Author: bdubbs
Date: Thu Jan 11 12:22:13 2018
New Revision: 19663
Log:
Script changes for sourceforge changes thru Chapter 10
Modified:
trunk/scripts/blfs-chapter04.php
trunk/scripts/blfs-chapter06.php
trunk/scripts/blfs-chapter09.php
trunk/scripts/blfs-chapter10.php
Modified: trunk/scripts/blfs-chapter04.php
==============================================================================
--- trunk/scripts/blfs-chapter04.php Wed Jan 10 10:41:27 2018 (r19662)
+++ trunk/scripts/blfs-chapter04.php Thu Jan 11 12:22:13 2018 (r19663)
@@ -14,7 +14,8 @@
$renames[ 'openssl1' ] = 'openssl-1.0';
$ignores = array();
-$ignores[ 'openssh1' ] = "";
+$ignores[ 'openssh1' ] = "";
+$ignores[ 'lsb-release' ] = ""; // Has not changed in 12 years
//$current="gnutls"; // For debugging
Modified: trunk/scripts/blfs-chapter06.php
==============================================================================
--- trunk/scripts/blfs-chapter06.php Wed Jan 10 10:41:27 2018 (r19662)
+++ trunk/scripts/blfs-chapter06.php Thu Jan 11 12:22:13 2018 (r19663)
@@ -16,7 +16,7 @@
//$current="emacs"; // For debugging
$regex = array();
-$regex[ 'joe' ] = "/^.*Download joe-(\d[\d\.]+).tar.*$/";
+//$regex[ 'joe' ] = "/^.*Download joe-(\d[\d\.]+).tar.*$/";
$url_fix = array (
@@ -97,8 +97,8 @@
if ( $book_index == "joe" )
{
- $dir = find_max( $lines, '/^.*joe-[\d\.]+.*$/',
'/^.*(joe-[\d\.]+).tar.*$/' );
- $lines = http_get_file( "$dirpath/$dir" );
+ return find_max( $lines, '/joe/', '/^.*joe-([\d\.]+).tar.*$/' );
+ //$lines = http_get_file( "$dirpath/$dir" );
}
// vim language pack
Modified: trunk/scripts/blfs-chapter09.php
==============================================================================
--- trunk/scripts/blfs-chapter09.php Wed Jan 10 10:41:27 2018 (r19662)
+++ trunk/scripts/blfs-chapter09.php Thu Jan 11 12:22:13 2018 (r19663)
@@ -19,10 +19,8 @@
//$current="gmime1"; // For debugging
$regex = array();
-$regex[ 'clucene-core' ] = "/^.*Download clucene-core-([\d\.]+).tar.*$/";
$regex[ 'expat' ] = "/^.*Download expat-([\d\.]+).tar.*$/";
$regex[ 'libzeitgeist' ] = "/^.*Latest version is ([\d\.]+)\s*$/";
-$regex[ 'libiodbc' ] = "/^.*Download libiodbc-(\d[\d\.]+\d).tar.*$/";
$regex[ 'libical' ] = "/^.*v(\d[\d\.]+\d).*$/";
$regex[ 'libdaemon' ] = "/^.*Version (\d[\d\.]+\d) released.*$/";
$regex[ 'libatasmart' ] = "/^.*v(\d[\d\.]+\d).*$/";
@@ -40,7 +38,7 @@
array( 'pkg' => 'clucene-core',
'match' => '^.*$',
- 'replace' => "http://$sf/projects/clucene/files"; ),
+ 'replace' => "http://sourceforge.net/projects/clucene/files"; ),
array( 'pkg' => 'expat',
'match' => '^.*$',
Modified: trunk/scripts/blfs-chapter10.php
==============================================================================
--- trunk/scripts/blfs-chapter10.php Wed Jan 10 10:41:27 2018 (r19662)
+++ trunk/scripts/blfs-chapter10.php Thu Jan 11 12:22:13 2018 (r19663)
@@ -17,14 +17,9 @@
//$current="opencv_contrib"; // For debugging
$regex = array();
-$regex[ 'aalib' ] = "/^.*Download aalib-([\d\.]+rc\d).tar.*$/";
-$regex[ 'libexif' ] = "/^.*Download libexif-(\d[\d\.]+\d).*$/";
-$regex[ 'libmng' ] = "/^.*Download libmng-(\d[\d\.]+\d).tar.*$/";
$regex[ 'LibRaw' ] = "/^.*LibRaw-(\d[\d\.]+\d).tar.*$/";
$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';
@@ -73,7 +68,7 @@
array( 'pkg' => 'libexif',
'match' => '^.*$',
- 'replace' => "http://$sf/projects/libexif/files/libexif"; ),
+ 'replace' => "http://$sf/projects/libexif/files"; ),
array( 'pkg' => 'libjpeg-turbo',
'match' => '^.*$',
@@ -261,6 +256,9 @@
if ( $book_index == "openjpeg" )
return find_max( $lines, '/files/', '/^.*files\/(1\.[\d\.]+)\/.*$/' );
+ if ( $book_index == "aalib" )
+ return find_max( $lines, "/$book_index/", '/^.*aalib-([rc\d\.]+).tar.*$/'
);
+
// imlib
if ( $book_index == "imlib2" )
{
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
