Merge ~lvoytek/ubuntu/+source/mysql-8.0:mysql-fix-mysqlpump-bugs-test into ubuntu/+source/mysql-8.0:ubuntu/devel

[Lena Voytek]

Looks like the security team forgot to add in the necessary debian folder items to make 8.0.29 in Kinetic. I added the necessary changes here based on what they added correctly in Jammy, Impish, and Focal. Confirmed the build now works in

https://launchpad.net/~lvoytek/+archive/ubuntu/mysql-fix-mysqlpump-test

I initially thought that libexpect-perl was the only issue since that was the only item breaking the tests but after attempting the build again I realized that the additional .so files were also needed. Luckily these two items combined cover everything the security team added for the first version of the other releases.

[Utkarsh Gupta (utkarsh)]

I like. +1.

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Lena.

I agree with adding libexpect-perl to B-D, but I'd like to better understand the changes to the *.install files. Are they related/necessary to the fix?

review: Needs Information

[Lena Voytek (lvoytek)]

Yeah the new so files are needed otherwise the build fails with the following seen in the first build I did in the PPA:

https://launchpadlibrarian.net/600583266/buildlog_ubuntu-kinetic-amd64.mysql-8.0_8.0.29-0ubuntu2~ppa1_BUILDING.txt.gz

The file modifications match those that the security team added in the other 8.0.29 releases such as https://launchpad.net/ubuntu/+source/mysql-8.0/8.0.29-0ubuntu0.22.04.1

install -d debian/.debhelper/generated/mysql-router
 dh_missing --exclude usr/share/man --exclude usr/share/mysql/mysql.server --fail-missing
dh_missing: warning: Compatibility levels before 10 are deprecated (level 9 in use)
dh_missing: warning: usr/lib/mysql-router/libmysqlrouter_connection_pool.so.1 exists in debian/tmp but is not installed to anywhere
dh_missing: warning: usr/lib/mysql-router/libmysqlrouter_metadata_cache.so.1 exists in debian/tmp but is not installed to anywhere
dh_missing: warning: usr/lib/mysql-router/libmysqlrouter_mysqlxmessages.so.1 exists in debian/tmp but is not installed to anywhere
dh_missing: warning: usr/lib/mysql-router/libmysqlrouter_routing.so.1 exists in debian/tmp but is not installed to anywhere
dh_missing: warning: usr/lib/mysql/plugin/component_test_sensitive_system_variables.so exists in debian/tmp but is not installed to anywhere
dh_missing: warning: usr/lib/mysqlrouter/plugin/connection_pool.so exists in debian/tmp but is not installed to anywhere
dh_missing: warning: usr/lib/mysqlrouter/plugin/rest_connection_pool.so exists in debian/tmp but is not installed to anywhere
dh_missing: error: missing files, aborting
 The following debhelper tools have reported what they installed (with files per package)
  * dh_install: libmysqlclient-dev (22), libmysqlclient21 (2), mysql-client (0), mysql-client-8.0 (1), mysql-client-core-8.0 (11), mysql-router (29), mysql-server (0), mysql-server-8.0 (14), mysql-server-core-8.0 (75), mysql-source-8.0 (1), mysql-testsuite (0), mysql-testsuite-8.0 (111)
 If the missing files are installed by another tool, please file a bug against it.
 When filing the report, if the tool is not part of debhelper itself, please reference the
 "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+).
   (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz)
 Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built
 If the omission is intentional or no other helper can take care of this consider adding the
 paths to debian/not-installed.
dh_install: error: dh_missing --exclude usr/share/man --exclude usr/share/mysql/mysql.server --fail-missing returned exit code 25
make[1]: *** [debian/rules:208: override_dh_install] Error 25
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
make: *** [debian/rules:232: binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2

[Sergio Durigan Junior (sergiodj)]

Ah, OK. I thought the purpose of this MP was solely to fix the test failure related to libexpect-perl, and it seemed strange to me that you were also touching these other files. Now I understand that the goal is to unbreak the build. I would suggest going into a bit more detail in the MP description :-).

Thanks. This LGTM. Let me know if you need sponsorship.

review: Approve

[Lena Voytek (lvoytek)]

Added a bit more to the description to show why I added that. A sponsorship for this upload would be great, thanks!

[Sergio Durigan Junior (sergiodj)]

On Tuesday, May 10 2022, Lena Voytek wrote:

> Added a bit more to the description to show why I added that. A sponsorship for this upload would be great, thanks!

Thanks :-). Uploaded:

