mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-19 08:13:21 +00:00
mail/mailman: fix empty group/user name regression in 2.1.39_2
...and drop files/patch-configure-in, which is no longer needed; neither is autoreconf needed to be reinstated. We can cheat the test -z "$VAR" inside the MM_FIND_{GROUP,USER}... configure[.in] macros by putting the proper contents into the proper environment variables. To fix the regression in... PR: 274991 Reported by: leres@
This commit is contained in:
parent
b4c952b5dd
commit
12264aff08
@ -1,6 +1,6 @@
|
|||||||
PORTNAME= mailman
|
PORTNAME= mailman
|
||||||
DISTVERSION= 2.1.39
|
DISTVERSION= 2.1.39
|
||||||
PORTREVISION= 2
|
PORTREVISION= 3
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
MASTER_SITES= GNU \
|
MASTER_SITES= GNU \
|
||||||
SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
|
SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
|
||||||
@ -34,6 +34,12 @@ CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} \
|
|||||||
--with-permcheck=no \
|
--with-permcheck=no \
|
||||||
--with-mailhost=localhost \
|
--with-mailhost=localhost \
|
||||||
--with-urlhost=localhost
|
--with-urlhost=localhost
|
||||||
|
# setting these defeats the automated check for users in configure[.in], as of 2.1.39,
|
||||||
|
# implemented in MM_FIND_* macros:
|
||||||
|
CONFIGURE_ENV+= CGI_GROUP=${CGI_GID} \
|
||||||
|
MAIL_GROUP=${MAIL_GID} \
|
||||||
|
MAILMAN_USER=${MM_USERNAME} \
|
||||||
|
MAILMAN_GROUP=${MM_GROUPNAME}
|
||||||
|
|
||||||
CONFLICTS= ja-mailman-2.1.* mailman*exim* mailman*postfix*
|
CONFLICTS= ja-mailman-2.1.* mailman*exim* mailman*postfix*
|
||||||
|
|
||||||
|
@ -1,67 +0,0 @@
|
|||||||
Mailman tests for existence of users during configure -- unfortunately
|
|
||||||
this creates a problem; we create the users just before install.
|
|
||||||
|
|
||||||
We remove the testing part.
|
|
||||||
|
|
||||||
--- configure.in.bak 2010-09-20 19:18:27.000000000 +0100
|
|
||||||
+++ configure.in 2011-06-14 20:20:29.209438957 +0100
|
|
||||||
@@ -311,28 +311,7 @@
|
|
||||||
# $2 == user id to check for
|
|
||||||
AC_SUBST($1)
|
|
||||||
changequote(,)
|
|
||||||
-if test -z "$$1"
|
|
||||||
-then
|
|
||||||
- cat > conftest.py <<EOF
|
|
||||||
-import grp
|
|
||||||
-gid = ''
|
|
||||||
-for group in "$2".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
|
|
||||||
- $1=`cat conftest.out`
|
|
||||||
-fi
|
|
||||||
+$1=$2
|
|
||||||
changequote([, ])
|
|
||||||
rm -f conftest.out conftest.py])
|
|
||||||
|
|
||||||
@@ -343,28 +322,7 @@
|
|
||||||
# $2 == user id to check for
|
|
||||||
AC_SUBST($1)
|
|
||||||
changequote(,)
|
|
||||||
-if test -z "$$1"
|
|
||||||
-then
|
|
||||||
- cat > conftest.py <<EOF
|
|
||||||
-import pwd
|
|
||||||
-uid = ''
|
|
||||||
-for user in "$2".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
|
|
||||||
- $1=`cat conftest.out`
|
|
||||||
-fi
|
|
||||||
+$1=$2
|
|
||||||
changequote([, ])
|
|
||||||
rm -f conftest.out conftest.py])
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user