Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/
Date: Wed, 29 Jun 2022 00:03:15
Message-Id: 1656460937.e7b9a095de5e6f78668385223fa6ccd9fdeb36ae.sam@gentoo
1 commit: e7b9a095de5e6f78668385223fa6ccd9fdeb36ae
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 29 00:02:17 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 00:02:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b9a095
7
8 Revert "dev-libs/openssl: add 1.1.1p"
9
10 This reverts commit eb0b67201d70d0def107d9db7f78844815113274.
11
12 Given the previous test issue and we're not vulnerable to the rehash
13 script CVE anyway (we use our own), I don't think we want to bump to it yet.
14
15 We'd discussed not bumping it on IRC. But I should've
16 pre-emptively masked / added a note in the ebuild.
17
18 Signed-off-by: Sam James <sam <AT> gentoo.org>
19
20 dev-libs/openssl/Manifest | 2 -
21 dev-libs/openssl/openssl-1.1.1p.ebuild | 336 ---------------------------------
22 2 files changed, 338 deletions(-)
23
24 diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
25 index fd4aba44df2c..3984e90d7345 100644
26 --- a/dev-libs/openssl/Manifest
27 +++ b/dev-libs/openssl/Manifest
28 @@ -6,8 +6,6 @@ DIST openssl-1.1.1n.tar.gz.asc 488 BLAKE2B 8fc18fdc884473dc4c243499cc3528691a9ec
29 DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 23ef36d7bd05c98f7fab6de25681a53fa7a558d114548836b6cd90a57c4f4e45dc9fb622936053608b463320605b7df60db2d2caf3811b249f6ead3791a1c081 SHA512 577aec97fb31cd9efe3b30d82c560d3e7da57ae52c4de0f86e951b777a673830baaadcc5eb366c523024d37405531c6d32de26bbbc1e77df15c7822c72e937e6
30 DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641 SHA512 75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
31 DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d SHA512 da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
32 -DIST openssl-1.1.1p.tar.gz 9860217 BLAKE2B 4354753a5e52393c9cc4569954c2cac6d89a1e204fa4f9ca00a60492782d29f8952fb92664cdbb3576c6443d3cb2eacebea51db584738589f3598b40df579b12 SHA512 203470b1cd37bdbfabfec5ef37fc97c991d9943f070c988316f6396b09dae7cea16ac884bd8646dbf7dd1ed40ebde6bdfa5700beee2d714d07c97cc70b4e48d9
33 -DIST openssl-1.1.1p.tar.gz.asc 488 BLAKE2B e68c8a4c992c2448b48428137f61f91fb89e4814f6e80c5525cea695bcf898326eca729f31b953fbd7ff51b448004101ca78abfbd3138ec2389596faa3eafc2f SHA512 c85d65df1ed0f1ae87b799d794ea43e32c8ecaf85caf6e36fbbd4a890ef1d47710380d3846296e0124898680be66113a959ad974e0448bc00d1253794dc48972
34 DIST openssl-3.0.2.tar.gz 15038141 BLAKE2B 140c4c80a0cad89cb0059fef6a4cd421460e6af9a3973f7a3eb5e39f64c0d44794d46e7a869e5235fced139f2249351e37a9ee5ebaa17f2708d63141ebebf919 SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03
35 DIST openssl-3.0.2.tar.gz.asc 488 BLAKE2B 2f6482114271c4f512159fa159486a3b3470637d770cd1614fda004918d06ed9ab562e655d1580d2ebb05745ec72987488c2161b72d078017cc157003d4205da SHA512 4303391a58107c76ad9b05510f5bfc95f687f4cb2f9ff5b03fb262ba99b573423ab83f0437471199954496799b343191b889ad9ef8fabdd7ee4ec3ec9b5f1d81
36 DIST openssl-3.0.3-test-fixes-expiry.patch.xz 29056 BLAKE2B 11be776b9c4baec770d81ff180581d7d8292261f32ebfcb2cfd399d684cef1b9e7b4575d906f23e8a61d853eafb178e1b0e01d9324dbe598c876c0ef74bcf5e8 SHA512 23bc571dfca453deb4f1812aea5fc1bcf1c27358d8638a66ce7f359a698b09a35bdc86e01db36aa5e59b37cc7e36f0ced6f1463b383fb0d904aada69f5d5cb04
37
38 diff --git a/dev-libs/openssl/openssl-1.1.1p.ebuild b/dev-libs/openssl/openssl-1.1.1p.ebuild
39 deleted file mode 100644
40 index 90f1683c106f..000000000000
41 --- a/dev-libs/openssl/openssl-1.1.1p.ebuild
42 +++ /dev/null
43 @@ -1,336 +0,0 @@
44 -# Copyright 1999-2022 Gentoo Authors
45 -# Distributed under the terms of the GNU General Public License v2
46 -
47 -EAPI=7
48 -
49 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
50 -inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
51 -
52 -MY_P=${P/_/-}
53 -DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
54 -HOMEPAGE="https://www.openssl.org/"
55 -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
56 - verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
57 -S="${WORKDIR}/${MY_P}"
58 -
59 -LICENSE="openssl"
60 -SLOT="0/1.1" # .so version of libssl/libcrypto
61 -if [[ ${PV} != *_pre* ]] ; then
62 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
63 -fi
64 -IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
65 -RESTRICT="!test? ( test )"
66 -
67 -RDEPEND=">=app-misc/c_rehash-1.7-r1
68 - tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
69 -DEPEND="${RDEPEND}"
70 -BDEPEND="
71 - >=dev-lang/perl-5
72 - sctp? ( >=net-misc/lksctp-tools-1.0.12 )
73 - test? (
74 - sys-apps/diffutils
75 - sys-devel/bc
76 - kernel_linux? ( sys-process/procps )
77 - )
78 - verify-sig? ( sec-keys/openpgp-keys-openssl )"
79 -PDEPEND="app-misc/ca-certificates"
80 -
81 -# force upgrade to prevent broken login, bug #696950
82 -RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
83 -
84 -MULTILIB_WRAPPED_HEADERS=(
85 - usr/include/openssl/opensslconf.h
86 -)
87 -
88 -PATCHES=(
89 - # General patches which are suitable to always apply
90 - # If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
91 - "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
92 - "${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
93 -)
94 -
95 -pkg_setup() {
96 - [[ ${MERGE_TYPE} == binary ]] && return
97 -
98 - # must check in pkg_setup; sysctl doesn't work with userpriv!
99 - if use test && use sctp; then
100 - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
101 - # if sctp.auth_enable is not enabled.
102 - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
103 - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
104 - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
105 - fi
106 - fi
107 -}
108 -
109 -src_unpack() {
110 - # Can delete this once test fix patch is dropped
111 - if use verify-sig ; then
112 - # Needed for downloaded patch (which is unsigned, which is fine)
113 - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
114 - fi
115 -
116 - default
117 -}
118 -
119 -src_prepare() {
120 - # Allow openssl to be cross-compiled
121 - cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
122 - chmod a+rx gentoo.config || die
123 -
124 - # Keep this in sync with app-misc/c_rehash
125 - SSL_CNF_DIR="/etc/ssl"
126 -
127 - # Make sure we only ever touch Makefile.org and avoid patching a file
128 - # that gets blown away anyways by the Configure script in src_configure
129 - rm -f Makefile
130 -
131 - if ! use vanilla ; then
132 - PATCHES+=(
133 - # Add patches which are Gentoo-specific customisations here
134 - )
135 - fi
136 -
137 - default
138 -
139 - if use test && use sctp && has network-sandbox ${FEATURES}; then
140 - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
141 - rm test/recipes/80-test_ssl_new.t || die
142 - fi
143 -
144 - # - Make sure the man pages are suffixed (bug #302165)
145 - # - Don't bother building man pages if they're disabled
146 - # - Make DOCDIR Gentoo compliant
147 - sed -i \
148 - -e '/^MANSUFFIX/s:=.*:=ssl:' \
149 - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
150 - -e $(has noman FEATURES \
151 - && echo '/^install:/s:install_docs::' \
152 - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
153 - -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
154 - Configurations/unix-Makefile.tmpl \
155 - || die
156 -
157 - # Quiet out unknown driver argument warnings since openssl
158 - # doesn't have well-split CFLAGS and we're making it even worse
159 - # and 'make depend' uses -Werror for added fun (bug #417795 again)
160 - tc-is-clang && append-flags -Qunused-arguments
161 -
162 - # We really, really need to build OpenSSL w/ strict aliasing disabled.
163 - # It's filled with violations and it *will* result in miscompiled
164 - # code. This has been in the ebuild for > 10 years but even in 2022,
165 - # it's still relevant:
166 - # - https://github.com/llvm/llvm-project/issues/55255
167 - # - https://github.com/openssl/openssl/issues/18225
168 - # Don't remove the no strict aliasing bits below!
169 - filter-flags -fstrict-aliasing
170 - append-flags -fno-strict-aliasing
171 -
172 - append-cppflags -DOPENSSL_NO_BUF_FREELISTS
173 -
174 - append-flags $(test-flags-CC -Wa,--noexecstack)
175 -
176 - # Prefixify Configure shebang (bug #141906)
177 - sed \
178 - -e "1s,/usr/bin/env,${EPREFIX}&," \
179 - -i Configure || die
180 -
181 - # Remove test target when FEATURES=test isn't set
182 - if ! use test ; then
183 - sed \
184 - -e '/^$config{dirs}/s@ "test",@@' \
185 - -i Configure || die
186 - fi
187 -
188 - if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
189 - # use GNU ld full option, not to confuse it on Solaris
190 - sed -i \
191 - -e 's/-Wl,-M,/-Wl,--version-script=/' \
192 - -e 's/-Wl,-h,/-Wl,--soname=/' \
193 - Configurations/10-main.conf || die
194 -
195 - # fix building on Solaris 10
196 - # https://github.com/openssl/openssl/issues/6333
197 - sed -i \
198 - -e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
199 - Configurations/10-main.conf || die
200 - fi
201 -
202 - # The config script does stupid stuff to prompt the user. Kill it.
203 - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
204 - ./config --test-sanity || die "I AM NOT SANE"
205 -
206 - multilib_copy_sources
207 -}
208 -
209 -multilib_src_configure() {
210 - # bug #197996
211 - unset APPS
212 - # bug #312551
213 - unset SCRIPTS
214 - # bug #311473
215 - unset CROSS_COMPILE
216 -
217 - tc-export AR CC CXX RANLIB RC
218 -
219 - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
220 -
221 - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
222 -
223 - # See if our toolchain supports __uint128_t. If so, it's 64bit
224 - # friendly and can use the nicely optimized code paths, bug #460790.
225 - local ec_nistp_64_gcc_128
226 -
227 - # Disable it for now though (bug #469976)
228 - # echo "__uint128_t i;" > "${T}"/128.c
229 - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
230 - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
231 - # fi
232 -
233 - local sslout=$(./gentoo.config)
234 - einfo "Use configuration ${sslout:-(openssl knows best)}"
235 - local config="Configure"
236 - [[ -z ${sslout} ]] && config="config"
237 -
238 - # "disable-deprecated" option breaks too many consumers.
239 - # Don't set it without thorough revdeps testing.
240 - # Make sure user flags don't get added *yet* to avoid duplicated
241 - # flags.
242 - local myeconfargs=(
243 - ${sslout}
244 -
245 - $(use cpu_flags_x86_sse2 || echo "no-sse2")
246 - enable-camellia
247 - enable-ec
248 - enable-ec2m
249 - enable-sm2
250 - enable-srp
251 - $(use elibc_musl && echo "no-async")
252 - ${ec_nistp_64_gcc_128}
253 - enable-idea
254 - enable-mdc2
255 - enable-rc5
256 - $(use_ssl sslv3 ssl3)
257 - $(use_ssl sslv3 ssl3-method)
258 - $(use_ssl asm)
259 - $(use_ssl rfc3779)
260 - $(use_ssl sctp)
261 - $(use test || echo "no-tests")
262 - $(use_ssl tls-compression zlib)
263 - $(use_ssl tls-heartbeat heartbeats)
264 - $(use_ssl weak-ssl-ciphers)
265 -
266 - --prefix="${EPREFIX}"/usr
267 - --openssldir="${EPREFIX}"${SSL_CNF_DIR}
268 - --libdir=$(get_libdir)
269 -
270 - shared
271 - threads
272 - )
273 -
274 - CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
275 -
276 - # Clean out hardcoded flags that openssl uses
277 - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
278 - -e 's:^CFLAGS=::' \
279 - -e 's:\(^\| \)-fomit-frame-pointer::g' \
280 - -e 's:\(^\| \)-O[^ ]*::g' \
281 - -e 's:\(^\| \)-march=[^ ]*::g' \
282 - -e 's:\(^\| \)-mcpu=[^ ]*::g' \
283 - -e 's:\(^\| \)-m[^ ]*::g' \
284 - -e 's:^ *::' \
285 - -e 's: *$::' \
286 - -e 's: \+: :g' \
287 - -e 's:\\:\\\\:g'
288 - )
289 -
290 - # Now insert clean default flags with user flags
291 - sed -i \
292 - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
293 - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
294 - Makefile || die
295 -}
296 -
297 -multilib_src_compile() {
298 - # depend is needed to use $confopts; it also doesn't matter
299 - # that it's -j1 as the code itself serializes subdirs
300 - emake -j1 depend
301 -
302 - emake all
303 -}
304 -
305 -multilib_src_test() {
306 - emake -j1 test
307 -}
308 -
309 -multilib_src_install() {
310 - # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
311 - dodir /usr
312 -
313 - emake DESTDIR="${D}" install
314 -
315 - # This is crappy in that the static archives are still built even
316 - # when USE=static-libs. But this is due to a failing in the openssl
317 - # build system: the static archives are built as PIC all the time.
318 - # Only way around this would be to manually configure+compile openssl
319 - # twice; once with shared lib support enabled and once without.
320 - if ! use static-libs; then
321 - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
322 - fi
323 -}
324 -
325 -multilib_src_install_all() {
326 - # openssl installs perl version of c_rehash by default, but
327 - # we provide a shell version via app-misc/c_rehash
328 - rm "${ED}"/usr/bin/c_rehash || die
329 -
330 - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
331 -
332 - # Create the certs directory
333 - keepdir ${SSL_CNF_DIR}/certs
334 -
335 - # Namespace openssl programs to prevent conflicts with other man pages
336 - cd "${ED}"/usr/share/man || die
337 - local m d s
338 - for m in $(find . -type f | xargs grep -L '#include') ; do
339 - d=${m%/*}
340 - d=${d#./}
341 - m=${m##*/}
342 -
343 - [[ ${m} == openssl.1* ]] && continue
344 -
345 - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
346 -
347 - mv ${d}/{,ssl-}${m} || die
348 -
349 - # Fix up references to renamed man pages
350 - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
351 - ln -s ssl-${m} ${d}/openssl-${m}
352 -
353 - # Locate any symlinks that point to this man page
354 - # We assume that any broken links are due to the above renaming
355 - for s in $(find -L ${d} -type l) ; do
356 - s=${s##*/}
357 -
358 - rm -f ${d}/${s}
359 -
360 - # We don't want to "|| die" here
361 - ln -s ssl-${m} ${d}/ssl-${s}
362 - ln -s ssl-${s} ${d}/openssl-${s}
363 - done
364 - done
365 - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
366 -
367 - # bug #254521
368 - dodir /etc/sandbox.d
369 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
370 -
371 - diropts -m0700
372 - keepdir ${SSL_CNF_DIR}/private
373 -}
374 -
375 -pkg_postinst() {
376 - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
377 - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
378 - eend $?
379 -}