$ dput mysql-8.0_8.0.29-0ubuntu2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/mysql/mysql-8.0_8.0.29-0ubuntu2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/mysql/mysql-8.0_8.0.29-0ubuntu2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading mysql-8.0_8.0.29-0ubuntu2.dsc: done.
  Uploading mysql-8.0_8.0.29-0ubuntu2.debian.tar.xz: done.
  Uploading mysql-8.0_8.0.29-0ubuntu2_source.buildinfo: done.
  Uploading mysql-8.0_8.0.29-0ubuntu2_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index 1725941..fd67d95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mysql-8.0 (8.0.29-0ubuntu2) kinetic; urgency=medium
+
+  * Add libexpect-perl module to fix mysqlpump_bugs test (LP: #1972737)
+    - d/control: Add libexpect-perl to dependency list
+    - d/t/control: Use libexpect-perl in upstream tests
+  * d/mysql-router.install, d/mysql-testsuite-8.0.install: Add new 8.0.29
+    shared object files to package
+
+ -- Lena Voytek <[e-mail]>  Tue, 10 May 2022 07:20:56 -0700
+
 mysql-8.0 (8.0.29-0ubuntu1) kinetic; urgency=medium
 
   * SECURITY UPDATE: Update to 8.0.29 to fix security issues
diff --git a/debian/control b/debian/control
index d054cf6..1de4f79 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: bison,
                libcurl4-openssl-dev,
                libedit-dev,
                libevent-dev,
+               libexpect-perl,
                libicu-dev,
                libjson-perl,
                liblz4-dev (>= 0.0~r131),
diff --git a/debian/mysql-router.install b/debian/mysql-router.install
index b819744..3cc41b2 100644
--- a/debian/mysql-router.install
+++ b/debian/mysql-router.install
@@ -9,10 +9,15 @@ usr/lib/mysql-router/libmysqlharness.so.1
 usr/lib/mysql-router/libmysqlharness_stdx.so.1
 usr/lib/mysql-router/libmysqlharness_tls.so.1
 usr/lib/mysql-router/libmysqlrouter.so.1
+usr/lib/mysql-router/libmysqlrouter_connection_pool.so.1
 usr/lib/mysql-router/libmysqlrouter_http.so.1
 usr/lib/mysql-router/libmysqlrouter_http_auth_backend.so.1
 usr/lib/mysql-router/libmysqlrouter_http_auth_realm.so.1
 usr/lib/mysql-router/libmysqlrouter_io_component.so.1
+usr/lib/mysql-router/libmysqlrouter_metadata_cache.so.1
+usr/lib/mysql-router/libmysqlrouter_mysqlxmessages.so.1
+usr/lib/mysql-router/libmysqlrouter_routing.so.1
+usr/lib/mysqlrouter/plugin/connection_pool.so
 usr/lib/mysqlrouter/plugin/http_auth_backend.so
 usr/lib/mysqlrouter/plugin/http_auth_realm.so
 usr/lib/mysqlrouter/plugin/http_server.so
@@ -20,6 +25,7 @@ usr/lib/mysqlrouter/plugin/io.so
 usr/lib/mysqlrouter/plugin/keepalive.so
 usr/lib/mysqlrouter/plugin/metadata_cache.so
 usr/lib/mysqlrouter/plugin/rest_api.so
+usr/lib/mysqlrouter/plugin/rest_connection_pool.so
 usr/lib/mysqlrouter/plugin/rest_metadata_cache.so
 usr/lib/mysqlrouter/plugin/rest_router.so
 usr/lib/mysqlrouter/plugin/rest_routing.so
diff --git a/debian/mysql-testsuite-8.0.install b/debian/mysql-testsuite-8.0.install
index 5fcd5cb..301af6d 100644
--- a/debian/mysql-testsuite-8.0.install
+++ b/debian/mysql-testsuite-8.0.install
@@ -22,6 +22,7 @@ usr/lib/mysql/plugin/component_test_mysql_runtime_error.so
 usr/lib/mysql/plugin/component_test_mysql_system_variable_set.so
 usr/lib/mysql/plugin/component_test_pfs_notification.so
 usr/lib/mysql/plugin/component_test_pfs_resource_group.so
+usr/lib/mysql/plugin/component_test_sensitive_system_variables.so
 usr/lib/mysql/plugin/component_test_status_var_service.so
 usr/lib/mysql/plugin/component_test_status_var_service_int.so
 usr/lib/mysql/plugin/component_test_status_var_service_reg_only.so
diff --git a/debian/tests/control b/debian/tests/control
index 72e4d26..7d758a3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,5 +3,5 @@ Depends: mysql-server-8.0
 Restrictions: allow-stderr needs-root breaks-testbed
 
 Tests: upstream
-Depends: mysql-testsuite-8.0
+Depends: mysql-testsuite-8.0, libexpect-perl
 Restrictions: allow-stderr breaks-testbed