View | Details | Raw Unified | Return to bug 269473 | Differences between
and this patch

Collapse All | Expand All

(-)b/UPDATING (+14 lines)
Lines 5-10 they are unavoidable. Link Here
5
You should get into the habit of checking this file for changes each time
5
You should get into the habit of checking this file for changes each time
6
you update your ports collection, before attempting any port upgrades.
6
you update your ports collection, before attempting any port upgrades.
7
7
8
20230922:
9
AFFECTS: users of security/openssl* and security/libressl*
10
AUTHOR: tijl@FreeBSD.org
11
12
The directories /usr/local/openssl/certs and /usr/local/etc/ssl/certs
13
have been replaced with symbolic links to /etc/ssl/certs.  Any CA
14
certificates in these directories should be moved to
15
/usr/local/share/certs and then installed to /etc/ssl/certs using
16
"certctl rehash".  See certctl(8) for more information.
17
18
If the directory certs exists when installing the package it will be
19
renamed certs.pkgsave.  If certs.pkgsave exists package installation
20
will fail.
21
8
20230919:
22
20230919:
9
  AFFECTS: users of net-p2p/transmission
23
  AFFECTS: users of net-p2p/transmission
10
  AUTHOR:  mondo.debater_0q@icloud.com
24
  AUTHOR:  mondo.debater_0q@icloud.com
(-)b/security/openssl-quictls/Makefile (+3 lines)
Lines 1-5 Link Here
1
PORTNAME=	openssl
1
PORTNAME=	openssl
2
PORTVERSION=	3.0.10
2
PORTVERSION=	3.0.10
3
PORTREVISION=	1
3
CATEGORIES=	security devel
4
CATEGORIES=	security devel
4
PKGNAMESUFFIX=	-quictls
5
PKGNAMESUFFIX=	-quictls
5
6
Lines 179-184 post-install-SHARED-off: Link Here
179
180
180
post-install:
181
post-install:
181
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
182
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
183
	${RMDIR} ${STAGEDIR}${OPENSSLDIR}/certs
184
	${LN} -s /etc/ssl/certs ${STAGEDIR}${OPENSSLDIR}/certs
