Source: icon
Version: 9.4.3-4.2
Severity: wishlist
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org

Hi!

While working on the "reproducible builds" effort [1], we have noticed
that icon could not be built reproducibly.
It has timestamps in the gzip headers of documentation files and embeds
the build date into the binary.

The attached patch fixes this.

Regards,
 Reiner

[1]: https://wiki.debian.org/ReproducibleBuilds
diff --git a/debian/rules b/debian/rules
index 6d1b9a7..cc7358b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,8 +97,8 @@ binary-icont: checkroot build-icont test-icont
 #	install -o root -g root -m 755 debian/icont-wrapper debian/tmp-icont/usr/bin/icont
 # Compress documentation...
 	test -f debian/tmp-icont/usr/share/doc/icont/changelog.Debian.gz || \
-		gzip -9 debian/tmp-icont/usr/share/doc/icont/changelog.Debian
-	-gzip -9rq debian/tmp-icont/usr/share/man
+		gzip -9n debian/tmp-icont/usr/share/doc/icont/changelog.Debian
+	-gzip -9rqn debian/tmp-icont/usr/share/man
 #	(cd debian/tmp-icont/usr/share/man/man1 && ln -sf icont.1.gz icont.real.1.gz)
 # Fix permissions...
 	chmod -R u=rwX,go=rX debian/tmp-icont
@@ -126,8 +126,8 @@ binary-iconx: checkroot build-icont
 		debian/tmp-iconx/usr/share/doc/iconx/changelog.Debian
 # Compress documentation...
 	test -f debian/tmp-iconx/usr/share/doc/iconx/changelog.Debian.gz || \
-		gzip -9 debian/tmp-iconx/usr/share/doc/iconx/changelog.Debian
-	-gzip -9rq debian/tmp-iconx/usr/share/man
+		gzip -9n debian/tmp-iconx/usr/share/doc/iconx/changelog.Debian
+	-gzip -9rqn debian/tmp-iconx/usr/share/man
 # Fix permissions...
 	chmod -R u=rwX,go=rX debian/tmp-iconx
 	chown -R root.root debian/tmp-iconx
@@ -159,8 +159,8 @@ binary-iconc: checkroot build-iconc
 		debian/tmp-iconc/usr/share/doc/iconc/changelog.Debian
 # Compress documentation...
 	test -f debian/tmp-iconc/usr/share/doc/iconc/changelog.Debian.gz || \
-		gzip -9 debian/tmp-iconc/usr/share/doc/iconc/changelog.Debian
-	-gzip -9rq debian/tmp-iconc/usr/share/man
+		gzip -9n debian/tmp-iconc/usr/share/doc/iconc/changelog.Debian
+	-gzip -9rqn debian/tmp-iconc/usr/share/man
 # Fix permissions...
 	chmod -R u=rwX,go=rX debian/tmp-iconc
 	chown -R root.root debian/tmp-iconc
@@ -186,9 +186,9 @@ binary-ipl: checkroot build-ipl
 		debian/tmp-ipl/usr/share/doc/icon-ipl/changelog.Debian
 # Compress documentation...
 	find debian/tmp-ipl/usr/share/doc/icon-ipl -type f -size +6k -print | \
-		xargs --no-run-if-empty gzip -9
+		xargs --no-run-if-empty gzip -9n
 	test -f debian/tmp-ipl/usr/share/doc/icon-ipl/changelog.Debian.gz || \
-		gzip -9 debian/tmp-ipl/usr/share/doc/icon-ipl/changelog.Debian
+		gzip -9n debian/tmp-ipl/usr/share/doc/icon-ipl/changelog.Debian
 # Fix permissions...
 	chmod -R u=rwX,go=rX debian/tmp-ipl
 	chown -R root.root debian/tmp-ipl
diff --git a/src/icont/tunix.c b/src/icont/tunix.c
index bff6988..9e94394 100644
--- a/src/icont/tunix.c
+++ b/src/icont/tunix.c
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
             iconxloc = "";
             break;
          case 'V':			/* -V: print version information */
-            fprintf(stderr, "%s  (%s, %s)\n", Version, Config, __DATE__);
+            fprintf(stderr, "%s  (%s)\n", Version, Config);
             if (optind == argc)
                exit(0);
             break;
diff --git a/src/runtime/imain.r b/src/runtime/imain.r
index 424a4f6..1745153 100644
--- a/src/runtime/imain.r
+++ b/src/runtime/imain.r
@@ -259,7 +259,7 @@ int *ip;
           * Announce version on stderr if -V is given.
           */
          case 'V':
-            fprintf(stderr, "%s  (%s, %s)\n", Version, Config, __DATE__);
+            fprintf(stderr, "%s  (%s)\n", Version, Config);
 	    if (!argv[2])
 	       exit(0);
             break;

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Reply via email to