1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
diff -urN ftpmirror-1.2l.orig/dirinfo.pl ftpmirror-1.2l/dirinfo.pl
--- ftpmirror-1.2l.orig/dirinfo.pl Tue Dec 21 12:41:25 1999
+++ ftpmirror-1.2l/dirinfo.pl Tue Dec 21 12:41:11 1999
@@ -24,6 +24,7 @@
= -x "/sbin/md5" ? "/sbin/md5"
: -x "/usr/bin/md5" ? "/usr/bin/md5"
: -x "/usr/local/bin/md5" ? "/usr/local/bin/md5"
+ : -x "/usr/bin/md5sum" ? "/usr/bin/md5sum"
: undef;
;#
diff -urN ftpmirror-1.2l.orig/ftpmirror ftpmirror-1.2l/ftpmirror
--- ftpmirror-1.2l.orig/ftpmirror Tue Dec 21 12:26:45 1999
+++ ftpmirror-1.2l/ftpmirror Tue Dec 21 12:43:24 1999
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
;#
;# Copyright (c) 1995-1997
;# Ikuo Nakagawa. All rights reserved.
@@ -106,7 +106,7 @@
;#
;# IMPORTANT: change to the package directory
-$prefix = '/usr/local/lib/ftpmirror';
+$prefix = '/usr/share/ftpmirror';
;# Some special filenames
$dirinfo = ".dirinfo";
@@ -1156,10 +1156,10 @@
;# set time
if (!defined($r->{'mtime'}) && !defined($p->{'no-mdtm'})) {
if (defined($mtime = $x = &ftp::mtime($r->{'path'}))
- && $x =~ /^\d\d(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
+ && $x =~ /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
my($diff);
- $r->{'modified'} = &timegm($6, $5, $4, $3, $2 - 1, $1); # VALID!
+ $r->{'modified'} = &timegm($6, $5, $4, $3, $2 - 1, $1 - 1900); # VALID!
$r->{'mtime'} = $mtime;
# $x = lsparse::lstime($r->{'date'});
$x = $r->{'time'};
@@ -1228,8 +1228,8 @@
if (!defined($r->{'modified'})) {
if (!defined($p->{'no-mdtm'})) {
if (defined($mtime = $x = &ftp::mtime($r->{'path'}))
- && $x =~ /^\d\d(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
- $r->{'modified'} = &timegm($6, $5, $4, $3, $2 - 1, $1); # VALID!
+ && $x =~ /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
+ $r->{'modified'} = &timegm($6, $5, $4, $3, $2 - 1, $1 - 1900); # VALID!
$r->{'mtime'} = $mtime;
} else {
$p->{'no-mdtm'} = 1 if $ftp::buffer =~ /^5/;
diff -urN ftpmirror-1.2l.orig/lsparse.pl ftpmirror-1.2l/lsparse.pl
--- ftpmirror-1.2l.orig/lsparse.pl Tue Dec 21 12:26:40 1999
+++ ftpmirror-1.2l/lsparse.pl Tue Dec 21 12:44:43 1999
@@ -261,7 +261,7 @@
}
# UNIX style - check file modes
- s/^(.)([-r][-w].[-r][-w].[-r][-w].)\s*// || do {
+ s/^\s*(.)([-r][-w].[-r][-w].[-r][-w].)\s*// || do {
log::putl("DEBUG", "invalid format: \"$x\"");
return undef;
};
@@ -386,7 +386,8 @@
$year = $l_year;
$year-- if $month > $l_month;
}
- $year -= ($year >= 2000 ? 2000 : $year >= 1970 ? 1900 : 0);
+ # $year -= ($year >= 2000 ? 2000 : $year >= 1970 ? 1900 : 0);
+ $year -= ($year > 1900 ? 1900 : 0);
$sec = 0 unless defined($sec) && $sec >= 0 && $sec < 60;
$min = 0 unless defined($min) && $min >= 0 && $min < 60;
diff -urN ftpmirror-1.2l.orig/mkdirinfo ftpmirror-1.2l/mkdirinfo
--- ftpmirror-1.2l.orig/mkdirinfo Tue Dec 21 12:45:18 1999
+++ ftpmirror-1.2l/mkdirinfo Tue Dec 21 12:46:05 1999
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
;#
;# Copyright (c) 1996, Ikuo Nakagawa.
;# All rights reserved.
@@ -9,7 +9,7 @@
;#
;# IMPORTANT: change to the package directory
-$prefix = '/usr/local/lib/ftpmirror';
+$prefix = '/usr/share/ftpmirror';
unshift(@INC, $prefix);
;# modules
diff -urN ftpmirror-1.2l.orig/param.pl ftpmirror-1.2l/param.pl
--- ftpmirror-1.2l.orig/param.pl Tue Dec 21 12:41:25 1999
+++ ftpmirror-1.2l/param.pl Tue Dec 21 12:41:11 1999
@@ -40,6 +40,7 @@
= -x "/sbin/md5" ? "/sbin/md5"
: -x "/usr/local/bin/md5" ? "/usr/local/bin/md5"
: -x "/usr/bin/md5" ? "/usr/bin/md5"
+ : -x "/usr/bin/md5sum" ? "/usr/bin/md5sum"
: undef;
chomp($hostname);
@@ -153,7 +154,7 @@
defined($assoc{'OPTION'}->{'prefix'}) ? $assoc{'OPTION'}->{'prefix'} :
defined($assoc{'INIT'}->{'prefix'}) ? $assoc{'INIT'}->{'prefix'} :
defined($main::prefix) ? $main::prefix :
- "/usr/local/lib/ftpmirror";
+ "/usr/lib/ftpmirror";
;# clean assoc first
undef %param;
--- ftpmirror-1.2l.orig/ftputil.pl Sun Feb 8 11:30:47 1998
+++ ftpmirror-1.2l/ftputil.pl Sat Feb 9 10:31:32 2002
@@ -224,11 +224,10 @@
;#
;# default parameters
;#
-chomp($hostname = `hostname`);
$server = '';
$gateway = '';
$user = 'anonymous';
-$pass = getpwuid($<).'@'.$hostname;
+$pass = 'anonymous@';
$debug = 0;
$timeout = 30;
$passive = 0; # use Passive mode to make a data connection
--- ftpmirror-1.2l.orig/param.pl Tue Apr 16 10:48:18 2002
+++ ftpmirror-1.2l/param.pl Tue Apr 16 10:48:53 2002
@@ -388,16 +388,18 @@
for $x (qw(debug timeout bindaddress server gateway
user pass group gpass passive idle max-idle)) {
my $y = "ftp-$x";
- $x =~ s/-/_/g;
- eval "\$ftp::$x = defined(\$p->{'$y'}) ? \$p->{'$y'} : undef;";
+ my $z = $x;
+ $z =~ s/-/_/g;
+ eval "\$ftp::$z = defined(\$p->{'$y'}) ? \$p->{'$y'} : undef;";
die $@ if $@;
}
;# parameters in lsparse.pl
for $x (qw(debug)) {
my $y = "lsparse-$x";
- $x =~ s/-/_/g;
- eval "\$lsparse::$x = defined(\$p->{'$y'}) ? \$p->{'$y'} : undef;";
+ my $z = $x ;
+ $z =~ s/-/_/g;
+ eval "\$lsparse::$z = defined(\$p->{'$y'}) ? \$p->{'$y'} : undef;";
die $@ if $@;
}
@@ -408,8 +410,9 @@
;# parameters in dirinfo.pl
for $x (qw(debug md5-program)) {
my $y = "dirinfo-$x";
- $x =~ s/-/_/g;
- eval "\$dirinfo::$x = defined(\$p->{'$y'}) ? \$p->{'$y'} : undef;";
+ my $z = $x ;
+ $z =~ s/-/_/g;
+ eval "\$dirinfo::$z = defined(\$p->{'$y'}) ? \$p->{'$y'} : undef;";
die $@ if $@;
}
|
