Bugzilla Bug #737761 - Update Dogtag Packages for Fedora 16

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2277 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

12 files changed, 81 insertions, 16 deletions

diff --git a/pki/CMakeLists.txt b/pki/CMakeLists.txt
index 43a25b5b5..88c0a0e69 100644
--- a/pki/CMakeLists.txt
+++ b/pki/CMakeLists.txt
@@ -23,20 +23,20 @@ elseif (BUILD_REDHAT_PKI_THEME)
 elseif (BUILD_PKI_CORE)
     set(APPLICATION_FLAVOR_PKI_CORE TRUE)
     # override APPLICATION VERSION
-    set(APPLICATION_VERSION_PATCH "15")
+    set(APPLICATION_VERSION_PATCH "16")
 elseif (BUILD_PKI_KRA)
     set(APPLICATION_FLAVOR_PKI_KRA TRUE)
     # override APPLICATION VERSION
-    set(APPLICATION_VERSION_PATCH "8")
+    set(APPLICATION_VERSION_PATCH "9")
 elseif (BUILD_PKI_OCSP)
     set(APPLICATION_FLAVOR_PKI_OCSP TRUE)
-    set(APPLICATION_VERSION_PATCH "7")
+    set(APPLICATION_VERSION_PATCH "8")
 elseif (BUILD_PKI_RA)
     set(APPLICATION_FLAVOR_PKI_RA TRUE)
     set(APPLICATION_VERSION_PATCH "4")
 elseif (BUILD_PKI_TKS)
     set(APPLICATION_FLAVOR_PKI_TKS TRUE)
-    set(APPLICATION_VERSION_PATCH "7")
+    set(APPLICATION_VERSION_PATCH "8")
 elseif (BUILD_PKI_TPS)
     set(APPLICATION_FLAVOR_PKI_TPS TRUE)
     # override APPLICATION VERSION
@@ -48,7 +48,7 @@ elseif (BUILD_PKI_CONSOLE)
 elseif (BUILD_PKI_MIGRATE)
     set(APPLICATION_FLAVOR_PKI_MIGRATE TRUE)
     # override APPLICATION VERSION
-    set(APPLICATION_VERSION_PATCH "1")
+    set(APPLICATION_VERSION_PATCH "2")
 endif ()
 
 set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
diff --git a/pki/scripts/compose_pki_core_packages b/pki/scripts/compose_pki_core_packages
index 44a5a67e3..46cfaa673 100755
--- a/pki/scripts/compose_pki_core_packages
+++ b/pki/scripts/compose_pki_core_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
 ##
 
 PKI_CORE="pki-core"
-PKI_CORE_VERSION="9.0.15"
+PKI_CORE_VERSION="9.0.16"
 
 
 ##
diff --git a/pki/scripts/compose_pki_kra_packages b/pki/scripts/compose_pki_kra_packages
index 79760d586..b31ad5f42 100755
--- a/pki/scripts/compose_pki_kra_packages
+++ b/pki/scripts/compose_pki_kra_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
 ##
 
 PKI_KRA="pki-kra"
-PKI_KRA_VERSION="9.0.8"
+PKI_KRA_VERSION="9.0.9"
 
 
 ##
diff --git a/pki/scripts/compose_pki_migrate_packages b/pki/scripts/compose_pki_migrate_packages
index 863a7a688..ac6f0048b 100755
--- a/pki/scripts/compose_pki_migrate_packages
+++ b/pki/scripts/compose_pki_migrate_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
 ##
 
 PKI_MIGRATE="pki-migrate"
-PKI_MIGRATE_VERSION="9.0.1"
+PKI_MIGRATE_VERSION="9.0.2"
 
 
 ##
diff --git a/pki/scripts/compose_pki_ocsp_packages b/pki/scripts/compose_pki_ocsp_packages
index 44d0e417f..dd20e6f27 100755
--- a/pki/scripts/compose_pki_ocsp_packages
+++ b/pki/scripts/compose_pki_ocsp_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
 ##
 
 PKI_OCSP="pki-ocsp"
-PKI_OCSP_VERSION="9.0.7"
+PKI_OCSP_VERSION="9.0.8"
 
 
 ##
diff --git a/pki/scripts/compose_pki_tks_packages b/pki/scripts/compose_pki_tks_packages
index 3f2bca4ef..d1dbd4842 100755
--- a/pki/scripts/compose_pki_tks_packages
+++ b/pki/scripts/compose_pki_tks_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
 ##
 
 PKI_TKS="pki-tks"
-PKI_TKS_VERSION="9.0.7"
+PKI_TKS_VERSION="9.0.8"
 
 
 ##
diff --git a/pki/specs/dogtag-pki.spec b/pki/specs/dogtag-pki.spec
index afa2dbdf9..addede494 100644
--- a/pki/specs/dogtag-pki.spec
+++ b/pki/specs/dogtag-pki.spec
@@ -1,7 +1,7 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
 Version:          9.0.0
