Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 68777 Details for
Bug 106418
Emerging "dev-php/php-4.4.0-r1" fails with "Failed Patch: php4.4.0-pcre-security.patch !"
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
The failing patch file
php4.4.0-pcre-security.patch (text/plain), 6.28 KB, created by
Oliver Schwabedissen
on 2005-09-18 15:34:44 UTC
(
hide
)
Description:
The failing patch file
Filename:
MIME Type:
Creator:
Oliver Schwabedissen
Created:
2005-09-18 15:34:44 UTC
Size:
6.28 KB
patch
obsolete
>--- configure 2005-09-18 02:12:50.000000000 +0200 >+++ configure 2005-09-18 21:00:29.000000000 +0200 >@@ -1685,7 +1685,7 @@ > MAJOR_VERSION=4 > MINOR_VERSION=4 > RELEASE_VERSION=0 >-EXTRA_VERSION="" >+EXTRA_VERSION="-gentoo-r1" > VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" > > >@@ -71512,7 +71506,7 @@ > ext_builddir=ext/pcre > ext_srcdir=$abs_srcdir/ext/pcre > >- 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` >+ 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 > >@@ -71536,7 +71530,7 @@ > > > old_IFS=$IFS >- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do >+ 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 >@@ -71582,7 +71576,7 @@ > > > old_IFS=$IFS >- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do >+ 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 >@@ -71658,7 +71652,7 @@ > > > old_IFS=$IFS >- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do >+ 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 >@@ -71701,7 +71695,7 @@ > > > old_IFS=$IFS >- for ac_src in pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c; do >+ 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 >@@ -71902,7 +71896,7 @@ > ext_builddir=ext/pcre > ext_srcdir=$abs_srcdir/ext/pcre > >- ac_extra=`echo "-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000"|sed s#@ext_srcdir@#$ext_srcdir#g` >+ 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 > >--- configure.in 2005-09-17 17:44:30.000000000 +0200 >+++ configure.in 2005-09-17 17:45:01.000000000 +0200 >@@ -41,7 +41,7 @@ > MAJOR_VERSION=4 > MINOR_VERSION=4 > RELEASE_VERSION=0 >-EXTRA_VERSION="" >+EXTRA_VERSION="-gentoo-r1" > VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" > > dnl Define where extension directories are located in the configure context >--- ext/pcre/config.m4 2005/05/31 12:22:27 1.29.2.7 >+++ ext/pcre/config.m4 2005/08/09 17:41:56 1.29.2.7.2.1 >@@ -1,5 +1,5 @@ > dnl >-dnl $Id: php4.4.0-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $ >+dnl $Id: php4.4.0-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $ > dnl > > dnl By default we'll compile and link against the bundled PCRE library >@@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support > > if test "$PHP_PCRE_REGEX" != "no"; then > if test "$PHP_PCRE_REGEX" = "yes"; then >- 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) >+ 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) > PHP_ADD_BUILD_DIR($ext_builddir/pcrelib) > AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) > else >@@ -50,7 +50,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then > > AC_DEFINE(HAVE_PCRE, 1, [ ]) > PHP_ADD_INCLUDE($PCRE_INCDIR) >- PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000) >+ 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) > fi > PHP_SUBST(PCRE_SHARED_LIBADD) > fi
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=68777">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 106418
: 68777
