Date: Wednesday, August 1, 2012 @ 20:26:06 Author: bisson Revision: 164657
archrelease: copy trunk to extra-i686, extra-x86_64 Added: postfix/repos/extra-i686/PKGBUILD (from rev 164656, postfix/trunk/PKGBUILD) postfix/repos/extra-i686/aliases.patch (from rev 164656, postfix/trunk/aliases.patch) postfix/repos/extra-i686/install (from rev 164656, postfix/trunk/install) postfix/repos/extra-i686/rc.d (from rev 164656, postfix/trunk/rc.d) postfix/repos/extra-i686/service (from rev 164656, postfix/trunk/service) postfix/repos/extra-x86_64/PKGBUILD (from rev 164656, postfix/trunk/PKGBUILD) postfix/repos/extra-x86_64/aliases.patch (from rev 164656, postfix/trunk/aliases.patch) postfix/repos/extra-x86_64/install (from rev 164656, postfix/trunk/install) postfix/repos/extra-x86_64/rc.d (from rev 164656, postfix/trunk/rc.d) postfix/repos/extra-x86_64/service (from rev 164656, postfix/trunk/service) Deleted: postfix/repos/extra-i686/PKGBUILD postfix/repos/extra-i686/aliases.patch postfix/repos/extra-i686/install postfix/repos/extra-i686/rc.d postfix/repos/extra-i686/service postfix/repos/extra-x86_64/PKGBUILD postfix/repos/extra-x86_64/aliases.patch postfix/repos/extra-x86_64/install postfix/repos/extra-x86_64/rc.d postfix/repos/extra-x86_64/service ----------------------------+ extra-i686/PKGBUILD | 142 +++++++++++++++++++++---------------------- extra-i686/aliases.patch | 36 +++++----- extra-i686/install | 66 +++++++++---------- extra-i686/rc.d | 72 ++++++++++----------- extra-i686/service | 24 +++---- extra-x86_64/PKGBUILD | 142 +++++++++++++++++++++---------------------- extra-x86_64/aliases.patch | 36 +++++----- extra-x86_64/install | 66 +++++++++---------- extra-x86_64/rc.d | 72 ++++++++++----------- extra-x86_64/service | 24 +++---- 10 files changed, 340 insertions(+), 340 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-i686/PKGBUILD 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,71 +0,0 @@ -# $Id$ -# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> -# Contributor: Paul Mattal <p...@archlinux.org> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=postfix -pkgver=2.9.3 -pkgrel=3 -pkgdesc='Fast, easy to administer, secure mail server' -url='http://www.postfix.org/' -license=('custom') -arch=('i686' 'x86_64') -depends=('pcre' 'libsasl' 'libldap' 'db' - 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') -backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" - 'aliases.patch' - 'service' - 'rc.d') -sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d' - '5fc3de6c7df1e5851a0a379e825148868808318b' - 'af621cf064813d9ddb13ffd579fee33e6b82d4be' - '40c6be2eb55e6437a402f43775cdb3d22ea87a66') - -provides=('smtp-server' 'smtp-forwarder') -conflicts=('smtp-server' 'smtp-forwarder') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make makefiles DEBUG='' CCARGS=' \ - -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ - -DHAS_LDAP \ - -DUSE_TLS \ - -DHAS_MYSQL -I/usr/include/mysql \ - -DHAS_PGSQL -I/usr/include/postgresql \ - -DHAS_SQLITE \ - -DHAS_CDB \ - ' AUXLIBS=' \ - -lsasl2 \ - -lldap -llber \ - -lssl -lcrypto \ - -lmysqlclient -lz -lm \ - -lpq \ - -lsqlite3 -lpthread \ - -lcdb \ - ' OPT="${CFLAGS} ${LDFLAGS}" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sh postfix-install -non-interactive \ - install_root="${pkgdir}" \ - daemon_directory="/usr/lib/${pkgname}" \ - sample_directory="/etc/${pkgname}/sample" \ - manpage_directory="/usr/share/man" \ - readme_directory="/usr/share/doc/${pkgname}" \ - - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" - - cd "${pkgdir}" - patch -p0 -i "${srcdir}"/aliases.patch - sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "usr/lib/${pkgname}/postfix-files" -} Copied: postfix/repos/extra-i686/PKGBUILD (from rev 164656, postfix/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,71 @@ +# $Id$ +# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> +# Contributor: Paul Mattal <p...@archlinux.org> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=postfix +pkgver=2.9.4 +pkgrel=1 +pkgdesc='Fast, easy to administer, secure mail server' +url='http://www.postfix.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('pcre' 'libsasl' 'libldap' 'db' + 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') +backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" + 'aliases.patch' + 'service' + 'rc.d') +sha1sums=('ac53c2c6e15b642d5d06eb0fc092d6a35ab7eec7' + '5fc3de6c7df1e5851a0a379e825148868808318b' + 'af621cf064813d9ddb13ffd579fee33e6b82d4be' + '40c6be2eb55e6437a402f43775cdb3d22ea87a66') + +provides=('smtp-server' 'smtp-forwarder') +conflicts=('smtp-server' 'smtp-forwarder') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make makefiles DEBUG='' CCARGS=' \ + -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ + -DHAS_LDAP \ + -DUSE_TLS \ + -DHAS_MYSQL -I/usr/include/mysql \ + -DHAS_PGSQL -I/usr/include/postgresql \ + -DHAS_SQLITE \ + -DHAS_CDB \ + ' AUXLIBS=' \ + -lsasl2 \ + -lldap -llber \ + -lssl -lcrypto \ + -lmysqlclient -lz -lm \ + -lpq \ + -lsqlite3 -lpthread \ + -lcdb \ + ' OPT="${CFLAGS} ${LDFLAGS}" + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sh postfix-install -non-interactive \ + install_root="${pkgdir}" \ + daemon_directory="/usr/lib/${pkgname}" \ + sample_directory="/etc/${pkgname}/sample" \ + manpage_directory="/usr/share/man" \ + readme_directory="/usr/share/doc/${pkgname}" \ + + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" + + cd "${pkgdir}" + patch -p0 -i "${srcdir}"/aliases.patch + sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "usr/lib/${pkgname}/postfix-files" +} Deleted: extra-i686/aliases.patch =================================================================== --- extra-i686/aliases.patch 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-i686/aliases.patch 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,18 +0,0 @@ ---- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 -+++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 -@@ -382,6 +382,7 @@ - #alias_maps = hash:/etc/aliases - #alias_maps = hash:/etc/aliases, nis:mail.aliases - #alias_maps = netinfo:/aliases -+alias_maps = hash:/etc/postfix/aliases - - # The alias_database parameter specifies the alias database(s) that - # are built with "newaliases" or "sendmail -bi". This is a separate -@@ -392,6 +393,7 @@ - #alias_database = dbm:/etc/mail/aliases - #alias_database = hash:/etc/aliases - #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases -+alias_database = $alias_maps - - # ADDRESS EXTENSIONS (e.g., user+foo) - # Copied: postfix/repos/extra-i686/aliases.patch (from rev 164656, postfix/trunk/aliases.patch) =================================================================== --- extra-i686/aliases.patch (rev 0) +++ extra-i686/aliases.patch 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,18 @@ +--- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 ++++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 +@@ -382,6 +382,7 @@ + #alias_maps = hash:/etc/aliases + #alias_maps = hash:/etc/aliases, nis:mail.aliases + #alias_maps = netinfo:/aliases ++alias_maps = hash:/etc/postfix/aliases + + # The alias_database parameter specifies the alias database(s) that + # are built with "newaliases" or "sendmail -bi". This is a separate +@@ -392,6 +393,7 @@ + #alias_database = dbm:/etc/mail/aliases + #alias_database = hash:/etc/aliases + #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases ++alias_database = $alias_maps + + # ADDRESS EXTENSIONS (e.g., user+foo) + # Deleted: extra-i686/install =================================================================== --- extra-i686/install 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-i686/install 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,33 +0,0 @@ -post_install() { - getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null - getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null - getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null - - cd var/spool/postfix - chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved - chgrp postdrop public maildrop - cd ../../../usr/sbin - chgrp postdrop postqueue postdrop - chmod g+s postqueue postdrop - cd ../.. - chown postfix var/lib/postfix - - newaliases -} - -post_upgrade() { - post_install - - if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF - -==> You must now run "postfix reload" due to inter-daemon protocol change. - -EOF - fi -} - -pre_remove() { - getent passwd postfix &>/dev/null && userdel postfix >/dev/null - getent group postfix &>/dev/null && groupdel postfix >/dev/null - getent group postdrop &>/dev/null && groupdel postdrop >/dev/null -} Copied: postfix/repos/extra-i686/install (from rev 164656, postfix/trunk/install) =================================================================== --- extra-i686/install (rev 0) +++ extra-i686/install 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,33 @@ +post_install() { + getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null + getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null + getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null + + cd var/spool/postfix + chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved + chgrp postdrop public maildrop + cd ../../../usr/sbin + chgrp postdrop postqueue postdrop + chmod g+s postqueue postdrop + cd ../.. + chown postfix var/lib/postfix + + newaliases +} + +post_upgrade() { + post_install + + if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF + +==> You must now run "postfix reload" due to inter-daemon protocol change. + +EOF + fi +} + +pre_remove() { + getent passwd postfix &>/dev/null && userdel postfix >/dev/null + getent group postfix &>/dev/null && groupdel postfix >/dev/null + getent group postdrop &>/dev/null && groupdel postdrop >/dev/null +} Deleted: extra-i686/rc.d =================================================================== --- extra-i686/rc.d 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-i686/rc.d 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=postfix - -case "$1" in -start) - stat_busy "Starting $name daemon" - /usr/sbin/postfix start &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - /usr/sbin/postfix stop &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - /usr/sbin/postfix reload &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 Copied: postfix/repos/extra-i686/rc.d (from rev 164656, postfix/trunk/rc.d) =================================================================== --- extra-i686/rc.d (rev 0) +++ extra-i686/rc.d 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=postfix + +case "$1" in +start) + stat_busy "Starting $name daemon" + /usr/sbin/postfix start &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + /usr/sbin/postfix stop &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +reload) + stat_busy "Reloading $name daemon" + /usr/sbin/postfix reload &>/dev/null \ + && { stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 Deleted: extra-i686/service =================================================================== --- extra-i686/service 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-i686/service 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,12 +0,0 @@ -[Unit] -Description=Postfix Mail Transport Daemon -After=network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/postfix start -ExecStop=/usr/sbin/postfix stop -ExecReload=/usr/sbin/postfix reload - -[Install] -WantedBy=multi-user.target Copied: postfix/repos/extra-i686/service (from rev 164656, postfix/trunk/service) =================================================================== --- extra-i686/service (rev 0) +++ extra-i686/service 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,12 @@ +[Unit] +Description=Postfix Mail Transport Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/postfix start +ExecStop=/usr/sbin/postfix stop +ExecReload=/usr/sbin/postfix reload + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-x86_64/PKGBUILD 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,71 +0,0 @@ -# $Id$ -# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> -# Contributor: Paul Mattal <p...@archlinux.org> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=postfix -pkgver=2.9.3 -pkgrel=3 -pkgdesc='Fast, easy to administer, secure mail server' -url='http://www.postfix.org/' -license=('custom') -arch=('i686' 'x86_64') -depends=('pcre' 'libsasl' 'libldap' 'db' - 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') -backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" - 'aliases.patch' - 'service' - 'rc.d') -sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d' - '5fc3de6c7df1e5851a0a379e825148868808318b' - 'af621cf064813d9ddb13ffd579fee33e6b82d4be' - '40c6be2eb55e6437a402f43775cdb3d22ea87a66') - -provides=('smtp-server' 'smtp-forwarder') -conflicts=('smtp-server' 'smtp-forwarder') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make makefiles DEBUG='' CCARGS=' \ - -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ - -DHAS_LDAP \ - -DUSE_TLS \ - -DHAS_MYSQL -I/usr/include/mysql \ - -DHAS_PGSQL -I/usr/include/postgresql \ - -DHAS_SQLITE \ - -DHAS_CDB \ - ' AUXLIBS=' \ - -lsasl2 \ - -lldap -llber \ - -lssl -lcrypto \ - -lmysqlclient -lz -lm \ - -lpq \ - -lsqlite3 -lpthread \ - -lcdb \ - ' OPT="${CFLAGS} ${LDFLAGS}" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sh postfix-install -non-interactive \ - install_root="${pkgdir}" \ - daemon_directory="/usr/lib/${pkgname}" \ - sample_directory="/etc/${pkgname}/sample" \ - manpage_directory="/usr/share/man" \ - readme_directory="/usr/share/doc/${pkgname}" \ - - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" - - cd "${pkgdir}" - patch -p0 -i "${srcdir}"/aliases.patch - sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "usr/lib/${pkgname}/postfix-files" -} Copied: postfix/repos/extra-x86_64/PKGBUILD (from rev 164656, postfix/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,71 @@ +# $Id$ +# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> +# Contributor: Paul Mattal <p...@archlinux.org> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=postfix +pkgver=2.9.4 +pkgrel=1 +pkgdesc='Fast, easy to administer, secure mail server' +url='http://www.postfix.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('pcre' 'libsasl' 'libldap' 'db' + 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') +backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" + 'aliases.patch' + 'service' + 'rc.d') +sha1sums=('ac53c2c6e15b642d5d06eb0fc092d6a35ab7eec7' + '5fc3de6c7df1e5851a0a379e825148868808318b' + 'af621cf064813d9ddb13ffd579fee33e6b82d4be' + '40c6be2eb55e6437a402f43775cdb3d22ea87a66') + +provides=('smtp-server' 'smtp-forwarder') +conflicts=('smtp-server' 'smtp-forwarder') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make makefiles DEBUG='' CCARGS=' \ + -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ + -DHAS_LDAP \ + -DUSE_TLS \ + -DHAS_MYSQL -I/usr/include/mysql \ + -DHAS_PGSQL -I/usr/include/postgresql \ + -DHAS_SQLITE \ + -DHAS_CDB \ + ' AUXLIBS=' \ + -lsasl2 \ + -lldap -llber \ + -lssl -lcrypto \ + -lmysqlclient -lz -lm \ + -lpq \ + -lsqlite3 -lpthread \ + -lcdb \ + ' OPT="${CFLAGS} ${LDFLAGS}" + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sh postfix-install -non-interactive \ + install_root="${pkgdir}" \ + daemon_directory="/usr/lib/${pkgname}" \ + sample_directory="/etc/${pkgname}/sample" \ + manpage_directory="/usr/share/man" \ + readme_directory="/usr/share/doc/${pkgname}" \ + + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" + + cd "${pkgdir}" + patch -p0 -i "${srcdir}"/aliases.patch + sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "usr/lib/${pkgname}/postfix-files" +} Deleted: extra-x86_64/aliases.patch =================================================================== --- extra-x86_64/aliases.patch 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-x86_64/aliases.patch 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,18 +0,0 @@ ---- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 -+++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 -@@ -382,6 +382,7 @@ - #alias_maps = hash:/etc/aliases - #alias_maps = hash:/etc/aliases, nis:mail.aliases - #alias_maps = netinfo:/aliases -+alias_maps = hash:/etc/postfix/aliases - - # The alias_database parameter specifies the alias database(s) that - # are built with "newaliases" or "sendmail -bi". This is a separate -@@ -392,6 +393,7 @@ - #alias_database = dbm:/etc/mail/aliases - #alias_database = hash:/etc/aliases - #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases -+alias_database = $alias_maps - - # ADDRESS EXTENSIONS (e.g., user+foo) - # Copied: postfix/repos/extra-x86_64/aliases.patch (from rev 164656, postfix/trunk/aliases.patch) =================================================================== --- extra-x86_64/aliases.patch (rev 0) +++ extra-x86_64/aliases.patch 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,18 @@ +--- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 ++++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 +@@ -382,6 +382,7 @@ + #alias_maps = hash:/etc/aliases + #alias_maps = hash:/etc/aliases, nis:mail.aliases + #alias_maps = netinfo:/aliases ++alias_maps = hash:/etc/postfix/aliases + + # The alias_database parameter specifies the alias database(s) that + # are built with "newaliases" or "sendmail -bi". This is a separate +@@ -392,6 +393,7 @@ + #alias_database = dbm:/etc/mail/aliases + #alias_database = hash:/etc/aliases + #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases ++alias_database = $alias_maps + + # ADDRESS EXTENSIONS (e.g., user+foo) + # Deleted: extra-x86_64/install =================================================================== --- extra-x86_64/install 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-x86_64/install 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,33 +0,0 @@ -post_install() { - getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null - getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null - getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null - - cd var/spool/postfix - chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved - chgrp postdrop public maildrop - cd ../../../usr/sbin - chgrp postdrop postqueue postdrop - chmod g+s postqueue postdrop - cd ../.. - chown postfix var/lib/postfix - - newaliases -} - -post_upgrade() { - post_install - - if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF - -==> You must now run "postfix reload" due to inter-daemon protocol change. - -EOF - fi -} - -pre_remove() { - getent passwd postfix &>/dev/null && userdel postfix >/dev/null - getent group postfix &>/dev/null && groupdel postfix >/dev/null - getent group postdrop &>/dev/null && groupdel postdrop >/dev/null -} Copied: postfix/repos/extra-x86_64/install (from rev 164656, postfix/trunk/install) =================================================================== --- extra-x86_64/install (rev 0) +++ extra-x86_64/install 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,33 @@ +post_install() { + getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null + getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null + getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null + + cd var/spool/postfix + chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved + chgrp postdrop public maildrop + cd ../../../usr/sbin + chgrp postdrop postqueue postdrop + chmod g+s postqueue postdrop + cd ../.. + chown postfix var/lib/postfix + + newaliases +} + +post_upgrade() { + post_install + + if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF + +==> You must now run "postfix reload" due to inter-daemon protocol change. + +EOF + fi +} + +pre_remove() { + getent passwd postfix &>/dev/null && userdel postfix >/dev/null + getent group postfix &>/dev/null && groupdel postfix >/dev/null + getent group postdrop &>/dev/null && groupdel postdrop >/dev/null +} Deleted: extra-x86_64/rc.d =================================================================== --- extra-x86_64/rc.d 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-x86_64/rc.d 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=postfix - -case "$1" in -start) - stat_busy "Starting $name daemon" - /usr/sbin/postfix start &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - /usr/sbin/postfix stop &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - /usr/sbin/postfix reload &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 Copied: postfix/repos/extra-x86_64/rc.d (from rev 164656, postfix/trunk/rc.d) =================================================================== --- extra-x86_64/rc.d (rev 0) +++ extra-x86_64/rc.d 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=postfix + +case "$1" in +start) + stat_busy "Starting $name daemon" + /usr/sbin/postfix start &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + /usr/sbin/postfix stop &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +reload) + stat_busy "Reloading $name daemon" + /usr/sbin/postfix reload &>/dev/null \ + && { stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 Deleted: extra-x86_64/service =================================================================== --- extra-x86_64/service 2012-08-02 00:25:13 UTC (rev 164656) +++ extra-x86_64/service 2012-08-02 00:26:06 UTC (rev 164657) @@ -1,12 +0,0 @@ -[Unit] -Description=Postfix Mail Transport Daemon -After=network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/postfix start -ExecStop=/usr/sbin/postfix stop -ExecReload=/usr/sbin/postfix reload - -[Install] -WantedBy=multi-user.target Copied: postfix/repos/extra-x86_64/service (from rev 164656, postfix/trunk/service) =================================================================== --- extra-x86_64/service (rev 0) +++ extra-x86_64/service 2012-08-02 00:26:06 UTC (rev 164657) @@ -0,0 +1,12 @@ +[Unit] +Description=Postfix Mail Transport Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/postfix start +ExecStop=/usr/sbin/postfix stop +ExecReload=/usr/sbin/postfix reload + +[Install] +WantedBy=multi-user.target