aboutsummaryrefslogtreecommitdiff
path: root/net/netatalk
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2010-08-15 21:52:32 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2010-08-15 21:52:32 +0000
commitb4fd4cce65d4ca2cfe3e17f8b073cbd0044f896e (patch)
treed6d5ce952ba919c6a9a11929363aaa10a54e47f5 /net/netatalk
parentd9a32ecab5d64cf44d8f6fb5d9bd12a790ed2c14 (diff)
downloadports-b4fd4cce65d4ca2cfe3e17f8b073cbd0044f896e.tar.gz
ports-b4fd4cce65d4ca2cfe3e17f8b073cbd0044f896e.zip
Notes
Diffstat (limited to 'net/netatalk')
-rw-r--r--net/netatalk/Makefile2
-rw-r--r--net/netatalk/files/patch-libatalk_dsi_dsi_tcp.c39
2 files changed, 40 insertions, 1 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index d429a8b8032d..5548a11b1c56 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netatalk
PORTVERSION= 2.1.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net print
MASTER_SITES= SF
diff --git a/net/netatalk/files/patch-libatalk_dsi_dsi_tcp.c b/net/netatalk/files/patch-libatalk_dsi_dsi_tcp.c
new file mode 100644
index 000000000000..894e9e164463
--- /dev/null
+++ b/net/netatalk/files/patch-libatalk_dsi_dsi_tcp.c
@@ -0,0 +1,39 @@
+--- libatalk/dsi/dsi_tcp.c.orig 2010-07-02 10:48:44.000000000 -0400
++++ libatalk/dsi/dsi_tcp.c 2010-08-15 17:49:41.000000000 -0400
+@@ -277,19 +277,22 @@ int dsi_tcp_init(DSI *dsi, const char *h
+ {
+ int ret;
+ int flag;
++ int on;
+ struct addrinfo hints, *servinfo, *p;
+
+ dsi->protocol = DSI_TCPIP;
+
+ /* Prepare hint for getaddrinfo */
+ memset(&hints, 0, sizeof hints);
+- hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_NUMERICSERV;
+- if ( ! address)
++ if ( ! address) {
+ hints.ai_flags |= AI_PASSIVE;
+- else
++ hints.ai_family = AF_INET6;
++ } else {
+ hints.ai_flags |= AI_NUMERICHOST;
++ hints.ai_family = AF_UNSPEC;
++ }
+
+ if ((ret = getaddrinfo(address ? address : NULL, port ? port : "548", &hints, &servinfo)) != 0) {
+ LOG(log_error, logtype_dsi, "dsi_tcp_init: getaddrinfo: %s\n", gai_strerror(ret));
+@@ -316,6 +319,10 @@ int dsi_tcp_init(DSI *dsi, const char *h
+ flag = 1;
+ setsockopt(dsi->serversock, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag));
+ #endif
++#ifdef IPV6_BINDV6ONLY
++ on = 0;
++ setsockopt(dsi->serversock, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof (on));
++#endif
+
+ #ifdef USE_TCP_NODELAY
+ #ifndef SOL_TCP