[PATCH 1/6] build-system: replace use of ssh with wget for checking the website

diff --git a/90/003ce8b1c0899d8c5950960ba2a618a1fb2830 b/90/003ce8b1c0899d8c5950960ba2a618a1fb2830
new file mode 100644 (file)
index 0000000..bba9d25
--- /dev/null
+++ b/90/003ce8b1c0899d8c5950960ba2a618a1fb2830
@@ -0,0 +1,93 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 25BBD429E26\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 05:03:59 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id gVa4twpw4Vix for <notmuch@notmuchmail.org>;\r
+       Mon,  4 Jul 2011 05:03:58 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AF909429E21\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 05:03:56 -0700 (PDT)\r
+Received: from zancas.localnet\r
+       (fctnnbsc30w-142167177149.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [142.167.177.149]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p64C3qHx027959\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Mon, 4 Jul 2011 09:03:52 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.76)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1QdhsW-0008Mh-3T; Mon, 04 Jul 2011 09:03:52 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/6] build-system: replace use of ssh with wget for checking\r
+       the website\r
+Date: Mon,  4 Jul 2011 09:03:36 -0300\r
+Message-Id: <1309781021-32062-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1309781021-32062-1-git-send-email-david@tethera.net>\r
+References: <1309781021-32062-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 04 Jul 2011 12:03:59 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+The idea is to see if the version we are already releasing exists on\r
+the notmuch website. Using wget allows more people to run this target,\r
+and also allows people with ssh access to run it without access to\r
+their keys.\r
+---\r
+ Makefile.local |   15 ++++++++++-----\r
+ 1 files changed, 10 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 8a8832d..41feeb3 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -180,11 +180,16 @@ verify-version-components:\r
+ .PHONY: verify-newer\r
+ verify-newer:\r
+       @echo -n "Checking that no $(VERSION) release already exists..."\r
+-      @ssh $(RELEASE_HOST) test ! -e $(RELEASE_DIR)/$(TAR_FILE) \\r
+-              || (echo "Ouch." && echo "Found: $(RELEASE_HOST):$(RELEASE_DIR)/$(TAR_FILE)" \\r
+-              && echo "Refusing to replace an existing release." \\r
+-              && echo "Don't forget to update \"version\" as described in RELEASING before release." && false)\r
+-      @echo "Good."\r
++      @wget -q -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \\r
++      case $$? in \\r
++          8) echo "Good." ;; \\r
++          0) echo "Ouch."; \\r
++           echo "Found: $(RELEASE_URL)/$(TAR_FILE)"; \\r
++           echo "Refusing to replace an existing release."; \\r
++           echo "Don't forget to update \"version\" as described in RELEASING before release." ; \\r
++           false ;; \\r
++        *) echo "An unexpected error occured"; \\r
++           false;; esac\r
+ \r
+ # The user has not set any verbosity, default to quiet mode and inform the\r
+ # user how to enable verbose compiles.\r
+-- \r
+1.7.5.4\r
+\r