summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2005-09-18 21:10:55 +0000
committerBenedikt Boehm <hollow@gentoo.org>2005-09-18 21:10:55 +0000
commitdbcc129b5ac38db0505bdabe227fa5aca4af6b70 (patch)
tree10a748640ed587fc470f65ab8f36d0c044b35cc7 /dev-php/php
parentAdd support for USE=selinux #106354 by petre rodan and USE=tcpd/readline #102... (diff)
downloadgentoo-2-dbcc129b5ac38db0505bdabe227fa5aca4af6b70.tar.gz
gentoo-2-dbcc129b5ac38db0505bdabe227fa5aca4af6b70.tar.bz2
gentoo-2-dbcc129b5ac38db0505bdabe227fa5aca4af6b70.zip
d'oh again fixing cvs bork ups
(Portage version: 2.0.52-r1)
Diffstat (limited to 'dev-php/php')
-rw-r--r--dev-php/php/Manifest14
-rw-r--r--dev-php/php/files/php4.3.11-pcre-security.patch7
-rw-r--r--dev-php/php/files/php4.4.0-pcre-security.patch7
3 files changed, 2 insertions, 26 deletions
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index e7d4f1d951fc..900df5ae2526 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 c8b52f3d06258efebdad0f36d77cc163 ChangeLog 25862
MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
MD5 eaa1a899f214a9ad1a095e9f6a4f5fc5 php-4.3.11.ebuild 1214
@@ -13,17 +10,10 @@ MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
-MD5 19de7d489e91ee502889f6de4ec4e828 files/php4.3.11-pcre-security.patch 6287
+MD5 37b9c16c4d9688ed40561a2e29955896 files/php4.3.11-pcre-security.patch 6030
MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
-MD5 a94bbec730cc65c7ffc407938bba42bc files/php4.4.0-pcre-security.patch 6431
+MD5 b048b183d4cc334d774ba478d695c055 files/php4.4.0-pcre-security.patch 6176
MD5 d1536bfe7ebf7dab5076fcd56b03250a files/digest-php-4.3.11-r1 290
MD5 c3936dcc33eacdde589f42f0f28e4bd6 files/digest-php-4.3.11 213
MD5 58cd61c7ae093d9e2b847d68e76b88a2 files/digest-php-4.4.0-r1 288
MD5 b3403a09e5d5fa394900b99ca6f63335 files/digest-php-4.4.0 211
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLdTnmPFBzbX68WERAgveAJ99b3DwiqCMn7w5Srmx86Moc7fBjACggMM4
-KSyrATiXakd9VC9jeqlkeZ4=
-=2Kq/
------END PGP SIGNATURE-----
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 04fcfde62426..477a6ea5a7cf 100644
--- a/dev-php/php/files/php4.3.11-pcre-security.patch
+++ b/dev-php/php/files/php4.3.11-pcre-security.patch
@@ -76,13 +76,6 @@
dnl Define where extension directories are located in the configure context
--- ext/pcre/config.m4 2003/12/16 22:14:55 1.29.2.5
+++ ext/pcre/config.m4 2005/08/09 17:41:56 1.29.2.7.2.1
-@@ -1,5 +1,5 @@
- dnl
--dnl $Id: php4.3.11-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $
-+dnl $Id: php4.3.11-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $
- dnl
-
- dnl By default we'll compile and link against the bundled PCRE library
@@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support
if test "$PHP_PCRE_REGEX" != "no"; then
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 fb9cd7f85569..574c2f3558aa 100644
--- a/dev-php/php/files/php4.4.0-pcre-security.patch
+++ b/dev-php/php/files/php4.4.0-pcre-security.patch
@@ -76,13 +76,6 @@
dnl Define where extension directories are located in the configure context
--- ext/pcre/config.m4 2005/05/31 12:22:27 1.29.2.7
+++ ext/pcre/config.m4 2005/08/09 17:41:56 1.29.2.7.2.1
-@@ -1,5 +1,5 @@
- dnl
--dnl $Id: php4.4.0-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $
-+dnl $Id: php4.4.0-pcre-security.patch,v 1.1 2005/09/18 20:56:51 hollow Exp $
- dnl
-
- dnl By default we'll compile and link against the bundled PCRE library
@@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support
if test "$PHP_PCRE_REGEX" != "no"; then