diff options
Diffstat (limited to 'dev-java/commons-fileupload')
5 files changed, 140 insertions, 3 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/Manifest b/dev-java/commons-fileupload/Manifest index b1037266bbd2..10dc7ae542ec 100644 --- a/dev-java/commons-fileupload/Manifest +++ b/dev-java/commons-fileupload/Manifest @@ -1,7 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX 0001-Remove-bogous-manifest-entry.patch 744 SHA256 fe4db687d9104c1f0c9c1a5da4ea7394bc87853a0f896dc2c2b22546888b0189 SHA512 a952ea640ca36fd4e4f2fdf13053d4487a88bb5bc95a70909f8202d46dba1cca0d2aacab6d6fbcf3cf8dbc6cd9b3e7b7085963d4ab9b7bb31267a63a5c037db0 WHIRLPOOL 9aeacadc54fa4da49376f5326409ef01b208dc8e45033617530f3d19060446dcdf43278ce0921b6d24acaa7ab7878f0974e7bddb86d8216594315ae5c2717621 +AUX 0002-Fix-running-tests.patch 736 SHA256 a46fdaa94c18fe6fbc7a03342b54bfdec4cb85a5e067bb1c997880f4b20d50b4 SHA512 c29c2c7d67214b940700cc50905fe879791c451686343a3a52fd840c95d8210663bf667548207d61d53b9967187ca468fa2dc439b56edc6bc137ce0c955fe289 WHIRLPOOL 7bb8bf4a47178de4d7b2c6415c3032cf93d49dca0f8835e2e57454a34a0a4539859fa3d55a8afe67abb1623040736dbf6a782fc9fa91680922c212eb5a5f0c57 AUX commons-fileupload-1.2.1-gentoo.patch 1602 SHA256 a01aaadf74351bbdc35cd5dad1d85ef0708c8d0b6c89d1db9c535a2d15067dd2 SHA512 d4fab740f5ba25c75b3225e270640c40028fe9ecee014580a1e4716b8dba373b8f1ce02fd7723dbe0d755d233532d4c0edff7859dacbefd53df2c15fc27a7720 WHIRLPOOL 0465fbf9cc2095429c63b99af5bf30253b7a7d374031cdc87788bd6dfc9da0a0aa8f9597c39076ff833894fa448a1daada470d8ac482511625a78a40faaa60a6 DIST commons-fileupload-1.2.1-src.tar.gz 149613 SHA256 08905cb3a0db4f7fa67f3b579b2c481060334d50d7f913c6974c7513243152f5 SHA512 54f75d55ce73a431391ef2071232b18fb1223a566b918b09945878aa1e4cadbd1acb862b3e5d19b74ae3888719cfd785dbb1be494ca4bf03a99a75a22d52a2b7 WHIRLPOOL a4a77f934579d4cdb29f29d4ac5b4a63cccb102de2e2aac2f7aa6fa8f587ea36e19cbbed4bba2546e3426883118b3e41cce81180fcadc78bbfee9b41de4c6855 DIST commons-fileupload-1.2.2-src.tar.gz 123220 SHA256 2f994b054b6514edd8d1bfe239db1dae5b7e581554d7c027c09d1b3afd832738 SHA512 e17e357079a2d985f2b6a6949619b7aa3686ff00817e092ccfa605000e3e2006e9a5c52df8b38bf8799c5711e7ad45386a8dc8c4f139ffc338a68ba540ac1637 WHIRLPOOL d6d1777d2540c0af83ba485aa9391acf7991cf10f7ae1dcc052c5b191498e2d9d1511b6d3ff9f13d4b970c5a21b259d7eaa2fa306d6a1bfc0a46c4b8b9421486 +DIST commons-fileupload-1.3-src.tar.gz 137105 SHA256 4bf3bfbaf7c25bbe6d0e2dc6a47479e16d42ec1b0365037ed508eeac276e8dc5 SHA512 dbaaef89eb8b4be3555f0736919234b42217e8b6a021dcd99c11d18462b39b10ba92e25bafda51d1b1fcc306c9becf3fb124d03debb66922ab5442197f6360d2 WHIRLPOOL 37803f31084977e4d58d4ea67a7e50de7a0c9988f6787e7e296e95678d94b05b502e36196d5e6af420e3fde0e3a11d94d9b5e2e2781c06d0f04130f9418ca6b1 EBUILD commons-fileupload-1.2.1-r1.ebuild 1347 SHA256 2dee3fab571119b3518972cad00004805c71b35104cc65bd0473207559804c57 SHA512 05a3002627334d6ca3743e7163c36a2c9ce664cad0d8c0050427beb2cb2e2ce512935b5ae0fce0f769af873f07da0b18a7ff0f2ab25d09a2bbc9bade5bfaa6f8 WHIRLPOOL 6258e6a8dabe3671728788ccf541bc791dedba38f60e470af0a2d8e3868cc4a36423e9dacab9dc78b6694bc5ef17156af114eaa4e822129e38ea8bb526559ae6 EBUILD commons-fileupload-1.2.2.ebuild 1581 SHA256 0b0ec873724f9764bba03f21961f8bd994f456827527009407f3d34bf95728e0 SHA512 5d5e4bc180716eead222319415c7a3d5de211799f8a6d896660390e15c7a5c79a804027e69fd240b3203f9b209c109fe16772269c4d150a379467c4049c06417 WHIRLPOOL 1131f1c41d0939edc8ad72fe4a252e503b017773f52a91b4f60d84cf4b81cbce820aa6349786f28c34d6b0b618c6a1f179d6fa11cf4dc0a38fb7d9faabc14e1f -MISC ChangeLog 9265 SHA256 b3c166dbb1ce5415bdc48b844d4564c29473641868412722ba829be5f6bc500b SHA512 5d3346748a5add622270885c5c55b0fb55c0960377cce676db82cdd0b25ef6434ae12654e613ff3b7617c3e6a4dda30571fe79970f71e56f27a765cd6223c657 WHIRLPOOL 3b696acce14b90e0b5a133f95bfe7dd2d09d5522b4e7cb0255332cc888bf5f1d5f35ac84a777a765e4d51d6469f51be7d5d14f49e00899f4758dd822c902b749 +EBUILD commons-fileupload-1.3.ebuild 1482 SHA256 9d70f8823a8faee375c930aecfbf4d2680bcaf1aa9736c73f0c4aa84fd6bfc91 SHA512 e64d5653a6f51560f168a61571907cc851edf70267c6cb70c8b4bbdde0caf98387d1a5850a75caf9c8c27f86a1d719087fdbc5e241528ca58a7f5eb909cca077 WHIRLPOOL 1bb4602695ac7c23f4495092824f1f1f5ac92b035c68108bde21fabca1c3bcdcdf879d58b958a1dec09b5d5ff05cf84a0fbd153732a863115b3ca6c3e44c543f +MISC ChangeLog 9502 SHA256 d9adbefb94bfa6132376ad7d68e35886102da460fd301ff8b2865619ca2949a4 SHA512 9c9b1e6ca3d6270caa7bd15ad1d4ca16b3610a7a5ff6d704a51c1744cb4666a7bdf46134513f8381a3011144f9e2b5a058b0245862d4d5d2930790ba827b7802 WHIRLPOOL 0a1e471d56a4f50b1504b9292ddc7c3ed186e23dee378a3d5d9d8788bf971903799b3aae33741c726e6335cfba74ba96c5112ce3ba63c09d163f85929e33f373 MISC metadata.xml 671 SHA256 5e208644d6c279e798b5991dff81a225dbb4408ec4eda8b6720b7e8c39e82739 SHA512 d970823838f73124052be599ea2133431bc225337fca9fbdb0823a8915d1464100f72677083c07052b0feca679e4dbf0c15acc29c8e1899f9f063b970b46cac5 WHIRLPOOL c539d6bbcf447a1aafd7c10243d5c8064e054703f1c55e10fadbe211b4c79e452eff9ce1c7fde3068a60114c06c1075cc6b6aa57155383c2e951a01370afca3e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJRclQjAAoJELjwI6Q8XPdamMkIAILX3UtJKNvX0q8YnUSy6GWh +yVHVZzallaEJUtIFTdAnyrqCuIxFtpMOjyWRybXzIzfDGJ3ZvG8kLhAStr/kC9Se ++vsGBr8m2mAnFMlRaUYFu91JTN/mNV14Ot7mQTJL6zZ/XcjtEyssA/rXcM6W8yxG +oSmIOHUfln+xyIIkepN2k+lH+pu8NLiH2kxrpTgeChFwMrUKonhP+tCHoUmgEPBh +0sLF349ggWQGyOfwASSl+6/j9sS5klSV1ZFgP8woyZMcUPIxwVZqieCYdtan7+9V +mxIsi4m57YhB61/aWI1ya8fNzPkAw0acugACWyV0yOhb+UxXN2SyGHpQl8LZJOE= +=Qj21 +-----END PGP SIGNATURE----- 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 + |