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

13 files changed, 81 insertions, 42 deletions

diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index b5016465..6346d9fa 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=1
+pkgrel=2
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
 url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
 license="custom"
@@ -32,9 +32,16 @@ build ()
 		--disable-otp \
 		--enable-plain \
 		--with-devrandom=/dev/urandom \
-		--mandir=/usr/share/man
+		--mandir=/usr/share/man || return 1
+	# parallell buildds is broken so we build libs first
+	cd lib && make || return 1
 
-	make -j1 || return 1
+	cd "$srcdir"/cyrus-sasl-$pkgver
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/cyrus-sasl-$pkgver
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 
diff --git a/main/db/APKBUILD b/main/db/APKBUILD
index 00940e41..60144820 100644
--- a/main/db/APKBUILD
+++ b/main/db/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=db
-pkgver=4.7.25.4
-_ver=${pkgver%.*}
+pkgver=4.8.24
+_ver=${pkgver}
 pkgrel=0
-pkgdesc="The Berkeley DB embedded database system 4.7"
+pkgdesc="The Berkeley DB embedded database system 4.8"
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
 license="custom"
 depends=
@@ -12,15 +12,12 @@ subpackages="$pkgname-dev $pkgname-doc"
 # Patches were found here:
 # http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.html
 source="http://download-uk.oracle.com/berkeley-db/db-$_ver.tar.gz
