[pki-tks/f16] Bugzilla Bug #749945 - Installation error reported during CA, DRM, OCSP, and TKS package installatio
kwright
kwright at fedoraproject.org
Mon Oct 31 00:19:29 UTC 2011
commit f54d551e365e2e0c01572d72f33ab0c717cb69be
Author: Kevin Wright <kwright at redhat.com>
Date: Sun Oct 30 17:19:26 2011 -0700
Bugzilla Bug #749945 - Installation error reported during CA, DRM,
OCSP, and TKS package installation . . .
.gitignore | 1 +
clog | 7 ++-----
pki-tks.spec | 46 ++++++++++++++++++++++++++--------------------
sources | 2 +-
4 files changed, 30 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 07fefde..fd98741 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pki-tks-1.3.3.tar.gz
/pki-tks-9.0.3.tar.gz
/pki-tks-9.0.6.tar.gz
/pki-tks-9.0.7.tar.gz
+/pki-tks-9.0.8.tar.gz
diff --git a/clog b/clog
index 9b99f52..db82499 100644
--- a/clog
+++ b/clog
@@ -1,5 +1,2 @@
-Bugzilla Bug #730146 - SSL handshake picks non-FIPS ciphers in FIPS mode (cfu)
-Bugzilla Bug #730162 - TPS/TKS token enrollment failure in FIPS mode
-(hsm+NSS). (jmagne)
-Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
-Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+OCSP, and TKS package installation . . .
diff --git a/pki-tks.spec b/pki-tks.spec
index e03c31b..4e1e32e 100644
--- a/pki-tks.spec
+++ b/pki-tks.spec
@@ -1,5 +1,5 @@
Name: pki-tks
-Version: 9.0.7
+Version: 9.0.8
Release: 1%{?dist}
Summary: Certificate System - Token Key Service
URL: http://pki.fedoraproject.org/
@@ -171,26 +171,28 @@ fi
%else
%post
# Attempt to update ALL old "TKS" instances to "systemd"
-for inst in `ls /etc/sysconfig/pki/tks`; do
- if [ ! -e "/etc/systemd/system/pki-tksd.target.wants/pki-tksd@${inst}.service" ]; then
- ln -s "/lib/systemd/system/pki-tksd at .service" \
- "/etc/systemd/system/pki-tksd.target.wants/pki-tksd@${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-tksd@${inst}.service" >> \
- /var/lib/${inst}/conf/CS.cfg || :
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- /bin/systemctl restart pki-tksd@${inst}.service || :
- else
- echo "pkicreate.systemd.servicename=pki-tksd@${inst}.service" >> \
- /var/lib/${inst}/conf/CS.cfg || :
+if [ -d /etc/sysconfig/pki/tks ]; then
+ for inst in `ls /etc/sysconfig/pki/tks`; do
+ if [ ! -e "/etc/systemd/system/pki-tksd.target.wants/pki-tksd@${inst}.service" ]; then
+ ln -s "/lib/systemd/system/pki-tksd at .service" \
+ "/etc/systemd/system/pki-tksd.target.wants/pki-tksd@${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-tksd@${inst}.service" >> \
+ /var/lib/${inst}/conf/CS.cfg || :
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /bin/systemctl restart pki-tksd@${inst}.service || :
+ else
+ echo "pkicreate.systemd.servicename=pki-tksd@${inst}.service" >> \
+ /var/lib/${inst}/conf/CS.cfg || :
+ fi
fi
- fi
-done
+ done
+fi
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%preun
@@ -236,6 +238,10 @@ fi
%changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.8-1
+- Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+ OCSP, and TKS package installation . . .
+
* Thu Sep 22 2011 Jack Magne <jmagne at redhat.com> 9.0.7-1
- Bugzilla Bug #730146 - SSL handshake picks non-FIPS ciphers in FIPS mode (cfu)
- Bugzilla Bug #730162 - TPS/TKS token enrollment failure in FIPS mode
diff --git a/sources b/sources
index e053c4f..096bf2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54af2eecc39942ba9d2e6a483e9356a2 pki-tks-9.0.7.tar.gz
+57f24c2a5ab7a16e0e14ae7fd6157980 pki-tks-9.0.8.tar.gz
More information about the scm-commits
mailing list