Merge git://dev.alpinelinux.org/aports

11 files changed, 47 insertions, 39 deletions

diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index 3dd0136b8..fe8033cae 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-provisioning
-pkgver=0.0.8
+pkgver=0.0.9
 pkgrel=0
 pkgdesc="ACF for provisioning templated configs to devices"
 url="http://git.alpinelinux.org/cgit/acf-provisioning"
@@ -18,4 +18,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="9eaf2cda946429315020e0b69e54ba08  acf-provisioning-0.0.8.tar.bz2"
+md5sums="f2d1fb7fc15f6b7779c2de986f218050  acf-provisioning-0.0.9.tar.bz2"
diff --git a/main/acf-provisioning/acf-provisioning.post-upgrade b/main/acf-provisioning/acf-provisioning.post-upgrade
index 089c448ac..53c8726cb 100644
--- a/main/acf-provisioning/acf-provisioning.post-upgrade
+++ b/main/acf-provisioning/acf-provisioning.post-upgrade
@@ -3,11 +3,25 @@
 new=$1
 old=$2
 
-# if current is not older than 0.0.8 we exit.
-if ! [ "$(apk version -t $old 0.0.8)" = "<" ]; then
-	exit 0
+# if current is older than 0.0.7-r1 we update.
+if [ "$(apk version -t $old 0.0.7-r1)" = "<" ]; then
+
+psql -U postgres -c "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Unsupported Phone', '999')"\
+	provisioning
+psql -U postgres -c "INSERT INTO provisioning_groups VALUES(default, 'reg1', 'Registration 1 Unsupported', '10')"\
+	provisioning
+psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Unsupported Phone'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 1 Unsupported'))"\
+	provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 Unsupported'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)"\
+	provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 Unsupported'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, true)"\
+	provisioning
+
 fi
 
+# if current is older than 0.0.8 we update.
+if [ "$(apk version -t $old 0.0.8)" = "<" ]; then
+
 psql -U postgres -c "ALTER TABLE provisioning_params ADD COLUMN validate text" provisioning
 
 psql -U postgres -c "UPDATE provisioning_params SET descr='Phone dial pattern based on section 2.1.5 of RFC 3435, plus a comma to turn dialtone back on', regexp='^[*#0-9xT|,.%[%]-]*\$' WHERE name='digitmap'" provisioning
@@ -24,21 +38,14 @@ psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id
 psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', false)" provisioning
 psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'false', false)" provisioning
 
-# if current is not older than 0.0.7-r1 we exit.
-if ! [ "$(apk version -t $old 0.0.7-r1)" = "<" ]; then
-	exit 0
 fi
 
-psql -U postgres -c "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Unsupported Phone', '999')"\
-	provisioning
-psql -U postgres -c "INSERT INTO provisioning_groups VALUES(default, 'reg1', 'Registration 1 Unsupported', '10')"\
-	provisioning
-psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Unsupported Phone'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 1 Unsupported'))"\
-	provisioning
-psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 Unsupported'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)"\
-	provisioning
-psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 Unsupported'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, true)"\
-	provisioning
+# if current is older than 0.0.9 we update.
+if [ "$(apk version -t $old 0.0.9)" = "<" ]; then
 
-exit 0
+psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'mailbox', 'text', 'Voice Mailbox', 'Mailbox extension or URL', '', '207', '', null)" provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), '', true)" provisioning
 
+fi
+
+exit 0
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 1cdb6c10c..2c82e2771 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-quagga
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.6.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for quagga"
 url="http://git.alpinelinux.org/cgit/acf-quagga"
 arch="noarch"
@@ -14,4 +14,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="6b22ff32cb493a7bd9b8055d75e07a8d  acf-quagga-0.5.0.tar.bz2"
+md5sums="7c513df9ea02f9f705e05205b72737bb  acf-quagga-0.6.0.tar.bz2"
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 0bde751b1..60f58aecd 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=binutils
-pkgver=2.21
+pkgver=2.21.1
 pkgrel=0
 pkgdesc="Tools necessary to build programs"
 url="http://www.gnu.org/software/binutils/"