-Release:          7%{?dist}
+Release:          8%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -10,6 +10,20 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 # Establish MINIMUM package versions based upon platform
+%if 0%{?fedora} >= 17
+%define dogtag_pki_theme_version   9.0.9
+%define esc_version                1.1.0
+%define jss_version                4.2.6-21
+%define osutil_version             2.0.2
+%define pki_core_version           9.0.16
+%define pki_kra_version            9.0.9
+%define pki_ocsp_version           9.0.8
+%define pki_ra_version             9.0.4
+%define pki_tks_version            9.0.8
+%define pki_tps_version            9.0.7
+%define pki_console_version        9.0.5
+%define tomcatjss_version          6.0.2
+%else
 %if 0%{?fedora} >= 16
 %define dogtag_pki_theme_version   9.0.9
 %define esc_version                1.1.0
@@ -52,6 +66,7 @@ BuildArch:        noarch
 %define tomcatjss_version          2.0.0
 %endif
 %endif
+%endif
 
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL top-level Dogtag PKI support packages
@@ -179,6 +194,12 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.8-1
+- Bugzilla Bug #749927 - Java class conflicts using Java 7 in Fedora 17
+  (rawhide) . . .
+- Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+  OCSP, and TKS package installation . . .
+
 * Thu Sep 22 2011 Matthew Harmsen <mharmsen@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)
diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec
index d006a9006..020b31a14 100644
--- a/pki/specs/pki-core.spec
+++ b/pki/specs/pki-core.spec
@@ -1,5 +1,5 @@
 Name:             pki-core
-Version:          9.0.15
+Version:          9.0.16
 Release:          1%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
@@ -721,6 +721,28 @@ fi
 
 
 %changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.16-1
+- 'pki-setup'
+- 'pki-symkey'
+- 'pki-native-tools'
+- 'pki-util'
+-      Bugzilla Bug #737122 - DRM: during archiving and recovering,
+       wrapping unwrapping keys should be done in the token (cfu)
+- 'pki-java-tools'
+- 'pki-common'
+-      Bugzilla Bug #744797 - KRA key recovery (retrieve pkcs#12) fails after
+       the in-place upgrade( CS 8.0->8.1) (cfu)
+- 'pki-selinux'
+- 'pki-ca'
+-      Bugzilla Bug #746367 - Typo in the profile name. (jmagne)
+-      Bugzilla Bug #737122 - DRM: during archiving and recovering,
+       wrapping unwrapping keys should be done in the token (cfu)
+-      Bugzilla Bug #749927 - Java class conflicts using Java 7 in Fedora 17
+       (rawhide) . . . (mharmsen)
+-      Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+       OCSP, and TKS package installation . . . (mharmsen)
+- 'pki-silent'
+
 * Thu Sep 22 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.15-1
 - Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
 - Bugzilla Bug #699809 - Convert CS to use systemd (alee)
diff --git a/pki/specs/pki-kra.spec b/pki/specs/pki-kra.spec
index 4764e8a54..0747773c9 100644
--- a/pki/specs/pki-kra.spec
+++ b/pki/specs/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/
@@ -238,6 +238,14 @@ fi
 
 
 %changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen@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@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/pki/specs/pki-migrate.spec b/pki/specs/pki-migrate.spec
index ecc5e679d..ea89f9cee 100644
--- a/pki/specs/pki-migrate.spec
+++ b/pki/specs/pki-migrate.spec
@@ -1,5 +1,5 @@
 Name:             pki-migrate
-Version:          9.0.1
+Version:          9.0.2
 Release:          1%{?dist}
 Summary:          Red Hat Certificate System - PKI Migration Scripts
 URL:              http://pki.fedoraproject.org/
@@ -68,6 +68,12 @@ cd build
 
 
 %changelog
+* Fri Oct 28 2011 Andrew Wnuk <awnuk@redhat.com> 9.0.2-1
+- Bugzilla Bug #737216 - unnecessary empty lines in "cert-info" attributes
+  created in 7.1->8.0 migration
+- Bugzilla Bug #737217 - Migration tool is not using proper "ext-data" array
+  format.
+
 * Thu Jul 14 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-1
 - Bugzilla Bug #669226 - Remove Legacy Build System
 
diff --git a/pki/specs/pki-ocsp.spec b/pki/specs/pki-ocsp.spec
index 5f30fecc2..2eaffb3cc 100644
--- a/pki/specs/pki-ocsp.spec
+++ b/pki/specs/pki-ocsp.spec
@@ -1,5 +1,5 @@
 Name:             pki-ocsp
-Version:          9.0.7
+Version:          9.0.8
 Release:          1%{?dist}
 Summary:          Certificate System - Online Certificate Status Protocol Manager
 URL:              http://pki.fedoraproject.org/
@@ -248,6 +248,10 @@ fi
 
 
 %changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.8-1
+- Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+  OCSP, and TKS package installation . . .
+
 * Thu Sep 22 2011 Matthew Harmsen <mharmsen@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)
diff --git a/pki/specs/pki-tks.spec b/pki/specs/pki-tks.spec
index d47caba20..4e1e32e4a 100644
--- a/pki/specs/pki-tks.spec
+++ b/pki/specs/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/
@@ -238,6 +238,10 @@ fi
 
 
 %changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen@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@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