SPECS: qmail.spec - %useradd/%groupadd

[glen]

Author: glen                         Date: Sun Apr 16 18:38:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %useradd/%groupadd

---- Files affected:
SPECS:
   qmail.spec (1.156 -> 1.157) 

---- Diffs:

================================================================
Index: SPECS/qmail.spec
diff -u SPECS/qmail.spec:1.156 SPECS/qmail.spec:1.157
--- SPECS/qmail.spec:1.156	Tue Apr 11 15:40:38 2006
+++ SPECS/qmail.spec	Sun Apr 16 20:38:09 2006
@@ -204,6 +204,7 @@
 Patch226:	%{name}-dkeys-config.patch
 
 # badrcptto v1.02 http://patch.be/qmail/
+# TODO: use this instead: http://www.iecc.com/bad-rcpt-noisy-patch.txt
 Patch227:	%{name}-badrcptto.patch
 
 URL:		http://www.qmail.org/
@@ -710,85 +711,15 @@
 
 %pre
 # Add few users and groups
-if [ -n "`/usr/bin/getgid nofiles`" ]; then
-	if [ "`/usr/bin/getgid nofiles`" != "81" ]; then
-		echo "Error: group nofiles doesn't have gid=81. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/groupadd -g 81 nofiles 1>&2
-fi
-if [ -n "`/usr/bin/getgid qmail`" ]; then
-	if [ "`/usr/bin/getgid qmail`" != "82" ]; then
-		echo "Error: group qmail doesn't have gid=82. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/groupadd -g 82 qmail 1>&2
-fi
-if [ -n "`/bin/id -u qmaild 2>/dev/null`" ]; then
-	if [ "`/bin/id -u qmaild`" != "81" ]; then
-		echo "Error: user qmaild doesn't have uid=81. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -g nofiles -d %{varqmail} -u 81 -s /bin/false \
-		qmaild 1>&2
-fi
-if [ -n "`/bin/id -u alias 2>/dev/null`" ]; then
-	if [ "`/bin/id -u alias`" != "82" ]; then
-		echo "Error: user alias doesn't have uid=82. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -g nofiles -d %{varqmail}/alias -u 82 \
-		-s /bin/false alias 1>&2
-fi
-if [ -n "`/bin/id -u qmailq 2>/dev/null`" ]; then
-	if [ "`/bin/id -u qmailq`" != "83" ]; then
-		echo "Error: user qmailq doesn't have uid=83. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -g qmail -d %{varqmail} -u 83 -s /bin/false \
-		qmailq 1>&2
-fi
-if [ -n "`/bin/id -u qmailr 2>/dev/null`" ]; then
-	if [ "`/bin/id -u qmailr`" != "84" ]; then
-		echo "Error: user qmailr doesn't have uid=84. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -g qmail -d %{varqmail} -u 84 -s /bin/false \
-		qmailr 1>&2
-fi
-if [ -n "`/bin/id -u qmails 2>/dev/null`" ]; then
-	if [ "`/bin/id -u qmails`" != "85" ]; then
-		echo "Error: user qmails doesn't have uid=85. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -g qmail -d %{varqmail} -u 85 -s /bin/false \
-		qmails 1>&2
-fi
-if [ -n "`/bin/id -u qmaill 2>/dev/null`" ]; then
-	if [ "`/bin/id -u qmaill`" != "86" ]; then
-		echo "Error: user qmaill doesn't have uid=86. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -g nofiles -d %{varqmail} -u 86 -s /bin/false \
-		qmaill 1>&2
-fi
-if [ -n "`/bin/id -u qmailp 2>/dev/null`" ]; then
-	if [ "`/bin/id -u qmailp`" != "87" ]; then
-		echo "Error: user qmailp doesn't have uid=87. Correct this before installing qmail." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -g nofiles -d %{varqmail} -u 87 -s /bin/false \
-		qmailp 1>&2
-fi
+%groupadd -g 81 nofiles
+%groupadd -g 82 qmail
+%useradd -g nofiles -d %{varqmail} -u 81 -s /bin/false qmaild
+%useradd -g nofiles -d %{varqmail}/alias -u 82 -s /bin/false alias
+%useradd -g qmail -d %{varqmail} -u 83 -s /bin/false qmailq
+%useradd -g qmail -d %{varqmail} -u 84 -s /bin/false qmailr
+%useradd -g qmail -d %{varqmail} -u 85 -s /bin/false qmails
+%useradd -g nofiles -d %{varqmail} -u 86 -s /bin/false qmaill
+%useradd -g nofiles -d %{varqmail} -u 87 -s /bin/false qmailp
 
 %post
 if [ ! -f /etc/mail/mailname -a -d /etc/mail ]; then
@@ -1259,6 +1190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2006/04/16 18:38:09  glen
+- %useradd/%groupadd
+
 Revision 1.156  2006/04/11 13:40:38  glen
 - add badrcpto patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qmail.spec?r1=1.156&r2=1.157&f=u