Sync from fedora/el8.5

copy-jdk-configs.spec

@@ -6,9 +6,9 @@
 Name:    copy-jdk-configs
 
 # hash relevant to version tag
-%global  htag 1d18ce8b5dec47a0468136ab6cdadfb93defe2c4
+%global  htag 88d3ed89f30d8b0eb4877d860fa8d951f224f156
-Version: 3.7
+Version: 4.0
-Release: 9%{?dist}
+Release: 1%{?dist}
 Summary: JDKs configuration files copier
 
 License:  BSD
@@ -24,6 +24,9 @@ BuildArch: noarch
 
 Requires: lua
 Requires: lua-posix
+# rh1965305 - copy-jdk-configs script uses find and xargs but RPM does not depend on them
+Requires: findutils
+OrderWithRequires: findutils
 
 %description
 Utility script to transfer JDKs configuration files between updates or for
@@ -72,8 +75,11 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || :
 %license LICENSE
 
 %changelog
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.7-9
+* Tue Jun 08 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- added requires and orderWithRequires of findutils to provide find and xargs (rh1965305)
+
+* Thu Apr 29 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-0
+- bumped to 4.0 to resolve remvoed rpm 4.17 removing arg from global table
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

copy_jdk_configs.lua

@@ -1,9 +1,77 @@
 #!/usr/bin/lua
 -- rpm call
--- lua -- copy_jdk_configs.lua   --currentjvm "%{uniquesuffix %{nil}}" --jvmdir "%{_jvmdir %{nil}}" --origname "%{name}" --origjavaver "%{javaver}" --arch "%{_arch}" --debug true
+-- debug=true lua -- copy_jdk_configs.lua   --currentjvm "%{uniquesuffix %{nil}}" --jvmdir "%{_jvmdir %{nil}}" --origname "%{name}" --origjavaver "%{javaver}" --arch "%{_arch}"
 --test call
---lua -- copy_jdk_configs.lua   --currentjvm "java-1.8.0-openjdk-1.8.0.65-3.b17.fc22.x86_64" --jvmdir "/usr/lib/jvm" --origname "java-1.8.0-openjdk" --origjavaver "1.8.0" --arch "x86_64" --debug true  --jvmDestdir /home/jvanek/Desktop
+-- debug=true lua -- copy_jdk_configs.lua   --currentjvm "java-1.8.0-openjdk-1.8.0.65-3.b17.fc22.x86_64" --jvmdir "/usr/lib/jvm" --origname "java-1.8.0-openjdk" --origjavaver "1.8.0" --arch "x86_64" --jvmDestdir /home/jvanek/Desktop
 
