OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Aug-2005 11:31:14
Branch: OPENPKG_2_4_SOLID Handle: 2005081610311300
Added files: (Branch: OPENPKG_2_4_SOLID)
openpkg-src/vcheck vcheck.patch
Modified files: (Branch: OPENPKG_2_4_SOLID)
openpkg-src/vcheck vcheck.spec
Log:
MFC: Passive-FTP support
Summary:
Revision Changes Path
1.2.2.1 +23 -0 openpkg-src/vcheck/vcheck.patch
1.16.2.2 +3 -1 openpkg-src/vcheck/vcheck.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vcheck/vcheck.patch
============================================================================
$ cvs diff -u -r0 -r1.2.2.1 vcheck.patch
--- /dev/null 2005-08-16 11:30:32 +0200
+++ vcheck.patch 2005-08-16 11:31:14 +0200
@@ -0,0 +1,23 @@
+Feature: retry failed FTP URLs using passive mode
+
+--- vcheck.orig 2005-03-20 20:05:19 +0100
++++ vcheck 2005-08-09 18:05:06 +0200
+@@ -1435,6 +1436,7 @@
+ sub read_url($;$$) # &read_url $url [$outfile [$referrer]]
+ {
+ local($i, $t) = (1, time);
++ local($isftp) = (@_->[0] =~ m|^ftp://|i);
+
+ sub meter($$$)
+ {
+@@ -1460,7 +1463,9 @@
+ $xfersum += length $_;
+ $_
+ } else {
+- local $_ = $ua->request($req);
++ local $_;
++ delete $ENV{FTP_PASSIVE}; $_ = $ua->request($req);
++ $ENV{FTP_PASSIVE}=1; $_ = $ua->request($req) if ($isftp and
$_->{_headers}->{content-length} == 0);
+ $xfersum += length($_->headers) + length $_->content;
+ $_->content
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vcheck/vcheck.spec
============================================================================
$ cvs diff -u -r1.16.2.1 -r1.16.2.2 vcheck.spec
--- openpkg-src/vcheck/vcheck.spec 15 Jun 2005 19:07:48 -0000 1.16.2.1
+++ openpkg-src/vcheck/vcheck.spec 16 Aug 2005 09:31:13 -0000 1.16.2.2
@@ -33,10 +33,11 @@
Group: Network
License: Artistic
Version: 1.2.1
-Release: 2.4.0
+Release: 2.4.1
# list of sources
Source0:
http://www.tu-ilmenau.de/~gomar/stuff/vcheck/vcheck-%{version}.tar.gz
+Patch0: vcheck.patch
# build information
Prefix: %{l_prefix}
@@ -61,6 +62,7 @@
%prep
%setup -q
+ %patch -p0
%build
%{l_prefix}/bin/pod2man vcheck >vcheck.1
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
