do not check for the existence of _mailman:_mailman at configure time,

that user/group might not exist yet

noticed by Chris Mika <cmika at seenothing.org>
maintainer timeout
This commit is contained in:
sturm 2005-11-11 20:33:25 +00:00
parent cd0621de37
commit 338835bc26
2 changed files with 119 additions and 6 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2005/06/23 07:34:56 djm Exp $
# $OpenBSD: Makefile,v 1.35 2005/11/11 20:33:25 sturm Exp $
COMMENT= "mailing list manager with web interface"
DISTNAME= mailman-2.1.6
PKGNAME= ${DISTNAME}
PKGNAME= ${DISTNAME}p0
CATEGORIES= mail www
HOMEPAGE= http://www.gnu.org/software/mailman/

View File

@ -1,7 +1,120 @@
$OpenBSD: patch-configure,v 1.6 2005/06/23 07:34:56 djm Exp $
--- configure.orig Fri Dec 31 10:41:08 2004
+++ configure Fri Jun 10 08:04:20 2005
@@ -1579,7 +1579,7 @@ echo "$ac_t""$URLHOST" 1>&6
$OpenBSD: patch-configure,v 1.7 2005/11/11 20:33:26 sturm Exp $
--- configure.orig Fri Dec 31 00:41:08 2004
+++ configure Fri Nov 11 21:27:15 2005
@@ -1205,54 +1205,8 @@ then
fi
USERNAME=$with_username
echo "$ac_t""$USERNAME" 1>&6
+MAILMAN_USER=$with_username
-# User `mailman' must exist
-
-echo $ac_n "checking for user name \"$USERNAME\"""... $ac_c" 1>&6
-echo "configure:1213: checking for user name \"$USERNAME\"" >&5
-
-# MAILMAN_USER == variable name
-# $USERNAME == user id to check for
-
-
-if test -z "$MAILMAN_USER"
-then
- cat > conftest.py <<EOF
-import pwd
-uid = ''
-for user in "$USERNAME".split():
- try:
- try:
- uname = pwd.getpwuid(int(user))[0]
- break
- except ValueError:
- uname = pwd.getpwnam(user)[0]
- break
- except KeyError:
- uname = ''
-fp = open("conftest.out", "w")
-fp.write("%s\n" % uname)
-fp.close()
-EOF
- $PYTHON conftest.py
- MAILMAN_USER=`cat conftest.out`
-fi
-
-rm -f conftest.out conftest.py
-if test -z "$MAILMAN_USER"
-then
- if test "$with_permcheck" = "yes"
- then
- { echo "configure: error:
-***** No \"$USERNAME\" user found!
-***** Your system must have a \"$USERNAME\" user defined
-***** (usually in your /etc/passwd file). Please see the INSTALL
-***** file for details." 1>&2; exit 1; }
- fi
-fi
-echo "$ac_t""okay" 1>&6
-
-
# Check for some other gid to use than `mailman'
echo $ac_n "checking for --with-groupname""... $ac_c" 1>&6
echo "configure:1259: checking for --with-groupname" >&5
@@ -1269,55 +1223,10 @@ then
fi
GROUPNAME=$with_groupname
echo "$ac_t""$GROUPNAME" 1>&6
+MAILMAN_GROUP=$with_groupname
-# Target group must exist
-echo $ac_n "checking for group name \"$GROUPNAME\"""... $ac_c" 1>&6
-echo "configure:1278: checking for group name \"$GROUPNAME\"" >&5
-
-# MAILMAN_GROUP == variable name
-# $GROUPNAME == user id to check for
-
-
-if test -z "$MAILMAN_GROUP"
-then
- cat > conftest.py <<EOF
-import grp
-gid = ''
-for group in "$GROUPNAME".split():
- try:
- try:
- gname = grp.getgrgid(int(group))[0]
- break
- except ValueError:
- gname = grp.getgrnam(group)[0]
- break
- except KeyError:
- gname = ''
-fp = open("conftest.out", "w")
-fp.write("%s\n" % gname)
-fp.close()
-EOF
- $PYTHON conftest.py
- MAILMAN_GROUP=`cat conftest.out`
-fi
-
-rm -f conftest.out conftest.py
-if test -z "$MAILMAN_GROUP"
-then
- if test "$with_permcheck" = "yes"
- then
- { echo "configure: error:
-***** No \"$GROUPNAME\" group found!
-***** Your system must have a \"$GROUPNAME\" group defined
-***** (usually in your /etc/group file). Please see the INSTALL
-***** file for details." 1>&2; exit 1; }
- fi
-fi
-echo "$ac_t""okay" 1>&6
-
-
echo $ac_n "checking permissions on $prefixcheck""... $ac_c" 1>&6
echo "configure:1323: checking permissions on $prefixcheck" >&5
@@ -1579,7 +1488,7 @@ echo "$ac_t""$URLHOST" 1>&6
rm -f conftest.out conftest.py
# Checks for libraries.