| 1 |
tomwij 13/06/30 19:58:47 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: xmlgraphics-commons-1.2-r1.ebuild |
| 5 |
Removed: xmlgraphics-commons-1.2.ebuild |
| 6 |
Log: |
| 7 |
Remove sun-jdk and sun-jre-bin from reverse dependencies. For security bug #473830 reported by Agostino Sarubbo. |
| 8 |
|
| 9 |
(Portage version: 2.1.12.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6D34E57D) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.24 dev-java/xmlgraphics-commons/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog?rev=1.24&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog?rev=1.24&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog?r1=1.23&r2=1.24 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v |
| 21 |
retrieving revision 1.23 |
| 22 |
retrieving revision 1.24 |
| 23 |
diff -u -r1.23 -r1.24 |
| 24 |
--- ChangeLog 31 Dec 2011 16:46:14 -0000 1.23 |
| 25 |
+++ ChangeLog 30 Jun 2013 19:58:47 -0000 1.24 |
| 26 |
@@ -1,6 +1,13 @@ |
| 27 |
# ChangeLog for dev-java/xmlgraphics-commons |
| 28 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.23 2011/12/31 16:46:14 sera Exp $ |
| 30 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.24 2013/06/30 19:58:47 tomwij Exp $ |
| 32 |
+ |
| 33 |
+*xmlgraphics-commons-1.2-r1 (30 Jun 2013) |
| 34 |
+ |
| 35 |
+ 30 Jun 2013; Tom Wijsman <TomWij@g.o> |
| 36 |
+ +xmlgraphics-commons-1.2-r1.ebuild, -xmlgraphics-commons-1.2.ebuild: |
| 37 |
+ Remove sun-jdk and sun-jre-bin from reverse dependencies. For security bug |
| 38 |
+ #473830 reported by Agostino Sarubbo. |
| 39 |
|
| 40 |
31 Dec 2011; Ralph Sennhauser <sera@g.o> |
| 41 |
xmlgraphics-commons-1.2.ebuild, xmlgraphics-commons-1.3.1.ebuild: |
| 42 |
@@ -100,4 +107,3 @@ |
| 43 |
07 May 2007; Vlastimil Babka <caster@g.o> +metadata.xml, |
| 44 |
+xmlgraphics-commons-1.1.ebuild: |
| 45 |
Initial ebuild, coming from java-overlay by Alistair Bush. |
| 46 |
- |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: xmlgraphics-commons-1.2-r1.ebuild |
| 56 |
=================================================================== |
| 57 |
# Copyright 1999-2013 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild,v 1.1 2013/06/30 19:58:47 tomwij Exp $ |
| 60 |
|
| 61 |
JAVA_PKG_IUSE="doc examples source test" |
| 62 |
|
| 63 |
inherit java-pkg-2 java-ant-2 |
| 64 |
|
| 65 |
DESCRIPTION="A library of several reusable components used by Apache Batik and Apache FOP." |
| 66 |
HOMEPAGE="http://xmlgraphics.apache.org/commons/index.html" |
| 67 |
SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz" |
| 68 |
|
| 69 |
LICENSE="Apache-2.0" |
| 70 |
SLOT="1" |
| 71 |
KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
| 72 |
IUSE="jpeg" |
| 73 |
|
| 74 |
# fails connect to X even tho it sets java.awt.headless |
| 75 |
RESTRICT="test" |
| 76 |
CDEPEND=">=dev-java/commons-io-1" |
| 77 |
DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) |
| 78 |
jpeg? ( |
| 79 |
|| ( |
| 80 |
>=dev-java/blackdown-jdk-1.4 |
| 81 |
=dev-java/icedtea-bin-1* |
| 82 |
>=dev-java/ibm-jdk-bin-1.4 |
| 83 |
>=dev-java/jrockit-jdk-bin-1.4 |
| 84 |
dev-java/icedtea |
| 85 |
>=dev-java/apple-jdk-bin-1.4 |
| 86 |
) |
| 87 |
) |
| 88 |
test? ( |
| 89 |
dev-java/ant-junit |
| 90 |
) |
| 91 |
${CDEPEND}" |
| 92 |
RDEPEND=">=virtual/jre-1.4 |
| 93 |
${CDEPEND}" |
| 94 |
|
| 95 |
# TODO investigate producing .net libraries |
| 96 |
# stratigies for non sun jdk's/jre's |
| 97 |
|
| 98 |
pkg_setup() { |
| 99 |
java-pkg-2_pkg_setup |
| 100 |
|
| 101 |
if use jpeg && java-pkg_current-vm-matches kaffe; then |
| 102 |
eerror "Sun-private JPEG support cannot be built with kaffe." |
| 103 |
eerror "Please set your build VM to Sun, Blackdown, IBM or JRockit JDK." |
| 104 |
eerror "See http://www.gentoo.org/doc/en/java.xml for details." |
| 105 |
eerror "Alternatively, install this package with USE=-jpeg" |
| 106 |
die "Cannot build with USE=jpeg and kaffe." |
| 107 |
fi |
| 108 |
} |
| 109 |
|
| 110 |
src_unpack() { |
| 111 |
unpack ${A} |
| 112 |
cd "${S}" |
| 113 |
|
| 114 |
# automagic bad |
| 115 |
java-ant_ignore-system-classes || die |
| 116 |
|
| 117 |
cd "${S}/lib" || die |
| 118 |
rm -v *.jar || die |
| 119 |
|
| 120 |
java-pkg_jarfrom commons-io-1 |
| 121 |
} |
| 122 |
|
| 123 |
src_compile() { |
| 124 |
local af="-Djdk14.present=true" |
| 125 |
use jpeg && af="${af} -Dsun.jpeg.present=true" |
| 126 |
eant ${af} jar-main $(use_doc javadocs) |
| 127 |
} |
| 128 |
|
| 129 |
src_test() { |
| 130 |
java-pkg_jarfrom --into lib junit |
| 131 |
# probably needs ${af} from src_compile, doesn't work anyway |
| 132 |
ANT_TASKS="ant-junit" eant -Djunit.present=true junit |
| 133 |
} |
| 134 |
|
| 135 |
src_install(){ |
| 136 |
java-pkg_newjar build/${P}.jar |
| 137 |
use source && java-pkg_dosrc src/java/org src/java-1.4/org |
| 138 |
use doc && java-pkg_dojavadoc build/javadocs |
| 139 |
} |
Archives