Merge branch 'master' of git://git.alpinelinux.org/aports

5 files changed, 26 insertions, 23 deletions

diff --git a/extra/fetchmail/APKBUILD b/extra/fetchmail/APKBUILD
index bef00014..09255663 100644
--- a/extra/fetchmail/APKBUILD
+++ b/extra/fetchmail/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fetchmail
 pkgver=6.3.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A remote-mail retrieval and forwarding utility"
 url="http://fetchmail.berlios.de/"
 license="GPL"
-depends="openssl uclibc"
+depends=
 makedepends="openssl-dev python"
 install="fetchmail.pre-install fetchmail.post-install"
 subpackages="$pkgname-doc fetchmailconf"
@@ -41,4 +41,4 @@ fetchmailconf() {
 md5sums="72c20ad2b9629f1a109668b05a84d823  fetchmail-6.3.9.tar.bz2
 5a2fc8e8b3115fe2b9bf23503fb8f0a4  fetchmail.pre-install
 4b451d102e92926b6b6c1774f4260310  fetchmail.post-install
-9a64c2b77d1a03a1eb8648a32d46b2c5  fetchmail.initd"
+22e9ac1d8385db05da15e01fd5c831e4  fetchmail.initd"
diff --git a/extra/fetchmail/fetchmail.initd b/extra/fetchmail/fetchmail.initd
index 4646fa4c..a1ed1ec8 100755
--- a/extra/fetchmail/fetchmail.initd
+++ b/extra/fetchmail/fetchmail.initd
@@ -20,7 +20,7 @@ start() {
         ebegin "Starting fetchmail"
         start-stop-daemon --start --quiet \
 		--chuid fetchmail --exec /usr/bin/fetchmail \
-		-- -d ${polling_period} -f /etc/fetchmailrc \
+		-- -d ${polling_period:-300} -f /etc/fetchmailrc \
 		--pidfile ${pidfile} -i /var/lib/fetchmail/.fetchids
         eend ${?}
 }
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)
diff --git a/extra/samba/APKBUILD b/extra/samba/APKBUILD
index f69b0de0..49a19a8c 100644
--- a/extra/samba/APKBUILD
+++ b/extra/samba/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=3.2.11
-pkgrel=1
+pkgver=3.3.4
+pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
 subpackages="$pkgname-dev $pkgname-doc winbind $pkgname-common 
 	$pkgname-initscript tdb"
-depends="db popt ncurses uclibc samba-initscript samba-common tdb libldap heimdal"
+depends="samba-initscript"
 makedepends="db-dev popt-dev ncurses-dev openldap-dev heimdal-dev"
 source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz
 	samba.initd
@@ -40,9 +40,6 @@ build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	cp -r examples "$pkgdir"/usr/share/doc/samba/
 	install -D packaging/RHEL/setup/smbusers "$pkgdir"/etc/samba/smbusers
-
-	# move the shared libs to /usr/lib
-	mv "$pkgdir"/usr/lib/samba/lib*.so* "$pkgdir"/usr/lib/
 }
 
 initscript() {
@@ -62,7 +59,7 @@ _mv_files() {
 
 winbind() {
 	pkgdesc="Samba user and group resolver"
-	depends="uclibc samba-common popt samba-initscript libldap heimdal"
+	depends=
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/wbinfo \
@@ -74,7 +71,7 @@ winbind() {
 
 common() {
 	pkgdesc="Samba common files for both client an servers"
-	depends="uclibc popt tdb libldap heimdal"
+	depends=
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/net \
@@ -90,13 +87,13 @@ common() {
 
 tdb() {
 	pkgdesc="Trivial database"
-	depends="uclibc"
+	depends=
 	cd "$pkgdir"
 	_mv_files \
 		usr/lib/libtdb* \
 		usr/bin/tdb*
 }
 
-md5sums="fc514bc92184b9b64544afa457e4d84e  samba-3.2.11.tar.gz
+md5sums="1443165edb7cb3f56f1e77aec1ee3266  samba-3.3.4.tar.gz
 587c1c4824ef5b0ac593fcf8ec8fec78  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd"