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

8 files changed, 4 insertions, 210 deletions

diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD
deleted file mode 100644
index f226e219f0..0000000000
--- a/testing/kamailio/APKBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=kamailio
-pkgver=1.5.2
-pkgrel=5
-pkgdesc="Open Source SIP Server"
-url="http://www.kamailio.org/"
-pkgusers="kamailio"
-pkggroups="kamailio"
-license="GPL"
-depends=
-makedepends="bison flex expat-dev postgresql-dev mysql-dev pcre-dev
-	libxml2-dev curl-dev"
-install=
-subpackages="$pkgname-doc $pkgname-mysql $pkgname-postgres $pkgname-pcre
-	$pkgname-presence"
-source="http://www.kamailio.org/pub/kamailio/$pkgver/src/$pkgname-$pkgver-notls_src.tar.gz
-	kamailio.initd
-	kamailio.pre-install
-	kamailio.post-install"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver-notls"
-	sed -i -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \
-		-e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' Makefile.defs \
-		|| return 1
-
-	cd scripts
-	sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \
-		kamctl.base kamctlrc || return 1
-	# we actually dont need bash
-	sed -i -e '1s:/bin/bash:/bin/sh:' kamctl kamdbctl \
-		|| return 1
-	cd ..
-
-	make prefix=/usr \
-		cfg-dir=/etc/kamailio/ \
-		MODS_MYSQL=yes \
-		MODS_PCRE=yes \
-		MODS_PRESENCE=yes \
-		MODS_RADIUS= \
-		TLS= \
-		include_modules=db_postgres \
-		all || return 1
-	make prefix=/usr \
-		cfg-dir=/etc/kamailio \
-		MODS_MYSQL=yes \
-		MODS_PCRE=yes \
-		MODS_PRESENCE=yes \
-		MODS_RADIUS= \
-		TLS= \
-		include_modules=db_postgres \
-		basedir="$pkgdir" install || return 1
-
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -d -o kamailio "$pkgdir"/var/run/kamailio
-}
-
-_mv_mod() {
-	local moddir=usr/lib/kamailio/modules i=
-	mkdir -p "$subpkgdir"/$moddir
-	for i in $@; do
-		mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1
-	done
-}
-
-
-mysql() {
-	pkgdesc="MySQL support for kamailio"
-	depends="kamailio mysql-client"
-	_mv_mod db_mysql
-	mkdir -p "$subpkgdir"/usr/share/kamailio
-	mv "$pkgdir"/usr/share/kamailio/mysql \
-		"$subpkgdir"/usr/share/kamailio/
-}
-
-postgres() {
-	pkgdesc="PostgreSQL support for kamailio"
-	depends="kamailio postgresql-client"
-	_mv_mod db_postgres
-	mkdir -p "$subpkgdir"/usr/share/kamailio
-	mv "$pkgdir"/usr/share/kamailio/postgres \
-		"$subpkgdir"/usr/share/kamailio/
-}
-
-pcre() {
-	pkgdesc="Regular expressions support for kamailio"
-	_mv_mod dialplan lcr regex
-}
-
-presence() {
-	pkgdesc="Precense support for kamailio"
-	_mv_mod presence presence_xml presence_mwi pua pua_bla pua_mi \
-		pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo \
-		pua_dialoginfo
-}
-
-md5sums="6c6f4ed6fbcb4d008b8ac3de5b99ce99  kamailio-1.5.2-notls_src.tar.gz
-81100c479890a2a8c2628db22fdd1a0c  kamailio.initd
-c646af2dd31f5c4289a2f802c873d98f  kamailio.pre-install
-3fbaf633ff1620d0d526fc4047c7bed9  kamailio.post-install"
diff --git a/testing/kamailio/kamailio.initd b/testing/kamailio/kamailio.initd
deleted file mode 100644
index ee4e2ecef1..0000000000
--- a/testing/kamailio/kamailio.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-
-daemon=/usr/sbin/kamailio
-pidfile=/var/run/kamailio/kamailio.pid
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting Kamailio"
-	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
-		-- \
-		-u ${KAMAILIO_USER:-kamailio} \
-		-g ${KAMAILIO_GROUP:-kamailio} \
-		-P $pidfile \
-		${KAMAILIO_OPTS:-}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Kamailio"
-	start-stop-daemon --stop --quiet --pidfile $pidfile
-	eend $?
-}
diff --git a/testing/kamailio/kamailio.post-install b/testing/kamailio/kamailio.post-install
deleted file mode 100644
index 19fc932dd6..0000000000
--- a/testing/kamailio/kamailio.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-chown -R kamailio:kamailio /var/run/kamailio
-chgrp kamailio /etc/kamailio/kamailio.cfg
-exit 0
diff --git a/testing/kamailio/kamailio.pre-install b/testing/kamailio/kamailio.pre-install
deleted file mode 100644
index 78dfa38bf3..0000000000
--- a/testing/kamailio/kamailio.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -H -h /var/empty -s /bin/false -D kamailio  2>/dev/null
-
-exit 0
diff --git a/testing/linux-vserver/APKBUILD b/testing/linux-vserver/APKBUILD
index 9cdf2fcb83..245d1b11ed 100644
--- a/testing/linux-vserver/APKBUILD
+++ b/testing/linux-vserver/APKBUILD
@@ -2,9 +2,9 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=2.6.30.7
+pkgver=2.6.30.8
 _kernver=2.6.30
