[pki-ocsp/f15] Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen) Bugzilla Bug #699809 -

Fri Oct 7 02:33:08 UTC 2011

commit 30fd0c31716b04e817a47f91575d08aa956d4a0f
Author: Kevin Wright <kwright at redhat.com>
Date:   Thu Oct 6 19:33:07 2011 -0700

    Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
    Bugzilla Bug #699809 - Convert CS to use systemd (alee)
    Bugzilla Bug #730146 - SSL handshake picks non-FIPS ciphers in FIPS mode (cfu)

 .gitignore    |    1 +
 clog          |    5 ++-
 pki-ocsp.spec |  104 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 sources       |    2 +-
 4 files changed, 103 insertions(+), 9 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 5d82826..4d128b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ pki-ocsp-1.3.3.tar.gz
 /pki-ocsp-9.0.2.tar.gz
 /pki-ocsp-9.0.3.tar.gz
 /pki-ocsp-9.0.4.tar.gz
+/pki-ocsp-9.0.7.tar.gz
diff --git a/clog b/clog
index 1e402f7..21d3171 100644
--- a/clog
+++ b/clog
@@ -1,2 +1,3 @@
-Bugzilla Bug #712931 - CS requires too many ports
-to be open in the FW
+Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
+Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+Bugzilla Bug #730146 - SSL handshake picks non-FIPS ciphers in FIPS mode (cfu)
diff --git a/pki-ocsp.spec b/pki-ocsp.spec
index c72511d..7d7e07b 100644
--- a/pki-ocsp.spec
+++ b/pki-ocsp.spec
@@ -1,5 +1,5 @@
 Name:             pki-ocsp
-Version:          9.0.4
+Version:          9.0.7
 Release:          1%{?dist}
 Summary:          Certificate System - Online Certificate Status Protocol Manager
 URL:              http://pki.fedoraproject.org/
@@ -10,30 +10,58 @@ BuildArch:        noarch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# specify '_unitdir' macro for platforms that don't use 'systemd'
+%if 0%{?rhel} || 0%{?fedora} < 16
+%define           _unitdir /lib/systemd/system
+%endif
+
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
+%if 0%{?fedora} >= 16
+BuildRequires:    jpackage-utils >= 0:1.7.5-10
+BuildRequires:    jss >= 4.2.6-19.1
+BuildRequires:    pki-common >= 9.0.15
+BuildRequires:    pki-util >= 9.0.15
+BuildRequires:    systemd-units
+%else
+BuildRequires:    jpackage-utils
+BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    pki-common
 BuildRequires:    pki-util
+%endif
 
 Requires:         java >= 1:1.6.0
+Requires:         pki-ocsp-theme >= 9.0.0
+%if 0%{?fedora} >= 16
+Requires:         pki-common >= 9.0.15
+Requires:         pki-selinux >= 9.0.15
+Requires(post):   systemd-units
+Requires(preun):  systemd-units
+Requires(postun): systemd-units
+%else
+%if 0%{?fedora} >= 15
 Requires:         pki-common
-Requires:         pki-ocsp-theme
 Requires:         pki-selinux
 Requires(post):   chkconfig
 Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
-%if 0%{?fedora} >= 15
 # Details:
 #
 #     * https://fedoraproject.org/wiki/Features/var-run-tmpfs
 #     * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft
 #
 Requires:         initscripts
+%else 
+Requires:         pki-common
+Requires:         pki-selinux
+Requires(post):   chkconfig
+Requires(preun):  chkconfig
+Requires(preun):  initscripts
+Requires(postun): initscripts
+%endif
 %endif
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
@@ -101,7 +129,7 @@ Additionally, Certificate System requires ONE AND ONLY ONE of the following
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_OCSP:BOOL=ON ..
+%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_OCSP:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} ..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -124,7 +152,14 @@ echo "D /var/run/pki 0755 root root -"       >> %{buildroot}%{_sysconfdir}/tmpfi
 echo "D /var/run/pki/ocsp 0755 root root -"  >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ocsp.conf
 %endif
 
+%if 0%{?fedora} >= 16
+%{__rm} %{buildroot}%{_initrddir}/pki-ocspd
+%else
+%{__rm} -rf %{buildroot}%{_sysconfdir}/systemd/system/pki-ocspd.target.wants
+%{__rm} -rf %{buildroot}%{_unitdir}
+%endif
 
+%if 0%{?rhel} || 0%{?fedora} < 16
 %post
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add pki-ocspd || :
@@ -142,11 +177,56 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service pki-ocspd condrestart >/dev/null 2>&1 || :
 fi
 
+%else 
+%post 
+# Attempt to update ALL old "OCSP" instances to "systemd"
+for inst in `ls /etc/sysconfig/pki/ocsp`; do
+    if [ ! -e "/etc/systemd/system/pki-ocspd.target.wants/pki-ocspd@${inst}.service" ]; then
+        ln -s "/lib/systemd/system/pki-ocspd at .service" \
+              "/etc/systemd/system/pki-ocspd.target.wants/pki-ocspd@${inst}.service"
+        [ -L /var/lib/${inst}/${inst} ] && unlink /var/lib/${inst}/${inst}
+        ln -s /usr/sbin/tomcat6-sysd /var/lib/${inst}/${inst}
+
+        if [ -e /var/run/${inst}.pid ]; then
+            kill -9 `cat /var/run/${inst}.pid` || :
+            rm -f /var/run/${inst}.pid
+            echo "pkicreate.systemd.servicename=pki-ocspd@${inst}.service" >> \
+                 /var/lib/${inst}/conf/CS.cfg || :
+            /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+            /bin/systemctl restart pki-ocspd@${inst}.service || :
+        else 
+            echo "pkicreate.systemd.servicename=pki-ocspd@${inst}.service" >> \
+                 /var/lib/${inst}/conf/CS.cfg || :
+        fi
+    fi
+done
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ 
+%preun 
+if [ $1 = 0 ] ; then
+    /bin/systemctl --no-reload disable pki-ocspd.target > /dev/null 2>&1 || :
+    /bin/systemctl stop pki-ocspd.target > /dev/null 2>&1 || :
+fi
+
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ "$1" -ge "1" ] ; then
+    /bin/systemctl try-restart pki-ocspd.target >/dev/null 2>&1 || :
+fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc base/ocsp/LICENSE
+%if 0%{?fedora} >= 16
+%dir %{_sysconfdir}/systemd/system/pki-ocspd.target.wants
+%{_unitdir}/pki-ocspd at .service
+%{_unitdir}/pki-ocspd.target
+%else 
 %{_initrddir}/pki-ocspd
+%endif
 %{_javadir}/pki/pki-ocsp-%{version}.jar
 %{_javadir}/pki/pki-ocsp.jar
 %dir %{_datadir}/pki/ocsp
@@ -166,6 +246,18 @@ fi
 
 
 %changelog
+* Thu Sep 22 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.7-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
+- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+- Bugzilla Bug #730146 - SSL handshake picks non-FIPS ciphers in FIPS mode (cfu)
+
+* Mon Sep 12 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.6-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
+- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+
+* Tue Sep 6 2011 Ade Lee <alee at redhat.com> 9.0.5-1
+- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+
 * Tue Aug 23 2011 Ade Lee <alee at redhat.com> 9.0.4-1
 - Bugzilla Bug #712931 - CS requires too many ports
   to be open in the FW
diff --git a/sources b/sources
index c703c1b..147fbf7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8543b07b3bcc93034772d361f70cbf4b  pki-ocsp-9.0.4.tar.gz
+bce8d72f14338ca8e0a737d7d1bb96ca  pki-ocsp-9.0.7.tar.gz
