r23037 - in /desktop/unstable/gdm/debian: changelog patches/01_gdmchooser-ipv6_bindv6only-workaround.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Feb 11 19:00:26 2010
New Revision: 23037

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23037
Log:
01_gdmchooser-ipv6_bindv6only-workaround.patch: patch from Miguel 
Landaeta. Allow gdmchooser to work with new default netbase setting 
net.ipv6.bindv6only=1. Closes: #562126.

Added:
    desktop/unstable/gdm/debian/patches/01_gdmchooser-ipv6_bindv6only-workaround.patch
Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/patches/series

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=23037&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm/debian/changelog [utf-8] Thu Feb 11 19:00:26 2010
@@ -1,11 +1,17 @@
 gdm (2.20.10-2) UNRELEASED; urgency=low
 
+  [ Emilio Pozuelo Monfort ]
   * debian/patches/68_hurd_pathmax.patch:
     - Don't use MAXPATHLEN and PATH_MAX since it's not defined on
       GNU/Hurd. Use dynamic allocation instead.
   * debian/patches/69_hurd_gdm_reset_locale.patch:
     - Don't implement gdm_reset_locale() only if RLIM_NLIMITS is defined,
       since it has nothing to do with it and it's undefined on the Hurd.
+
+  [ Josselin Mouette ]
+  * 01_gdmchooser-ipv6_bindv6only-workaround.patch: patch from Miguel 
+    Landaeta. Allow gdmchooser to work with new default netbase setting 
+    net.ipv6.bindv6only=1. Closes: #562126.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 14 Dec 2009 21:59:58 +0100
 

Added: desktop/unstable/gdm/debian/patches/01_gdmchooser-ipv6_bindv6only-workaround.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/01_gdmchooser-ipv6_bindv6only-workaround.patch?rev=23037&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/01_gdmchooser-ipv6_bindv6only-workaround.patch (added)
+++ desktop/unstable/gdm/debian/patches/01_gdmchooser-ipv6_bindv6only-workaround.patch [utf-8] Thu Feb 11 19:00:26 2010
@@ -1,0 +1,28 @@
+Debian #562126; enable gdmchooser to work with netbase default setting
+net.ipv6.bindv6only=1
+
+diff -Naur gdm-2.20.10/gui/gdmchooser.c gdm-2.20.10/gui/gdmchooser.c
+--- gdm-2.20.10/gui/gdmchooser.c	2009-03-19 00:29:11.000000000 -0430
++++ gdm-2.20.10/gui/gdmchooser.c	2010-02-09 20:10:08.000000000 -0430
+@@ -1121,6 +1121,7 @@
+ {
+ 	static XdmcpHeader header;
+ 	gint sockopts = 1;
++	int ipv6_only_flag = 0;
+ 
+ 	/* Open socket for communication */
+ #ifdef ENABLE_IPV6
+@@ -1140,6 +1141,13 @@
+ 		gdm_common_fail_exit ("Could not set socket options!");
+ 	}
+ 
++	if (have_ipv6) {
++		if (setsockopt (sockfd, IPPROTO_IPV6, IPV6_V6ONLY,
++			(char*)&ipv6_only_flag, sizeof(ipv6_only_flag)) < 0) {
++			gdm_common_fail_exit ("Could not set socket options!");
++            }
++	}
++
+ 	/* Assemble XDMCP BROADCAST_QUERY packet in static buffer */
+ 	header.opcode  = (CARD16) BROADCAST_QUERY;
+ 	header.length  = 1;

Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=23037&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm/debian/patches/series [utf-8] Thu Feb 11 19:00:26 2010
@@ -1,3 +1,4 @@
+01_gdmchooser-ipv6_bindv6only-workaround.patch
 20_xdm-stuff.patch
 21_XKeepsCrashing_bashism.patch
 35_gdm.conf.patch