Author: bdubbs
Date: Sun Jun 4 11:18:23 2017
New Revision: 18794
Log:
Script updates for openssl LVM2 pycairo
Modified:
trunk/scripts/blfs-chapter04.php
trunk/scripts/blfs-chapter05.php
trunk/scripts/blfs-chapter13.php
Modified: trunk/scripts/blfs-chapter04.php
==============================================================================
--- trunk/scripts/blfs-chapter04.php Sun Jun 4 10:32:41 2017 (r18793)
+++ trunk/scripts/blfs-chapter04.php Sun Jun 4 11:18:23 2017 (r18794)
@@ -10,11 +10,13 @@
$renames = array();
$renames[ 'Linux-PAM1' ] = 'Linux-PAM-docs';
+$renames[ 'openssl' ] = 'openssl-1.1';
+$renames[ 'openssl1' ] = 'openssl-1.0';
$ignores = array();
$ignores[ 'openssh1' ] = "";
-//$current="p11-kit"; // For debugging
+//$current="openssl"; // For debugging
$regex = array();
$regex[ 'krb5' ] = "/^.*Kerberos V5 Release ([\d\.]+).*$/";
@@ -181,6 +183,9 @@
if ( $book_index == "openssl" )
return find_max( $lines, "/$package/",
"/^.*$package-([\d\.p]*\d.?).tar.*$/" );
+ if ( $book_index == "openssl1" )
+ return find_max( $lines, "/$package/",
"/^.*$package-(1.0[\d\.p]*\d.?).tar.*$/" );
+
if ( $book_index == "p11-kit" )
return find_max( $lines, "/$package/", "/^.*$package-([\d\.]*\d).tar.*$/"
);
@@ -227,6 +232,9 @@
array( 'pkg' => 'openssl',
'regex' => "/\D*(\d.*\d.*)$/" ),
+ array( 'pkg' => 'openssl1',
+ 'regex' => "/\D*(\d.*\d.*)$/" ),
+
array( 'pkg' => 'krb',
'regex' => "/krb5-([\d.]+)$/" ),
);
Modified: trunk/scripts/blfs-chapter05.php
==============================================================================
--- trunk/scripts/blfs-chapter05.php Sun Jun 4 10:32:41 2017 (r18793)
+++ trunk/scripts/blfs-chapter05.php Sun Jun 4 11:18:23 2017 (r18794)
@@ -15,7 +15,7 @@
$renames[ 'fuse1' ] = 'fuse2';
$ignores = array();
-//$current="fuse1"; // For debugging
+//$current="LVM2."; // For debugging
$regex = array();
$regex[ 'ntfs-3g_ntfsprogs' ] = "/^.*Stable Source Release ([\d\.]+).*$/";
@@ -44,6 +44,10 @@
'match' => '^.*$',
'replace' => "http://$sf/projects/gptfdisk/files/gptfdisk/"; ),
+ array( 'pkg' => 'LVM2.',
+ 'match' => '^.*$',
+ 'replace' => "https://sourceware.org/git/?p=lvm2.git"; ),
+
array( 'pkg' => 'sshfs',
'match' => '^.*$',
'replace' => "https://github.com/libfuse/sshfs/releases"; ),
@@ -61,6 +65,7 @@
global $current;
if ( isset( $current ) && $book_index != "$current" ) return 0;
+echo "pkg=$book_index $dirpath\n";
// Fix up directory path
foreach ( $url_fix as $u )
@@ -110,7 +115,7 @@
return find_max( $lines, "/$package/", "/^.*$package([\d\.]*\d).tar.*$/" );
if ( $book_index == "LVM2." )
- return find_max( $lines, "/$package/", "/^.*$package([\d\.]*\d).tgz.*$/" );
+ return find_max( $lines, "/Version/", "/^.*Version (\d[\d\.]*\d).*$/" );
if ( $book_index == "gptfdisk" )
{
Modified: trunk/scripts/blfs-chapter13.php
==============================================================================
--- trunk/scripts/blfs-chapter13.php Sun Jun 4 10:32:41 2017 (r18793)
+++ trunk/scripts/blfs-chapter13.php Sun Jun 4 11:18:23 2017 (r18794)
@@ -11,7 +11,7 @@
$renames = array();
$renames[ 'llvm' ] = 'llvm-3';
$renames[ 'llvm1' ] = 'llvm-4';
-$renames[ 'py' ] = 'pycairo';
+//$renames[ 'py' ] = 'pycairo';
$renames[ 'Python' ] = 'python2';
$renames[ 'Python1' ] = 'python3';
$renames[ 'pygobject' ] = 'pygobject2';
@@ -36,7 +36,7 @@
$ignores[ 'python' ] = '';
$ignores[ 'python1' ] = '';
-//$current="Text-CSV"; // For debugging
+//$current="pycairo"; // For debugging
$regex = array();
$regex[ 'check' ] = "/^.*Check (\d[\d\.]+\d).*$/";
@@ -351,6 +351,10 @@
'match' => '^.*$',
'replace' => "https://pypi.python.org/pypi/pycrypto"; ),
+ array( 'pkg' => 'pycairo',
+ 'match' => '^.*$',
+ 'replace' => "https://github.com/pygobject/pycairo/releases"; ),
+
);
/*
@@ -588,6 +592,9 @@
if ( $book_index == "librep" )
return find_max( $lines, "/librep/", "/^.*[_-](\d[\d\.]*\d)\.tar.*$/" );
+ if ( $book_index == "pycairo" )
+ return find_max( $lines, "/pycairo/", "/^.*pycairo-(\d[\d\.]*\d)\.tar.*$/"
);
+
if ( $book_index == "apache-ant" )
return find_max( $lines, "/$package/",
"/^.*$package-(\d[\d\.]+\d)-src.*$/" );
@@ -614,8 +621,8 @@
$match = array();
$match = array(
- array( 'pkg' => 'py2cairo',
- 'regex' => "/py2cairo-([\d\.]+)/" ),
+ //array( 'pkg' => 'py2cairo',
+ // 'regex' => "/py2cairo-([\d\.]+)/" ),
array( 'pkg' => 'Encode-JIS2K',
'regex' => "/\D*Encode-JIS2K-([\d\.]+)\D*$/" ),
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
