Struts is now slotted so fixed the dependencies. In the latest revision fixed bug #99704. Thanks to David Owen <fugue88@hotmail.com> for reporting. Also startup problems from bug #103925 should now be fixed.

Package-Manager: portage-2.0.52-r1

6 files changed, 53 insertions, 34 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index ca8df1bb2165..142932353265 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.38 2005/09/17 12:22:13 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.39 2005/09/20 17:56:51 betelgeuse Exp $
+
+*tomcat-5.0.28-r6 (20 Sep 2005)
+
+  20 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
+  files/5.0.28/tomcat.init, tomcat-5.0.28-r4.ebuild,
+  -tomcat-5.0.28-r5.ebuild, +tomcat-5.0.28-r6.ebuild:
+  Struts is now slotted so fixed the dependencies. In the latest revision
+  fixed bug #99704. Thanks to David Owen <fugue88@hotmail.com> for reporting.
+  Also startup problems from bug #103925 should now be fixed.
 
 *tomcat-5.0.28-r5 (14 Sep 2005)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 68f664572278..170d7ea6ac45 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 MD5 ff1524d371f1ff9a12eaa651674fe7d0 tomcat-5.0.27-r6.ebuild 3889
-MD5 7d3e02b6a6894cf8d2189a2377112ce9 tomcat-5.0.28-r5.ebuild 9717
-MD5 c8f45be5e36dcd7078dc0defe2810fce tomcat-5.0.28-r4.ebuild 9588
-MD5 2bdb50475de81d9979ce2bbd281cb0dd ChangeLog 17395
+MD5 857c539ac6d3e9f0b9d3f45cb00ca701 tomcat-5.0.28-r4.ebuild 9670
+MD5 37dc61b21182d30e21f2682bdf329408 ChangeLog 17807
 MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
+MD5 3b6e68aa059b3571c1d5d48dbe18ac71 tomcat-5.0.28-r6.ebuild 10127
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r6 75
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r4 78
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r5 78
+MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r6 78
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 MD5 38c130772e7d43dcdff78b3d94f96efd files/5.0.27/tomcat.env 27
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
@@ -19,7 +19,7 @@ MD5 987ddee3c5a93ccaa4311c85f5dfceb3 files/5.0.28/gentoo.diff 541
 MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
 MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
 MD5 a4df0ce5b57f2bcaa707ff3b5858bee4 files/5.0.28/tomcat.conf 2707
-MD5 c0d89ffb4276e8a6d0cf08fcad6517f9 files/5.0.28/tomcat.init 701
+MD5 8f6ccdf1c60e7671d28f0eb67decd468 files/5.0.28/tomcat.init 715
 MD5 4a887877fb26ce5a6a1d58c66578bd7f files/5.0.28/log4j.properties 401
 MD5 744a9ce174144fc5689c1fabee527e55 files/5.0.28/build.xml-02.patch 3177
 MD5 be12f05c16725d1c68cd1ba916ff8748 files/5.0.28/tomcat.conf-r1 2709
