[119728] trunk/dports/net/loudmouth

[nicos at macports.org]

Revision: 119728
          https://trac.macports.org/changeset/119728
Author:   nicos at macports.org
Date:     2014-05-04 20:01:15 -0700 (Sun, 04 May 2014)
Log Message:
-----------
loudmouth: fix compilation errors due to TCP_KEEPIDLE (ticket #42266)

Modified Paths:
--------------
    trunk/dports/net/loudmouth/Portfile

Added Paths:
-----------
    trunk/dports/net/loudmouth/files/patch-configure-tcp.diff
    trunk/dports/net/loudmouth/files/patch-keepidle.diff

Modified: trunk/dports/net/loudmouth/Portfile
===================================================================
--- trunk/dports/net/loudmouth/Portfile	2014-05-05 02:27:10 UTC (rev 119727)
+++ trunk/dports/net/loudmouth/Portfile	2014-05-05 03:01:15 UTC (rev 119728)
@@ -32,6 +32,17 @@
                 patch-automake-1.13.diff \
                 patch-loudmouth-lm-error.c.diff
 
+platform darwin {
+    if {${os.major} >= 13} {
+        #On Mavericks, TCP constants are declared, apart from TCP_KEEPIDLE
+        patchfiles-append   patch-keepidle.diff
+    } else {
+        #On ML and lower, TCP constants are not declared, so force deactivation
+        patchfiles-append   patch-configure-tcp.diff
+
+    }
+}
+
 use_autoreconf  yes
 
 configure.args  --without-check

Added: trunk/dports/net/loudmouth/files/patch-configure-tcp.diff
===================================================================
--- trunk/dports/net/loudmouth/files/patch-configure-tcp.diff	                        (rev 0)
+++ trunk/dports/net/loudmouth/files/patch-configure-tcp.diff	2014-05-05 03:01:15 UTC (rev 119728)
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2014-05-03 17:24:26.000000000 +0900
++++ configure.ac	2014-05-03 17:41:18.000000000 +0900
+@@ -224,6 +224,7 @@
+ #include <netinet/tcp.h>
+ ])
+ 
++ac_use_keepalives=no
+ use_keepalives=no
+ if test x$ac_use_keepalives != xno; then
+ 	use_keepalives=yes

Added: trunk/dports/net/loudmouth/files/patch-keepidle.diff
===================================================================
--- trunk/dports/net/loudmouth/files/patch-keepidle.diff	                        (rev 0)
+++ trunk/dports/net/loudmouth/files/patch-keepidle.diff	2014-05-05 03:01:15 UTC (rev 119728)
@@ -0,0 +1,15 @@
+--- loudmouth/lm-sock.c.orig	2014-05-05 11:50:37.000000000 +0900
++++ loudmouth/lm-sock.c	2014-05-05 11:50:49.000000000 +0900
+@@ -325,10 +325,10 @@
+ 		return FALSE;
+ 	}
+ 
+-	opt = delay;
++/*	opt = delay;
+ 	if (setsockopt (sock, IPPROTO_TCP, TCP_KEEPIDLE, &opt, sizeof (opt)) < 0) {
+ 		return FALSE;
+-	}
++	}*/
+ 
+ 	opt = delay; 
+ 	if (setsockopt (sock, IPPROTO_TCP, TCP_KEEPINTVL, &opt, sizeof (opt)) < 0) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140504/d83aed77/attachment-0001.html>