Security bump. #466460

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

4 files changed, 121 insertions, 2 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index d1036d364d84..4406ce2af4cb 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-fileupload
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.66 2012/12/08 15:54:49 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.67 2013/04/20 08:38:45 sera Exp $
+
+*commons-fileupload-1.3 (20 Apr 2013)
+
+  20 Apr 2013; Ralph Sennhauser <sera@gentoo.org>
+  +files/0001-Remove-bogous-manifest-entry.patch,
+  +files/0002-Fix-running-tests.patch, +commons-fileupload-1.3.ebuild:
+  Security bump. #466460
 
   08 Dec 2012; Agostino Sarubbo <ago@gentoo.org>
   commons-fileupload-1.2.2.ebuild:
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
new file mode 100644
index 000000000000..6989b6623c9c
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild,v 1.1 2013/04/20 08:38:45 sera Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Add robust, high-performance, file upload capability to your servlets and web applications."
+HOMEPAGE="http://commons.apache.org/fileupload/"
+SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-io:1
+	dev-java/portletapi:1
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	epatch "${FILESDIR}"/0001-Remove-bogous-manifest-entry.patch
+	epatch "${FILESDIR}"/0002-Fix-running-tests.patch
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="commons-io-1,portletapi-1,servlet-api-2.5"
+EANT_EXTRA_ARGS="-Dlibdir=target/lib"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}-SNAPSHOT.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch b/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch
new file mode 100644
index 000000000000..0c5be867489d
--- /dev/null
+++ b/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch
@@ -0,0 +1,29 @@
+From 88920db784bbb37c1043371548642a9ad529d600 Mon Sep 17 00:00:00 2001
+From: Ralph Sennhauser <sera@gentoo.org>
+Date: Sat, 20 Apr 2013 09:51:46 +0200
+Subject: [PATCH 1/2] Remove bogous manifest entry
+
+---
+ build.xml | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index b207f76..1e18fec 100644
+--- a/build.xml
++++ b/build.xml
+@@ -252,12 +252,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="${commons.manifestfile}" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+-- 
+1.8.1.5
+
diff --git a/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch b/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch
new file mode 100644
index 000000000000..0eb41212cd29
--- /dev/null
+++ b/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch
@@ -0,0 +1,25 @@
+From ec99347a09caeae147c075813543fc839d5b4562 Mon Sep 17 00:00:00 2001
+From: Ralph Sennhauser <sera@gentoo.org>
+Date: Sat, 20 Apr 2013 09:57:06 +0200
+Subject: [PATCH 2/2] Fix running tests
+
+---
+ build.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index 1e18fec..947f325 100644
+--- a/build.xml
++++ b/build.xml
+@@ -172,6 +172,8 @@
+           <include name="**/*Test.java"/>
+           <include name="**/*TestCase.java"/>
+           <exclude name="**/*Abstract*Test.java"/>
++	  <!-- base class without tests violationg naming scheme -->
++          <exclude name="**/FileUploadTestCase.java"/>
+         </fileset>
+       </batchtest>
+       <batchtest todir="${maven.test.reports}" if="test">
+-- 
+1.8.1.5
+