Revision: 16674
http://gar.svn.sourceforge.net/gar/?rev=16674&view=rev
Author: phipsy
Date: 2012-01-04 11:06:42 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
augeas: added patch files
Added Paths:
-----------
csw/mgar/pkg/augeas/trunk/files/0002-regexp-escape.patch
csw/mgar/pkg/augeas/trunk/files/0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch
csw/mgar/pkg/augeas/trunk/files/0004-pkg-config-Augeas-requires-libxml2.patch
Added: csw/mgar/pkg/augeas/trunk/files/0002-regexp-escape.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0002-regexp-escape.patch
(rev 0)
+++ csw/mgar/pkg/augeas/trunk/files/0002-regexp-escape.patch 2012-01-04
11:06:42 UTC (rev 16674)
@@ -0,0 +1,26 @@
+From 021ea39f8e400225e2d01b4c62eb9d56404f2ecd Mon Sep 17 00:00:00 2001
+From: Michael Chapman <m...@very.puzzling.org>
+Date: Fri, 16 Dec 2011 21:30:07 +1100
+Subject: [PATCH] Add missing argument to escape()
+
+Fixes ticket #242.
+---
+ src/regexp.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+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
+--
+1.7.7.4
+
Added:
csw/mgar/pkg/augeas/trunk/files/0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch
===================================================================
---
csw/mgar/pkg/augeas/trunk/files/0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch
(rev 0)
+++
csw/mgar/pkg/augeas/trunk/files/0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch
2012-01-04 11:06:42 UTC (rev 16674)
@@ -0,0 +1,95 @@
+From 92b355588c88a09282a8a9bc255c1b24817ff64a Mon Sep 17 00:00:00 2001
+From: Dominic Cleal <dcl...@redhat.com>
+Date: Sat, 31 Dec 2011 00:10:37 +0000
+Subject: [PATCH 1/2] Remove Linux-isms so tests can run on Solaris
+
+* tests/test-augtool-modify-root.sh: /bin/sh -> /bin/bash
+* tests/test-augtool.sh: /bin/sh -> /bin/bash, use 'gsed' if available (GNU sed
+ is required)
+* tests/test-load.c: don't use GNU sed in-place extension
+* tests/test-preserve.sh: handle Solaris `ls -il` output
+
+(also include upstream d3c86096)
+---
+ tests/test-augtool-modify-root.sh | 2 +-
+ tests/test-augtool.sh | 9 ++++++---
+ tests/test-load.c | 3 ++-
+ tests/test-preserve.sh | 2 +-
+ 4 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/tests/test-augtool-modify-root.sh
b/tests/test-augtool-modify-root.sh
+index b102965..4c92c83 100755
+--- a/tests/test-augtool-modify-root.sh
++++ b/tests/test-augtool-modify-root.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+
+ # Make sure changing the value of root works
+
+diff --git a/tests/test-augtool.sh b/tests/test-augtool.sh
+index a0d11f3..88fd779 100755
+--- a/tests/test-augtool.sh
++++ b/tests/test-augtool.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+
+ TOP_DIR=$(cd $(dirname $0)/.. && pwd)
+ TOP_BUILDDIR="$abs_top_builddir"
+@@ -13,6 +13,9 @@ export PATH="$TOP_BUILDDIR/src:${PATH}"
+ export AUGEAS_ROOT="$TOP_BUILDDIR/build/test-augtool"
+ export AUGEAS_LENS_LIB="$TOP_SRCDIR/lenses"
+
++GSED=sed
++type gsed >/dev/null 2>&1 && GSED=gsed
++
+ fail() {
+ [ -z "$failed" ] && echo FAIL
+ failed=yes
+@@ -67,13 +70,13 @@ quit"
+ fail "Expected file $file.augnew"
+ else
+ act=$(diff -u "$abs_file" "${abs_file}.augnew" \
+- | sed -r -e "s/^ $//;s!^(---|\+\+\+)
${AUGEAS_ROOT}($file(\.augnew)?)(.*)\$!\1 \2!;s/\\t/\\\\t/g")
++ | $GSED -r -e "s/^ $//;s!^(---|\+\+\+)
${AUGEAS_ROOT}($file(\.augnew)?)(.*)\$!\1 \2!;s/\\t/\\\\t/g")
+
+ if [ "$act" != "$diff" ] ; then
+ fail "$act"
+ fi
+ fi
+- other_files=$(find "$AUGEAS_ROOT" -name \*.augnew -not -path
"$abs_file.augnew")
++ other_files=$(find "$AUGEAS_ROOT" -name \*.augnew | grep -v
"$abs_file.augnew")
+ [ -n "$other_files" ] && fail "Unexpected file(s) $other_files"
+ [ -z "$failed" ] && echo OK
+ done
+diff --git a/tests/test-load.c b/tests/test-load.c
+index b1018e1..f3c7cda 100644
+--- a/tests/test-load.c
++++ b/tests/test-load.c
+@@ -437,7 +437,8 @@ static void testReloadExternalMod(CuTest *tc) {
+ r = aug_get(aug, "/augeas/root", &aug_root);
+ CuAssertIntEquals(tc, 1, r);
+
+- run(tc, "sed -i -e '1,2d' %setc/hosts", aug_root);
++ run(tc, "sed -e '1,2d' %setc/hosts > %setc/hosts.new", aug_root,
aug_root);
++ run(tc, "mv %setc/hosts.new %setc/hosts", aug_root, aug_root);
+
+ /* Reload and save again */
+ r = aug_load(aug);
+diff --git a/tests/test-preserve.sh b/tests/test-preserve.sh
+index daafea3..042dab9 100755
+--- a/tests/test-preserve.sh
++++ b/tests/test-preserve.sh
+@@ -13,7 +13,7 @@ mkdir -p $(dirname $hosts)
+ }
+
+ stat_inode() {
+-ls -il $1 | cut -d ' ' -f 1
++ls -il $1 | awk '{ print $1 }'
+ }
+
+ AUGTOOL="augtool --nostdinc -r $root -I $abs_top_srcdir/lenses"
+--
+1.7.7.4
+
Added:
csw/mgar/pkg/augeas/trunk/files/0004-pkg-config-Augeas-requires-libxml2.patch
===================================================================
---
csw/mgar/pkg/augeas/trunk/files/0004-pkg-config-Augeas-requires-libxml2.patch
(rev 0)
+++
csw/mgar/pkg/augeas/trunk/files/0004-pkg-config-Augeas-requires-libxml2.patch
2012-01-04 11:06:42 UTC (rev 16674)
@@ -0,0 +1,24 @@
+From 11b00ad49301ae6e246eae3e5ee64a80e2084a43 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjo...@redhat.com>
+Date: Sat, 3 Dec 2011 14:21:50 +0000
+Subject: [PATCH] pkg-config: Augeas requires libxml2.
+
+---
+ augeas.pc.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/augeas.pc.in b/augeas.pc.in
+index c97847d..9e166db 100644
+--- a/augeas.pc.in
++++ b/augeas.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: augeas
+ Version: @VERSION@
+ Description: Augeas configuration editing library
+-Requires:
++Requires.private: libxml-2.0
+ Libs: -L${libdir} -laugeas @LIBS@
+ Cflags: -I${includedir}
+--
+1.7.7.4
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
