Security bump wrt bug 325575.

Package-Manager: portage-2.2.3/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x42618354

5 files changed, 37 insertions, 33 deletions

diff --git a/www-apps/lxr/ChangeLog b/www-apps/lxr/ChangeLog
index a008a30d2f40..e180a1efe9db 100644
--- a/www-apps/lxr/ChangeLog
+++ b/www-apps/lxr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/lxr
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.20 2012/09/18 04:17:13 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.21 2013/09/12 21:44:22 creffett Exp $
+
+*lxr-0.9.8 (12 Sep 2013)
+
+  12 Sep 2013; Chris Reffett <creffett@gentoo.org>
+  +files/lxr-0.9.8-initdb-mysql.patch, +lxr-0.9.8.ebuild,
+  -files/initdb-mysql.patch, -lxr-0.9.5.ebuild:
+  Security bump wrt bug 325575.
 
   18 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
@@ -102,4 +109,3 @@
   23 Apr 2004; Stuart Herbert <stuart@gentoo.org> lxr-0.3.1.ebuild,
   metadata.xml:
   Initial import; thanks to Josh Glover <gentoo@jmglov.net>; see bug #48459
-
diff --git a/www-apps/lxr/Manifest b/www-apps/lxr/Manifest
index 23ed5d2938dd..ccfde736c526 100644
--- a/www-apps/lxr/Manifest
+++ b/www-apps/lxr/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX initdb-mysql.patch 472 SHA256 c8ebfbc343182631715c65663d05947d89ce21445b5b16f18872a10eb4873025 SHA512 e4164c15cbb6e9b6899043e969eca2ae38d95ce42e6a5740a39d901af44fc3523f9177cda832f5b6f654b633968ef01fa76911266795b423129a5c7e57604dff WHIRLPOOL 9b55dba9847a54fcbe6aa7b730d93804aa26769fb3039c0b29fa4d5a47b25ebef953417cec6f241badcac1404bcaefd43daef163a0ed0c85ee6eeffdfe53fe34
+AUX lxr-0.9.8-initdb-mysql.patch 484 SHA256 2ebeaaa9c10f2953b159fe99206a7eabf618cdc350e27d8ed52d56a4bc8d9241 SHA512 616a819fdd899bbac114dcebe42864f16e7b17e81f07be915ae36c9dfac4d621e960d5901a253d6e13d4e16440eb84702784b66ba1922a0cba72afea1f896da4 WHIRLPOOL bf6360342dc499178979f85d0dcbbb852a4d08a8d06e50f602ffacee49eea0f35dfa50350151d2db9730d2d976d02862ecb4e408042b1dac2146a62619375faa
 AUX postinstall-en.txt 1351 SHA256 1c5ccbde33bf200f727c53a87f67499328f140b64e8821e50065c872fe8b72f2 SHA512 4730fcc56b8a775d5922883906f9db8ead7a0f3beb8a46ceeb451f8ba273e823fbe328b227da72f39a9dfa926cd93b77c5d27c0d1ba2730afec0c570b1da0006 WHIRLPOOL 10b571d9605cd9b927ecfcc0383ae080b9604f6b1e59ce89deaa5331568a4b58380fb67d7b8391d967acc82e457701bf5e43706186d3e94fa8b2211895eb3e0a
 AUX reconfig 357 SHA256 395a8d5013e87e13e6701c8b1bbc889978cc92186ebe3569e2b1bee9f96b78a7 SHA512 b218ddf830fc1412ab95bd53377f07b76209b2dd7640654618e937355efd716f2374a0a18f97e8f92c06619f8aed6bbc311eb93541ebf088437e40250288f8cd WHIRLPOOL 0365b1faa0c266d8c3369eaaf2808ffd6ee55ef9dcc303a425a5a661b3eba239e2f807bbeecdf33a4ab35c26d87eea536e87f7c31ebc72f2f5ac15b68c228b2d
