From 5dfc85bee059c4b4385d36762701f8a36daae596 Mon Sep 17 00:00:00 2001
From: Han Boetes <han@mijncomputer.nl>
Date: Sun, 19 Nov 2006 20:16:09 +0100
Subject: [PATCH] qmail: cleanup and better scripts

---
 qmail/Pkgfile            |  9 ++++++---
 qmail/qmail-users-uid.sh | 18 +++++++++---------
 qmail/qmail-users.sh     | 15 +++++++--------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/qmail/Pkgfile b/qmail/Pkgfile
index 1678403c1..108db4fa4 100644
--- a/qmail/Pkgfile
+++ b/qmail/Pkgfile
@@ -1,8 +1,7 @@
-# $Id$
 # Maintainer:  Han Boetes <han@mijncomputer.nl>
 # Description: qmail is the proof security-bugfree software can be written.
 # URL:         http://www.qmail.org/
-# Depends on:  
+# Depends on:
 
 name=qmail
 version=1.05
@@ -14,10 +13,14 @@ source="
 
 build ()
 {
+    if ! grep -q qmaild /etc/passwd; then
+	echo "Read the README!" >&2
+	false
+    fi
     cd net$name-$version
     ./collate.sh
     cd net$name-$version
-    patch < $SRC/patch-Makefile
+    patch -i $SRC/patch-Makefile
     echo "${CC:=gcc} $CFLAGS" > conf-cc
     echo "${CC:=gcc -s}" > conf-ld
     make it man
diff --git a/qmail/qmail-users-uid.sh b/qmail/qmail-users-uid.sh
index a4dfcf4e3..f6af25779 100644
--- a/qmail/qmail-users-uid.sh
+++ b/qmail/qmail-users-uid.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-groupadd -g 81 nofiles
-useradd -u 81 -g nofiles -d /var/qmail/alias alias
-useradd -u 82 -g nofiles -d /var/qmail qmaild
-useradd -u 83 -g nofiles -d /var/qmail qmaill
-useradd -u 84 -g nofiles -d /var/qmail qmailp
-groupadd -g 82 qmail
-useradd -u 85 -g qmail -d /var/qmail qmailq
-useradd -u 86 -g qmail -d /var/qmail qmailr
-useradd -u 87 -g qmail -d /var/qmail qmails
+groupadd -g 250 nofiles
+useradd -u 250 -g nofiles -d /var/qmail/alias alias  -s /sbin/nologin
+useradd -u 251 -g nofiles -d /var/qmail       qmaild -s /sbin/nologin
+useradd -u 252 -g nofiles -d /var/qmail       qmaill -s /sbin/nologin
+useradd -u 253 -g nofiles -d /var/qmail       qmailp -s /sbin/nologin
 
+groupadd -g 251 qmail
+useradd -u 254 -g qmail -d /var/qmail qmailq -s /sbin/nologin
+useradd -u 255 -g qmail -d /var/qmail qmailr -s /sbin/nologin
+useradd -u 256 -g qmail -d /var/qmail qmails -s /sbin/nologin
diff --git a/qmail/qmail-users.sh b/qmail/qmail-users.sh
index 740d60c45..5cd33492e 100644
--- a/qmail/qmail-users.sh
+++ b/qmail/qmail-users.sh
@@ -1,12 +1,11 @@
 #!/bin/sh
 
 groupadd nofiles
-useradd -g nofiles -d /var/qmail/alias alias
-useradd -g nofiles -d /var/qmail qmaild
-useradd -g nofiles -d /var/qmail qmaill
-useradd -g nofiles -d /var/qmail qmailp
+useradd -g nofiles -d /var/qmail/alias alias  -s /sbin/nologin
+useradd -g nofiles -d /var/qmail       qmaild -s /sbin/nologin
+useradd -g nofiles -d /var/qmail       qmaill -s /sbin/nologin
+useradd -g nofiles -d /var/qmail       qmailp -s /sbin/nologin
 groupadd qmail
-useradd -g qmail -d /var/qmail qmailq
-useradd -g qmail -d /var/qmail qmailr
-useradd -g qmail -d /var/qmail qmails
-
+useradd -g qmail -d /var/qmail qmailq -s /sbin/nologin
+useradd -g qmail -d /var/qmail qmailr -s /sbin/nologin
+useradd -g qmail -d /var/qmail qmails -s /sbin/nologin