diff -crB exim.orig/PKGBUILD exim/PKGBUILD *** exim.orig/PKGBUILD 2010-01-31 21:05:47.000000000 +0000 --- exim/PKGBUILD 2010-02-01 20:24:10.000000000 +0000 *************** *** 2,8 **** # Maintainer: judd pkgname=exim pkgver=4.69 ! pkgrel=2 pkgdesc="A Message Transfer Agent" arch=(i686 x86_64) url="http://www.exim.org/" --- 2,8 ---- # Maintainer: judd pkgname=exim pkgver=4.69 ! pkgrel=3 pkgdesc="A Message Transfer Agent" arch=(i686 x86_64) url="http://www.exim.org/" *************** *** 26,31 **** --- 26,32 ---- '9aed772e87223213e8da9ca5e7376869' 'd788c26f86a9d72a0aebb3b849fe74f2' 'b75fe4c6e960a59a25b5f51e8f61ba3a') + pwd build() { # An exim user is required to build this *************** *** 52,57 **** --- 53,59 ---- 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|^# 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|' | \ *************** *** 64,69 **** --- 66,72 ---- 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/aliases|" | \ sed 's|^# \(LOG_FILE_PATH=/var/log/exim\)_%slog.*$|\1/%slog|' >Local/Makefile echo "EXTRALIBS_EXIM=-lwrap -lpam" >>Local/Makefile *************** *** 71,86 **** install -D -m644 ../exim.logrotate $pkgdir/etc/logrotate.d/exim install -D -m644 ../exim.conf.d $pkgdir/etc/conf.d/exim install -D -m644 doc/exim.8 $pkgdir/usr/share/man/man8/exim.8 mkdir -p $pkgdir/var/spool/exim/db $pkgdir/etc/mail \ $pkgdir/var/log/exim $pkgdir/usr/lib chown root.exim $pkgdir/var/spool/exim $pkgdir/var/log/exim ! touch $pkgdir/var/log/exim/{mainlog,paniclog,rejectlog} ! chown exim.exim $pkgdir/var/log/exim/{mainlog,paniclog,rejectlog} $pkgdir/var/spool/exim/db ! chmod 640 $pkgdir/var/log/exim/{mainlog,paniclog,rejectlog} chmod 770 $pkgdir/var/spool/exim $pkgdir/var/spool/exim/db $pkgdir/var/log/exim ! cd scripts ! cp exim_install exim_install.old ! sed "s|/etc/aliases|$pkgdir/etc/aliases|g" exim_install.old >exim_install if [ "$CARCH" = "x86_64" ]; then cd ../build-Linux-x86_64 else cd ../build-Linux-i386 --- 74,86 ---- install -D -m644 ../exim.logrotate $pkgdir/etc/logrotate.d/exim install -D -m644 ../exim.conf.d $pkgdir/etc/conf.d/exim install -D -m644 doc/exim.8 $pkgdir/usr/share/man/man8/exim.8 + 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 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 ! if [ "$CARCH" = "x86_64" ]; then cd ../build-Linux-x86_64 else cd ../build-Linux-i386 *************** *** 90,96 **** sed "s|/etc/aliases|/etc/mail/aliases|g" configure.default | \ sed "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \ >$pkgdir/etc/mail/exim.conf ! rm -f $pkgdir/etc/aliases cp $srcdir/aliases $pkgdir/etc/mail cp $srcdir/newaliases $pkgdir/usr/sbin cd $pkgdir/usr/sbin --- 90,96 ---- sed "s|/etc/aliases|/etc/mail/aliases|g" configure.default | \ sed "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \ >$pkgdir/etc/mail/exim.conf ! cp $srcdir/aliases $pkgdir/etc/mail cp $srcdir/newaliases $pkgdir/usr/sbin cd $pkgdir/usr/sbin Only in exim: PKGBUILD.patch diff -crB exim.orig/exim.install exim/exim.install *** exim.orig/exim.install 2010-02-01 20:26:40.000000000 +0000 --- exim/exim.install 2010-02-01 20:16:03.000000000 +0000 *************** *** 1,7 **** # arg 1: the new package version post_install() { ! groupadd -g 79 exim &>/dev/null ! useradd -u 79 -g exim -d /var/spool/exim -s /bin/false exim &>/dev/null } # arg 1: the new package version --- 1,15 ---- # arg 1: the new package version post_install() { ! ! grep "^exim:" /etc/group > /dev/null 2>&1 ! if [ $? -ne 0 ]; then ! groupadd -g 79 exim &>/dev/null ! fi ! ! grep "^exim:" /etc/passwd > /dev/null 2>&1 ! if [ $? -ne 0 ]; then ! useradd -u 79 -g exim -d /var/spool/exim -s /bin/false exim &>/dev/null ! fi } # arg 1: the new package version