-DIST lxr-0.9.5.tgz 105230 SHA256 5b126b8180a1c56fef5a89b9335a0b5d6e467850bf62b29a9f44b12107a74c8e
-EBUILD lxr-0.9.5.ebuild 2162 SHA256 15b40269286b3c01a3534c0abdbccf2c11d0ec2bcab95192f4a39924a932003c SHA512 068fff6e186c56e45d9f3c179d782e5c874e048f99bb9d3efff3ceeface655ee13c1e39e031827d25a8354fda428671c8e058346574a884f8d3535920009e356 WHIRLPOOL f545c14bc31734cd8b617b3a978aff9973eeb66bbb08a56df565b3b8b57178461c457fa8be9d1179ad48d6130d47eb644a6e1819207ef5d032b1136d659cfdd1
-MISC ChangeLog 3683 SHA256 260bb6fd9ae07d20d4243b7f7f38ce9f241665a48e575d17c50c6e03195b3da8 SHA512 0a4af0254aeb39d97870b015cdfc6dbb45144b2e7551a6dbd23e0601d44b241f49b590ea9146ea0f4a913ee6b39f39b1ad0396a9f6c295d6c49936bcb003b94d WHIRLPOOL 9195d34df2c933365da1e85a843e0f69d95acb52ee40b13bc59a87a653dcc816549ff478feec5bbfb341a786ef6916ad8a2817b6de0a9cba4f5aab7f20e561ff
+DIST lxr-0.9.8.tgz 104246 SHA256 2caff9447cc2ef1f82d96ce5a2fc4a0358f2d12de52d73a91f29ae5119db4bf5 SHA512 2ee9965448edc63a35a3c9d51b2e22c142e5e0aed8e487a590ad3e8a9f840f94fbe38736fe139fb02941ab4e5c891821460b0f32b56a52bf295988c6ef432318 WHIRLPOOL e25bc692b08666402e8ef09b9f464811b7d49bbe7ca2597d35e3d9f3dbe2b4bb285ae52e748b86b11327f92a491863ede9030ba914f6f8e3a2251ea3f1b8859c
+EBUILD lxr-0.9.8.ebuild 2195 SHA256 57bbd3520e6a3a7509ec91f05977475df9af26739e16a06114bd4bf5bbee534a SHA512 b47cbbcca4a6f7152be42658ed3b63708ca45fd8efc86194fad6e392de02e1bc91e67d3ced69541e449b06bb1296aae35319b2179e52ec133759d92b19cc6556 WHIRLPOOL f191e52d3b5653838c7198d51850fb91c2adf8603370fbdb98a9622488e85fb99ecb1f0b4fdace52060181a04db84996e9bf206289630c9492728cd85c9f556b
+MISC ChangeLog 3897 SHA256 d1198c85b15e5afcb99303f122141a1a009cb43686ac3534b9e3670bf3d41bda SHA512 8dc3018739f61e88869e154ab6bafcce84e5ead8b77d4364654f08a10e5eacd086ffab924ab6895003f0ac3d69e2e217a89677179efc43a4d80cb8e79f817905 WHIRLPOOL 4c371fb3022c22893e63bf58c663c59dd174631a5157ba181f456305a91eccde400d372ea0d6ca46863cf9c870e465a64f3242c3f4aebd9ca5e136e83a1acbad
 MISC metadata.xml 251 SHA256 f856867639306390e0f4b50557363f4820b5cfaeb5bbae97f44096d97fd0cb9b SHA512 9c079ad0a787d165d63206e0f717d9bd13b8a956be51d425df11e3d12e394bed49a4f25f61df3b0ed8e1f1b3d539ef551937386b75ceceeeaa156f4fa008b104 WHIRLPOOL 72506b63d3d4f3354cddc9df066e328c44058fd04bbc5bb0130002161a11ea74b7f06472629e91cb49be44ddea123583a024c803d06fcb953463d418b42f7dac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQV/XPAAoJEEqz6FtPBkyjWfMH/ip6FwF3LL80ooAByQZ6IAfV
