[pki-kra/f16] Bugzilla Bug #737122 - DRM: during archiving and recovering, wrapping unwrapping keys should be done
kwright
kwright at fedoraproject.org
Sun Oct 30 23:22:47 UTC 2011
commit 8f003d101e4220399cfb32da932af22d1264118f
Author: Kevin Wright <kwright at redhat.com>
Date: Sun Oct 30 16:22:38 2011 -0700
Bugzilla Bug #737122 - DRM: during archiving and recovering,
wrapping unwrapping keys should be done in the token (cfu)
Bugzilla Bug #744797 - KRA key recovery (retrieve pkcs#12) fails after
the in-place upgrade( CS 8.0->8.1) (cfu)
Bugzilla Bug #749945 - Installation error reported during CA, DRM,
OCSP, and TKS package installation . . . (mharmsen)
.gitignore | 1 +
clog | 9 ++++++---
pki-kra.spec | 50 ++++++++++++++++++++++++++++++--------------------
sources | 2 +-
4 files changed, 38 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2877279..bc1668c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pki-kra-1.3.4.tar.gz
/pki-kra-9.0.4.tar.gz
/pki-kra-9.0.7.tar.gz
/pki-kra-9.0.8.tar.gz
+/pki-kra-9.0.9.tar.gz
diff --git a/clog b/clog
index 21d3171..53e8d49 100644
--- a/clog
+++ b/clog
@@ -1,3 +1,6 @@
-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)
+Bugzilla Bug #737122 - DRM: during archiving and recovering,
+wrapping unwrapping keys should be done in the token (cfu)
+Bugzilla Bug #744797 - KRA key recovery (retrieve pkcs#12) fails after
+the in-place upgrade( CS 8.0->8.1) (cfu)
+Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+OCSP, and TKS package installation . . . (mharmsen)
diff --git a/pki-kra.spec b/pki-kra.spec
index bb0cde3..0747773 100644
--- a/pki-kra.spec
+++ b/pki-kra.spec
@@ -1,5 +1,5 @@
Name: pki-kra
-Version: 9.0.8
+Version: 9.0.9
Release: 1%{?dist}
Summary: Certificate System - Data Recovery Manager
URL: http://pki.fedoraproject.org/
@@ -172,26 +172,28 @@ fi
%else
%post
# Attempt to update ALL old "KRA" instances to "systemd"
-for inst in `ls /etc/sysconfig/pki/kra`; do
- if [ ! -e "/etc/systemd/system/pki-krad.target.wants/pki-krad@${inst}.service" ]; then
- ln -s "/lib/systemd/system/pki-krad at .service" \
- "/etc/systemd/system/pki-krad.target.wants/pki-krad@${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-krad@${inst}.service" >> \
- /var/lib/${inst}/conf/CS.cfg || :
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- /bin/systemctl restart pki-krad@${inst}.service || :
- else
- echo "pkicreate.systemd.servicename=pki-krad@${inst}.service" >> \
- /var/lib/${inst}/conf/CS.cfg || :
+if [ -d /etc/sysconfig/pki/kra ]; then
+ for inst in `ls /etc/sysconfig/pki/kra`; do
+ if [ ! -e "/etc/systemd/system/pki-krad.target.wants/pki-krad@${inst}.service" ]; then
+ ln -s "/lib/systemd/system/pki-krad at .service" \
+ "/etc/systemd/system/pki-krad.target.wants/pki-krad@${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-krad@${inst}.service" >> \
+ /var/lib/${inst}/conf/CS.cfg || :
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /bin/systemctl restart pki-krad@${inst}.service || :
+ else
+ echo "pkicreate.systemd.servicename=pki-krad@${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,14 @@ fi
%changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.9-1
+- Bugzilla Bug #737122 - DRM: during archiving and recovering,
+ wrapping unwrapping keys should be done in the token (cfu)
+- Bugzilla Bug #744797 - KRA key recovery (retrieve pkcs#12) fails after
+ the in-place upgrade( CS 8.0->8.1) (cfu)
+- Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+ OCSP, and TKS package installation . . . (mharmsen)
+
* Thu Sep 22 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.8-1
- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
diff --git a/sources b/sources
index d58bf4f..99704e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d215a3fd74fd04b28ae44e611ce6910d pki-kra-9.0.8.tar.gz
+50f829899ff9a73642370416176e3e2e pki-kra-9.0.9.tar.gz
More information about the scm-commits
mailing list