[Git][debian-proftpd-team/proftpd][master] 3 commits: Use the valid value "binary-targets" for Rules-Requires-Root

[Hilmar Preuße (@hilmar-guest)]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
ea8d2fe8 by Jörn-Thorben Hinz at 2023-02-10T16:20:32+01:00
Use the valid value "binary-targets" for Rules-Requires-Root

The policy currently allows[1] the values "no", "binary-targets", or a
custom value which must contain a "/".

[1] https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-rules-requires-root

- - - - -
6269662a by Jörn-Thorben Hinz at 2023-02-10T16:21:48+01:00
Just let the build tool invoke the binary targets with (fake)root

Don't hardcode a value for DEB_GAIN_ROOT_CMD. This variable is supposed
to be set by the build tool, not by debian/rules, see [1] and [2].

[1] https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-gainrootapi
[2] /usr/share/doc/dpkg/spec/rootless-builds.txt

- - - - -
dc94a69a by Hilmar Preuße at 2023-02-16T07:01:56+00:00
Merge branch 'correctly-use-rules-requires-root' into 'master'

Correctly use Rules-Requires-Root

See merge request debian-proftpd-team/proftpd!8
- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -27,7 +27,7 @@ Build-Depends: debhelper-compat (= 13),
                libmd-dev,
                libidn2-dev
 Homepage: http://www.proftpd.org/
-Rules-Requires-Root: binary
+Rules-Requires-Root: binary-targets
 Vcs-Browser: https://salsa.debian.org/debian-proftpd-team/proftpd
 Vcs-Git: https://salsa.debian.org/debian-proftpd-team/proftpd.git
 


=====================================
debian/rules
=====================================
@@ -7,8 +7,6 @@ VERSION=$(shell grep PROFTPD_VERSION_TEXT $(CURDIR)/include/version.h|cut -d\" -
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-export DEB_GAIN_ROOT_CMD=fakeroot
-
 # Some special build options
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
   DEVELOPT=--enable-devel=yes
@@ -76,7 +74,7 @@ override_dh_auto_build: debian/proftpd-substvars
 	dh_auto_build
 
 override_dh_auto_install:
-	$(DEB_GAIN_ROOT_CMD) dh_auto_install
+	dh_auto_install
 	rm -f $(CURDIR)/debian/tmp/usr/sbin/in.proftpd
 
 override_dh_auto_clean:



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/cb85307e349ca71e79a2208fe6987dab2ac0726f...dc94a69aa57d9fbc19eda8d64c94a459ee892d60

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/cb85307e349ca71e79a2208fe6987dab2ac0726f...dc94a69aa57d9fbc19eda8d64c94a459ee892d60
You're receiving this email because of your account on salsa.debian.org.