Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl (Moody) 2022-04-20 05:45:10 +02:00
commit 20d3801d62

View File

@ -70,6 +70,7 @@ function find_even_max( $lines, $regex_match, $regex_replace )
function http_get_file( $url ) function http_get_file( $url )
{ {
if ( ! preg_match( "/sourceforge/", $url ) && if ( ! preg_match( "/sourceforge/", $url ) &&
! preg_match( "/mpfr/", $url ) &&
! preg_match( "/psmisc/", $url ) ) ! preg_match( "/psmisc/", $url ) )
{ {
exec( "curl --location --silent --max-time 30 $url", $dir ); exec( "curl --location --silent --max-time 30 $url", $dir );
@ -78,6 +79,14 @@ function http_get_file( $url )
$dir = strip_tags( $s ); $dir = strip_tags( $s );
return explode( "\n", $dir ); return explode( "\n", $dir );
} }
else if ( preg_match( "/mpfr/", $url ) )
{
# There seems to be a problem with the mpfs certificate
exec( "curl --location --silent --insecure --max-time 30 $url", $dir );
$s = implode( "\n", $dir );
$dir = strip_tags( $s );
return explode( "\n", $dir );
}
else else
{ {
exec( "lynx -dump $url 2>/dev/null", $lines ); exec( "lynx -dump $url 2>/dev/null", $lines );