[tz] [PATCH] Automate the building of tarball signatures.

Paul Eggert eggert at cs.ucla.edu
Sun Nov 4 00:43:13 UTC 2012


On 11/03/2012 05:28 PM, Phil Pennock wrote:

> GnuPG defaults to ".asc"

Thanks for mentioning the problem.  I've written up the following patch
and plan to use it in the next release.


>From 4fc4c4cf403f2d5426fdeb06e1929d379d9b0150 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Sat, 3 Nov 2012 17:41:16 -0700
Subject: [PATCH] Use .asc and not .sign for PGP signatures.

* Makefile (maintainer-clean): Clean *.asc files and *.tar.gz files.
(signatures): Use .asc instead of .sign as the extension for signatures
as this works better with other software.  Reported by Phil Pennock.
* .gitignore: Also ignore .asc files.
---
 .gitignore |    1 +
 Makefile   |   12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d36f26e..5edf101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.asc
 *.o
 *.tar.gz
 *.txt
diff --git a/Makefile b/Makefile
index 9e71fd6..fd909f7 100644
--- a/Makefile
+++ b/Makefile
@@ -415,7 +415,7 @@ clean:
 maintainer-clean: clean
 		@echo 'This command is intended for maintainers to use; it'
 		@echo 'deletes files that may need special tools to rebuild.'
-		rm -f *.[1-8].txt tzcode*.tar.gz tzdata*.tar.gz
+		rm -f *.[1-8].txt *.asc *.tar.gz
 
 names:
 		@echo $(ENCHILADA)
@@ -469,13 +469,13 @@ tzdata$(VERSION).tar.gz: $(COMMON) $(DATA)
 		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) | \
 		  gzip $(GZIPFLAGS) > $@
 
-signatures:	tzcode$(VERSION).tar.gz.sign tzdata$(VERSION).tar.gz.sign
+signatures:	tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc
 
-tzcode$(VERSION).tar.gz.sign: tzcode$(VERSION).tar.gz
-		gpg --armor --detach-sign -o $@ $?
+tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
+		gpg --armor --detach-sign $?
 
-tzdata$(VERSION).tar.gz.sign: tzdata$(VERSION).tar.gz
-		gpg --armor --detach-sign -o $@ $?
+tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
+		gpg --armor --detach-sign $?
 
 typecheck:
 		make clean
-- 
1.7.9.5




More information about the tz mailing list