Changeset 00983ba6

Timestamp:

07/25/2024 10:30:11 PM (7 weeks ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib, xry111/multilib

Children:

3830377

Parents:

08de18a (diff), d2ac702 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

File:

• lfs-latest-git.php (modified) (4 diffs)

lfs-latest-git.php

@@ -136 +136 @@
 if ( $package == "libffi"     ) $dirpath = github("libffi/libffi");
 if ( $package == "libxcrypt"  ) $dirpath = github("besser82/libxcrypt");
-if ( $package == "lz"         ) $dirpath = github("lz4/lz4");
+if ( $package == "lz4"        ) $dirpath = github("lz4/lz4");
 if ( $package == "meson"      ) $dirpath = github("mesonbuild/meson");
 if ( $package == "mpc"        ) $dirpath = "https://ftp.gnu.org/gnu/mpc";
@@ -142 +142 @@
 if ( $package == "ncurses"    ) $dirpath = "https://invisible-mirror.net/archives/ncurses";
 if ( $package == "ninja"      ) $dirpath = github("ninja-build/ninja");
+if ( $package == "openssl"    ) $dirpath = github("openssl/openssl");
 if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
 if ( $package == "psmisc"     ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
@@ -268 +269 @@
      return find_max( $lines, "/Jinja/", "/^.*Jinja2 ([\d\.]+).*$/" );
 
-  if ( $package == "lz" )
+  if ( $package == "lz4" )
      return find_max( $lines, "/tag_name/", '/^.*v([\d\.]+).*$/' );
 
   if ( $package == "openssl" )
-     return find_max( $lines, "/openssl/", "/^.*openssl-([\d\.p]*\d.?).tar.*$/" );
+     return find_max( $lines, "/name.:/", "/^.*OpenSSL ([\d\.]+\d).*$/" );
 
   if ( $package == "Python" )
@@ -347 +348 @@
       {
         $pattern = "/\D*(\d.*[a-z]*)\.tar\D*/";
+      }
+
+      else if ( preg_match( "/lz4/", $file ) )
+      {
+        $pkg_pattern= "/(\D*4).*/";
       }