Version bump fixing securitiy bug #262107 reported by Alex Legler <a3li@gentoo.org>

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 72 insertions, 58 deletions

diff --git a/dev-java/echo2/ChangeLog b/dev-java/echo2/ChangeLog
index 056588975a2d..7675eecfd9b0 100644
--- a/dev-java/echo2/ChangeLog
+++ b/dev-java/echo2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/echo2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/echo2/ChangeLog,v 1.5 2007/08/11 21:49:32 nelchael Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/echo2/ChangeLog,v 1.6 2009/04/22 19:43:17 serkan Exp $
+
+*echo2-2.1.1 (22 Apr 2009)
+
+  22 Apr 2009; Serkan Kaba <serkan@gentoo.org> -echo2-2.0.0.ebuild,
+  +echo2-2.1.1.ebuild:
+  Version bump fixing securitiy bug #262107 reported by Alex Legler
+  <a3li@gentoo.org>
 
   11 Aug 2007; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml:
   Remove myself from <maintainer>.
diff --git a/dev-java/echo2/Manifest b/dev-java/echo2/Manifest
index 26de92b71cb2..4c8b78ddb9b1 100644
--- a/dev-java/echo2/Manifest
+++ b/dev-java/echo2/Manifest
@@ -1,4 +1,14 @@
-DIST NextApp_Echo2-2.0.0.tgz 4330345 RMD160 a4061b7792524381a17e3b91240bdedf3adb521b SHA1 c9f2c27a6d0845123cb32b8151dbb2579f11b00a SHA256 9509c400e3b87714e65270658cbc1da2c417e141a2bb8b6369d244004dd0ed8f
-EBUILD echo2-2.0.0.ebuild 1283 RMD160 159cb54e8e977025c6eb9e3e4c96c463d5afa5f5 SHA1 a558aedaaf8d9a912e986047745b20b44b147765 SHA256 90ac2fa70df0abd6b4c33aeed43b08f6bb904918728bfe6ef57f4b698836ed11
-MISC ChangeLog 831 RMD160 42e50fbea9b1226f4a4b33726abbe1a2c12db825 SHA1 33ad604d8a5234ae90f7575b2c3966496537899f SHA256 3f4a0ccd375b8998bde4b43c5692720fed7c4d046a6c4202f200467cefa9fb84
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST NextApp_Echo2-2.1.1.tgz 5372814 RMD160 a575e9bed18b81d04192905d14de677061f97ebd SHA1 04324a86555e77c7bbd26849d34fe782360e82cf SHA256 73c0325d019a7df92270c0f3eebef07c2a4fa42a58e588d3bb2cfbd7c1869ce2
+EBUILD echo2-2.1.1.ebuild 1267 RMD160 975c81c9730fb9797e9ba60f974ae9d2c2a99318 SHA1 714bee4c731e56dbfd38e73d4180255a97512bf3 SHA256 b5443b70b6e1b2e1fe7913f4a6a32585747db3761868345515fd7f4d8e6ef444
+MISC ChangeLog 1037 RMD160 479c1eb4a41b4b5cd1611f7a7232170fa68f86c8 SHA1 ce4be29fdd80e3676bb07e58b28725c3fe24ef9d SHA256 52eb9f1f5167bb60e0682727c80e809e0bee0f64dd505eb546a617372c272dbd
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknvc1sACgkQRh6X64ivZaIKxgCfatnkSrGkwBE5jHR9I+Op2s1e
+aT0An3Mq0+TsuHp0JnuFo/kot3rQhONo
+=3mU5
+-----END PGP SIGNATURE-----
diff --git a/dev-java/echo2/echo2-2.0.0.ebuild b/dev-java/echo2/echo2-2.0.0.ebuild
deleted file mode 100644
index 8f5297ccbb93..000000000000
--- a/dev-java/echo2/echo2-2.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/echo2/echo2-2.0.0.ebuild,v 1.5 2007/07/11 19:58:37 mr_bones_ Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Echo2 is the next-generation of the Echo Web Framework"
-HOMEPAGE="http://www.nextapp.com/platform/echo2/echo/"
-
-# NextApp uses broken file naming, all versions of Echo2
-# are named NextApp_Echo2.tgz. So you have manually put this to the mirrors
-# DOWNLOAD_URI="http://www.nextapp.com/downloads/echo2/${PV}/NextApp_Echo2.tgz"
-
-SRC_URI="mirror://gentoo/NextApp_Echo2-${PV}.tgz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/servletapi-2.4"
-
-S="${WORKDIR}/NextApp_Echo2/"
-
-src_compile() {
-
-	export SERVLET_LIB_JAR=$(java-config -p servletapi-2.4)
-	cd "${S}/SourceCode"
-	eant dist || die "ant failed"
-
-}
-
-src_install() {
-
-	java-pkg_dojar ${S}/SourceCode/dist/lib/*.jar
-
-	use doc && {
-
-		cd "${S}/Documentation"
-		java-pkg_dohtml -r api
-
-	}
-
-	java-pkg_dohtml "${S}/Documentation/index.html"
-	java-pkg_dohtml -r "${S}/Documentation/images"
-
-	use source && java-pkg_dosrc "${S}/SourceCode/src"
-
-	dodoc "${S}/readme.txt"
-
-}
diff --git a/dev-java/echo2/echo2-2.1.1.ebuild b/dev-java/echo2/echo2-2.1.1.ebuild
new file mode 100644
index 000000000000..4a4cf30f6213
--- /dev/null
+++ b/dev-java/echo2/echo2-2.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/echo2/echo2-2.1.1.ebuild,v 1.1 2009/04/22 19:43:17 serkan Exp $
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+MY_PN="NextApp_Echo2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Echo2 is the next-generation of the Echo Web Framework"
+HOMEPAGE="http://www.nextapp.com/platform/echo2/echo/"
+SRC_URI="http://download.nextapp.com/downloads/echo2/${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="2.1"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEP="java-virtuals/servlet-api:2.4"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_PN}/
+
+java_prepare() {
+	rm -rfv BinaryLibraries || die
+	echo "servlet.lib.jar=$(java-pkg_getjars servlet-api-2.4)" >> SourceCode/ant.properties || die
+}
+
+src_compile() {
+	cd SourceCode || die
+	eant dist $(use_doc doc.public)
+}
+
+src_install() {
+	java-pkg_dojar SourceCode/dist/lib/*.jar
+	use doc && {
+		cp Documentation/api/public/*.html SourceCode/javadoc/public
+		java-pkg_dojavadoc SourceCode/javadoc/public
+	}
+	use source && java-pkg_dosrc SourceCode/src
+	dodoc ReadMe.txt || die "dodoc failed"
+}