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

6 files changed, 70 insertions, 6 deletions

diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD
new file mode 100644
index 000000000..9317a1848
--- /dev/null
+++ b/main/jasper/APKBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=jasper
+pkgver=1.900.1
+pkgrel=0
+pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
+url="http://www.ece.uvic.ca/~mdadams/jasper/"
+license="custom:JasPer2.0"
+depends=  #"libjpeg>=8 freeglut libxi libxmu mesa"
+makedepends="jpeg-dev>=8"
+subpackages="$pkgname-dev $pkgname-doc libjasper"
+source="http://www.ece.uvic.ca/~mdadams/$pkgname/software/$pkgname-$pkgver.zip
+	jpc_dec.c.patch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	patch -Np1 < "$srcdir"/jpc_dec.c.patch || return 1
+	chmod +x configure
+}
+
+build () {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-shared || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+
+	make DESTDIR="$pkgdir" install || return 1
+	install -Dm644 LICENSE \
+		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1
+}
+
+libjasper() {
+	pkgdesc="JPEG-2000 library"
+	install -d "$subpkgdir"/usr/
+	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
+}
+
+md5sums="a342b2b4495b3e1394e161eb5d85d754  jasper-1.900.1.zip
+36de7128eea6f701c1e2e13ce5bd8d37  jpc_dec.c.patch"
diff --git a/main/jasper/jpc_dec.c.patch b/main/jasper/jpc_dec.c.patch
new file mode 100644
index 000000000..ae1cd0617
--- /dev/null
+++ b/main/jasper/jpc_dec.c.patch
@@ -0,0 +1,18 @@
+diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
+--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
++++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
+@@ -1069,12 +1069,12 @@
+ 	/* Apply an inverse intercomponent transform if necessary. */
+ 	switch (tile->cp->mctid) {
+ 	case JPC_MCT_RCT:
+-		assert(dec->numcomps == 3);
++		assert(dec->numcomps >= 3);
+ 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
+ 		  tile->tcomps[2].data);
+ 		break;
+ 	case JPC_MCT_ICT:
+-		assert(dec->numcomps == 3);
++		assert(dec->numcomps >= 3);
+ 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
+ 		  tile->tcomps[2].data);
+ 		break;
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 28cda38db..4e2def8e4 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=1.5.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -128,5 +128,5 @@ unixodbc() {
 
 md5sums="17eeea5cdc2fdd28b2f9a1bad6598de2  kamailio-1.5.3-notls_src.tar.gz
 eb665248ee39cf755a247286affc5cbb  kamailio.cfg
-81100c479890a2a8c2628db22fdd1a0c  kamailio.initd
+8ac6c260f090aea0ca344f18f9a2a904  kamailio.initd
 b0ea6c22e2e40d5d12a547898aef6973  kamailio-backslash.patch"
diff --git a/main/kamailio/kamailio.initd b/main/kamailio/kamailio.initd
index ee4e2ecef..a70b1781e 100644
--- a/main/kamailio/kamailio.initd
+++ b/main/kamailio/kamailio.initd
@@ -4,7 +4,7 @@ daemon=/usr/sbin/kamailio
 pidfile=/var/run/kamailio/kamailio.pid
 
 depend() {
-	need net
+	need net logger
 	after firewall
 }
 
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index b0cdbbbab..cc8bb9e99 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
 pkgver=2.4.19
-pkgrel=4
+pkgrel=5
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 license="custom"
diff --git a/main/openldap/openldap.pre-install b/main/openldap/openldap.pre-install
index 7ca82b1c2..7de7c0ce3 100644
--- a/main/openldap/openldap.pre-install
+++ b/main/openldap/openldap.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
 
-adduser -h /usr/lib/openldap -s /bin/false -S -D ldap 2>/dev/null
-addgroup ldap
+addgroup -S ldap 2>/dev/null
+adduser -h /usr/lib/openldap -s /bin/false -S -D -H -g "OpenLdap User" \
+	-G ldap ldap 2>/dev/null
+
 exit 0