fix SNI patch, #198701

Package-Manager: portage-2.1.3.19

4 files changed, 24 insertions, 21 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 383ae0b2cb8d..4e43a2733c97 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/apache
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.34 2007/10/25 02:07:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.35 2007/11/10 18:19:01 hollow Exp $
+
+  10 Nov 2007; Benedikt Böhm <hollow@gentoo.org> apache-2.2.6-r3.ebuild:
+  fix SNI patch, #198701
 
 *apache-2.2.6-r3 (25 Oct 2007)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index bb1128474ce6..a295a2a40e11 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -7,7 +7,7 @@ DIST gentoo-apache-2.0.61-20070907.tar.bz2 58543 RMD160 3d40fd2e793bfedbca0410e6
 DIST gentoo-apache-2.2.6-20070907.tar.bz2 58121 RMD160 d0e5f55a8985f97fcdf646e04d92f6519f968104 SHA1 f9fd830bfb8e6c6e3cbac9d8342cc981032d20c5 SHA256 56f809f93fdcba204e6be271f195095d8ad033aa61447dab607af91d95cde8e6
 DIST gentoo-apache-2.2.6-r1-20070921.tar.bz2 58046 RMD160 44c241049265f3e7f524350cfc278ad75d2a3351 SHA1 a905f839a4e1696c92f74f4ea538ed9c29a429e6 SHA256 d2172bd6fef6a3be19fba864eb1dd459ba044585d2b0a2ed737dff39b966c318
 DIST gentoo-apache-2.2.6-r2-20071020.tar.bz2 58805 RMD160 0471593be243a4ecb6f7386b76411e9f1b2e9048 SHA1 7e87e95950d8a68f9f3d1c4ed913d6aa093bbb2e SHA256 3711e6f3c63b931b80f6db2602ad66e5303c7779f6a0571fe14156b7ec7ab3f5
-DIST gentoo-apache-2.2.6-r3-20071025.tar.bz2 60483 RMD160 3097b088eae160f1196f21abb1488cf54b349ba1 SHA1 1bb261c16e93bb1abc1972b38f73c2726435fb36 SHA256 3f2d0b9d210f3bb22c06901dee7df482c26647562d1a4e98f4196cd649f71d58
+DIST gentoo-apache-2.2.6-r3-20071110.tar.bz2 61137 RMD160 42725197e2d5476e4f60705fb743944bb600dd3f SHA1 bf51e05ad9ef92f2e0ddeefcf12c2e07af25f7e1 SHA256 6696e223bb42d75aed1d0846d986428ad8c4dc97095a3abfe0540817b4e63c12
 DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA1 697e1674f8efbbe05b9f6c1ba00cd28a37293229 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029
 DIST httpd-2.0.59.tar.bz2 4743549 RMD160 78b802354e338798a6978ece8b3568be97542174 SHA1 908209cd6e52f700d2a841a25de36e44d469c376 SHA256 bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d
 DIST httpd-2.0.61.tar.bz2 4580339 RMD160 a2c2c90976a967112a9129b9716d880d71261882 SHA1 665017829022d287ffe3cec749e2b5b61252d7b4 SHA256 c257d3a6c120a21a637b422cf9973be2fca9bee58ae70478f5235adb5fac8899
@@ -32,18 +32,18 @@ EBUILD apache-2.2.6-r2.ebuild 15786 RMD160 0c5441fe77fda84b29a1b2fe2daceee9bcd27
 MD5 253a635db9d5348823336948fcfaaa16 apache-2.2.6-r2.ebuild 15786
 RMD160 0c5441fe77fda84b29a1b2fe2daceee9bcd27d36 apache-2.2.6-r2.ebuild 15786
 SHA256 5e8d6ab5bfab1b42e55fb68d73cac3cf7839379258946f16fa9cd75ab4643179 apache-2.2.6-r2.ebuild 15786
