[arch-commits] Commit in postfix/trunk (PKGBUILD install)

[Gaetan Bisson]

    Date: Tuesday, February 10, 2015 @ 22:08:45
  Author: bisson
Revision: 231241

upstream update, use shared libs, merge postfix-tools, modernize PKGBUILD

Modified:
  postfix/trunk/PKGBUILD
  postfix/trunk/install

----------+
 PKGBUILD |  104 ++++++++++++++++++++++++++++++-------------------------------
 install  |    2 -
 2 files changed, 53 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-10 20:40:38 UTC (rev 231240)
+++ PKGBUILD	2015-02-10 21:08:45 UTC (rev 231241)
@@ -3,82 +3,82 @@
 # Contributor: Paul Mattal <paul at archlinux.org>
 # Maintainer: Gaetan Bisson <bisson at archlinux.org>
 
-pkgname=(postfix postfix-tools)
-pkgbase=postfix
-pkgver=2.11.3
-pkgrel=2
+pkgname=postfix
+pkgver=3.0.0
+pkgrel=1
 url='http://www.postfix.org/'
+pkgdesc='Fast, easy to administer, secure mail server'
 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[@]}")
+depends=('openssl' 'pcre' '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=('2c0e974d7a24eb48e352c9268b5bb131e7c9debf'
+sha1sums=('f4eaa87673e0b073265749a1de88664a1fe58067'
           '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}"
 
-	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}"
+	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
+        '
+	make makefiles \
+		DEBUG='' \
+		shared=yes \
+		CCARGS="${CCARGS//$'\n'/}" \
+		AUXLIBS="${AUXLIBS//$'\n'/}" \
+		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
+package() {
 	cd "${srcdir}/postfix-${pkgver}"
 
+        LD_PRELOAD= LD_LIBRARY_PATH=./lib \
 	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}"
+		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"
+	cd "${pkgdir}"
+	patch -p0 -i "${srcdir}"/aliases.patch
+	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "etc/postfix/postfix-files"
 }

Modified: install
===================================================================
--- install	2015-02-10 20:40:38 UTC (rev 231240)
+++ install	2015-02-10 21:08:45 UTC (rev 231241)
@@ -1,5 +1,5 @@
 post_upgrade() {
-	/usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package
+	/usr/lib/postfix/post-install meta_directory=/etc/postfix daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package
 	chown postfix var/lib/postfix
 }