[Astlinux-commits] SF.net SVN: astlinux:[7111] branches/1.0/package/php

[<abe...@us...>]

Revision: 7111
          http://sourceforge.net/p/astlinux/code/7111
Author:   abelbeck
Date:     2015-06-12 00:27:48 +0000 (Fri, 12 Jun 2015)
Log Message:
-----------
php, version bump to 5.5.26

Modified Paths:
--------------
    branches/1.0/package/php/php-0001-no-iconv-search.patch
    branches/1.0/package/php/php-0003-disable-pharcmd.patch
    branches/1.0/package/php/php.mk

Modified: branches/1.0/package/php/php-0001-no-iconv-search.patch
===================================================================
--- branches/1.0/package/php/php-0001-no-iconv-search.patch	2015-06-11 15:33:14 UTC (rev 7110)
+++ branches/1.0/package/php/php-0001-no-iconv-search.patch	2015-06-12 00:27:48 UTC (rev 7111)
@@ -12,7 +12,7 @@
 diff -Nura php-5.5.11.orig/configure php-5.5.11/configure
 --- php-5.5.11.orig/configure	2014-04-16 14:55:52.300838499 -0300
 +++ php-5.5.11/configure	2014-04-22 21:54:01.499097295 -0300
-@@ -45943,12 +45943,6 @@
+@@ -45944,12 +45944,6 @@
    if test -n "$unique" && test "`eval $cmd`" = "" ; then
      eval "INCLUDEPATH$unique=set"
  
@@ -25,7 +25,7 @@
    fi
  
    fi
-@@ -45978,14 +45972,7 @@
+@@ -45979,14 +45973,7 @@
        PHP_ICONV_PREFIX="$ICONV_DIR"
      fi
  
@@ -36,12 +36,12 @@
 -      PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
 -    else
 -      PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
--    fi
+-	fi
 +      PHP_ICONV_H_PATH="iconv.h"
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
  $as_echo_n "checking if iconv is glibc's... " >&6; }
-@@ -46383,8 +46370,6 @@
+@@ -46446,8 +46433,6 @@
    ext_builddir=ext/iconv
    ext_srcdir=$abs_srcdir/ext/iconv
  
@@ -50,7 +50,7 @@
    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
      PHP_ICONV_SHARED=no
  
-@@ -97712,12 +97697,6 @@
+@@ -97775,12 +97760,6 @@
    if test -n "$unique" && test "`eval $cmd`" = "" ; then
      eval "INCLUDEPATH$unique=set"
  

Modified: branches/1.0/package/php/php-0003-disable-pharcmd.patch
===================================================================
--- branches/1.0/package/php/php-0003-disable-pharcmd.patch	2015-06-11 15:33:14 UTC (rev 7110)
+++ branches/1.0/package/php/php-0003-disable-pharcmd.patch	2015-06-12 00:27:48 UTC (rev 7111)
@@ -8,7 +8,7 @@
 diff -Nura php-5.5.14.orig/configure php-5.5.14/configure
 --- php-5.5.14.orig/configure	2014-07-08 09:52:52.657753194 -0300
 +++ php-5.5.14/configure	2014-07-08 09:53:07.610243933 -0300
-@@ -113196,13 +113196,8 @@
+@@ -113259,13 +113259,8 @@
  INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  

Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk	2015-06-11 15:33:14 UTC (rev 7110)
+++ branches/1.0/package/php/php.mk	2015-06-12 00:27:48 UTC (rev 7111)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.5.25
+PHP_VERSION = 5.5.26
 PHP_SITE = http://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.