From 54942567a4ec3708fefed603427efadaf696f534 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 30 2017 13:46:06 +0000 Subject: import copy-jdk-configs-2.2-5.el7_4 --- diff --git a/SOURCES/newPolices.patch b/SOURCES/newPolices.patch new file mode 100644 index 0000000..ced8421 --- /dev/null +++ b/SOURCES/newPolices.patch @@ -0,0 +1,22 @@ +diff --git a/copy_jdk_configs.lua b/copy_jdk_configs.lua +index 801c4d0..426efb3 100755 +--- a/copy_jdk_configs.lua ++++ b/copy_jdk_configs.lua +@@ -14,9 +14,17 @@ local caredFiles = {"jre/lib/calendars.properties", + "jre/lib/deployment.properties", + "jre/lib/deployment.config", + "jre/lib/security/US_export_policy.jar", ++ "jre/lib/security/unlimited/US_export_policy.jar", ++ "jre/lib/security/limited/US_export_policy.jar", ++ "jre/lib/security/policy/unlimited/US_export_policy.jar", ++ "jre/lib/security/policy/limited/US_export_policy.jar", + "jre/lib/security/java.policy", + "jre/lib/security/java.security", + "jre/lib/security/local_policy.jar", ++ "jre/lib/security/unlimited/local_policy.jar", ++ "jre/lib/security/limited/local_policy.jar", ++ "jre/lib/security/policy/unlimited/local_policy.jar", ++ "jre/lib/security/policy/limited/local_policy.jar", + "jre/lib/security/nss.cfg", + "jre/lib/security/cacerts", + "jre/lib/security/blacklisted.certs", diff --git a/SPECS/copy-jdk-configs.spec b/SPECS/copy-jdk-configs.spec index 08a6669..ffbfcae 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 3f9d6c4448f867a95fb166416a41c45c7e795c10 Version: 2.2 -Release: 3%{?dist} +Release: 5%{?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} +Patch1: newPolices.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) @@ -59,6 +61,11 @@ end %install mkdir -p $RPM_BUILD_ROOT/%{_libexecdir} cp -a %{SOURCE0} $RPM_BUILD_ROOT/%{_libexecdir}/%{file} +pushd $RPM_BUILD_ROOT/%{_libexecdir}/ +patch -p1 < %{PATCH1} +rm -f *.orig +rm -f *.rej +popd chmod 644 $RPM_BUILD_ROOT/%{_libexecdir}/%{file} cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_libexecdir}/%{fixFile} @@ -73,6 +80,14 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || : %license LICENSE %changelog +* Tue Nov 21 2017 Jiri Vanek - 2.2-5 +- adapted (added policy subdir) patch1: newPolices.patch +- Resolves: rhbz#1513697 + +* Thu Nov 16 2017 Jiri Vanek - 2.2-4 +- added an daplied in install patch1: newPolices.patch +- Resolves: rhbz#1513697 + * Mon Jun 19 2017 Jiri Vanek - 2.2-3 - updated to latest head - Resolves: rhbz#1427463