[arch-commits] Commit in postfix/repos (16 files)
Gaetan Bisson
bisson at archlinux.org
Fri Mar 23 16:53:41 UTC 2012
Date: Friday, March 23, 2012 @ 12:53:40
Author: bisson
Revision: 154122
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
postfix/repos/extra-i686/PKGBUILD
(from rev 154121, postfix/trunk/PKGBUILD)
postfix/repos/extra-i686/aliases.patch
(from rev 154121, postfix/trunk/aliases.patch)
postfix/repos/extra-i686/install
(from rev 154121, postfix/trunk/install)
postfix/repos/extra-i686/rc.d
(from rev 154121, postfix/trunk/rc.d)
postfix/repos/extra-x86_64/PKGBUILD
(from rev 154121, postfix/trunk/PKGBUILD)
postfix/repos/extra-x86_64/aliases.patch
(from rev 154121, postfix/trunk/aliases.patch)
postfix/repos/extra-x86_64/install
(from rev 154121, postfix/trunk/install)
postfix/repos/extra-x86_64/rc.d
(from rev 154121, postfix/trunk/rc.d)
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-x86_64/PKGBUILD
postfix/repos/extra-x86_64/aliases.patch
postfix/repos/extra-x86_64/install
postfix/repos/extra-x86_64/rc.d
----------------------------+
extra-i686/PKGBUILD | 126 +++++++++++++++++++++----------------------
extra-i686/aliases.patch | 36 ++++++------
extra-i686/install | 66 +++++++++++-----------
extra-i686/rc.d | 72 ++++++++++++------------
extra-x86_64/PKGBUILD | 126 +++++++++++++++++++++----------------------
extra-x86_64/aliases.patch | 36 ++++++------
extra-x86_64/install | 66 +++++++++++-----------
extra-x86_64/rc.d | 72 ++++++++++++------------
8 files changed, 300 insertions(+), 300 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-03-23 16:53:09 UTC (rev 154121)
+++ extra-i686/PKGBUILD 2012-03-23 16:53:40 UTC (rev 154122)
@@ -1,63 +0,0 @@
-# $Id$
-# Contributor: Jeff Brodnax <tullyarcher at bellsouth.net>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=postfix
-pkgver=2.9.1
-pkgrel=1
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
-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' \
- 'rc.d')
-sha1sums=('d4f6572ab1ac5fc15626ac2de6d18c340aae2cef'
- '5fc3de6c7df1e5851a0a379e825148868808318b'
- '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' '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 \
- ' AUXLIBS=' \
- -lsasl2 \
- -lldap -llber \
- -lssl -lcrypto \
- -lmysqlclient -lz -lm \
- -lpq \
- -lsqlite3 -lpthread \
- ' 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"
-
- install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
- cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
-}
Copied: postfix/repos/extra-i686/PKGBUILD (from rev 154121, postfix/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-23 16:53:40 UTC (rev 154122)
@@ -0,0 +1,63 @@
+# $Id$
+# Contributor: Jeff Brodnax <tullyarcher at bellsouth.net>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=postfix
+pkgver=2.9.1
+pkgrel=2
+pkgdesc='Fast, easy to administer, secure mail server'
+url='http://www.postfix.org/'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
+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' \
+ 'rc.d')
+sha1sums=('d4f6572ab1ac5fc15626ac2de6d18c340aae2cef'
+ '5fc3de6c7df1e5851a0a379e825148868808318b'
+ '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
+
+provides=('smtp-server' 'smtp-forwarder')
+replaces=('postfix-mysql' 'postfix-pgsql')
+conflicts=('postfix-mysql' 'postfix-pgsql' '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 \
+ ' AUXLIBS=' \
+ -lsasl2 \
+ -lldap -llber \
+ -lssl -lcrypto \
+ -lmysqlclient -lz -lm \
+ -lpq \
+ -lsqlite3 -lpthread \
+ ' 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"
+
+ install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
+ cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
+}
Deleted: extra-i686/aliases.patch
===================================================================
--- extra-i686/aliases.patch 2012-03-23 16:53:09 UTC (rev 154121)
+++ extra-i686/aliases.patch 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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 154121, postfix/trunk/aliases.patch)
===================================================================
--- extra-i686/aliases.patch (rev 0)
+++ extra-i686/aliases.patch 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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-03-23 16:53:09 UTC (rev 154121)
+++ extra-i686/install 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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 154121, postfix/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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-03-23 16:53:09 UTC (rev 154121)
+++ extra-i686/rc.d 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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 154121, postfix/trunk/rc.d)
===================================================================
--- extra-i686/rc.d (rev 0)
+++ extra-i686/rc.d 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-03-23 16:53:09 UTC (rev 154121)
+++ extra-x86_64/PKGBUILD 2012-03-23 16:53:40 UTC (rev 154122)
@@ -1,63 +0,0 @@
-# $Id$
-# Contributor: Jeff Brodnax <tullyarcher at bellsouth.net>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=postfix
-pkgver=2.9.1
-pkgrel=1
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
-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' \
- 'rc.d')
-sha1sums=('d4f6572ab1ac5fc15626ac2de6d18c340aae2cef'
- '5fc3de6c7df1e5851a0a379e825148868808318b'
- '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' '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 \
- ' AUXLIBS=' \
- -lsasl2 \
- -lldap -llber \
- -lssl -lcrypto \
- -lmysqlclient -lz -lm \
- -lpq \
- -lsqlite3 -lpthread \
- ' 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"
-
- install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
- cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
-}
Copied: postfix/repos/extra-x86_64/PKGBUILD (from rev 154121, postfix/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-23 16:53:40 UTC (rev 154122)
@@ -0,0 +1,63 @@
+# $Id$
+# Contributor: Jeff Brodnax <tullyarcher at bellsouth.net>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=postfix
+pkgver=2.9.1
+pkgrel=2
+pkgdesc='Fast, easy to administer, secure mail server'
+url='http://www.postfix.org/'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
+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' \
+ 'rc.d')
+sha1sums=('d4f6572ab1ac5fc15626ac2de6d18c340aae2cef'
+ '5fc3de6c7df1e5851a0a379e825148868808318b'
+ '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
+
+provides=('smtp-server' 'smtp-forwarder')
+replaces=('postfix-mysql' 'postfix-pgsql')
+conflicts=('postfix-mysql' 'postfix-pgsql' '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 \
+ ' AUXLIBS=' \
+ -lsasl2 \
+ -lldap -llber \
+ -lssl -lcrypto \
+ -lmysqlclient -lz -lm \
+ -lpq \
+ -lsqlite3 -lpthread \
+ ' 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"
+
+ install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
+ cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
+}
Deleted: extra-x86_64/aliases.patch
===================================================================
--- extra-x86_64/aliases.patch 2012-03-23 16:53:09 UTC (rev 154121)
+++ extra-x86_64/aliases.patch 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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 154121, postfix/trunk/aliases.patch)
===================================================================
--- extra-x86_64/aliases.patch (rev 0)
+++ extra-x86_64/aliases.patch 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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-03-23 16:53:09 UTC (rev 154121)
+++ extra-x86_64/install 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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 154121, postfix/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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-03-23 16:53:09 UTC (rev 154121)
+++ extra-x86_64/rc.d 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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 154121, postfix/trunk/rc.d)
===================================================================
--- extra-x86_64/rc.d (rev 0)
+++ extra-x86_64/rc.d 2012-03-23 16:53:40 UTC (rev 154122)
@@ -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
More information about the arch-commits
mailing list