Control: tags -1 patch
On Sat, 7 Dec 2024 20:38:28 +0100 Niels Thykier wrote:
Source: logapp
Version: 0.16-2
Severity: important
Tags: ftbfs
Justification: FTBFS
X-Debbugs-Cc: ni...@thykier.net
User: ni...@thykier.net
Usertags: rrr-no-as-default-issue
Dear maintainer,
During a test rebuild for building packages with
`Rules-Requires-Root: no` as the default in `dpkg`,
logapp failed to rebuild.
Log Summary:
---
[...]
Hi
Please see attached as a patch.
I intend to NMU to make progress on the MBF if I do not hear from you on
this. It would help me if you either uploaded this soon or approved the
NMU (enabling me to skip the delay). Thanks in advance.
Best regards,
Niels
diff -Nru logapp-0.16/debian/changelog logapp-0.16/debian/changelog
--- logapp-0.16/debian/changelog2023-01-11 05:01:52.0 +0100
+++ logapp-0.16/debian/changelog2025-01-01 10:26:50.0 +0100
@@ -1,3 +1,12 @@
+logapp (0.16-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove need for root when building the package.
+(Closes: #1089377)
+ * Pass `-n` to `gzip` to aid reproducibility.
+
+ -- Niels Thykier Wed, 01 Jan 2025 09:26:50 +
+
logapp (0.16-2) unstable; urgency=medium
* Patch from Chris Lamb: The md5sums file is "manually" generated, and
diff -Nru logapp-0.16/debian/control logapp-0.16/debian/control
--- logapp-0.16/debian/control 2023-01-11 05:01:08.0 +0100
+++ logapp-0.16/debian/control 2025-01-01 10:26:45.0 +0100
@@ -3,6 +3,7 @@
Priority: optional
Maintainer: Kumar Appaiah
Build-Depends: quilt
+Rules-Requires-Root: no
Standards-Version: 4.4.1
Homepage: http://logapp.sourceforge.net/
Vcs-Browser: https://salsa.debian.org/akumar/logapp
diff -Nru logapp-0.16/debian/rules logapp-0.16/debian/rules
--- logapp-0.16/debian/rules2023-01-11 05:01:52.0 +0100
+++ logapp-0.16/debian/rules2025-01-01 10:25:42.0 +0100
@@ -13,10 +13,10 @@
# Install program
INSTALL = install
-INSTALL_FILE= $(INSTALL) -p-o root -g root -m 644
-INSTALL_PROGRAM = $(INSTALL) -p-o root -g root -m 755
-INSTALL_SCRIPT = $(INSTALL) -p-o root -g root -m 755
-INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
+INSTALL_FILE= $(INSTALL) -p-m 644
+INSTALL_PROGRAM = $(INSTALL) -p-m 755
+INSTALL_SCRIPT = $(INSTALL) -p-m 755
+INSTALL_DIR = $(INSTALL) -p -d -m 755
# The installation directory
@@ -39,35 +39,35 @@
$(MAKE)
touch $@
-clean: checkroot unpatch
+clean: unpatch
$(checkdir)
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) clean
rm -rf $(PACKAGE_DIR) debian/files debian/substvars
debian/logapplogmake \
debian/logapplogsvn debian/logapplogcvs debian/logapp.substvars
-install: checkroot build
+install: build
$(checkdir)
$(INSTALL_DIR) $(PACKAGE_DIR)/usr/bin
$(MAKE) DESTDIR=$(CURDIR)/$(PACKAGE_DIR) install
# Build architecture-independent files here.
-binary-indep: checkroot build install
+binary-indep: build install
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: checkroot build install
+binary-arch: build install
$(checkdir)
$(INSTALL_DIR) $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/
for i in README TODO;do \
$(INSTALL_FILE) -m 644 $$i
$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/; \
done;
$(INSTALL_FILE) -m 644 debian/changelog
$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/changelog.Debian
- gzip -9v $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/changelog.Debian
+ gzip -9nv $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/changelog.Debian
$(INSTALL_FILE) -m 644 debian/copyright
$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/copyright
$(INSTALL_DIR) $(PACKAGE_DIR)/usr/share/man/man1
$(INSTALL_FILE) -m 644 $(PACKAGE_NAME).1
$(PACKAGE_DIR)/usr/share/man/man1
- gzip -9v $(PACKAGE_DIR)/usr/share/man/*/*
+ gzip -9nv $(PACKAGE_DIR)/usr/share/man/*/*
(cd $(PACKAGE_DIR)/usr/share/man/man1/;for i in logcvs logmake
logsvn;do ln -s logapp.1.gz $$i.1.gz; done)
# Recreate the symbolic links for the executables, to ensure that they
are relative to $PWD
(cd $(PACKAGE_DIR)/usr/bin;for i in logcvs logmake logsvn;do rm -f
"$$i"; ln -s logapp $$i; done)
@@ -80,7 +80,7 @@
$(INSTALL_DIR) $(PACKAGE_DIR)/DEBIAN
cd $(PACKAGE_DIR) && find * -type f ! -regex '^DEBIAN/.*' -print0 |
LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums
dpkg-gencontrol -p$(PACKAGE_NAME) -P$(PACKAGE_DIR)
- dpkg-deb --build $(PACKAGE_DIR) ..
+ dpkg-deb --root-owner-group --build $(PACKAGE_DIR) ..
binary: binary-indep binary-arch
@@ -88,9 +88,4 @@
test -f logapp.h && test -f debian/rules
endef
-checkroot:
- $(checkdir)
- test root = "