-pkgrel=1
+pkgrel=0
 pkgdesc="Linux kernel with vserver"
 url="http://linux-vserver.org/"
 depends="mkinitfs linux-firmware"
@@ -28,7 +28,7 @@ _prepare() {
 		bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1
 	fi
 
-	sed -i -e 's/EXTRAVERSION = \.6/EXTRAVERSION = .7/' \
+	sed -i -e 's/EXTRAVERSION = \.6/EXTRAVERSION = .8/' \
 		../patch-2.6.30.6-vs2.3.0.36.14-pre8.diff || return 1
 
 	for i in ../*.diff ../*.patch; do
@@ -116,7 +116,7 @@ dev() {
 }
 
 md5sums="7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-7c91fa862b90d74da3aa83446d69a412  patch-2.6.30.7.bz2
+7e9b405b840bf5ecc70d208bfccee5f9  patch-2.6.30.8.bz2
 37e45dcf0eb69e8cc8665522dde28f1a  patch-2.6.30.6-vs2.3.0.36.14-pre8.diff
 ca05fd252783b82e01610e775cf56498  net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
 5db2d023915e69fbcab0e1eec4f31402  kernelconfig"
diff --git a/testing/lua-discount/APKBUILD b/testing/lua-discount/APKBUILD
deleted file mode 100644
index 9fe7cfd373..0000000000
--- a/testing/lua-discount/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lua-discount
-pkgver=1.2.10.1
-pkgrel=0
-pkgdesc="Lua binding to discount, a Markdown implementation in C"
-url="http://asbradbury.org/projects/lua-discount"
-license="BSD"
-depends="lua"
-makedepends="lua-dev"
-install=
-subpackages=
-source="http://luaforge.net/frs/download.php/3758/lua-discount-1.2.10.1.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	make || return 1
-	install -D -m644 discount.so "$pkgdir"/usr/lib/lua/5.1/discount.so
-}
-
-md5sums="7dc7055816dc755aacb48bfd5eb2eb5b  lua-discount-1.2.10.1.tar.gz"
diff --git a/testing/luasql-mysql/APKBUILD b/testing/luasql-mysql/APKBUILD
deleted file mode 100644
index 42f5d7604d..0000000000
--- a/testing/luasql-mysql/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <natanael.copa@gmail.com>
-pkgname=luasql-mysql
-pkgver=2.1.1
-pkgrel=0
-pkgdesc="MySQL driver for LuaSQL"
-url="http://www.keplerproject.org/luasql/"
-license="MIT"
-depends="lua"
-makedepends="lua-dev mysql-dev"
-install=
-subpackages=
-source="http://luaforge.net/frs/download.php/2686/luasql-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/luasql-$pkgver
-
-	# The config has DRIVER_INCS but it seems like its not respected
-	# so we just fix the .c file
-	sed -i -e 's:^\#include "mysql.h":\#include <mysql/mysql.h>:' \
-		src/ls_mysql.c || return 1
-
-	make CFLAGS="$CFLAGS" T=mysql DRIVER_LIBS="-lmysqlclient" || return 1
-	install -D src/mysql.so "$pkgdir"/usr/lib/lua/5.1/luasql/mysql.so
-}
-
-md5sums="63bdd57de4b9d1be336ba112d8cb69eb  luasql-2.1.1.tar.gz"
diff --git a/testing/luasql-sqlite3/APKBUILD b/testing/luasql-sqlite3/APKBUILD
deleted file mode 100644
index 6cd89c8f0d..0000000000
--- a/testing/luasql-sqlite3/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <natanael.copa@gmail.com>
-pkgname=luasql-sqlite3
-pkgver=2.1.1
-pkgrel=0
-pkgdesc="LuaSQL driver for sqlite3"
-url="http://www.keplerproject.org/luasql/"
-license="MIT"
-depends="lua"
-makedepends="lua-dev sqlite-dev"
-install=
-subpackages=
-source="http://luaforge.net/frs/download.php/2686/luasql-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/luasql-$pkgver
-
-	make CFLAGS="$CFLAGS" T=sqlite3 DRIVER_LIBS="-lsqlite3" || return 1
-	install -D src/sqlite3.so "$pkgdir"/usr/lib/lua/5.1/luasql/sqlite3.so
-}
-
-md5sums="63bdd57de4b9d1be336ba112d8cb69eb  luasql-2.1.1.tar.gz"