From c07955fffc8c82b9d37211c3f7f38455d7ef0599 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Oct 2022 01:39:26 +0100 Subject: gentoo auto-resync : 12:10:2022 - 01:39:26 --- dev-libs/Manifest.gz | Bin 95942 -> 95948 bytes dev-libs/ell/Manifest | 2 +- dev-libs/ell/ell-0.53.ebuild | 2 +- dev-libs/openssl/Manifest | 6 + dev-libs/openssl/openssl-1.1.1r.ebuild | 339 +++++++++++++++++++++++++++++++++ dev-libs/openssl/openssl-3.0.6.ebuild | 334 ++++++++++++++++++++++++++++++++ dev-libs/trio/Manifest | 2 +- dev-libs/trio/trio-1.17.ebuild | 8 +- 8 files changed, 689 insertions(+), 4 deletions(-) create mode 100644 dev-libs/openssl/openssl-1.1.1r.ebuild create mode 100644 dev-libs/openssl/openssl-3.0.6.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 21806843743c..5525d487dfa5 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index 94e4d75b524b..eb120df521b5 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -4,6 +4,6 @@ DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b99081 DIST ell-0.53.tar.xz 550296 BLAKE2B d68952a0d899d8d346aa9e491b19fc5fbe845fd607446b4c16f09816c3d8b38f576a08cf994fdc49d794847277cdbe6483a147146ed4adaafa47c269846d78b5 SHA512 4ebe79834acabaec411bece7d81f50d7d6ea8f5d330769bbeb20596df6c2885ff584f589b6f5bbf9607e1a52158151d6940d4a1438b4aa610d42c38882366ed7 EBUILD ell-0.51.ebuild 1331 BLAKE2B 7d6a254dbf13ae781be3f9f4e4240590cac8f9bc36267bb84f5fda9d7035b01007bc4106d04537daa5fd2828cda7f1343a5f3ccc8258349c01cbdc41344981cf SHA512 287bfa2f891a9097fb7fbf11c96037fa7f875afe1a268863a8a21d77d0c0bcdfb8a7a83044c010a5fa767cd1bf21b7187e8ead14719428db074c8588b1c24cf8 EBUILD ell-0.52-r1.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e -EBUILD ell-0.53.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155 +EBUILD ell-0.53.ebuild 1180 BLAKE2B ccc3d8967772f536b7eb3780f4d558b12f8a6d1f0f51549d6e4b5f6cac63317820b9937c1b77eb9625ee73ce2614bad5d3fc53c5bde9c59a2feedbc74053a2ab SHA512 e39faf46ae0044c7b3e6a3aa77f0689d80056cfa9ce475c50a307897b922dfc281a60c7f359e7ac2121d611b47639844dbbf26059d1541ff27320a8082802272 EBUILD ell-9999.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f diff --git a/dev-libs/ell/ell-0.53.ebuild b/dev-libs/ell/ell-0.53.ebuild index 8cffe5864e18..059b2bfee340 100644 --- a/dev-libs/ell/ell-0.53.ebuild +++ b/dev-libs/ell/ell-0.53.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86" fi LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index cf8b93d33c12..a09c5b27e566 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -7,9 +7,15 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32 DIST openssl-1.1.1q.tar.gz 9864061 BLAKE2B fc8fd6a62dc291d0bda328a051e253175fb04442cc4b8f45d67c3a5027748a0fc5fb372d0483bc9024ae0bff119c4fac8f1e982a182612427696d6d09f5935f5 SHA512 cb9f184ec4974a3423ef59c8ec86b6bf523d5b887da2087ae58c217249da3246896fdd6966ee9c13aea9e6306783365239197e9f742c508a0e35e5744e3e085f DIST openssl-1.1.1q.tar.gz.asc 833 BLAKE2B 9311abf47469c3802a84dc9b7427a168ba7717496960e6f84b04e4d9263dea1168493082937a06bcb6ef4169b2ed9b2f36084bbac15b5f7ca5b4c41041c4bab6 SHA512 03a41f29d1713c47bb300e01e36dbd048074076a6a3b9913e2fc9a1b56b726c038978f99e86f9a3e4ea39f72bd82a15965842f6d94210fa9d3474f6f0f68559e +DIST openssl-1.1.1r.tar.gz 9868506 BLAKE2B ae1f56718d6a9400e9670f1ad1db2bc15bfbefc4fb114c7920c95a193285984d46cb28fe8dfbfa732f7755fb7810b51412f6e23a592d5769af9925026aa912d9 SHA512 73577707f7846af3c53606cb7590872306ba2bce331dc64692acb6d998a95982221dd39948f5f4ef7430897c0430bc61410983c5bac0f8dd88f2d9dbbc305fae +DIST openssl-1.1.1r.tar.gz.asc 488 BLAKE2B 9308c87f2d7bfcbcaf7f61aad892aeb411e1d600eea085e5e4adb9c24c0f2087f43cdc81615b1dc7bb8a199daca225e10df98c14e33af5be851b4f8394f02dbe SHA512 dcb33a52e646d68e936833ef2170016227e4fc2a1b2741fe9091b76751d66c6601eaa48a085793ec6deb87b641187bdc350afce1f31499c8ab6e02a7ff36f3b4 DIST openssl-3.0.5.tar.gz 15074407 BLAKE2B 7bf89e042417c003ef02a8bb1278590a52ce4a3d50f66795c66b750f90248840edb0d3352811caaaaff708c7e65b77384142e316916a6c311f1d2b4747f44816 SHA512 782b0df3d0252468aa696bd74a3b661810499819c0df849aa9698ba0e06a845820dc856aac650fced4be234f1271e576d4317ac3ab1406cf0ffe087d695d20fe DIST openssl-3.0.5.tar.gz.asc 862 BLAKE2B 24f1839227be7acec45eb6b748cea7be0b5e66b5cf745814861f7290670733936bf1af2c1dc9357439b31a2ca28f418880d63726d4be6fa994902ac95b51e401 SHA512 516da9ef291601400576adaba7271854af3caa23dc1d70116004360f580e4c28fe61d51e86477d341e4c5bf0ca5f98db8264581ed6cc2c8df124da83ad3e40be +DIST openssl-3.0.6.tar.gz 15101953 BLAKE2B 08e1217dc2fb874062c0f2248257c340dac6e24edd13310f4f0c0ee367c61cd629f4e73a043545895e6ec94ed6eef760eb8fc8a7eec9547b046e82c01f2e9770 SHA512 1d1fc07122116ce68c85b8eb57a13024ed65fc5c4f0311327dfe68a29f38b9e66f32e6345f11827e0b26ee0de3c21bb92d5834604ffaf37db5c6a380d98c0e51 +DIST openssl-3.0.6.tar.gz.asc 488 BLAKE2B 482bfd9569ebac0ea0eee1d311a62c28f0dd3a7d54c3d264e37c7f52edda7ecf41e8e6825619a40a2c6256bba92fdb97f5a9c236ec22d470cdd8c5e894756ee9 SHA512 458e7721b179121f46a7972e9a7cf253b593f25742de9b4536d76f157bd9681a9d2540c7dc92dc1a73fb53e43900ffae61708cd0ef71207fdab66d10bc424de1 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9 EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee +EBUILD openssl-1.1.1r.ebuild 10153 BLAKE2B 175a9dcf5b4c0226d37634153509b60f4271370a6a6d2293cd97aea5388f65ad75592ed8a6aaad2ba8e4e74eae46540754440f9360ac61541ef15bbf8015137a SHA512 e815549684529b9feb03c4c4668ab2e30f183eed1b00190fee7a062839c9f3223ad801c22fd8f63b8b253a7b324a3e1c9bcf30abf7b051288683b576f2ef9670 EBUILD openssl-3.0.5.ebuild 9849 BLAKE2B ed926b4509ded0bbf0eb637eaf7690595a7f8ef2fbabd6b39ec0554e400aaeab1904daedae13c3dc1434b046642b2dadd30793735ded0b6aed9715c8379a0bd2 SHA512 ee29db03c896e2b8744b0c49160adc037cff79719ae109e6a7a21d74d6467bd6a1c1bab14ae9490c5581ee2e24e1819b2ba742c15103760f5966735cea3ea6ee +EBUILD openssl-3.0.6.ebuild 9798 BLAKE2B d044f88203d1e055ffb12a0b84d2dd7567f5a4935014862d9556931d5c0e9f4c29ca77de198bfae14ad54ec818bc19c41ea268548ef6680394eb1f657edaa182 SHA512 0115593e8b63d09a78a9d15df6ea4625dac6c656e9de63c8047d9f8ba067c445b7da7579cfa3721dede79b58073ee43a302b34c70b8a6a5efa962f7086394137 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92 diff --git a/dev-libs/openssl/openssl-1.1.1r.ebuild b/dev-libs/openssl/openssl-1.1.1r.ebuild new file mode 100644 index 000000000000..8dba22fd8d85 --- /dev/null +++ b/dev-libs/openssl/openssl-1.1.1r.ebuild @@ -0,0 +1,339 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc +inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig + +MY_P=${P/_/-} +DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)" +HOMEPAGE="https://www.openssl.org/" +SRC_URI="mirror://openssl/source/${MY_P}.tar.gz + verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" +S="${WORKDIR}/${MY_P}" + +LICENSE="openssl" +SLOT="0/1.1" # .so version of libssl/libcrypto +if [[ ${PV} != *_pre* ]] ; then + 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" +fi +IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers" +RESTRICT="!test? ( test )" + +RDEPEND=">=app-misc/c_rehash-1.7-r1 + tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-lang/perl-5 + sctp? ( >=net-misc/lksctp-tools-1.0.12 ) + test? ( + sys-apps/diffutils + sys-devel/bc + kernel_linux? ( sys-process/procps ) + ) + verify-sig? ( sec-keys/openpgp-keys-openssl )" +PDEPEND="app-misc/ca-certificates" + +# force upgrade to prevent broken login, bug #696950 +RDEPEND+=" !/dev/null) + if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then + die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" + fi + fi +} + +src_unpack() { + # Can delete this once test fix patch is dropped + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_prepare() { + # Allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die + chmod a+rx gentoo.config || die + + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" + + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script in src_configure + rm -f Makefile + + if ! use vanilla ; then + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) + fi + + default + + if use test && use sctp && has network-sandbox ${FEATURES}; then + einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." + rm test/recipes/80-test_ssl_new.t || die + fi + + # - Make sure the man pages are suffixed (bug #302165) + # - Don't bother building man pages if they're disabled + # - Make DOCDIR Gentoo compliant + sed -i \ + -e '/^MANSUFFIX/s:=.*:=ssl:' \ + -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ + -e $(has noman FEATURES \ + && echo '/^install:/s:install_docs::' \ + || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ + -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ + Configurations/unix-Makefile.tmpl \ + || die + + # Quiet out unknown driver argument warnings since openssl + # doesn't have well-split CFLAGS and we're making it even worse + # and 'make depend' uses -Werror for added fun (bug #417795 again) + tc-is-clang && append-flags -Qunused-arguments + + # We really, really need to build OpenSSL w/ strict aliasing disabled. + # It's filled with violations and it *will* result in miscompiled + # code. This has been in the ebuild for > 10 years but even in 2022, + # it's still relevant: + # - https://github.com/llvm/llvm-project/issues/55255 + # - https://github.com/openssl/openssl/issues/18225 + # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 + # Don't remove the no strict aliasing bits below! + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing + + append-cppflags -DOPENSSL_NO_BUF_FREELISTS + + append-flags $(test-flags-CC -Wa,--noexecstack) + + # Prefixify Configure shebang (bug #141906) + sed \ + -e "1s,/usr/bin/env,${BROOT}&," \ + -i Configure || die + + # Remove test target when FEATURES=test isn't set + if ! use test ; then + sed \ + -e '/^$config{dirs}/s@ "test",@@' \ + -i Configure || die + fi + + if use prefix && [[ ${CHOST} == *-solaris* ]] ; then + # use GNU ld full option, not to confuse it on Solaris + sed -i \ + -e 's/-Wl,-M,/-Wl,--version-script=/' \ + -e 's/-Wl,-h,/-Wl,--soname=/' \ + Configurations/10-main.conf || die + + # fix building on Solaris 10 + # https://github.com/openssl/openssl/issues/6333 + sed -i \ + -e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \ + Configurations/10-main.conf || die + fi + + # The config script does stupid stuff to prompt the user. Kill it. + sed -i '/stty -icanon min 0 time 50; read waste/d' config || die + ./config --test-sanity || die "I AM NOT SANE" + + multilib_copy_sources +} + +multilib_src_configure() { + # bug #197996 + unset APPS + # bug #312551 + unset SCRIPTS + # bug #311473 + unset CROSS_COMPILE + + tc-export AR CC CXX RANLIB RC + + use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + # See if our toolchain supports __uint128_t. If so, it's 64bit + # friendly and can use the nicely optimized code paths, bug #460790. + #local ec_nistp_64_gcc_128 + # + # Disable it for now though (bug #469976) + # Do NOT re-enable without substantial discussion first! + # + #echo "__uint128_t i;" > "${T}"/128.c + #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" + #fi + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + # "disable-deprecated" option breaks too many consumers. + # Don't set it without thorough revdeps testing. + # Make sure user flags don't get added *yet* to avoid duplicated + # flags. + local myeconfargs=( + ${sslout} + + $(use cpu_flags_x86_sse2 || echo "no-sse2") + enable-camellia + enable-ec + enable-ec2m + enable-sm2 + enable-srp + $(use elibc_musl && echo "no-async") + ${ec_nistp_64_gcc_128} + enable-idea + enable-mdc2 + enable-rc5 + $(use_ssl sslv3 ssl3) + $(use_ssl sslv3 ssl3-method) + $(use_ssl asm) + $(use_ssl rfc3779) + $(use_ssl sctp) + $(use test || echo "no-tests") + $(use_ssl tls-compression zlib) + $(use_ssl tls-heartbeat heartbeats) + $(use_ssl weak-ssl-ciphers) + + --prefix="${EPREFIX}"/usr + --openssldir="${EPREFIX}"${SSL_CNF_DIR} + --libdir=$(get_libdir) + + shared + threads + ) + + CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}" + + # Clean out hardcoded flags that openssl uses + local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ + -e 's:^CFLAGS=::' \ + -e 's:\(^\| \)-fomit-frame-pointer::g' \ + -e 's:\(^\| \)-O[^ ]*::g' \ + -e 's:\(^\| \)-march=[^ ]*::g' \ + -e 's:\(^\| \)-mcpu=[^ ]*::g' \ + -e 's:\(^\| \)-m[^ ]*::g' \ + -e 's:^ *::' \ + -e 's: *$::' \ + -e 's: \+: :g' \ + -e 's:\\:\\\\:g' + ) + + # Now insert clean default flags with user flags + sed -i \ + -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + Makefile || die +} + +multilib_src_compile() { + # depend is needed to use $confopts; it also doesn't matter + # that it's -j1 as the code itself serializes subdirs + emake -j1 depend + + emake all +} + +multilib_src_test() { + emake -j1 test +} + +multilib_src_install() { + # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130) + dodir /usr + + emake DESTDIR="${D}" install + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + fi +} + +multilib_src_install_all() { + # openssl installs perl version of c_rehash by default, but + # we provide a shell version via app-misc/c_rehash + rm "${ED}"/usr/bin/c_rehash || die + + dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el + + # Create the certs directory + keepdir ${SSL_CNF_DIR}/certs + + # Namespace openssl programs to prevent conflicts with other man pages + cd "${ED}"/usr/share/man || die + local m d s + for m in $(find . -type f | xargs grep -L '#include') ; do + d=${m%/*} + d=${d#./} + m=${m##*/} + + [[ ${m} == openssl.1* ]] && continue + + [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" + + mv ${d}/{,ssl-}${m} || die + + # Fix up references to renamed man pages + sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die + ln -s ssl-${m} ${d}/openssl-${m} + + # Locate any symlinks that point to this man page + # We assume that any broken links are due to the above renaming + for s in $(find -L ${d} -type l) ; do + s=${s##*/} + + rm -f ${d}/${s} + + # We don't want to "|| die" here + ln -s ssl-${m} ${d}/ssl-${s} + ln -s ssl-${s} ${d}/openssl-${s} + done + done + [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" + + # bug #254521 + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private +} + +pkg_postinst() { + ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)" + c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null + eend $? +} diff --git a/dev-libs/openssl/openssl-3.0.6.ebuild b/dev-libs/openssl/openssl-3.0.6.ebuild new file mode 100644 index 000000000000..5e1d61247902 --- /dev/null +++ b/dev-libs/openssl/openssl-3.0.6.ebuild @@ -0,0 +1,334 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc +inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig + +DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" +HOMEPAGE="https://www.openssl.org/" + +MY_P=${P/_/-} + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/openssl/openssl.git" + + inherit git-r3 +else + SRC_URI="mirror://openssl/source/${MY_P}.tar.gz + verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0/3" # .so version of libssl/libcrypto +IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=app-misc/c_rehash-1.7-r1 + tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) +" +BDEPEND=" + >=dev-lang/perl-5 + sctp? ( >=net-misc/lksctp-tools-1.0.12 ) + test? ( + sys-apps/diffutils + sys-devel/bc + sys-process/procps + ) + verify-sig? ( sec-keys/openpgp-keys-openssl )" + +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +PDEPEND="app-misc/ca-certificates" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/openssl/configuration.h +) + +pkg_setup() { + if use ktls ; then + if kernel_is -lt 4 18 ; then + ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" + else + CONFIG_CHECK="~TLS ~TLS_DEVICE" + ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" + ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" + + linux-info_pkg_setup + fi + fi + + [[ ${MERGE_TYPE} == binary ]] && return + + # must check in pkg_setup; sysctl doesn't work with userpriv! + if use test && use sctp ; then + # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" + # if sctp.auth_enable is not enabled. + local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) + if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then + die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" + fi + fi +} + +src_unpack() { + # Can delete this once test fix patch is dropped + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_prepare() { + # Allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die + chmod a+rx gentoo.config || die + + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" + + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script in src_configure + rm -f Makefile + + if ! use vanilla ; then + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) + fi + + default + + if use test && use sctp && has network-sandbox ${FEATURES} ; then + einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." + rm test/recipes/80-test_ssl_new.t || die + fi + + # - Make sure the man pages are suffixed (bug #302165) + # - Don't bother building man pages if they're disabled + # - Make DOCDIR Gentoo compliant + sed -i \ + -e '/^MANSUFFIX/s:=.*:=ssl:' \ + -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ + -e $(has noman FEATURES \ + && echo '/^install:/s:install_docs::' \ + || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ + -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ + Configurations/unix-Makefile.tmpl \ + || die + + # Quiet out unknown driver argument warnings since openssl + # doesn't have well-split CFLAGS and we're making it even worse + # and 'make depend' uses -Werror for added fun (bug #417795 again) + tc-is-clang && append-flags -Qunused-arguments + + # We really, really need to build OpenSSL w/ strict aliasing disabled. + # It's filled with violations and it *will* result in miscompiled + # code. This has been in the ebuild for > 10 years but even in 2022, + # it's still relevant: + # - https://github.com/llvm/llvm-project/issues/55255 + # - https://github.com/openssl/openssl/issues/18225 + # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 + # Don't remove the no strict aliasing bits below! + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing + + append-flags $(test-flags-CC -Wa,--noexecstack) + + # Prefixify Configure shebang (bug #141906) + sed \ + -e "1s,/usr/bin/env,${BROOT}&," \ + -i Configure || die + + # Remove test target when FEATURES=test isn't set + if ! use test ; then + sed \ + -e '/^$config{dirs}/s@ "test",@@' \ + -i Configure || die + fi + + # The config script does stupid stuff to prompt the user. Kill it. + sed -i '/stty -icanon min 0 time 50; read waste/d' config || die + ./config --test-sanity || die "I AM NOT SANE" + + multilib_copy_sources +} + +multilib_src_configure() { + # bug #197996 + unset APPS + # bug #312551 + unset SCRIPTS + # bug #311473 + unset CROSS_COMPILE + + tc-export AR CC CXX RANLIB RC + + use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + # See if our toolchain supports __uint128_t. If so, it's 64bit + # friendly and can use the nicely optimized code paths, bug #460790. + #local ec_nistp_64_gcc_128 + # + # Disable it for now though (bug #469976) + # Do NOT re-enable without substantial discussion first! + # + #echo "__uint128_t i;" > "${T}"/128.c + #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" + #fi + + local sslout=$(./gentoo.config) + einfo "Using configuration: ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features + local myeconfargs=( + ${sslout} + + $(use cpu_flags_x86_sse2 || echo "no-sse2") + enable-camellia + enable-ec + enable-ec2m + enable-sm2 + enable-srp + $(use elibc_musl && echo "no-async") + enable-idea + enable-mdc2 + enable-rc5 + $(use fips && echo "enable-fips") + $(use_ssl asm) + $(use_ssl ktls) + $(use_ssl rfc3779) + $(use_ssl sctp) + $(use test || echo "no-tests") + $(use_ssl tls-compression zlib) + $(use_ssl weak-ssl-ciphers) + + --prefix="${EPREFIX}"/usr + --openssldir="${EPREFIX}"${SSL_CNF_DIR} + --libdir=$(get_libdir) + + shared + threads + ) + + CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}" + + # Clean out hardcoded flags that openssl uses + local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ + -e 's:^CFLAGS=::' \ + -e 's:\(^\| \)-fomit-frame-pointer::g' \ + -e 's:\(^\| \)-O[^ ]*::g' \ + -e 's:\(^\| \)-march=[^ ]*::g' \ + -e 's:\(^\| \)-mcpu=[^ ]*::g' \ + -e 's:\(^\| \)-m[^ ]*::g' \ + -e 's:^ *::' \ + -e 's: *$::' \ + -e 's: \+: :g' \ + -e 's:\\:\\\\:g' + ) + + # Now insert clean default flags with user flags + sed -i \ + -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + Makefile \ + || die +} + +multilib_src_compile() { + # depend is needed to use $confopts; it also doesn't matter + # that it's -j1 as the code itself serializes subdirs + emake -j1 depend + + emake all +} + +multilib_src_test() { + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. + emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test +} + +multilib_src_install() { + # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130) + dodir /usr + + emake DESTDIR="${D}" install + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + if ! use static-libs ; then + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + fi +} + +multilib_src_install_all() { + # openssl installs perl version of c_rehash by default, but + # we provide a shell version via app-misc/c_rehash + rm "${ED}"/usr/bin/c_rehash || die + + dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el + + # Create the certs directory + keepdir ${SSL_CNF_DIR}/certs + + # Namespace openssl programs to prevent conflicts with other man pages + cd "${ED}"/usr/share/man || die + local m d s + for m in $(find . -type f | xargs grep -L '#include') ; do + d=${m%/*} + d=${d#./} + m=${m##*/} + + [[ ${m} == openssl.1* ]] && continue + + [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" + + mv ${d}/{,ssl-}${m} || die + + # Fix up references to renamed man pages + sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die + ln -s ssl-${m} ${d}/openssl-${m} || die + + # Locate any symlinks that point to this man page + # We assume that any broken links are due to the above renaming + for s in $(find -L ${d} -type l) ; do + s=${s##*/} + + rm -f ${d}/${s} + + # We don't want to "|| die" here + ln -s ssl-${m} ${d}/ssl-${s} + ln -s ssl-${s} ${d}/openssl-${s} + done + done + [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" + + # bug #254521 + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private +} + +pkg_postinst() { + ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)" + c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null + eend $? +} diff --git a/dev-libs/trio/Manifest b/dev-libs/trio/Manifest index 1a1a6459e308..061d1dc80ee8 100644 --- a/dev-libs/trio/Manifest +++ b/dev-libs/trio/Manifest @@ -1,3 +1,3 @@ DIST trio-1.17.tar.gz 452237 BLAKE2B 77ff673cc103b07b1424720d28c49d2e33a1402a98d8d21124fabb0cafd3498a99976d808cbbc5a90e1b3a063c6af68c3daf94768d533e4a762b730a253fa012 SHA512 19f4732b32c6a3754677d5766399fa70083c6a78c0d04b1dfa10a578b21405ba3e3d3af6543e4811f5fd305ec2727781a1b0f2888e59c574ca735f8406da7954 -EBUILD trio-1.17.ebuild 544 BLAKE2B da4a36e2ac24aa7e116bddd1401f19e87b682f2c44d95cd4bd4d7fa819c4d37f1a557a089619e1a57961c545567e51730d77b7554f0d1c23cc36e2bfe0e22b62 SHA512 2a995659a8da3cea24dfc4830c40b74488a5583bd7a38d0ec70d6133a6ee7df6dbf45212b5f96b621cc737a4042456ef62047878813f7ad4f799b52108ec53f2 +EBUILD trio-1.17.ebuild 657 BLAKE2B f3c4111ed3ce9b7e6060b1899b532375838a86a3da3de500e24d36eab29fe3b493bda944ee2ddc4b61463ea60fedffa55c747e118f53ac1f03f1b6b1a142cda7 SHA512 dbbafe87c14f5d82f62eac77be8679e1f6040df5be59c60a048c3df80a6e9460997a0969c48cdacb02627e2ae597ec56fa748e647ac59998bb7abe6e6c953713 MISC metadata.xml 329 BLAKE2B 5863c898baa0c23c810edcdc6ae637b0a391579d1fee8db773c899bb936e36c76fb847e2d6de1410d9b6b286154459fb7d515f0a7f270c16a762274f4c19457f SHA512 5ee6ecb624bca2b159b5a6ebd0605d5ccef265c21f37e5f440317032a4144851b0b2eeaabf5fa89f710b9b18b85ad6812827cf9d32f4cfefc4d44e6592c98de2 diff --git a/dev-libs/trio/trio-1.17.ebuild b/dev-libs/trio/trio-1.17.ebuild index a12bd3608b4d..c0cd72148b66 100644 --- a/dev-libs/trio/trio-1.17.ebuild +++ b/dev-libs/trio/trio-1.17.ebuild @@ -6,7 +6,7 @@ EAPI=8 DOCS_BUILDER="doxygen" DOCS_DIR="doc" -inherit docs +inherit autotools docs DESCRIPTION="Portable string functions, focus on the *printf() and *scanf() clones" HOMEPAGE="https://daniel.haxx.se/projects/trio/" @@ -16,6 +16,12 @@ LICENSE="trio" SLOT="0" KEYWORDS="~amd64 ~x86" +src_prepare() { + default + # Required to fix -Werror=strict-prototypes configure errors + eautoreconf +} + src_compile() { default docs_compile -- cgit v1.2.3