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

4 files changed, 57 insertions, 4 deletions

diff --git a/testing/libwmf/APKBUILD b/testing/libwmf/APKBUILD
new file mode 100644
index 000000000..3f4108795
--- /dev/null
+++ b/testing/libwmf/APKBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libwmf
+pkgver=0.2.8.4
+pkgrel=0
+pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)."
+url="http://wvware.sourceforge.net/libwmf.html"
+license="LGPL"
+makedepends="libpng-dev>=1.4.0 freetype-dev jpeg-dev>=8 expat-dev"
+install=
+subpackages="$pkgname-dev"
+source="http://downloads.sourceforge.net/sourceforge/wvware/$pkgname-$pkgver.tar.gz
+	libpng14.patch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	patch -Np1 -i ""$srcdir"/libpng14.patch" || return 1
+	sed -i -e 's/src include fonts doc/src include fonts/g' Makefile.in
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--with-gsfontdir=/usr/share/fonts/Type1 \
+		--with-fontdir=/usr/share/fonts/Type1 \
+		--with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make -j1 DESTDIR="$pkgdir" install
+}
+md5sums="d1177739bf1ceb07f57421f0cee191e0  libwmf-0.2.8.4.tar.gz
+33d3c07a1be9f99fd88de220930c5550  libpng14.patch"
diff --git a/testing/libwmf/libpng14.patch b/testing/libwmf/libpng14.patch
new file mode 100644
index 000000000..3d38c717a
--- /dev/null
+++ b/testing/libwmf/libpng14.patch
@@ -0,0 +1,12 @@
+diff -Nur libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c libwmf-0.2.8.4/src/extra/gd/gd_png.c
+--- libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c	2005-07-27 23:35:06.000000000 +0300
++++ libwmf-0.2.8.4/src/extra/gd/gd_png.c	2010-01-17 01:33:58.000000000 +0200
+@@ -136,7 +136,7 @@
+   /* first do a quick check that the file really is a PNG image; could
+    * have used slightly more general png_sig_cmp() function instead */
+   gdGetBuf (sig, 8, infile);
+-  if (!png_check_sig (sig, 8))
++  if (png_sig_cmp (sig, 0, 8))
+     return NULL;		/* bad signature */
+ 
+ #ifndef PNG_SETJMP_NOT_SUPPORTED
diff --git a/testing/open-iscsi-grsec/APKBUILD b/testing/open-iscsi-grsec/APKBUILD
index 09b3091d0..1bda4a7f2 100644
--- a/testing/open-iscsi-grsec/APKBUILD
+++ b/testing/open-iscsi-grsec/APKBUILD
@@ -31,22 +31,26 @@ source="http://www.open-iscsi.org/bits/$_realname-$_realver.tar.gz
 	CVE-2009-1297.patch
 	open-iscsi-2.0.871-makefile-cleanup.patch"
 
+_builddir="$srcdir/$_realname-$_realver"
+
 prepare() {
-	cd "$srcdir"/$_realname-$_realver
+	cd "$_builddir"
 	patch -p0 < ../../CVE-2009-1297.patch || return 1
 	patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1
 	patch -p2 < ../../Makefile.kernel.patch || return 1
 }
 
 build() {
-	cd "$srcdir"/$_realname-$_realver
+	cd "$_builddir"
 	unset ARCH
 	make KSRC="$_ksrc" kernel || return 1
 }
 
 package() {
-	cd "$srcdir"/$_realname-$_realver
-	make KSRC="$_ksrc" INSTALL_MOD_PATH="$pkgdir" install_kernel || return 
+	cd "$_builddir"
+	make KSRC="$_ksrc" DESTDIR="$pkgdir" \
+	 INSTALL_MOD_DIR="extra/drivers/scsi" \
+	 install_kernel
 }
 
 md5sums="0c403e8c9ad41607571ba0e6e8ff196e  open-iscsi-2.0-871.tar.gz
diff --git a/testing/open-iscsi/APKBUILD b/testing/open-iscsi/APKBUILD
index 4c9852b03..c74cf2692 100644
--- a/testing/open-iscsi/APKBUILD
+++ b/testing/open-iscsi/APKBUILD
@@ -31,9 +31,11 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install_user
 	mkdir -p $pkgdir/usr/bin
+	mkdir -p $pkgdir/usr/sbin
 	mv $pkgdir/sbin/iscsi-iname $pkgdir/usr/bin
 	mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin
 	mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin
+	mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin
 	install -Dm755 ../../iscsid-2.0.871-r1.init.d "$pkgdir"/etc/init.d/iscsid
 }