Date: Thursday, May 8, 2014 @ 10:56:17 Author: bisson Revision: 212121
archrelease: copy trunk to extra-i686, extra-x86_64 Added: postfix/repos/extra-i686/PKGBUILD (from rev 212120, postfix/trunk/PKGBUILD) postfix/repos/extra-i686/aliases.patch (from rev 212120, postfix/trunk/aliases.patch) postfix/repos/extra-i686/install (from rev 212120, postfix/trunk/install) postfix/repos/extra-i686/service (from rev 212120, postfix/trunk/service) postfix/repos/extra-x86_64/PKGBUILD (from rev 212120, postfix/trunk/PKGBUILD) postfix/repos/extra-x86_64/aliases.patch (from rev 212120, postfix/trunk/aliases.patch) postfix/repos/extra-x86_64/install (from rev 212120, postfix/trunk/install) postfix/repos/extra-x86_64/service (from rev 212120, postfix/trunk/service) Deleted: postfix/repos/extra-i686/PKGBUILD postfix/repos/extra-i686/aliases.patch postfix/repos/extra-i686/install 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/service ----------------------------+ /PKGBUILD | 168 +++++++++++++++++++++++++++++++++++++++++++ /aliases.patch | 36 +++++++++ /install | 36 +++++++++ /service | 28 +++++++ extra-i686/PKGBUILD | 84 --------------------- extra-i686/aliases.patch | 18 ---- extra-i686/install | 18 ---- extra-i686/service | 14 --- extra-x86_64/PKGBUILD | 84 --------------------- extra-x86_64/aliases.patch | 18 ---- extra-x86_64/install | 18 ---- extra-x86_64/service | 14 --- 12 files changed, 268 insertions(+), 268 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-05-08 08:56:03 UTC (rev 212120) +++ extra-i686/PKGBUILD 2014-05-08 08:56:17 UTC (rev 212121) @@ -1,84 +0,0 @@ -# $Id$ -# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> -# Contributor: Paul Mattal <p...@archlinux.org> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=(postfix postfix-tools) -pkgbase=postfix -pkgver=2.11.0 -pkgrel=2 -url='http://www.postfix.org/' -license=('custom') -arch=('i686' 'x86_64') -_postfix_depends=('pcre' 'libsasl' 'libldap' 'db' - 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') -_postfix_tools_depends=('openssl') -makedepends=("${_postfix_depends[@]}" "${_postfix_tools_depends[@]}") -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} - 'aliases.patch' - 'service') -sha1sums=('bc1fd50412742d9c28232b07c7d2139e37d3de28' 'SKIP' - '5fc3de6c7df1e5851a0a379e825148868808318b' - 'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9') - -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 \ - -DDEF_COMMAND_DIR=\"/usr/bin\" \ - -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ - -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \ - -DDEF_README_DIR=\"/usr/share/doc/postfix\" \ - -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ - -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ - ' AUXLIBS=' \ - -lsasl2 \ - -lldap -llber \ - -lssl -lcrypto \ - -lmysqlclient -lz -lm \ - -lpq \ - -lsqlite3 -lpthread \ - -lcdb \ - ' OPT="${CFLAGS} ${LDFLAGS}" - - make -} - -package_postfix() { - pkgdesc='Fast, easy to administer, secure mail server' - depends=("${_postfix_depends[@]}") - backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) - provides=('smtp-server' 'smtp-forwarder') - conflicts=('smtp-server' 'smtp-forwarder') - install=install - cd "${srcdir}/postfix-${pkgver}" - - sh postfix-install -non-interactive install_root="${pkgdir}" - - 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" -} - -package_postfix-tools() { - pkgdesc='SMTP/QMQP tools from the postfix distribution' - depends=("${_postfix_tools_depends[@]}") - cd "${srcdir}/postfix-${pkgver}" - - for name in posttls-finger {smtp,qmqp}-{sink,source}; do - install -Dm644 "man/man1/${name}.1" "$pkgdir/usr/share/man/man1/${name}.1" - install -Dm755 "bin/${name}" "$pkgdir/usr/bin/${name}" - done - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: postfix/repos/extra-i686/PKGBUILD (from rev 212120, postfix/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-05-08 08:56:17 UTC (rev 212121) @@ -0,0 +1,84 @@ +# $Id$ +# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> +# Contributor: Paul Mattal <p...@archlinux.org> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=(postfix postfix-tools) +pkgbase=postfix +pkgver=2.11.1 +pkgrel=1 +url='http://www.postfix.org/' +license=('custom') +arch=('i686' 'x86_64') +_postfix_depends=('pcre' 'libsasl' 'libldap' 'db' + 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') +_postfix_tools_depends=('openssl') +makedepends=("${_postfix_depends[@]}" "${_postfix_tools_depends[@]}") +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} + 'aliases.patch' + 'service') +sha1sums=('4034171013bde30600724f79c37f82d69a802ad0' 'SKIP' + '5fc3de6c7df1e5851a0a379e825148868808318b' + 'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9') + +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 \ + -DDEF_COMMAND_DIR=\"/usr/bin\" \ + -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ + -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \ + -DDEF_README_DIR=\"/usr/share/doc/postfix\" \ + -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ + ' AUXLIBS=' \ + -lsasl2 \ + -lldap -llber \ + -lssl -lcrypto \ + -lmysqlclient -lz -lm \ + -lpq \ + -lsqlite3 -lpthread \ + -lcdb \ + ' OPT="${CFLAGS} ${LDFLAGS}" + + make +} + +package_postfix() { + pkgdesc='Fast, easy to administer, secure mail server' + depends=("${_postfix_depends[@]}") + backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) + provides=('smtp-server' 'smtp-forwarder') + conflicts=('smtp-server' 'smtp-forwarder') + install=install + cd "${srcdir}/postfix-${pkgver}" + + sh postfix-install -non-interactive install_root="${pkgdir}" + + 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" +} + +package_postfix-tools() { + pkgdesc='SMTP/QMQP tools from the postfix distribution' + depends=("${_postfix_tools_depends[@]}") + cd "${srcdir}/postfix-${pkgver}" + + for name in posttls-finger {smtp,qmqp}-{sink,source}; do + install -Dm644 "man/man1/${name}.1" "$pkgdir/usr/share/man/man1/${name}.1" + install -Dm755 "bin/${name}" "$pkgdir/usr/bin/${name}" + done + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: extra-i686/aliases.patch =================================================================== --- extra-i686/aliases.patch 2014-05-08 08:56:03 UTC (rev 212120) +++ extra-i686/aliases.patch 2014-05-08 08:56:17 UTC (rev 212121) @@ -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 212120, postfix/trunk/aliases.patch) =================================================================== --- extra-i686/aliases.patch (rev 0) +++ extra-i686/aliases.patch 2014-05-08 08:56:17 UTC (rev 212121) @@ -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 2014-05-08 08:56:03 UTC (rev 212120) +++ extra-i686/install 2014-05-08 08:56:17 UTC (rev 212121) @@ -1,18 +0,0 @@ -post_upgrade() { - /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package - chown postfix var/lib/postfix -} - -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 - post_upgrade -} - -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 - true -} Copied: postfix/repos/extra-i686/install (from rev 212120, postfix/trunk/install) =================================================================== --- extra-i686/install (rev 0) +++ extra-i686/install 2014-05-08 08:56:17 UTC (rev 212121) @@ -0,0 +1,18 @@ +post_upgrade() { + /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package + chown postfix var/lib/postfix +} + +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 + post_upgrade +} + +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 + true +} Deleted: extra-i686/service =================================================================== --- extra-i686/service 2014-05-08 08:56:03 UTC (rev 212120) +++ extra-i686/service 2014-05-08 08:56:17 UTC (rev 212121) @@ -1,14 +0,0 @@ -[Unit] -Description=Postfix Mail Transport Agent -After=network.target - -[Service] -Type=forking -PIDFile=/var/spool/postfix/pid/master.pid -ExecStart=/usr/bin/postfix start -ExecStop=/usr/bin/postfix stop -ExecReload=/usr/bin/postfix reload -Restart=always - -[Install] -WantedBy=multi-user.target Copied: postfix/repos/extra-i686/service (from rev 212120, postfix/trunk/service) =================================================================== --- extra-i686/service (rev 0) +++ extra-i686/service 2014-05-08 08:56:17 UTC (rev 212121) @@ -0,0 +1,14 @@ +[Unit] +Description=Postfix Mail Transport Agent +After=network.target + +[Service] +Type=forking +PIDFile=/var/spool/postfix/pid/master.pid +ExecStart=/usr/bin/postfix start +ExecStop=/usr/bin/postfix stop +ExecReload=/usr/bin/postfix reload +Restart=always + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-05-08 08:56:03 UTC (rev 212120) +++ extra-x86_64/PKGBUILD 2014-05-08 08:56:17 UTC (rev 212121) @@ -1,84 +0,0 @@ -# $Id$ -# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> -# Contributor: Paul Mattal <p...@archlinux.org> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=(postfix postfix-tools) -pkgbase=postfix -pkgver=2.11.0 -pkgrel=2 -url='http://www.postfix.org/' -license=('custom') -arch=('i686' 'x86_64') -_postfix_depends=('pcre' 'libsasl' 'libldap' 'db' - 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') -_postfix_tools_depends=('openssl') -makedepends=("${_postfix_depends[@]}" "${_postfix_tools_depends[@]}") -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} - 'aliases.patch' - 'service') -sha1sums=('bc1fd50412742d9c28232b07c7d2139e37d3de28' 'SKIP' - '5fc3de6c7df1e5851a0a379e825148868808318b' - 'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9') - -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 \ - -DDEF_COMMAND_DIR=\"/usr/bin\" \ - -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ - -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \ - -DDEF_README_DIR=\"/usr/share/doc/postfix\" \ - -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ - -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ - ' AUXLIBS=' \ - -lsasl2 \ - -lldap -llber \ - -lssl -lcrypto \ - -lmysqlclient -lz -lm \ - -lpq \ - -lsqlite3 -lpthread \ - -lcdb \ - ' OPT="${CFLAGS} ${LDFLAGS}" - - make -} - -package_postfix() { - pkgdesc='Fast, easy to administer, secure mail server' - depends=("${_postfix_depends[@]}") - backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) - provides=('smtp-server' 'smtp-forwarder') - conflicts=('smtp-server' 'smtp-forwarder') - install=install - cd "${srcdir}/postfix-${pkgver}" - - sh postfix-install -non-interactive install_root="${pkgdir}" - - 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" -} - -package_postfix-tools() { - pkgdesc='SMTP/QMQP tools from the postfix distribution' - depends=("${_postfix_tools_depends[@]}") - cd "${srcdir}/postfix-${pkgver}" - - for name in posttls-finger {smtp,qmqp}-{sink,source}; do - install -Dm644 "man/man1/${name}.1" "$pkgdir/usr/share/man/man1/${name}.1" - install -Dm755 "bin/${name}" "$pkgdir/usr/bin/${name}" - done - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: postfix/repos/extra-x86_64/PKGBUILD (from rev 212120, postfix/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-05-08 08:56:17 UTC (rev 212121) @@ -0,0 +1,84 @@ +# $Id$ +# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> +# Contributor: Paul Mattal <p...@archlinux.org> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=(postfix postfix-tools) +pkgbase=postfix +pkgver=2.11.1 +pkgrel=1 +url='http://www.postfix.org/' +license=('custom') +arch=('i686' 'x86_64') +_postfix_depends=('pcre' 'libsasl' 'libldap' 'db' + 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') +_postfix_tools_depends=('openssl') +makedepends=("${_postfix_depends[@]}" "${_postfix_tools_depends[@]}") +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} + 'aliases.patch' + 'service') +sha1sums=('4034171013bde30600724f79c37f82d69a802ad0' 'SKIP' + '5fc3de6c7df1e5851a0a379e825148868808318b' + 'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9') + +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 \ + -DDEF_COMMAND_DIR=\"/usr/bin\" \ + -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ + -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \ + -DDEF_README_DIR=\"/usr/share/doc/postfix\" \ + -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ + ' AUXLIBS=' \ + -lsasl2 \ + -lldap -llber \ + -lssl -lcrypto \ + -lmysqlclient -lz -lm \ + -lpq \ + -lsqlite3 -lpthread \ + -lcdb \ + ' OPT="${CFLAGS} ${LDFLAGS}" + + make +} + +package_postfix() { + pkgdesc='Fast, easy to administer, secure mail server' + depends=("${_postfix_depends[@]}") + backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) + provides=('smtp-server' 'smtp-forwarder') + conflicts=('smtp-server' 'smtp-forwarder') + install=install + cd "${srcdir}/postfix-${pkgver}" + + sh postfix-install -non-interactive install_root="${pkgdir}" + + 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" +} + +package_postfix-tools() { + pkgdesc='SMTP/QMQP tools from the postfix distribution' + depends=("${_postfix_tools_depends[@]}") + cd "${srcdir}/postfix-${pkgver}" + + for name in posttls-finger {smtp,qmqp}-{sink,source}; do + install -Dm644 "man/man1/${name}.1" "$pkgdir/usr/share/man/man1/${name}.1" + install -Dm755 "bin/${name}" "$pkgdir/usr/bin/${name}" + done + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: extra-x86_64/aliases.patch =================================================================== --- extra-x86_64/aliases.patch 2014-05-08 08:56:03 UTC (rev 212120) +++ extra-x86_64/aliases.patch 2014-05-08 08:56:17 UTC (rev 212121) @@ -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 212120, postfix/trunk/aliases.patch) =================================================================== --- extra-x86_64/aliases.patch (rev 0) +++ extra-x86_64/aliases.patch 2014-05-08 08:56:17 UTC (rev 212121) @@ -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 2014-05-08 08:56:03 UTC (rev 212120) +++ extra-x86_64/install 2014-05-08 08:56:17 UTC (rev 212121) @@ -1,18 +0,0 @@ -post_upgrade() { - /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package - chown postfix var/lib/postfix -} - -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 - post_upgrade -} - -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 - true -} Copied: postfix/repos/extra-x86_64/install (from rev 212120, postfix/trunk/install) =================================================================== --- extra-x86_64/install (rev 0) +++ extra-x86_64/install 2014-05-08 08:56:17 UTC (rev 212121) @@ -0,0 +1,18 @@ +post_upgrade() { + /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package + chown postfix var/lib/postfix +} + +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 + post_upgrade +} + +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 + true +} Deleted: extra-x86_64/service =================================================================== --- extra-x86_64/service 2014-05-08 08:56:03 UTC (rev 212120) +++ extra-x86_64/service 2014-05-08 08:56:17 UTC (rev 212121) @@ -1,14 +0,0 @@ -[Unit] -Description=Postfix Mail Transport Agent -After=network.target - -[Service] -Type=forking -PIDFile=/var/spool/postfix/pid/master.pid -ExecStart=/usr/bin/postfix start -ExecStop=/usr/bin/postfix stop -ExecReload=/usr/bin/postfix reload -Restart=always - -[Install] -WantedBy=multi-user.target Copied: postfix/repos/extra-x86_64/service (from rev 212120, postfix/trunk/service) =================================================================== --- extra-x86_64/service (rev 0) +++ extra-x86_64/service 2014-05-08 08:56:17 UTC (rev 212121) @@ -0,0 +1,14 @@ +[Unit] +Description=Postfix Mail Transport Agent +After=network.target + +[Service] +Type=forking +PIDFile=/var/spool/postfix/pid/master.pid +ExecStart=/usr/bin/postfix start +ExecStop=/usr/bin/postfix stop +ExecReload=/usr/bin/postfix reload +Restart=always + +[Install] +WantedBy=multi-user.target