[pki-ocsp] Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . Bugzilla Bug #699809 - Convert CS

Tue Sep 13 09:33:09 UTC 2011

commit 79a7e3fc33742cd6fb207d3a89ff148753758107
Author: Kevin Wright <kwright at redhat.com>
Date:   Tue Sep 13 02:32:56 2011 -0700

    Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
    Bugzilla Bug #699809 - Convert CS to use systemd (alee)

 .gitignore    |    1 +
 clog          |   10 +------
 pki-ocsp.spec |   74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 sources       |    2 +-
 4 files changed, 76 insertions(+), 11 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d7a833e..6d56f77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pki-ocsp-1.3.3.tar.gz
 /pki-ocsp-9.0.1.tar.gz
 /pki-ocsp-9.0.2.tar.gz
 /pki-ocsp-9.0.3.tar.gz
+/pki-ocsp-9.0.6.tar.gz
diff --git a/clog b/clog
index 2e96b26..77317ae 100644
--- a/clog
+++ b/clog
@@ -1,8 +1,2 @@
-Bugzilla Bug #693815 - /var/log/tomcat6/catalina.out owned by pkiuser
-(jdennis)
-Bugzilla Bug #699837 - service command is not fully backwards
-compatible with Dogtag pki subsystems (mharmsen)
-Bugzilla Bug #649910 - Console: an auditor or agent can be added to an
-administrator group. (jmagne)
-Bugzilla Bug #669226 - Remove Legacy Build System (mharmsen)
-Updated release of 'jss'
+Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
+Bugzilla Bug #699809 - Convert CS to use systemd (alee)
diff --git a/pki-ocsp.spec b/pki-ocsp.spec
index d2e2f0d..9693a78 100644
--- a/pki-ocsp.spec
+++ b/pki-ocsp.spec
@@ -1,5 +1,5 @@
 Name:             pki-ocsp
-Version:          9.0.3
+Version:          9.0.6
 Release:          1%{?dist}
 Summary:          Certificate System - Online Certificate Status Protocol Manager
 URL:              http://pki.fedoraproject.org/
@@ -12,21 +12,36 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
+%if 0%{?fedora} >= 16
+BuildRequires:    jpackage-utils >= 0:1.7.5-10
+%else
 BuildRequires:    jpackage-utils
+%endif
 BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 BuildRequires:    pki-common
 BuildRequires:    pki-util
+%if 0%{?fedora} >= 16
+BuildRequires:    systemd-units
+%endif
 
 Requires:         java >= 1:1.6.0
 Requires:         pki-common
 Requires:         pki-ocsp-theme
 Requires:         pki-selinux
+
+%if 0%{?fedora} >= 16
+Requires(post):   systemd-units
+Requires(preun):  systemd-units
+Requires(postun): systemd-units
+%else 
 Requires(post):   chkconfig
 Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
+%endif
+
 %if 0%{?fedora} >= 15
 # Details:
 #
@@ -101,7 +116,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 +139,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 +164,48 @@ 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"
+#        [ -e /var/lib/${inst}/${inst} ] && unlink /var/lib/${inst}/${inst}
+#        ln -s /usr/sbin/tomcat6-sysd /var/lib/${inst}/${inst}
+#        echo "pkicreate.systemd.servicename=pki-ocspd@${inst}.service" >> /var/lib/${inst}/conf/CS.cfg
+#    fi
+#done
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+# Attempt to restart ALL updated "OCSP" instances
+#if [ $1 = 2 ] ; then
+#    /bin/systemctl try-restart pki-ocspd.target >/dev/null 2>&1 || :
+#fi
+ 
+%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 +225,17 @@ fi
 
 
 %changelog
+* 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
+
 * Thu Jul 14 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.3-1
 - Bugzilla Bug #693815 - /var/log/tomcat6/catalina.out owned by pkiuser
   (jdennis)
diff --git a/sources b/sources
index ec2d22e..fee2e2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12d895a6ecf0142057b63ae89b30cfc7  pki-ocsp-9.0.3.tar.gz
+40e6539a1e4740464265a2ddaf3df549  pki-ocsp-9.0.6.tar.gz
