Update to 0.0.15

Submitted by:	Anders Andersson <anders@codefactory.se>
This commit is contained in:
Neil Blakey-Milner 2001-08-01 09:05:58 +00:00
parent edc6033a2d
commit a2de863d81
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=45691
4 changed files with 3 additions and 60 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= vsftpd
PORTVERSION= 0.0.10
PORTVERSION= 0.0.15
CATEGORIES= ftp
MASTER_SITES= ftp://ferret.lmh.ox.ac.uk/pub/linux/

View File

@ -1 +1 @@
MD5 (vsftpd-0.0.10.tar.gz) = f43b0fa54e47907502c5800ed877e387
MD5 (vsftpd-0.0.15.tar.gz) = 74eadb6c203cc90359632c91e6bb2b9a

View File

@ -1,57 +0,0 @@
diff -ur sysutil.c work2/vsftpd-0.0.10/sysutil.c
--- sysutil.c Wed Jan 31 03:39:15 2001
+++ sysutil.c Sat Feb 3 18:08:05 2001
@@ -19,7 +19,7 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <sys/types.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <sys/mman.h>
#include <sys/stat.h>
@@ -30,7 +30,12 @@
#include <sys/file.h>
#include <time.h>
#include <arpa/inet.h>
+#ifndef BSD
#include <sys/sendfile.h>
+#endif
+#ifdef BSD
+#include <machine/limits.h>
+#endif
#include <errno.h>
#include <pwd.h>
#include <grp.h>
@@ -38,6 +43,7 @@
#include <sys/wait.h>
#include <sys/time.h>
#include <sys/uio.h>
+#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
@@ -378,7 +384,11 @@
vsf_sysutil_set_nodelay(int fd)
{
int nodelay = 1;
+#ifndef BSD
int retval = setsockopt(fd, SOL_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
+#else
+ int retval = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
+#endif
if (retval != 0)
{
die("setsockopt");
@@ -413,7 +423,11 @@
int tos = IPTOS_THROUGHPUT;
/* Ignore failure to set (maybe this IP stack demands privilege for this) */
+#ifndef BSD
(void) setsockopt(fd, SOL_IP, IP_TOS, &tos, sizeof(tos));
+#else
+ (void) setsockopt(fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos));
+#endif
}
int

View File

@ -68,7 +68,7 @@ EOM
}
if ($> != 0) {
print "It is necessary to add missing vpopmail users/groups at";
print "It is necessary to add missing vsftpd users/groups at";
print "this stage. Please either add them manually or retry";
print "as root.";
# Let pw(1) signal the failure so the user can see which