-EBUILD apache-2.2.6-r3.ebuild 15786 RMD160 678ae65ff1de64f90907d7926c847e625c4148e9 SHA1 d0a51504ad6f89d6a5522df05ad9397c3ef29483 SHA256 40e61e3f59dd59b9de07507834e2a6f70980c94a347f724d2e36bea99295c646
-MD5 692dd7225bee371b28761f4475feaa89 apache-2.2.6-r3.ebuild 15786
-RMD160 678ae65ff1de64f90907d7926c847e625c4148e9 apache-2.2.6-r3.ebuild 15786
-SHA256 40e61e3f59dd59b9de07507834e2a6f70980c94a347f724d2e36bea99295c646 apache-2.2.6-r3.ebuild 15786
+EBUILD apache-2.2.6-r3.ebuild 15786 RMD160 896b347c165bddc365d31cf8b4c45dfae6ae7a41 SHA1 a72c29910a4822208d8fe411ef98510c83bd1696 SHA256 9d8f4371908bb0814f8cf49c10706122e4a9040cd7d2bfe863946c2bf64654f7
+MD5 3af4ddd9f26218875b92e436ae50a8dd apache-2.2.6-r3.ebuild 15786
+RMD160 896b347c165bddc365d31cf8b4c45dfae6ae7a41 apache-2.2.6-r3.ebuild 15786
+SHA256 9d8f4371908bb0814f8cf49c10706122e4a9040cd7d2bfe863946c2bf64654f7 apache-2.2.6-r3.ebuild 15786
 EBUILD apache-2.2.6.ebuild 15370 RMD160 6317292a5ab3c80979ad91c781ecb473738a33a6 SHA1 8aa8d0f4dd44d9c285924ccaf983c4acc6ab83e8 SHA256 ef0e00f4ab52a4ce5a2b62010e4b568d95fc942668219a251b4b049a00a23b23
 MD5 f12d48c7c70eb8a2d9f2ed0d016a1645 apache-2.2.6.ebuild 15370
 RMD160 6317292a5ab3c80979ad91c781ecb473738a33a6 apache-2.2.6.ebuild 15370
 SHA256 ef0e00f4ab52a4ce5a2b62010e4b568d95fc942668219a251b4b049a00a23b23 apache-2.2.6.ebuild 15370
-MISC ChangeLog 97897 RMD160 1f4bf94445e7e4b20ea5a086e2ad3d77f4acaf73 SHA1 9ea270abc56c31b47cdf12ad169a913b9281612d SHA256 947f425103d32a9fd633f80c74a34067a90d821d9a2f39d991eb18071fccf7e1
-MD5 b3ae8362bfc65744676922ffa2bce827 ChangeLog 97897
-RMD160 1f4bf94445e7e4b20ea5a086e2ad3d77f4acaf73 ChangeLog 97897
-SHA256 947f425103d32a9fd633f80c74a34067a90d821d9a2f39d991eb18071fccf7e1 ChangeLog 97897
+MISC ChangeLog 97997 RMD160 5c3d59c197edbd36928aae1835a8f9775a4ceb43 SHA1 a38941cdea9e795be87c5722ddcf2335c54a0f90 SHA256 d638b80f547c6fb01f95e6c49de4d6bc8cbb6706e79057a24e45cdbae63dda56
+MD5 a6a224be40a7dfd1d12815208dbe87ea ChangeLog 97997
+RMD160 5c3d59c197edbd36928aae1835a8f9775a4ceb43 ChangeLog 97997
+SHA256 d638b80f547c6fb01f95e6c49de4d6bc8cbb6706e79057a24e45cdbae63dda56 ChangeLog 97997
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -66,13 +66,13 @@ SHA256 1eaf262b351038f98bd27160ba59da98ef2ac5bd06ec972f5cadd64d8399d42e files/di
 MD5 f055984d26898f84b9a767c5e052ae83 files/digest-apache-2.2.6-r2 536
 RMD160 f824d5e2e706c1d5654ae80a1c3806c94782fcdc files/digest-apache-2.2.6-r2 536
 SHA256 c8df8e510c87a64c990b66893443b97796d8cdbfa7da48218244cf95d20659c1 files/digest-apache-2.2.6-r2 536
