please sync or merge 6.32-1

[Christian Ehrhardt ]

Debian took our Delta in a slightly modified way but ok to sync.
Will allow to pick up two minor revisions.

[Christian Ehrhardt  (paelzer)]

The only diff that is "missing" to be accepted in Debian is the disabling of debian/patches/adjust-test-scripts-for-debian.patch

That was meant for ", our kernel is new enough" as the patch itself is for: "The test failed in Debian due to the lack of some features that are not included in the current Debian Linux kernel."

[Christian Ehrhardt  (paelzer)]

I'm not sure as the old delta did not explain how important this sub-piece was.
It seems to only modify a small subset of tests - if they are not failing as-is I'd think we could and should sync.

[Christian Ehrhardt  (paelzer)]

Here is a log how a sync would test [1]:

It would still fail with the same issues which is sad.
So the Delta is still needed :-/

The reason Debian is snot stumbling over that is not only that the debci is not (yet) blocking.
In all I checked in [2] the tests skipped for:
"regression SKIP Test requires machine-level isolation but testbed does not provide that"

That said not syncable right now as I hoped.
Not big enough for a merge to be important.

I also checked if still just "dropping" the patch would continue to make it working, results in [3] - but that failed as well. It seems a full update to how it currently executes is needed.

Checking if Debian has a bug for the Delta - there is none.
But it isn't as easy as to ask them to disable.
Since even then there are issues this needs to be handled in more detail.

Subscribing ubuntu-server but low prio for now.
Steps:
1. full repro on Debian system
2. adapt patch to match there on a real execution of the dep8
3. check if it would then work on Ubuntu as well
4. submit to Debian
5. make a sync after that is accepted

[1]: http://paste.ubuntu.com/25288824/
[2]: https://ci.debian.net/packages/i/ipset/unstable/amd64/
[3]: http://paste.ubuntu.com/25288980/

[Andreas Hasenack (ahasenack)]

Bionic is at 6.34-1, and a sync. The test patch is this:
Description: Adjust test scripts for Debian
 The test failed in Debian due to the lack of some features that are not
 included in the current Debian Linux kernel.
Author: Neutron Soutmun <email address hidden>
Forwarded: not-needed
Last-Update: 2017-05-30

Index: ipset/tests/hash:net.t
===================================================================
--- ipset.orig/tests/hash:net.t
+++ ipset/tests/hash:net.t
@@ -120,16 +120,6 @@
 0 ./resizet.sh -4 net
 # Nomatch: Check that resizing keeps the nomatch flag
 0 ./resizen.sh -4 net
-# Create set without timeout support
-0 ipset n test hash:net
-# Add more than 2^31 elements in a range
-0 ipset a test 0.0.0.0-128.0.0.1
-# List set
-0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0
-# Check listing
-0 diff -u -I 'Size in memory.*' .foo hash:net.t.list3
-# Delete test set
-0 ipset destroy test
 # Counters: create set
 0 ipset n test hash:net counters
 # Counters: add element with packet, byte counters

I'm not sure if we can close this bug, or if the sync was premature.

[Christian Ehrhardt  (paelzer)]

Yeah this is a sync now, thanks for spotting - setting fix released.