From 8d5c945470c22e1aaf4aa8c62c22315c50bab233 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 10 Feb 2016 20:04:28 -0800
Subject: [PATCH 1/5] release.sh: autopin letsencrypt-auto autopeep autohashes

---
 tools/release.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tools/release.sh b/tools/release.sh
index 83b57657f..ee9c30704 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -161,6 +161,23 @@ for module in letsencrypt $subpkgs_modules ; do
 done
 deactivate
 
+# pin peep hashes of the things we just built
+for pkg in acme letsencrypt letsencrypt-apache ; do
+    echo
+    peep hash dist."$version/$pkg"/*.{whl,gz}
+    echo $pkg==$version
+done > /tmp/hashes.$$
+
+if ! wc -l /tmp/hashes.$$ | grep -qE "^12 " ; then
+    echo Unexpected peep hash output
+    exit 1
+fi
+
+# perform hideous surgery on requirements.txt...
+head -n -12 letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt > /tmp/req.$$
+cat /tmp/hashes.$$ >> /tmp/req.$$
+cp /tmp/req.$$ letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt
+
 # ensure we have the latest built version of leauto
 letsencrypt-auto-source/build.py
 

From 805e85dd64fe907217ae4c1ed99cd33aa5b89ae7 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Tue, 16 Feb 2016 12:34:35 -0800
Subject: [PATCH 2/5] Make requirements.txt safe for editing

---
 .../pieces/letsencrypt-auto-requirements.txt          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt b/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt
index c83396de2..111a4abb6 100644
--- a/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt
+++ b/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt
@@ -201,6 +201,13 @@ zope.event==4.1.0
 # sha256: sJyMHUezUxxADgGVaX8UFKYyId5u9HhZik8UYPfZo5I
 zope.interface==4.1.3
 
+# sha256: uDndLZwRfHAUMMFJlWkYpCOphjtIsJyQ4wpgE-fS9E8
+# sha256: j4MIDaoknQNsvM-4rlzG_wB7iNbZN1ITca-r57Gbrbw
+mock==1.0.1
+
+# THE LINES BELOW ARE EDITED BY THE RELEASE SCRIPT,
+# ADD ALL DEPENDENCIES ABOVE
+
 # sha256: QMIkIvGF3mcJhGLAKRX7n5EVIPjOrfLtklN6ePjbJes
 # sha256: fNFWiij6VxfG5o7u3oNbtrYKQ4q9vhzOLATfxNlozvQ
 acme==0.3.0
@@ -212,7 +219,3 @@ letsencrypt==0.3.0
 # sha256: EypLpEw3-Tr8unw4aSFsHXgRiU8ZYLrJKOJohP2tC9M
 # sha256: HYvP13GzA-DDJYwlfOoaraJO0zuYO48TCSAyTUAGCqA
 letsencrypt-apache==0.3.0
-
-# sha256: uDndLZwRfHAUMMFJlWkYpCOphjtIsJyQ4wpgE-fS9E8
-# sha256: j4MIDaoknQNsvM-4rlzG_wB7iNbZN1ITca-r57Gbrbw
-mock==1.0.1

From a8089a43da05e3de527e07d50b144345fab751a2 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 29 Feb 2016 12:56:34 -0800
Subject: [PATCH 3/5] Use local peep

---
 tools/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/release.sh b/tools/release.sh
index fcb8d13c6..bc61db85d 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -164,7 +164,7 @@ deactivate
 # pin peep hashes of the things we just built
 for pkg in acme letsencrypt letsencrypt-apache ; do
     echo
-    peep hash dist."$version/$pkg"/*.{whl,gz}
+    letsencrypt-auto-source/pieces/peep.py hash dist."$version/$pkg"/*.{whl,gz}
     echo $pkg==$version
 done > /tmp/hashes.$$
 

From bbea71760c26a3045ba028f106063f0247210b5c Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 29 Feb 2016 13:24:12 -0800
Subject: [PATCH 4/5] grammar

---
 .../pieces/letsencrypt-auto-requirements.txt                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt b/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt
index b38b941b3..32896b8f4 100644
--- a/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt
+++ b/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt
@@ -201,7 +201,7 @@ zope.interface==4.1.3
 # sha256: j4MIDaoknQNsvM-4rlzG_wB7iNbZN1ITca-r57Gbrbw
 mock==1.0.1
 
-# THE LINES BELOW ARE EDITED BY THE RELEASE SCRIPT,
+# THE LINES BELOW ARE EDITED BY THE RELEASE SCRIPT;
 # ADD ALL DEPENDENCIES ABOVE
 
 # sha256: ilvjjTWOS86xchl0WBZ0YOAw_0rmqdnjNsxb1hq2RD8

From 3b0a95ff97f18c6f2ad484184b85d719ce362484 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 29 Feb 2016 13:26:48 -0800
Subject: [PATCH 5/5] compatibility++

---
 tools/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/release.sh b/tools/release.sh
index bc61db85d..78babcff2 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -168,7 +168,7 @@ for pkg in acme letsencrypt letsencrypt-apache ; do
     echo $pkg==$version
 done > /tmp/hashes.$$
 
-if ! wc -l /tmp/hashes.$$ | grep -qE "^12 " ; then
+if ! wc -l /tmp/hashes.$$ | grep -qE "^\s*12 " ; then
     echo Unexpected peep hash output
     exit 1
 fi