Merge ~ahasenack/ubuntu/+source/uwsgi-plugin-php:focal-uwsgi-plugin-php-ftbfs into ubuntu/+source/uwsgi-plugin-php:ubuntu/devel

[Andreas Hasenack]

uwsgi --build-plugin ends up calling a python script to build the plugin. This script comes from the uwsgi-src source. I checked and I believe it's python3 compatible, specially because it has checks like these in it (uwsgiconfig.py):
"""
try:
    import ConfigParser
except:
    import configparser as ConfigParser

PY3 = sys.version_info[0] == 3
"""

See the linked bug for my troubleshooting on this issue.

I didn't add a build dependency on python3 because uwsgi-dev, a b-d of this package, already has it.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/uwsgi-plugin-php-ftbfs
sudo add-apt-repository ppa:ahasenack/uwsgi-plugin-php-ftbfs -y -u

[Andreas Hasenack (ahasenack)]

Oh, my mistake, looks like uwsgi-dev pulls in python2, not python3:
$ dpkg -s uwsgi-dev|grep Depends
Depends: libpcre3-dev, libssl-dev, uuid-dev, zlib1g-dev, libcap-dev, binutils, gcc, python2, uwsgi-core, libc6-dev | libc-dev

Let me fix that.

[Bryce Harrington (bryce)]

Looks good, verified it installs properly, and that it pulls in php7.4 as expected, rather than php7.3.

Thanks for the fix, that was a good find.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading 9c16524904e563eee8c8ccdc62a6e82eeea85e4f

$ git push pkg upload/0.0.4ubuntu1
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 4 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (13/13), 1.41 KiB | 1.41 MiB/s, done.
Total 13 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/uwsgi-plugin-php
 * [new tag] upload/0.0.4ubuntu1 -> upload/0.0.4ubuntu1

$ dput ubuntu ../uwsgi-plugin-php_0.0.4ubuntu1_source.changes
Checking signature on .changes
gpg: ../uwsgi-plugin-php_0.0.4ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../uwsgi-plugin-php_0.0.4ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading uwsgi-plugin-php_0.0.4ubuntu1.dsc: done.
  Uploading uwsgi-plugin-php_0.0.4ubuntu1.tar.xz: done.
  Uploading uwsgi-plugin-php_0.0.4ubuntu1_source.buildinfo: done.
  Uploading uwsgi-plugin-php_0.0.4ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 9730b85..135f00f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+uwsgi-plugin-php (0.0.4ubuntu1) focal; urgency=medium
+
+  * d/rules: be explicit about the python interpreter we want the
+    plugin builder to use (LP: #1866693)
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 09 Mar 2020 19:29:10 +0000
+
 uwsgi-plugin-php (0.0.4build1) focal; urgency=medium
 
   * No-change rebuild for php7.4
diff --git a/debian/control b/debian/control
index 5e6a58a..e288d67 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: uwsgi-plugin-php
 Section: httpd
 Priority: optional
-Maintainer: uWSGI packaging team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: uWSGI packaging team <[e-mail]>
 Uploaders: Jonas Smedegaard <[e-mail]>
 Build-Depends:
  debhelper,
diff --git a/debian/rules b/debian/rules
index a426234..9055315 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ OUR_BINARY_VERSION = $(subst -,+,$(UWSGI_VERSION))+$(DEB_VERSION)
 	dh $@ --with uwsgi
 
 override_dh_auto_build:
-	uwsgi --build-plugin /usr/src/uwsgi/plugins/php
+	PYTHON=python2 uwsgi --build-plugin /usr/src/uwsgi/plugins/php
 	help2man \
 		--name 'fast (pure C), self-healing, developer-friendly WSGI server' \
 		--section 1 \