Merge ~ahasenack/ubuntu/+source/zeromq3:eoan-zeromq3-merge into ubuntu/+source/zeromq3:debian/sid

[Andreas Hasenack]

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/zeromq3-merge
sudo add-apt-repository ppa:ahasenack/zeromq3-merge -y

There are no DEP8 tests for this package.

Merge from debian. Some notes:
- I collapsed our delta, since 4.3.1-3ubuntu2 reverted the symbols change from 4.3.1-3ubuntu1. Only the patch validate-group-before-using.patch remains
- that patch was merged upstream, so I updated its DEP3 header to reflect that. Debian should pick it up the next time upstream releases, and then this package can become a sync
- we are also affected by this debian bug, so this merge is beneficial to us:
  * Fix GSSAPI support build (closes: #925914).
- and this fixes a security issue that our security team has already SRUed:
  * Fix CVE-2019-13132: application metadata not parsed correctly when using
    CURVE.

[Christian Ehrhardt  (paelzer)]

Taking this review as part of my inbox cleanup ....

[Christian Ehrhardt  (paelzer)]

- found all the tags
- ack to only "validate-group-before-using.patch" is remaining
- ack on Debians GSSAPI+CVE fixes
- ack to header update
- the build in the PPA LGTM
- all self tests passed or skipped
- no rebuild of dependencies needed for this upload
- tested with some examples from http://zguide.zeromq.org/php:all

All working fine +1 on this MP

review: Approve

[Christian Ehrhardt  (paelzer)]

The merge target should be d/sid but that wasn't important for the review since I check things out anyway (but it breaks the LP view).

[Andreas Hasenack (ahasenack)]

Oopsie on the merge target... Thanks for the +1, I'll resubmit to the right target before tagging and uploading.

[Andreas Hasenack (ahasenack)]

Tagged and uploaded:
$ git push pkg upload/4.3.1-5ubuntu1
Enumerating objects: 25, done.
Counting objects: 100% (25/25), done.
Delta compression using up to 2 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (19/19), 3.11 KiB | 636.00 KiB/s, done.
Total 19 (delta 13), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/zeromq3
 * [new tag] upload/4.3.1-5ubuntu1 -> upload/4.3.1-5ubuntu1

$ dput ubuntu ../zeromq3_4.3.1-5ubuntu1_source.changes
Checking signature on .changes
gpg: ../zeromq3_4.3.1-5ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../zeromq3_4.3.1-5ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading zeromq3_4.3.1-5ubuntu1.dsc: done.
  Uploading zeromq3_4.3.1.orig.tar.gz: done.
  Uploading zeromq3_4.3.1-5ubuntu1.debian.tar.xz: done.
  Uploading zeromq3_4.3.1-5ubuntu1_source.buildinfo: hdone.
  Uploading zeromq3_4.3.1-5ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated finally.

diff --git a/debian/changelog b/debian/changelog
index 7aa9248..8ed6210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+zeromq3 (4.3.1-5ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/validate-group-before-using.patch: validate the supplementary
+      group used in the filter_ipc test before using it. (LP #1820282)
+      [Updated DEP3 header with Applied-Upstream information]
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 10 Jul 2019 10:13:50 -0300
+
 zeromq3 (4.3.1-5) unstable; urgency=high
 
   [ Luca Boccassi <[e-mail]> ]
@@ -13,6 +22,22 @@ zeromq3 (4.3.1-4) unstable; urgency=medium
 
  -- Laszlo Boszormenyi (GCS) <[e-mail]>  Thu, 28 Mar 2019 16:37:09 +0000
 
+zeromq3 (4.3.1-3ubuntu2) disco; urgency=medium
+
+  * d/libzmq5.symbols: revert previous symbols update, as that came from a
+    draft API that was mistakenly enabled in a local build when a .git
+    directory was detected. 
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 19 Mar 2019 17:01:01 +0000
+
+zeromq3 (4.3.1-3ubuntu1) disco; urgency=medium
+
+  * d/libzmq5.symbols: updated symbols
+  * d/p/validate-group-before-using.patch: validate the supplementary
+    group used in the filter_ipc test before using it. (LP: #1820282)
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 18 Mar 2019 16:36:40 +0000
+
 zeromq3 (4.3.1-3) unstable; urgency=medium
 
   [ Luca Boccassi <[e-mail]> ]
diff --git a/debian/control b/debian/control
index 1647021..6b35a84 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: zeromq3
 Section: libs
 Priority: optional
-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
 Build-Depends: debhelper (>= 11),
  libpgm-dev (>= 5.2.122~dfsg),
  libsodium-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 2bbccff..8906cf8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ ppc64_atomic_intrinsics.patch
 test_pair_ipc_hurd.patch
 gssapi_pkgconfig.patch
 CVE-2019-13132.patch
+validate-group-before-using.patch
diff --git a/debian/patches/validate-group-before-using.patch b/debian/patches/validate-group-before-using.patch
new file mode 100644
index 0000000..09330ec
--- /dev/null
+++ b/debian/patches/validate-group-before-using.patch
@@ -0,0 +1,42 @@
+Description: validate the group before using it
+ This makes the test a bit more robust in scenarios where, probably due
+ to a misconfiguration in the environment, a group present in the list
+ of supplementary groups is not really a valid choice. This was seen in
+ the Launchpad builders (see #1820348), and possibly elsewhere (see
+ https://github.com/habitat-sh/core-plans/blob/master/zeromq/plan.sh#L22-L25)
+Author: Andreas Hasenack <[e-mail]>
+Bug: https://github.com/zeromq/libzmq/issues/1462
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/zeromq3/+bug/1820282
+Forwarded: https://github.com/zeromq/libzmq/pull/3453
+Applied-Upstream: https://github.com/zeromq/libzmq/commit/168aa83d089425d4be5a34911c37c6f58eed2b9b
+Last-Update: 2019-07-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/test_filter_ipc.cpp
++++ b/tests/test_filter_ipc.cpp
+@@ -122,8 +122,10 @@
+     supgroup = group;
+     notgroup = group + 1;
+     for (int i = 0; i < ngroups; i++) {
+-        if (supgroup == group && group != groups[i])
+-            supgroup = groups[i];
++        if (supgroup == group && group != groups[i]) {
++            if (getgrgid (groups[i]))
++                supgroup = groups[i];
++        }
+         if (notgroup <= groups[i])
+             notgroup = groups[i] + 1;
+     }
+--- a/tests/testutil.hpp
++++ b/tests/testutil.hpp
+@@ -76,8 +76,10 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <stdlib.h>
++#include <grp.h>
+ #include <sys/wait.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>