From 0f0a7ca37c684f0944d70aab595805372a50d9a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Wed, 31 Jan 2007 18:42:40 +0000 Subject: [PATCH] Version bump. Fixes bug #164607 and hopefully bug #164056. Dropped amd64 keywords because I could not test if the changes work there. Package-Manager: portage-2.1.2-r5 --- dev-java/jss/ChangeLog | 11 +++- dev-java/jss/Manifest | 36 +++++++---- dev-java/jss/files/digest-jss-4.2 | 3 + dev-java/jss/files/jss-4.2-pkg-config.patch | 22 +++++++ dev-java/jss/jss-4.2.ebuild | 71 +++++++++++++++++++++ dev-java/jss/metadata.xml | 4 +- 6 files changed, 131 insertions(+), 16 deletions(-) create mode 100644 dev-java/jss/files/digest-jss-4.2 create mode 100644 dev-java/jss/files/jss-4.2-pkg-config.patch create mode 100644 dev-java/jss/jss-4.2.ebuild diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog index f350da6d98db..34e5e5054d76 100644 --- a/dev-java/jss/ChangeLog +++ b/dev-java/jss/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/jss -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.10 2006/10/05 18:21:17 gustavoz Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.11 2007/01/31 18:42:40 betelgeuse Exp $ + +*jss-4.2 (31 Jan 2007) + + 31 Jan 2007; Petteri Räty + +files/jss-4.2-pkg-config.patch, metadata.xml, +jss-4.2.ebuild: + Version bump. Fixes bug #164607 and hopefully bug #164056. Dropped amd64 + keywords because I could not test if the changes work there. 05 Oct 2006; Gustavo Zacarias jss-3.4.ebuild: Dropping sparc keywords, see #96229 diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest index 1ad0b4f85980..89232b507367 100644 --- a/dev-java/jss/Manifest +++ b/dev-java/jss/Manifest @@ -5,7 +5,12 @@ AUX jss-3.4-target_source.patch 633 RMD160 cc76aea593fb7493b59f0ed61f70bb1a636cc MD5 a7b470e604b083c7af151e663b3a079f files/jss-3.4-target_source.patch 633 RMD160 cc76aea593fb7493b59f0ed61f70bb1a636ccbc5 files/jss-3.4-target_source.patch 633 SHA256 7785f02cb67d47198e5d6052ecaf88ec1f237585e3244ee6bac147d5a5336732 files/jss-3.4-target_source.patch 633 +AUX jss-4.2-pkg-config.patch 571 RMD160 df3e74da0679ffd5c087050fc352dd90a64e3262 SHA1 f4ca079eb8d188b66fa0ed2be9a3d1fd75a616c2 SHA256 492d82cf076c69f9194563588b663a3c7cc8c04a217da499a78d5c19874d35cb +MD5 876a5eea2810a0bfdc68d2a4ce013866 files/jss-4.2-pkg-config.patch 571 +RMD160 df3e74da0679ffd5c087050fc352dd90a64e3262 files/jss-4.2-pkg-config.patch 571 +SHA256 492d82cf076c69f9194563588b663a3c7cc8c04a217da499a78d5c19874d35cb files/jss-4.2-pkg-config.patch 571 DIST jss-3.4-src.tar.gz 481774 RMD160 2c0577de95fd753c176d3d37e9d2cdfbbc7fdf71 SHA1 3a316e926b2db3ae41a7b6eb4c323f8aad092742 SHA256 53396a99eb8d4024ede7a416ee3e2ece95daeca9353e92b971243d52181b919c +DIST jss-4.2.tar.bz2 376845 RMD160 1bc9180a43d062dbf46818427f96df86bb0ce4e5 SHA1 aa1312971b2e13456ad01ea181702d0aa0643bcf SHA256 1c7240312193620607d4b823adb69ad63b3f8bd5de8e0c284f3df2d19aab8621 EBUILD jss-3.4-r1.ebuild 1995 RMD160 60dfef409b9aad64f2b7e70b6a345616a1913624 SHA1 798f12059f6274227c64a618f70af7327f7fc1db SHA256 4b22d0987bdaa270e70715e733072cc9c12948501c0e5cbaeb9ab7accc532a29 MD5 00e027f7a5f4ac41055f8340ee6f900b jss-3.4-r1.ebuild 1995 RMD160 60dfef409b9aad64f2b7e70b6a345616a1913624 jss-3.4-r1.ebuild 1995 @@ -14,24 +19,31 @@ EBUILD jss-3.4.ebuild 2052 RMD160 4a91fe0384123a44728b67b08109ddb49da13354 SHA1 MD5 df55afc34b93ca9a5b84917cd9e8bb0b jss-3.4.ebuild 2052 RMD160 4a91fe0384123a44728b67b08109ddb49da13354 jss-3.4.ebuild 2052 SHA256 6012e55e4baac92895ecbaca545c79f2d90e84809a966a8b0f5359306e56a823 jss-3.4.ebuild 2052 -MISC ChangeLog 1466 RMD160 730ca1b447f05c85598cdd40bf07a0f1aa3dd700 SHA1 161f5b00b7a9cd96ac865cf980e09c2d54b8de20 SHA256 b92182a2332eb145f685cf01ef9721d0c7d2cf5f356fb41a2ba2a06e082d5d54 -MD5 7285105c5f4e71dc87515b1daa4a4d8c ChangeLog 1466 -RMD160 730ca1b447f05c85598cdd40bf07a0f1aa3dd700 ChangeLog 1466 -SHA256 b92182a2332eb145f685cf01ef9721d0c7d2cf5f356fb41a2ba2a06e082d5d54 ChangeLog 1466 -MISC metadata.xml 436 RMD160 633c555792805d7150d936bb95b6ec9aabdc40a2 SHA1 f58fe4f4e0c2af5f054fca5169cef45671fdf77c SHA256 37c2b1c7c0550a86ed31626e173543f86a97aa0adbac60bd6884c1ea88bd2526 -MD5 411a0f670c9f4b9de76bd163882ae4d8 metadata.xml 436 -RMD160 633c555792805d7150d936bb95b6ec9aabdc40a2 metadata.xml 436 -SHA256 37c2b1c7c0550a86ed31626e173543f86a97aa0adbac60bd6884c1ea88bd2526 metadata.xml 436 +EBUILD jss-4.2.ebuild 2104 RMD160 204ffb9c4763faf098cec019953545bbae8c9177 SHA1 19328c08130525244e45e876b0ca2c25ddaa0a2f SHA256 b0beceba7b9154fb0892b38d22f182c831ed7b29549bc5a1c0cccbc3c92790e6 +MD5 35b7e50859f097e143c794eead02eadf jss-4.2.ebuild 2104 +RMD160 204ffb9c4763faf098cec019953545bbae8c9177 jss-4.2.ebuild 2104 +SHA256 b0beceba7b9154fb0892b38d22f182c831ed7b29549bc5a1c0cccbc3c92790e6 jss-4.2.ebuild 2104 +MISC ChangeLog 1750 RMD160 c93e2cfd0f00d5c36eaefe8e569993f987eab9dd SHA1 4265b6a628ef24c936f7494ba4de1a8b88e5cc0a SHA256 8f346cdad2ae8e67a3c8361738cfc3badb061926f6186d7447e74369e7a90683 +MD5 9a1a651dc8f90b680b9a981fdcd06914 ChangeLog 1750 +RMD160 c93e2cfd0f00d5c36eaefe8e569993f987eab9dd ChangeLog 1750 +SHA256 8f346cdad2ae8e67a3c8361738cfc3badb061926f6186d7447e74369e7a90683 ChangeLog 1750 +MISC metadata.xml 434 RMD160 bf2f7b01b200787d7473ce84834202067366f86d SHA1 86157cdb7f1921ef19906439056d5ef4a0bc1c59 SHA256 c92168f2c1bddf51758e8fbef06d9cf84df325cef503d5d2d040de174d3c7397 +MD5 2f430734ab6744f82037df29e1f0e6c4 metadata.xml 434 +RMD160 bf2f7b01b200787d7473ce84834202067366f86d metadata.xml 434 +SHA256 c92168f2c1bddf51758e8fbef06d9cf84df325cef503d5d2d040de174d3c7397 metadata.xml 434 MD5 484470914b36b944f1dfce77f6256ff7 files/digest-jss-3.4 235 RMD160 e6a7036f57f6923dd5f4ec340f7ea0f9ca8d4bd2 files/digest-jss-3.4 235 SHA256 768bf597fec0894ea2d321b191276d10f872fcc7996902e945f3a6de7f512bdc files/digest-jss-3.4 235 MD5 484470914b36b944f1dfce77f6256ff7 files/digest-jss-3.4-r1 235 RMD160 e6a7036f57f6923dd5f4ec340f7ea0f9ca8d4bd2 files/digest-jss-3.4-r1 235 SHA256 768bf597fec0894ea2d321b191276d10f872fcc7996902e945f3a6de7f512bdc files/digest-jss-3.4-r1 235 +MD5 f5b9db74e437cebe1a32eb93b6a67ded files/digest-jss-4.2 226 +RMD160 2dc6de16dbc37e11d1c10bd15d86e8775a526c68 files/digest-jss-4.2 226 +SHA256 2ff63bf22ccb9f5efbe63b660f923649a27e398bfd94c5bdc4ba2438488c0ecb files/digest-jss-4.2 226 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFJU0qKRy60XGEcJIRAqXaAKCt75d0ZHphRaoFwL5k5deITR8JwACfaj8v -hB4cJBY99zq3KiQgdrQ6/HI= -=+Aw2 +iD8DBQFFwOMocxLzpIGCsLQRArhjAJ9FeEFf4MY3n4Wj0mdEi4JaKG70kACdG24Y +CDE3b47uJRjSZ4tUBkYB/Js= +=fyoB -----END PGP SIGNATURE----- diff --git a/dev-java/jss/files/digest-jss-4.2 b/dev-java/jss/files/digest-jss-4.2 new file mode 100644 index 000000000000..fd7a14192e30 --- /dev/null +++ b/dev-java/jss/files/digest-jss-4.2 @@ -0,0 +1,3 @@ +MD5 cc42b5cf802c8aa782c1aea3df7598fc jss-4.2.tar.bz2 376845 +RMD160 1bc9180a43d062dbf46818427f96df86bb0ce4e5 jss-4.2.tar.bz2 376845 +SHA256 1c7240312193620607d4b823adb69ad63b3f8bd5de8e0c284f3df2d19aab8621 jss-4.2.tar.bz2 376845 diff --git a/dev-java/jss/files/jss-4.2-pkg-config.patch b/dev-java/jss/files/jss-4.2-pkg-config.patch new file mode 100644 index 000000000000..befd3fbe68ae --- /dev/null +++ b/dev-java/jss/files/jss-4.2-pkg-config.patch @@ -0,0 +1,22 @@ +Index: security/jss/lib/config.mk +=================================================================== +RCS file: /cvsroot/mozilla/security/jss/lib/config.mk,v +retrieving revision 1.19 +diff -u -r1.19 config.mk +--- mozilla/security/jss/lib/config.mk 25 Apr 2004 15:02:19 -0000 1.19 ++++ mozilla/security/jss/lib/config.mk 30 Jan 2007 21:08:06 -0000 +@@ -72,13 +72,7 @@ + else + + EXTRA_SHARED_LIBS += \ +- -L$(DIST)/lib \ +- -lnss3 \ +- -lsmime3 \ +- -lssl3 \ +- -lplc4 \ +- -lplds4 \ +- -lnspr4 \ ++ `pkg-config --libs nss` \ + $(JAVA_LIBS) \ + $(NULL) + diff --git a/dev-java/jss/jss-4.2.ebuild b/dev-java/jss/jss-4.2.ebuild new file mode 100644 index 000000000000..6cbbd7529e3f --- /dev/null +++ b/dev-java/jss/jss-4.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.2.ebuild,v 1.1 2007/01/31 18:42:40 betelgeuse Exp $ + +inherit eutils java-pkg-2 versionator + +RTM_NAME="JSS_${PV//./_}_RTM" +DESCRIPTION="Network Security Services for Java (JSS)" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/" +# To prepare this tarball +# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \ +# -r JSS_4_2_RTM mozilla/security/corefonf +# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \ +# -r JSS_4_2_RTM mozilla/security/jss +# tar cvjf jss-4.2.tar.bz2 mozilla +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="MPL-1.1" +SLOT="3.4" +KEYWORDS="~x86" +IUSE="doc examples source" + +RDEPEND=">=virtual/jre-1.4 + >=dev-libs/nspr-4.3 + >=dev-libs/nss-3.9.2" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + app-arch/zip + dev-util/pkgconfig + >=sys-apps/sed-4" + +S=${WORKDIR}/mozilla + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}/${PN}-3.4-target_source.patch" + epatch "${FILESDIR}/${PN}-4.2-pkg-config.patch" + + echo "INCLUDES += -I${ROOT}usr/include/nss -I${ROOT}usr/include/nspr" \ + >> "${S}"/security/coreconf/headers.mk || die +} + +src_compile() { + export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)" + cd "${S}/security/coreconf" || die + emake -j1 BUILD_OPT=1 || die "coreconf make failed" + + cd "${S}/security/jss" || die + emake -j1 BUILD_OPT=1 || die "jss make failed" + if use doc; then + emake -j1 BUILD_OPT=1 javadoc || die "failed to create javadocs" + fi +} + +src_test() { + BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \ + "${S}"/dist/Linux*.OBJ/ +} + +src_install() { + java-pkg_dojar dist/*.jar + # Use this instead of the one in dist because it is a symlink + # and doso handles symlinks by just symlinking to the original + java-pkg_doso ./security/${PN}/lib/*/*.so + use doc && java-pkg_dojavadoc dist/jssdoc + use source && java-pkg_dosrc ./security/jss/org + if use examples; then + docinto examples + dodoc ./security/jss/samples/* + fi +} diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml index 8cbf83f2d1a1..6b82ef4099b3 100644 --- a/dev-java/jss/metadata.xml +++ b/dev-java/jss/metadata.xml @@ -6,8 +6,8 @@ -Network Security Services for Java (JSS) is a Java interface to NSS. It supports -most of the security standards and encryption technologies supported by NSS. JSS +Network Security Services for Java (JSS) is a Java interface to NSS. It supports +most of the security standards and encryption technologies supported by NSS. JSS also provides a pure Java interface for ASN.1 types and BER/DER encoding. -- 2.26.2