Merge ~athos-ribeiro/ubuntu/+source/php8.1:lp1882279-lp1772915-php into ubuntu/+source/php8.1:ubuntu/devel

[Athos Ribeiro]

This MP contains the fixes for both LP: #1772915 and LP: #1882279.

A PPA with the proposed changes is available at

https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1882279-lp1772915-php/+packages

I ran the autopkgtest suite locally. This is the result summary:

autopkgtest [10:59:23]: @@@@@@@@@@@@@@@@@@@@ summary
cli PASS
cgi PASS
mod-php PASS
fpm PASS

[Bryce Harrington (bryce)]

Wow, great debugging work on this. Rather crazy that warning messages caused a performance regression.

I've reviewed the upstream bugs including the forwarded PRs and upstream's response. It looks like the grep for -Wattributes follows what was done in autoconf at http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=commitdiff;h=df0894ad1a8195df67a52108b931e07d708cec9a.

I've not reproduced the problem + fix, but did check rebuilding locally is fine, and triggered autopkgtests against the ppa:

  lp-test-ppa -r kinetic -u ppa:athos-ribeiro/lp1882279-lp1772915-php

Results from https://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-athos-ribeiro-lp1882279-lp1772915-php/?format=plain:
    No results published yet
Running:
    time pkg release arch ppa trigger
    0:10:00 php8.1 kinetic armhf athos-ribeiro/lp1882279-lp1772915-php php8.1/8.1.2-1ubuntu4~ppa1
    0:14:01 php8.1 kinetic arm64 athos-ribeiro/lp1882279-lp1772915-php php8.1/8.1.2-1ubuntu4~ppa1
    0:14:01 php8.1 kinetic amd64 athos-ribeiro/lp1882279-lp1772915-php php8.1/8.1.2-1ubuntu4~ppa1
    0:15:21 php8.1 kinetic s390x athos-ribeiro/lp1882279-lp1772915-php php8.1/8.1.2-1ubuntu4~ppa1
    0:16:21 php8.1 kinetic ppc64el athos-ribeiro/lp1882279-lp1772915-php php8.1/8.1.2-1ubuntu4~ppa1
Waiting:

Assuming no failures from the test, this all LGTM, +1

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Bryce!

I will need sponsorship for this one since my request at

https://lists.ubuntu.com/archives/devel-permissions/2022-May/001962.html

was not processed yet :)

[Athos Ribeiro (athos-ribeiro)]

Actually, Robie just updated the packageset (thanks, Robie), so I can upload this one myself (and test the new permissions as well).

[Athos Ribeiro (athos-ribeiro)]

Uploaded

$ dput ubuntu ../php8.1_8.1.2-1ubuntu4_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../php8.1_8.1.2-1ubuntu4_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../php8.1_8.1.2-1ubuntu4.dsc: Valid signature from 033C4CA276024834
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading php8.1_8.1.2-1ubuntu4.dsc: done.
  Uploading php8.1_8.1.2-1ubuntu4.debian.tar.xz: done.
  Uploading php8.1_8.1.2-1ubuntu4_source.buildinfo: done.
  Uploading php8.1_8.1.2-1ubuntu4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 7c1f1b8..e4bd36c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php8.1 (8.1.2-1ubuntu4) kinetic; urgency=medium
