ports/113966: [MAINTAINER] mail/spamd: [Build fail on 5.xx]

[Alex Samorukov]

>Number:         113966
>Category:       ports
>Synopsis:       [MAINTAINER] mail/spamd: [Build fail on 5.xx]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 23 12:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alex Samorukov
>Release:        FreeBSD 5.4-RELEASE-p22 i386
>Organization:
Shevchenko Didkovskiy and Partners
>Environment:
System: FreeBSD deepvision.tsua.net 5.4-RELEASE-p22 FreeBSD 5.4-RELEASE-p22 #6: Thu Feb  1 14:16:07 EET
>Description:
Build was broken on 5.xx because of some troubles with spamlogd. 
This patch fix this.

Added file(s):
- files/patch-makefile
- files/patch-spamlogd

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- spamd-4.1.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/spamd/files/patch-makefile /root/spamd/files/patch-makefile
--- /usr/ports/mail/spamd/files/patch-makefile	Thu Jan  1 03:00:00 1970
+++ /root/spamd/files/patch-makefile	Sat Jun 23 15:32:45 2007
@@ -0,0 +1,13 @@
+--- spamlogd/Makefile.old	Mon Apr  2 01:33:46 2007
++++ spamlogd/Makefile	Sat Jun 23 15:29:03 2007
+@@ -4,6 +4,10 @@
+ SRCS=	spamlogd.c sync.c
+ MAN=	spamlogd.8
+ 
++.if ${OSVERSION} < 601000
++SRCS+=	../spamd/strtonum.c
++.endif
++
+ CFLAGS+= -Wall -Wstrict-prototypes -I${.CURDIR}/../spamd
+ LDADD+= -lpcap -lcrypto -lmd
+ DPADD+= ${LIBPCAP} ${LIBMD}
diff -ruN --exclude=CVS /usr/ports/mail/spamd/files/patch-spamlogd /root/spamd/files/patch-spamlogd
--- /usr/ports/mail/spamd/files/patch-spamlogd	Thu Jan  1 03:00:00 1970
+++ /root/spamd/files/patch-spamlogd	Sat Jun 23 15:34:05 2007
@@ -0,0 +1,15 @@
+--- spamlogd/spamlogd.c.orig	Sat Jun 23 15:28:14 2007
++++ spamlogd/spamlogd.c	Sat Jun 23 15:28:27 2007
+@@ -158,10 +158,12 @@
+ 
+ 	pcap_freecode(&bpfp);
+ 
++#ifdef BIOLOCK
+ 	if (ioctl(pcap_fileno(hpcap), BIOCLOCK) < 0) {
+ 		logmsg(LOG_ERR, "BIOCLOCK: %s", strerror(errno));
+ 		return (-1);
+ 	}
++#endif
+ 
+ 	return (0);
+ }
--- spamd-4.1.2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: