From de21ac3d42029a595f8fa3d809c930e9a8a09ca0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 19 Dec 2011 07:40:01 +0000
Subject: main/augeas: upgrade to 0.10.0

---
 main/augeas/APKBUILD       | 16 +++++++++++-----
 main/augeas/regexp.c.patch | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 main/augeas/regexp.c.patch

(limited to 'main/augeas')

diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index de3cceda1..39b481211 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -1,21 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=augeas
-pkgver=0.9.0
+pkgver=0.10.0
 pkgrel=0
 pkgdesc="a configuration editing tool"
 url="http://augeas.net"
 arch="all"
 license="LGPL"
 depends=
-makedepends="readline-dev"
+makedepends="readline-dev libxml2-dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tests"
-source="http://augeas.net/download/augeas-$pkgver.tar.gz"
+source="http://augeas.net/download/augeas-$pkgver.tar.gz
+	regexp.c.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
-	# apply patches here
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 }
 
 build() {
@@ -39,4 +44,5 @@ tests() {
 	mv "$pkgdir"/usr/share/augeas/lenses/dist/tests \
 		"$subpkgdir"/usr/share/augeas/lenses/dist/
 }
-md5sums="5ef0ce53ce4c75f59ab2523506731084  augeas-0.9.0.tar.gz"
+md5sums="fe1834e90a066c3208ac0214622c7352  augeas-0.10.0.tar.gz
+a9f0fe2cd7e6aebf916747207cc2b537  regexp.c.patch"
diff --git a/main/augeas/regexp.c.patch b/main/augeas/regexp.c.patch
new file mode 100644
index 000000000..87ba795ba
--- /dev/null
+++ b/main/augeas/regexp.c.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.fedorahosted.org/git?p=augeas.git;a=blobdiff_plain;f=src%2Fregexp.c;h=811087d8f2de1d7adc80b4d9308dc7c9f3827c99;hp=cf0ea5d37e21bed27295bd788fc474ba900a910d;hb=021ea39f8e400225e2d01b4c62eb9d56404f2ecd;hpb=1d5b19760d4d92153a8eb9279bf9709b7ead20c7
+
+diff --git a/src/regexp.c b/src/regexp.c
+index cf0ea5d..811087d 100644
+--- a/src/regexp.c
++++ b/src/regexp.c
+@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) {
+     ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
+                                &nre, &nre_len, 2, 1);
+     if (ret == 0) {
+-        pat = escape(nre, nre_len);
++        pat = escape(nre, nre_len, RX_ESCAPES);
+         free(nre);
+     }
+ #endif
-- 
cgit v1.2.3