Ticket #6560: php5-5.3.1-3.patch

File php5-5.3.1-3.patch, 3.8 KB (added by crick <mail@…>, 6 years ago)
  • files/php.ini

    diff -Naurdb php5-5.3.1-orig/files/php.ini php5-5.3.1/files/php.ini
    old new  
    11[PHP] 
    22 
    3 zend.ze1_compatibility_mode = Off 
    4  
    53; Language Options 
    64 
    75engine = On 
  • Makefile

    diff -Naurdb php5-5.3.1-orig/Makefile php5-5.3.1/Makefile
    old new  
    99 
    1010PKG_NAME:=php 
    1111PKG_VERSION:=5.3.1 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.php.net/distributions/ 
     
    365365  depends on PHP5_LIBXML 
    366366endef 
    367367 
     368PKG_CONFIGURE_LIBS+= -ldl 
    368369PKG_CONFIGURE_OPTS:= \ 
    369370        --enable-shared \ 
    370371        --disable-static \ 
     
    442443        --with-jpeg-dir="$(STAGING_DIR)/usr" \ 
    443444        --with-png-dir="$(STAGING_DIR)/usr" \ 
    444445        --without-xpm-dir \ 
    445         --without-ttf \ 
    446446        --without-t1lib \ 
    447447        --enable-gd-native-ttf \ 
    448448        --disable-gd-jis-conv 
     
    521521  endif 
    522522  ifneq ($(CONFIG_PACKAGE_php5-mod-pdo-sqlite),) 
    523523    PKG_CONFIGURE_OPTS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr" 
    524     PKG_CONFIGURE_LIBS+= -lsqlite3 
    525524  else 
    526525    PKG_CONFIGURE_OPTS+= --without-pdo-sqlite 
    527526  endif 
     
    561560 
    562561ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite3),) 
    563562  PKG_CONFIGURE_OPTS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr" 
    564   PKG_CONFIGURE_LIBS+= -lsqlite3 
    565563else 
    566564  PKG_CONFIGURE_OPTS+= --without-sqlite3 
    567565endif 
     
    626624 
    627625ifneq ($(CONFIG_PACKAGE_php5-cli),) 
    628626  define Build/Compile/php5-cli 
     627        cd $(PKG_BUILD_DIR) && ./buildconf --force 
    629628        -$(MAKE) -C $(PKG_BUILD_DIR) clean 
    630629        $(call Build/Configure/Default, \ 
    631630                $(PKG_CONFIGURE_OPTS) \ 
     
    644643 
    645644ifneq ($(CONFIG_PACKAGE_php5-cgi),) 
    646645  define Build/Compile/php5-cgi 
     646        cd $(PKG_BUILD_DIR) && ./buildconf --force 
    647647        -$(MAKE) -C $(PKG_BUILD_DIR) clean 
    648648        $(call Build/Configure/Default, \ 
    649649                $(PKG_CONFIGURE_OPTS) \ 
  • patches/001-configure_cross.patch

    diff -Naurdb php5-5.3.1-orig/patches/001-configure_cross.patch php5-5.3.1/patches/001-configure_cross.patch
    old new  
    1 diff -Naur php-5.3.1.orig/configure php-5.3.1/configure 
    2 --- php-5.3.1.orig/configure    2009-11-18 21:11:57.000000000 +0100 
    3 +++ php-5.3.1/configure 2010-01-15 23:43:10.000000000 +0100 
    4 @@ -14712,7 +14712,7 @@ 
    5      ac_libs=$LIBS 
    6      LIBS="$LIBS -ldl" 
    7      if test "$cross_compiling" = yes; then 
    8 -  found=no 
    9 +  found=yes 
    10  else 
    11    cat > conftest.$ac_ext <<EOF 
    12  #line 14719 "configure" 
    13 @@ -54494,7 +54494,7 @@ 
    14      _SAVE_CPPFLAGS=$CPPFLAGS 
    15    _SAVE_LIBS=$LIBS 
    16    CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR" 
    17 -  LIBS="$LIBS $LDAP_SHARED_LIBADD" 
    18 +  LIBS="$LIBS $LDAP_SHARED_LIBADD -lsasl2" 
    19   
    20      echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6 
    21  echo "configure:54501: checking for 3 arg ldap_set_rebind_proc" >&5 
  • patches/005-APC.patch

    diff -Naurdb php5-5.3.1-orig/patches/005-APC.patch php5-5.3.1/patches/005-APC.patch
    old new  
    54285428diff -ubrN php-5.2.5-orig/ext/apc/apc_fcntl.c php-5.2.5/ext/apc/apc_fcntl.c 
    54295429--- php-5.2.5-orig/ext/apc/apc_fcntl.c  1969-12-31 18:00:00.000000000 -0600 
    54305430+++ php-5.2.5/ext/apc/apc_fcntl.c       2007-12-26 16:51:32.000000000 -0600 
    5431 @@ -0,0 +1,118 @@ 
     5431@@ -0,0 +1,123 @@ 
    54325432+/* 
    54335433+  +----------------------------------------------------------------------+ 
    54345434+  | APC                                                                  | 
     
    55475547+/* 
    55485548+ * Local variables: 
    55495549+ * tab-width: 4 
     5550+ * c-basic-offset: 4 
    55505551+ * End: 
    55515552+ * vim>600: expandtab sw=4 ts=4 sts=4 fdm=marker 
    55525553+ * vim<600: expandtab sw=4 ts=4 sts=4