mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 16:13:50 +02:00
gnutls: rebuild against nettle-3.6
This commit is contained in:
parent
f7e53baad4
commit
e845c9de05
2 changed files with 34 additions and 3 deletions
22
srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch
Normal file
22
srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch
Normal file
|
@ -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
|
|
@ -1,17 +1,17 @@
|
||||||
# Template file for 'gnutls'
|
# Template file for 'gnutls'
|
||||||
pkgname=gnutls
|
pkgname=gnutls
|
||||||
version=3.6.13
|
version=3.6.13
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-zlib --disable-guile --disable-static
|
configure_args="--with-zlib --disable-guile --disable-static
|
||||||
--disable-valgrind-tests --disable-rpath
|
--disable-valgrind-tests --disable-rpath
|
||||||
--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
|
--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
|
||||||
--with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
|
--with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
|
||||||
hostmakedepends="which gettext-devel pkg-config libtool"
|
hostmakedepends="automake gettext-devel libtool pkg-config which"
|
||||||
# add autogen when #6550 is solved
|
|
||||||
makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
|
makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
|
||||||
libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
|
libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
|
||||||
libunistring-devel unbound-devel trousers-devel"
|
libunistring-devel unbound-devel trousers-devel"
|
||||||
|
checkdepends="iproute2"
|
||||||
short_desc="GNU Transport Layer Security library"
|
short_desc="GNU Transport Layer Security library"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="GPL-3.0-only, LGPL-2.1-or-later"
|
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"
|
distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
|
||||||
checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38
|
checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38
|
||||||
|
|
||||||
|
pre_configure() {
|
||||||
|
autoreconf -vfi
|
||||||
|
}
|
||||||
|
|
||||||
|
pre_check() {
|
||||||
|
# same as $PASS in tests/cert-tests/certtool
|
||||||
|
export GNUTLS_PIN=1234
|
||||||
|
}
|
||||||
|
|
||||||
gnutls-devel_package() {
|
gnutls-devel_package() {
|
||||||
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
|
|
Loading…
Add table
Reference in a new issue