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

12 files changed, 61 insertions, 57 deletions

diff --git a/extra/ca-certificates/APKBUILD b/extra/ca-certificates/APKBUILD
index 1ff7a0f47..f4d33e8db 100644
--- a/extra/ca-certificates/APKBUILD
+++ b/extra/ca-certificates/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ca-certificates
 pkgver=20080809
-pkgrel=0
+pkgrel=1
 pkgdesc="Common CA certificates PEM files"
 url="http://packages.debian.org/sid/ca-certificates"
 license="MPL GPL"
 depends="run-parts openssl"
-install=ca-certificates.install
+install=ca-certificates.post-install
 source="http://ftp.no.debian.org/debian/pool/main/c/$pkgname/${pkgname}_${pkgver}_all.deb
 	$pkgname-20080514-warn-on-bad-symlinks.patch
 	$install
@@ -31,4 +31,4 @@ build () {
 }
 md5sums="3c44f9c232c2335da26d969c716af44d  ca-certificates_20080809_all.deb
 fda24bd37c6cd55b9dd2ea7ef7b59778  ca-certificates-20080514-warn-on-bad-symlinks.patch
-91f1c902b1065cddcd5d58bdcbb3ad7b  ca-certificates.install"
+83a92f371137ac9f046c94452bf17058  ca-certificates.post-install"
diff --git a/extra/ca-certificates/ca-certificates.install b/extra/ca-certificates/ca-certificates.install
deleted file mode 100644
index 5e27fe0e6..000000000
--- a/extra/ca-certificates/ca-certificates.install
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-post_install() {
-	usr/sbin/update-ca-certificates --fresh  &> /dev/null
-}
-
-case "$i" in
-	post_install|post_upgrade)
-		post_install
-		;;
-esac
-exit 0;
diff --git a/extra/ca-certificates/ca-certificates.post-install b/extra/ca-certificates/ca-certificates.post-install
new file mode 100644
index 000000000..439cfca52
--- /dev/null
+++ b/extra/ca-certificates/ca-certificates.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+/usr/sbin/update-ca-certificates --fresh  &> /dev/null
+
+exit 0;
diff --git a/extra/clamav/APKBUILD b/extra/clamav/APKBUILD
index 28cafd4bb..8ccf6aa9a 100644
--- a/extra/clamav/APKBUILD
+++ b/extra/clamav/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=clamav
 pkgver=0.94.2
-pkgrel=0
+pkgrel=1
 pkgdesc="An anti-virus toolkit for UNIX"
 url="http://www.clamav.net/"
 license="GPL"
 depends="zlib gmp"
-install=clamav.install
+install=clamav.pre-install
 makedepends="gmp-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
@@ -36,4 +36,5 @@ build() {
 md5sums="1181e6d62341b84708f126cc353f7ebf  clamav-0.94.2.tar.gz
 d0c708403940c51e52eb27ea1610a27d  clamav.initd
 431dfe7403323e247a88b97beade5d78  clamav.confd
-328a0c3449a6b516e443d7db5a0d4d01  clamav-0.94.2-nls.patch"
+328a0c3449a6b516e443d7db5a0d4d01  clamav-0.94.2-nls.patch
+275e05587e2da782781829a1862d57b1  clamav.pre-install"
diff --git a/extra/clamav/clamav.install b/extra/clamav/clamav.install
deleted file mode 100644
index 8d427d916..000000000
--- a/extra/clamav/clamav.install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	post_install)
-	echo '*'
-	echo '* Adding new user clamav'
-	echo '*'
-	adduser -H -s /bin/false -D clamav 2>/dev/null
-	;;
-esac
diff --git a/extra/clamav/clamav.pre-install b/extra/clamav/clamav.pre-install
new file mode 100644
index 000000000..59ac60a44
--- /dev/null
+++ b/extra/clamav/clamav.pre-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+adduser -H -s /bin/false -D clamav 2>/dev/null
+exit 0
diff --git a/extra/djbdns/APKBUILD b/extra/djbdns/APKBUILD
index f05c45608..0181c1ad0 100644
--- a/extra/djbdns/APKBUILD
+++ b/extra/djbdns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=23
+pkgrel=24
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 license="public-domain"
@@ -13,10 +13,10 @@ source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz
 	dnstracesort.patch
 	$pkgver-errno.patch
 	$pkgver-response.patch
-	tinydns.install
+	tinydns.pre-install
 	tinydns.initd
 	tinydns.confd
-	dnscache.install
+	dnscache.pre-install
 	dnscache.initd
 	dnscache.confd
 	"
