Changes in lfs-latest-git.php [043e9bd:7b54528]

File:

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

lfs-latest-git.php

@@ -16 +16 @@
 $regex[ 'less'     ] = "/^.*current released version is less-(\d+).*$/";
 $regex[ 'mpfr'     ] = "/^mpfr-([\d\.]+)\.tar.*$/";
-//$regex[ 'Python'   ] = "/^.*Latest Python 3.*Python (3[\d\.]+\d).*$/";
+$regex[ 'Python'   ] = "/^.*Latest Python 3.*Python (3[\d\.]+\d).*$/";
 //$regex[ 'sysvinit' ] = "/^.*sysvinit-([\d\.]+)dsf\.tar.*$/";
 $regex[ 'tzdata'   ] = "/^.*tzdata([\d]+[a-z]).*$/";
@@ -78 +78 @@
 
   if ( preg_match( "/sourceforge/", $url ) ||
-       preg_match( "/python/",      $url ) ||
        preg_match( "/psmisc/",      $url ) )
   {
@@ -136 +135 @@
 if ( $package == "libffi"     ) $dirpath = github("libffi/libffi");
 if ( $package == "libxcrypt"  ) $dirpath = github("besser82/libxcrypt");
-if ( $package == "lz"         ) $dirpath = github("lz4/lz4");
 if ( $package == "meson"      ) $dirpath = github("mesonbuild/meson");
 if ( $package == "mpc"        ) $dirpath = "https://ftp.gnu.org/gnu/mpc";
@@ -148 +146 @@
 if ( $package == "sysvinit"   ) $dirpath = github("slicer69/sysvinit");
 if ( $package == "MarkupSafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/";
-if ( $package == "jinja"      ) $dirpath = "https://pypi.python.org/pypi/Jinja2/";
+if ( $package == "Jinja"      ) $dirpath = "https://pypi.python.org/pypi/Jinja2/";
 if ( $package == "systemd"    ) $dirpath = github("systemd/systemd");
 //if ( $package == "tcl"        ) $dirpath = "https://sourceforge.net/projects/tcl/files";
@@ -163 +161 @@
   {
     echo "ftp should not occur\n";
+  /*
+    $dirpath  = substr( $dirpath, 6 );           // Remove ftp://
+    $dirpath  = rtrim ( $dirpath, "/" );         // Trim any trailing slash
+    $position = strpos( $dirpath, "/" );         // Divide at first slash
+    $server   = substr( $dirpath, 0, $position );
+    $path     = substr( $dirpath, $position );
+
+    $conn = ftp_connect( $server );
+    ftp_login( $conn, "anonymous", "" );
+
+    // See if we need special handling
+    if ( isset( $exceptions[ $package ] ) )
+    {
+       $specials = explode( ":", $exceptions[ $package ] );
+
+       foreach ( $specials as $i )
+       {
+          list( $op, $regexp ) = explode( "=", $i );
+
+          switch ($op)
+          {
+            case "UPDIR":
+              // Remove last dir from $path
+              $position = strrpos( $path, "/" );
+              $path = substr( $path, 0, $position );
+
+              // Get dir listing
+              $lines = ftp_rawlist ($conn, $path);
+              $max   = find_max( $lines, $regexp, $regexp );
+              break;
+
+            case "DOWNDIR":
+              // Append found directory
+              $path .= "/$max";
+              break;
+
+            default:
+              echo "Error in specials array for $package\n";
+              return -5;
+              break;
+          }
+       }
+    }
+
+    $lines = ftp_rawlist ($conn, $path);
+    ftp_close( $conn );
+*/
   }
   else // http(s)
@@ -259 +304 @@
 
   if ( $package == "psmisc" )
-     return find_max( $lines, "/v\d/", "/^.*v([\d\.]+)$/" );
+     return find_max( $lines, "/v\d/", "/^.*v([\d\.]+).tar.*$/" );
 
   if ( $package == "grub" )
      return find_max( $lines, "/grub/", "/^.*grub-([\d\.]+).tar.xz.*$/" );
 
-  if ( $package == "jinja" )
+  if ( $package == "Jinja" )
      return find_max( $lines, "/Jinja/", "/^.*Jinja2 ([\d\.]+).*$/" );
-
-  if ( $package == "lz" )
-     return find_max( $lines, "/name.:/", '/^.*LZ4 v([\d\.]+)".*$/' );
 
   if ( $package == "openssl" )
      return find_max( $lines, "/openssl/", "/^.*openssl-([\d\.p]*\d.?).tar.*$/" );
-
-  if ( $package == "Python" )
-     return find_max( $lines, "/Python 3/", "/^.*Python (3[\d\.]*\d) .*$/" );
 
   if ( $package == "vim" )
@@ -294 +333 @@
    // Fetech from git and get wget-list
    $current = array();
+   #$lfssvn = "svn://svn.linuxfromscratch.org/LFS/trunk";
    $lfsgit = "https://git.linuxfromscratch.org/lfs.git";
 
@@ -325 +365 @@
       $file        = rtrim( $file );
       $pkg_pattern = "/(\D*).*/";
+      //$pattern     = "/\D*(\d.*\d)\D*/";
       $pattern     = "/\D*(\d.*\d)\D*/";