From 7c75ccf32dcaeb3880660c3b7a3324f46186e5de Mon Sep 17 00:00:00 2001 From: John Date: Tue, 7 Apr 2020 23:18:09 +0200 Subject: [PATCH] libressl: remove package --- common/shlibs | 2 - srcpkgs/libcrypto46 | 1 - srcpkgs/libressl-devel | 1 - .../fail-instead-of-trying-fallback.patch | 21 ---- srcpkgs/libressl/template | 109 ------------------ srcpkgs/libressl/update | 1 - srcpkgs/libssl48 | 1 - srcpkgs/libtls20 | 1 - 8 files changed, 137 deletions(-) delete mode 120000 srcpkgs/libcrypto46 delete mode 120000 srcpkgs/libressl-devel delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch delete mode 100644 srcpkgs/libressl/template delete mode 100644 srcpkgs/libressl/update delete mode 120000 srcpkgs/libssl48 delete mode 120000 srcpkgs/libtls20 diff --git a/common/shlibs b/common/shlibs index 25cdcdfbe97..75c5ee1c2cd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3447,9 +3447,7 @@ libmanette-0.2.so.0 libmanette-0.2.1_1 libfmt.so.7 fmt-7.0.3_1 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1 libolm.so.3 olm-3.0.0_1 -libcrypto.so.46 libcrypto46-3.1.1_1 libtls.so.20 libtls-3.2.4_1 -libssl.so.48 libssl48-3.1.1_1 libxmlb.so.2 libxmlb-0.2.1_1 libvoikko.so.1 libvoikko-4.2_1 libfstrcmp.so.0 libfstrcmp-0.7.D001_1 diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46 deleted file mode 120000 index cab5b6fcb51..00000000000 --- a/srcpkgs/libcrypto46 +++ /dev/null @@ -1 +0,0 @@ -libressl \ No newline at end of file diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel deleted file mode 120000 index cab5b6fcb51..00000000000 --- a/srcpkgs/libressl-devel +++ /dev/null @@ -1 +0,0 @@ -libressl \ No newline at end of file diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch deleted file mode 100644 index 9df423ed7a2..00000000000 --- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch +++ /dev/null @@ -1,21 +0,0 @@ - so, current flow for getentropy is - 1) use SYS_getrandom if it exists (true on glibc and musl) - 2) use /dev/urandom - 3) use sysctl (glibc only) - 4) use terrible fallback - and with a one-line patch it can instead kill itself after 3 - so that should only affect processes running without /dev/urandom on old kernels - probably no harm else - +1 - ---- crypto/compat/getentropy_linux.c.orig -+++ crypto/compat/getentropy_linux.c -@@ -162,7 +162,7 @@ - * sysctl ABI, or consider providing a new failsafe API which - * works in a chroot or when file descriptors are exhausted. - */ --#undef FAIL_INSTEAD_OF_TRYING_FALLBACK -+#define FAIL_INSTEAD_OF_TRYING_FALLBACK - #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK - raise(SIGKILL); - #endif diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template deleted file mode 100644 index 731168709b8..00000000000 --- a/srcpkgs/libressl/template +++ /dev/null @@ -1,109 +0,0 @@ -# Template file for 'libressl' -pkgname=libressl -version=3.1.5 -revision=3 -bootstrap=yes -build_style=gnu-configure -configure_args="$(vopt_enable asm)" -short_desc="Version of the TLS/crypto stack forked from OpenSSL" -maintainer="Juan RP " -license="OpenSSL, ISC" -#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog" -homepage="http://www.libressl.org/" -distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" -checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494 -provides="openssl-${version}_${revision}" -replaces="openssl>=0" -conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf" -_lssl_asm_ver="1.1.0" - -build_options="asm" -desc_option_asm="Use platform assembly for faster crypto" - -if [ "$build_option_asm" ]; then - distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz" - checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789" -fi - -# only enable asm for full chroots by default -# otherwise we'd be introducing an autotools dependency on the host -if [ "$CHROOT_READY" ]; then - build_options_default="asm" -fi - -case "$XBPS_TARGET_MACHINE" in - # disable ssp - i686-musl) configure_args+=" --disable-hardening";; - # on armv5 always disable asm as it's not supported - armv5*) configure_args+=" --disable-asm";; -esac - -if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then - _regen_build=yes -fi - -if [ -n "$_regen_build" ]; then - hostmakedepends=" automake libtool" -fi - -post_extract() { - [ -z "$build_option_asm" ] && return 0 - mv ../libressl-portable-asm-${_lssl_asm_ver} . -} - -pre_configure() { - [ -z "$_regen_build" ] && return 0 - if [ "$build_option_asm" ]; then - ./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh . - fi - autoreconf -if -} - -post_install() { - # Use CA file from ca-certificates instead. - rm -f ${DESTDIR}/etc/ssl/cert.pem - ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem - - vlicense COPYING - if [ "$build_option_asm" ]; then - vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams - vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl - fi - find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete -} - -libcrypto46_package() { - short_desc+=" - crypto library" - pkg_install() { - vmove usr/lib/libcrypto.so.* - } -} - -libssl48_package() { - short_desc+=" - SSL/TLS library" - pkg_install() { - vmove usr/lib/libssl.so.* - } -} - -libtls20_package() { - short_desc+=" - new TLS library" - pkg_install() { - vmove usr/lib/libtls.so.* - } -} - -libressl-devel_package() { - short_desc+=" - development files" - depends="libressl-${version}_${revision} - libcrypto46-${version}_${revision} - libssl48-${version}_${revision} - libtls20-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - vmove usr/share/man/man3 - } -} diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update deleted file mode 100644 index a5d5038a832..00000000000 --- a/srcpkgs/libressl/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.0 *.1" diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48 deleted file mode 120000 index cab5b6fcb51..00000000000 --- a/srcpkgs/libssl48 +++ /dev/null @@ -1 +0,0 @@ -libressl \ No newline at end of file diff --git a/srcpkgs/libtls20 b/srcpkgs/libtls20 deleted file mode 120000 index cab5b6fcb51..00000000000 --- a/srcpkgs/libtls20 +++ /dev/null @@ -1 +0,0 @@ -libressl \ No newline at end of file