[arch-commits] Commit in postfix/repos (16 files)

Gaetan Bisson bisson at archlinux.org
Sun Aug 30 04:37:42 UTC 2015


    Date: Sunday, August 30, 2015 @ 06:37:42
  Author: bisson
Revision: 245080

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  postfix/repos/extra-i686/PKGBUILD
    (from rev 245079, postfix/trunk/PKGBUILD)
  postfix/repos/extra-i686/aliases.patch
    (from rev 245079, postfix/trunk/aliases.patch)
  postfix/repos/extra-i686/install
    (from rev 245079, postfix/trunk/install)
  postfix/repos/extra-i686/service
    (from rev 245079, postfix/trunk/service)
  postfix/repos/extra-x86_64/PKGBUILD
    (from rev 245079, postfix/trunk/PKGBUILD)
  postfix/repos/extra-x86_64/aliases.patch
    (from rev 245079, postfix/trunk/aliases.patch)
  postfix/repos/extra-x86_64/install
    (from rev 245079, postfix/trunk/install)
  postfix/repos/extra-x86_64/service
    (from rev 245079, 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                  |  202 +++++++++++++++++++++++++++++++++++++++++++
 /aliases.patch             |   36 +++++++
 /install                   |   48 ++++++++++
 /service                   |   28 +++++
 extra-i686/PKGBUILD        |  100 ---------------------
 extra-i686/aliases.patch   |   18 ---
 extra-i686/install         |   24 -----
 extra-i686/service         |   14 --
 extra-x86_64/PKGBUILD      |  100 ---------------------
 extra-x86_64/aliases.patch |   18 ---
 extra-x86_64/install       |   24 -----
 extra-x86_64/service       |   14 --
 12 files changed, 314 insertions(+), 312 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-08-30 04:36:52 UTC (rev 245079)
+++ extra-i686/PKGBUILD	2015-08-30 04:37:42 UTC (rev 245080)
@@ -1,100 +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=3.0.2
-pkgrel=1
-url='http://www.postfix.org/'
-pkgdesc='Fast, easy to administer, secure mail server'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('openssl' 'pcre' 'icu' 'libsasl' 'libldap' 'db'
-         'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
-source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
-        'aliases.patch'
-        'service')
-sha1sums=('9d75ca3c207441a38a79a2c8ceaa398c2b9cdc4e'
-          '5fc3de6c7df1e5851a0a379e825148868808318b'
-          'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9')
-
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-
-conflicts=('smtp-server' 'smtp-forwarder' 'postfix-tools')
-provides=('smtp-server' 'smtp-forwarder' 'postfix-tools')
-replaces=('postfix-tools')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	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/bin\"
-                -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\"
-                -DDEF_README_DIR=\"/usr/share/doc/postfix\"
-                -DDEF_MANPAGE_DIR=\"/usr/share/man\"
-        '
-	AUXLIBS='
-                -lsasl2
-                -lldap -llber
-                -lssl -lcrypto
-                -lmysqlclient -lz -lm
-                -lpq
-                -lsqlite3 -lpthread
-                -lcdb
-        '
-	make makefiles \
-		DEBUG='' \
-		shared=yes \
-		CCARGS="${CCARGS//$'\n'/}" \
-		AUXLIBS="${AUXLIBS//$'\n'/}" \
-		OPT="${CFLAGS} ${LDFLAGS}" \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/postfix-${pkgver}"
-
-	sed 's:bin/postconf -dhx:bin/postconf -c conf -dhx:g' -i postfix-install
-	LD_LIBRARY_PATH=lib:$LD_LIBRARY_PATH \
-	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"
-
-	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
-
-	# now set permissions right to appease the pacman gods
-	sed -r \
-		-e '/override=1/d' \
-		-e '/absolute path name/d' \
-		-e 's/\$POSTCONF -/$POSTCONF -c .\/etc\/postfix -/g' \
-		-e '/(if \[|chmod|chown|find|mkdir|test)/s/\$path/.\/$path/g' \
-		libexec/post-install > ../arch-post-install
-	cd "${pkgdir}"
-	LD_LIBRARY_PATH=usr/lib/postfix:$LD_LIBRARY_PATH \
-	sh "${srcdir}/arch-post-install" \
-                command_directory=usr/bin \
-                config_directory=etc/postfix \
-                meta_directory=etc/postfix \
-                setgid_group=75 \
-                mail_owner=73 \
-                set-permissions
-
-	patch -p0 -i "${srcdir}"/aliases.patch
-	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "etc/postfix/postfix-files"
-}

