From 2e8f003402590df57242357313d700d662f76428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Fran=C3=A7ois?= <nicolas.francois@centraliens.net>
Date: Fri, 9 Aug 2013 23:54:47 +0200
Subject: [PATCH] Add uidmap package, based on Ubuntu.

  * passwd.install: add new subuid.5 and subgid.5 manpages
  * debian/rules, debian/control, debian/uidmap.install: create new uidmap
    package containing the new setuid-root binaries newuidmap and newgidmap
---
 debian/changelog      | 3 +++
 debian/control        | 6 ++++++
 debian/passwd.install | 2 ++
 debian/rules          | 4 ++++
 debian/uidmap.install | 5 +++++
 5 files changed, 20 insertions(+)
 create mode 100644 debian/uidmap.install

diff --git a/debian/changelog b/debian/changelog
index 4b3b23cf..3a0c5284 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ shadow (1:4.2-1) UNRELEASED; urgency=low
   * Moved to git: replace Vcs-Git in place of Vcs-Svn and adapt
     Vcs-Browser.
   * Add pam_loginuid to login PAM settings. Closes: #677441
+  * passwd.install: add new subuid.5 and subgid.5 manpages
+  * debian/rules, debian/control, debian/uidmap.install: create new uidmap
+    package containing the new setuid-root binaries newuidmap and newgidmap 
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 27 Jul 2013 20:07:18 +0200
 
diff --git a/debian/control b/debian/control
index 8f2b8a7a..4323fa88 100644
--- a/debian/control
+++ b/debian/control
@@ -33,3 +33,9 @@ Description: system login tools
  workgroup type situations). The su program allows changing your effective
  user ID (useful being able to execute commands as another user).
 
+Package: uidmap
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Description: programs to help use subuids
+ These programs help unprivileged users to create uid and gid mappings in
+ user namespaces.
diff --git a/debian/passwd.install b/debian/passwd.install
index 64794bbf..382b338e 100644
--- a/debian/passwd.install
+++ b/debian/passwd.install
@@ -55,6 +55,8 @@ usr/share/man/man1/passwd.1
 usr/share/man/man5/passwd.5
 usr/share/man/man5/shadow.5
 usr/share/man/man5/gshadow.5
+usr/share/man/man5/subuid.5
+usr/share/man/man5/subgid.5
 usr/share/man/man8/chgpasswd.8
 usr/share/man/man8/chpasswd.8
 usr/share/man/man8/groupadd.8
diff --git a/debian/rules b/debian/rules
index e0a15157..ce79a198 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,10 @@ endif
 	install -c -m 444 debian/cppw.8 debian/passwd/usr/share/man/man8
 	dh_lintian -p passwd
 
+binary-predeb/uidmap::
+	chmod u+s debian/uidmap/usr/bin/newuidmap
+	chmod u+s debian/uidmap/usr/bin/newgidmap
+
 binary-predeb/login::
 	# No real need for login to be setuid root
 	# chmod u+s debian/login/bin/login
diff --git a/debian/uidmap.install b/debian/uidmap.install
new file mode 100644
index 00000000..30d14069
--- /dev/null
+++ b/debian/uidmap.install
@@ -0,0 +1,5 @@
+usr/bin/newuidmap
+usr/bin/newgidmap
+usr/share/man/man1/newuidmap.1
+usr/share/man/man1/newgidmap.1
+