From 8d9d0e55cd2b37e19f04365d92a4e6effe779fcf Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 25 Apr 2019 15:18:14 +0300 Subject: [PATCH] gnutls: Update to 3.6.7.1 --- gnutls/0005-remove-coverage-rules.patch | 10 ------- gnutls/PKGBUILD | 22 +++++++-------- gnutls/gnutls-3.6.3-msysize.patch | 37 ++++++++++++------------- 3 files changed, 27 insertions(+), 42 deletions(-) delete mode 100644 gnutls/0005-remove-coverage-rules.patch diff --git a/gnutls/0005-remove-coverage-rules.patch b/gnutls/0005-remove-coverage-rules.patch deleted file mode 100644 index f3b22674..00000000 --- a/gnutls/0005-remove-coverage-rules.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gnutls-3.6.6/Makefile.am.orig 2019-02-01 10:27:21.583548200 +0300 -+++ gnutls-3.6.6/Makefile.am 2019-02-01 10:27:41.301982800 +0300 -@@ -149,7 +149,6 @@ - fi - rm -f symbols.last.tmp symbols.diff.tmp - --@CODE_COVERAGE_RULES@ - - local-code-coverage-output: code-coverage-capture - cat GnuTLS-$(VERSION)-coverage/index.html|grep headerCovTableEntry|grep '%'|head -1|sed 's/^.*>\([0-9]\+\.[0-9]\+\s*%\)<.*$$/ coverage lines: \1/' || true diff --git a/gnutls/PKGBUILD b/gnutls/PKGBUILD index da3a95dd..7cc32834 100644 --- a/gnutls/PKGBUILD +++ b/gnutls/PKGBUILD @@ -2,8 +2,9 @@ pkgbase=gnutls pkgname=('gnutls' 'libgnutls' 'libgnutls-devel') -pkgver=3.6.6 -pkgrel=2 +_base_ver=3.6.7 +pkgver=${_base_ver}.1 +pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('x86_64' 'i686') license=('GPL3' 'LGPL2.1') @@ -18,28 +19,25 @@ makedepends=('gettext-devel' 'libunistring-devel' 'zlib-devel') #optdepends=('guile: for use with Guile bindings') -source=(https://gnupg.org/ftp/gcrypt/gnutls/v${pkgver%.*}/${pkgname}-${pkgver}.tar.xz{,.sig} - gnutls-3.6.3-msysize.patch - 0005-remove-coverage-rules.patch) -sha256sums=('bb9acab8af2ac430edf45faaaa4ed2c51f86e57cb57689be6701aceef4732ca7' +source=(https://gnupg.org/ftp/gcrypt/gnutls/v${_base_ver%.*}/${pkgname}-${pkgver}.tar.xz{,.sig} + gnutls-3.6.3-msysize.patch) +sha256sums=('881b26409ecd8ea4c514fd3fbdb6fae5fab422ca7b71116260e263940a4bbbad' 'SKIP' - 'd3ff01773d6f88d82492e7af54dde9f4f577a111e0e9443c7e4b72bac95af613' - 'd79f61a0a6edb533badebd890ba04560246a09effa3fb98733ae33f499973188') + '9225123bb8b3367894c5403c26f91fecb0b7851e7beb17aa8f22ccfaeaf2ee10') validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F' '1F42418905D8206AA754CCDC29EE58B996865171') # "Simon Josefsson " # "Nikos Mavrogiannopoulos prepare() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${_base_ver} patch -p1 -i ${srcdir}/gnutls-3.6.3-msysize.patch - patch -p1 -i ${srcdir}/0005-remove-coverage-rules.patch autoreconf -vfi } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${_base_ver}" ./configure \ --build=${CHOST} \ --prefix=/usr \ @@ -57,7 +55,7 @@ build() { } check() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${_base_ver} #make check } diff --git a/gnutls/gnutls-3.6.3-msysize.patch b/gnutls/gnutls-3.6.3-msysize.patch index aae265db..3a61dc85 100644 --- a/gnutls/gnutls-3.6.3-msysize.patch +++ b/gnutls/gnutls-3.6.3-msysize.patch @@ -168,30 +168,27 @@ diff -Naur gnutls-3.6.3-orig/m4/malloc.m4 gnutls-3.6.3/m4/malloc.m4 diff -Naur gnutls-3.6.3-orig/m4/printf.m4 gnutls-3.6.3/m4/printf.m4 --- gnutls-3.6.3-orig/m4/printf.m4 2018-07-13 08:13:42.000000000 +0300 +++ gnutls-3.6.3/m4/printf.m4 2018-07-26 14:01:04.375422400 +0300 -@@ -769,7 +769,7 @@ - openbsd*) gl_cv_func_printf_directive_ls="guessing no";; - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; -- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; -+ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - # Guess yes on native Windows. - mingw*) gl_cv_func_printf_directive_ls="guessing yes";; -@@ -849,7 +849,7 @@ - [ +@@ -785,6 +785,7 @@ + irix*) gl_cv_func_printf_directive_ls="guessing no";; + solaris*) gl_cv_func_printf_directive_ls="guessing no";; + cygwin*) gl_cv_func_printf_directive_ls="guessing no";; ++ msys*) gl_cv_func_printf_directive_ls="guessing no";; + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_directive_ls="guessing no";; +@@ -869,6 +869,7 @@ changequote(,)dnl case "$host_os" in -- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; -+ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; - netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; - # Guess no on native Windows. - mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; -@@ -1524,7 +1524,7 @@ - darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; ++ msys*) gl_cv_func_printf_flag_grouping="guessing no";; + netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";; +@@ -1564,6 +1564,7 @@ darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on Cygwin. -- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; -+ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; ++ msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on Solaris >= 2.6. solaris2.[0-5] | solaris2.[0-5].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;