Copied: postfix/repos/extra-i686/PKGBUILD (from rev 245079, postfix/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-08-30 04:37:42 UTC (rev 245080)
@@ -0,0 +1,101 @@
+# $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=3.0.2
+pkgrel=2
+url='http://www.postfix.org/'
+pkgdesc='Fast, easy to administer, secure mail server'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('openssl' 'pcre' 'icu' 'libsasl' 'libldap' 'db'
+         'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
+source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
+        'aliases.patch'
+        'service')
+sha1sums=('9d75ca3c207441a38a79a2c8ceaa398c2b9cdc4e'
+          '5fc3de6c7df1e5851a0a379e825148868808318b'
+          'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9')
+
+backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
+
+conflicts=('smtp-server' 'smtp-forwarder' 'postfix-tools')
+provides=('smtp-server' 'smtp-forwarder' 'postfix-tools')
+replaces=('postfix-tools')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	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/bin\"
+                -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\"
+                -DDEF_README_DIR=\"/usr/share/doc/postfix\"
+                -DDEF_MANPAGE_DIR=\"/usr/share/man\"
+        '
+	AUXLIBS='
+                -lsasl2
+                -lldap -llber
+                -lssl -lcrypto
+                -lmysqlclient -lz -lm
+                -lpq
+                -lsqlite3 -lpthread
+                -lcdb
+        '
+	make makefiles \
+		DEBUG='' \
+		pie=yes \
+		shared=yes \
+		CCARGS="${CCARGS//$'\n'/}" \
+		AUXLIBS="${AUXLIBS//$'\n'/}" \
+		OPT="${CFLAGS} ${LDFLAGS}" \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/postfix-${pkgver}"
+
+	sed 's:bin/postconf -dhx:bin/postconf -c conf -dhx:g' -i postfix-install
+	LD_LIBRARY_PATH=lib:$LD_LIBRARY_PATH \
+	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"
+
+	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
+
+	# now set permissions right to appease the pacman gods
+	sed -r \
+		-e '/override=1/d' \
+		-e '/absolute path name/d' \
+		-e 's/\$POSTCONF -/$POSTCONF -c .\/etc\/postfix -/g' \
+		-e '/(if \[|chmod|chown|find|mkdir|test)/s/\$path/.\/$path/g' \
+		libexec/post-install > ../arch-post-install
+	cd "${pkgdir}"
+	LD_LIBRARY_PATH=usr/lib/postfix:$LD_LIBRARY_PATH \
+	sh "${srcdir}/arch-post-install" \
+                command_directory=usr/bin \
+                config_directory=etc/postfix \
+                meta_directory=etc/postfix \
+                setgid_group=75 \
+                mail_owner=73 \
+                set-permissions
+
+	patch -p0 -i "${srcdir}"/aliases.patch
+	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "etc/postfix/postfix-files"
+}

