Bugzilla Bug #919476 - pkispawn crashes due to dangling symlink to jss4.jar

4 files changed, 23 insertions, 10 deletions

diff --git a/base/deploy/etc/default.cfg b/base/deploy/etc/default.cfg
index faed34044..32e744762 100644
--- a/base/deploy/etc/default.cfg
+++ b/base/deploy/etc/default.cfg
@@ -272,8 +272,8 @@ pki_nsutil_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-nsutil.
 # JAR paths
 # These are used in the processing of pkispawn and are not supposed
 # to be overwritten by user configuration files
-pki_jss_jar=%(arch_java_lib)s/jss4.jar
-pki_symkey_jar=%(arch_java_lib)s/symkey.jar
+pki_jss_jar=%(jni_jar_dir)s/jss4.jar
+pki_symkey_jar=%(jni_jar_dir)s/symkey.jar
 pki_apache_commons_collections_jar=/usr/share/java/apache-commons-collections.jar
 pki_apache_commons_lang_jar=/usr/share/java/apache-commons-lang.jar
 pki_apache_commons_logging_jar=/usr/share/java/apache-commons-logging.jar
diff --git a/base/deploy/etc/pki.conf b/base/deploy/etc/pki.conf
index 3e5a5e154..24decec52 100644
--- a/base/deploy/etc/pki.conf
+++ b/base/deploy/etc/pki.conf
@@ -1,2 +1,4 @@
 # RESTEasy library
 RESTEASY_LIB=${RESTEASY_LIB}
+# JNI jar file location
+JNI_JAR_DIR=${JNI_JAR_DIR}
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index 32a3da154..639b11820 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -170,11 +170,10 @@ class PKIConfigParser:
             'source /etc/pki/pki.conf && echo $RESTEASY_LIB',
             shell=True).strip()
 
-        # arch dependent libpath
-        if config.pki_architecture == 64:
-            arch_java_lib = '/usr/lib64/java'
-        else:
-            arch_java_lib = '/usr/lib/java'
+        # JNI jar location
+        jni_jar_dir = subprocess.check_output(\
+            'source /etc/pki/pki.conf && echo $JNI_JAR_DIR',
+            shell=True).strip()
 
         if config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS:
             default_instance_name = 'pki-tomcat'
@@ -194,7 +193,7 @@ class PKIConfigParser:
             'pki_subsystem_type': config.pki_subsystem.lower(),
             'pki_root_prefix' : config.pki_root_prefix,
             'resteasy_lib': resteasy_lib,
-            'arch_java_lib': arch_java_lib,
+            'jni_jar_dir': jni_jar_dir,
             'home_dir': os.path.expanduser("~"),
             'pki_hostname': config.pki_hostname})
 
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 6527bcb67..353d6cecd 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:             pki-core
 Version:          10.0.1
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -499,6 +499,15 @@ cd build
 %else
 	-DRESTEASY_LIB=/usr/share/java/resteasy \
 %endif
+%if 0%{?fedora} <= 18
+%ifarch x86_64
+	-DJNI_JAR_DIR=/usr/lib64/java \
+%else
+	-DJNI_JAR_DIR=/usr/lib/java \
+%endif
+%else
+	-DJNI_JAR_DIR=/usr/lib/java \
+%endif
 	%{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
 %if ! 0%{?rhel} && 0%{?fedora} <= 17
         -DBUILD_PKI_SELINUX:BOOL=ON \
@@ -997,7 +1006,10 @@ fi
 
 
 %changelog
-* Wed Mar 7 2013 Endi S. Dewata <edewata@redhat.com> 10.0.1-5
+* Fri Mar 8 2013 Matthew Harmsen <mharmsen@redhat.com> 10.0.1-6
+- Bugzilla Bug #919476 - pkispawn crashes due to dangling symlink to jss4.jar
+
+* Thu Mar 7 2013 Endi S. Dewata <edewata@redhat.com> 10.0.1-5
 - Added dependency on python-requests.
 - Reorganized Python module packaging.