From d70dcf974d8e6a1ecb53e8f2627f4c0cb4ae3cef Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 9 Jul 2015 11:20:44 +0200 Subject: [PATCH] libressl: update to 2.2.1 (soname bumps). Due to new subpkgs, we can still perform a progressive update. --- common/shlibs | 3 +++ srcpkgs/{libcrypto32 => libcrypto34} | 0 srcpkgs/libressl/template | 12 ++++++------ srcpkgs/{libssl32 => libssl33} | 0 srcpkgs/{libtls3 => libtls4} | 0 5 files changed, 9 insertions(+), 6 deletions(-) rename srcpkgs/{libcrypto32 => libcrypto34} (100%) rename srcpkgs/{libssl32 => libssl33} (100%) rename srcpkgs/{libtls3 => libtls4} (100%) diff --git a/common/shlibs b/common/shlibs index 4e5e656270..2abd2e43c2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1693,9 +1693,12 @@ libgirara-gtk3.so.2 girara-0.2.4_1 libjq.so.1 jq-devel-1.4_1 libcrypto.so.30 libcrypto30-2.1.2_3 libcrypto.so.32 libcrypto32-2.1.4_1 +libcrypto.so.34 libcrypto34-2.2.1_1 libssl.so.29 libssl29-2.1.2_3 libssl.so.30 libssl30-2.1.3_1 libssl.so.32 libssl32-2.1.4_1 +libssl.so.33 libssl33-2.2.1_1 +libtls.so.4 libtls4-2.2.1_1 libtls.so.3 libtls3-2.1.4_1 libtls.so.1 libtls1-2.1.2_3 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6 diff --git a/srcpkgs/libcrypto32 b/srcpkgs/libcrypto34 similarity index 100% rename from srcpkgs/libcrypto32 rename to srcpkgs/libcrypto34 diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index c8abc4966c..8d74b70e4d 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,6 +1,6 @@ # Template file for 'libressl' pkgname=libressl -version=2.1.7 +version=2.2.1 revision=1 bootstrap=yes build_style=gnu-configure @@ -9,10 +9,10 @@ maintainer="Juan RP " license="OpenSSL-License, SSLeay-License, ISC" homepage="http://www.libressl.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" -checksum=1dc4bfc03fbe14732704291d6d9cb7a3cc70575957c958a7e2d686908e9cdb8f +checksum=4f331750abfc3b605b02eeca1e8994fa0d2629985bc3f62924378197fbfe572d # Compat pkg that depends on the real pkgs. -depends="libcrypto32-${version}_${revision} libssl32-${version}_${revision} libtls3-${version}_${revision}" +depends="libcrypto34-${version}_${revision} libssl33-${version}_${revision} libtls4-${version}_${revision}" if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then # XXX disable SSP @@ -33,19 +33,19 @@ post_install() { find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete } -libcrypto32_package() { +libcrypto34_package() { short_desc+=" - crypto library" pkg_install() { vmove usr/lib/libcrypto.so.* } } -libssl32_package() { +libssl33_package() { short_desc+=" - SSL/TLS library" pkg_install() { vmove usr/lib/libssl.so.* } } -libtls3_package() { +libtls4_package() { short_desc+=" - new TLS library" pkg_install() { vmove usr/lib/libtls.so.* diff --git a/srcpkgs/libssl32 b/srcpkgs/libssl33 similarity index 100% rename from srcpkgs/libssl32 rename to srcpkgs/libssl33 diff --git a/srcpkgs/libtls3 b/srcpkgs/libtls4 similarity index 100% rename from srcpkgs/libtls3 rename to srcpkgs/libtls4