182
185
183
post-install-MAN3-on:
186
post-install-MAN3-on:
184
	( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \
187
	( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \
(-)b/security/openssl-quictls/pkg-plist (-1 / +2 lines)
Lines 265-270 man/man1/x509.1ossl.gz Link Here
265
man/man5/config.5ossl.gz
265
man/man5/config.5ossl.gz
266
man/man5/fips_config.5ossl.gz
266
man/man5/fips_config.5ossl.gz
267
man/man5/x509v3_config.5ossl.gz
267
man/man5/x509v3_config.5ossl.gz
268
%%OPENSSLDIR%%/certs
268
%%OPENSSLDIR%%/misc/CA.pl
269
%%OPENSSLDIR%%/misc/CA.pl
269
@comment %%OPENSSLDIR%%/misc/tsget.pl
270
@comment %%OPENSSLDIR%%/misc/tsget.pl
270
%%OPENSSLDIR%%/misc/tsget
271
%%OPENSSLDIR%%/misc/tsget
Lines 273-276 man/man5/x509v3_config.5ossl.gz Link Here
273
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
274
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
274
@dir lib/ossl-modules
275
@dir lib/ossl-modules
275
@dir %%OPENSSLDIR%%/private
276
@dir %%OPENSSLDIR%%/private
276
@dir %%OPENSSLDIR%%/certs
277
@preexec if [ -d %D/%%OPENSSLDIR%%/certs -a ! -L %D/%%OPENSSLDIR%%/certs ]; then [ ! -e %D/%%OPENSSLDIR%%/certs.pkgsave -a ! -L %D/%%OPENSSLDIR%%/certs.pkgsave ] && mv %D/%%OPENSSLDIR%%/certs %D/%%OPENSSLDIR%%/certs.pkgsave; fi
(-)b/security/openssl-unsafe/Makefile (+3 lines)
Lines 1-5 Link Here
1
PORTNAME=	openssl
1
PORTNAME=	openssl
2
PORTVERSION=	1.0.2.20170706
2
PORTVERSION=	1.0.2.20170706
3
PORTREVISION=	1
3
CATEGORIES=	security devel
4
CATEGORIES=	security devel
4
PKGNAMESUFFIX=	-unsafe
5
PKGNAMESUFFIX=	-unsafe
5
6
Lines 69-74 post-install: Link Here
69
.for i in ubsec gost capi gmp atalla sureware nuron cswift 4758cca padlock aep chil
70
.for i in ubsec gost capi gmp atalla sureware nuron cswift 4758cca padlock aep chil
70
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/lib/engines/lib${i}.so
71
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/lib/engines/lib${i}.so
71
.endfor
72
.endfor
73
	${RMDIR} ${STAGEDIR}${OPENSSLDIR}/certs
74
	${LN} -s /etc/ssl/certs ${STAGEDIR}${OPENSSLDIR}/certs
72
75
73
test: build
76
test: build
74
	cd ${WRKSRC} && ${MAKE} test
77
	cd ${WRKSRC} && ${MAKE} test
(-)b/security/openssl-unsafe/pkg-plist (-1 / +2 lines)
Lines 101-109 openssl-unsafe/lib/libssl.so.%%SHLIBVER%% Link Here
101
openssl-unsafe/libdata/pkgconfig/libcrypto.pc
101
openssl-unsafe/libdata/pkgconfig/libcrypto.pc
102
openssl-unsafe/libdata/pkgconfig/libssl.pc
102
openssl-unsafe/libdata/pkgconfig/libssl.pc
103
openssl-unsafe/libdata/pkgconfig/openssl.pc
103
openssl-unsafe/libdata/pkgconfig/openssl.pc
104
%%OPENSSLDIR%%/certs
104
%%OPENSSLDIR%%/misc/CA.pl
105
%%OPENSSLDIR%%/misc/CA.pl
105
%%OPENSSLDIR%%/misc/CA.sh
106
%%OPENSSLDIR%%/misc/CA.sh
106
%%OPENSSLDIR%%/misc/tsget
107
%%OPENSSLDIR%%/misc/tsget
107
@sample %%OPENSSLDIR%%/openssl.cnf.sample
108
@sample %%OPENSSLDIR%%/openssl.cnf.sample
108
@dir %%OPENSSLDIR%%/private
109
@dir %%OPENSSLDIR%%/private
109
@dir %%OPENSSLDIR%%/certs
110
@preexec if [ -d %D/%%OPENSSLDIR%%/certs -a ! -L %D/%%OPENSSLDIR%%/certs ]; then [ ! -e %D/%%OPENSSLDIR%%/certs.pkgsave -a ! -L %D/%%OPENSSLDIR%%/certs.pkgsave ] && mv %D/%%OPENSSLDIR%%/certs %D/%%OPENSSLDIR%%/certs.pkgsave; fi
(-)b/security/openssl/Makefile (+3 lines)
Lines 1-5 Link Here
1
PORTNAME=	openssl
1
PORTNAME=	openssl
2
PORTVERSION=	1.1.1w
2
PORTVERSION=	1.1.1w
3
PORTREVISION=	1
3
PORTEPOCH=	1
4
PORTEPOCH=	1
4
CATEGORIES=	security devel
5
CATEGORIES=	security devel
5
MASTER_SITES=	https://www.openssl.org/source/ \
6
MASTER_SITES=	https://www.openssl.org/source/ \
Lines 161-166 post-install-SHARED-on: Link Here
161
162
162
post-install:
163
post-install:
163
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
164
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
165
	${RMDIR} ${STAGEDIR}${OPENSSLDIR}/certs
166
	${LN} -s /etc/ssl/certs ${STAGEDIR}${OPENSSLDIR}/certs
164
167
165
post-install-MAN3-on:
168
post-install-MAN3-on:
166
	( cd ${STAGEDIR}/${PREFIX} ; ${FIND} man/man3 man/man7 -not -type d ) | \
169
	( cd ${STAGEDIR}/${PREFIX} ; ${FIND} man/man3 man/man7 -not -type d ) | \
(-)b/security/openssl/pkg-plist (-1 / +2 lines)
Lines 217-226 man/man1/version.1.gz Link Here
217
man/man1/x509.1.gz
217
man/man1/x509.1.gz
218
man/man5/config.5.gz
218
man/man5/config.5.gz
219
man/man5/x509v3_config.5.gz
219
man/man5/x509v3_config.5.gz
220
%%OPENSSLDIR%%/certs
220
%%OPENSSLDIR%%/misc/CA.pl
221
%%OPENSSLDIR%%/misc/CA.pl
221
%%OPENSSLDIR%%/misc/tsget
222
%%OPENSSLDIR%%/misc/tsget
222
@comment %%OPENSSLDIR%%/misc/tsget.pl
223
@comment %%OPENSSLDIR%%/misc/tsget.pl
223
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
224
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
224
@sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
225
@sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
225
@dir %%OPENSSLDIR%%/private
226
@dir %%OPENSSLDIR%%/private
226
@dir %%OPENSSLDIR%%/certs
227
@preexec if [ -d %D/%%OPENSSLDIR%%/certs -a ! -L %D/%%OPENSSLDIR%%/certs ]; then [ ! -e %D/%%OPENSSLDIR%%/certs.pkgsave -a ! -L %D/%%OPENSSLDIR%%/certs.pkgsave ] && mv %D/%%OPENSSLDIR%%/certs %D/%%OPENSSLDIR%%/certs.pkgsave; fi
(-)b/security/openssl30/Makefile (-1 / +3 lines)
Lines 1-6 Link Here
1
PORTNAME=	openssl
1
PORTNAME=	openssl
2
PORTVERSION=	3.0.11
2
PORTVERSION=	3.0.11
3
PORTREVISION=	1
3
PORTREVISION=	2
4
CATEGORIES=	security devel
4
CATEGORIES=	security devel
5
MASTER_SITES=	https://www.openssl.org/source/ \
5
MASTER_SITES=	https://www.openssl.org/source/ \
6
		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
6
		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
Lines 186-191 post-install-SHARED-off: Link Here
186
186
187
post-install:
187
post-install:
188
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
188
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
189
	${RMDIR} ${STAGEDIR}${OPENSSLDIR}/certs
190
	${LN} -s /etc/ssl/certs ${STAGEDIR}${OPENSSLDIR}/certs
189
191
190
post-install-MAN3-on:
192
post-install-MAN3-on:
191
	( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \
193
	( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \
(-)b/security/openssl30/pkg-plist (-1 / +2 lines)
Lines 264-269 man/man1/x509.1ossl.gz Link Here
264
man/man5/config.5ossl.gz
264
man/man5/config.5ossl.gz
265
man/man5/fips_config.5ossl.gz
265
man/man5/fips_config.5ossl.gz
266
man/man5/x509v3_config.5ossl.gz
266
man/man5/x509v3_config.5ossl.gz
267
%%OPENSSLDIR%%/certs
267
%%OPENSSLDIR%%/misc/CA.pl
268
%%OPENSSLDIR%%/misc/CA.pl
268
@comment %%OPENSSLDIR%%/misc/tsget.pl
269
@comment %%OPENSSLDIR%%/misc/tsget.pl
269
%%OPENSSLDIR%%/misc/tsget
270
%%OPENSSLDIR%%/misc/tsget
Lines 272-275 man/man5/x509v3_config.5ossl.gz Link Here
272
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
273
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
273
@dir lib/ossl-modules
274
@dir lib/ossl-modules
274
@dir %%OPENSSLDIR%%/private
275
@dir %%OPENSSLDIR%%/private
275
@dir %%OPENSSLDIR%%/certs
276
@preexec if [ -d %D/%%OPENSSLDIR%%/certs -a ! -L %D/%%OPENSSLDIR%%/certs ]; then [ ! -e %D/%%OPENSSLDIR%%/certs.pkgsave -a ! -L %D/%%OPENSSLDIR%%/certs.pkgsave ] && mv %D/%%OPENSSLDIR%%/certs %D/%%OPENSSLDIR%%/certs.pkgsave; fi
(-)b/security/openssl31/Makefile (-1 / +3 lines)
Lines 1-6 Link Here
1
PORTNAME=	openssl
1
PORTNAME=	openssl
2
PORTVERSION=	3.1.3
2
PORTVERSION=	3.1.3
3
PORTREVISION=	1
3
PORTREVISION=	2
4
CATEGORIES=	security devel
4
CATEGORIES=	security devel
5
MASTER_SITES=	https://www.openssl.org/source/ \
5
MASTER_SITES=	https://www.openssl.org/source/ \
6
		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
6
		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
Lines 186-191 post-install-SHARED-off: Link Here
186
186
187
post-install:
187
post-install:
188
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
188
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
189
	${RMDIR} ${STAGEDIR}${OPENSSLDIR}/certs
190
	${LN} -s /etc/ssl/certs ${STAGEDIR}${OPENSSLDIR}/certs
189
191
190
post-install-MAN3-on:
192
post-install-MAN3-on:
191
	( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \
193
	( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \
(-)b/security/openssl31/pkg-plist (-1 / +2 lines)
Lines 264-269 man/man1/x509.1ossl.gz Link Here
264
man/man5/config.5ossl.gz
264
man/man5/config.5ossl.gz
265
man/man5/fips_config.5ossl.gz
265
man/man5/fips_config.5ossl.gz
266
man/man5/x509v3_config.5ossl.gz
266
man/man5/x509v3_config.5ossl.gz
267
%%OPENSSLDIR%%/certs
267
%%OPENSSLDIR%%/misc/CA.pl
268
%%OPENSSLDIR%%/misc/CA.pl
268
@comment %%OPENSSLDIR%%/misc/tsget.pl
269
@comment %%OPENSSLDIR%%/misc/tsget.pl
269
%%OPENSSLDIR%%/misc/tsget
270
%%OPENSSLDIR%%/misc/tsget
Lines 272-275 man/man5/x509v3_config.5ossl.gz Link Here
272
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
273
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
273
@dir lib/ossl-modules
274
@dir lib/ossl-modules
274
@dir %%OPENSSLDIR%%/private
275
@dir %%OPENSSLDIR%%/private
275
@dir %%OPENSSLDIR%%/certs
276
@preexec if [ -d %D/%%OPENSSLDIR%%/certs -a ! -L %D/%%OPENSSLDIR%%/certs ]; then [ ! -e %D/%%OPENSSLDIR%%/certs.pkgsave -a ! -L %D/%%OPENSSLDIR%%/certs.pkgsave ] && mv %D/%%OPENSSLDIR%%/certs %D/%%OPENSSLDIR%%/certs.pkgsave; fi
(-)b/security/openssl32/Makefile (+3 lines)
Lines 1-5 Link Here
1
PORTNAME=	openssl
1
PORTNAME=	openssl
2
DISTVERSION=	3.2.0-alpha1
2
DISTVERSION=	3.2.0-alpha1
3
PORTREVISION=	1
3
CATEGORIES=	security devel
4
CATEGORIES=	security devel
4
MASTER_SITES=	https://www.openssl.org/source/ \
5
MASTER_SITES=	https://www.openssl.org/source/ \
5
		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
6
		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
Lines 199-204 post-install-SHARED-off: Link Here
199
200
200
post-install:
201
post-install:
201
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
202
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
203
	${RMDIR} ${STAGEDIR}${OPENSSLDIR}/certs
204
	${LN} -s /etc/ssl/certs ${STAGEDIR}${OPENSSLDIR}/certs
202
205
203
post-install-MAN3-on:
206
post-install-MAN3-on:
204
	( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \
207
	( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \
(-)b/security/openssl32/pkg-plist (-2 / +2 lines)
Lines 267-272 man/man1/x509.1ossl.gz Link Here
267
man/man5/config.5ossl.gz
267
man/man5/config.5ossl.gz
268
man/man5/fips_config.5ossl.gz
268
man/man5/fips_config.5ossl.gz
269
man/man5/x509v3_config.5ossl.gz
269
man/man5/x509v3_config.5ossl.gz
270
%%OPENSSLDIR%%/certs
270
%%OPENSSLDIR%%/misc/CA.pl
271
%%OPENSSLDIR%%/misc/CA.pl
271
@comment %%OPENSSLDIR%%/misc/tsget.pl
272
@comment %%OPENSSLDIR%%/misc/tsget.pl
272
%%OPENSSLDIR%%/misc/tsget
273
%%OPENSSLDIR%%/misc/tsget
Lines 274-277 man/man5/x509v3_config.5ossl.gz Link Here
274
%%OPENSSLDIR%%/fipsmodule.cnf
275
%%OPENSSLDIR%%/fipsmodule.cnf
275
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
276
@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
276
@dir %%OPENSSLDIR%%/private
277
@dir %%OPENSSLDIR%%/private
277
@dir %%OPENSSLDIR%%/certs
278
@preexec if [ -d %D/%%OPENSSLDIR%%/certs -a ! -L %D/%%OPENSSLDIR%%/certs ]; then [ ! -e %D/%%OPENSSLDIR%%/certs.pkgsave -a ! -L %D/%%OPENSSLDIR%%/certs.pkgsave ] && mv %D/%%OPENSSLDIR%%/certs %D/%%OPENSSLDIR%%/certs.pkgsave; fi
278
- 

Return to bug 269473