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

4 files changed, 119 insertions, 9 deletions

diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index 5b440336c8..b0cdbbbab5 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,13 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
 pkgver=2.4.19
-pkgrel=3
+pkgrel=4
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 license="custom"
 depends=
-makedepends="db-dev openssl-dev groff unixodbc-dev"
-subpackages="$pkgname-dev $pkgname-doc libldap"
+makedepends="db-dev openssl-dev groff unixodbc-dev libtool"
+subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-back-sql:sql
+	$pkgname-back-bdb:bdb $pkgname-back-hdb:hdb $pkgname-back-ldap:ldap
+	$pkgname-back-meta:meta	$pkgname-back-monitor:monitor"
+
 install="$pkgname.pre-install $pkgname.post-install"
 source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz
 	openldap-2.4-ppolicy.patch
@@ -27,16 +30,16 @@ build () {
 	done
 
 	./configure --prefix=/usr \
-		--libexecdir=/usr/sbin \
+		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var/lib/openldap \
 		--enable-slapd \
-		--enable-bdb \
-		--enable-hdb \
-		--enable-sql \
 		--enable-crypt \
+		--enable-modules \
 		--enable-dynamic \
+		--enable-bdb=mod \
+		--enable-hdb=mod \
 		--enable-dnssrv=mod \
 		--enable-ldap=mod \
 		--enable-meta=mod \
@@ -46,6 +49,7 @@ build () {
 		--enable-relay=mod \
 		--enable-shell=mod \
 		--enable-sock=mod \
+		--enable-sql=mod \
 		--with-tls=openssl 
 	
 	make || return 1
@@ -59,6 +63,7 @@ package() {
 	sed -i -e 's:/var/lib/openldap/run:/var/run/openldap:g' \
 		"$pkgdir"/etc/openldap/slapd.conf
 
+	mv "$pkgdir"/usr/lib/slapd "$pkgdir"/usr/sbin/
 	chmod g+r "$pkgdir"/etc/openldap/slapd.conf
 	install -Dm755 ../slapd.initd "$pkgdir"/etc/init.d/slapd
 	install -Dm755 ../slapd.confd "$pkgdir"/etc/conf.d/slapd
@@ -69,11 +74,25 @@ libldap() {
 	pkgdesc="OpenLDAP libraries"
 	depends=
 	install=
-	mkdir -p "$subpkgdir"/usr "$subpkgdir"/etc/openldap
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+	mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/etc/openldap
+	mv "$pkgdir"/usr/lib/*.so* "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/etc/openldap/ldap.conf "$subpkgdir"/etc/openldap/
 }
 
+_backend() {
+	pkgdesc="OpenLDAP ${2:-$1} backend"
+	mkdir -p "$subpkgdir"/usr/lib/openldap
+	mv "$pkgdir"/usr/lib/openldap/back_$1* "$subpkgdir"/usr/lib/openldap/
+}
+
+bdb() {		_backend bdb ; }
+hdb() {		_backend hdb ; }
+sql() {		_backend sql ODBC; }
+ldap() {	_backend ldap LDAP; }
+meta() {	_backend meta; }
+monitor() {	_backend monitor; }
+
+
 md5sums="4a6dab2711fcf141f19bb680bc335887  openldap-2.4.19.tgz
 2524e490ba334a760fa57057c16da7a9  openldap-2.4-ppolicy.patch
 d19d0502f046078ecd737e29e7552fa8  openldap-2.4.11-libldap_r.patch
diff --git a/testing/lua-filesystem/APKBUILD b/testing/lua-filesystem/APKBUILD
new file mode 100644
index 0000000000..cf07eb5ad4
--- /dev/null
+++ b/testing/lua-filesystem/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: 
+# Maintainer: 
+pkgname=lua-filesystem
+pkgver=1.4.2
+pkgrel=0
+pkgdesc="Lua library to complement the set of functions related to file systems"
+url="http://www.keplerproject.org/luafilesystem/"
+license="GPL"
+depends=
+makedepends="lua-dev"
+install=
+subpackages=
+source="http://luaforge.net/frs/download.php/3931/luafilesystem-1.4.2.tar.gz"
+
+_builddir="$srcdir"/luafilesystem-$pkgver
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make LUA_LIBDIR="$pkgdir"/usr/lib/lua/5.1 install
+}
+
+md5sums="8e7b2a9b899d669280456d0f95afd961  luafilesystem-1.4.2.tar.gz"
diff --git a/testing/lua-penlight/APKBUILD b/testing/lua-penlight/APKBUILD
new file mode 100644
index 0000000000..56980fb3ba
--- /dev/null
+++ b/testing/lua-penlight/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: 
+# Maintainer: 
+pkgname=lua-penlight
+pkgver=0.7.2
+pkgrel=0
+pkgdesc="Lua libraries for extended operations on tables, lists and strings"
+url="http://penlight.luaforge.net/"
+license="GPL"
+depends="lua-filesystem"
+makedepends=
+install=
+subpackages="$pkgname-doc"
+source="http://luaforge.net/frs/download.php/4091/pl.0.7.2.zip"
+
+# append extra dependencies to -dev subpackage
+# remove if not used.
+# depends_dev="somepackage-dev"
+
+_builddir="$srcdir"
+
+build() {
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	mkdir -p "$pkgdir"/usr/share/lua/5.1/ \
+		"$pkgdir"/usr/share/doc/$pkgname
+	cp -r lua/pl "$pkgdir"/usr/share/lua/5.1/
+	cp -r docs/* "$pkgdir"/usr/share/doc/$pkgname/
+	cp -r examples/penlight "$pkgdir"/usr/share/doc/$pkgname/examples
+}
+
+md5sums="ef4eec0cb87ebf81886da0f2a4663d59  pl.0.7.2.zip"
diff --git a/testing/psqlodbc/APKBUILD b/testing/psqlodbc/APKBUILD
new file mode 100644
index 0000000000..6139d96eaa
--- /dev/null
+++ b/testing/psqlodbc/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=psqlodbc
+pkgver=08.04.0200
+pkgrel=0
+pkgdesc="PostgreSQL ODBC driver"
+url="http://www.postgresql.org"
+license="GPL"
+depends=
+makedepends="postgresql-dev unixodbc-dev openssl-dev"
+subpackages="$pkgname-dev"
+source="ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr
+	make || return 1
+}
+
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+md5sums="8296be11d24e3111319826fbaf034066  psqlodbc-08.04.0200.tar.gz"