+
+  * d/p/0046-Update-gcc-func-attr-macro.patch: fix detection of unknown gcc
+    function attributes. (LP: #1882279)
+  * d/rules: document garbage collection in ini files. (LP: #1772915)
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 02 May 2022 19:54:49 -0300
+
 php8.1 (8.1.2-1ubuntu3) kinetic; urgency=medium
 
   * No-change rebuild against libicu71
diff --git a/debian/patches/0046-Update-gcc-func-attr-macro.patch b/debian/patches/0046-Update-gcc-func-attr-macro.patch
new file mode 100644
index 0000000..cb8ea57
--- /dev/null
+++ b/debian/patches/0046-Update-gcc-func-attr-macro.patch
@@ -0,0 +1,29 @@
+From df0894ad1a8195df67a52108b931e07d708cec9a Mon Sep 17 00:00:00 2001
+From: Ming Chen <[e-mail]>
+Date: Mon, 2 Mar 2020 09:40:36 +0800
+Subject: ax_gcc_func_attribute: Revise the detection of unknown attributes
+
+GCC outputs a warning when Wstrict-prototypes is on, in such case the
+attribute detection always fails even if the attribute is actually
+supported. This change checks for the "-Wattributes" warning in
+conftest.err instead of the existence of the file.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php8.1/+bug/1882279
+Forwarded: https://github.com/php/php-src/pull/8483
+Origin: http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=commitdiff;h=df0894ad1a8195df67a52108b931e07d708cec9a
+Last-Update: 2022-05-02
+---
+ build/ax_gcc_func_attribute.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/build/ax_gcc_func_attribute.m4
++++ b/build/ax_gcc_func_attribute.m4
+@@ -227,7 +227,7 @@
+             dnl GCC doesn't exit with an error if an unknown attribute is
+             dnl provided but only outputs a warning, so accept the attribute
+             dnl only if no warning were issued.
+-            [AS_IF([test -s conftest.err],
++            [AS_IF([grep -- -Wattributes conftest.err],
+                 [AS_VAR_SET([ac_var], [no])],
+                 [AS_VAR_SET([ac_var], [yes])])],
+             [AS_VAR_SET([ac_var], [no])])
diff --git a/debian/patches/series b/debian/patches/series
index 08755ab..953d8cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,3 +44,4 @@
 0044-Fail-the-build-when-the-dtrace-call-fails.patch
 0045-Override-result-of-AC_PROG_LN_S-to-fix-FTBFS-on-ppc6.patch
 CVE-2021-21708.patch
+0046-Update-gcc-func-attr-macro.patch
diff --git a/debian/rules b/debian/rules
index 1b3fc90..036610f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,6 +257,16 @@ BUILTIN_EXTENSION_CHECK=$$e=get_loaded_extensions(); natcasesort($$e); \
 			foreach($$e as $$i) { $$s .= " $$i"; } \
 			echo("php:Extensions=" . wordwrap($$s . ".\n", 75, "\$${Newline}"));
 
+# Document garbage collection procedure
+define GC_PROBABILITY_DOC
+; Debian Default Value: 1\n;\
+This is disabled in the Debian packages due to the strict permissions\n;\
+on /var/lib/php. Instead, GC is performed through /etc/cron.d/php,\n;\
+which uses the session.gc_maxlifetime setting. Please, check\n;\
+/usr/share/doc/$(PHP_COMMON)/README.Debian.gz for further reference.
+endef
+export GC_PROBABILITY_DOC
+
 include $(CURDIR)/debian/rules.d/*.mk
 
 #extensions
@@ -509,6 +519,7 @@ override_dh_install-arch: remove-files-stamp prepare-fpm-pools
 	mkdir -p debian/$(PHP_COMMON)/usr/lib/php/$(PHP_NAME_VERSION)/
 	cat php.ini-production | tr "\t" " " | \
 	$(SED) -e'/session.gc_probability =/ s/1/0/g;' \
+	    -e"/session.gc_probability =/i $${GC_PROBABILITY_DOC}" \
 	    -e'/disable_functions =/ s/$$/ $(PCNTL_FUNCTIONS)/g;' \
 	    -e'/expose_php =/ s/On/Off/g;' \
 	  > debian/$(PHP_COMMON)/usr/lib/php/$(PHP_NAME_VERSION)/php.ini-production
@@ -516,10 +527,12 @@ override_dh_install-arch: remove-files-stamp prepare-fpm-pools
 	cat php.ini-production | tr "\t" " " | \
 	$(SED) -e'/memory_limit =/ s/128M/-1/g;' \
 	    -e'/session.gc_probability =/ s/1/0/g' \
+	    -e"/session.gc_probability =/i $${GC_PROBABILITY_DOC}" \
 	  > debian/$(PHP_COMMON)/usr/lib/php/$(PHP_NAME_VERSION)/php.ini-production.cli
 
 	cat php.ini-development | tr "\t" " " | \
 	$(SED) -e'/session.gc_probability =/ s/1/0/g;' \
+	    -e"/session.gc_probability =/i $${GC_PROBABILITY_DOC}" \
 	    -e'/disable_functions =/ s/$$/ $(PCNTL_FUNCTIONS)/g;' \
 	  > debian/$(PHP_COMMON)/usr/lib/php/$(PHP_NAME_VERSION)/php.ini-development