diff --git a/pki-core-10.0.1-bz919476.patch b/pki-core-10.0.1-bz919476.patch new file mode 100644 index 0000000..c73aecd --- /dev/null +++ b/pki-core-10.0.1-bz919476.patch @@ -0,0 +1,66 @@ +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} + diff --git a/pki-core.spec b/pki-core.spec index 15fa25e..f829e81 100644 --- a/pki-core.spec +++ b/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: 2%{?dist} +Release: 2.1%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -55,6 +55,8 @@ BuildRequires: selinux-policy-devel >= 3.10.0-151 Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz +Patch0: %{name}-%{version}-bz919476.patch + %if 0%{?rhel} ExcludeArch: ppc ppc64 s390 s390x %endif @@ -473,6 +475,9 @@ This package is a part of the PKI Core used by the Certificate System. %prep %setup -q -n %{name}-%{version}%{?prerel} + +%patch0 -p1 -b .p0 + %clean %{__rm} -rf %{buildroot} @@ -489,6 +494,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 \ @@ -985,6 +999,9 @@ fi %changelog +* Fri Mar 8 2013 Matthew Harmsen 10.0.1-2.1 +- Bugzilla Bug #919476 - pkispawn crashes due to dangling symlink to jss4.jar + * Thu Feb 14 2013 Fedora Release Engineering - 10.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -1167,7 +1184,7 @@ fi * Thu Jun 14 2012 Matthew Harmsen 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 10.0.0-0.17.a1 +* Tue May 29 2012 Endi S. Dewata 10.0.0-0.17.a1 - Added CLI for REST services * Fri May 18 2012 Matthew Harmsen 10.0.0-0.16.a1 @@ -1182,7 +1199,7 @@ fi * Thu Apr 5 2012 Christina Fu 10.0.0-0.14.a1 - Bug 745278 - [RFE] ECC encryption keys cannot be archived -* Fri Mar 27 2012 Endi S. Dewata 10.0.0-0.13.a1 +* Tue Mar 27 2012 Endi S. Dewata 10.0.0-0.13.a1 - Replaced candlepin-deps with resteasy * Fri Mar 23 2012 Endi S. Dewata 10.0.0-0.12.a1 @@ -1218,7 +1235,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 10.0.0-0.4.a1 +* Thu Feb 23 2012 Endi S. Dewata 10.0.0-0.4.a1 - Added dependency on Apache Commons Codec. * Wed Feb 22 2012 Matthew Harmsen 10.0.0-0.3.a1