- from DEVEL

Changed files:
    php-hardening-fix.patch -> 1.3
    php-readline.patch -> 1.2

diff --git a/php-hardening-fix.patch b/php-hardening-fix.patch
new file mode 100644 (file)
index 0000000..1ab1ce4
--- /dev/null
+++ b/php-hardening-fix.patch
@@ -0,0 +1,28 @@
+diff -uNr php-5.0.4.orig/main/hardening_patch.c php-5.0.4/main/hardening_patch.c
+--- php-5.0.4.orig/main/hardening_patch.c      2005-07-03 02:05:18.000000000 +0200
++++ php-5.0.4/main/hardening_patch.c   2005-07-03 02:06:58.000000000 +0200
+@@ -126,9 +126,9 @@
+               i++;
+       }
+       
+-      if (zend_is_executing(TSRMLS_CC)) {
+-              lineno = zend_get_executed_lineno(TSRMLS_CC);
+-              fname = zend_get_executed_filename(TSRMLS_CC);
++      if (zend_is_executing(TSRMLS_C)) {
++              lineno = zend_get_executed_lineno(TSRMLS_C);
++              fname = zend_get_executed_filename(TSRMLS_C);
+               ap_php_snprintf(buf, sizeof(buf), "ALERT - %s (attacker '%s', file '%s', line %u)", error, ip_address, fname, lineno);
+       } else {
+               fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
+diff -uNr php-5.0.4.orig/Zend/zend_execute_API.c php-5.0.4/Zend/zend_execute_API.c
+--- php-5.0.4.orig/Zend/zend_execute_API.c     2005-07-03 02:05:18.000000000 +0200
++++ php-5.0.4/Zend/zend_execute_API.c  2005-07-03 02:06:32.000000000 +0200
+@@ -1037,7 +1037,7 @@
+ 
+ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC)
+ {
+-      return (zend_eval_string_ex_ex(str, retval_ptr, string_name, ZEND_EVAL_CODE TSRMLS_C));
++      return (zend_eval_string_ex_ex(str, retval_ptr, string_name, ZEND_EVAL_CODE TSRMLS_CC));
+ }
+ 
+ 

diff --git a/php-readline.patch b/php-readline.patch
new file mode 100644 (file)
index 0000000..d94a353
--- /dev/null
+++ b/php-readline.patch
@@ -0,0 +1,12 @@
+diff -urN php-5.1.0RC1.org/sapi/cli/config.m4 php-5.1.0RC1/sapi/cli/config.m4
+--- php-5.1.0RC1.org/sapi/cli/config.m4        2005-08-25 19:54:02.051504000 +0200
++++ php-5.1.0RC1/sapi/cli/config.m4    2005-08-25 19:54:28.699452976 +0200
+@@ -29,7 +29,7 @@
+     BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+     ;;
+   *)
+-    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
++    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)"
+     ;;
+   esac
+   INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"