From fe5a3339838e6bfbf71d1bb02d2e1764cfae01bc Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Thu, 30 Mar 2017 16:31:35 -0600 Subject: [PATCH] Resolves: rhbz #1434535 - Bugzilla Bug #1431937 - Rebase jss to 4.4.x in Fedora 25+ - Updated build requirements for NSPR - Updated build and runtime requirements for NSS - ## 'jss-post-rebase.patch' resolves the following issues ported from ## upstream: - Mozilla Bugzilla #1337092 - CMC conformance update: Implement required ASN.1 code for RFC5272+ (cfu) - Mozilla Bugzilla #1347394 - Eclipse project files for JSS (edewata) - Mozilla Bugzilla #1347429 - Deprecated SSL 3.0 cipher names in SSLSocket class. (edewata) - Mozilla Bugzilla #1348856 - SSL alert callback (edewata) - Mozilla Bugzilla #1349278 - SSL cipher enumeration (edewata) - Mozilla Bugzilla #1349349 - Problem with Password.readPasswordFromConsole(). (edewata) - Mozilla Bugzilla #1349831 - Revise top-level README file (mharmsen) - Mozilla Bugzilla #1349836 - Changes to JSS Version Block (mharmsen) - Mozilla Bugzilla #1350130 - Missing CryptoManager.verifyCertificateNowCUNative() implementation. (emaldona) --- .gitignore | 1 + jss.spec | 66 +++++++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 0332477..2af452b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ jss-4.2.6.tar.gz /jss-4.2.6.tar.gz /jss-4.4.0.tar.gz +/jss-4.4.1.tar.gz diff --git a/jss.spec b/jss.spec index 7bc2686..982725b 100644 --- a/jss.spec +++ b/jss.spec @@ -2,8 +2,8 @@ %global minorrel `uname -r | cut -f2 -d.` Name: jss -Version: 4.4.0 -Release: 3%{?dist} +Version: 4.4.1 +Release: 1%{?dist} Summary: Java Security Services (JSS) Group: System Environment/Libraries @@ -12,41 +12,27 @@ URL: http://www.mozilla.org/projects/security/pki/jss/ # The source for this package was pulled from upstream's hg. Use the # following commands to generate the tarball: # -# hg clone --rev JSS_4_4_0_RTM https://hg.mozilla.org/projects/jss jss-4.4.0/jss -# rm -rf jss-4.4.0/jss/.hg -# if the tarball is Beta, set this define in 'org/mozilla/jss/util/jssver.h': -# #define JSS_BETA PR_TRUE -# else if tarball is non-Beta: -# #define JSS_BETA PR_FALSE -# tar -czvf jss-4.4.0.tar.gz jss-4.4.0 -# -# For now until the JSS_4_4_0_RTM tag is created I actually used: -# hg clone --rev d48f63b92b05 https://hg.mozilla.org/projects/jss jss-4.4.0/jss -# This is from upstream tip as of Mon, 13 Mar 2017 11:49:51 -0700 -# https://hg.mozilla.org/projects/jss/rev/d48f63b92b0538e47e867122c475cfbc1334f7c9 -# -# Alternatively (if using 'default' hg tip): -# # hg clone https://hg.mozilla.org/projects/jss # cd jss -# hg archive --prefix jss-4.4.0/jss/ ../jss-4.4.0.tar.gz +# hg archive --prefix jss-4.4.1/jss/ ../jss-4.4.1.tar.gz # -Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}-%{release}/%{name}-%{version}.tar.gz -Source1: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}-%{release}/MPL-1.1.txt -Source2: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}-%{release}/gpl.txt -Source3: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}-%{release}/lgpl.txt +Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{name}-%{version}.tar.gz +Source1: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/MPL-1.1.txt +Source2: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/gpl.txt +Source3: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/lgpl.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Conflicts: tomcatjss < 7.2.1 Conflicts: pki-base < 10.4.0 -BuildRequires: nss-devel >= 3.21.0 -BuildRequires: nspr-devel >= 4.11.0 + +BuildRequires: nss-devel >= 3.28.3 +BuildRequires: nspr-devel >= 4.13.1 BuildRequires: java-devel %if 0%{?fedora} >= 25 -BuildRequires: perl +BuildRequires: perl %endif Requires: java-headless -Requires: nss >= 3.21.0 +Requires: nss >= 3.28.3 %description Java Security Services (JSS) is a java native interface which provides a bridge @@ -111,7 +97,6 @@ make -C jss javadoc %check - %install rm -rf $RPM_BUILD_ROOT docdir @@ -157,18 +142,37 @@ rm -rf $RPM_BUILD_ROOT %dir %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}-%{version}/* - %changelog +* Mon Mar 27 2017 Matthew Harmsen - 4.4.1-1 +- Bugzilla Bug #1431937 - Rebase jss to 4.4.x in Fedora 25+ +- Updated build requirements for NSPR +- Updated build and runtime requirements for NSS +- ## 'jss-post-rebase.patch' resolves the following issues ported from + ## upstream: +- Mozilla Bugzilla #1337092 - CMC conformance update: Implement required ASN.1 + code for RFC5272+ (cfu) +- Mozilla Bugzilla #1347394 - Eclipse project files for JSS (edewata) +- Mozilla Bugzilla #1347429 - Deprecated SSL 3.0 cipher names in SSLSocket + class. (edewata) +- Mozilla Bugzilla #1348856 - SSL alert callback (edewata) +- Mozilla Bugzilla #1349278 - SSL cipher enumeration (edewata) +- Mozilla Bugzilla #1349349 - Problem with Password.readPasswordFromConsole(). + (edewata) +- Mozilla Bugzilla #1349831 - Revise top-level README file (mharmsen) +- Mozilla Bugzilla #1349836 - Changes to JSS Version Block (mharmsen) +- Mozilla Bugzilla #1350130 - Missing + CryptoManager.verifyCertificateNowCUNative() implementation. (emaldona) + * Tue Mar 21 2017 Matthew Harmsen - 4.4.0-3 -- Bugzilla Bug #1434535 - JSS 4.4.0 is incompatible with versions of +- Bugzilla Bug #1434535 - JSS 4.4.x is incompatible with versions of pki-base < 10.4.0 * Wed Mar 15 2017 Matthew Harmsen - 4.4.0-2 -- Bugzilla Bug #1432568 - JSS 4.4.0 is incompatible with versions of +- Bugzilla Bug #1432568 - JSS 4.4.x is incompatible with versions of tomcatjss < 7.2.1 * Mon Mar 13 2017 Elio Maldonado - 4.4.0-1 -- Bugzilla Bug #1431937 - Rebase jss to 4.4.0 in Fedora 25+ +- Bugzilla Bug #1431937 - Rebase jss to 4.4.x in Fedora 25+ - ## JSS 4.4.0 includes the following patches ported from downstream: - Mozilla Bugzilla #507536 - Add IPv6 functionality to JSS - Mozilla Bugzilla #1307872 - Expose NSS calls for OCSP settings diff --git a/sources b/sources index b607491..f479c82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.4.0.tar.gz) = 2a3c6c3a5f0b3fe5b0a503a04ce0fa3475e5e79f5f34ab4318384f22c4f0689d183585b861624200143161e4ff5c7a6dead81ed2824e39bd7df74804dbcace21 +SHA512 (jss-4.4.1.tar.gz) = 06162955d83adf95552408f087a687e9f30e5a4baa2621ce0be041ab0d3ea0aa7aec7e4db8d53bbe995499ad269a9cabffd756aa239190cdc24048b1cbe3bb22