r24030 - in /desktop/unstable/gdm3/debian: changelog patches/14_bindv6only.patch patches/15_kfreebsd.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon Apr 26 21:04:50 UTC 2010


Author: joss
Date: Mon Apr 26 21:04:48 2010
New Revision: 24030

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24030
Log:
* 14_bindv6only.patch: patch from Julien Cristau to fix XDMCP and 
  chooser behavior with bindv6only=1. Closes: #579033.
* 15_kfreebsd.patch: first attempt at making gdm3 build on kfreebsd.
  This fixes the current build issue and will probably not be enough.

Added:
    desktop/unstable/gdm3/debian/patches/14_bindv6only.patch
    desktop/unstable/gdm3/debian/patches/15_kfreebsd.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=24030&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Mon Apr 26 21:04:48 2010
@@ -3,8 +3,12 @@
   * Break orca < 2.30.0-2 just to be sure.
   * New Czech translation by Michal Šimůnek.
   * New Vietnamese translation by Clytie Siddall. Closes: #579228.
-
- -- Josselin Mouette <joss at debian.org>  Mon, 26 Apr 2010 15:04:40 +0200
+  * 14_bindv6only.patch: patch from Julien Cristau to fix XDMCP and 
+    chooser behavior with bindv6only=1. Closes: #579033.
+  * 15_kfreebsd.patch: first attempt at making gdm3 build on kfreebsd.
+    This fixes the current build issue and will probably not be enough.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 26 Apr 2010 23:04:18 +0200
 
 gdm3 (2.30.0-3) unstable; urgency=low
 

Added: desktop/unstable/gdm3/debian/patches/14_bindv6only.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/14_bindv6only.patch?rev=24030&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/14_bindv6only.patch (added)
+++ desktop/unstable/gdm3/debian/patches/14_bindv6only.patch [utf-8] Mon Apr 26 21:04:48 2010
@@ -1,0 +1,37 @@
+Index: gdm-2.30.0/daemon/gdm-xdmcp-display-factory.c
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-xdmcp-display-factory.c	2010-04-26 22:52:52.315121124 +0200
++++ gdm-2.30.0/daemon/gdm-xdmcp-display-factory.c	2010-04-26 22:53:03.779622721 +0200
+@@ -411,6 +411,14 @@ create_socket (struct addrinfo *ai)
+                 return sock;
+         }
+ 
++#if defined(ENABLE_IPV6) && defined(IPV6_V6ONLY)
++       if (ai->ai_family == AF_INET6) {
++               int zero = 0;
++               if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)) < 0)
++                       g_warning("setsockopt(IPV6_V6ONLY): %s", g_strerror(errno));
++       }
++#endif
++
+         if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
+                 g_warning ("bind: %s", g_strerror (errno));
+                 close (sock);
+Index: gdm-2.30.0/gui/simple-chooser/gdm-host-chooser-widget.c
+===================================================================
+--- gdm-2.30.0.orig/gui/simple-chooser/gdm-host-chooser-widget.c	2010-04-26 22:53:15.999120959 +0200
++++ gdm-2.30.0/gui/simple-chooser/gdm-host-chooser-widget.c	2010-04-26 22:53:25.103171390 +0200
+@@ -544,6 +544,13 @@ xdmcp_init (GdmHostChooserWidget *widget
+         widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0);
+         if (widget->priv->socket_fd != -1) {
+                 widget->priv->have_ipv6 = TRUE;
++#ifdef IPV6_V6ONLY
++               {
++                       int zero = 0;
++                       if (setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)) < 0)
++                               g_warning("setsockopt(IPV6_V6ONLY): %s", g_strerror(errno));
++               }
++#endif
+         }
+ #endif
+         if (! widget->priv->have_ipv6) {

Added: desktop/unstable/gdm3/debian/patches/15_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/15_kfreebsd.patch?rev=24030&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/15_kfreebsd.patch (added)
+++ desktop/unstable/gdm3/debian/patches/15_kfreebsd.patch [utf-8] Mon Apr 26 21:04:48 2010
@@ -1,0 +1,23 @@
+Index: gdm-2.30.0/common/gdm-common.c
+===================================================================
+--- gdm-2.30.0.orig/common/gdm-common.c	2010-04-26 23:00:05.639623730 +0200
++++ gdm-2.30.0/common/gdm-common.c	2010-04-26 23:02:11.027622756 +0200
+@@ -380,11 +380,17 @@ _read_bytes (int      fd,
+         } while (bytes_left_to_read > 0);
+ 
+         if (premature_eof) {
++#ifdef ENODATA
+                 g_set_error (error,
+                              G_FILE_ERROR,
+                              g_file_error_from_errno (ENODATA),
+                              "%s", g_strerror (ENODATA));
+-
++#else /* ENODATA */
++                g_set_error (error,
++                             G_FILE_ERROR,
++                             G_FILE_ERROR_FAILED,
++                             "No data available");
++#endif /* ENODATA */
+                 return FALSE;
+         } else if (bytes_left_to_read > 0) {
+                 g_set_error (error,

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=24030&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Mon Apr 26 21:04:48 2010
@@ -13,4 +13,6 @@
 13_gdmsetup.patch
 13_gdmsetup_ui.patch
 13_gdmsetup_desktop.patch
+14_bindv6only.patch
+15_kfreebsd.patch
 90_relibtoolize.patch




More information about the pkg-gnome-commits mailing list