extra/postfix: upgrade to 2.6.2

2 files changed, 15 insertions, 9 deletions

diff --git a/extra/postfix/APKBUILD b/extra/postfix/APKBUILD
index 07431f5f..534bffb2 100644
--- a/extra/postfix/APKBUILD
+++ b/extra/postfix/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
-pkgver=2.6.1
+pkgver=2.6.2
 pkgrel=0
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
@@ -24,6 +24,12 @@ source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgv
 # the dynamic maps patch is taken from mandriva
 # http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/postfix/current/SOURCES
 
+_shared_libs() {
+	file --mime-type "$@" | \
+		awk '$2 == "application/x-sharedlib" {print $1}' | \
+		tr -d :
+}
+
 build () { 
 	cd "$srcdir/$pkgname-$pkgver"
 	for i in ../*.patch; do
@@ -75,7 +81,7 @@ build () {
 	
 	make OPT="$CFLAGS" || return 1
 
-	for i in lib/*.a; do
+	for i in $(_shared_libs lib/*.a); do
 		j=${i#lib/lib}
 		ln -s ${i#lib/} lib/libpostfix-${j%.a}.so.1
 	done
@@ -90,7 +96,7 @@ build () {
 		|| return 1
 
 	install -d "$pkgdir"/usr/lib
-	for i in lib/*.a; do
+	for i in $(_shared_libs lib/*.a); do
 		j=${i#lib/lib}
 		install $i "$pkgdir"/usr/lib/libpostfix-${j%.a}.so.1 || return 1
 	done
@@ -133,11 +139,11 @@ mysql() { _mv_dict mysql ;}
 pcre()  { _mv_dict pcre ; }
 pgsql() { _mv_dict pgsql ; }
 
-md5sums="737bbc245da9c72c174893397f70ae86  postfix-2.6.1.tar.gz
+md5sums="1f0edbd521d2b0473626f4d61e8bb4eb  postfix-2.6.2.tar.gz
 8416354d402f3be288fa98b60af86240  postfix.initd
 2bfc3864183694e5484ac073bb0cb7ef  postfix.pre-install
 0064d45c2c8a46c374b55c4abc46cfb2  postfix.post-install
-b8812dbf2d076c79cf948ee017e81b39  postfix-2.6.1-dynamicmaps.patch
+d45552cfdcd911d0934c0cb7816c4011  postfix-2.6.1-dynamicmaps.patch
 0efff9b4bb493ad2ff0b9915cb244d14  dynamicmaps.cf
 2ebe51a882eb9d6d7866583eb6af3969  postfix-ldap.post-install
 2ebe51a882eb9d6d7866583eb6af3969  postfix-mysql.post-install
diff --git a/extra/postfix/postfix-2.6.1-dynamicmaps.patch b/extra/postfix/postfix-2.6.1-dynamicmaps.patch
index 6000caaf..630abedc 100644
--- a/extra/postfix/postfix-2.6.1-dynamicmaps.patch
+++ b/extra/postfix/postfix-2.6.1-dynamicmaps.patch
@@ -94,13 +94,13 @@ diff -ruN a/src/global/Makefile.in b/src/global/Makefile.in
 -	$(RANLIB) $(LIB)
 +	gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS)
 +
-+$(LDAPSO): dict_ldap.o $(LIB)
++$(LDAPSO): dict_ldap.o $(LIB) ../../lib/libglobal.a
 +	gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal
 +
-+$(MYSQLSO): dict_mysql.o $(LIB)
++$(MYSQLSO): dict_mysql.o $(LIB) ../../lib/libglobal.a
 +	gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil -lglobal
 +
-+$(PGSQLSO): dict_pgsql.o $(LIB)
++$(PGSQLSO): dict_pgsql.o $(LIB) ../../lib/libglobal.a
 +	gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L. -lutil -lglobal
  
  $(LIB_DIR)/$(LIB): $(LIB)
@@ -4737,7 +4737,7 @@ diff -ruN a/src/util/Makefile.in b/src/util/Makefile.in
  
  test:	$(TESTPROG)
  
-+$(PCRESO): dict_pcre.o
++$(PCRESO): dict_pcre.o libutil.a
 +	gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil
 +
  $(LIB):	$(OBJS)