Author: krejzi
Date: Thu Mar 24 02:40:55 2016
New Revision: 17159
Log:
Fixes to currency scripts.
Deleted:
trunk/scripts/blfs-chapter31.php
Modified:
trunk/scripts/blfs-chapter04.php
trunk/scripts/blfs-chapter10.php
trunk/scripts/blfs-chapter29.php
Modified: trunk/scripts/blfs-chapter04.php
==============================================================================
--- trunk/scripts/blfs-chapter04.php Wed Mar 23 22:30:12 2016 (r17158)
+++ trunk/scripts/blfs-chapter04.php Thu Mar 24 02:40:55 2016 (r17159)
@@ -23,11 +23,11 @@
$regex[ 'haveged' ] = "/^.*haveged-([\d\.]+)\.tar.*$/";
$regex[ 'cracklib' ] = "/^.*cracklib-([\d\.]+)\.tar.*$/";
$regex[ 'cracklib-words' ] = "/^.*cracklib-words-([\d\.]+)\.bz2.*$/";
-$regex[ 'ConsoleKit' ] = "/^.*ConsoleKit(2-[\d\.]+)\.tar.*$/";
+$regex[ 'ConsoleKit2' ] = "/^.*ConsoleKit2-([\d\.]+)\.tar.*$/";
$url_fix = array(
- array( 'pkg' => 'ConsoleKit',
+ array( 'pkg' => 'ConsoleKit2',
'match' => '^.*$',
'replace' => 'https://github.com/ConsoleKit2/ConsoleKit2/releases' ),
@@ -51,6 +51,10 @@
'match' => '^.*$',
'replace' => 'http://sourceforge.net/projects/haveged/files' ),
+ array( 'pkg' => 'krb5',
+ 'match' => '^.*$',
+ 'replace' => 'http://web.mit.edu/kerberos/www/dist/' ),
+
array( 'pkg' => 'openssh',
'match' => '^ftp',
'replace' => 'http' ),
@@ -122,14 +126,14 @@
else // http
{
// Customize http directories as needed
- if ( $book_index == "krb5" )
- {
- // Remove last two dirs from $path
- $position = strrpos( $dirpath, "/" );
- $dirpath = substr( $dirpath, 0, $position );
- $position = strrpos( $dirpath, "/" );
- $dirpath = substr( $dirpath, 0, $position );
- }
+ //if ( $book_index == "krb5" )
+ //{
+ // // Remove last two dirs from $path
+ // $position = strrpos( $dirpath, "/" );
+ // $dirpath = substr( $dirpath, 0, $position );
+ // $position = strrpos( $dirpath, "/" );
+ // $dirpath = substr( $dirpath, 0, $position );
+ //}
$lines = http_get_file( $dirpath );
if ( ! is_array( $lines ) ) return $lines;
@@ -199,6 +203,9 @@
{
// Set up specific pattern matches for extracting book versions
$match = array (
+ array( 'pkg' => 'ConsoleKit',
+ 'regex' => "/ConsoleKit2-([\d.]+)$/"),
+
array( 'pkg' => 'p11-kit',
'regex' => "/p11-kit.(\d.*\d)\D*$/" ),
@@ -206,10 +213,7 @@
'regex' => "/\D*(\d.*\d.*)$/" ),
array( 'pkg' => 'krb',
- 'regex' => "/krb5-([\d.]+)-signed$/" ),
-
- array( 'pkg' => 'krb',
- 'regex' => "/krb5-([\d.]+)-signed$/" ),
+ 'regex' => "/krb5-([\d.]+)$/" ),
);
foreach( $match as $m )
Modified: trunk/scripts/blfs-chapter10.php
==============================================================================
--- trunk/scripts/blfs-chapter10.php Wed Mar 23 22:30:12 2016 (r17158)
+++ trunk/scripts/blfs-chapter10.php Thu Mar 24 02:40:55 2016 (r17159)
@@ -16,7 +16,7 @@
$regex = array();
$regex[ 'aalib' ] = "/^.*Download aalib-([\d\.]+rc\d).tar.*$/";
$regex[ 'libexif' ] = "/^.*Download libexif-(\d[\d\.]+\d).*$/";
-$regex[ 'graphite2' ] = "/^.*Download graphite-(\d[\d\.]+\d).tgz.*$/";
+//$regex[ 'graphite2' ] = "/^.*Download graphite-(\d[\d\.]+\d).tgz.*$/";
$regex[ 'libmng' ] = "/^.*Download libmng-(\d[\d\.]+\d).tar.*$/";
$regex[ 'libpng' ] = "/^.*Download libpng-(\d[\d\.]+\d).tar.*$/";
$regex[ 'LibRaw' ] = "/^.*LibRaw-(\d[\d\.]+\d).tar.*$/";
@@ -75,7 +75,7 @@
array( 'pkg' => 'graphite2',
'match' => '^.*$',
- 'replace' => "http://$sf/projects/silgraphite/files"; ),
+ 'replace' =>
"https://sourceforge.net/projects/silgraphite/files/graphite2/"; ),
array( 'pkg' => 'libmng',
'match' => '^.*$',
@@ -214,6 +214,11 @@
$lines = http_get_file( "$dirpath/$dir" );
}
+ if ( $book_index == "graphite2" )
+ {
+ return find_max( $lines, '/graphite2-/',
'/^.*graphite2-(\d\.[\d\.]+)\.tgz.*$/' );
+ }
+
if ( $book_index == "libjpeg-turbo" )
{
return find_max( $lines, '/\d\./', '/^\s*([\d\.]+)\s*$/' );
Modified: trunk/scripts/blfs-chapter29.php
==============================================================================
--- trunk/scripts/blfs-chapter29.php Wed Mar 23 22:30:12 2016 (r17158)
+++ trunk/scripts/blfs-chapter29.php Thu Mar 24 02:40:55 2016 (r17159)
@@ -6,11 +6,10 @@
$CHAPTER = '29';
$CHAPTERS = 'Chapters 29-30';
$START_PACKAGE = 'phonon';
-$STOP_PACKAGE = 'kde-workspace';
+$STOP_PACKAGE = 'extra-cmake-modules';
$renames = array();
$ignores = array();
-$ignores[ 'kde-workspace' ] = '';
//$current="extra-cmake-modules";
@@ -67,18 +66,10 @@
}
// Check for ftp
- if ( preg_match( "/^ftp/", $dirpath ) )
- {
- if ( $book_index == "automoc4" )
- {
- $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
- $position = strrpos( $dirpath, "/" );
- $dirpath = substr ( $dirpath, 0, $position ); // Up 1
- }
+ if ( preg_match( "/^ftp/", $dirpath ) )
+ {
- if ( $book_index == "kactivities" ) return "check manually";
-
- if ( $book_index == "phonon-backend-vlc" ||
+ if ( $book_index == "phonon-backend-vlc" ||
$book_index == "phonon" ||
$book_index == "phonon-backend-gstreamer" )
{
@@ -95,35 +86,13 @@
}
else // http
{
- if ( $book_index == "kdepimlibs" ) return "check manually";
- if ( $book_index == "oxygen-icons" ) return "check manually";
- if ( $book_index == "kfilemetadata" ) return "check manually";
- if ( $book_index == "kde-workspace" ) return "check manually";
- if ( preg_match( '/baloo/', $book_index) ) return "check manually";
-
- # Copy from ftp above for now
- if ( $book_index == "automoc4" )
- {
- $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
- $position = strrpos( $dirpath, "/" );
- $dirpath = substr ( $dirpath, 0, $position ); // Up 1
- $lines = http_get_file( "$dirpath" );
- return find_max( $lines, "/\d\./", "/^.*;([\d\.]+)\/.*$/" );
- }
-
- if ( $book_index == "akonadi" ||
- $book_index == "qimageblitz" ||
- $book_index == "polkit-qt-1" ||
- $book_index == "polkit-kde-agent-1" ||
- $book_index == "attica" )
+ if ( $book_index == "polkit-qt-1" )
{
$lines = http_get_file( "$dirpath" );
return find_max( $lines, "/$book_index/",
"/^.*$book_index-([\d\.]+).tar.*$/" );
}
- if ( $book_index == "kactivities" ) return "check manually";
-
- if ( $book_index == "phonon-backend-vlc" ||
+ if ( $book_index == "phonon-backend-vlc" ||
$book_index == "phonon" ||
$book_index == "phonon-backend-gstreamer" )
{
@@ -165,8 +134,7 @@
} // End fetch
// automoc4 and similar
- if ( $book_index == "automoc4" ||
- $book_index == "phonon" ||
+ if ( $book_index == "phonon" ||
$book_index == "phonon-backend-gstreamer" ||
$book_index == "phonon-backend-vlc" )
return find_max( $lines, "/\d\./", "/^.* (\d\.[\d\.]+).*$/" );
@@ -185,14 +153,10 @@
$match = array();
$match = array(
- array( 'pkg' => 'automoc',
- 'regex' => "/^.*automoc4-(\d[\d\.]+).*$/" ),
- array( 'pkg' => 'polkit-qt',
+ array( 'pkg' => 'polkit-qt',
'regex' => "/^.*polkit-qt-1-(\d[\d\.]+).*$/" ),
- array( 'pkg' => 'polkit-kde-agent',
- 'regex' => "/^.*polkit-kde-agent-1-(\d[\d\.]+).*$/" ),
);
foreach( $match as $m )
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
