Changeset 43822cc for lfs-latest.php

Timestamp:

03/31/2021 10:41:37 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib, xry111/multilib

Children:

e2ccc32

Parents:

3e18fa2

git-author:

Thomas Trepl <thomas@…> (02/21/2020 04:32:53 PM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:37 AM)

Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11757 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• lfs-latest.php (modified) (2 diffs)

lfs-latest.php

@@ -121 +121 @@
 if ( $package == "mpfr"       ) $dirpath = "http://mpfr.loria.fr/mpfr-current";
 if ( $package == "ninja"      ) $dirpath = "https://github.com/ninja-build/ninja/releases";
-if ( $package == "procps-ng"  ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
-if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
+//if ( $package == "procps-ng"  ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
+if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
+//if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
+if ( $package == "psmisc"     ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
 if ( $package == "shadow"     ) $dirpath = "https://github.com/shadow-maint/shadow/releases";
 if ( $package == "systemd"    ) $dirpath = "https://github.com/systemd/systemd/releases";
@@ -276 +278 @@
   }
 
+  if ( $package == "procps-ng" )
+     return find_max( $lines, "/release/", "/^.* ([\d\.]+).*$/" );
+
+  if ( $package == "psmisc" )
+     return find_max( $lines, "/^v/", "/^v([\d\.]+).*$/" );
+
   if ( $package == "grub" )
      return find_max( $lines, "/grub/", "/^.*grub-(\d\..*).tar.xz.*$/" );