116 lines
3.1 KiB
Plaintext
116 lines
3.1 KiB
Plaintext
$OpenBSD: patch-configure,v 1.11 2015/04/09 15:37:08 okan Exp $
|
|
--- configure.orig Tue May 6 12:43:56 2014
|
|
+++ configure Sun Jan 11 10:37:11 2015
|
|
@@ -3543,54 +3543,8 @@ USERNAME=$with_username
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USERNAME" >&5
|
|
$as_echo "$USERNAME" >&6; }
|
|
|
|
-# User `mailman' must exist
|
|
+MAILMAN_USER=$with_username
|
|
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for user name \"$USERNAME\"" >&5
|
|
-$as_echo_n "checking for user name \"$USERNAME\"... " >&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
|
|
- as_fn_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." "$LINENO" 5
|
|
- fi
|
|
-fi
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
|
|
-$as_echo "okay" >&6; }
|
|
-
|
|
-
|
|
# Check for some other gid to use than `mailman'
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-groupname" >&5
|
|
$as_echo_n "checking for --with-groupname... " >&6; }
|
|
@@ -3609,54 +3563,7 @@ GROUPNAME=$with_groupname
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GROUPNAME" >&5
|
|
$as_echo "$GROUPNAME" >&6; }
|
|
|
|
-
|
|
-# Target group must exist
|
|
-
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for group name \"$GROUPNAME\"" >&5
|
|
-$as_echo_n "checking for group name \"$GROUPNAME\"... " >&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
|
|
- as_fn_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." "$LINENO" 5
|
|
- fi
|
|
-fi
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
|
|
-$as_echo "okay" >&6; }
|
|
-
|
|
+MAILMAN_GROUP=$with_groupname
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking permissions on $prefixcheck" >&5
|
|
$as_echo_n "checking permissions on $prefixcheck... " >&6; }
|