Merge ~paelzer/ubuntu/+source/strongswan:lp1753018-remerge-bionic into ubuntu/+source/strongswan:debian/sid

Ran the QA Tests
name base - 4/4 ok
ip based - 4/4 ok

Test build is in PPA https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3199

For more details on the reasoning see https://bugs.launchpad.net/ubuntu/+source/strongswan/+bug/1753018

IMHO it is not a FFE case, as all new things are either bugfixes or default off and minor (the bypass plugin).

Taking a look.

First, could you please push the tags? :)

I hit an upgrade error:
The following packages will be upgraded:
  libcharon-extra-plugins libcharon-standard-plugins libgdk-pixbuf2.0-0 libgdk-pixbuf2.0-bin libgdk-pixbuf2.0-common libstrongswan libstrongswan-extra-plugins libstrongswan-standard-plugins strongswan
  strongswan-charon strongswan-libcharon strongswan-nm strongswan-starter strongswan-tnc-base strongswan-tnc-client strongswan-tnc-pdp strongswan-tnc-server
17 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
Need to get 1.795 kB of archives.
After this operation, 57,3 kB of additional disk space will be used.
Get:1 http://br.archive.ubuntu.com/ubuntu bionic/main amd64 libgdk-pixbuf2.0-0 amd64 2.36.11-1ubuntu0.1 [165 kB]
Get:2 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 libcharon-standard-plugins amd64 5.6.2-1ubuntu1 [22,1 kB]
Get:3 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 strongswan-tnc-client amd64 5.6.2-1ubuntu1 [34,9 kB]
Get:4 http://br.archive.ubuntu.com/ubuntu bionic/main amd64 libgdk-pixbuf2.0-common all 2.36.11-1ubuntu0.1 [4.488 B]
Get:5 http://br.archive.ubuntu.com/ubuntu bionic/main amd64 libgdk-pixbuf2.0-bin amd64 2.36.11-1ubuntu0.1 [7.802 B]
Get:6 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 strongswan-tnc-pdp amd64 5.6.2-1ubuntu1 [20,0 kB]
Get:7 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 strongswan-tnc-server amd64 5.6.2-1ubuntu1 [71,3 kB]
Get:8 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 strongswan-tnc-base amd64 5.6.2-1ubuntu1 [131 kB]
Get:9 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 strongswan-libcharon amd64 5.6.2-1ubuntu1 [228 kB]
Get:10 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 strongswan-starter amd64 5.6.2-1ubuntu1 [167 kB]
Get:11 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 strongswan-charon amd64 5.6.2-1ubuntu1 [21,9 kB]
Get:12 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 libstrongswan-standard-plugins amd64 5.6.2-1ubuntu1 [62,7 kB]
Get:13 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 libstrongswan amd64 5.6.2-1ubuntu1 [349 kB]
Get:14 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 libstrongswan-extra-plugins amd64 5.6.2-1ubuntu1 [268 kB]
Get:15 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bionic/main amd64 libcharon-extra-plugins amd64 5.6.2-1ubuntu1 [201 kB]
Get:16 http://ppa.launchpad.net/ci-train-ppa-service/3199/ubuntu bion...

The rest is ok:
- strongswan-nm is now linked with libnm instead of libnm-glib. Build-deps adjusted accordingly. This is potentially a bigger code change, but if the -glib backend was deprecated already, it's good to start fresh in a new LTS. I would just keep an eye open for new bugs about this change upstream
- save-keys plugin is disabled by default
- bypass-lan plugin is built, but disabled by default in the config via a debian patch

Thanks for the check, the tags to some extend didn't create due to known issues in git ubuntu.
I those that failed manually now and push them ...

The upgrade issue is a good catch.
Debian moved that and we need to bump the breaks/replaces to match our versions.
Fir is easy, I'm testing it and will push once confirmed.

$ git push --dry-run paelzer lp1753018/deconstruct/5.6.1-2ubuntu4 lp1753018/logical/5.6.1-2ubuntu4 lp1753018/new/debian lp1753018/old/debian lp1753018/old/ubuntu lp1753018/reconstruct/5.6.1-2ubuntu4
To ssh://<email address hidden>/~paelzer/ubuntu/+source/strongswan
 * [new tag] lp1753018/deconstruct/5.6.1-2ubuntu4 -> lp1753018/deconstruct/5.6.1-2ubuntu4
 * [new tag] lp1753018/logical/5.6.1-2ubuntu4 -> lp1753018/logical/5.6.1-2ubuntu4
 * [new tag] lp1753018/new/debian -> lp1753018/new/debian
 * [new tag] lp1753018/old/debian -> lp1753018/old/debian
 * [new tag] lp1753018/old/ubuntu -> lp1753018/old/ubuntu
 * [new tag] lp1753018/reconstruct/5.6.1-2ubuntu4 -> lp1753018/reconstruct/5.6.1-2ubuntu4

Ok, the new ppa build 5.6.2-1ubuntu2~ppa1 worked and there were no other similar collisions on the upgrade.

That said please re-review for final ack please.

+1

Thanks for the review,
tag pushed and package uploaded.

FYI - we both overlooked that
  strongswan-starter (<= 5.6.2-1ubuntu1)
is actually wrong.

It worked fine in the ppa test because the ppa was on 5.6.2-1ubuntu2~ppa1 at the time.
Never the less correct is:
  strongswan-starter (<= 5.6.2-1ubuntu1~)

Fixing as a follow on.