[arch-commits] Commit in gnupg/trunk (3 files)

[Gaëtan Bisson]

    Date: Friday, July 10, 2020 @ 08:38:18
  Author: bisson
Revision: 391525

upstream update

Added:
  gnupg/trunk/do-not-rebuild-defsincdate.patch
Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/do-not-rebuild-defsincdate.patch

----------------------------------+
 PKGBUILD                         |    8 +--
 do-not-rebuild-defsincdate.patch |   84 ++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-10 06:43:48 UTC (rev 391524)
+++ PKGBUILD	2020-07-10 08:38:18 UTC (rev 391525)
@@ -4,8 +4,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.2.20
-pkgrel=4
+pkgver=2.2.21
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -25,11 +25,11 @@
         'drop-import-clean.patch'
         'avoid-beta-warning.patch'
         'do-not-rebuild-defsincdate.patch')
-sha256sums=('04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30'
+sha256sums=('61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec'
             'SKIP'
             '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
             '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
-            '01fee1b04358e5dce76894214bb263e9a75cf408eb1277fad5b751ab3d45b87a')
+            'bb4dcba0328af6271ccfe992a64d8daa9f0a691ba52978491647f1dea05675ee')
 
 install=install
 

Deleted: do-not-rebuild-defsincdate.patch
===================================================================
--- do-not-rebuild-defsincdate.patch	2020-07-10 06:43:48 UTC (rev 391524)
+++ do-not-rebuild-defsincdate.patch	2020-07-10 08:38:18 UTC (rev 391525)
@@ -1,41 +0,0 @@
-From 3e8ff68502bf5de333db7213d9e27e0b9e8cc36e Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Mon, 29 Aug 2016 12:34:42 -0400
-Subject: [PATCH 7/7] avoid regenerating defsincdate (use shipped file)
-
-upstream ships doc/defsincdate in its tarballs.  but doc/Makefile.am
-tries to rewrite doc/defsincdate if it notices that any of the files
-have been modified more recently, and it does so assuming that we're
-running from a git repo.
-
-However, we'd rather ship the documents cleanly without regenerating
-defsincdate -- we don't have a git repo available (debian builds from
-upstream tarballs) and any changes to the texinfo files (e.g. from
-debian/patches/) might result in different dates on the files than we
-expect after they're applied by dpkg or quilt or whatever, which makes
-the datestamp unreproducible.
----
- doc/Makefile.am | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index d47d83ede..c0a81b0b9 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -177,13 +177,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
- 
- dist-hook: defsincdate
- 
--defsincdate: $(gnupg_TEXINFOS)
--	: >defsincdate ; \
--	if test -e $(top_srcdir)/.git; then \
--	  (cd $(srcdir) && git log -1 --format='%ct' \
--               -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
--	fi
--
- defs.inc : defsincdate Makefile mkdefsinc
- 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
- 	./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
--- 
-2.27.0
-

Added: do-not-rebuild-defsincdate.patch
===================================================================
--- do-not-rebuild-defsincdate.patch	                        (rev 0)
+++ do-not-rebuild-defsincdate.patch	2020-07-10 08:38:18 UTC (rev 391525)
@@ -0,0 +1,43 @@
+From 3e8ff68502bf5de333db7213d9e27e0b9e8cc36e Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Mon, 29 Aug 2016 12:34:42 -0400
+Subject: [PATCH 7/7] avoid regenerating defsincdate (use shipped file)
+
+upstream ships doc/defsincdate in its tarballs.  but doc/Makefile.am
+tries to rewrite doc/defsincdate if it notices that any of the files
+have been modified more recently, and it does so assuming that we're
+running from a git repo.
+
+However, we'd rather ship the documents cleanly without regenerating
+defsincdate -- we don't have a git repo available (debian builds from
+upstream tarballs) and any changes to the texinfo files (e.g. from
+debian/patches/) might result in different dates on the files than we
+expect after they're applied by dpkg or quilt or whatever, which makes
+the datestamp unreproducible.
+---
+ doc/Makefile.am | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d47d83ede..c0a81b0b9 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -177,15 +177,6 @@
+ 
+ dist-hook: defsincdate
+ 
+-defsincdate: $(gnupg_TEXINFOS)
+-	: >defsincdate ; \
+-	if test -e $(top_srcdir)/.git; then \
+-	  (cd $(srcdir) && git log -1 --format='%ct' \
+-               -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
+-        elif test x"$SOURCE_DATE_EPOCH" != x; then   \
+-	   echo "$SOURCE_DATE_EPOCH" >>defsincdate ; \
+-	fi
+-
+ defs.inc : defsincdate Makefile mkdefsinc
+ 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
+ 	./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
+-- 
+2.27.0
+