summaryrefslogtreecommitdiffstats
path: root/ftp/fmirror
diff options
context:
space:
mode:
authorbarner <barner@FreeBSD.org>2005-06-07 08:47:46 +0000
committerbarner <barner@FreeBSD.org>2005-06-07 08:47:46 +0000
commit2520009e6ef18e5e1da511fb32bf4f4710663c87 (patch)
treec38c21a2fa63c2286172fe684e5d51b31d76f62c /ftp/fmirror
parent9140c088322aad38941a7d74b40c7db9621baa11 (diff)
downloadFreeBSD-ports-2520009e6ef18e5e1da511fb32bf4f4710663c87.zip
FreeBSD-ports-2520009e6ef18e5e1da511fb32bf4f4710663c87.tar.gz
- Fix mirroring the root directory of an FTP server [1].
The original author's email address bounces, so this is fixed here. - Move patch from patch-aa to patch-fmirror.c Submitted by: Fred Cox <sailorfred@yahoo.com> Approved by: Xavier Beaudouin <kiwi@oav.net> (maintainer) PR: ports/81787
Diffstat (limited to 'ftp/fmirror')
-rw-r--r--ftp/fmirror/Makefile2
-rw-r--r--ftp/fmirror/files/patch-aa11
-rw-r--r--ftp/fmirror/files/patch-fmirror.c20
3 files changed, 21 insertions, 12 deletions
diff --git a/ftp/fmirror/Makefile b/ftp/fmirror/Makefile
index 80922bb..81d70a9 100644
--- a/ftp/fmirror/Makefile
+++ b/ftp/fmirror/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fmirror
PORTVERSION= 0.8.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.guardian.no/pub/free/ftp/fmirror/ \
ftp://ftp.oav.net/pkg_freebsd/distfiles/
diff --git a/ftp/fmirror/files/patch-aa b/ftp/fmirror/files/patch-aa
deleted file mode 100644
index a5f5f4b..0000000
--- a/ftp/fmirror/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- fmirror.c.old Fri Apr 11 21:37:09 2003
-+++ fmirror.c Fri Apr 11 21:39:33 2003
-@@ -642,7 +642,7 @@
- va_list args;
- va_start(args, format);
- vsprintf(buffer, format, args);
-- l = fprintf(out_file, "%s\n", buffer);
-+ l = fprintf(out_file, "%s\r\n", buffer);
- fflush(out_file);
- buffer[l - 1] = 0;
- LOG(6, cmd, ("---> %s", buffer));
diff --git a/ftp/fmirror/files/patch-fmirror.c b/ftp/fmirror/files/patch-fmirror.c
new file mode 100644
index 0000000..6c1f00e
--- /dev/null
+++ b/ftp/fmirror/files/patch-fmirror.c
@@ -0,0 +1,20 @@
+--- fmirror.c.orig Tue Jun 7 10:39:35 2005
++++ fmirror.c Tue Jun 7 10:39:44 2005
+@@ -642,7 +642,7 @@
+ va_list args;
+ va_start(args, format);
+ vsprintf(buffer, format, args);
+- l = fprintf(out_file, "%s\n", buffer);
++ l = fprintf(out_file, "%s\r\n", buffer);
+ fflush(out_file);
+ buffer[l - 1] = 0;
+ LOG(6, cmd, ("---> %s", buffer));
+@@ -934,7 +934,7 @@
+
+ if (gotodir) {
+ cmd("CWD %s", gotodir);
+- if (!success()) {
++ if (!success() && strcmp(gotodir, "/") != 0) {
+ LOG(4, findtz, ("Cannot CWD %s for timezone", gotodir));
+ gotodir = 0;
+ goto dirdone;
OpenPOWER on IntegriCloud