Deleted: extra-i686/aliases.patch
===================================================================
--- extra-i686/aliases.patch	2015-08-30 04:36:52 UTC (rev 245079)
+++ extra-i686/aliases.patch	2015-08-30 04:37:42 UTC (rev 245080)
@@ -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 245079, postfix/trunk/aliases.patch)
===================================================================
--- extra-i686/aliases.patch	                        (rev 0)
+++ extra-i686/aliases.patch	2015-08-30 04:37:42 UTC (rev 245080)
@@ -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	2015-08-30 04:36:52 UTC (rev 245079)
+++ extra-i686/install	2015-08-30 04:37:42 UTC (rev 245080)
@@ -1,24 +0,0 @@
-post_upgrade() {
-	if [[ $(vercmp $2 3.0.0-3) -eq -1 ]]; then
-		echo '==> The postfix daemon binaries have moved.'
-		echo '==> Please restart postfix as soon as possible.'
-	elif [[ $(vercmp $2 3.0.1-1) -eq -1 ]]; then
-		echo '==> Several Postfix-internal protocols have changed.'
-		echo '==> Please restart postfix as soon as possible.'
-	fi
-	/usr/lib/postfix/bin/post-install command_directory=/usr/bin meta_directory=/etc/postfix upgrade-configuration
-}
-
-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 245079, postfix/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2015-08-30 04:37:42 UTC (rev 245080)
@@ -0,0 +1,24 @@
+post_upgrade() {
+	if [[ $(vercmp $2 3.0.0-3) -eq -1 ]]; then
+		echo '==> The postfix daemon binaries have moved.'
+		echo '==> Please restart postfix as soon as possible.'
+	elif [[ $(vercmp $2 3.0.1-1) -eq -1 ]]; then
+		echo '==> Several Postfix-internal protocols have changed.'
+		echo '==> Please restart postfix as soon as possible.'
+	fi
+	/usr/lib/postfix/bin/post-install command_directory=/usr/bin meta_directory=/etc/postfix upgrade-configuration
+}
+
+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	2015-08-30 04:36:52 UTC (rev 245079)
+++ extra-i686/service	2015-08-30 04:37:42 UTC (rev 245080)
@@ -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 245079, postfix/trunk/service)
===================================================================
--- extra-i686/service	                        (rev 0)
+++ extra-i686/service	2015-08-30 04:37:42 UTC (rev 245080)
@@ -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	2015-08-30 04:36:52 UTC (rev 245079)
+++ extra-x86_64/PKGBUILD	2015-08-30 04:37:42 UTC (rev 245080)
@@ -1,100 +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=3.0.2
-pkgrel=1
-url='http://www.postfix.org/'
-pkgdesc='Fast, easy to administer, secure mail server'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('openssl' 'pcre' 'icu' 'libsasl' 'libldap' 'db'
-         'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
-source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
-        'aliases.patch'
-        'service')
-sha1sums=('9d75ca3c207441a38a79a2c8ceaa398c2b9cdc4e'
-          '5fc3de6c7df1e5851a0a379e825148868808318b'
-          'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9')
-
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-
-conflicts=('smtp-server' 'smtp-forwarder' 'postfix-tools')
-provides=('smtp-server' 'smtp-forwarder' 'postfix-tools')
-replaces=('postfix-tools')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	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/bin\"
-                -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\"
-                -DDEF_README_DIR=\"/usr/share/doc/postfix\"
-                -DDEF_MANPAGE_DIR=\"/usr/share/man\"
-        '
-	AUXLIBS='
-                -lsasl2
-                -lldap -llber
-                -lssl -lcrypto
-                -lmysqlclient -lz -lm
-                -lpq
-                -lsqlite3 -lpthread
-                -lcdb
-        '
-	make makefiles \
-		DEBUG='' \
-		shared=yes \
-		CCARGS="${CCARGS//$'\n'/}" \
-		AUXLIBS="${AUXLIBS//$'\n'/}" \
-		OPT="${CFLAGS} ${LDFLAGS}" \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/postfix-${pkgver}"
-
-	sed 's:bin/postconf -dhx:bin/postconf -c conf -dhx:g' -i postfix-install
-	LD_LIBRARY_PATH=lib:$LD_LIBRARY_PATH \
-	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"
-
-	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
-
-	# now set permissions right to appease the pacman gods
-	sed -r \
-		-e '/override=1/d' \
-		-e '/absolute path name/d' \
-		-e 's/\$POSTCONF -/$POSTCONF -c .\/etc\/postfix -/g' \
-		-e '/(if \[|chmod|chown|find|mkdir|test)/s/\$path/.\/$path/g' \
-		libexec/post-install > ../arch-post-install
-	cd "${pkgdir}"
-	LD_LIBRARY_PATH=usr/lib/postfix:$LD_LIBRARY_PATH \
-	sh "${srcdir}/arch-post-install" \
-                command_directory=usr/bin \
-                config_directory=etc/postfix \
-                meta_directory=etc/postfix \
-                setgid_group=75 \
-                mail_owner=73 \
-                set-permissions
-
-	patch -p0 -i "${srcdir}"/aliases.patch
-	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "etc/postfix/postfix-files"
-}

