From e225d71e7f4d0fb35c11fcc2222780ea810b45e6 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@balintreczey.hu>
Date: Sun, 14 Nov 2021 13:17:32 +0100
Subject: [PATCH] Install nologin /usr/sbin without patching makefiles

---
 debian/login.install                   |  2 +-
 debian/patches/508_nologin_in_usr_sbin | 18 ------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 debian/patches/508_nologin_in_usr_sbin

diff --git a/debian/login.install b/debian/login.install
index 35ae1457..9f706476 100644
--- a/debian/login.install
+++ b/debian/login.install
@@ -1,6 +1,6 @@
 debian/login.defs etc
 usr/share/locale/*/LC_MESSAGES/shadow.mo
-usr/sbin/nologin
+sbin/nologin usr/sbin
 usr/bin/faillog
 usr/bin/lastlog
 usr/bin/newgrp
diff --git a/debian/patches/508_nologin_in_usr_sbin b/debian/patches/508_nologin_in_usr_sbin
deleted file mode 100644
index d5091b1b..00000000
--- a/debian/patches/508_nologin_in_usr_sbin
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -24,7 +24,6 @@
- # $prefix/bin and $prefix/sbin, no install-data hacks...)
- 
- bin_PROGRAMS   = groups login
--sbin_PROGRAMS  = nologin
- ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
- if ENABLE_SUBIDS
- ubin_PROGRAMS += newgidmap newuidmap
-@@ -45,6 +44,7 @@
- 	grpunconv \
- 	logoutd \
- 	newusers \
-+	nologin \
- 	pwck \
- 	pwconv \
- 	pwunconv \
diff --git a/debian/patches/series b/debian/patches/series
index 68dc397a..5ea26270 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,5 @@
 506_relaxed_usernames
 542_useradd-O_option
 463_login_delay_obeys_to_PAM
-508_nologin_in_usr_sbin
 505_useradd_recommend_adduser
 501_commonio_group_shadow