[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1014564: marked as done (tvtime: reproducible-builds: embedded build paths in /usr/bin/tvtime)

Your message dated Fri, 08 Jul 2022 20:25:35 +0000
with message-id <E1o9uXf-0001hE-3I@fasolo.debian.org>
and subject line Bug#1014564: fixed in tvtime 1.0.11-7
has caused the Debian Bug report #1014564,
regarding tvtime: reproducible-builds: embedded build paths in /usr/bin/tvtime
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1014564: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014564
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: tvtime
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

The build path is embedded in /usr/bin/tvtime:

  https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/tvtime.html

  /build/1st/tvtime-1.0.11/src/speedy.c:1933
  vs.
  /build/2/tvtime-1.0.11/2nd/src/speedy.c:1933

The attached patch fixes this by switching to using debhelper compat 13
and debhelper's "dh" command, which passes compiler flags to avoid
embedding the build path (e.g. -ffile-prefix-map), and avoids embedding
differing buildids via rpath (even though rpath is later stripped).


With this patch applied, tvtime should build reproducibly on
tests.reproducible-builds.org!


live well,
  vagrant

From 3d6ca922e5eb31ad71500437fc47828ac77bfa52 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Thu, 7 Jul 2022 23:18:38 +0000
Subject: [PATCH] Switch to "dh" and debhelper compat 13.

---
 debian/control |  4 +--
 debian/rules   | 94 ++++----------------------------------------------
 2 files changed, 8 insertions(+), 90 deletions(-)

diff --git a/debian/control b/debian/control
index 316a232..f2848a4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: video
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends:
- debhelper-compat (= 12),
- autotools-dev,
+ debhelper-compat (= 13),
  pkg-config,
  zlib1g-dev,
  libpng-dev,
@@ -18,7 +17,6 @@ Build-Depends:
  libxxf86vm-dev,
  libxml2-dev,
  fontforge,
- chrpath,
  libasound2-dev
 Standards-Version: 3.9.3
 Homepage: https://linuxtv.org/wiki/index.php/Tvtime
diff --git a/debian/rules b/debian/rules
index 013193d..7ef5a0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,66 +20,14 @@
 # Based on the sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-include /usr/share/dpkg/architecture.mk
+override_dh_auto_build:
+	dh_auto_build -- FONT_CFLAGS='-DFONTDIR="\"/usr/share/fonts/truetype/freefont\""'
 
-CFLAGS += -Wall
-
-config.status:
-	dh_testdir
-	dh_autoreconf
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE)       \
-	            --build=$(DEB_BUILD_GNU_TYPE)     \
-		    --prefix=/usr                     \
-		    --mandir=\$${prefix}/share/man    \
-		    --infodir=\$${prefix}/share/info  \
-		    --sysconfdir=/etc                 \
-		    --localstatedir=/var              \
-		    --with-fifogroup=video            \
-	            --without-directfb                \
-	            --without-sdl                     \
-	            --disable-silent-rules
-
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) FONT_CFLAGS='-DFONTDIR="\"/usr/share/fonts/truetype/freefont\""'
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_autoreconf_clean
-	dh_clean
-
-	rm -f po/stamp-po po/*.gmo
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tvtime.
-	$(MAKE) install prefix=$(CURDIR)/debian/tvtime/usr       \
-	                sysconfdir=$(CURDIR)/debian/tvtime/etc   \
-			localstatedir=$(CURDIR)/debian/tvtime/var
+override_dh_auto_install:
+	dh_auto_install
 	# Remove the freefont TTF.
 	rm -f $(CURDIR)/debian/tvtime/usr/share/tvtime/FreeMonoBold.ttf
 	# Remove the configuration file.
@@ -89,34 +37,6 @@ install: build
 	cp -f $(CURDIR)/docs/html/*.png $(CURDIR)/debian/tvtime/usr/share/doc/tvtime/html/
 	cp -f $(CURDIR)/docs/html/*.jpg $(CURDIR)/debian/tvtime/usr/share/doc/tvtime/html/
 	cp -f $(CURDIR)/docs/html/*.css $(CURDIR)/debian/tvtime/usr/share/doc/tvtime/html/
-	# Fix E: tvtime: binary-or-shlib-defines-rpath usr/bin/tvtime /usr/lib/x86_64-linux-gnu
-	chrpath -d $(CURDIR)/debian/tvtime/usr/bin/tvtime
 
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdebconf
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_lintian
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
+override_dh_compress:
 	dh_compress -Xdefault.tvtime.xml -Xexample.lirc
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-- 
2.36.1

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: tvtime
Source-Version: 1.0.11-7
Done: Vagrant Cascadian <vagrant@debian.org>

We believe that the bug you reported is fixed in the latest version of
tvtime, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1014564@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Vagrant Cascadian <vagrant@debian.org> (supplier of updated tvtime package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Fri, 08 Jul 2022 12:46:49 -0700
Source: tvtime
Architecture: source
Version: 1.0.11-7
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Vagrant Cascadian <vagrant@debian.org>
Closes: 1014564
Changes:
 tvtime (1.0.11-7) unstable; urgency=medium
 .
   * QA upload.
 .
   [ Debian Janitor ]
   * Trim trailing whitespace.
   * Bump debhelper from deprecated 7 to 12.
   * Set upstream metadata fields: Bug-Submit.
   * Rely on pre-initialized dpkg-architecture variables.
 .
   [ Vagrant Cascadian ]
   * Switch to "dh" and debhelper compat 13. (Closes: #1014564)
   * debian/control: Fix Vcs-* headers.
   * debian/copyright: Update links to licenses.
   * debian/control: Set Rules-Requires-Root to "no".
   * debian/control: Update Standards-Version to 4.6.1.
Checksums-Sha1:
 9edd07ebdeaac62916e992ee9d0c37b8d553a478 1448 tvtime_1.0.11-7.dsc
 4012454e0d781d93218cf6cb4b29bc97f8e7080d 40196 tvtime_1.0.11-7.debian.tar.xz
 0f99bbf9bb2257efaf13fa370b6063170057555b 9977 tvtime_1.0.11-7_arm64.buildinfo
Checksums-Sha256:
 df12d1aba511079e37e7fbc5c01118fcde12bbb46af0aa500b96fe224ceaff96 1448 tvtime_1.0.11-7.dsc
 604b19d8660b03e448b6679c4d88249b5475ce8de1963ab4d4cb0ac989376ba9 40196 tvtime_1.0.11-7.debian.tar.xz
 3974dcfcb1f6938a145563af41809de529136151765a2ffbd2f2bfd0a24dd24b 9977 tvtime_1.0.11-7_arm64.buildinfo
Files:
 af5dcd625f54bf0548e48ce349498355 1448 video optional tvtime_1.0.11-7.dsc
 e7616b8f7dd210ae4259e2337760315f 40196 video optional tvtime_1.0.11-7.debian.tar.xz
 c52118f55f1ff003740fa01d549810de 9977 video optional tvtime_1.0.11-7_arm64.buildinfo

-----BEGIN PGP SIGNATURE-----

iIkEARYKADEWIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYsiMJRMcdmFncmFudEBk
ZWJpYW4ub3JnAAoJENxRj8h/lxaq8csBAJFePScEpleC1u1/6Hd2uNE6w70syNde
hWrnmC7gBnpgAP9VJFbqMYtgtJ4h7GyjbDqY9Qd+G11hvcOc+7qOeV/rBg==
=Pjw0
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: