|
 |
eb29d7 |
From d3b2f55279c540f70d468cd969a4ae16d0f2fbb3 Mon Sep 17 00:00:00 2001
|
|
|
eb29d7 |
From: Matthew Harmsen <mharmsen@redhat.com>
|
|
|
eb29d7 |
Date: Wed, 19 Nov 2014 14:57:43 -0700
|
|
|
eb29d7 |
Subject: [PATCH] Remove legacy multilib JNI_JAR_DIR logic
|
|
|
eb29d7 |
|
|
|
eb29d7 |
* Bugzilla Bug #1165351 - Errata TPS test fails due to dependent packages not
|
|
|
eb29d7 |
found
|
|
|
eb29d7 |
---
|
|
|
eb29d7 |
base/common/share/etc/pki.conf | 2 +-
|
|
|
eb29d7 |
base/java-tools/templates/pki_java_command_wrapper.in | 2 ++
|
|
|
eb29d7 |
.../templates/pretty_print_cert_command_wrapper.in | 2 ++
|
|
|
eb29d7 |
.../templates/pretty_print_crl_command_wrapper.in | 2 ++
|
|
|
eb29d7 |
base/server/python/pki/server/deployment/pkiparser.py | 3 ++-
|
|
|
eb29d7 |
base/server/scripts/operations | 2 ++
|
|
|
eb29d7 |
6 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
eb29d7 |
|
|
|
eb29d7 |
diff --git a/base/common/share/etc/pki.conf b/base/common/share/etc/pki.conf
|
|
|
eb29d7 |
index f352344..a43d1d6 100644
|
|
|
eb29d7 |
--- a/base/common/share/etc/pki.conf
|
|
|
eb29d7 |
+++ b/base/common/share/etc/pki.conf
|
|
|
eb29d7 |
@@ -1,2 +1,2 @@
|
|
|
eb29d7 |
# JNI jar file location
|
|
|
eb29d7 |
-JNI_JAR_DIR=${JNI_JAR_DIR}
|
|
|
eb29d7 |
+JNI_JAR_DIR=/usr/lib/java
|
|
|
eb29d7 |
diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in
|
|
|
eb29d7 |
index e9ff005..e9bea58 100644
|
|
|
eb29d7 |
--- a/base/java-tools/templates/pki_java_command_wrapper.in
|
|
|
eb29d7 |
+++ b/base/java-tools/templates/pki_java_command_wrapper.in
|
|
|
eb29d7 |
@@ -126,6 +126,8 @@ fi
|
|
|
eb29d7 |
###############################################################################
|
|
|
eb29d7 |
|
|
|
eb29d7 |
JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
+# Override JNI_JAR_DIR using a user-defined value if one exists
|
|
|
eb29d7 |
+JNI_JAR_DIR=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
CP=${JNI_JAR_DIR}/jss4.jar
|
|
|
eb29d7 |
CP=/usr/share/java/commons-codec.jar:${CP}
|
|
|
eb29d7 |
CP=/usr/share/java/ldapjdk.jar:${CP}
|
|
|
eb29d7 |
diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
|
|
|
eb29d7 |
index 811935e..0c15184 100644
|
|
|
eb29d7 |
--- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in
|
|
|
eb29d7 |
+++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
|
|
|
eb29d7 |
@@ -126,6 +126,8 @@ fi
|
|
|
eb29d7 |
###############################################################################
|
|
|
eb29d7 |
|
|
|
eb29d7 |
JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
+# Override JNI_JAR_DIR using a user-defined value if one exists
|
|
|
eb29d7 |
+JNI_JAR_DIR=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
CP=${JNI_JAR_DIR}/jss4.jar
|
|
|
eb29d7 |
CP=/usr/share/java/commons-codec.jar:${CP}
|
|
|
eb29d7 |
CP=/usr/share/java/ldapjdk.jar:${CP}
|
|
|
eb29d7 |
diff --git a/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
|
|
|
eb29d7 |
index e70b9ab..02e223c 100644
|
|
|
eb29d7 |
--- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in
|
|
|
eb29d7 |
+++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
|
|
|
eb29d7 |
@@ -126,6 +126,8 @@ fi
|
|
|
eb29d7 |
###############################################################################
|
|
|
eb29d7 |
|
|
|
eb29d7 |
JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
+# Override JNI_JAR_DIR using a user-defined value if one exists
|
|
|
eb29d7 |
+JNI_JAR_DIR=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
CP=${JNI_JAR_DIR}/jss4.jar
|
|
|
eb29d7 |
|
|
|
eb29d7 |
CP=/usr/share/java/commons-codec.jar:${CP}
|
|
|
eb29d7 |
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
|
|
|
eb29d7 |
index df636d4..971cb45 100644
|
|
|
eb29d7 |
--- a/base/server/python/pki/server/deployment/pkiparser.py
|
|
|
eb29d7 |
+++ b/base/server/python/pki/server/deployment/pkiparser.py
|
|
|
eb29d7 |
@@ -170,7 +170,8 @@ class PKIConfigParser:
|
|
|
eb29d7 |
|
|
|
eb29d7 |
# JNI jar location
|
|
|
eb29d7 |
jni_jar_dir = subprocess.check_output(
|
|
|
eb29d7 |
- 'source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR',
|
|
|
eb29d7 |
+ '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf '
|
|
|
eb29d7 |
+ '&& echo $JNI_JAR_DIR',
|
|
|
eb29d7 |
shell=True)
|
|
|
eb29d7 |
# workaround for pylint error E1103
|
|
|
eb29d7 |
jni_jar_dir = str(jni_jar_dir).strip()
|
|
|
eb29d7 |
diff --git a/base/server/scripts/operations b/base/server/scripts/operations
|
|
|
eb29d7 |
index 7d026fe..e89f1f6 100644
|
|
|
eb29d7 |
--- a/base/server/scripts/operations
|
|
|
eb29d7 |
+++ b/base/server/scripts/operations
|
|
|
eb29d7 |
@@ -1060,6 +1060,8 @@ verify_symlinks()
|
|
|
eb29d7 |
|
|
|
eb29d7 |
# Dogtag 10 Conditional Variables
|
|
|
eb29d7 |
jni_jar_dir=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
+ # Override jni_jar_dir using a user-defined value if one exists
|
|
|
eb29d7 |
+ jni_jar_dir=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
|
|
|
eb29d7 |
# Dogtag 10 Symbolic Link Target Variables
|
|
|
eb29d7 |
java_dir="/usr/share/java"
|
|
|
eb29d7 |
|