On Thu, Dec 21, 2006 at 10:03:29AM +0100, Aurelien Jarno wrote:
> Hi,
> 
> This bug is open for a very long time (more than 1 year and a half), and
> a simple patch is attached to fix the problem. Could you please have a
> look? I haven't heared from you, except when playing ping-pong with the
> severity of this bug.

In the mean time, gdm version 2.6.16.4-1 has been uploaded without this
patch, and it breaks a bit more Hurd support.

Please find bellow a new patch to fix that. The non Debian specific part
has been submitted upstream.


diff -Nru gdm-2.16.4/debian/control gdm-2.16.4/debian/control
--- gdm-2.16.4/debian/control   2007-02-20 00:04:13.000000000 +0100
+++ gdm-2.16.4/debian/control   2007-02-20 00:05:08.000000000 +0100
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ryan Murray <[EMAIL PROTECTED]>
-Build-Depends: libpam0g-dev, libgnomeui-dev, librsvg2-dev, libglade2-dev, 
libwrap0-dev, debhelper, gettext, intltool, scrollkeeper, libselinux1-dev 
[!hurd-i386], libattr1-dev, libxau-dev, libxt-dev, libxdmcp-dev, 
libxinerama-dev, libdmx-dev, gnome-doc-utils, sharutils
+Build-Depends: libpam0g-dev, libgnomeui-dev, librsvg2-dev, libglade2-dev, 
libwrap0-dev, debhelper, gettext, intltool, scrollkeeper, libselinux1-dev 
[!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libattr1-dev, libxau-dev, 
libxt-dev, libxdmcp-dev, libxinerama-dev, libdmx-dev, gnome-doc-utils, sharutils
 Standards-Version: 3.7.2
 
 Package: gdm
diff -Nru gdm-2.16.4/debian/rules gdm-2.16.4/debian/rules
--- gdm-2.16.4/debian/rules     2007-02-20 00:04:13.000000000 +0100
+++ gdm-2.16.4/debian/rules     2007-02-20 00:05:08.000000000 +0100
@@ -8,10 +8,18 @@
 # This is the debhelper compatability version to use.
 export DH_COMPAT=4
 
+DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+       SELINUX_CONFIGURE = --with-selinux
+else
+       SELINUX_CONFIGURE = --without-selinux
+endif
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       ./configure --disable-dependency-tracking --with-tags= --prefix=/usr 
--libexecdir=\$${prefix}/lib --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info --sysconfdir=/etc 
--libexecdir=\$${prefix}/lib/gdm --localstatedir=/var/lib --with-selinux 
--with-custom-conf=/etc/gdm/gdm.conf
+       ./configure --disable-dependency-tracking --with-tags= --prefix=/usr 
--libexecdir=\$${prefix}/lib --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info --sysconfdir=/etc 
--libexecdir=\$${prefix}/lib/gdm --localstatedir=/var/lib $(SELINUX_CONFIGURE) 
--with-custom-conf=/etc/gdm/gdm.conf
        touch configure-stamp
 
 build: configure-stamp build-stamp
diff -Nru gdm-2.16.4/gui/gdmchooser.c gdm-2.16.4/gui/gdmchooser.c
--- gdm-2.16.4/gui/gdmchooser.c 2006-12-05 22:02:51.000000000 +0100
+++ gdm-2.16.4/gui/gdmchooser.c 2007-02-20 00:05:08.000000000 +0100
@@ -524,6 +524,15 @@
         }
     } else
 #endif
+
+#ifdef PIPE_BUF
+    pipe_buf = PIPE_BUF;
+#else
+    /* apparently Hurd doesn't have PIPE_BUF */
+    pipe_buf = fpathconf (1 /*stdout*/, _PC_PIPE_BUF);
+    /* could return -1 if no limit */
+#endif
+
     {
         if ( !is_loopback_addr ((char *)&clnt_sa.sin_addr, AF_INET)) {
            he = gethostbyaddr ((gchar *) &clnt_sa.sin_addr,
@@ -531,7 +540,7 @@
                                AF_INET);
 
            hostname = (he && he->h_name) ? he->h_name : inet_ntoa 
(clnt_sa.sin_addr);
-           if (strlen (hostname)+1 > PIPE_BUF)
+           if (strlen (hostname)+1 > pipe_buf)
                    goto done;
 
            hostname = g_strdup (hostname);
@@ -544,14 +553,6 @@
         }
     }
 
-#ifdef PIPE_BUF
-    pipe_buf = PIPE_BUF;
-#else
-    /* apparently Hurd doesn't have PIPE_BUF */
-    pipe_buf = fpathconf (1 /*stdout*/, _PC_PIPE_BUF);
-    /* could return -1 if no limit */
-#endif
-
     /* We can't pipe hostnames larger than this */
     if (pipe_buf > 0 && strlen (hostname)+1 > pipe_buf) {
            g_free (hostname);


-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   [EMAIL PROTECTED]         | [EMAIL PROTECTED]
   `-    people.debian.org/~aurel32 | www.aurel32.net


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to