usr/src/cmd/php5/patches/php_divert.patch
author Jon Tibble <meths@btinternet.com>
Mon, 04 May 2015 14:04:39 +0100
branchoi_151a
changeset 254 9c2a4ac793f0
parent 206 8644b5e5bf7f
permissions -rw-r--r--
Bash patch catchup including shellshock
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
206
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     1
--- php-5.2.17/configure.in.orig	Thu Jan 19 05:56:12 2012
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     2
+++ php-5.2.17/configure.in	Thu Jan 19 05:56:27 2012
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     3
@@ -1,7 +1,6 @@
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     4
 ## $Id: configure.in 307193 2011-01-06 23:01:19Z iliaa $ -*- autoconf -*-
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     5
 dnl ## Process this file with autoconf to produce a configure script.
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     6
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     7
-divert(1)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     8
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     9
 dnl ## Diversion 1 is the autoconf + automake setup phase. We also
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    10
 dnl ## set the PHP version, deal with platform-specific compile
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    11
@@ -256,7 +255,6 @@
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    12
 sinclude(TSRM/tsrm.m4)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    13
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    14
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    15
-divert(2)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    16
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    17
 dnl ## Diversion 2 is where we set PHP-specific options and come up
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    18
 dnl ## with reasonable default values for them. We check for pthreads here
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    19
@@ -295,7 +293,6 @@
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    20
   PTHREADS_FLAGS
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    21
 fi
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    22
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    23
-divert(3)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    24
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    25
 dnl ## In diversion 3 we check for compile-time options to the PHP
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    26
 dnl ## core and how to deal with different system dependencies.
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    27
@@ -655,7 +652,6 @@
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    28
   PHP_CRYPT_R_STYLE
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    29
 fi
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    30
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    31
-divert(4)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    32
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    33
 dnl ## In diversion 4 we check user-configurable general settings.
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    34
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    35
@@ -913,7 +909,6 @@
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    36
   AC_MSG_RESULT([using system default])
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    37
 fi
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    38
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    39
-divert(5)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    40
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    41
 dnl ## In diversion 5 we check which extensions should be compiled.
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    42
 dnl ## All of these are normally in the extension directories.
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    43
--- php-5.2.17/ext/standard/config.m4.orig	Thu Jan 19 05:57:19 2012
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    44
+++ php-5.2.17/ext/standard/config.m4	Thu Jan 19 05:59:05 2012
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    45
@@ -1,6 +1,5 @@
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    46
 dnl $Id: config.m4 291364 2009-11-27 23:41:13Z rasmus $ -*- autoconf -*-
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    47
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    48
-divert(3)dnl
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    49
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    50
 dnl
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    51
 dnl Check if flush should be called explicitly after buffered io
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    52
@@ -205,7 +204,6 @@
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    53
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    54
 AC_FUNC_FNMATCH	
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    55
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    56
-divert(5)dnl
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    57
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    58
 dnl
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    59
 dnl Check for regex library type
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    60
--- php-5.2.17/scripts/phpize.m4.orig	Thu Jan 19 05:57:11 2012
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    61
+++ php-5.2.17/scripts/phpize.m4	Thu Jan 19 05:58:52 2012
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    62
@@ -1,6 +1,5 @@
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    63
 dnl This file becomes configure.in for self-contained extensions.
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    64
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    65
-divert(1)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    66
 
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    67
 AC_PREREQ(2.13)
8644b5e5bf7f Build PHP on a8
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    68
 AC_INIT(config.m4)