Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-java/jss/files/jss-3.4-target_source.patch5
-rw-r--r--dev-java/jss/files/jss-4.2.5-use_pkg-config.patch13
-rw-r--r--dev-java/jss/files/jss-4.3-cflags.patch4
-rw-r--r--dev-java/jss/files/jss-4.3-javadoc.patch4
-rw-r--r--dev-java/jss/files/jss-4.3-secitem.patch56
-rw-r--r--dev-java/jss/files/jss-4.3.2-ldflags.patch4
-rw-r--r--dev-java/jss/jss-4.3.2.ebuild4
7 files changed, 45 insertions, 45 deletions
diff --git a/dev-java/jss/files/jss-3.4-target_source.patch b/dev-java/jss/files/jss-3.4-target_source.patch
index e024a0b8b622..5d5ce6409654 100644
--- a/dev-java/jss/files/jss-3.4-target_source.patch
+++ b/dev-java/jss/files/jss-3.4-target_source.patch
@@ -1,6 +1,5 @@
-diff -Nru jss-3.4-src/mozilla/security/jss/build_java.pl jss-3.4-src.patched/mozilla/security/jss/build_java.pl
---- jss-3.4-src/mozilla/security/jss/build_java.pl 2002-10-17 02:33:29.000000000 +0200
-+++ jss-3.4-src.patched/mozilla/security/jss/build_java.pl 2006-08-15 00:53:05.000000000 +0200
+--- a/mozilla/security/jss/build_java.pl
++++ b/mozilla/security/jss/build_java.pl
@@ -190,7 +190,7 @@
#
if( scalar(@source_list) > 0 ) {
diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
index a2c3a3e5ad93..adf2862c90e6 100644
--- a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
+++ b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
@@ -6,18 +6,17 @@ Upstream Status: #392775 UNCONFIRMED
Description: this patch adds pkgconfig support to jss coreconf
!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
-diff -Naur mozilla.orig/security/coreconf/location.mk mozilla/security/coreconf/location.mk
---- mozilla.orig/security/coreconf/location.mk 2006-02-27 21:18:31.000000000 +0000
-+++ mozilla/security/coreconf/location.mk 2007-10-06 10:10:17.000000000 +0000
+--- 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)`
++ 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
diff --git a/dev-java/jss/files/jss-4.3-cflags.patch b/dev-java/jss/files/jss-4.3-cflags.patch
index 3298a2765fc1..8b9705ca1e3d 100644
--- a/dev-java/jss/files/jss-4.3-cflags.patch
+++ b/dev-java/jss/files/jss-4.3-cflags.patch
@@ -1,5 +1,5 @@
---- security/coreconf/command.mk 2007-10-23 23:55:00.000000000 +0200
-+++ security/coreconf/command.mk.b 2013-06-05 11:15:31.092383902 +0200
+--- a/security/coreconf/command.mk
++++ b/security/coreconf/command.mk
@@ -45,7 +45,7 @@
CCF = $(CC) $(CFLAGS)
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch
index 891e1ff93838..87941029bcee 100644
--- a/dev-java/jss/files/jss-4.3-javadoc.patch
+++ b/dev-java/jss/files/jss-4.3-javadoc.patch
@@ -1,5 +1,5 @@
---- security/jss/build_java.pl.orig 2015-10-01 23:04:22.540035573 +0100
-+++ security/jss/build_java.pl 2015-10-01 23:11:41.413230402 +0100
+--- 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);
diff --git a/dev-java/jss/files/jss-4.3-secitem.patch b/dev-java/jss/files/jss-4.3-secitem.patch
index d9e7da394075..a215bc628ea7 100644
--- a/dev-java/jss/files/jss-4.3-secitem.patch
+++ b/dev-java/jss/files/jss-4.3-secitem.patch
@@ -1,5 +1,5 @@
---- a/security/jss/org/mozilla/jss/CryptoManager.c 2008-05-22 06:28:09.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/CryptoManager.c 2013-06-05 11:09:58.649080012 +0200
+--- 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"
@@ -9,8 +9,8 @@
#include <secmod.h>
#include <cert.h>
#include <certt.h>
---- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c 2003-12-19 20:36:30.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c 2013-06-05 11:09:58.585746684 +0200
+--- 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"
@@ -20,8 +20,8 @@
#include <jss_exceptions.h>
#include <jssutil.h>
#include <pk11func.h>
---- a/security/jss/org/mozilla/jss/crypto/PQGParams.c 2004-04-25 17:02:21.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c 2013-06-05 11:09:58.589080017 +0200
+--- 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>
@@ -31,8 +31,8 @@
#include <secoidt.h>
#include <keyt.h> /* for PQGParams */
#include <pk11pqg.h>
---- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c 2002-01-08 20:38:46.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c 2013-06-05 11:09:58.585746684 +0200
+--- 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"
@@ -42,8 +42,8 @@
#include <pk11sdr.h>
#include <jss_exceptions.h>
#include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c 2004-04-25 17:02:22.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c 2013-06-05 11:09:58.632413347 +0200
+--- 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>
@@ -53,8 +53,8 @@
/* JSS includes */
#include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c 2006-02-23 02:21:42.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c 2013-06-05 11:09:58.595746684 +0200
+--- 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>
@@ -64,8 +64,8 @@
#include <jssutil.h>
#include <pk11util.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2006-02-23 02:21:42.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2013-06-05 11:09:58.629080014 +0200
+--- 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>
@@ -75,8 +75,8 @@
#include <keyt.h>
/* JSS includes */
---- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c 2004-04-25 17:02:22.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c 2013-06-05 11:09:58.609080016 +0200
+--- 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>
@@ -86,8 +86,8 @@
/* JSS includes */
#include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c 2006-04-25 03:26:42.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c 2013-06-05 11:09:58.609080016 +0200
+--- 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>
@@ -97,8 +97,8 @@
#include <jss_bigint.h>
#include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c 2004-04-25 17:02:22.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c 2013-06-05 11:09:58.605746683 +0200
+--- 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 ***** */
@@ -108,8 +108,8 @@
#include <secoidt.h>
#include <secmodt.h>
#include <pk11func.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c 2007-11-10 01:37:57.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c 2013-06-05 11:09:58.622413348 +0200
+--- 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>
@@ -119,8 +119,8 @@
#include "java_ids.h"
#include "pk11util.h"
---- a/security/jss/org/mozilla/jss/ssl/callbacks.c 2004-09-03 20:32:03.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/ssl/callbacks.c 2013-06-05 11:09:58.565746686 +0200
+--- 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>
@@ -130,8 +130,8 @@
#include <jssutil.h>
#include <certt.h>
#include <keythi.h>
---- a/security/jss/org/mozilla/jss/util/jssutil.c 2004-04-25 17:02:29.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/util/jssutil.c 2013-06-05 11:09:58.579080018 +0200
+--- 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>
@@ -141,8 +141,8 @@
#include "jssutil.h"
#include "jss_bigint.h"
#include "jss_exceptions.h"
---- a/security/jss/org/mozilla/jss/util/jssutil.h 2004-04-25 17:02:29.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/util/jssutil.h 2013-06-05 11:09:49.829080794 +0200
+--- 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>
diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch
index fde2e26bf77c..11687fac4a09 100644
--- a/dev-java/jss/files/jss-4.3.2-ldflags.patch
+++ b/dev-java/jss/files/jss-4.3.2-ldflags.patch
@@ -1,5 +1,5 @@
---- security/coreconf/Linux.mk.orig 2010-01-15 22:19:00.000000000 +0000
-+++ security/coreconf/Linux.mk 2015-09-27 22:17:50.102547607 +0100
+--- a/security/coreconf/Linux.mk
++++ b/security/coreconf/Linux.mk
@@ -142,7 +142,7 @@
ARCH = linux
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
index 077c3bf848fb..5c5137e81997 100644
--- a/dev-java/jss/jss-4.3.2.ebuild
+++ b/dev-java/jss/jss-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -53,6 +53,8 @@ src_compile() {
"BUILD_OPT=1"
)
+ tc-export PKG_CONFIG
+
export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
use amd64 && export USE_64=1