Hi,

Given that I haven't received any answer about this bug (not even a
single answer in more than 600 days!), I have decided to do a porter
NMU.

As specified in the Debian Policy I have uploaded the fixed package
to DELAYED/7-day. You will also find the patch of the NMU below. Note
that the non-Debian specific part is now merged upstream.

Bye,
Aurelien


diff -u gdm-2.16.4/debian/changelog gdm-2.16.4/debian/changelog
--- gdm-2.16.4/debian/changelog
+++ gdm-2.16.4/debian/changelog
@@ -1,3 +1,12 @@
+gdm (2.16.4-1.1) unstable; urgency=low
+
+  * Porter NMU.
+  * Disable SELinux on non-Linux architectures (Hurd, GNU/kFreeBSD).
+    Fix gui/gdmchoosed.c wrt to PIPE_BUF (patch from upstream) to 
+    support Hurd. (closes: #313008).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]>  Mon, 26 Feb 2007 11:51:48 +0100
+
 gdm (2.16.4-1) unstable; urgency=high
 
   * New upstream release
diff -u gdm-2.16.4/debian/control gdm-2.16.4/debian/control
--- gdm-2.16.4/debian/control
+++ gdm-2.16.4/debian/control
@@ -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 -u gdm-2.16.4/debian/rules gdm-2.16.4/debian/rules
--- gdm-2.16.4/debian/rules
+++ gdm-2.16.4/debian/rules
@@ -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
only in patch2:
unchanged:
--- gdm-2.16.4.orig/gui/gdmchooser.c
+++ gdm-2.16.4/gui/gdmchooser.c
@@ -448,6 +448,14 @@
     int pipe_buf;
     gboolean host_not_willing = FALSE;
 
+#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 ( ! (condition & G_IO_IN)) 
         return TRUE;
 
@@ -508,7 +516,7 @@
 
            hostname = hbuf;
 
-           if (strlen (hostname)+1 > PIPE_BUF)
+           if (strlen (hostname) + 1 > pipe_buf)
                goto done;
            hostname = g_strdup (hostname);
 
@@ -531,7 +539,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 +552,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