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

8 files changed, 23 insertions, 42 deletions

diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index b7fde642a2..79381baa1f 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-skins
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=0
 pkgdesc="Skins for ACF"
 url="http://git.alpinelinux.org/cgit/acf-skins"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="2d93a761b9bf012a27f8ae2b52ca89cd  acf-skins-0.2.2.tar.bz2"
+md5sums="00d35c2230510ffd0f00fb29eeb26183  acf-skins-0.2.3.tar.bz2"
diff --git a/main/alpine-conf/0001-setup-disk-check-if-the-devce-itself-is-mounted.patch b/main/alpine-conf/0001-setup-disk-check-if-the-devce-itself-is-mounted.patch
deleted file mode 100644
index 28050509f8..0000000000
--- a/main/alpine-conf/0001-setup-disk-check-if-the-devce-itself-is-mounted.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 841c6823ac8a3f1e17af457722c8b7ea2abf8cb4 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 30 Sep 2009 12:57:59 +0000
-Subject: [PATCH] setup-disk: check if the devce itself is mounted
-
-this will filter out loop0 device
----
- setup-disk.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 33cc868..c11d20c 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -149,6 +149,7 @@ has_mounted_part() {
- 	# parse /proc/mounts for mounted devices
- 	for p in $(awk '$1 ~ /^\/dev\// {gsub("/dev/", "", $1); print $1}' \
- 			/proc/mounts); do
-+		[ "$p" = "$1" ] && return 0
- 		[ -e /sys/block/$1/$p ] && return 0
- 	done
- 	return 1
--- 
-1.6.4.4
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 485805e28e..82be2b4592 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,18 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.0_rc7
-pkgrel=1
+pkgver=2.0_rc8
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-setup-disk-check-if-the-devce-itself-is-mounted.patch
 	"
 license="GPL-2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i ../0001-setup-disk-check-if-the-devce-itself-is-mounted.patch || return
 
 	make || return 1
 	make install PREFIX= DESTDIR="$pkgdir"
@@ -20,5 +18,4 @@ build() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="8b44c02500d646dd64368904762d236e  alpine-conf-2.0_rc7.tar.bz2
-f51a1948ddf5f035e9e6509e57000ccd  0001-setup-disk-check-if-the-devce-itself-is-mounted.patch"
+md5sums="c84957f015989ed806aa393c398ce901  alpine-conf-2.0_rc8.tar.bz2"
diff --git a/main/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD
index 0c5456fa0c..6929217100 100644
--- a/main/amavisd-new/APKBUILD
+++ b/main/amavisd-new/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=amavisd-new
 pkgver=2.6.4
-pkgrel=0
+pkgrel=1
 pkgdesc="High-performance interface between mailer (MTA) and content checkers"
 url="http://www.ijs.si/software/amavisd"
 license="GPL-2"
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index aaaa763c80..167ec16d6d 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-addgroup amavis
-adduser -D -S -G amavis -h /var/amavis -s /bin/false amavis
+addgroup amavis 2>/dev/null
+adduser -D -S -G amavis -h /var/amavis -s /bin/false amavis 2>/dev/null
+exit 0
+
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index b006055a04..905297b654 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=php
 pkgver=5.2.10
 _suhosinver=${pkgver}-0.9.7
-pkgrel=2
+pkgrel=3
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -161,6 +161,8 @@ build() {
 
         make || return 1
         make -j1 INSTALL_ROOT="$pkgdir" install || return 1
+	# fix the extension_dir
+	sed -i -e 's/^extension_dir/\;extension_dir/' php.ini-recommended
         install -D -m644 php.ini-recommended "$pkgdir"/etc/php/php.ini
 }
 
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index dd4b80c76a..01f7bfa743 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=squid
 pkgver=2.7.6
 _ver=2.7.STABLE6
-pkgrel=11
+pkgrel=12
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -279,7 +279,7 @@ errors_ukrainian_utf8() {
 
 
 md5sums="6de3a6a7a56a7ecae092f2d31a04f039  squid-2.7.STABLE6.tar.bz2
-1f65e9dad473a027773c1f9a3eaf04b5  squid.initd
+57fed05adc40acab6a5480ec7a014154  squid.initd
 44b052db7910f386ef88ddcf69c9ba4e  squid.confd
 3827f71d940b47eb385a1a1d92a51d66  squid-2.7-gentoo.patch
 58823e0b86bc2dc71d270208b7b284b4  squid.logrotate"
diff --git a/main/squid/squid.initd b/main/squid/squid.initd
index beaea0b17a..2eaf1dd2af 100644
--- a/main/squid/squid.initd
+++ b/main/squid/squid.initd
@@ -50,7 +50,7 @@ checkconfig() {
 		fi
 	done
 	
-	return 0
+	squid -k parse
 }
 
 get_pidfile() {
@@ -69,14 +69,19 @@ start() {
 }
 
 stop() {
-	local rc=0
+	local rc=0 pid
 	ebegin "Stopping squid"
 	get_pidfile
 	/usr/sbin/squid -k shutdown
 
 	# Now we have to wait until squid has _really_ stopped.
 	if [ -f "$PIDFILE" ] ; then
-		einfon "Waiting for squid to shutdown ."
+		pid=$(cat "$PIDFILE")
+		if [ -d /proc/$pid ]; then
+			einfon "Waiting for squid to shutdown ."
+		else
+			rm -f "$PIDFILE"
+		fi
 		cnt=0
 		while [ -f "$PIDFILE" ] ; do
 			cnt=$(expr $cnt + 1)