Changeset 13849


Ignorieren:
Zeitstempel:
31.07.2016 14:20:31 (vor 16 Monaten)
Autor:
er13
Nachricht:

php:

  • add experimental support for php-5.6.x
  • compile-tested only
Ort:
trunk
Dateien:
1 hinzugefügt
11 bearbeitet
1 kopiert

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r13846 r13849  
    154154    * pcre 8.38 
    155155    * pcscd 1.8.12 
    156     * php 5.4.45/5.5.38 
     156    * php 5.4.45/5.5.38/5.6.24 
    157157    * privoxy 3.0.24 
    158158    * polarssl 1.2.19/1.3.17 
  • trunk/make/php/Config.in

    r13847 r13849  
    2121    config FREETZ_PHP_VERSION_5_5 
    2222        bool "php 5.5.38" 
     23    config FREETZ_PHP_VERSION_5_6 
     24        bool "php 5.6.24 (EXPERIMENTAL)" 
    2325endchoice 
    2426 
  • trunk/make/php/patches/5.6/100-libxml-support-missing-ifdefs.patch

    r13068 r13849  
    11--- ext/libxml/libxml.c 
    22+++ ext/libxml/libxml.c 
    3 @@ -820,11 +820,11 @@ 
     3@@ -821,11 +821,11 @@ 
    44 #endif 
    55  
  • trunk/make/php/patches/5.6/101-missing_openssl_ifdef.patch

    r13068 r13849  
    11--- ext/openssl/openssl.c 
    22+++ ext/openssl/openssl.c 
    3 @@ -69,12 +69,18 @@ 
     3@@ -70,12 +70,18 @@ 
    44 #endif 
    55 #define OPENSSL_ALGO_DSS1  5 
     
    2020  
    2121 #if !defined(OPENSSL_NO_EC) && defined(EVP_PKEY_EC) 
    22 @@ -991,22 +997,28 @@ 
     22@@ -1057,22 +1063,28 @@ 
    2323            mdtype = (EVP_MD *) EVP_dss1(); 
    2424            break; 
     
    4949            return NULL; 
    5050            break; 
    51 @@ -1102,12 +1114,18 @@ 
     51@@ -1175,12 +1187,18 @@ 
    5252 #endif 
    5353    REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT); 
  • trunk/make/php/patches/5.6/120-openssl-no-rc4.patch

    r13778 r13849  
    11--- ext/openssl/openssl.c 
    22+++ ext/openssl/openssl.c 
    3 @@ -4390,7 +4390,12 @@ 
     3@@ -4959,7 +4959,12 @@ 
    44            RETURN_FALSE; 
    55        } 
     
    1414  
    1515    pkeys = safe_emalloc(nkeys, sizeof(*pkeys), 0); 
    16 @@ -4518,7 +4523,12 @@ 
     16@@ -5087,7 +5092,12 @@ 
    1717            RETURN_FALSE; 
    1818        } 
  • trunk/make/php/patches/5.6/300-no_ldcxx.patch

    r13166 r13849  
    11--- configure 
    22+++ configure 
    3 @@ -113192,7 +113192,7 @@ 
     3@@ -115372,7 +115372,7 @@ 
    44 GCC=$lt_save_GCC 
    55 with_gnu_ldcxx=$with_gnu_ld 
  • trunk/make/php/patches/5.6/500-ttyname_r.patch

    r13166 r13849  
    11--- configure 
    22+++ configure 
    3 @@ -78040,8 +78040,10 @@ 
     3@@ -79178,8 +79178,10 @@ 
    44 $as_echo_n "checking for working ttyname_r() implementation... " >&6; } 
    55   if test "$cross_compiling" = yes; then : 
  • trunk/make/php/patches/5.6/600-iconv_in_libc_workaround.patch

    r13166 r13849  
    11--- configure 
    22+++ configure 
    3 @@ -45966,7 +45966,7 @@ 
     3@@ -47098,7 +47098,7 @@ 
    44  
    55   if test "$iconv_avail" != "no"; then 
  • trunk/make/php/patches/5.6/650-no_libpng_with_external_libgd.patch

    r13166 r13849  
    11--- configure 
    22+++ configure 
    3 @@ -37808,7 +37808,7 @@ 
     3@@ -38792,7 +38792,7 @@ 
    44  
    55 if test "$PHP_GD" != "no"; then 
  • trunk/make/php/patches/5.6/660-flock_type_linux.patch

    r13166 r13849  
    11--- configure 
    22+++ configure 
    3 @@ -65468,6 +65468,11 @@ 
     3@@ -66551,6 +66551,11 @@ 
    44   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5 
    55 $as_echo "$msg" >&6; } 
     
    1313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"whether flock struct is linux ordered\"" >&5 
    1414 $as_echo_n "checking \"whether flock struct is linux ordered\"... " >&6; } 
    15 @@ -65545,6 +65550,7 @@ 
     15@@ -66628,6 +66633,7 @@ 
    1616 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ 
    1717   conftest.$ac_objext conftest.beam conftest.$ac_ext 
     
    2020  
    2121  
    22  if test "$flock_type" == "unknown"; then 
     22 if test "$flock_type" = "unknown"; then 
  • trunk/make/php/php.mk

    r13846 r13849  
    1 $(call PKG_INIT_BIN, $(if $(FREETZ_PHP_VERSION_5_4),5.4.45,5.5.38)) 
     1$(call PKG_INIT_BIN, $(if $(FREETZ_PHP_VERSION_5_4),5.4.45,$(if $(FREETZ_PHP_VERSION_5_6),5.6.24,5.5.38))) 
    22$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.bz2 
    33$(PKG)_SOURCE_MD5_5.4.45:=185f67f1ca652b18bc0cca9d7edbde7c 
    44$(PKG)_SOURCE_MD5_5.5.38:=312244a0eecad602a1555ed2434e223f 
     5$(PKG)_SOURCE_MD5_5.6.24:=2ab124d58b7b763ca453f6a18ec3866b 
    56$(PKG)_SOURCE_MD5:=$($(PKG)_SOURCE_MD5_$($(PKG)_VERSION)) 
    67$(PKG)_SITE:=http://de.php.net/distributions 
     
    139140$(PKG)_REBUILD_SUBOPTS += FREETZ_PHP_VERSION_5_4 
    140141$(PKG)_REBUILD_SUBOPTS += FREETZ_PHP_VERSION_5_5 
     142$(PKG)_REBUILD_SUBOPTS += FREETZ_PHP_VERSION_5_6 
    141143$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_PHP_STATIC 
    142144$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_PHP_apxs2 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.