Merge ~kstenerud/ubuntu/+source/php7.3:disco-php7.3-pcre3-1806710 into ubuntu/+source/php7.3:ubuntu/devel

[Karl Stenerud]

  * d/control.in: Reverted dependency on pcre2, temporarily depending on pcre3,
    to avoid pulling pcre2 into main (LP: #1806710)
  * d/tests.in/pcre, d/tests/pcre: Added regex smoke test for pcre3

PPA: https://launchpad.net/~kstenerud/+archive/ubuntu/disco-php7.3-pcre3-2-1806710

Steps to test:

lxc launch ubuntu-daily:disco tester && lxc exec tester bash
apt-add-repository -y ppa:kstenerud/disco-php7.3-pcre3-2-1806710 && \
apt update && apt dist-upgrade -y && \
apt install -y php7.3 &&
echo "echo preg_match('|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i', 'http://example.com/path');" | php -a

This should print "1"

Package Tests:

autopkgtest [14:41:20]: test fpm: -----------------------]
fpm PASS
autopkgtest [14:41:21]: test fpm: - - - - - - - - - - results - - - - - - - - - -
autopkgtest [14:41:21]: @@@@@@@@@@@@@@@@@@@@ summary
cli PASS
cgi PASS
mod-php PASS
fpm PASS

[Robie Basak (racb)]

Looks good, thanks! Comments inline.

Also, do we need to regenerate tests/ from tests.in/ before upload? I assume we do need to do this, because the source previously contains a generated tests/ that matches tests.in/, and now it won't.

[Robie Basak (racb)]

Also control needs regenerating from control.in please.

