svn commit: r382318 - head/ftp/pftpd/files

[John Marino]

Author: marino
Date: Thu Mar 26 14:18:50 2015
New Revision: 382318
URL: https://svnweb.freebsd.org/changeset/ports/382318
QAT: https://qat.redports.org/buildarchive/r382318/

Log:
  ftp/pftpd: Add DragonFly support
  
  Bring in fix from dports (port is not maintained)

Added:
  head/ftp/pftpd/files/patch-plib_safeio.c   (contents, props changed)
Modified:
  head/ftp/pftpd/files/patch-plib_dirlist.c

Modified: head/ftp/pftpd/files/patch-plib_dirlist.c
==============================================================================
--- head/ftp/pftpd/files/patch-plib_dirlist.c	Thu Mar 26 14:13:41 2015	(r382317)
+++ head/ftp/pftpd/files/patch-plib_dirlist.c	Thu Mar 26 14:18:50 2015	(r382318)
@@ -1,12 +1,27 @@
---- plib/dirlist.c.orig	Tue Feb  1 10:43:35 2005
-+++ plib/dirlist.c	Mon May 23 18:35:47 2005
-@@ -80,7 +80,9 @@
-     len = strlen(name);
+--- plib/dirlist.c.orig	2013-07-04 11:10:49 UTC
++++ plib/dirlist.c
+@@ -66,7 +66,11 @@ dirent_dup(const struct dirent *dep)
+     n_dep = a_malloc(len, "struct dirent");
+     memcpy(n_dep, dep, len);
+ #else
++# ifdef __DragonFly__
++    n_dep = a_malloc(len = _DIRENT_RECLEN(dep->d_namlen), "struct dirent");
++# else
+     n_dep = a_malloc(len = dep->d_reclen, "struct dirent");
++# endif
+ #endif
+     memcpy(n_dep, dep, len);
+     
+@@ -91,8 +95,12 @@ dirent_alloc(ino_t ino, const char *name
+ 	    
      dp = a_malloc(sizeof(*dp)+len, "struct dirent");
      dp->d_ino = ino;
 +#ifdef		linux
      dp->d_off = 0;
 +#endif		/* linux */
++#ifndef		__DragonFly__
      dp->d_reclen = len;
++#endif
      strcpy(dp->d_name, name);
  
+     return dp;

Added: head/ftp/pftpd/files/patch-plib_safeio.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/pftpd/files/patch-plib_safeio.c	Thu Mar 26 14:18:50 2015	(r382318)
@@ -0,0 +1,11 @@
+--- plib/safeio.c.orig	2013-07-04 11:10:49 UTC
++++ plib/safeio.c
+@@ -448,7 +448,7 @@
+     {
+ 	int err;
+ 	
+-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
++#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__DragonFly__)
+ 	off_t sbytes;
+ 	while ((err = sendfile(to_fd, from_fd, *start, len,
+ 			       NULL, &sbytes, 0)) == -1) {