main/postfix: upgrade to 3.1.0

2 files changed, 42 insertions, 20 deletions

diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD
index f5d4fd6748..e5bae0cb18 100644
--- a/main/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
@@ -1,7 +1,8 @@
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
-pkgver=3.0.4
+pkgver=3.1.0
 pkgrel=0
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
@@ -12,13 +13,14 @@ makedepends="db-dev pcre-dev openssl-dev postgresql-dev mariadb-dev openldap-dev
 	cyrus-sasl-dev perl file sqlite-dev linux-headers"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre
-	$pkgname-pgsql $pkgname-sqlite"
+	$pkgname-pgsql $pkgname-sqlite $pkgname-stone"
 options="suid"
 pkgusers="postfix"
 pkggroups="postfix postdrop"
 source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
 	no-glibc.patch
+	postfix-install.patch
 	"
 
 _shared_libs() {
@@ -26,8 +28,9 @@ _shared_libs() {
 		awk -F: '$2 ~ /sharedlib/ {print $1}'
 }
 
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd $_builddir
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -40,14 +43,12 @@ prepare() {
 	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || return 1
 }
 
-build () {
-	cd "$srcdir/$pkgname-$pkgver"
+build() {
+	cd $_builddir
 	# needed for dynamic maps.
-	local ccargs="-DHAS_SHL_LOAD"
+	local ccargs="-DHAS_SHL_LOAD -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
 	local auxlibs="$LDFLAGS -lpthread -lcrypt"
 
-	ccargs="$ccargs -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-
 	# pcre
 	ccargs="$ccargs -DHAS_PCRE $(pkg-config --cflags libpcre)"
 
@@ -55,11 +56,11 @@ build () {
 	ccargs="$ccargs -DUSE_TLS"
 	auxlibs="$auxlibs -lssl -lcrypto"
 
-	## dovecot-sasl
-	#ccargs="$ccargs -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	# dovecot-sasl
+	ccargs="$ccargs -DUSE_SASL_AUTH -DDEF_SASL_SERVER=\\\"dovecot\\\""
 
 	# cyrus sasl
-	ccargs="$ccargs	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+	ccargs="$ccargs -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
 	auxlibs="$auxlibs -lsasl2"
 
 	# postgresql
@@ -106,14 +107,13 @@ d
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd $_builddir
 	make non-interactive-package \
 		install_root="$pkgdir" \
 		readme_directory=/usr/share/doc/$pkgname/readme \
 		manpage_directory=/usr/share/man \
 		|| return 1
 
-	# fix permissions
 	for i in postdrop postqueue; do
 		chgrp postdrop "$pkgdir"/usr/sbin/$i
 		chmod g+s "$pkgdir"/usr/sbin/$i
@@ -121,7 +121,7 @@ package() {
 
 	mkdir -p "$pkgdir"/usr/share/doc/postfix/defaults/ \
 		"$pkgdir"/usr/share/licenses/${pkgname}/
-	mv "$pkgdir"/etc/postfix/*.default \
+	mv "$pkgdir"/etc/postfix/*.default "$pkgdir"/etc/postfix/*.proto \
 		"$pkgdir"/usr/share/doc/postfix/defaults/ || return 1
 	mv "$pkgdir"/etc/postfix/*LICENSE* \
 		"$pkgdir"/usr/share/licenses/${pkgname}/ || return 1
@@ -138,6 +138,7 @@ package() {
 		msg "split $map"
 		_mvline "^\s*$map" "$map" dynamicmaps.cf || return 1
 	done
+	rm makedefs.out postfix-files
 }
 
 _mv_dict() {
@@ -159,12 +160,22 @@ pcre()  { _mv_dict pcre ; }
 pgsql() { _mv_dict pgsql ; }
 sqlite() { _mv_dict sqlite ; }
 
-md5sums="877365c99e1fb5d46e61da5b22df0255  postfix-3.0.4.tar.gz
+stone() {
+	cd $_builddir
+	pkgdesc="Postfix simulation and testing tools"
+	install -Dm755 src/fsstone/fsstone "$subpkgdir"/usr/bin/fsstone
+	find src/smtpstone -perm 0755 -exec cp {} "$subpkgdir"/usr/bin \;
+}
+
+md5sums="b4a506fa74c69c6fb1875c0971268344  postfix-3.1.0.tar.gz
 82c78ea8cb77a55f563d2086b73c36e2  postfix.initd
-b7ed1614fafb5fed6253b1a62f76b709  no-glibc.patch"
-sha256sums="b81ce81176b9df7183ad99b9c98000135f5e88e659493ab50db5d9fe5b8dba0e  postfix-3.0.4.tar.gz
+b7ed1614fafb5fed6253b1a62f76b709  no-glibc.patch
+3c58426d21611dd4eb1f93e924b349a1  postfix-install.patch"
+sha256sums="88ac3e92755629077d9363319b1fa0db406efb10c2f22cdbb941bd8ab36fd733  postfix-3.1.0.tar.gz
 2f744cfe9c3a0bac8e15c1e2347ff38283cb323617740f853e01d9eade7957ee  postfix.initd
-e8d7c4b3edab2388c9aba6c9ce70ff141ae7aacbd6480e233711241d90b14563  no-glibc.patch"
-sha512sums="ca1ad1b7a0c552825d820e1ea017bdd79cf31e6262c9d2b801fa11011be5e10549cfb57745cec4177046a178fab104f3b7f79bf08708bb7772b127970970949d  postfix-3.0.4.tar.gz
+e8d7c4b3edab2388c9aba6c9ce70ff141ae7aacbd6480e233711241d90b14563  no-glibc.patch
+7185d2b2e4d7cc090b958c1d372c16e15f274465e2123686a0d97db20e2b5943  postfix-install.patch"
+sha512sums="06cf4c827de8d613cab6a57a8e76198d293660a263f60d17dd189f511da4b1e12eb98bbcf75695697a62959e26ca204bf2a53eb6657e8bd756a816977e717783  postfix-3.1.0.tar.gz
 2752e69c4e1857bdcf29444ffb458bca818bc60b9c77c20823c5f5b87c36cb5e0f3217a625a7fe5788d5bfcef7570a1f2149e1233fcd23ccf7ee14190aff47a2  postfix.initd
-cf9ef0d07e54011107da57e2855cbda10047c100047e2cc2fdede072ace1fc6c060a6b1cfc8c277417a28a23ecd3c6ffdc061da1673e8f61d2ed11899f1efb25  no-glibc.patch"
+cf9ef0d07e54011107da57e2855cbda10047c100047e2cc2fdede072ace1fc6c060a6b1cfc8c277417a28a23ecd3c6ffdc061da1673e8f61d2ed11899f1efb25  no-glibc.patch
+25cd34f23ca909d4e33aaf3239d1e397260abc7796d9a4456dee4f005682fd3a58aab8106126e5218c95bdddae415a3ef7e2223cd3b0d7b1e2bd76158bb7eaf8  postfix-install.patch"
diff --git a/main/postfix/postfix-install.patch b/main/postfix/postfix-install.patch
new file mode 100644
index 0000000000..90d878c481
--- /dev/null
+++ b/main/postfix/postfix-install.patch
@@ -0,0 +1,11 @@
+--- a/postfix-install
++++ b/postfix-install
+@@ -832,7 +832,7 @@
+ # the wrong place when Postfix is being upgraded.
+ 
+ case "$mail_version" in
+-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
++"") mail_version="`bin/postconf -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1
+ esac
+ 
+ # Undo MAIL_VERSION expansion at the end of a parameter value. If