-	patch.$_ver.1
-	patch.$_ver.2
-	patch.$_ver.3
-	patch.$_ver.4
 	"
 
 build () { 
 	cd "$srcdir"/db-$_ver
 	for i in ../patch.*; do
+		[ -r "$i" ] || continue
 		msg "Applying $i..."
 		patch -p0 < $i || return 1
 	done
@@ -33,6 +30,10 @@ build () {
 		--disable-static \
 		--disable-cxx
 	make LIBSO_LIBS=-lpthread || return 1
+}
+
+package() {
+	cd "$srcdir"/db-$_ver/build_unix
 	make DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/usr/share/doc
@@ -42,8 +43,4 @@ build () {
 		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-md5sums="ec2b87e833779681a0c3a814aa71359e  db-4.7.25.tar.gz
-5fdf101259e5164dea1c8c86214fde38  patch.4.7.25.1
-bd410a11c71fee52fddb6aa2d8d4f80c  patch.4.7.25.2
-6fcd69f64f5b34bfe8f0a63cc2e402c1  patch.4.7.25.3
-42c5d1a727e4a7f59b9dce12ff2f6b84  patch.4.7.25.4"
+md5sums="147afdecf438ff99ade105a5272db158  db-4.8.24.tar.gz"
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index efaeaaf9..77916f00 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=1.5.3
-pkgrel=0
+pkgrel=2
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -18,22 +18,28 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/$pkgname-$pkgver-notls_
 	kamailio.cfg
 	kamailio.initd
 	kamailio.pre-install
-	kamailio.post-install"
+	kamailio.post-install
+	"
 
-build() {
+prepare() {
 	cd "$srcdir/$pkgname-$pkgver-notls"
 	sed -i -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \
 		-e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' Makefile.defs \
 		|| return 1
-
 	cd scripts
 	sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \
 		kamctl.base kamctlrc || return 1
 	# we actually dont need bash
-	sed -i -e '1s:/bin/bash:/bin/sh:' kamctl kamdbctl \
+	sed -i -e 's:/bin/bash:/bin/sh:' kamctl kamdbctl \
+		|| return 1
+	# Set email_address field as not required field (could be null)
+	cd dbtext/kamailio
+	sed -i -e 's:email_address(string):email_address(string,null):' subscriber \
 		|| return 1
-	cd ..
+}
 
+build() {
+	cd "$srcdir/$pkgname-$pkgver-notls"
 	make prefix=/usr \
 		cfg-dir=/etc/kamailio/ \
 		MODS_MYSQL=yes \
@@ -43,6 +49,10 @@ build() {
 		TLS= \
 		include_modules="db_postgres mediaproxy db_unixodbc" \
 		all || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver-notls"
 	make prefix=/usr \
 		cfg-dir=/etc/kamailio/ \
 		MODS_MYSQL=yes \
@@ -54,6 +64,7 @@ build() {
 		basedir="$pkgdir" install || return 1
 
 	# move default config to -doc package and use our own default config
+
 	mv "$pkgdir"/etc/kamailio/kamailio.cfg \
 		"$pkgdir"/usr/share/doc/kamailio/
 	install -m644 -D "$srcdir"/kamailio.cfg \
diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD
index 6c542121..99508831 100644
--- a/main/libetpan/APKBUILD
+++ b/main/libetpan/APKBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libetpan
 pkgver=0.58
-pkgrel=0
+pkgrel=1
+_dbver=4.8
 pkgdesc="a portable middleware for email access"
 url="http://www.etpan.org/"
 license="custom:etpan"
@@ -14,11 +15,15 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	sed -e 's/db-4.4/db-4.7/g' -i configure || return 1
+	sed -e "s/db-4.4/db-${_dbver}/g" -i configure || return 1
 	./configure --prefix=/usr \
 		--disable-static
 
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/license.txt
 }
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index d3a1182b..3b4e707d 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
 pkgver=2.4.19
-pkgrel=1
+pkgrel=2
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 license="custom"
@@ -48,6 +48,10 @@ build () {
 		--with-tls=openssl 
 	
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 
 	install -d "$pkgdir"/var/run/openldap
diff --git a/main/patch/APKBUILD b/main/patch/APKBUILD
index 8e4691db..699bd08a 100644
--- a/main/patch/APKBUILD
+++ b/main/patch/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=patch
-pkgver=2.5.9
+pkgver=2.6
 pkgrel=0
 pkgdesc="Utility to apply diffs to files"
 url="http://www.gnu.org/software/patch/patch.html"
 license='GPL'
 depends=
-source=http://alpha.gnu.org/gnu/diffutils/$pkgname-$pkgver.tar.gz
+source="ftp://ftp.gnu.org/gnu/patch/patch-2.6.tar.bz2"
 
 subpackages="$pkgname-doc"
 
@@ -15,7 +15,11 @@ build() {
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install
 }
 
-md5sums='dacfb618082f8d3a2194601193cf8716  patch-2.5.9.tar.gz'
+md5sums="5729b1430ba6c2216e0f3eb18f213c81  patch-2.6.tar.bz2"
diff --git a/main/perl-db/APKBUILD b/main/perl-db/APKBUILD
index b55e744b..2dfa1def 100644
--- a/main/perl-db/APKBUILD
+++ b/main/perl-db/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer:  Leonardo Arena <rnalrd@gmail.com>
 pkgname=perl-db
 _realname=BerkeleyDB
-pkgver=0.38
+pkgver=0.39
 pkgrel=0
 pkgdesc="Perl extension for Berkeley DB version 2, 3 or 4"
 url="http://search.cpan.org/~pmqs/BerkeleyDB-0.38/"
 license="GPL PerlArtistic"
-depends="perl db"
+depends="perl"
 makedepends="perl-dev db-dev"
 install=
 subpackages="$pkgname-doc"
@@ -23,4 +23,4 @@ build() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="33a0c1a9d566a3f5fc71601a165d8335  BerkeleyDB-0.38.tar.gz"
+md5sums="da4cff937216a147162a6df76cae8096  BerkeleyDB-0.39.tar.gz"
diff --git a/main/perl-db_file/APKBUILD b/main/perl-db_file/APKBUILD
index 6415f1bb..88b155d6 100644
--- a/main/perl-db_file/APKBUILD
+++ b/main/perl-db_file/APKBUILD
@@ -3,11 +3,11 @@
 pkgname=perl-db_file
 _realname=DB_File
 pkgver=1.820
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl5 access to Berkeley DB"
 url="http://search.cpan.org/~pmqs/DB_File-1.820/"
 license="GPL PerlArtistic"
-depends="perl db"
+depends="perl"
 makedepends="perl-dev db-dev"
 install=
 subpackages="$pkgname-doc"
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 666f8155..e1a23d39 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=php
 pkgver=5.3.1
 _suhosinver=${pkgver}RC1-0.9.8
-pkgrel=0
+pkgrel=1
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -170,6 +170,7 @@ package() {
 
 _mv_mod() {
 	pkgdesc="$1 php extension"
+	depends="php"
 	local d=usr/lib/php/20090626
 	mkdir -p "$subpkgdir/$d"
 	mv "$pkgdir/$d/${1}.so" "$subpkgdir/$d/" || return 1
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD
index 68f39ff1..e4e43fea 100644
--- a/main/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
 pkgver=2.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
 license="IPL-1"
 depends=
-makedepends="db-dev pcre-dev openssl-dev postgresql-dev mysql-dev openldap-dev cyrus-sasl-dev perl"
+makedepends="db-dev pcre-dev openssl-dev postgresql-dev mysql-dev openldap-dev cyrus-sasl-dev perl file"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre
 	$pkgname-pgsql"
@@ -83,7 +83,10 @@ build () {
 		makefiles || return 1
 	
 	make OPT="$CFLAGS" || return 1
+}
 
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	for i in $(_shared_libs lib/*.a); do
 		j=${i#lib/lib}
 		ln -s ${i#lib/} lib/libpostfix-${j%.a}.so.1
diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index daefac1a..839377d5 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -1,24 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=python
-pkgver=2.6.3
+pkgver=2.6.4
 pkgrel=0
 pkgdesc="A high-level scripting language"
 url="http://www.python.org"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
-makedepends="db-dev expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev !gettext"
+makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev !gettext"
 source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.bz2
 	$pkgname-2.6-internal-expat.patch
 	"
 
-build() {
+prepare() {
 	cd "$srcdir/Python-$pkgver"
 	for i in ../*.patch; do
 		msg "Apply $i"
 		patch -p1 < $i || return 1
 	done
+}
 
+build() {
+	cd "$srcdir/Python-$pkgver"
 	./configure --prefix=/usr \
 		--enable-shared \
 		--with-threads \
@@ -26,8 +29,12 @@ build() {
 		--disable-gdbm
 
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/Python-$pkgver"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="8755fc03075b1701ca3f13932e6ade9f  Python-2.6.3.tar.bz2
+md5sums="fee5408634a54e721a93531aba37f8c1  Python-2.6.4.tar.bz2
 9d64df5e0a6aed149a792c7bff16e3d9  python-2.6-internal-expat.patch"
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 06b33bbe..e49c35a1 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=ruby
 pkgver=1.8.7_p174
 _pkgver=1.8.7-p174
-pkgrel=2
+pkgrel=3
 pkgdesc="An object-oriented language for quick and easy programming"
 url="http://www.ruby-lang.org/en/"
 license="Ruby"
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 40c1612e..c6055f8b 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=3.4.3
-pkgrel=0
+pkgrel=1
 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="samba-initscript"
-makedepends="db-dev popt-dev ncurses-dev openldap-dev heimdal-dev"
+makedepends="popt-dev ncurses-dev openldap-dev heimdal-dev"
 source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz
 	samba.initd
 	samba.confd