[arch-commits] Commit in postfix/repos (12 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Wed Aug 7 18:29:47 UTC 2013
Date: Wednesday, August 7, 2013 @ 20:29:47
Author: andyrtr
Revision: 192212
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
postfix/repos/staging-i686/
postfix/repos/staging-i686/PKGBUILD
(from rev 192211, postfix/trunk/PKGBUILD)
postfix/repos/staging-i686/aliases.patch
(from rev 192211, postfix/trunk/aliases.patch)
postfix/repos/staging-i686/buildfix_db6.diff
(from rev 192211, postfix/trunk/buildfix_db6.diff)
postfix/repos/staging-i686/install
(from rev 192211, postfix/trunk/install)
postfix/repos/staging-i686/service
(from rev 192211, postfix/trunk/service)
postfix/repos/staging-x86_64/
postfix/repos/staging-x86_64/PKGBUILD
(from rev 192211, postfix/trunk/PKGBUILD)
postfix/repos/staging-x86_64/aliases.patch
(from rev 192211, postfix/trunk/aliases.patch)
postfix/repos/staging-x86_64/buildfix_db6.diff
(from rev 192211, postfix/trunk/buildfix_db6.diff)
postfix/repos/staging-x86_64/install
(from rev 192211, postfix/trunk/install)
postfix/repos/staging-x86_64/service
(from rev 192211, postfix/trunk/service)
----------------------------------+
staging-i686/PKGBUILD | 75 +++++++++++++++++++++++++++++++++++++
staging-i686/aliases.patch | 18 ++++++++
staging-i686/buildfix_db6.diff | 11 +++++
staging-i686/install | 18 ++++++++
staging-i686/service | 14 ++++++
staging-x86_64/PKGBUILD | 75 +++++++++++++++++++++++++++++++++++++
staging-x86_64/aliases.patch | 18 ++++++++
staging-x86_64/buildfix_db6.diff | 11 +++++
staging-x86_64/install | 18 ++++++++
staging-x86_64/service | 14 ++++++
10 files changed, 272 insertions(+)
Copied: postfix/repos/staging-i686/PKGBUILD (from rev 192211, postfix/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-08-07 18:29:47 UTC (rev 192212)
@@ -0,0 +1,75 @@
+# $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.10.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' 'libldap' 'db'
+ 'libmariadbclient' '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"{,.sig}
+ 'buildfix_db6.diff'
+ 'aliases.patch'
+ 'service')
+sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2'
+ 'SKIP'
+ '50663b218f59d5c16d523c8949dc4e736fb7da37'
+ '5fc3de6c7df1e5851a0a379e825148868808318b'
+ '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6')
+
+provides=('smtp-server' 'smtp-forwarder')
+conflicts=('smtp-server' 'smtp-forwarder')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # fix build with Berkeley DB 6.x - let's pray db format hasn't changed
+ patch -Np1 -i $srcdir/buildfix_db6.diff
+
+ 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() {
+ cd "${srcdir}/${pkgname}-${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"
+}
Copied: postfix/repos/staging-i686/aliases.patch (from rev 192211, postfix/trunk/aliases.patch)
===================================================================
--- staging-i686/aliases.patch (rev 0)
+++ staging-i686/aliases.patch 2013-08-07 18:29:47 UTC (rev 192212)
@@ -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)
+ #
Copied: postfix/repos/staging-i686/buildfix_db6.diff (from rev 192211, postfix/trunk/buildfix_db6.diff)
===================================================================
--- staging-i686/buildfix_db6.diff (rev 0)
+++ staging-i686/buildfix_db6.diff 2013-08-07 18:29:47 UTC (rev 192212)
@@ -0,0 +1,11 @@
+--- postfix-2.10.1/src/util/dict_db.c 2013-08-07 20:21:59.935379313 +0200
++++ postfix-2.10.1/src/util/dict_db.c.new 2013-08-07 20:24:10.172473653 +0200
+@@ -693,7 +693,7 @@
+ msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
+ if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
+ msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
+-#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
++#if DB_VERSION_MAJOR == 6 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
+ if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
+ FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags,
+ "open database %s: %m", db_path));
Copied: postfix/repos/staging-i686/install (from rev 192211, postfix/trunk/install)
===================================================================
--- staging-i686/install (rev 0)
+++ staging-i686/install 2013-08-07 18:29:47 UTC (rev 192212)
@@ -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
+}
Copied: postfix/repos/staging-i686/service (from rev 192211, postfix/trunk/service)
===================================================================
--- staging-i686/service (rev 0)
+++ staging-i686/service 2013-08-07 18:29:47 UTC (rev 192212)
@@ -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/sbin/postfix start
+ExecStop=/usr/sbin/postfix stop
+ExecReload=/usr/sbin/postfix reload
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Copied: postfix/repos/staging-x86_64/PKGBUILD (from rev 192211, postfix/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-08-07 18:29:47 UTC (rev 192212)
@@ -0,0 +1,75 @@
+# $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.10.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' 'libldap' 'db'
+ 'libmariadbclient' '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"{,.sig}
+ 'buildfix_db6.diff'
+ 'aliases.patch'
+ 'service')
+sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2'
+ 'SKIP'
+ '50663b218f59d5c16d523c8949dc4e736fb7da37'
+ '5fc3de6c7df1e5851a0a379e825148868808318b'
+ '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6')
+
+provides=('smtp-server' 'smtp-forwarder')
+conflicts=('smtp-server' 'smtp-forwarder')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # fix build with Berkeley DB 6.x - let's pray db format hasn't changed
+ patch -Np1 -i $srcdir/buildfix_db6.diff
+
+ 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() {
+ cd "${srcdir}/${pkgname}-${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"
+}
Copied: postfix/repos/staging-x86_64/aliases.patch (from rev 192211, postfix/trunk/aliases.patch)
===================================================================
--- staging-x86_64/aliases.patch (rev 0)
+++ staging-x86_64/aliases.patch 2013-08-07 18:29:47 UTC (rev 192212)
@@ -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)
+ #
Copied: postfix/repos/staging-x86_64/buildfix_db6.diff (from rev 192211, postfix/trunk/buildfix_db6.diff)
===================================================================
--- staging-x86_64/buildfix_db6.diff (rev 0)
+++ staging-x86_64/buildfix_db6.diff 2013-08-07 18:29:47 UTC (rev 192212)
@@ -0,0 +1,11 @@
+--- postfix-2.10.1/src/util/dict_db.c 2013-08-07 20:21:59.935379313 +0200
++++ postfix-2.10.1/src/util/dict_db.c.new 2013-08-07 20:24:10.172473653 +0200
+@@ -693,7 +693,7 @@
+ msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
+ if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
+ msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
+-#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
++#if DB_VERSION_MAJOR == 6 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
+ if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
+ FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags,
+ "open database %s: %m", db_path));
Copied: postfix/repos/staging-x86_64/install (from rev 192211, postfix/trunk/install)
===================================================================
--- staging-x86_64/install (rev 0)
+++ staging-x86_64/install 2013-08-07 18:29:47 UTC (rev 192212)
@@ -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
+}
Copied: postfix/repos/staging-x86_64/service (from rev 192211, postfix/trunk/service)
===================================================================
--- staging-x86_64/service (rev 0)
+++ staging-x86_64/service 2013-08-07 18:29:47 UTC (rev 192212)
@@ -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/sbin/postfix start
+ExecStop=/usr/sbin/postfix stop
+ExecReload=/usr/sbin/postfix reload
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list