e9afe5e028
fixes many vulnerabilities http://www.php.net/ChangeLog-5.php#5.2.2 from Lawrence Teo <lteo.openbsd1@calyptix.com>;
59 lines
2.2 KiB
Plaintext
59 lines
2.2 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.8 2007/05/11 15:05:15 robert Exp $
|
|
--- configure.in.orig Wed Feb 7 01:45:04 2007
|
|
+++ configure.in Tue Apr 3 12:14:04 2007
|
|
@@ -918,7 +918,7 @@ enable_static=yes
|
|
|
|
case $php_build_target in
|
|
program|static)
|
|
- standard_libtool_flag='-prefer-non-pic -static'
|
|
+ standard_libtool_flag=''
|
|
if test -z "$PHP_MODULES"; then
|
|
enable_shared=no
|
|
fi
|
|
@@ -934,8 +934,8 @@ program|static)
|
|
shared)
|
|
enable_static=no
|
|
case $with_pic in
|
|
- yes) standard_libtool_flag='-prefer-pic';;
|
|
- no) standard_libtool_flag='-prefer-non-pic';;
|
|
+ yes) standard_libtool_flag='';;
|
|
+ no) standard_libtool_flag='';;
|
|
esac
|
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
|
|
;;
|
|
@@ -1128,7 +1128,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
|
|
EXPANDED_DATADIR=$datadir
|
|
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
|
|
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
|
|
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
|
|
+INCLUDE_PATH=.:$libdir
|
|
|
|
exec_prefix=$old_exec_prefix
|
|
libdir=$old_libdir
|
|
@@ -1300,7 +1300,7 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
|
|
INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
|
|
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
|
|
|
|
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)"
|
|
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)"
|
|
install_targets="$install_modules install-build install-headers install-programs $install_pear"
|
|
|
|
case $PHP_SAPI in
|
|
@@ -1348,7 +1348,7 @@ PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_lan
|
|
zend_ini_parser.c zend_ini_scanner.c)
|
|
|
|
PHP_ADD_SOURCES(Zend, \
|
|
- zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
|
|
+ zend_compile.c zend_constants.c zend_dynamic_array.c \
|
|
zend_execute_API.c zend_highlight.c zend_llist.c \
|
|
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
|
|
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
|
|
@@ -1370,6 +1370,7 @@ else
|
|
fi
|
|
|
|
PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
|
|
+PHP_ADD_SOURCES_X(Zend, zend_alloc.c,,PHP_GLOBAL_OBJS,,"-O0")
|
|
|
|
PHP_ADD_BUILD_DIR(main main/streams)
|
|
PHP_ADD_BUILD_DIR(regex)
|