From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Aug 2021 22:36:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'spwhitton/master'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=89f98ca8607bff495fe48d60ed4357bd34d9ff9f;hp=0c399214bfbbff192193d8580086e93224883fa1;p=userv-utils.git

Merge remote-tracking branch 'spwhitton/master'
---

diff --git a/debian/changelog b/debian/changelog
index bf344f3..d5a33b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-userv-utils (0.6.1-1~~iwj) unstable; urgency=medium
+userv-utils (0.6.1-1) unstable; urgency=medium
 
-  * Initial Debian-specific packaging changelog.
+  * Initial release (Closes: #991906).
 
- --
+ -- Sean Whitton <spwhitton@spwhitton.name>  Wed, 04 Aug 2021 15:32:01 -0700
 
 
 # Local variables:
diff --git a/debian/control b/debian/control
index afd21e7..7272e6c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,16 @@ Priority: optional
 Maintainer: Sean Whitton <spwhitton@spwhitton.name>
 Uploaders: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Build-Depends: debhelper-compat (= 12), rename
-Standards-Version: 3.7.0.0
+Standards-Version: 4.5.1
 Rules-Requires-Root: binary-targets
+Homepage: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=summary
+Vcs-Git: https://git.spwhitton.name/userv-utils/
+Vcs-Browser: https://git.spwhitton.name/userv-utils/
 
 Package: userv-utils
 Architecture: any
-Depends: userv
-Recommends: ${perl:Depends}, ${misc:Depends}
+Depends: userv, ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${perl:Depends}
 Description: privsep utilities collection
  Several small userv services, which allow certain system configuration
  actions to be delegated.  In each case the service is disabled unless
@@ -25,7 +28,7 @@ Description: privsep utilities collection
 
 Package: userv-dyndns
 Architecture: all
-Depends: userv, chiark-utils-bin, ${perl:Depends}, ${misc:Depends}
+Depends: userv, chiark-utils-bin, adduser, ${perl:Depends}, ${misc:Depends}
 Recommends: bind
 Description: dynamic DNS for shell account users
  userv-dyndns is a userv service which allows non-root users to
diff --git a/debian/copyright b/debian/copyright
index ea715a5..36f5bac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,6 @@
 This package contains a number of small utilities and programs for use
-with the `userv' security boundary tool.
+with the `userv' security boundary tool, obtained from
+<https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=summary>.
 
 This package, containing the moderately portable sources and Debian
 packaging information, and the resulting Debian binary packages, was
diff --git a/debian/userv-dyndns.postinst b/debian/userv-dyndns.postinst
index a6779f9..6517a45 100755
--- a/debian/userv-dyndns.postinst
+++ b/debian/userv-dyndns.postinst
@@ -1,3 +1,6 @@
+#!/bin/sh
+set -e
+
 # Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
 # Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
 # Copyright 1999,2003
@@ -17,14 +20,12 @@
 # You should have received a copy of the GNU General Public License
 # along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
-#!/bin/sh
-set -e
-
 #DEBHELPER#
 
 user="$(sed -n '/^[a-z]/{p;q;}' /etc/userv/dyndns-service-users)"
 
 if [ "$user" ]; then
-	adduser --system --quiet --group --gecos 'userv dyndns' \
+	adduser --system --force-badname --quiet --group \
+		--gecos 'userv dyndns' \
 	   	--home /etc/userv --no-create-home --shell /bin/false $user
 fi
diff --git a/debian/userv-git-daemon.postinst b/debian/userv-git-daemon.postinst
index 5ccaa88..f055c84 100755
--- a/debian/userv-git-daemon.postinst
+++ b/debian/userv-git-daemon.postinst
@@ -22,7 +22,7 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
-GITDUSER=userv-git
+GITDUSER=_userv-git
 
 defaults=/etc/default/userv-git-daemon
 if test -f $defaults; then . $defaults; fi
@@ -30,6 +30,7 @@ if test -f $defaults; then . $defaults; fi
 #DEBHELPER#
 
 if [ "$GITDUSER" ]; then
-	adduser --system --quiet --group --gecos 'userv git daemon' \
+	adduser --system --force-badname --quiet --group \
+		--gecos 'userv git daemon' \
 		--home /etc/userv --no-create-home --shell /bin/false $GITDUSER
 fi
diff --git a/dyndns/Makefile b/dyndns/Makefile
index e0a769d..b7fc855 100644
--- a/dyndns/Makefile
+++ b/dyndns/Makefile
@@ -27,7 +27,7 @@ install-examples:
 		mkdir -p $(services)
 		cp dyndns $(services)/dyndns.distrib
 		cp dyndns-domains $(etcuserv)/dyndns-domains.example
-		echo userv-dyndns >$(etcuserv)/dyndns-service-users.example
+		echo _userv-dyndns >$(etcuserv)/dyndns-service-users.example
 
 install-docs:
 		mkdir -p $(docdir)/userv-dyndns