Merge pull request #1292 from yast/broken-casefold

Fix case-insensitive finding of LICENSE.*.TXT (bsc#1215698)

library/packages/src/lib/y2packager/licenses_fetchers/archive.rb

@@ -42,7 +42,7 @@ def locales
           begin
             unpack_archive
 
-            license_files = Dir.glob(File.join(archive_dir, "**", "LICENSE.*.TXT"), File::FNM_CASEFOLD)
+            license_files = find_case_insensitive(archive_dir, "LICENSE.*.TXT")
             # NOTE: despite the use of the case-insensitive flag, the captured group will be
             # returned as it is.
             languages = license_files.map { |path| path[/LICENSE.(\w*).TXT/i, 1] }
@@ -155,12 +155,22 @@ def fallback_path(directory)
 
       # Return the path for the given file in specified directory
       #
-      # @param directory [String] Directory where licenses were unpacked
-      # @param file      [String] File name (without directory component)
-      #
+      # @param (see #find_case_insensitive)
       # @return [String, nil] The file path; nil if was not found
-      def find_path_for(directory, file)
-        Dir.glob(File.join(directory, "**", file), File::FNM_CASEFOLD).first
+      def find_path_for(directory, fileglob)
+        find_case_insensitive(directory, fileglob).first
+      end
+
+      # Return paths for the given file glob in specified directory
+      #
+      # @param directory [String] Directory, whole subtree is searched
+      # @param fileglob  [String] File name, with glob characters like `*` `{a,b}`, case insensitive
+      # @return [Array<String>] All found file paths
+      def find_case_insensitive(directory, fileglob)
+        files = Dir.glob(File.join(directory, "**", "*"))
+        files.find_all do |fn|
+          File.fnmatch?(File.join(directory, "**", fileglob), fn, File::FNM_CASEFOLD | File::FNM_EXTGLOB)
+        end
       end
     end
   end

package/yast2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  5 08:50:25 UTC 2023 - Martin Vidner <mvidner@suse.com>
+
+- Fix case-insensitive finding of LICENSE.*.TXT (bsc#1215698)
+- 5.0.1
+
 -------------------------------------------------------------------
 Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <jreidinger@suse.cz>
 

package/yast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        5.0.0
+Version:        5.0.1
 
 Release:        0
 Summary:        YaST2 Main Package