Copied: postfix/repos/extra-x86_64/PKGBUILD (from rev 245079, postfix/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-08-30 04:37:42 UTC (rev 245080)
@@ -0,0 +1,101 @@
+# $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=3.0.2
+pkgrel=2
+url='http://www.postfix.org/'
+pkgdesc='Fast, easy to administer, secure mail server'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('openssl' 'pcre' 'icu' 'libsasl' 'libldap' 'db'
+         'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
+source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
+        'aliases.patch'
+        'service')
+sha1sums=('9d75ca3c207441a38a79a2c8ceaa398c2b9cdc4e'
+          '5fc3de6c7df1e5851a0a379e825148868808318b'
+          'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9')
+
+backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
+
+conflicts=('smtp-server' 'smtp-forwarder' 'postfix-tools')
+provides=('smtp-server' 'smtp-forwarder' 'postfix-tools')
+replaces=('postfix-tools')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	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/bin\"
+                -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\"
+                -DDEF_README_DIR=\"/usr/share/doc/postfix\"
+                -DDEF_MANPAGE_DIR=\"/usr/share/man\"
+        '
+	AUXLIBS='
+                -lsasl2
+                -lldap -llber
+                -lssl -lcrypto
+                -lmysqlclient -lz -lm
+                -lpq
+                -lsqlite3 -lpthread
+                -lcdb
+        '
+	make makefiles \
+		DEBUG='' \
+		pie=yes \
+		shared=yes \
+		CCARGS="${CCARGS//$'\n'/}" \
+		AUXLIBS="${AUXLIBS//$'\n'/}" \
+		OPT="${CFLAGS} ${LDFLAGS}" \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/postfix-${pkgver}"
+
+	sed 's:bin/postconf -dhx:bin/postconf -c conf -dhx:g' -i postfix-install
+	LD_LIBRARY_PATH=lib:$LD_LIBRARY_PATH \
+	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"
+
+	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
+
+	# now set permissions right to appease the pacman gods
+	sed -r \
+		-e '/override=1/d' \
+		-e '/absolute path name/d' \
+		-e 's/\$POSTCONF -/$POSTCONF -c .\/etc\/postfix -/g' \
+		-e '/(if \[|chmod|chown|find|mkdir|test)/s/\$path/.\/$path/g' \
+		libexec/post-install > ../arch-post-install
+	cd "${pkgdir}"
+	LD_LIBRARY_PATH=usr/lib/postfix:$LD_LIBRARY_PATH \
+	sh "${srcdir}/arch-post-install" \
+                command_directory=usr/bin \
+                config_directory=etc/postfix \
+                meta_directory=etc/postfix \
+                setgid_group=75 \
+                mail_owner=73 \
+                set-permissions
+
+	patch -p0 -i "${srcdir}"/aliases.patch
+	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "etc/postfix/postfix-files"
+}

Deleted: extra-x86_64/aliases.patch
===================================================================
--- extra-x86_64/aliases.patch	2015-08-30 04:36:52 UTC (rev 245079)
+++ extra-x86_64/aliases.patch	2015-08-30 04:37:42 UTC (rev 245080)
@@ -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 245079, postfix/trunk/aliases.patch)
===================================================================
--- extra-x86_64/aliases.patch	                        (rev 0)
+++ extra-x86_64/aliases.patch	2015-08-30 04:37:42 UTC (rev 245080)
@@ -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	2015-08-30 04:36:52 UTC (rev 245079)
+++ extra-x86_64/install	2015-08-30 04:37:42 UTC (rev 245080)
@@ -1,24 +0,0 @@
-post_upgrade() {
-	if [[ $(vercmp $2 3.0.0-3) -eq -1 ]]; then
-		echo '==> The postfix daemon binaries have moved.'
-		echo '==> Please restart postfix as soon as possible.'
-	elif [[ $(vercmp $2 3.0.1-1) -eq -1 ]]; then
-		echo '==> Several Postfix-internal protocols have changed.'
-		echo '==> Please restart postfix as soon as possible.'
-	fi
-	/usr/lib/postfix/bin/post-install command_directory=/usr/bin meta_directory=/etc/postfix upgrade-configuration
-}
-
-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 245079, postfix/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2015-08-30 04:37:42 UTC (rev 245080)
@@ -0,0 +1,24 @@
+post_upgrade() {
+	if [[ $(vercmp $2 3.0.0-3) -eq -1 ]]; then
+		echo '==> The postfix daemon binaries have moved.'
+		echo '==> Please restart postfix as soon as possible.'
+	elif [[ $(vercmp $2 3.0.1-1) -eq -1 ]]; then
+		echo '==> Several Postfix-internal protocols have changed.'
+		echo '==> Please restart postfix as soon as possible.'
+	fi
+	/usr/lib/postfix/bin/post-install command_directory=/usr/bin meta_directory=/etc/postfix upgrade-configuration
+}
+
+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	2015-08-30 04:36:52 UTC (rev 245079)
+++ extra-x86_64/service	2015-08-30 04:37:42 UTC (rev 245080)
@@ -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 245079, postfix/trunk/service)
===================================================================
--- extra-x86_64/service	                        (rev 0)
+++ extra-x86_64/service	2015-08-30 04:37:42 UTC (rev 245080)
@@ -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



More information about the arch-commits mailing list