From 4c3f308ca4e2b0a432ad7297536ebe38e274e78b Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Sat, 12 Jan 2019 02:02:23 +0000 Subject: [PATCH 1/5] New package: openssl-1.1.1f --- common/shlibs | 2 ++ srcpkgs/libcrypto1.1 | 1 + srcpkgs/libssl1.1 | 1 + srcpkgs/openssl-devel | 1 + srcpkgs/openssl/template | 72 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+) create mode 120000 srcpkgs/libcrypto1.1 create mode 120000 srcpkgs/libssl1.1 create mode 120000 srcpkgs/openssl-devel create mode 100644 srcpkgs/openssl/template diff --git a/common/shlibs b/common/shlibs index 08ddbc903bd..76f8b70e8b8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1739,6 +1739,8 @@ libjq.so.1 jq-devel-1.4_1 libcrypto.so.43 libcrypto43-2.7.2_1 libssl.so.45 libssl45-2.7.2_1 libtls.so.17 libtls17-2.7.2_1 +libcrypto.so.1.1 libcrypto1.1-1.1.1f_1 +libssl.so.1.1 libssl1.1-1.1.1f_1 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6 libportmidi.so portmidi-217_1 libWildMidi.so.2 libwildmidi-0.4.3_1 diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1 new file mode 120000 index 00000000000..fc538edfef4 --- /dev/null +++ b/srcpkgs/libcrypto1.1 @@ -0,0 +1 @@ +openssl \ No newline at end of file diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1 new file mode 120000 index 00000000000..fc538edfef4 --- /dev/null +++ b/srcpkgs/libssl1.1 @@ -0,0 +1 @@ +openssl \ No newline at end of file diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel new file mode 120000 index 00000000000..fc538edfef4 --- /dev/null +++ b/srcpkgs/openssl-devel @@ -0,0 +1 @@ +openssl \ No newline at end of file diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template new file mode 100644 index 00000000000..fcf8c82a9ea --- /dev/null +++ b/srcpkgs/openssl/template @@ -0,0 +1,72 @@ +# Template file for 'openssl' +pkgname=openssl +version=1.1.1f +revision=1 +build_style=configure +configure_script="./Configure" +configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib shared + no-async no-comp no-idea no-mdc2 no-rc5 no-ec2m no-sm2 no-sm4 no-ssl2 + no-ssl3 no-seed no-weak-ssl-ciphers -Wa,--noexecstack" +make_cmd=make +make_build_args='MAKEDEPPROG="$(CC)' +make_check_target=test +hostmakedepends="perl" +short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security" +maintainer="John " +license="OpenSSL-License" +homepage="https://www.openssl.org" +distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz" +checksum=186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 +provides="libressl-3.3_${revision}" +replaces="libressl>=0" + +case $XBPS_TARGET_MACHINE in + x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";; + i686*) configure_args+=" linux-elf";; + aarch64*) configure_args+=" linux-aarch64";; + ppc64le*) configure_args+=" linux-ppc64le";; + ppc64*) configure_args+=" linux-ppc64 no-asm";; + ppc*) configure_args+=" linux-ppc";; + arm*) configure_args+=" linux-armv4";; + mips*) configure_args+=" linux-mips32 -mips32";; + *) broken="$XBPS_TARGET_MACHINE";; +esac + +pre_configure() { + configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" +} + +pre_build() { + make ${makejobs} depend +} + +libcrypto1.1_package() { + short_desc+=" - crypto library" + pkg_install() { + vmove "usr/lib/libcrypto.so.*" + vmove usr/lib/engines-1.1 + } +} + +libssl1.1_package() { + short_desc+=" - SSL/TLS library" + pkg_install() { + vmove "usr/lib/libssl.so.*" + } +} + + +openssl-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + provides="libressl-devel-${version}_${revision}" + replaces="libressl>=0" + short_desc+=" - development files" + pkg_install() { + vmove usr/share/man/man3 + vmove usr/share/doc + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 0e440f98e491c0571b72247d03b766fd20ac92ce Mon Sep 17 00:00:00 2001 From: John Date: Tue, 7 Apr 2020 23:18:09 +0200 Subject: [PATCH 2/5] libressl: don't provide OpenSSL anymore --- srcpkgs/libressl/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index 4790d556987..b74c969b405 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,9 +1,10 @@ # Template file for 'libressl' pkgname=libressl version=3.0.2 -revision=2 +revision=3 bootstrap=yes build_style=gnu-configure +configure_args="--program-prefix=libressl-" short_desc="Version of the TLS/crypto stack forked from OpenSSL" maintainer="Juan RP " license="OpenSSL-License, SSLeay-License, ISC" @@ -11,8 +12,6 @@ license="OpenSSL-License, SSLeay-License, ISC" homepage="http://www.libressl.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" checksum=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e -provides="openssl-${version}_${revision}" -replaces="openssl>=0" conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf" if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then From 0852e000d39d27f041b10f9fb8ba6b8559c2f600 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 9 Apr 2020 22:04:35 +0200 Subject: [PATCH 3/5] ca-certificates: rebuild for openssl --- srcpkgs/ca-certificates/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index 4be2b4f929b..aa2083fcfa7 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -1,12 +1,12 @@ # Template file for 'ca-certificates' pkgname=ca-certificates version=20190110 -revision=1 +revision=2 bootstrap=yes archs=noarch conf_files="/etc/ca-certificates.conf" -hostmakedepends="libressl" -depends="libressl>=2.2.4_2 run-parts" +hostmakedepends="openssl" +depends="openssl<2.0.0_1 run-parts" short_desc="Common CA certificates for SSL/TLS" maintainer="Orphaned " license="GPL-2.0-or-later, MPL-2.0" @@ -37,7 +37,6 @@ do_install() { ${DESTDIR}/usr/share/man/man8/update-ca-certificates.8 cd ${DESTDIR}/usr/share/ca-certificates find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf - sed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem } From 28a8395a40a6bea0bfd0ca24d24feaa152e8456e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 16 Apr 2020 15:32:25 +0200 Subject: [PATCH 4/5] xbps: rebuild against OpenSSL --- srcpkgs/xbps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index ef7d1daf047..9ce29cf39f2 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.59.1 -revision=1 +revision=2 bootstrap=yes build_style=configure short_desc="XBPS package system utilities" @@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a hostmakedepends="pkgconf" checkdepends="kyua" -makedepends="zlib-devel libressl-devel libarchive-devel" +makedepends="zlib-devel openssl-devel libarchive-devel" depends="ca-certificates xbps-triggers" make_dirs="/etc/xbps.d 0755 root root" From 831cf8f391a3e6c56c980ac87dddae4ba1bd14ae Mon Sep 17 00:00:00 2001 From: John Date: Thu, 16 Apr 2020 15:32:39 +0200 Subject: [PATCH 5/5] libarchive: rebuild against OpenSSL --- srcpkgs/libarchive/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 4a7fb0febd6..1f2ad8c1ab7 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=3.4.2 -revision=1 +revision=2 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) @@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) hostmakedepends="pkgconf" makedepends="zlib-devel bzip2-devel liblzma-devel $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel) - $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)" + $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)" short_desc="Library to read/write several different streaming archive formats" maintainer="Juan RP " license="BSD-2-Clause"