From a52b216bbde26c35137a10b9d732b7bd9eb79aa4 Mon Sep 17 00:00:00 2001 From: Piraty Date: Mon, 4 May 2020 18:29:49 +0200 Subject: [PATCH 01/16] nettle: update to 3.6. --- common/shlibs | 4 ++-- srcpkgs/nettle/template | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8342e117092..79d7c53e276 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1222,8 +1222,8 @@ libHX.so.28 libHX-3.14_1 libxkbcommon.so.0 libxkbcommon-0.2.0_1 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1 libgee-0.8.so.2 libgee08-0.8.2_1 -libnettle.so.7 nettle-3.5.1_1 -libhogweed.so.5 nettle-3.5.1_1 +libnettle.so.8 nettle-3.6_1 +libhogweed.so.6 nettle-3.6_1 libgtkspell.so.0 gtkspell-2.0.16_1 libgtkspell3-3.so.0 gtkspell3-3.0.9_1 libpurple.so.0 libpurple-2.10.6_1 diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template index 2b2716179e7..a9409e1b782 100644 --- a/srcpkgs/nettle/template +++ b/srcpkgs/nettle/template @@ -1,18 +1,17 @@ # Template file for 'nettle' pkgname=nettle -version=3.5.1 +version=3.6 revision=1 build_style=gnu-configure configure_args="--enable-shared" hostmakedepends="m4 texinfo" makedepends="gmp-devel" -short_desc="A low-level cryptographic library" +short_desc="Low-level cryptographic library" maintainer="Orphaned " license="GPL-2.0-or-later, GPL-3.0-or-later" -homepage="http://www.lysator.liu.se/~nisse/nettle/" +homepage="https://www.lysator.liu.se/~nisse/nettle/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419 - +checksum=d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1 nettle-devel_package() { depends="gmp-devel ${sourcepkg}>=${version}_${revision}" From c1639abdef28896533e8d7e377b172e6d5257249 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:09 +0200 Subject: [PATCH 02/16] claws-mail: rebuild against nettle-3.6 --- srcpkgs/claws-mail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template index b20a954f8c9..fba1389cb9a 100644 --- a/srcpkgs/claws-mail/template +++ b/srcpkgs/claws-mail/template @@ -1,7 +1,7 @@ # Template file for 'claws-mail' pkgname=claws-mail version=3.17.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-python-plugin --disable-perl-plugin --enable-enchant --enable-gnutls" From 9f3405fe52dc4f96b165cf0a2329cfb1e008da0e Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:09 +0200 Subject: [PATCH 03/16] epiphany: rebuild against nettle-3.6 --- srcpkgs/epiphany/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index f0be325d6fd..ed54d08014c 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,7 +1,7 @@ # Template file for 'epiphany' pkgname=epiphany version=3.32.4 -revision=2 +revision=3 build_helper="gir" build_style=meson configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled" From 33c6461469bc32fc81afd3143d9016253c65de7c Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:09 +0200 Subject: [PATCH 04/16] filezilla: rebuild against nettle-3.6 --- srcpkgs/filezilla/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index 9579feefad9..745400bacd1 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,7 +1,7 @@ # Template file for 'filezilla' pkgname=filezilla version=3.48.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck --with-wx-config=wx-config-gtk3" From 793db44558f583cbbdacaede928ccad897ec6e6e Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:10 +0200 Subject: [PATCH 05/16] gnutls: rebuild against nettle-3.6 --- .../patches/tests-certtool-no-prompt.patch | 22 +++++++++++++++++++ srcpkgs/gnutls/template | 15 ++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch diff --git a/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch b/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch new file mode 100644 index 00000000000..6625c25ff58 --- /dev/null +++ b/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch @@ -0,0 +1,22 @@ +upstream: no +reason: don't prompt for password, don't assume it has been asked for + +--- tests/cert-tests/certtool ++++ tests/cert-tests/certtool +@@ -26,6 +26,7 @@ + TMPFILE1=certtool-file1.$$.tmp + TMPFILE2=certtool-file2.$$.tmp + PASS="1234" ++export GNUTLS_PIN="1234" + + if test -n "$DISABLE_BASH_TESTS"; then + exit 77 +@@ -66,7 +67,7 @@ + fi + + grep "Enter password" ${TMPFILE2} >/dev/null 2>&1 +- if test $? != 0;then ++ if test $? != 0 && test -z "$GNUTLS_PIN" ; then + cat ${TMPFILE2} + echo "No password was asked" + exit 1 diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index dc5c58da50e..95bfab6a3f2 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,17 +1,17 @@ # Template file for 'gnutls' pkgname=gnutls version=3.6.13 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-zlib --disable-guile --disable-static --disable-valgrind-tests --disable-rpath --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib" -hostmakedepends="which gettext-devel pkg-config libtool" -# add autogen when #6550 is solved +hostmakedepends="automake gettext-devel libtool pkg-config which" makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel libunistring-devel unbound-devel trousers-devel" +checkdepends="iproute2" short_desc="GNU Transport Layer Security library" maintainer="Orphaned " license="GPL-3.0-only, LGPL-2.1-or-later" @@ -19,6 +19,15 @@ homepage="https://gnutls.org" distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38 +pre_configure() { + autoreconf -vfi +} + +pre_check() { + # same as $PASS in tests/cert-tests/certtool + export GNUTLS_PIN=1234 +} + gnutls-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From cf1b5454e73940c5f9ff5cee8efc0643c1d73787 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:10 +0200 Subject: [PATCH 06/16] libfilezilla: rebuild against nettle-3.6 --- srcpkgs/libfilezilla/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template index f0d2daf3e0d..c6589222fd5 100644 --- a/srcpkgs/libfilezilla/template +++ b/srcpkgs/libfilezilla/template @@ -2,7 +2,7 @@ # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable pkgname=libfilezilla version=0.21.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="gettext pkg-config" From 52be6305bc82554bae15c2a23741e40ba6504fc2 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:10 +0200 Subject: [PATCH 07/16] pijul: rebuild against nettle-3.6 --- srcpkgs/pijul/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index d46ca14e242..95aea9ce678 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -1,7 +1,7 @@ # Template file for 'pijul' pkgname=pijul version=0.12.2 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config clang" makedepends="libsodium-devel libressl-devel nettle-devel" From c7920f6eb77d47fb9c3efab857c5bbf466ea8b26 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:11 +0200 Subject: [PATCH 08/16] qemu: rebuild against nettle-3.6 --- srcpkgs/qemu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 82563bf381b..65bbbd4764e 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,7 +1,7 @@ # Template file for 'qemu' pkgname=qemu version=5.0.0 -revision=1 +revision=2 short_desc="Open Source Processor Emulator" maintainer="Helmut Pozimski " license="GPL-2.0-or-later, LGPL-2.1-or-later" From cc9b16b4aab7a1394490a3ec2691b14fec86179b Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:11 +0200 Subject: [PATCH 09/16] rdesktop: rebuild against nettle-3.6 --- srcpkgs/rdesktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template index aabd36b701c..bb28a0490e3 100644 --- a/srcpkgs/rdesktop/template +++ b/srcpkgs/rdesktop/template @@ -1,7 +1,7 @@ # Template file for 'rdesktop' pkgname=rdesktop version=1.9.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config automake" From 41b59c6eee15e3539463512ce4122728b2bbb0cb Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:12 +0200 Subject: [PATCH 10/16] rdfind: rebuild against nettle-3.6 --- srcpkgs/rdfind/template | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rdfind/template b/srcpkgs/rdfind/template index 510e46839ba..53a34e68ded 100644 --- a/srcpkgs/rdfind/template +++ b/srcpkgs/rdfind/template @@ -1,16 +1,24 @@ # Template file for 'rdfind' pkgname=rdfind version=1.4.1 -revision=2 +revision=3 build_style=gnu-configure makedepends="nettle-devel" -short_desc="A program that finds duplicate files" +checkdepends="tar which" +short_desc="Program that finds duplicate files" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://rdfind.pauldreik.se" distfiles="https://rdfind.pauldreik.se/rdfind-${version}.tar.gz" checksum=30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c +pre_configure() { + # skip tests that don't work as expected in the chroot + vsed -i Makefile.in \ + -e 's:testcases/hardlink_fails.sh \\:\\:' \ + -e 's:testcases/symlinking_action.sh \\:\\:' +} + case "${XBPS_TARGET_MACHINE}" in aarch64) LDFLAGS="-Wl,-znotext";; esac From 7a624233f4415817d1ad11f0471a2c8e61e3ab58 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:12 +0200 Subject: [PATCH 11/16] rdup: rebuild against nettle-3.6 --- srcpkgs/rdup/patches/release-1.1.15.patch | 43 +++++++++++++++++++++++ srcpkgs/rdup/template | 6 ++-- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/rdup/patches/release-1.1.15.patch diff --git a/srcpkgs/rdup/patches/release-1.1.15.patch b/srcpkgs/rdup/patches/release-1.1.15.patch new file mode 100644 index 00000000000..c467a736fc2 --- /dev/null +++ b/srcpkgs/rdup/patches/release-1.1.15.patch @@ -0,0 +1,43 @@ +upstream: yes + +From 02eb963f11de11a1115e815625ae38f6dad6b276 Mon Sep 17 00:00:00 2001 +From: Miek Gieben +Date: Wed, 2 Mar 2016 15:51:45 +0000 +Subject: [PATCH] Release 1.1.15 + +--- + ChangeLog | 3 ++- + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 1c79ba6..5a6812a 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,4 +1,4 @@ +-xx Yyy 2013: 1.1.15 Miek Gieben ++02 Mar 2016: 1.1.15 Miek Gieben + * [rdup] Change -P so any arguments are executed with 'sh -c', + this removes the 7 option limit (Alexander Neumann) + * [rdup-tr] Fix crashes with filename encryption and symlinks (reported by +@@ -6,6 +6,7 @@ xx Yyy 2013: 1.1.15 Miek Gieben + * [rdup-tr] Fix memory leak + * [rdup] Fix the linked list that tracks the child's PIDs. + * [rdup] Drop -a option, it's racy and must proper or not at all. ++ * [rdup] Compilation fixed for Mac OS X + + + 19 Jan 2013: 1.1.14 Miek Gieben +diff --git a/configure.ac b/configure.ac +index 5b77cfe..bc3ada5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.57) +-AC_INIT(rdup, 1.1.14, miek@miek.nl, rdup) ++AC_INIT(rdup, 1.1.15, miek@miek.nl, rdup) + AC_CONFIG_SRCDIR([rdup.c]) + AC_PREFIX_DEFAULT(/usr/local) + diff --git a/srcpkgs/rdup/template b/srcpkgs/rdup/template index ccc818e6892..82877b9bec5 100644 --- a/srcpkgs/rdup/template +++ b/srcpkgs/rdup/template @@ -1,16 +1,18 @@ # Template file for 'rdup' pkgname=rdup version=1.1.15 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="glib-devel libarchive-devel nettle-devel" +checkdepends="bsdtar dejagnu" short_desc="The only backup program that doesn't make backups" maintainer="Rui Abreu Ferreira " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/miekg/rdup" distfiles="https://github.com/miekg/rdup/archive/${version}.tar.gz" checksum=787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb +patch_args="-Np1" pre_configure() { vsed -e 's/-Werror//' -i GNUmakefile.in From 3a2d42a74bb20c682bb25b3c6dea54063df13de6 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:12 +0200 Subject: [PATCH 12/16] stoken: rebuild against nettle-3.6 --- srcpkgs/stoken/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/stoken/template b/srcpkgs/stoken/template index 3be790f616b..98293c153c1 100644 --- a/srcpkgs/stoken/template +++ b/srcpkgs/stoken/template @@ -1,7 +1,7 @@ # Template file for 'stoken' pkgname=stoken version=0.92 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkgconf" makedepends="libxml2-devel nettle-devel gtk+3-devel" From 9944517751b05017f8f3aca81780f7d3206e52c5 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:13 +0200 Subject: [PATCH 13/16] tigervnc: rebuild against nettle-3.6 --- srcpkgs/tigervnc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template index 98b981ecc39..a2ec9d13f05 100644 --- a/srcpkgs/tigervnc/template +++ b/srcpkgs/tigervnc/template @@ -1,7 +1,7 @@ # Template file for 'tigervnc' pkgname=tigervnc version=1.10.1 -revision=1 +revision=2 _xorg_version=1.20.0 build_style=cmake short_desc="VNC client forked from TightVNC" @@ -9,7 +9,7 @@ maintainer="Evan Deaubl " license="GPL-2.0-or-later" hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans" makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel - xorgproto libxkbfile-devel libXfont2-devel gnutls-devel libdrm-devel" + xorgproto libxkbfile-devel libXrandr-devel libXfont2-devel gnutls-devel libdrm-devel" depends="perl xauth xkeyboard-config" conflicts="turbovnc>=0" homepage="https://www.tigervnc.org" @@ -23,7 +23,7 @@ post_configure() { cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* . patch -p1 <../xserver120.patch # glvnd changed versioning - sed -i '/LIBGL/s/[79]\..\.0/1.2/' configure.ac + vsed -i configure.ac -e '/LIBGL/s/[79]\..\.0/1.2/' autoreconf -fi ./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \ --with-pic --without-dtrace --disable-static \ @@ -36,7 +36,7 @@ post_configure() { # Hardcodes TIGERVNC_BUILDDIR which we have to set later on because # we do out of source builds - sed "s/TIGERVNC_BUILDDIR =/TIGERVNC_BUILDDIR :=/" -i hw/vnc/Makefile + vsed -i hw/vnc/Makefile -e "s/TIGERVNC_BUILDDIR =/TIGERVNC_BUILDDIR :=/" } post_build() { From 5a1f63a655872441130ee5b1bcb95e416a4f4b83 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:13 +0200 Subject: [PATCH 14/16] viking: rebuild against nettle-3.6 --- srcpkgs/viking/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template index c860fe5eecc..32b19f30481 100644 --- a/srcpkgs/viking/template +++ b/srcpkgs/viking/template @@ -1,7 +1,7 @@ # Template file for 'viking' pkgname=viking version=1.7 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-realtime-gps-tracking --disable-bluemarble --disable-bing --disable-terraserver --disable-spotmaps From 788ee19e08a192a643da7ba124b030f55e8abef0 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:13 +0200 Subject: [PATCH 15/16] xen: rebuild against nettle-3.6 --- srcpkgs/xen/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index 6a7f8a73719..de8b4d7df4f 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,7 +1,7 @@ # Template file for 'xen' pkgname=xen version=4.10.4 -revision=2 +revision=3 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot _git_tag_ipxe=356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d archs="x86_64*" From 434ca73d98d5006f6a1f27b89b850a7809f4c550 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:14 +0200 Subject: [PATCH 16/16] xorg-server: rebuild against nettle-3.6 [ci skip] --- srcpkgs/xorg-server/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index de2eefdb851..aa832c25a08 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=1.20.8 -revision=2 +revision=3 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb @@ -19,6 +19,7 @@ makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')" # See hw/xfree86/common/xf86Module.h. Only care for the major version. depends="xkeyboard-config $(vopt_if elogind 'elogind')" +checkdepends="xkeyboard-config" short_desc="X11 server from X.org" maintainer="Juan RP " license="MIT, BSD-3-Clause"