@@ -27,7 +27,7 @@ MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDLXVO8zY1VwezZiERArTPAJ9F21osYX8vgm2CQ7psI1BkKzlbiQCeLptF
-z1wxycY48IT1d5mlB4cuj1Q=
-=49hE
+iD8DBQFDME2HQiJ/wx066S4RAp/UAJwMoiCbKt/1Vw9B19MgDYKL+6YLsgCfXcOJ
+mgVTsUWaY2SsPZdyHm8gXAg=
+=V5BF
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/5.0.28/tomcat.init b/www-servers/tomcat/files/5.0.28/tomcat.init
index 1de1cc199e2d..03eedaa9be9d 100644
--- a/www-servers/tomcat/files/5.0.28/tomcat.init
+++ b/www-servers/tomcat/files/5.0.28/tomcat.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.init,v 1.3 2005/03/28 03:14:47 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.init,v 1.4 2005/09/20 17:56:51 betelgeuse Exp $
 
 depend() {
 	use dns logger mysql postgresql net
@@ -12,7 +12,7 @@ start()	{
 	cd ${CATALINA_BASE}/webapps
 	start-stop-daemon --start --quiet --chuid tomcat:tomcat \
 			  --exec ${CATALINA_HOME}/bin/catalina.sh \
-			  -- ${TOMCAT_START}
+			  --background -- ${TOMCAT_START}
 	#sleep 5
 	eend $?
 }
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r5 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r6
index 38ec5031aa8e..38ec5031aa8e 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r5
+++ b/www-servers/tomcat/files/digest-tomcat-5.0.28-r6
diff --git a/www-servers/tomcat/tomcat-5.0.28-r4.ebuild b/www-servers/tomcat/tomcat-5.0.28-r4.ebuild
index eb66e0f6cdc8..61ffce059ae0 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r4.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r4.ebuild,v 1.7 2005/08/26 13:45:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r4.ebuild,v 1.8 2005/09/20 17:56:51 betelgeuse Exp $
 
 inherit eutils java-pkg
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.
 HOMEPAGE="http://jakarta.apache.org/tomcat"
 KEYWORDS="~x86 ~amd64 -ppc64 ~sparc"
 LICENSE="Apache-2.0"
+#only one revision of struts to force upgrade because of slotting
 RDEPEND=">=virtual/jdk-1.4
 	=dev-java/commons-beanutils-1.7*
 	>=dev-java/commons-collections-3.1
@@ -31,7 +32,7 @@ RDEPEND=">=virtual/jdk-1.4
 	=dev-java/jakarta-regexp-1.3*
 	>=dev-java/saxpath-1.0
 	~dev-java/servletapi-2.4
-	=dev-java/struts-1.1*
+	=dev-java/struts-1.1-r4
 	dev-java/sun-jaf-bin
 	>=dev-java/xerces-2.6.2-r1
 	jikes? ( dev-java/jikes )"
@@ -103,7 +104,7 @@ src_compile(){
 	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
 	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
 	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
-	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
+	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.1 struts.jar)"
 	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
@@ -113,7 +114,7 @@ src_compile(){
 	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
 	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
 	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
-	antflags="${antflags} -Dstruts.home=/usr/share/struts"
+	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
 
 	ant ${antflags} || die "compile failed"
 
@@ -188,7 +189,7 @@ src_install() {
 	# replace a packed struts.jar
 	cd server/webapps/admin/WEB-INF/lib
 	rm -f struts.jar
-	java-pkg_jar-from struts struts.jar
+	java-pkg_jar-from struts-1.1 struts.jar
 	cd ${base}
 
 	# replace the default pw with a random one, see #92281 
diff --git a/www-servers/tomcat/tomcat-5.0.28-r5.ebuild b/www-servers/tomcat/tomcat-5.0.28-r6.ebuild
index 0aa0cbe00935..9dae1f8666f1 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r5.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r5.ebuild,v 1.2 2005/09/18 14:10:44 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r6.ebuild,v 1.1 2005/09/20 17:56:51 betelgeuse Exp $
 
 inherit eutils java-pkg
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.
 HOMEPAGE="http://jakarta.apache.org/tomcat"
 KEYWORDS="~x86 ~amd64 -ppc64 ~sparc"
 LICENSE="Apache-2.0"
+#only one accepted revision of struts to force upgrading because of slot changes
 RDEPEND=">=virtual/jdk-1.4
 	=dev-java/commons-beanutils-1.7*
 	>=dev-java/commons-collections-3.1
@@ -31,7 +32,7 @@ RDEPEND=">=virtual/jdk-1.4
 	=dev-java/jakarta-regexp-1.3*
 	>=dev-java/saxpath-1.0
 	~dev-java/servletapi-2.4
-	=dev-java/struts-1.1*
+	=dev-java/struts-1.1-r4
 	dev-java/sun-jaf-bin
 	>=dev-java/xerces-2.6.2-r1
 	jikes? ( dev-java/jikes )"
@@ -45,6 +46,7 @@ S=${WORKDIR}/jakarta-${P}-src
 
 TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
 TOMCAT_NAME="${PN}-${SLOT}"
+WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/default/webapps"
 
 src_unpack() {
 	unpack ${A}
@@ -103,7 +105,7 @@ src_compile(){
 	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
 	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
 	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
-	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
+	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.1 struts.jar)"
 	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
@@ -113,7 +115,7 @@ src_compile(){
 	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
 	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
 	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
-	antflags="${antflags} -Dstruts.home=/usr/share/struts"
+	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
 
 	ant ${antflags} || die "compile failed"
 
@@ -139,22 +141,17 @@ src_install() {
 	diropts -m755
 	dodir /usr/share/${TOMCAT_NAME}
 
-	dodir /var/log/${TOMCAT_NAME}/default
+	keepdir /var/log/${TOMCAT_NAME}/default
 	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-	dodir /etc/${TOMCAT_NAME}/default/
+	keepdir /etc/${TOMCAT_NAME}/default/
 	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
-	dodir /var/tmp/${TOMCAT_NAME}/default
+	keepdir /var/tmp/${TOMCAT_NAME}/default
 	chown -R tomcat:tomcat ${D}/var/tmp/${TOMCAT_NAME}
-	dodir /var/run/${TOMCAT_NAME}/default
+	keepdir /var/run/${TOMCAT_NAME}/default
 	chown -R tomcat:tomcat ${D}/var/run/${TOMCAT_NAME}
 	dodir /var/lib/${TOMCAT_NAME}/default
 	chown -R tomcat:tomcat ${D}/var/lib/${TOMCAT_NAME}
 
-	keepdir /var/log/${TOMCAT_NAME}/default
-	keepdir /etc/${TOMCAT_NAME}/default/
-	keepdir /var/tmp/${TOMCAT_NAME}/default
-	keepdir /var/run/${TOMCAT_NAME}/default
-
 	# we don't need dos scripts	
 	rm -f bin/*.bat
 
@@ -188,7 +185,7 @@ src_install() {
 	# replace a packed struts.jar
 	cd server/webapps/admin/WEB-INF/lib
 	rm -f struts.jar
-	java-pkg_jar-from struts struts.jar
+	java-pkg_jar-from struts-1.1 struts.jar
 	cd ${base}
 
 	# replace the default pw with a random one, see #92281 
@@ -201,9 +198,10 @@ src_install() {
 	cp -pR conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf"
 	cp -R bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
 
+	keepdir               ${WEBAPPS_DIR}
+	set_webapps_perms     ${D}/${WEBAPPS_DIR}
+
 	# if the useflag is set, copy over the examples
-	dodir /var/lib/${TOMCAT_NAME}/default/webapps
-	keepdir /var/lib/${TOMCAT_NAME}/default/webapps
 	if use examples; then
 		cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
 		cp -pr webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \
@@ -219,7 +217,7 @@ src_install() {
 	cp ${FILESDIR}/${PV}/log4j.properties ${D}/etc/${TOMCAT_NAME}/
 	chown tomcat:tomcat ${D}/etc/${TOMCAT_NAME}/log4j.properties
 
-	use doc && dodoc ${S}/jakarta-tomcat-5/{LICENSE,RELEASE-NOTES,RUNNING.txt}
+	dodoc  ${S}/jakarta-tomcat-5/{RELEASE-NOTES,RUNNING.txt}
 	fperms 640 /etc/${TOMCAT_NAME}/default/tomcat-users.xml
 }
 
@@ -227,7 +225,6 @@ pkg_postinst() {
 	#due to previous ebuild bloopers, make sure everything is correct
 	chown root:0 /etc/init.d/${TOMCAT_NAME}
 	chown root:0 /etc/conf.d/${TOMCAT_NAME}
-
 	chmod -R 750 /etc/${TOMCAT_NAME}
 
 	einfo
@@ -271,4 +268,16 @@ pkg_postinst() {
 	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
 	einfo " may not get seen.  Thank you."
 	einfo
+
+	einfo "${WEBAPPS_DIR}"
+	einfo "is now owned by tomcat:tomcat and has 750 as permissions."
+	einfo "This is needed to deploy WAR files from the manager webapp."
+	einfo "See bug 99704. If you are upgrading tomcat you need to manually"
+	einfo "change the permissions."
+}
+
+#helpers
+set_webapps_perms() {
+	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
+	chmod  750           ${1} || die "Failed to change permissions off ${1}."
 }