Commit bcd412c7 authored by Sean Finney's avatar Sean Finney Committed by Mark A. Hershberger

Imported Debian patch 5.1.6-2

parent e5bc03e3
php5 (5.1.5-1) unstable; urgency=high
php5 (5.1.6-2) unstable; urgency=low
[ sean finney ]
* enable the mysqli extension (closes: #320835).
-- sean finney <seanius@debian.org> Tue, 19 Sep 2006 19:31:27 +0200
php5 (5.1.6-1) unstable; urgency=high
[ Adam Conrad ]
* Drop 041-shut_up_snmp.patch, which was no longer needed as of 5.1.0.
[ Ondřej Surý ]
* Acknowledge NMU.
* New upstream release (Closes: #383596)
- Added missing safe_mode/open_basedir checks inside the error_log(),
......@@ -12,7 +23,8 @@ php5 (5.1.5-1) unstable; urgency=high
- Fixed a buffer overflow inside sscanf() function. (CVE-2006-4020)
(Closes: #382256)
- Fixed an out of bounds read inside stripos() function.
- Fixed memory_limit restriction on 64 bit system.
- Fixed memory_limit restriction on 64 bit system (really with 5.1.6).
* Bump libdb build-dep from libdb4.3 to libdb4.4, to match with apache.
-- Ondřej Surý <ondrej@debian.org> Sat, 19 Aug 2006 14:41:43 +0200
......@@ -359,7 +371,7 @@ php4 (4:4.3.10-9) unstable; urgency=low
* Update 040-curl_open_basedir.patch once more to make sure it doesn't
segfault when fed a null or uninitialised URL (closes: #295447)
* Add 047-zts_with_dl.patch, courtest of Steve Langasek to re-enable the
* Add 047-zts_with_dl.patch, courtesy of Steve Langasek to re-enable the
dl() function in our builds, despite upstream's claim that it "might
not be threadsafe on all platforms"; it is on ours (closes: #297839)
* Make the php4-dev binaries versioned with alternatives (closes: #295903)
......
......@@ -2,8 +2,8 @@ Source: php5
Section: web
Priority: optional
Maintainer: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Uploaders: Adam Conrad <adconrad@0c3.net>, Steve Langasek <vorlon@debian.org>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>, Ondřej Surý <ondrej@debian.org>
Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), flex (>= 2.5.4), freetds-dev, po-debconf, libbz2-dev (>= 1.0.0), libcurl3-openssl-dev | libcurl3-dev, libdb4.3-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libgdbm-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev | libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 4.3-1), libpng12-dev, libpq-dev | postgresql-dev, librecode-dev, libsnmp9-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
Uploaders: Adam Conrad <adconrad@0c3.net>, Steve Langasek <vorlon@debian.org>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>, Ondřej Surý <ondrej@debian.org>, sean finney <seanius@debian.org>
Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), flex (>= 2.5.4), freetds-dev, po-debconf, libbz2-dev (>= 1.0.0), libcurl3-openssl-dev | libcurl3-dev, libdb4.4-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libgdbm-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev | libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 4.3-1), libpng12-dev, libpq-dev | postgresql-dev, librecode-dev, libsnmp9-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
Build-Conflicts: bind-dev
Standards-Version: 3.6.2
......@@ -195,10 +195,28 @@ Description: MHASH module for php5
Package: php5-mysql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-mysqli (= ${Source-Version}), php5-common (= ${Source-Version})
Description: MySQL module for php5
This package provides a module for MySQL database connections directly from
PHP scripts.
PHP scripts. This generic module can be used to connect to all versions of
MySQL, however when connecting to MySQL servers greater than version 4.1,
you may want to consider using the interface provided by the php5-mysqli
extention, which this package depends on.
.
PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
from C, Java and Perl with a couple of unique PHP-specific features thrown
in. The goal of the language is to allow web developers to write
dynamically generated pages quickly.
Package: php5-mysqli
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-mysql (= ${Source-Version}), php5-common (= ${Source-Version})
Description: MySQL Improved module for php5
This package provides a module for MySQL database connections directly from
PHP scripts. This new "Improved" interface should only be used to connect
to MySQL databases greater than version 4.1. For older MySQL servers,
please use the functions from the php5-mysql extension instead, which this
package depends on.
.
PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
from C, Java and Perl with a couple of unique PHP-specific features thrown
......
......@@ -3,6 +3,7 @@ gd GD
ldap LDAP
mhash MHASH
mysql MySQL
mysqli MySQLi
odbc ODBC
pgsql PostgreSQL
recode recode
......
--- php4-4.3.10/ext/snmp/snmp.c 2005-03-23 00:32:06.000000000 -0700
+++ php4-4.3.10/ext/snmp/snmp.c 2005-03-23 00:30:18.000000000 -0700
@@ -220,7 +220,9 @@
*/
PHP_MSHUTDOWN_FUNCTION(snmp)
{
+/*** This should be re-enabled when I have a newer libsnmp to play with ***
snmp_shutdown("snmpapp");
+**************************************************************************/
return SUCCESS;
}
diff -urN php-5.1.5.orig/Zend/zend_strtod.c php-5.1.5/Zend/zend_strtod.c
--- php-5.1.5.orig/Zend/zend_strtod.c 2006-02-14 23:10:55.000000000 +0100
+++ php-5.1.5/Zend/zend_strtod.c 2006-08-19 15:00:44.000000000 +0200
@@ -123,13 +123,25 @@
diff -urN php-5.1.6.orig/Zend/zend_strtod.c php-5.1.6/Zend/zend_strtod.c
--- php-5.1.6.orig/Zend/zend_strtod.c 2006-04-15 14:54:14.000000000 +0200
+++ php-5.1.6/Zend/zend_strtod.c 2006-09-01 15:05:22.000000000 +0200
@@ -123,14 +123,25 @@
#define IEEE_LITTLE_ENDIAN
#endif
......@@ -17,7 +17,7 @@ diff -urN php-5.1.5.orig/Zend/zend_strtod.c php-5.1.5/Zend/zend_strtod.c
+ byte ordering was big or little endian depending upon the target.
+ Modern floating-point formats are naturally ordered; in this case
+ __VFP_FP__ will be defined, even if soft-float. */
+#undef IEEE_LITTLE_ENDIAN
#undef IEEE_LITTLE_ENDIAN
+#undef IEEE_BIG_ENDIAN
+#if defined(__VFP_FP__) || defined(__MAVERICK__)
+# ifdef __ARMEL__
......@@ -34,7 +34,7 @@ diff -urN php-5.1.5.orig/Zend/zend_strtod.c php-5.1.5/Zend/zend_strtod.c
#endif
#ifdef __vax__
@@ -237,8 +249,7 @@
@@ -238,8 +249,7 @@
#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
defined(IBM) != 1
......@@ -44,7 +44,7 @@ diff -urN php-5.1.5.orig/Zend/zend_strtod.c php-5.1.5/Zend/zend_strtod.c
#endif
typedef union {
@@ -258,7 +269,7 @@
@@ -259,7 +269,7 @@
* An alternative that might be better on some machines is
* #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
*/
......
......@@ -211,6 +211,7 @@ configure-apache2-stamp: patch-stamp
--with-ldap=shared,/usr \
--with-mhash=shared,/usr \
--with-mysql=shared,/usr \
--with-mysqli=shared,/usr/bin/mysql_config \
--with-unixODBC=shared,/usr \
--with-recode=shared,/usr \
--with-xsl=shared,/usr \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment