[Bug 254648] mail/qmail-tls doesn't compile with spf

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254648

--- Comment #1 from Charles Lecklider <freebsd@charles.lecklider.org> ---
The problem is with qmail-spf-rc5.patch-tls-20110119. The failing hunk (line
856) is:

diff -Nur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
--- qmail-1.03.orig/qmail-smtpd.c       1998-06-15 12:53:16.000000000 +0200
+++ qmail-1.03/qmail-smtpd.c    2004-10-26 20:59:47.563201720 +0200
@@ -23,9 +23,11 @@
 #include "commands.h"
+#include "spf.h"

 #define MAXHOPS 100
 unsigned int databytes = 0;
 int timeout = 1200;
+unsigned int spfbehavior = 0;

 const char *protocol = "SMTP";

 #ifdef TLS


There's nothing wrong with the hunk, so I believe the problem is patch(1)
itself as this works:

@@ -23,7 +23,9 @@
 #include "commands.h"
+#include "spf.h"

 #define MAXHOPS 100
 unsigned int databytes = 0;
 int timeout = 1200;
+unsigned int spfbehavior = 0;

 const char *protocol = "SMTP";


patch(1) seems to be getting confused by having more context at the end so I'll
open a bug on that, but until that's sorted could you update the patch file
please?

-- 
You are receiving this mail because:
You are the assignee for the bug.