Author: bdubbs
Date: Wed Aug 22 07:10:43 2018
New Revision: 20366
Log:
Currency updates due to upstream website changes
Modified:
trunk/scripts/blfs-chapter10.php
trunk/scripts/blfs-chapter12.php
trunk/scripts/blfs-chapter17.php
trunk/scripts/blfs-chapter20.php
trunk/scripts/blfs-chapter37.php
trunk/scripts/blfs-chapter47.php
Modified: trunk/scripts/blfs-chapter10.php
==============================================================================
--- trunk/scripts/blfs-chapter10.php Wed Aug 22 06:32:30 2018 (r20365)
+++ trunk/scripts/blfs-chapter10.php Wed Aug 22 07:10:43 2018 (r20366)
@@ -251,11 +251,11 @@
{
$dir = find_max( $lines, '/^\s*libpng\d/', '/^\s*libpng(\d[02468]) .*$/' );
$lines = http_get_file( "$dirpath/libpng$dir" );
- return find_max( $lines, '/^\s*\d/', '/^\s*(\d[\d\.]+) .*$/' );
+ return find_max( $lines, '/^\s*\d/', '/^\s*(\d\.[\d\.]+) .*$/' );
}
if ( $book_index == "libjpeg-turbo" )
- return find_max( $lines, '/^\s*\d/', '/^\s*(\d[\d\.]+) .*$/' );
+ return find_max( $lines, '/^\s*\d/', '/^\s*(\d\.[\d\.]+) .*$/' );
if ( $book_index == "libmypaint" )
return find_max( $lines, '/libmypaint/',
'/^\s*libmypaint-(\d[\d\.]+).tar.*$/' );
Modified: trunk/scripts/blfs-chapter12.php
==============================================================================
--- trunk/scripts/blfs-chapter12.php Wed Aug 22 06:32:30 2018 (r20365)
+++ trunk/scripts/blfs-chapter12.php Wed Aug 22 07:10:43 2018 (r20366)
@@ -210,7 +210,7 @@
if ( $book_index == "p7zip" )
{
- $max = find_max( $lines, '/^\s*\d/', '/^\s*([\d\.]+) .*$/' );
+ $max = find_max( $lines, '/^\s*\d/', '/^\s*(\d+\.[\d\.]+) .*$/' );
return $max;
}
Modified: trunk/scripts/blfs-chapter17.php
==============================================================================
--- trunk/scripts/blfs-chapter17.php Wed Aug 22 06:32:30 2018 (r20365)
+++ trunk/scripts/blfs-chapter17.php Wed Aug 22 07:10:43 2018 (r20366)
@@ -222,7 +222,7 @@
// libtirpc (sourceforge is inconsistent here)
if ( $book_index == "libtirpc" )
- return find_max( $lines, '/^\s*\d/', '/^\s*(\d[\d\.]+) .*$/' );
+ return find_max( $lines, '/^\s*\d/', '/^\s*(\d\.[\d\.]+) .*$/' );
// Most packages are in the form $package-n.n.n
// Occasionally there are dashes (e.g. 201-1)
Modified: trunk/scripts/blfs-chapter20.php
==============================================================================
--- trunk/scripts/blfs-chapter20.php Wed Aug 22 06:32:30 2018 (r20365)
+++ trunk/scripts/blfs-chapter20.php Wed Aug 22 07:10:43 2018 (r20366)
@@ -19,7 +19,7 @@
$regex = array();
$regex[ 'vsftpd' ] = "/^.*vsftpd-(\d[\d\.]+\d) released.*$/";
-$regex[ 'db' ] = "/^.*Berkeley DB (\d[\d\.]+\d).tar.*$/";
+//$regex[ 'db' ] = "/^.*Berkeley DB (\d[\d\.]+\d).tar.*$/";
$regex[ 'LMDB' ] = "/^.*LMDB_(\d[\d\.]+\d).*$/";
$regex[ 'mysql' ] = "/^.*Current Generally Available Release:
(\d[\d\.]+\d).*$/";
$regex[ 'soprano' ] = "/^.*Download soprano-(\d[\d\.]*).tar.*$/";
@@ -54,9 +54,9 @@
'match' => '^.*$',
'replace' => "https://downloads.mariadb.org"; ),
- array( 'pkg' => 'db',
- 'match' => '^.*$',
- 'replace' =>
"http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html"; ),
+// array( 'pkg' => 'db',
+// 'match' => '^.*$',
+// 'replace' =>
"http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html"; ),
array( 'pkg' => 'vsftpd',
'match' => '^.*$',
@@ -85,6 +85,8 @@
if ( isset( $current ) && $book_index != "$current" ) return 0;
+ if ( $package == "db" ) return "manual";
+
// Fix up directory path
foreach ( $url_fix as $u )
{
Modified: trunk/scripts/blfs-chapter37.php
==============================================================================
--- trunk/scripts/blfs-chapter37.php Wed Aug 22 06:32:30 2018 (r20365)
+++ trunk/scripts/blfs-chapter37.php Wed Aug 22 07:10:43 2018 (r20366)
@@ -262,7 +262,7 @@
else if ( $book_index == "gpicview" )
{
$dirs = http_get_file( "$dirpath/" );
- $dir = find_max ( $dirs, "/^\s*\d/", "/^\s*([\d\.x]+) .*$/" );
+ $dir = find_max ( $dirs, "/^\s*\d/", "/^\s*(\d\.[\d\.x]+) .*$/" );
//$dir = preg_replace( "/ /", '%20', $dir );
$dirpath .= "/$dir";
$lines = http_get_file( "$dirpath/" );
Modified: trunk/scripts/blfs-chapter47.php
==============================================================================
--- trunk/scripts/blfs-chapter47.php Wed Aug 22 06:32:30 2018 (r20365)
+++ trunk/scripts/blfs-chapter47.php Wed Aug 22 07:10:43 2018 (r20366)
@@ -164,7 +164,7 @@
return find_max( $lines, "/\d\./", "/^.*;([\d\.]+)\/.*$/", TRUE );
if ( $package == "xine-ui" )
- return find_max( $lines, "/^\s*\d/", "/^\s*([\d\.]+)\s+.*$/" );
+ return find_max( $lines, "/^\s*\d/", "/^\s*(\d\.[\d\.]+)\s+.*$/" );
if ( $package == "freetts" )
return find_max( $lines, "/freetts/", "/^.*freetts-([\d\.]+)-bin.*$/" );
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
