Merge ~danilogondolfo/ubuntu/+source/libcap2:merge-lp2020460-mantic into ubuntu/+source/libcap2:debian/sid

[Danilo Egea Gondolfo]

[William Wilson (jawn-smith)]

review: Approve

Unmerged commits

c3cf10f... by Danilo Egea Gondolfo on 2023-05-23

changelog

ba53d51... by Danilo Egea Gondolfo on 2023-05-23

update-maintainer

99a42d7... by Danilo Egea Gondolfo on 2023-05-23

reconstruct-changelog

0998c20... by Danilo Egea Gondolfo on 2023-05-23

merge-changelogs

cf005bd... by Danilo Egea Gondolfo on 2023-05-23

* d/t/upstream-root: Skip "uns_test" to fix autopkgtests on armhf.
  It's failing on armhf due to the version of the kernel we use in our
  infrastructure for for this architecture. Once we upgrade our hosts,
  this patch can be dropped. See LP: #2003892.

c3f1303... by Danilo Egea Gondolfo on 2023-01-25

Strip -Wl,-Bsymbolic-functions from LDFLAGS (LP: #2003892)

diff --git a/debian/changelog b/debian/changelog
index cb547f0..466cacf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libcap2 (1:2.66-4ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Strip -Wl,-Bsymbolic-functions from LDFLAGS (LP: #2003892)
+    - d/t/upstream-root: Skip "uns_test" to fix autopkgtests on armhf.
+      It's failing on armhf due to the version of the kernel we use in our
+      infrastructure for for this architecture. Once we upgrade our hosts,
+      this patch can be dropped. See LP: #2003892.
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Tue, 23 May 2023 11:11:27 +0100
+
 libcap2 (1:2.66-4) unstable; urgency=medium
 
   * Apply upstream patches for CVE-2023-2602, CVE-2023-2603
@@ -5,6 +16,21 @@ libcap2 (1:2.66-4) unstable; urgency=medium
 
  -- Christian Kastner <[e-mail]>  Mon, 15 May 2023 20:34:57 +0200
 
+libcap2 (1:2.66-3ubuntu2) lunar; urgency=medium
+
+  * Skip the test uns_test to fix autopkgtest on armhf.
+    It's failing on armhf because we are using an older kernel in the armhf
+    builders. This test succeeds on newer versions. Once we upgrade our
+    hosts this patch can be dropped. See LP#2003892
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Fri, 03 Feb 2023 11:18:40 +0000
+
+libcap2 (1:2.66-3ubuntu1) lunar; urgency=medium
+
+  * Strip -Wl,-Bsymbolic-functions from LDFLAGS (LP: #2003892)
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Wed, 25 Jan 2023 18:07:03 +0000
+
 libcap2 (1:2.66-3) unstable; urgency=medium
 
   * Add gcc to autopkgtest for upstream tests.
diff --git a/debian/control b/debian/control
index 148ce39..d6de799 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libcap2
 Section: libs
 Priority: optional
-Maintainer: Christian Kastner <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Christian Kastner <[e-mail]>
 Build-Depends: chrpath,
                debhelper-compat (= 13),
                gperf (>= 3.1),
diff --git a/debian/rules b/debian/rules
index 0e05d4f..0848a7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,9 @@ SHLIBS_MINVER = 1:2.63
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+# Removing the linker flag. It causes problems with libcap2, see LP#2003892
+export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
+
 # Support cross-compiling
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 CC := $(DEB_HOST_GNU_TYPE)-gcc
diff --git a/debian/tests/upstream-root b/debian/tests/upstream-root
index b5634dc..9fb7703 100755
--- a/debian/tests/upstream-root
+++ b/debian/tests/upstream-root
@@ -25,7 +25,9 @@ cd "$AUTOPKGTEST_TMP"
 
 echo "## libcap2 tests ##"
 # From <src>/tests/Makefile
-echo exit | "$TESTDIR"/uns_test
+# Skip uns_test on armhf. It will fail because we currently run armhf tests
+# in hosts with an older kernel (5.4). See LP#2003892
+dpkg-architecture -e armhf || echo exit | "$TESTDIR"/uns_test
 ./libcap_launch_test
 ./exploit || echo "exploit failed"
 ./noexploit