Attachment 115978 Details for Bug 157868 – mm.diff

[patch] mm.diff

mm.diff (text/x-diff; charset=us-ascii), 2.37 KB, created by Guido Falsi on 2011-06-14 10:54:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2011-06-14 10:54:35 UTC

Size: 2.37 KB

patch

obsolete

>diff -ruN mailman.old/Makefile mailman/Makefile
>--- mailman.old/Makefile	2011-06-14 11:23:19.482461682 +0200
>+++ mailman/Makefile	2011-06-14 11:36:36.148014388 +0200
>@@ -154,10 +154,6 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \
> 	  ${WRKSRC}/Mailman/Defaults.py.in
>-# Disable username check in configure -- we promise to make the users!
>-	@${REINPLACE_CMD} \
>-		-e 's#^MM_FIND_$[^_]*$_NAME.*#MAILMAN_\1=$${\1NAME}#' \
>-		${WRKSRC}/configure.in
> 	@${SED} \
> 	  -e 's#%%USER%%#${MM_USERNAME}#g' \
> 	  -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' \
>diff -ruN mailman.old/files/patch-configure.in mailman/files/patch-configure.in
>--- mailman.old/files/patch-configure.in	1970-01-01 01:00:00.000000000 +0100
>+++ mailman/files/patch-configure.in	2011-06-14 11:39:14.446161292 +0200
>@@ -0,0 +1,70 @@
>+--- configure.in.old	2010-09-20 20:18:27.000000000 +0200
>++++ configure.in	2011-06-14 11:38:38.442321110 +0200
>+@@ -308,31 +308,10 @@
>+ # new macro for finding group names
>+ AC_DEFUN([MM_FIND_GROUP_NAME], [
>+ # $1 == variable name
>+-# $2 == user id to check for
>++# $2 == user group name
>+ 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])
>+ 
>+@@ -340,31 +319,10 @@
>+ # new macro for finding UIDs
>+ AC_DEFUN([MM_FIND_USER_NAME], [
>+ # $1 == variable name
>+-# $2 == user id to check for
>++# $2 == user name
>+ 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])
>+

Actions: View | Diff

Attachments on bug 157868: 115978