summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2006-03-11 17:51:21 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2006-03-11 17:51:21 +0000
commitcc11f21c5a9fccf2dd2a5546e3b6643e7217ed6f (patch)
tree047f7ec67025f2d4d942733c934a51e414c1d66c /www-servers
parentRelocate paths only in the scripts that need relocating. Use /bin/bash rather... (diff)
downloadhistorical-cc11f21c5a9fccf2dd2a5546e3b6643e7217ed6f.tar.gz
historical-cc11f21c5a9fccf2dd2a5546e3b6643e7217ed6f.tar.bz2
historical-cc11f21c5a9fccf2dd2a5546e3b6643e7217ed6f.zip
Moved enewgroup and enewuser calls to pkg_setup from src_install for bug #124680.
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog7
-rw-r--r--www-servers/tomcat/Manifest12
-rw-r--r--www-servers/tomcat/tomcat-5.0.28-r12.ebuild11
3 files changed, 19 insertions, 11 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 8e6e77c20833..15aed9f0ff1d 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/tomcat
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.48 2006/03/11 17:38:31 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.49 2006/03/11 17:51:21 betelgeuse Exp $
+
+ 11 Mar 2006; Petteri Räty <betelgeuse@gentoo.org>
+ tomcat-5.0.28-r12.ebuild:
+ Moved enewgroup and enewuser calls to pkg_setup from src_install for bug
+ #124680.
11 Mar 2006; Petteri Räty <betelgeuse@gentoo.org>
tomcat-5.0.27-r6.ebuild, -tomcat-5.0.28-r9.ebuild,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 106eebd92247..3ba04b16ff70 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,6 @@
-MD5 4e1190ad35027f16338bb443ab8da019 ChangeLog 20059
-RMD160 cc6924df79f8fb33d0b7181826de0fc088c4690d ChangeLog 20059
-SHA256 1ab84b1e0977406dcc229ac3273d943e2e262363c676b2e7fc478fbdcc35f107 ChangeLog 20059
+MD5 b2ae6d934ed00dce04b4dad84dd7d4eb ChangeLog 20227
+RMD160 6f6f3611023f273864b1caab3ce68a9ef59e931f ChangeLog 20227
+SHA256 d0a8e14d72b129a6531dd5e3175e81087183b4809cff6bb02fb73f2c50d8f432 ChangeLog 20227
MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc files/5.0.27/gentoo.diff 463
SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401 files/5.0.27/gentoo.diff 463
@@ -61,6 +61,6 @@ SHA256 c8affe406c8353e5ba4a811a2ea2016dfa0626858ef3413dade2a266f78ee82c metadata
MD5 749387e4f40a08f338295901aa1ccd60 tomcat-5.0.27-r6.ebuild 3907
RMD160 470077caf9ebe247c9a19ac69f2f3d4c777202e7 tomcat-5.0.27-r6.ebuild 3907
SHA256 9ca756c1e82f2f8a693a64fa154e58b2ce03f04697ac165d2f8b74374e734f23 tomcat-5.0.27-r6.ebuild 3907
-MD5 3d51b76f10eb0677aa7a31d19aa516e7 tomcat-5.0.28-r12.ebuild 11121
-RMD160 25eceab1e834d841f0ec267ee9c4b87edce16801 tomcat-5.0.28-r12.ebuild 11121
-SHA256 1cdebf04dfd899851fce53715648005dfcf021da36f6bc093307b6d3902440e4 tomcat-5.0.28-r12.ebuild 11121
+MD5 935b85f96588785ea578042c3984ef28 tomcat-5.0.28-r12.ebuild 11138
+RMD160 7e7a04d273cec10955f8db35da0b39d946a3904a tomcat-5.0.28-r12.ebuild 11138
+SHA256 0cbc5ef6348aa322b258bc63c5db3efbaad54ce9d8b8e487bff3599ca55d4cf1 tomcat-5.0.28-r12.ebuild 11138
diff --git a/www-servers/tomcat/tomcat-5.0.28-r12.ebuild b/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
index 5c3229d5cbc4..fd1f507275e6 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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-r12.ebuild,v 1.3 2006/03/11 17:38:31 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r12.ebuild,v 1.4 2006/03/11 17:51:21 betelgeuse Exp $
inherit eutils java-pkg
@@ -49,6 +49,12 @@ TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
TOMCAT_NAME="${PN}-${SLOT}"
WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/default/webapps"
+pkg_setup() {
+ # new user for tomcat
+ enewgroup tomcat
+ enewuser tomcat -1 -1 /dev/null tomcat
+}
+
src_unpack() {
unpack ${A}
cd ${S}
@@ -130,9 +136,6 @@ src_compile(){
}
src_install() {
- # new user for tomcat
- enewgroup tomcat
- enewuser tomcat -1 -1 /dev/null tomcat
cd ${S}/jakarta-tomcat-5/build