[arch-commits] Commit in gnupg/trunk (PKGBUILD gpg-zip.patch)

[Gaëtan Bisson]

    Date: Wednesday, June 3, 2020 @ 23:48:22
  Author: bisson
Revision: 388240

implement FS#66884

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/gpg-zip.patch

---------------+
 PKGBUILD      |    5 +----
 gpg-zip.patch |   27 ---------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-03 23:29:01 UTC (rev 388239)
+++ PKGBUILD	2020-06-03 23:48:22 UTC (rev 388240)
@@ -5,7 +5,7 @@
 
 pkgname=gnupg
 pkgver=2.2.20
-pkgrel=3
+pkgrel=4
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -22,13 +22,11 @@
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-        'gpg-zip.patch'
         'drop-import-clean.patch'
         'avoid-beta-warning.patch'
         'do-not-rebuild-defsincdate.patch')
 sha256sums=('04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30'
             'SKIP'
-            'ddcd1f125cb2efda187ef8374a7440b491eb9f338db1772af497e50fdd367eb5'
             '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
             '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
             '01fee1b04358e5dce76894214bb263e9a75cf408eb1277fad5b751ab3d45b87a')
@@ -39,7 +37,6 @@
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../avoid-beta-warning.patch
 	patch -p1 -i ../drop-import-clean.patch
-	patch -p1 -i ../gpg-zip.patch
 
 	# improve reproducibility
 	patch -p1 -i ../do-not-rebuild-defsincdate.patch

Deleted: gpg-zip.patch
===================================================================
--- gpg-zip.patch	2020-06-03 23:29:01 UTC (rev 388239)
+++ gpg-zip.patch	2020-06-03 23:48:22 UTC (rev 388240)
@@ -1,27 +0,0 @@
-From 4d07d80b662913de3935829cd783b5b6f38dccd4 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig at archlinux.org>
-Date: Wed, 3 Jun 2020 23:53:04 +0200
-Subject: [PATCH 1/7] install gpg-zip
-
----
- tools/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 0c828a7bd..d9aa7d010 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -35,8 +35,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
- sbin_SCRIPTS = addgnupghome applygnupgdefaults
- 
- if HAVE_USTAR
--# bin_SCRIPTS += gpg-zip
--noinst_SCRIPTS = gpg-zip
-+bin_SCRIPTS = gpg-zip
-+# noinst_SCRIPTS = gpg-zip
- endif
- 
- if BUILD_SYMCRYPTRUN
--- 
-2.27.0
-