diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:33 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:33 +0000 |
commit | 98396d661d76a98491cf9de99fa50ae08894374d (patch) | |
tree | cffdf812f06ee728717d39bffcb4f69833f4e578 /debian/rules | |
parent | Merging upstream version 2.40. (diff) | |
download | util-linux-98396d661d76a98491cf9de99fa50ae08894374d.tar.xz util-linux-98396d661d76a98491cf9de99fa50ae08894374d.zip |
Adding debian version 2.40-1.debian/2.40-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/debian/rules b/debian/rules index e61e41c..9724ec1 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,10 @@ include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/pkg-info.mk +include /usr/share/debhelper/dh_package_notes/package-notes.mk CONFOPTS += --enable-usrdir-path - +CONFOPTS += --disable-makeinstall-chown ifeq ($(DEB_HOST_ARCH_OS),linux) CONFOPTS += --with-selinux CONFOPTS += --with-smack @@ -50,6 +51,9 @@ CONFOPTS += --disable-hwclock-gplv3 # Reduce setgid programs (cf. CVE-2024-28085) CONFOPTS += --disable-use-tty-group +CONFOPTS += --disable-liblastlog2 +CONFOPTS += --disable-pam-liblastlog2 + # Get the list of binary package, except lib* and *-udeb, from # debian/control instead of hardcoding the list when installing # bash-completions below. @@ -71,6 +75,8 @@ override_dh_autoreconf: AM_OPTS=--copy LT_OPTS=--copy dh_autoreconf ./autogen.sh override_dh_auto_configure: + ss -xp + sysctl kernel.modules_disabled dh_auto_configure -- $(CONFOPTS) override_dh_auto_install: @@ -82,6 +88,16 @@ override_dh_auto_install: # Avoid shipping static libraries. # - libblkid.a is used by e2fsprogs. find debian/tmp/usr/lib -name 'lib*.a' \! -name 'libuuid.a' \! -name 'libblkid.a' -delete + # + # Remove programs we do not install + find debian/tmp/ -name 'addpart*' -delete + find debian/tmp/ -name 'delpart*' -delete + find debian/tmp/ -name 'enosys*' -delete + find debian/tmp/ -name 'irqtop*' -delete + find debian/tmp/ -name 'setpgid*' -delete + # + # show installed man pages + find debian/tmp/usr/share/man override_dh_auto_clean: dh_auto_clean @@ -141,12 +157,6 @@ endif override_dh_missing: dh_missing --list-missing -override_dh_gencontrol: -ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) - dh_gencontrol --package=bsdutils -- -v1:$(DEB_VERSION_UPSTREAM_REVISION) -endif - dh_gencontrol --remaining-packages - override_dh_installinit: ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) # install uuidd sysvinit script @@ -162,9 +172,6 @@ override_dh_installpam: dh_installpam --package=util-linux --name=su dh_installpam --package=util-linux --name=su-l -override_dh_fixperms: - dh_fixperms -i -a -Xusr/bin/wall -Xusr/bin/write -Xusr/bin/mount -Xusr/bin/umount -Xusr/bin/su - ifeq (linux,$(DEB_HOST_ARCH_OS)) override_dh_installsystemd: dh_installsystemd -putil-linux fstrim.timer |