From 20d23bbc9b4dd03f7f6387dbece18a25a83204eb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:10:04 +0100 Subject: [PATCH 01/11] libressl: update to 2.6.4. --- common/shlibs | 3 +++ srcpkgs/{libcrypto41 => libcrypto42} | 0 srcpkgs/libressl/template | 12 ++++++------ srcpkgs/{libssl43 => libssl44} | 0 srcpkgs/{libtls15 => libtls16} | 0 5 files changed, 9 insertions(+), 6 deletions(-) rename srcpkgs/{libcrypto41 => libcrypto42} (100%) rename srcpkgs/{libssl43 => libssl44} (100%) rename srcpkgs/{libtls15 => libtls16} (100%) diff --git a/common/shlibs b/common/shlibs index 56db6c8aad4..02282ebc311 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1697,12 +1697,15 @@ libjq.so.1 jq-devel-1.4_1 libcrypto.so.37 libcrypto37-2.3.3_1 libcrypto.so.38 libcrypto38-2.4.2_1 libcrypto.so.41 libcrypto41-2.5.3_1 +libcrypto.so.42 libcrypto42-2.6.4_1 libssl.so.38 libssl38-2.3.3_1 libssl.so.39 libssl39-2.4.2_1 libssl.so.43 libssl43-2.5.3_1 +libssl.so.44 libssl44-2.6.4_1 libtls.so.10 libtls10-2.3.3_1 libtls.so.11 libtls11-2.4.2_1 libtls.so.15 libtls15-2.5.3_1 +libtls.so.16 libtls16-2.6.4_1 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6 libportmidi.so portmidi-217_1 libsox.so.3 sox-14.4.2_1 diff --git a/srcpkgs/libcrypto41 b/srcpkgs/libcrypto42 similarity index 100% rename from srcpkgs/libcrypto41 rename to srcpkgs/libcrypto42 diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index 71cc1970ef1..f98db815da4 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,6 +1,6 @@ # Template file for 'libressl' pkgname=libressl -version=2.5.5 +version=2.6.4 revision=1 bootstrap=yes build_style=gnu-configure @@ -9,7 +9,7 @@ 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=e57f5e3d5842a81fe9351b6e817fcaf0a749ca4ef35a91465edba9e071dce7c4 +checksum=638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f provides="openssl-${version}_${revision}" replaces="openssl>=0" @@ -38,21 +38,21 @@ post_install() { find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete } -libcrypto41_package() { +libcrypto42_package() { short_desc+=" - crypto library" pkg_install() { vmove usr/lib/libcrypto.so.* } } -libssl43_package() { +libssl44_package() { short_desc+=" - SSL/TLS library" pkg_install() { vmove usr/lib/libssl.so.* } } -libtls15_package() { +libtls16_package() { short_desc+=" - new TLS library" pkg_install() { vmove usr/lib/libtls.so.* @@ -61,7 +61,7 @@ libtls15_package() { libressl-devel_package() { short_desc+=" - development files" - depends="libcrypto41-${version}_${revision} libssl43-${version}_${revision} libtls15-${version}_${revision}" + depends="libcrypto42-${version}_${revision} libssl44-${version}_${revision} libtls16-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/*.a diff --git a/srcpkgs/libssl43 b/srcpkgs/libssl44 similarity index 100% rename from srcpkgs/libssl43 rename to srcpkgs/libssl44 diff --git a/srcpkgs/libtls15 b/srcpkgs/libtls16 similarity index 100% rename from srcpkgs/libtls15 rename to srcpkgs/libtls16 From 503b0b7fb449ee6e58cc37a0813beefe5293b071 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:10:43 +0100 Subject: [PATCH 02/11] acme-client: rebuild for libressl-2.6.4. --- srcpkgs/acme-client/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template index 7583581d4ad..e2b9bed4b91 100644 --- a/srcpkgs/acme-client/template +++ b/srcpkgs/acme-client/template @@ -1,7 +1,7 @@ # Template file for 'acme-client' pkgname=acme-client version=0.1.11 -revision=3 +revision=4 _distver=VERSION_${version//./_} wrksrc=acme-client-portable-${_distver} build_style=gnu-makefile From 64b2154d6f75255d102bc0624211719f925e043b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:14:10 +0100 Subject: [PATCH 03/11] aircrack-ng: rebuild for libressl-2.6.4. --- srcpkgs/aircrack-ng/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template index 461aa202321..b839549cad7 100644 --- a/srcpkgs/aircrack-ng/template +++ b/srcpkgs/aircrack-ng/template @@ -3,7 +3,7 @@ pkgname=aircrack-ng _aircrack_ver=1.2 _aircrack_rc=rc4 version="${_aircrack_ver}${_aircrack_rc}" -revision=5 +revision=6 wrksrc="${pkgname}-${_aircrack_ver}-${_aircrack_rc}" hostmakedepends="pkg-config" makedepends="zlib-devel libressl-devel sqlite-devel libnl3-devel" From 57e263e47e42e24808fcc454c86bbd5d4eabcd28 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:16:36 +0100 Subject: [PATCH 04/11] alpine: rebuild for libressl-2.6.4. --- srcpkgs/alpine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index 178803125d7..1e914edea12 100644 --- a/srcpkgs/alpine/template +++ b/srcpkgs/alpine/template @@ -1,7 +1,7 @@ # Template file for 'alpine' pkgname=alpine version=2.21.99 -revision=1 +revision=2 _githash=04737118aa1d9ad3db63fb1064267187ae871856 _gitshort="${_githash:0:7}" wrksrc="${pkgname}-${_gitshort}" From 0aa097cf2e4a2ab293bcf34241f0627439255c00 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:22:15 +0100 Subject: [PATCH 05/11] apache: rebuild for libressl-2.6.4. --- srcpkgs/apache/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 9e21f51e063..2ca6d35d8dc 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.29 -revision=1 +revision=2 wrksrc=httpd-${version} build_style=gnu-configure configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all From 5ba8de73c9bce80f32d10d616a43c7add023260b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:26:07 +0100 Subject: [PATCH 06/11] apk-tools: rebuild for libressl-2.6.4. --- srcpkgs/apk-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template index 751e5dfcc68..8dcdceeec44 100644 --- a/srcpkgs/apk-tools/template +++ b/srcpkgs/apk-tools/template @@ -1,7 +1,7 @@ # Template file for 'apk-tools' pkgname=apk-tools version=2.9.1 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="LUAAPK=" hostmakedepends="pkg-config" From 62c162073b77da4fd2166a451856c3862fd14dcb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:26:36 +0100 Subject: [PATCH 07/11] apr-util: rebuild for libressl-2.6.4. --- srcpkgs/apr-util/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index 316b4616648..80d8de27ce9 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -1,7 +1,7 @@ # Template file for 'apr-util' pkgname=apr-util version=1.6.1 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap From 252d336e7cf00106a929bdf929a2b9b0234da32f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:27:46 +0100 Subject: [PATCH 08/11] aria2: rebuild for libressl-2.6.4. --- srcpkgs/aria2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index a9225bf75bd..1e131b87e18 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,7 +1,7 @@ # Template file for 'aria2' pkgname=aria2 version=1.33.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt From a015d44c0a6eaf34fca8cf8d8f49391992f6daff Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:30:33 +0100 Subject: [PATCH 09/11] attic: rebuild for libressl-2.6.4. --- srcpkgs/attic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template index 3d8126daee4..5e848c74826 100644 --- a/srcpkgs/attic/template +++ b/srcpkgs/attic/template @@ -1,7 +1,7 @@ # Template file for 'attic' pkgname=attic version=0.16 -revision=9 +revision=10 wrksrc="Attic-$version" build_style=python3-module hostmakedepends="python3-setuptools python3-devel libressl-devel python3-Sphinx" From 196f72221b29c38717a62ee61c79bf3593c60cb9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:31:52 +0100 Subject: [PATCH 10/11] axel: rebuild for libressl-2.6.4. --- srcpkgs/axel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template index 59ab890dc67..bdf4e68fd04 100644 --- a/srcpkgs/axel/template +++ b/srcpkgs/axel/template @@ -1,7 +1,7 @@ # Template file for 'axel' pkgname=axel version=2.16.1 -revision=1 +revision=2 wrksrc=${pkgname}-${version}${_patch} build_style=gnu-configure conf_files=/etc/axelrc From fa76e82350599cc43996b4ccd9b07332a5ede8aa Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Feb 2018 13:56:15 +0100 Subject: [PATCH 11/11] argyllcms: rebuild for libressl-2.6.4. --- srcpkgs/argyllcms/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template index f1627313462..70e2192f345 100644 --- a/srcpkgs/argyllcms/template +++ b/srcpkgs/argyllcms/template @@ -1,7 +1,7 @@ # Template file for 'argyllcms' pkgname=argyllcms version=2.0.0 -revision=1 +revision=2 wrksrc="Argyll_V${version}" hostmakedepends="ftjam zip unzip" makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel