diff --git a/debian/patches/debian/0010-Define-LOGIN_NAME_MAX-on-HURD.patch b/debian/patches/debian/Define-LOGIN_NAME_MAX-on-HURD.patch similarity index 100% rename from debian/patches/debian/0010-Define-LOGIN_NAME_MAX-on-HURD.patch rename to debian/patches/debian/Define-LOGIN_NAME_MAX-on-HURD.patch diff --git a/debian/patches/debian/Stop-building-programs-we-do-not-install.patch b/debian/patches/debian/Stop-building-programs-we-do-not-install.patch new file mode 100644 index 00000000..b435127a --- /dev/null +++ b/debian/patches/debian/Stop-building-programs-we-do-not-install.patch @@ -0,0 +1,537 @@ +From: Chris Hofstaedtler +Date: Tue, 6 Aug 2024 00:27:13 +0200 +Subject: Stop building programs we do not install + +--- + man/Makefile.am | 19 ------------------- + man/cs/Makefile.am | 5 ----- + man/da/Makefile.am | 4 ---- + man/de/Makefile.am | 9 --------- + man/fr/Makefile.am | 10 ---------- + man/it/Makefile.am | 10 ---------- + man/ja/Makefile.am | 8 -------- + man/ko/Makefile.am | 2 -- + man/pl/Makefile.am | 5 ----- + man/ru/Makefile.am | 8 -------- + man/sv/Makefile.am | 7 ------- + man/tr/Makefile.am | 2 -- + man/uk/Makefile.am | 10 ---------- + man/zh_CN/Makefile.am | 9 --------- + man/zh_TW/Makefile.am | 2 -- + src/Makefile.am | 7 +++---- + 16 files changed, 3 insertions(+), 114 deletions(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index dab98f4..2beb0e4 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -13,35 +13,26 @@ man_MANS = \ + man8/chpasswd.8 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmems.8 \ + man8/groupmod.8 \ +- man1/groups.1 \ + man8/grpck.8 \ + man8/grpconv.8 \ + man8/grpunconv.8 \ + man5/gshadow.5 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ +- man8/nologin.8 \ + man1/passwd.1 \ + man5/passwd.5 \ + man8/pwck.8 \ + man8/pwconv.8 \ + man8/pwunconv.8 \ + man8/shadowconfig.8 \ +- man1/sg.1 \ + man3/shadow.3 \ + man5/shadow.5 \ +- man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 \ +@@ -83,27 +74,20 @@ man_XMANS = \ + chpasswd.8.xml \ + chsh.1.xml \ + expiry.1.xml \ +- faillog.5.xml \ +- faillog.8.xml \ + getsubids.1.xml \ + gpasswd.1.xml \ + groupadd.8.xml \ + groupdel.8.xml \ + groupmems.8.xml \ + groupmod.8.xml \ +- groups.1.xml \ + grpck.8.xml \ + gshadow.5.xml \ + limits.5.xml \ +- login.1.xml \ + login.access.5.xml \ + login.defs.5.xml \ +- logoutd.8.xml \ + newgidmap.1.xml \ +- newgrp.1.xml \ + newuidmap.1.xml \ + newusers.8.xml \ +- nologin.8.xml \ + passwd.1.xml \ + passwd.5.xml \ + porttime.5.xml \ +@@ -112,9 +96,6 @@ man_XMANS = \ + shadowconfig.8.xml \ + shadow.3.xml \ + shadow.5.xml \ +- sg.1.xml \ +- su.1.xml \ +- suauth.5.xml \ + subgid.5.xml \ + subuid.5.xml \ + useradd.8.xml \ +diff --git a/man/cs/Makefile.am b/man/cs/Makefile.am +index 84407d7..42638c4 100644 +--- a/man/cs/Makefile.am ++++ b/man/cs/Makefile.am +@@ -3,19 +3,14 @@ mandir = @mandir@/cs + + man_MANS = \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +- man1/groups.1 \ + man8/grpck.8 \ + man5/gshadow.5 \ +- man8/nologin.8 \ + man5/passwd.5 \ + man5/shadow.5 \ +- man1/su.1 \ + man8/vipw.8 + + if ENABLE_LASTLOG +diff --git a/man/da/Makefile.am b/man/da/Makefile.am +index a3b0922..f8e957d 100644 +--- a/man/da/Makefile.am ++++ b/man/da/Makefile.am +@@ -5,12 +5,8 @@ mandir = @mandir@/da + man_MANS = \ + man1/chfn.1 \ + man8/groupdel.8 \ +- man1/groups.1 \ + man5/gshadow.5 \ +- man8/logoutd.8 \ + man1/newgrp.1 \ +- man8/nologin.8 \ +- man1/sg.1 \ + man8/vigr.8 \ + man8/vipw.8 + +diff --git a/man/de/Makefile.am b/man/de/Makefile.am +index 671432d..777e5bf 100644 +--- a/man/de/Makefile.am ++++ b/man/de/Makefile.am +@@ -8,8 +8,6 @@ man_MANS = \ + man8/chpasswd.8 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ +@@ -21,22 +19,15 @@ man_MANS = \ + man8/grpconv.8 \ + man8/grpunconv.8 \ + man5/gshadow.5 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ +- man8/nologin.8 \ + man1/passwd.1 \ + man5/passwd.5 \ + man8/pwck.8 \ + man8/pwconv.8 \ + man8/pwunconv.8 \ +- man1/sg.1 \ + man3/shadow.3 \ + man5/shadow.5 \ +- man1/su.1 \ +- man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 \ +diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am +index 78aee9a..b454b94 100644 +--- a/man/fr/Makefile.am ++++ b/man/fr/Makefile.am +@@ -8,36 +8,26 @@ man_MANS = \ + man8/chpasswd.8 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmems.8 \ + man8/groupmod.8 \ +- man1/groups.1 \ + man8/grpck.8 \ + man8/grpconv.8 \ + man8/grpunconv.8 \ + man5/gshadow.5 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ +- man8/nologin.8 \ + man1/passwd.1 \ + man5/passwd.5 \ + man8/pwck.8 \ + man8/pwconv.8 \ + man8/pwunconv.8 \ + man8/shadowconfig.8 \ +- man1/sg.1 \ + man3/shadow.3 \ + man5/shadow.5 \ +- man1/su.1 \ +- man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 \ +diff --git a/man/it/Makefile.am b/man/it/Makefile.am +index b76187f..cf220b7 100644 +--- a/man/it/Makefile.am ++++ b/man/it/Makefile.am +@@ -8,35 +8,25 @@ man_MANS = \ + man8/chpasswd.8 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmems.8 \ + man8/groupmod.8 \ +- man1/groups.1 \ + man8/grpck.8 \ + man8/grpconv.8 \ + man8/grpunconv.8 \ + man5/gshadow.5 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ +- man8/nologin.8 \ + man1/passwd.1 \ + man5/passwd.5 \ + man8/pwck.8 \ + man8/pwconv.8 \ + man8/pwunconv.8 \ +- man1/sg.1 \ + man3/shadow.3 \ + man5/shadow.5 \ +- man1/su.1 \ +- man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 \ +diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am +index c72097f..374adee 100644 +--- a/man/ja/Makefile.am ++++ b/man/ja/Makefile.am +@@ -7,8 +7,6 @@ man_MANS = \ + man8/chpasswd.8 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ + man8/groupdel.8 \ +@@ -17,10 +15,7 @@ man_MANS = \ + man8/grpck.8 \ + man8/grpconv.8 \ + man8/grpunconv.8 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ + man1/passwd.1 \ + man5/passwd.5 \ +@@ -28,10 +23,7 @@ man_MANS = \ + man8/pwconv.8 \ + man8/pwunconv.8 \ + man8/shadowconfig.8 \ +- man1/sg.1 \ + man5/shadow.5 \ +- man1/su.1 \ +- man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 \ +diff --git a/man/ko/Makefile.am b/man/ko/Makefile.am +index c269f0b..6d15190 100644 +--- a/man/ko/Makefile.am ++++ b/man/ko/Makefile.am +@@ -5,9 +5,7 @@ man_MANS = \ + man1/chfn.1 \ + man1/chsh.1 \ + man1/groups.1 \ +- man1/login.1 \ + man5/passwd.5 \ +- man1/su.1 \ + man8/vigr.8 \ + man8/vipw.8 + # newgrp.1 must be updated +diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am +index aa79af2..df11bf6 100644 +--- a/man/pl/Makefile.am ++++ b/man/pl/Makefile.am +@@ -6,8 +6,6 @@ man_MANS = \ + man1/chage.1 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man8/groupadd.8 \ + man8/groupdel.8 \ +@@ -15,9 +13,6 @@ man_MANS = \ + man8/groupmod.8 \ + man1/groups.1 \ + man8/grpck.8 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ +- man1/sg.1 \ + man8/shadowconfig.8 \ + man3/shadow.3 \ + man8/userdel.8 \ +diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am +index 84d55d9..42c58b9 100644 +--- a/man/ru/Makefile.am ++++ b/man/ru/Makefile.am +@@ -8,8 +8,6 @@ man_MANS = \ + man8/chpasswd.8 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ +@@ -21,10 +19,7 @@ man_MANS = \ + man8/grpconv.8 \ + man8/grpunconv.8 \ + man5/gshadow.5 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ + man8/nologin.8 \ + man1/passwd.1 \ +@@ -32,11 +27,8 @@ man_MANS = \ + man8/pwck.8 \ + man8/pwconv.8 \ + man8/pwunconv.8 \ +- man1/sg.1 \ + man3/shadow.3 \ + man5/shadow.5 \ +- man1/su.1 \ +- man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 \ +diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am +index 70329ed..5ae9272 100644 +--- a/man/sv/Makefile.am ++++ b/man/sv/Makefile.am +@@ -5,8 +5,6 @@ man_MANS = \ + man1/chage.1 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man8/groupadd.8 \ + man8/groupdel.8 \ +@@ -15,15 +13,10 @@ man_MANS = \ + man1/groups.1 \ + man8/grpck.8 \ + man5/gshadow.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ +- man8/nologin.8 \ + man1/passwd.1 \ + man5/passwd.5 \ + man8/pwck.8 \ +- man1/sg.1 \ + man3/shadow.3 \ +- man5/suauth.5 \ + man8/userdel.8 \ + man8/vigr.8 \ + man8/vipw.8 +diff --git a/man/tr/Makefile.am b/man/tr/Makefile.am +index 8d8b916..8b2aa2d 100644 +--- a/man/tr/Makefile.am ++++ b/man/tr/Makefile.am +@@ -6,11 +6,9 @@ man_MANS = \ + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +- man1/login.1 \ + man1/passwd.1 \ + man5/passwd.5 \ + man5/shadow.5 \ +- man1/su.1 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 +diff --git a/man/uk/Makefile.am b/man/uk/Makefile.am +index 3fb5ffb..e5ae706 100644 +--- a/man/uk/Makefile.am ++++ b/man/uk/Makefile.am +@@ -8,35 +8,25 @@ man_MANS = \ + man8/chpasswd.8 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmems.8 \ + man8/groupmod.8 \ +- man1/groups.1 \ + man8/grpck.8 \ + man8/grpconv.8 \ + man8/grpunconv.8 \ + man5/gshadow.5 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ +- man8/nologin.8 \ + man1/passwd.1 \ + man5/passwd.5 \ + man8/pwck.8 \ + man8/pwconv.8 \ + man8/pwunconv.8 \ +- man1/sg.1 \ + man3/shadow.3 \ + man5/shadow.5 \ +- man1/su.1 \ +- man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 \ +diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am +index a8b93a5..96230e4 100644 +--- a/man/zh_CN/Makefile.am ++++ b/man/zh_CN/Makefile.am +@@ -8,8 +8,6 @@ man_MANS = \ + man8/chpasswd.8 \ + man1/chsh.1 \ + man1/expiry.1 \ +- man5/faillog.5 \ +- man8/faillog.8 \ + man3/getspnam.3 \ + man1/gpasswd.1 \ + man8/groupadd.8 \ +@@ -21,22 +19,15 @@ man_MANS = \ + man8/grpconv.8 \ + man8/grpunconv.8 \ + man5/gshadow.5 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ +- man8/nologin.8 \ + man1/passwd.1 \ + man5/passwd.5 \ + man8/pwck.8 \ + man8/pwconv.8 \ + man8/pwunconv.8 \ +- man1/sg.1 \ + man3/shadow.3 \ + man5/shadow.5 \ +- man1/su.1 \ +- man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 \ +diff --git a/man/zh_TW/Makefile.am b/man/zh_TW/Makefile.am +index c36ed2c..6fb6a15 100644 +--- a/man/zh_TW/Makefile.am ++++ b/man/zh_TW/Makefile.am +@@ -5,12 +5,10 @@ man_MANS = \ + man1/chfn.1 \ + man1/chsh.1 \ + man8/chpasswd.8 \ +- man1/newgrp.1 \ + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ + man5/passwd.5 \ +- man1/su.1 \ + man8/useradd.8 \ + man8/userdel.8 \ + man8/usermod.8 +diff --git a/src/Makefile.am b/src/Makefile.am +index b6cb09e..f517d1e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -26,8 +26,8 @@ AM_CFLAGS = $(LIBBSD_CFLAGS) + # and installation would be much simpler (just two directories, + # $prefix/bin and $prefix/sbin, no install-data hacks...) + +-bin_PROGRAMS = groups login +-sbin_PROGRAMS = nologin ++bin_PROGRAMS = ++sbin_PROGRAMS = + ubin_PROGRAMS = faillog chage chfn chsh expiry gpasswd newgrp passwd + if ENABLE_SUBIDS + ubin_PROGRAMS += newgidmap newuidmap +@@ -48,7 +48,6 @@ usbin_PROGRAMS = \ + grpck \ + grpconv \ + grpunconv \ +- logoutd \ + newusers \ + pwck \ + pwconv \ +@@ -59,7 +58,7 @@ usbin_PROGRAMS = \ + vipw + + # id and groups are from gnu, sulogin from sysvinit +-noinst_PROGRAMS = id sulogin ++noinst_PROGRAMS = + + suidusbins = + suidbins = diff --git a/debian/patches/series b/debian/patches/series index aedc91db..fa006de5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,5 @@ upstream/tests-Support-run_some-from-exported-tarball.patch debian/tests-disable-su.patch debian/tests-libsubid-04_nss-fix-setting-basedir.patch debian/Adapt-login.defs-for-Debian.patch -debian/0010-Define-LOGIN_NAME_MAX-on-HURD.patch +debian/Define-LOGIN_NAME_MAX-on-HURD.patch +debian/Stop-building-programs-we-do-not-install.patch