Version dependency on iptables

and drop Disable-CHECKSUM-rule.patch

Closes: #627595

diff --git a/debian/control b/debian/control
index 9a9a902..6aaa2bf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -44,8 +44,16 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (= ${binary:Version}), logrotate, gettext-base
 Enhances: qemu, qemu-kvm, xen
 Section: admin
-Recommends: netcat-openbsd, bridge-utils, dnsmasq-base (>= 2.46-1), iptables, qemu-kvm | qemu (>= 0.9.1),
- libxml2-utils, iptables, gawk, ebtables, dmidecode, iproute
+Recommends: netcat-openbsd,
+ bridge-utils,
+ dnsmasq-base (>= 2.46-1),
+ iptables (>= 1.4.10),
+ qemu-kvm | qemu (>= 0.9.1),
+ libxml2-utils,
+ gawk,
+ ebtables,
+ dmidecode,
+ iproute
 Suggests: policykit-1
 Description: the programs for the libvirt library
  Libvirt is a C toolkit to interact with the virtualization capabilities

diff --git a/debian/patches/Disable-CHECKSUM-rule.patch b/debian/patches/Disable-CHECKSUM-rule.patch
deleted file mode 100644 (file)
index 509e582..0000000
--- a/debian/patches/Disable-CHECKSUM-rule.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Wed, 6 Oct 2010 18:37:20 +0200
-Subject: Disable CHECKSUM rule
-
-not supported by Squeeze's iptables
-
-Closes: #598330
----
- src/util/iptables.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/util/iptables.c b/src/util/iptables.c
-index 76d412c..8b22fc8 100644
---- a/src/util/iptables.c
-+++ b/src/util/iptables.c
-@@ -870,6 +870,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
-                              int port,
-                              int action)
- {
-+#if 0
-     char portstr[32];
- 
-     snprintf(portstr, sizeof(portstr), "%d", port);
-@@ -883,6 +884,9 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
-                                  "--destination-port", portstr,
-                                  "--jump", "CHECKSUM", "--checksum-fill",
-                                  NULL);
-+#else
-+    return 0;
-+#endif
- }
- 
- /**
--- 

diff --git a/debian/patches/series b/debian/patches/series
index a06759e..442536b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ allow-libvirt-group-to-access-the-socket.patch
 fix-Debian-specific-path-to-hvm-loader.patch
 Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
 patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
-Disable-CHECKSUM-rule.patch
 Debianize-libvirt-guests.patch
 virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-daemon-start-test.patch