acc991b... by Karl Stenerud on 2018-12-05

  * d/control.in: Reverted dependency on pcre2, temporarily depending on pcre3,
    to avoid pulling pcre2 into main (LP: #1806710)

0cb9be6... by Karl Stenerud on 2018-12-05

  * d/tests.in/pcre, d/tests/pcre: Added regex smoke test for pcre3

52865d5... by Karl Stenerud on 2018-12-05

changelog

[Nish Aravamudan (nacc)]

Based upon the diff below, you are b-d upon both libpcre2-dev and libpcre3-dev. I don't think that's correct.

Also, most of the binary packages should not depend on -dev but the correct libpcre3 package, which should not be necessary to add explictily to each (it'll come from shlibs, I think). Only the replacement you have for php7.3-dev (which lists libpcre2-dev explicitly) is needed.

Also, as a sanity test, it's probably best to show the binary package dependencies in a comment here when you update the MP to prove no rev-dep on pcre2 is left.

[Robie Basak (racb)]

We've cancelled attempting to make PHP work against pcre3 again. The upstream commits seem too extensive and spread out for us to realistically cherry-pick reverts from them.

Unmerged commits

52865d5... by Karl Stenerud on 2018-12-05

changelog

0cb9be6... by Karl Stenerud on 2018-12-05

  * d/tests.in/pcre, d/tests/pcre: Added regex smoke test for pcre3

acc991b... by Karl Stenerud on 2018-12-05

  * d/control.in: Reverted dependency on pcre2, temporarily depending on pcre3,
    to avoid pulling pcre2 into main (LP: #1806710)

diff --git a/debian/changelog b/debian/changelog
index fe00365..f1d4ece 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php7.3 (7.3.0~rc5-2ubuntu1) disco; urgency=medium
+
+  * d/control.in: Reverted dependency on pcre2, temporarily depending on pcre3,
+    to avoid pulling pcre2 into main (LP: #1806710)
+  * d/tests.in/pcre, d/tests/pcre: Added regex smoke test for pcre3
+
+ -- Karl Stenerud <[e-mail]>  Mon, 04 Dec 2018 10:23:56 +0100
+
 php7.3 (7.3.0~rc5-2build1) disco; urgency=medium
 
   * No-change rebuild against latest libzip
diff --git a/debian/control.in b/debian/control.in
index 94ea59d..64c9cc6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -45,6 +45,7 @@ Build-Depends: apache2-dev (>= 2.4),
                libonig-dev,
                libpam0g-dev,
 	       libpcre2-dev (>= 10.30),
+               libpcre3-dev (>= 2:8.35),
                libpng-dev,
                libpq-dev,
                libpspell-dev,
@@ -84,6 +85,7 @@ Package: libapache2-mod-php@PHP_VERSION@
 Section: httpd
 Architecture: any
 Depends: libmagic1,
+         libpcre3-dev (>= 2:8.35),
          mime-support,
          php@PHP_VERSION@-cli,
          php@PHP_VERSION@-common (= ${binary:Version}),
@@ -111,6 +113,7 @@ Description: server-side, HTML-embedded scripting language (Apache 2 module)
 Package: libphp@PHP_VERSION@-embed
 Architecture: any
 Depends: libmagic1,
+         libpcre3-dev (>= 2:8.35),
          mime-support,
          php@PHP_VERSION@-cli,
          php@PHP_VERSION@-common (= ${binary:Version}),
@@ -156,6 +159,7 @@ Description: server-side, HTML-embedded scripting language (metapackage)
 Package: php@PHP_VERSION@-cgi
 Architecture: any
 Depends: libmagic1,
+         libpcre3-dev (>= 2:8.35),
          mime-support,
          php@PHP_VERSION@-cli,
          php@PHP_VERSION@-common (= ${binary:Version}),
@@ -183,6 +187,7 @@ Description: server-side, HTML-embedded scripting language (CGI binary)
 Package: php@PHP_VERSION@-cli
 Architecture: any
 Depends: libedit2 (>= 2.11-20080614-4),
+         libpcre3-dev (>= 2:8.35),
          libmagic1,
          mime-support,
          php@PHP_VERSION@-common (= ${binary:Version}),
@@ -209,7 +214,7 @@ Description: command-line interpreter for the PHP scripting language
 Package: php@PHP_VERSION@-dev
 Depends: autoconf (>= 2.63),
          automake (>= 1.11),
-	 libpcre2-dev (>= 10.30),
+         libpcre3-dev (>= 2:8.35),
          libssl-dev,
          php@PHP_VERSION@-cli (>= ${binary:Version}),
          php@PHP_VERSION@-common (= ${binary:Version}),
@@ -232,6 +237,7 @@ Description: Files for PHP@PHP_VERSION@ module development
 Package: php@PHP_VERSION@-fpm
 Architecture: any
 Depends: libmagic1,
+         libpcre3-dev (>= 2:8.35),
          mime-support,
          php@PHP_VERSION@-cli,
          php@PHP_VERSION@-common (= ${binary:Version}),
@@ -259,6 +265,7 @@ Description: server-side, HTML-embedded scripting language (FPM-CGI binary)
 Package: php@PHP_VERSION@-phpdbg
 Architecture: any
 Depends: libmagic1,
+         libpcre3-dev (>= 2:8.35),
          mime-support,
          php@PHP_VERSION@-cli,
          php@PHP_VERSION@-common (= ${binary:Version}),
diff --git a/debian/tests.in/pcre b/debian/tests.in/pcre
new file mode 100644
index 0000000..0ef6351
--- /dev/null
+++ b/debian/tests.in/pcre
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+# Author: Karl Stenerud <[e-mail]>
+#
+# This test ensures that PCRE regular expressions still work
+# after reverting from pcre2 to pcre3. Once we fully move to
+# pcre2, this test should no longer be necessary.
+
+cd "$ADTTMP"
+cat > regex.php <<EOT
+<?php echo preg_match('|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i', 'http://example.com/path'); ?>
+EOT
+
+result=`php@PHP_VERSION@ regex.php`
+test "$result" = "1"
diff --git a/debian/tests/pcre b/debian/tests/pcre
new file mode 100644
index 0000000..ada1bb3
--- /dev/null
+++ b/debian/tests/pcre
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+# Author: Karl Stenerud <[e-mail]>
+#
+# This test ensures that PCRE regular expressions still work
+# after reverting from pcre2 to pcre3. Once we fully move to
+# pcre2, this test should no longer be necessary.
+
+cd "$ADTTMP"
+cat > regex.php <<EOT
+<?php echo preg_match('|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i', 'http://example.com/path'); ?>
+EOT
+
+result=`php7.3 regex.php`
+test "$result" = "1"