diff --git a/common/shlibs b/common/shlibs index 85c60d27074..093e8c12204 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1705,10 +1705,13 @@ 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 +libcrypto.so.35 libcrypto35-2.2.2_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 +libssl.so.35 libssl35-2.2.2_1 +libtls.so.6 libtls6-2.2.2_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 diff --git a/srcpkgs/libcrypto34 b/srcpkgs/libcrypto35 similarity index 100% rename from srcpkgs/libcrypto34 rename to srcpkgs/libcrypto35 diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index 8d74b70e4d1..cfa1e2bf8f4 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,6 +1,6 @@ # Template file for 'libressl' pkgname=libressl -version=2.2.1 +version=2.2.2 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=4f331750abfc3b605b02eeca1e8994fa0d2629985bc3f62924378197fbfe572d +checksum=e094b09f33d468545edbb2b16dc178f958ec2f66de1a2fc7cc2a20bd2489a114 # Compat pkg that depends on the real pkgs. -depends="libcrypto34-${version}_${revision} libssl33-${version}_${revision} libtls4-${version}_${revision}" +depends="libcrypto35-${version}_${revision} libssl35-${version}_${revision} libtls6-${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 } -libcrypto34_package() { +libcrypto35_package() { short_desc+=" - crypto library" pkg_install() { vmove usr/lib/libcrypto.so.* } } -libssl33_package() { +libssl35_package() { short_desc+=" - SSL/TLS library" pkg_install() { vmove usr/lib/libssl.so.* } } -libtls4_package() { +libtls6_package() { short_desc+=" - new TLS library" pkg_install() { vmove usr/lib/libtls.so.* @@ -67,9 +67,9 @@ libressl-openssl_package() { short_desc+=" - utilities" provides="openssl-${version}_${revision}" replaces="openssl>=0" - conf_files="/etc/ssl/openssl.cnf" + conf_files="/etc/ssl/openssl.cnf /etc/ssl/cert.pem /etc/ssl/x509v3.cnf" pkg_install() { - vinstall ${FILESDIR}/openssl.cnf 644 etc/ssl + vmove etc vmove usr/bin vmove usr/share/man/man1 } diff --git a/srcpkgs/libssl33 b/srcpkgs/libssl35 similarity index 100% rename from srcpkgs/libssl33 rename to srcpkgs/libssl35 diff --git a/srcpkgs/libtls4 b/srcpkgs/libtls6 similarity index 100% rename from srcpkgs/libtls4 rename to srcpkgs/libtls6