Control: tags 913734 pending Control: tags 829715 pending Uploaded an NMU to DELAYED/10 fixing the cross building and reproducible builds patches submitted in 2018 and 2016:
diff -Nru snake4-1.0.14/debian/changelog snake4-1.0.14/debian/changelog --- snake4-1.0.14/debian/changelog 2014-08-18 06:07:37.000000000 -0700 +++ snake4-1.0.14/debian/changelog 2022-10-06 13:24:22.000000000 -0700 @@ -1,3 +1,16 @@ +snake4 (1.0.14-1.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Reiner Herrmann ] + * Strip build date/user to enable reproducible building. + (Closes: #829715) + + [ Helmut Grohne ] + * Fix FTCBFS: Don't strip during make install. (Closes: #913734) + + -- Vagrant Cascadian <vagr...@reproducible-builds.org> Thu, 06 Oct 2022 13:24:22 -0700 + snake4 (1.0.14-1) unstable; urgency=medium * New upstream release diff -Nru snake4-1.0.14/debian/patches/makefile-use-install-variable-rather-tha.patch snake4-1.0.14/debian/patches/makefile-use-install-variable-rather-tha.patch --- snake4-1.0.14/debian/patches/makefile-use-install-variable-rather-tha.patch 1969-12-31 16:00:00.000000000 -0800 +++ snake4-1.0.14/debian/patches/makefile-use-install-variable-rather-tha.patch 2022-10-06 13:24:22.000000000 -0700 @@ -0,0 +1,40 @@ +From: Helmut Grohne <hel...@subdivi.de> +Date: Wed, 14 Nov 2018 14:00:58 +0100 +X-Dgit-Generated: 1.0.14-1.1 cc12e06821c48f4a94bfa55ea275a6de3b2979b9 +Subject: Makefile: Use INSTALL variable rather than hard-coded install. + +Patch from https://bugs.debian.org/913734 + +Patch description by Vagrant Cascadian <vagr...@reproducible-builds.org> + +--- + +diff --git a/Makefile b/Makefile +index bf234f9..6ac7b99 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,6 +63,7 @@ DEFINES = -DVERSION=\"$(VERSION)\" \ + ########################################################################### + + CC = gcc ++INSTALL ?= install + + OPTIM = -s -O2 + CCOPT = -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS) +@@ -90,12 +91,12 @@ clean: + rm -f *.o core depend *~ $(PROG) + + install: $(PROG) +- install -d -m 755 $(INSTBINDIR) $(INSTLIBDIR) $(INSTMANDIR) +- install -s -m 4755 -o $(OWNER) -g $(GROUP) $(PROG) $(INSTBINDIR) ++ $(INSTALL) -d -m 755 $(INSTBINDIR) $(INSTLIBDIR) $(INSTMANDIR) ++ $(INSTALL) -s -m 4755 -o $(OWNER) -g $(GROUP) $(PROG) $(INSTBINDIR) + ln -sf $(PROG) $(INSTBINDIR)/snake4scores +- install -m 644 $(DIST).6 $(INSTMANDIR) ++ $(INSTALL) -m 644 $(DIST).6 $(INSTMANDIR) + if test ! -f $(SCOREFILE); then \ +- install -m 644 -o $(OWNER) -g $(GROUP) \ ++ $(INSTALL) -m 644 -o $(OWNER) -g $(GROUP) \ + $(SCOREBASEFILE) $(INSTLIBDIR); fi + + depend dep: diff -Nru snake4-1.0.14/debian/patches/series snake4-1.0.14/debian/patches/series --- snake4-1.0.14/debian/patches/series 2014-08-18 04:43:09.000000000 -0700 +++ snake4-1.0.14/debian/patches/series 2022-10-06 13:24:22.000000000 -0700 @@ -1,3 +1,5 @@ useless-linkage.patch hardening.patch standard-install-directories.patch +strip-build-dateuser-to-enable-reproduci.patch +makefile-use-install-variable-rather-tha.patch diff -Nru snake4-1.0.14/debian/patches/strip-build-dateuser-to-enable-reproduci.patch snake4-1.0.14/debian/patches/strip-build-dateuser-to-enable-reproduci.patch --- snake4-1.0.14/debian/patches/strip-build-dateuser-to-enable-reproduci.patch 1969-12-31 16:00:00.000000000 -0800 +++ snake4-1.0.14/debian/patches/strip-build-dateuser-to-enable-reproduci.patch 2022-10-06 13:24:22.000000000 -0700 @@ -0,0 +1,35 @@ +From: Reiner Herrmann <rei...@reiner-h.de> +Date: Tue, 5 Jul 2016 16:43:38 +0200 +X-Dgit-Generated: 1.0.14-1.1 a00bd8404731fe2738413108aee6fcb249a5727e +Subject: Strip build date/user to enable reproducible building (Closes: #829715). + + +--- + +diff --git a/Makefile b/Makefile +index bfe5a78..bf234f9 100644 +--- a/Makefile ++++ b/Makefile +@@ -57,8 +57,6 @@ GROUP = games + SCOREBASEFILE = $(PROG).score + SCOREFILE = $(INSTLIBDIR)/$(SCOREBASEFILE) + DEFINES = -DVERSION=\"$(VERSION)\" \ +- "-DCOMPILED_DATE=\"$(COMPILED_DATE)\"" \ +- "-DCOMPILED_BY=\"$(COMPILED_BY)\"" \ + -DSCOREFILE=\"$(SCOREFILE)\" \ + -DXK_MISCELLANY -DXK_LATIN1 + +diff --git a/snake4.c b/snake4.c +index 13c5b25..1180adc 100644 +--- a/snake4.c ++++ b/snake4.c +@@ -31,8 +31,7 @@ static void + version(void) + { + printf( +- "snake4 " VERSION ", by Sverre H. Huseby " +- "(compiled " COMPILED_DATE " by " COMPILED_BY ")\n" ++ "snake4 " VERSION ", by Sverre H. Huseby\n" + ); + exit(0); + } diff -Nru snake4-1.0.14/debian/rules snake4-1.0.14/debian/rules --- snake4-1.0.14/debian/rules 2014-08-14 16:45:50.000000000 -0700 +++ snake4-1.0.14/debian/rules 2022-10-06 13:24:22.000000000 -0700 @@ -5,6 +5,9 @@ %: dh $@ --parallel +override_dh_auto_install: # drop with debhelper compat 10 + dh_auto_install -- 'INSTALL=install --strip-program=true' + override_dh_fixperms: chown 'root:games' debian/snake4/usr/games/snake4 chmod 2755 debian/snake4/usr/games/snake4
signature.asc
Description: PGP signature
