[med-svn] r22025 - in trunk/packages/bowtie/trunk/debian: . patches

[Sascha Steinbiss]

Author: sascha-guest
Date: 2016-05-26 08:34:02 +0000 (Thu, 26 May 2016)
New Revision: 22025

Modified:
   trunk/packages/bowtie/trunk/debian/changelog
   trunk/packages/bowtie/trunk/debian/patches/reproducible.patch
Log:
make reproducibility changes less drastic


Modified: trunk/packages/bowtie/trunk/debian/changelog
===================================================================
--- trunk/packages/bowtie/trunk/debian/changelog	2016-05-25 22:44:22 UTC (rev 22024)
+++ trunk/packages/bowtie/trunk/debian/changelog	2016-05-26 08:34:02 UTC (rev 22025)
@@ -2,7 +2,7 @@
 
   * Team upload.
   * Make build reproducible.
-    - Remove build hostname and compiler version from binary.
+    - Use fixed build hostname and compiler version.
   * Fix autopkgtest by adjusting directory.
   * Enable full hardening.
   * Bump Standards-Version.

Modified: trunk/packages/bowtie/trunk/debian/patches/reproducible.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/reproducible.patch	2016-05-25 22:44:22 UTC (rev 22024)
+++ trunk/packages/bowtie/trunk/debian/patches/reproducible.patch	2016-05-26 08:34:02 UTC (rev 22025)
@@ -9,69 +9,9 @@
 -     -DBUILD_HOST="\"`hostname`\"" \
 -     -DBUILD_TIME="\"`date`\"" \
 -     -DCOMPILER_VERSION="\"`$(CXX) -v 2>&1 | tail -1`\"" \
-+     -DBUILD_HOST="\"\"" \
-+     -DBUILD_TIME="\"\"" \
-+     -DCOMPILER_VERSION="\"\"" \
++     -DBUILD_HOST="\"Debian-reproducible\"" \
++     -DBUILD_TIME="\"`dpkg-parsechangelog --show-field Date`\"" \
++     -DCOMPILER_VERSION="\"`$(CXX) -v 2>&1 | tail -1 | sed 's/ *(.*//'`\"" \
       $(FILE_FLAGS) \
       $(PTHREAD_DEF) \
       $(PREF_DEF) \
---- a/bowtie_inspect.cpp
-+++ b/bowtie_inspect.cpp
-@@ -496,7 +496,7 @@
- 			} else {
- 				cout << "Neither 32- nor 64-bit: sizeof(void*) = " << sizeof(void*) << endl;
- 			}
--			cout << "Built on " << BUILD_HOST << endl;
-+			/* cout << "Built on " << BUILD_HOST << endl;
- 			cout << BUILD_TIME << endl;
- 			cout << "Compiler: " << COMPILER_VERSION << endl;
- 			cout << "Options: " << COMPILER_OPTIONS << endl;
-@@ -504,7 +504,7 @@
- 				 << sizeof(int)
- 				 << ", " << sizeof(long) << ", " << sizeof(long long)
- 				 << ", " << sizeof(void *) << ", " << sizeof(size_t)
--				 << ", " << sizeof(off_t) << "}" << endl;
-+				 << ", " << sizeof(off_t) << "}" << endl; */
- 			return 0;
- 		}
- 
---- a/ebwt_build.cpp
-+++ b/ebwt_build.cpp
-@@ -526,7 +526,7 @@
- 			} else {
- 				cout << "Neither 32- nor 64-bit: sizeof(void*) = " << sizeof(void*) << endl;
- 			}
--			cout << "Built on " << BUILD_HOST << endl;
-+			/* cout << "Built on " << BUILD_HOST << endl;
- 			cout << BUILD_TIME << endl;
- 			cout << "Compiler: " << COMPILER_VERSION << endl;
- 			cout << "Options: " << COMPILER_OPTIONS << endl;
-@@ -534,7 +534,7 @@
- 				 << sizeof(int)
- 				 << ", " << sizeof(long) << ", " << sizeof(long long)
- 				 << ", " << sizeof(void *) << ", " << sizeof(size_t)
--				 << ", " << sizeof(off_t) << "}" << endl;
-+				 << ", " << sizeof(off_t) << "}" << endl; */
- 			return 0;
- 		}
- 
---- a/ebwt_search.cpp
-+++ b/ebwt_search.cpp
-@@ -2837,7 +2837,7 @@
- 			} else {
- 				cout << "Neither 32- nor 64-bit: sizeof(void*) = " << sizeof(void*) << endl;
- 			}
--			cout << "Built on " << BUILD_HOST << endl;
-+			/* cout << "Built on " << BUILD_HOST << endl;
- 			cout << BUILD_TIME << endl;
- 			cout << "Compiler: " << COMPILER_VERSION << endl;
- 			cout << "Options: " << COMPILER_OPTIONS << endl;
-@@ -2845,7 +2845,7 @@
- 				 << sizeof(int)
- 				 << ", " << sizeof(long) << ", " << sizeof(long long)
- 				 << ", " << sizeof(void *) << ", " << sizeof(size_t)
--				 << ", " << sizeof(off_t) << "}" << endl;
-+				 << ", " << sizeof(off_t) << "}" << endl; */
- 			return 0;
- 		}
- 	#ifdef CHUD_PROFILING