diff options
Diffstat (limited to 'net/vino/files')
-rw-r--r-- | net/vino/files/patch-configure | 28 | ||||
-rw-r--r-- | net/vino/files/patch-server_libvncserver_sockets.c | 20 | ||||
-rw-r--r-- | net/vino/files/patch-server_vino-dbus-listener.c | 12 | ||||
-rw-r--r-- | net/vino/files/patch-server_vino-http.c | 24 |
4 files changed, 84 insertions, 0 deletions
diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure new file mode 100644 index 000000000..c7da75af7 --- /dev/null +++ b/net/vino/files/patch-configure @@ -0,0 +1,28 @@ +--- configure.orig 2009-02-27 20:32:40.000000000 -0500 ++++ configure 2009-02-27 20:34:44.000000000 -0500 +@@ -17882,6 +17882,8 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + ++ #include <sys/types.h> ++ #include <sys/socket.h> + #include <ifaddrs.h> + + int +@@ -17896,6 +17898,7 @@ main () + } + _ACEOF + rm -f conftest.$ac_objext ++have_getifaddrs=yes + if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +@@ -17921,7 +17924,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- if test $"$have_getifaddrs" = "yes"; then ++ if test x"$have_getifaddrs" = x"yes"; then + HAVE_GETIFADDRS_TRUE= + HAVE_GETIFADDRS_FALSE='#' + else diff --git a/net/vino/files/patch-server_libvncserver_sockets.c b/net/vino/files/patch-server_libvncserver_sockets.c new file mode 100644 index 000000000..9014b85a2 --- /dev/null +++ b/net/vino/files/patch-server_libvncserver_sockets.c @@ -0,0 +1,20 @@ +--- server/libvncserver/sockets.c.orig 2009-02-13 08:11:38.000000000 -0500 ++++ server/libvncserver/sockets.c 2009-02-27 20:24:02.000000000 -0500 +@@ -580,6 +580,7 @@ ListenOnTCPPort(rfbScreenInfoPtr rfbScre + { + #ifdef ENABLE_IPV6 + struct sockaddr_in6 s6; ++ int off = 0; + + memset(&s6, 0, sizeof(s6)); + s6.sin6_family = AF_INET6; +@@ -587,6 +588,9 @@ ListenOnTCPPort(rfbScreenInfoPtr rfbScre + s6.sin6_addr = in6addr_any; + + sock = NewSocketListenTCP ((struct sockaddr*)&s6, sizeof(s6)); ++#ifdef IPV6_V6ONLY ++ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off)); ++#endif + rfbLog("Listening IPv{4,6}://*:%d\n", port); + #endif + if(sock < 0) { diff --git a/net/vino/files/patch-server_vino-dbus-listener.c b/net/vino/files/patch-server_vino-dbus-listener.c new file mode 100644 index 000000000..8057b9410 --- /dev/null +++ b/net/vino/files/patch-server_vino-dbus-listener.c @@ -0,0 +1,12 @@ +--- server/vino-dbus-listener.c.orig 2009-02-27 20:36:08.000000000 -0500 ++++ server/vino-dbus-listener.c 2009-02-27 20:36:30.000000000 -0500 +@@ -35,6 +35,9 @@ + #include <string.h> + #include <unistd.h> + #include <netdb.h> ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> + #include <net/if.h> + #include <arpa/inet.h> + diff --git a/net/vino/files/patch-server_vino-http.c b/net/vino/files/patch-server_vino-http.c new file mode 100644 index 000000000..d51f95885 --- /dev/null +++ b/net/vino/files/patch-server_vino-http.c @@ -0,0 +1,24 @@ +Index: server/vino-http.c +diff -u -p server/vino-http.c.orig server/vino-http.c +--- server/vino-http.c.orig Tue Feb 27 19:47:35 2007 ++++ server/vino-http.c Sun Mar 25 20:56:41 2007 +@@ -595,6 +595,9 @@ vino_http_create_listening_socket (VinoH + { + #ifdef ENABLE_IPV6 + struct sockaddr_in6 saddr_in6; ++#ifdef IPV6_V6ONLY ++ int off = 0; ++#endif + #endif + struct sockaddr_in saddr_in; + struct sockaddr *saddr; +@@ -621,6 +624,9 @@ vino_http_create_listening_socket (VinoH + + #ifdef ENABLE_IPV6 + sock = socket (AF_INET6, SOCK_STREAM, 0); ++#ifdef IPV6_V6ONLY ++ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off)); ++#endif + + memset (&saddr_in6, 0, sizeof (struct sockaddr_in6)); + saddr_in6.sin6_family = AF_INET6; |