Fix build on DragonFly 1.6+.

4 files changed, 53 insertions, 11 deletions

diff --git a/net/wu-ftpd/distinfo b/net/wu-ftpd/distinfo
index ab72f5ac65f..592747e1978 100644
--- a/net/wu-ftpd/distinfo
+++ b/net/wu-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/12/18 18:54:26 joerg Exp $
+$NetBSD: distinfo,v 1.15 2006/09/22 19:44:01 joerg Exp $
 
 SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271
 RMD160 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 0b7451c185f80cf9a345f97b9642853e0323e3bd
@@ -17,9 +17,11 @@ SHA1 (patch-ae) = 9abb285c65bb3a764a838f22ee9bdc34371265e4
 SHA1 (patch-af) = 6f9fe289ea5af19ba4c85f63109e8e47e5b21bca
 SHA1 (patch-ag) = 59cc211f4770e5e447b2cd9ca7bd5ab3dc07fc3d
 SHA1 (patch-ah) = a5305d6b9f8d3e1145e6951eaf37f0cdd5c98edc
-SHA1 (patch-ai) = f46979e05d7dcd8568833f56cd6add45fffbc323
+SHA1 (patch-ai) = 0f90c45b24e370fc87b2028a73b15e483b01fa54
 SHA1 (patch-aj) = 65eef2815b2364aaa243cb93ce4a99fdf2eb9f10
 SHA1 (patch-ak) = 8eca121c737498106a5e829cb166746436a87237
 SHA1 (patch-al) = b537901ac9e267a13247547d621215acd6595502
 SHA1 (patch-am) = 1b1cdf067382fce0cb6aa5e6ff605c15414b26ff
 SHA1 (patch-an) = fd1d50bd28b283df717c1ce5fe2f0d6f3eab4967
+SHA1 (patch-ao) = 4b686fce75452665d3b1729a4175b2ba917b7df0
+SHA1 (patch-ap) = 977af5a2fa79360c1a213fa097dc3d6a79a527d5
diff --git a/net/wu-ftpd/patches/patch-ai b/net/wu-ftpd/patches/patch-ai
index 8b8c95142cd..a8168709ab7 100644
--- a/net/wu-ftpd/patches/patch-ai
+++ b/net/wu-ftpd/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
+$NetBSD: patch-ai,v 1.10 2006/09/22 19:44:01 joerg Exp $
 
---- src/ftpd.c.orig	2005-12-18 18:41:46.000000000 +0000
+--- src/ftpd.c.orig	2006-09-22 21:01:34.000000000 +0000
 +++ src/ftpd.c
 @@ -75,6 +75,7 @@
  #include <grp.h>
@@ -10,7 +10,15 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
  
  #define VA_LOCAL_DECL	va_list ap;
  #define VA_START(f)	va_start(ap, f)
-@@ -88,6 +89,9 @@
+@@ -85,9 +86,17 @@
+ #ifdef HAVE_UFS_QUOTA_H
+ #include <ufs/quota.h>
+ #endif
++
++#if defined(__DragonFly__) && __DragonFly_version >= 160000
++#define dqblk ufs_dqblk
++#endif
++
  #ifdef HAVE_SYS_FS_UFS_QUOTA_H
  #include <sys/fs/ufs_quota.h>
  #endif
@@ -20,7 +28,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
  
  #ifdef HAVE_SYS_SYSLOG_H
  #include <sys/syslog.h>
-@@ -214,7 +218,6 @@ int Send(FILE *sockfp, char *format,...)
+@@ -214,7 +223,6 @@ int Send(FILE *sockfp, char *format,...)
  
  /* File containing login names NOT to be used on this machine. Commonly used
   * to disallow uucp. */
@@ -28,7 +36,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
  extern int pidfd;
  
  extern char *ctime(const time_t *);
-@@ -2370,7 +2373,8 @@ void end_login(void)
+@@ -2370,7 +2378,8 @@ void end_login(void)
      (void) seteuid((uid_t) 0);
      if (logged_in)
  	if (wtmp_logging)
@@ -38,7 +46,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
      pw = NULL;
  #ifdef AFS_AUTH
      ktc_ForgetAllTokens();
-@@ -2869,7 +2873,8 @@ void pass(char *passwd)
+@@ -2869,7 +2878,8 @@ void pass(char *passwd)
  #ifdef DEBUG
  	syslog(LOG_DEBUG, "about to call wtmp");
  #endif
@@ -48,7 +56,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
      }
      logged_in = 1;
  
-@@ -5459,7 +5464,9 @@ void reply(int n, char *fmt,...)
+@@ -5459,7 +5469,9 @@ void reply(int n, char *fmt,...)
  		*p = '\0';
  
  	    /* send a line...(note that this overrides dolreplies!) */
@@ -58,7 +66,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
  
  	    if (p)
  		ptr = p + 1;	/* set to the next line... (\0 is handled in the while) */
-@@ -6083,6 +6090,8 @@ void dologout(int status)
+@@ -6083,6 +6095,8 @@ void dologout(int status)
  	(void) seteuid((uid_t) 0);
  	if (wtmp_logging)
  	    wu_logwtmp(ttyline, pw->pw_name, remotehost, 0);
@@ -67,7 +75,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
      }
      if (logging)
  	syslog(LOG_INFO, "FTP session closed");
-@@ -7378,7 +7387,7 @@ int SockPrintf(FILE *sockfp, char *forma
+@@ -7378,7 +7392,7 @@ int SockPrintf(FILE *sockfp, char *forma
      char buf[32768];
  
      va_start(ap, format);
diff --git a/net/wu-ftpd/patches/patch-ao b/net/wu-ftpd/patches/patch-ao
new file mode 100644
index 00000000000..31560ca2996
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2006/09/22 19:44:01 joerg Exp $
+
+--- configure.orig	2006-09-22 21:18:19.000000000 +0000
++++ configure
+@@ -5333,6 +5333,12 @@ echo $ECHO_N "checking whether quota sup
+ #ifdef HAVE_UFS_UFS_QUOTA_H
+ #include <ufs/ufs/quota.h>
+ #endif
++#if defined(__DragonFly__)
++# include <sys/param.h>
++# if __DragonFly_version >= 160000
++#  define dqblk ufs_dqblk
++# endif
++#endif
+ struct dqblk quota;
+ int
+ main ()
diff --git a/net/wu-ftpd/patches/patch-ap b/net/wu-ftpd/patches/patch-ap
new file mode 100644
index 00000000000..dc65e0b92fc
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-ap
@@ -0,0 +1,15 @@
+$NetBSD: patch-ap,v 1.1 2006/09/22 19:44:01 joerg Exp $
+
+--- src/extensions.c.orig	2006-09-22 21:22:18.000000000 +0000
++++ src/extensions.c
+@@ -67,6 +67,10 @@
+ #include <sys/mnttab.h>
+ #endif
+ 
++#if defined(__DragonFly__) && __DragonFly_version >= 160000
++#define dqblk ufs_dqblk
++#endif
++
+ #if defined(HAVE_STATVFS)
+ #include <sys/statvfs.h>
+ #elif defined(HAVE_SYS_VFS)