www-servers/tomcat: fixed bug with storing session information

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 3764ecc76c018926ce4787cb6db122875d6688a7..e796ab0a13055e2ea5f03534199412e91d7e12b9 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.270 2011/12/14 18:56:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.271 2011/12/15 21:31:15 fordfrog Exp $
+
+*tomcat-7.0.23-r1 (15 Dec 2011)
+
+  15 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> -tomcat-7.0.23.ebuild,
+  +tomcat-7.0.23-r1.ebuild:
+  Fixed bug with storing SESSIONS.ser in work directory. It cannot be symlink
+  because tomcat by default does not allow working with symlink paths.
 
   14 Dec 2011; Agostino Sarubbo <ago@gentoo.org> tomcat-7.0.22-r1.ebuild:
   Stable for AMD64, wrt bug #392393

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 680f892745b18f03a1b4d1f387d1eff8dc452691..faf02e43a5b5b81a498b0ebc7b7a31f8a7ff0511 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d
 AUX 5.5/build-jspc-classpath.patch 1486 RMD160 454b41920a864e06b5b70e448fae724241eb008d SHA1 3671b1cd4d53fd248c19380c96760c051f7f7bff SHA256 865fd2a8721799b1628fe7b31f9bad00563d679236aba5656740feb310b6eb88
@@ -27,17 +24,6 @@ EBUILD tomcat-5.5.27-r5.ebuild 10087 RMD160 f9f32edcf802c72499de5519e332aaf7b4b7
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.33.ebuild 6961 RMD160 17c4cc0cd1bf9b681f612bf131f34440e1a67bae SHA1 1dbe88bf2615d57add8e0deab2074d653a7423f0 SHA256 ae706bb3f875113fa03dc4e9770cd43b033db449f75bb3c76e7bd9b1405c2036
 EBUILD tomcat-7.0.22-r1.ebuild 7055 RMD160 73f24c33a3ddbedd60ddae890a2bf0db684b1d61 SHA1 cfeea5c3f16128b6344873ecea2683407c0c012c SHA256 8d540db3b047725613c34b886d18d42799abe82fa82daa4373a2dff20b6d670a
-EBUILD tomcat-7.0.23.ebuild 7058 RMD160 a9d606e91ee0c811cb1efc0336ca553be0f540d8 SHA1 9a88b0c66bec18ddd524c60f7e6b65cbc0514dae SHA256 aa7245b06be0cec0e5cc6be67d1b6cb7347dd5563e5cf3a1b8d1905733ef8099
-MISC ChangeLog 67172 RMD160 55fc5e4e28d6b2f02e54af07cf8ae68e23947bf5 SHA1 fe5d720e81432b4689a6cbfde8e7ddc56b1b663f SHA256 c8cf239f4cd71bcc063d42c1d87c949d63218165034b0891773977e98dfcd04d
+EBUILD tomcat-7.0.23-r1.ebuild 7617 RMD160 76c9ed4e07167e24dd6b91da34fd27de20d5abaa SHA1 7f11f31d8efd45e4ad714fda48aacea40b318683 SHA256 f9163ae30f907dfc7a2064612625359a4e2b681ec7c9ae48b3f384bfdd18ead9
+MISC ChangeLog 67463 RMD160 fba9e8ee6901e55b47545fd19854cc51e041c254 SHA1 7fea37e1010cb7ec4ba4915b0ed4963ebda27f8f SHA256 ec953b176d9de385a4f88c5c54570fa9d9daf55fdaff9c8a4e191092bed410d8
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJO6PGQAAoJEOTDgjZ80txdG3cH/3xb3hcCVhy2IMZU5mVu7cH1
-5snCkHgkkiNfImd4rchzk4OD+l+16xjsMn1gSU8ORShdyU/8gJuhwuKwaGrp7V+8
-5I1Nk+cgpnyWpn9UwGOa5xdEyVfBOE3FHpwlXqkvTRTdZeNHr+fx7H5VCtFoRivF
-va851sQ6jsx5X497mxx91nVS2iygaz17JwI6vel6LuPx03MgcQ6ZNrbLSCzGChvs
-DHkm4RkmQbik0sPi8pM15SlH+U4MLImVpMJW5YhSTPVsWeidz8eB7Z3zqvTu1XMw
-2AKDndePQleCSNsOJs0O25sBM6z5MDh3l/Hv9haaqvut2owCVYsH7EcbYe2zhC0=
-=QKyH
------END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-7.0.23.ebuild b/www-servers/tomcat/tomcat-7.0.23-r1.ebuild
similarity index 91%
rename from www-servers/tomcat/tomcat-7.0.23.ebuild
rename to www-servers/tomcat/tomcat-7.0.23-r1.ebuild
index c69936e8911994a710d43e0bc0ea4db680fefbfd..d953141ff0c6676aeb1c864f4e1dd9fc9efa41da 100644 (file)
--- a/www-servers/tomcat/tomcat-7.0.23.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.23.ebuild,v 1.1 2011/11/29 13:00:21 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.23-r1.ebuild,v 1.1 2011/12/15 21:31:15 fordfrog Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -165,7 +165,9 @@ src_install() {
        dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
        dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
        dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-       dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
+       # we cannot symlink work directory because that breaks saving session data
+       # because session file cannot be saved to symlinked location by default
+       #dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
 
        dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
        fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
@@ -183,6 +185,7 @@ pkg_postinst() {
 
        # bug #180519
        if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
+               elog
                elog "The latest webapp has NOT been installed into"
                elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
                elog "and we do not want to overwrite any files you have put there."
@@ -201,6 +204,15 @@ pkg_postinst() {
                dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
        fi
 
+       # bug with storing SESSIONS.ser file to path with symlink
+       if [[ -L "${ROOT}var/lib/${TOMCAT_NAME}/work" ]] ; then
+               elog
+               ewarn "${ROOT}var/lib/${TOMCAT_NAME}/work is symbolic link which breaks"
+               ewarn "storing of SESSIONS.ser files in work directory when allowLinking"
+               ewarn "is disabled (the default). Remove the symbolic link (while Tomcat is"
+               ewarn "not running) to fix the issue."
+       fi
+
        elog
        elog " This ebuild implements a FHS compliant layout for tomcat"
        elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"