udpated to latst relase

- configurable blacklist
- listed all java keystores
This commit is contained in:
Jiri Vanek 2018-06-20 14:54:44 +02:00
parent 987022318e
commit c6a49d886b
3 changed files with 18 additions and 5 deletions

View File

@ -6,9 +6,9 @@
Name: copy-jdk-configs Name: copy-jdk-configs
# hash relevant to version tag # hash relevant to version tag
%global htag ed45a7dce13fab490529d4d13a064d379c8f66e7 %global htag 1d18ce8b5dec47a0468136ab6cdadfb93defe2c4
Version: 3.3 Version: 3.7
Release: 12%{?dist} Release: 1%{?dist}
Summary: JDKs configuration files copier Summary: JDKs configuration files copier
License: BSD License: BSD
@ -72,6 +72,11 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || :
%license LICENSE %license LICENSE
%changelog %changelog
* Wed May 02 2018 Jiri Vanek <jvanek@redhat.com> - 3.7-1
- udpated to latst relase
- configurable blacklist
- listed all java keystores
* Wed May 02 2018 Jiri Vanek <jvanek@redhat.com> - 3.3-12 * Wed May 02 2018 Jiri Vanek <jvanek@redhat.com> - 3.3-12
- blackidrs put on single line - blackidrs put on single line

View File

@ -28,6 +28,10 @@ local caredFiles = {"jre/lib/calendars.properties",
"jre/lib/security/nss.cfg", "jre/lib/security/nss.cfg",
"jre/lib/security/cacerts", "jre/lib/security/cacerts",
"jre/lib/security/blacklisted.certs", "jre/lib/security/blacklisted.certs",
"jre/lib/security/jssecacerts",
"jre/lib/security/trusted.certs",
"jre/lib/security/trusted.jssecerts",
"jre/lib/security/trusted.clientcerts",
"jre/lib/ext", "jre/lib/ext",
"jre/lib/security/blacklist", "jre/lib/security/blacklist",
"jre/lib/security/javaws.policy", "jre/lib/security/javaws.policy",

View File

@ -192,8 +192,12 @@ files=`find $sourceSearchPath | grep "\\.rpmsave$"`
#warning: file /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-11.b12.el7.x86_64-debug/jre/lib/amd64/client: remove failed: No such file or directory #warning: file /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-11.b12.el7.x86_64-debug/jre/lib/amd64/client: remove failed: No such file or directory
#warning: file /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.171-2.6.13.2.el7.x86_64/jre/lib/amd64/xawt: remove failed: No such file or directory #warning: file /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.171-2.6.13.2.el7.x86_64/jre/lib/amd64/xawt: remove failed: No such file or directory
#those dirs might be mepty by installtion, filling to not be rmeoved later #those dirs might be mepty by installtion, filling to not be rmeoved later
blackdirs="$source/jre/lib/applet $source/jre/lib/*/client $source/jre/lib/locale/*/LC_MESSAGE $source/jre/lib/*/xawt $source/jre/javaws $source/properties/version $source/properties $source/jre/lib/endorsed $source/jre/lib/boot $source/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/.data" #use exported CJC_BLACKDIRS_ADD to extend it in runtime/spec file
blackdirs=""
internal_blackdirs="jre/lib/applet jre/lib/*/client jre/lib/locale/*/LC_MESSAGES jre/lib/*/xawt jre/javaws properties/version properties jre/lib/endorsed jre/lib/boot lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/.data"
for x in $internal_blackdirs $CJC_BLACKDIRS_ADD ; do
blackdirs="$blackdirs $source/$x"
done
for blackdir in $blackdirs; do for blackdir in $blackdirs; do
if [ -e $blackdir ] ; then if [ -e $blackdir ] ; then