@@ -45,7 +45,7 @@ build() {
 
 tinydns() {
 	pkgdesc="A small and secure DNS server"
-	install=tinydns.install
+	install=tinydns.pre-install
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/etc/tinydns \
 		"$subpkgdir"/var/cache/tinydns
 	mv "$pkgdir"/usr/bin/tinydns* "$subpkgdir"/usr/bin
@@ -57,7 +57,7 @@ tinydns() {
 
 dnscache() {
 	pkgdesc="A recursive resolver"
-	install=dnscache.install
+	install=dnscache.pre-install
 	mkdir -p "$subpkgdir"/usr/bin \
 		"$subpkgdir"/etc/dnscache/ip \
 		"$subpkgdir"/etc/dnscache/servers
@@ -78,9 +78,9 @@ dfd675b2775efcbb604413a84db8bf1a  dnsroots.patch
 6fe7f473233f1c86b76261afd8345bf0  dnstracesort.patch
 c7be73fe2fb4ae02d5096fa2c1f55a68  1.05-errno.patch
 1292500c04baba3995d9753fe40fdc94  1.05-response.patch
-2e1cd0923248120f8d066967781538be  tinydns.install
+7695bf50559c09798ec852b578ac8698  tinydns.pre-install
 d7be449f5f90457ba785aebb1cadbf88  tinydns.initd
 7dcf6674c07d46c736b3c25d9c92384a  tinydns.confd
-6f42e0c25d35ccf7b0af5f26aea04f55  dnscache.install
+e09c3a6ba6917e16f4736ab5c070dbe9  dnscache.pre-install
 e368a86ddc320937d663dd47684ba410  dnscache.initd
 e2938593277d7a87806e70e145a90c3f  dnscache.confd"
diff --git a/extra/djbdns/dnscache.install b/extra/djbdns/dnscache.install
deleted file mode 100644
index 63ffb14cb..000000000
--- a/extra/djbdns/dnscache.install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	pre_install)
-		adduser -h /etc/dnscache -g dnscache -s /bin/false -H -D \
-			dnscache 2>/dev/null
-		;;
-esac
-exit 0
-
diff --git a/extra/djbdns/dnscache.pre-install b/extra/djbdns/dnscache.pre-install
new file mode 100644
index 000000000..061b8f028
--- /dev/null
+++ b/extra/djbdns/dnscache.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -h /etc/dnscache -g dnscache -s /bin/false -H -D dnscache 2>/dev/null
+exit 0
+
diff --git a/extra/djbdns/tinydns.install b/extra/djbdns/tinydns.install
deleted file mode 100644
index 2e52b72c6..000000000
--- a/extra/djbdns/tinydns.install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	pre_install)
-		adduser -h /etc/tinydns -g tinydns -s /bin/false -H -D \
-			tinydns 2>/dev/null
-		;;
-esac
-exit 0
-
diff --git a/extra/djbdns/tinydns.pre-install b/extra/djbdns/tinydns.pre-install
new file mode 100644
index 000000000..11ea87abc
--- /dev/null
+++ b/extra/djbdns/tinydns.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -h /etc/tinydns -g tinydns -s /bin/false -H -D tinydns 2>/dev/null
+exit 0
+
diff --git a/testing/asterisk/APKBUILD b/testing/asterisk/APKBUILD
index 736004ab9..3d6bbac6a 100644
--- a/testing/asterisk/APKBUILD
+++ b/testing/asterisk/APKBUILD
@@ -7,9 +7,10 @@ pkgdesc="Asterisk: A Module Open Source PBX System"
 url="http://www.asterisk.org/"
 license="GPL"
 depends="ncurses popt zlib newt dahdi-linux dahdi-tools libltdl"
-makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev"
+makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
+	postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev g++"
 install="$pkgname.pre-install $pkgname.post-install"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc"
 source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz
 	asterisk-01-1.6.0-gsm-pic.patch
 	asterisk-02-1.6.0-uclibc.patch
@@ -41,7 +42,8 @@ build() {
 		--disable-xmldoc --with-gsm=internal \
 		--without-iconv --with-popt --with-z --with-newt \
 		--with-odbc --with-postgres \
-		--with-dahdi --with-pri --with-tonezone
+		--with-dahdi --with-pri --with-tonezone \
+		|| return 1
 
 	# and figure out which modules to build
 	rm menuselect.makeopts
@@ -53,6 +55,29 @@ build() {
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
+_find_and_move() {
+	local pattern="$1"
+	cd "$pkgdir" || return 1
+	find -name "$pattern" -type f | while read f; do
+		local dest="$subpkgdir/${f%/*}"
+		mkdir -p "$dest"
+		mv "$f" "$dest"
+	done
+}
+
+pgsql() {
+	depends="uclibc asterisk libpq zlib"
+	install=
+	_find_and_move '*_pgsql*'
+}
+
+odbc() {
+	depends="uclibc asterisk unixodbc"
+	install=
+	_find_and_move '*odbc*'
+}
+
+
 md5sums="29f7285b673d52b49d91c8e797acbbb0  asterisk-1.6.1-rc1.tar.gz
 97b39fd9777a2521d4f9f095482b7ac2  asterisk-01-1.6.0-gsm-pic.patch
 53b0b2a1527972722a50c8c5b560e63e  asterisk-02-1.6.0-uclibc.patch