150 lines
3.9 KiB
Plaintext
150 lines
3.9 KiB
Plaintext
$OpenBSD: patch-configure,v 1.5 2003/10/09 15:39:33 sturm Exp $
|
|
--- configure.orig 2003-09-22 04:54:04.000000000 +0200
|
|
+++ configure 2003-09-30 22:23:40.000000000 +0200
|
|
@@ -2631,65 +2631,13 @@ fi;
|
|
|
|
if test -z "$with_username"
|
|
then
|
|
- with_username="mailman"
|
|
+ with_username="_mailman"
|
|
fi
|
|
USERNAME=$with_username
|
|
echo "$as_me:$LINENO: result: $USERNAME" >&5
|
|
echo "${ECHO_T}$USERNAME" >&6
|
|
|
|
-# User `mailman' must exist
|
|
-
|
|
-echo "$as_me:$LINENO: checking for user name \"$USERNAME\"" >&5
|
|
-echo $ECHO_N "checking for user name \"$USERNAME\"... $ECHO_C" >&6
|
|
-
|
|
-# 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 "$as_me:$LINENO: 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." >&5
|
|
-echo "$as_me: 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." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- fi
|
|
-fi
|
|
-echo "$as_me:$LINENO: result: okay" >&5
|
|
-echo "${ECHO_T}okay" >&6
|
|
-
|
|
+MAILMAN_USER=_mailman
|
|
|
|
# Check for some other gid to use than `mailman'
|
|
echo "$as_me:$LINENO: checking for --with-groupname" >&5
|
|
@@ -2703,66 +2651,13 @@ fi;
|
|
|
|
if test -z "$with_groupname"
|
|
then
|
|
- with_groupname="mailman"
|
|
+ with_groupname="_mailman"
|
|
fi
|
|
GROUPNAME=$with_groupname
|
|
echo "$as_me:$LINENO: result: $GROUPNAME" >&5
|
|
echo "${ECHO_T}$GROUPNAME" >&6
|
|
|
|
-
|
|
-# Target group must exist
|
|
-
|
|
-echo "$as_me:$LINENO: checking for group name \"$GROUPNAME\"" >&5
|
|
-echo $ECHO_N "checking for group name \"$GROUPNAME\"... $ECHO_C" >&6
|
|
-
|
|
-# 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 "$as_me:$LINENO: 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." >&5
|
|
-echo "$as_me: 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." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- fi
|
|
-fi
|
|
-echo "$as_me:$LINENO: result: okay" >&5
|
|
-echo "${ECHO_T}okay" >&6
|
|
-
|
|
+MAILMAN_GROUP=_mailman
|
|
|
|
echo "$as_me:$LINENO: checking permissions on $prefixcheck" >&5
|
|
echo $ECHO_N "checking permissions on $prefixcheck... $ECHO_C" >&6
|
|
@@ -3057,7 +2952,7 @@ rm -f conftest.out conftest.py
|
|
|
|
|
|
|
|
-for ac_func in strerror setregid syslog
|
|
+for ac_func in strerror syslog
|
|
do
|
|
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
echo "$as_me:$LINENO: checking for $ac_func" >&5
|