summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2008-03-28 03:58:54 +0000
committerRod Whitby <rod@whitby.id.au>2008-03-28 03:58:54 +0000
commit2ef28fa6f42e75594369f950ecc2046e200f67c8 (patch)
tree81f28c5c57f41d0bc026abe6ee1bc2670dbc7472
parentc387c55213338679b3dee7c4e6c97f01b4806c6a (diff)
parent8fb289de060b5778d79f0ffa16f5bdfccf28112c (diff)
merge of '19f950ca4a0d912a0ac8680d3b82d52f11fc2cd0'
and 'dd15f7f49322c01bcd6b9e0738b3452ab727d348'
-rw-r--r--packages/ftpd-topfield/files/syslog.patch26
-rwxr-xr-xpackages/ftpd-topfield/ftpd-topfield_0.7.5.bb (renamed from packages/ftpd-topfield/ftpd-topfield_0.7.4.bb)6
2 files changed, 30 insertions, 2 deletions
diff --git a/packages/ftpd-topfield/files/syslog.patch b/packages/ftpd-topfield/files/syslog.patch
new file mode 100644
index 0000000000..8c2bf294f5
--- /dev/null
+++ b/packages/ftpd-topfield/files/syslog.patch
@@ -0,0 +1,26 @@
+--- ftpd-topfield/ftpd.c~ 2008-02-16 09:49:30.000000000 +1030
++++ ftpd-topfield/ftpd.c 2008-03-24 21:45:15.000000000 +1030
+@@ -1190,6 +1190,7 @@
+ if (debug) {
+ fprintf(stderr, "Transfer failed %lld bytes %s\n", (long long)current, srcpath);
+ }
++ syslog(LOG_INFO, "retrieve: Failed transfer of %s @%Ld", srcpath, (long long)current);
+ perror_reply (550, name);
+ }
+
+@@ -1363,6 +1364,7 @@
+ #endif
+
+ if (ret != 0) {
++ syslog(LOG_INFO, "store: Failed transfer of %s @%Ld", destpath, (long long)current);
+ perror_reply (553, name);
+
+ LOGCMD (*mode == 'w' ? "put" : "append", name);
+@@ -1451,6 +1453,7 @@
+ }
+ }
+
++ syslog(LOG_INFO, "store: Failed transfer of %s @%Ld", destpath, (long long)current);
+ /* Failed to cancel the put, so give up */
+ perror_reply (426, "Data Connection");
+ }
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
index 356a6018a2..74a3743b1e 100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
@@ -3,9 +3,11 @@ DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR"
HOMEPAGE = "http://sourceforge.net/projects/puppy"
SECTION = "net"
LICENSE = "MIT"
+PR = "r1"
-SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_4 \
- cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_4 \
+SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_5 \
+ cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_5 \
+ file://syslog.patch;patch=1 \
file://init"
# The source will end up in the subdirectory 'ftpd-topfield' - no release name