diff options
Diffstat (limited to 'www-servers/tomcat')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 10 | ||||
| -rw-r--r-- | www-servers/tomcat/Manifest | 14 | ||||
| -rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.0.27-r6 (renamed from www-servers/tomcat/files/digest-tomcat-5.0.27-r5) | 0 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.0.27-r6.ebuild (renamed from www-servers/tomcat/tomcat-5.0.27-r5.ebuild) | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.0.28-r3.ebuild | 46 |
5 files changed, 42 insertions, 34 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index e904bb2801b5..9dd4673c4825 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,14 @@ # 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.29 2005/05/14 16:13:34 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.30 2005/05/15 15:36:37 luckyduck Exp $ + +*tomcat-5.0.27-r6 (15 May 2005) + + 15 May 2005; Jan Brinkmann <luckyduck@gentoo.org> + -tomcat-5.0.27-r5.ebuild, +tomcat-5.0.27-r6.ebuild, + tomcat-5.0.28-r3.ebuild: + fixed problem with userpriv, see #92663. default shutdown password now gets + replaced with a random one, see #92281 *tomcat-5.0.28-r3 (14 May 2005) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 15698941d120..68dcace74326 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 65da85ab9720d9a3b9089a24676d8441 tomcat-5.0.28-r3.ebuild 9894 -MD5 f1fe88bfc0fcd20ac959642431e6ffc7 tomcat-5.0.27-r5.ebuild 3756 -MD5 c77c73dbbeddd8c2d2d25697426186ab ChangeLog 15987 +MD5 8add2becf47049a1a6ff73fda03fd016 tomcat-5.0.28-r3.ebuild 9861 +MD5 918871e43d382090d5e2ee937cad8271 tomcat-5.0.27-r6.ebuild 3931 +MD5 7670dd3b97403f58799b2ffd5ad0fc8a ChangeLog 16273 MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555 -MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r5 75 +MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r6 75 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r3 78 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463 MD5 38c130772e7d43dcdff78b3d94f96efd files/5.0.27/tomcat.env 27 @@ -23,7 +23,7 @@ MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFChiPC06ebR+OMO78RAhARAJ4k6V3rjXtmgmfkBFwEHkJcfcZNVwCeP+X3 -VWGU7cbvKwP0cWBvQucAWUo= -=WeIz +iD8DBQFCh2yc06ebR+OMO78RAlRGAJ9g7YkpRS1iohlEgyXNOpyJVlvqTwCeJjYV +M+RVCxdtEpHA2RNjG/oTvyg= +=HEUu -----END PGP SIGNATURE----- diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.27-r5 b/www-servers/tomcat/files/digest-tomcat-5.0.27-r6 index f96d1cd9d33a..f96d1cd9d33a 100644 --- a/www-servers/tomcat/files/digest-tomcat-5.0.27-r5 +++ b/www-servers/tomcat/files/digest-tomcat-5.0.27-r6 diff --git a/www-servers/tomcat/tomcat-5.0.27-r5.ebuild b/www-servers/tomcat/tomcat-5.0.27-r6.ebuild index d889c8ba9222..4edb346d5061 100644 --- a/www-servers/tomcat/tomcat-5.0.27-r5.ebuild +++ b/www-servers/tomcat/tomcat-5.0.27-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.27-r5.ebuild,v 1.1 2005/04/13 18:22:59 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.27-r6.ebuild,v 1.1 2005/05/15 15:36:37 luckyduck Exp $ inherit eutils @@ -50,6 +50,10 @@ src_install() { # we don't want DOS related things rm -f bin/*.{bat,exe} + # replace the default pw with a random one, see #92281 + local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) + sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml + mv conf/* ${D}/etc/${TOMCAT_NAME} mv bin common server shared temp work ${D}${TOMCAT_HOME} keepdir ${TOMCAT_HOME}/{work,temp} diff --git a/www-servers/tomcat/tomcat-5.0.28-r3.ebuild b/www-servers/tomcat/tomcat-5.0.28-r3.ebuild index 07b6f8246124..5792f0377ac1 100644 --- a/www-servers/tomcat/tomcat-5.0.28-r3.ebuild +++ b/www-servers/tomcat/tomcat-5.0.28-r3.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-r3.ebuild,v 1.1 2005/05/14 16:13:34 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r3.ebuild,v 1.2 2005/05/15 15:36:37 luckyduck Exp $ inherit eutils java-pkg @@ -131,14 +131,20 @@ src_install() { fi # create dir structure - dodir /usr/share/${TOMCAT_NAME} diropts -m750 + dodir /usr/share/${TOMCAT_NAME} + chown root:tomcat ${D}/usr/share/${TOMCAT_NAME} dodir /var/log/${TOMCAT_NAME}/default + chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME} dodir /etc/${TOMCAT_NAME}/default/ + chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME} dodir /var/tmp/${TOMCAT_NAME}/default + chown -R tomcat:tomcat ${D}/var/tmp/${TOMCAT_NAME} dodir /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/ @@ -156,7 +162,7 @@ src_install() { conf/Catalina/localhost # make the jars available via java-config -p and jar-from, etc - base=`pwd` + base=$(pwd) libdirs="common/lib server/lib" for dir in ${libdirs} do @@ -168,12 +174,13 @@ src_install() { if [ ! -L ${jar} ]; then java-pkg_dojar ${jar} rm -f ${jar} - ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar} + ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar} fi done cd ${base} done + chown -R root:tomcat ${D}/usr/share/${TOMCAT_NAME} # replace a packed struts.jar cd server/webapps/admin/WEB-INF/lib @@ -181,15 +188,20 @@ src_install() { java-pkg_jar-from struts struts.jar cd ${base} - # copy over the directories - cp -ra conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf" - cp -ra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy" + # replace the default pw with a random one, see #92281 + local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) + sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml + + # copy over the directories + chown -R root:tomcat conf/ bin/ common/ server/ shared/ + cp -pra conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf" + cp -pra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy" # if the useflag is set, copy over the examples dodir /var/lib/${TOMCAT_NAME}/default/webapps if use examples; then - cp ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt - cp -r webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \ + cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt + cp -pr webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \ ${D}/var/lib/${TOMCAT_NAME}/default/webapps fi @@ -207,13 +219,6 @@ src_install() { pkg_preinst() { enewgroup tomcat enewuser tomcat -1 -1 /dev/null tomcat - - chown -R root:tomcat ${D}/usr/share/${TOMCAT_NAME} - chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME} - chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME} - chown -R tomcat:tomcat ${D}/var/tmp/${TOMCAT_NAME} - chown -R tomcat:tomcat ${D}/var/run/${TOMCAT_NAME} - chown -R tomcat:tomcat ${D}/var/lib/${TOMCAT_NAME} } pkg_postinst() { @@ -221,15 +226,6 @@ pkg_postinst() { chown root:root /etc/init.d/${TOMCAT_NAME} chown root:root /etc/conf.d/${TOMCAT_NAME} - # These directories contain the runtime files and - # are therefor owned by tomcat - chown -R tomcat:tomcat /etc/${TOMCAT_NAME} - chown -R tomcat:tomcat /var/log/${TOMCAT_NAME} - chown -R tomcat:tomcat /var/tmp/${TOMCAT_NAME} - chown -R tomcat:tomcat /var/run/${TOMCAT_NAME} - chown -R tomcat:tomcat /var/lib/${TOMCAT_NAME} - - chmod 750 /etc/${TOMCAT_NAME} einfo " " |