From f617d8bc4650d0c6fe6130e38ff5a361228f7bfc Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: Apr 14 2010 09:07:34 +0000
Subject: - Backport the new API aug_clear from upstream development branch.


---

diff --git a/libguestfs-1.2.2-aug-clear.patch b/libguestfs-1.2.2-aug-clear.patch
new file mode 100644
index 0000000..7b0094d
--- /dev/null
+++ b/libguestfs-1.2.2-aug-clear.patch
@@ -0,0 +1,70 @@
+Backport of the guestfs_aug_clear API from upstream development branch
+(commit 66477d07e37ffe66c).
+
+diff -ur libguestfs-1.2.2.orig/daemon/augeas.c libguestfs-1.2.2/daemon/augeas.c
+--- libguestfs-1.2.2.orig/daemon/augeas.c	2010-04-12 19:03:41.000000000 +0100
++++ libguestfs-1.2.2/daemon/augeas.c	2010-04-14 10:03:10.307680521 +0100
+@@ -210,6 +210,26 @@
+ }
+ 
+ int
++do_aug_clear (const char *path)
++{
++#ifdef HAVE_AUGEAS
++  int r;
++
++  NEED_AUG (-1);
++
++  r = aug_set (aug, path, NULL);
++  if (r == -1) {
++    reply_with_error ("Augeas clear failed");
++    return -1;
++  }
++
++  return 0;
++#else
++  NOT_AVAILABLE (-1);
++#endif
++}
++
++int
+ do_aug_insert (const char *path, const char *label, int before)
+ {
+ #ifdef HAVE_AUGEAS
+diff -ur libguestfs-1.2.2.orig/src/generator.ml libguestfs-1.2.2/src/generator.ml
+--- libguestfs-1.2.2.orig/src/generator.ml	2010-04-12 19:05:28.000000000 +0100
++++ libguestfs-1.2.2/src/generator.ml	2010-04-14 10:03:10.312679892 +0100
+@@ -1238,7 +1238,12 @@
+    [], (* XXX Augeas code needs tests. *)
+    "set Augeas path to value",
+    "\
+-Set the value associated with C<path> to C<value>.");
++Set the value associated with C<path> to C<val>.
++
++In the Augeas API, it is possible to clear a node by setting
++the value to NULL.  Due to an oversight in the libguestfs API
++you cannot do that with this call.  Instead you must use the
++C<guestfs_aug_clear> call.");
+ 
+   ("aug_insert", (RErr, [String "augpath"; String "label"; Bool "before"]), 21, [Optional "augeas"],
+    [], (* XXX Augeas code needs tests. *)
+@@ -4400,6 +4405,13 @@
+ You will get undefined results for other partition table
+ types (see C<guestfs_part_get_parttype>).");
+ 
++  ("aug_clear", (RErr, [String "augpath"]), 239, [Optional "augeas"],
++   [], (* XXX Augeas code needs tests. *)
++   "clear Augeas path",
++   "\
++Set the value associated with C<path> to C<NULL>.  This
++is the same as the L<augtool(1)> C<clear> command.");
++
+ ]
+ 
+ let all_functions = non_daemon_functions @ daemon_functions
+diff -ur libguestfs-1.2.2.orig/src/MAX_PROC_NR libguestfs-1.2.2/src/MAX_PROC_NR
+--- libguestfs-1.2.2.orig/src/MAX_PROC_NR	2010-04-12 19:06:21.000000000 +0100
++++ libguestfs-1.2.2/src/MAX_PROC_NR	2010-04-14 10:03:43.885055262 +0100
+@@ -1 +1 @@
+-236
++239
diff --git a/libguestfs.spec b/libguestfs.spec
index ed4310a..e2ed5c5 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -42,7 +42,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.2.2
-Release:       1%{?dist}.3
+Release:       1%{?dist}.4
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -56,6 +56,9 @@ ExclusiveArch: %{ix86} x86_64
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
+# Backport the new API aug_clear from upstream development branch.
+Patch1:        libguestfs-1.2.2-aug-clear.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -390,6 +393,7 @@ Requires:      jpackage-utils
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -690,6 +694,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 14 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.2.2-1.el5.4
+- Backport the new API aug_clear from upstream development branch.
+
 * Tue Apr 13 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.2.2-1.el5.3
 - Disable KVM again (see rel-eng ticket 2982).
 - Disable part-get-bootable test, fails with old version of parted.