@@ -33,5 +33,6 @@ package() {
 		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
 		rmdir "$pkgdir"/usr/lib64
 	fi
+	rm "$pkgdir"/usr/lib/*.la || return 1
 }
-md5sums="c84c5acc9d266f1a7044b51c85a823f5  binutils-2.21.tar.bz2"
+md5sums="a22801a9cad45c85e9ff6afc10537d72  binutils-2.21.1.tar.bz2"
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index 28d226719..333abc14c 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cgit
-pkgver=0.9
+pkgver=0.9.0.1
 pkgrel=0
 _gitver=1.7.4
 pkgdesc="a fast webinterface for git"
@@ -43,5 +43,5 @@ package() {
 	ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit
 }
 
-md5sums="b55f953c5c8a418bca72b3de3c297270  cgit-0.9.tar.bz2
+md5sums="dddae5bcfc1eeb469fc2b95531a75c1c  cgit-0.9.0.1.tar.bz2
 fa24dc1ef0b663327ea0fe1981365b39  git-1.7.4.tar.bz2"
diff --git a/main/kamailio/0001-utils-Install-the-sqlite-scripts.patch b/main/kamailio/0001-utils-Install-the-sqlite-scripts.patch
index bf5304bd1..0c72f6451 100644
--- a/main/kamailio/0001-utils-Install-the-sqlite-scripts.patch
+++ b/main/kamailio/0001-utils-Install-the-sqlite-scripts.patch
@@ -39,7 +39,7 @@ index 0f2643b..8b0f790 100644
 +		if [ "$(SQLITEON)" = "yes" ]; then \
 +			mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \
 +			sed -e "s#/usr/local/sbin#$(bin_target)#g" \
-+				< kamctl.pgsql > /tmp/kamctl.sqlite ; \
++				< kamctl.sqlite > /tmp/kamctl.sqlite ; \
 +			$(INSTALL_CFG) /tmp/kamctl.sqlite \
 +				$(modules_prefix)/$(lib_dir)/kamctl/kamctl.sqlite ; \
 +			rm -fr /tmp/kamctl.sqlite ; \
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index dbb4849d0..993349506 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=3.1.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -184,4 +184,4 @@ c0dc4e13d9e57feb99f016d3ee443c0b  kamailio.initd
 8454687f047f703c5cb443db3a0003a8  kamailio-3.1-backslash.patch
 199df21eaa4856dcacdcc438f72765f1  sqlite.patch
 9611a1246bc522cbfa5d8d99b3a55ac8  0001-utils-add-sqlite-support-to-kamctl-kamdbctl.patch
-bc92b472c843e01f4c16bf0078bfae27  0001-utils-Install-the-sqlite-scripts.patch"
+8751c968e57d7c1bd7342d83d5a8d48d  0001-utils-Install-the-sqlite-scripts.patch"
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index 99c0cac4e..d6e04a065 100644
--- a/main/open-vm-tools/APKBUILD
+++ b/main/open-vm-tools/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=open-vm-tools
-pkgver=2011.03.28
-_pkgsubver=387002
-pkgrel=3
+pkgver=2011.05.27
+_pkgsubver=420096
+pkgrel=0
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="http://open-vm-tools.sourceforge.net/"
 arch="all"
@@ -81,7 +81,7 @@ gtk() {
 		"$subpkgdir"/usr/lib/open-vm-tools/plugins/
 }
 
-md5sums="a9c72ab0b8f7778d444e69e9d3b95527  open-vm-tools-2011.03.28-387002.tar.gz
+md5sums="3e43d4857d412d02115e69db193830b5  open-vm-tools-2011.05.27-420096.tar.gz
 49e2e394d0b567fa71fcd295e96bc1c8  getloadavg-uclibc.patch
 82840b6bed002284b9bd2358707ee826  codeset-uclibc.patch
 840e4d6ff3f53fc22bdedf4d64aabc91  ecvt.patch
diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD
index 76e60c904..e8a611316 100644
--- a/main/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sysstat
-pkgver=10.0.0
+pkgver=10.0.1
 pkgrel=0
 pkgdesc="Performance monitoring tools for Linux"
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -28,4 +28,4 @@ package() {
 
 }
 
-md5sums="accc17cc1fa855be6b27def77dd92a0d  sysstat-10.0.0.tar.gz"
+md5sums="a8b12230452dc0e0b6cae5fd5ec3c579  sysstat-10.0.1.tar.gz"
diff --git a/main/terminal/APKBUILD b/main/terminal/APKBUILD
index 193bcef5d..71a8eb238 100644
--- a/main/terminal/APKBUILD
+++ b/main/terminal/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=terminal
-pkgver=0.4.7
+pkgver=0.4.8
 pkgrel=0
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 url="http://www.xfce.org/projects/terminal/"
@@ -29,4 +29,4 @@ package() {
 	cd "$srcdir"/Terminal-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="34daa0090e1bc9014a5b9849103a129f  Terminal-0.4.7.tar.bz2"
+md5sums="8dff62234da14e1a5e542fb56560ebe2  Terminal-0.4.8.tar.bz2"
diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD
index 889c3ea1b..28f5aba68 100644
--- a/main/xfce4-panel/APKBUILD
+++ b/main/xfce4-panel/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-panel
-pkgver=4.8.4
+pkgver=4.8.5
 pkgrel=0
 pkgdesc="Panel for the Xfce desktop environment"
 url="http://www.xfce.org/"
@@ -40,4 +40,4 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-md5sums="44f06660226723fdd8de3ad59d648546  xfce4-panel-4.8.4.tar.bz2"
+md5sums="3c00e92821709baa2a71b166a32d46a2  xfce4-panel-4.8.5.tar.bz2"