From 7a4edc39c141e598f0c12a91879df937faecc6ce Mon Sep 17 00:00:00 2001
From: arved <arved@FreeBSD.org>
Date: Wed, 15 Jun 2005 13:56:51 +0000
Subject: Fix build after NI_WITHSCOPEID removal

Reported by:	pointyhat
---
 mail/popd/files/patch-popd.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 mail/popd/files/patch-popd.c

(limited to 'mail/popd')

diff --git a/mail/popd/files/patch-popd.c b/mail/popd/files/patch-popd.c
new file mode 100644
index 00000000000..83d2fd805e4
--- /dev/null
+++ b/mail/popd/files/patch-popd.c
@@ -0,0 +1,40 @@
+--- src/popd.c.orig	Wed Jun 15 15:28:13 2005
++++ src/popd.c	Wed Jun 15 15:49:05 2005
+@@ -46,6 +46,7 @@
+ #include <unistd.h>
+ 
+ #include <poputil.h>
++#include <osreldate.h>
+ #include "config.h"
+ #include "popd.h"
+ #include "paths.h"
+@@ -280,9 +281,15 @@
+ 			}
+ #endif
+ 			if (bind(serverfd, r->ai_addr, r->ai_addrlen) < 0) {
++#if __FreeBSD_version >= 502000
++				getnameinfo(r->ai_addr, r->ai_addrlen,
++                                            ip, sizeof(ip), NULL, 0,
++                                            NI_NUMERICHOST);
++#else
+ 				getnameinfo(r->ai_addr, r->ai_addrlen,
+ 					    ip, sizeof(ip), NULL, 0,
+ 					    NI_NUMERICHOST | NI_WITHSCOPEID);
++#endif
+ 				syslog(facility, "Can't bind port %s on %s",
+ 				       config.port, ip);
+ 				close(serverfd);
+@@ -434,8 +441,13 @@
+ 	facility = LOG_INFO;
+ 	if (config.daemonise || config.debug)
+ #ifdef USE_IPV6
++#if __FreeBSD_version >= 502000
++		getnameinfo((struct sockaddr *)&addr, addr.ss_len,
++		    ip, sizeof(ip), NULL, 0, NI_NUMERICHOST);
++#else
+ 		getnameinfo((struct sockaddr *)&addr, addr.ss_len,
+ 		    ip, sizeof(ip), NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID);
++#endif
+ 	if (config.daemonise || config.debug)
+ 		syslog(facility, "Connection from %s", ip);
+ #else
-- 
cgit