Attachment 708666 Details for Bug 919476 – Patch for Koji build of Fedora 19

[patch] Patch for Koji build of Fedora 19

pki-core-10.0.1-bz919476.patch (text/plain), 3.38 KB, created by Matthew Harmsen on 2013-03-11 21:54:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Harmsen

Created: 2013-03-11 21:54:46 UTC

Size: 3.38 KB

patch

obsolete

>diff -rupN pki-core-10.0.1/base/deploy/etc/default.cfg pki-core-10.0.1.new/base/deploy/etc/default.cfg
>--- pki-core-10.0.1/base/deploy/etc/default.cfg	2013-01-11 07:54:53.000000000 -0800
>+++ pki-core-10.0.1.new/base/deploy/etc/default.cfg	2013-03-08 20:23:38.364090000 -0800
>@@ -267,8 +267,8 @@ pki_nsutil_jar_link=%(pki_tomcat_webapps
> # 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 -rupN pki-core-10.0.1/base/deploy/etc/pki.conf pki-core-10.0.1.new/base/deploy/etc/pki.conf
>--- pki-core-10.0.1/base/deploy/etc/pki.conf	2013-01-11 07:54:53.000000000 -0800
>+++ pki-core-10.0.1.new/base/deploy/etc/pki.conf	2013-03-08 20:23:52.658063000 -0800
>@@ -1,2 +1,4 @@
> # RESTEasy library
> RESTEASY_LIB=${RESTEASY_LIB}
>+# JNI jar file location
>+JNI_JAR_DIR=${JNI_JAR_DIR}
>diff -rupN pki-core-10.0.1/base/deploy/scripts/operations pki-core-10.0.1.new/base/deploy/scripts/operations
>--- pki-core-10.0.1/base/deploy/scripts/operations	2013-01-11 07:54:53.000000000 -0800
>+++ pki-core-10.0.1.new/base/deploy/scripts/operations	2013-03-11 08:48:08.416881000 -0700
>@@ -1088,11 +1088,7 @@ verify_symlinks()
>     declare -A systemd_symlinks
> 
>     # Dogtag 10 Conditional Variables
>-    if [ ${ARCHITECTURE} == "x86_64" ]; then
>-        jni_dir="/usr/lib64/java"
>-    else
>-        jni_dir="/usr/lib/java"
>-    fi
>+    jni_dir=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
> 
>     # Dogtag 10 Symbolic Link Target Variables
>     java_dir="/usr/share/java"
>diff -rupN pki-core-10.0.1/base/deploy/src/scriptlets/pkiparser.py pki-core-10.0.1.new/base/deploy/src/scriptlets/pkiparser.py
>--- pki-core-10.0.1/base/deploy/src/scriptlets/pkiparser.py	2013-01-11 07:54:53.000000000 -0800
>+++ pki-core-10.0.1.new/base/deploy/src/scriptlets/pkiparser.py	2013-03-08 20:54:11.903427000 -0800
>@@ -198,11 +198,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()
> 
>             predefined_dict = {'pki_instance_name': default_instance_name,
>                                'pki_http_port': default_http_port,
>@@ -212,7 +211,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}
>

Actions: View | Diff

Attachments on bug 919476: 707215 | 708665 | 708666 | 708667