From 209b52fd0bc9bbd9d366aa93de8e9a567306b77f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 02 2018 17:37:21 +0000
Subject: import copy-jdk-configs-3.3-10.el7_5


---

diff --git a/SOURCES/copy_jdk_configs.lua b/SOURCES/copy_jdk_configs.lua
index 1ec1321..b93477c 100755
--- a/SOURCES/copy_jdk_configs.lua
+++ b/SOURCES/copy_jdk_configs.lua
@@ -29,6 +29,8 @@ local caredFiles = {"jre/lib/calendars.properties",
               "jre/lib/security/cacerts",
               "jre/lib/security/blacklisted.certs",
               "jre/lib/ext",
+              "jre/lib/security/blacklist",
+              "jre/lib/security/javaws.policy",
               "lib/security",
               "conf",
               "lib/ext"}
diff --git a/SOURCES/copy_jdk_configs_fixFiles.sh b/SOURCES/copy_jdk_configs_fixFiles.sh
index 767e2c3..964f607 100755
--- a/SOURCES/copy_jdk_configs_fixFiles.sh
+++ b/SOURCES/copy_jdk_configs_fixFiles.sh
@@ -60,22 +60,35 @@ fi
 
 
 listLinks(){
-  find $1 -type l -print0 | xargs -0 ls -ld | sed "s;.* $1;$1;" | sed "s; \+;_;g"
+  find $1 -type l -print0 | xargs -0 ls -ld | sed "s; \+-> \+;_->_;g" | sed "s;.* $1;$1;"
+}
+
+printIfExists(){
+  if [ -e $ffileCandidate ] ; then
+    echo $1
+  else
+    # stdout can be captured, therefore stderr
+    debug "skipping not-existing link-target-dir $1" 1>&2
+  fi
 }
 
 createListOfLinksTargetsDirectories(){
   pushd $source >/dev/null 2>&1 
     local links=`listLinks $1`
     for x in $links ; do 
+      echo "$x" | grep "jre-abrt" > /dev/null
+      if [ $? -eq 0 ] ; then
+        continue
+      fi
       local ffileCandidate=$(echo $x | sed "s/.*_->_//") ;
 # ignoring relative paths as they may lead who know where later   
 # there can be simlink relative to position, so push is not catching all
       if [ "$ffileCandidate" != "${ffileCandidate#/}" ] ; then
         if [ -d $ffileCandidate ] ; then
 # should we accept the links to directories themselves?
-          echo $ffileCandidate
+          printIfExists $ffileCandidate
         else
-          dirname $ffileCandidate
+          printIfExists `dirname $ffileCandidate`
         fi
       fi
     done | sort | uniq
@@ -120,8 +133,7 @@ work(){
     if [ $? -gt 0 ] ; then
      if [ "X$1" == "Xrpmnew" ] ; then
        debug "$sf2 was NOT modified, removing possibly corrupted $sf1 and renaming from $file"
-       rm $rma $sf1 
-       mv $rma $file $sf1
+       mv $rma -f $file $sf1
        if [ $? -eq 0 ] ; then
          echo "restored $file to $sf1"
        else
@@ -178,8 +190,9 @@ 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/applet: 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
 #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"
+blackdirs="$source/jre/lib/applet $source/jre/lib/*/client $source/jre/lib/locale/*/LC_MESSAGE $source/jre/lib/*/xawt"
 for blackdir in $blackdirs; do
   if [ -e $blackdir ] ; then
     debug "nasty $blackdir  exists, filling"
diff --git a/SPECS/copy-jdk-configs.spec b/SPECS/copy-jdk-configs.spec
index 9c6018d..6d6c08d 100644
--- a/SPECS/copy-jdk-configs.spec
+++ b/SPECS/copy-jdk-configs.spec
@@ -6,9 +6,9 @@
 Name:    copy-jdk-configs
 
 # hash relevant to version tag
-%global  htag f1cd4541f89ac601873ee16d6aa3b3cb1497f0d5
+%global  htag ed45a7dce13fab490529d4d13a064d379c8f66e7
 Version: 3.3
-Release: 2%{?dist}
+Release: 10%{?dist}
 Summary: JDKs configuration files copier
 
 License:  BSD
@@ -73,6 +73,14 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || :
 %license LICENSE
 
 %changelog
+* Mon Apr 30 2018 Jiri Vanek <jvanek@redhat.com> - 3.3-10
+- added javaws.policy and blacklist
+- Resolves: rhbz#1573163
+
+* Wed Apr 25 2018 Jiri Vanek <jvanek@redhat.com> - 3.3-3
+- fixes issue when java.security for openjdk7 was erased
+- Resolves: rhbz#1573163 
+
 * Fri Nov 03 2017 Jiri Vanek <jvanek@redhat.com> - 3.3-2
 - added another subdirs for policies files
 - Resolves: rhbz#1503647
@@ -95,7 +103,7 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || :
 - copy_jdk_configs.lua  aligned to it
 - Resolves: rhbz#1427463
 
-* Tue Dec 01 2016 Jiri Vanek <jvanek@redhat.com> - 1.3-1
+* Thu Dec 01 2016 Jiri Vanek <jvanek@redhat.com> - 1.3-1
 - updated to upstream 1.3 (adding jre/lib/security/cacerts file)
 - Resolves: rhbz#1399719