|
[-]
[+]
|
Deleted |
php5.changes
|
| @@ -1,1911 +0,0 @@
--------------------------------------------------------------------
-Fri May 2 10:12:59 CEST 2008 - crrodriguez@suse.de
-
-- update to PHP 5.2.6
- * Fixed possible stack buffer overflow in the FastCGI SAPI identified by Andrei Nigmatulin.
- * Fixed integer overflow in printf() identified by Maksymilian Aciemowicz.
- * Fixed security issue detailed in CVE-2008-0599 identified by Ryan Permeh.
- * Fixed a safe_mode bypass in cURL identified by Maksymilian Arciemowicz.
- * Properly address incomplete multibyte chars inside escapeshellcmd() identified by Stefan Esser.
- * Fixed two possible crashes inside the posix extension.
- * Fixed bug #44069 (Huge memory usage with concatenation using . instead of .=)
- * Fixed bug #44141 (private parent constructor callable through static function).
- * Fixed bug #43589 (a possible infinite loop in bz2_filter.c).
- * Fixed bug #43450 (Memory leak on some functions with implicit object __toString() call).
- * Fixed bug #43201 (Crash on using uninitialized vals and __get/__set).
- * Fixed bug #42978 (mismatch between number of bound params and values causes a crash in pdo_pgsql).
- * Fixed bug #42937 (__call() method not invoked when methods are called on parent from child class).
- * Fixed bug #42736 (xmlrpc_server_call_method() crashes).
- * Fixed bug #42369 (Implicit conversion to string leaks memory).
- * Fixed bug #41562 (SimpleXML memory issue).
- * Fixed bug #43606 (define missing depencies of the exif extension). (crrodriguez at suse dot de)
- * Fixed bug #43498 (file_exists() on a proftpd server got SIZE not allowed in ASCII mode). (Ilia, crrodriguez at suse dot de)
- * Over 120 bug fixes.
-
--------------------------------------------------------------------
-Wed Feb 6 00:37:17 CET 2008 - crrodriguez@suse.de
-
-- update suhosin extension to version 0.9.23
-- Fixed suhosin extension now compiles with snapshots of PHP 5.3
-- Fixed crypt() behaves like normal again when there is no salt supplied
-- wrong Obsoletes causes upgrade trouble [bnc #355618]
-
--------------------------------------------------------------------
-Fri Feb 1 10:47:45 CET 2008 - mmarek@suse.cz
-
-- use %%_with_ming and %%_with_qdbm instead of %%opensuse_bs,
- enables building in the bs in other projects than server:php
- (bnc#357917)
-
--------------------------------------------------------------------
-Fri Jan 11 08:06:38 CET 2008 - crrodriguez@suse.de
-
-- Try patch recently published by Redhat that allows PHP to
- use the system timezone database instead of the bundled one.
-
--------------------------------------------------------------------
-Mon Jan 7 07:07:53 CET 2008 - crrodriguez@suse.de
-
-- Do not hard require php5-timezonedb, instead provide a capability
- php(tzdatabase) = builtin_tz_ver so it gets installed via rpm
- Supplements only when needed.
-
--------------------------------------------------------------------
-Thu Dec 27 08:10:15 CET 2007 - crrodriguez@suse.de
-
-- PHP is leaking file descriptors badly on relative includes
- (php-5.2.5-fdleak.patch)
-
-
--------------------------------------------------------------------
-Thu Dec 13 05:35:08 CET 2007 - crrodriguez@suse.de
-
-- suhosin 0.9.22
- - Fixed function_exists() now checks the Suhosin permissions
- - Fixed crypt() salt no longer uses Blowfish by default
- - Fixed .htaccess/perdir support
- - Fixed compilation problem on OS/X
- - Added protection against some attacks through _SERVER variables
- - Added suhosin.server.strip and suhosin.server.encode
-
-
--------------------------------------------------------------------
-Tue Dec 11 06:37:03 CET 2007 - crrodriguez@suse.de
-
-- use /dev/urandom for generating session-IDs [#337005]
-- L3: PHP: Venezuela Time Zone Update starting date changed to December 9 [#345548]
-
--------------------------------------------------------------------
-Mon Nov 12 06:40:39 CET 2007 - crrodriguez@suse.de
-
-- update to PHP 5.2.5
- * Fixed dl() to only accept filenames. reported by Laurent Gaffie.
- * Fixed dl() to limit argument size to MAXPATHLEN (CVE-2007-4887).
- * Fixed htmlentities/htmlspecialchars not to accept partial multibyte sequences.
- * Fixed possible triggering of buffer overflows inside glibc implementations of the fnmatch(), setlocale() and glob() functions. Reported by Laurent Gaffie.
- * Fixed "mail.force_extra_parameters" php.ini directive not to be modifiable in .htaccess due to the security implications reported by SecurityReason.
- * Fixed bug #42869 (automatic session id insertion adds sessions id to non-local forms).
- * Fixed bug #41561 (Values set with php_admin_* in httpd.conf can be overwritten with ini_set()).
- * Upgraded PCRE to version 7.3 (Nuno)
- * Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
- * Added alpha support for imagefilter() IMG_FILTER_COLORIZE. (Pierre)
- * Added ability to control memory consumption between request using ZEND_MM_COMPACT environment variable. (Dmitry)
- * Improved speed of array_intersect_key(), array_intersect_assoc(), array_uintersect_assoc(), array_diff_key(), array_diff_assoc() and array_udiff_assoc(). (Dmitry)
- * Fixed move_uploaded_file() to always set file permissions of resulting file according to UMASK. (Andrew Sitnikov)
- * Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
- * Fixed regression in glob() when enforcing safe_mode/open_basedir checks on paths containing '*'. (Ilia)
- * Fixed PDO crash when driver returns empty LOB stream. (Stas)
- * Fixed iconv_*() functions to limit argument sizes as workaround to libc bug (CVE-2007-4783, CVE-2007-4840 by Laurent Gaffie). (Christian Hoffmann, Stas)
- * Fixed missing brackets leading to build warning and error in the log. Win32 code. (Andrey)
- * Fixed leaks with multiple connects on one mysqli object. (Andrey)
- * Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre)
- * Fixed bug #43196 (array_intersect_assoc() crashes with non-array input). (Jani)
- * Fixed bug #43139 (PDO ignores ATTR_DEFAULT_FETCH_MODE in some cases with fetchAll()). (Ilia)
- * Fixed bug #43137 (rmdir() and rename() do not clear statcache). (Jani)
- * Fixed bug #43130 (Bound parameters cannot have - in their name). (Ilia)
- * Fixed bug #43099 (XMLWriter::endElement() does not check # of params). (Ilia)
- * Fixed bug #43020 (Warning message is missing with shuffle() and more than one argument). (Scott)
- * Fixed bug #42976 (Crash when constructor for newInstance() or newInstanceArgs() fails) (Ilia)
- * Fixed bug #42917 (PDO::FETCH_KEY_PAIR doesn't work with setFetchMode). (Ilia)
- * Fixed bug #42890 (Constant "LIST" defined by mysqlclient and c-client). (Andrey)
- * Fixed bug #42818 ($foo = clone(array()); leaks memory). (Dmitry)
- * Fixed bug #42817 (clone() on a non-object does not result in a fatal error). (Ilia)
- * Fixed bug #42785 (json_encode() formats doubles according to locale rather then following standard syntax). (Ilia)
- * Fixed bug #42783 (pg_insert() does not accept an empty list for insertion). (Ilia)
- * Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
- * Fixed bug #42772 (Storing $this in a static var fails while handling a cast to string). (Dmitry)
- * Fixed bug #42767 (highlight_string() truncates trailing comment). (Ilia)
- * Fixed bug #42739 (mkdir() doesn't like a trailing slash when safe_mode is enabled). (Ilia)
- * Fixed bug #42703 (Exception raised in an iterator::current() causes segfault in FilterIterator) (Marcus)
- * Fixed bug #42699 (PHP_SELF duplicates path). (Dmitry)
- * Fixed bug #42654 (RecursiveIteratorIterator modifies only part of leaves) (Marcus)
- * Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT). (Ilia)
- * Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
- * Fixed bug #42627 (bz2 extension fails to build with -fno-common). (dolecek at netbsd dot org)
- * Fixed bug #42596 (session.save_path MODE option does not work). (Ilia)
- * Fixed bug #42590 (Make the engine recognize \v and \f escape sequences). (Ilia)
- * Fixed bug #42587 (behavior change regarding symlinked .php files). (Dmitry)
- * Fixed bug #42579 (apache_reset_timeout() does not exist). (Jani)
- * Fixed bug #42549 (ext/mysql failed to compile with libmysql 3.23). (Scott)
- * Fixed bug #42523 (PHP_SELF duplicates path). (Dmitry)
- * Fixed bug #42512 (ip2long('255.255.255.255') should return 4294967295 on 64-bit PHP). (Derick)
- * Fixed bug #42506 (php_pgsql_convert() timezone parse bug) (nonunnet at gmail dot com, Ilia)
- * Fixed bug #42462 (Segmentation when trying to set an attribute in a DOMElement). (Rob)
- * Fixed bug #42453 (CGI SAPI does not shut down cleanly with -i/-m/-v cmdline options). (Dmitry)
- * Fixed bug #42452 (PDO classes do not expose Reflection API information). (Hannes)
- * Fixed bug #42468 (Write lock on file_get_contents fails when using a compression stream). (Ilia)
- * Fixed bug #42488 (SoapServer reports an encoding error and the error itself breaks). (Dmitry)
- * Fixed bug #42378 (mysqli_stmt_bind_result memory exhaustion). (Andrey)
- * Fixed bug #42359 (xsd:list type not parsed). (Dmitry)
- * Fixed bug #42326 (SoapServer crash). (Dmitry)
- * Fixed bug #42214 (SoapServer sends clients internal PHP errors). (Dmitry)
- * Fixed bug #42189 (xmlrpc_set_type() crashes php on invalid datetime values). (Ilia)
- * Fixed bug #42139 (XMLReader option constants are broken using XML()). (Rob)
- * Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic compliant wsdl). (Dmitry)
- * Fixed bug #41822 (Relative includes broken when getcwd() fails). (Ab5602, Jani)
- * Fixed bug #39651 (proc_open() append mode doesn't work on windows). (Nuno)
-
--------------------------------------------------------------------
-Thu Aug 30 03:52:35 CEST 2007 - crrodriguez@suse.de
-
-- update to PHP 5.2.4, no relevant changes since RC3.
-
--------------------------------------------------------------------
-Fri Aug 24 11:11:41 CEST 2007 - crrodriguez@suse.de
-
-- PHP 5.2.4RC3
-- Fixed version_compare() to support "rc" as well as "RC" for release
- candidate version numbers.
-- Fixed bug #42368 (Incorrect error message displayed by pg_escape_string).
- (Ilia)
-- Fixed phpbug #42365 and Novell bugzilla #292998 (glob() crashes and/or accepts way too many flags). (Jani)
-- Fixed bug #42183 (classmap causes crash in non-wsdl mode). (Dmitry)
-- Fixed bug #42009 (is_a() and is_subclass_of() should NOT call autoload,
- in the same way as "instanceof" operator). (Dmitry)
-- Fixed bug #41904 (proc_open(): empty env array should cause empty
- environment to be passed to process). (Jani)
-- Fixed bug #37273 (Symlinks and mod_files session handler allow open_basedir
- bypass). (Ilia)
-- remove wrong hardcoded requirement on libedit
-- devel package at least does not need libtool the php build enviroment uses a private copy.
-- drop no longer needed patches already in upstream
-
--------------------------------------------------------------------
-Fri Aug 17 14:46:08 CEST 2007 - anosek@suse.cz
-
-- updated to version 5.2.4RC2
- - Fixed oci8 and PDO_OCI extensions to allow configuring with Oracle 11g client
- libraries. (Chris Jones)
- - Fixed bug #42292 ($PHP_CONFIG not set for phpized builds). (Jani)
- - Fixed bug #42261 (header wrong for date field). (roberto at spadim dot com
- dot br, Ilia)
- - Fixed bug #42259 (SimpleXMLIterator loses ancestry). (Rob)
- - Fixed bug #42247 (ldap_parse_result() not defined under win32). (Jani)
- - Fixed bug #42243 (copy() does not output an error when the first arg is a
- dir). (Ilia)
- - Fixed bug #42242 (sybase_connect() crashes). (Ilia)
- - Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped
- streams). (andrew dot minerd at sellingsource dot com, Ilia)
- - Fixed bug #42222 (possible buffer overflow in php_openssl_make_REQ). (Pierre)
- - Fixed bug #42211 (property_exists() fails to find protected properties from
- a parent class). (Dmitry)
- - Fixed bug #42208 (substr_replace() crashes when the same array is passed
- more than once). (crrodriguez at suse dot de, Ilia)
- - Fixed bug #42198 (SCRIPT_NAME and PHP_SELF truncated when inside a userdir
- and using PATH_INFO). (Dmitry)
- - Fixed bug #42195 (C++ compiler required always). (Jani)
- - Fixed bug #42117 (bzip2.compress loses data in internal buffer). (Philip,
- Ilia)
- - Fixed bug #42082 (NodeList length zero should be empty). (Hannes)
|
|
[-]
[+]
|
Deleted |
php5.spec
^
|
| @@ -1,2967 +0,0 @@
-#
-# spec file for package php5 (Version 5.3.0
-#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-Name: php5
-%define suhosin_version 0.9.27
-%define suhosin_php_version 5.2.10
-%define suhosin_patch_version 0.9.7
-%define with_suhosin_patch 0
-%define pkg_name php5
-%define with_spell 1
-%if 0%{?suse_version} < 930
-%define with_spell 0
-BuildRequires: heimdal-devel
-%else
-BuildRequires: krb5-devel
-%endif
-BuildRequires: apache2-devel bison curl-devel db-devel gmp-devel gtk-devel imap imap-devel libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel ncurses-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pkgconfig postfix postgresql-devel qt3-devel tcpd-devel unixODBC-devel update-alternatives zip
-%if %{with_spell}
-BuildRequires: aspell-devel
-%endif
-%if 0%{?suse_version} < 1100
-BuildRequires: mhash-devel
-%endif
-%if 0%{?suse_version} > 1000
-#!BuildIgnore: flex
-BuildRequires: flex-old
-# I would like this to become a hard dependency, as PHP is
-# documented to have this modules by default (no addtional libs are needed)
-Recommends: php-ctype php-dom php-iconv php-sqlite php-tokenizer
-Recommends: php-xmlreader php-xmlwriter php-json php-hash
-# other highly reccommended extensions
-Suggests: php-mbstring php-gd php-pear php-gettext php-mysql php-suhosin
-%else
-BuildRequires: flex libgcrypt-devel rpm-devel
-BuildRequires: libjpeg libjpeg-devel
-%endif
-BuildRequires: libedit-devel
-# use system PCRE and sqlite on 10.2 an up only, previous versions will not work.
-%if 0%{?suse_version} > 1010
-BuildRequires: pcre-devel sqlite-devel sqlite2-devel
-%endif
-#support t1lib in gd in 10.3 or later
-%if 0%{?suse_version} > 1020
-BuildRequires: re2c t1lib-devel
-#10.3 does not install sendmail binary with the minimal system
-Requires: smtp_daemon
-%endif
-%if 0%{?_with_ming:1}
-BuildRequires: ming-devel
-%endif
-%if 0%{?_with_qdbm:1}
-BuildRequires: qdbm-devel
-%endif
-%define extension_dir %{_libdir}/%{pkg_name}/extensions
-%define peardir %{_datadir}/%{pkg_name}/PEAR
-%define php_sysconf %{_sysconfdir}/%{pkg_name}
-%define _x11prefix %(xft-config --prefix)
-########################################
-# apache macros
-########################################
-%define apxs2 %{_sbindir}/apxs2
-%define apache2_mmn %(MMN=$(%{apxs2} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN)
-%define apache2_libexecdir %(%{apxs2} -q LIBEXECDIR)
-%define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR)
-%define apache2_includedir %(%{apxs2} -q INCLUDEDIR)
-%define apache2_serverroot %(%{apxs2} -q PREFIX)
-#unfortunately at this stage we dont have a working PHP binary..
-#define builtin_tz_ver 2007.9
-###
-###
-Version: 5.3.0
-Release: 30
-License: The PHP License, version 3.01
-Group: Development/Languages/Other
-Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter
-#Provides: php(tzdatabase) = %{builtin_tz_ver}
-AutoReqProv: on
-PreReq: update-alternatives
-#extensions that are no longer here
-Obsoletes: php5-dbx php5-dio php5-fam php5-filepro php5-yp
-Source0: php-%{version}.tar.bz2
-Source1: php-suse-addons.tar.bz2
-Source2: suhosin-%{suhosin_version}.tgz
-Source4: README.SUSE-pear
-#until it gets fixed in upstream...
-Source5: Registry.php
-#SUSE specific stuff
-##Patch1: php5-config.patch
-Patch2: php5-phpize.patch
-Patch3: php5-apache_sapi_install.patch
-Patch4: php5-php-config.patch
-#home made hack to really build against libedit
-Patch5: php5-really-with-libedit.patch
-%if %{with_suhosin_patch}
-Patch6: suhosin-patch-%{suhosin_php_version}-%{suhosin_patch_version}.patch.gz
-%endif
-Patch7: php-5.2.5-system-tzdb.patch
-#bugs
-# compiler warnings
-##Patch9: php5-%{version}-warnings.patch
-#please use patch30 and up for security fixes
-Url: http://www.php.net
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: PHP5 Core Files
-
-%description
-This package contains the PHP5 core files, including PHP binary (CLI)
-and PHP configuration (php.ini). This package must be installed in
-order to use PHP. Additionally, extension modules and server modules
-(e.g. for Apache) may be installed.
-
-Additional documentation is available in package php-doc.
-
-
-
-Authors:
---------
- The PHP Group
- See http://www.php.net/credits.php for more details
-
-%package devel
-Provides: php-devel pecl
-Summary: Include files of PHP5
-Group: Development/Languages/C and C++
-#this is required by the installed development headers
-Requires: %{name} = %{version} glibc-devel libxml2-devel
-#this is needed for "pecl" functionality
-Requires: autoconf automake
-# 5.2.2 or later installs php_pcre.h that requires pcre-devel
-%if 0%{?suse_version} > 1010
-Requires: pcre-devel
-%endif
-Conflicts: php4-devel
-PreReq: update-alternatives
-
-%description devel
-PHP is a server-side, cross-platform, HTML embedded scripting language.
-If you are completely new to PHP and want to get some idea of how it
-works, have a look at the Introductory Tutorial. Once you get beyond
-that have a look at the example archive sites and some of the other
-resources available in the Links section. PHP5 is the latest version.
-
-
-
-Authors:
---------
- The PHP Group
- See http://www.php.net/credits.php for more details
-
-%package pear
-Provides: php-pear
-Summary: PHP Extension and Application Repository
-Group: Development/Libraries/PHP
-Requires: %{name}-zlib
-PreReq: update-alternatives
-
-%description pear
-PEAR is a code repository for PHP extensions and PHP library code
-similar to TeX's CTAN and Perl's CPAN. This package provides an access
-to the repository.
-
-See http://pear.php.net/manual/ for more datails.
-
-
-
-Authors:
---------
- The PHP Group
- See http://www.php.net/credits.php for more details
-
-%package -n apache2-mod_php5
-Summary: PHP5 Module for Apache 2.0
-Group: Productivity/Networking/Web/Servers
-Requires: apache2-prefork %{apache2_mmn} %{name} = %{version}
-PreReq: apache2
-Conflicts: apache2-mod_php4
-Provides: mod_php_any php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter
-
-%description -n apache2-mod_php5
-PHP is a server-side, cross-platform HTML embedded scripting language.
-If you are completely new to PHP and want to get some idea of how it
-works, have a look at the Introductory tutorial. Once you get beyond
-that, have a look at the example archive sites and some of the other
-resources available in the links section.
-
-Please refer to /usr/share/doc/packages/php5/README.SUSE for
-information on how to load the module into the Apache webserver.
-
-
-
|
|
[-]
[+]
|
Deleted |
php-5.2.5-fdleak.patch
^
|
| @@ -1,25 +0,0 @@
-Index: main/fopen_wrappers.c
-===================================================================
-RCS file: /repository/php-src/main/fopen_wrappers.c,v
-retrieving revision 1.175.2.3.2.16
-retrieving revision 1.175.2.3.2.17
-diff -u -r1.175.2.3.2.16 -r1.175.2.3.2.17
---- main/fopen_wrappers.c 9 Oct 2007 10:06:34 -0000 1.175.2.3.2.16
-+++ main/fopen_wrappers.c 27 Dec 2007 02:10:26 -0000 1.175.2.3.2.17
-@@ -17,7 +17,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id: fopen_wrappers.c,v 1.175.2.3.2.16 2007/10/09 10:06:34 scottmac Exp $ */
-+/* $Id: fopen_wrappers.c,v 1.175.2.3.2.17 2007/12/27 02:10:26 bjori Exp $ */
-
- /* {{{ includes
- */
-@@ -620,6 +620,7 @@
- * relatively referenced file is accessible */
- copy_len = strlen(filepath) > MAXPATHLEN - 1 ? MAXPATHLEN - 1 : strlen(filepath);
- real_path = estrndup(filepath, copy_len);
-+ close(fdtest);
- return real_path;
- } else {
- cwd[0] = '\0';
|
|
[-]
[+]
|
Deleted |
php-5.2.5-system-tzdb.patch
^
|
| @@ -1,265 +0,0 @@
-Index: ext/date/lib/parse_tz.c
-===================================================================
-RCS file: /repository/php-src/ext/date/lib/parse_tz.c,v
-retrieving revision 1.35
-diff -u -r1.35 parse_tz.c
---- ext/date/lib/parse_tz.c 31 Dec 2007 07:12:08 -0000 1.35
-+++ ext/date/lib/parse_tz.c 10 Jan 2008 11:42:15 -0000
-@@ -20,6 +20,16 @@
-
- #include "timelib.h"
-
-+#ifdef HAVE_SYSTEM_TZDATA
-+#include <sys/mman.h>
-+#include <sys/stat.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
-+#include "php_scandir.h"
-+#endif
-+
- #include <stdio.h>
-
- #ifdef HAVE_STRING_H
-@@ -27,7 +37,10 @@
- #else
- #include <strings.h>
- #endif
-+
-+#ifndef HAVE_SYSTEM_TZDATA
- #include "timezonedb.h"
-+#endif
-
- #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
- # if defined(__LITTLE_ENDIAN__)
-@@ -202,6 +215,195 @@
- }
- }
-
-+#ifdef HAVE_SYSTEM_TZDATA
-+
-+#ifdef HAVE_SYSTEM_TZDATA_PREFIX
-+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
-+#else
-+#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
-+#endif
-+
-+static const timelib_tzdb *timezonedb_system = NULL;
-+
-+/* Filter out some non-tzdata files and the posix/right databases, if
-+ * present. */
-+static int index_filter(const struct dirent *ent)
-+{
-+ return strcmp(ent->d_name, ".") != 0
-+ && strcmp(ent->d_name, "..") != 0
-+ && strcmp(ent->d_name, "posix") != 0
-+ && strcmp(ent->d_name, "posixrules") != 0
-+ && strcmp(ent->d_name, "right") != 0
-+ && strstr(ent->d_name, ".tab") == NULL;
-+}
-+
-+/* Create the zone identifier index by trawling the filesystem. */
-+static void create_zone_index(timelib_tzdb *db)
-+{
-+ size_t dirstack_size, dirstack_top;
-+ size_t index_size, index_next;
-+ timelib_tzdb_index_entry *db_index;
-+ char **dirstack;
-+
-+ /* LIFO stack to hold directory entres to scan; each slot is a
-+ * directory name relative to the zoneinfo prefix. */
-+ dirstack_size = 32;
-+ dirstack = malloc(dirstack_size * sizeof *dirstack);
-+ dirstack_top = 1;
-+ dirstack[0] = strdup("");
-+
-+ /* Index array. */
-+ index_size = 64;
-+ db_index = malloc(index_size * sizeof *db_index);
-+ index_next = 0;
-+
-+ do {
-+ struct dirent **ents;
-+ char name[PATH_MAX], *top;
-+ int count;
-+
-+ /* Pop the top stack entry, and iterate through its contents. */
-+ top = dirstack[--dirstack_top];
-+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
-+
-+ count = php_scandir(name, &ents, index_filter, php_alphasort);
-+
-+ while (count > 0) {
-+ struct stat st;
-+ const char *leaf = ents[count - 1]->d_name;
-+
-+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
-+ top, leaf);
-+
-+ if (strlen(name) && stat(name, &st) == 0) {
-+ /* Name, relative to the zoneinfo prefix. */
-+ const char *root = top;
-+
-+ if (root[0] == '/') root++;
-+
-+ snprintf(name, sizeof name, "%s%s%s", root,
-+ *root ? "/": "", leaf);
-+
-+ if (S_ISDIR(st.st_mode)) {
-+ if (dirstack_top == dirstack_size) {
-+ dirstack_size *= 2;
-+ dirstack = realloc(dirstack,
-+ dirstack_size * sizeof *dirstack);
-+ }
-+ dirstack[dirstack_top++] = strdup(name);
-+ }
-+ else {
-+ if (index_next == index_size) {
-+ index_size *= 2;
-+ db_index = realloc(db_index,
-+ index_size * sizeof *db_index);
-+ }
-+
-+ db_index[index_next].id = strdup(name);
-+ db_index[index_next++].pos = 0;
-+ }
-+ }
-+
-+ free(ents[--count]);
-+ }
-+
-+ free(ents);
-+ free(top);
-+ } while (dirstack_top);
-+
-+ db->index = db_index;
-+ db->index_size = index_next;
-+
-+ free(dirstack);
-+}
-+
-+/* Return the mmap()ed tzfile if found, else NULL. On success, the
-+ * length of the mapped data is placed in *length. */
-+static char *map_tzfile(const char *timezone, size_t *length)
-+{
-+ char fname[PATH_MAX];
-+ struct stat st;
-+ char *p;
-+ int fd;
-+
-+ if (strstr(timezone, "..") != NULL) {
-+ return NULL;
-+ }
-+
-+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
-+
-+ fd = open(fname, O_RDONLY);
-+ if (fd == -1) {
-+ return NULL;
-+ } else if (fstat(fd, &st) != 0 || st.st_size < 21) {
-+ close(fd);
-+ return NULL;
-+ }
-+
-+ *length = st.st_size;
-+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-+ close(fd);
-+
-+ return p != MAP_FAILED ? p : NULL;
-+}
-+
-+const timelib_tzdb *timelib_builtin_db(void)
-+{
-+ if (timezonedb_system == NULL) {
-+ timelib_tzdb *tmp = malloc(sizeof *tmp);
-+
-+ tmp->version = "0.system";
-+ tmp->data = NULL;
-+ create_zone_index(tmp);
-+ timezonedb_system = tmp;
-+ }
-+
-+ return timezonedb_system;
-+}
-+
-+const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count)
-+{
-+ *count = timezonedb_system->index_size;
-+ return timezonedb_system->index;
-+}
-+
-+int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
-+{
-+ char fname[PATH_MAX];
-+
-+ if (strstr(timezone, "..") != NULL) {
-+ return 0;
-+ }
-+
|
|
[-]
[+]
|
Deleted |
php5-5.3.0-warnings.patch
^
|
| @@ -1,34 +0,0 @@
---- ext/xmlrpc/xmlrpc-epi-php.c.orig
-+++ ext/xmlrpc/xmlrpc-epi-php.c
-@@ -170,7 +170,7 @@ typedef struct _xmlrpc_callback_data {
-
- #define ENCODING_KEY "encoding"
- #define ENCODING_KEY_LEN (sizeof(ENCODING_KEY) - 1)
--#define ENCODING_DEFAULT "iso-8859-1"
-+static const char *ENCODING_DEFAULT = "iso-8859-1";
-
- /* value types */
- #define OBJECT_TYPE_ATTR "xmlrpc_type"
---- Zend/zend_canary.c.orig
-+++ Zend/zend_canary.c
-@@ -21,6 +21,9 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <unistd.h>
-+#include <time.h>
-+#include <fcntl.h>
-
-
- #if SUHOSIN_PATCH
---- TSRM/tsrm_virtual_cwd.c.orig 2009-07-05 18:57:25.000000000 +0200
-+++ TSRM/tsrm_virtual_cwd.c 2009-07-05 19:00:47.000000000 +0200
-@@ -1053,7 +1053,7 @@
- int start = 1;
- int ll = 0;
- time_t t;
-- int ret;
-+ int ret = 0;
- int add_slash;
- TSRMLS_FETCH();
-
|
|
[-]
[+]
|
Deleted |
php5-apache_sapi_install.patch
^
|
| @@ -1,27 +0,0 @@
-# Do not attempt to modify apache configuration on module install
-================================================================================
----
- sapi/apache2handler/config.m4 | 9 ---------
- 1 file changed, 9 deletions(-)
-
---- php-5.2.3.orig/sapi/apache2handler/config.m4
-+++ php-5.2.3/sapi/apache2handler/config.m4
-@@ -68,18 +68,9 @@ if test "$PHP_APXS2" != "no"; then
- fi
-
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-- if test -z `$APXS -q SYSCONFDIR`; then
- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
- -i -n php5"
-- else
-- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
-- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-- \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-- -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-- -i -a -n php5"
-- fi
-
- case $host_alias in
- *aix*)
|
|
[-]
[+]
|
Deleted |
php5-config.patch
^
|
| @@ -1,473 +0,0 @@
----
- php.ini-recommended | 307 ++--------------------------------------------------
- 1 file changed, 15 insertions(+), 292 deletions(-)
-
-Index: php.ini-recommended
-===================================================================
---- php.ini-recommended.orig 2007-08-22 01:24:18.000000000 +0200
-+++ php.ini-recommended 2007-12-11 06:29:32.000000000 +0100
-@@ -244,7 +244,9 @@ safe_mode_allowed_env_vars = PHP_
- ; This directive contains a comma-delimited list of environment variables that
- ; the end user won't be able to change using putenv(). These variables will be
- ; protected even if safe_mode_allowed_env_vars is set to allow to change them.
--safe_mode_protected_env_vars = LD_LIBRARY_PATH
-+; the default is the same list ld.so uses when starting a setuid binary
-+safe_mode_protected_env_vars = GCONV_PATH,GETCONF_DIR,HOSTALIASES,LD_AUDIT,LD_DEBUG,LD_DEBUG_OUTPUT,LD_DYNAMIC_WEAK,LD_LIBRARY_PATH,LD_ORIGIN_PATH,LD_PRELOAD,LD_PROFILE,LD_SHOW_AUXV,LD_USE_LOAD_BIAS,LOCALDOMAIN,LOCPATH,MALLOC_TRACE,NLSPATH,RESOLV_HOST_CONF,RES_OPTIONS,TMPDIR,TZDIR
-+
-
- ; open_basedir, if set, limits all file operations to the defined directory
- ; and below. This directive makes most sense if used in a per-directory
-@@ -406,7 +408,7 @@ track_errors = Off
-
- ; 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.
-@@ -516,7 +518,7 @@ default_mimetype = "text/html"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/php5:/usr/share/php5/PEAR"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -533,12 +535,12 @@ doc_root =
- user_dir =
-
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+extension_dir = @extdir@
-
- ; 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
- ; 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
-@@ -591,7 +593,7 @@ file_uploads = On
-
- ; Temporary directory for HTTP uploaded files (will use system default if not
- ; specified).
--;upload_tmp_dir =
-+upload_tmp_dir = "/tmp"
-
- ; Maximum allowed size for uploaded files.
- upload_max_filesize = 2M
-@@ -623,81 +625,6 @@ default_socket_timeout = 60
- ; 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)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_dba.dll
--;extension=php_dbase.dll
--;extension=php_exif.dll
--;extension=php_fdf.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_ifx.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_mcrypt.dll
--;extension=php_mhash.dll
--;extension=php_mime_magic.dll
--;extension=php_ming.dll
--;extension=php_msql.dll
--;extension=php_mssql.dll
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll
--;extension=php_openssl.dll
--;extension=php_pdo.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_oci8.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--;extension=php_snmp.dll
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
--
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
- ;;;;;;;;;;;;;;;;;;;
-@@ -745,12 +672,6 @@ default_socket_timeout = 60
- 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 =
-@@ -769,7 +690,7 @@ sql.safe_mode = Off
- ;odbc.default_pw = Not yet implemented
-
- ; Allow or prevent persistent links.
--odbc.allow_persistent = On
-+odbc.allow_persistent = Off
-
- ; Check that a connection is still valid before reuse.
- odbc.check_persistent = On
-@@ -791,7 +712,7 @@ odbc.defaultbinmode = 1
-
- [MySQL]
- ; Allow or prevent persistent links.
--mysql.allow_persistent = On
-+mysql.allow_persistent = Off
-
- ; Maximum number of persistent links. -1 means no limit.
- mysql.max_persistent = -1
-@@ -860,50 +781,9 @@ mysqli.default_pw =
- ; Allow or prevent reconnect
- mysqli.reconnect = Off
-
--[mSQL]
--; Allow or prevent persistent links.
--msql.allow_persistent = On
--
--; 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
--
--[OCI8]
--; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA)
--;oci8.privileged_connect = Off
--
--; Connection: The maximum number of persistent OCI8 connections per
--; process. Using -1 means no limit.
--;oci8.max_persistent = -1
--
--; Connection: The maximum number of seconds a process is allowed to
--; maintain an idle persistent connection. Using -1 means idle
--; persistent connections will be maintained forever.
|
|
[-]
[+]
|
Deleted |
php5-php-config.patch
^
|
| @@ -1,15 +0,0 @@
----
- scripts/php-config.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- scripts/php-config.in
-+++ scripts/php-config.in
-@@ -5,7 +5,7 @@ prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- version="@PHP_VERSION@"
- vernum="@PHP_VERSION_ID@"
--include_dir="@includedir@/php"
-+include_dir="@includedir@/php5"
- includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
- ldflags="@PHP_LDFLAGS@"
- libs="@EXTRA_LIBS@"
|
|
[-]
[+]
|
Deleted |
php5-phpize.patch
^
|
| @@ -1,31 +0,0 @@
----
- scripts/Makefile.frag | 4 ++--
- scripts/phpize.in | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- scripts/Makefile.frag.orig
-+++ scripts/Makefile.frag
-@@ -3,8 +3,8 @@
- # Build environment install
- #
-
--phpincludedir = $(includedir)/php
--phpbuilddir = $(libdir)/build
-+phpincludedir = $(includedir)/php5
-+phpbuilddir = $(datadir)/build
-
- BUILD_FILES = \
- scripts/phpize.m4 \
---- scripts/phpize.in.orig
-+++ scripts/phpize.in
-@@ -3,8 +3,8 @@
- # Variable declaration
- prefix='@prefix@'
- exec_prefix="`eval echo @exec_prefix@`"
--phpdir="`eval echo @libdir@`/build"
--includedir="`eval echo @includedir@`/php"
-+phpdir="`eval echo @datadir@`/build"
-+includedir="`eval echo @includedir@`/php5"
- builddir="`pwd`"
- SED="@SED@"
-
|
|
[-]
[+]
|
Deleted |
php5-really-with-libedit.patch
^
|
| @@ -1,68 +0,0 @@
-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
|
|
[-]
[+]
|
Deleted |
php5-warnings.patch
^
|
| @@ -1,34 +0,0 @@
---- ext/xmlrpc/xmlrpc-epi-php.c.orig
-+++ ext/xmlrpc/xmlrpc-epi-php.c
-@@ -170,7 +170,7 @@ typedef struct _xmlrpc_callback_data {
-
- #define ENCODING_KEY "encoding"
- #define ENCODING_KEY_LEN (sizeof(ENCODING_KEY) - 1)
--#define ENCODING_DEFAULT "iso-8859-1"
-+static const char *ENCODING_DEFAULT = "iso-8859-1";
-
- /* value types */
- #define OBJECT_TYPE_ATTR "xmlrpc_type"
---- Zend/zend_canary.c.orig
-+++ Zend/zend_canary.c
-@@ -21,6 +21,9 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <unistd.h>
-+#include <time.h>
-+#include <fcntl.h>
-
-
- #if SUHOSIN_PATCH
---- TSRM/tsrm_virtual_cwd.c.orig
-+++ TSRM/tsrm_virtual_cwd.c
-@@ -643,7 +643,7 @@ CWD_API int virtual_file_ex(cwd_state *s
- char orig_path[MAXPATHLEN];
- realpath_cache_bucket *bucket;
- time_t t = 0;
-- int ret;
-+ int ret = 0;
- int use_cache;
- int use_relative_path = 0;
- TSRMLS_FETCH();
|
|
[-]
[+]
|
Deleted |
suhosin-patch-5.2.10-0.9.7.patch.gz
^
|
| @@ -1,2639 +0,0 @@
-diff -Nura php-5.2.10/TSRM/TSRM.h suhosin-patch-5.2.10-0.9.7/TSRM/TSRM.h
---- php-5.2.10/TSRM/TSRM.h 2008-12-31 12:17:31.000000000 +0100
-+++ suhosin-patch-5.2.10-0.9.7/TSRM/TSRM.h 2009-06-23 22:36:11.000000000 +0200
-@@ -38,6 +38,13 @@
- typedef unsigned long tsrm_uintptr_t;
- #endif
-
-+#if SUHOSIN_PATCH
-+# if HAVE_REALPATH
-+# undef realpath
-+# define realpath php_realpath
-+# endif
-+#endif
-+
- /* Only compile multi-threading functions if we're in ZTS mode */
- #ifdef ZTS
-
-@@ -93,6 +100,7 @@
-
- #define THREAD_HASH_OF(thr,ts) (unsigned long)thr%(unsigned long)ts
-
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-diff -Nura php-5.2.10/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.c
---- php-5.2.10/TSRM/tsrm_virtual_cwd.c 2008-12-31 12:17:31.000000000 +0100
-+++ suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.c 2009-06-23 22:36:11.000000000 +0200
-@@ -273,6 +273,191 @@
- }
- /* }}} */
-
-+#if SUHOSIN_PATCH
-+CWD_API char *php_realpath(const char *path, char *resolved)
-+{
-+ struct stat sb;
-+ char *p, *q, *s;
-+ size_t left_len, resolved_len;
-+ unsigned symlinks;
-+ int serrno, slen;
-+ int is_dir = 1;
-+ char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
-+
-+ serrno = errno;
-+ symlinks = 0;
-+ if (path[0] == '/') {
-+ resolved[0] = '/';
-+ resolved[1] = '\0';
-+ if (path[1] == '\0')
-+ return (resolved);
-+ resolved_len = 1;
-+ left_len = strlcpy(left, path + 1, sizeof(left));
-+ } else {
-+ if (getcwd(resolved, PATH_MAX) == NULL) {
-+ strlcpy(resolved, ".", PATH_MAX);
-+ return (NULL);
-+ }
-+ resolved_len = strlen(resolved);
-+ left_len = strlcpy(left, path, sizeof(left));
-+ }
-+ if (left_len >= sizeof(left) || resolved_len >= PATH_MAX) {
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+
-+ /*
-+ * Iterate over path components in `left'.
-+ */
-+ while (left_len != 0) {
-+ /*
-+ * Extract the next path component and adjust `left'
-+ * and its length.
-+ */
-+ p = strchr(left, '/');
-+ s = p ? p : left + left_len;
-+ if (s - left >= sizeof(next_token)) {
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+ memcpy(next_token, left, s - left);
-+ next_token[s - left] = '\0';
-+ left_len -= s - left;
-+ if (p != NULL)
-+ memmove(left, s + 1, left_len + 1);
-+ if (resolved[resolved_len - 1] != '/') {
-+ if (resolved_len + 1 >= PATH_MAX) {
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+ resolved[resolved_len++] = '/';
-+ resolved[resolved_len] = '\0';
-+ }
-+ if (next_token[0] == '\0')
-+ continue;
-+ else if (strcmp(next_token, ".") == 0){
-+ if (!is_dir) {
-+ resolved_len = strlcat(resolved, "#", PATH_MAX);
-+ if (resolved_len >= PATH_MAX) {
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+ return resolved;
-+ }
-+ continue;
-+ } else if (strcmp(next_token, "..") == 0) {
-+ /*
-+ * Strip the last path component except when we have
-+ * single "/"
-+ */
-+ if (!is_dir) {
-+ errno = ENOENT;
-+ return (NULL);
-+ }
-+ if (resolved_len > 1) {
-+ resolved[resolved_len - 1] = '\0';
-+ q = strrchr(resolved, '/');
-+ *q = '\0';
-+ resolved_len = q - resolved;
-+ }
-+ continue;
-+ }
-+
-+ /*
-+ * Append the next path component and lstat() it. If
-+ * lstat() fails we still can return successfully if
-+ * there are no more path components left.
-+ */
-+ resolved_len = strlcat(resolved, next_token, PATH_MAX);
-+ if (resolved_len >= PATH_MAX) {
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+ if (lstat(resolved, &sb) != 0) {
-+ if (errno == ENOENT) {
-+ if (p == NULL) {
-+ errno = serrno;
-+ return NULL;
-+ return (resolved);
-+ } /*else if (strstr(left, "/.") == NULL && strstr(left, "./") == NULL) {
-+ resolved_len = strlcat(resolved, "/", PATH_MAX);
-+ resolved_len = strlcat(resolved, left, PATH_MAX);
-+ if (resolved_len >= PATH_MAX) {
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+ errno = serrno;
-+ return (resolved);
-+ } */
-+ }
-+ return (NULL);
-+ }
-+ if (S_ISLNK(sb.st_mode)) {
-+ if (symlinks++ > MAXSYMLINKS) {
-+ errno = ELOOP;
-+ return (NULL);
-+ }
-+ slen = readlink(resolved, symlink, sizeof(symlink) - 1);
-+ if (slen < 0)
-+ return (NULL);
-+ symlink[slen] = '\0';
-+ if (symlink[0] == '/') {
-+ resolved[1] = 0;
-+ resolved_len = 1;
-+ } else if (resolved_len > 1) {
-+ /* Strip the last path component. */
-+ resolved[resolved_len - 1] = '\0';
-+ q = strrchr(resolved, '/');
-+ *q = '\0';
-+ resolved_len = q - resolved;
-+ }
-+
-+ /*
-+ * If there are any path components left, then
-+ * append them to symlink. The result is placed
-+ * in `left'.
-+ */
-+ if (p != NULL) {
-+ if (symlink[slen - 1] != '/') {
-+ if (slen + 1 >= sizeof(symlink)) {
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+ symlink[slen] = '/';
-+ symlink[slen + 1] = 0;
-+ }
-+ left_len = strlcat(symlink, left, sizeof(left));
-+ if (left_len >= sizeof(left)) {
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+ }
-+ left_len = strlcpy(left, symlink, sizeof(left));
-+ } else {
-+ if (S_ISDIR(sb.st_mode)) {
-+ is_dir = 1;
-+ } else {
-+ is_dir = 0;
-+ }
-+ }
|
|
[-]
[+]
|
Deleted |
README.SUSE-pear
^
|
| @@ -1,12 +0,0 @@
-Package php5-pear does not include Pear DB support
-==================================================
-
-Php5-pear package comes without Pear DB database
-support, which was obsoleted by MDB2.
-
-If you need Pear DB, please install it with:
-#pear install --onlyreqdeps DB
-
-This is the case of Squirrelmail which requires
-Pear DB support. More information can be found
-at bugzilla.novell.com, bug #178982.
|
|
[-]
[+]
|
Deleted |
Registry.php
^
|
| @@ -1,2228 +0,0 @@
-<?php
-/**
- * PEAR_Registry
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt. If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category pear
- * @package PEAR
- * @author Stig Bakken <ssb@php.net>
- * @author Tomas V. V. Cox <cox@idecnet.com>
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2006 The PHP Group
- * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Registry.php,v 1.167.2.1 2007/09/08 15:02:49 cellog Exp $
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 0.1
- */
-
-/**
- * for PEAR_Error
- */
-require_once 'PEAR.php';
-require_once 'PEAR/DependencyDB.php';
-
-define('PEAR_REGISTRY_ERROR_LOCK', -2);
-define('PEAR_REGISTRY_ERROR_FORMAT', -3);
-define('PEAR_REGISTRY_ERROR_FILE', -4);
-define('PEAR_REGISTRY_ERROR_CONFLICT', -5);
-define('PEAR_REGISTRY_ERROR_CHANNEL_FILE', -6);
-
-/**
- * Administration class used to maintain the installed package database.
- * @category pear
- * @package PEAR
- * @author Stig Bakken <ssb@php.net>
- * @author Tomas V. V. Cox <cox@idecnet.com>
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2006 The PHP Group
- * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: @package_version@
- * @link http://pear.php.net/package/PEAR
- * @since Class available since Release 1.4.0a1
- */
-class PEAR_Registry extends PEAR
-{
- // {{{ properties
-
- /**
- * File containing all channel information.
- * @var string
- */
- var $channels = '';
-
- /** Directory where registry files are stored.
- * @var string
- */
- var $statedir = '';
-
- /** File where the file map is stored
- * @var string
- */
- var $filemap = '';
-
- /** Directory where registry files for channels are stored.
- * @var string
- */
- var $channelsdir = '';
-
- /** Name of file used for locking the registry
- * @var string
- */
- var $lockfile = '';
-
- /** File descriptor used during locking
- * @var resource
- */
- var $lock_fp = null;
-
- /** Mode used during locking
- * @var int
- */
- var $lock_mode = 0; // XXX UNUSED
-
- /** Cache of package information. Structure:
- * array(
- * 'package' => array('id' => ... ),
- * ... )
- * @var array
- */
- var $pkginfo_cache = array();
-
- /** Cache of file map. Structure:
- * array( '/path/to/file' => 'package', ... )
- * @var array
- */
- var $filemap_cache = array();
-
- /**
- * @var false|PEAR_ChannelFile
- */
- var $_pearChannel;
-
- /**
- * @var false|PEAR_ChannelFile
- */
- var $_peclChannel;
-
- /**
- * @var PEAR_DependencyDB
- */
- var $_dependencyDB;
-
- /**
- * @var PEAR_Config
- */
- var $_config;
- // }}}
-
- // {{{ constructor
-
- /**
- * PEAR_Registry constructor.
- *
- * @param string (optional) PEAR install directory (for .php files)
- * @param PEAR_ChannelFile PEAR_ChannelFile object representing the PEAR channel, if
- * default values are not desired. Only used the very first time a PEAR
- * repository is initialized
- * @param PEAR_ChannelFile PEAR_ChannelFile object representing the PECL channel, if
- * default values are not desired. Only used the very first time a PEAR
- * repository is initialized
- *
- * @access public
- */
- function PEAR_Registry($pear_install_dir = PEAR_INSTALL_DIR, $pear_channel = false,
- $pecl_channel = false)
- {
- parent::PEAR();
- $ds = DIRECTORY_SEPARATOR;
- $this->install_dir = $pear_install_dir;
- $this->channelsdir = $pear_install_dir.$ds.'.channels';
- $this->statedir = $pear_install_dir.$ds.'.registry';
- $this->filemap = $pear_install_dir.$ds.'.filemap';
- $this->lockfile = $pear_install_dir.$ds.'.lock';
- $this->_pearChannel = $pear_channel;
- $this->_peclChannel = $pecl_channel;
- $this->_config = false;
- }
-
- function hasWriteAccess()
- {
- if (!file_exists($this->install_dir)) {
- $dir = $this->install_dir;
- while ($dir && $dir != '.') {
- $olddir = $dir;
- $dir = dirname($dir); // cd ..
- if ($dir != '.' && file_exists($dir)) {
- if (is_writeable($dir)) {
- return true;
- } else {
- return false;
- }
- }
- if ($dir == $olddir) { // this can happen in safe mode
- return @is_writable($dir);
- }
- }
- return false;
- }
- return is_writeable($this->install_dir);
- }
-
- function setConfig(&$config)
- {
- $this->_config = &$config;
- }
-
- function _initializeChannelDirs()
- {
- static $running = false;
- if (!$running) {
- $running = true;
- $ds = DIRECTORY_SEPARATOR;
- if (!is_dir($this->channelsdir) ||
- !file_exists($this->channelsdir . $ds . 'pear.php.net.reg') ||
- !file_exists($this->channelsdir . $ds . 'pecl.php.net.reg') ||
- !file_exists($this->channelsdir . $ds . '__uri.reg')) {
- if (!file_exists($this->channelsdir . $ds . 'pear.php.net.reg')) {
- $pear_channel = $this->_pearChannel;
- if (!is_a($pear_channel, 'PEAR_ChannelFile') || !$pear_channel->validate()) {
- if (!class_exists('PEAR_ChannelFile')) {
- require_once 'PEAR/ChannelFile.php';
- }
- $pear_channel = new PEAR_ChannelFile;
|
|
|
Deleted |
php-5.3.0.tar.bz2
^
|
|
|
Deleted |
php-suse-addons.tar.bz2
^
|
|
|
Deleted |
suhosin-0.9.27.tgz
^
|
