Merge branch '1.9' of git://dev.alpinelinux.org/aports into 1.9

5 files changed, 16 insertions, 18 deletions

diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD
index d8dd4fe8..14c1ac72 100644
--- a/main/imap/APKBUILD
+++ b/main/imap/APKBUILD
@@ -5,7 +5,7 @@
 # build it shared
 pkgname=imap
 pkgver=2007e
-pkgrel=0
+pkgrel=1
 pkgdesc="An IMAP/POP server"
 url="http://www.washington.edu/imap"
 license="APACHE"
@@ -24,7 +24,8 @@ build ()
 		-i src/osdep/unix/Makefile || return 1
 
 	export GCCCFLAGS="$CFLAGS"
-	make slx SPECIALAUTHENTICATORS=ssl || return 1
+	make slx SPECIALAUTHENTICATORS=ssl EXTRACFLAGS="$CFLAGS -fPIC" \
+		|| return 1
 	
 	mkdir -p $pkgdir/usr/sbin
 	install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index ee08583d..d3a1182b 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
-pkgver=2.4.18
-pkgrel=0
+pkgver=2.4.19
+pkgrel=1
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 license="custom"
@@ -69,7 +69,7 @@ libldap() {
 	mv "$pkgdir"/etc/openldap/ldap.conf "$subpkgdir"/etc/openldap/
 }
 
-md5sums="fecd7a64b6d9a0eb79b817d2562956ed  openldap-2.4.18.tgz
+md5sums="4a6dab2711fcf141f19bb680bc335887  openldap-2.4.19.tgz
 2524e490ba334a760fa57057c16da7a9  openldap-2.4-ppolicy.patch
 d19d0502f046078ecd737e29e7552fa8  openldap-2.4.11-libldap_r.patch
 a729bf553d12b4a9fbda0ff5202a0443  slapd.initd
diff --git a/main/openldap/openldap.pre-install b/main/openldap/openldap.pre-install
index b208a9f5..7ca82b1c 100644
--- a/main/openldap/openldap.pre-install
+++ b/main/openldap/openldap.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-adduser -h /usr/lib/openldap -s /bin/false -S -D ldap 2>/dev/null || true
+adduser -h /usr/lib/openldap -s /bin/false -S -D ldap 2>/dev/null
+addgroup ldap
+exit 0
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index 69a1db15..a4b22a9d 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openssl
-pkgver=0.9.8k
-pkgrel=7
+pkgver=0.9.8l
+pkgrel=0
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url=http://openssl.org
 depends=
@@ -41,7 +41,7 @@ libcrypto() {
 	mv "$pkgdir"/usr/lib/engines "$subpkgdir"/usr/lib/
 }
 
-md5sums="e555c6d58d276aec7fdc53363e338ab3  openssl-0.9.8k.tar.gz
+md5sums="05a0ece1372392a2cf310ebb96333025  openssl-0.9.8l.tar.gz
 04a6a88c2ee4badd4f8649792b73eaf3  openssl-0.9.8g-fix_manpages-1.patch
 c6a9857a5dbd30cead0404aa7dd73977  openssl-bb-basename.patch
 c838eb8488896cfeb7de957a0cbe04ae  openssl-0.9.8k-quote-cc.patch
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index a43bd2eb..01cbab1a 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=php
-pkgver=5.2.10
+pkgver=5.2.11
 _suhosinver=${pkgver}-0.9.7
-pkgrel=4
+pkgrel=0
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -61,7 +61,6 @@ subpackages="$pkgname-dev $pkgname-doc
 
 source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
         http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
-	curl-flush.patch
 	"
 
 build() {
@@ -71,9 +70,6 @@ build() {
 	gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \
 		| patch -p1 || return 1
 
-	# fix curl regression; should be fixed upstream with PHP >= 5.2.11
-	patch -p3 -i ${srcdir}/curl-flush.patch || return 1
-
 	phpextensions="--enable-bcmath=shared \
 		--enable-calendar=shared \
 		--enable-dba=shared \
@@ -234,6 +230,5 @@ dev() {
 	mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/
 }
 
-md5sums="15c7b5a87f57332d6fc683528e28247b  php-5.2.10.tar.bz2
-41b475a469eef0eb0e7aa10a820f12b2  suhosin-patch-5.2.10-0.9.7.patch.gz
-648c83c991a187cd0f2be435cb022947  curl-flush.patch"
+md5sums="286bf34630f5643c25ebcedfec5e0a09  php-5.2.11.tar.bz2
+8f9de4d97fae6eba163cf3699509a260  suhosin-patch-5.2.11-0.9.7.patch.gz"