[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/
commit: 114672fc1bf0174a8ee16360e8de6b5a090c87de
Author: Patrice Clement gentoo org>
AuthorDate: Fri Apr 26 16:34:28 2019 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Fri Apr 26 16:38:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=114672fc
dev-java/xerces: clean up old
Closes: https://github.com/gentoo/gentoo/pull/11829
Bug: https://bugs.gentoo.org/683350
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Patrice Clement gentoo.org>
Signed-off-by: Georgy Yakovlev gentoo.org>
dev-java/xerces/Manifest | 1 -
.../xerces/files/xerces-2.11.0-build.xml.patch | 46
dev-java/xerces/xerces-2.11.0-r2.ebuild| 61 --
3 files changed, 108 deletions(-)
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 4c869cdd241..ecb391145d4 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,2 +1 @@
-DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B
84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43
SHA512
de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
DIST xerces-2.12.0.jar 2113705 BLAKE2B
4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7
SHA512
21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
diff --git a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
deleted file mode 100644
index 61afcddad9a..000
--- a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Author: Ralph Sennhauser
-
-Don't reference non existing jar in taskdef. #351394
-Don't let user properties leak into build env.
-Don't bundle stuff from xml-commons-external.
-
a/build.xml
-+++ b/build.xml
-@@ -39,18 +39,13 @@ Authors:
-
-
-
--
--
--
--
--
-+
-
-
-
-
-
--
-
-
-
-@@ -247,7 +242,7 @@ Authors:
-
-
--
-+
-
-
- http://xml.apache.org/xerces2-j/index.html;
-SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE=""
-
-# they are missing from the upstream tarball"
-RESTRICT="test"
-
-CDEPEND="
- dev-java/xml-commons-external:1.4
- >=dev-java/xml-commons-resolver-1.2:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- dev-java/xjavac:1"
-
-S="${WORKDIR}/${PN}-${SRC_PV}"
-
-java_prepare() {
- epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_ANT_TASKS="xjavac-1"
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
-EANT_DOC_TARGET="javadocs"
-# known small bug - javadocs use custom taglets, which come as bundled jar in
-# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
-EANT_EXTRA_ARGS="-Dadditional.param="
-
-src_install() {
- java-pkg_dojar build/xercesImpl.jar
-
- dodoc README NOTICE
- dohtml Readme.html
-
- use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/org
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/
commit: 836a2c5ac06a69de6e9354b0a969f50c190b4ba5
Author: Patrice Clement gentoo org>
AuthorDate: Wed Apr 17 19:25:27 2019 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Apr 17 19:28:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836a2c5a
dev-java/xerces: version bump.
* Fetch sources from maven.org.
* Clear QA warnings.
* Switch build process to java-pkg-simple.
* Knock together a patch to add missing overrides in required classes.
* EAPI 6 bump whilst we're at it.
Bug: https://bugs.gentoo.org/683350
Signed-off-by: Patrice Clement gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-java/xerces/Manifest | 1 +
.../xerces/files/xerces-2.12.0-overrides.patch | 66 ++
dev-java/xerces/xerces-2.12.0.ebuild | 47 +++
3 files changed, 114 insertions(+)
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 8cf2dfb6b44..4c869cdd241 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1 +1,2 @@
DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B
84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43
SHA512
de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
+DIST xerces-2.12.0.jar 2113705 BLAKE2B
4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7
SHA512
21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
diff --git a/dev-java/xerces/files/xerces-2.12.0-overrides.patch
b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
new file mode 100644
index 000..2e31002065e
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
@@ -0,0 +1,66 @@
+--- a/org/apache/html/dom/HTMLIFrameElementImpl.java 2019-04-17
18:08:03.187783332 +
b/org/apache/html/dom/HTMLIFrameElementImpl.java 2019-04-17
18:09:38.640274335 +
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;
+
+ import org.w3c.dom.html.HTMLIFrameElement;
++import org.w3c.dom.Document;
+
+ /**
+ * @xerces.internal
+@@ -161,6 +162,11 @@
+ super( owner, name );
+ }
+
++@Override
++public Document getContentDocument()
++{
++return null;
++}
+
+ }
+
+--- a/org/apache/html/dom/HTMLFrameElementImpl.java2019-04-17
19:14:06.833172177 +
b/org/apache/html/dom/HTMLFrameElementImpl.java2019-04-17
19:14:56.755428976 +
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;
+
+ import org.w3c.dom.html.HTMLFrameElement;
++import org.w3c.dom.Document;
+
+ /**
+ * @xerces.internal
+@@ -138,6 +139,11 @@
+ super( owner, name );
+ }
+
++@Override
++public Document getContentDocument()
++{
++return null;
++}
+
+ }
+
+--- a/org/apache/html/dom/HTMLObjectElementImpl.java 2019-04-17
19:17:26.624199895 +
b/org/apache/html/dom/HTMLObjectElementImpl.java 2019-04-17
19:19:23.691802087 +
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;
+
+ import org.w3c.dom.html.HTMLObjectElement;
++import org.w3c.dom.Document;
+
+ /**
+ * @xerces.internal
+@@ -251,6 +252,11 @@
+ super( owner, name );
+ }
+
++@Override
++public Document getContentDocument()
++{
++return null;
++}
+
+ }
+
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild
b/dev-java/xerces/xerces-2.12.0.ebuild
new file mode 100644
index 000..1e27c4ffd23
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="xercesImpl"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xml.apache.org/xerces2-j/index.html;
+SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.jar
-> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+ dev-java/xjavac:1
+ dev-java/xml-commons-resolver:0
+ dev-java/xml-commons-external:1.4"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
+
+JAVA_SRC_DIR="org"
+
+JAVA_GENTOO_CLASSPATH="
+ xjavac-1
+ xml-commons-resolver
+ xml-commons-external-1.4"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+
+ epatch "${FILESDIR}/${P}-overrides.patch"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/
commit: 95e1895408b48bda1b14d45072d89523dd4388d3
Author: Patrice Clement gentoo org>
AuthorDate: Wed Dec 2 16:19:49 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Dec 2 16:19:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e18954
dev-java/xerces: Remove vulnerable version. Fixes security bug 519502.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
dev-java/xerces/Manifest | 1 -
dev-java/xerces/files/xerces-1.3.1-build.xml | 64
dev-java/xerces/files/xerces-2.3.0-gentoo.patch | 61 --
dev-java/xerces/files/xerces-2.9.0-gentoo.patch | 21
dev-java/xerces/files/xerces-2.9.0-no_dom3.patch | 20
dev-java/xerces/files/xerces-2.9.1-gentoo.patch | 21
dev-java/xerces/files/xerces-2.9.1-no_dom3.patch | 20
dev-java/xerces/xerces-1.3.1-r2.ebuild | 39 ---
8 files changed, 247 deletions(-)
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index ac71250..9bc9f72 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,2 +1 @@
-DIST Xerces-J-src.1.3.1.tar.gz 900263 SHA256
d59f57ef4ec540f75b4b79aeef20e85ccb4f2c3b516dc995f1fc88f526f5f1e1 SHA512
2a7990a63d0ff3c491af4e5d7480583378dbcd8ce6042d4be6e87e53aa1012f2f0e709e7e0cde1ec9b930822a1e386550a899a1ef29a01267806dbfe595a9d64
WHIRLPOOL
ecc7abc65c6b22e8e749e5f2ccc5b45d3b99d0439f2a020cfda2c4db5958ce66df743a978df475ee855f07129c8ef801d2c8cd97635738c1df404873d4287e9a
DIST Xerces-J-src.2.11.0.tar.gz 1792762 SHA256
f59a5ef7b51bd883f2e9bda37a9360692e6c5e439b98d9b6ac1953e1f98b0680 SHA512
de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
WHIRLPOOL
891a1a04dd781c3dd4c01f295679b069dca9ae7126b3a4e3ab0e9da8ae6bd00e62e97b606acb233d3cd7b0da21012a6aa4f8339b42d26e251440d01057d24973
diff --git a/dev-java/xerces/files/xerces-1.3.1-build.xml
b/dev-java/xerces/files/xerces-1.3.1-build.xml
deleted file mode 100644
index d688a62..000
--- a/dev-java/xerces/files/xerces-1.3.1-build.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/xerces/files/xerces-2.3.0-gentoo.patch
b/dev-java/xerces/files/xerces-2.3.0-gentoo.patch
deleted file mode 100644
index 08f95ed..000
--- a/dev-java/xerces/files/xerces-2.3.0-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -urpN xerces-2_3_0.orig/build.sh xerces-2_3_0/build.sh
xerces-2_3_0.orig/build.sh 2005-01-15 15:14:51.682424232 +0100
-+++ xerces-2_3_0/build.sh 2005-01-15 16:22:11.299309120 +0100
-@@ -19,7 +19,7 @@ uname | grep WIN && CLPATHSEP=\;
-
- # Keep this classpath to the minimum required to run ant
- # Application dependent classpaths are specified in build.xml
--LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/xercesImpl.jar${CLPATHSEP}./tools/xml-apis.jar${CLPATHSEP}./tools/bin/xjavac.jar"
-+LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/ant-launcher.jar${CLPATHSEP}./tools/xercesImpl.jar${CLPATHSEP}./tools/xml-apis.jar${CLPATHSEP}./tools/bin/xjavac.jar"
- ANT_HOME=./tools
-
- echo Building with classpath \"$LOCALCLASSPATH\"
-diff -urpN xerces-2_3_0.orig/build.xml xerces-2_3_0/build.xml
xerces-2_3_0.orig/build.xml2005-01-15 15:14:51.682424232 +0100
-+++ xerces-2_3_0/build.xml 2005-01-15 16:38:48.751673312 +0100
-@@ -173,7 +173,6 @@ Copyright:
-
-
--
-
-
-
-
--
--
-+
-+
-
-
-@@ -221,16 +220,7 @@ Copyright:
-debug="${debug}"
-deprecation="${deprecation}"
-optimize="${optimize}"
-- includeAntRuntime="false"
-- includeJavaRuntime="false"
-- excludes="org/xml/sax/**
--javax/xml/parsers/**
--org/w3c/dom/*
--org/w3c/dom/events/**
--org/w3c/dom/html/**
--org/w3c/dom/ranges/**
--org/w3c/dom/traversal/**"
-- />
-+ classpath="tools/xml-apis.jar" />
-
-
-
diff --git a/dev-java/xerces/files/xerces-2.9.0-gentoo.patch
