Merge ~athos-ribeiro/ubuntu/+source/lighttpd:bionic-libgamin-conflicts into ubuntu/+source/lighttpd:applied/ubuntu/bionic-devel

[Athos Ribeiro]

Depend on libgamin to fix missing symbol errors (LP: #1453463)

While the proposed fix contains a new regression autopkgtest entry, this was not included in impish nor proposed to debian because the dependency on fam was removed in Debian (and the related delta should be removed from Ubuntu in the next merge). See https://salsa.debian.org/debian/lighttpd/-/merge_requests/18#note_206687 for further reference.

A PPA with the proposed change is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lighttpd-lp-1453463/+packages.

I also ran the autopkgtest suite locally. The results were:

autopkgtest [16:10:23]: @@@@@@@@@@@@@@@@@@@@ summary
libfam-libgamin-conflict-regression PASS

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

The same comments I made on the Focal MP also apply here. There's also an issue with the version of the package. Otherwise, I agree with the fix & the test. Let me know when you update the MPs and I can sponsor them for you.

review: Needs Fixing

[Athos Ribeiro (athos-ribeiro)]

Thanks for the review, Sergio!

- Fixed the version

- Added a comment in the begining of the test to describe it's purpose, as requested.

I re-ran the autopkgtest suite:

autopkgtest [22:05:19]: @@@@@@@@@@@@@@@@@@@@ summary
libfam-libgamin-conflict-regression PASS

And pushed a new package with the latest changes to the PPA as lighttpd_1.4.45-1ubuntu3.18.04.1~ppa1 (note that the version is now lower than the former one, which was deleted)

[Athos Ribeiro (athos-ribeiro)]

Based on the focal MP comments, I

- Changed the new test to use apt-get instead of apt (allow-stderr restriction removed)

- re-ran the autopkgtest suite:

autopkgtest [08:47:39]: @@@@@@@@@@@@@@@@@@@@ summary
libfam-libgamin-conflict-regression PASS

- pushed a new package with the latest changes to the PPA.

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos.

Pushed and Uploaded:

$ git push pkg upload/1.4.45-1ubuntu3.18.04.1
Enumerating objects: 19, done.
Counting objects: 100% (19/19), done.
Delta compression using up to 8 threads
Compressing objects: 100% (15/15), done.
Writing objects: 100% (15/15), 2.04 KiB | 348.00 KiB/s, done.
Total 15 (delta 8), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/lighttpd
 * [new tag] upload/1.4.45-1ubuntu3.18.04.1 -> upload/1.4.45-1ubuntu3.18.04.1

$ dput lighttpd_1.4.45-1ubuntu3.18.04.1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/lighttpd/lighttpd_1.4.45-1ubuntu3.18.04.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/lighttpd/lighttpd_1.4.45-1ubuntu3.18.04.1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading lighttpd_1.4.45-1ubuntu3.18.04.1.dsc: done.
  Uploading lighttpd_1.4.45-1ubuntu3.18.04.1.debian.tar.xz: done.
  Uploading lighttpd_1.4.45-1ubuntu3.18.04.1_source.buildinfo: done.
  Uploading lighttpd_1.4.45-1ubuntu3.18.04.1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 03e2665..747c006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lighttpd (1.4.45-1ubuntu3.18.04.1) bionic; urgency=medium
+
+  * d/control: Depend on libgamin to fix missing symbol errors (LP: #1453463)
+  * d/test/control: introduce regression test for libgamin/libfam
+  * d/test/libfam-libgamin-conflict-regression: check for libgamin/libfam
+    conflict regressions
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 15 Jun 2021 11:44:25 -0300
+
 lighttpd (1.4.45-1ubuntu3.18.04) bionic; urgency=medium
 
   * Cherrypick and rebase upstream patch to disable client renegotiation
diff --git a/debian/control b/debian/control
index 602e846..396e774 100644
--- a/debian/control
+++ b/debian/control
@@ -19,10 +19,10 @@ Build-Depends:
  libbz2-dev,
  libattr1-dev,
  libpcre3-dev,
- libgamin-dev,
  default-libmysqlclient-dev,
  libldap2-dev,
  libfcgi-dev,
+ libgamin-dev,
  libgdbm-dev,
  libgeoip-dev,
  liblua5.1-0-dev,
@@ -48,6 +48,7 @@ Depends:
  ${shlibs:Depends},
  mime-support,
  lsb-base (>= 3.0-6),
+ libgamin0,
 Recommends:
  spawn-fcgi,
 Suggests:
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..62d97fa
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: libfam-libgamin-conflict-regression
+Restrictions: needs-root
diff --git a/debian/tests/libfam-libgamin-conflict-regression b/debian/tests/libfam-libgamin-conflict-regression
new file mode 100644
index 0000000..008c62d
--- /dev/null
+++ b/debian/tests/libfam-libgamin-conflict-regression
@@ -0,0 +1,19 @@
+#!/bin/sh
+# This test checks for regressions on lighttpd fam dependencies,
+# which could either be satisfied by libgamin or libfam, whereas the latter
+# does not provide all the needed symbols for the package to work properly
+# https://bugs.launchpad.net/ubuntu/+source/lighttpd/+bug/1453463
+
+test_dep_regression() {
+  apt-get purge -y libfam0 libgamin0 lighttpd
+  apt-get install -y $1
+  apt-get install -y lighttpd
+  if ! /usr/sbin/lighttpd -v; then
+    echo "Err: possible libfam-libgamin conflict regression"
+    exit 1
+  fi
+}
+
+apt-get update
+test_dep_regression libfam0
+test_dep_regression libgamin0