Split libpam-modules into libpam-modules and libpam-modules-bin, so that we

only have to have one copy of the helper binaries installed.

8 files changed, 24 insertions, 12 deletions

diff --git a/debian/control b/debian/control
index df0dc3f3..242e44cd 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,8 @@ Section: admin
 Priority: required
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${shlibs:Depends}, ${misc:Depends},
+	libpam-modules-bin (= ${binary:Version})
 Conflicts: libpam-motd, libpam-mkhomedir, libpam-umask
 Replaces: libpam0g-util, libpam-umask
 Provides: libpam-motd, libpam-mkhomedir, libpam-umask
@@ -40,6 +41,17 @@ Description: Pluggable Authentication Modules for PAM
  This package completes the set of modules for PAM. It includes the
   pam_unix_*.so module as well as some specialty modules.
 
+Package: libpam-modules-bin
+Section: admin
+Priority: required
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libpam-modules (<< 1.1.0-3)
+Description: Pluggable Authentication Modules for PAM - helper binaries
+ This package contains helper binaries used by the standard set of PAM
+ modules in the libpam-modules package.
+
 Package: libpam-runtime
 Section: admin
 Priority: required
diff --git a/debian/libpam-modules-bin.install b/debian/libpam-modules-bin.install
new file mode 100644
index 00000000..48a1c0ca
--- /dev/null
+++ b/debian/libpam-modules-bin.install
@@ -0,0 +1,4 @@
+sbin/unix_chkpwd	sbin
+sbin/unix_update	sbin
+sbin/pam_tally		sbin
+sbin/mkhomedir_helper	sbin
diff --git a/debian/libpam-modules-bin.lintian-overrides b/debian/libpam-modules-bin.lintian-overrides
new file mode 100644
index 00000000..a4579766
--- /dev/null
+++ b/debian/libpam-modules-bin.lintian-overrides
@@ -0,0 +1,3 @@
+# yes, we know it's sgid, that's the whole point...
+libpam-modules-bin: setgid-binary sbin/unix_chkpwd 2755 root/shadow
+
diff --git a/debian/libpam-modules-bin.manpages b/debian/libpam-modules-bin.manpages
new file mode 100644
index 00000000..90fddec4
--- /dev/null
+++ b/debian/libpam-modules-bin.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man8/mkhomedir_helper.8
+debian/tmp/usr/share/man/man8/unix_*.8
diff --git a/debian/libpam-modules.install b/debian/libpam-modules.install
index 41b07af7..191a34ea 100644
--- a/debian/libpam-modules.install
+++ b/debian/libpam-modules.install
@@ -1,6 +1,2 @@
 etc/security/*		etc/security
-sbin/unix_chkpwd	sbin
-sbin/unix_update	sbin
-sbin/pam_tally		sbin
-sbin/mkhomedir_helper	sbin
 lib/*/security/*.so
diff --git a/debian/libpam-modules.lintian-overrides b/debian/libpam-modules.lintian-overrides
deleted file mode 100644
index e323f6f8..00000000
--- a/debian/libpam-modules.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# yes, we know it's sgid, that's the whole point...
-libpam-modules: setgid-binary sbin/unix_chkpwd 2755 root/shadow
-
diff --git a/debian/libpam-modules.manpages b/debian/libpam-modules.manpages
index 96fce214..a9f488d0 100644
--- a/debian/libpam-modules.manpages
+++ b/debian/libpam-modules.manpages
@@ -1,4 +1,2 @@
 debian/tmp/usr/share/man/man8/pam_*.8
-debian/tmp/usr/share/man/man8/mkhomedir_helper.8
-debian/tmp/usr/share/man/man8/unix_*.8
 debian/tmp/usr/share/man/man5/*conf.5
diff --git a/debian/rules b/debian/rules
index 8a90a507..e1818d2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,8 +110,8 @@ binary-arch: install
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
-	chgrp shadow $(d)/libpam-modules/sbin/unix_chkpwd
-	chmod 02755 $(d)/libpam-modules/sbin/unix_chkpwd
+	chgrp shadow $(d)/libpam-modules-bin/sbin/unix_chkpwd
+	chmod 02755 $(d)/libpam-modules-bin/sbin/unix_chkpwd
 	dh_makeshlibs -a -V "libpam0g (>= 1.1.0)"
 	dh_installdeb -a
 	dh_shlibdeps -a