gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 18:47:16 -08:00
Code Issues Projects Releases Wiki Activity

dev-java/jss: treeclean

Browse Source 
Closes: https://bugs.gentoo.org/721052
Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
This commit is contained in:
Jakov Smolić
2021-12-26 18:50:00 +01:00
parent 72ca225921
commit e7e084bdd8
10 changed files with 0 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-java/jss/Manifest
-1
View File
@@ -1 +0,0 @@
DIST jss-4.3.2.tar.bz2 435542 BLAKE2B 9623018e6e67654219fa439fdc907777cd286aa28b6bdbafee39a7082f949bc393d60dba32ca0b49178ecd423dcff0aa3ad411abb9db9332c6429d7751d89127 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232
dev-java/jss/files/jss-3.4-target_source.patch
-11
View File
@@ -1,11 +0,0 @@
--- a/mozilla/security/jss/build_java.pl
+++ b/mozilla/security/jss/build_java.pl
@@ -190,7 +190,7 @@
#
if( scalar(@source_list) > 0 ) {
ensure_dir_exists($class_dir);
- print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
+ print_do("$javac $ENV{JAVA_GENTOO_OPTS} $javac_opt_flag -sourcepath . -d $class_dir " .
"$classpath " . join(" ",@source_list));
}
dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
-24
View File
@@ -1,24 +0,0 @@
Submitted By: Mario Fetka (mario-fetka at gmx dot at)
Date: 2007-10-06
Initial Package Version: 4.2.5
Origin: me
Upstream Status: #392775 UNCONFIRMED
Description: this patch adds pkgconfig support to jss coreconf
!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
--- a/mozilla/security/coreconf/location.mk
+++ b/mozilla/security/coreconf/location.mk
@@ -67,6 +67,13 @@
GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
+ifdef USE_PKGCONFIG
+ NSPR_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSPR_PKGCONFIG)`
+ NSPR_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSPR_PKGCONFIG)`
+ NSS_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSS_PKGCONFIG)`
+ NSS_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSS_PKGCONFIG)`
+endif
+
ifdef NSPR_INCLUDE_DIR
INCLUDES += -I$(NSPR_INCLUDE_DIR)
endif
dev-java/jss/files/jss-4.3-cflags.patch
-11
View File
@@ -1,11 +0,0 @@
--- a/security/coreconf/command.mk
+++ b/security/coreconf/command.mk
@@ -45,7 +45,7 @@
CCF = $(CC) $(CFLAGS)
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
$(XCFLAGS)
PERL = perl
RANLIB = echo
dev-java/jss/files/jss-4.3-javadoc.patch
-11
View File
@@ -1,11 +0,0 @@
--- a/security/jss/build_java.pl
+++ b/security/jss/build_java.pl
@@ -323,7 +323,7 @@
ensure_dir_exists("$dist_dir/jssdoc");
my $targets = join(" ", @packages);
print "$targets\n";
- print_do("$javadoc -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
+ print_do("$javadoc -Xdoclint:none -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
print_do("cp $dist_dir/jssdoc/index.html $dist_dir/jssdoc/index.html.bak");
print_do("cp $dist_dir/jssdoc/overview-summary.html $dist_dir/jssdoc/index.html");
}
dev-java/jss/files/jss-4.3-secitem.patch
-154
View File
@@ -1,154 +0,0 @@
--- a/security/jss/org/mozilla/jss/CryptoManager.c
+++ b/security/jss/org/mozilla/jss/CryptoManager.c
@@ -35,7 +35,7 @@
* ***** END LICENSE BLOCK ***** */
#include "_jni/org_mozilla_jss_CryptoManager.h"
-#include <secitem.h>
+#include <nss/secitem.h>
#include <secmod.h>
#include <cert.h>
#include <certt.h>
--- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
+++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
@@ -36,7 +36,7 @@
#include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
#include <nspr.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include <jss_exceptions.h>
#include <jssutil.h>
#include <pk11func.h>
--- a/security/jss/org/mozilla/jss/crypto/PQGParams.c
+++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c
@@ -39,7 +39,7 @@
#include <nspr.h>
#include <plarena.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include <secoidt.h>
#include <keyt.h> /* for PQGParams */
#include <pk11pqg.h>
--- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
+++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
@@ -36,7 +36,7 @@
#include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h"
#include <nspr.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include <pk11sdr.h>
#include <jss_exceptions.h>
#include <jssutil.h>
--- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
@@ -40,7 +40,7 @@
#include <plarena.h>
#include <seccomon.h>
#include <pk11func.h>
-#include <secitem.h>
+#include <nss/secitem.h>
/* JSS includes */
#include <java_ids.h>
--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
@@ -40,7 +40,7 @@
#include <pk11pqg.h>
#include <nspr.h>
#include <key.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include <jssutil.h>
#include <pk11util.h>
--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
@@ -40,7 +40,7 @@
#include <plarena.h>
#include <seccomon.h>
#include <pk11func.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include <keyt.h>
/* JSS includes */
--- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
+++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
@@ -40,7 +40,7 @@
#include <plarena.h>
#include <seccomon.h>
#include <pk11func.h>
-#include <secitem.h>
+#include <nss/secitem.h>
/* JSS includes */
#include <java_ids.h>
--- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
+++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
@@ -43,7 +43,7 @@
#include <secerr.h>
#include <nspr.h>
#include <key.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include <jss_bigint.h>
#include <jssutil.h>
--- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
@@ -35,7 +35,7 @@
* ***** END LICENSE BLOCK ***** */
#include <nspr.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include <secoidt.h>
#include <secmodt.h>
#include <pk11func.h>
--- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
@@ -53,7 +53,7 @@
#include <jss_bigint.h>
#include <Algorithm.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include "java_ids.h"
#include "pk11util.h"
--- a/security/jss/org/mozilla/jss/ssl/callbacks.c
+++ b/security/jss/org/mozilla/jss/ssl/callbacks.c
@@ -39,7 +39,7 @@
#include <nspr.h>
#include <java_ids.h>
#include <jss_exceptions.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include <jssutil.h>
#include <certt.h>
#include <keythi.h>
--- a/security/jss/org/mozilla/jss/util/jssutil.c
+++ b/security/jss/org/mozilla/jss/util/jssutil.c
@@ -38,7 +38,7 @@
#include <nspr.h>
#include <plstr.h>
#include <seccomon.h>
-#include <secitem.h>
+#include <nss/secitem.h>
#include "jssutil.h"
#include "jss_bigint.h"
#include "jss_exceptions.h"
--- a/security/jss/org/mozilla/jss/util/jssutil.h
+++ b/security/jss/org/mozilla/jss/util/jssutil.h
@@ -39,7 +39,7 @@
/* Need to include these first.
* #include <nspr.h>
* #include <jni.h>
- * #include <secitem.h>
+ * #include <nss/secitem.h>
*/
PR_BEGIN_EXTERN_C
dev-java/jss/files/jss-4.3.2-ldflags.patch
-11
View File
@@ -1,11 +0,0 @@
--- a/security/coreconf/Linux.mk
+++ b/security/coreconf/Linux.mk
@@ -142,7 +142,7 @@
ARCH = linux
DSO_CFLAGS = -fPIC
-DSO_LDOPTS = -shared $(ARCHFLAG)
+DSO_LDOPTS = $(LDFLAGS) -shared $(ARCHFLAG)
# The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
# incorrectly reports undefined references in the libraries we link with, so
# we don't use -z defs there.
dev-java/jss/jss-4.3.2.ebuild
-95
View File
@@ -1,95 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
JAVA_PKG_IUSE="doc source"
inherit multilib toolchain-funcs java-pkg-2
DESCRIPTION="Network Security Services for Java (JSS)"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS"
# 4.3.2 was released but was seemingly never announced. The binary jar
# exists on Mozilla's servers but Chewi could only find a source tarball
# at https://obs.kolabsys.com/package/show/Kolab:3.4/jss. However, you
# need to register in order to download it, hence he has mirrored it.
SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2"
LICENSE="MPL-1.1"
SLOT="3.4"
KEYWORDS="amd64 x86"
IUSE="examples test"
CDEPEND=">=dev-libs/nspr-4.7.1
>=dev-libs/nss-3.12.5"
DEPEND="${CDEPEND}
dev-lang/perl
>=virtual/jdk-1.6
virtual/pkgconfig
test? ( dev-libs/nss[utils] )"
RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
S="${WORKDIR}/${P}/mozilla"
java_prepare() {
epatch "${FILESDIR}"/${PN}-3.4-target_source.patch
epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch
epatch "${FILESDIR}"/${PN}-4.3-cflags.patch
epatch "${FILESDIR}"/${PN}-4.3.2-ldflags.patch
epatch "${FILESDIR}"/${PN}-4.3-secitem.patch
if java-pkg_is-vm-version-ge 1.8; then
epatch "${FILESDIR}"/${PN}-4.3-javadoc.patch
fi
}
src_compile() {
local ARGS=(
"CC=$(tc-getCC)"
"AR=$(tc-getAR) cr \$@"
"OS_RELEASE=2.6"
"BUILD_OPT=1"
)
tc-export PKG_CONFIG
export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
use amd64 && export USE_64=1
cd "${S}/security/coreconf" || die
emake -j1 "${ARGS[@]}"
cd "${S}/security/jss" || die
emake -j1 "${ARGS[@]}" USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr
use doc && emake -j1 "${ARGS[@]}" javadoc
}
# Chewi has managed to reach a test pass rate of 31/40 (78%) but the
# remainder fail due to JSS not having kept pace with the ciphersuites
# in NSS. There's not much we can do about that. The suite also leaves
# java processes running and exits successfully on failure.
RESTRICT="test"
src_test() {
# Parts of NSS are required for the tests.
ln -snf "${EROOT}usr/$(get_libdir)/libnssckbi.so" dist/Linux*.OBJ/lib/ || die
ln -snf "${EROOT}usr/bin" dist/Linux*.OBJ/ || die
# The tests must be run from this directory.
cd security/jss/org/mozilla/jss/tests || die
BUILD_OPT=1 perl all.pl dist "${S}"/dist/Linux*.OBJ/ || die "tests failed"
}
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
use examples && java-pkg_doexamples ./security/jss/samples
}
dev-java/jss/metadata.xml
-16
View File
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
<longdescription>
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.
</longdescription>
</pkgmetadata>
profiles/package.mask
-8
View File
@@ -275,14 +275,6 @@ www-apache/mod_extract_forwarded
# Removal in 30 days. Bug #827654
www-apache/mod_evasive
# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-26)
# Library without consumers. Removal in 30 days.
dev-java/jss
# Alfredo Tupone <tupone@gentoo.org> (2021-11-26)
# EAPI 6. Removal in 30 days. Bug @827158
=dev-lang/gnat-gpl-2019-r2
# Hans de Graaff <graaff@gentoo.org> (2021-11-26)
# Mask new rubygems version for testing. This version uses a new
# gentoo-defaults profile, bug #789957