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

Bug#1011402: marked as done (razor: reproducible-builds: embedded build paths in deHTMLxs.so)

Your message dated Sat, 21 May 2022 23:49:30 +0000
with message-id <E1nsYqg-000IGl-Qb@fasolo.debian.org>
and subject line Bug#1011402: fixed in razor 1:2.85-6
has caused the Debian Bug report #1011402,
regarding razor: reproducible-builds: embedded build paths in deHTMLxs.so
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.)


-- 
1011402: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011402
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: razor
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/lib/x86_64-linux-gnu/perl5/5.34/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.so:

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

  /build/1st/razor-2.85/Razor2-Preproc-deHTMLxs/_deHTMLxs.c:56
  vs.
  /build/2/razor-2.85/2nd/Razor2-Preproc-deHTMLxs/_deHTMLxs.c:56

The attached patch fixes this by updating to use debhelper compat level
13 and switching to use "dh" in debian/rules. This passes the default
CFLAGS from dpkg-buildflags, which includes the -ffile-prefix-map
argument to avoid embedding the absolute path in compiled files.

To make the switch, it was also easiest to also switch to "3.0 (quilt)"
at the same time, so this also closes #1007665.


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


live well,
  vagrant

From b4521516222b4d2b26d947bdc7fa320eed960071 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Fri, 20 May 2022 06:02:16 +0000
Subject: [PATCH 02/13] Switch to debhelper compat 13, dh and source format
 "3.0 (quilt)". (Closes: #1007665)

---
 debian/compat        |  1 -
 debian/control       |  2 +-
 debian/rules         | 67 ++++++--------------------------------------
 debian/source/format |  1 +
 4 files changed, 10 insertions(+), 61 deletions(-)
 delete mode 100644 debian/compat
 create mode 100644 debian/source/format

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
index 107b676..a0ac766 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: razor
 Section: mail
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 7), libnet-dns-perl, libtime-hires-perl | perl (>= 5.8), liburi-perl, quilt (>= 0.40)
+Build-Depends: debhelper-compat (= 13), libnet-dns-perl, libtime-hires-perl | perl (>= 5.8), liburi-perl
 Standards-Version: 3.8.1
 Homepage: http://razor.sourceforge.net
 Vcs-git: git://git.debian.org/git/users/derevko-guest/razor.git
diff --git a/debian/rules b/debian/rules
index f76f976..af29c29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,20 @@
 #!/usr/bin/make -f
-# 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
-
-include /usr/share/quilt/quilt.make
 
 ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+%:
+	dh $@
 
-build: $(QUILT_STAMPFN) configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	perl Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
+override_dh_auto_build:
+	dh_auto_build
 	pod2text Changes > changelog
-	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	[ ! -f Makefile ] || $(MAKE) realclean
+override_dh_auto_clean:
 	rm -f changelog
-	dh_clean
+	dh_auto_clean -- realclean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/razor
+override_dh_auto_install:
+	dh_auto_install
 	echo "# See razor-agent.conf (5)" > $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
 	echo "# Change this to 5 for safer classification of MIME attachments.  This will let more spam through"  >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
 	echo "logic_method = 4" >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
@@ -44,33 +23,3 @@ install: build
 	cp $(CURDIR)/debian/razor-client.1p $(CURDIR)/debian/razor/usr/share/man/man1
 	mv $(CURDIR)/debian/razor/$(ARCHLIB)/Razor2/* $(CURDIR)/debian/razor/usr/share/perl5/Razor2/
 	rmdir $(CURDIR)/debian/razor/$(ARCHLIB)/Razor2
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs changelog
-	dh_installlogrotate
-	dh_installlogcheck
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-build-arch: build
-build-indep: build
-binary: binary-arch binary-indep
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
-- 
2.35.1

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: razor
Source-Version: 1:2.85-6
Done: Vagrant Cascadian <vagrant@reproducible-builds.org>

We believe that the bug you reported is fixed in the latest version of
razor, 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 1011402@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Vagrant Cascadian <vagrant@reproducible-builds.org> (supplier of updated razor 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: Sat, 21 May 2022 16:19:56 -0700
Source: razor
Architecture: source
Version: 1:2.85-6
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Vagrant Cascadian <vagrant@reproducible-builds.org>
Closes: 1007665 1011402
Changes:
 razor (1:2.85-6) unstable; urgency=medium
 .
   * QA upload.
   * debian/changelog: Remove trailing whitespace.
   * Switch to debhelper compat 13, dh and source format "3.0 (quilt)".
     (Closes: #1007665, #1011402)
   * debian/control: Drop obsolete "DM-Upload-Allowed" field.
   * debian/control: Set Rules-Requires-Root to "no".
   * debian/control: Remove outdated Vcs-* fields.
   * debian/control: Add ${misc:Depends} to Depends.
   * debian/postinst: Remove obsolete check.
   * debian/control: Update to Standards-Version 4.6.1.
Checksums-Sha1:
 b1eef8476933c77c5dfd36d5a1d3e577e6e71373 1188 razor_2.85-6.dsc
 51325eac7749b799a8e4d45c67d7fcd7d4d346c9 13996 razor_2.85-6.debian.tar.xz
 a1fb0f02e7b07fea2e3bcbf648e211f7858c1cd3 5501 razor_2.85-6_arm64.buildinfo
Checksums-Sha256:
 c900c666f30632d8b92443192904ac5969c44dd234602ad56a0576ee15e22afa 1188 razor_2.85-6.dsc
 35b5bc29259c14c2627f8e23e038bd25d9dd6a4db780cc62a6157241a9d5f368 13996 razor_2.85-6.debian.tar.xz
 a2a1dfd37e90160e4fd5a7c4bcf4afd5bafc2712e0056b4c58b6a7719bc40d8b 5501 razor_2.85-6_arm64.buildinfo
Files:
 3b3171a7e80d3d82d5dd1e0ec671ae7c 1188 mail optional razor_2.85-6.dsc
 a8cc232215ba09caf42cc6957904904f 13996 mail optional razor_2.85-6.debian.tar.xz
 d8c157d6afff7c8ab67e4a8806a7e543 5501 mail optional razor_2.85-6_arm64.buildinfo

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

iJYEARYKAD4WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYol4/CAcdmFncmFudEBy
ZXByb2R1Y2libGUtYnVpbGRzLm9yZwAKCRDcUY/If5cWqnVHAP0Qx7s4kbu5TKvj
LsKT91zG53LowHGoOXbbASujwXsp3wEA0k0D0HMAzVzb87Im2sF5v407NElL3AxK
6F67qbBsYgQ=
=1MyH
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: