aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorroam <roam@FreeBSD.org>2004-12-29 20:28:55 +0800
committerroam <roam@FreeBSD.org>2004-12-29 20:28:55 +0800
commita2306aea5cc28e2eae37331be99c5efd75174a9d (patch)
tree4a49736e32cf8e81771dd384f6d3d4e2e08a304b /security
parent9b4ccae698734ce6669f415faf19272f598dc67d (diff)
downloadfreebsd-ports-gnome-a2306aea5cc28e2eae37331be99c5efd75174a9d.tar.gz
freebsd-ports-gnome-a2306aea5cc28e2eae37331be99c5efd75174a9d.tar.zst
freebsd-ports-gnome-a2306aea5cc28e2eae37331be99c5efd75174a9d.zip
Fix the build on FreeBSD versions around 5.2 when EAI_NODATA was
temporarily aliased to EAI_NONAME. No PORTREVISION bump, since this is a no-op on earlier and later versions, and it didn't build at all until now on the affected versions. Reported by: Bretislav Kubesa <bretislav.kubesa@centrum.cz>
Diffstat (limited to 'security')
-rw-r--r--security/stunnel/files/patch-src::network.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/security/stunnel/files/patch-src::network.c b/security/stunnel/files/patch-src::network.c
index eac8748a1206..799222470d3d 100644
--- a/security/stunnel/files/patch-src::network.c
+++ b/security/stunnel/files/patch-src::network.c
@@ -1,5 +1,5 @@
---- src/network.c.orig Mon Dec 27 15:30:04 2004
-+++ src/network.c Mon Dec 27 15:30:07 2004
+--- src/network.c.orig Thu Oct 14 18:03:49 2004
++++ src/network.c Wed Dec 29 14:16:06 2004
@@ -125,7 +125,7 @@
int retval;
@@ -9,18 +9,20 @@
/* no timeout -> main loop */
if(timeout<0 && retval>0 && s_poll_canread(fds, signal_pipe[0]))
signal_pipe_empty();
-@@ -416,8 +416,10 @@
+@@ -416,8 +416,12 @@
return "Temporary failure in name resolution (EAI_AGAIN)";
case EAI_FAIL:
return "Non-recoverable failure in name resolution (EAI_FAIL)";
+#ifdef EAI_NODATA
++#if EAI_NODATA != EAI_NONAME
case EAI_NODATA:
return "No address associated with nodename (EAI_NODATA)";
+#endif
++#endif
case EAI_FAMILY:
return "ai_family not supported (EAI_FAMILY)";
case EAI_SOCKTYPE:
-@@ -562,10 +564,13 @@
+@@ -562,10 +566,13 @@
/* getnameinfo() version */
char *s_ntop(char *text, SOCKADDR_UNION *addr) {
char host[20], port[6];