[Pkg-shadow-commits] r720 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2005-12-18 08:18:53 +0000 (Sun, 18 Dec 2005)
New Revision: 720

Modified:
   trunk/debian/changelog
   trunk/debian/passwd.config
   trunk/debian/rules
Log:
Two fixes in the same commit:
-stop building login for Hurd
-call programs using [a-z] under a C locale


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-17 16:21:15 UTC (rev 719)
+++ trunk/debian/changelog	2005-12-18 08:18:53 UTC (rev 720)
@@ -19,6 +19,12 @@
     - debian/rules, debian/login.files, debian/passwd.files:
       Use dh_install instead of old dh_movefiles for moving files from
       debian/tmp and rename {login, passwd}.files to {login,passwd}.install
+    - debian/rules:
+      debian/rules: stop building login for Hurd, which breaks bootstrap
+      Thanks to Michael Banck for the patch. Closes: #343473
+    - debian/passwd.config:
+      call programs using [a-z] under a C locale. Thanks Denis Barbier
+      for the patch. Closes: #343595
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 21 Nov 2005 20:33:40 +0100
 

Modified: trunk/debian/passwd.config
===================================================================
--- trunk/debian/passwd.config	2005-12-17 16:21:15 UTC (rev 719)
+++ trunk/debian/passwd.config	2005-12-18 08:18:53 UTC (rev 720)
@@ -225,11 +225,11 @@
 					userdefault="tbm"
 				    ;;
 				    *)
-					userdefault=`echo $RET | sed 's/ .*//' | tr A-Z a-z`
+					userdefault=`echo $RET | sed 's/ .*//' | LC_ALL=C tr A-Z a-z`
 				    ;;
 				esac
 				if test -n "$userdefault" && \
-				   expr "$userdefault" : '[a-z][-a-z0-9]*$' >/dev/null; then
+				   LC_ALL=C expr "$userdefault" : '[a-z][-a-z0-9]*$' >/dev/null; then
 					db_set passwd/username "$userdefault"
 				fi
 			fi
@@ -243,7 +243,7 @@
 			# Verify the user name, loop with message if bad.
 			db_get passwd/username
 			USER="$RET"
-			if ! expr "$USER" : '[a-z][-a-z0-9]*$' >/dev/null; then
+			if ! LC_ALL=C expr "$USER" : '[a-z][-a-z0-9]*$' >/dev/null; then
 				db_fset passwd/username seen false
 				db_fset passwd/username-bad seen false
 				db_input critical passwd/username-bad

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-12-17 16:21:15 UTC (rev 719)
+++ trunk/debian/rules	2005-12-18 08:18:53 UTC (rev 720)
@@ -166,13 +166,17 @@
 	dh_installdebconf
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
+	dh_installdeb -Nlogin
+	dh_gencontrol -Nlogin
+	dh_md5sums -Nlogin
+	dh_builddeb -Nlogin
 else
 	echo "loginpam=login (>= 970502-1), libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
-endif
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+endif
 
 binary: binary-indep binary-arch