Tagged rc8; Mac gitian build checksum check (for cpio download)

yedino · Feb 14, 2017 · d4502de · d4502de
1 parent d82e434
commit d4502de
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,6 @@
 # Galaxy42 - Changelog
 
-### Version v0.3.1b (pre-alpha) [up to Release Candidate: rc7]
+### Version v0.3.1b (pre-alpha) [up to Release Candidate: rc8]
 
 * Important changes:
   * Fixed segfault (nullptr deref) when peered peer with wrong ipv6 (remote attack: crash)!
@@ -29,7 +29,7 @@
   * Mac OS X users:
     * Gitian for Mac OS X - produces deterministic binary.
     * Gitian for Mac OS X - now generates the .dmg installer [in rc4].
-    * Gitian for Mac OS X - now the resulting .dmg is *almost* deterministic [in rc7] (only top-level xar is not tested, cpio should be ok).
+    * Gitian for Mac OS X - now the resulting .dmg is *almost* deterministic [in rc8].
 * Misc:
   * Precompiled headers (with Cotire for CMake) for build speed (tested on Linux, MSVC).
   * Using Jenkins to help with QA of Gitian.

diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ For more details, including correct naming and **glossary**, and advanced techni
 
 ## Release notes
 
-### Version v0.3.1b (pre-alpha) [up to Release Candidate: rc7]
+### Version v0.3.1b (pre-alpha) [up to Release Candidate: rc8]
 
 * Important changes:
   * Fixed segfault (nullptr deref) when peered peer with wrong ipv6 (remote attack: crash)!
@@ -81,7 +81,7 @@ For more details, including correct naming and **glossary**, and advanced techni
   * Mac OS X users:
     * Gitian for Mac OS X - produces deterministic binary.
     * Gitian for Mac OS X - now generates the .dmg installer [in rc4].
-    * Gitian for Mac OS X - now the resulting .dmg is *almost* deterministic [in rc7] (only top-level xar is not tested, cpio should be ok).
+    * Gitian for Mac OS X - now the resulting .dmg is *almost* deterministic [in rc8].
 * Misc:
   * Precompiled headers (with Cotire for CMake) for build speed (tested on Linux, MSVC).
   * Using Jenkins to help with QA of Gitian.

diff --git a/contrib/macdeploy/build-cpio.sh b/contrib/macdeploy/build-cpio.sh
@@ -18,10 +18,24 @@ build_cpio () {
 
 	pushd "${BUILD_DIR}"
 			printf "clean previous build\n"
-			rm -rf ${prog_name}
+			rm -rf "${prog_name}"
+			rm -rf "${prog_name}.tar.gz"
 
 			printf "build ${prog_name} in ${BUILD_DIR}\n"
-			wget "${source}"
+			wget "${source}" -O "${prog_name}.tar.gz"
+
+			sum_expected="640a6980273b699dba147e7b656440d3bd09c1c3ac71650f218ca1e4b4309c04b391ff2a8569e12d7a95827dd2781ab369542de20cc3c26dab3431f2efbdc905"
+			sum_now=$(sha512sum "cpio-2.12.tar.gz" | cut -f1 -d' ')
+			echo "Sum of downloaded file: $sum_now"
+			if [ "$sum_now" != "$sum_expected" ] ; then
+				pwd ; ls -l ;
+				echo "Invalid checksum ($prog_name) got $sum_now instead of expected $sum_expected)"
+				exit 1 # <--- exit
+			else
+				echo "Checksum is OK"
+			fi
+
+
 			tar -xf "${prog_name}.tar.gz"
 
 			pushd "cpio-2.12"
@@ -32,5 +46,7 @@ build_cpio () {
 		   popd
    popd
 }
+
 build_cpio
 
+