[arch-commits] CVS update of arch/build/devel/php (3 files)
Pierre Schmitz
pierre at archlinux.org
Sun Sep 2 12:07:12 UTC 2007
Date: Sunday, September 2, 2007 @ 08:07:12
Author: pierre
Path: /home/cvs-arch/arch/build/devel/php
Modified: PKGBUILD (1.103 -> 1.104) php.ini (1.17 -> 1.18)
Removed: CVE-2007-2872.patch (1.2)
upgpkg: php 5.2.4-1
update to 5.2.4; updated php.ini; add fr #6154
---------------------+
CVE-2007-2872.patch | 26 --------------------------
PKGBUILD | 26 +++++++++++---------------
php.ini | 42 ++++++++++++++----------------------------
3 files changed, 25 insertions(+), 69 deletions(-)
Index: arch/build/devel/php/CVE-2007-2872.patch
diff -u arch/build/devel/php/CVE-2007-2872.patch:1.2 arch/build/devel/php/CVE-2007-2872.patch:removed
--- arch/build/devel/php/CVE-2007-2872.patch:1.2 Thu Jun 7 09:55:38 2007
+++ arch/build/devel/php/CVE-2007-2872.patch Sun Sep 2 08:07:12 2007
@@ -1,26 +0,0 @@
---- string.c 2007/05/30 00:33:13 1.445.2.14.2.58
-+++ string.c 2007/06/03 18:47:10 1.445.2.14.2.59
-@@ -1956,18 +1956,20 @@
- char *p, *q;
- int chunks; /* complete chunks! */
- int restlen;
-- int out_len;
-+ float out_len;
-
- chunks = srclen / chunklen;
- restlen = srclen - chunks * chunklen; /* srclen % chunklen */
-
-- out_len = (srclen + (chunks + 1) * endlen + 1);
-+ out_len = chunks + 1;
-+ out_len *= endlen;
-+ out_len += srclen + 1;
-
- if (out_len > INT_MAX || out_len <= 0) {
- return NULL;
- }
-
-- dest = safe_emalloc(out_len, sizeof(char), 0);
-+ dest = safe_emalloc((int)out_len, sizeof(char), 0);
-
- for (p = src, q = dest; p < (src + srclen - chunklen + 1); ) {
- memcpy(q, p, chunklen);
Index: arch/build/devel/php/PKGBUILD
diff -u arch/build/devel/php/PKGBUILD:1.103 arch/build/devel/php/PKGBUILD:1.104
--- arch/build/devel/php/PKGBUILD:1.103 Sun Jun 17 12:10:07 2007
+++ arch/build/devel/php/PKGBUILD Sun Sep 2 08:07:12 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.103 2007/06/17 16:10:07 pierre Exp $
+# $Id: PKGBUILD,v 1.104 2007/09/02 12:07:12 pierre Exp $
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=php
-pkgver=5.2.3
-pkgrel=4
+pkgver=5.2.4
+pkgrel=1
_suhosinver=0.9.6.2
pkgdesc='A high-level scripting language'
arch=('i686' 'x86_64')
@@ -13,17 +13,15 @@
depends=('openssl' 'pam' 'bzip2' 'gdbm' 'ncurses' 'curl' 'libxslt' 'freetype2' \
'libjpeg' 'libpng')
makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' \
- 'sqlite3' 'unixodbc' 'net-snmp' 'libmcrypt')
+ 'sqlite3' 'unixodbc' 'net-snmp' 'libmcrypt' 'tidyhtml')
conflicts=('php-cgi' 'php-suhosin')
replaces=('php-cgi' 'php-suhosin')
source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
"http://www.hardened-php.net/suhosin/_media/suhosin-patch-${pkgver}-${_suhosinver}.patch.gz" \
- 'CVE-2007-2872.patch' \
'php.ini')
-md5sums=('eb50b751c8e1ced05bd012d5a0e4dec3' \
- 'f217d04f9513222e48cea6588ac65b89' \
- 'bbd60bdc21549a90c97cd270553f4d2e' \
- '2c5193ae494d5694999c042ec7a66dd6')
+md5sums=('55c97a671fdabf462cc7a82971a656d2' \
+ 'becfae15ba8ec7cdbc1f084b7938063e' \
+ '2cd735d54ace29279edb1adef1097bce')
build() {
export MAKEFLAGS="-j1"
@@ -31,10 +29,10 @@
# common config
phpconfig="--prefix=/usr \
--sysconfdir=/etc \
+ --with-config-file-scan-dir=/etc \
--with-layout=PHP \
--with-ttf \
--enable-mailparse \
- --with-config-file-scan-dir=/etc \
--enable-bcmath=shared \
--enable-calendar=shared \
--enable-ftp=shared \
@@ -98,14 +96,12 @@
--enable-mbregex \
--with-snmp=shared,/usr \
--enable-dbase \
- --enable-pcntl"
+ --enable-pcntl \
+ --enable-tidy \
+ --with-tidy=shared"
cd ${startdir}/src/${pkgname}-${pkgver}
- cd ext/standard
- patch -i ${startdir}/src/CVE-2007-2872.patch || return 1
- cd ../../
-
# apply suhosin patch
patch -p1 -i ${startdir}/src/suhosin-patch-${pkgver}-${_suhosinver}.patch || return 1
Index: arch/build/devel/php/php.ini
diff -u arch/build/devel/php/php.ini:1.17 arch/build/devel/php/php.ini:1.18
--- arch/build/devel/php/php.ini:1.17 Wed Jun 6 18:01:31 2007
+++ arch/build/devel/php/php.ini Sun Sep 2 08:07:12 2007
@@ -357,6 +357,18 @@
; instead (see below). Keeping display_errors enabled on a production web site
; may reveal security information to end users, such as file paths on your Web
; server, your database schema or other information.
+;
+; possible values for display_errors:
+;
+; Off - Do not display any errors
+; stderr - Display errors to STDERR (affects only CGI/CLI binaries!)
+; On or stdout - Display errors to STDOUT (default)
+;
+; To output errors to STDERR with CGI/CLI:
+;display_errors = "stderr"
+;
+; Default
+;
display_errors = Off
; Even when display_errors is on, errors that occur during PHP's startup
@@ -548,7 +560,7 @@
; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting
; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting
-; of zero causes PHP to behave as before. Default is zero. You should fix your scripts
+; of zero causes PHP to behave as before. Default is 1. You should fix your scripts
; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
; cgi.fix_pathinfo=1
@@ -560,7 +572,7 @@
; fastcgi.impersonate = 1;
; Disable logging through FastCGI connection
-; fastcgi.log = 0
+; fastcgi.logging = 0
; cgi.rfc2616_headers configuration option tells PHP what type of headers to
; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
@@ -1153,32 +1165,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 =
-
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
[COM]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
;com.typelib_file =
More information about the arch-commits
mailing list