Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/libevent/PKGBUILD
	core/syslinux/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/amarok/PKGBUILD
	extra/libstroke/PKGBUILD
	extra/pidgin/PKGBUILD

1 files changed, 25 insertions, 63 deletions

diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 877f1be0c..a191557d0 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 38427 2011-01-27 04:52:11Z angvp $
+# $Id: PKGBUILD 46480 2011-05-07 19:12:24Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=exim
-pkgver=4.74
-pkgrel=1
+pkgver=4.75
+pkgrel=2
 pkgdesc="A Message Transfer Agent"
 arch=(i686 x86_64 'mips64el')
 url="http://www.exim.org/"
@@ -11,6 +11,7 @@ license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf \
         etc/logrotate.d/exim etc/conf.d/exim)
 install=exim.install
+changelog=exim.changelog
 depends=('db' 'pcre' 'pam' 'tcp_wrappers' 'openssl' 'libldap')
 makedepends=('sudo')
 provides=('smtp-server')
@@ -21,60 +22,25 @@ source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-${pkgver}.
         newaliases 
         exim 
         exim.logrotate 
-        exim.conf.d)
-md5sums=('1d9c189940909303d914bbc4247dc861'
+        exim.conf.d
+        exim.Makefile
+        475format.patch
+        )
+md5sums=('427fb74bbd2afbea759e6da38f25af17'
          '4874006f0585253ddab027d441009757'
          'ea39f58bffc16f5e3bbe59dffcf09449'
          '9aed772e87223213e8da9ca5e7376869'
          'd788c26f86a9d72a0aebb3b849fe74f2'
-         'b75fe4c6e960a59a25b5f51e8f61ba3a')
+         'b75fe4c6e960a59a25b5f51e8f61ba3a'
+         '61e76543476f52f136c1d6c80ac1c5a1'
+         '4d5e58f07896db227ea24bea57972bd1')
 
 build() {
-  # An exim user is required to build this
-  if [ ! `egrep '^exim' /etc/passwd` ]; then
-    echo "==> Adding user/group exim (temporarily)"
-    sudo groupadd -g 79 exim
-    sudo useradd -u 79 -g exim -d /var/spool/exim -s /bin/false exim
-    cleanup=1
-  else
-    cleanup=0
-  fi
-  
   cd ${srcdir}/${pkgname}-${pkgver}
   sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h
   # Make some configuration changes
-  sed 's|^BIN_DIRECTORY.*$|BIN_DIRECTORY=/usr/sbin|' src/EDITME | \
-  sed 's|^CONFIGURE_FILE.*$|CONFIGURE_FILE=/etc/mail/exim.conf|' | \
-  sed 's|^EXIM_USER.*$|EXIM_USER=exim|' | \
-  sed 's|^COMPRESS_COMMAND.*$|COMPRESS_COMMAND=/bin/gzip|' | \
-  sed 's|^ZCAT_COMMAND.*$|ZCAT_COMMAND=/bin/zcat|' | \
-  sed 's|^CHOWN_COMMAND.*$|CHOWN_COMMAND=/bin/chown|' | \
-  sed 's|^CHGRP_COMMAND.*$|CHGRP_COMMAND=/bin/chgrp|' | \
-  sed 's|^EXIM_MONITOR.*$||' | \
-  sed 's|^# MAX_NAMED_LIST.*$|MAX_NAMED_LIST=16|' | \
-  sed 's|^# SUPPORT_MAILDIR.*$|SUPPORT_MAILDIR=yes|' | \
-  sed 's|^# \(PID_FILE_PATH=/var\)/lock/exim.pid.*$|\1/run/exim.pid|' | \
-  sed 's|^# TRANSPORT_LMTP=yes|TRANSPORT_LMTP=yes|' | \
-  sed 's|^# LOOKUP_LDAP=yes|LOOKUP_LDAP=yes|' | \
-  sed 's|^# LDAP_LIB_TYPE=OPENLDAP2|LDAP_LIB_TYPE=OPENLDAP2|' | \
-  sed 's|^# LOOKUP_DSEARCH=yes|LOOKUP_DSEARCH=yes|' | \
-  sed 's|^# AUTH_CRAM_MD5=yes$|AUTH_CRAM_MD5=yes|' | \
-  sed 's|^# AUTH_PLAINTEXT=yes$|AUTH_PLAINTEXT=yes|' | \
-  sed 's|^# AUTH_SPA=yes$|AUTH_SPA=yes|' | \
-  sed 's|^# AUTH_DOVECOT=yes$|AUTH_DOVECOT=yes|' | \
-  sed 's|^# SUPPORT_PAM=yes$|SUPPORT_PAM=yes|' | \
-  sed 's|^# USE_TCP_WRAPPERS=yes$|USE_TCP_WRAPPERS=yes|' | \
-  sed 's|^EXIM_GROUP.*$|EXIM_GROUP=exim|' | \
-  sed 's|^# SUPPORT_TLS.*$|SUPPORT_TLS=yes|' | \
-  sed 's|^# TLS_LIBS.*$|TLS_LIBS=-L/usr/lib -lssl -lcrypto|' | \
-  sed 's|^# TLS_INCLUDE.*$|TLS_INCLUDE=-I/usr/include/openssl|' | \
-  sed 's|^# WITH_CONTENT_SCAN.*$|WITH_CONTENT_SCAN=yes|' | \
-  sed 's|^# WITH_OLD_DEMIME.*$|WITH_OLD_DEMIME=yes|' | \
-  sed "s|^SYSTEM_ALIASES_FILE=/etc/aliases|SYSTEM_ALIASES_FILE=${pkgdir}/etc/mail/aliases|" | \
-  sed 's|^# \(LOG_FILE_PATH=/var/log/exim\)_%slog.*$|\1/%slog|' >Local/Makefile
-  echo "HAVE_IPV6=YES"               >> Local/Makefile
-  echo "LOOKUP_LIBS=-lldap"          >> Local/Makefile
-  echo "EXTRALIBS_EXIM=-lwrap -lpam" >> Local/Makefile
+  cp ${srcdir}/${pkgname}.Makefile Local/Makefile
+  patch -p2 < ${srcdir}/475format.patch
   make
 }
 
