summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-05 23:52:40 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-05 23:52:40 -0500
commitb7063e4bef7df483c30e8462b6cc8d0fcd0d7be7 (patch)
tree2f3847da27755e7a8b4d66bc2f1a854381d0872d
parent8d3bdb0e6c45f7e0793b10a3133f569c1cb4490b (diff)
downloadpackages-b7063e4bef7df483c30e8462b6cc8d0fcd0d7be7.tar.gz
packages-b7063e4bef7df483c30e8462b6cc8d0fcd0d7be7.tar.bz2
packages-b7063e4bef7df483c30e8462b6cc8d0fcd0d7be7.tar.xz
packages-b7063e4bef7df483c30e8462b6cc8d0fcd0d7be7.zip
user/gnutls: bump, fix
-rw-r--r--user/gnutls/APKBUILD19
-rw-r--r--user/gnutls/gnulib-tests-dont-require-gpg-passphrase.patch10
-rw-r--r--user/gnutls/tests-date-compat.patch12
3 files changed, 20 insertions, 21 deletions
diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD
index b64faaa64..b2ed36e43 100644
--- a/user/gnutls/APKBUILD
+++ b/user/gnutls/APKBUILD
@@ -1,23 +1,24 @@
# Contriburo: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer:
pkgname=gnutls
-pkgver=3.6.1
+pkgver=3.6.2
pkgrel=0
pkgdesc="A TLS protocol implementation"
url="http://www.gnutls.org/"
arch="all"
-license="GPL"
+license="LGPL-2.1+"
+makedepends="libtasn1-dev libunistring-dev nettle-dev p11-kit-dev texinfo
+ zlib-dev"
checkdepends="diffutils"
-makedepends="nettle-dev zlib-dev libtasn1-dev p11-kit-dev libunistring-dev texinfo"
-subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils $pkgname-c++:xx"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils
+ $pkgname-c++:xx"
_v=${pkgver%.*}
case $pkgver in
*.*.*.*) _v=${_v%.*};;
esac
source="https://www.gnupg.org/ftp/gcrypt/gnutls/v${_v}/$pkgname-$pkgver.tar.xz
- tests-date-compat.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+ gnulib-tests-dont-require-gpg-passphrase.patch"
# secfixes:
# 3.5.13-r0:
@@ -70,5 +71,5 @@ xx() {
mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23 gnutls-3.6.1.tar.xz
-14b1be86a0180c914aaaada261ccf01914d48df9510b57572e4f32683d1dd984a907ecf2c848cc4773b1c139059de26383a2c617f509f8c75b985668a23fd28d tests-date-compat.patch"
+sha512sums="6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06 gnutls-3.6.2.tar.xz
+abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch"
diff --git a/user/gnutls/gnulib-tests-dont-require-gpg-passphrase.patch b/user/gnutls/gnulib-tests-dont-require-gpg-passphrase.patch
new file mode 100644
index 000000000..2c9276cbc
--- /dev/null
+++ b/user/gnutls/gnulib-tests-dont-require-gpg-passphrase.patch
@@ -0,0 +1,10 @@
+--- gnutls-3.6.2/gl/tests/test-vc-list-files-git.sh 2018-01-03 18:36:29.000000000 -0600
++++ gnutls-3.6.2/gl/tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500
+@@ -32,6 +32,7 @@
+ touch d/a b c &&
+ git config user.email "you@example.com" &&
+ git config user.name "Your Name" &&
++ git config commit.gpgsign false &&
+ git add . > /dev/null &&
+ git commit -q -a -m log &&
+ printf '%s\n' b c d/a > expected &&
diff --git a/user/gnutls/tests-date-compat.patch b/user/gnutls/tests-date-compat.patch
deleted file mode 100644
index 2717ab230..000000000
--- a/user/gnutls/tests-date-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Busybox date does not support %N, this is GNU extension.
---- a/tests/scripts/common.sh
-+++ b/tests/scripts/common.sh
-@@ -59,7 +59,7 @@
- }
-
- # Find a port number not currently in use.
--GETPORT='rc=0; myrandom=$(date +%N | sed s/^0*//)
-+GETPORT='rc=0; myrandom=$(date +%s | sed s/^0*//)
- while test $rc = 0;do
- PORT="$(((($$<<15)|$myrandom) % 63001 + 2000))"
- check_if_port_in_use $PORT;rc=$?