-MD5 5345564d6f3113af8483954bf52c4209 files/digest-apache-2.2.6-r3 536
-RMD160 7569c275d74b58f38b180e12e19fb2e48608c86c files/digest-apache-2.2.6-r3 536
-SHA256 6de6aef20a1588fb17fdcfda567ee9e7b08fd700ffc823c83c88aeb88c43a51b files/digest-apache-2.2.6-r3 536
+MD5 f9e775f2f3ae555cee3b0929f484dfc1 files/digest-apache-2.2.6-r3 536
+RMD160 950142a5146ae83b1504e8b9e387a9dd4b8d1b1d files/digest-apache-2.2.6-r3 536
+SHA256 fa0177482f8cb6eafd496085c3dc8c495141fca24a368ca4a263b28826f66212 files/digest-apache-2.2.6-r3 536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHH/qFmPFBzbX68WERAnF+AJ484srGmRrPas41XpufIz4SW1vBbgCdHo9D
-JFBv4QEv4tVMiOb61k4Gksg=
-=my55
+iD8DBQFHNfYemPFBzbX68WERAr8eAJ4nilYOgL7iDbgAjV1qkOjaSXWEKwCbBOE6
+foPhrjdAFEKKuleBgOrjSeI=
+=h8+R
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.6-r3.ebuild b/www-servers/apache/apache-2.2.6-r3.ebuild
index 5bade7c2f35e..bc8bc8fd6573 100644
--- a/www-servers/apache/apache-2.2.6-r3.ebuild
+++ b/www-servers/apache/apache-2.2.6-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.6-r3.ebuild,v 1.1 2007/10/25 02:07:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.6-r3.ebuild,v 1.2 2007/11/10 18:19:01 hollow Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-${PF}"
-GENTOO_PATCHSTAMP="20071025"
+GENTOO_PATCHSTAMP="20071110"
 GENTOO_DEVSPACE="hollow"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
diff --git a/www-servers/apache/files/digest-apache-2.2.6-r3 b/www-servers/apache/files/digest-apache-2.2.6-r3
index 0310a81ed895..6c98e08c138d 100644
--- a/www-servers/apache/files/digest-apache-2.2.6-r3
+++ b/www-servers/apache/files/digest-apache-2.2.6-r3
@@ -1,6 +1,6 @@
-MD5 4f09d67fac5fbdd8dacf57935d71f2df gentoo-apache-2.2.6-r3-20071025.tar.bz2 60483
-RMD160 3097b088eae160f1196f21abb1488cf54b349ba1 gentoo-apache-2.2.6-r3-20071025.tar.bz2 60483
-SHA256 3f2d0b9d210f3bb22c06901dee7df482c26647562d1a4e98f4196cd649f71d58 gentoo-apache-2.2.6-r3-20071025.tar.bz2 60483
+MD5 8c0b8504ef55a39407549a035b5f3b15 gentoo-apache-2.2.6-r3-20071110.tar.bz2 61137
+RMD160 42725197e2d5476e4f60705fb743944bb600dd3f gentoo-apache-2.2.6-r3-20071110.tar.bz2 61137
+SHA256 6696e223bb42d75aed1d0846d986428ad8c4dc97095a3abfe0540817b4e63c12 gentoo-apache-2.2.6-r3-20071110.tar.bz2 61137
 MD5 203bea91715064f0c787f6499d33a377 httpd-2.2.6.tar.bz2 4717066
 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f httpd-2.2.6.tar.bz2 4717066
 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c httpd-2.2.6.tar.bz2 4717066