Merge ~ahasenack/ubuntu/+source/php7.3:focal-php73-mysql8-ftbfs-1850190 into ~usd-import-team/ubuntu/+source/php7.3:ubuntu/devel

Proposed by Andreas Hasenack on 2019-11-04
Status: Merged
Approved by: Andreas Hasenack on 2019-11-08
Approved revision: dad4a27db3ff5e45d3ba62802ad698cb4817dbca
Merged at revision: dad4a27db3ff5e45d3ba62802ad698cb4817dbca
Proposed branch: ~ahasenack/ubuntu/+source/php7.3:focal-php73-mysql8-ftbfs-1850190
Merge into: ~usd-import-team/ubuntu/+source/php7.3:ubuntu/devel
Diff against target: 69 lines (+17/-4)
4 files modified
debian/changelog (+11/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/setup-mysql.sh (+2/-2)
Reviewer Review Type Date Requested Status
Bryce Harrington 2019-11-04 Approve on 2019-11-08
Canonical Server Core Reviewers 2019-11-04 Pending
Review via email: mp+375112@code.launchpad.net
To post a comment you must log in.
Bryce Harrington (bryce) wrote :

I'm not sure I fully understand what the X plugin is, but it seems to be new since 5.7.12 so disabling it seems reasonable, and verified it is being disabled in the documented fashion recommended by mysql.

Comment #2 on bug #1850190 alludes to the use of --skip-grant-tables as a way to work around a problem with the network disabled, however I'm not finding a more detailed analysis or explanation of this. Is there a reference about this somewhere? Can you add a reference link or some additional discussion about this either in the bug report or changelog?

I've not done a build check for the change, but looks like several people have verified that by now.

Rest of the patch LGTM.

review: Needs Information
Andreas Hasenack (ahasenack) wrote :

I cherry picked these commits directly from the debian packaging, so I'm trying to avoid changing the commits themselves.

The X plugin is a document store for mysql, schemaless. I tried a build without disabling it, and it worked as well, so it's not strictly necessary to fix this FTBFS bug, but dropping that diff would add to our delta with debian. Anyway, I dropped this commit. We will get it again the next time we merge or sync with debian anyway.

When --skip-grant-tables is used, the only way to talk to mysql is via the unix socket, and that breaks the tests that are run at build time, as they expect a port on localhost. I added a quick explanation to d/changelog.

The current two DEP8 failures in bileto are known failures and have hints in the archive for them already:

andreas@nsnx:~/bzr/hints-ubuntu$ grep kopano-webapp *
ubuntu-release:force-badtest kopano-webapp/all/armhf
ubuntu-release:force-badtest kopano-webapp/3.5.9+dfsg1-1build1 kopano-webapp/3.5.10+dfsg1-1 kopano-webapp/3.5.12+dfsg1-1

andreas@nsnx:~/bzr/hints-ubuntu$ grep php-horde-util *
ubuntu-release:force-badtest php-horde-util/2.5.8-1ubuntu1

I uploaded to the bileto PPA again with the above changes.

Andreas Hasenack (ahasenack) wrote :

Bileto is green again, with just the two known reds.

Bryce Harrington (bryce) wrote :

Looks good, thanks for the clarification.

review: Approve
Andreas Hasenack (ahasenack) wrote :

Thanks, tagging dad4a27db3ff5e45d3ba62802ad698cb4817dbca and uploading

$ git push pkg upload/7.3.10-1ubuntu1
Enumerating objects: 24, done.
Counting objects: 100% (24/24), done.
Delta compression using up to 4 threads
Compressing objects: 100% (15/15), done.
Writing objects: 100% (18/18), 2.24 KiB | 153.00 KiB/s, done.
Total 18 (delta 13), reused 3 (delta 3)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/php7.3
 * [new tag] upload/7.3.10-1ubuntu1 -> upload/7.3.10-1ubuntu1

$ dput ubuntu ../php7.3_7.3.10-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../php7.3_7.3.10-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../php7.3_7.3.10-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading php7.3_7.3.10-1ubuntu1.dsc: done.
  Uploading php7.3_7.3.10-1ubuntu1.debian.tar.xz: done.
  Uploading php7.3_7.3.10-1ubuntu1_source.buildinfo: done.
  Uploading php7.3_7.3.10-1ubuntu1_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index f52e44b..e14a287 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,14 @@
6+php7.3 (7.3.10-1ubuntu1) focal; urgency=medium
7+
8+ [ Ondřej Surý ]
9+ * debian/setup-mysql.sh: fix FTBFS with MySQL 8 (LP: #1850190)
10+ - Use mysqld --initialize-insecure for MySQL 8.0 (for Ubuntu 19.10)
11+ - Remove --skip-grant-tables to fix FTBFS with MySQL 8.0. The tests
12+ expect mysql listening on localhost, and this option in v8.0 makes
13+ it listen only on the unix socket.
14+
15+ -- Andreas Hasenack <andreas@canonical.com> Mon, 04 Nov 2019 12:32:15 -0300
16+
17 php7.3 (7.3.10-1) unstable; urgency=medium
18
19 * New upstream version 7.3.10
20diff --git a/debian/control b/debian/control
21index 1b5be85..16184c9 100644
22--- a/debian/control
23+++ b/debian/control
24@@ -1,7 +1,8 @@
25 Source: php7.3
26 Section: php
27 Priority: optional
28-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
29+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
30+XSBC-Original-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
31 Uploaders: Ondřej Surý <ondrej@debian.org>,
32 Lior Kaplan <kaplan@debian.org>
33 Build-Depends: apache2-dev (>= 2.4),
34diff --git a/debian/control.in b/debian/control.in
35index 94ea59d..169da0b 100644
36--- a/debian/control.in
37+++ b/debian/control.in
38@@ -1,7 +1,8 @@
39 Source: php@PHP_VERSION@
40 Section: php
41 Priority: optional
42-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
43+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
44+XSBC-Original-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
45 Uploaders: Ondřej Surý <ondrej@debian.org>,
46 Lior Kaplan <kaplan@debian.org>
47 Build-Depends: apache2-dev (>= 2.4),
48diff --git a/debian/setup-mysql.sh b/debian/setup-mysql.sh
49index 3071983..9f30bee 100644
50--- a/debian/setup-mysql.sh
51+++ b/debian/setup-mysql.sh
52@@ -23,7 +23,7 @@ socket=$datadir/mysql.sock
53 # Commands:
54 mysql="mysql --no-defaults --user root --socket=$socket --no-beep"
55 mysqladmin="mysqladmin --no-defaults --user root --port $port --host 127.0.0.1 --socket=$socket --no-beep"
56-mysqld="/usr/sbin/mysqld --no-defaults --skip-grant-tables --user=$user --bind-address=127.0.0.1 --port=$port --socket=$socket --datadir=$datadir/data"
57+mysqld="/usr/sbin/mysqld --no-defaults --user=$user --bind-address=127.0.0.1 --port=$port --socket=$socket --datadir=$datadir/data"
58
59 mysqld_version=$($mysqld -V 2>/dev/null | sed -ne 's/.*Ver \([0-9]\+\.[0-9]\+\).*/\1/p')
60
61@@ -40,7 +40,7 @@ chmod go-rx $datadir
62 chown $user: $datadir
63
64 case "$mysqld_version" in
65- 5.7)
66+ 5.7|8.0)
67 $mysqld --initialize-insecure
68 ;;
69 5.5|5.6|10.0|*)

Subscribers

People subscribed via source and target branches