Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-php/php/ChangeLog6
-rw-r--r--dev-php/php/Manifest54
-rw-r--r--dev-php/php/files/php4.3.11-pcre-security.patch2
-rw-r--r--dev-php/php/files/php4.4.0-pcre-security.patch2
4 files changed, 34 insertions, 30 deletions
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 4003d4f2d56a..ec78f303998c 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php/php
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.210 2005/11/06 13:42:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.211 2005/11/06 18:36:07 chtekk Exp $
+
+ 06 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+ files/php4.3.11-pcre-security.patch, files/php4.4.0-pcre-security.patch:
+ Fix PHP branding.
06 Nov 2005; Simon Stelling <blubb@gentoo.org> php-4.3.11-r4.ebuild,
php-4.4.0-r4.ebuild:
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 7c625f71fa66..b1b16cd8fe32 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,39 +1,39 @@
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 557c596d93aede139f8b8087a8e2b5c7 ChangeLog 29697
-MD5 7b0585a1b1826288946cd49c26d85d61 php-4.3.11.ebuild 1219
-MD5 3457e095190ae0497eff026b2351bb14 php-4.4.0.ebuild 1082
-MD5 5c877d02b146b5885cecc89b9f445c73 php-4.3.11-r1.ebuild 1972
-MD5 1bbf33997259477ea2ff61296875184e php-4.4.0-r1.ebuild 1831
-MD5 c757b9ce357a04d26ae0f88d731cf5c2 php-4.3.11-r3.ebuild 2898
-MD5 f8b5aa5ec5358b0ecced16d21e3613a9 php-4.4.0-r3.ebuild 2753
-MD5 a1a9dd2e91946831a717565d0fad25cb php-4.3.11-r4.ebuild 2894
-MD5 748c825960cb614eb92384577596d8a9 php-4.4.0-r4.ebuild 2749
-MD5 f25bbe20f37a0eb83f7a57ca2c3a25e3 files/digest-php-4.4.0 211
+MD5 3bcc4c310451f9ceb35b764231c911c7 ChangeLog 29845
MD5 289778209b2df87dbc5052351e604b1a files/digest-php-4.3.11 213
MD5 a7b81d42cc56fdd6c72fbe2549dbe898 files/digest-php-4.3.11-r1 290
-MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r1 288
-MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
-MD5 a9b932952f12aa01a9f98a7fcbf32ed9 files/php4.3.11-pcre-security.patch 6031
-MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
-MD5 54a4ad0766f89185d7de2c6d07b07296 files/php4.4.0-pcre-security.patch 6177
MD5 a7b81d42cc56fdd6c72fbe2549dbe898 files/digest-php-4.3.11-r3 290
-MD5 cb36a386184ed6a887f62d2205f57173 files/php4.3.11-fopen_wrappers.patch 1481
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r3 288
-MD5 4db8e0b66cde22dd4e4d9f51e59f6098 files/php4.3.11-gd_safe_mode.patch 1573
-MD5 48d9c939434e9b01d0696410d59c503c files/php4.3.11-pspell-ext-segf.patch 8482
MD5 a7b81d42cc56fdd6c72fbe2549dbe898 files/digest-php-4.3.11-r4 290
+MD5 f25bbe20f37a0eb83f7a57ca2c3a25e3 files/digest-php-4.4.0 211
+MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r1 288
+MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r3 288
+MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r4 288
MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 2646498369dc5c64c318ee6da2f9487a files/php4.3.11-session_save_path-segf.patch 4961
-MD5 cb36a386184ed6a887f62d2205f57173 files/php4.4.0-fopen_wrappers.patch 1481
-MD5 a540c54ba22dc16b157edcf1ecb6258f files/php4.4.0-gd_safe_mode.patch 883
-MD5 48d9c939434e9b01d0696410d59c503c files/php4.4.0-pspell-ext-segf.patch 8482
-MD5 3d3986815e0e06adce512b36959e6f26 files/php4.4.0-session_save_path-segf.patch 4155
-MD5 43c5b30a9e9bde68a44cf414341e32e8 files/digest-php-4.4.0-r4 288
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
MD5 09637e8f6f861b1f3698ec0390ec6b57 files/php4.3.11-curl_safemode.patch 5129
+MD5 cb36a386184ed6a887f62d2205f57173 files/php4.3.11-fopen_wrappers.patch 1481
+MD5 4db8e0b66cde22dd4e4d9f51e59f6098 files/php4.3.11-gd_safe_mode.patch 1573
MD5 89d12226b1726b681df274be79043411 files/php4.3.11-globals_overwrite.patch 18011
+MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
+MD5 5a66b2ff838bd8ba8a1a1160460683ae files/php4.3.11-pcre-security.patch 6032
MD5 43b4113d1fb159955b0d5ed307cac143 files/php4.3.11-phpinfo_xss.patch 2518
+MD5 48d9c939434e9b01d0696410d59c503c files/php4.3.11-pspell-ext-segf.patch 8482
+MD5 2646498369dc5c64c318ee6da2f9487a files/php4.3.11-session_save_path-segf.patch 4961
MD5 0429f8334ba4bab659a2e41ce5debc80 files/php4.4.0-curl_safemode.patch 1937
+MD5 cb36a386184ed6a887f62d2205f57173 files/php4.4.0-fopen_wrappers.patch 1481
+MD5 a540c54ba22dc16b157edcf1ecb6258f files/php4.4.0-gd_safe_mode.patch 883
MD5 7c45198e6118d82c680e9ed56e7d1df0 files/php4.4.0-globals_overwrite.patch 9731
+MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
+MD5 48b1aa50f8a3ebdfbda4c796b6e3fbec files/php4.4.0-pcre-security.patch 6178
MD5 57644300fb52ad610fa52ae8ba6b522b files/php4.4.0-phpinfo_xss.patch 1284
+MD5 48d9c939434e9b01d0696410d59c503c files/php4.4.0-pspell-ext-segf.patch 8482
+MD5 3d3986815e0e06adce512b36959e6f26 files/php4.4.0-session_save_path-segf.patch 4155
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 5c877d02b146b5885cecc89b9f445c73 php-4.3.11-r1.ebuild 1972
+MD5 c757b9ce357a04d26ae0f88d731cf5c2 php-4.3.11-r3.ebuild 2898
+MD5 a1a9dd2e91946831a717565d0fad25cb php-4.3.11-r4.ebuild 2894
+MD5 7b0585a1b1826288946cd49c26d85d61 php-4.3.11.ebuild 1219
+MD5 1bbf33997259477ea2ff61296875184e php-4.4.0-r1.ebuild 1831
+MD5 f8b5aa5ec5358b0ecced16d21e3613a9 php-4.4.0-r3.ebuild 2753
+MD5 748c825960cb614eb92384577596d8a9 php-4.4.0-r4.ebuild 2749
+MD5 3457e095190ae0497eff026b2351bb14 php-4.4.0.ebuild 1082
diff --git a/dev-php/php/files/php4.3.11-pcre-security.patch b/dev-php/php/files/php4.3.11-pcre-security.patch
index 1b76f8b27c6a..ba7b414cfc40 100644
--- a/dev-php/php/files/php4.3.11-pcre-security.patch
+++ b/dev-php/php/files/php4.3.11-pcre-security.patch
@@ -5,7 +5,7 @@
MINOR_VERSION=3
RELEASE_VERSION=11
-EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-pl1-gentoo"
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
diff --git a/dev-php/php/files/php4.4.0-pcre-security.patch b/dev-php/php/files/php4.4.0-pcre-security.patch
index 002ee2842c56..086210da477e 100644
--- a/dev-php/php/files/php4.4.0-pcre-security.patch
+++ b/dev-php/php/files/php4.4.0-pcre-security.patch
@@ -5,7 +5,7 @@
MINOR_VERSION=4
RELEASE_VERSION=0
-EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-pl1-gentoo"
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"