Fix version-branding for security fix.

Package-Manager: portage-2.0.52-r1

9 files changed, 48 insertions, 78 deletions

diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index ddeb4e2f6969..8adabdec1457 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,40 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 0667b9ac338f7834eeb1eadebbb3381d ChangeLog 47077
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 adf20bea2955fa8bb573026c733864b5 mod_php-4.3.11.ebuild 6196
 MD5 151698471c967f2ee266891aaebd18ea mod_php-4.4.0.ebuild 6145
-MD5 351294e87971c75ff03f3b68b85663fd mod_php-4.4.0-r2.ebuild 6877
-MD5 e91b5fb961ab382291a45f5221ae7394 mod_php-4.3.11-r1.ebuild 6930
 MD5 5497fe36dda29f34ea7e35780683acd8 mod_php-4.4.0-r1.ebuild 6370
-MD5 adf20bea2955fa8bb573026c733864b5 mod_php-4.3.11.ebuild 6196
+MD5 e91b5fb961ab382291a45f5221ae7394 mod_php-4.3.11-r1.ebuild 6930
+MD5 351294e87971c75ff03f3b68b85663fd mod_php-4.4.0-r2.ebuild 6877
 MD5 344c2ed7ef423d32e92495a11a482ae0 mod_php-4.4.0-r3.ebuild 5912
-MD5 0667b9ac338f7834eeb1eadebbb3381d ChangeLog 47077
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
-MD5 225b57325cbdf582288a8796da9d72f5 files/digest-mod_php-4.3.11 287
 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
+MD5 225b57325cbdf582288a8796da9d72f5 files/digest-mod_php-4.3.11 287
+MD5 61c52577ff879166da224373e27ad11e files/digest-mod_php-4.4.0-r2 362
 MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0 285
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
-MD5 b048b183d4cc334d774ba478d695c055 files/php4.4.0-pcre-security.patch 6176
-MD5 ce1f1b2a1e56cf4459b2cbfdcce6b03f files/digest-mod_php-4.3.11-r1 364
-MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
+MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
+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 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444
-MD5 37b9c16c4d9688ed40561a2e29955896 files/php4.3.11-pcre-security.patch 6030
+MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
+MD5 cdcafb1f1235579bb1f54e53ffac5f9b files/php4.3.11-pcre-security.patch 6031
+MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
+MD5 c345d14fba0025e1b0d6365693f8923e files/php4.4.0-pcre-security.patch 6177
+MD5 ce1f1b2a1e56cf4459b2cbfdcce6b03f files/digest-mod_php-4.3.11-r1 364
 MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0-r1 285
-MD5 61c52577ff879166da224373e27ad11e files/digest-mod_php-4.4.0-r2 362
 MD5 61c52577ff879166da224373e27ad11e files/digest-mod_php-4.4.0-r3 362
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
+MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0-a2/70_mod_php.conf 485
 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
 MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0-a1/70_mod_php.conf 484
-MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0-a2/70_mod_php.conf 485
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMdgtViELBEf1JB0RArw0AJ9/YeD52Hb69FN05W22v1HSnlT25wCfRDeX
-6QkuQK63q3cNCnz0cGsAxPU=
-=peqR
------END PGP SIGNATURE-----
diff --git a/dev-php/mod_php/files/php4.3.11-pcre-security.patch b/dev-php/mod_php/files/php4.3.11-pcre-security.patch
index 477a6ea5a7cf..0cdb77878e61 100644
--- a/dev-php/mod_php/files/php4.3.11-pcre-security.patch
+++ b/dev-php/mod_php/files/php4.3.11-pcre-security.patch
@@ -70,7 +70,7 @@
  MINOR_VERSION=3
  RELEASE_VERSION=11
 -EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-p11-gentoo"
  VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
  
  dnl Define where extension directories are located in the configure context
diff --git a/dev-php/mod_php/files/php4.4.0-pcre-security.patch b/dev-php/mod_php/files/php4.4.0-pcre-security.patch
index 574c2f3558aa..4971ff814ee4 100644
--- a/dev-php/mod_php/files/php4.4.0-pcre-security.patch
+++ b/dev-php/mod_php/files/php4.4.0-pcre-security.patch
@@ -70,7 +70,7 @@
  MINOR_VERSION=4
  RELEASE_VERSION=0
 -EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-p11-gentoo"
  VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
  
  dnl Define where extension directories are located in the configure context
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index 8892b8cf75fb..d926f68a5c38 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d872a25f985f00e2d9cc17379b2d0492 php-cgi-4.4.0-r1.ebuild 972
-MD5 98731632103435e701ba69cea7b38800 php-cgi-4.3.11-r2.ebuild 1840
-MD5 58596c107f1a23e6be418c9dae669e74 php-cgi-4.4.0.ebuild 969
-MD5 87afbaa27805c015e37148d0347887af php-cgi-4.3.11-r1.ebuild 1110
 MD5 a9a28ceddc54e96fd392c0cb2969a7fa ChangeLog 13732
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 87afbaa27805c015e37148d0347887af php-cgi-4.3.11-r1.ebuild 1110
+MD5 58596c107f1a23e6be418c9dae669e74 php-cgi-4.4.0.ebuild 969
+MD5 d872a25f985f00e2d9cc17379b2d0492 php-cgi-4.4.0-r1.ebuild 972
+MD5 98731632103435e701ba69cea7b38800 php-cgi-4.3.11-r2.ebuild 1840
 MD5 bb0b29729ab0c01efd613ff75f0480dd php-cgi-4.4.0-r2.ebuild 1692
+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 cdcafb1f1235579bb1f54e53ffac5f9b files/php4.3.11-pcre-security.patch 6031
 MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
