From 370ccd9e64bff57fdcf7fdec18831a9c0aa64957 Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Tue, 17 May 2005 19:16:23 +0000 Subject: permission changes (Portage version: 2.0.51.19) --- www-servers/tomcat/ChangeLog | 5 ++- www-servers/tomcat/Manifest | 14 +------ www-servers/tomcat/tomcat-5.0.28-r3.ebuild | 62 ++++++++++++++---------------- 3 files changed, 35 insertions(+), 46 deletions(-) (limited to 'www-servers/tomcat') diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 9dd4673c4825..02f7e9847045 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,9 @@ # 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.30 2005/05/15 15:36:37 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.31 2005/05/17 19:16:23 luckyduck Exp $ + + 17 May 2005; Jan Brinkmann tomcat-5.0.28-r3.ebuild: + permission changes *tomcat-5.0.27-r6 (15 May 2005) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 68dcace74326..e9f8e9a7a44f 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,9 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8add2becf47049a1a6ff73fda03fd016 tomcat-5.0.28-r3.ebuild 9861 +MD5 5e3c627d75495f80b174ef7818c4d871 tomcat-5.0.28-r3.ebuild 9573 MD5 918871e43d382090d5e2ee937cad8271 tomcat-5.0.27-r6.ebuild 3931 -MD5 7670dd3b97403f58799b2ffd5ad0fc8a ChangeLog 16273 +MD5 af012df79f2dd0fc1b8a3bf75d7f3f04 ChangeLog 16372 MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r6 75 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r3 78 @@ -20,10 +17,3 @@ MD5 d538c7caef4b5cecd6cc95ee1988bace files/5.0.28/tomcat.conf 2652 MD5 c0d89ffb4276e8a6d0cf08fcad6517f9 files/5.0.28/tomcat.init 701 MD5 744a9ce174144fc5689c1fabee527e55 files/5.0.28/build.xml-02.patch 3177 MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCh2yc06ebR+OMO78RAlRGAJ9g7YkpRS1iohlEgyXNOpyJVlvqTwCeJjYV -M+RVCxdtEpHA2RNjG/oTvyg= -=HEUu ------END PGP SIGNATURE----- diff --git a/www-servers/tomcat/tomcat-5.0.28-r3.ebuild b/www-servers/tomcat/tomcat-5.0.28-r3.ebuild index 5792f0377ac1..b5c543d8758e 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.2 2005/05/15 15:36:37 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r3.ebuild,v 1.3 2005/05/17 19:16:23 luckyduck Exp $ inherit eutils java-pkg @@ -12,32 +12,32 @@ HOMEPAGE="http://jakarta.apache.org/tomcat" KEYWORDS="~x86 ~amd64 -ppc64 ~sparc" LICENSE="Apache-2.0" DEPEND="sys-apps/sed - >=virtual/jdk-1.4 - ${RDEPEND}" + >=virtual/jdk-1.4 + dev-java/ant" RDEPEND=">=virtual/jdk-1.4 - =dev-java/commons-beanutils-1.7* - >=dev-java/commons-collections-3.1 - >=dev-java/commons-daemon-1.0 - >=dev-java/commons-dbcp-1.2.1 - >=dev-java/commons-digester-1.5 - >=dev-java/commons-fileupload-1.0 - =dev-java/commons-httpclient-2* - >=dev-java/commons-el-1.0 - >=dev-java/commons-launcher-0.9 - >=dev-java/commons-logging-1.0.4 - >=dev-java/commons-modeler-1.1 - >=dev-java/commons-pool-1.2 - ~dev-java/jaxen-1.0 - >=dev-java/junit-3.8.1 - dev-java/jmx - >=dev-java/log4j-1.2.8 - =dev-java/jakarta-regexp-1.3* - >=dev-java/saxpath-1.0 - ~dev-java/servletapi-2.4 - =dev-java/struts-1.1* - dev-java/sun-jaf-bin - >=dev-java/xerces-2.6.2-r1 - jikes? ( dev-java/jikes )" + =dev-java/commons-beanutils-1.7* + >=dev-java/commons-collections-3.1 + >=dev-java/commons-daemon-1.0 + >=dev-java/commons-dbcp-1.2.1 + >=dev-java/commons-digester-1.5 + >=dev-java/commons-fileupload-1.0 + =dev-java/commons-httpclient-2* + >=dev-java/commons-el-1.0 + >=dev-java/commons-launcher-0.9 + >=dev-java/commons-logging-1.0.4 + >=dev-java/commons-modeler-1.1 + >=dev-java/commons-pool-1.2 + ~dev-java/jaxen-1.0 + >=dev-java/junit-3.8.1 + dev-java/jmx + >=dev-java/log4j-1.2.8 + =dev-java/jakarta-regexp-1.3* + >=dev-java/saxpath-1.0 + ~dev-java/servletapi-2.4 + =dev-java/struts-1.1* + dev-java/sun-jaf-bin + >=dev-java/xerces-2.6.2-r1 + jikes? ( dev-java/jikes )" IUSE="doc examples jikes" S=${WORKDIR}/jakarta-${P}-src @@ -131,9 +131,8 @@ src_install() { fi # create dir structure - diropts -m750 + diropts -m755 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} @@ -180,7 +179,6 @@ src_install() { cd ${base} done - chown -R root:tomcat ${D}/usr/share/${TOMCAT_NAME} # replace a packed struts.jar cd server/webapps/admin/WEB-INF/lib @@ -193,12 +191,12 @@ src_install() { 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 + 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} \ @@ -226,7 +224,7 @@ pkg_postinst() { chown root:root /etc/init.d/${TOMCAT_NAME} chown root:root /etc/conf.d/${TOMCAT_NAME} - chmod 750 /etc/${TOMCAT_NAME} + chmod -R 750 /etc/${TOMCAT_NAME} einfo " " einfo " NOTICE!" @@ -248,8 +246,6 @@ pkg_postinst() { ewarn " If you are upgrading from older ebuild do NOT use" ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably" ewarn " want to remove these. " - ewarn " A version number has been appended so that tomcat 3, 4 and 5" - ewarn " can be installed side by side" einfo " " ewarn " This ebuild implements a new filesystem layout for tomcat" ewarn " please read http://gentoo-wiki.com/Tomcat_Gentoo_ebuild for" -- cgit v1.2.3-65-gdbad