dev-java/jamon: Remove vulnerable 1.01-r3 wrt bug #499330

Package-Manager: portage-2.2.28

diff --git a/dev-java/jamon/Manifest b/dev-java/jamon/Manifest
index ac2fb922e580686953bf698e115491e6f624fc9c..42bf3a45e5382815c7c6650a7b7bc76ab40d4b7c 100644 (file)
--- a/dev-java/jamon/Manifest
+++ b/dev-java/jamon/Manifest
@@ -1,2 +1 @@
-DIST JAMonAll_103005.zip 143825 SHA256 23eceb23264c4643846372c6454f9406d2435aeaf840a183033d9fa50176c9ab SHA512 bb4b7fbd108a0612ceb59486c985f32ffa4c9dd158fe6d6c307357d3ab76c53dfa87ed691295a9de9172744e46c6a01c2ed976d3959834e1665fbbc36dcafb97 WHIRLPOOL 53aa936d313f32e052609173dd94de9bc8b659babcca8af71f4729e646989fb44d25a49f442db792dcb1bde762c40f3b46db69d9c075f659125d233dfdf1e015
 DIST jamonapi-2_81.tar.gz 23149879 SHA256 7b88d90fc284375cb329569570a3c125f41590c95422239aaf661a5260b8004e SHA512 09fba65aec2754f8a1b85dd7f5691b8bae5c4f1c852dd69cddb3642a594bb44baa5b6a3c611657041d6ce2cc37c824a111adeaa929761e3983d43d7080ce05b1 WHIRLPOOL f2f281c491fe80602040086844f64ddbf99ba03334f734c9ad0a3d039903c13480a21f5eaf10acd991c252a589a0f2155d651f7015a7c728d8184125e08a7a15

diff --git a/dev-java/jamon/files/build-1.0.xml b/dev-java/jamon/files/build-1.0.xml
deleted file mode 100644 (file)
index 4153ebf..0000000
--- a/dev-java/jamon/files/build-1.0.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-   @author: Saleem Abdulrasool <compnerd@gentoo.org>
-   @date: 5/9/2005
-   @revision: 1.0_alpha
-
-   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
--->
-
-<project name="Gentoo_Builder" default="jar" basedir=".">
-   <property name="src" value="src"/>
-   <property name="build" value="build"/>
-   <property name="dist" value="dist"/>
-
-   <property name="pkg" value="${package.name}"/>
-   <property name="jar" value="${project.name}.jar"/>
-
-   <!-- Override any defined properties -->
-   <property file="build.properties"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${dist}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <manifest file="${build}/MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-      </manifest>
-   </target>
-   
-   <target name="jar" depends="compile,manifest">
-      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
-         <fileset dir="${build}"/>
-      </jar>
-   </target>
-
-   <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api">
-       <fileset dir="${src}"/>
-      </javadoc>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>

diff --git a/dev-java/jamon/files/jamon-1.01-java1.5.patch b/dev-java/jamon/files/jamon-1.01-java1.5.patch
deleted file mode 100644 (file)
index e7ad896..0000000
--- a/dev-java/jamon/files/jamon-1.01-java1.5.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru Code/com/jamonapi/utils/CommandIterator.java Code-patched/com/jamonapi/utils/CommandIterator.java
---- Code/com/jamonapi/utils/CommandIterator.java       2004-01-29 22:42:34.000000000 -0500
-+++ Code-patched/com/jamonapi/utils/CommandIterator.java       2005-11-04 08:52:30.000000000 -0500
-@@ -38,8 +38,8 @@
-     \r
-     \r
-     /** Iterate through an Enumeration passing the Command object each element in the Collection **/\r
--    public static void iterate(Enumeration enum, Command command)throws Exception     {\r
--        iterate(new EnumIterator(enum) , command);\r
-+    public static void iterate(Enumeration my_enum, Command command)throws Exception     {\r
-+        iterate(new EnumIterator(my_enum) , command);\r
-     }\r
- \r
-     /** Iterate passing each Command each Object that is being iterated **/\r
-diff -ru Code/com/jamonapi/utils/EnumIterator.java Code-patched/com/jamonapi/utils/EnumIterator.java
---- Code/com/jamonapi/utils/EnumIterator.java  2004-01-29 22:42:34.000000000 -0500
-+++ Code-patched/com/jamonapi/utils/EnumIterator.java  2005-11-04 08:52:10.000000000 -0500
-@@ -6,18 +6,18 @@
- \r
- \r
- public class EnumIterator extends java.lang.Object implements java.util.Iterator {\r
--    Enumeration enum;\r
-+    Enumeration my_enum;\r
- \r
--    public EnumIterator(Enumeration enum) {\r
--        this.enum=enum;\r
-+    public EnumIterator(Enumeration my_enum) {\r
-+        this.my_enum=my_enum;\r
-     }\r
-     \r
-     public boolean hasNext() {\r
--        return enum.hasMoreElements();\r
-+        return my_enum.hasMoreElements();\r
-     }\r
-     \r
-     public Object next() {\r
--        return enum.nextElement();\r
-+        return my_enum.nextElement();\r
-     }\r
-     \r
-     public void remove() {\r

diff --git a/dev-java/jamon/jamon-1.01-r3.ebuild b/dev-java/jamon/jamon-1.01-r3.ebuild
deleted file mode 100644 (file)
index 7af9c03..0000000
--- a/dev-java/jamon/jamon-1.01-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="JAMon"
-MY_PV="103005"
-
-DESCRIPTION="Java API to monitor production applications"
-HOMEPAGE="http://www.javaperformancetuning.com/tools/jamon/index.shtml"
-SRC_URI="mirror://sourceforge/jamonapi/${MY_PN}All_${MY_PV}.zip"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.4
-       java-virtuals/servlet-api:2.3"
-
-DEPEND=">=virtual/jdk-1.4
-       app-arch/unzip
-       ${RDEPEND}"
-
-S="${WORKDIR}"
-
-java_prepare() {
-       rm ${MY_PN}.{j,w}ar || die
-
-       epatch "${FILESDIR}"/${P}-java1.5.patch
-
-       mv Code src || die
-
-       # No provided ant script! Bad upstream, bad!
-       cp "${FILESDIR}"/build-1.0.xml build.xml || die
-}
-
-src_compile() {
-       eant jar $(use_doc) \
-               -Dproject.name=${PN} \
-               -Dclasspath=$(java-pkg_getjars servlet-api-2.3)
-}
-
-src_install() {
-       java-pkg_dojar dist/${PN}.jar
-
-       use doc && java-pkg_dojavadoc dist/doc/api
-}