From a95494eedfa33fb57758cabd46763190b1749341 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 26 Apr 2018 21:36:45 +0000
Subject: main/libgpg-error: upgrade to 1.29

---
 main/libgpg-error/APKBUILD          |  8 +++-----
 main/libgpg-error/fix-va_list.patch | 22 ----------------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 main/libgpg-error/fix-va_list.patch

(limited to 'main')

diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index c7833f5410..e3185427c7 100644
--- a/main/libgpg-error/APKBUILD
+++ b/main/libgpg-error/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libgpg-error
-pkgver=1.28
+pkgver=1.29
 pkgrel=0
 pkgdesc="Support library for libgcrypt"
 url="http://www.gnupg.org"
@@ -12,8 +12,7 @@ depends_dev=""
 makedepends=""
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lisp:lisp:noarch"
-source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
-	fix-va_list.patch"
+source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
 builddir="$srcdir"/$pkgname-$pkgver
 build () {
 	cd "$builddir"
@@ -42,5 +41,4 @@ lisp() {
 	mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/
 }
 
-sha512sums="967e5e9930ca2bcd4cc790d69c907684500120c1363ed384a5540ccd4e9a387977c7352da03ff7e0feeacedf073131fc0db9eea9d097d0fbd389fd0bc9b5c209  libgpg-error-1.28.tar.bz2
-36b8d9248fe4ce8efc6dc046f3b0e658f54e95fdd21afa1b262c2b87acbddcc46f68ccd475d761038e38f2991903f51ebe2c13bd9351fa650cfa2f08c2235429  fix-va_list.patch"
+sha512sums="57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b  libgpg-error-1.29.tar.bz2"
diff --git a/main/libgpg-error/fix-va_list.patch b/main/libgpg-error/fix-va_list.patch
deleted file mode 100644
index 5a8ba01686..0000000000
--- a/main/libgpg-error/fix-va_list.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/logging.c b/src/logging.c
-index 1a4f620..12b9494 100644
---- a/src/logging.c
-+++ b/src/logging.c
-@@ -1141,7 +1141,7 @@ void
- _gpgrt_log_printhex (const void *buffer, size_t length,
-                      const char *fmt, ...)
- {
--  va_list arg_ptr;
-+  va_list arg_ptr = {};
- 
-   if (fmt)
-     {
-@@ -1150,7 +1150,7 @@ _gpgrt_log_printhex (const void *buffer, size_t length,
-       va_end (arg_ptr);
-     }
-   else
--    _gpgrt_logv_printhex (buffer, length, NULL, NULL);
-+    _gpgrt_logv_printhex (buffer, length, NULL, arg_ptr);
- }
- 
- 
-- 
cgit v1.2.3