Author: krejzi Date: Wed Aug 16 10:45:04 2017 New Revision: 19029 Log: Update currency scripts
Modified: trunk/scripts/blfs-chapter04.php trunk/scripts/blfs-chapter05.php trunk/scripts/blfs-chapter06.php trunk/scripts/blfs-chapter10.php trunk/scripts/blfs-chapter11.php trunk/scripts/blfs-chapter12.php trunk/scripts/blfs-chapter13.php trunk/scripts/blfs-chapter17.php trunk/scripts/blfs-chapter20.php trunk/scripts/blfs-chapter24.php trunk/scripts/blfs-chapter25.php trunk/scripts/blfs-chapter35.php trunk/scripts/blfs-chapter43.php trunk/scripts/blfs-chapter46.php trunk/scripts/blfs-chapter47.php Modified: trunk/scripts/blfs-chapter04.php ============================================================================== --- trunk/scripts/blfs-chapter04.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter04.php Wed Aug 16 10:45:04 2017 (r19029) @@ -6,7 +6,7 @@ $CHAPTER = "4"; $CHAPTERS = "Chapters 2-4"; $START_PACKAGE = "lsb-release"; -$STOP_PACKAGE = "tripwire"; +$STOP_PACKAGE = "volume_key"; $renames = array(); $renames[ 'Linux-PAM1' ] = 'Linux-PAM-docs'; @@ -16,9 +16,10 @@ $ignores = array(); $ignores[ 'openssh1' ] = ""; -//$current="openssl"; // For debugging +//$current="liboauth"; // For debugging $regex = array(); +$regex[ 'lsb-release' ] = "/^.*lsb-release_([\d\.]+).*_all\.deb*$/"; $regex[ 'krb5' ] = "/^.*Kerberos V5 Release ([\d\.]+).*$/"; $regex[ 'haveged' ] = "/^.*haveged-([\d\.]+)\.tar.*$/"; $regex[ 'cracklib' ] = "/^.*cracklib-([\d\.]+)\.tar.*$/"; @@ -27,6 +28,14 @@ $url_fix = array( + array( 'pkg' => 'lsb-release', + 'match' => '^.*$', + 'replace' => 'https://sourceforge.net/projects/lsb/files/' ), + + array( 'pkg' => 'liboauth', + 'match' => '^.*$', + 'replace' => 'https://sourceforge.net/projects/liboauth/files/' ), + array( 'pkg' => 'ConsoleKit2', 'match' => '^.*$', 'replace' => 'https://github.com/ConsoleKit2/ConsoleKit2/releases' ), Modified: trunk/scripts/blfs-chapter05.php ============================================================================== --- trunk/scripts/blfs-chapter05.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter05.php Wed Aug 16 10:45:04 2017 (r19029) @@ -15,7 +15,7 @@ $renames[ 'fuse1' ] = 'fuse2'; $ignores = array(); -//$current="LVM2."; // For debugging +//$current="smartmontools"; // For debugging $regex = array(); $regex[ 'ntfs-3g_ntfsprogs' ] = "/^.*Stable Source Release ([\d\.]+).*$/"; @@ -25,6 +25,10 @@ $url_fix = array ( + array( 'pkg' => 'smartmontools', + 'match' => '^.*$', + 'replace' => "https://sourceforge.net/projects/smartmontools/files/"; ), + array( 'pkg' => 'dosfstools', 'match' => '^.*$', 'replace' => "https://github.com/dosfstools/dosfstools/releases"; ), @@ -70,7 +74,7 @@ global $current; if ( isset( $current ) && $book_index != "$current" ) return 0; -echo "pkg=$book_index $dirpath\n"; +//echo "pkg=$book_index $dirpath\n"; // Fix up directory path foreach ( $url_fix as $u ) Modified: trunk/scripts/blfs-chapter06.php ============================================================================== --- trunk/scripts/blfs-chapter06.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter06.php Wed Aug 16 10:45:04 2017 (r19029) @@ -9,9 +9,9 @@ $STOP_PACKAGE = 'qemu'; $renames = array(); -$renames[ 'zsh1' ] = 'zsh-doc'; $ignores = array(); +$ignores[ 'zsh1' ] = ''; //$current="tcsh"; // For debugging Modified: trunk/scripts/blfs-chapter10.php ============================================================================== --- trunk/scripts/blfs-chapter10.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter10.php Wed Aug 16 10:45:04 2017 (r19029) @@ -9,7 +9,7 @@ $STOP_PACKAGE = 'qpdf'; $renames = array(); -$renames[ 'v' ] = 'openjpeg2'; +$renames[ 'openjpeg1' ] = 'openjpeg2'; $ignores = array(); $ignores[ 'ippicv' ] = ""; @@ -25,6 +25,8 @@ $regex[ 'poppler' ] = "/^.*poppler-([\d\.]+\d).tar.*$/"; $regex[ 'popplerdata' ] = "/^.*poppler-data([\d\.]+\d).tar.*$/"; $regex[ 'qpdf' ] = "/^.*Download qpdf-([\d\.]+\d).tar.*$/"; +$regex[ 'potrace' ] = "/^.*Download potrace-([\d\.]+\d).tar.*$/"; +$regex[ 'exiv2' ] = "/^.*exiv2-(\d[\d\.]+\d).*.tar.*$/"; $sf = 'sourceforge.net'; @@ -100,7 +102,7 @@ array( 'pkg' => 'exiv2', 'match' => '^.*$', - 'replace' => "http://pkgs.fedoraproject.org/repo/pkgs/exiv2"; ), + 'replace' => "http://exiv2.org/download.html"; ), array( 'pkg' => 'opencv', 'match' => '^.*$', @@ -114,18 +116,18 @@ 'match' => '^.*$', 'replace' => "http://sourceforge.net/projects/openjpeg.mirror/files"; ), - array( 'pkg' => 'openjpeg1', - 'match' => '^.*$', - 'replace' => "http://sourceforge.net/projects/openjpeg.mirror/files"; ), - array( 'pkg' => 'ijs', 'match' => '^.*$', 'replace' => "https://www.openprinting.org/download/ijs/download/"; ), - array( 'pkg' => 'v', // OpenJPEG2 + array( 'pkg' => 'openjpeg1', // OpenJPEG2 'match' => '^.*$', 'replace' => "https://github.com/uclouvain/openjpeg/releases"; ), + array( 'pkg' => 'potrace', + 'match' => '^.*$', + 'replace' => "https://sourceforge.net/projects/potrace/files"; ), + ); function get_packages( $package, $dirpath ) @@ -251,9 +253,6 @@ if ( $book_index == "openjpeg" ) return find_max( $lines, '/files/', '/^.*files\/(1\.[\d\.]+)\/.*$/' ); - if ( $book_index == "openjpeg1" ) - return find_max( $lines, '/files/', '/^.*files\/(2\.[\d\.]+)\/.*$/' ); - // imlib if ( $book_index == "imlib2" ) { @@ -273,7 +272,7 @@ return find_max( $lines, '/3\./', '/^.* (3\.[\d\.]+).*$/' ); // OpenJPEG2 - if ( $book_index == "v" ) + if ( $book_index == "openjpeg1" ) return find_max( $lines, '/openjpeg/', '/^.*openjpeg-v(\d\.[\d\.]+)-.*$/' ); if ( $book_index == "lcms2" ) @@ -305,9 +304,6 @@ array( 'pkg' => 'imlib2', 'regex' => "/\D*imlib2-([\d\.]+)\D*$/" ), - array( 'pkg' => 'opencv_contrib', - 'regex' => "/.*\/([\d\.]+\d)\D*$/" ), - array( 'pkg' => 'graphite2', 'regex' => "/\D*graphite2-([\d\.]+)\D*$/" ), ); Modified: trunk/scripts/blfs-chapter11.php ============================================================================== --- trunk/scripts/blfs-chapter11.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter11.php Wed Aug 16 10:45:04 2017 (r19029) @@ -21,7 +21,7 @@ $regex[ 'intltool' ] = "/^.*Latest version is (\d[\d\.]+\d).*$/"; $regex[ 'xscreensaver' ] = "/^.*xscreensaver-(\d[\d\.]+\d).tar.*$/"; -//$current="tidy-html5"; // For debugging +//$current="graphviz"; // For debugging $url_fix = array ( array( 'pkg' => 'bogofilter', @@ -71,6 +71,10 @@ array( 'pkg' => 'xscreensaver', 'match' => '^.*$', 'replace' => "http://www.jwz.org/xscreensaver/download.html"; ), + + array( 'pkg' => 'graphviz', + 'match' => '^.*$', + 'replace' => "http://graphviz.org/pub/graphviz/stable/SOURCES/"; ), ); function get_packages( $package, $dirpath ) Modified: trunk/scripts/blfs-chapter12.php ============================================================================== --- trunk/scripts/blfs-chapter12.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter12.php Wed Aug 16 10:45:04 2017 (r19029) @@ -9,14 +9,13 @@ $STOP_PACKAGE = 'zip'; $renames = array(); -$renames[ 'colord' ] = 'colord-1.2'; -$renames[ 'colord1' ] = 'colord-1.3'; $renames[ 'udisks1' ] = 'udisks2'; $renames[ 'sg' ] = 'sg3_utils'; $renames[ 'unrarsrc' ] = 'unrar'; //$renames[ 'p7zip_' ] = 'p7zip'; $ignores = array(); +$ignores[ 'colord1' ] = ""; //$current="logrotate"; @@ -56,10 +55,6 @@ 'match' => '^.*$', 'replace' => "ftp://ftp.rarlab.com/rar"; ), - array( 'pkg' => 'unzip', - 'match' => '^.*$', - 'replace' => "ftp://ftp.info-zip.org/pub/infozip/src"; ), - array( 'pkg' => 'acpid', 'match' => '^.*$', 'replace' => "http://sourceforge.net/projects/acpid2/files"; ), @@ -91,10 +86,6 @@ if ( isset( $current ) && $book_index != "$current" ) return 0; - if ( $book_index == 'zip' || - $book_index == 'unzip' ) - return 'manual check'; - // Fix up directory path foreach ( $url_fix as $u ) { Modified: trunk/scripts/blfs-chapter13.php ============================================================================== --- trunk/scripts/blfs-chapter13.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter13.php Wed Aug 16 10:45:04 2017 (r19029) @@ -9,16 +9,14 @@ $STOP_PACKAGE = 'junit'; $renames = array(); -$renames[ 'llvm' ] = 'llvm-3'; -$renames[ 'llvm1' ] = 'llvm-4'; -//$renames[ 'py' ] = 'pycairo'; +$renames[ 'llvm1' ] = 'llvm'; $renames[ 'Python' ] = 'python2'; $renames[ 'Python1' ] = 'python3'; $renames[ 'pygobject' ] = 'pygobject2'; $renames[ 'pygobject1' ] = 'pygobject3'; -$renames[ 'v' ] = 'ninja'; $ignores = array(); +$ignores[ 'llvm' ] = ''; // LLVM3 $ignores[ 'cfe' ] = ''; $ignores[ 'clang' ] = ''; $ignores[ 'compiler-rt' ] = ''; @@ -28,7 +26,6 @@ $ignores[ 'nasm1' ] = ''; $ignores[ 'tcl1' ] = ''; $ignores[ 'gcc1' ] = ''; -$ignores[ 'gcc11' ] = ''; $ignores[ 'OpenJDK' ] = ''; $ignores[ 'hamcrest' ] = ''; $ignores[ 'apache-ant1' ] = ''; @@ -36,7 +33,7 @@ $ignores[ 'python' ] = ''; $ignores[ 'python1' ] = ''; -//$current="valgrind"; // For debugging +//$current="scour"; // For debugging $regex = array(); $regex[ 'check' ] = "/^.*Check (\d[\d\.]+\d).*$/"; @@ -102,6 +99,10 @@ 'match' => '^.*$', 'replace' => "http://github.com/libcheck/check/releases"; ), + array( 'pkg' => 'cmake', + 'match' => '^.*$', + 'replace' => "https://cmake.org/download/"; ), + array( 'pkg' => 'expect', 'match' => '^.*$', 'replace' => "http://sourceforge.net/projects/expect/files"; ), @@ -114,7 +115,7 @@ 'match' => '^.*$', 'replace' => "https://github.com/junit-team/junit/wiki"; ), - array( 'pkg' => 'v', + array( 'pkg' => 'ninja', 'match' => '^.*$', 'replace' => "https://github.com/ninja-build/ninja/releases"; ), @@ -354,6 +355,9 @@ 'match' => '^.*$', 'replace' => "https://github.com/pygobject/pycairo/releases"; ), + array( 'pkg' => 'scour', + 'match' => '^.*$', + 'replace' => "https://github.com/scour-project/scour/releases"; ), ); /* @@ -480,22 +484,6 @@ $dirpath .= "/$dir/"; } - // Customize http directories as needed - if ( $book_index == "cmake" ) - { - $dirpath = max_parent( $dirpath, 'v' ); - $prev = $previous; - - // Special if there is no current version in $dirpath - $lines = http_get_file( $dirpath ); - $max = find_max( $lines, "/$package/", - "/^.*$package-([\d\.]*\d)\.tar.*$/" ); - if ( $max != 0 ) return $max; - - $position = strrpos( $dirpath, "/" ); - $dirpath = substr ( $dirpath, 0, $position ) . "/$prev"; - } - if ( $package == "npapi-sdk" ) { # We have to process the stupid javascript to get this to work @@ -543,19 +531,22 @@ return find_max( $lines, "/Download LLVM/", "/^.*LLVM (3[\d\.]+).*$/" ); if ( $book_index == "llvm1" ) - return find_max( $lines, "/Download LLVM/", "/^.*LLVM (4[\d\.]+).*$/" ); + return find_max( $lines, "/Download LLVM/", "/^.*LLVM ([\d\.]+).*$/" ); if ( $book_index == "elfutils" ) { return find_max( $lines, "/\d[\d\.]+/", "/^.* (\d[\d\.]+)$/" ); } - if ( $package == "v" ) // ninja + if ( $package == "ninja" ) { $max = find_max( $lines, "/v/", "/^.*v(\d[\d\.]*\d).*$/" ); return $max; } + if ( $package == "scour" ) + return find_max( $lines, "/v/", "/^.*v(\d[\d\.]*\d).*$/" ); + if ( $package == "rustc" ) { $max = find_max( $lines, "/release/", "/^.* (\d[\d\.]+\d) release.*$/" ); Modified: trunk/scripts/blfs-chapter17.php ============================================================================== --- trunk/scripts/blfs-chapter17.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter17.php Wed Aug 16 10:45:04 2017 (r19029) @@ -9,10 +9,9 @@ $STOP_PACKAGE = 'procmail'; $renames = array(); -$renames[ 'geoclue1' ] = 'geoclue2'; $ignores = array(); -$ignores[ 'rpcnis-headers' ] = ''; +$ignores[ 'libnl-doc' ] = ''; //$current="lynx"; Modified: trunk/scripts/blfs-chapter20.php ============================================================================== --- trunk/scripts/blfs-chapter20.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter20.php Wed Aug 16 10:45:04 2017 (r19029) @@ -13,6 +13,7 @@ $renames[ 'virtuoso-opensource' ] = 'virtuoso'; $ignores = array(); +$ignores[ 'sqlite-doc' ] = ''; //$current="httpd"; @@ -21,7 +22,6 @@ $regex[ 'db' ] = "/^.*Berkeley DB (\d[\d\.]+\d).tar.*$/"; $regex[ 'LMDB' ] = "/^.*LMDB_(\d[\d\.]+\d).*$/"; $regex[ 'mysql' ] = "/^.*Current Generally Available Release: (\d[\d\.]+\d).*$/"; -$regex[ 'sqlite-doc' ] = "/^.*sqlite-doc-(\d+).zip.*$/"; $regex[ 'soprano' ] = "/^.*Download soprano-(\d[\d\.]*).tar.*$/"; $regex[ 'xinetd' ] = "/^.*xinetd_(\d[\d\.]*).orig.tar.*$/"; $regex[ 'mariadb' ] = "/^.*Download (\d[\d\.]*\d) Stable.*$/"; @@ -42,10 +42,6 @@ 'match' => '^.*$', 'replace' => "http://sourceforge.net/projects/virtuoso/files"; ), - array( 'pkg' => 'sqlite-doc', - 'match' => '^.*$', - 'replace' => "http://sqlite.org/download.html"; ), - array( 'pkg' => 'sqlite-autoconf', 'match' => '^.*$', 'replace' => "http://sqlite.org/download.html"; ), Modified: trunk/scripts/blfs-chapter24.php ============================================================================== --- trunk/scripts/blfs-chapter24.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter24.php Wed Aug 16 10:45:04 2017 (r19029) @@ -9,7 +9,6 @@ $STOP_PACKAGE = 'xinit'; $renames = array(); -$renames[ 'v' ] = 'libvdpau-va-gl'; $ignores = array(); $d = getenv( 'BLFS_DIR' ); @@ -24,8 +23,7 @@ $fonts = array(); $regex = array(); -//$regex[ 'libvdpau-va-gl' ] = "/^.*version (\d[\d\.]+\d).*$/"; -$regex[ 'v' ] = "/^.*version (\d[\d\.]+\d).*$/"; +$regex[ 'libvdpau-va-gl' ] = "/^.*version (\d[\d\.]+\d).*$/"; //$current="v"; // For debugging @@ -35,8 +33,15 @@ 'match' => '^.*$', 'replace' => "http://sourceforge.net/projects/linuxwacom/files/xf86-input-wacom"; ), - //array( 'pkg' => 'libvdpau-va-gl', - array( 'pkg' => 'v', + array( 'pkg' => 'libva', + 'match' => '^.*$', + 'replace' => "https://github.com/01org/libva/releases"; ), + + array( 'pkg' => 'intel-vaapi-driver', + 'match' => '^.*$', + 'replace' => "https://github.com/01org/intel-vaapi-driver/releases"; ), + + array( 'pkg' => 'libvdpau-va-gl', 'match' => '^.*$', 'replace' => "https://github.com/i-rinat/libvdpau-va-gl/releases"; ), Modified: trunk/scripts/blfs-chapter25.php ============================================================================== --- trunk/scripts/blfs-chapter25.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter25.php Wed Aug 16 10:45:04 2017 (r19029) @@ -6,7 +6,7 @@ $CHAPTER = '25'; $CHAPTERS = 'Chapter 25'; $START_PACKAGE = 'atk'; -$STOP_PACKAGE = 'lxdm'; +$STOP_PACKAGE = 'webkitgtk'; $renames = array(); $renames[ 'gtk+' ] = 'gtk+2'; @@ -14,6 +14,8 @@ $renames[ 'gtkmm' ] = 'gtkmm2'; $renames[ 'gtkmm1' ] = 'gtkmm3'; $renames[ 'qt-everywhere-opensource-src' ] = 'qt5'; +$renames[ 'qtwebengine-opensource-src' ] = 'qtwebengine'; +$renames[ 'qtwebkit-opensource-src' ] = 'qtwebkit'; $ignores = array(); @@ -21,16 +23,8 @@ $regex = array(); $regex[ 'freeglut' ] = "/^.*Download freeglut-(\d[\d\.]+\d).tar.*$/"; -//$regex[ 'libepoxy' ] = "/^.*v(\d[\d\.]+\d).*$/"; -$regex[ 'lxdm' ] = "/^.*Download lxdm-(\d[\d\.]+\d).tar.*$/"; -$regex[ 'sddm' ] = "/^.*Version (\d[\d\.]+\d).*$/"; $url_fix = array ( - - array( 'pkg' => 'clutter-gst', - 'match' => '^.*$', - 'replace' => "http://ftp.gnome.org/pub/gnome/sources/clutter-gst/3.0"; ), - array( 'pkg' => 'freeglut', 'match' => '^.*$', 'replace' => "http://sourceforge.net/projects/freeglut/files"; ), @@ -42,22 +36,10 @@ array( 'pkg' => 'libepoxy', 'match' => '^.*$', 'replace' => "https://github.com/anholt/libepoxy/releases"; ), - - array( 'pkg' => 'lxdm', - 'match' => '^.*$', - 'replace' => "http://sourceforge.net/projects/lxdm/files"; ), array( 'pkg' => 'QScintilla_gpl', 'match' => '^.*$', 'replace' => "https://sourceforge.net/projects/pyqt/files/QScintilla2"; ), - - array( 'pkg' => 'sddm', - 'match' => '^.*$', - 'replace' => "https://github.com/sddm/sddm/releases"; ), - - array( 'pkg' => 'webkitgtk', - 'match' => '^.*$', - 'replace' => "http://webkitgtk.org/releases"; ), ); function get_packages( $package, $dirpath ) Modified: trunk/scripts/blfs-chapter35.php ============================================================================== --- trunk/scripts/blfs-chapter35.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter35.php Wed Aug 16 10:45:04 2017 (r19029) @@ -80,37 +80,63 @@ } // gsettings-desktop-schemas and similar - if ( $book_index == "gsettings-desktop-schemas" || - $book_index == "GConf" || - $book_index == "gcr" || - $book_index == "gvfs" || + if ( $book_index == "gcr" || + $book_index == "gsettings-desktop-schemas" || + $book_index == "rest" || + $book_index == "totem-pl-parser" || + $book_index == "vte" || $book_index == "yelp-xsl" || + $book_index == "GConf" || + $book_index == "geocode-glib" || + $book_index == "gjs" || + $book_index == "gnome-autoar" || $book_index == "gnome-desktop" || - $book_index == "gnome-keyring" || + $book_index == "gnome-menus" || + $book_index == "gnome-online-accounts" || $book_index == "gnome-video-effects" || - $book_index == "gtksourceview" || + $book_index == "grilo" || + $book_index == "gtkhtml" || + $book_index == "libchamplain" || + $book_index == "libgdata" || + $book_index == "libgee" || $book_index == "libgtop" || + $book_index == "libgweather" || $book_index == "libpeas" || $book_index == "libwnck" || - $book_index == "totem-pl-parser" || - $book_index == "vte" || + $book_index == "evolution-data-server" || + $book_index == "folks" || + $book_index == "gfbgraph" || + $book_index == "caribou" || $book_index == "dconf" || - $book_index == "gnome-icon-theme" || - $book_index == "gnome-icon-theme-symbolic" || + $book_index == "dconf-editor" || + $book_index == "gnome-backgrounds" || + $book_index == "gvfs" || + $book_index == "nautilus" || + $book_index == "zenity" || + $book_index == "gnome-bluetooth" || + $book_index == "gnome-keyring" || + $book_index == "gnome-settings-daemon" || + $book_index == "gnome-control-center" || + $book_index == "mutter" || + $book_index == "gnome-shell" || + $book_index == "gnome-shell-extensions" || + $book_index == "gnome-session" || + $book_index == "gdm" || $book_index == "gnome-user-docs" || - $book_index == "gnome-themes-standard" || - $book_index == "notification-daemon" || $book_index == "yelp" || - $book_index == "libgnome-keyring" ) + $book_index == "notification-daemon" ) { $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash $position = strrpos( $dirpath, "/" ); $dirpath = substr ( $dirpath, 0, $position ); // Up 1 $dirs = http_get_file( "$dirpath/" ); - //if ( $book_index == "libpeas" ) - // $dir = find_max( $dirs, "/\d$/", "/^.* ([\d\.]+)$/" ); - //else + if ( $book_index == "gnome-menus" || + $book_index == "grilo" || + $book_index == "libgdata" || + $book_index == "folks" ) + $dir = find_max( $dirs, "/\d$/", "/^.* ([\d\.]+)$/" ); + else $dir = find_even_max( $dirs, "/\d$/", "/^.* ([\d\.]+)$/" ); $dirpath .= "/$dir/"; Modified: trunk/scripts/blfs-chapter43.php ============================================================================== --- trunk/scripts/blfs-chapter43.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter43.php Wed Aug 16 10:45:04 2017 (r19029) @@ -20,8 +20,7 @@ //$current="xscreensaver"; $regex = array(); -//$regex[ 'inkscape' ] = "/^.*Latest stable.*(\d[\d\.]+\d).*$/"; -//$regex[ 'chromium' ] = "/^.*stable.*updated to (\d[\d\.]+\d) for Windows.*$/"; +$regex[ 'inkscape' ] = "/^.*Download Inkscape (\d[\d\.]+\d).*$/"; $regex[ 'chromium' ] = "/^pkgver=(\d[\d\.]+\d).*$/"; $regex[ 'gnucash' ] = "/^.*Download gnucash-(\d[\d\.]+\d).tar.*$/"; $regex[ 'midori' ] = "/^.*midori_(\d[\d\.]*\d)_all.*$/"; @@ -85,7 +84,7 @@ array( 'pkg' => 'inkscape', 'match' => '^.*$', - 'replace' => "https://inkscape.org/en/download/source"; ), + 'replace' => "https://inkscape.org/en/release/"; ), array( 'pkg' => 'pidgin', 'match' => '^.*$', @@ -166,6 +165,18 @@ // Check for ftp if ( preg_match( "/^ftp/", $dirpath ) ) { + if ( $package == "epiphany" ) + { + $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash + $position = strrpos( $dirpath, "/" ); + $dirpath = substr ( $dirpath, 0, $position ); // Up 1 + $dirs = http_get_file( "$dirpath/" ); + + $dir = find_even_max( $dirs, "/\d$/", "/^.* ([\d\.]+)$/" ); + + $dirpath .= "/$dir/"; + } + // Get listing $lines = http_get_file( "$dirpath/" ); } Modified: trunk/scripts/blfs-chapter46.php ============================================================================== --- trunk/scripts/blfs-chapter46.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter46.php Wed Aug 16 10:45:04 2017 (r19029) @@ -9,12 +9,12 @@ $STOP_PACKAGE = 'xvidcore'; $renames = array(); -$renames[ 'libmusicbrainz' ] = 'libmusicbrainz2'; -$renames[ 'libmusicbrainz1' ] = 'libmusicbrainz5'; -$renames[ 'libvpx-v' ] = 'libvpx'; -$renames[ 'v' ] = 'fdk-aac'; -$renames[ 'x264-snapshot' ] = 'x264'; -$renames[ 'x1' ] = 'x265'; +$renames[ 'libmusicbrainz' ] = 'libmusicbrainz2'; +$renames[ 'libmusicbrainz1' ] = 'libmusicbrainz5'; +$renames[ 'libvpx-v' ] = 'libvpx'; +$renames[ 'x264-snapshot' ] = 'x264'; +$renames[ 'x1' ] = 'x265'; +$renames[ 'flash_player_ppapi_linux.x' ] = 'flashplayer'; $ignores = array(); $ignores[ 'chromium-launcher' ] = ''; @@ -23,21 +23,23 @@ $ignores[ 'flash_player_npapi_linux.x' ] = ''; $ignores[ 'flash_player_npapi_linux.i' ] = ''; -//$current="opus"; +//$current="libcanberra"; $regex = array(); -$regex[ 'faac' ] = "/^.*Download faac-(\d[\d\.]+\d).tar.*$/"; -$regex[ 'a52dec' ] = "/^.*a52dec-(\d[\d\.]+\d) is.*$/"; -$regex[ 'libass' ] = "/^.*Release (\d[\d\.]+\d).*$/"; -$regex[ 'libdv' ] = "/^.*Download libdv-(\d[\d\.]+\d).*$/"; -$regex[ 'libmpeg2' ] = "/^.*libmpeg2-(\d[\d\.]+\d).*$/"; -$regex[ 'libmusicbrainz1' ] = "/^.*libmusicbrainz-(5[\d\.]+\d).*$/"; -$regex[ 'libquicktime' ] = "/^.*Download libquicktime-([\d\.]+\d).tar.*$/"; -$regex[ 'libsamplerate' ] = "/^.*libsamplerate-([\d\.]+\d).tar.*$/"; -$regex[ 'soundtouch' ] = "/^.*Download .* Source Codes release ([\d\.]+\d).*$/"; -$regex[ 'xine-lib' ] = "/^.*Download xine-lib-([\d\.]+\d).tar.*$/"; -$regex[ 'v' ] = "/^.*fdk-aac ([\d\.]+) *$/"; - +$regex[ 'faac' ] = "/^.*Download faac-(\d[\d\.]+\d).*$/"; +$regex[ 'a52dec' ] = "/^.*a52dec-(\d[\d\.]+\d) is.*$/"; +$regex[ 'libass' ] = "/^.*Release (\d[\d\.]+\d).*$/"; +$regex[ 'libdv' ] = "/^.*Download libdv-(\d[\d\.]+\d).*$/"; +$regex[ 'libmpeg2' ] = "/^.*libmpeg2-(\d[\d\.]+\d).*$/"; +$regex[ 'libmusicbrainz1' ] = "/^.*libmusicbrainz-(5[\d\.]+\d).*$/"; +$regex[ 'libquicktime' ] = "/^.*Download libquicktime-([\d\.]+\d).tar.*$/"; +$regex[ 'libsamplerate' ] = "/^.*libsamplerate-([\d\.]+\d).tar.*$/"; +$regex[ 'soundtouch' ] = "/^.*Download .* Source Codes release ([\d\.]+\d).*$/"; +$regex[ 'xine-lib' ] = "/^.*Download xine-lib-([\d\.]+\d).tar.*$/"; +$regex[ 'mlt' ] = "/^.*Download mlt-([\d\.]+\d).tar.*$/"; +$regex[ 'libcddb' ] = "/^.*Download libcddb-([\d\.]+\d).tar.*$/"; +$regex[ 'flash_player_ppapi_linux.x' ] = "/^.*latest versions are (\d[\d\.]+\d).*$/"; +$regex[ 'libcanberra' ] = "/^.*(\d[\d\.]+\d) released.*$/"; $url_fix = array ( @@ -115,16 +117,23 @@ array( 'pkg' => 'xvidcore', 'match' => '^.*$', - 'replace' => "http://ftp.br.debian.org/debian-multimedia/pool/main/x/xvidcore"; ), + 'replace' => "https://labs.xvid.com/source/"; ), + + array( 'pkg' => 'gavl', + 'match' => '^.*$', + 'replace' => "https://sourceforge.net/projects/gmerlin/files/gavl"; ), - array( 'pkg' => 'v', + array( 'pkg' => 'mlt', 'match' => '^.*$', - 'replace' => "https://github.com/mstorsjo/fdk-aac/releases"; ), + 'replace' => "https://sourceforge.net/projects/mlt/files"; ), - array( 'pkg' => 'libcanberra', + array( 'pkg' => 'libcddb', 'match' => '^.*$', - 'replace' => "http://pkgs.fedoraproject.org/repo/pkgs/libcanberra"; ), + 'replace' => "https://sourceforge.net/projects/libcddb/files"; ), + array( 'pkg' => 'flash_player_ppapi_linux.x', + 'match' => '^.*$', + 'replace' => "https://www.adobe.com/support/flashplayer/debug_downloads.html"; ), ); function get_packages( $package, $dirpath ) @@ -182,6 +191,13 @@ } else // http { + if ( $package == "gavl" ) + { + exec( "elinks -dump '$dirpath/'", $dirs ); + $dir = find_max( $dirs, "/\d\./", "/^.* ([\d\.]+)$/" ); + $dirpath .= "/$dir/"; + } + if ( $package == "libdvdcss" || $package == "libdvdnav" || $package == "libdvdread" ) @@ -296,16 +312,12 @@ if ( $package == "libvpx" ) return find_max( $lines, "/v\d/", "/^.*sv([\d\.]+)v.*$/" ); - if ( $package == "speex" || - $package == "speexdsp" ) + if ( $package == "speexdsp" ) return find_max( $lines, "/$package/", "/^.*$package-([\d\.rc]+).tar.*$/" ); if ( $package == "taglib" ) return find_max( $lines, "/TagLib/", "/^.*TagLib ([\d\.]+).*$/" ); - if ( $package == "xvidcore" ) - return find_max( $lines, "/xvidcore_/", "/^.*xvidcore_([\d\.]+).orig.*$/" ); - if ( $package == "libcdio-paranoia" ) return find_max( $lines, "/paranoia/", "/^.*paranoia-([\d\.\+]+).tar.*$/" ); Modified: trunk/scripts/blfs-chapter47.php ============================================================================== --- trunk/scripts/blfs-chapter47.php Wed Aug 16 09:44:11 2017 (r19028) +++ trunk/scripts/blfs-chapter47.php Wed Aug 16 10:45:04 2017 (r19029) @@ -8,13 +8,12 @@ $START_PACKAGE = 'audacious'; $STOP_PACKAGE = 'libisofs'; -//$current="libisofs"; // For debugging +//$current="cdrtools"; // For debugging $renames = array(); $ignores = array(); $ignores[ 'freetts1' ] = ''; -$ignores[ 'Clearlooks' ] = ''; $regex = array(); $regex[ 'mpg123' ] = "/^.*Download mpg123-(\d[\d\.]+\d).tar.*$/"; @@ -86,6 +85,10 @@ array( 'pkg' => 'simpleburn', 'match' => '^.*$', 'replace' => "http://simpleburn.tuxfamily.org/-Download-"; ), + + array( 'pkg' => 'cdrtools', + 'match' => '^.*$', + 'replace' => "https://sourceforge.net/projects/cdrtools/files/alpha"; ), ); function get_packages( $package, $dirpath ) @@ -97,8 +100,6 @@ global $current; if ( isset( $current ) && $book_index != "$current" ) return 0; - if ( $book_index == "mplayer" ) return "daily"; - if ( $book_index == "cdrtools" ) return "manual"; // Fix up directory path foreach ( $url_fix as $u ) @@ -187,6 +188,12 @@ if ( $package == "vlc" ) return find_max( $lines, "/\d\.[\d\.]+\//", "/^([\d\.]+)\/.*$/" ); + if ( $package == "cdrtools" ) + return find_max( $lines, "/$package/", "/^.*$package-([\d\.]+a?\d*)\.tar.*$/" ); + + if ( $package == "cdrtools" ) + return find_max( $lines, "/cdrtools-[\d\.]+/", "/^.*cdrtools-([\d\.]+a?\d?).tar.*$/" ); + // Most packages are in the form $package-n.n.n // Occasionally there are dashes (e.g. 201-1) $max = find_max( $lines, "/$package/", "/^.*$package-([\d\.]*\d)\.tar.*$/" ); -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
