[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.13-1-7-gcf9666c

[Guido Günther]

The following commit has been merged in the experimental branch:
commit cf9666cf700d90d570ab8a1061d19ff7bb3cd719
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Aug 29 08:01:06 2012 +0200

    Dropped Don-t-require-gawk-for-a-simple-print-expression.patch
    
    applied upstream.

diff --git a/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch b/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
deleted file mode 100644
index d31940c..0000000
--- a/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 9 Aug 2011 14:59:01 +0200
-Subject: Don't require gawk for a simple print expression
-
-Closes: #636712
-Thanks: Luca Capello
-
-
-
-
----
- src/nwfilter/nwfilter_ebiptables_driver.c |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
-index 11fd04c..ad1d055 100644
---- a/src/nwfilter/nwfilter_ebiptables_driver.c
-+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
-@@ -84,7 +84,7 @@ static char *ebtables_cmd_path;
- static char *iptables_cmd_path;
- static char *ip6tables_cmd_path;
- static char *grep_cmd_path;
--static char *gawk_cmd_path;
-+static char *awk_cmd_path;
- 
- #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \
-     snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname)
-@@ -586,7 +586,7 @@ static int iptablesLinkIPTablesBaseChain(virBufferPtr buf,
-                       grep_cmd_path, udchain,
- 
-                       syschain, pos, udchain,
--                      gawk_cmd_path,
-+                      awk_cmd_path,
- 
-                       pos,
- 
-@@ -4288,7 +4288,7 @@ ebiptablesDriverInit(bool privileged)
-     if (virMutexInit(&execCLIMutex) < 0)
-         return -EINVAL;
- 
--    gawk_cmd_path = virFindFileInPath("gawk");
-+    awk_cmd_path = virFindFileInPath("awk");
-     grep_cmd_path = virFindFileInPath("grep");
- 
-     /*
-@@ -4302,9 +4302,9 @@ ebiptablesDriverInit(bool privileged)
-     /* make sure tools are available and work */
-     ebiptablesDriverTestCLITools();
- 
--    /* ip(6)tables support needs gawk & grep, ebtables doesn't */
-+    /* ip(6)tables support needs awk & grep, ebtables doesn't */
-     if ((iptables_cmd_path != NULL || ip6tables_cmd_path != NULL) &&
--        (!grep_cmd_path || !gawk_cmd_path)) {
-+        (!grep_cmd_path || !awk_cmd_path)) {
-         VIR_ERROR(_("essential tools to support ip(6)tables "
-                   "firewalls could not be located"));
-         VIR_FREE(iptables_cmd_path);
-@@ -4326,7 +4326,7 @@ ebiptablesDriverInit(bool privileged)
- static void
- ebiptablesDriverShutdown(void)
- {
--    VIR_FREE(gawk_cmd_path);
-+    VIR_FREE(awk_cmd_path);
-     VIR_FREE(grep_cmd_path);
-     VIR_FREE(ebtables_cmd_path);
-     VIR_FREE(iptables_cmd_path);
diff --git a/debian/patches/series b/debian/patches/series
index 875c15b..22a535b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ debian/Don-t-enable-default-network-on-boot.patch
 debian/Allow-libvirt-group-to-access-the-socket.patch
 debian/fix-Debian-specific-path-to-hvm-loader.patch
 debian/Debianize-libvirt-guests.patch
-debian/Don-t-require-gawk-for-a-simple-print-expression.patch
 patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch

-- 
Libvirt Debian packaging