Your message dated Wed, 19 Oct 2022 15:24:40 +0000
with message-id <e1olavw-00fvbs...@fasolo.debian.org>
and subject line Bug#979021: fixed in lirc 0.10.1-7.1
has caused the Debian Bug report #979021,
regarding lirc: reproducible builds: Embeds different paths to "modinfo" and
"sh"
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 ow...@bugs.debian.org
immediately.)
--
979021: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=979021
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: lirc
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: usrmerge
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Various files embed paths to "modinfo" and "sh" differently on a
non-usrmerge vs. usrmerge system.
https://tests.reproducible-builds.org/debian/rb-pkg/bullseye/i386/diffoscope-results/lirc.html
/usr/lib/x86_64-linux-gnu/python3.9/site-packages/lirc/config.py
MODINFO·=·"/sbin/modinfo"
vs.
MODINFO·=·"/usr/sbin/modinfo"
/usr/include/lirc/config.h
#define·SH_PATH·"/bin/sh"
vs.
#define·SH_PATH·"/usr/bin/sh"
The attached patches fix this by patching configure.ac to accept the
MODINFO variable, and passing the SH_PATH and MODINFO variables to
configure.
Thanks for maintaining lirc!
live well,
vagrant
From 63155d63989f7470ce5231e4846029cd8b20be34 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Sat, 2 Jan 2021 01:04:17 +0000
Subject: [PATCH 2/3] debian/patches: Add patch to support passing MODINFO to
configure.
---
...figure.ac-to-support-passing-MODINFO.patch | 25 +++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 26 insertions(+)
create mode 100644 debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch
diff --git a/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch b/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch
new file mode 100644
index 0000000..fd4d9f8
--- /dev/null
+++ b/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch
@@ -0,0 +1,25 @@
+From 6f3ba4fa2b98d7fede17da5888fb8e00fb54dba4 Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagr...@reproducible-builds.org>
+Date: Sat, 2 Jan 2021 01:03:10 +0000
+Subject: [PATCH] Patch configure.ac to support passing MODINFO.
+
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 58347d8..1d910b0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,8 +25,6 @@ AC_CHECK_PROGS([MODINFO], [modinfo], [no], [$PATH:/sbin:/usr/sbin])
+ if test x$MODINFO = xno; then
+ AC_MSG_WARN(["No modinfo command found - skipping kernel drivers."])
+ MODINFO="false"
+-else
+- MODINFO=$( PATH=$PATH:/sbin:/usr/sbin which modinfo )
+ fi
+ AC_SUBST(MODINFO)
+ AC_CHECK_PROG([PKGCONFIG],[pkg-config],[yes],[no])
+--
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 7797a6c..0dbfd25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
0007-python3.8.diff
0008-doxyfile-Don-t-include-full-pathname-961954.patch
0009-Do-not-embed-build-date-and-kernel-version-in-variou.patch
+0010-Patch-configure.ac-to-support-passing-MODINFO.patch
--
2.20.1
From c4e6f2360108bf15d23684290f56e09e78a6fc1e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Sat, 2 Jan 2021 00:47:10 +0000
Subject: [PATCH 3/3] debian/rules: Pass MODINFO and SH_PATH to configure.
The paths to "modinfo" and "sh" may vary as either located in /bin and
/sbin or in /usr/bin and /usr/sbin if the system is configured as a
usrmerge system. Use the non-usrmerge paths for the most compatible
location.
---
debian/rules | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/debian/rules b/debian/rules
index 84787ef..446510f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,14 @@ override_dh_autoreconf:
override_dh_auto_configure:
ifeq ($(DEB_BUILD_ARCH_OS), linux)
dh_auto_configure -- \
+ SH_PATH=/bin/sh \
+ MODINFO=/sbin/modinfo \
--enable-uinput --enable-devinput \
--enable-silent-rules
else
dh_auto_configure -- \
+ SH_PATH=/bin/sh \
+ MODINFO=/sbin/modinfo \
--disable-uinput --disable-devinput \
--enable-silent-rules
endif
--
2.20.1
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Source: lirc
Source-Version: 0.10.1-7.1
Done: Micha Lenk <mi...@debian.org>
We believe that the bug you reported is fixed in the latest version of
lirc, 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 979...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Micha Lenk <mi...@debian.org> (supplier of updated lirc 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 ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 16 Oct 2022 13:31:28 +0200
Source: lirc
Architecture: source
Version: 0.10.1-7.1
Distribution: unstable
Urgency: medium
Maintainer: Debian Lirc Team <team+debian-l...@tracker.debian.org>
Changed-By: Micha Lenk <mi...@debian.org>
Closes: 979021
Changes:
lirc (0.10.1-7.1) unstable; urgency=medium
.
* Non-maintainer upload.
* debian/patches: Add patch to support passing MODINFO to configure.
* debian/rules: Pass MODINFO and SH_PATH to configure. The paths to "modinfo"
and "sh" may vary as either located in /bin and /sbin or in /usr/bin and
/usr/sbin if the system is configured as a usrmerge system. Use the
non-usrmerge paths for the most compatible location (closes: #979021).
Checksums-Sha1:
e09c289fd856f910418b54178bef75fcafedd211 2663 lirc_0.10.1-7.1.dsc
a96698ccb90c5e87335128b293571c620238cd8c 39952 lirc_0.10.1-7.1.debian.tar.xz
3c6a8005740549e83ed2f0a80cef631a394ae204 8438 lirc_0.10.1-7.1_source.buildinfo
Checksums-Sha256:
c7a682cb3113b5fa6a779702cccd6fcf82448cb238670220d77168e09e7f2005 2663
lirc_0.10.1-7.1.dsc
d9c2fb2012a486fee0ffad078371f80aedc98c82dd333f74ea96d381367f5fd9 39952
lirc_0.10.1-7.1.debian.tar.xz
b941d6181513524c149d946aad842c3491b448fb06bb88243efc428075316ca7 8438
lirc_0.10.1-7.1_source.buildinfo
Files:
60e91c7cc8809c746cf9d5dddd1a8fa7 2663 utils optional lirc_0.10.1-7.1.dsc
8d50e2251fcd31f1d5c3e046a1f96e16 39952 utils optional
lirc_0.10.1-7.1.debian.tar.xz
fcb85fcac30e747520bef12bd03f14bc 8438 utils optional
lirc_0.10.1-7.1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEo+u0H8Wr1nXO5BxF6mymuVG4UTkFAmNMB1AACgkQ6mymuVG4
UTmS6Q/+NR6iL96pd2eqESnA588pJ1J9uhnpTLQtNcCwHsXol+ML/e/WyiGqNMwA
G9ecqnHCV6wBceqNMydOtFiLCFb0aYydNVVMYRUGpK5tlrV9RO40bG3qi+sHiaRp
EwR+My5DkuAwAgGljIFWjCiGZ88llVX9JpjJLeh9fsveM4XhYSwkDKWRuk3BDxHu
gjN1H8BcxhGIcRR5ghIc6QPE5z/20mASsTSmtH/S5M326yCran3OK+L3wtObf7w9
aFdIHof/NKyupowGzm/1HhFhCEgIT74qQy0bYSGz+ckvPAr/ubWxot2jYLWbTbk8
JGTVPDMHpEymixsoEx+sNg7PGjo22Et1u9maa9uvWO74lhfDKE4zAXdalEaLVpWt
C8+OwtdFT/dYJKT9FRr9fvo1XsNiri1IGlHWPbuLgNsHsTk67WowpJTZLpe2wSyS
zPLid8jh9vk1tBKVDDMBxl78me/yek3kd7yPMq6Cg9IDO+POElKW2fbWUq70mv4s
QPpQwxhTG42312H5dCqfD7Fla/6Qc42tJKHpWs58VcWcsU+v4TqdktP+cGjX5Llr
FC6XuUxTWRZoTxaSInpsBYgFM2lodxRM3xXxBGPNv3vCeb8bFU52SZAErFbmGCzF
q0FMxNeWAbH0O1YjhXgKld66ABZFR6RcVQQk8nUC4LO+pTQZy50=
=tHgl
-----END PGP SIGNATURE-----
--- End Message ---
