Changeset a150e738

Timestamp:

11/09/2021 04:45:14 AM (23 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

384c707

Parents:

b08c451 (diff), d18d285 (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

Files:

• .gitignore (modified) (1 diff)
• lfs-latest-git.php (modified) (5 diffs)

.gitignore

@@ -3 +3 @@
 version.ent
 appendices/*.script
+*.swp
 

lfs-latest-git.php

@@ -111 +111 @@
 if ( $package == "bc"         ) $dirpath = "https://github.com/gavinhoward/bc/releases";
 if ( $package == "check"      ) $dirpath = "https://github.com/libcheck/check/releases";
-if ( $package == "e2fsprogs"  ) $dirpath = "https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/";
-if ( $package == "expat"      ) $dirpath = "http://sourceforge.net/projects/expat/files";
+if ( $package == "e2fsprogs"  ) $dirpath = "https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs";
+if ( $package == "expat"      ) $dirpath = "https://sourceforge.net/projects/expat/files";
 if ( $package == "elfutils"   ) $dirpath = "https://sourceware.org/ftp/elfutils";
-if ( $package == "expect"     ) $dirpath = "http://sourceforge.net/projects/expect/files";
+if ( $package == "expect"     ) $dirpath = "https://sourceforge.net/projects/expect/files";
 if ( $package == "file"       ) $dirpath = "https://github.com/file/file/tags";
 if ( $package == "flex"       ) $dirpath = "https://github.com/westes/flex/releases";
@@ -123 +123 @@
 if ( $package == "meson"      ) $dirpath = "https://github.com/mesonbuild/meson/releases";
 if ( $package == "mpc"        ) $dirpath = "https://ftp.gnu.org/gnu/mpc";
-if ( $package == "mpfr"       ) $dirpath = "http://mpfr.loria.fr/mpfr-current";
+if ( $package == "mpfr"       ) $dirpath = "https://mpfr.loria.fr/mpfr-current";
+if ( $package == "ncurses"    ) $dirpath = "https://invisible-mirror.net/archives/ncurses";
 if ( $package == "ninja"      ) $dirpath = "https://github.com/ninja-build/ninja/releases";
 if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
@@ -132 +133 @@
 if ( $package == "Jinja"      ) $dirpath = "https://pypi.python.org/pypi/Jinja2/";
 if ( $package == "systemd"    ) $dirpath = "https://github.com/systemd/systemd/releases";
-if ( $package == "tcl"        ) $dirpath = "http://sourceforge.net/projects/tcl/files";
+if ( $package == "tcl"        ) $dirpath = "https://sourceforge.net/projects/tcl/files";
 if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." );
 if ( $package == "vim"        ) $dirpath = "https://github.com/vim/vim/tags";
 if ( $package == "zstd"       ) $dirpath = "https://github.com/facebook/zstd/releases";
-//if ( $package == "vim"        ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
 
   // Check for ftp
   if ( preg_match( "/^ftp/", $dirpath ) )
   {
+    echo "ftp should not occur\n";
+  /*
     $dirpath  = substr( $dirpath, 6 );           // Remove ftp://
     $dirpath  = rtrim ( $dirpath, "/" );         // Trim any trailing slash
@@ -186 +188 @@
     $lines = ftp_rawlist ($conn, $path);
     ftp_close( $conn );
+*/
   }
   else // http(s)
@@ -411 +414 @@
 
    exec ( "echo '$message' | mailx -r $from -s '$subject' $to" );
-   //echo $message;
 }