@@ -86,11 +52,15 @@ package() {
   install -D -m755 ../exim ${pkgdir}/etc/rc.d/exim
   mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \
     ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin}
-  chown root.exim ${pkgdir}/var/spool/exim ${pkgdir}/var/log/exim
-  chown exim.exim ${pkgdir}/var/spool/exim/db
   chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim
   cd build-Linux-*
-  inst_dest=${pkgdir}/usr/sbin inst_conf=${pkgdir}/etc/mail/exim.conf ../scripts/exim_install
+  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\
+          exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\
+          exim_fixdb eximstats exinext exiqgrep exiwhat
+  do
+          install -m 0755 $i ${pkgdir}/usr/sbin
+  done
+
   cd ${srcdir}/exim-${pkgver}/src
   sed "s|/etc/aliases|/etc/mail/aliases|g" configure.default | \
     sed "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
@@ -99,21 +69,13 @@ package() {
   cp ${srcdir}/aliases ${pkgdir}/etc/mail
   cp ${srcdir}/newaliases ${pkgdir}/usr/sbin
   cd ${pkgdir}/usr/sbin
-  ln -s exim mailq
-  ln -s exim rmail
-  ln -s exim rsmtp
-  ln -s exim runq
-  ln -s exim sendmail
+  for i in mailq rmail rsmtp runq sendmail 
+  do
+      ln -s exim $i
+  done
   # fhs compliancy
   ln -s ../sbin/exim ../lib/sendmail
 
   mkdir -p ${pkgdir}/etc/rc.d
   cp ${srcdir}/exim ${pkgdir}/etc/rc.d
-
-
-  if [ $cleanup -eq 1 ]; then
-    echo "==> Removing user/group exim"
-    sudo userdel exim
-  fi
-  return 0
 }