Hello community, here is the log from the commit of package php5 checked in at Mon Oct 9 11:15:31 CEST 2006. -------- --- php5/php5.changes 2006-08-16 14:01:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2006-10-08 13:22:12.000000000 +0200 @@ -1,0 +2,49 @@ +Sun Oct 8 10:17:53 CEST 2006 - postadal@suse.cz + +- update to version 5.2.0RC4 + * added DSA key generation support to openssl_pkey_new() + * updated PCRE to version 6.7 + * increased default memory limit to 16 megabytes to accommodate for a more + accurate memory utilization measurement + * added support for httpOnly flag for session extension and cookie setting + functions + * added version specific registry keys to allow different configurations for + different php version + * added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs + * added an optional boolean parameter to memory_get_usage() and + memory_get_peak_usage() to get memory size allocated by emalloc() or real + size of memory allocated from system + * moved extensions to PECL (filepro and hwapi) + * improved SNMP, OpenSSL extension + * improved the Zend memory manager, FastCGI SAPI, CURL, PCRE, PDO, SPL, + xmlReader + +- merged changes from openSUSE build service + * build without --enable-sigchild [#206533, php#28294, php#38342] + * build CLI with libedit support (really-with-libedit.patch) + * tweaked the default config a bit, to make it more secure + * removed ini entries related to extensions we don't ship + * t1lib is not currently needed for build, we need t1lib5 to do + something useful + * removeed --enable-ucd-snmp-hack (needed for ucd-snmp, but we use net-snmp) + * pdo_odbc provided by php-odbc + * php-suse-addons : + o PHP5 is unlikely to parse php3 code, remove the file association + o corrected apache directive is AddHandler not AddType + * dropped extensions: + o mysql, mysqli and pdo_mysql provided by php-mysql (reduce package count) + o php-pdo_sqlite provided by php-sqlite + o php-pdo_pgsql provided by php-pgsql + o filepro dropped by upstream + * new extension: + o filter (kept static and cannot be unloaded, due security reasons) + o json (added as Recommended) + o zip (it uses a bundled library) + +- fixed gcc issues (gcc.patch) +- droped obsoleted patches: include_path.patch, bug-37720.patch, + bug-37306.patch, cgi_bugs.patch, bug-37587.patch, gd-fixes.patch, + bug-37416.patch, main_bugs.patch, soap.patch, standard.patch, + mbstring_bugs.patch, ze2_bugs.patch, xsl_bugs.patch, curl.patch + +------------------------------------------------------------------- Old: ---- cgi_bugs.patch curl.patch main_bugs.patch mbstring_bugs.patch php-5.1.2-include_path.patch php-5.1.4.tar.bz2 php-bug-37306.patch php-bug-37416.patch php-bug-37587.patch php-bug-37720.patch php5-gd-fixes.patch soap.patch standard.patch xsl_bugs.patch ze2_bugs.patch New: ---- php-5.2.0RC4.tar.bz2 php5-gcc.patch php5-really-with-libedit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ ++++ 1405 lines (skipped) ++++ between php5/php5.spec ++++ and /mounts/work_src_done/STABLE/php5/php5.spec ++++++ php-suse-addons.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/php-suse-addons/sysconfig.apache2 new/php-suse-addons/sysconfig.apache2 --- old/php-suse-addons/sysconfig.apache2 2005-02-09 15:41:06.000000000 +0100 +++ new/php-suse-addons/sysconfig.apache2 2006-08-06 09:14:25.000000000 +0200 @@ -1,13 +1,10 @@ <IfModule mod_php5.c> - AddType application/x-httpd-php .php3 - AddType application/x-httpd-php .php4 - AddType application/x-httpd-php .php5 - AddType application/x-httpd-php .php - AddType application/x-httpd-php-source .php3s - AddType application/x-httpd-php-source .php4s - AddType application/x-httpd-php-source .php5s - AddType application/x-httpd-php-source .phps - DirectoryIndex index.php3 + AddHandler application/x-httpd-php .php4 + AddHandler application/x-httpd-php .php5 + AddHandler application/x-httpd-php .php + AddHandler application/x-httpd-php-source .php4s + AddHandler application/x-httpd-php-source .php5s + AddHandler application/x-httpd-php-source .phps DirectoryIndex index.php4 DirectoryIndex index.php5 DirectoryIndex index.php diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/php-suse-addons/test.php5 new/php-suse-addons/test.php5 --- old/php-suse-addons/test.php5 2005-02-09 15:42:33.000000000 +0100 +++ new/php-suse-addons/test.php5 2006-08-06 08:47:36.000000000 +0200 @@ -1,4 +1,10 @@ -<? -phpinfo() +<?php + +/** + * Simple test for PHP5 + */ + +phpinfo(); + ?> ++++++ php5-config.patch ++++++ --- /var/tmp/diff_new_pack.O0dMcm/_old 2006-10-09 11:14:29.000000000 +0200 +++ /var/tmp/diff_new_pack.O0dMcm/_new 2006-10-09 11:14:29.000000000 +0200 @@ -1,33 +1,84 @@ -# modify default php settings: -# - use correct directories -# - persistent connections are disabled (bug #34849) -# - prepare header for sce_install -================================================================================ ---- php-5.1.2/php.ini-recommended -+++ php-5.1.2/php.ini-recommended -@@ -138,7 +138,8 @@ +Index: php.ini-recommended +=================================================================== +RCS file: /repository/php-src/php.ini-recommended,v +retrieving revision 1.179.2.11.2.8 +diff -u -r1.179.2.11.2.8 php.ini-recommended +--- php.ini-recommended 9 Sep 2006 21:56:58 -0000 1.179.2.11.2.8 ++++ php.ini-recommended 18 Sep 2006 22:41:08 -0000 +@@ -126,7 +126,7 @@ ; servers which are not under your control, because short tags may not ; be supported on the target server. For portable, redistributable code, ; be sure not to use short tags. -short_open_tag = Off -+; short_open_tag = Off +short_open_tag = On ; Allow ASP-style <% %> tags. asp_tags = Off -@@ -516,7 +517,7 @@ - user_dir = - - ; Directory in which the loadable extensions (modules) reside. --extension_dir = "./" -+extension_dir = @extdir@ +@@ -388,7 +388,7 @@ + ; Disable the inclusion of HTML tags in error messages. + ; Note: Never use this feature for production boxes. +-;html_errors = Off ++html_errors = Off + + ; If html_errors is set On PHP produces clickable error messages that direct + ; to a page describing the error or function causing the error in detail. +@@ -498,10 +498,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" +-; +-; Windows: "\path1;\path2" +-;include_path = ".;c:\php\includes" ++include_path = ".:/usr/share/php5:/usr/share/php5/PEAR" + + ; The root of the PHP pages, used only if nonempty. + ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root +@@ -520,7 +517,7 @@ ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -@@ -618,46 +619,6 @@ - ; extension_dir directive above. - + ; disabled on them. +-enable_dl = On ++enable_dl = Off + + ; cgi.force_redirect is necessary to provide security running PHP as a CGI under + ; most web servers. Left undefined, PHP turns this on by default. You can +@@ -579,6 +576,7 @@ + allow_url_fopen = On + + ; Whether to allow include/require to open URLs (like http:// or ftp://) as files. ++ + allow_url_include = Off + + ; Define the anonymous ftp password (your email address) +@@ -597,70 +595,6 @@ + ; fgets() and file() will work regardless of the source of the file. + ; auto_detect_line_endings = Off +- +-;;;;;;;;;;;;;;;;;;;;;; +-; Dynamic Extensions ; +-;;;;;;;;;;;;;;;;;;;;;; +-; +-; If you wish to have an extension loaded automatically, use the following +-; syntax: +-; +-; extension=modulename.extension +-; +-; For example, on Windows: +-; +-; extension=msql.dll +-; +-; ... or under UNIX: +-; +-; extension=msql.so +-; +-; Note that it should be the name of the module only; no directory information +-; needs to go here. Specify the location of the extension with the +-; extension_dir directive above. +- +- -; Windows Extensions -; Note that ODBC support is built in, so no dll is needed for it. -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) @@ -68,10 +119,25 @@ -;extension=php_xmlrpc.dll -;extension=php_xsl.dll - - +- ;;;;;;;;;;;;;;;;;;; ; Module Settings ; -@@ -698,7 +659,7 @@ + ;;;;;;;;;;;;;;;;;;; +@@ -676,13 +610,6 @@ + define_syslog_variables = Off + + [mail function] +-; For Win32 only. +-SMTP = localhost +-smtp_port = 25 +- +-; For Win32 only. +-;sendmail_from = me@example.com +- + ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). + ;sendmail_path = + +@@ -700,7 +627,7 @@ ;odbc.default_pw = Not yet implemented ; Allow or prevent persistent links. @@ -80,7 +146,7 @@ ; Check that a connection is still valid before reuse. odbc.check_persistent = On -@@ -720,7 +681,7 @@ +@@ -722,7 +649,7 @@ [MySQL] ; Allow or prevent persistent links. @@ -89,17 +155,20 @@ ; Maximum number of persistent links. -1 means no limit. mysql.max_persistent = -1 -@@ -791,7 +752,7 @@ +@@ -791,19 +718,9 @@ + ; Allow or prevent reconnect + mysqli.reconnect = Off - [mSQL] - ; Allow or prevent persistent links. +-[mSQL] +-; Allow or prevent persistent links. -msql.allow_persistent = On -+msql.allow_persistent = Off - - ; Maximum number of persistent links. -1 means no limit. - msql.max_persistent = -1 -@@ -801,7 +762,7 @@ - +- +-; Maximum number of persistent links. -1 means no limit. +-msql.max_persistent = -1 +- +-; Maximum number of links (persistent+non persistent). -1 means no limit. +-msql.max_links = -1 +- [PostgresSQL] ; Allow or prevent persistent links. -pgsql.allow_persistent = On @@ -107,57 +176,240 @@ ; Detect broken persistent links always with pg_pconnect(). ; Auto reset feature requires a little overheads. -@@ -823,7 +784,7 @@ +@@ -823,46 +740,6 @@ + ; Unless pgsql.ignore_notice=0, module cannot log notice message. + pgsql.log_notice = 0 - [Sybase] - ; Allow or prevent persistent links. +-[Sybase] +-; Allow or prevent persistent links. -sybase.allow_persistent = On -+sybase.allow_persistent = Off - - ; Maximum number of persistent links. -1 means no limit. - sybase.max_persistent = -1 -@@ -848,7 +809,7 @@ - - [Sybase-CT] - ; Allow or prevent persistent links. +- +-; Maximum number of persistent links. -1 means no limit. +-sybase.max_persistent = -1 +- +-; Maximum number of links (persistent + non-persistent). -1 means no limit. +-sybase.max_links = -1 +- +-;sybase.interface_file = "/usr/sybase/interfaces" +- +-; Minimum error severity to display. +-sybase.min_error_severity = 10 +- +-; Minimum message severity to display. +-sybase.min_message_severity = 10 +- +-; Compatibility mode with old versions of PHP 3.0. +-; If on, this will cause PHP to automatically assign types to results according +-; to their Sybase type, instead of treating them all as strings. This +-; compatibility mode will probably not stay around forever, so try applying +-; whatever necessary changes to your code, and turn it off. +-sybase.compatability_mode = Off +- +-[Sybase-CT] +-; Allow or prevent persistent links. -sybct.allow_persistent = On -+sybct.allow_persistent = Off - - ; Maximum number of persistent links. -1 means no limit. - sybct.max_persistent = -1 -@@ -880,7 +841,7 @@ - ifx.default_password = +- +-; Maximum number of persistent links. -1 means no limit. +-sybct.max_persistent = -1 +- +-; Maximum number of links (persistent + non-persistent). -1 means no limit. +-sybct.max_links = -1 +- +-; Minimum server message severity to display. +-sybct.min_server_severity = 10 +- +-; Minimum client message severity to display. +-sybct.min_client_severity = 10 - ; Allow or prevent persistent links. + [bcmath] + ; Number of decimal digits for all bcmath functions. +@@ -871,42 +748,6 @@ + [browscap] + ;browscap = extra/browscap.ini + +-[Informix] +-; Default host for ifx_connect() (doesn't apply in safe mode). +-ifx.default_host = +- +-; Default user for ifx_connect() (doesn't apply in safe mode). +-ifx.default_user = +- +-; Default password for ifx_connect() (doesn't apply in safe mode). +-ifx.default_password = +- +-; Allow or prevent persistent links. -ifx.allow_persistent = On -+ifx.allow_persistent = Off - - ; Maximum number of persistent links. -1 means no limit. - ifx.max_persistent = -1 -@@ -936,7 +897,7 @@ - ; - ; where MODE is the octal representation of the mode. Note that this - ; does not overwrite the process's umask. --;session.save_path = "/tmp" -+session.save_path = "/var/lib/php5" - - ; Whether to use cookies. - session.use_cookies = 1 -@@ -1048,7 +1009,7 @@ +- +-; Maximum number of persistent links. -1 means no limit. +-ifx.max_persistent = -1 +- +-; Maximum number of links (persistent + non-persistent). -1 means no limit. +-ifx.max_links = -1 +- +-; If on, select statements return the contents of a text blob instead of its id. +-ifx.textasvarchar = 0 +- +-; If on, select statements return the contents of a byte blob instead of its id. +-ifx.byteasvarchar = 0 +- +-; Trailing blanks are stripped from fixed-length char columns. May help the +-; life of Informix SE users. +-ifx.charasvarchar = 0 +- +-; If on, the contents of text and byte blobs are dumped to a file instead of +-; keeping them in memory. +-ifx.blobinfile = 0 +- +-; NULL's are returned as empty strings, unless this is set to 1. In that case, +-; NULL's are returned as string 'NULL'. +-ifx.nullformat = 0 + + [Session] + ; Handler used to store/retrieve data. +@@ -945,7 +786,7 @@ + + ; This option enables administrators to make their users invulnerable to + ; attacks which involve passing session ids in URLs; defaults to 0. +-; session.use_only_cookies = 1 ++session.use_only_cookies = 1 + + ; Name of the session (used as cookie name). + session.name = PHPSESSID +@@ -963,7 +804,7 @@ + session.cookie_domain = + + ; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. +-session.cookie_httponly = ++session.cookie_httponly = 1 + + ; Handler used to serialize data. php is the standard serializer of PHP. + session.serialize_handler = php +@@ -1034,7 +875,7 @@ + ; Select a hash function + ; 0: MD5 (128 bits) + ; 1: SHA-1 (160 bits) +-session.hash_function = 0 ++session.hash_function = 1 + + ; Define how many bits are stored in each character when converting + ; the binary hash data to something readable. +@@ -1051,57 +892,6 @@ + ; Note that all valid entries require a "=", even if no value follows. + url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - [MSSQL] - ; Allow or prevent persistent links. +-[MSSQL] +-; Allow or prevent persistent links. -mssql.allow_persistent = On -+mssql.allow_persistent = Off - - ; Maximum number of persistent links. -1 means no limit. - mssql.max_persistent = -1 -@@ -1191,7 +1152,7 @@ - ;mbstring.func_overload = 0 +- +-; Maximum number of persistent links. -1 means no limit. +-mssql.max_persistent = -1 +- +-; Maximum number of links (persistent+non persistent). -1 means no limit. +-mssql.max_links = -1 +- +-; Minimum error severity to display. +-mssql.min_error_severity = 10 +- +-; Minimum message severity to display. +-mssql.min_message_severity = 10 +- +-; Compatibility mode with old versions of PHP 3.0. +-mssql.compatability_mode = Off +- +-; Connect timeout +-;mssql.connect_timeout = 5 +- +-; Query timeout +-;mssql.timeout = 60 +- +-; Valid range 0 - 2147483647. Default = 4096. +-;mssql.textlimit = 4096 +- +-; Valid range 0 - 2147483647. Default = 4096. +-;mssql.textsize = 4096 +- +-; Limits the number of records in each batch. 0 = all records in one batch. +-;mssql.batchsize = 0 +- +-; Specify how datetime and datetim4 columns are returned +-; On => Returns data converted to SQL server settings +-; Off => Returns values as YYYY-MM-DD hh:mm:ss +-;mssql.datetimeconvert = On +- +-; Use NT authentication when connecting to the server +-mssql.secure_connection = Off +- +-; Specify max number of processes. -1 = library default +-; msdlib defaults to 25 +-; FreeTDS defaults to 4096 +-;mssql.max_procs = -1 +- +-; Specify client character set. +-; If empty or not set the client charset from freetds.comf is used +-; This is only used when compiled with FreeTDS +-;mssql.charset = "ISO-8859-1" + + [Assertion] + ; Assert(expr); active by default. +@@ -1120,39 +910,6 @@ + ; error_reporting(0) around the eval(). + ;assert.quiet_eval = 0 + +-[Verisign Payflow Pro] +-; Default Payflow Pro server. +-pfpro.defaulthost = "test-payflow.verisign.com" +- +-; Default port to connect to. +-pfpro.defaultport = 443 +- +-; Default timeout in seconds. +-pfpro.defaulttimeout = 30 +- +-; Default proxy IP address (if required). +-;pfpro.proxyaddress = +- +-; Default proxy port. +-;pfpro.proxyport = +- +-; Default proxy logon. +-;pfpro.proxylogon = +- +-; Default proxy password. +-;pfpro.proxypassword = +- +-[COM] +-; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs +-;com.typelib_file = +-; allow Distributed-COM calls +-;com.allow_dcom = true +-; autoregister constants of a components typlib on com_load() +-;com.autoregister_typelib = true +-; register constants casesensitive +-;com.autoregister_casesensitive = false +-; show warnings on duplicate constant registrations +-;com.autoregister_verbose = true + + [mbstring] + ; language for internal character representation. +@@ -1198,21 +955,6 @@ + ; enable strict encoding detection. + ;mbstring.strict_encoding = Off - [FrontBase] +-[FrontBase] -;fbsql.allow_persistent = On -+;fbsql.allow_persistent = Off - ;fbsql.autocommit = On - ;fbsql.default_database = - ;fbsql.default_database_password = +-;fbsql.autocommit = On +-;fbsql.show_timestamp_decimals = Off +-;fbsql.default_database = +-;fbsql.default_database_password = +-;fbsql.default_host = +-;fbsql.default_password = +-;fbsql.default_user = "_SYSTEM" +-;fbsql.generate_warnings = Off +-;fbsql.max_connections = 128 +-;fbsql.max_links = 128 +-;fbsql.max_persistent = -1 +-;fbsql.max_results = 128 +-;fbsql.batchSize = 1000 + + [gd] + ; Tell the jpeg decode to libjpeg warnings and try to create ++++++ php5-gcc.patch ++++++ --- ext/curl/interface.c +++ ext/curl/interface.c @@ -156,7 +156,7 @@ #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1); #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v); -#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len) \ +#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len, retval) \ if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && \ strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \ { \ @@ -164,23 +164,27 @@ \ if (!(tmp_url = php_url_parse_ex(str, len))) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL '%s'", str); \ - RETURN_FALSE; \ - } \ + RETVAL_FALSE; \ + return retval; \ + } \ \ if (php_memnstr(str, tmp_url->path, strlen(tmp_url->path), str + len)) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s' contains unencoded control characters.", str); \ - RETURN_FALSE; \ + RETVAL_FALSE; \ + return retval; \ } \ \ if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC) || \ (PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+", CHECKUID_CHECK_MODE_PARAM)) \ ) { \ php_url_free(tmp_url); \ - RETURN_FALSE; \ + RETVAL_FALSE; \ + return retval; \ } \ php_url_free(tmp_url); \ } + /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_version, 0, 0, 0) @@ -1068,7 +1072,7 @@ if (argc > 0) { convert_to_string_ex(url); - PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(url), Z_STRLEN_PP(url)); + PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(url), Z_STRLEN_PP(url),); } cp = curl_easy_init(); @@ -1255,7 +1259,8 @@ if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) { if (Z_LVAL_PP(zvalue) != 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set"); - RETURN_FALSE; + RETVAL_FALSE; + return 1; } } error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue)); @@ -1288,7 +1293,7 @@ convert_to_string_ex(zvalue); if (option == CURLOPT_URL) { - PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); + PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1); } copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); @@ -1306,7 +1311,10 @@ void * what; what = zend_fetch_resource(zvalue TSRMLS_CC, -1, "File-Handle", &type, 1, php_file_le_stream()); - ZEND_VERIFY_RESOURCE(what); + if (!what) { + RETVAL_FALSE + return 1; + } if (FAILURE == php_stream_cast((php_stream *) what, PHP_STREAM_AS_STDIO, (void *) &fp, REPORT_ERRORS)) { RETVAL_FALSE; ++++++ php5-php-config.patch ++++++ --- /var/tmp/diff_new_pack.O0dMcm/_old 2006-10-09 11:14:29.000000000 +0200 +++ /var/tmp/diff_new_pack.O0dMcm/_new 2006-10-09 11:14:29.000000000 +0200 @@ -1,11 +1,16 @@ ---- scripts/php-config.in -+++ scripts/php-config.in -@@ -3,7 +3,7 @@ - prefix="@prefix@" +Index: scripts/php-config.in +=================================================================== +RCS file: /repository/php-src/scripts/php-config.in,v +retrieving revision 1.3.2.2.2.2 +diff -u -r1.3.2.2.2.2 php-config.in +--- scripts/php-config.in 27 Jul 2006 08:53:16 -0000 1.3.2.2.2.2 ++++ scripts/php-config.in 14 Aug 2006 04:16:34 -0000 +@@ -4,7 +4,7 @@ exec_prefix="@exec_prefix@" version="@PHP_VERSION@" + version_id="@PHP_VERSION_ID@" -includedir="@includedir@/php" +includedir="@includedir@/php5" - includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext" + includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib" ldflags="@PHP_LDFLAGS@" libs="@EXTRA_LIBS@" ++++++ php5-really-with-libedit.patch ++++++ Index: ext/readline/config.m4 =================================================================== RCS file: /repository/php-src/ext/readline/config.m4,v retrieving revision 1.25.2.3 diff -u -r1.25.2.3 config.m4 --- ext/readline/config.m4 28 Nov 2005 23:04:01 -0000 1.25.2.3 +++ ext/readline/config.m4 17 Aug 2006 22:46:53 -0000 @@ -64,7 +64,7 @@ elif test "$PHP_LIBEDIT" != "no"; then for i in $PHP_LIBEDIT /usr/local /usr; do - test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break + test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break done if test -z "$LIBEDIT_DIR"; then Index: ext/readline/readline.c =================================================================== RCS file: /repository/php-src/ext/readline/readline.c,v retrieving revision 1.42.2.3 diff -u -r1.42.2.3 readline.c --- ext/readline/readline.c 1 Jan 2006 12:50:12 -0000 1.42.2.3 +++ ext/readline/readline.c 17 Aug 2006 22:46:53 -0000 @@ -33,9 +33,11 @@ #define rl_completion_matches completion_matches #endif +#if HAVE_LIBREADLINE #include <readline/readline.h> -#ifndef HAVE_LIBEDIT #include <readline/history.h> +#else +#include <editline/readline.h> #endif PHP_FUNCTION(readline); Index: sapi/cli/php_cli.c =================================================================== RCS file: /repository/php-src/sapi/cli/php_cli.c,v retrieving revision 1.129.2.13.2.6 diff -u -r1.129.2.13.2.6 php_cli.c --- sapi/cli/php_cli.c 27 Jun 2006 08:27:10 -0000 1.129.2.13.2.6 +++ sapi/cli/php_cli.c 17 Aug 2006 22:47:10 -0000 @@ -76,7 +76,7 @@ #endif #if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE) -#include <readline/readline.h> +#include <editline/readline.h> #if !HAVE_LIBEDIT #include <readline/history.h> #endif Index: sapi/cli/php_cli_readline.c =================================================================== RCS file: /repository/php-src/sapi/cli/php_cli_readline.c,v retrieving revision 1.3.2.5 diff -u -r1.3.2.5 php_cli_readline.c --- sapi/cli/php_cli_readline.c 1 Jan 2006 12:50:19 -0000 1.3.2.5 +++ sapi/cli/php_cli_readline.c 17 Aug 2006 22:47:10 -0000 @@ -49,7 +49,7 @@ #include <unixlib/local.h> #endif -#include <readline/readline.h> +#include <editline/readline.h> #if !HAVE_LIBEDIT #include <readline/history.h> #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org