Attachment 708665 Details for Bug 919476 – Additional fix for platform-dependent JNI jar files

[patch] Additional fix for platform-dependent JNI jar files

20130311-Bugzilla-Bug-919476-pkispawn-crashes-due-to-dangling-2.patch (text/plain), 2.33 KB, created by Matthew Harmsen on 2013-03-11 21:53:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Harmsen

Created: 2013-03-11 21:53:43 UTC

Size: 2.33 KB

patch

obsolete

>From 6edaefb71899e69c5ff99086138120430f3b5953 Mon Sep 17 00:00:00 2001
>From: Matthew Harmsen <mharmsen@redhat.com>
>Date: Mon, 11 Mar 2013 21:26:49 -0700
>Subject: [PATCH] Bugzilla Bug #919476 - pkispawn crashes due to dangling
> symlink to jss4.jar
>
>* Additional fix for Fedora 19+
>---
> base/deploy/scripts/operations | 6 +-----
> specs/pki-core.spec            | 6 +++---
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
>diff --git a/base/deploy/scripts/operations b/base/deploy/scripts/operations
>index 63a6bdb..50dd4e4 100644
>--- a/base/deploy/scripts/operations
>+++ b/base/deploy/scripts/operations
>@@ -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 --git a/specs/pki-core.spec b/specs/pki-core.spec
>index 353d6ce..a411745 100644
>--- a/specs/pki-core.spec
>+++ b/specs/pki-core.spec
>@@ -1203,7 +1203,7 @@ fi
> * Thu Jun 14 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.18.a1
> - Updated release of 'tomcatjss' to rely on Tomcat 7 for Fedora 18
> 
>-* Mon May 29 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.17.a1
>+* Tue May 29 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.17.a1
> - Added CLI for REST services
> 
> * Fri May 18 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.16.a1
>@@ -1218,7 +1218,7 @@ fi
> * Thu Apr  5 2012 Christina Fu <cfu@redhat.com> 10.0.0-0.14.a1
> - Bug 745278 - [RFE] ECC encryption keys cannot be archived
> 
>-* Fri Mar 27 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.13.a1
>+* Tue Mar 27 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.13.a1
> - Replaced candlepin-deps with resteasy
> 
> * Fri Mar 23 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.12.a1
>@@ -1254,7 +1254,7 @@ fi
> -      Bugzilla Bug #739708 - Selinux fix for ephemeral ports (F16)
> -      Bugzilla Bug #795966 - pki-selinux policy is kind of a mess (F17)
> 
>-* Wed Feb 23 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.4.a1
>+* Thu Feb 23 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.4.a1
> - Added dependency on Apache Commons Codec.
> 
> * Wed Feb 22 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.3.a1
>-- 
>1.8.1.4
>

Actions: View | Diff

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