Merge remote branch 'ncopa/master'

Conflicts:
	testing/iscsi-scst/APKBUILD

14 files changed, 402 insertions, 3 deletions

diff --git a/testing/agg/APKBUILD b/testing/agg/APKBUILD
new file mode 100644
index 000000000..5ec08625d
--- /dev/null
+++ b/testing/agg/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
+# Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
+pkgname=agg
+pkgver=2.5
+pkgrel=0
+pkgdesc="A Rendering Engine for C++"
+url="http://antigrain.org/"
+license="GPL"
+depends=
+makedepends="autoconf automake libtool libx11-dev freetype-dev sdl-dev"
+install=
+arch="all"
+subpackages="$pkgname-dev"
+source="http://www.antigrain.com/$pkgname-$pkgver.tar.gz
+	agg-2.4-depends.patch
+	agg-2.5-pkgconfig.patch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd $_builddir
+	for i in "$srcdir"/*.patch; do
+		msg "Applying ${i}"
+		patch -Np1 -i "$i" || return 1
+	done
+	sh ./autogen.sh || return 1
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr --disable-static || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="${pkgdir}" install || return 1
+}
+
+md5sums="0229a488bc47be10a2fee6cf0b2febd6  agg-2.5.tar.gz
+22f8e48c137d25038181c86d5e40b110  agg-2.4-depends.patch
+43a19a7b1564c591e56c8d09a0fd8da5  agg-2.5-pkgconfig.patch"
diff --git a/testing/agg/agg-2.4-depends.patch b/testing/agg/agg-2.4-depends.patch
new file mode 100644
index 000000000..9d4f6e309
--- /dev/null
+++ b/testing/agg/agg-2.4-depends.patch
@@ -0,0 +1,48 @@
+--- agg-2.4.orig/font_freetype/Makefile.am	2005-10-18 11:45:40.000000000 +0100
++++ agg-2.4/font_freetype/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+@@ -4,8 +4,9 @@
+ agginclude_HEADERS = agg_font_freetype.h
+ lib_LTLIBRARIES = libaggfontfreetype.la
+ 
+-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ 
++libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
+ libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ 
++libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@
+ endif
+ 
+--- agg-2.4.orig/src/platform/sdl/Makefile.am	2005-10-17 23:49:35.000000000 +0100
++++ agg-2.4/src/platform/sdl/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+@@ -5,6 +5,6 @@
+ libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
+ libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
+-libaggplatformsdl_la_LIBADD = @SDL_LIBS@
++libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
+ endif
+ 
+--- agg-2.5.orig/configure.in	2006-10-09 05:06:36.000000000 +0100
++++ agg-2.5/configure.in	2007-01-07 14:07:39.000000000 +0000
+@@ -122,7 +122,8 @@
+ fi
+ AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
+ AC_SUBST(x_includes)
+-AC_SUBST(x_libraries)
++test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries"
++AC_SUBST(X_LDFLAGS)
+ dnl ###############################################
+ 
+ dnl Settung up library version
+--- agg-2.5.orig/src/platform/X11/Makefile.am	2006-12-11 00:59:45.000000000 +0000
++++ agg-2.5/src/platform/X11/Makefile.am	2007-01-07 14:07:39.000000000 +0000
+@@ -1,8 +1,8 @@
+ if ENABLE_X11
+ lib_LTLIBRARIES = libaggplatformX11.la
+ 
+-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L@x_libraries@
++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@
+ libaggplatformX11_la_SOURCES = agg_platform_support.cpp
+ libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include -I@x_includes@
+-libaggplatformX11_la_LIBADD = -lX11
++libaggplatformX11_la_LIBADD = ../../libagg.la -lX11
+ endif
diff --git a/testing/agg/agg-2.5-pkgconfig.patch b/testing/agg/agg-2.5-pkgconfig.patch
new file mode 100644
index 000000000..a303bfb90
--- /dev/null
+++ b/testing/agg/agg-2.5-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- agg-2.5/libagg.pc.in.orig	2007-01-07 13:58:28.000000000 +0000
++++ agg-2.5/libagg.pc.in	2007-01-07 14:02:40.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Requires.private: freetype2
++Libs: -L${libdir} -lagg
+ Cflags: -I${includedir}
diff --git a/testing/aoetools/APKBUILD b/testing/aoetools/APKBUILD
new file mode 100644
index 000000000..22f000c1a
--- /dev/null
+++ b/testing/aoetools/APKBUILD
@@ -0,0 +1,28 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=aoetools
+pkgver=32
+pkgrel=0
+pkgdesc="tools for managing the linux AoE driver"
+url="http://aoetools.sourceforge.net/"
+license="GPL"
+depends=
+makedepends=
+install=
+subpackages=
+source="http://downloads.sourceforge.net/aoetools/$pkgname-$pkgver.tar.gz"
+arch="all"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make PREFIX="$pkgdir" install
+}
+
+md5sums="62c8b5664d413019d0008f27ab5dc4d1  aoetools-32.tar.gz"
diff --git a/testing/apts/APKBUILD b/testing/apts/APKBUILD
new file mode 100644
index 000000000..ba6813c4e
--- /dev/null
+++ b/testing/apts/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
+pkgname=apts
+pkgver=0.1
+_pkgver="master"
+pkgrel=0
+pkgdesc="APTS - Alpine Package Testing Suite"
+depends=
+makedepends=
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$_pkgver.tar.bz2
+	"
+url="http://git.alpinelinux.org/cgit/apts/"
+arch="x86 x86_64"
+license=GPL-2
+
+build() {
+	echo "Nothing to build, moving on to package"
+}
+
+package() {
+	cd "$srcdir/$pkgname-$_pkgver"
+	mkdir -p "$pkgdir"/etc/apts
+	mkdir -p "$pkgdir"/usr/bin
+	mkdir -p "$pkgdir"/usr/share/$pkgname/tests
+	mkdir -p "$pkgdir"/usr/share/docs/$pkgname
+
+	install -m755 -D $pkgname "$pkgdir"/usr/bin/$pkgname
+	install -m644 -D apts.conf "$pkgdir"/etc/$pkgname/${pkgname}.conf
+	install -m644 -D README "$pkgdir"/usr/share/docs/$pkgname/README
+	install -m644 -D missing-tests "$pkgdir"/usr/share/docs/$pkgname/missing-tests
+	install -m644 -D torvalds-says-linux.mp3 "$pkgdir"/usr/share/$pkgname/torvalds-says-linux.mp3
+	install -m644 -D test.rar "$pkgdir"/usr/share/$pkgname/test.rar
+	for i in `ls tests`; do
+		install -m644 -D tests/$i "$pkgdir"/usr/share/$pkgname/tests/$i
+	done
+}
+
+md5sums="0eead32c26a0224f9f7afcc013fc8f52  apts-master.tar.bz2"
diff --git a/testing/gigolo/APKBUILD b/testing/gigolo/APKBUILD
new file mode 100644
index 000000000..9f3544d76
--- /dev/null
+++ b/testing/gigolo/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gigolo
+pkgver=0.4.1
+pkgrel=0
+pkgdesc="GIO/GVFS management application"
+url="http://www.uvena.de/gigolo/"
+license="GPLv2"
+arch="all"
+depends=
+makedepends="gtk+-dev python"
+install=
+subpackages="$pkgname-doc"
+source="http://archive.xfce.org/src/apps/gigolo/${pkgver%.*}/gigolo-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="760bdc5753768214b379733a728b0c80  gigolo-0.4.1.tar.bz2"
diff --git a/testing/iscsi-scst/APKBUILD b/testing/iscsi-scst/APKBUILD
index 8a2fd4664..a60c1985b 100644
--- a/testing/iscsi-scst/APKBUILD
+++ b/testing/iscsi-scst/APKBUILD
@@ -40,8 +40,8 @@ package() {
 	install -D -m 644 "$srcdir"/scst.conf "$pkgdir"/etc/scst.conf
 }
 
-md5sums="04e623184f9061bea06b9ba10631a620  iscsi-scst-2.0.0.tar.gz
-e7262a26d38d8311d0296b36718d593b  scst-2.0.0.tar.gz
+md5sums="0980e7f0cc57d3a09cc57ba4b127ef12  iscsi-scst-2.0.0-svn-3161.tar.gz
+73c1ec37231918e5183e78f1ec8f2302  scst-2.0.0-svn-3161.tar.gz
 6440aac6ffdf18c90ae9824f04f8c638  iscsi-scst.initd
 6d8b6e27d47748f7805fdb318b62bb3b  iscsi-scst.confd
 e8eda9872b3da3a55605c7fa17cb6c68  scst.conf"
diff --git a/testing/libcanberra/APKBUILD b/testing/libcanberra/APKBUILD
new file mode 100644
index 000000000..e73d7970c
--- /dev/null
+++ b/testing/libcanberra/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=libcanberra
+pkgver=0.26
+pkgrel=0
+pkgdesc="simple audio library for GTK applications"
+url="http://0pointer.de/lennart/projects/libcanberra/"
+license="LGPL"
+depends=
+makedepends="gtk+-dev libogg-dev libvorbis-dev alsa-lib-dev libtool"
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.gz"
+arch="all"
+
+depends_dev="$makedepends"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="ee2c66ada7c851a4e7b6eb1682285a24  libcanberra-0.26.tar.gz"
diff --git a/testing/lxdm/APKBUILD b/testing/lxdm/APKBUILD
new file mode 100644
index 000000000..de51ddad7
--- /dev/null
+++ b/testing/lxdm/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=lxdm
+pkgver=0.3.0
+pkgrel=0
+pkgdesc="LXDE desktop login manager"
+url="http://wiki.lxde.org/en/LXDM"
+license="GPL"
+depends=
+makedepends="autoconf automake gtk+-dev consolekit-dev"
+install=
+source="http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
+	lxdm.initd
+	lxdm-execinfo.patch
+	lxdm-nopam.patch"
+arch="all"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i..."
+			patch -s -p1 -N -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+
+	autoreconf
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--without-pam
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+}
+
+md5sums="1d0688e088edab7c3c563263eb2f9654  lxdm-0.3.0.tar.gz
+27f8ef5c16ae1234365ab318e2c9001c  lxdm.initd
+045da38f5bb183ccacc489ea7e50e927  lxdm-execinfo.patch
+0d44e8cd97894fd680e3f09e680c3481  lxdm-nopam.patch"
diff --git a/testing/lxdm/lxdm-execinfo.patch b/testing/lxdm/lxdm-execinfo.patch
new file mode 100644
index 000000000..b81ef2fc8
--- /dev/null
+++ b/testing/lxdm/lxdm-execinfo.patch
@@ -0,0 +1,47 @@
+--- lxdm-0.3.0/configure.ac
++++ lxdm-0.3.0.mod/configure.ac
+@@ -23,7 +23,7 @@
+ 
+ # Checks for header files.
+ AC_PATH_X
+-AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h])
++AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h execinfo.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_PID_T
+Only in lxdm-0.3.0: data/LoginReady
+Only in lxdm-0.3.0: data/PostLogin
+Only in lxdm-0.3.0: data/PostLogout
+Only in lxdm-0.3.0: data/PreLogin
+Only in lxdm-0.3.0: data/PreReboot
+Only in lxdm-0.3.0: data/PreShutdown
+--- lxdm-0.3.0/src/lxdm.c
++++ lxdm-0.3.0.mod/src/lxdm.c
+@@ -51,7 +51,9 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ 
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ 
+ #include <utmp.h>
+ 
+@@ -1480,6 +1482,7 @@
+ 
+ static void log_sigsegv(void)
+ {
++#ifdef HAVE_EXECINFO_H
+ 	void *array[40];
+ 	size_t size;
+ 	char **bt_strs;
+@@ -1492,6 +1495,9 @@
+ 	    fprintf(stderr, "%s\n", bt_strs[i]);
+ 
+ 	free(bt_strs);
++#else
++	fprintf(stderr, "backtrace is unavailable\n");
++#endif
+ }
+ 
+ static void sigsegv_handler(int sig)
diff --git a/testing/lxdm/lxdm-nopam.patch b/testing/lxdm/lxdm-nopam.patch
new file mode 100644
index 000000000..86c808fcb
--- /dev/null
+++ b/testing/lxdm/lxdm-nopam.patch
@@ -0,0 +1,18 @@
+--- lxdm-0.3.0/src/lxdm.c
++++ lxdm-0.3.0.mod/src/lxdm.c
+@@ -152,6 +152,7 @@
+     while( waitpid(-1, 0, WNOHANG) > 0 ) ;
+ }
+ 
++#if HAVE_LIBPAM
+ static void close_pam_session(pam_handle_t *pamh)
+ {
+     int err;
+@@ -161,6 +162,7 @@
+     pam_end(pamh, err);
+     pamh = NULL;
+ }
++#endif
+ 
+ static LXSession *lxsession_find_greeter(void)
+ {
diff --git a/testing/lxdm/lxdm.initd b/testing/lxdm/lxdm.initd
new file mode 100755
index 000000000..274c4afe9
--- /dev/null
+++ b/testing/lxdm/lxdm.initd
@@ -0,0 +1,18 @@
+#!/sbin/runscript
+
+depends() {
+	needs localmount
+}
+
+start() {
+	ebegin "Starting lxdm"
+	start-stop-daemon --start --quiet --exec /usr/bin/lxdm -- -d
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping lxdm"
+	start-stop-daemon --stop --quiet --exec /usr/bin/lxdm
+	eend $?
+}
+
diff --git a/testing/openvpn-auth-ldap/APKBUILD b/testing/openvpn-auth-ldap/APKBUILD
index dd2a392fd..98d98a20c 100644
--- a/testing/openvpn-auth-ldap/APKBUILD
+++ b/testing/openvpn-auth-ldap/APKBUILD
@@ -8,7 +8,7 @@ url="http://code.google.com/p/openvpn-auth-ldap/"
 arch="x86 x86_64"
 license="GPL"
 depends=
-makedepends="openvpn re2c openldap-dev objc"
+makedepends="openvpn re2c openldap-dev"
 install=
 subpackages=
 source="http://openvpn-auth-ldap.googlecode.com/files/auth-ldap-$pkgver.tar.gz
diff --git a/testing/scons/APKBUILD b/testing/scons/APKBUILD
new file mode 100644
index 000000000..636bdf1f8
--- /dev/null
+++ b/testing/scons/APKBUILD
@@ -0,0 +1,22 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=scons
+pkgver=2.0.1
+pkgrel=0
+pkgdesc="scons software construction system"
+url="http://www.scons.org/"
+license="MIT"
+depends="python"
+makedepends="python-dev"
+install=
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+arch="noarch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+package() {
+	cd "$_builddir"
+	python setup.py install --root="$pkgdir"
+}
+
+md5sums="beca648b894cdbf85383fffc79516d18  scons-2.0.1.tar.gz"