7.2.16 and fpm/sodium fixes

4 files changed, 53 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c97f990994d..748cc8aebfe5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = php72
 	pkgdesc = php 7.2 compiled as to not conflict with mainline php
-	pkgver = 7.2.15
+	pkgver = 7.2.16
 	pkgrel = 1
 	url = http://www.php.net
 	arch = i686
@@ -27,7 +27,8 @@ pkgbase = php72
 	makedepends = libtool
 	makedepends = freetds
 	makedepends = pcre
-	source = https://php.net/distributions/php-7.2.15.tar.xz
+	makedepends = libsodium
+	source = https://php.net/distributions/php-7.2.16.tar.xz
 	source = apache.patch
 	source = apache.conf
 	source = php-fpm.patch
@@ -35,11 +36,11 @@ pkgbase = php72
 	source = php.ini.patch
 	source = enchant-2.patch
 	source = php-freetype-2.9.1.patch
-	md5sums = 2271549c2dadb4ef8cfe59e838bb0281
+	md5sums = 6a8f1cd5cbf025ab5977e1cca93cd8d8
 	md5sums = 13cda50a6a420d04ddc26935ded3164e
 	md5sums = b7d69762f7c045b3950d770e04db504c
-	md5sums = 57342b2632c8a4a829f26e8f9985f3aa
-	md5sums = 62fa82888154a0c0d55b41a8d7138a05
+	md5sums = f248c783449f310291905b5551c57e48
+	md5sums = 406f7a3ef7f476e4a5c26e462e47b7c7
 	md5sums = 4bf0b1296fc95947a11bef36fe76102a
 	md5sums = e3883dce91ed21e23a3d7ae9fa80216d
 	md5sums = b40b82f55208eaead22dbfb64720b064
@@ -50,26 +51,26 @@ pkgname = php72
 	depends = curl
 	depends = libzip
 	depends = pcre
-	provides = php=7.2.15
+	provides = php=7.2.16
 	backup = etc/php72/php.ini
 
 pkgname = php72-cgi
 	pkgdesc = CGI and FCGI SAPI for PHP
 	depends = php72
-	provides = php-cgi=7.2.15
+	provides = php-cgi=7.2.16
 
 pkgname = php72-apache
 	pkgdesc = Apache SAPI for PHP
 	depends = php72
 	depends = apache
-	provides = php-apache=7.2.15
+	provides = php-apache=7.2.16
 	backup = etc/httpd/conf/extra/php72_module.conf
 
 pkgname = php72-fpm
 	pkgdesc = FastCGI Process Manager for PHP
 	depends = php72
 	depends = systemd
-	provides = php-fpm=7.2.15
+	provides = php-fpm=7.2.16
 	options = !emptydirs
 	backup = etc/php72/php-fpm.conf
 	backup = etc/php72/php-fpm.d/www.conf
@@ -78,84 +79,89 @@ pkgname = php72-embed
 	pkgdesc = Embedded PHP SAPI library
 	depends = php72
 	depends = libsystemd
-	provides = php-embed=7.2.15
+	provides = php-embed=7.2.16
 	options = !emptydirs
 
 pkgname = php72-phpdbg
 	pkgdesc = Interactive PHP debugger
 	depends = php72
-	provides = php-phpdbg=7.2.15
+	provides = php-phpdbg=7.2.16
 	options = !emptydirs
 
 pkgname = php72-dblib
 	pkgdesc = dblib module for PHP
 	depends = php72
 	depends = freetds
-	provides = php-dblib=7.2.15
+	provides = php-dblib=7.2.16
 
 pkgname = php72-enchant
 	pkgdesc = enchant module for PHP
 	depends = php72
 	depends = enchant
-	provides = php-enchant=7.2.15
+	provides = php-enchant=7.2.16
 
 pkgname = php72-gd
 	pkgdesc = gd module for PHP
 	depends = php72
 	depends = gd
-	provides = php-gd=7.2.15
+	provides = php-gd=7.2.16
 
 pkgname = php72-imap
 	pkgdesc = imap module for PHP
 	depends = php72
 	depends = c-client
-	provides = php-imap=7.2.15
+	provides = php-imap=7.2.16
 
 pkgname = php72-intl
 	pkgdesc = intl module for PHP
 	depends = php72
 	depends = icu
-	provides = php-intl=7.2.15
+	provides = php-intl=7.2.16
 
 pkgname = php72-odbc
 	pkgdesc = ODBC modules for PHP
 	depends = php72
 	depends = unixodbc
-	provides = php-odbc=7.2.15
+	provides = php-odbc=7.2.16
 
 pkgname = php72-pgsql
 	pkgdesc = PostgreSQL modules for PHP
 	depends = php72
 	depends = postgresql-libs
-	provides = php-pgsql=7.2.15
+	provides = php-pgsql=7.2.16
 
 pkgname = php72-pspell
 	pkgdesc = pspell module for PHP
 	depends = php72
 	depends = aspell
-	provides = php-pspell=7.2.15
+	provides = php-pspell=7.2.16
 
 pkgname = php72-snmp
 	pkgdesc = snmp module for PHP
 	depends = php72
 	depends = net-snmp
-	provides = php-snmp=7.2.15
+	provides = php-snmp=7.2.16
 
 pkgname = php72-sqlite
 	pkgdesc = sqlite module for PHP
 	depends = php72
 	depends = sqlite
-	provides = php-sqlite=7.2.15
+	provides = php-sqlite=7.2.16
 
 pkgname = php72-tidy
 	pkgdesc = tidy module for PHP
 	depends = php72
 	depends = tidy