+MD5 c345d14fba0025e1b0d6365693f8923e files/php4.4.0-pcre-security.patch 6177
 MD5 225b57325cbdf582288a8796da9d72f5 files/digest-php-cgi-4.3.11-r1 287
 MD5 ce1f1b2a1e56cf4459b2cbfdcce6b03f files/digest-php-cgi-4.3.11-r2 364
-MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-php-cgi-4.4.0 285
 MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-php-cgi-4.4.0-r1 285
 MD5 61c52577ff879166da224373e27ad11e files/digest-php-cgi-4.4.0-r2 362
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 b048b183d4cc334d774ba478d695c055 files/php4.4.0-pcre-security.patch 6176
-MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
-MD5 37b9c16c4d9688ed40561a2e29955896 files/php4.3.11-pcre-security.patch 6030
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMbolViELBEf1JB0RAqN7AJ99TXFE2hWlmahQ2UlDQmC/k+z6swCfVdWV
-Bup2Bgnq+tiAHBnYrfdAsjg=
-=avcv
------END PGP SIGNATURE-----
+MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-php-cgi-4.4.0 285
diff --git a/dev-php/php-cgi/files/php4.3.11-pcre-security.patch b/dev-php/php-cgi/files/php4.3.11-pcre-security.patch
index 477a6ea5a7cf..0cdb77878e61 100644
--- a/dev-php/php-cgi/files/php4.3.11-pcre-security.patch
+++ b/dev-php/php-cgi/files/php4.3.11-pcre-security.patch
@@ -70,7 +70,7 @@
  MINOR_VERSION=3
  RELEASE_VERSION=11
 -EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-p11-gentoo"
  VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
  
  dnl Define where extension directories are located in the configure context
diff --git a/dev-php/php-cgi/files/php4.4.0-pcre-security.patch b/dev-php/php-cgi/files/php4.4.0-pcre-security.patch
index 574c2f3558aa..4971ff814ee4 100644
--- a/dev-php/php-cgi/files/php4.4.0-pcre-security.patch
+++ b/dev-php/php-cgi/files/php4.4.0-pcre-security.patch
@@ -70,7 +70,7 @@
  MINOR_VERSION=4
  RELEASE_VERSION=0
 -EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-p11-gentoo"
  VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
  
  dnl Define where extension directories are located in the configure context
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index cf75781eba9f..b4ba1179e2a8 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 553f5d081a17a88c4dae4253e561c942 php-4.3.11-r1.ebuild 1948
-MD5 1832b7dad433181a1ea82028e176f098 php-4.4.0.ebuild 1080
-MD5 eaa1a899f214a9ad1a095e9f6a4f5fc5 php-4.3.11.ebuild 1214
-MD5 3cb5fdc48285349de8fc1fda4cce29be php-4.4.0-r1.ebuild 1814
 MD5 2e49a31b55385c0bec9501697bf53869 ChangeLog 26376
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 d1536bfe7ebf7dab5076fcd56b03250a files/digest-php-4.3.11-r1 290
+MD5 eaa1a899f214a9ad1a095e9f6a4f5fc5 php-4.3.11.ebuild 1214
+MD5 1832b7dad433181a1ea82028e176f098 php-4.4.0.ebuild 1080
+MD5 553f5d081a17a88c4dae4253e561c942 php-4.3.11-r1.ebuild 1948
+MD5 3cb5fdc48285349de8fc1fda4cce29be php-4.4.0-r1.ebuild 1814
+MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
-MD5 58cd61c7ae093d9e2b847d68e76b88a2 files/digest-php-4.4.0-r1 288
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 b048b183d4cc334d774ba478d695c055 files/php4.4.0-pcre-security.patch 6176
-MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
-MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
-MD5 b3403a09e5d5fa394900b99ca6f63335 files/digest-php-4.4.0 211
-MD5 37b9c16c4d9688ed40561a2e29955896 files/php4.3.11-pcre-security.patch 6030
+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 cdcafb1f1235579bb1f54e53ffac5f9b files/php4.3.11-pcre-security.patch 6031
+MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
+MD5 c345d14fba0025e1b0d6365693f8923e files/php4.4.0-pcre-security.patch 6177
+MD5 d1536bfe7ebf7dab5076fcd56b03250a files/digest-php-4.3.11-r1 290
 MD5 c3936dcc33eacdde589f42f0f28e4bd6 files/digest-php-4.3.11 213
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMbnWViELBEf1JB0RAti8AJ9vKYV6sEP4/xOy+uY/SGjO+uZ/hQCfQej/
-Pe++cna6e1Mu+DT4nFs1H9E=
-=o9nt
------END PGP SIGNATURE-----
+MD5 58cd61c7ae093d9e2b847d68e76b88a2 files/digest-php-4.4.0-r1 288
+MD5 b3403a09e5d5fa394900b99ca6f63335 files/digest-php-4.4.0 211
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 477a6ea5a7cf..0cdb77878e61 100644
--- a/dev-php/php/files/php4.3.11-pcre-security.patch
+++ b/dev-php/php/files/php4.3.11-pcre-security.patch
@@ -70,7 +70,7 @@
  MINOR_VERSION=3
  RELEASE_VERSION=11
 -EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-p11-gentoo"
  VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
  
  dnl Define where extension directories are located in the configure context
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 574c2f3558aa..4971ff814ee4 100644
--- a/dev-php/php/files/php4.4.0-pcre-security.patch
+++ b/dev-php/php/files/php4.4.0-pcre-security.patch
@@ -70,7 +70,7 @@
  MINOR_VERSION=4
  RELEASE_VERSION=0
 -EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-p11-gentoo"
  VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
  
  dnl Define where extension directories are located in the configure context