From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 59A4A6DE0F60 for ; Sat, 23 Mar 2019 05:35:55 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -2.615 X-Spam-Level: X-Spam-Status: No, score=-2.615 tagged_above=-999 required=5 tests=[AWL=-2.414, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vczq9k2kLtoI for ; Sat, 23 Mar 2019 05:35:54 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id B868B6DE1059 for ; Sat, 23 Mar 2019 05:35:53 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1553344551; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=SCZW4IxS06DaRoCoa7P2QiAkB0RxeaCoqUz1IoSBJPk=; b=T+FJKqyz4gqAqeUuzL4N4tqICFCUPAXsJeK47Od0XazotQEECeRznL5o nShp3ITSfmQF1Zz6WikPoSRPOauYBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1553344551; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=SCZW4IxS06DaRoCoa7P2QiAkB0RxeaCoqUz1IoSBJPk=; b=iRQRWJwLtsLgHti52wl4VYorH4/6wxS+9K5rdFkElBpVjDWj6z9ERi9g SRYfCfMdEEB+IsUIIxJE3QzSwMs2djqlec91ciJ98A0bknDuqtt5Yrtq36 xH1iXyfrofamgX60dtM8fJgKfLlGcUZe/b3vsaSnRsdnfdCt05XzBxohwY oK+Eytt79gkafIVZlbIvjql6JW/NyB6TCTrp+Jo5jzADJpl2WLbSxBqEsI MTEqffULS1Dqxk2x2xRM9XhuPfNCQAKjA9YIzZDrbvyHdL4xT/h26+7t+c 6DF8KzsKey75XU8mKS+Y54VAurZz5TLclh6B3avIcfSTQxWHXGAyKA== Received: from fifthhorseman.net (unknown [IPv6:2001:67c:370:128:b815:dfa4:66ed:5b6f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 08D7DF99F for ; Sat, 23 Mar 2019 08:35:50 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 2B676210D6; Sat, 23 Mar 2019 08:35:44 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH v2 3/3] build: Rename GPG_FILE to DETACHED_SIG_FILE Date: Sat, 23 Mar 2019 13:35:44 +0100 Message-Id: <20190323123544.6264-3-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190323123544.6264-1-dkg@fifthhorseman.net> References: <20190323112118.4022-1-dkg@fifthhorseman.net> <20190323123544.6264-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Mar 2019 12:35:55 -0000 This is just a semantic cleanup -- we have multiple files that are OpenPGP signatures. And while we're probably making signatures with GnuPG, they can be verified with any OpenPGP implementation, so "GPG_" is arguably both not specific enough, and overly-specific. Signed-off-by: Daniel Kahn Gillmor --- Makefile.global | 2 +- Makefile.local | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.global b/Makefile.global index 27c82433..b54ba9dd 100644 --- a/Makefile.global +++ b/Makefile.global @@ -44,7 +44,7 @@ TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz ELPA_FILE:=$(PACKAGE)-emacs-$(ELPA_VERSION).tar DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz SHA256_FILE=$(TAR_FILE).sha256.asc -GPG_FILE=$(TAR_FILE).asc +DETACHED_SIG_FILE=$(TAR_FILE).asc PV_FILE=bindings/python/notmuch/version.py diff --git a/Makefile.local b/Makefile.local index eb599565..383e0cba 100644 --- a/Makefile.local +++ b/Makefile.local @@ -42,7 +42,7 @@ $(TAR_FILE): $(SHA256_FILE): $(TAR_FILE) sha256sum $^ | gpg --clear-sign --output $@ - -$(GPG_FILE): $(TAR_FILE) +$(DETACHED_SIG_FILE): $(TAR_FILE) gpg --armor --detach-sign $^ .PHONY: dist @@ -68,16 +68,16 @@ release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) clean $(MAKE) VERSION=$(VERSION) test git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG) - $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(GPG_FILE) + $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE) ln -sf $(TAR_FILE) $(DEB_TAR_FILE) pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG) git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG) mkdir -p releases - mv $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) releases + mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce ifeq ($(REALLY_UPLOAD),yes) git push origin $(VERSION) $(DEB_TAG) release pristine-tar - cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) + cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)" endif @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template." @@ -121,7 +121,7 @@ release-message: @echo -n " " @cat releases/$(SHA256_FILE) @echo "" - @echo " $(RELEASE_URL)/$(GPG_FILE)" + @echo " $(RELEASE_URL)/$(DETACHED_SIG_FILE)" @echo " (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)" @echo "" @echo "What's new in notmuch $(VERSION)" -- 2.20.1