upgrading package: apache-php 5.6.31 -> 7.1.7

apache-php/apache-php.conf

@@ -3,7 +3,7 @@
 ##
 
 #   load DSO
-LoadModule  php5_module @l_prefix@/libexec/apache/mod_php.so
+LoadModule  php7_module @l_prefix@/libexec/apache/mod_php.so
 
 #   activate PHP handler by file extension
 AddType     application/x-httpd-php  .php

apache-php/apache-php.patch

@@ -1,6 +1,6 @@
 Index: ext/intl/msgformat/msgformat_helpers.cpp
---- ext/intl/msgformat/msgformat_helpers.cpp.orig	2015-09-30 01:35:05.000000000 +0200
-+++ ext/intl/msgformat/msgformat_helpers.cpp	2015-10-16 19:33:42.856986147 +0200
+--- ext/intl/msgformat/msgformat_helpers.cpp.orig	2015-12-01 14:36:42.000000000 +0100
++++ ext/intl/msgformat/msgformat_helpers.cpp	2015-12-02 20:17:51.198927871 +0100
 @@ -62,11 +62,13 @@
  #endif
  };
@@ -16,33 +16,33 @@ Index: ext/intl/msgformat/msgformat_helpers.cpp
  #ifdef HAS_MESSAGE_PATTERN
  const MessagePattern
 Index: ext/pdo_mysql/mysql_driver.c
---- ext/pdo_mysql/mysql_driver.c.orig	2015-09-30 01:35:05.000000000 +0200
-+++ ext/pdo_mysql/mysql_driver.c	2015-10-16 19:28:25.525702213 +0200
-@@ -716,7 +716,7 @@
+--- ext/pdo_mysql/mysql_driver.c.orig	2015-12-01 14:36:34.000000000 +0100
++++ ext/pdo_mysql/mysql_driver.c	2015-12-02 20:17:51.198927871 +0100
+@@ -724,7 +724,7 @@
  			}
  		}
  
 -#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
 +#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
  		{
- 			char *public_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL TSRMLS_CC);
+ 			zend_string *public_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL);
  			if (public_key) {
 Index: ext/pdo_mysql/pdo_mysql.c
---- ext/pdo_mysql/pdo_mysql.c.orig	2015-09-30 01:35:05.000000000 +0200
-+++ ext/pdo_mysql/pdo_mysql.c	2015-10-16 19:28:25.525702213 +0200
-@@ -123,7 +123,7 @@
- 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (long)PDO_MYSQL_ATTR_SSL_CA);
- 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (long)PDO_MYSQL_ATTR_SSL_CAPATH);
- 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (long)PDO_MYSQL_ATTR_SSL_CIPHER);
+--- ext/pdo_mysql/pdo_mysql.c.orig	2015-12-02 20:17:51.198927000 +0100
++++ ext/pdo_mysql/pdo_mysql.c	2015-12-02 20:24:30.589062022 +0100
+@@ -126,7 +126,7 @@
+ 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (zend_long)PDO_MYSQL_ATTR_SSL_CA);
+ 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (zend_long)PDO_MYSQL_ATTR_SSL_CAPATH);
+ 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (zend_long)PDO_MYSQL_ATTR_SSL_CIPHER);
 -#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
 +#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
- 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
+ 	 REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (zend_long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
  #endif
- 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (long)PDO_MYSQL_ATTR_MULTI_STATEMENTS);
+ 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (zend_long)PDO_MYSQL_ATTR_MULTI_STATEMENTS);
 Index: ext/pdo_mysql/php_pdo_mysql_int.h
---- ext/pdo_mysql/php_pdo_mysql_int.h.orig	2015-09-30 01:35:05.000000000 +0200
-+++ ext/pdo_mysql/php_pdo_mysql_int.h	2015-10-16 19:28:25.525702213 +0200
-@@ -171,7 +171,7 @@
+--- ext/pdo_mysql/php_pdo_mysql_int.h.orig	2015-12-01 14:36:34.000000000 +0100
++++ ext/pdo_mysql/php_pdo_mysql_int.h	2015-12-02 20:17:51.208953657 +0100
+@@ -175,7 +175,7 @@
  	PDO_MYSQL_ATTR_SSL_CA,
  	PDO_MYSQL_ATTR_SSL_CAPATH,
  	PDO_MYSQL_ATTR_SSL_CIPHER,

apache-php/apache-php.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Web
 License:      PHP
-Version:      5.6.31
-Release:      20170723
+Version:      7.1.7
+Release:      20170726
 
 #   package options
 %option       with_bc                   no
@@ -268,7 +268,7 @@ PreReq:       gmp
     prog apache-php = {
         version   = %{version}
         url       = http://www.php.net/downloads.php
-        regex     = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
+        regex     = php-(\d+\.\d+\.\d+)\.tar\.(bz2|gz)
     }
 
 %prep
@@ -354,12 +354,10 @@ PreReq:       gmp
         --without-pdo-sqlite \
 %endif
 %if "%{with_mysql}" == "yes"
-        --with-mysql=mysqlnd \
         --with-mysqli=mysqlnd \
         --with-pdo-mysql=mysqlnd \
         --with-mysql-sock=%{l_prefix}/var/mysql/run/mysqld.sock \
 %else
-        --without-mysql \
         --without-mysqli \
         --without-pdo-mysql \
 %endif
@@ -544,9 +542,16 @@ PreReq:       gmp
 
 %install
     #   install package
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/apache
+    ( echo "#"
+      echo "LoadModule dummy_module modules/dummy.so"
+      echo "#"
+    ) >$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.conf
     %{l_make} %{l_mflags} install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
-    mv  $RPM_BUILD_ROOT%{l_prefix}/libexec/apache/libphp5.so \
+    mv  $RPM_BUILD_ROOT%{l_prefix}/libexec/apache/libphp7.so \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/apache/mod_php.so
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.conf*
 
     #   install default configuration file
     %{l_shtool} mkdir -f -p -m 755 \