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

4 files changed, 102 insertions, 30 deletions

diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 0fe38ff91..df4222405 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -2,14 +2,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
 pkgver=1.2.6
-pkgrel=0
+pkgrel=1
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 license="LGPL-2.1"
 depends=
-makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev"
+makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev postgresql-dev
+	mysql-dev sqlite-dev"
 install="dovecot.pre-install"
-subpackages="$pkgname-doc $pkgname-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-pgsql $pkgname-mysql
+	$pkgname-sqlite"
 source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz
 	dovecot.initd
 	"
@@ -21,13 +23,47 @@ build() {
 		--sysconfdir=/etc/dovecot \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--with-sql=plugin \
+		--with-sql-drivers \
+		--with-mysql \
+		--with-sqlite \
+		--with-pgsql \
 		--with-ssl=openssl || return 1
 
 	make || return 1
-	make DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
+_mv() {
+	local i
+	while [ $# -gt 0 ]; do
+		local dir=${1%/*}
+		mkdir -p "$subpkgdir"/$dir
+		mv "$pkgdir/$1" "$subpkgdir/$dir/"
+		shift
+	done
+}
+
+
+pgsql() {
+	pkgdesc="postgresql driver for dovecot"
+	_mv $(cd "$pkgdir" && find usr -name '*pgsql.so')
+}
+
+mysql() {
+	pkgdesc="mysql driver for dovecot"
+	_mv $(cd "$pkgdir" && find usr -name '*mysql.so')
+}
+
+sqlite() {
+	pkgdesc="sqlite driver for dovecot"
+	_mv $(cd "$pkgdir" && find usr -name '*sqlite.so')
+}
+
 md5sums="807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd"
diff --git a/main/iftop/APKBUILD b/main/iftop/APKBUILD
new file mode 100644
index 000000000..db210d493
--- /dev/null
+++ b/main/iftop/APKBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=iftop
+pkgver=0.17
+pkgrel=0
+pkgdesc="iftop does for network usage what top(1) does for CPU usage"
+url="http://www.ex-parrot.com/~pdw/iftop/"
+license="GPL"
+depends=
+makedepends="libpcap-dev>=1 ncurses-dev"
+subpackages="$pkgname-doc"
+source="http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --prefix=/usr --mandir=/usr/share/man
+	make
+}
+
+package()  {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
+md5sums="062bc8fb3856580319857326e0b8752d  iftop-0.17.tar.gz"
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 292d1942e..efaeaaf9c 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
-pkgver=1.5.2
-pkgrel=7
+pkgver=1.5.3
+pkgrel=0
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -10,10 +10,10 @@ pkggroups="kamailio"
 license="GPL"
 depends=
 makedepends="bison flex expat-dev postgresql-dev mysql-dev pcre-dev
-	libxml2-dev curl-dev"
+	libxml2-dev curl-dev unixodbc-dev"
 install=
 subpackages="$pkgname-doc $pkgname-mysql $pkgname-postgres $pkgname-pcre
-	$pkgname-presence $pkgname-mediaproxy"
+	$pkgname-presence $pkgname-mediaproxy $pkgname-unixodbc"
 source="http://www.kamailio.org/pub/kamailio/$pkgver/src/$pkgname-$pkgver-notls_src.tar.gz
 	kamailio.cfg
 	kamailio.initd
@@ -41,7 +41,7 @@ build() {
 		MODS_PRESENCE=yes \
 		MODS_RADIUS= \
 		TLS= \
-		include_modules="db_postgres mediaproxy" \
+		include_modules="db_postgres mediaproxy db_unixodbc" \
 		all || return 1
 	make prefix=/usr \
 		cfg-dir=/etc/kamailio/ \
@@ -50,7 +50,7 @@ build() {
 		MODS_PRESENCE=yes \
 		MODS_RADIUS= \
 		TLS= \
-		include_modules="db_postgres mediaproxy" \
+		include_modules="db_postgres mediaproxy db_unixodbc" \
 		basedir="$pkgdir" install || return 1
 
 	# move default config to -doc package and use our own default config
@@ -108,7 +108,13 @@ mediaproxy() {
 	_mv_mod mediaproxy
 }
 
-md5sums="6c6f4ed6fbcb4d008b8ac3de5b99ce99  kamailio-1.5.2-notls_src.tar.gz
+unixodbc() {
+	pkgdesc="UnixODBC support for kamailio"
+	depends="kamailio"
+	_mv_mod db_unixodbc
+}
+
+md5sums="17eeea5cdc2fdd28b2f9a1bad6598de2  kamailio-1.5.3-notls_src.tar.gz
 eb665248ee39cf755a247286affc5cbb  kamailio.cfg
 81100c479890a2a8c2628db22fdd1a0c  kamailio.initd
 c646af2dd31f5c4289a2f802c873d98f  kamailio.pre-install
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index ea564c225..76c10fab3 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -1,32 +1,39 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
-pkgver=5.0.83
-pkgrel=1
+pkgver=5.1.40
+pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
 license='GPL'
 depends=
-makedepends="libtool uclibc++-dev readline-dev openssl-dev ncurses-dev zlib-dev"
-source="http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.0/${pkgname}-${pkgver}.tar.gz
-$pkgname.initd
-$pkgname.mycnf"
+makedepends="libtool readline-dev openssl-dev ncurses-dev zlib-dev"
+source="http://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.mycnf"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-test libmysqlclient $pkgname-client"
 
 build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --prefix=/usr --libexecdir=/usr/sbin \
+		--localstatedir=/var/lib/mysql \
+		--disable-assembler \
+		--with-pthread \
+		--without-libwrap \
+		--without-pstack \
+		--without-docs \
+		--without-embedded-server \
+		--with-ssl \
+		--without-debug \
+		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+		--mandir=/usr/share/man \
+		|| return 1
+
+        make
+}
+
+package() {
         cd "$srcdir/$pkgname-$pkgver"
-	export CXX=g++-uc
-        ./configure --prefix=/usr --libexecdir=/usr/sbin \
-        --localstatedir=/var/lib/mysql \
-        --disable-assembler --with-pthread \
-        --without-raid --without-libwrap \
-        --without-pstack --without-docs \
-        --without-embedded-server --with-openssl \
-        --without-mysqlfs --without-vio \
-        --without-bench --without-debug \
-	--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-        --with-innodb --mandir=/usr/share/man || return 1
-        make || return 1
         make -j1 DESTDIR="$pkgdir/" install
         install -Dm 755 "$startdir"/$pkgname.initd $pkgdir/etc/init.d/$pkgname
         install -Dm 644 "$startdir"/$pkgname.mycnf $pkgdir/etc/mysql/my.cnf
@@ -65,6 +72,6 @@ client() {
 	done
 }
 
-md5sums="051392064a1e32cca5c23a593908b10e  mysql-5.0.83.tar.gz
+md5sums="32e7373c16271606007374396e6742ad  mysql-5.1.40.tar.gz
 25d08b02bff6aa379dc45859b7a3f28a  mysql.initd
 15a7e3ddd6a40bf5a1eb3a8c69d9c34c  mysql.mycnf"