+local M = {}
+
+if (os.getenv("debug") == "true") then
+    debug = true;
+else
+    debug = false;
+end
+
+local function debugOneLinePrint(string)
+    if (debug) then
+        print(string)
+    end ;
+end
+
+function getPath(str, sep)
+    sep = sep or '/'
+    return str:match("(.*" .. sep .. ")")
+end
+
+function splitToTable(source, pattern)
+    local i1 = string.gmatch(source, pattern)
+    local l1 = {}
+    for i in i1 do
+        table.insert(l1, i)
+    end
+    return l1
+end
+
+local function slurp(path)
+    local f = io.open(path)
+    local s = f:read("*a")
+    f:close()
+    return s
+end
+
+function trim(s)
+    return (s:gsub("^%s*(.-)%s*$", "%1"))
+end
+
+local function dirWithParents(path)
+    local s = ""
+    local dirs = splitToTable(path, "[^/]+")
+    for i, d in pairs(dirs) do
+        if (i == #dirs) then
+            break
+        end
+        s = s .. "/" .. d
+        local stat2 = posix.stat(s, "type");
+        if (stat2 == nil) then
+            debugOneLinePrint(s .. " does not exists, creating")
+            if (not dry) then
+                posix.mkdir(s)
+            end
+        else
+            debugOneLinePrint(s .. " exists,not creating")
+        end
+    end
+end
+
+
+-- main function,
+-- formelry main body
+-- move to function resolved
+-- https://bugzilla.redhat.com/show_bug.cgi?id=1892224
+-- for readability not indented, todo, indent once tuned
+
+function M.mainProgram(arg)
+    debugOneLinePrint("cjc: lua debug on")
     local caredFiles = { "jre/lib/calendars.properties",
                          "jre/lib/content-types.properties",
                          "jre/lib/flavormap.properties",
@@ -35,6 +103,7 @@ local caredFiles = {"jre/lib/calendars.properties",
                          "jre/lib/ext",
                          "jre/lib/security/blacklist",
                          "jre/lib/security/javaws.policy",
+                         "jre/lib/security/nss.fips.cfg",
                          "lib/security",
                          "conf",
                          "lib/ext" }
@@ -57,7 +126,6 @@ local jvmDestdir = nil
     local origname = nil
     local origjavaver = nil
     local arch = nil
-local debug = false;
     local temp = nil;
     local dry = false;
 
@@ -76,7 +144,7 @@ for i=1,#arg,2 do
             print("    convinient switch to determine jdk's arch")
             print("  --jvmDestdir")
             print("    Migration/testing switch. Target Mostly same as jvmdir, but you may wont to copy ouside it.")
-    print("  --debug")
+            print("  --debug or $debug")
             print("    Enables printing out whats going on. true/false. False by default")
             print("  --temp")
             print("    optional file to save intermediate result - directory configs were copied from")
@@ -126,7 +194,6 @@ if (jvmDestdir == nil) then
         jvmDestdir = jvmdir
     end
 
-
     if (debug) then
         print("--currentjvm:");
         print(currentjvm);
@@ -144,68 +211,14 @@ if (debug) then
         print(debug);
     end
 
-local function debugOneLinePrint(string)
-  if (debug) then
-    print(string)
-  end;
-end
-
-
     --trasnform substitute names to lua patterns
     local name = string.gsub(string.gsub(origname, "%-", "%%-"), "%.", "%%.")
     local javaver = string.gsub(origjavaver, "%.", "%%.")
 
     local jvms = { }
 
-function getPath(str,sep)
-    sep=sep or '/'
-    return str:match("(.*"..sep..")")
-end
-
-function splitToTable(source, pattern)
-  local i1 = string.gmatch(source, pattern) 
-  local l1 = {}
-  for i in i1 do
-    table.insert(l1, i)
-  end
-  return l1
-end
-
-local function slurp(path)
-    local f = io.open(path)
-    local s = f:read("*a")
-    f:close()
-    return s
-end
-
-function trim(s)
-  return (s:gsub("^%s*(.-)%s*$", "%1"))
-end
-
-local function dirWithParents(path)
-  local s = ""
-  local dirs = splitToTable(path, "[^/]+") 
-  for i,d in pairs(dirs) do
-    if (i == #dirs) then
-      break
-    end
-    s = s.."/"..d
-    local stat2 = posix.stat(s, "type");
-    if (stat2 == nil) then
-      debugOneLinePrint(s.." does not exists, creating")
-      if (not dry) then
-        posix.mkdir(s)
-      end
-    else
-      debugOneLinePrint(s.." exists,not creating")
-    end
-  end
-end
-
-
     debugOneLinePrint("started")
 
-
     foundJvms = posix.dir(jvmdir);
     if (foundJvms == nil) then
         debugOneLinePrint("no, or nothing in " .. jvmdir .. " exit")
@@ -250,11 +263,19 @@ table.sort(jvms , function(a,b)
             local l2x = tonumber(l2[x])
             if (l1x ~= nil and l2x ~= nil) then
                 --if hunks are numbers, go with them
-      if (l1x < l2x) then return true; end
+                if (l1x < l2x) then
-      if (l1x > l2x) then return false; end
+                    return true;
+                end
+                if (l1x > l2x) then
+                    return false;
+                end
             else
-      if (l1[x] < l2[x]) then return true; end
+                if (l1[x] < l2[x]) then
-      if (l1[x] > l2[x]) then return false; end
+                    return true;
+                end
+                if (l1[x] > l2[x]) then
+                    return false;
+                end
             end
             -- if hunks are equals then move to another pair of hunks
         end
@@ -279,7 +300,6 @@ if ( temp ~= nil ) then
         file:close()
     end
 
-
     local readlinkOutput = os.tmpname()
 
     for i, file in pairs(caredFiles) do
@@ -326,3 +346,13 @@ for i,file in pairs(caredFiles) do
             debugOneLinePrint(SOURCE .. " does not exists")
         end
     end
+
+end --unindented main function
+
+if (arg == nil) then
+    debugOneLinePrint("arg variable is nil, you have to call mainProgram manually") -- this can actually not be invoked, as the debug is set via arg
+else
+    M.mainProgram(arg)
+end
+
+return M

copy_jdk_configs_fixFiles.sh

@@ -2,23 +2,38 @@
 config=$1
 target=$2
 
-debug="false"
-
-rma=""
-  if [ "x$debug" == "xtrue" ] ; then
-    rma="-v"
-  fi
-
 debug(){
   if [ "x$debug" == "xtrue" ] ; then
-    echo "$1"
+    echo "$@"
   fi
 }
 
+debug "cjc: bash debug is on"
+
+cmdvDebug() {
+  if [ "x$debug" == "xtrue" ] ; then
+    "$@" -v
+  else
+    "$@" 1>/dev/null 2>&1
+  fi
+}
+
+mvDebug() {
+  cmdvDebug mv "$@"
+}
+
+rmDebug() {
+  cmdvDebug rm "$@"
+}
+
+rmdirDebug() {
+ cmdvDebug rmdir "$@"
+}
+
 #we should be pretty strict about removing once used (even "used" [with fail]) config file, as it may corrupt another installation
 clean(){
   debug "cleanup: removing $config"
-  rm -rf $config
+  rmDebug -rf $config
 }
 
 if [ "x" == "x$config" ] ; then
@@ -133,23 +148,23 @@ work(){
     if [ $? -gt 0 ] ; then
      if [ "X$1" == "Xrpmnew" ] ; then
        debug "$sf2 was NOT modified, removing possibly corrupted $sf1 and renaming from $file"
-       mv $rma -f $file $sf1
+       mvDebug -f $file $sf1
        if [ $? -eq 0 ] ; then
          echo "restored $file to $sf1"
        else
-         echo "FAILED to restore $file to $sf1"
+         debug "FAILED to restore $file to $sf1"
        fi
     fi
      if [ "X$1" == "Xrpmorig" ] ; then
        debug "$sf2 was NOT modified, removing possibly corrupted $file"
-       rm $rma $file
+       rmDebug $file
     fi
     else
      debug "$sf2 was modified, keeping $file, and removing the duplicated original"
      # information is now backuped, in new directory anyway. Removing future rpmsave to allow rpm -e
-     rm -f $rma $sf2
+     rmDebug -f $sf2
      # or its corresponding backup
-     rm -f $rma $sf2.$1
+     rmDebug -f $sf2.$1
     fi
 done
 }
@@ -169,9 +184,9 @@ files=`find $sourceSearchPath | grep "\\.rpmorig$"`
     rpmsaveTarget=`echo $file | sed "s/$srcName/$targetName/"`
     debug "relocating $file to $rpmsaveTarget"
     if [ -e $rpmsaveTarget ] ; then
-      rm $rma $file
+      rmDebug $file
     else
-      mv $rma $file $rpmsaveTarget
+      mvDebug $file $rpmsaveTarget
     fi
   done
 
@@ -181,9 +196,9 @@ files=`find $sourceSearchPath | grep "\\.rpmsave$"`
     rpmsaveTarget=`echo $file | sed "s/$srcName/$targetName/"`
     debug "relocating $file to $rpmsaveTarget"
     if [ -e $rpmsaveTarget ] ; then
-      rm $rma $file
+      rmDebug $file
     else
-      mv $rma $file $rpmsaveTarget
+      mvDebug $file $rpmsaveTarget
     fi
   done
 
@@ -211,20 +226,21 @@ done
 debug "cleaning legacy leftowers"
 if [ "x$debug" == "xtrue" ] ; then
   find $sourceSearchPath -empty -type d -delete
-  rmdir $rma $sourceSearchPath
 else
   find $sourceSearchPath -empty -type d -delete 2>/dev/null >/dev/null
-  rmdir $rma $sourceSearchPath 2>/dev/null >/dev/null
 fi
+rmdirDebug $sourceSearchPath
 
 # and remove placeholders
 for blackdir in $blackdirs; do
   if [ -e $blackdir ] ; then
     debug "nasty $blackdir  exists, cleaning placeholder"
-    rm $blackdir/C-J-C_placeholder
+    rmDebug $blackdir/C-J-C_placeholder
   else
     debug "nasty $blackdir  DONT exists, ignoring again"
   fi
 done
 
 clean
+
+exit 0