public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2015-09-25 23:23 James Le Cuirot
  0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2015-09-25 23:23 UTC (permalink / raw
  To: gentoo-commits

commit:     375b1578abc8fe67c08778d963356d9c496df015
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 23:22:27 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 23:22:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=375b1578

dev-java/xstream: Remove the tests so we can last-rite dev-java/stax

The tests were completely broken anyway. Also update the HOMEPAGE and
SRC_URI as Codehaus is dead.

Package-Manager: portage-2.2.20.1

 dev-java/xstream/xstream-1.3.1-r4.ebuild | 59 ++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/dev-java/xstream/xstream-1.3.1-r4.ebuild b/dev-java/xstream/xstream-1.3.1-r4.ebuild
new file mode 100644
index 0000000..bd8cd61
--- /dev/null
+++ b/dev-java/xstream/xstream-1.3.1-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again"
+HOMEPAGE="http://x-stream.github.io"
+SRC_URI="http://repo.maven.apache.org/maven2/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+# By default, these tests exit successfully on failure. Chewi has fixed
+# that below but it's probably because they blow up spectacularly on
+# every VM he has tried. They also depend on classes unique to the
+# Codehaus StAX implementation (dev-java/stax), which has now been
+# last-rited, so we no longer bother to support them at all.
+RESTRICT="test"
+
+CDEPEND="dev-java/cglib:3
+	dev-java/dom4j:1
+	dev-java/jdom:1.0
+	dev-java/joda-time:0
+	dev-java/xom:0
+	dev-java/xpp3:0
+	dev-java/xml-commons-external:1.3
+	dev-java/jettison:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-3,xml-commons-external-1.3,jettison"
+EANT_BUILD_TARGET="benchmark:compile jar"
+EANT_EXTRA_ARGS="-Dversion=${PV} -Djunit.haltonfailure=true"
+
+java_prepare() {
+	rm -v lib/*.jar || die
+	rm -rfv lib/jdk1.3 || die
+}
+
+src_install(){
+	java-pkg_newjar target/${P}.jar
+	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
+
+	use doc && java-pkg_dojavadoc target/javadoc
+	use source && java-pkg_dosrc src/java/com
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2015-09-29 21:20 James Le Cuirot
  0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2015-09-29 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2bba75f246252834781d75f8057f190f9bc968c1
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Fri Sep 18 00:08:40 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 21:19:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bba75f2

dev-java/xstream: Updated dev-java/jdom slot from 1.0 -> 0 for v1

 dev-java/xstream/xstream-1.3.1-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/xstream/xstream-1.3.1-r4.ebuild b/dev-java/xstream/xstream-1.3.1-r4.ebuild
index bd8cd61..e0f82b3 100644
--- a/dev-java/xstream/xstream-1.3.1-r4.ebuild
+++ b/dev-java/xstream/xstream-1.3.1-r4.ebuild
@@ -24,7 +24,7 @@ RESTRICT="test"
 
 CDEPEND="dev-java/cglib:3
 	dev-java/dom4j:1
-	dev-java/jdom:1.0
+	dev-java/jdom:0
 	dev-java/joda-time:0
 	dev-java/xom:0
 	dev-java/xpp3:0
@@ -41,7 +41,7 @@ DEPEND=">=virtual/jdk-1.6
 S="${WORKDIR}/${P}/${PN}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-3,xml-commons-external-1.3,jettison"
+EANT_GENTOO_CLASSPATH="xpp3,jdom,xom,dom4j-1,joda-time,cglib-3,xml-commons-external-1.3,jettison"
 EANT_BUILD_TARGET="benchmark:compile jar"
 EANT_EXTRA_ARGS="-Dversion=${PV} -Djunit.haltonfailure=true"
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2015-10-31 17:45 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2015-10-31 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     70e304f4a946ded932efc2a9a2f1637053129802
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 17:31:57 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 17:43:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e304f4

dev-java/xstream: Version bump. Fixes security bug 497652.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/xstream/Manifest             |  1 +
 dev-java/xstream/xstream-1.4.8.ebuild | 56 +++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 7b2a3d2..5c7dbb5 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1 +1,2 @@
+DIST xstream-1.4.8-sources.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2
 DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6

diff --git a/dev-java/xstream/xstream-1.4.8.ebuild b/dev-java/xstream/xstream-1.4.8.ebuild
new file mode 100644
index 0000000..41f26ae
--- /dev/null
+++ b/dev-java/xstream/xstream-1.4.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A text-processing Java API that serialize objects to XML and back again"
+HOMEPAGE="http://x-stream.github.io"
+SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/kxml:2
+	dev-java/xom:0
+	dev-java/xpp3:0
+	dev-java/cglib:3
+	dev-java/dom4j:1
+	dev-java/jdom:2
+	dev-java/jdom:1.0
+	dev-java/joda-time:0
+	dev-java/jettison:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	xpp3
+	xom
+	kxml-2
+	jdom-2
+	jdom-1.0
+	dom4j-1
+	cglib-3
+	jettison
+	joda-time"
+
+# Two drivers for two very old implementations of StAX.
+# StAX has been last-rited from Gentoo as it is now part of the Java 6 JDK. 
+# See bug 561504. These drivers rely on ancient APIs that aren't maintained
+# upstream and may contain security holes.
+JAVA_RM_FILES=(
+	com/thoughtworks/xstream/io/xml/WstxDriver.java
+	com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
+)


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2015-11-01 19:12 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2015-11-01 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     5b65a8e62fcb19f08dd7d96c43f4d847344b3c6e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 13:30:05 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 19:09:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b65a8e6

dev-java/xstream: Raise {jdk,jre} reqs to 1.8. Fixes bug 564616.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/xstream/{xstream-1.4.8.ebuild => xstream-1.4.8-r1.ebuild} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-java/xstream/xstream-1.4.8.ebuild b/dev-java/xstream/xstream-1.4.8-r1.ebuild
similarity index 91%
rename from dev-java/xstream/xstream-1.4.8.ebuild
rename to dev-java/xstream/xstream-1.4.8-r1.ebuild
index 41f26ae..d977592 100644
--- a/dev-java/xstream/xstream-1.4.8.ebuild
+++ b/dev-java/xstream/xstream-1.4.8-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://x-stream.github.io"
 SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="
 	dev-java/kxml:2
@@ -26,13 +26,14 @@ CDEPEND="
 	dev-java/joda-time:0
 	dev-java/jettison:0"
 
+# This package does need Java 8. See bug 564616.
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8
 	app-arch/unzip"
 
 JAVA_GENTOO_CLASSPATH="


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2016-01-06 10:11 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2016-01-06 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     4315b3edc94ae5e6f50269bc7175fb0eaacc23cf
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 09:44:21 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 10:08:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4315b3ed

dev-java/xstream: Stable for amd64. Retroactively mark stable for the remaining arches using the ALLARCHES policy.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/xstream/xstream-1.3.1-r4.ebuild | 33 +++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/dev-java/xstream/xstream-1.3.1-r4.ebuild b/dev-java/xstream/xstream-1.3.1-r4.ebuild
index e0f82b3..306f958 100644
--- a/dev-java/xstream/xstream-1.3.1-r4.ebuild
+++ b/dev-java/xstream/xstream-1.3.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://x-stream.github.io"
 SRC_URI="http://repo.maven.apache.org/maven2/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 # By default, these tests exit successfully on failure. Chewi has fixed
 # that below but it's probably because they blow up spectacularly on
@@ -22,21 +22,24 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 # last-rited, so we no longer bother to support them at all.
 RESTRICT="test"
 
-CDEPEND="dev-java/cglib:3
-	dev-java/dom4j:1
-	dev-java/jdom:0
-	dev-java/joda-time:0
+CDEPEND="
 	dev-java/xom:0
+	dev-java/jdom:0
 	dev-java/xpp3:0
-	dev-java/xml-commons-external:1.3
-	dev-java/jettison:0"
+	dev-java/cglib:3
+	dev-java/dom4j:1
+	dev-java/jettison:0
+	dev-java/joda-time:0
+	dev-java/xml-commons-external:1.3"
 
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="
+	${CDEPEND}
 	app-arch/unzip
-	${CDEPEND}"
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${P}/${PN}"
 
@@ -50,9 +53,9 @@ java_prepare() {
 	rm -rfv lib/jdk1.3 || die
 }
 
-src_install(){
-	java-pkg_newjar target/${P}.jar
-	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
+src_install() {
+	java-pkg_newjar "target/${P}.jar"
+	java-pkg_newjar "target/${PN}-benchmark-${PV}.jar" "${PN}-benchmark.jar"
 
 	use doc && java-pkg_dojavadoc target/javadoc
 	use source && java-pkg_dosrc src/java/com


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2016-01-06 10:11 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2016-01-06 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     18ef64e7b0e094aa38bb089995c594ada80489cd
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 09:44:58 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 10:08:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ef64e7

dev-java/xstream: Clean up old.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/xstream/xstream-1.3.1-r3.ebuild | 84 --------------------------------
 1 file changed, 84 deletions(-)

diff --git a/dev-java/xstream/xstream-1.3.1-r3.ebuild b/dev-java/xstream/xstream-1.3.1-r3.ebuild
deleted file mode 100644
index 46fdf94..0000000
--- a/dev-java/xstream/xstream-1.3.1-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again"
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-# By default, these tests exit successfully on failure. Chewi has fixed
-# that below but it's probably because they blow up spectacularly on
-# every VM he has tried.
-RESTRICT="test"
-
-CDEPEND="dev-java/cglib:3
-	dev-java/dom4j:1
-	dev-java/jdom:1.0
-	dev-java/joda-time:0
-	dev-java/xom:0
-	dev-java/xpp3:0
-	dev-java/xml-commons-external:1.3
-	dev-java/jettison:0
-	java-virtuals/stax-api:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-trax:0
-		dev-java/junit:4
-		dev-java/xml-writer:0
-		dev-java/commons-lang:2.1
-		dev-java/jmock:1.0
-		dev-java/jakarta-oro:2.0
-		dev-java/stax:0
-		dev-java/wstx:3.2
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-3,xml-commons-external-1.3,jettison,stax-api"
-EANT_BUILD_TARGET="benchmark:compile jar"
-EANT_EXTRA_ARGS="-Dversion=${PV} -Djunit.haltonfailure=true"
-
-java_prepare() {
-	rm -v lib/*.jar || die
-	rm -rfv lib/jdk1.3 || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,jmock-1.0,commons-lang-2.1,xml-writer,wstx-3.2,stax,jakarta-oro-2.0"
-EANT_TEST_TARGET="test"
-ANT_TASKS="ant-junit ant-trax"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install(){
-	java-pkg_newjar target/${P}.jar
-	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
-
-	use doc && java-pkg_dojavadoc target/javadoc
-	use source && java-pkg_dosrc src/java/com
-}
-
-pkg_postinst(){
-	elog "Major Changes from 1.2 See:"
-	elog "http://xstream.codehaus.org/changes.html"
-	elog "to prevent breakage ..."
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2016-05-19  7:40 Agostino Sarubbo
  0 siblings, 0 replies; 13+ messages in thread
From: Agostino Sarubbo @ 2016-05-19  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     78bafbed5dec00da8ba3ff799a63d3b47abbfa9e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 07:40:28 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu May 19 07:40:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bafbed

dev-java/xstream: amd64 stable wrt bug #497652

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/xstream/xstream-1.4.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xstream/xstream-1.4.8-r1.ebuild b/dev-java/xstream/xstream-1.4.8-r1.ebuild
index d977592..ed188db 100644
--- a/dev-java/xstream/xstream-1.4.8-r1.ebuild
+++ b/dev-java/xstream/xstream-1.4.8-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://x-stream.github.io"
 SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CDEPEND="
 	dev-java/kxml:2


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2016-05-19  7:42 Agostino Sarubbo
  0 siblings, 0 replies; 13+ messages in thread
From: Agostino Sarubbo @ 2016-05-19  7:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ee91f589bbbe4788679e4b490a0378824414c514
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 07:41:38 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu May 19 07:41:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee91f589

dev-java/xstream: x86 stable wrt bug #497652

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/xstream/xstream-1.4.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xstream/xstream-1.4.8-r1.ebuild b/dev-java/xstream/xstream-1.4.8-r1.ebuild
index ed188db..63cbd52 100644
--- a/dev-java/xstream/xstream-1.4.8-r1.ebuild
+++ b/dev-java/xstream/xstream-1.4.8-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://x-stream.github.io"
 SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="
 	dev-java/kxml:2


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2016-05-19 23:56 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2016-05-19 23:56 UTC (permalink / raw
  To: gentoo-commits

commit:     144dad3f486dbd6189724db13c28566110aaa482
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 20:54:00 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu May 19 23:27:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144dad3f

dev-java/xstream: Remove vulnerable version. Fixes bug 497652.

Package-Manager: portage-2.2.28

 dev-java/xstream/Manifest                |  1 -
 dev-java/xstream/xstream-1.3.1-r4.ebuild | 62 --------------------------------
 2 files changed, 63 deletions(-)

diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 5c7dbb5..cbbb6ee 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,2 +1 @@
 DIST xstream-1.4.8-sources.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2
-DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6

diff --git a/dev-java/xstream/xstream-1.3.1-r4.ebuild b/dev-java/xstream/xstream-1.3.1-r4.ebuild
deleted file mode 100644
index 6a30ad0..0000000
--- a/dev-java/xstream/xstream-1.3.1-r4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again"
-HOMEPAGE="http://x-stream.github.io"
-SRC_URI="http://repo.maven.apache.org/maven2/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-# By default, these tests exit successfully on failure. Chewi has fixed
-# that below but it's probably because they blow up spectacularly on
-# every VM he has tried. They also depend on classes unique to the
-# Codehaus StAX implementation (dev-java/stax), which has now been
-# last-rited, so we no longer bother to support them at all.
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/xom:0
-	dev-java/jdom:0
-	dev-java/xpp3:0
-	dev-java/cglib:3
-	dev-java/dom4j:1
-	dev-java/jettison:0
-	dev-java/joda-time:0
-	dev-java/xml-commons-external:1.3"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xpp3,jdom,xom,dom4j-1,joda-time,cglib-3,xml-commons-external-1.3,jettison"
-EANT_BUILD_TARGET="benchmark:compile jar"
-EANT_EXTRA_ARGS="-Dversion=${PV} -Djunit.haltonfailure=true"
-
-java_prepare() {
-	rm -v lib/*.jar || die
-	rm -rfv lib/jdk1.3 || die
-}
-
-src_install() {
-	java-pkg_newjar "target/${P}.jar"
-	java-pkg_newjar "target/${PN}-benchmark-${PV}.jar" "${PN}-benchmark.jar"
-
-	use doc && java-pkg_dojavadoc target/javadoc
-	use source && java-pkg_dosrc src/java/com
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2016-05-20  0:24 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2016-05-20  0:24 UTC (permalink / raw
  To: gentoo-commits

commit:     6b8ebcb188982a242563621385ad2073b8ef2ae5
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 23:55:30 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu May 19 23:55:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8ebcb1

dev-java/xstream: Stable for ppc64.

Package-Manager: portage-2.2.28

 dev-java/xstream/xstream-1.4.8-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/xstream/xstream-1.4.8-r1.ebuild b/dev-java/xstream/xstream-1.4.8-r1.ebuild
index 63cbd52..d46c6df 100644
--- a/dev-java/xstream/xstream-1.4.8-r1.ebuild
+++ b/dev-java/xstream/xstream-1.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://x-stream.github.io"
 SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="
 	dev-java/kxml:2


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2016-10-08 19:02 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2016-10-08 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     28a42ea67e06e003a105e6aa0259cb283eebb69f
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 19:02:17 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 19:02:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a42ea6

dev-java/xstream: get rid of jdom:1.1 dependency.

Package-Manager: portage-2.3.0

 dev-java/xstream/Manifest                |  1 +
 dev-java/xstream/xstream-1.4.8-r2.ebuild | 57 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index cbbb6ee..d915cd8 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1 +1,2 @@
 DIST xstream-1.4.8-sources.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2
+DIST xstream-1.4.8.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2

diff --git a/dev-java/xstream/xstream-1.4.8-r2.ebuild b/dev-java/xstream/xstream-1.4.8-r2.ebuild
new file mode 100644
index 00000000..b72fc31
--- /dev/null
+++ b/dev-java/xstream/xstream-1.4.8-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A text-processing Java API that serialize objects to XML and back again"
+HOMEPAGE="http://x-stream.github.io"
+SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/xom:0
+	dev-java/xpp3:0
+	dev-java/jdom:0
+	dev-java/jdom:2
+	dev-java/kxml:2
+	dev-java/cglib:3
+	dev-java/dom4j:1
+	dev-java/joda-time:0
+	dev-java/jettison:0"
+
+# This package does need Java 8. See bug 564616.
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	xom
+	xpp3
+	jdom
+	kxml-2
+	jdom-2
+	dom4j-1
+	cglib-3
+	jettison
+	joda-time"
+
+# Two drivers for two very old implementations of StAX.
+# StAX has been last-rited from Gentoo as it is now part of the Java 6 JDK.
+# See bug 561504. These drivers rely on ancient APIs that aren't maintained
+# upstream and may contain security holes.
+JAVA_RM_FILES=(
+	com/thoughtworks/xstream/io/xml/WstxDriver.java
+	com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
+)


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2017-05-17 14:34 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2017-05-17 14:34 UTC (permalink / raw
  To: gentoo-commits

commit:     8f59db274921be8e362d7726e80fb5eee07b9266
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 14:19:04 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed May 17 14:33:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f59db27

dev-java/xstream: stable for amd64. stabilise for the remaining arches using the ALLARCHES policy.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-java/xstream/xstream-1.4.8-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/xstream/xstream-1.4.8-r2.ebuild b/dev-java/xstream/xstream-1.4.8-r2.ebuild
index 4c6aee8cd98..c842bc2d914 100644
--- a/dev-java/xstream/xstream-1.4.8-r2.ebuild
+++ b/dev-java/xstream/xstream-1.4.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://x-stream.github.io"
 SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="
 	dev-java/xom:0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/
@ 2017-05-17 14:34 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2017-05-17 14:34 UTC (permalink / raw
  To: gentoo-commits

commit:     828a4c4ab99c5a7f0e225558dbab924e5b7128bd
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 14:19:37 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed May 17 14:34:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828a4c4a

dev-java/xstream: clean up old.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-java/xstream/Manifest                |  1 -
 dev-java/xstream/xstream-1.4.8-r1.ebuild | 56 --------------------------------
 2 files changed, 57 deletions(-)

diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index d915cd8bb68..d5498d45a8a 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,2 +1 @@
-DIST xstream-1.4.8-sources.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2
 DIST xstream-1.4.8.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2

diff --git a/dev-java/xstream/xstream-1.4.8-r1.ebuild b/dev-java/xstream/xstream-1.4.8-r1.ebuild
deleted file mode 100644
index 70bcd6d8e5b..00000000000
--- a/dev-java/xstream/xstream-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A text-processing Java API that serialize objects to XML and back again"
-HOMEPAGE="http://x-stream.github.io"
-SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="
-	dev-java/kxml:2
-	dev-java/xom:0
-	dev-java/xpp3:0
-	dev-java/cglib:3
-	dev-java/dom4j:1
-	dev-java/jdom:2
-	dev-java/jdom:1.0
-	dev-java/joda-time:0
-	dev-java/jettison:0"
-
-# This package does need Java 8. See bug 564616.
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="
-	xpp3
-	xom
-	kxml-2
-	jdom-2
-	jdom-1.0
-	dom4j-1
-	cglib-3
-	jettison
-	joda-time"
-
-# Two drivers for two very old implementations of StAX.
-# StAX has been last-rited from Gentoo as it is now part of the Java 6 JDK.
-# See bug 561504. These drivers rely on ancient APIs that aren't maintained
-# upstream and may contain security holes.
-JAVA_RM_FILES=(
-	com/thoughtworks/xstream/io/xml/WstxDriver.java
-	com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
-)


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2017-05-17 14:34 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-29 21:20 [gentoo-commits] repo/gentoo:master commit in: dev-java/xstream/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2017-05-17 14:34 Patrice Clement
2017-05-17 14:34 Patrice Clement
2016-10-08 19:02 Patrice Clement
2016-05-20  0:24 Patrice Clement
2016-05-19 23:56 Patrice Clement
2016-05-19  7:42 Agostino Sarubbo
2016-05-19  7:40 Agostino Sarubbo
2016-01-06 10:11 Patrice Clement
2016-01-06 10:11 Patrice Clement
2015-11-01 19:12 Patrice Clement
2015-10-31 17:45 Patrice Clement
2015-09-25 23:23 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox