Author: bdubbs Date: Mon Feb 12 06:50:19 2018 New Revision: 19753 Log: Fix script for openssl move to LFS
Modified: trunk/scripts/blfs-chapter04.php Modified: trunk/scripts/blfs-chapter04.php ============================================================================== --- trunk/scripts/blfs-chapter04.php Mon Feb 12 03:38:07 2018 (r19752) +++ trunk/scripts/blfs-chapter04.php Mon Feb 12 06:50:19 2018 (r19753) @@ -10,8 +10,8 @@ $renames = array(); $renames[ 'Linux-PAM1' ] = 'Linux-PAM-docs'; -$renames[ 'openssl' ] = 'openssl-1.1'; -$renames[ 'openssl1' ] = 'openssl-1.0'; +$renames[ 'openssl' ] = 'openssl-1.0'; +//$renames[ 'openssl1' ] = 'openssl-1.0'; $ignores = array(); $ignores[ 'openssh1' ] = ""; @@ -189,10 +189,10 @@ if ( $book_index == "openssh" ) return find_max( $lines, "/$package/", "/^.*$package-([\d\.p]*\d).tar.*$/" ); - if ( $book_index == "openssl" ) - return find_max( $lines, "/$package/", "/^.*$package-([\d\.p]*\d.?).tar.*$/" ); +// if ( $book_index == "openssl" ) +// return find_max( $lines, "/$package/", "/^.*$package-([\d\.p]*\d.?).tar.*$/" ); - if ( $book_index == "openssl1" ) + if ( $book_index == "openssl" ) return find_max( $lines, "/$package/", "/^.*$package-(1.0[\d\.p]*\d.?).tar.*$/" ); if ( $book_index == "p11-kit" ) @@ -241,8 +241,8 @@ array( 'pkg' => 'openssl', 'regex' => "/\D*(\d.*\d.*)$/" ), - array( 'pkg' => 'openssl1', - 'regex' => "/\D*(\d.*\d.*)$/" ), +// array( 'pkg' => 'openssl1', +// 'regex' => "/\D*(\d.*\d.*)$/" ), array( 'pkg' => 'krb', 'regex' => "/krb5-([\d.]+)$/" ), -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page