-IJSmTLSO6YM03w1slhceqop5H9l7xp+mB139J18RKZWkf9je37pz9uTfvNMeINzm
-1aV1D+Wx7+mjudI5KYKZtOTdZ0HU8petdtZUVQyD3YXEEdtcmHFSeixlHJKZS+0B
-b28hFJIZkXuh0DKqvu5GC0GbhKl5Bdaep1ajl14N9SldVYjyjbJoJg18C6aXHIre
-ZFM4yRZKWRAhNZp+lWx2gZpUtuqM5ruUP5mZql1rTJ/yW5WEsCIIf3aGtMy0WFos
-61P3+Q0qAZl3gHTWt36K3dcwGN60c+rVdMmETTyWlF+MsX3b5j5TYwsok7MnK3w=
-=PO1X
+iKYEAREIAGYFAlIyNbZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1Q7wACdEf/Th+32HcyzOY8XFaVhgaXh
+AQIAnRvQCcwos+JCZ5flZvLFRSkDkVBZ
+=Uxi4
 -----END PGP SIGNATURE-----
diff --git a/www-apps/lxr/files/initdb-mysql.patch b/www-apps/lxr/files/initdb-mysql.patch
deleted file mode 100644
index 8c35593017b8..000000000000
--- a/www-apps/lxr/files/initdb-mysql.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- initdb-mysql	2004-07-20 11:31:24.000000000 -0400
-+++ initdb-mysql.patched	2006-01-26 15:41:43.000000000 -0500
-@@ -34,8 +34,8 @@ create table lxr_indexes (
- 
- create table lxr_releases 
-         (fileid         int not null references lxr_files,
--        release         char(255) binary not null,
--        primary key     (fileid,release)
-+        `release`         char(255) binary not null,
-+        primary key     (fileid,`release`)
- );
- 
- create table lxr_useage
diff --git a/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch b/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch
new file mode 100644
index 000000000000..f28604683781
--- /dev/null
+++ b/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch
@@ -0,0 +1,13 @@
+--- initdb-mysql	2004-07-20 11:31:24.000000000 -0400
++++ initdb-mysql.patched	2006-01-26 15:41:43.000000000 -0500
+@@ -34,8 +34,8 @@ create table lxr_indexes (
+
+ create table lxr_releases
+         (fileid         int not null references lxr_files,
+-        releaseid             char(255) binary not null,
+-        primary key     (fileid,releaseid)
++        `releaseid`             char(255) binary not null,
++        primary key     (fileid,`releaseid`)
+ );
+
+ create table lxr_usage
diff --git a/www-apps/lxr/lxr-0.9.5.ebuild b/www-apps/lxr/lxr-0.9.8.ebuild
index 4c6ea2021411..aaff4f9d2a73 100644
--- a/www-apps/lxr/lxr-0.9.5.ebuild
+++ b/www-apps/lxr/lxr-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.5.ebuild,v 1.7 2010/03/05 07:37:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.8.ebuild,v 1.1 2013/09/12 21:44:22 creffett Exp $
 
 inherit perl-module webapp multilib eutils depend.apache
 
@@ -32,7 +32,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/initdb-mysql.patch
+	epatch "${FILESDIR}/${PN}-0.9.8-initdb-mysql.patch"
 
 	sed -i \
 		-e 's|/usr/local/bin/swish-e|/usr/bin/swish-e|' \
@@ -42,7 +42,7 @@ src_unpack() {
 		templates/lxr.conf
 	sed -i \
 		-e 's|Apache::Registry|ModPerl::PerlRun|' \
-		.htaccess
+		.htaccess-apache1
 	sed -i \
 		-e 's|require Local;|require LXR::Local;|' \
 		-e 's|use Local;|use LXR::Local;|' \
@@ -69,7 +69,7 @@ src_install() {
 	insinto "${MY_HTDOCSDIR}"
 	doins .htaccess* templates/* || die
 
-	webapp_configfile "${MY_HTDOCSDIR}"/lxr.conf "${MY_HTDOCSDIR}"/.htaccess
+	webapp_configfile "${MY_HTDOCSDIR}"/lxr.conf "${MY_HTDOCSDIR}"/.htaccess-apache1
 	webapp_sqlscript mysql initdb-mysql
 	webapp_sqlscript postgresql initdb-postgres
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt