Attachment #68777 for bug #106418

View | Details | Raw Unified | Return to bug 106418
Collapse All | Expand All




MAJOR_VERSION=4
MINOR_VERSION=4
RELEASE_VERSION=0
EXTRA_VERSION="-gentoo-r1"
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"



  ext_builddir=ext/pcre
  ext_srcdir=$abs_srcdir/ext/pcre

  ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"|sed s#@ext_srcdir@#$ext_srcdir#g`

  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then




  old_IFS=$IFS
  for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do
  
      IFS=.
      set $ac_src



  old_IFS=$IFS
  for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do
  
      IFS=.
      set $ac_src



  old_IFS=$IFS
  for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do
  
      IFS=.
      set $ac_src



  old_IFS=$IFS
  for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do
  
      IFS=.
      set $ac_src

  ext_builddir=ext/pcre
  ext_srcdir=$abs_srcdir/ext/pcre

  ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"|sed s#@ext_srcdir@#$ext_srcdir#g`

  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then


Lines 41-47 Link Here

(-)configure.in (-1 / +1 lines)
41	MAJOR_VERSION=4	41	MAJOR_VERSION=4
42	MINOR_VERSION=4	42	MINOR_VERSION=4
43	RELEASE_VERSION=0	43	RELEASE_VERSION=0
44	EXTRA_VERSION=""	44	EXTRA_VERSION="-gentoo-r1"
45	VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"	45	VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
46		46
47	dnl Define where extension directories are located in the configure context	47	dnl Define where extension directories are located in the configure context

Lines 1-5 Link Here

(-)ext/pcre/config.m4 (-3 / +3 lines)
1	dnl	1	dnl
2	dnl $Id: php4.4.0-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $	2	dnl $Id: php4.4.0-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $
3	dnl	3	dnl
4	dnl By default we'll compile and link against the bundled PCRE library	4	dnl By default we'll compile and link against the bundled PCRE library
Lines 13-19 PHP_ARG_WITH(pcre-regex,for PCRE support Link Here
13	if test "$PHP_PCRE_REGEX" != "no"; then	13	if test "$PHP_PCRE_REGEX" != "no"; then
14	if test "$PHP_PCRE_REGEX" = "yes"; then	14	if test "$PHP_PCRE_REGEX" = "yes"; then
15	PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib)	15	PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib)
16	PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)	16	PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
17	AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])	17	AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
18	else	18	else
Lines 50-56 if test "$PHP_PCRE_REGEX" != "no"; then Link Here
50	AC_DEFINE(HAVE_PCRE, 1, [ ])	50	AC_DEFINE(HAVE_PCRE, 1, [ ])
51	PHP_ADD_INCLUDE($PCRE_INCDIR)	51	PHP_ADD_INCLUDE($PCRE_INCDIR)
52	PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000)	52	PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000)
53	fi	53	fi
54	PHP_SUBST(PCRE_SHARED_LIBADD)	54	PHP_SUBST(PCRE_SHARED_LIBADD)
55	fi	55	fi

Return to bug 106418

Lines 1685-1691 Link Here

(-)configure (-7 / +7 lines)
1685	MAJOR_VERSION=4	1685	MAJOR_VERSION=4
1686	MINOR_VERSION=4	1686	MINOR_VERSION=4
1687	RELEASE_VERSION=0	1687	RELEASE_VERSION=0
1688	EXTRA_VERSION=""	1688	EXTRA_VERSION="-gentoo-r1"
1689	VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"	1689	VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
1690		1690
1691		1691
Lines 71512-71518 Link Here
71512	ext_builddir=ext/pcre	71506	ext_builddir=ext/pcre
71513	ext_srcdir=$abs_srcdir/ext/pcre	71507	ext_srcdir=$abs_srcdir/ext/pcre
71514		71508
71515	ac_extra=`echo "-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"\|sed s#@ext_srcdir@#$ext_srcdir#g`	71509	ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib"\|sed s#@ext_srcdir@#$ext_srcdir#g`
71516		71510
71517	if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then	71511	if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
71518		71512
Lines 71536-71542 Link Here
71536		71530
71537		71531
71538	old_IFS=$IFS	71532	old_IFS=$IFS
71539	for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do	71533	for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do
71540		71534
71541	IFS=.	71535	IFS=.
71542	set $ac_src	71536	set $ac_src
Lines 71582-71588 Link Here
71582		71576
71583		71577
71584	old_IFS=$IFS	71578	old_IFS=$IFS
71585	for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do	71579	for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do
71586		71580
71587	IFS=.	71581	IFS=.
71588	set $ac_src	71582	set $ac_src
Lines 71658-71664 Link Here
71658		71652
71659		71653
71660	old_IFS=$IFS	71654	old_IFS=$IFS
71661	for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do	71655	for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do
71662		71656
71663	IFS=.	71657	IFS=.
71664	set $ac_src	71658	set $ac_src
Lines 71701-71707 Link Here
71701		71695
71702		71696
71703	old_IFS=$IFS	71697	old_IFS=$IFS
71704	for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do	71698	for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_printint.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_ucp_findchar.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do
71705		71699
71706	IFS=.	71700	IFS=.
71707	set $ac_src	71701	set $ac_src
Lines 71902-71908 Link Here
71902	ext_builddir=ext/pcre	71896	ext_builddir=ext/pcre
71903	ext_srcdir=$abs_srcdir/ext/pcre	71897	ext_srcdir=$abs_srcdir/ext/pcre
71904		71898
71905	ac_extra=`echo "-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"\|sed s#@ext_srcdir@#$ext_srcdir#g`	71899	ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"\|sed s#@ext_srcdir@#$ext_srcdir#g`
71906		71900
71907	if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then	71901	if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
71908		71902