Update gnupg and its libraries
authorAndre Heinecke <aheinecke@intevation.de>
Fri, 5 Jun 2015 09:29:10 +0000 (11:29 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Fri, 5 Jun 2015 09:32:07 +0000 (11:32 +0200)
* patches/pinentry-0.9.0/fix-wrong-moc-files.patch: Removed.
* patches/gnupg2-2.0.27/
0003-gpgtar-Fix-extracting-files-with-size-512.patch: Removed.
* patches/gnupg2-2.0.27: moved to patches/gnugp2-2.28.
* Makefile.am (EXTRA_DIST): Update patches.
* src/packages.current (libgpg-error, libksba, libassuan)
  (gnupg, pinentry): Updated.

Makefile.am
NEWS
packages/packages.current
patches/gnupg2-2.0.27/0003-gpgtar-Fix-extracting-files-with-size-512.patch [deleted file]
patches/gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch [moved from patches/gnupg2-2.0.27/0001-Enable-wildcard-expansion-with-mingw-w64.patch with 100% similarity]
patches/gnupg2-2.0.28/0002-Let-wchar_to_native-convert-to-console-codepage.patch [moved from patches/gnupg2-2.0.27/0002-Let-wchar_to_native-convert-to-console-codepage.patch with 100% similarity]
patches/gnupg2-2.0.28/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch [moved from patches/gnupg2-2.0.27/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch with 100% similarity]

index fa073c5..954509a 100644 (file)
@@ -37,10 +37,9 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/claws-mail-3.9.1/80-src-makefile.postcfg-build \
         patches/dirmngr-1.1.1/dirmngr-pth.patch \
         patches/glib-2.41.5/01-socket.patch \
-        patches/gnupg2-2.0.27/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
-        patches/gnupg2-2.0.27/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
-        patches/gnupg2-2.0.27/0003-gpgtar-Fix-extracting-files-with-size-512.patch \
-        patches/gnupg2-2.0.27/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
+        patches/gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
+        patches/gnupg2-2.0.28/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
+        patches/gnupg2-2.0.28/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
         patches/gnupg2/01-version.patch \
         patches/gnupg2/01-version.patch.in \
         patches/gnutls-2.12.23/01-openssl-wincrypt.patch \
@@ -54,7 +53,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch \
         patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build \
         patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
-        patches/pinentry-0.9.0/fix-wrong-moc-files.patch \
         patches/pthreads-w32-2-8-0-release/01-make.patch \
         patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
 
diff --git a/NEWS b/NEWS
index 5bf00ba..987a069 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,14 @@
 Noteworthy changes in version 2.2.5 (unreleased)
 ------------------------------------------------
 
+(en) GnuPG has been updated to version 2.0.28. See release notes on
+     www.gnupg.org for details.
+
+(de) GnuPG wurde auf Version 2.0.28 aktualisiert. Details zu dieser
+     Version finden sich unter www.gnupg.org
+
 ~~~~~~~~~~~~~~~
-GnuPG:          2.0.27
+GnuPG:          2.0.28
 Kleopatra:      2.2.0-git945878c
 GPA:            0.9.7
 GpgOL:          1.2.1
index f869433..8dd65e1 100644 (file)
@@ -408,38 +408,40 @@ chk  6e38be3377340a21a1f13ff84b5e6adce97cd1d4
 # D869 2123 C406 5DEA 5E0F  3AB5 249B 39D2 4F25 E3B6
 server ftp://ftp.gnupg.org/gcrypt
 
-# checked: 2014-07-16 ah - updated
-file libgpg-error/libgpg-error-1.13.tar.bz2
-chk  50fbff11446a7b0decbf65a6e6b0eda17b5139fb
+# last-changed: 2015-06-05
+# by: ah
+file libgpg-error/libgpg-error-1.19.tar.bz2
+chk  4997951ab058788de48b989013668eb3df1e6939
 
 # last changed: 2015-03-09
 # by: ah
 file libgcrypt/libgcrypt-1.6.3.tar.bz2
 chk  9456e7b64db9df8360a1407a38c8c958da80bbf1
 
-# checked: 2014-11-25 ah
-file libksba/libksba-1.3.2.tar.bz2
-chk  37d0893a587354af2b6e49f6ae701ca84f52da67
+# last-changed: 2015-06-05
+# by: ah
+file libksba/libksba-1.3.3.tar.bz2
+chk  86fe0436f3c8c394d32e142ee410a9f9560173fb
 
-# last changed: 2015-03-09
+# last-changed: 2015-06-05
 # by: ah
-file libassuan/libassuan-2.2.0.tar.bz2
-chk  7cf0545955ce414044bb99b871d324753dd7b2e5
+file libassuan/libassuan-2.2.1.tar.bz2
+chk  c21b86482f6a3624c2b46b91e20f8415f244233a
 
-# last changed: 2015-02-18
+# last changed: 2015-06-05
 # by: ah
-name gnupg2-2.0.27.tar.bz2
-file gnupg/gnupg-2.0.27.tar.bz2
-chk  d065be185f5bac8ea07b210ab7756e79b83b63d4
+name gnupg2-2.0.28.tar.bz2
+file gnupg/gnupg-2.0.28.tar.bz2
+chk  9a1050f72b6c9afe2b4a0a3f2e9dca2abba8e4ef
 
 # checked: 2014-07-16 ah
 file dirmngr/dirmngr-1.1.1.tar.bz2
 chk  e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
 
-# last changed: 2015-03-09
+# last changed: 2015-06-05
 # by: ah
-file pinentry/pinentry-0.9.0.tar.bz2
-chk  f8e5c774c35fbb91d84e82559baf76f6b4513236
+file pinentry/pinentry-0.9.3.tar.bz2
+chk  5551fdb62dc268dee8861b50ff93f6741b8eec8a
 
 # checked: 2014-07-16 ah
 file scute/scute-1.4.0.tar.bz2
diff --git a/patches/gnupg2-2.0.27/0003-gpgtar-Fix-extracting-files-with-size-512.patch b/patches/gnupg2-2.0.27/0003-gpgtar-Fix-extracting-files-with-size-512.patch
deleted file mode 100755 (executable)
index ddde7df..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 0ed2cfcf054e286b238d4ddbbb3e929482849a47 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Tue, 17 Mar 2015 10:48:09 +0100
-Subject: [PATCH 1/4] gpgtar: Fix extracting files with !(size % 512)
-
-* tools/gpgtar-extract.c (extract_regular): Handle size multiples
-  of RECORDSIZE.
-
---
-  If a hdr->size was a multiple of 512 the last record would
-  not have been written and the files corrupted accordingly.
-
-GnuPG-bug-id: 1926
-
-Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
-
-Changed to use only if-else.
-
-Signed-off-by: Werner Koch <wk@gnupg.org>
-(cherry picked from commit 6cbbb0bec98e1acefc4c7163cc41a507469db920)
----
- tools/gpgtar-extract.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
-index 736c7fc..b0d31e0 100644
---- a/tools/gpgtar-extract.c
-+++ b/tools/gpgtar-extract.c
-@@ -73,7 +73,11 @@ extract_regular (estream_t stream, const char *dirname,
-       if (err)
-         goto leave;
-       n++;
--      nbytes = (n < hdr->nrecords)? RECORDSIZE : (hdr->size % RECORDSIZE);
-+      if (n < hdr->nrecords || (hdr->size && !(hdr->size % RECORDSIZE)))
-+        nbytes = RECORDSIZE;
-+      else
-+        nbytes = (hdr->size % RECORDSIZE);
-+
-       nwritten = es_fwrite (record, 1, nbytes, outfp);
-       if (nwritten != nbytes)
-         {
---
-1.9.1