[ca-certificates/f19] * Mon Apr 22 2013 Kai Engert <kaie at redhat.com> - 2012.87-10.1 - Add myself as contributor to certdat
Kai Engert
kengert at fedoraproject.org
Mon Apr 22 12:49:45 UTC 2013
commit 76ef429dac4e8aca5265291218b6d0449b671b24
Author: Kai Engert <kaie at redhat.com>
Date: Mon Apr 22 14:49:25 2013 +0200
* Mon Apr 22 2013 Kai Engert <kaie at redhat.com> - 2012.87-10.1
- Add myself as contributor to certdata2.pem.py and remove use of rcs/ident.
(thanks to Michael Shuler for suggesting to do so)
- Update source URLs and comments, add source file for version information.
ca-certificates.spec | 34 +++++++++++++++++----------
certdata2pem.py | 1 +
nssckbi.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 82 insertions(+), 13 deletions(-)
---
diff --git a/ca-certificates.spec b/ca-certificates.spec
index df39b74..22e91d3 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -12,13 +12,13 @@ Name: ca-certificates
# For the package version number, we use: year.{upstream version}
#
# The {upstream version} can be found as symbol NSS_BUILTINS_LIBRARY_VERSION at
-# http://hg.mozilla.org/projects/nss/file/default/lib/ckfw/builtins/nssckbi.h
+# http://hg.mozilla.org/projects/nss/raw-file/default/lib/ckfw/builtins/nssckbi.h
# which corresponds to
-# http://hg.mozilla.org/projects/nss/file/default/lib/ckfw/builtins/certdata.txt
+# http://hg.mozilla.org/projects/nss/raw-file/default/lib/ckfw/builtins/certdata.txt
# (these revisions are the tip of development and might be unreleased).
# For the latest release used in RTM versions of Mozilla Firefox, check:
-# https://hg.mozilla.org/releases/mozilla-release/file/default/security/nss/lib/ckfw/builtins/nssckbi.h
-# https://hg.mozilla.org/releases/mozilla-release/file/default/security/nss/lib/ckfw/builtins/certdata.txt
+# https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/nssckbi.h
+# https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
#
# (until 2012.87 the version was based on the cvs revision ID of certdata.txt,
# but in 2013 the NSS projected was migrated to HG. Old version 2012.87 is
@@ -27,16 +27,18 @@ Name: ca-certificates
# because all future versions will start with 2013 or larger.)
Version: 2012.87
-Release: 10.0%{?dist}
+Release: 10.1%{?dist}
License: Public Domain
Group: System Environment/Base
URL: http://www.mozilla.org/
+#Please always update both certdata.txt and nssckbi.h
Source0: certdata.txt
-Source1: update-ca-trust
-Source2: trust-fixes
-Source3: certdata2pem.py
+Source1: nssckbi.h
+Source2: update-ca-trust
+Source3: trust-fixes
+Source4: certdata2pem.py
Source11: README.usr
Source12: README.etc
Source13: README.extr
@@ -68,7 +70,7 @@ mkdir %{name}/java
pushd %{name}/certs
pwd
cp %{SOURCE0} .
- python %{SOURCE3} >c2p.log 2>c2p.err
+ python %{SOURCE4} >c2p.log 2>c2p.err
popd
pushd %{name}
(
@@ -78,11 +80,12 @@ pushd %{name}
# These certificates are in the OpenSSL "TRUSTED CERTIFICATE"
# format and have trust bits set accordingly.
#
-# Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+# Source: nss/lib/ckfw/builtins/certdata.txt
+# Source: nss/lib/ckfw/builtins/nssckbi.h
#
# Generated from:
EOF
- ident -q %{SOURCE0} | sed '1d;s/^/#/';
+ cat %{SOURCE1} |grep -w NSS_BUILTINS_LIBRARY_VERSION | awk '{print "# " $2 " " $3}';
echo '#';
) > %{trusted_all_bundle}
for f in certs/*.crt; do
@@ -112,7 +115,7 @@ EOF
cat "$p" >> %{bundle_supplement}
done
# Append our trust fixes
- cat %{SOURCE2} >> %{bundle_supplement}
+ cat %{SOURCE3} >> %{bundle_supplement}
popd
@@ -150,7 +153,7 @@ touch -r %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-source/%{bundle_supp
# TODO: consider to dynamically create the update-ca-trust script from within
# this .spec file, in order to have the output file+directory names at once place only.
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-ca-trust
+install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-ca-trust
# touch ghosted files that will be extracted dynamically
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/pem/tls-ca-bundle.pem
@@ -271,6 +274,11 @@ fi
%changelog
+* Mon Apr 22 2013 Kai Engert <kaie at redhat.com> - 2012.87-10.1
+- Add myself as contributor to certdata2.pem.py and remove use of rcs/ident.
+ (thanks to Michael Shuler for suggesting to do so)
+- Update source URLs and comments, add source file for version information.
+
* Wed Mar 27 2013 Kai Engert <kaie at redhat.com> - 2012.87-10.0
- Use both label and serial to identify cert during conversion, rhbz#927601
diff --git a/certdata2pem.py b/certdata2pem.py
index aa1ac97..230298f 100644
--- a/certdata2pem.py
+++ b/certdata2pem.py
@@ -4,6 +4,7 @@
# certdata2pem.py - splits certdata.txt into multiple files
#
# Copyright (C) 2009 Philipp Kern <pkern at debian.org>
+# Copyright (C) 2013 Kai Engert <kaie at redhat.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/nssckbi.h b/nssckbi.h
new file mode 100644
index 0000000..d3f10ef
--- /dev/null
+++ b/nssckbi.h
@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef NSSCKBI_H
+#define NSSCKBI_H
+
+/*
+ * NSS BUILTINS Version numbers.
+ *
+ * These are the version numbers for the builtins module packaged with
+ * this release on NSS. To determine the version numbers of the builtin
+ * module you are using, use the appropriate PKCS #11 calls.
+ *
+ * These version numbers detail changes to the PKCS #11 interface. They map
+ * to the PKCS #11 spec versions.
+ */
+#define NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR 2
+#define NSS_BUILTINS_CRYPTOKI_VERSION_MINOR 20
+
+/* These version numbers detail the changes
+ * to the list of trusted certificates.
+ *
+ * The NSS_BUILTINS_LIBRARY_VERSION_MINOR macro needs to be bumped
+ * for each NSS minor release AND whenever we change the list of
+ * trusted certificates. 10 minor versions are allocated for each
+ * NSS 3.x branch as follows, allowing us to change the list of
+ * trusted certificates up to 9 times on each branch.
+ * - NSS 3.5 branch: 3-9
+ * - NSS 3.6 branch: 10-19
+ * - NSS 3.7 branch: 20-29
+ * - NSS 3.8 branch: 30-39
+ * - NSS 3.9 branch: 40-49
+ * - NSS 3.10 branch: 50-59
+ * - NSS 3.11 branch: 60-69
+ * ...
+ * - NSS 3.12 branch: 70-89
+ * - NSS 3.13 branch: 90-99
+ * - NSS 3.14 branch: 100-109
+ * ...
+ * - NSS 3.29 branch: 250-255
+ *
+ * NSS_BUILTINS_LIBRARY_VERSION_MINOR is a CK_BYTE. It's not clear
+ * whether we may use its full range (0-255) or only 0-99 because
+ * of the comment in the CK_VERSION type definition.
+ */
+#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 94
+#define NSS_BUILTINS_LIBRARY_VERSION "1.94"
+
+/* These version numbers detail the semantic changes to the ckfw engine. */
+#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
+#define NSS_BUILTINS_HARDWARE_VERSION_MINOR 0
+
+/* These version numbers detail the semantic changes to ckbi itself
+ * (new PKCS #11 objects), etc. */
+#define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1
+#define NSS_BUILTINS_FIRMWARE_VERSION_MINOR 0
+
+#endif /* NSSCKBI_H */
More information about the scm-commits
mailing list