Gentoo Archives: gentoo-commits

From: "Alex Legler (a3li)" <a3li@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/struts: struts-1.2.9-r3.ebuild ChangeLog
Date: Mon, 24 Aug 2009 08:12:15
Message-Id: E1MfUey-0007Ky-PH@stork.gentoo.org
1 a3li 09/08/24 08:12:12
2
3 Modified: ChangeLog
4 Added: struts-1.2.9-r3.ebuild
5 Log:
6 Non-maintainer commit: Revbump to fix security bug 267081 (CVE-2008-2025).
7 (Portage version: 2.2_rc33/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.45 dev-java/struts/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?rev=1.45&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?rev=1.45&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?r1=1.44&r2=1.45
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v
19 retrieving revision 1.44
20 retrieving revision 1.45
21 diff -u -r1.44 -r1.45
22 --- ChangeLog 29 Mar 2009 17:03:50 -0000 1.44
23 +++ ChangeLog 24 Aug 2009 08:12:12 -0000 1.45
24 @@ -1,6 +1,12 @@
25 # ChangeLog for dev-java/struts
26 -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.44 2009/03/29 17:03:50 betelgeuse Exp $
28 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.45 2009/08/24 08:12:12 a3li Exp $
30 +
31 +*struts-1.2.9-r3 (24 Aug 2009)
32 +
33 + 24 Aug 2009; Alex Legler <a3li@g.o> +struts-1.2.9-r3.ebuild,
34 + +files/struts-CVE-2008-2025.patch:
35 + Non-maintainer commit: Revbump to fix security bug 267081 (CVE-2008-2025).
36
37 29 Mar 2009; Petteri Räty <betelgeuse@g.o> struts-1.2.9-r2.ebuild:
38 Migrate to EAPI 2 for bug #239835.
39
40
41
42 1.1 dev-java/struts/struts-1.2.9-r3.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/struts-1.2.9-r3.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/struts-1.2.9-r3.ebuild?rev=1.1&content-type=text/plain
46
47 Index: struts-1.2.9-r3.ebuild
48 ===================================================================
49 # Copyright 1999-2009 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r3.ebuild,v 1.1 2009/08/24 08:12:12 a3li Exp $
52
53 EAPI="2"
54 JAVA_PKG_IUSE="doc examples source"
55 WANT_ANT_TASKS="ant-trax"
56
57 inherit java-pkg-2 java-ant-2
58
59 MY_P="${P}-src"
60 DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
61 SRC_URI="mirror://apache/struts/source/${MY_P}.tar.gz"
62 HOMEPAGE="http://jakarta.apache.org/struts/index.html"
63 LICENSE="Apache-2.0"
64 SLOT="1.2"
65 COMMON_DEPS="
66 >=dev-java/antlr-2.7.7:0[java]
67 dev-java/commons-beanutils:1.7
68 >=dev-java/commons-collections-2.1:0
69 >=dev-java/commons-digester-1.5:0
70 >=dev-java/commons-fileupload-1.0:0
71 >=dev-java/commons-logging-1.0.4:0
72 >=dev-java/commons-validator-1.1.4:0
73 dev-java/jakarta-oro:2.0
74 java-virtuals/servlet-api:2.3"
75 RDEPEND=">=virtual/jre-1.4
76 ${COMMON_DEPS}"
77 DEPEND=">=virtual/jdk-1.4
78 ${COMMON_DEPS}"
79 IUSE=""
80 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
81
82 S="${WORKDIR}/${MY_P}"
83
84 src_prepare() {
85 epatch "${FILESDIR}/${PN}-CVE-2008-2025.patch"
86
87 java_prepare
88 }
89
90 java_prepare() {
91 # the build.xml expects this directory to exist
92 mkdir "${S}/lib"
93 cd "${S}/lib"
94
95 # No property exists for this
96 java-pkg_jar-from commons-collections
97 }
98
99 src_compile() {
100 local antflags="compile.library"
101
102 # In the order the build process asks for these
103 # They are copied in the build.xml to ${S}/target/library/
104 antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
105 antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
106 antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
107 antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
108 antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
109 antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
110
111 # Needed to compile
112 antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
113 antflags="${antflags} -Dantlr.jar=$(java-pkg_getjars antlr)"
114
115 # only needed for contrib stuff which we don't currently build
116 # antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
117
118 eant ${antflags} $(use_doc compile.javadoc)
119 }
120
121 src_install() {
122 java-pkg_dojar target/library/${PN}.jar
123
124 #install the tld files
125 insinto /usr/share/${PN}-${SLOT}/lib
126 doins target/library/*.tld
127
128 dodoc README STATUS.txt || die
129 use doc && java-pkg_dohtml -r target/documentation/
130 use examples && java-pkg_doexamples src/example*
131 use source && java-pkg_dosrc src/share/*
132 }