From 78af6063161887212304b8aca5ea4df363ebcdd3 Mon Sep 17 00:00:00 2001
From: Christian Faulhammer <fauli@gentoo.org>
Date: Tue, 6 Mar 2007 07:40:16 +0000
Subject: [PATCH] stable x86; security bug 169433; removed CHANGES.txt from doc
 installation Package-Manager: portage-2.1.2-r9

---
 www-apache/mod_jk/ChangeLog               |  6 +++++-
 www-apache/mod_jk/Manifest                | 26 ++++++++++++++++-------
 www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild |  6 +++---
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index 76083e268f92..e7fc54ebf863 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_jk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.23 2007/03/04 23:06:43 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.24 2007/03/06 07:40:16 opfer Exp $
+
+  06 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  mod_jk-1.2.21-r1.ebuild:
+  stable x86; security bug 169433; removed CHANGES.txt from doc installation
 
 *mod_jk-1.2.21-r1 (04 Mar 2007)
 *mod_jk-1.2.20-r1 (04 Mar 2007)
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 50c40791bd0d..9faed1d1e7af 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 88_mod_jk.conf 5413 RMD160 c819778af79a218c1be50dd44926dc76186abcd8 SHA1 dcdcd25c9f4f809e2e2fd7bde194dbb87f0e3ad4 SHA256 6d094519669eddb1407d52c346f13dd930bf4aa2509dfef5fbd9146e76f82432
 MD5 ff72392876e555a587c311d19aceca22 files/88_mod_jk.conf 5413
 RMD160 c819778af79a218c1be50dd44926dc76186abcd8 files/88_mod_jk.conf 5413
@@ -17,14 +20,14 @@ EBUILD mod_jk-1.2.20-r1.ebuild 1549 RMD160 810cf749054b28f7472d0da8eb67effcf778f
 MD5 0d7dec6e62f38a7b562391f3f0f6547d mod_jk-1.2.20-r1.ebuild 1549
 RMD160 810cf749054b28f7472d0da8eb67effcf778f8a8 mod_jk-1.2.20-r1.ebuild 1549
 SHA256 bd029cb352a9f926ba3776176cd1676c0175badc1e2681da13cde8cdb6e9b01c mod_jk-1.2.20-r1.ebuild 1549
-EBUILD mod_jk-1.2.21-r1.ebuild 1729 RMD160 172afee6476e4b658cc6f10c75e4e2fe02754cc5 SHA1 d5367c817dada74a2c10ca3286a8787537a5d97c SHA256 3aa56ea07873743b35c864781889dc127e78d6f1fc0f0c42d38e8771e462d874
-MD5 7cd500b2af3efe80fd0f654a5ee8c6f9 mod_jk-1.2.21-r1.ebuild 1729
-RMD160 172afee6476e4b658cc6f10c75e4e2fe02754cc5 mod_jk-1.2.21-r1.ebuild 1729
-SHA256 3aa56ea07873743b35c864781889dc127e78d6f1fc0f0c42d38e8771e462d874 mod_jk-1.2.21-r1.ebuild 1729
-MISC ChangeLog 4516 RMD160 337d27e0b7bc7bb40c7b7ac2c023c4b745c3283e SHA1 b530c16d506a342c4e7f5a62ecc3d9d8da7d3862 SHA256 d086835c7f3fe5e2db1bb9b4f9f37a23a612ebf0ef9cfd3e57f7f22c6ef47d5d
-MD5 72f6dd00ce243a5488a32a45c629fce3 ChangeLog 4516
-RMD160 337d27e0b7bc7bb40c7b7ac2c023c4b745c3283e ChangeLog 4516
-SHA256 d086835c7f3fe5e2db1bb9b4f9f37a23a612ebf0ef9cfd3e57f7f22c6ef47d5d ChangeLog 4516
+EBUILD mod_jk-1.2.21-r1.ebuild 1716 RMD160 eb5af17442d1518c1ff39ba95d9ccd77d01b8ff7 SHA1 aed753867f3a5b9e5d873ea8d00f7b5a1037bcf5 SHA256 a663d44d30952e28b131ee9993687967ad3b2d5152bc5b819eb8edb5af65536c
+MD5 12d3be99976b4078273ab9cf4aa116b2 mod_jk-1.2.21-r1.ebuild 1716
+RMD160 eb5af17442d1518c1ff39ba95d9ccd77d01b8ff7 mod_jk-1.2.21-r1.ebuild 1716
+SHA256 a663d44d30952e28b131ee9993687967ad3b2d5152bc5b819eb8edb5af65536c mod_jk-1.2.21-r1.ebuild 1716
+MISC ChangeLog 4676 RMD160 c1b47ac0fe7f0bb7080185300598ef9a3332599d SHA1 c40fe34cb12345eff4593d89e93a439c5873c4d3 SHA256 937adf62d39d1d232082ad2039cae707a8c48b176aad10bf47f9bd209c4a7c33
+MD5 011a8bf9047988c409b752f4fa6318e3 ChangeLog 4676
+RMD160 c1b47ac0fe7f0bb7080185300598ef9a3332599d ChangeLog 4676
+SHA256 937adf62d39d1d232082ad2039cae707a8c48b176aad10bf47f9bd209c4a7c33 ChangeLog 4676
 MISC metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 SHA1 e2c0054761431097e455f551f0a16822c2315adf SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f
 MD5 0cb6c2d14d328234b97aab96f3a81981 metadata.xml 490
 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 metadata.xml 490
@@ -38,3 +41,10 @@ SHA256 e02255ee932a8ec7fe4d9bd14d03d4ed317bd86ae39bcf5da3cc18c467756a8a files/di
 MD5 bfb38ada368b556843143972158bd03f files/digest-mod_jk-1.2.21-r1 289
 RMD160 50d1681f5733e770bbfbdeaf86a0ba890a89bc26 files/digest-mod_jk-1.2.21-r1 289
 SHA256 51d6699d225cf9d6ca08e83085169e088bf9a48d1664efff0020454290409b1c files/digest-mod_jk-1.2.21-r1 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFF7RqnNQqtfCuFneMRAlyDAJ0ZT2ljD3h7YTxrXWBwL2zgXqLKTQCfQ/nq
+BHbDG5D5kwMxADWgJOQmFTQ=
+=RmLX
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild
index 07cc78e59dc0..b2142e6f1878 100644
--- a/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.21-r1.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-apache/mod_jk/mod_jk-1.2.21-r1.ebuild,v 1.1 2007/03/04 23:06:43 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild,v 1.2 2007/03/06 07:40:16 opfer Exp $
 
 inherit apache-module autotools
 
 MY_P="tomcat-connectors-${PV}-src"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol."
 HOMEPAGE="http://tomcat.apache.org/connectors-doc/"
@@ -26,7 +26,7 @@ APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_CONF="88_${PN}"
 APACHE2_MOD_DEFINE="JK"
 
-DOCFILES="CHANGES.txt README"
+DOCFILES="README"
 
 need_apache
 
-- 
2.26.2