www-servers/tomcat: warning fixes in initd script

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

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 466c1c315f769e9ab54de7e2a02733b88f19100d..df94f81da1ba0e885bad11c1d35d0ed5b56c03ea 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.261 2011/09/07 17:16:21 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.262 2011/10/18 22:27:52 fordfrog Exp $
+
+*tomcat-7.0.21-r1 (18 Oct 2011)
+
+  18 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> files/7/tomcat.init,
+  -tomcat-7.0.21.ebuild, +tomcat-7.0.21-r1.ebuild:
+  Changed opts to extra_commands in initd script (bug #386753). Also replaced
+  deprecated --chuid with --user.
 
   07 Sep 2011; Miroslav Šulc <fordfrog@gentoo.org>
   -files/7/7.0.20-build-xml.patch, -tomcat-7.0.20.ebuild:

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 2cae7e7a413793f27706557b5f34f08d5b10d0c1..d3fe65639e6ac9d4c8fa81c19adf23bcf6a5ee34 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -17,7 +17,7 @@ AUX 7/7.0.21-build-xml.patch 4744 RMD160 3d89056a8325ac7bf40f4b49822aff552e570d6
 AUX 7/build-xml.patch 5561 RMD160 672659e5273a9d6ef450fd29cc171fae56c99c9a SHA1 08714c12a72b1db8490460b10f74d32fc951dacb SHA256 f85ec37d37cc2bceca7877da3271570701a352e087e101e6b3146bdd16f31490
 AUX 7/examples-cal.patch 565 RMD160 85294480f354eb19340bdc7357690ae55ef5a89f SHA1 e9550e02500f2d9da6f4f7b3c7ca79c1934318ea SHA256 caf76c88d3b67d29a7aadca1485accd01270d986e7bc77281a9b30f0b1582b55
 AUX 7/tomcat.conf 2895 RMD160 e0f3b7f72b925a5d681780e1dcdde46143daef48 SHA1 1b94de2c71c046045b5622756d976378678200a3 SHA256 834b38c1e17294ee73c6571a45fb35bc398f15da4ed189e4d359b8b39121bb8e
-AUX 7/tomcat.init 3504 RMD160 7c97ae3f95c9e65656ac3f7eddcfc5e195a1a59a SHA1 275c705140a4e48f27f767bc3d8e721fdc584281 SHA256 c4d50516bafe58d427f02a71dcc04f9d42c4a778e5830cfaee3df0ee2ead8edb
+AUX 7/tomcat.init 3505 RMD160 6fd99e04c94ca5cccd61d4dce4f35fa9f058488f SHA1 1e550da27a648a36eec9a4e3991e77992fdbd7c8 SHA256 9b2eaaadc9ccf25cf56212d3ca0574bba286fef7895c0a56327d5c3d5f98f5d5
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087f6d82e0f111f SHA1 c6217d78d2e64fa839a30372bd2724ba75030c14 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334
 DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3aed43bf66cd2 SHA1 afe0aa87d004a89f4ad314314b17bd4e7222250b SHA256 376a02d4fa56c4bbdc981965e62db74aa6c63fe0f056d9c82b4558013a74a88c
 DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f14681a0fa9924b1 SHA1 0df5e58518607ff738bbf440d829747df6acb9ce SHA256 0d6354d45de39e3593ae8f8e6e1361caaa55835e73838f003000e53c6c7ff73a
@@ -34,6 +34,6 @@ EBUILD tomcat-6.0.29-r1.ebuild 6948 RMD160 d340dad22a80e36a03bdc0614fee97ce9e296
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.32-r2.ebuild 6968 RMD160 756ffd21d60906c47031e0bc202d3fc77b21c868 SHA1 a9339169846af791be4a92c5cda053324eaa923a SHA256 ad9c4ce33cb4d998b3447a106f8a9df76dde19ef28b6dd94163362d0aaff3343
 EBUILD tomcat-6.0.33.ebuild 6965 RMD160 a3221a02424e3960eec38de7db6f89b406501ec3 SHA1 d7b0e9bb92f4aa232594a63c6245f91c291f15a0 SHA256 c361b1795c611f6d97152a24ccf27ccdfc41e008f7ecf9ea87379b559d44aa50
-EBUILD tomcat-7.0.21.ebuild 7147 RMD160 98897b88da50dbdb3c1c0e5edaf839aaa63baab7 SHA1 063922dbae6daa9a815280c09cf19061580f1995 SHA256 9667e82ae693505cf615b4d559ffcdad310058658b75f6f152a23b9f52b286e0
-MISC ChangeLog 65433 RMD160 5bf2a4c191701f238696a98e72988d80b119b1f4 SHA1 70b52a377c8f0214d1b6b3934c049c87fa6ed783 SHA256 c31f6c23c0fab97d6f768f911c72cf5512bf6000ce44661d43693d9acc352ef8
+EBUILD tomcat-7.0.21-r1.ebuild 7150 RMD160 ee721d42438a969cd2fb158e539d3e6a0c0e8f6d SHA1 459260462dfe3d0cf3b3411d421b428790d42027 SHA256 111de68f76a3deddf5d97663c5f5f1e80093b4a79b695b7cbdec93d58f4d0e67
+MISC ChangeLog 65703 RMD160 363e6ea30a78894d117309d4c6abfb594e0ab85f SHA1 4d2563b671d38ed053324e6b8576d617485634e8 SHA256 0dfc4dc37c73316850b7854c7bdaedd93d3e60aa82e93fab1943de3c1ff9634c
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22

diff --git a/www-servers/tomcat/files/7/tomcat.init b/www-servers/tomcat/files/7/tomcat.init
index 9a8f4bba0e00d2adebf38d19b079c56d90cfb2d0..9e623a9dfc1b6b05bb4c9f44f6e468987701f5ec 100644 (file)
--- a/www-servers/tomcat/files/7/tomcat.init
+++ b/www-servers/tomcat/files/7/tomcat.init
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/7/tomcat.init,v 1.1 2010/12/21 09:13:39 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/7/tomcat.init,v 1.2 2011/10/18 22:27:52 fordfrog Exp $
 
-opts="${opts} forcestop"
+extra_commands="forcestop"
 
 init_env_vars() {
        # Populate JAVA_HOME
@@ -44,7 +44,7 @@ ssd() {
        shift
        start-stop-daemon --start --quiet --background \
                --chdir "${CATALINA_TMPDIR}" \
-               --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
+               --user ${CATALINA_USER}:${CATALINA_GROUP} \
                --make-pidfile --pidfile /var/run/tomcat-7.pid \
                --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
        return $?

diff --git a/www-servers/tomcat/tomcat-7.0.21.ebuild b/www-servers/tomcat/tomcat-7.0.21-r1.ebuild
similarity index 99%
rename from www-servers/tomcat/tomcat-7.0.21.ebuild
rename to www-servers/tomcat/tomcat-7.0.21-r1.ebuild
index 16144e3cdc8636a0cbd9b2c8a521d889a5d8e0c6..19227d51969c49a1bc33e448353e6e5cb0023311 100644 (file)
--- a/www-servers/tomcat/tomcat-7.0.21.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.21-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.21.ebuild,v 1.1 2011/09/02 10:50:01 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.21-r1.ebuild,v 1.1 2011/10/18 22:27:52 fordfrog Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"