diff options
author | Rene Ladan <rene@FreeBSD.org> | 2023-05-31 23:12:07 +0200 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2023-05-31 23:12:07 +0200 |
commit | 9f992efe9464b892299f34b8fd3127498766fcaa (patch) | |
tree | e4abad2a43f1f79d065242a632f47847ce91edcf /ftp/ftpmirror/files | |
parent | 36cd9bb3bd01cb3e3676e85b23ffe4a0dcc1ec28 (diff) | |
download | freebsd-ports-9f992efe9464b892299f34b8fd3127498766fcaa.zip |
ftp/ftpmirror: Remove expired port:
2023-05-31 ftp/ftpmirror: Abandonware
Diffstat (limited to 'ftp/ftpmirror/files')
-rw-r--r-- | ftp/ftpmirror/files/patch-FTP.pm | 108 | ||||
-rw-r--r-- | ftp/ftpmirror/files/patch-Fan__Fan.pm | 11 | ||||
-rw-r--r-- | ftp/ftpmirror/files/patch-Makefile.in | 42 | ||||
-rw-r--r-- | ftp/ftpmirror/files/patch-TCP.pm | 154 |
4 files changed, 0 insertions, 315 deletions
diff --git a/ftp/ftpmirror/files/patch-FTP.pm b/ftp/ftpmirror/files/patch-FTP.pm deleted file mode 100644 index fb8e8448105f..000000000000 --- a/ftp/ftpmirror/files/patch-FTP.pm +++ /dev/null @@ -1,108 +0,0 @@ -Index: Fan/FTP/FTP.pm -=================================================================== -RCS file: /usr/home/ume/ncvs/src/ftpmirror/Fan/FTP/FTP.pm,v -retrieving revision 1.1.1.2 -retrieving revision 1.6 -diff -u -r1.1.1.2 -r1.6 ---- Fan/FTP/FTP.pm 2000/03/03 07:35:58 1.1.1.2 -+++ Fan/FTP/FTP.pm 2000/03/09 13:32:04 1.6 -@@ -60,6 +60,9 @@ - - use Carp; - use Socket; -+ -+use Socket6; -+ - use Fan::TCP; - use AutoLoader 'AUTOLOAD'; - -@@ -390,7 +393,7 @@ - $self->clearerror || return undef; - $self->cleardataconn; # always success - -- my($port, $addr) = $self->sockname; -+ my ($port, $addr, $family) = $self->sockname; - - my $acpt = Fan::TCP->new(); - unless (defined($acpt)) { -@@ -398,20 +401,28 @@ - return undef; - } - -- unless ($acpt->do_server(tcp_bindaddr => $addr)) { -+ unless ($acpt->do_server(tcp_family => $family, -+ tcp_bindaddr => $addr)) { - warn("Fan::TCP->do_server failed"); - return undef; - } - -- ($port, $addr) = $acpt->sockname; -- unless ($addr =~ tr/./,/ == 3) { -- warn("ADDRESS=$addr must have just 3 dots"); -- return undef; -+ ($port, $addr, $family) = $acpt->sockname; -+ my $command; -+ if ($family == AF_INET) { -+ unless ($addr =~ tr/./,/ == 3) { -+ warn("ADDRESS=$addr must have just 3 dots"); -+ return undef; -+ } -+ $addr .= sprintf(",%d,%d", ($port >> 8) & 0xff, $port & 0xff); -+ $command = 'PORT'; -+ } else { -+ $addr = "|2|$addr|$port|"; -+ $command = 'EPRT'; - } -- $addr .= sprintf(",%d,%d", ($port >> 8) & 0xff, $port & 0xff); - -- unless ($self->putreq("PORT $addr") =~ /^2/) { -- warn("PORT command failed\n") if $LOG > 5; -+ unless ($self->putreq("$command $addr") =~ /^2/) { -+ warn("$command command failed\n") if $LOG > 5; - $self->error($self->{lastmesg}); - return undef; - } -@@ -437,12 +448,20 @@ - ;# - sub pasv ($) { - my $self = shift; -- my $a_regexp = '\((\d+),(\d+),(\d+),(\d+),(\d+),(\d+)\)'; - - $self->clearerror && - $self->cleardataconn || return undef; - -- if ($self->putreq("PASV") !~ /^2/) { -+ my $family = ($self->sockname)[2]; -+ my ($a_regexp, $command); -+ if ($family == AF_INET) { -+ $a_regexp = '\((\d+),(\d+),(\d+),(\d+),(\d+),(\d+)\)'; -+ $command = 'PASV'; -+ } else { -+ $a_regexp = '\([^\d\s]{3}(\d+)[^\d\s]\)'; -+ $command = 'EPSV'; -+ } -+ if ($self->putreq($command) !~ /^2/) { - $self->error($self->{lastmesg}); - return undef; - } -@@ -452,11 +471,18 @@ - } - - my $bindaddr = $self->{ftp_bindaddr}; -- my $port = $5 * 256 + $6; -- my $addr = join('.', $1, $2, $3, $4); -+ my ($port, $addr); -+ if ($family == AF_INET) { -+ $port = $5 * 256 + $6; -+ $addr = join('.', $1, $2, $3, $4); -+ } else { -+ $port = $1; -+ $addr = ($self->peername)[1]; -+ } - my $data = Fan::TCP->new(); - - $data && $data->do_client( -+ tcp_family => $family, - tcp_bindaddr => $bindaddr, - tcp_host => $addr, - tcp_port => $port diff --git a/ftp/ftpmirror/files/patch-Fan__Fan.pm b/ftp/ftpmirror/files/patch-Fan__Fan.pm deleted file mode 100644 index 720124599a89..000000000000 --- a/ftp/ftpmirror/files/patch-Fan__Fan.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- Fan/Fan.pm.orig Sun Nov 21 17:24:27 1999 -+++ Fan/Fan.pm Wed Jan 12 13:28:20 2000 -@@ -48,7 +48,7 @@ - - ;# Where configuration files are. - BEGIN { -- $sysconfdir = "/usr/local/etc"; -+ $sysconfdir = '%%PREFIX%%/etc'; - } - - ;# diff --git a/ftp/ftpmirror/files/patch-Makefile.in b/ftp/ftpmirror/files/patch-Makefile.in deleted file mode 100644 index b29c6a91c6fd..000000000000 --- a/ftp/ftpmirror/files/patch-Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ ---- Makefile.in.orig 1997-09-26 11:43:03.000000000 -0300 -+++ Makefile.in 2013-10-30 11:19:37.000000000 -0200 -@@ -23,28 +23,31 @@ - rm -f *.old *.bak *.core Makefile - - # install:: ${BINDIR}/farm --install:: ${BINDIR}/rotate --install:: ${BINDIR}/ftpmirror --install:: ${SYSCONFDIR}/ftpmirror.cf-sample -+install:: ${DESTDIR}${BINDIR}/rotate -+install:: ${DESTDIR}${BINDIR}/ftpmirror -+install:: ${DESTDIR}${SYSCONFDIR}/ftpmirror.cf-sample - --${BINDIR}/rotate: rotate -+${DESTDIR}${BINDIR}/rotate: rotate - ${INSTALL_PROGRAM} $? $@ - --${BINDIR}/farm: farm -+${DESTDIR}${BINDIR}/farm: farm - ${INSTALL_PROGRAM} $? $@ - --${BINDIR}/ftpmirror: ftpmirror -+${DESTDIR}${BINDIR}/ftpmirror: ftpmirror - ${INSTALL_PROGRAM} $? $@ - --${SYSCONFDIR}/ftpmirror.cf-sample: ftpmirror.cf-sample -+${DESTDIR}${SYSCONFDIR}/ftpmirror.cf-sample: ftpmirror.cf-sample - ${INSTALL_DATA} $? $@ - - # for subdirectories... --all clean realclean install:: Fan/Makefile -+all clean realclean:: Fan/Makefile - @ for d in ${SUBDIR} ; do \ - ( echo "make $@ in $$d..." && cd $$d && make $@ ) ; \ - done - -+install:: Fan/Makefile -+ ( echo "make pure_install in Fan..." && cd Fan && make pure_install ) ; \ -+ - # Fan subdirectory requres Makefile first. - Fan/Makefile:: Fan/Makefile.PL - cd Fan; ${PERL} Makefile.PL diff --git a/ftp/ftpmirror/files/patch-TCP.pm b/ftp/ftpmirror/files/patch-TCP.pm deleted file mode 100644 index d8ed2c572d39..000000000000 --- a/ftp/ftpmirror/files/patch-TCP.pm +++ /dev/null @@ -1,154 +0,0 @@ -Index: Fan/TCP/TCP.pm -=================================================================== -RCS file: /usr/home/ume/ncvs/src/ftpmirror/Fan/TCP/TCP.pm,v -retrieving revision 1.1.1.1 -retrieving revision 1.12 -diff -u -r1.1.1.1 -r1.12 ---- Fan/TCP/TCP.pm 1999/10/24 10:28:15 1.1.1.1 -+++ Fan/TCP/TCP.pm 2000/03/09 13:32:06 1.12 -@@ -35,15 +35,16 @@ - package Fan::TCP; - - use strict; --use vars qw($VERSION $LOG -- $tcp_proto $seq_id $sent_octets $recv_octets); -+use vars qw($VERSION $LOG $seq_id $sent_octets $recv_octets); - - use Carp; - use Socket; -+ -+use Socket6; -+ - use AutoLoader 'AUTOLOAD'; - - $VERSION = '0.03'; --$tcp_proto = (getprotobyname('tcp'))[2]; - - ;# - BEGIN { -@@ -463,27 +464,21 @@ - - # check local side port #. - my $port = $params{tcp_bindport} || $self->{tcp_bindport} || 0; -- if ($port !~ /^\d+$/) { -- if (!defined($port = getservbyname($port, 'tcp'))) { -- my $e = $!.''; -- $self->error($e, &FATAL); -- carp("$self: getservbyname($port) - $e"); -- return undef; -- } -- } - - # define local side address if bindaddr is not null string. -- my $addr = inet_aton( -- $params{tcp_bindaddr} || $self->{tcp_bindaddr} || '0.0.0.0'); -- -- # parameter for bind. -- my $me = sockaddr_in($port, $addr); -+ my $family = $params{tcp_family} ? $params{tcp_family} : AF_INET; -+ my $tcp_bindaddr = $params{tcp_bindaddr} || $self->{tcp_bindaddr} || -+ (($family == AF_INET) ? '0.0.0.0' : '::'); -+ -+ my ($socktype, $proto, $me, $canonname); -+ ($family, $socktype, $proto, $me, $canonname) -+ = getaddrinfo($tcp_bindaddr, $port, $family, SOCK_STREAM); - - # local file handle... - local *SOCKET; - - # creating a stream socket. -- unless (socket(SOCKET, PF_INET, SOCK_STREAM, $tcp_proto)) { -+ unless (socket(SOCKET, $family, $socktype, $proto)) { - my $e = $!.''; - $self->error($e, &FATAL); - carp("$self: socket - $e") if $LOG >= 5; -@@ -539,41 +534,27 @@ - return undef; - } - -- # try to parse port number -- if ($port !~ /^\d+$/) { -- if (!defined($port = getservbyname($port, 'tcp'))) { -- my $e = $!.''; -- $self->error($e, &FATAL); -- carp("$self: getservbyname($port) - $e"); -- return undef; -- } -- } -- -- # check server name -- my @addr; -- if ($host =~ /^(\d+)\.(\d+)\.(\d+).(\d+)$/) { -- @addr = (pack('C4', $1, $2, $3, $4)); -- } else { -- if ((@addr = gethostbyname($host)) < 5) { -- carp("$self: gethostbyname - $?"); -- my $e = $?.''; -- $self->error($e, &FATAL); -- carp("$self: gethostbyname - $e"); -- return undef; -- } -- splice(@addr, 0, 4); -+ # check server name and try to parse port number -+ my @infos = getaddrinfo($host, $port, AF_UNSPEC, SOCK_STREAM); -+ if ($#infos < 1) { -+ carp("$self: getaddrinfo($host, $port) - $?"); -+ my $e = $?.''; -+ $self->error($e, &FATAL); -+ carp("$self: getaddrinfo($host, $port) - $e"); -+ return undef; - } - - # Perl's bug? once connect fails, we could not any more - # connect (connect returns "Invalid Argument"). So we - # create/close a socket in each iteration. -- for my $i (@addr) { -+ while ($#infos >= 1) { -+ my ($family, $socktype, $proto, $peer, $canonname) -+ = splice(@infos, 0, 5); - - # open socket stores any error -+ $params{tcp_family} = $family; - $self->open_socket(%params) || return undef; - -- # target address. -- my $peer = sockaddr_in($port, $i); - my $result = undef; - - # do real work. -@@ -758,10 +739,13 @@ - my $sock = $self->handle; - - if (defined($sock)) { -- my($port, $a) = sockaddr_in(getsockname($sock)); -- my $addr = join('.', unpack('C4', $a)); --carp("$self sockname=$addr:$port") if $LOG > 7; -- return wantarray ? ($port, $addr) : "$addr:$port"; -+ my $sa = getsockname($sock); -+ my $family = (unpack('CC', $sa))[1]; -+ my ($addr, $port) = getnameinfo($sa, NI_NUMERICHOST | -+ NI_NUMERICSERV); -+ carp("$self sockname=$addr|$port|$family") if $LOG > 7; -+ return wantarray ? ($port, $addr, $family) -+ : "$addr|$port|$family"; - } - return wantarray ? () : undef; - } -@@ -772,10 +756,13 @@ - my $sock = $self->handle; - - if (defined($sock)) { -- my($port, $a) = sockaddr_in(getpeername($sock)); -- my $addr = join('.', unpack('C4', $a)); --carp("$self sockpeer=$addr:$port") if $LOG > 7; -- return wantarray ? ($port, $addr) : "$addr:$port"; -+ my $sa = getpeername($sock); -+ my $family = (unpack('CC', $sa))[1]; -+ my ($addr, $port) = getnameinfo($sa, NI_NUMERICHOST | -+ NI_NUMERICSERV); -+ carp("$self sockpeer=$addr|$port|$family") if $LOG > 7; -+ return wantarray ? ($port, $addr, $family) -+ : "$addr|$port|$family"; - } - return wantarray ? () : undef; - } |