diff options
| -rw-r--r-- | www-apache/mod_jk/ChangeLog | 11 | ||||
| -rw-r--r-- | www-apache/mod_jk/Manifest | 24 | ||||
| -rw-r--r-- | www-apache/mod_jk/files/88_mod_jk.conf | 6 | ||||
| -rw-r--r-- | www-apache/mod_jk/files/digest-mod_jk-1.2.21 | 3 | ||||
| -rw-r--r-- | www-apache/mod_jk/mod_jk-1.2.21.ebuild | 72 |
5 files changed, 104 insertions, 12 deletions
diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog index d8556842be08..87de5d15b08d 100644 --- a/www-apache/mod_jk/ChangeLog +++ b/www-apache/mod_jk/ChangeLog @@ -1,6 +1,15 @@ # 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.19 2007/02/03 19:20:49 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.20 2007/02/26 19:27:44 wltjr Exp $ + +*mod_jk-1.2.21 (26 Feb 2007) + + 26 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org> + files/88_mod_jk.conf, +mod_jk-1.2.21.ebuild: + Bumped to latest development version, added sed to change paths from apache2 + -> apache depending on use. Paths were set/hard coded to fix bug #164838. + Could cause issues for apache (!apache2) users < 1.2.21. But no worse than + present :) 03 Feb 2007; Steve Dibb <beandog@gentoo.org> mod_jk-1.2.20.ebuild: amd64 stable, bug 162949 diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index e19c62ee8afe..400b4af1d201 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,13 +1,14 @@ -AUX 88_mod_jk.conf 5391 RMD160 840beec20a576b630c571d26fbf3e61722991810 SHA1 dbbf75f2d9427441496786c6767b62231deb12db SHA256 1f78a0766aac425e994da81aa26632aa359db92ced09dc443dc207049d9d38cf -MD5 eecf40590474fbcdb54010d1f8525e49 files/88_mod_jk.conf 5391 -RMD160 840beec20a576b630c571d26fbf3e61722991810 files/88_mod_jk.conf 5391 -SHA256 1f78a0766aac425e994da81aa26632aa359db92ced09dc443dc207049d9d38cf files/88_mod_jk.conf 5391 +AUX 88_mod_jk.conf 5414 RMD160 91a07b945a2540f3b61ae95826425016cb9ace51 SHA1 4a25dd1fa022200a4b0df24e26914f966075e087 SHA256 2c46be9f73437be26c86fc397884dd48364e3e5c71533165b6493c83d867cdd1 +MD5 deddfbb4acb1bc2eafc4cab3268be861 files/88_mod_jk.conf 5414 +RMD160 91a07b945a2540f3b61ae95826425016cb9ace51 files/88_mod_jk.conf 5414 +SHA256 2c46be9f73437be26c86fc397884dd48364e3e5c71533165b6493c83d867cdd1 files/88_mod_jk.conf 5414 AUX jk-workers.properties 1034 RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f SHA1 c1a1619fd51b8825fc1c464aeabd5a7597515733 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d MD5 83e37c0f3e893815403a6f9e4efde4f1 files/jk-workers.properties 1034 RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f files/jk-workers.properties 1034 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d files/jk-workers.properties 1034 DIST tomcat-connectors-1.2.19-src.tar.gz 1246419 RMD160 f48895b847b84a77f95ec87faa47115b023f686f SHA1 7e49c98000455ea226b16c45cf63fd565c2221eb SHA256 7d75e357c6ff083f5b383d53475a3f14d1f6a45294bf0f2de0a8c552a04746c0 DIST tomcat-connectors-1.2.20-src.tar.gz 1316612 RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc SHA1 716b61ffa137067c1df9fb1b0a5d81f6969a181a SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610 +DIST tomcat-connectors-1.2.21-dev-511864-src.tar.gz 1333812 RMD160 ec8dd9e66299508ce37a0d8ac68e668f11c568c4 SHA1 9d4cbc627aaff9d09093f5d3486b32da70d0b2c0 SHA256 f37b0b3197772ec52bc93900d505a0412d848fb731702dd91b22c27d13983ca6 EBUILD mod_jk-1.2.19.ebuild 1908 RMD160 1e66f293151db950c3bf91fe8a7788ef62199887 SHA1 123831e02113608eaa0bb417528d63c44dffb4f5 SHA256 76b1294ddfc6760ca565e720ab0c95f573f427016453b8ea2a49a468602574e5 MD5 981a100c54f2ae482a3db8c2c8d80e9b mod_jk-1.2.19.ebuild 1908 RMD160 1e66f293151db950c3bf91fe8a7788ef62199887 mod_jk-1.2.19.ebuild 1908 @@ -16,10 +17,14 @@ EBUILD mod_jk-1.2.20.ebuild 1548 RMD160 ee8fe4ba7fa46a9d050d5e69b6fc817ac7c0b781 MD5 1b77cd525adae70ca02bdb7e92bee2e8 mod_jk-1.2.20.ebuild 1548 RMD160 ee8fe4ba7fa46a9d050d5e69b6fc817ac7c0b781 mod_jk-1.2.20.ebuild 1548 SHA256 4001a45e87e9013bd25dc470715b44b2fb92e0292be16c8b04d393e0e81ac004 mod_jk-1.2.20.ebuild 1548 -MISC ChangeLog 3415 RMD160 bee51578eee6f54b4f9e78087945aa64920ffe99 SHA1 92fcaa299a3ac746e1f45a677c6bc2a60b7ff304 SHA256 ff19946c33faac1ea577c06321b298333180c0c8fd3bd1f3769490801741cbd7 -MD5 a75ed8a62a37f984beed07c48088eb1f ChangeLog 3415 -RMD160 bee51578eee6f54b4f9e78087945aa64920ffe99 ChangeLog 3415 -SHA256 ff19946c33faac1ea577c06321b298333180c0c8fd3bd1f3769490801741cbd7 ChangeLog 3415 +EBUILD mod_jk-1.2.21.ebuild 1842 RMD160 78388dee0e315e5a22cfd1cb0c81774595d08589 SHA1 212110413880e610f86b956874a78a9504d38757 SHA256 ca3296a61b0051784743d7ef3ea17e7fafce89afa29f3ed016cda70872628af2 +MD5 789f7b92f784e0f15eac1bfe8d25f5d7 mod_jk-1.2.21.ebuild 1842 +RMD160 78388dee0e315e5a22cfd1cb0c81774595d08589 mod_jk-1.2.21.ebuild 1842 +SHA256 ca3296a61b0051784743d7ef3ea17e7fafce89afa29f3ed016cda70872628af2 mod_jk-1.2.21.ebuild 1842 +MISC ChangeLog 3793 RMD160 4f0d28f38e1992e3b9a6c21fc0a85696d3465f8c SHA1 2b139aa39fce29ec70fe320899834906b6da8e7d SHA256 d3d42f206a6b58c4e1c29a518f0f3476e76669f5c725698b70bc3b9cb7ee00a4 +MD5 2ebf77ffad753c088e80bbf644f84193 ChangeLog 3793 +RMD160 4f0d28f38e1992e3b9a6c21fc0a85696d3465f8c ChangeLog 3793 +SHA256 d3d42f206a6b58c4e1c29a518f0f3476e76669f5c725698b70bc3b9cb7ee00a4 ChangeLog 3793 MISC metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 SHA1 e2c0054761431097e455f551f0a16822c2315adf SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f MD5 0cb6c2d14d328234b97aab96f3a81981 metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 metadata.xml 490 @@ -30,3 +35,6 @@ SHA256 82a579b49926d41fc56a3e3866a8b00c430e49b455a50d31a3133a87ae07a221 files/di MD5 351803f1828843b33d077f268ce7697c files/digest-mod_jk-1.2.20 289 RMD160 300a2ff8289cd5721e1dd04b0b8bb6fc08b7fe2d files/digest-mod_jk-1.2.20 289 SHA256 e02255ee932a8ec7fe4d9bd14d03d4ed317bd86ae39bcf5da3cc18c467756a8a files/digest-mod_jk-1.2.20 289 +MD5 f49fa0bc82b46ec66b5102e45bb5bd3b files/digest-mod_jk-1.2.21 322 +RMD160 aa01ac4dd4ee424f6318583d4d7b529a9f16ddea files/digest-mod_jk-1.2.21 322 +SHA256 34e784f250eb5bdf50a462caf311a6c8cf4e9c217852ab8ac6bc976ba063aa0a files/digest-mod_jk-1.2.21 322 diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf index 4ee73d13ef7c..b868205be592 100644 --- a/www-apache/mod_jk/files/88_mod_jk.conf +++ b/www-apache/mod_jk/files/88_mod_jk.conf @@ -6,14 +6,14 @@ LoadModule jk_module modules/mod_jk.so ### # JkWorkersFile specify the location where mod_jk will find # the workers definitions. -JkWorkersFile conf/jk-workers.properties +JkWorkersFile /etc/apache2/jk-workers.properties ### ### Where to put mod_jk logs ### # specify the location where mod_jk is going to place its log file. -JkLogFile logs/mod_jk.log +JkLogFile /etc/apache2/logs/mod_jk.log ### @@ -152,7 +152,7 @@ JkRequestLogFormat "%w %V %T" # reponsible for serving static html files. All requests of files with # the ending .jsp will be redirected to a default Tomcat installation which # uses the default profile. Change this to fit your needs. -jkAutoAlias /var/lib/tomcat-5/default/webapps/ +jkAutoAlias /var/lib/tomcat-5.5/default/webapps/ jkMount /*.jsp ajp13 </IfDefine> diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.21 b/www-apache/mod_jk/files/digest-mod_jk-1.2.21 new file mode 100644 index 000000000000..b972ead03699 --- /dev/null +++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.21 @@ -0,0 +1,3 @@ +MD5 04e30a859373525a08a1fead7a900d56 tomcat-connectors-1.2.21-dev-511864-src.tar.gz 1333812 +RMD160 ec8dd9e66299508ce37a0d8ac68e668f11c568c4 tomcat-connectors-1.2.21-dev-511864-src.tar.gz 1333812 +SHA256 f37b0b3197772ec52bc93900d505a0412d848fb731702dd91b22c27d13983ca6 tomcat-connectors-1.2.21-dev-511864-src.tar.gz 1333812 diff --git a/www-apache/mod_jk/mod_jk-1.2.21.ebuild b/www-apache/mod_jk/mod_jk-1.2.21.ebuild new file mode 100644 index 000000000000..23128b703098 --- /dev/null +++ b/www-apache/mod_jk/mod_jk-1.2.21.ebuild @@ -0,0 +1,72 @@ +# 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.ebuild,v 1.1 2007/02/26 19:27:44 wltjr Exp $ + +inherit apache-module autotools + +#MY_P="tomcat-connectors-${PV}-src" +MY_P="tomcat-connectors-${PV}-dev-511864-src" + +KEYWORDS="~amd64 ~ppc ~x86" + +DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol." +HOMEPAGE="http://tomcat.apache.org/connectors-doc/" +#SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" +SRC_URI="http://people.apache.org/~rjung/mod_jk-dev/${MY_P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + + +S="${WORKDIR}/${MY_P}/native" + +APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so" +APACHE1_MOD_CONF="88_${PN}" +APACHE1_MOD_DEFINE="JK" + +APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" +APACHE2_MOD_CONF="88_${PN}" +APACHE2_MOD_DEFINE="JK" + +DOCFILES="CHANGES.txt README" + +need_apache + +src_unpack() { + unpack ${A} + cd "${S}" + + eautoreconf +} + +src_compile() { + local apxs + use apache2 && apxs="${APXS2}" + use apache2 || apxs="${APXS1}" + + econf \ + --with-apxs=${apxs} \ + --with-apr-config=/usr/bin/apr-config \ + || die "econf failed" + emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed" +} + +src_install() { + # install the workers.properties file + insinto "${APACHE_CONFDIR}" + doins "${FILESDIR}/jk-workers.properties" + + # call the nifty default src_install :-) + apache-module_src_install + + if ! use apache2 ; then + sed -i -e 's:/apache2/:/apache/:' "${D}${APACHE_CONFDIR}/modules.d/88_${PN}.conf" \ + || die "Could not update jk-workers.properties for apache" + fi +} + +pkg_postinst() { + elog "Tomcat is not a dependency of mod_jk any longer, if you intend" + elog "to use it with Tomcat, you have to merge www-servers/tomcat on" + elog "your own." +} |