|
 |
eb29d7 |
From b88754da750bc87fe9ae99d0571fc4432d87f8d3 Mon Sep 17 00:00:00 2001
|
|
|
eb29d7 |
From: Matthew Harmsen <mharmsen@redhat.com>
|
|
|
eb29d7 |
Date: Wed, 26 Nov 2014 11:19:41 -0700
|
|
|
eb29d7 |
Subject: [PATCH] Remove legacy multilib JNI_JAR_DIR logic (revised)
|
|
|
eb29d7 |
|
|
|
eb29d7 |
* Bugzilla Bug #1165351 - Errata TPS test fails due to dependent packages
|
|
|
eb29d7 |
not found - fixed shell tests
|
|
|
eb29d7 |
---
|
|
|
eb29d7 |
base/java-tools/templates/pki_java_command_wrapper.in | 4 +---
|
|
|
eb29d7 |
base/java-tools/templates/pretty_print_cert_command_wrapper.in | 4 +---
|
|
|
eb29d7 |
base/java-tools/templates/pretty_print_crl_command_wrapper.in | 4 +---
|
|
|
eb29d7 |
base/server/scripts/operations | 4 +---
|
|
|
eb29d7 |
4 files changed, 4 insertions(+), 12 deletions(-)
|
|
|
eb29d7 |
|
|
|
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 e9bea58..2c13d66 100644
|
|
|
eb29d7 |
--- a/base/java-tools/templates/pki_java_command_wrapper.in
|
|
|
eb29d7 |
+++ b/base/java-tools/templates/pki_java_command_wrapper.in
|
|
|
eb29d7 |
@@ -125,9 +125,7 @@ fi
|
|
|
eb29d7 |
## order this command wrapper uses to find jar files. ##
|
|
|
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 |
+JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && 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 0c15184..cd4888a 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 |
@@ -125,9 +125,7 @@ fi
|
|
|
eb29d7 |
## order this command wrapper uses to find jar files. ##
|
|
|
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 |
+JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && 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 02e223c..3596fae 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 |
@@ -125,9 +125,7 @@ fi
|
|
|
eb29d7 |
## order this command wrapper uses to find jar files. ##
|
|
|
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 |
+JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && 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/scripts/operations b/base/server/scripts/operations
|
|
|
eb29d7 |
index e89f1f6..92d01c3 100644
|
|
|
eb29d7 |
--- a/base/server/scripts/operations
|
|
|
eb29d7 |
+++ b/base/server/scripts/operations
|
|
|
eb29d7 |
@@ -1059,9 +1059,7 @@ verify_symlinks()
|
|
|
eb29d7 |
declare -A systemd_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 |
+ jni_jar_dir=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
|
|
|
eb29d7 |
|
|
|
eb29d7 |
# Dogtag 10 Symbolic Link Target Variables
|
|
|
eb29d7 |
java_dir="/usr/share/java"
|
|
|
eb29d7 |
--
|
|
|
eb29d7 |
1.8.3.1
|
|
|
eb29d7 |
|