From eb5a0437a962479f36372384824160262f316400 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Wed, 12 Jun 2013 21:51:16 -0400
Subject: [PATCH] Move user and group creation to separate
 libnss-nonlocal-common package

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 debian/changelog                              |  2 ++
 debian/control                                | 21 ++++++++++++++++---
 ...l.postrm => libnss-nonlocal-common.postrm} |  2 +-
 ...preinst => libnss-nonlocal-common.preinst} |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)
 rename debian/{libnss-nonlocal.postrm => libnss-nonlocal-common.postrm} (96%)
 rename debian/{libnss-nonlocal.preinst => libnss-nonlocal-common.preinst} (95%)

diff --git a/debian/changelog b/debian/changelog
index b91413a..2a4e94f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libnss-nonlocal (2.1-0debathena1) UNRELEASED; urgency=low
     - Guard one-time initialization with memory barriers.
     - Make initgroups_dyn succeed when adding only magic groups.
   * Rewrite packaging with Debhelper 7.
+  * Move magic user and group creation to separate libnss-nonlocal-common
+    package.
 
  -- Anders Kaseorg <andersk@mit.edu>  Wed, 12 Jun 2013 20:02:33 -0400
 
diff --git a/debian/control b/debian/control
index f2c6681..2b31806 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,9 @@ Build-Depends: debhelper (>= 7.0.50~),
 
 Package: libnss-nonlocal
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}, adduser
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libnss-nonlocal-common
 Description: nsswitch proxy module to prevent local account spoofing
  This nsswitch module acts as a proxy for other nsswitch modules like 
  hesiod, but prevents non-local users from potentially gaining local 
@@ -22,8 +23,9 @@ Description: nsswitch proxy module to prevent local account spoofing
 
 Package: lib32nss-nonlocal
 Architecture: amd64
-Pre-Depends: ${misc:Pre-Depends}, adduser
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libnss-nonlocal-common
 Description: nsswitch proxy module to prevent local account spoofing (32-bit library)
  This nsswitch module acts as a proxy for other nsswitch modules like 
  hesiod, but prevents non-local users from potentially gaining local 
@@ -34,8 +36,9 @@ Description: nsswitch proxy module to prevent local account spoofing (32-bit lib
 
 Package: lib64nss-nonlocal
 Architecture: i386
-Pre-Depends: ${misc:Pre-Depends}, adduser
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libnss-nonlocal-common
 Description: nsswitch proxy module to prevent local account spoofing (64-bit library)
  This nsswitch module acts as a proxy for other nsswitch modules like 
  hesiod, but prevents non-local users from potentially gaining local 
@@ -43,3 +46,15 @@ Description: nsswitch proxy module to prevent local account spoofing (64-bit lib
  .
  This package contains a 64-bit version of the library for compatibility 
  on 32-bit architectures.
+
+Package: libnss-nonlocal-common
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends}, adduser
+Depends: ${misc:Depends}
+Description: nsswitch proxy module to prevent local account spoofing (common package)
+ This nsswitch module acts as a proxy for other nsswitch modules like 
+ hesiod, but prevents non-local users from potentially gaining local 
+ privileges by spoofing local UIDs and GIDs.
+ .
+ This package creates the system users and groups that have special 
+ meanings to nss_nonlocal.
diff --git a/debian/libnss-nonlocal.postrm b/debian/libnss-nonlocal-common.postrm
similarity index 96%
rename from debian/libnss-nonlocal.postrm
rename to debian/libnss-nonlocal-common.postrm
index 88c224f..9b97214 100644
--- a/debian/libnss-nonlocal.postrm
+++ b/debian/libnss-nonlocal-common.postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for libnss-nonlocal
+# postrm script for libnss-nonlocal-common
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/libnss-nonlocal.preinst b/debian/libnss-nonlocal-common.preinst
similarity index 95%
rename from debian/libnss-nonlocal.preinst
rename to debian/libnss-nonlocal-common.preinst
index d1815fa..4cb5047 100644
--- a/debian/libnss-nonlocal.preinst
+++ b/debian/libnss-nonlocal-common.preinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# preinst script for libnss-nonlocal
+# preinst script for libnss-nonlocal-common
 #
 # see: dh_installdeb(1)
 
-- 
2.44.0