Sat Feb 25 23:15:06 UTC 2012

1 files changed, 12 insertions, 32 deletions

diff --git a/extra/mailman/PKGBUILD b/extra/mailman/PKGBUILD
index 7306c6363..a7b140030 100644
--- a/extra/mailman/PKGBUILD
+++ b/extra/mailman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102741 2010-12-10 21:29:32Z andyrtr $
+# $Id: PKGBUILD 151051 2012-02-24 15:02:06Z pierre $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=mailman
 pkgver=2.1.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Mailing list manager with built in web access"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,42 +12,27 @@ depends=('python2' 'smtp-server')
 # 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead.
 backup=('usr/lib/mailman/Mailman/mm_cfg.py')
 install=$pkgname.install
-source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz
-	mailman-2.1-build.patch
-	rc.mailman)
+source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
+        'mailman-2.1-build.patch'
+        'rc.mailman')
 md5sums=('9ea163871ceccbd33fee4c9e335fcf7b'
          'ed04d062379eb21e39ce1e70e6b1ade2'
          '3d83d06d0ec3319bf3c7d9df5d18e89f')
 
-# needs to be build as root for pam allowing to create new user/group
-# LANG=C; time rm -rf src/ pkg/ && time makepkg -L --asroot
-
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   # fix calls to /usr/bin/python
-  find . -name '*.py' | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
+  find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} +
   # fix directory permissions to satisfy check_perms
   patch -Np1 -i ${srcdir}/mailman-2.1-build.patch
-  
-  # the mailman user and group are required to build (better to satisfy check_perms)
-  if ! egrep '^mailman' /etc/passwd; then
-    msg "Adding user/group mailman (temporarily)"
-    groupadd -g 80 mailman
-    useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman -M -r mailman
-    export cleanup=1
-  else
-    export cleanup=0
-  fi
 
   ./configure --without-permcheck \
               --prefix=/usr/lib/mailman \
               --with-var-prefix=/var/lib/mailman \
-              --with-mail-gid=mailman \
-	      --with-username=mailman --with-groupname=mailman \
+              --with-mail-gid=80 \
+              --with-username=80 --with-groupname=80 \
               --with-cgi-gid=http --with-python=/usr/bin/python2
-
   make
 }
 
@@ -69,17 +54,12 @@ package() {
   ln -sv /usr/lib/mailman/Mailman/mm_cfg.py ${pkgdir}/etc/${pkgname}/mm_cfg.py
 
   # fix some permissions to satisfy check_perms
-  chown -R mailman:mailman $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
-  chown http:mailman ${pkgdir}/var/lib/mailman/archives/private
+  chown -R 80:80 $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
+  chown http:80 ${pkgdir}/var/lib/mailman/archives/private
   chmod 2770 ${pkgdir}/var/lib/mailman/archives/private
   chmod 2755 ${pkgdir}/usr/lib/mailman/cgi-bin/* 
   chmod 2755 ${pkgdir}/usr/lib/mailman/mail/mailman
-  
+
   # install the launch script
-  install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman || return 1
-  
-  if [ $cleanup -eq 1 ]; then
-    msg "Removing user/group mailman"
-    userdel mailman
-  fi
+  install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman
 }