-	provides = php-tidy=7.2.15
+	provides = php-tidy=7.2.16
 
 pkgname = php72-xsl
 	pkgdesc = xsl module for PHP
 	depends = php72
 	depends = libxslt
-	provides = php-xsl=7.2.15
+	provides = php-xsl=7.2.16
+
+pkgname = php72-sodium
+	pkgdesc = sodium module for PHP
+	depends = php72
+	depends = libsodium
 
diff --git a/PKGBUILD b/PKGBUILD
index 8a900f39b972..a2affac8b7e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,15 @@ pkgbase=php72
 _pkgbase=${pkgbase%72}
 _realpkg=${pkgbase%}
 pkgname=("${pkgbase}"
-         "${_realpkg}-"{cgi,apache,fpm,embed,phpdbg,dblib,enchant,gd,imap,intl,odbc,pgsql,pspell,snmp,sqlite,tidy,xsl}"")
-pkgver=7.2.15
+         "${_realpkg}-"{cgi,apache,fpm,embed,phpdbg,dblib,enchant,gd,imap,intl,odbc,pgsql,pspell,snmp,sqlite,tidy,xsl,sodium}"")
+pkgver=7.2.16
 pkgrel=1
 pkgdesc="php 7.2 compiled as to not conflict with mainline php"
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
 makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libmcrypt' 'libxslt' 'libzip' 'net-snmp'
-             'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'freetds' 'pcre')
+             'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'freetds' 'pcre' 'libsodium')
 #checkdepends=('procps-ng')
 source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' 'enchant-2.patch' 'php-freetype-2.9.1.patch')
@@ -159,7 +159,7 @@ package_php72() {
     # remove static modules
     rm -f ${pkgdir}/usr/lib/${_realpkg}/modules/*.a
     # remove modules provided by sub packages
-    rm -f ${pkgdir}/usr/lib/${_realpkg}/modules/{enchant,gd,imap,intl,mcrypt,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+    rm -f ${pkgdir}/usr/lib/${_realpkg}/modules/{enchant,gd,imap,intl,sodium,mcrypt,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
     # remove empty directory
     rmdir ${pkgdir}/usr/include/php/include
 
@@ -343,11 +343,16 @@ package_php72-xsl() {
     install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/usr/lib/${_realpkg}/modules/xsl.so
 }
 
-md5sums=('2271549c2dadb4ef8cfe59e838bb0281'
+package_php72-sodium() {
+    pkgdesc='sodium module for PHP'
+    depends=("${pkgbase}" 'libsodium')
+    install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/${_realpkg}/modules/sodium.so
+}
+md5sums=('6a8f1cd5cbf025ab5977e1cca93cd8d8'
          '13cda50a6a420d04ddc26935ded3164e'
          'b7d69762f7c045b3950d770e04db504c'
-         '57342b2632c8a4a829f26e8f9985f3aa'
-         '62fa82888154a0c0d55b41a8d7138a05'
+         'f248c783449f310291905b5551c57e48'
+         '406f7a3ef7f476e4a5c26e462e47b7c7'
          '4bf0b1296fc95947a11bef36fe76102a'
          'e3883dce91ed21e23a3d7ae9fa80216d'
          'b40b82f55208eaead22dbfb64720b064')
diff --git a/php-fpm.patch b/php-fpm.patch
index f13521b76ff6..3e4ca06cc154 100644
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -9,7 +9,7 @@
 +		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
 +		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
  	fi
- 	
+
  	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
 --- sapi/fpm/php-fpm.conf.in.orig
 +++ sapi/fpm/php-fpm.conf.in
@@ -18,8 +18,8 @@
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
  ; Default Value: none
 -;pid = run/php-fpm.pid
-+;pid = /opt/php71/run/php-fpm/php-fpm.pid
- 
++;pid = /run/php72-fpm/php-fpm.pid
+
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
  ; into a local file.
@@ -27,7 +27,7 @@
  ; Default Value: log/php-fpm.log
 -;error_log = log/php-fpm.log
 +error_log = syslog
- 
+
  ; syslog_facility is used to specify what type of program is logging the
  ; message. This lets syslogd specify that messages from different facilities
 --- sapi/fpm/www.conf.in.orig
@@ -37,8 +37,8 @@
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
 -listen = 127.0.0.1:9000
-+listen = /opt/php71/run/php-fpm/php-fpm.sock
- 
++listen = /run/php72-fpm/php-fpm.sock
+
  ; Set listen(2) backlog.
  ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
 @@ -44,8 +44,8 @@
@@ -58,17 +58,18 @@
  ; Default Value: current directory or / when chroot
 -;chdir = /var/www
 +;chdir = /srv/http
- 
+
  ; Redirect worker stdout and stderr into main error log. If not set, stdout and
  ; stderr will be redirected to /dev/null according to FastCGI specs.
 --- sapi/fpm/php-fpm.service.in.orig
 +++ sapi/fpm/php-fpm.service.in
 @@ -8,7 +8,7 @@
- 
+
  [Service]
  Type=@php_fpm_systemd@
 -PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
-+PIDFile=/opt/php71/run/php-fpm/php-fpm.pid
- ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
+-ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
++PIDFile=/run/php72-fpm/php-fpm.pid
++ExecStart=@EXPANDED_SBINDIR@/php-fpm72 --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
  ExecReload=/bin/kill -USR2 $MAINPID
  PrivateTmp=true
diff --git a/php-fpm.tmpfiles b/php-fpm.tmpfiles
index 1544819f2771..29f29ad70793 100644
--- a/php-fpm.tmpfiles
+++ b/php-fpm.tmpfiles
@@ -1 +1 @@
-d /opt/php71/run/php-fpm 755 root root
+d /run/php72-fpm 755 root root