summaryrefslogtreecommitdiffstats
path: root/net/vino/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/vino/files')
-rw-r--r--net/vino/files/patch-configure19
-rw-r--r--net/vino/files/patch-server_libvncserver_sockets.c30
-rw-r--r--net/vino/files/patch-server_vino-dbus-listener.c11
-rw-r--r--net/vino/files/patch-server_vino-http.c24
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..6cb7065fc
--- /dev/null
+++ b/net/vino/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig 2009-04-15 11:26:27.000000000 +0200
++++ configure 2009-04-15 11:26:27.000000000 +0200
+@@ -18108,6 +18108,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
+@@ -18122,6 +18124,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;;
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..348ea91d3
--- /dev/null
+++ b/net/vino/files/patch-server_libvncserver_sockets.c
@@ -0,0 +1,30 @@
+--- server/libvncserver/sockets.c.orig 2009-02-13 08:11:38.000000000 -0500
++++ server/libvncserver/sockets.c 2009-03-07 20:19:28.000000000 -0500
+@@ -668,6 +669,11 @@ NewSocketListenTCP(struct sockaddr *addr
+ {
+ int sock = -1;
+ int one = 1;
++#ifdef ENABLE_IPV6
++#ifdef IPV6_V6ONLY
++ int off = 0;
++#endif
++#endif
+
+ if ((sock = socket(addr->sa_family, SOCK_STREAM, 0)) < 0)
+ return -1;
+@@ -677,6 +683,15 @@ NewSocketListenTCP(struct sockaddr *addr
+ return -1;
+ }
+
++#ifdef ENABLE_IPV6
++#ifdef IPV6_V6ONLY
++ if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off)) < 0) {
++ close(sock);
++ return -1;
++ }
++#endif
++#endif
++
+ if (bind(sock, addr, len) < 0) {
+ close(sock);
+ return -1;
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..0744af116
--- /dev/null
+++ b/net/vino/files/patch-server_vino-dbus-listener.c
@@ -0,0 +1,11 @@
+--- server/vino-dbus-listener.c.orig 2009-05-18 17:59:03.000000000 +0200
++++ server/vino-dbus-listener.c 2009-05-19 10:13:22.000000000 +0200
+@@ -35,6 +35,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.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;