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

5 files changed, 66 insertions, 9 deletions

diff --git a/main/nasm/APKBUILD b/main/nasm/APKBUILD
index 661ca83fc..963f64822 100644
--- a/main/nasm/APKBUILD
+++ b/main/nasm/APKBUILD
@@ -1,18 +1,29 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nasm
 pkgver=2.10.06
-pkgrel=0
+pkgrel=1
 pkgdesc="80x86 assembler designed for portability and modularity"
 url="http://nasm.sourceforge.net"
 arch="all"
 license="LGPL"
 depends=
-source="http://www.nasm.us/pub/nasm/releasebuilds/$pkgver/$pkgname-$pkgver.tar.bz2"
+source="http://www.nasm.us/pub/nasm/releasebuilds/$pkgver/$pkgname-$pkgver.tar.bz2
+	space-after-backslash.patch"
 
 subpackages="$pkgname-doc"
 
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
 build () { 
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	export CFLAGS=
 	export CXXFLAGS=
 	./configure --prefix=/usr
@@ -21,7 +32,8 @@ build () {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make INSTALLROOT="$pkgdir" install
 }
-md5sums="875c4217b2e581dbae0bf96d45a6067a  nasm-2.10.06.tar.bz2"
+md5sums="875c4217b2e581dbae0bf96d45a6067a  nasm-2.10.06.tar.bz2
+87a4def3898f4dddfde17bcc7b57fd40  space-after-backslash.patch"
diff --git a/main/nasm/space-after-backslash.patch b/main/nasm/space-after-backslash.patch
new file mode 100644
index 000000000..c6e0df5dd
--- /dev/null
+++ b/main/nasm/space-after-backslash.patch
@@ -0,0 +1,31 @@
+From 490f85e73d8bca15ada1c0bacc101c136e5d9cee Mon Sep 17 00:00:00 2001
+From: Cyrill Gorcunov <gorcunov@gmail.com>
+Date: Thu, 27 Dec 2012 20:02:17 +0400
+Subject: [PATCH] br3392236: Don't treat \Space after \BackSlash as a sign for line continuation
+
+In commit f1fe4fdeabeaf2e5e4d02ef43beeb09a6fbfed1b I occasionally
+made a \Space after \BackSlash being a sign of line continuation.
+
+Fix it.
+
+Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
+---
+ preproc.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/preproc.c b/preproc.c
+index 8c5bf7a..9d65917 100644
+--- a/preproc.c
++++ b/preproc.c
+@@ -844,7 +844,7 @@ static char *read_line(void)
+         case '\\':
+             next = fgetc(istk->fp);
+             ungetc(next, istk->fp);
+-            if (next == ' ' || next == '\r' || next == '\n') {
++            if (next == '\r' || next == '\n') {
+                 cont = true;
+                 nr_cont++;
+                 continue;
+-- 
+1.6.5.GIT
+
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 211f50d37..ece55e1f7 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=php
 pkgver=5.3.20
 _suhosinver=5.3.9-0.9.10
-pkgrel=0
+pkgrel=1
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 arch="all"
@@ -11,7 +11,7 @@ license="PHP-3"
 depends="$pkgname-cgi"
 install="$pkgname.post-upgrade"
 makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev
-	curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev
+	curl-dev libpng-dev libjpeg-turbo-dev freetype-dev libmcrypt-dev mysql-dev
 	sqlite-dev libtool libltdl postgresql-dev db-dev unixodbc-dev icu-dev
 	gd-dev gmp-dev gettext-dev imap-dev aspell-dev
 	net-snmp-dev libxslt-dev openldap-dev pkgconfig
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 422ac8763..499bbf3da 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zabbix
 pkgver=2.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="http://www.zabbix.com"
 arch="all"
@@ -23,6 +23,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	zabbix_agentd.conf
 	zabbix-getloadavg.patch
 	res_send.patch
+	automake.patch
 	zabbix-server.initd
 	zabbix-agentd.initd
 	zabbix-proxy.initd
@@ -40,7 +41,8 @@ prepare() {
 			;;
 		esac
 	done
-	aclocal -I m4 && autoconf && autoheader && automake || return 1
+	aclocal -I m4 && autoconf && autoheader \
+		&& automake --add-missing || return 1
 }
 
 build() {
@@ -164,6 +166,7 @@ md5sums="1e3eca19867cadc8377895a646c78dd6  zabbix-2.0.4.tar.gz
 721c18077fa739f956340afca9f067f4  zabbix_agentd.conf
 8d1d2e53479173aac0df0c38a4d6afda  zabbix-getloadavg.patch
 b80eca2e260cc9e563f4b7a1b30bb158  res_send.patch
+5f7b1815a309d8dade4a1d15d5048742  automake.patch
 d823c2ab6c2bbdd0ebd3511fac4a83b4  zabbix-server.initd
 1a5c718bcf815fcf659e14fb0b576a1a  zabbix-agentd.initd
 a99978139481e69434f78fc3e8c53441  zabbix-proxy.initd"
diff --git a/main/zabbix/automake.patch b/main/zabbix/automake.patch
new file mode 100644
index 000000000..e310bfc86
--- /dev/null
+++ b/main/zabbix/automake.patch
@@ -0,0 +1,11 @@
+--- ./configure.in.orig	2013-01-01 12:03:46.707359730 +0000
++++ ./configure.in	2013-01-01 12:03:56.957459786 +0000
+@@ -26,7 +26,7 @@
+ 
+ AC_PROG_MAKE_SET
+ 
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADER(include/config.h)
+ 
+ AC_CANONICAL_HOST
+