From c3643f295b83733c159f480c0e73239d27b51f6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Wed, 19 Oct 2011 16:37:41 +0000 Subject: [PATCH] net-nds/jxplorer: fixed bug #381557 Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- net-nds/jxplorer/ChangeLog | 11 ++- net-nds/jxplorer/Manifest | 4 +- net-nds/jxplorer/files/3.2-com.ca.level.patch | 20 ++++++ net-nds/jxplorer/jxplorer-3.2-r1.ebuild | 71 +++++++++++++++++++ 4 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 net-nds/jxplorer/files/3.2-com.ca.level.patch create mode 100644 net-nds/jxplorer/jxplorer-3.2-r1.ebuild diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog index 8cd58592707f..a6223abdf236 100644 --- a/net-nds/jxplorer/ChangeLog +++ b/net-nds/jxplorer/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-nds/jxplorer -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.28 2008/01/10 23:14:59 caster Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.29 2011/10/19 16:37:41 fordfrog Exp $ + +*jxplorer-3.2-r1 (19 Oct 2011) + + 19 Oct 2011; Miroslav Å ulc + +files/3.2-com.ca.level.patch, +jxplorer-3.2-r1.ebuild: + Fixed startup exception complaining about bad logging level (bug #381557, + based on patches from John Crist ) 10 Jan 2008; Vlastimil Babka -files/jxplorer-gentoo.patch, -jxplorer-3.1-r5.ebuild, diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest index a60f9f34d68d..1cb583cbfc6b 100644 --- a/net-nds/jxplorer/Manifest +++ b/net-nds/jxplorer/Manifest @@ -1,7 +1,9 @@ +AUX 3.2-com.ca.level.patch 1158 RMD160 fd7c60557231178b5d7f44583e7c54399ef05964 SHA1 ecd65cca622bac20d4fe02a55933d63025147f50 SHA256 4716e1b03e56e899ec621035623f8f3791f2eee1252611c74892de2ac1169c35 AUX build.xml 1871 RMD160 8cc94302bc50f542b6842a0a26b2fa92c2d7ddb8 SHA1 037c318b855c5f9cdb1ddc1f0958e9b8f8ef80d8 SHA256 c1203b1269f3eadbea82fb54e27d75c6a6e89db71d91529ef80b9a1e67762746 AUX jxplorer-pre-r1 595 RMD160 978410eb4eb06336fb1d92d1d46771b3e712f3f5 SHA1 5d0e49ca9259264619cab21378f25f7195014a0c SHA256 df61361351348f8dc7fb93df648cae6251a6a0f85260872750e84d191f216c57 DIST JXv3.2deploy.tar.bz2 1771812 RMD160 9f262012415699bcf0ec413eb04a74550ce3e935 SHA1 f47f6a9ade703e24ba1cb081a283a8ed350c990d SHA256 0e678aa5daa829517bf080c33137db7c6ed12dd5c49a3722d12717b57fe35535 DIST JXv3.2src.tar.bz2 459951 RMD160 bbdf90c33a62251e6f4a38de623d4dae96337979 SHA1 e5c74a02ff6c15a1ed8a81b45b996b23171558d0 SHA256 63789857f19eb677f488e9a031c6bebb28726d2bb967893ab6df32dfb8862cc9 +EBUILD jxplorer-3.2-r1.ebuild 1684 RMD160 f82846ed42f076520a97db5d2af2454e47bf5780 SHA1 dac57496c24bde93858cb118f19d38a02235882f SHA256 5e2acf514fc483be131231e4de455af44095632663d8a7006e5d223130e05279 EBUILD jxplorer-3.2.ebuild 1593 RMD160 6bb9b88b75be87cc45de2612c6ada38da2c49bcc SHA1 fd1c6c8fc553dc3753ffc6a3d9d0bda4793cfd56 SHA256 c93fc049c44f8c37d11fda331296aaa3285b595db7d5af05feb10ffd2e2966e9 -MISC ChangeLog 4441 RMD160 4ea25aa5b87eeecb0c7da54072e3b7651fab83a0 SHA1 c5b072188ed74a5bf726ecab776db61979f9341f SHA256 e080dd258bb4c5498f86dc194292964938490b1c4a7310e57d0c98759a19c652 +MISC ChangeLog 4722 RMD160 57e030b48f986166f3921aea5798925525fe29cc SHA1 cc08e01c51cb675524c4e4fb41639f3278011f50 SHA256 7f142639beeab49c1938f8b11ecf2eaf8a11ab8212e5fc3d206e686738f173bf MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 diff --git a/net-nds/jxplorer/files/3.2-com.ca.level.patch b/net-nds/jxplorer/files/3.2-com.ca.level.patch new file mode 100644 index 000000000000..0f2fabeba208 --- /dev/null +++ b/net-nds/jxplorer/files/3.2-com.ca.level.patch @@ -0,0 +1,20 @@ +diff --git a/jxplorer/src/com/ca/directory/jxplorer/JXplorer.java b/jxplorer/src/com/ca/directory/jxplorer/JXplorer.java +index a36110c..0b748f5 100644 +--- a/jxplorer/src/com/ca/directory/jxplorer/JXplorer.java ++++ b/jxplorer/src/com/ca/directory/jxplorer/JXplorer.java +@@ -584,7 +584,7 @@ public class + + setDefaultProperty(".level", "WARNING", "(java loggin variable) - allowable values are 'OFF', 'SEVERE', 'WARNING', 'INFO', 'FINE', 'FINER', 'FINEST' and 'ALL'"); + +- setDefaultProperty("com.ca.level", "UNUSED", " (java loggin variable) partial logging is also available. Be warned that the Sun logging system is a very buggy partial reimplementation of log4j, and doesn't seem to do inheritance well."); ++ setDefaultProperty("com.ca.level", "WARNING", " (java loggin variable) partial logging is also available. Be warned that the Sun logging system is a very buggy partial reimplementation of log4j, and doesn't seem to do inheritance well."); + + + //setDefaultProperty("logging", "console"); +@@ -1986,4 +1986,4 @@ public class + { + return buttonRegister; + } +-} +\ No newline at end of file ++} diff --git a/net-nds/jxplorer/jxplorer-3.2-r1.ebuild b/net-nds/jxplorer/jxplorer-3.2-r1.ebuild new file mode 100644 index 000000000000..a3fa7cc02a58 --- /dev/null +++ b/net-nds/jxplorer/jxplorer-3.2-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.2-r1.ebuild,v 1.1 2011/10/19 16:37:41 fordfrog Exp $ + +EAPI="4" +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="A fully functional ldap browser written in java." +HOMEPAGE="http://jxplorer.org/" +SRC_URI="mirror://sourceforge/${PN}/JXv${PV}src.tar.bz2 + mirror://sourceforge/${PN}/JXv${PV}deploy.tar.bz2" +LICENSE="CAOSL" +IUSE="" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +RDEPEND=">=virtual/jre-1.4 + >=dev-java/javahelp-2.0.02_p46 + >=dev-java/log4j-1.2.8 + =dev-java/junit-3.8*" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND}" + +S=${WORKDIR}/${PN} + +src_prepare() { + epatch "${FILESDIR}/${PV}-com.ca.level.patch" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + cp "${FILESDIR}/build.xml" ./build.xml || die + + # Contains stuff for javahelp + mkdir dist + cp jars/help.jar dist || die + + rm -v jars/*.jar || die + mkdir lib/ && cd lib/ + java-pkg_jar-from javahelp + java-pkg_jar-from log4j + java-pkg_jar-from junit +} + +EANT_DOC_TARGET="docs" +EANT_FILTER_COMPILER="jikes" + +src_install() { + java-pkg_dojar dist/${PN}.jar dist/help.jar + + dodir /usr/share/${PN} + for i in "icons images htmldocs language templates security connections.txt log4j.xml" + do + cp -r ${i} "${D}/usr/share/${PN}" || die + done + + dodoc RELEASE.TXT || die + + # By default the config dir is ${HOME}/jxplorer + java-pkg_dolauncher ${PN} \ + --main com.ca.directory.jxplorer.JXplorer \ + --pwd '"${HOME}/.jxplorer"' \ + --pkg_args console \ + -pre "${FILESDIR}/${PN}-pre-r1" + + use source && java-pkg_dosrc src/com + use doc && java-pkg_dojavadoc docs +} -- 2.26.2