* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-6.0.26.ebuild
@ 2010-03-29 21:40 Markus Meier (maekke)
0 siblings, 0 replies; 6+ messages in thread
From: Markus Meier (maekke) @ 2010-03-29 21:40 UTC (permalink / raw
To: gentoo-commits
maekke 10/03/29 21:40:34
Modified: ChangeLog tomcat-6.0.26.ebuild
Log:
amd64 stable, bug #303719
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.228 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.228&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.228&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.227&r2=1.228
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- ChangeLog 29 Mar 2010 13:58:42 -0000 1.227
+++ ChangeLog 29 Mar 2010 21:40:34 -0000 1.228
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.227 2010/03/29 13:58:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.228 2010/03/29 21:40:34 maekke Exp $
+
+ 29 Mar 2010; Markus Meier <maekke@gentoo.org> tomcat-6.0.26.ebuild:
+ amd64 stable, bug #303719
29 Mar 2010; Christian Faulhammer <fauli@gentoo.org> tomcat-6.0.26.ebuild:
stable x86, security bug 303719
1.5 www-servers/tomcat/tomcat-6.0.26.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?r1=1.4&r2=1.5
Index: tomcat-6.0.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat-6.0.26.ebuild 29 Mar 2010 13:58:42 -0000 1.4
+++ tomcat-6.0.26.ebuild 29 Mar 2010 21:40:34 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.4 2010/03/29 13:58:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.5 2010/03/29 21:40:34 maekke Exp $
EAPI=2
JAVA_PKG_IUSE="doc examples source test"
@@ -14,7 +14,7 @@
SLOT="6"
SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
LICENSE="Apache-2.0"
IUSE=""
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-6.0.26.ebuild
@ 2010-04-10 21:17 Vlastimil Babka (caster)
0 siblings, 0 replies; 6+ messages in thread
From: Vlastimil Babka (caster) @ 2010-04-10 21:17 UTC (permalink / raw
To: gentoo-commits
caster 10/04/10 21:17:30
Modified: ChangeLog tomcat-6.0.26.ebuild
Log:
Always use ecj to compile on amd64 to prevent insufficient heap, fixes bug #312293.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.229 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.229&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.229&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.228&r2=1.229
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- ChangeLog 29 Mar 2010 21:40:34 -0000 1.228
+++ ChangeLog 10 Apr 2010 21:17:30 -0000 1.229
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.228 2010/03/29 21:40:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.229 2010/04/10 21:17:30 caster Exp $
+
+ 10 Apr 2010; Vlastimil Babka <caster@gentoo.org> tomcat-6.0.26.ebuild:
+ Always use ecj to compile on amd64 to prevent insufficient heap, fixes bug
+ #312293.
29 Mar 2010; Markus Meier <maekke@gentoo.org> tomcat-6.0.26.ebuild:
amd64 stable, bug #303719
1.6 www-servers/tomcat/tomcat-6.0.26.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?r1=1.5&r2=1.6
Index: tomcat-6.0.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat-6.0.26.ebuild 29 Mar 2010 21:40:34 -0000 1.5
+++ tomcat-6.0.26.ebuild 10 Apr 2010 21:17:30 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.5 2010/03/29 21:40:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.6 2010/04/10 21:17:30 caster Exp $
EAPI=2
JAVA_PKG_IUSE="doc examples source test"
@@ -66,8 +66,8 @@
java_prepare() {
rm -v webapps/examples/WEB-INF/lib/*.jar || die
- # bug # 178980
- if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then
+ # bug # 178980 and #312293
+ if use amd64; then
java-pkg_force-compiler ecj-3.3
fi
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-6.0.26.ebuild
@ 2010-03-29 13:58 Christian Faulhammer (fauli)
0 siblings, 0 replies; 6+ messages in thread
From: Christian Faulhammer (fauli) @ 2010-03-29 13:58 UTC (permalink / raw
To: gentoo-commits
fauli 10/03/29 13:58:42
Modified: ChangeLog tomcat-6.0.26.ebuild
Log:
stable x86, security bug 303719
(Portage version: 2.1.7.17/cvs/Linux i686)
Revision Changes Path
1.227 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.226&r2=1.227
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ChangeLog 26 Mar 2010 15:41:27 -0000 1.226
+++ ChangeLog 29 Mar 2010 13:58:42 -0000 1.227
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.226 2010/03/26 15:41:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.227 2010/03/29 13:58:42 fauli Exp $
+
+ 29 Mar 2010; Christian Faulhammer <fauli@gentoo.org> tomcat-6.0.26.ebuild:
+ stable x86, security bug 303719
26 Mar 2010; Brent Baude <ranger@gentoo.org> tomcat-6.0.26.ebuild:
Marking tomcat-6.0.26 ppc for bug 303719
1.4 www-servers/tomcat/tomcat-6.0.26.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?r1=1.3&r2=1.4
Index: tomcat-6.0.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat-6.0.26.ebuild 26 Mar 2010 15:41:27 -0000 1.3
+++ tomcat-6.0.26.ebuild 29 Mar 2010 13:58:42 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.3 2010/03/26 15:41:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.4 2010/03/29 13:58:42 fauli Exp $
EAPI=2
JAVA_PKG_IUSE="doc examples source test"
@@ -14,7 +14,7 @@
SLOT="6"
SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ppc ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc ppc64 x86 ~x86-fbsd"
LICENSE="Apache-2.0"
IUSE=""
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-6.0.26.ebuild
@ 2010-03-26 15:41 Brent Baude (ranger)
0 siblings, 0 replies; 6+ messages in thread
From: Brent Baude (ranger) @ 2010-03-26 15:41 UTC (permalink / raw
To: gentoo-commits
ranger 10/03/26 15:41:27
Modified: ChangeLog tomcat-6.0.26.ebuild
Log:
Marking tomcat-6.0.26 ppc for bug 303719
(Portage version: 2.1.7.17/cvs/Linux ppc64)
Revision Changes Path
1.226 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.226&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.226&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.225&r2=1.226
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- ChangeLog 26 Mar 2010 15:32:25 -0000 1.225
+++ ChangeLog 26 Mar 2010 15:41:27 -0000 1.226
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.225 2010/03/26 15:32:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.226 2010/03/26 15:41:27 ranger Exp $
+
+ 26 Mar 2010; Brent Baude <ranger@gentoo.org> tomcat-6.0.26.ebuild:
+ Marking tomcat-6.0.26 ppc for bug 303719
26 Mar 2010; Brent Baude <ranger@gentoo.org> tomcat-6.0.26.ebuild:
Marking tomcat-6.0.26 ppc64 for bug 303719
1.3 www-servers/tomcat/tomcat-6.0.26.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?r1=1.2&r2=1.3
Index: tomcat-6.0.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat-6.0.26.ebuild 26 Mar 2010 15:32:25 -0000 1.2
+++ tomcat-6.0.26.ebuild 26 Mar 2010 15:41:27 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.2 2010/03/26 15:32:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.3 2010/03/26 15:41:27 ranger Exp $
EAPI=2
JAVA_PKG_IUSE="doc examples source test"
@@ -14,7 +14,7 @@
SLOT="6"
SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc ppc64 ~x86 ~x86-fbsd"
LICENSE="Apache-2.0"
IUSE=""
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-6.0.26.ebuild
@ 2010-03-26 15:32 Brent Baude (ranger)
0 siblings, 0 replies; 6+ messages in thread
From: Brent Baude (ranger) @ 2010-03-26 15:32 UTC (permalink / raw
To: gentoo-commits
ranger 10/03/26 15:32:25
Modified: ChangeLog tomcat-6.0.26.ebuild
Log:
Marking tomcat-6.0.26 ppc64 for bug 303719
(Portage version: 2.1.7.17/cvs/Linux ppc64)
Revision Changes Path
1.225 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.225&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.225&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.224&r2=1.225
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- ChangeLog 17 Mar 2010 10:10:58 -0000 1.224
+++ ChangeLog 26 Mar 2010 15:32:25 -0000 1.225
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.224 2010/03/17 10:10:58 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.225 2010/03/26 15:32:25 ranger Exp $
+
+ 26 Mar 2010; Brent Baude <ranger@gentoo.org> tomcat-6.0.26.ebuild:
+ Marking tomcat-6.0.26 ppc64 for bug 303719
*tomcat-6.0.26 (16 Mar 2010)
1.2 www-servers/tomcat/tomcat-6.0.26.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?r1=1.1&r2=1.2
Index: tomcat-6.0.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat-6.0.26.ebuild 17 Mar 2010 10:10:58 -0000 1.1
+++ tomcat-6.0.26.ebuild 26 Mar 2010 15:32:25 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.1 2010/03/17 10:10:58 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.2 2010/03/26 15:32:25 ranger Exp $
EAPI=2
JAVA_PKG_IUSE="doc examples source test"
@@ -14,7 +14,7 @@
SLOT="6"
SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ppc64 ~x86 ~x86-fbsd"
LICENSE="Apache-2.0"
IUSE=""
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-6.0.26.ebuild
@ 2010-03-17 10:10 Alistair Bush (ali_bush)
0 siblings, 0 replies; 6+ messages in thread
From: Alistair Bush (ali_bush) @ 2010-03-17 10:10 UTC (permalink / raw
To: gentoo-commits
ali_bush 10/03/17 10:10:59
Modified: ChangeLog
Added: tomcat-6.0.26.ebuild
Log:
Version Bump.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.224 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.224&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.224&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.223&r2=1.224
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- ChangeLog 17 Nov 2009 14:53:52 -0000 1.223
+++ ChangeLog 17 Mar 2010 10:10:58 -0000 1.224
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/tomcat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.223 2009/11/17 14:53:52 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.224 2010/03/17 10:10:58 ali_bush Exp $
+
+*tomcat-6.0.26 (16 Mar 2010)
+
+ 16 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +tomcat-6.0.26.ebuild:
+ Version Bump.
17 Nov 2009; Vlastimil Babka <caster@gentoo.org> -tomcat-5.5.27-r3.ebuild:
Remove old.
1.1 www-servers/tomcat/tomcat-6.0.26.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.1&content-type=text/plain
Index: tomcat-6.0.26.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.1 2010/03/17 10:10:58 ali_bush Exp $
EAPI=2
JAVA_PKG_IUSE="doc examples source test"
WANT_ANT_TASKS="ant-trax"
inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
MY_P="apache-${P}-src"
SLOT="6"
SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
LICENSE="Apache-2.0"
IUSE=""
COMMON_DEPEND="dev-java/eclipse-ecj:3.3
dev-java/ant-eclipse-ecj:3.3
>=dev-java/commons-dbcp-1.2.1
>=dev-java/commons-logging-1.1
>=dev-java/commons-pool-1.2
~dev-java/tomcat-servlet-api-${PV}
examples? ( dev-java/jakarta-jstl )"
RDEPEND=">=virtual/jre-1.5
>=dev-java/commons-daemon-1.0.1
dev-java/ant-core
${COMMON_DEPEND}"
DEPEND=">=virtual/jdk-1.5
${COMMON_DEPEND}
test? ( =dev-java/junit-3.8* )"
S=${WORKDIR}/${MY_P}
TOMCAT_NAME="${PN}-${SLOT}"
TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
# Find out why so
JAVA_ANT_CELEMENT_REWRITER="true"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_NEEDS_TOOLS="true"
EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3"
EANT_BUILD_TARGET="build-only build-jasper-jdt"
EANT_DOC_TARGET="build-docs"
EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV}
-Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
-Dant.jar=ant.jar"
pkg_setup() {
java-pkg-2_pkg_setup
enewgroup tomcat 265
enewuser tomcat 265 -1 /dev/null tomcat
}
java_prepare() {
rm -v webapps/examples/WEB-INF/lib/*.jar || die
# bug # 178980
if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then
java-pkg_force-compiler ecj-3.3
fi
if ! use doc; then
EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
fi
EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
java-pkg_jarfrom --build-only ant-core ant.jar
}
src_install() {
cd "${S}/bin"
rm -f *.bat
chmod 755 *.sh
# register jars per bug #171496
cd "${S}/output/build/lib/"
for jar in *.jar; do
java-pkg_dojar ${jar}
done
local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
# init.d, conf.d
newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
# create dir structure
dodir /usr/share/${TOMCAT_NAME}
diropts -m750 -o tomcat -g tomcat
dodir /etc/${TOMCAT_NAME}
keepdir ${WEBAPPS_DIR}
diropts -m755 -o tomcat -g tomcat
dodir ${CATALINA_BASE}
diropts -m775 -o tomcat -g tomcat
dodir /etc/${TOMCAT_NAME}/Catalina/localhost
keepdir /var/log/${TOMCAT_NAME}/
keepdir /var/run/${TOMCAT_NAME}/
keepdir /var/tmp/${TOMCAT_NAME}/
cd "${S}"
# fix context's so webapps will be deployed
sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml
sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml
# 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.xml
# copy over the directories
chown -R tomcat:tomcat webapps/* conf/*
cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
|| die "failed to copy"
# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
cd "${S}"/webapps || die
ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
if use doc; then
cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
fi
if use examples; then
cd "${S}"/webapps/examples/WEB-INF/lib
java-pkg_jar-from jakarta-jstl jstl.jar
java-pkg_jar-from jakarta-jstl standard.jar
cd "${S}"/webapps
cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
fi
# replace catalina.policy with gentoo specific one bug #176701
# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
# || die "failed to replace catalina.policy"
cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
|| die "failed to copy"
cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
java-pkg_jar-from tomcat-servlet-api-2.5
# symlink the directories to make CATALINA_BASE possible
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
dodoc "${S}"/{RELEASE-NOTES,RUNNING.txt}
fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
#install *.sh scripts bug #278059
exeinto /usr/share/${TOMCAT_NAME}/bin
doexe "${S}"/bin/*.sh
}
pkg_postinst() {
ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
# temp fix for bug #176097
chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
# bug #180519
if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
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."
elog
elog "Installing latest webapp into"
elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
elog
elog "Manager Symbolic Links NOT created."
else
einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
"${ROOT}""${WEBAPPS_DIR}"
# link the manager's context to the right position
dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
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"
elog " for more information."
elog
ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
elog
ewarn "The manager webapps have known exploits, please refer to"
ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
if use examples ; then
ewarn
ewarn "The examples webapp has a known exploit, please refer to"
ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
ewarn
fi
elog
elog " Please report any bugs to http://bugs.gentoo.org/"
elog
}
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-04-10 21:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-29 21:40 [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-6.0.26.ebuild Markus Meier (maekke)
-- strict thread matches above, loose matches on Subject: below --
2010-04-10 21:17 Vlastimil Babka (caster)
2010-03-29 13:58 Christian Faulhammer (fauli)
2010-03-26 15:41 Brent Baude (ranger)
2010-03-26 15:32 Brent Baude (ranger)
2010-03-17 10:10 Alistair Bush (ali_bush)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox