Bug#1089383: mailagent: Supporting rootless builds by default

[Niels Thykier]

Control: tags -1 patch

On Sat, 7 Dec 2024 20:42:46 +0100 Niels Thykier <ni...@thykier.net> wrote:

Source: mailagent
Version: 1:3.1-106-1
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`,
mailagent failed to rebuild.

[...]

Please see attached as a patch.



Best regards,
Niels


diff -u mailagent-3.1-106/debian/changelog mailagent-3.1-106/debian/changelog
--- mailagent-3.1-106/debian/changelog
+++ mailagent-3.1-106/debian/changelog
@@ -1,3 +1,10 @@
+mailagent (1:3.1-106-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Make package build without requiring root. (Closes: #1089383)
+
+ -- Niels Thykier <ni...@thykier.net>  Mon, 30 Dec 2024 11:26:58 +0000
+
 mailagent (1:3.1-106-1) unstable; urgency=medium
 
   * Upstream has moved to git. This is the new upstream HEAD
diff -u mailagent-3.1-106/debian/control mailagent-3.1-106/debian/control
--- mailagent-3.1-106/debian/control
+++ mailagent-3.1-106/debian/control
@@ -4,6 +4,7 @@
 Section: mail
 Priority: optional
 Maintainer: Manoj Srivastava <sriva...@debian.org>
+Rules-Requires-Root: no
 Standards-Version: 4.3.0
 Build-Depends: groff-base, debhelper-compat (= 12), po-debconf, file,
                gettext, libperl4-corelibs-perl, dpkg-dev (>= 1.16.0),
diff -u mailagent-3.1-106/debian/rules mailagent-3.1-106/debian/rules
--- mailagent-3.1-106/debian/rules
+++ mailagent-3.1-106/debian/rules
@@ -8,10 +8,10 @@
     INSTALL_PROGRAM += -s
 endif
 
-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
-make_directory = $(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
+make_directory = $(INSTALL) -p -d -m   755
 email := sriva...@debian.org
 TMPTOP:=debian/tmp
 DOCDIR=debian/$(package)/usr/share/doc/$(package)
@@ -57,13 +57,14 @@
        bash -n debian/mailagent.prerm
 
 override_dh_installdocs:
+       chmod -R u=rwX debian/mailagent
        dh_installdocs
        $(install_file) agent/README            $(DOCDIR)/README.agent
        $(install_file) agent/filter/README     $(DOCDIR)/README.filter
        $(install_file) agent/files/README      $(DOCDIR)/README.shell
        $(install_file) agent/files/help/README $(DOCDIR)/README.server
-       find $(DOCDIR)/help -name \*.SH -exec rm {} \;
-       find $(DOCDIR)/help -name \*Makefile -exec rm {} \;
+       find $(DOCDIR)/help -name \*.SH -exec rm -f {} \;
+       find $(DOCDIR)/help -name \*Makefile -exec rm -f {} \;
 
 override_dh_install:
        test -d $(MAN1DIR) || $(make_directory) $(MAN1DIR)
@@ -73,7 +74,7 @@
        $(MAKE) install.man
        test ! -f $(DEBDOCDIR)/filter  ||        \
           $(install_program) $(DEBDOCDIR)/filter $(DEBLIBDIR)/filter
-       test ! -f $(DEBDOCDIR)/filter  ||     rm $(DEBDOCDIR)/filter
+       test ! -f $(DEBDOCDIR)/filter  ||     rm -f $(DEBDOCDIR)/filter
        for i in chkagent.sh filter.sh setup.cf mailagent.cf commands; do \
          test ! -f $(DEBDOCDIR)/$$i || mv $(DEBDOCDIR)/$$i $(PKG_DIR); \
        done

I intend to NMU to make process 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.

OpenPGP_signature.asc
Description: OpenPGP digital signature