5f5cce2eb3
* Allow deleting remote directories. (It is needed to put local file tree to remote with mirror. Bump PKGREVISION.
106 lines
3.7 KiB
Text
106 lines
3.7 KiB
Text
$NetBSD: patch-ac,v 1.5 2011/09/12 16:35:43 taca Exp $
|
|
|
|
* Fix path for pkgsrc.
|
|
* Use md5(1) instead of sum(1).
|
|
* Add -f option to compress program.
|
|
* Fix deleting remote directories.
|
|
* Fix display of transfer direction.
|
|
|
|
--- mirror.pl.orig 1998-06-08 10:55:27.000000000 +0000
|
|
+++ mirror.pl
|
|
@@ -104,7 +104,7 @@ $load_defaults = 1;
|
|
# Try to find the default location of various programs via
|
|
# the users PATH then using $extra_path
|
|
if( ! $on_win ){
|
|
- $extra_path = '/usr/local/bin:/usr/new/bin:/usr/public/bin:/usr/ucb:/usr/bin:/bin:/etc:/usr/etc:/usr/local/etc';
|
|
+ $extra_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:!!PREFIX!!/bin:!!PREFIX!!/sbin';
|
|
}
|
|
if( $extra_path ne '' ){
|
|
$ENV{ 'PATH' } .= $path_sep . $extra_path;
|
|
@@ -159,19 +159,20 @@ if( ! $mail_prog ){
|
|
$rm_prog = &find_prog( 'rm' );
|
|
|
|
# Generate checksums
|
|
-$sum_prog = &find_prog( 'sum' );
|
|
+$sum_prog = &find_prog( 'md5' );
|
|
|
|
# SPECIAL NOTE: This is eval'd, so DONT put double-quotes (") in it.
|
|
# You can get local variables to appear as in the second example:
|
|
-$mail_subject = '-s \'mirror update\'';
|
|
-# $mail_subject = ' -s \'mirror update of $package\'';
|
|
+# $mail_subject = '-s \'mirror update\'';
|
|
+$mail_subject = ' -s \'mirror update of $package\'';
|
|
|
|
# When scanning the local directory, how often to prod the remote
|
|
# system to keep the connection alive
|
|
$prod_interval = 60;
|
|
|
|
# Put the directory that mirror is actually in at the start of PERLLIB.
|
|
-$dir = &real_dir_from_path( $0 );
|
|
+# $dir = &real_dir_from_path( $0 );
|
|
+$dir = "!!PREFIX!!/lib/mirror";
|
|
unshift( @INC, $dir );
|
|
|
|
# Debian GNU/Linux stores mirror.defaults in /etc/mirror
|
|
@@ -1022,7 +1023,7 @@ sub do_mirror
|
|
&pr_variables( "\n" );
|
|
}
|
|
elsif( $package && ! $pretty_print ){
|
|
- if( $get_patt ){
|
|
+ if( $get_file ){
|
|
&msg( "package=$package $site:$remote_dir -> $local_dir\n");
|
|
}
|
|
else {
|
|
@@ -1807,7 +1808,7 @@ sub get_remote_directory_details
|
|
local( $f );
|
|
$f = $dirtmp;
|
|
$f =~ s/($shell_metachars)/\\$1/g;
|
|
- $dirtmp = "$unsquish -d < \"$f\" |";
|
|
+ $dirtmp = "$unsquish -f -d < \"$f\" |";
|
|
}
|
|
if( ! open( DIRTMP, $dirtmp ) ){
|
|
&msg( "Cannot open $dirtmp\n" );
|
|
@@ -1845,7 +1846,7 @@ sub get_remote_directory_details
|
|
$f = $dirtmp;
|
|
$dirtmp =~ s/\.($sys_compress_suffix|$gzip_suffix|$old_gzip_suffix)$//;
|
|
$udirtmp =~ s/\.($sys_compress_suffix|$gzip_suffix|$ol_gzip_suffix)$//;
|
|
- if( &sys( "$unsquish -d < \"$f\" > \"$dirtmp\"" ) != 0 ){
|
|
+ if( &sys( "$unsquish -f -d < \"$f\" > \"$dirtmp\"" ) != 0 ){
|
|
&msg( "Cannot uncompress directory listing\n" );
|
|
return 0;
|
|
}
|
|
@@ -2760,7 +2761,7 @@ sub transfer_file
|
|
local( $f ) = $src_file;
|
|
$f =~ s/($shell_metachars)/\\$1/g;
|
|
$comptemp = "$big_temp/.out$$";
|
|
- &sys( "$compress_prog < \"$f\" > \"$comptemp\"" );
|
|
+ &sys( "$compress_prog -f < \"$f\" > \"$comptemp\"" );
|
|
$src_file = $comptemp;
|
|
}
|
|
|
|
@@ -2840,10 +2841,10 @@ sub transfer_file
|
|
# Am I doing compress to gzip conversion?
|
|
if( $compress_conv_patt && $src_path =~ /$compress_conv_patt/ &&
|
|
$compress_suffix eq $gzip_suffix ){
|
|
- $comp = "$sys_compress_prog -d < \"$f\" | $gzip_prog > \"$temp\"";
|
|
+ $comp = "$sys_compress_prog -f -d < \"$f\" | $gzip_prog > \"$temp\"";
|
|
}
|
|
else {
|
|
- $comp = "$compress_prog < \"$f\" > \"$temp\"";
|
|
+ $comp = "$compress_prog -f < \"$f\" > \"$temp\"";
|
|
}
|
|
&sys( $comp );
|
|
$temp =~ s/\\($shell_metachars)/$1/g;
|
|
@@ -3174,9 +3175,9 @@ sub do_delete
|
|
&msg( $log, "rmdir $cwd/$del failed: $!\n" );
|
|
}
|
|
else {
|
|
- &msg( $log, "delete DIR $del\n" );
|
|
- &ftp'delete( "$del" ) ||
|
|
- &msg( $log, "ftp delete DIR $del failed\n" );
|
|
+ &msg( $log, "deldir DIR $del\n" );
|
|
+ &ftp'deldir( "$del" ) ||
|
|
+ &msg( $log, "ftp deldir DIR $del failed\n" );
|
|
}
|
|
}
|
|
else {
|