Bug#1011500: tuxcmd-modules: reproducible-builds: embedded build paths in various binaries
tags 1011500 + pending patch
tags 941296 + pending patch
thanks
I've just uploaded tuxcmd-modules 0.6.70+ds-5.1 to DELAYED/10:
tuxcmd-modules (0.6.70+ds-5.1) unstable; urgency=medium
.
* Non-maintainer upload.
* Apply a patch by Vagrant Cascadian to ensure that tuxcmd-modules does not
embed build paths in various binaries. (Closes: #1011500)
* Apply a patch by Helmut Grohne to make it possible to cross-build
tuxcmd-modules. (Closes: #941296)
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org / chris-lamb.co.uk
`-
diffstat for tuxcmd-modules-0.6.70+ds tuxcmd-modules-0.6.70+ds
changelog | 10 +++++
patches/reproducible-build.patch | 68 +++++++++++++++++++++++++++++++++++++++
patches/series | 1
3 files changed, 79 insertions(+)
diff -Nru tuxcmd-modules-0.6.70+ds/debian/changelog tuxcmd-modules-0.6.70+ds/debian/changelog
--- tuxcmd-modules-0.6.70+ds/debian/changelog 2013-05-10 21:00:35.000000000 +0100
+++ tuxcmd-modules-0.6.70+ds/debian/changelog 2022-11-17 17:15:30.000000000 +0000
@@ -1,3 +1,13 @@
+tuxcmd-modules (0.6.70+ds-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply a patch by Vagrant Cascadian to ensure that tuxcmd-modules does not
+ embed build paths in various binaries. (Closes: #1011500)
+ * Apply a patch by Helmut Grohne to make it possible to cross-build
+ tuxcmd-modules. (Closes: #941296)
+
+ -- Chris Lamb <lamby@debian.org> Thu, 17 Nov 2022 17:15:30 +0000
+
tuxcmd-modules (0.6.70+ds-5) unstable; urgency=low
* QA upload.
diff -Nru tuxcmd-modules-0.6.70+ds/debian/patches/reproducible-build.patch tuxcmd-modules-0.6.70+ds/debian/patches/reproducible-build.patch
--- tuxcmd-modules-0.6.70+ds/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.000000000 +0100
+++ tuxcmd-modules-0.6.70+ds/debian/patches/reproducible-build.patch 2022-11-17 17:15:30.000000000 +0000
@@ -0,0 +1,68 @@
+--- tuxcmd-modules-0.6.70+ds.orig/Makefile
++++ tuxcmd-modules-0.6.70+ds/Makefile
+@@ -1,5 +1,7 @@
+ SUBDIRS = zip libarchive gvfs
+
++export BUILDPATH = $(CURDIR)
++
+ all install clean shared static::
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+--- tuxcmd-modules-0.6.70+ds.orig/gvfs/Makefile
++++ tuxcmd-modules-0.6.70+ds/gvfs/Makefile
+@@ -9,6 +9,8 @@ CFLAGS =-I. -I/usr/include \
+ -Wall -fPIC -O2 -g \
+ -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+
++# Avoid embedding build path
++CFLAGS += -ffile-prefix-map=$(BUILDPATH)=.
+
+ # VFS_COMMON_OBJECTS=strutils.o treepathutils.o treepath_vfs.o vfsutils.o
+ VFS_COMMON_OBJECTS=
+--- tuxcmd-modules-0.6.70+ds.orig/libarchive/Makefile
++++ tuxcmd-modules-0.6.70+ds/libarchive/Makefile
+@@ -13,6 +13,9 @@ CFLAGS =-I. -I/usr/include -I$(DIR_COMMO
+ -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
+ -D__VERBOSE_DEBUGx
+
++# Avoid embedding build path
++CFLAGS += -ffile-prefix-map=$(BUILDPATH)=.
++
+ VFS_COMMON_OBJECTS=strutils.o treepathutils.o treepath_vfs.o vfsutils.o
+
+ VFS_OBJECTS=libarchive.o
+--- tuxcmd-modules-0.6.70+ds.orig/zip/Makefile
++++ tuxcmd-modules-0.6.70+ds/zip/Makefile
+@@ -12,6 +12,8 @@ CFLAGS =-I. -I$(DIR_ZIPARCHIVE) -I/usr/i
+ -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
+ -D__VERBOSE_DEBUGx
+
++# Avoid embedding build path
++CFLAGS += -ffile-prefix-map=$(BUILDPATH)=.
+
+ VFS_COMMON_OBJECTS=strutils.o treepathutils.o treepath_vfs.o vfsutils.o
+
+--- tuxcmd-modules-0.6.70+ds.orig/zip/Makefile.ziparch
++++ tuxcmd-modules-0.6.70+ds/zip/Makefile.ziparch
+@@ -19,6 +19,9 @@ CCC=cc
+ CFLAGS = -D ZIP_ARCHIVE_LNX -fPIC -g -O2
+ #CFLAGS =
+
++# Avoid embedding build path
++CFLAGS += -ffile-prefix-map=$(BUILDPATH)=.
++
+ ifdef INTERNAL_BZIP2
+ CFLAGS += -D ZIP_ARCHIVE_BZIP2_INTERNAL
+ endif
+--- tuxcmd-modules-0.6.70+ds.orig/zip/ZipArchive/Makefile
++++ tuxcmd-modules-0.6.70+ds/zip/ZipArchive/Makefile
+@@ -23,6 +23,9 @@ ifdef INTERNAL_BZIP2
+ CFLAGS += -D ZIP_ARCHIVE_BZIP2_INTERNAL
+ endif
+
++# Avoid embedding build path
++CFLAGS += -ffile-prefix-map=$(BUILDPATH)=.
++
+ ZIPARCHLIB = libziparch.a
+
+ ZIPPIELOCATION = ../Zippie/
diff -Nru tuxcmd-modules-0.6.70+ds/debian/patches/series tuxcmd-modules-0.6.70+ds/debian/patches/series
--- tuxcmd-modules-0.6.70+ds/debian/patches/series 2013-05-10 21:00:35.000000000 +0100
+++ tuxcmd-modules-0.6.70+ds/debian/patches/series 2022-11-17 17:15:30.000000000 +0000
@@ -2,3 +2,4 @@
Fix-FTBFS-because-removal-of-ARCHIVE_LIBRARY_VERSION.patch
glib-single-include.patch
fix-FTBFS-with-gcc-4.7.patch
+reproducible-build.patch
Reply to: