From 8041fe00c7d722e9a996956c0108afb6b5ff5aa3 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Tue, 4 Sep 2012 18:08:43 -0700 Subject: TRAC Ticket #310 - Dogtag 9: Rebuild official PKI packages as necessary . . . --- CMakeLists.txt | 4 ++-- scripts/compose_pki_ra_packages | 2 +- scripts/compose_pki_tps_packages | 2 +- specs/dogtag-pki.spec | 25 ++++++++++++++----------- specs/pki-ra.spec | 6 +++--- specs/pki-tps.spec | 6 +++--- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0986fb75..ba9fa31cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,14 +33,14 @@ elseif (BUILD_PKI_OCSP) set(APPLICATION_VERSION_PATCH "10") elseif (BUILD_PKI_RA) set(APPLICATION_FLAVOR_PKI_RA TRUE) - set(APPLICATION_VERSION_PATCH "4") + set(APPLICATION_VERSION_PATCH "5") elseif (BUILD_PKI_TKS) set(APPLICATION_FLAVOR_PKI_TKS TRUE) set(APPLICATION_VERSION_PATCH "10") elseif (BUILD_PKI_TPS) set(APPLICATION_FLAVOR_PKI_TPS TRUE) # override APPLICATION VERSION - set(APPLICATION_VERSION_PATCH "7") + set(APPLICATION_VERSION_PATCH "8") elseif (BUILD_PKI_CONSOLE) set(APPLICATION_FLAVOR_PKI_CONSOLE TRUE) # override APPLICATION VERSION diff --git a/scripts/compose_pki_ra_packages b/scripts/compose_pki_ra_packages index d9a7976db..83d25837b 100755 --- a/scripts/compose_pki_ra_packages +++ b/scripts/compose_pki_ra_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## PKI_RA="pki-ra" -PKI_RA_VERSION="9.0.4" +PKI_RA_VERSION="9.0.5" ## diff --git a/scripts/compose_pki_tps_packages b/scripts/compose_pki_tps_packages index 31342d36f..86f1eede7 100755 --- a/scripts/compose_pki_tps_packages +++ b/scripts/compose_pki_tps_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## PKI_TPS="pki-tps" -PKI_TPS_VERSION="9.0.7" +PKI_TPS_VERSION="9.0.8" ## diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec index b0d68cb29..9fe5ef37f 100644 --- a/specs/dogtag-pki.spec +++ b/specs/dogtag-pki.spec @@ -1,7 +1,7 @@ Summary: Dogtag Public Key Infrastructure (PKI) Suite Name: dogtag-pki Version: 9.0.0 -Release: 11%{?dist} +Release: 12%{?dist} # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPLv2 and LGPLv2 URL: http://pki.fedoraproject.org/ @@ -15,12 +15,12 @@ BuildArch: noarch %define esc_version 1.1.0 %define jss_version 4.2.6-24 %define osutil_version 2.0.2 -%define pki_core_version 9.0.18 +%define pki_core_version 9.0.22 %define pki_kra_version 9.0.12 -%define pki_ocsp_version 9.0.9 -%define pki_ra_version 9.0.4 -%define pki_tks_version 9.0.9 -%define pki_tps_version 9.0.7 +%define pki_ocsp_version 9.0.10 +%define pki_ra_version 9.0.5 +%define pki_tks_version 9.0.10 +%define pki_tps_version 9.0.8 %define pki_console_version 9.0.5 %define tomcatjss_version 6.0.2 %else @@ -29,12 +29,12 @@ BuildArch: noarch %define esc_version 1.1.0 %define jss_version 4.2.6-24 %define osutil_version 2.0.2 -%define pki_core_version 9.0.18 +%define pki_core_version 9.0.22 %define pki_kra_version 9.0.12 -%define pki_ocsp_version 9.0.9 -%define pki_ra_version 9.0.4 -%define pki_tks_version 9.0.9 -%define pki_tps_version 9.0.7 +%define pki_ocsp_version 9.0.10 +%define pki_ra_version 9.0.5 +%define pki_tks_version 9.0.10 +%define pki_tps_version 9.0.8 %define pki_console_version 9.0.5 %define tomcatjss_version 6.0.2 %else @@ -194,6 +194,9 @@ rm -rf %{buildroot} %doc README %changelog +* Tue Sep 4 2012 Matthew Harmsen 9.0.0-12 +- Updated PKI versions on Fedora 16/Fedora 17 to coincide with latest packages + * Tue Apr 10 2012 Christina Fu 9.0.0-11 - Bugzilla Bug #745278 - [RFE] ECC encryption keys cannot be archived diff --git a/specs/pki-ra.spec b/specs/pki-ra.spec index 146cba6d9..997f071e1 100644 --- a/specs/pki-ra.spec +++ b/specs/pki-ra.spec @@ -1,6 +1,6 @@ Name: pki-ra -Version: 9.0.4 -Release: 2%{?dist} +Version: 9.0.5 +Release: 1%{?dist} Summary: Certificate System - Registration Authority URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -236,7 +236,7 @@ fi %changelog -* Wed Aug 22 2012 Ade Lee 9.0.4-2 +* Wed Aug 22 2012 Ade Lee 9.0.5-1 - Added systemd scripts * Thu Sep 22 2011 Ade Lee 9.0.4-1 diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec index fd3fd021e..31469ec8d 100644 --- a/specs/pki-tps.spec +++ b/specs/pki-tps.spec @@ -1,6 +1,6 @@ Name: pki-tps -Version: 9.0.7 -Release: 5%{?dist} +Version: 9.0.8 +Release: 1%{?dist} Summary: Certificate System - Token Processing System URL: http://pki.fedoraproject.org/ License: LGPLv2 @@ -277,7 +277,7 @@ fi %changelog -* Wed Aug 22 2012 Ade Lee 9.0.7-5 +* Wed Aug 22 2012 Ade Lee 9.0.8-1 - Added systemd scripts * Tue Aug 7 2012 Nathan Kinder 9.0.7-4 -- cgit