From 835564c3e5e9ccca2b03019869902df030e29384 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 3 Nov 2020 07:12:43 -0500 Subject: [PATCH] import copy-jdk-configs-3.7-4.el8 --- SOURCES/addNssCfgFips.patch | 11 +++++++++++ SPECS/copy-jdk-configs.spec | 22 ++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 SOURCES/addNssCfgFips.patch diff --git a/SOURCES/addNssCfgFips.patch b/SOURCES/addNssCfgFips.patch new file mode 100644 index 0000000..29dc303 --- /dev/null +++ b/SOURCES/addNssCfgFips.patch @@ -0,0 +1,11 @@ +--- copy_jdk_configs.lua ++++ copy_jdk_configs.lua +@@ -35,6 +35,7 @@ + "jre/lib/ext", + "jre/lib/security/blacklist", + "jre/lib/security/javaws.policy", ++ "jre/lib/security/nss.fips.cfg", + "lib/security", + "conf", + "lib/ext"} + diff --git a/SPECS/copy-jdk-configs.spec b/SPECS/copy-jdk-configs.spec index 358ee96..3d38ac3 100644 --- a/SPECS/copy-jdk-configs.spec +++ b/SPECS/copy-jdk-configs.spec @@ -8,7 +8,7 @@ Name: copy-jdk-configs # hash relevant to version tag %global htag 1d18ce8b5dec47a0468136ab6cdadfb93defe2c4 Version: 3.7 -Release: 1%{?dist} +Release: 4%{?dist} Summary: JDKs configuration files copier License: BSD @@ -17,6 +17,8 @@ Source0: %{URL}/blob/%{htag}/f/%{file} Source1: %{URL}/blob/%{htag}/f/LICENSE Source2: %{URL}/blob/%{htag}/f/%{fixFile} +Patch0: addNssCfgFips.patch + # we need to duplicate msot of the percents in that script so they survive rpm expansion (even in that sed they have to be duplicated) %global pretrans_install %(cat %{SOURCE0} | sed s/%%/%%%%/g | sed s/\\^%%%%/^%%/g) @@ -31,6 +33,8 @@ archiving. With script to fix incorrectly created rpmnew files %prep cp -a %{SOURCE1} . +cp -a %{SOURCE0} . +%patch0 -p0 %build @@ -58,7 +62,7 @@ end %install mkdir -p $RPM_BUILD_ROOT/%{_libexecdir} -cp -a %{SOURCE0} $RPM_BUILD_ROOT/%{_libexecdir}/%{file} +cp -a %{file} $RPM_BUILD_ROOT/%{_libexecdir}/%{file} chmod 644 $RPM_BUILD_ROOT/%{_libexecdir}/%{file} cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_libexecdir}/%{fixFile} @@ -73,6 +77,20 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || : %license LICENSE %changelog +* Thu Jul 09 2020 Jiri Vanek - 3.7-3 +- added link to http://hydra.brq.redhat.com:8080/view/c~j~c/#projectstatus +- removed source check from test.yaml +- added gating.yaml +- Resolves: rhbz#1855374 + +* Thu Jul 09 2020 Jiri Vanek - 3.7-3 +- added gatnig placeholder +- Resolves: rhbz#1855374 + +* Thu Jul 09 2020 Jiri Vanek - 3.7-2 +- added nss.fips.cfg to cared files +- Resolves: rhbz#1855374 + * Wed May 02 2018 Jiri Vanek - 3.7-1 - udpated to latst relase - configurable blacklist