From 5341807fa0ef3c9d5d3583bbed21e66b81245833 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sat, 26 Nov 2005 14:51:16 +0000 Subject: [PATCH] Version bump for security bug #113192. Dropped dependency on commons-lang because struts does not use it any more and on struts-legacy because our ebuild does not build the code using it. Package-Manager: portage-2.0.53_rc7 --- dev-java/struts/ChangeLog | 9 ++- dev-java/struts/Manifest | 20 +++--- dev-java/struts/files/digest-struts-1.2.8 | 1 + dev-java/struts/struts-1.2.8.ebuild | 82 +++++++++++++++++++++++ 4 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 dev-java/struts/files/digest-struts-1.2.8 create mode 100644 dev-java/struts/struts-1.2.8.ebuild diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog index 3361b9d97343..cb449c3e25ef 100644 --- a/dev-java/struts/ChangeLog +++ b/dev-java/struts/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/struts # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.21 2005/09/20 17:52:43 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.22 2005/11/26 14:51:16 betelgeuse Exp $ + +*struts-1.2.8 (26 Nov 2005) + + 26 Nov 2005; Petteri Räty +struts-1.2.8.ebuild: + Version bump for security bug #113192. Dropped dependency on commons-lang + because struts does not use it any more and on struts-legacy because our + ebuild does not build the code using it. *struts-1.2.4-r2 (20 Sep 2005) *struts-1.1-r4 (20 Sep 2005) diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest index 8dad2364963d..9d67ef491764 100644 --- a/dev-java/struts/Manifest +++ b/dev-java/struts/Manifest @@ -1,18 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 82216a9701d748a926f7921b8011a7b4 struts-1.2.4-r2.ebuild 2479 -MD5 865dd397f11b5616702de4e9bf686be5 struts-1.2.2-r2.ebuild 2272 -MD5 b5b442424c993cf043d373bdd35e54dc ChangeLog 3852 -MD5 5cbf8672d927109e52e5dff6dda84c6e struts-1.1-r4.ebuild 2356 -MD5 e99e5c6201a09707b99fd10b6bb25c6e metadata.xml 449 +MD5 30cebea82737eee3180dd490812dc2e4 ChangeLog 4151 +MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r4 75 MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2-r2 77 MD5 762b50289a349b2d9dad8b763f5186a0 files/digest-struts-1.2.4-r2 78 -MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r4 75 +MD5 cff5c944d7af147923a7c75dedca8a2c files/digest-struts-1.2.8 69 +MD5 e99e5c6201a09707b99fd10b6bb25c6e metadata.xml 449 +MD5 5cbf8672d927109e52e5dff6dda84c6e struts-1.1-r4.ebuild 2356 +MD5 865dd397f11b5616702de4e9bf686be5 struts-1.2.2-r2.ebuild 2272 +MD5 82216a9701d748a926f7921b8011a7b4 struts-1.2.4-r2.ebuild 2479 +MD5 82f1e80f468147a4bd88c63995e2c7cd struts-1.2.8.ebuild 2714 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDPkb8/rLF9B432nYRAjawAJ0WMi0rV+aeP4MjLUa20eGnOwvxtACfSj2L -7DfTQfDjH74YiU4asbeM0wU= -=Xpab +iD8DBQFDiHZyQiJ/wx066S4RAhOuAKCaQUH/EnCkbiCaJzy8TAtRC9FbMQCfWnUm +lJvKMFUAKHxLNBJ8eQSiajw= +=cM9p -----END PGP SIGNATURE----- diff --git a/dev-java/struts/files/digest-struts-1.2.8 b/dev-java/struts/files/digest-struts-1.2.8 new file mode 100644 index 000000000000..924fc18f6c9a --- /dev/null +++ b/dev-java/struts/files/digest-struts-1.2.8 @@ -0,0 +1 @@ +MD5 99b90aed5fd29bb06b2b97f70da4b889 struts-1.2.8-src.tar.gz 5747674 diff --git a/dev-java/struts/struts-1.2.8.ebuild b/dev-java/struts/struts-1.2.8.ebuild new file mode 100644 index 000000000000..a00cf65ab9c4 --- /dev/null +++ b/dev-java/struts/struts-1.2.8.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.8.ebuild,v 1.1 2005/11/26 14:51:16 betelgeuse Exp $ + +inherit java-pkg + +MY_P=${P}-src +DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets" +SRC_URI="mirror://apache/struts/source/${MY_P}.tar.gz" +HOMEPAGE="http://jakarta.apache.org/struts/index.html" +LICENSE="Apache-2.0" +SLOT="1.2" +RDEPEND=">=virtual/jre-1.4 + dev-java/antlr + =dev-java/commons-beanutils-1.7* + >=dev-java/commons-collections-2.1 + >=dev-java/commons-digester-1.5 + >=dev-java/commons-fileupload-1.0 + >=dev-java/commons-logging-1.0.4 + ~dev-java/commons-validator-1.1.4 + =dev-java/jakarta-oro-2.0* + =dev-java/servletapi-2.3*" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + >=dev-java/ant-1.6.0 + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" +IUSE="doc examples jikes source" +KEYWORDS="~amd64 ~ppc ~x86" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + + # the build.xml expects this directory to exist + mkdir ${S}/lib + cd ${S}/lib + + # No property exists for this + java-pkg_jar-from commons-collections +} + +src_compile() { + local antflags="compile.library" + use doc && antflags="${antflags} compile.javadoc" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + + # In the order the build process asks for these + # They are copied in the build.xml to ${S}/target/library/ + antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)" + antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)" + antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)" + antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" + antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)" + antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)" + + # Needed to compile + antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)" + antflags="${antflags} -Dantlr.jar=$(java-pkg_getjars antlr)" + + # only needed for contrib stuff which we don't currently build +# antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)" + + ant ${antflags} || die "compile failed" +} + +src_install() { + java-pkg_dojar target/library/struts.jar + + #install the tld files + insinto /usr/share/${PN}-${SLOT}/lib + doins target/library/*.tld + + dodoc README STATUS.txt + use doc && java-pkg_dohtml -r target/documentation/ + if use examples; then + dodir /usr/share/doc/${PF}/examples + cp -r src/example*/* ${D}/usr/share/doc/${PF}/examples + fi + use source && java-pkg_dosrc src/share/* +} -- 2.26.2