rpms/php/devel php-5.0.4-dlopen.patch, NONE, 1.1 php-5.0.4-lib64.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 Makefile, 1.1, 1.2 php-5.0.0-easter.patch, 1.1, 1.2 php-5.0.3-gcc4.patch, 1.2, 1.3 php.conf, 1.6, 1.7 php.spec, 1.62, 1.63 sources, 1.18, 1.19 php-4.3.1-dlopen.patch, 1.5, NONE php-4.3.3-miscfix.patch, 1.4, NONE php-5.0.2-lib64.patch, 1.2, NONE php-5.0.3-libmbfl.patch, 1.1, NONE php-5.0.3-memset0.patch, 1.1, NONE php-5.0.3-mysqli.patch, 1.1, NONE php-5.0.3-mysqliglobal.patch, 1.1, NONE php-5.0.3-zendwarn.patch, 1.1, NONE php-5.0.3-zstrtod.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 1 12:01:22 UTC 2005
Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25033
Modified Files:
.cvsignore Makefile php-5.0.0-easter.patch
php-5.0.3-gcc4.patch php.conf php.spec sources
Added Files:
php-5.0.4-dlopen.patch php-5.0.4-lib64.patch
Removed Files:
php-4.3.1-dlopen.patch php-4.3.3-miscfix.patch
php-5.0.2-lib64.patch php-5.0.3-libmbfl.patch
php-5.0.3-memset0.patch php-5.0.3-mysqli.patch
php-5.0.3-mysqliglobal.patch php-5.0.3-zendwarn.patch
php-5.0.3-zstrtod.patch
Log Message:
* Fri Apr 1 2005 Joe Orton <jorton at redhat.com> 5.0.4-1
- update to 5.0.4 (#153068)
- add .phps AddType to php.conf (#152973)
php-5.0.4-dlopen.patch:
zend.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE php-5.0.4-dlopen.patch ---
--- php-5.0.4/Zend/zend.h.dlopen
+++ php-5.0.4/Zend/zend.h
@@ -102,11 +102,11 @@
# endif
# if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
# elif defined(RTLD_DEEPBIND)
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND)
# else
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL)
# endif
# define DL_UNLOAD dlclose
# if defined(DLSYM_NEEDS_UNDERSCORE)
php-5.0.4-lib64.patch:
acinclude.m4 | 26 +++++++++++++-------------
configure.in | 5 +++++
ext/bz2/config.m4 | 4 ++--
ext/cpdf/config.m4 | 6 +++---
ext/curl/config.m4 | 6 +++---
ext/dba/config.m4 | 18 ++++++++----------
ext/fam/config.m4 | 4 ++--
ext/gd/config.m4 | 28 ++++++++++++++--------------
ext/gettext/config.m4 | 2 +-
ext/gmp/config.m4 | 6 +++---
ext/iconv/config.m4 | 2 +-
ext/imap/config.m4 | 8 +-------
ext/ldap/config.m4 | 8 ++++----
ext/mbstring/config.m4 | 4 ++--
ext/mysql/config.m4 | 6 +++---
ext/ncurses/config.m4 | 8 ++++----
ext/odbc/config.m4 | 20 ++++++++++----------
ext/pcre/config.m4 | 2 +-
ext/pgsql/config.m4 | 2 +-
ext/pspell/config.m4 | 2 +-
ext/readline/config.m4 | 12 ++++++------
ext/recode/config.m4 | 6 +++---
ext/session/config.m4 | 2 +-
ext/sqlite/config.m4 | 4 ++--
ext/xml/config.m4 | 4 ++--
ext/xmlrpc/config.m4 | 6 +++---
ext/xsl/config.m4 | 2 +-
ext/zlib/config0.m4 | 4 ++--
28 files changed, 102 insertions(+), 105 deletions(-)
--- NEW FILE php-5.0.4-lib64.patch ---
--- php-5.0.4/ext/gd/config.m4.lib64
+++ php-5.0.4/ext/gd/config.m4
@@ -51,7 +51,7 @@
if test "$PHP_JPEG_DIR" != "no"; then
for i in $PHP_JPEG_DIR /usr/local /usr; do
- test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break
+ test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
done
if test -z "$GD_JPEG_DIR"; then
@@ -61,11 +61,11 @@
PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
[
PHP_ADD_INCLUDE($GD_JPEG_DIR/include)
- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
],[
AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.])
],[
- -L$GD_JPEG_DIR/lib
+ -L$GD_JPEG_DIR/$PHP_LIBDIR
])
else
AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
@@ -76,7 +76,7 @@
if test "$PHP_PNG_DIR" != "no"; then
for i in $PHP_PNG_DIR /usr/local /usr; do
- test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break
+ test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
done
if test -z "$GD_PNG_DIR"; then
@@ -94,12 +94,12 @@
PHP_CHECK_LIBRARY(png,png_write_image,
[
PHP_ADD_INCLUDE($GD_PNG_DIR/include)
- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
],[
AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
],[
- -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib
+ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
])
else
@@ -111,7 +111,7 @@
if test "$PHP_XPM_DIR" != "no"; then
for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
- test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break
+ test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
done
if test -z "$GD_XPM_DIR"; then
@@ -129,12 +129,12 @@
PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
[
PHP_ADD_INCLUDE($GD_XPM_INC)
- PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
],[
AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.])
],[
- -L$GD_XPM_DIR/lib -lX11
+ -L$GD_XPM_DIR/$PHP_LIBDIR -lX11
])
else
AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)
@@ -163,7 +163,7 @@
fi
if test -n "$TTF_DIR" ; then
AC_DEFINE(HAVE_LIBTTF,1,[ ])
- PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
fi
if test -z "$TTF_INC_DIR"; then
TTF_INC_DIR=$TTF_DIR/include
@@ -188,7 +188,7 @@
done
if test -n "$FREETYPE2_DIR" ; then
- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
@@ -216,7 +216,7 @@
[
AC_DEFINE(HAVE_LIBT1,1,[ ])
PHP_ADD_INCLUDE($GD_T1_DIR/include)
- PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
],[
AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
],[
--- php-5.0.4/ext/bz2/config.m4.lib64
+++ php-5.0.4/ext/bz2/config.m4
@@ -27,12 +27,12 @@
PHP_CHECK_LIBRARY(bz2, BZ2_bzerror,
[
PHP_ADD_INCLUDE($BZIP_DIR/include)
- PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD)
AC_DEFINE(HAVE_BZ2,1,[ ])
], [
AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0)
], [
- -L$BZIP_DIR/lib
+ -L$BZIP_DIR/$PHP_LIBDIR
])
PHP_NEW_EXTENSION(bz2, bz2.c, $ext_shared)
--- php-5.0.4/ext/dba/config.m4.lib64
+++ php-5.0.4/ext/dba/config.m4
@@ -21,7 +21,7 @@
dnl Assign INCLUDE/LFLAGS from PREFIX
AC_DEFUN([PHP_DBA_STD_ASSIGN],[
if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
- THIS_LFLAGS=$THIS_PREFIX/lib
+ THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
fi
])
@@ -86,7 +86,7 @@
AC_DEFINE_UNQUOTED(QDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_QDBM, 1, [ ])
THIS_LIBS=$LIB
- ], [], [-L$THIS_PREFIX/lib])
+ ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
if test -n "$THIS_LIBS"; then
break
fi
@@ -120,7 +120,7 @@
AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_GDBM, 1, [ ])
THIS_LIBS=gdbm
- ], [], [-L$THIS_PREFIX/lib])
+ ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
fi
PHP_DBA_STD_ASSIGN
@@ -152,7 +152,7 @@
AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_NDBM, 1, [ ])
THIS_LIBS=$LIB
- ], [], [-L$THIS_PREFIX/lib])
+ ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
if test -n "$THIS_LIBS"; then
break
fi
@@ -170,8 +170,7 @@
dnl parameters(version, library list, function)
AC_DEFUN([PHP_DBA_DB_CHECK],[
for LIB in $2; do
- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[
+ PHP_TEMP_LDFLAGS([], -l$LIB,[
AC_TRY_LINK([
#include "$THIS_INCLUDE"
],[
@@ -188,7 +187,6 @@
])
])
])
- fi
done
if test -z "$THIS_LIBS"; then
AC_MSG_CHECKING(for db$1 major version)
@@ -258,7 +256,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
])
AC_DBA_STD_RESULT(db4,Berkeley DB4)
@@ -366,7 +364,7 @@
fi
AC_DEFINE(DBA_DBM, 1, [ ])
THIS_LIBS=$LIB
- ], [], [-L$THIS_PREFIX/lib])
+ ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
if test -n "$THIS_LIBS"; then
break
fi
@@ -408,7 +406,7 @@
AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_CDB, 1, [ ])
THIS_LIBS=$LIB
- ], [], [-L$THIS_PREFIX/lib])
+ ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
if test -n "$THIS_LIBS"; then
break
fi
--- php-5.0.4/ext/fam/config.m4.lib64
+++ php-5.0.4/ext/fam/config.m4
@@ -42,12 +42,12 @@
PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
[
- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FAM_DIR/lib, FAM_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $FAM_DIR/$PHP_LIBDIR, FAM_SHARED_LIBADD)
AC_DEFINE(HAVE_FAMLIB,1,[ ])
],[
AC_MSG_ERROR([wrong fam lib version or lib not found])
],[
- -L$FAM_DIR/lib -lm -ldl
+ -L$FAM_DIR/$PHP_LIBDIR -lm -ldl
])
PHP_SUBST(FAM_SHARED_LIBADD)
--- php-5.0.4/ext/gmp/config.m4.lib64
+++ php-5.0.4/ext/gmp/config.m4
@@ -21,13 +21,13 @@
[],[
AC_MSG_ERROR([GNU MP Library version 4.1.2 or greater required.])
],[
- -L$GMP_DIR/lib
+ -L$GMP_DIR/$PHP_LIBDIR
])
],[
- -L$GMP_DIR/lib
+ -L$GMP_DIR/$PHP_LIBDIR
])
- PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/$PHP_LIBDIR, GMP_SHARED_LIBADD)
PHP_ADD_INCLUDE($GMP_DIR/include)
PHP_NEW_EXTENSION(gmp, gmp.c, $ext_shared)
--- php-5.0.4/ext/xml/config.m4.lib64
+++ php-5.0.4/ext/xml/config.m4
@@ -30,7 +30,7 @@
dnl
if test "$PHP_LIBEXPAT_DIR" != "no"; then
for i in $PHP_XML $PHP_LIBEXPAT_DIR; do
- if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then
+ if test -f "$i/$PHP_LIBDIR/libexpat.a" -o -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
EXPAT_DIR=$i
break
fi
@@ -41,7 +41,7 @@
fi
PHP_ADD_INCLUDE($EXPAT_DIR/include)
- PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/$PHP_LIBDIR, XML_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
fi
--- php-5.0.4/ext/xsl/config.m4.lib64
+++ php-5.0.4/ext/xsl/config.m4
@@ -45,7 +45,7 @@
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT(found)
- PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/lib, XSL_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD)
PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include)
AC_DEFINE(HAVE_XSL_EXSLT,1,[ ])
fi
--- php-5.0.4/ext/cpdf/config.m4.lib64
+++ php-5.0.4/ext/cpdf/config.m4
@@ -4,7 +4,7 @@
AC_ARG_WITH(jpeg-dir,
[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[
for i in $withval /usr/local /usr; do
- if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then
+ if test -f "$i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libjpeg.a"; then
CPDF_JPEG_DIR=$i
break;
fi
@@ -26,7 +26,7 @@
AC_ARG_WITH(tiff-dir,
[ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[
for i in $withval /usr/local /usr; do
- if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then
+ if test -f "$i/$PHP_LIBDIR/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libtiff.a"; then
CPDF_TIFF_DIR=$i
break;
fi
@@ -68,7 +68,7 @@
-L$i/lib $CPDF_SHARED_LIBADD
])
], [
- -L$i/lib $CPDF_SHARED_LIBADD
+ -L$i/$PHP_LIBDIR $CPDF_SHARED_LIBADD
])
PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib, CPDF_SHARED_LIBADD)
--- php-5.0.4/ext/curl/config.m4.lib64
+++ php-5.0.4/ext/curl/config.m4
@@ -51,7 +51,7 @@
PHP_ADD_INCLUDE($CURL_DIR/include)
PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
PHP_CHECK_LIBRARY(curl,curl_easy_perform,
[
@@ -59,14 +59,14 @@
],[
AC_MSG_ERROR(There is something wrong. Please check config.log for more information.)
],[
- $CURL_LIBS -L$CURL_DIR/lib
+ $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
])
PHP_CHECK_LIBRARY(curl,curl_version_info,
[
AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ])
],[],[
- $CURL_LIBS -L$CURL_DIR/lib
+ $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
])
if test "$PHP_CURLWRAPPERS" != "no" ; then
--- php-5.0.4/ext/imap/config.m4.lib64
+++ php-5.0.4/ext/imap/config.m4
@@ -146,15 +146,9 @@
AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
fi
- if test -r "$IMAP_DIR/c-client/c-client.a"; then
- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
- elif test -r "$IMAP_DIR/lib/c-client.a"; then
- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
- fi
-
for lib in c-client4 c-client imap; do
IMAP_LIB=$lib
- IMAP_LIB_CHK(lib)
+ IMAP_LIB_CHK($PHP_LIBDIR)
IMAP_LIB_CHK(c-client)
done
--- php-5.0.4/ext/ldap/config.m4.lib64
+++ php-5.0.4/ext/ldap/config.m4
@@ -6,15 +6,15 @@
if test -f $1/include/ldap.h; then
LDAP_DIR=$1
LDAP_INCDIR=$1/include
- LDAP_LIBDIR=$1/lib
+ LDAP_LIBDIR=$1/$PHP_LIBDIR
elif test -f $1/include/umich-ldap/ldap.h; then
LDAP_DIR=$1
LDAP_INCDIR=$1/include/umich-ldap
- LDAP_LIBDIR=$1/lib
+ LDAP_LIBDIR=$1/$PHP_LIBDIR
elif test -f $1/ldap/public/ldap.h; then
LDAP_DIR=$1
LDAP_INCDIR=$1/ldap/public
- LDAP_LIBDIR=$1/lib
+ LDAP_LIBDIR=$1/$PHP_LIBDIR
fi
])
@@ -39,7 +39,7 @@
if test "$LDAP_SASL_DIR"; then
LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include
- LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/lib
+ LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR
else
AC_MSG_ERROR([sasl.h not found!])
fi
--- php-5.0.4/ext/odbc/config.m4.lib64
+++ php-5.0.4/ext/odbc/config.m4
@@ -101,8 +101,8 @@
fi
if test "$withval" != "no"; then
PHP_ADD_INCLUDE($withval/incl)
- PHP_ADD_LIBPATH($withval/lib)
- ODBC_OBJS="$withval/lib/odbclib.a"
+ PHP_ADD_LIBPATH($withval/$PHP_LIBDIR)
+ ODBC_OBJS="$withval/$PHP_LIBDIR/odbclib.a"
ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
$srcdir/build/shtool mkdir -f -p ext/odbc
rm -f "$ODBC_LIB"
@@ -159,7 +159,7 @@
fi
if test "$withval" != "no"; then
ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
+ ODBC_LIBDIR=$withval/$PHP_LIBDIR
ODBC_INCLUDE=-I$ODBC_INCDIR
ODBC_TYPE=solid
if test -f $ODBC_LIBDIR/soc*35.a; then
@@ -192,7 +192,7 @@
ODBC_LIBDIR=/home/db2inst1/sqllib/lib
else
ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
+ ODBC_LIBDIR=$withval/$PHP_LIBDIR
fi
if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then
@@ -311,7 +311,7 @@
ODBC_LIBDIR=/usr/local/birdstep/lib
else
ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
+ ODBC_LIBDIR=$withval/$PHP_LIBDIR
fi
ODBC_INCLUDE=-I$ODBC_INCDIR
ODBC_TYPE=birdstep
@@ -349,7 +349,7 @@
fi
if test "$withval" != "no"; then
ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
+ ODBC_LIBDIR=$withval/$PHP_LIBDIR
ODBC_LFLAGS=-L$ODBC_LIBDIR
ODBC_INCLUDE=-I$ODBC_INCDIR
ODBC_LIBS=$CUSTOM_ODBC_LIBS
@@ -379,7 +379,7 @@
PHP_ADD_INCLUDE($withval/include, 1)
ODBC_TYPE=iodbc
ODBC_INCLUDE=-I$withval/include
- ODBC_LFLAGS=-L$withval/lib
+ ODBC_LFLAGS=-L$withval/$PHP_LIBDIR
ODBC_LIBS=-liodbc
AC_DEFINE(HAVE_IODBC,1,[ ])
AC_DEFINE(HAVE_ODBC2,1,[ ])
@@ -405,7 +405,7 @@
fi
if test "$withval" != "no"; then
ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
+ ODBC_LIBDIR=$withval/$PHP_LIBDIR
ODBC_LFLAGS=-L$ODBC_LIBDIR
ODBC_INCLUDE=-I$ODBC_INCDIR
ODBC_LIBS=-lesoobclient
@@ -432,7 +432,7 @@
fi
if test "$withval" != "no"; then
ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
+ ODBC_LIBDIR=$withval/$PHP_LIBDIR
ODBC_LFLAGS=-L$ODBC_LIBDIR
ODBC_INCLUDE=-I$ODBC_INCDIR
ODBC_LIBS=-lodbc
@@ -481,7 +481,7 @@
if test "$withval" != "no"; then
ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
+ ODBC_LIBDIR=$withval/$PHP_LIBDIR
ODBC_INCLUDE=-I$ODBC_INCDIR
ODBC_LFLAGS=-L$ODBC_LIBDIR
ODBC_INCLUDE=-I$ODBC_INCDIR
--- php-5.0.4/ext/pcre/config.m4.lib64
+++ php-5.0.4/ext/pcre/config.m4
@@ -25,7 +25,7 @@
AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX])
fi
- for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do
+ for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
done
--- php-5.0.4/ext/zlib/config0.m4.lib64
+++ php-5.0.4/ext/zlib/config0.m4
@@ -38,7 +38,7 @@
case $ZLIB_DIR in
/usr) ac_extra= ;;
- *) ac_extra=-L$ZLIB_DIR/lib ;;
+ *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;;
esac
PHP_CHECK_LIBRARY(z, gzgets, [
@@ -49,7 +49,7 @@
$ac_extra
])
- PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD)
+ PHP_ADD_LIBPATH($ZLIB_DIR/$PHP_LIBDIR, ZLIB_SHARED_LIBADD)
PHP_ZLIB_DIR=$ZLIB_DIR
PHP_ADD_LIBRARY(z,, ZLIB_SHARED_LIBADD)
--- php-5.0.4/ext/iconv/config.m4.lib64
+++ php-5.0.4/ext/iconv/config.m4
@@ -24,7 +24,7 @@
fi
CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
- LDFLAGS="-L$PHP_ICONV_PREFIX/lib $LDFLAGS"
+ LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
if test -r $PHP_ICONV_PREFIX/include/giconv.h; then
PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
--- php-5.0.4/ext/mysql/config.m4.lib64
+++ php-5.0.4/ext/mysql/config.m4
@@ -83,7 +83,7 @@
Note that the MySQL client library is not bundled anymore.])
fi
- for i in lib lib/mysql; do
+ for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do
MYSQL_LIB_CHK($i)
done
@@ -99,9 +99,9 @@
PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.])
], [
- -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR
+ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR
])
- MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz"
+ MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
else
PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
--- php-5.0.4/ext/pgsql/config.m4.lib64
+++ php-5.0.4/ext/pgsql/config.m4
@@ -44,7 +44,7 @@
fi
done
- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
+ for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
PGSQL_LIBDIR=$i/$j
fi
--- php-5.0.4/ext/session/config.m4.lib64
+++ php-5.0.4/ext/session/config.m4
@@ -25,7 +25,7 @@
AC_MSG_ERROR(cannot find mm library)
fi
- PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD)
PHP_ADD_INCLUDE($MM_DIR/include)
AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm])
fi
--- php-5.0.4/ext/ncurses/config.m4.lib64
+++ php-5.0.4/ext/ncurses/config.m4
@@ -40,18 +40,18 @@
PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL, [
AC_DEFINE(HAVE_NCURSESLIB,1,[ ])
- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/$PHP_LIBDIR, NCURSES_SHARED_LIBADD)
PHP_CHECK_LIBRARY(panel, new_panel, [
AC_DEFINE(HAVE_NCURSES_PANEL,1,[ ])
- PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/$PHP_LIBDIR, NCURSES_SHARED_LIBADD)
], [], [
- -L$NCURSES_DIR/lib -l$LIBNAME -lm
+ -L$NCURSES_DIR/$PHP_LIBDIR -l$LIBNAME -lm
])
], [
AC_MSG_ERROR(Wrong ncurses lib version or lib not found)
], [
- -L$NCURSES_DIR/lib -lm
+ -L$NCURSES_DIR/$PHP_LIBDIR -lm
])
AC_CHECK_LIB($LIBNAME, color_set, [AC_DEFINE(HAVE_NCURSES_COLOR_SET, 1, [ ])])
--- php-5.0.4/ext/gettext/config.m4.lib64
+++ php-5.0.4/ext/gettext/config.m4
@@ -14,7 +14,7 @@
AC_MSG_ERROR(Cannot locate header file libintl.h)
fi
- GETTEXT_LIBDIR=$GETTEXT_DIR/lib
+ GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR
GETTEXT_INCDIR=$GETTEXT_DIR/include
O_LDFLAGS=$LDFLAGS
--- php-5.0.4/ext/pspell/config.m4.lib64
+++ php-5.0.4/ext/pspell/config.m4
@@ -27,7 +27,7 @@
AC_MSG_ERROR(Cannot find pspell)
fi
- PSPELL_LIBDIR=$PSPELL_DIR/lib
+ PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR
PHP_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD)
--- php-5.0.4/ext/mbstring/config.m4.lib64
+++ php-5.0.4/ext/mbstring/config.m4
@@ -236,11 +236,11 @@
fi
PHP_CHECK_LIBRARY(mbfl, mbfl_buffer_converter_new, [
- PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/lib, MBSTRING_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/$PHP_LIBDIR, MBSTRING_SHARED_LIBADD)
],[
AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more information.])
], [
- -LPHP_LIBMBFL/lib
+ -LPHP_LIBMBFL/$PHP_LIBDIR
])
fi
])
--- php-5.0.4/ext/recode/config.m4.lib64
+++ php-5.0.4/ext/recode/config.m4
@@ -12,17 +12,17 @@
if test -f $i/include/recode.h; then
RECODE_DIR=$i
RECODE_INC=include
- RECODE_LIB=lib
+ RECODE_LIB=$PHP_LIBDIR
fi
if test -f $i/include/recode/recode.h; then
RECODE_DIR=$i
RECODE_INC=include/recode
- RECODE_LIB=lib/recode
+ RECODE_LIB=$PHP_LIBDIR/recode
fi
if test -f $i/recode/include/recode.h; then
RECODE_DIR=$i/recode
RECODE_INC=include
- RECODE_LIB=lib
+ RECODE_LIB=$PHP_LIBDIR
fi
test -n "$RECODE_DIR" && break
done
--- php-5.0.4/ext/sqlite/config.m4.lib64
+++ php-5.0.4/ext/sqlite/config.m4
@@ -40,12 +40,12 @@
PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
[
- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/lib, SQLITE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/$PHP_LIBDIR, SQLITE_SHARED_LIBADD)
AC_DEFINE(HAVE_SQLITELIB,1,[ ])
],[
AC_MSG_ERROR([wrong sqlite lib version or lib not found])
],[
- -L$SQLITE_DIR/lib -lm
+ -L$SQLITE_DIR/$PHP_LIBDIR -lm
])
PHP_SUBST(SQLITE_SHARED_LIBADD)
--- php-5.0.4/ext/xmlrpc/config.m4.lib64
+++ php-5.0.4/ext/xmlrpc/config.m4
@@ -23,9 +23,9 @@
testval=no
for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
+ if test -f $i/$PHP_LIBDIR/libexpat.a -o -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
PHP_ADD_INCLUDE($i/include)
testval=yes
break
@@ -88,6 +88,6 @@
fi
PHP_ADD_INCLUDE($XMLRPC_DIR)
- PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
fi
--- php-5.0.4/ext/readline/config.m4.lib64
+++ php-5.0.4/ext/readline/config.m4
@@ -31,20 +31,20 @@
PHP_CHECK_LIBRARY(readline, readline,
[
- PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)
], [
AC_MSG_ERROR(readline library not found)
], [
- -L$READLINE_DIR/lib
+ -L$READLINE_DIR/$PHP_LIBDIR
])
PHP_CHECK_LIBRARY(history, add_history,
[
- PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)
], [
AC_MSG_ERROR(history library required by readline not found)
], [
- -L$READLINE_DIR/lib
+ -L$READLINE_DIR/$PHP_LIBDIR
])
PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
@@ -75,11 +75,11 @@
PHP_CHECK_LIBRARY(edit, readline,
[
- PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)
], [
AC_MSG_ERROR(edit library required by readline not found)
], [
- -L$READLINE_DIR/lib
+ -L$READLINE_DIR/$PHP_LIBDIR
])
PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
--- php-5.0.4/acinclude.m4.lib64
+++ php-5.0.4/acinclude.m4
@@ -190,7 +190,7 @@
unset ac_new_flags
for i in [$]$1; do
case [$]i in
- -L/usr/lib|-L/usr/lib/[)] ;;
+ -L/usr/$PHP_LIBDIR|-L/usr/$PHP_LIBDIR/[)] ;;
*[)] ac_new_flags="[$]ac_new_flags [$]i" ;;
esac
done
@@ -653,7 +653,7 @@
AC_MSG_CHECKING([if compiler supports -R])
AC_CACHE_VAL(php_cv_cc_dashr,[
SAVE_LIBS=$LIBS
- LIBS="-R /usr/lib $LIBS"
+ LIBS="-R /usr/$PHP_LIBDIR $LIBS"
AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
LIBS=$SAVE_LIBS])
AC_MSG_RESULT([$php_cv_cc_dashr])
@@ -663,7 +663,7 @@
AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
AC_CACHE_VAL(php_cv_cc_rpath,[
SAVE_LIBS=$LIBS
- LIBS="-Wl,-rpath,/usr/lib $LIBS"
+ LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
LIBS=$SAVE_LIBS])
AC_MSG_RESULT([$php_cv_cc_rpath])
@@ -852,7 +852,7 @@
dnl add a library to linkpath/runpath
dnl
AC_DEFUN([PHP_ADD_LIBPATH],[
- if test "$1" != "/usr/lib"; then
+ if test "$1" != "/usr/$PHP_LIBDIR"; then
PHP_EXPAND_PATH($1, ai_p)
ifelse([$2],,[
_PHP_ADD_LIBPATH_GLOBAL([$ai_p])
@@ -1647,7 +1647,7 @@
fi
for i in $PHP_KERBEROS; do
- if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
+ if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then
PHP_KERBEROS_DIR=$i
break
fi
@@ -1655,7 +1655,7 @@
if test "$PHP_KERBEROS_DIR"; then
found_kerberos=yes
- PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, $1)
+ PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
PHP_ADD_LIBRARY(krb5, 1, $1)
PHP_ADD_LIBRARY(k5crypto, 1, $1)
@@ -1720,8 +1720,8 @@
if test -r $i/include/openssl/evp.h; then
OPENSSL_INCDIR=$i/include
fi
- if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
- OPENSSL_LIBDIR=$i/lib
+ if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then
+ OPENSSL_LIBDIR=$i/$PHP_LIBDIR
fi
test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
done
@@ -1842,8 +1842,8 @@
AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>])
fi
- if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
- test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+ if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
+ test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
then
PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
found_iconv=yes
@@ -1853,10 +1853,10 @@
found_iconv=yes
PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
], [], [
- -L$ICONV_DIR/lib
+ -L$ICONV_DIR/$PHP_LIBDIR
])
], [
- -L$ICONV_DIR/lib
+ -L$ICONV_DIR/$PHP_LIBDIR
])
fi
fi
@@ -1864,7 +1864,7 @@
if test "$found_iconv" = "yes"; then
if test -n "$ICONV_DIR"; then
AC_DEFINE(HAVE_ICONV, 1, [ ])
- PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
+ PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1)
PHP_ADD_INCLUDE($ICONV_DIR/include)
fi
$2
--- php-5.0.4/configure.in.lib64
+++ php-5.0.4/configure.in
@@ -128,6 +128,11 @@
dnl AC_PROG_CXX
dnl AC_PROG_CXXCPP
+dnl Support systems with system libraries in e.g. /usr/lib64
+AC_ARG_WITH(libdir,
+[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib],
+[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib])
+
dnl check for -R, etc. switch
PHP_RUNPATH_SWITCH
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/php/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 12 Jan 2005 13:47:06 -0000 1.17
+++ .cvsignore 1 Apr 2005 12:01:20 -0000 1.18
@@ -1 +1,4 @@
php-5.0.3.tar.gz
+php-5.0.4.tar.gz
+*.rpm
+i386
Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/php/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 9 Sep 2004 10:24:55 -0000 1.1
+++ Makefile 1 Apr 2005 12:01:20 -0000 1.2
@@ -2,5 +2,6 @@
# $Id$
NAME := php
SPECFILE = $(firstword $(wildcard *.spec))
+UPSTREAM_CHECKS :=
include ../common/Makefile.common
php-5.0.0-easter.patch:
ext/standard/basic_functions.c | 1
ext/standard/info.c | 28 -
ext/standard/info.h | 2
main/logos.h | 646 -----------------------------------------
main/php_logos.c | 1
5 files changed, 1 insertion(+), 677 deletions(-)
Index: php-5.0.0-easter.patch
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php-5.0.0-easter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-5.0.0-easter.patch 10 Nov 2004 11:10:24 -0000 1.1
+++ php-5.0.0-easter.patch 1 Apr 2005 12:01:20 -0000 1.2
@@ -1,22 +1,32 @@
Remove 7K of April's Fool.
---- php-5.0.0/ext/standard/info.c.easter 2004-05-02 08:23:30.000000000 -0500
-+++ php-5.0.0/ext/standard/info.c 2004-08-09 11:34:57.249656512 -0500
-@@ -984,11 +984,7 @@
- the_time = time(NULL);
- ta = php_localtime_r(&the_time, &tmbuf);
-
+--- php-5.0.4/ext/standard/info.c.easter
++++ php-5.0.4/ext/standard/info.c
+@@ -976,21 +976,7 @@
+ */
+ PHPAPI char *php_logo_guid()
+ {
+- char *logo_guid;
+-
+- time_t the_time;
+- struct tm *ta, tmbuf;
+-
+- the_time = time(NULL);
+- ta = php_localtime_r(&the_time, &tmbuf);
+-
- if ((ta->tm_mon==3) && (ta->tm_mday==1)) {
- logo_guid = PHP_EGG_LOGO_GUID;
- } else {
- logo_guid = PHP_LOGO_GUID;
- }
-+ logo_guid = PHP_LOGO_GUID;
-
- return estrdup(logo_guid);
+-
+- return estrdup(logo_guid);
++ return estrdup(PHP_LOGO_GUID);
-@@ -1021,18 +1017,6 @@
+ }
+ /* }}} */
+@@ -1021,18 +1007,6 @@
}
/* }}} */
@@ -35,8 +45,8 @@
/* {{{ proto string zend_logo_guid(void)
Return the special ID used to request the Zend logo in phpinfo screens*/
PHP_FUNCTION(zend_logo_guid)
---- php-5.0.0/ext/standard/info.h.easter 2004-01-08 11:32:51.000000000 -0600
-+++ php-5.0.0/ext/standard/info.h 2004-08-09 11:32:25.711693784 -0500
+--- php-5.0.4/ext/standard/info.h.easter
++++ php-5.0.4/ext/standard/info.h
@@ -51,7 +51,6 @@
#endif /* HAVE_CREDITS_DEFS */
@@ -53,623 +63,18 @@
PHP_FUNCTION(php_sapi_name);
PHP_FUNCTION(php_uname);
PHP_FUNCTION(php_ini_scanned_files);
---- php-5.0.0/main/logos.h.easter 2004-01-08 11:33:04.000000000 -0600
-+++ php-5.0.0/main/logos.h 2004-08-09 11:33:14.743239856 -0500
-@@ -703,612 +703,3 @@
- 40, 132, 242, 41, 225, 246, 109, 216, 155, 189,
- 222, 22, 110, 41, 68, 110, 209, 187, 106, 1,
- 1, 1, 0, 59 };
--
--unsigned char php_egg_logo[] = {
-- 71, 73, 70, 56, 57, 97, 120, 0, 67, 0,
-- 247, 255, 0, 0, 0, 0, 177, 156, 157, 205,
-- 169, 172, 148, 134, 135, 134, 109, 112, 169, 155,
-- 157, 182, 169, 171, 165, 153, 155, 119, 79, 87,
-- 167, 152, 155, 167, 157, 159, 195, 159, 167, 170,
-- 156, 161, 160, 150, 154, 153, 129, 143, 118, 109,
-- 115, 3, 1, 3, 74, 60, 74, 6, 5, 6,
-- 183, 173, 184, 101, 93, 102, 148, 142, 150, 5,
-- 3, 6, 9, 7, 10, 83, 74, 88, 168, 159,
-- 174, 156, 150, 166, 222, 219, 229, 172, 166, 187,
-- 215, 212, 225, 206, 203, 220, 123, 120, 139, 134,
-- 132, 155, 195, 193, 216, 182, 181, 209, 187, 186,
-- 214, 174, 173, 208, 1, 1, 3, 3, 3, 5,
-- 11, 11, 16, 14, 14, 20, 7, 7, 10, 34,
-- 34, 48, 22, 22, 31, 28, 28, 39, 85, 85,
-- 115, 153, 153, 205, 153, 153, 203, 9, 9, 12,
-- 156, 156, 205, 160, 160, 206, 170, 170, 206, 177,
-- 177, 208, 142, 144, 195, 149, 150, 202, 150, 151,
-- 199, 157, 158, 202, 161, 162, 201, 165, 166, 204,
-- 80, 82, 122, 75, 77, 112, 112, 115, 165, 97,
-- 99, 143, 91, 93, 134, 69, 71, 102, 105, 107,
-- 154, 41, 42, 60, 127, 130, 185, 86, 88, 125,
-- 51, 52, 74, 136, 139, 192, 133, 135, 184, 146,
-- 148, 197, 153, 155, 199, 155, 157, 200, 119, 123,
-- 178, 61, 63, 90, 16, 17, 24, 192, 192, 192,
-- 132, 89, 62, 139, 94, 66, 143, 105, 82, 222,
-- 180, 157, 132, 77, 50, 113, 74, 54, 115, 87,
-- 73, 125, 66, 39, 126, 83, 64, 122, 82, 63,
-- 102, 71, 57, 113, 85, 72, 197, 160, 142, 204,
-- 168, 152, 89, 54, 39, 93, 57, 42, 82, 50,
-- 37, 121, 75, 56, 95, 60, 45, 105, 68, 53,
-- 89, 58, 45, 97, 67, 55, 113, 79, 65, 104,
-- 73, 60, 99, 70, 58, 111, 81, 69, 118, 88,
-- 75, 115, 85, 73, 115, 87, 75, 116, 90, 79,
-- 181, 143, 127, 207, 174, 160, 94, 51, 35, 78,
-- 45, 33, 105, 62, 47, 98, 62, 48, 100, 65,
-- 52, 107, 71, 58, 108, 74, 62, 216, 182, 170,
-- 210, 177, 165, 227, 193, 180, 219, 188, 177, 118,
-- 60, 40, 106, 56, 39, 111, 62, 45, 68, 39,
-- 29, 55, 34, 27, 83, 53, 43, 71, 45, 37,
-- 94, 64, 54, 10, 7, 6, 93, 67, 59, 116,
-- 85, 75, 149, 110, 97, 12, 9, 8, 111, 84,
-- 75, 102, 66, 56, 101, 69, 60, 103, 71, 62,
-- 93, 65, 57, 95, 67, 59, 99, 70, 62, 91,
-- 65, 58, 117, 88, 80, 118, 93, 86, 183, 150,
-- 140, 188, 158, 149, 236, 203, 194, 198, 171, 163,
-- 190, 164, 157, 41, 26, 22, 91, 61, 53, 98,
-- 66, 58, 95, 65, 57, 84, 59, 53, 114, 82,
-- 74, 109, 81, 74, 102, 79, 73, 158, 127, 119,
-- 123, 100, 94, 163, 133, 126, 194, 167, 160, 204,
-- 179, 173, 171, 159, 156, 95, 65, 59, 71, 49,
-- 44, 97, 67, 61, 93, 65, 59, 76, 54, 49,
-- 126, 91, 83, 19, 14, 13, 112, 86, 80, 87,
-- 69, 65, 133, 107, 101, 144, 119, 114, 137, 114,
-- 109, 177, 150, 144, 164, 139, 134, 181, 155, 149,
-- 209, 183, 177, 200, 176, 171, 223, 197, 191, 211,
-- 187, 182, 167, 157, 155, 165, 155, 153, 32, 20,
-- 18, 82, 55, 50, 90, 63, 58, 119, 83, 77,
-- 94, 66, 61, 60, 43, 40, 95, 74, 70, 171,
-- 145, 140, 247, 212, 206, 235, 209, 204, 167, 155,
-- 153, 255, 244, 242, 86, 61, 57, 247, 220, 216,
-- 155, 142, 140, 170, 157, 155, 149, 124, 121, 187,
-- 160, 157, 172, 149, 146, 216, 192, 189, 147, 131,
-- 129, 147, 138, 137, 91, 65, 63, 46, 33, 32,
-- 155, 132, 130, 157, 137, 135, 181, 159, 157, 224,
-- 202, 200, 132, 121, 120, 248, 228, 226, 165, 152,
-- 151, 140, 130, 129, 156, 145, 144, 162, 151, 150,
-- 151, 141, 140, 186, 176, 175, 103, 85, 84, 174,
-- 156, 155, 163, 147, 146, 176, 151, 150, 166, 143,
-- 142, 188, 165, 164, 194, 171, 170, 198, 177, 176,
-- 210, 189, 188, 229, 207, 206, 236, 215, 214, 22,
-- 17, 17, 176, 153, 153, 203, 181, 181, 174, 159,
-- 159, 168, 153, 153, 169, 155, 155, 171, 157, 157,
-- 191, 177, 177, 176, 163, 163, 169, 157, 157, 167,
-- 155, 155, 165, 153, 153, 171, 159, 159, 158, 148,
-- 148, 169, 159, 159, 165, 155, 155, 163, 153, 153,
-- 161, 153, 153, 3, 3, 3, 1, 1, 1, 255,
-- 255, 255, 0, 0, 0, 0, 0, 0, 0, 0,
-- 0, 33, 249, 4, 1, 0, 0, 78, 0, 44,
-- 0, 0, 0, 0, 120, 0, 67, 0, 64, 8,
-- 255, 0, 157, 8, 28, 72, 176, 160, 193, 131,
-- 8, 19, 42, 92, 200, 176, 161, 195, 135, 16,
-- 9, 186, 112, 177, 164, 133, 144, 20, 48, 78,
-- 160, 64, 209, 100, 197, 10, 22, 44, 84, 64,
-- 243, 229, 171, 20, 170, 82, 38, 53, 53, 130,
-- 180, 173, 94, 182, 1, 216, 176, 57, 203, 182,
-- 141, 102, 180, 100, 174, 114, 186, 218, 118, 108,
-- 219, 54, 103, 206, 154, 37, 147, 38, 205, 83,
-- 178, 106, 213, 30, 40, 85, 234, 35, 72, 143,
-- 37, 80, 163, 70, 29, 98, 4, 201, 68, 23,
-- 17, 19, 78, 252, 193, 2, 128, 87, 0, 130,
-- 114, 149, 68, 117, 9, 211, 25, 50, 166, 26,
-- 169, 29, 116, 234, 212, 32, 76, 138, 234, 208,
-- 17, 51, 71, 140, 24, 58, 117, 204, 32, 42,
-- 3, 233, 27, 55, 122, 217, 142, 101, 203, 118,
-- 11, 215, 60, 109, 223, 200, 217, 42, 103, 142,
-- 153, 55, 109, 218, 188, 81, 35, 102, 141, 90,
-- 57, 101, 201, 142, 221, 26, 134, 172, 29, 50,
-- 119, 237, 66, 15, 19, 141, 203, 240, 129, 210,
-- 134, 33, 107, 171, 183, 13, 91, 181, 15, 75,
-- 140, 200, 150, 109, 21, 235, 65, 23, 71, 84,
-- 124, 69, 87, 82, 211, 174, 94, 167, 122, 177,
-- 117, 107, 74, 145, 153, 185, 115, 146, 7, 202,
-- 132, 41, 19, 25, 51, 104, 228, 120, 153, 62,
-- 134, 250, 152, 49, 156, 164, 113, 91, 39, 205,
-- 85, 44, 74, 121, 236, 216, 255, 185, 227, 166,
-- 252, 150, 72, 231, 183, 216, 169, 197, 158, 82,
-- 44, 88, 162, 68, 77, 187, 229, 142, 158, 253,
-- 251, 244, 220, 233, 119, 135, 172, 127, 231, 97,
-- 240, 192, 3, 26, 59, 184, 92, 115, 13, 62,
-- 249, 36, 168, 32, 100, 245, 56, 3, 194, 13,
-- 72, 68, 248, 2, 86, 46, 148, 240, 149, 47,
-- 168, 236, 210, 72, 34, 136, 32, 50, 7, 25,
-- 129, 44, 34, 98, 38, 153, 244, 178, 200, 37,
-- 151, 236, 130, 162, 138, 127, 124, 1, 7, 32,
-- 128, 244, 97, 73, 46, 52, 230, 98, 137, 31,
-- 125, 0, 114, 73, 35, 191, 60, 82, 8, 40,
-- 177, 172, 195, 205, 59, 234, 148, 67, 141, 57,
-- 212, 28, 73, 13, 37, 161, 76, 70, 12, 51,
-- 145, 180, 17, 73, 37, 148, 208, 66, 78, 37,
-- 110, 228, 33, 201, 43, 159, 180, 66, 64, 53,
-- 205, 28, 115, 205, 48, 244, 172, 99, 102, 126,
-- 241, 32, 168, 224, 154, 108, 174, 169, 77, 54,
-- 57, 228, 128, 3, 14, 87, 229, 246, 85, 46,
-- 168, 20, 179, 203, 41, 142, 56, 178, 139, 138,
-- 41, 234, 185, 75, 159, 142, 160, 168, 137, 46,
-- 46, 194, 161, 168, 162, 95, 52, 242, 9, 27,
-- 99, 244, 225, 7, 32, 186, 112, 146, 204, 50,
-- 202, 136, 35, 78, 56, 201, 180, 210, 202, 43,
-- 159, 70, 3, 76, 44, 192, 68, 19, 77, 56,
-- 227, 216, 66, 11, 45, 204, 48, 99, 11, 53,
-- 181, 168, 255, 51, 142, 56, 202, 216, 145, 199,
-- 29, 177, 180, 162, 198, 38, 155, 160, 225, 171,
-- 175, 106, 4, 171, 134, 22, 196, 22, 107, 108,
-- 21, 105, 176, 193, 6, 36, 173, 184, 146, 1,
-- 13, 52, 144, 48, 67, 12, 19, 21, 116, 149,
-- 11, 92, 73, 144, 130, 70, 43, 248, 162, 73,
-- 32, 152, 32, 114, 87, 28, 111, 132, 241, 72,
-- 42, 96, 232, 161, 238, 186, 234, 242, 225, 110,
-- 24, 127, 232, 162, 231, 42, 175, 184, 18, 77,
-- 58, 182, 24, 99, 141, 40, 146, 84, 178, 76,
-- 52, 177, 132, 179, 204, 52, 227, 88, 41, 142,
-- 58, 204, 144, 163, 169, 56, 149, 204, 210, 42,
-- 123, 179, 132, 71, 137, 39, 88, 80, 97, 49,
-- 21, 117, 148, 161, 49, 26, 85, 84, 97, 172,
-- 177, 205, 76, 224, 193, 200, 30, 132, 48, 195,
-- 181, 89, 9, 116, 109, 157, 62, 0, 81, 196,
-- 203, 76, 196, 204, 4, 16, 52, 99, 16, 193,
-- 51, 113, 88, 49, 133, 206, 86, 232, 241, 134,
-- 28, 127, 168, 98, 73, 41, 159, 128, 2, 75,
-- 191, 253, 82, 162, 76, 40, 149, 244, 27, 138,
-- 40, 118, 48, 89, 229, 44, 179, 208, 66, 235,
-- 52, 203, 120, 18, 5, 20, 133, 120, 2, 140,
-- 1, 35, 144, 236, 65, 7, 100, 111, 176, 129,
-- 7, 35, 232, 176, 114, 181, 41, 183, 205, 208,
-- 218, 112, 199, 45, 247, 220, 107, 187, 109, 247,
-- 221, 78, 92, 107, 68, 16, 68, 184, 255, 172,
-- 194, 223, 66, 4, 254, 242, 224, 50, 199, 76,
-- 51, 205, 60, 36, 206, 195, 14, 59, 16, 225,
-- 248, 15, 144, 255, 224, 195, 228, 148, 55, 229,
-- 212, 18, 84, 217, 128, 50, 222, 17, 77, 116,
-- 4, 16, 77, 120, 181, 143, 62, 22, 92, 128,
-- 142, 37, 36, 153, 164, 139, 38, 197, 44, 114,
-- 70, 94, 89, 40, 66, 71, 25, 117, 100, 113,
-- 198, 28, 89, 96, 17, 133, 43, 246, 208, 211,
-- 83, 54, 165, 93, 131, 152, 58, 230, 156, 51,
-- 139, 44, 223, 8, 47, 252, 52, 204, 192, 90,
-- 139, 40, 210, 124, 51, 204, 60, 243, 224, 194,
-- 206, 245, 6, 30, 184, 26, 77, 206, 184, 246,
-- 90, 15, 67, 132, 47, 254, 17, 53, 104, 110,
-- 91, 67, 91, 161, 240, 149, 33, 168, 163, 194,
-- 250, 158, 167, 48, 146, 8, 236, 89, 32, 98,
-- 134, 34, 152, 144, 66, 74, 38, 243, 203, 17,
-- 134, 28, 0, 12, 131, 23, 252, 39, 135, 58,
-- 188, 130, 27, 127, 105, 70, 43, 32, 209, 137,
-- 95, 116, 131, 0, 201, 136, 6, 40, 218, 192,
-- 5, 41, 72, 193, 13, 118, 192, 131, 6, 241,
-- 240, 42, 106, 144, 3, 28, 236, 216, 207, 125,
-- 244, 227, 159, 208, 20, 102, 24, 195, 144, 71,
-- 1, 218, 177, 153, 234, 29, 96, 30, 248, 192,
-- 135, 54, 26, 224, 146, 1, 124, 128, 124, 53,
-- 200, 161, 249, 6, 226, 2, 30, 124, 69, 21,
-- 24, 218, 5, 41, 255, 24, 209, 139, 33, 50,
-- 130, 20, 110, 89, 4, 255, 200, 240, 63, 57,
-- 4, 226, 137, 39, 186, 206, 24, 200, 224, 5,
-- 69, 245, 161, 15, 46, 186, 226, 23, 90, 241,
-- 141, 111, 28, 163, 27, 225, 96, 134, 40, 142,
-- 100, 11, 74, 72, 34, 18, 89, 194, 195, 36,
-- 172, 193, 70, 125, 25, 35, 26, 24, 8, 71,
-- 45, 66, 65, 9, 46, 68, 2, 24, 253, 241,
-- 76, 104, 218, 193, 142, 121, 92, 99, 30, 163,
-- 185, 94, 59, 214, 65, 143, 118, 76, 47, 134,
-- 106, 106, 83, 130, 86, 179, 13, 13, 36, 33,
-- 9, 55, 152, 80, 15, 119, 83, 138, 214, 93,
-- 226, 137, 80, 60, 17, 138, 46, 33, 34, 66,
-- 237, 66, 19, 39, 241, 3, 52, 44, 1, 141,
-- 43, 94, 145, 81, 95, 248, 2, 235, 52, 129,
-- 134, 84, 184, 226, 27, 177, 0, 85, 50, 194,
-- 17, 142, 128, 197, 34, 26, 210, 8, 71, 0,
-- 188, 1, 143, 105, 80, 98, 18, 198, 8, 198,
-- 36, 134, 57, 76, 246, 144, 131, 18, 179, 168,
-- 132, 39, 30, 181, 138, 67, 112, 130, 19, 135,
-- 88, 5, 36, 32, 161, 172, 106, 118, 233, 83,
-- 174, 104, 134, 52, 234, 145, 15, 68, 186, 169,
-- 30, 25, 208, 129, 56, 233, 164, 178, 244, 121,
-- 165, 4, 64, 244, 205, 160, 254, 4, 63, 253,
-- 97, 2, 19, 115, 8, 195, 30, 248, 176, 135,
-- 55, 4, 34, 13, 105, 160, 103, 28, 246, 25,
-- 255, 7, 39, 106, 226, 18, 157, 72, 198, 56,
-- 200, 65, 14, 90, 0, 195, 40, 177, 144, 5,
-- 40, 94, 129, 75, 105, 12, 12, 107, 211, 80,
-- 135, 58, 86, 85, 14, 87, 169, 67, 28, 1,
-- 80, 198, 29, 194, 195, 5, 46, 84, 194, 21,
-- 179, 43, 131, 175, 54, 65, 172, 52, 120, 236,
-- 99, 40, 45, 86, 43, 50, 16, 130, 17, 140,
-- 64, 4, 106, 187, 138, 66, 86, 118, 132, 22,
-- 168, 224, 35, 33, 81, 129, 16, 124, 241, 135,
-- 61, 176, 235, 167, 244, 244, 169, 207, 190, 80,
-- 10, 64, 148, 68, 23, 207, 40, 198, 47, 46,
-- 129, 138, 222, 116, 130, 89, 205, 114, 5, 1,
-- 90, 1, 48, 89, 60, 205, 22, 182, 112, 85,
-- 86, 153, 81, 11, 102, 172, 138, 18, 176, 40,
-- 196, 21, 192, 0, 134, 43, 60, 225, 172, 80,
-- 184, 2, 22, 202, 80, 5, 72, 36, 195, 0,
-- 30, 48, 155, 92, 59, 48, 2, 25, 172, 140,
-- 115, 183, 153, 91, 13, 134, 208, 131, 32, 248,
-- 32, 114, 147, 11, 130, 96, 123, 64, 216, 169,
-- 136, 111, 54, 57, 172, 1, 18, 110, 112, 131,
-- 36, 40, 1, 7, 113, 18, 231, 12, 102, 64,
-- 2, 18, 208, 64, 4, 34, 120, 105, 180, 116,
-- 64, 173, 185, 225, 245, 179, 90, 89, 153, 17,
-- 150, 208, 215, 191, 18, 161, 5, 60, 56, 156,
-- 106, 19, 215, 56, 34, 72, 206, 41, 79, 57,
-- 66, 85, 234, 6, 218, 218, 255, 90, 107, 34,
-- 70, 104, 153, 16, 154, 208, 17, 156, 254, 77,
-- 167, 129, 19, 2, 225, 48, 64, 92, 226, 118,
-- 131, 2, 200, 77, 110, 55, 126, 225, 192, 228,
-- 38, 183, 5, 174, 13, 172, 96, 167, 75, 216,
-- 234, 86, 23, 115, 70, 48, 223, 249, 108, 155,
-- 215, 32, 20, 225, 2, 16, 48, 129, 182, 50,
-- 130, 130, 21, 144, 114, 44, 154, 208, 196, 24,
-- 22, 65, 134, 58, 212, 46, 17, 115, 16, 23,
-- 21, 90, 113, 0, 120, 208, 100, 27, 218, 40,
-- 208, 60, 190, 33, 11, 101, 208, 18, 24, 217,
-- 80, 13, 100, 194, 1, 139, 101, 0, 163, 18,
-- 178, 144, 134, 106, 190, 225, 18, 154, 192, 196,
-- 53, 74, 249, 192, 83, 196, 71, 225, 217, 110,
-- 215, 110, 184, 97, 130, 4, 190, 2, 0, 11,
-- 160, 99, 36, 170, 43, 134, 35, 22, 193, 167,
-- 224, 20, 199, 12, 102, 200, 66, 22, 240, 50,
-- 23, 15, 209, 1, 10, 187, 235, 29, 77, 128,
-- 231, 199, 121, 28, 163, 18, 141, 153, 133, 56,
-- 178, 87, 15, 120, 152, 195, 26, 231, 48, 71,
-- 45, 100, 17, 141, 107, 176, 3, 133, 9, 64,
-- 161, 146, 135, 129, 26, 234, 169, 198, 37, 221,
-- 123, 205, 7, 168, 34, 27, 217, 150, 143, 109,
-- 111, 115, 65, 11, 82, 240, 21, 9, 136, 37,
-- 37, 187, 144, 159, 123, 109, 151, 8, 69, 40,
-- 194, 20, 192, 33, 69, 34, 204, 32, 23, 49,
-- 200, 161, 255, 159, 97, 136, 51, 34, 32, 225,
-- 10, 120, 24, 0, 30, 245, 104, 70, 53, 64,
-- 245, 9, 2, 96, 35, 26, 234, 96, 15, 51,
-- 40, 1, 142, 79, 124, 98, 25, 204, 56, 135,
-- 49, 144, 36, 142, 8, 126, 102, 63, 252, 233,
-- 207, 10, 219, 113, 0, 20, 150, 38, 201, 46,
-- 44, 205, 97, 182, 231, 140, 215, 144, 111, 54,
-- 181, 185, 13, 18, 138, 240, 21, 65, 180, 207,
-- 55, 109, 73, 53, 35, 226, 146, 226, 44, 176,
-- 217, 12, 137, 216, 223, 115, 162, 211, 196, 56,
-- 199, 121, 12, 114, 64, 195, 91, 233, 113, 141,
-- 106, 124, 162, 27, 171, 104, 69, 44, 36, 113,
-- 30, 244, 108, 129, 11, 110, 232, 40, 23, 204,
-- 8, 11, 101, 136, 2, 171, 228, 128, 71, 59,
-- 234, 115, 166, 252, 236, 167, 132, 74, 38, 36,
-- 50, 10, 32, 15, 234, 193, 16, 31, 13, 104,
-- 64, 62, 86, 211, 32, 16, 40, 22, 9, 138,
-- 101, 155, 11, 110, 160, 27, 175, 136, 37, 79,
-- 142, 56, 133, 254, 136, 216, 22, 37, 134, 11,
-- 17, 115, 113, 226, 19, 81, 36, 135, 249, 133,
-- 33, 149, 169, 244, 66, 42, 199, 16, 6, 78,
-- 28, 3, 30, 195, 24, 128, 43, 68, 49, 9,
-- 97, 8, 163, 22, 228, 73, 246, 29, 236, 144,
-- 165, 96, 0, 185, 22, 230, 48, 71, 124, 200,
-- 1, 139, 54, 180, 33, 22, 200, 40, 147, 153,
-- 206, 100, 38, 253, 216, 199, 29, 220, 255, 14,
-- 144, 126, 228, 97, 24, 111, 182, 137, 145, 21,
-- 96, 44, 99, 175, 210, 21, 175, 64, 163, 20,
-- 154, 144, 31, 38, 200, 240, 78, 83, 152, 130,
-- 45, 74, 236, 69, 32, 80, 20, 8, 21, 45,
-- 34, 16, 99, 72, 37, 28, 146, 110, 69, 63,
-- 56, 221, 18, 80, 167, 17, 52, 88, 241, 12,
-- 175, 85, 98, 162, 161, 144, 69, 179, 199, 40,
-- 12, 99, 212, 98, 22, 212, 176, 6, 63, 4,
-- 64, 0, 165, 72, 34, 235, 176, 176, 195, 36,
-- 66, 177, 140, 145, 187, 157, 29, 94, 140, 9,
-- 54, 182, 49, 140, 2, 204, 67, 145, 120, 31,
-- 119, 61, 42, 128, 3, 37, 40, 33, 9, 19,
-- 169, 57, 0, 160, 145, 161, 76, 4, 34, 57,
-- 115, 200, 228, 37, 73, 172, 34, 118, 166, 87,
-- 19, 95, 144, 20, 41, 161, 126, 35, 28, 153,
-- 242, 15, 43, 49, 244, 43, 248, 248, 13, 3,
-- 188, 99, 26, 233, 16, 199, 52, 100, 65, 139,
-- 139, 18, 204, 26, 196, 8, 134, 48, 55, 136,
-- 135, 86, 205, 34, 20, 119, 184, 3, 40, 216,
-- 128, 6, 78, 160, 65, 11, 107, 88, 22, 36,
-- 62, 241, 10, 109, 74, 35, 26, 3, 104, 73,
-- 55, 19, 153, 247, 25, 234, 32, 78, 116, 90,
-- 119, 187, 1, 128, 167, 98, 112, 178, 147, 187,
-- 208, 228, 37, 244, 228, 201, 98, 232, 226, 36,
-- 49, 2, 196, 23, 152, 190, 168, 62, 252, 161,
-- 19, 214, 239, 69, 255, 29, 90, 33, 141, 100,
-- 36, 131, 0, 246, 74, 198, 43, 112, 98, 175,
-- 88, 132, 94, 83, 179, 146, 69, 37, 242, 144,
-- 7, 53, 178, 39, 73, 234, 144, 133, 40, 106,
-- 33, 9, 79, 164, 226, 16, 107, 112, 8, 209,
-- 36, 128, 2, 152, 82, 90, 48, 44, 90, 80,
-- 5, 202, 178, 126, 216, 16, 38, 217, 0, 78,
-- 210, 50, 3, 49, 149, 55, 46, 48, 106, 165,
-- 6, 13, 190, 65, 40, 126, 34, 40, 131, 66,
-- 98, 164, 48, 116, 213, 225, 5, 111, 80, 79,
-- 93, 64, 6, 108, 176, 10, 97, 240, 6, 113,
-- 32, 6, 152, 144, 34, 189, 64, 0, 239, 87,
-- 48, 178, 224, 9, 174, 224, 9, 92, 146, 12,
-- 224, 144, 14, 211, 224, 13, 58, 8, 127, 171,
-- 242, 108, 18, 37, 81, 227, 176, 52, 226, 225,
-- 6, 146, 208, 10, 104, 16, 44, 248, 164, 6,
-- 29, 131, 79, 6, 248, 132, 4, 192, 1, 152,
-- 37, 2, 39, 35, 83, 229, 52, 17, 91, 86,
-- 2, 226, 165, 10, 24, 168, 39, 245, 198, 8,
-- 247, 22, 7, 244, 84, 46, 132, 128, 46, 236,
-- 226, 46, 251, 4, 47, 48, 242, 11, 4, 128,
-- 42, 3, 197, 12, 93, 39, 12, 202, 16, 11,
-- 160, 0, 48, 164, 50, 13, 4, 101, 37, 138,
-- 193, 12, 229, 80, 14, 234, 160, 48, 226, 32,
-- 10, 26, 20, 30, 110, 64, 9, 192, 160, 49,
-- 136, 184, 49, 183, 247, 132, 32, 35, 2, 33,
-- 255, 240, 136, 35, 80, 133, 88, 150, 87, 158,
-- 3, 58, 28, 225, 17, 44, 192, 83, 95, 224,
-- 5, 106, 96, 134, 63, 197, 46, 123, 48, 79,
-- 124, 240, 6, 128, 80, 10, 108, 129, 18, 157,
-- 208, 37, 16, 20, 13, 203, 240, 14, 192, 144,
-- 19, 67, 17, 65, 225, 0, 14, 224, 48, 122,
-- 176, 208, 48, 88, 213, 42, 92, 85, 11, 182,
-- 64, 127, 238, 81, 8, 103, 165, 86, 88, 48,
-- 140, 136, 136, 44, 198, 210, 10, 242, 48, 54,
-- 100, 211, 1, 30, 32, 2, 118, 101, 133, 157,
-- 179, 50, 61, 0, 4, 128, 35, 56, 47, 19,
-- 1, 197, 32, 79, 235, 18, 138, 62, 101, 5,
-- 86, 192, 7, 47, 226, 7, 55, 226, 11, 78,
-- 119, 9, 175, 96, 20, 157, 178, 64, 244, 2,
-- 48, 192, 0, 11, 148, 32, 53, 161, 64, 11,
-- 207, 214, 42, 170, 34, 14, 76, 2, 12, 133,
-- 0, 5, 83, 176, 143, 251, 8, 6, 84, 16,
-- 5, 209, 96, 0, 29, 32, 87, 4, 25, 2,
-- 36, 64, 91, 181, 21, 55, 53, 208, 3, 62,
-- 192, 3, 51, 3, 4, 172, 213, 56, 144, 67,
-- 57, 126, 229, 3, 15, 64, 1, 76, 80, 4,
-- 66, 128, 1, 4, 112, 42, 177, 64, 42, 145,
-- 32, 11, 253, 162, 12, 153, 34, 14, 6, 96,
-- 0, 25, 144, 1, 28, 176, 146, 58, 96, 89,
-- 151, 149, 89, 35, 240, 136, 143, 72, 50, 45,
-- 69, 2, 207, 136, 144, 220, 255, 229, 16, 116,
-- 179, 50, 232, 86, 101, 20, 22, 62, 178, 133,
-- 88, 138, 197, 88, 143, 244, 88, 115, 130, 3,
-- 49, 208, 89, 59, 57, 137, 57, 217, 148, 78,
-- 249, 148, 80, 217, 54, 75, 57, 149, 208, 24,
-- 149, 86, 73, 129, 19, 241, 2, 71, 208, 3,
-- 63, 208, 2, 46, 99, 141, 48, 83, 56, 171,
-- 165, 56, 140, 211, 90, 174, 21, 57, 63, 48,
-- 88, 67, 64, 62, 119, 117, 149, 110, 115, 21,
-- 72, 208, 3, 45, 192, 4, 55, 5, 18, 191,
-- 21, 92, 194, 69, 56, 98, 121, 56, 100, 201,
-- 56, 142, 115, 150, 19, 89, 57, 211, 53, 152,
-- 176, 181, 4, 228, 163, 93, 110, 25, 90, 72,
-- 16, 4, 212, 168, 17, 188, 133, 137, 57, 5,
-- 92, 36, 49, 22, 172, 240, 0, 72, 177, 20,
-- 72, 129, 20, 174, 65, 0, 211, 180, 10, 159,
-- 144, 153, 151, 169, 20, 4, 64, 0, 199, 117,
-- 145, 129, 101, 93, 215, 37, 21, 228, 35, 73,
-- 110, 57, 17, 65, 192, 4, 43, 160, 45, 23,
-- 112, 2, 142, 233, 17, 208, 48, 18, 48, 130,
-- 10, 186, 112, 9, 100, 112, 73, 188, 153, 5,
-- 104, 224, 10, 247, 0, 24, 206, 208, 18, 135,
-- 129, 15, 199, 64, 42, 18, 20, 11, 10, 214,
-- 69, 245, 80, 15, 176, 244, 145, 71, 35, 13,
-- 62, 177, 13, 3, 0, 19, 161, 249, 0, 151,
-- 35, 21, 83, 97, 97, 23, 134, 87, 19, 209,
-- 3, 76, 255, 112, 1, 0, 16, 94, 22, 128,
-- 17, 232, 144, 11, 35, 129, 94, 129, 112, 6,
-- 103, 113, 6, 89, 64, 59, 41, 70, 6, 89,
-- 64, 5, 79, 224, 10, 246, 49, 99, 213, 99,
-- 32, 223, 64, 11, 126, 168, 12, 0, 38, 67,
-- 252, 57, 13, 171, 50, 14, 148, 176, 12, 217,
-- 224, 71, 217, 35, 60, 136, 225, 18, 63, 1,
-- 97, 15, 32, 97, 63, 25, 62, 22, 198, 57,
-- 91, 177, 124, 0, 80, 2, 166, 179, 158, 165,
-- 176, 58, 130, 18, 63, 172, 166, 98, 179, 83,
-- 7, 116, 33, 46, 79, 16, 5, 175, 160, 0,
-- 240, 240, 59, 193, 131, 24, 228, 80, 60, 162,
-- 128, 60, 6, 162, 13, 215, 160, 14, 194, 144,
-- 113, 194, 64, 9, 209, 160, 13, 236, 96, 100,
-- 76, 134, 26, 168, 97, 32, 50, 212, 96, 81,
-- 246, 1, 83, 118, 4, 72, 74, 161, 53, 192,
-- 148, 58, 233, 2, 65, 32, 4, 28, 182, 15,
-- 66, 211, 27, 68, 135, 9, 62, 7, 28, 38,
-- 22, 23, 42, 150, 5, 25, 67, 59, 30, 130,
-- 6, 108, 16, 13, 132, 244, 156, 131, 81, 24,
-- 6, 146, 13, 227, 208, 85, 230, 160, 14, 217,
-- 243, 13, 234, 192, 70, 141, 1, 61, 210, 192,
-- 14, 134, 20, 26, 157, 97, 72, 40, 36, 15,
-- 167, 241, 66, 48, 244, 100, 52, 225, 26, 31,
-- 0, 2, 179, 1, 106, 76, 138, 16, 88, 168,
-- 62, 162, 243, 97, 71, 21, 102, 102, 255, 134,
-- 8, 103, 80, 102, 141, 192, 8, 108, 33, 63,
-- 178, 99, 23, 136, 39, 7, 115, 96, 6, 101,
-- 176, 9, 159, 192, 14, 127, 193, 26, 63, 241,
-- 19, 197, 121, 12, 228, 128, 48, 204, 160, 99,
-- 205, 208, 12, 211, 16, 118, 196, 112, 14, 229,
-- 32, 11, 174, 32, 13, 121, 164, 31, 5, 144,
-- 71, 158, 65, 32, 184, 112, 11, 7, 192, 167,
-- 243, 192, 167, 218, 195, 26, 216, 16, 168, 131,
-- 90, 161, 161, 181, 101, 165, 134, 58, 29, 234,
-- 133, 98, 246, 94, 177, 163, 8, 140, 112, 68,
-- 204, 145, 5, 117, 33, 6, 112, 246, 63, 113,
-- 102, 41, 239, 112, 103, 199, 144, 20, 144, 192,
-- 9, 157, 208, 10, 213, 16, 13, 88, 130, 108,
-- 110, 176, 5, 82, 34, 9, 121, 224, 112, 73,
-- 50, 14, 209, 112, 12, 252, 1, 105, 145, 38,
-- 105, 120, 154, 167, 120, 154, 0, 168, 17, 67,
-- 228, 214, 26, 55, 148, 88, 233, 246, 157, 121,
-- 211, 3, 130, 103, 8, 35, 225, 62, 131, 162,
-- 106, 141, 128, 98, 42, 102, 63, 137, 144, 63,
-- 96, 24, 159, 4, 100, 107, 182, 54, 7, 193,
-- 121, 146, 237, 224, 107, 221, 192, 10, 191, 64,
-- 103, 19, 20, 37, 91, 96, 65, 228, 42, 5,
-- 244, 231, 48, 150, 49, 14, 157, 81, 31, 1,
-- 178, 14, 240, 106, 66, 184, 192, 100, 183, 144,
-- 31, 161, 113, 26, 212, 163, 61, 13, 192, 105,
-- 251, 154, 88, 59, 255, 84, 78, 68, 240, 21,
-- 16, 240, 110, 168, 54, 8, 195, 49, 8, 98,
-- 102, 6, 201, 129, 8, 89, 144, 8, 11, 235,
-- 28, 208, 33, 29, 183, 54, 29, 94, 64, 112,
-- 157, 208, 12, 127, 113, 12, 10, 244, 10, 183,
-- 24, 123, 201, 198, 5, 91, 144, 181, 89, 203,
-- 5, 118, 48, 11, 134, 8, 10, 149, 176, 113,
-- 210, 134, 31, 249, 97, 109, 36, 100, 171, 0,
-- 178, 14, 119, 106, 24, 7, 2, 110, 226, 166,
-- 119, 229, 22, 33, 232, 182, 67, 88, 120, 129,
-- 201, 26, 111, 189, 32, 28, 109, 65, 10, 166,
-- 192, 102, 114, 129, 120, 251, 22, 8, 100, 160,
-- 8, 209, 225, 5, 93, 112, 184, 134, 251, 7,
-- 4, 103, 112, 6, 224, 14, 199, 224, 10, 202,
-- 48, 76, 120, 64, 136, 87, 219, 81, 89, 50,
-- 9, 65, 38, 12, 212, 224, 85, 161, 32, 14,
-- 109, 0, 12, 131, 52, 114, 35, 68, 66, 212,
-- 134, 178, 237, 160, 114, 160, 113, 72, 196, 183,
-- 32, 46, 81, 1, 139, 21, 33, 55, 112, 21,
-- 65, 208, 101, 55, 167, 9, 142, 144, 183, 241,
-- 195, 8, 169, 38, 34, 240, 21, 6, 128, 187,
-- 28, 129, 240, 63, 207, 33, 112, 139, 2, 112,
-- 93, 224, 5, 144, 192, 14, 240, 96, 15, 15,
-- 144, 12, 173, 66, 13, 231, 0, 113, 87, 107,
-- 43, 233, 138, 122, 15, 103, 12, 202, 144, 10,
-- 148, 192, 127, 230, 234, 9, 223, 112, 11, 237,
-- 255, 48, 15, 117, 186, 14, 240, 64, 72, 244,
-- 176, 109, 5, 160, 31, 229, 11, 26, 187, 234,
-- 114, 138, 180, 26, 174, 11, 73, 145, 52, 17,
-- 164, 230, 110, 56, 151, 187, 207, 122, 165, 245,
-- 134, 22, 193, 171, 111, 33, 178, 8, 99, 240,
-- 7, 2, 124, 9, 93, 208, 125, 112, 32, 142,
-- 52, 226, 11, 197, 128, 177, 189, 0, 14, 76,
-- 226, 42, 180, 112, 70, 145, 112, 7, 195, 164,
-- 104, 194, 112, 14, 98, 119, 14, 14, 240, 3,
-- 20, 240, 142, 178, 64, 9, 120, 96, 7, 178,
-- 48, 10, 110, 103, 109, 143, 54, 10, 222, 112,
-- 61, 246, 209, 14, 215, 144, 119, 47, 183, 119,
-- 127, 247, 72, 19, 113, 2, 95, 65, 120, 97,
-- 150, 8, 100, 144, 195, 152, 176, 8, 67, 52,
-- 8, 74, 100, 10, 39, 130, 73, 68, 215, 34,
-- 138, 66, 196, 226, 8, 117, 78, 55, 41, 165,
-- 88, 10, 204, 226, 9, 177, 16, 0, 228, 48,
-- 43, 3, 85, 14, 139, 65, 13, 194, 224, 181,
-- 181, 64, 12, 252, 176, 0, 169, 128, 0, 174,
-- 64, 71, 162, 87, 9, 33, 12, 11, 201, 227,
-- 69, 122, 6, 154, 153, 137, 13, 199, 160, 13,
-- 171, 235, 194, 9, 178, 119, 114, 210, 119, 51,
-- 124, 33, 25, 130, 9, 70, 155, 28, 32, 34,
-- 34, 79, 148, 9, 167, 32, 125, 42, 146, 94,
-- 45, 34, 41, 71, 76, 121, 78, 167, 69, 142,
-- 144, 177, 169, 64, 126, 215, 255, 224, 121, 125,
-- 88, 170, 125, 216, 60, 204, 160, 12, 148, 128,
-- 122, 193, 244, 112, 183, 210, 181, 170, 18, 10,
-- 118, 192, 5, 133, 112, 8, 93, 18, 65, 210,
-- 16, 48, 223, 192, 14, 200, 176, 14, 163, 48,
-- 10, 225, 27, 67, 110, 252, 77, 113, 18, 39,
-- 244, 251, 21, 150, 80, 120, 152, 148, 120, 33,
-- 50, 116, 151, 212, 199, 41, 242, 39, 135, 210,
-- 84, 148, 55, 74, 78, 7, 8, 112, 224, 34,
-- 49, 162, 11, 187, 192, 9, 188, 208, 10, 205,
-- 240, 13, 55, 161, 75, 233, 64, 75, 181, 212,
-- 95, 59, 56, 13, 12, 167, 122, 171, 167, 70,
-- 147, 192, 139, 227, 224, 6, 119, 16, 9, 173,
-- 64, 128, 0, 184, 10, 202, 210, 76, 186, 215,
-- 37, 189, 151, 13, 223, 192, 198, 238, 203, 38,
-- 245, 160, 1, 226, 36, 39, 174, 217, 101, 222,
-- 178, 11, 153, 20, 125, 210, 71, 125, 125, 114,
-- 10, 214, 23, 74, 133, 28, 35, 166, 100, 74,
-- 95, 240, 11, 154, 96, 10, 169, 208, 123, 191,
-- 199, 37, 0, 99, 126, 166, 130, 75, 225, 0,
-- 15, 11, 227, 108, 181, 160, 65, 196, 52, 9,
-- 248, 39, 14, 182, 48, 11, 192, 208, 10, 185,
-- 167, 44, 222, 236, 205, 196, 226, 43, 196, 178,
-- 44, 93, 146, 77, 45, 129, 206, 50, 212, 0,
-- 28, 48, 89, 156, 117, 21, 45, 176, 62, 241,
-- 76, 98, 139, 64, 40, 155, 196, 78, 236, 84,
-- 12, 187, 255, 188, 40, 193, 28, 204, 169, 212,
-- 5, 207, 164, 11, 57, 210, 161, 173, 80, 75,
-- 191, 39, 20, 173, 240, 9, 58, 225, 80, 203,
-- 0, 14, 71, 29, 122, 6, 106, 11, 181, 64,
-- 127, 176, 194, 135, 228, 48, 13, 110, 128, 7,
-- 148, 0, 10, 221, 124, 8, 104, 176, 9, 206,
-- 100, 123, 9, 216, 49, 8, 248, 49, 195, 178,
-- 6, 187, 23, 210, 209, 80, 15, 28, 80, 89,
-- 51, 112, 147, 19, 145, 179, 94, 1, 1, 208,
-- 32, 47, 158, 212, 39, 187, 192, 129, 169, 102,
-- 203, 4, 220, 5, 111, 144, 215, 112, 240, 125,
-- 144, 80, 7, 111, 240, 5, 127, 224, 27, 189,
-- 112, 104, 211, 32, 14, 228, 32, 10, 224, 16,
-- 13, 245, 226, 10, 205, 178, 12, 71, 93, 75,
-- 224, 32, 14, 5, 19, 10, 161, 224, 122, 125,
-- 40, 43, 211, 80, 9, 226, 177, 205, 173, 64,
-- 8, 75, 168, 5, 139, 232, 132, 140, 88, 44,
-- 29, 179, 44, 3, 128, 89, 208, 114, 147, 88,
-- 9, 176, 63, 20, 207, 114, 45, 211, 125, 44,
-- 111, 134, 231, 63, 94, 16, 138, 111, 208, 5,
-- 104, 208, 215, 111, 224, 5, 98, 24, 7, 153,
-- 64, 211, 191, 144, 12, 146, 173, 48, 164, 226,
-- 9, 70, 241, 10, 175, 16, 11, 203, 16, 14,
-- 58, 152, 14, 224, 160, 12, 227, 80, 14, 94,
-- 235, 159, 229, 64, 80, 179, 2, 123, 20, 183,
-- 5, 71, 88, 7, 192, 114, 128, 7, 255, 104,
-- 82, 163, 253, 49, 43, 229, 82, 34, 96, 147,
-- 208, 120, 45, 198, 170, 133, 233, 228, 133, 241,
-- 182, 183, 153, 224, 33, 98, 56, 138, 111, 80,
-- 7, 169, 128, 5, 235, 194, 7, 189, 29, 6,
-- 171, 115, 10, 166, 208, 10, 80, 172, 14, 241,
-- 161, 52, 89, 229, 9, 173, 32, 139, 225, 16,
-- 81, 82, 44, 217, 70, 194, 12, 127, 56, 13,
-- 1, 48, 127, 147, 171, 108, 160, 128, 136, 104,
-- 32, 82, 30, 125, 82, 225, 253, 10, 28, 0,
-- 137, 105, 179, 57, 18, 161, 210, 40, 32, 94,
-- 179, 121, 115, 122, 178, 8, 239, 212, 33, 98,
-- 32, 223, 244, 125, 5, 159, 168, 7, 104, 232,
-- 5, 49, 162, 9, 135, 224, 86, 233, 16, 122,
-- 112, 24, 12, 2, 112, 96, 176, 192, 156, 31,
-- 25, 122, 214, 109, 36, 213, 253, 135, 12, 195,
-- 42, 15, 77, 127, 81, 3, 10, 254, 104, 49,
-- 238, 149, 49, 30, 205, 136, 159, 208, 0, 35,
-- 35, 147, 146, 232, 175, 60, 36, 187, 69, 64,
-- 94, 29, 113, 115, 114, 96, 23, 134, 75, 7,
-- 144, 192, 226, 45, 174, 7, 161, 248, 46, 127,
-- 64, 41, 157, 192, 9, 191, 176, 10, 177, 26,
-- 0, 197, 195, 12, 227, 0, 11, 160, 96, 224,
-- 71, 13, 221, 146, 173, 12, 178, 0, 14, 31,
-- 204, 212, 236, 209, 85, 189, 120, 7, 253, 55,
-- 140, 254, 152, 136, 34, 133, 44, 24, 78, 44,
-- 175, 0, 15, 100, 255, 67, 50, 29, 238, 225,
-- 51, 117, 45, 62, 80, 4, 143, 105, 151, 190,
-- 240, 11, 101, 16, 230, 103, 40, 84, 127, 221,
-- 161, 165, 128, 33, 191, 112, 230, 13, 228, 64,
-- 29, 9, 139, 191, 23, 65, 31, 9, 14, 149,
-- 32, 143, 21, 149, 139, 187, 72, 53, 179, 160,
-- 12, 254, 247, 4, 80, 0, 235, 87, 48, 235,
-- 107, 197, 86, 105, 96, 232, 5, 16, 87, 27,
-- 176, 140, 6, 217, 150, 16, 177, 54, 211, 168,
-- 2, 57, 21, 92, 69, 128, 10, 181, 253, 137,
-- 99, 174, 46, 123, 208, 5, 146, 66, 18, 128,
-- 112, 18, 190, 0, 80, 233, 197, 10, 172, 208,
-- 13, 157, 160, 9, 159, 48, 77, 201, 45, 146,
-- 241, 40, 10, 179, 128, 85, 91, 165, 42, 239,
-- 216, 127, 81, 208, 143, 83, 64, 86, 96, 0,
-- 232, 173, 80, 163, 4, 105, 54, 29, 96, 50,
-- 56, 153, 50, 112, 35, 151, 26, 153, 151, 69,
-- 32, 51, 17, 16, 1, 151, 80, 79, 35, 168,
-- 7, 222, 184, 51, 111, 32, 35, 183, 105, 35,
-- 154, 224, 10, 237, 40, 11, 178, 0, 12, 7,
-- 207, 36, 90, 23, 182, 110, 64, 217, 242, 40,
-- 10, 167, 74, 11, 67, 104, 231, 90, 3, 5,
-- 177, 62, 5, 92, 19, 14, 34, 179, 140, 4,
-- 249, 238, 7, 25, 239, 22, 186, 54, 55, 192,
-- 149, 64, 176, 151, 17, 121, 90, 20, 208, 13,
-- 155, 0, 6, 59, 51, 5, 124, 128, 192, 190,
-- 139, 208, 10, 70, 35, 11, 145, 16, 9, 146,
-- 144, 243, 103, 247, 142, 180, 64, 30, 76, 19,
-- 143, 180, 160, 12, 142, 157, 0, 9, 208, 0,
-- 12, 48, 1, 49, 41, 147, 98, 147, 232, 6,
-- 169, 148, 140, 238, 148, 114, 131, 4, 67, 16,
-- 4, 63, 176, 3, 139, 35, 145, 129, 73, 93,
-- 133, 5, 21, 21, 38, 27, 57, 36, 183, 141,
-- 245, 88, 145, 165, 3, 147, 229, 146, 152, 229,
-- 82, 73, 223, 82, 52, 48, 45, 114, 147, 152,
-- 6, 177, 148, 53, 112, 4, 164, 213, 87, 131,
-- 181, 245, 152, 115, 88, 66, 9, 187, 142, 165,
-- 4, 173, 44, 89, 147, 37, 129, 50, 224, 244,
-- 109, 239, 246, 191, 78, 149, 134, 127, 248, 34,
-- 79, 248, 35, 143, 248, 134, 239, 246, 1, 1,
-- 0, 59 };
---- php-5.0.0/main/php_logos.c.easter 2004-01-08 02:17:54.000000000 -0600
-+++ php-5.0.0/main/php_logos.c 2004-08-09 11:33:35.123141640 -0500
+--- php-5.0.4/ext/standard/basic_functions.c.easter
++++ php-5.0.4/ext/standard/basic_functions.c
+@@ -203,7 +203,6 @@
+ PHP_FE(phpcredits, NULL)
+ PHP_FE(php_logo_guid, NULL)
+ PHP_FE(php_real_logo_guid, NULL)
+- PHP_FE(php_egg_logo_guid, NULL)
+ PHP_FE(zend_logo_guid, NULL)
+ PHP_FE(php_sapi_name, NULL)
+ PHP_FE(php_uname, NULL)
+--- php-5.0.4/main/php_logos.c.easter
++++ php-5.0.4/main/php_logos.c
@@ -56,7 +56,6 @@
return FAILURE;
@@ -678,13 +83,655 @@
php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
return SUCCESS;
---- php-5.0.0/ext/standard/basic_functions.c.easter 2004-08-09 11:54:25.021128264 -0500
-+++ php-5.0.0/ext/standard/basic_functions.c 2004-08-09 11:54:30.555286944 -0500
-@@ -209,7 +209,6 @@
- PHP_FE(phpcredits, NULL)
- PHP_FE(php_logo_guid, NULL)
- PHP_FE(php_real_logo_guid, NULL)
-- PHP_FE(php_egg_logo_guid, NULL)
- PHP_FE(zend_logo_guid, NULL)
- PHP_FE(php_sapi_name, NULL)
- PHP_FE(php_uname, NULL)
+--- php-5.0.4/main/logos.h.easter
++++ php-5.0.4/main/logos.h
+@@ -704,649 +704,3 @@
+ 222, 22, 110, 41, 68, 110, 209, 187, 106, 1,
+ 1, 1, 0, 59 };
+
+-unsigned char php_egg_logo[] = {
+- 71, 73, 70, 56, 57, 97, 120, 0, 67, 0,
+- 247, 0, 0, 0, 0, 0, 255, 255, 255, 153,
+- 153, 205, 135, 111, 114, 110, 103, 104, 185, 161,
+- 165, 182, 176, 177, 178, 169, 171, 22, 18, 19,
+- 43, 39, 40, 217, 151, 172, 233, 184, 199, 196,
+- 168, 177, 253, 219, 230, 207, 179, 188, 252, 202,
+- 219, 216, 178, 191, 254, 231, 239, 123, 120, 121,
+- 240, 190, 209, 144, 141, 143, 99, 92, 97, 91,
+- 87, 90, 6, 5, 6, 189, 187, 189, 93, 92,
+- 93, 170, 162, 172, 5, 3, 6, 103, 101, 104,
+- 33, 29, 36, 3, 2, 4, 203, 199, 209, 215,
+- 211, 222, 9, 8, 11, 107, 106, 109, 116, 115,
+- 118, 221, 219, 228, 206, 203, 218, 174, 171, 194,
+- 191, 188, 210, 195, 193, 215, 191, 190, 202, 159,
+- 158, 168, 168, 167, 182, 185, 184, 211, 172, 171,
+- 207, 1, 1, 2, 11, 11, 16, 14, 14, 20,
+- 7, 7, 10, 34, 34, 48, 28, 28, 39, 22,
+- 22, 30, 153, 153, 203, 156, 156, 205, 160, 160,
+- 205, 133, 133, 163, 148, 148, 178, 178, 178, 208,
+- 182, 182, 194, 79, 79, 82, 66, 66, 68, 33,
+- 33, 34, 111, 111, 114, 46, 46, 47, 76, 76,
+- 77, 84, 85, 121, 142, 144, 194, 149, 150, 202,
+- 153, 154, 205, 154, 155, 205, 150, 151, 199, 157,
+- 158, 202, 161, 162, 200, 165, 166, 203, 75, 77,
+- 111, 115, 118, 170, 97, 99, 143, 91, 93, 134,
+- 105, 107, 154, 41, 42, 60, 51, 52, 74, 129,
+- 132, 182, 136, 139, 191, 146, 148, 196, 153, 155,
+- 199, 155, 157, 200, 65, 67, 96, 174, 175, 184,
+- 16, 17, 24, 147, 149, 161, 68, 69, 73, 53,
+- 54, 57, 132, 133, 136, 139, 143, 153, 93, 96,
+- 102, 97, 100, 106, 71, 73, 77, 98, 99, 101,
+- 82, 85, 90, 86, 89, 94, 90, 93, 98, 131,
+- 137, 146, 104, 109, 116, 109, 114, 121, 119, 124,
+- 131, 101, 105, 110, 123, 129, 136, 74, 78, 82,
+- 61, 64, 67, 115, 120, 125, 80, 83, 86, 56,
+- 58, 60, 35, 36, 37, 48, 49, 50, 50, 51,
+- 52, 60, 61, 62, 41, 42, 42, 39, 40, 40,
+- 37, 38, 38, 136, 164, 159, 4, 5, 3, 176,
+- 173, 166, 192, 189, 183, 180, 174, 163, 194, 187,
+- 177, 181, 175, 166, 178, 172, 163, 176, 170, 161,
+- 182, 166, 144, 179, 164, 143, 179, 168, 153, 121,
+- 116, 109, 186, 180, 172, 184, 178, 170, 191, 185,
+- 177, 201, 195, 187, 198, 193, 186, 138, 117, 91,
+- 154, 135, 111, 181, 163, 140, 160, 144, 124, 187,
+- 170, 149, 184, 168, 148, 189, 178, 164, 186, 175,
+- 162, 203, 198, 192, 203, 199, 194, 202, 198, 193,
+- 200, 196, 191, 133, 108, 79, 144, 126, 105, 195,
+- 180, 163, 176, 163, 148, 201, 187, 171, 202, 190,
+- 177, 179, 169, 158, 205, 194, 182, 197, 188, 178,
+- 200, 192, 183, 180, 173, 165, 178, 171, 163, 177,
+- 170, 162, 175, 168, 160, 189, 182, 174, 197, 190,
+- 182, 206, 199, 191, 203, 197, 190, 3, 2, 1,
+- 111, 96, 81, 173, 157, 140, 164, 151, 138, 181,
+- 171, 161, 178, 170, 162, 173, 166, 159, 195, 188,
+- 181, 214, 207, 200, 211, 204, 197, 200, 194, 188,
+- 197, 191, 185, 192, 186, 180, 207, 201, 195, 205,
+- 199, 193, 202, 197, 192, 196, 192, 188, 197, 194,
+- 191, 64, 63, 62, 84, 83, 82, 122, 83, 48,
+- 193, 175, 158, 188, 171, 155, 198, 182, 167, 194,
+- 183, 173, 88, 55, 28, 210, 198, 188, 201, 193,
+- 186, 204, 196, 189, 204, 197, 191, 115, 103, 94,
+- 204, 194, 186, 204, 195, 188, 205, 200, 196, 100,
+- 89, 81, 105, 98, 93, 175, 168, 163, 202, 195,
+- 190, 196, 193, 191, 95, 82, 74, 123, 109, 100,
+- 165, 157, 152, 177, 170, 166, 199, 192, 188, 202,
+- 197, 194, 201, 196, 193, 199, 194, 191, 13, 11,
+- 10, 61, 55, 52, 130, 126, 124, 69, 67, 66,
+- 81, 79, 78, 200, 196, 194, 193, 189, 187, 82,
+- 67, 60, 149, 136, 130, 79, 74, 72, 198, 193,
+- 191, 40, 29, 25, 62, 48, 43, 74, 58, 52,
+- 87, 73, 68, 138, 130, 127, 10, 7, 6, 201,
+- 195, 193, 195, 192, 191, 199, 189, 186, 19, 15,
+- 14, 88, 84, 83, 196, 188, 186, 201, 197, 196,
+- 185, 181, 180, 31, 22, 20, 198, 193, 192, 51,
+- 39, 37, 47, 34, 33, 183, 156, 154, 168, 162,
+- 162, 157, 151, 151, 196, 190, 190, 189, 184, 184,
+- 57, 56, 56, 193, 190, 190, 72, 71, 71, 53,
+- 53, 53, 44, 44, 44, 29, 29, 29, 255, 255,
+- 255, 33, 249, 4, 1, 0, 0, 255, 0, 44,
+- 0, 0, 0, 0, 120, 0, 67, 0, 0, 8,
+- 255, 0, 255, 9, 28, 72, 176, 160, 193, 131,
+- 8, 19, 42, 92, 200, 176, 161, 195, 135, 16,
+- 35, 50, 20, 64, 177, 162, 197, 139, 24, 51,
+- 82, 148, 200, 177, 163, 71, 131, 24, 167, 48,
+- 97, 242, 164, 137, 19, 33, 66, 150, 92, 89,
+- 201, 242, 202, 146, 37, 40, 133, 56, 105, 242,
+- 100, 36, 19, 41, 83, 168, 96, 252, 200, 179,
+- 39, 65, 139, 53, 164, 48, 57, 121, 37, 10,
+- 20, 40, 81, 146, 70, 105, 233, 82, 229, 203,
+- 167, 49, 99, 58, 153, 58, 245, 73, 77, 41,
+- 82, 134, 92, 244, 201, 181, 161, 197, 41, 79,
+- 132, 20, 149, 65, 246, 40, 82, 165, 75, 139,
+- 22, 21, 242, 229, 41, 212, 168, 84, 103, 54,
+- 153, 75, 215, 234, 72, 156, 68, 44, 118, 221,
+- 43, 176, 34, 21, 38, 98, 101, 208, 152, 49,
+- 131, 172, 12, 179, 103, 147, 170, 101, 218, 20,
+- 102, 84, 153, 84, 233, 206, 181, 74, 153, 178,
+- 205, 41, 67, 242, 110, 228, 235, 177, 226, 148,
+- 38, 87, 160, 100, 201, 66, 99, 112, 225, 178,
+- 102, 149, 126, 35, 180, 139, 14, 144, 126, 236,
+- 216, 205, 153, 211, 134, 13, 155, 47, 101, 198,
+- 168, 1, 83, 65, 12, 135, 223, 40, 229, 86,
+- 182, 59, 178, 166, 205, 155, 83, 52, 11, 224,
+- 12, 145, 34, 149, 39, 87, 100, 188, 128, 49,
+- 186, 52, 97, 195, 71, 201, 105, 127, 246, 108,
+- 117, 107, 57, 64, 98, 207, 255, 145, 211, 38,
+- 204, 237, 47, 186, 213, 140, 9, 3, 6, 76,
+- 25, 17, 35, 8, 88, 200, 80, 161, 130, 132,
+- 17, 147, 139, 235, 191, 123, 119, 72, 141, 205,
+- 204, 37, 68, 17, 96, 80, 196, 16, 194, 116,
+- 212, 89, 87, 216, 60, 227, 52, 24, 140, 55,
+- 170, 168, 146, 137, 119, 116, 128, 39, 30, 121,
+- 182, 125, 129, 158, 26, 90, 156, 209, 198, 22,
+- 106, 156, 129, 134, 27, 101, 180, 55, 70, 27,
+- 186, 100, 19, 141, 57, 44, 154, 99, 15, 77,
+- 54, 9, 117, 19, 86, 200, 233, 4, 96, 128,
+- 125, 9, 0, 29, 13, 23, 24, 248, 194, 116,
+- 164, 209, 48, 15, 131, 229, 4, 99, 164, 145,
+- 150, 68, 168, 202, 55, 95, 108, 177, 5, 25,
+- 235, 181, 1, 7, 16, 92, 144, 241, 5, 24,
+- 95, 168, 129, 134, 25, 104, 108, 193, 198, 110,
+- 96, 208, 209, 70, 25, 101, 192, 177, 204, 62,
+- 111, 184, 193, 204, 48, 179, 36, 82, 136, 31,
+- 209, 216, 131, 3, 127, 119, 9, 133, 85, 78,
+- 21, 225, 72, 209, 19, 81, 132, 224, 130, 7,
+- 61, 30, 8, 3, 13, 226, 48, 72, 206, 34,
+- 150, 88, 194, 203, 145, 193, 240, 34, 161, 42,
+- 25, 124, 24, 198, 24, 99, 176, 241, 6, 148,
+- 147, 150, 33, 226, 150, 107, 168, 23, 70, 27,
+- 149, 126, 9, 6, 15, 109, 136, 73, 199, 54,
+- 230, 28, 51, 12, 50, 136, 52, 51, 205, 30,
+- 134, 184, 255, 34, 231, 156, 118, 98, 101, 43,
+- 158, 203, 241, 53, 224, 21, 33, 0, 224, 129,
+- 7, 27, 24, 136, 0, 60, 227, 120, 83, 142,
+- 42, 171, 52, 114, 137, 37, 138, 44, 106, 36,
+- 47, 188, 52, 162, 10, 33, 83, 250, 16, 135,
+- 28, 112, 212, 70, 134, 26, 106, 144, 177, 173,
+- 23, 94, 152, 97, 198, 25, 99, 244, 192, 197,
+- 22, 116, 176, 49, 6, 25, 111, 176, 177, 69,
+- 16, 97, 108, 67, 72, 41, 195, 16, 211, 106,
+- 51, 178, 200, 162, 78, 59, 6, 212, 163, 133,
+- 25, 56, 224, 96, 235, 192, 184, 114, 69, 145,
+- 20, 87, 100, 1, 0, 0, 127, 110, 16, 2,
+- 2, 243, 144, 83, 142, 50, 153, 60, 178, 138,
+- 34, 137, 42, 234, 236, 179, 141, 52, 2, 206,
+- 28, 253, 204, 177, 30, 27, 97, 96, 59, 198,
+- 166, 106, 164, 225, 133, 22, 94, 172, 81, 198,
+- 22, 61, 192, 60, 198, 23, 103, 188, 241, 198,
+- 23, 111, 240, 16, 68, 6, 246, 116, 66, 204,
+- 207, 196, 156, 114, 203, 41, 167, 52, 163, 206,
+- 43, 253, 134, 27, 240, 192, 88, 101, 118, 35,
+- 71, 20, 57, 33, 195, 194, 11, 187, 240, 112,
+- 177, 207, 168, 50, 72, 47, 190, 168, 114, 9,
+- 180, 96, 55, 122, 164, 37, 171, 64, 211, 67,
+- 27, 92, 176, 65, 134, 166, 109, 248, 0, 68,
+- 109, 103, 184, 33, 174, 25, 43, 123, 193, 174,
+- 26, 91, 132, 113, 70, 167, 106, 88, 255, 138,
+- 222, 22, 207, 92, 146, 136, 41, 63, 23, 125,
+- 138, 36, 69, 87, 98, 205, 52, 179, 28, 114,
+- 128, 61, 94, 44, 61, 5, 78, 56, 105, 149,
+- 43, 212, 8, 95, 64, 53, 0, 27, 32, 0,
+- 68, 57, 169, 100, 2, 9, 38, 144, 244, 226,
+- 72, 35, 205, 130, 29, 118, 163, 151, 52, 146,
+- 1, 29, 159, 182, 177, 173, 148, 113, 68, 65,
+- 105, 26, 107, 164, 161, 197, 191, 102, 116, 161,
+- 134, 25, 120, 168, 193, 195, 109, 96, 168, 81,
+- 6, 15, 233, 110, 147, 202, 34, 145, 152, 226,
+- 124, 49, 167, 152, 98, 75, 49, 136, 227, 91,
+- 73, 46, 221, 224, 211, 175, 22, 146, 79, 225,
+- 189, 211, 151, 59, 180, 39, 20, 155, 187, 176,
+- 142, 56, 222, 164, 178, 10, 36, 165, 251, 226,
+- 203, 35, 140, 52, 178, 8, 198, 204, 50, 171,
+- 8, 198, 173, 55, 18, 4, 28, 108, 144, 138,
+- 30, 28, 117, 32, 3, 151, 246, 230, 5, 52,
+- 212, 205, 13, 106, 248, 129, 27, 220, 112, 6,
+- 247, 80, 170, 12, 95, 8, 3, 29, 246, 17,
+- 134, 103, 40, 98, 17, 144, 112, 158, 243, 108,
+- 193, 65, 91, 220, 2, 29, 205, 104, 70, 53,
+- 20, 135, 11, 237, 249, 75, 96, 222, 75, 161,
+- 141, 28, 130, 143, 168, 205, 96, 115, 231, 32,
+- 150, 50, 26, 49, 8, 247, 57, 194, 17, 129,
+- 16, 4, 35, 118, 200, 195, 27, 114, 173, 23,
+- 64, 52, 221, 8, 255, 96, 134, 37, 32, 128,
+- 97, 12, 65, 168, 67, 25, 208, 128, 134, 53,
+- 152, 97, 13, 77, 252, 215, 8, 212, 32, 130,
+- 31, 212, 204, 102, 37, 226, 86, 25, 216, 144,
+- 174, 32, 88, 98, 17, 140, 16, 70, 45, 198,
+- 72, 198, 49, 74, 130, 24, 183, 184, 5, 37,
+- 170, 49, 194, 87, 109, 15, 133, 42, 124, 26,
+- 66, 40, 34, 4, 24, 80, 205, 5, 16, 75,
+- 223, 42, 4, 241, 136, 62, 62, 226, 134, 238,
+- 115, 95, 16, 7, 57, 72, 115, 144, 33, 8,
+- 109, 56, 3, 27, 228, 144, 155, 125, 140, 1,
+- 75, 96, 24, 209, 2, 113, 103, 134, 31, 136,
+- 33, 68, 25, 88, 215, 25, 202, 144, 38, 55,
+- 160, 161, 12, 251, 232, 193, 62, 150, 183, 136,
+- 94, 192, 34, 22, 168, 76, 165, 25, 37, 97,
+- 139, 73, 76, 130, 26, 149, 184, 94, 9, 15,
+- 176, 59, 156, 196, 49, 124, 7, 161, 99, 12,
+- 168, 118, 1, 98, 61, 99, 0, 170, 8, 68,
+- 32, 252, 24, 200, 98, 6, 242, 134, 200, 116,
+- 196, 35, 84, 177, 12, 54, 100, 203, 13, 176,
+- 171, 84, 27, 218, 67, 179, 6, 58, 49, 13,
+- 104, 56, 131, 111, 212, 192, 1, 68, 206, 33,
+- 31, 61, 160, 131, 39, 63, 121, 196, 125, 40,
+- 195, 18, 151, 232, 133, 48, 80, 9, 139, 118,
+- 158, 50, 22, 101, 108, 229, 244, 110, 97, 13,
+- 117, 224, 227, 113, 56, 200, 1, 102, 188, 183,
+- 255, 194, 57, 10, 64, 8, 187, 92, 216, 57,
+- 196, 65, 14, 101, 44, 66, 21, 124, 244, 99,
+- 31, 135, 41, 204, 133, 10, 243, 161, 60, 100,
+- 132, 42, 36, 224, 36, 77, 177, 225, 120, 164,
+- 138, 100, 184, 184, 37, 183, 113, 37, 48, 13,
+- 105, 56, 67, 24, 182, 240, 154, 48, 4, 193,
+- 55, 71, 156, 212, 27, 44, 216, 136, 94, 252,
+- 226, 23, 154, 208, 196, 38, 58, 209, 9, 97,
+- 208, 180, 22, 206, 195, 169, 45, 78, 81, 9,
+- 124, 169, 195, 113, 42, 200, 39, 102, 134, 48,
+- 132, 126, 22, 36, 106, 118, 92, 216, 53, 208,
+- 7, 141, 70, 100, 66, 16, 57, 124, 104, 14,
+- 117, 40, 8, 29, 70, 244, 170, 59, 84, 133,
+- 57, 44, 21, 6, 44, 178, 161, 7, 108, 56,
+- 3, 238, 200, 244, 5, 38, 186, 225, 7, 85,
+- 212, 210, 168, 182, 193, 3, 53, 160, 135, 82,
+- 60, 0, 3, 27, 62, 4, 14, 75, 52, 2,
+- 24, 49, 141, 233, 75, 49, 129, 137, 94, 240,
+- 245, 165, 50, 221, 132, 96, 61, 81, 138, 82,
+- 120, 130, 20, 173, 240, 151, 62, 137, 10, 62,
+- 144, 48, 225, 133, 74, 157, 71, 57, 46, 177,
+- 199, 170, 78, 181, 170, 85, 101, 132, 85, 119,
+- 40, 204, 171, 6, 34, 171, 223, 120, 3, 23,
+- 122, 240, 6, 80, 189, 11, 12, 32, 93, 15,
+- 25, 80, 139, 6, 14, 72, 64, 4, 22, 216,
+- 214, 110, 200, 144, 129, 53, 255, 144, 136, 102,
+- 111, 200, 77, 169, 118, 97, 140, 69, 24, 2,
+- 25, 166, 16, 6, 49, 108, 218, 9, 193, 106,
+- 226, 23, 124, 37, 221, 95, 127, 1, 140, 230,
+- 2, 163, 16, 204, 80, 129, 22, 114, 192, 216,
+- 198, 14, 68, 0, 84, 136, 2, 213, 6, 90,
+- 14, 115, 84, 22, 179, 152, 213, 44, 84, 165,
+- 10, 81, 172, 74, 244, 27, 187, 128, 3, 88,
+- 185, 128, 188, 39, 173, 237, 74, 213, 156, 228,
+- 8, 68, 32, 55, 52, 100, 64, 12, 95, 24,
+- 193, 26, 206, 64, 6, 49, 240, 23, 93, 186,
+- 80, 94, 83, 61, 97, 138, 90, 116, 240, 20,
+- 197, 0, 154, 170, 62, 177, 9, 77, 56, 215,
+- 185, 164, 32, 133, 33, 162, 59, 221, 162, 82,
+- 193, 168, 116, 164, 154, 7, 224, 209, 93, 173,
+- 101, 226, 169, 224, 37, 175, 84, 253, 56, 204,
+- 62, 226, 240, 161, 230, 104, 82, 222, 232, 96,
+- 129, 225, 245, 224, 12, 102, 192, 102, 3, 197,
+- 218, 187, 46, 184, 161, 120, 98, 200, 89, 2,
+- 71, 128, 192, 117, 125, 193, 93, 219, 120, 70,
+- 42, 190, 24, 9, 98, 216, 34, 25, 173, 164,
+- 158, 208, 208, 193, 228, 91, 224, 107, 24, 137,
+- 152, 69, 97, 95, 241, 138, 67, 144, 194, 0,
+- 209, 205, 65, 14, 46, 108, 93, 1, 72, 97,
+- 106, 11, 67, 128, 55, 160, 17, 141, 65, 152,
+- 249, 204, 103, 102, 133, 47, 34, 193, 230, 210,
+- 141, 14, 255, 19, 47, 141, 243, 94, 251, 58,
+- 136, 111, 228, 56, 102, 104, 250, 129, 134, 246,
+- 91, 60, 8, 186, 33, 13, 189, 203, 198, 89,
+- 221, 106, 179, 148, 217, 118, 4, 95, 232, 47,
+- 24, 50, 64, 0, 99, 48, 107, 17, 131, 248,
+- 196, 145, 57, 56, 9, 73, 72, 34, 141, 78,
+- 70, 135, 53, 172, 17, 142, 105, 224, 194, 211,
+- 184, 232, 70, 55, 246, 64, 139, 119, 28, 64,
+- 5, 91, 190, 48, 21, 254, 243, 143, 12, 11,
+- 84, 30, 202, 88, 197, 40, 56, 65, 235, 90,
+- 115, 130, 21, 184, 230, 131, 31, 12, 97, 136,
+- 8, 247, 225, 21, 165, 248, 132, 176, 59, 113,
+- 140, 78, 48, 216, 19, 192, 136, 4, 5, 56,
+- 96, 129, 30, 140, 129, 7, 91, 16, 3, 160,
+- 113, 22, 210, 109, 121, 50, 13, 223, 144, 192,
+- 56, 23, 216, 5, 52, 224, 238, 172, 173, 253,
+- 194, 125, 151, 225, 232, 11, 102, 226, 21, 182,
+- 24, 35, 7, 45, 125, 233, 52, 50, 89, 22,
+- 211, 136, 55, 46, 230, 61, 111, 125, 140, 250,
+- 29, 89, 62, 194, 133, 143, 80, 145, 35, 128,
+- 25, 0, 28, 254, 134, 43, 254, 208, 138, 130,
+- 135, 34, 20, 173, 8, 197, 31, 254, 0, 10,
+- 80, 236, 186, 16, 133, 32, 197, 33, 104, 65,
+- 139, 82, 168, 67, 29, 195, 56, 6, 49, 144,
+- 81, 92, 79, 176, 194, 28, 34, 24, 195, 22,
+- 74, 155, 129, 50, 136, 193, 137, 33, 255, 2,
+- 147, 136, 70, 144, 13, 180, 146, 43, 146, 182,
+- 245, 141, 8, 50, 16, 132, 55, 176, 99, 27,
+- 224, 88, 6, 179, 46, 177, 136, 76, 0, 163,
+- 24, 181, 72, 6, 146, 43, 109, 105, 76, 107,
+- 90, 22, 156, 166, 55, 46, 238, 145, 14, 123,
+- 155, 112, 203, 71, 136, 122, 69, 158, 192, 75,
+- 121, 24, 35, 26, 204, 144, 6, 40, 14, 126,
+- 112, 81, 36, 92, 225, 14, 55, 4, 196, 37,
+- 78, 11, 96, 207, 98, 26, 33, 68, 134, 218,
+- 135, 81, 10, 87, 100, 163, 111, 147, 154, 230,
+- 241, 190, 208, 133, 150, 161, 65, 75, 55, 230,
+- 64, 54, 152, 205, 95, 53, 184, 161, 11, 93,
+- 144, 128, 4, 44, 185, 139, 32, 20, 158, 29,
+- 67, 86, 68, 235, 124, 126, 138, 160, 7, 125,
+- 18, 182, 104, 247, 45, 70, 168, 56, 78, 59,
+- 35, 23, 244, 102, 122, 58, 178, 119, 234, 28,
+- 84, 33, 234, 255, 17, 192, 18, 168, 182, 142,
+- 114, 124, 35, 235, 210, 232, 186, 40, 86, 15,
+- 8, 174, 135, 125, 236, 135, 48, 251, 217, 67,
+- 120, 138, 159, 33, 227, 21, 209, 24, 129, 24,
+- 186, 186, 158, 16, 173, 171, 12, 245, 253, 115,
+- 26, 52, 244, 131, 76, 122, 178, 12, 63, 208,
+- 130, 61, 150, 111, 14, 193, 103, 96, 23, 187,
+- 8, 242, 163, 27, 33, 8, 96, 32, 98, 140,
+- 66, 95, 183, 36, 170, 145, 198, 17, 110, 58,
+- 28, 224, 119, 134, 255, 248, 197, 223, 116, 12,
+- 188, 67, 3, 42, 168, 194, 231, 67, 175, 221,
+- 133, 193, 227, 234, 122, 72, 189, 52, 68, 17,
+- 138, 213, 219, 255, 224, 127, 216, 181, 216, 201,
+- 94, 138, 89, 204, 66, 22, 205, 128, 96, 197,
+- 64, 56, 133, 96, 15, 63, 80, 46, 149, 66,
+- 90, 8, 20, 55, 221, 52, 60, 75, 148, 1,
+- 28, 240, 3, 189, 177, 64, 35, 192, 1, 35,
+- 64, 1, 20, 96, 14, 217, 64, 0, 203, 192,
+- 14, 1, 54, 100, 211, 55, 8, 192, 128, 12,
+- 100, 116, 100, 149, 70, 9, 148, 208, 125, 149,
+- 199, 105, 185, 208, 130, 226, 167, 121, 250, 112,
+- 79, 42, 96, 5, 234, 87, 5, 20, 1, 89,
+- 0, 32, 15, 208, 80, 15, 241, 215, 117, 204,
+- 0, 8, 64, 120, 127, 12, 247, 112, 100, 247,
+- 10, 109, 2, 128, 205, 80, 12, 182, 96, 10,
+- 211, 0, 10, 223, 32, 2, 35, 181, 30, 97,
+- 240, 5, 43, 163, 5, 35, 192, 14, 86, 82,
+- 46, 219, 176, 11, 247, 101, 1, 236, 80, 1,
+- 14, 48, 1, 5, 0, 120, 18, 64, 8, 26,
+- 104, 12, 236, 96, 1, 28, 96, 12, 208, 240,
+- 104, 170, 192, 10, 125, 208, 12, 216, 151, 125,
+- 236, 182, 70, 105, 100, 13, 185, 176, 105, 226,
+- 23, 15, 241, 240, 130, 250, 160, 15, 24, 96,
+- 0, 42, 128, 4, 86, 64, 131, 20, 241, 2,
+- 84, 35, 15, 230, 224, 10, 210, 208, 136, 162,
+- 255, 240, 131, 65, 184, 122, 173, 32, 10, 127,
+- 160, 107, 251, 55, 113, 192, 150, 8, 0, 136,
+- 96, 75, 88, 10, 163, 64, 1, 145, 50, 41,
+- 100, 128, 6, 42, 176, 2, 90, 112, 31, 85,
+- 232, 6, 186, 192, 14, 102, 96, 138, 4, 240,
+- 12, 244, 208, 0, 15, 208, 0, 12, 144, 13,
+- 128, 135, 129, 18, 0, 13, 131, 103, 12, 247,
+- 195, 115, 170, 16, 9, 165, 208, 120, 115, 120,
+- 130, 147, 151, 130, 43, 24, 14, 185, 112, 121,
+- 201, 248, 130, 24, 96, 126, 42, 144, 4, 72,
+- 64, 136, 2, 48, 4, 46, 192, 48, 215, 224,
+- 13, 246, 192, 136, 243, 7, 132, 220, 200, 141,
+- 244, 23, 10, 175, 87, 132, 254, 55, 12, 33,
+- 68, 61, 166, 240, 10, 204, 32, 1, 224, 0,
+- 7, 91, 80, 86, 110, 112, 104, 93, 80, 138,
+- 43, 96, 6, 106, 176, 15, 96, 176, 2, 41,
+- 128, 2, 102, 96, 15, 17, 240, 0, 179, 216,
+- 0, 244, 144, 13, 18, 96, 139, 230, 192, 134,
+- 26, 72, 8, 138, 39, 45, 145, 32, 105, 216,
+- 23, 116, 145, 103, 105, 41, 88, 13, 32, 100,
+- 13, 124, 136, 140, 125, 72, 126, 127, 232, 140,
+- 73, 0, 141, 72, 48, 141, 189, 2, 0, 165,
+- 151, 141, 210, 192, 12, 144, 216, 141, 222, 8,
+- 142, 68, 136, 137, 254, 151, 8, 205, 64, 12,
+- 212, 99, 11, 123, 16, 13, 98, 0, 7, 92,
+- 16, 6, 119, 119, 37, 63, 255, 64, 1, 42,
+- 32, 93, 120, 144, 6, 100, 160, 13, 216, 2,
+- 86, 22, 0, 2, 253, 232, 143, 17, 0, 1,
+- 223, 64, 1, 246, 160, 2, 107, 32, 6, 25,
+- 48, 2, 130, 71, 8, 173, 163, 10, 144, 48,
+- 13, 233, 22, 116, 66, 231, 74, 69, 199, 70,
+- 232, 176, 130, 185, 16, 15, 203, 152, 14, 98,
+- 233, 116, 207, 184, 145, 73, 48, 141, 52, 0,
+- 0, 168, 176, 14, 216, 72, 146, 36, 9, 8,
+- 111, 217, 141, 171, 87, 137, 41, 89, 118, 254,
+- 39, 11, 136, 32, 128, 167, 96, 8, 230, 176,
+- 13, 252, 64, 7, 200, 151, 1, 106, 48, 144,
+- 20, 192, 50, 42, 16, 82, 104, 192, 5, 64,
+- 0, 78, 216, 64, 0, 13, 16, 1, 13, 208,
+- 0, 19, 208, 0, 11, 112, 129, 209, 176, 2,
+- 88, 64, 1, 63, 128, 86, 203, 112, 9, 139,
+- 7, 12, 199, 80, 70, 201, 160, 149, 146, 128,
+- 130, 108, 52, 66, 95, 9, 150, 96, 233, 12,
+- 98, 217, 116, 128, 248, 14, 245, 160, 4, 74,
+- 0, 141, 211, 72, 62, 107, 233, 13, 217, 224,
+- 10, 110, 9, 8, 163, 208, 155, 114, 169, 112,
+- 150, 8, 113, 152, 216, 127, 154, 88, 123, 197,
+- 32, 11, 210, 64, 8, 251, 144, 15, 209, 86,
+- 69, 93, 96, 15, 24, 88, 119, 94, 192, 6,
+- 110, 160, 2, 110, 64, 82, 116, 0, 14, 236,
+- 48, 1, 17, 0, 153, 11, 240, 0, 16, 32,
+- 1, 93, 255, 160, 148, 24, 128, 5, 35, 192,
+- 3, 187, 144, 10, 208, 176, 120, 125, 0, 116,
+- 100, 148, 149, 39, 104, 154, 222, 247, 149, 200,
+- 152, 140, 99, 105, 111, 129, 168, 1, 178, 169,
+- 4, 29, 73, 5, 87, 192, 48, 235, 32, 7,
+- 100, 182, 155, 188, 233, 155, 220, 8, 156, 250,
+- 23, 113, 177, 183, 146, 155, 40, 9, 137, 224,
+- 10, 34, 160, 13, 116, 192, 3, 98, 144, 147,
+- 20, 48, 158, 20, 32, 1, 91, 196, 5, 123,
+- 163, 5, 62, 57, 6, 101, 80, 1, 32, 16,
+- 153, 15, 160, 0, 223, 80, 1, 63, 208, 5,
+- 34, 96, 14, 94, 128, 5, 6, 88, 31, 235,
+- 233, 84, 158, 64, 12, 115, 248, 120, 174, 180,
+- 70, 167, 121, 61, 120, 232, 130, 172, 57, 150,
+- 205, 104, 0, 43, 176, 159, 253, 233, 4, 12,
+- 51, 80, 202, 176, 136, 36, 57, 10, 5, 106,
+- 146, 8, 202, 107, 10, 106, 132, 184, 144, 8,
+- 61, 117, 56, 165, 16, 13, 28, 160, 13, 61,
+- 192, 3, 28, 176, 6, 94, 208, 5, 217, 96,
+- 15, 18, 144, 1, 100, 128, 54, 108, 144, 6,
+- 101, 224, 3, 65, 176, 3, 37, 192, 0, 178,
+- 248, 0, 19, 48, 0, 240, 192, 15, 99, 192,
+- 1, 236, 64, 0, 24, 170 ,
+- 162, 25, 144, 10, 139, 231, 9, 238, 41, 116,
+- 240, 57, 9, 56, 74, 13, 222, 7, 150, 95,
+- 105, 159, 62, 138, 15, 26, 96, 2, 45, 208,
+- 2, 74, 255, 96, 3, 2, 112, 4, 82, 240,
+- 66, 121, 128, 0, 216, 0, 13, 217, 152, 164,
+- 189, 169, 164, 65, 8, 118, 9, 42, 113, 70,
+- 152, 8, 44, 25, 128, 167, 240, 10, 246, 176,
+- 12, 65, 176, 5, 109, 213, 5, 226, 130, 129,
+- 22, 16, 4, 65, 0, 50, 239, 50, 90, 100,
+- 224, 0, 1, 16, 0, 17, 176, 0, 11, 240,
+- 13, 243, 224, 15, 218, 0, 125, 219, 144, 1,
+- 18, 144, 6, 227, 153, 1, 219, 160, 12, 230,
+- 214, 158, 239, 57, 154, 55, 74, 13, 130, 202,
+- 70, 215, 211, 130, 203, 216, 163, 127, 168, 61,
+- 43, 176, 168, 140, 90, 17, 67, 112, 5, 46,
+- 128, 10, 3, 197, 14, 3, 16, 13, 174, 144,
+- 169, 6, 90, 127, 156, 234, 164, 164, 80, 118,
+- 165, 0, 170, 178, 112, 56, 163, 106, 15, 4,
+- 176, 13, 251, 160, 165, 194, 58, 158, 3, 0,
+- 14, 218, 192, 15, 117, 112, 7, 116, 48, 7,
+- 91, 128, 6, 99, 96, 1, 26, 224, 0, 223,
+- 48, 0, 21, 144, 0, 29, 0, 7, 59, 83,
+- 1, 224, 176, 15, 217, 144, 6, 226, 153, 1,
+- 227, 48, 100, 148, 69, 10, 146, 224, 167, 240,
+- 137, 130, 204, 138, 163, 207, 250, 149, 228, 119,
+- 159, 6, 144, 168, 214, 122, 3, 253, 198, 4,
+- 29, 224, 2, 121, 112, 13, 242, 176, 12, 171,
+- 16, 174, 153, 202, 155, 173, 167, 112, 67, 88,
+- 151, 159, 186, 174, 67, 179, 7, 246, 255, 192,
+- 26, 241, 154, 95, 105, 48, 2, 230, 64, 0,
+- 186, 48, 7, 252, 144, 15, 117, 192, 5, 114,
+- 224, 108, 194, 138, 6, 21, 208, 142, 95, 64,
+- 7, 116, 0, 7, 60, 176, 13, 98, 176, 11,
+- 218, 112, 31, 131, 183, 5, 17, 203, 44, 141,
+- 80, 8, 149, 128, 149, 89, 137, 130, 242, 201,
+- 149, 60, 218, 177, 25, 89, 15, 43, 96, 2,
+- 58, 192, 168, 142, 106, 17, 66, 80, 141, 39,
+- 75, 14, 100, 214, 178, 7, 10, 179, 97, 119,
+- 137, 118, 169, 137, 162, 186, 7, 174, 32, 1,
+- 236, 32, 74, 178, 5, 6, 35, 176, 12, 252,
+- 32, 7, 116, 0, 78, 251, 48, 27, 101, 154,
+- 153, 90, 178, 6, 96, 0, 7, 180, 65, 115,
+- 63, 96, 1, 251, 48, 120, 217, 80, 1, 62,
+- 32, 14, 188, 128, 78, 141, 96, 8, 149, 224,
+- 167, 174, 244, 74, 24, 43, 168, 76, 70, 145,
+- 227, 215, 154, 127, 24, 131, 137, 170, 3, 168,
+- 43, 178, 27, 225, 28, 81, 176, 173, 121, 176,
+- 14, 110, 11, 174, 65, 8, 8, 223, 184, 112,
+- 150, 184, 127, 180, 176, 160, 118, 123, 105, 137,
+- 160, 7, 217, 208, 26, 89, 218, 95, 100, 176,
+- 12, 202, 144, 15, 115, 16, 4, 251, 32, 161,
+- 112, 144, 15, 187, 32, 2, 176, 101, 1, 190,
+- 193, 14, 21, 242, 46, 187, 32, 1, 21, 192,
+- 14, 34, 32, 158, 186, 128, 0, 98, 102, 12,
+- 148, 101, 8, 214, 255, 48, 154, 202, 250, 74,
+- 205, 202, 149, 207, 218, 177, 247, 105, 126, 88,
+- 128, 186, 44, 208, 2, 122, 81, 17, 143, 181,
+- 48, 30, 32, 102, 111, 203, 141, 173, 64, 187,
+- 149, 248, 122, 10, 74, 11, 123, 112, 132, 205,
+- 112, 11, 146, 144, 11, 134, 144, 13, 224, 192,
+- 15, 234, 21, 6, 153, 100, 1, 219, 240, 33,
+- 52, 71, 7, 61, 160, 11, 249, 176, 15, 18,
+- 188, 133, 203, 192, 133, 251, 128, 45, 20, 42,
+- 2, 191, 145, 189, 98, 128, 0, 235, 224, 15,
+- 228, 160, 167, 171, 96, 8, 179, 80, 13, 238,
+- 48, 154, 146, 240, 74, 92, 137, 14, 213, 192,
+- 13, 220, 16, 182, 98, 137, 11, 128, 136, 1,
+- 59, 176, 3, 58, 208, 190, 170, 123, 57, 21,
+- 225, 4, 73, 181, 1, 240, 48, 102, 43, 27,
+- 174, 38, 153, 127, 98, 23, 113, 252, 59, 179,
+- 105, 36, 9, 149, 96, 8, 18, 160, 13, 64,
+- 32, 7, 92, 160, 11, 72, 196, 3, 218, 160,
+- 11, 101, 64, 6, 61, 64, 37, 249, 160, 11,
+- 92, 188, 133, 65, 112, 115, 82, 59, 27, 99,
+- 48, 95, 28, 64, 0, 4, 176, 11, 254, 112,
+- 13, 48, 224, 15, 216, 32, 194, 210, 176, 7,
+- 185, 64, 13, 238, 0, 168, 107, 212, 149, 76,
+- 198, 13, 59, 58, 186, 165, 11, 136, 53, 204,
+- 2, 44, 160, 3, 74, 160, 23, 57, 66, 71,
+- 189, 226, 2, 62, 172, 13, 198, 240, 13, 224,
+- 255, 170, 169, 64, 72, 151, 151, 104, 118, 154,
+- 88, 9, 0, 92, 9, 122, 32, 2, 66, 91,
+- 7, 79, 252, 46, 76, 203, 5, 110, 181, 5,
+- 179, 193, 5, 116, 192, 197, 251, 32, 181, 219,
+- 16, 27, 247, 218, 15, 111, 144, 6, 101, 108,
+- 1, 218, 128, 0, 215, 128, 0, 254, 208, 15,
+- 216, 240, 12, 132, 240, 13, 163, 240, 14, 179,
+- 192, 13, 238, 64, 13, 107, 84, 9, 161, 11,
+- 173, 201, 40, 195, 174, 217, 13, 205, 184, 3,
+- 39, 112, 2, 126, 28, 200, 121, 242, 19, 21,
+- 33, 4, 126, 2, 44, 240, 32, 15, 207, 144,
+- 200, 209, 192, 200, 161, 160, 7, 157, 170, 146,
+- 145, 140, 14, 178, 160, 7, 25, 208, 15, 113,
+- 112, 7, 117, 96, 7, 113, 192, 5, 179, 113,
+- 7, 99, 178, 5, 92, 0, 7, 116, 192, 15,
+- 218, 240, 206, 91, 176, 13, 242, 220, 26, 115,
+- 0, 4, 25, 32, 2, 21, 160, 13, 249, 224,
+- 15, 89, 224, 15, 117, 0, 180, 186, 240, 12,
+- 208, 160, 200, 134, 64, 11, 225, 224, 14, 220,
+- 64, 13, 31, 180, 105, 208, 10, 150, 245, 38,
+- 106, 196, 140, 1, 41, 112, 2, 40, 128, 204,
+- 238, 187, 204, 71, 213, 204, 48, 176, 1, 23,
+- 16, 2, 89, 16, 49, 71, 90, 205, 65, 168,
+- 107, 50, 155, 174, 249, 130, 47, 209, 160, 13,
+- 113, 224, 3, 44, 125, 7, 62, 224, 15, 52,
+- 224, 15, 118, 32, 7, 114, 255, 224, 76, 179,
+- 81, 180, 251, 96, 175, 251, 176, 133, 219, 160,
+- 11, 225, 12, 6, 63, 208, 3, 129, 91, 207,
+- 92, 80, 212, 85, 92, 14, 203, 64, 8, 171,
+- 0, 8, 239, 208, 14, 232, 224, 194, 215, 19,
+- 15, 245, 233, 130, 246, 38, 106, 123, 128, 15,
+- 18, 141, 2, 90, 141, 2, 23, 45, 71, 215,
+- 181, 195, 51, 112, 14, 49, 48, 29, 29, 48,
+- 14, 229, 0, 13, 43, 203, 9, 128, 0, 10,
+- 193, 73, 118, 125, 16, 108, 120, 137, 8, 179,
+- 32, 1, 64, 224, 210, 254, 112, 7, 114, 112,
+- 7, 118, 125, 215, 119, 0, 7, 97, 48, 30,
+- 64, 48, 82, 116, 160, 13, 134, 151, 134, 115,
+- 224, 15, 114, 160, 6, 35, 16, 4, 251, 42,
+- 38, 112, 208, 15, 67, 171, 11, 224, 160, 12,
+- 181, 28, 13, 6, 176, 7, 211, 192, 13, 108,
+- 84, 168, 47, 56, 111, 163, 70, 113, 248, 144,
+- 2, 31, 80, 2, 37, 160, 213, 93, 141, 75,
+- 32, 49, 117, 81, 240, 35, 212, 225, 15, 242,
+- 16, 194, 223, 48, 8, 173, 112, 187, 10, 250,
+- 107, 193, 150, 8, 136, 128, 8, 135, 176, 13,
+- 253, 144, 0, 118, 224, 54, 117, 224, 15, 62,
+- 224, 210, 119, 16, 7, 194, 205, 15, 115, 64,
+- 147, 92, 176, 63, 89, 58, 31, 235, 1, 59,
+- 143, 11, 4, 236, 200, 15, 53, 7, 4, 117,
+- 240, 151, 189, 106, 12, 95, 58, 10, 123, 16,
+- 14, 220, 255, 16, 75, 22, 233, 12, 184, 224,
+- 12, 247, 48, 106, 123, 176, 7, 24, 48, 218,
+- 164, 93, 2, 44, 160, 204, 24, 45, 32, 21,
+- 129, 48, 89, 144, 32, 52, 80, 214, 2, 189,
+- 10, 173, 16, 9, 69, 124, 8, 135, 96, 219,
+- 159, 144, 8, 108, 103, 14, 186, 112, 221, 43,
+- 13, 30, 113, 96, 7, 118, 48, 180, 98, 178,
+- 210, 253, 32, 206, 236, 117, 54, 60, 160, 134,
+- 33, 199, 3, 20, 78, 7, 254, 176, 5, 112,
+- 32, 7, 204, 235, 196, 236, 172, 13, 57, 87,
+- 203, 174, 112, 8, 184, 80, 121, 60, 42, 195,
+- 184, 112, 222, 7, 240, 1, 32, 176, 226, 164,
+- 205, 2, 57, 140, 218, 240, 93, 17, 77, 16,
+- 5, 213, 49, 3, 29, 0, 4, 176, 157, 9,
+- 172, 176, 127, 125, 208, 7, 132, 21, 108, 85,
+- 186, 11, 186, 208, 15, 224, 65, 147, 175, 81,
+- 7, 227, 252, 207, 83, 2, 4, 32, 243, 207,
+- 253, 229, 170, 206, 43, 60, 18, 52, 7, 62,
+- 80, 7, 174, 17, 180, 131, 157, 15, 40, 34,
+- 217, 202, 48, 208, 245, 240, 14, 137, 240, 212,
+- 132, 202, 154, 161, 214, 13, 6, 80, 2, 36,
+- 64, 2, 43, 14, 2, 92, 189, 21, 205, 97,
+- 17, 82, 32, 4, 130, 225, 15, 167, 49, 7,
+- 233, 67, 89, 131, 80, 8, 61, 254, 227, 137,
+- 80, 10, 202, 57, 184, 176, 83, 42, 68, 123,
+- 7, 64, 144, 224, 175, 65, 206, 118, 255, 208,
+- 224, 114, 16, 109, 98, 224, 170, 95, 88, 6,
+- 252, 208, 15, 253, 144, 15, 249, 48, 184, 219,
+- 160, 207, 92, 220, 3, 15, 188, 15, 236, 96,
+- 12, 139, 88, 8, 184, 240, 212, 20, 137, 121,
+- 206, 240, 14, 103, 158, 230, 168, 14, 2, 46,
+- 238, 230, 17, 129, 17, 76, 16, 29, 215, 113,
+- 20, 163, 53, 205, 151, 192, 9, 164, 224, 227,
+- 192, 86, 8, 132, 64, 7, 65, 48, 6, 111,
+- 192, 184, 52, 253, 26, 64, 80, 232, 76, 254,
+- 196, 80, 140, 45, 14, 252, 58, 76, 206, 216,
+- 114, 96, 7, 9, 80, 42, 140, 189, 13, 61,
+- 144, 15, 200, 27, 4, 85, 172, 13, 211, 172,
+- 34, 160, 46, 145, 241, 224, 194, 6, 160, 14,
+- 168, 158, 234, 109, 206, 234, 80, 115, 17, 175,
+- 142, 29, 80, 192, 5, 73, 1, 14, 137, 236,
+- 10, 164, 224, 7, 230, 96, 1, 116, 0, 202,
+- 174, 1, 4, 61, 32, 65, 116, 144, 175, 253,
+- 224, 54, 197, 125, 236, 115, 160, 11, 235, 28,
+- 6, 92, 224, 236, 138, 9, 148, 225, 140, 176,
+- 217, 210, 15, 109, 112, 115, 100, 176, 156, 216,
+- 238, 233, 209, 32, 226, 186, 124, 15, 248, 176,
+- 226, 225, 158, 230, 227, 46, 200, 60, 145, 17,
+- 128, 97, 20, 137, 145, 22, 79, 75, 8, 98,
+- 128, 46, 104, 19, 202, 111, 112, 170, 53, 217,
+- 15, 9, 126, 224, 9, 222, 15, 195, 78, 233,
+- 66, 139, 45, 224, 255, 28, 7, 9, 80, 33,
+- 197, 125, 46, 167, 154, 15, 45, 166, 11, 91,
+- 224, 240, 236, 224, 229, 248, 112, 15, 241, 160,
+- 222, 32, 16, 238, 108, 126, 218, 239, 221, 19,
+- 25, 33, 5, 160, 129, 22, 87, 176, 5, 45,
+- 145, 189, 246, 224, 6, 218, 144, 55, 22, 176,
+- 5, 68, 46, 7, 117, 32, 233, 146, 158, 232,
+- 65, 59, 7, 43, 77, 3, 117, 192, 184, 117,
+- 224, 54, 243, 62, 236, 254, 160, 11, 28, 176,
+- 11, 111, 48, 2, 25, 128, 13, 252, 208, 3,
+- 216, 174, 12, 217, 80, 15, 59, 32, 218, 31,
+- 160, 226, 22, 79, 2, 236, 237, 222, 26, 175,
+- 43, 24, 113, 4, 67, 193, 24, 111, 161, 5,
+- 187, 0, 6, 18, 112, 34, 215, 157, 15, 118,
+- 192, 206, 114, 80, 207, 253, 192, 197, 90, 255,
+- 219, 137, 94, 7, 90, 111, 30, 98, 18, 6,
+- 64, 16, 7, 97, 64, 15, 171, 176, 10, 246,
+- 16, 39, 246, 144, 168, 88, 80, 195, 39, 80,
+- 2, 68, 15, 2, 165, 221, 2, 105, 75, 238,
+- 1, 162, 17, 67, 48, 20, 42, 177, 18, 47,
+- 17, 19, 102, 176, 147, 108, 240, 239, 234, 220,
+- 15, 234, 149, 15, 252, 128, 220, 132, 205, 15,
+- 9, 176, 10, 170, 64, 15, 244, 224, 11, 198,
+- 95, 0, 5, 112, 0, 7, 160, 1, 26, 176,
+- 2, 208, 175, 4, 45, 128, 186, 55, 236, 199,
+- 199, 124, 204, 235, 141, 2, 56, 172, 17, 56,
+- 251, 146, 75, 176, 47, 5, 79, 112, 18, 142,
+- 33, 4, 77, 144, 3, 249, 212, 148, 25, 16,
+- 78, 131, 45, 207, 21, 40, 2, 236, 128, 13,
+- 41, 68, 84, 170, 118, 4, 85, 96, 5, 72,
+- 176, 145, 178, 105, 173, 236, 91, 253, 44, 0,
+- 16, 40, 4, 178, 208, 209, 194, 134, 0, 132,
+- 9, 19, 254, 99, 216, 208, 225, 67, 136, 17,
+- 37, 74, 84, 88, 17, 225, 16, 41, 76, 158,
+- 52, 113, 210, 177, 9, 14, 51, 88, 204, 124,
+- 25, 243, 35, 199, 59, 21, 43, 188, 4, 81,
+- 49, 197, 229, 16, 152, 84, 142, 28, 169, 98,
+- 5, 73, 146, 36, 74, 148, 180, 224, 217, 66,
+- 135, 14, 22, 65, 11, 42, 57, 104, 81, 225,
+- 68, 164, 73, 149, 70, 52, 106, 17, 35, 19,
+- 168, 94, 64, 164, 88, 99, 70, 138, 148, 41,
+- 34, 119, 96, 208, 225, 242, 229, 16, 42, 50,
+- 107, 90, 193, 153, 115, 103, 79, 37, 55, 138,
+- 54, 93, 184, 212, 237, 91, 165, 108, 43, 86,
+- 81, 130, 132, 10, 154, 21, 87, 175, 106, 65,
+- 241, 211, 235, 148, 152, 51, 171, 212, 68, 82,
+- 24, 137, 141, 181, 114, 219, 194, 101, 220, 120,
+- 162, 226, 34, 70, 146, 236, 184, 33, 128, 200,
+- 229, 200, 69, 20, 111, 102, 235, 216, 243, 231,
+- 199, 156, 69, 143, 94, 12, 218, 244, 105, 166,
+- 164, 85, 35, 68, 221, 218, 245, 107, 216, 174,
+- 3, 2, 0, 59 };
+-
php-5.0.3-gcc4.patch:
xml_element.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Index: php-5.0.3-gcc4.patch
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php-5.0.3-gcc4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-5.0.3-gcc4.patch 18 Feb 2005 10:13:55 -0000 1.2
+++ php-5.0.3-gcc4.patch 1 Apr 2005 12:01:20 -0000 1.3
@@ -22,13 +22,3 @@
simplestring_free(&root->text);
my_free(root);
}
---- php-5.0.3/Zend/zend_modules.h.gcc4
-+++ php-5.0.3/Zend/zend_modules.h
-@@ -23,6 +23,7 @@
- #define MODULES_H
-
- #include "zend.h"
-+#include "zend_compile.h"
-
- #define INIT_FUNC_ARGS int type, int module_number TSRMLS_DC
- #define INIT_FUNC_ARGS_PASSTHRU type, module_number TSRMLS_CC
Index: php.conf
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php.conf 10 Nov 2004 11:10:24 -0000 1.6
+++ php.conf 1 Apr 2005 12:01:20 -0000 1.7
@@ -16,3 +16,9 @@
# indexes.
#
DirectoryIndex index.php
+
+#
+# Uncomment the following line to allow PHP to pretty-print .phps
+# files as PHP source code:
+#
+#AddType application/x-httpd-php-source .phps
Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- php.spec 30 Mar 2005 21:02:23 -0000 1.62
+++ php.spec 1 Apr 2005 12:01:20 -0000 1.63
@@ -6,8 +6,8 @@
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
Name: php
-Version: 5.0.3
-Release: 5
+Version: 5.0.4
+Release: 1
License: The PHP License
Group: Development/Languages
URL: http://www.php.net/
@@ -17,31 +17,24 @@
Source50: php.conf
Patch2: php-5.0.1-config.patch
-Patch3: php-5.0.2-lib64.patch
+Patch3: php-5.0.4-lib64.patch
Patch4: php-4.2.2-cxx.patch
Patch5: php-4.3.3-install.patch
Patch6: php-4.3.1-tests.patch
Patch7: php-4.3.2-libtool15.patch
-Patch8: php-4.3.3-miscfix.patch
Patch9: php-4.3.6-umask.patch
Patch10: php-5.0.2-gdnspace.patch
Patch11: php-4.3.8-round.patch
Patch13: php-5.0.2-phpize64.patch
Patch14: php-5.0.3-sprintf.patch
-Patch15: php-5.0.3-zstrtod.patch
Patch16: php-5.0.3-gdheaders.patch
Patch17: php-5.0.3-gcc4.patch
-Patch18: php-5.0.3-memset0.patch
-Patch19: php-5.0.3-zendwarn.patch
# Fixes for extension modules
Patch21: php-4.3.1-odbc.patch
-Patch22: php-5.0.3-libmbfl.patch
-Patch23: php-5.0.3-mysqli.patch
-Patch24: php-5.0.3-mysqliglobal.patch
# Functional changes
-Patch30: php-4.3.1-dlopen.patch
+Patch30: php-5.0.4-dlopen.patch
Patch31: php-5.0.0-easter.patch
BuildRoot: %{_tmppath}/%{name}-root
@@ -306,22 +299,14 @@
%patch5 -p1 -b .install
%patch6 -p1 -b .tests
%patch7 -p1 -b .libtool15
-##patch8 -p1 -b .miscfix
%patch9 -p1 -b .umask
%patch10 -p1 -b .gdnspace
%patch11 -p1 -b .round
%patch13 -p1 -b .phpize64
-%patch14 -p1 -b .sprintf
-%patch15 -p1 -b .zstrtod
%patch16 -p1 -b .gdheaders
%patch17 -p1 -b .gcc4
-%patch18 -p1 -b .memset0
-%patch19 -p1 -b .zendwarn
%patch21 -p1 -b .odbc
-%patch22 -p1 -b .libmbfl
-%patch23 -p1 -b .mysqli
-%patch24 -p1 -b .mysqliglobal
%patch30 -p1 -b .dlopen
%patch31 -p1 -b .easter
@@ -349,20 +334,18 @@
: Build for oci8=%{with_oci8} mssql=%{with_mssql} mhash=%{with_mhash} ibase=%{with_ibase}
%build
-
-CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"; export CFLAGS
-
-# Install extension modules in %{_libdir}/php/modules.
-EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR
-
-# pull latest ltmain.sh, AC_PROG_LIBTOOL
+# Force use of system libtool:
libtoolize --force --copy
-# force aclocal run during buildconf
-touch acinclude.m4
+cat `aclocal --print-ac-dir`/libtool.m4 > build/libtool.m4
# Regenerate configure scripts (patches change config.m4's)
./buildconf --force
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"; export CFLAGS
+
+# Install extension modules in %{_libdir}/php/modules.
+EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR
+
# Shell function to configure and build a PHP tree.
build() {
# bison-1.875-2 seems to produce a broken parser; workaround.
@@ -603,6 +586,10 @@
%endif
%changelog
+* Fri Apr 1 2005 Joe Orton <jorton at redhat.com> 5.0.4-1
+- update to 5.0.4 (#153068)
+- add .phps AddType to php.conf (#152973)
+
* Wed Mar 30 2005 Joe Orton <jorton at redhat.com> 5.0.3-5
- BuildRequire mysql-devel >= 4.1
- don't mark php.ini as noreplace to make upgrades work (#152171)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/php/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 12 Jan 2005 13:47:06 -0000 1.18
+++ sources 1 Apr 2005 12:01:20 -0000 1.19
@@ -1 +1 @@
-bf89557056ce34d502e20e24071616c7 php-5.0.3.tar.gz
+c8f5fa441fd99c1b363bd2a071a0bd97 php-5.0.4.tar.gz
--- php-4.3.1-dlopen.patch DELETED ---
--- php-4.3.3-miscfix.patch DELETED ---
--- php-5.0.2-lib64.patch DELETED ---
--- php-5.0.3-libmbfl.patch DELETED ---
--- php-5.0.3-memset0.patch DELETED ---
--- php-5.0.3-mysqli.patch DELETED ---
--- php-5.0.3-mysqliglobal.patch DELETED ---
--- php-5.0.3-zendwarn.patch DELETED ---
--- php-5.0.3-zstrtod.patch DELETED ---
More information about the fedora-cvs-commits
mailing list