Package: ipset
Version: 6.30-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* debian/tests/control: Add missing kmod and netbase test dependencies,
and remove the completely unnecessary test dependency on autopkgtest.
* Drop adjust-test-scripts-for-debian.patch, our kernel is new enough.
* debian/patches/test-installed.patch: Broken out from the above patch.
Obviously, in the above, you can't drop the adjust-test-scripts-for-debian.patch
until Debian's kernels are new enough, but I also broke out "test-installed" as
a new patch, since that bit is required even after the kernel-related bits can
be dropped.
As for the altered test dependencies, I would expect them to be
self-explanatory.
... Adam
-- System Information:
Debian Release: stretch/sid
APT prefers zesty
APT policy: (500, 'zesty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.10.0-15-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru ipset-6.30/debian/patches/adjust-test-scripts-for-debian.patch
ipset-6.30/debian/patches/adjust-test-scripts-for-debian.patch
--- ipset-6.30/debian/patches/adjust-test-scripts-for-debian.patch
2016-11-29 19:05:14.000000000 -0700
+++ ipset-6.30/debian/patches/adjust-test-scripts-for-debian.patch
2017-04-04 06:25:34.000000000 -0600
@@ -128,19 +128,6 @@
test $n -eq $x || exit 1
done
$ipset x test
-Index: ipset/tests/cidr.sh
-===================================================================
---- ipset.orig/tests/cidr.sh
-+++ ipset/tests/cidr.sh
-@@ -35,7 +35,7 @@ NETS="0.0.0.0/1
- 255.255.255.252/31
- 255.255.255.254/32"
-
--ipset="../src/ipset"
-+ipset=${IPSET_BIN:-../src/ipset}
-
- case "$1" in
- net)
Index: ipset/tests/comment.t.list0
===================================================================
--- ipset.orig/tests/comment.t.list0
diff -Nru ipset-6.30/debian/patches/series ipset-6.30/debian/patches/series
--- ipset-6.30/debian/patches/series 2016-11-29 19:05:14.000000000 -0700
+++ ipset-6.30/debian/patches/series 2017-04-04 06:25:34.000000000 -0600
@@ -1,2 +1,3 @@
-adjust-test-scripts-for-debian.patch
+#adjust-test-scripts-for-debian.patch
05-delay-the-set-with-timeout-resizing-test.patch
+test-installed.patch
diff -Nru ipset-6.30/debian/patches/test-installed.patch
ipset-6.30/debian/patches/test-installed.patch
--- ipset-6.30/debian/patches/test-installed.patch 1969-12-31
17:00:00.000000000 -0700
+++ ipset-6.30/debian/patches/test-installed.patch 2017-04-04
06:25:34.000000000 -0600
@@ -0,0 +1,14 @@
+Index: ipset/tests/cidr.sh
+===================================================================
+--- ipset.orig/tests/cidr.sh
++++ ipset/tests/cidr.sh
+@@ -35,7 +35,7 @@ NETS="0.0.0.0/1
+ 255.255.255.252/31
+ 255.255.255.254/32"
+
+-ipset="../src/ipset"
++ipset=${IPSET_BIN:-../src/ipset}
+
+ case "$1" in
+ net)
+
diff -Nru ipset-6.30/debian/tests/control ipset-6.30/debian/tests/control
--- ipset-6.30/debian/tests/control 2016-11-29 19:05:14.000000000 -0700
+++ ipset-6.30/debian/tests/control 2017-04-04 06:25:34.000000000 -0600
@@ -1,6 +1,7 @@
Tests: regression
Depends: @,
- autopkgtest,
netmask,
sendip,
+ kmod,
+ netbase,
Restrictions: needs-root isolation-machine allow-stderr
