gdm stable port information

Package: gdm

# 2.26 needs xauth features only available in x11 newer than 10.4 has
Version: 2.26.1
Revision: 1
Distribution: 10.5, 10.6

Depends: <<
at-spi (>= 1.26.0-1),
atk1-shlibs (>= 1.26.0-1),
audiofile-shlibs (>= 0.2.5-1),
cairo-shlibs (>= 1.8-1),
dbus (>= 1.2.1-1),
dbus-shlibs (>= 1.2.1-1),
esound-shlibs (>= 0.2.38-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.8-2),
gconf2 (>= 2.26.0-1),
gconf2-shlibs (>= 2.26.0-1),
glib2-shlibs (>= 2.20.0-1),
glitz-shlibs,
gnome-panel-shlibs (>= 2.26.0-1),
gnome-vfs2-unified (>= 1:2.24.1-1),
gtk+2-shlibs (>= 2.16.0-1),
iso-codes (>= 1.0-3),
libart2-shlibs (>= 2.3.16-1),
libavahi-client3-shlibs,
libavahi-common3-shlibs,
libavahi-glib1-shlibs,
libbonobo2-shlibs (>= 2.24.1-1),
libbonoboui2-shlibs (>= 2.24.1-1),
libgettext3-shlibs,
libglade2-shlibs (>= 2.6.4-1),
libgnome2 (>= 2.26.0-1),
libgnomecanvas2 (>= 2.26.0-1),
libiconv,
libpng3-shlibs,
libxklavier12-shlibs (>= 3.9-1),
libxml2-shlibs (>= 2.6.30-1),
orbit2 (>= 2.14.17-1),
pango1-xft2-ft219 (>= 1.24.0-1),
passwd (>= 20051118-1),
pixman-shlibs (>= 0.14.0-1),
popt-shlibs,
rarian-compat,
x11-shlibs
<<
BuildDepends: <<
atk1 (>= 1.26.0-1),
audiofile,
avahi-dev,
cairo (>= 1.8-1),
dbus-dev (>= 1.2.1-1),
esound (>= 0.2.38-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.8-2),
gconf2-dev (>= 2.26.0-1),
gettext-bin,
gettext-tools (>= 0.17),
glib2-dev (>= 2.20.0-1),
glitz,
gnome-doc-utils (>= 0.16.0-1),
gnome-panel-dev (>= 2.26.0-1),
gnome-vfs2-unified-dev (>= 1:2.24.1-1),
gtk+2-dev (>= 2.16.0-1),
gtk-doc,
intltool40,
libart2 (>= 2.3.16-1),
libavahi-glib1-dev,
libbonobo2-dev (>= 2.24.1-1),
libbonoboui2-dev (>= 2.24.1-1),
libgettext3-dev,
libglade2 (>= 2.6.4-1),
libgnome2-dev (>= 2.26.0-1),
libgnomecanvas2-dev (>= 2.26.0-1),
libiconv-dev,
libpng3,
libxklavier12 (>= 3.9-1),
libxml2 (>= 2.6.30-1),
orbit2-dev (>= 2.14.17-1),
pango1-xft2-ft219-dev (>= 1.24.0-1),
pixman (>= 0.14.0-1),
pkgconfig (>= 0.23),
popt,
x11-dev,
xft2-dev
<<
Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2
Source-MD5: c2c15f8b741962f278fa7e790aaa9a2b
PatchFile: %n.patch
PatchFile-MD5: b6f9fef27cc2f40ad37625b73a7702f3
PatchScript: <<
#!/bin/sh -ev
%{default_script}
case `uname -r` in
10*)
perl -pi -e 's,pam/(.*?\.h),security/\1,g' configure daemon/gdm-session* gui/simple-greeter/gdm-greeter-login-window.c
;;
*)
perl -pi -e 's,security/(.*?\.h),pam/\1,g' configure daemon/gdm-session* gui/simple-greeter/gdm-greeter-login-window.c
;;
esac
perl -pi -e 's/(POLICYKIT_REQUIRED_VERSION\s*=).*/${1}99999.FORCE.NONDETECT/' configure
sed -i.bak -e '// a\
#define HOST_NAME_MAX _POSIX_HOST_NAME_MAX' daemon/gdm-display-access-file.c
<<
ConfigureParams: <<
--mandir=%p/share/man --libexecdir=%p/lib/%n \
--with-log-dir=%p/var/log/gdm --with-pid-file=%p/var/run/gdm.pid \
--disable-dependency-tracking --disable-static --enable-more-warnings \
--disable-scrollkeeper \
--disable-polkit \
--with-at-spi-registryd-directory=%p/lib/at-spi \
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
<<
CompileScript: <<
#!/bin/sh -ev
if [ $UID -ne 0 ]; then echo "%n cannot be built with --build-as-nobody"; exit 1; fi
%{default_script}
<<
InfoTest: <<
TestDepends: check
TestScript: make check || exit 2
<<
InstallScript: make -j1 install DESTDIR=%d
ConfFiles: %p/etc/gconf/schemas/gdm-simple-greeter.schemas
PostInstScript: <<
. %p/bin/init.sh
if [ configure = "$1" ]; then
scrollkeeper-update -q
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %p/etc/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
fi
<<
PostRmScript: <<
. %p/bin/init.sh
if [ remove != "$1" ]; then
scrollkeeper-update -q
fi
<<
DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS README TODO
DescPort: <<
May need to fix some _environ usage for darwin. See:
http://bugzilla.gnome.org/show_bug.cgi?id=322085

Make sure utmp.ut_exit is protected by autoconf test. See:
http://bugzilla.gnome.org/show_bug.cgi?id=568487

execinfo.h isn't always available. Avail on OS X >= 10.5 but
not bothering to test (i.e., always patched out) because it's
not important enough to gdm to need to autoreconf. See:
http://bugzilla.gnome.org/show_bug.cgi?id=568491

pam header detection is a disaster: convert to darwin's pam/
not others' security/ pathnames, and fix other problems. See:
http://bugzilla.gnome.org/show_bug.cgi?id=568515
And it changed from 10.[45]->10.6 with no backward-compatible
symlink. Thanks Apple!

We don't have an AI_NUMERICSERV flag in getaddrinfo()

Avoid nested extern decl in gdm-xdmcp-display-factory.c. See:
http://bugzilla.gnome.org/show_bug.cgi?id=568516

Don't have fgetpwent() but just using normal /etc/passwd, so
patch gdm-user-manager.c to getpwent() instead.

jfm fix missing HOST_NAME_MAX. See:
http://bugzilla.gnome.org/show_bug.cgi?id=580676
<<
DescPackaging: <<
Disable PolicyKit for consistent build results if fink gets polkit pkg

Back out feature that requires newer fontconfig (2.5) than we
have (2.4.1). See:
http://bugzilla.gnome.org/show_bug.cgi?id=547826
<<
Description: GNOME desktop manager
License: GPL
Homepage: http://www.gnome.org/projects/gdm
Maintainer: The Gnome Core Team

gdm stable port .patch

diff -Nurd -x'*~' gdm-2.26.1.orig/common/gdm-signal-handler.c gdm-2.26.1/common/gdm-signal-handler.c
--- gdm-2.26.1.orig/common/gdm-signal-handler.c 2009-02-19 21:45:13.000000000 -0500
+++ gdm-2.26.1/common/gdm-signal-handler.c 2009-06-14 00:38:13.000000000 -0400
@@ -27,7 +27,9 @@
#include
#include
#include
+#if HAVE_EXECINFO_H
#include
+#endif
#include
#include
#include
@@ -160,6 +162,7 @@
static void
fallback_get_backtrace (void)
{
+#ifdef HAVE_EXECINFO_H
void * frames[64];
size_t size;
char ** strings;
@@ -173,9 +176,10 @@
}
free (strings);
syslog (LOG_CRIT, "******************* END **********************************");
- } else {
- g_warning ("GDM crashed, but symbols couldn't be retrieved.");
+ return;
}
+#endif
+ g_warning ("GDM crashed, but symbols couldn't be retrieved.");
}


diff -Nurd -x'*~' gdm-2.26.1.orig/configure gdm-2.26.1/configure
--- gdm-2.26.1.orig/configure 2009-04-14 10:21:25.000000000 -0400
+++ gdm-2.26.1/configure 2009-06-14 00:37:38.000000000 -0400
@@ -18762,7 +18762,7 @@
GNOME_PANEL_REQUIRED_VERSION=2.0.0
LIBXKLAVIER_REQUIRED_VERSION=3.5
#FONTCONFIG_REQUIRED_VERSION=2.6.0
-FONTCONFIG_REQUIRED_VERSION=2.5.0
+FONTCONFIG_REQUIRED_VERSION=2.4.0



@@ -26751,6 +26751,7 @@
fi


+ac_pam_includes="/usr/include"
if test "x$have_pam" = "xyes"; then
pam_appl_h="$ac_pam_includes/security/pam_appl.h"
{ $as_echo "$as_me:$LINENO: checking for const pam_message" >&5
diff -Nurd -x'*~' gdm-2.26.1.orig/daemon/gdm-session-record.c gdm-2.26.1/daemon/gdm-session-record.c
--- gdm-2.26.1.orig/daemon/gdm-session-record.c 2009-02-19 21:45:13.000000000 -0500
+++ gdm-2.26.1/daemon/gdm-session-record.c 2009-06-14 00:32:58.000000000 -0400
@@ -322,8 +322,10 @@
#elif defined(HAVE_UT_UT_TIME)
u->ut_time = session_record.ut_time;
#endif
+#ifdef HAVE_UT_UT_EXIT_E_TERMINATION
u->ut_exit.e_termination = 0;
u->ut_exit.e_exit = 0;
+#endif

pututxline (u);

diff -Nurd -x'*~' gdm-2.26.1.orig/daemon/gdm-xdmcp-display-factory.c gdm-2.26.1/daemon/gdm-xdmcp-display-factory.c
--- gdm-2.26.1.orig/daemon/gdm-xdmcp-display-factory.c 2009-03-16 16:12:08.000000000 -0400
+++ gdm-2.26.1/daemon/gdm-xdmcp-display-factory.c 2009-06-14 00:34:32.000000000 -0400
@@ -373,9 +373,6 @@
if (ai->ai_flags & AI_NUMERICHOST) {
g_string_append (str, "numhost ");
}
- if (ai->ai_flags & AI_NUMERICSERV) {
- g_string_append (str, "numserv ");
- }
if (ai->ai_flags & AI_V4MAPPED) {
g_string_append (str, "v4mapped ");
}
@@ -605,20 +602,22 @@
return TRUE;
}

+#ifdef HAVE_TCPWRAPPERS
+
+/*
+ * Avoids a warning, my tcpd.h file doesn't include this prototype, even
+ * though the library does include the function and the manpage mentions it
+ */
+extern int hosts_ctl (char *daemon,
+ char *client_name,
+ char *client_addr,
+ char *client_user);
+#endif
+
static gboolean
gdm_xdmcp_host_allow (GdmAddress *address)
{
#ifdef HAVE_TCPWRAPPERS
-
- /*
- * Avoids a warning, my tcpd.h file doesn't include this prototype, even
- * though the library does include the function and the manpage mentions it
- */
- extern int hosts_ctl (char *daemon,
- char *client_name,
- char *client_addr,
- char *client_user);
-
char *client;
char *host;
gboolean ret;
diff -Nurd -x'*~' gdm-2.26.1.orig/gui/simple-greeter/gdm-greeter-login-window.c gdm-2.26.1/gui/simple-greeter/gdm-greeter-login-window.c
--- gdm-2.26.1.orig/gui/simple-greeter/gdm-greeter-login-window.c 2009-02-19 21:45:09.000000000 -0500
+++ gdm-2.26.1/gui/simple-greeter/gdm-greeter-login-window.c 2009-06-14 00:34:53.000000000 -0400
@@ -68,7 +68,7 @@
#include "gdm-user-chooser-widget.h"

#ifdef HAVE_PAM
-#include
+#include
#define PW_ENTRY_SIZE PAM_MAX_RESP_SIZE
#else
#define PW_ENTRY_SIZE GDM_MAX_PASS
diff -Nurd -x'*~' gdm-2.26.1.orig/gui/simple-greeter/gdm-language-chooser-widget.c gdm-2.26.1/gui/simple-greeter/gdm-language-chooser-widget.c
--- gdm-2.26.1.orig/gui/simple-greeter/gdm-language-chooser-widget.c 2009-02-19 21:45:09.000000000 -0500
+++ gdm-2.26.1/gui/simple-greeter/gdm-language-chooser-widget.c 2009-06-14 00:38:28.000000000 -0400
@@ -133,7 +133,6 @@
static gboolean
language_has_font (const char *locale)
{
- const FcCharSet *charset;
FcPattern *pattern;
FcObjectSet *object_set;
FcFontSet *font_set;
@@ -147,29 +146,21 @@

gdm_parse_language_name (locale, &language_code, NULL, NULL, NULL);

- charset = FcLangGetCharSet ((FcChar8 *) language_code);
- if (!charset) {
- /* fontconfig does not know about this language */
- is_displayable = TRUE;
- } else {
- /* see if any fonts support rendering it */
- pattern = FcPatternBuild (NULL, FC_LANG, FcTypeString, language_code, NULL);
-
- if (pattern == NULL)
- goto done;
+ pattern = FcPatternBuild (NULL, FC_LANG, FcTypeString, language_code, NULL);
+ if (pattern == NULL)
+ goto done;

- object_set = FcObjectSetCreate ();
+ object_set = FcObjectSetBuild (NULL, NULL);

- if (object_set == NULL)
- goto done;
+ if (object_set == NULL)
+ goto done;

- font_set = FcFontList (NULL, pattern, object_set);
+ font_set = FcFontList (NULL, pattern, object_set);

- if (font_set == NULL)
- goto done;
+ if (font_set == NULL)
+ goto done;

- is_displayable = (font_set->nfont > 0);
- }
+ is_displayable = (font_set->nfont > 0);

done:

diff -Nurd -x'*~' gdm-2.26.1.orig/gui/simple-greeter/gdm-user-manager.c gdm-2.26.1/gui/simple-greeter/gdm-user-manager.c
--- gdm-2.26.1.orig/gui/simple-greeter/gdm-user-manager.c 2009-02-19 21:45:09.000000000 -0500
+++ gdm-2.26.1/gui/simple-greeter/gdm-user-manager.c 2009-06-14 00:37:15.000000000 -0400
@@ -1280,11 +1280,7 @@
new_users = NULL;

errno = 0;
- fp = fopen (PATH_PASSWD, "r");
- if (fp == NULL) {
- g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
- goto out;
- }
+ setpwent();

g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
@@ -1297,7 +1293,7 @@
}
}

- for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
+ for (pwent = getpwent(); pwent != NULL; pwent = getpwent()) {
GdmUser *user;

user = NULL;
@@ -1360,7 +1356,6 @@
out:
/* Cleanup */

- fclose (fp);

g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);

gdm _unstable_ port information

Package: gdm
Version: 2.28.2
Revision: 2
Depends: <<
at-spi (>= 1.28.0-1),
atk1-shlibs (>= 1.28.0-1),
cairo-shlibs (>= 1.8.8-3),
dbus (>= 1.2.1-1),
dbus-glib1.2-shlibs,
dbus1.3-shlibs,
dpkg-base-files,
fontconfig2-shlibs (>= 2.8.0-4),
freetype219-shlibs (>= 2.3.12-1),
gconf2 (>= 2.28.0-1),
gconf2-shlibs (>= 2.28.0-1),
glib2-shlibs (>= 2.22.0-1),
gnome-panel-shlibs (>= 2.28.0-1),
gtk+2-shlibs (>= 2.18.0-1),
iso-codes (>= 1.0-3),
libart2-shlibs (>= 2.3.16-1),
libbonobo2 (>= 2.24.2-1),
libbonobo2-shlibs (>= 2.24.2-1),
libbonoboui2-shlibs (>= 2.24.2-1),
libcanberra-gtk0-shlibs (>= 0.23-1),
libcanberra0-shlibs (>= 0.23-1),
libgettext8-shlibs,
libglade2-shlibs (>= 2.6.4-7),
libgnome2 (>= 2.28.0-1),
libgnome2-shlibs (>= 2.28.0-1),
libgnomecanvas2 (>= 2.26.0-3),
libgnomecanvas2-shlibs (>= 2.26.0-3),
libxklavier16-shlibs,
libxml2-shlibs (>= 2.6.30-1),
orbit2 (>= 2.14.17-2),
orbit2-shlibs (>= 2.14.17-2),
pango1-xft2-ft219-shlibs (>= 1.24.5-4),
passwd (>= 20051118-1),
popt-shlibs,
rarian-compat,
x11-shlibs
<<
BuildDepends: <<
atk1 (>= 1.28.0-1),
cairo (>= 1.8.8-3),
dbus-glib1.2-dev,
dbus1.3-dev,
fink (>= 0.24.12-1),
fink-package-precedence,
fontconfig2-dev (>= 2.8.0-4),
freetype219 (>= 2.3.12-1),
gconf2-dev (>= 2.28.0-1),
gettext-bin,
gettext-tools (>= 0.17),
glib2-dev (>= 2.22.0-1),
glitz,
gnome-doc-utils (>= 0.18.0-1),
gnome-panel-dev (>= 2.28.0-1),
gtk+2-dev (>= 2.18.0-1),
gtk-doc (>= 1.13-5),
intltool40,
libart2 (>= 2.3.16-1),
libbonobo2-dev (>= 2.24.2-1),
libbonoboui2-dev (>= 2.24.2-1),
libcanberra-gtk0 (>= 0.23-1),
libcanberra0 (>= 0.23-1),
libgettext8-dev,
libglade2 (>= 2.6.4-7),
libgnome2-dev (>= 2.28.0-1),
libgnomecanvas2-dev (>= 2.26.0-3),
libiconv-dev,
libxklavier16,
libxml2 (>= 2.6.30-1),
orbit2-dev (>= 2.14.17-2),
pango1-xft2-ft219-dev (>= 1.24.5-4),
pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
popt,
x11-dev
<<
Source: mirror:gnome:sources/%n/2.28/%n-%v.tar.bz2
Source-MD5: 9607c6bac31c9d8bd3446e66a4576c2e
PatchFile: %n.patch
PatchFile-MD5: c567d51b49d38db01b59fce5415d5809
PatchScript: <<
#!/bin/sh -ev
%{default_script}
case `uname -r` in
10*)
perl -pi -e 's,pam/(.*?\.h),security/\1,g' configure daemon/gdm-session* gui/simple-greeter/gdm-greeter-login-window.c
;;
*)
perl -pi -e 's,security/(.*?\.h),pam/\1,g' configure daemon/gdm-session* gui/simple-greeter/gdm-greeter-login-window.c
;;
esac
perl -pi -e 's/(DEVKIT_POWER_REQUIRED_VERSION\s*=).*/${1}99999.FORCE.NONDETECT/' configure
perl -pi -e 's/(libglade-2.0 >= )(\\?)(\$LIBGLADE_REQUIRED_VERSION)/dbus-glib-1 >= \2\$DBUS_GLIB_REQUIRED_VERSION \1\2\3/g' configure
<<
ConfigureParams: <<
--mandir=%p/share/man --libexecdir=%p/lib/%n \
--with-log-dir=%p/var/log/gdm --with-pid-file=%p/var/run/gdm.pid \
--enable-dependency-tracking --disable-static --enable-more-warnings \
--disable-scrollkeeper \
--with-at-spi-registryd-directory=%p/lib/at-spi \
--build=%m-apple-darwin`uname -r|cut -f1 -d.` --host=%m-apple-darwin`uname -r|cut -f1 -d.` \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
<<
CompileScript: <<
#!/bin/sh -ev
if [ $UID -ne 0 ]; then echo "%n cannot be built with --build-as-nobody"; exit 1; fi
./configure %c
make
fink-package-precedence --prohibit-bdep %n .
<<
InfoTest: <<
TestDepends: check
TestScript: make check || exit 2
<<
InstallScript: make -j1 install DESTDIR=%d
ConfFiles: %p/etc/gconf/schemas/gdm-simple-greeter.schemas
PostInstScript: <<
if [ configure = "$1" ]; then
scrollkeeper-update -q
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %p/etc/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
fi
<<
PostRmScript: <<
if [ remove != "$1" ]; then
scrollkeeper-update -q
fi
<<
DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS README TODO
DescPort: <<
May need to fix some _environ usage for darwin. See:
http://bugzilla.gnome.org/show_bug.cgi?id=322085

pam header detection is a disaster: convert to darwin's pam/
not others' security/ pathnames, and fix other problems. See:
http://bugzilla.gnome.org/show_bug.cgi?id=568515
And it changed from 10.[45]->10.6 with no backward-compatible
symlink. Thanks Apple!

We don't have an AI_NUMERICSERV flag in getaddrinfo()

Don't have fgetpwent() but just using normal /etc/passwd, so
patch gdm-user-manager.c to getpwent() instead.

OS X X11 doesn't have ServerInterpreted in xhost/xauth. Is
only for a feature/bugfix added in 2.26, so just patch it out.
See: https://bugzilla.gnome.org/show_bug.cgi?id=585809

Recent glib doesn't publish -lintl, so pass it directly.

Need libX11 to use libXdmcp (at least on 10.4, where libXdmcp
is static-only). See:
https://bugzilla.gnome.org/show_bug.cgi?id=616722

Add missing dbus-glib-1 dependency to user-switch-applet. See:
https://bugzilla.gnome.org/show_bug.cgi?id=616730
<<
DescPackaging: <<
Disable DevKit for consistent build results if fink gets polkit pkg
<<
Description: GNOME desktop manager
License: GPL
Homepage: http://www.gnome.org/projects/gdm
Maintainer: The Gnome Core Team

gdm _unstable_ port .patch

diff -Nurd -x'*~' gdm-2.28.2.orig/common/Makefile.in gdm-2.28.2/common/Makefile.in
--- gdm-2.28.2.orig/common/Makefile.in 2009-12-16 18:07:09.000000000 -0500
+++ gdm-2.28.2/common/Makefile.in 2010-04-24 13:59:37.000000000 -0400
@@ -455,6 +455,7 @@
$(NULL)

libgdmcommon_la_LIBADD = \
+ $(INTLLIBS) \
$(NULL)

libgdmcommon_la_LDFLAGS = \
diff -Nurd -x'*~' gdm-2.28.2.orig/configure gdm-2.28.2/configure
--- gdm-2.28.2.orig/configure 2009-12-16 18:07:08.000000000 -0500
+++ gdm-2.28.2/configure 2010-04-24 14:17:20.000000000 -0400
@@ -30108,6 +30108,7 @@
fi


+ac_pam_includes="/usr/include"
if test "x$have_pam" = "xyes"; then
pam_appl_h="$ac_pam_includes/security/pam_appl.h"
{ echo "$as_me:$LINENO: checking for const pam_message" >&5
@@ -32377,7 +32378,7 @@
#define HAVE_LIBXDMCP 1
_ACEOF

- XDMCP_LIBS="-lXdmcp"
+ XDMCP_LIBS="-lXdmcp -lX11"
XDMCP_SUPPORT=yes
fi

diff -Nurd -x'*~' gdm-2.28.2.orig/daemon/gdm-slave.c gdm-2.28.2/daemon/gdm-slave.c
--- gdm-2.28.2.orig/daemon/gdm-slave.c 2009-12-16 17:51:14.000000000 -0500
+++ gdm-2.28.2/daemon/gdm-slave.c 2010-04-24 13:54:15.000000000 -0400
@@ -401,36 +401,6 @@
if (slave->priv->server_display == NULL) {
g_warning ("Unable to connect to display %s", slave->priv->display_name);
ret = FALSE;
- } else if (slave->priv->display_is_local) {
- XHostAddress host_entries[2] = {
- { FamilyServerInterpreted },
- { FamilyServerInterpreted }
- };
- XServerInterpretedAddress si_entries[2];
-
- g_debug ("GdmSlave: Connected to display %s", slave->priv->display_name);
- ret = TRUE;
-
- /* Give programs run by the slave and greeter access to the display
- * independent of current hostname
- */
- si_entries[0].type = "localuser";
- si_entries[0].typelength = strlen ("localuser");
- si_entries[1].type = "localuser";
- si_entries[1].typelength = strlen ("localuser");
-
- si_entries[0].value = "root";
- si_entries[0].valuelength = strlen ("root");
- si_entries[1].value = GDM_USERNAME;
- si_entries[1].valuelength = strlen (GDM_USERNAME);
-
- host_entries[0].address = (char *) &si_entries[0];
- host_entries[0].length = sizeof (XServerInterpretedAddress);
- host_entries[1].address = (char *) &si_entries[1];
- host_entries[1].length = sizeof (XServerInterpretedAddress);
-
- XAddHosts (slave->priv->server_display, host_entries,
- G_N_ELEMENTS (host_entries));
} else {
g_debug ("GdmSlave: Connected to display %s", slave->priv->display_name);
ret = TRUE;
diff -Nurd -x'*~' gdm-2.28.2.orig/daemon/gdm-xdmcp-display-factory.c gdm-2.28.2/daemon/gdm-xdmcp-display-factory.c
--- gdm-2.28.2.orig/daemon/gdm-xdmcp-display-factory.c 2009-12-16 17:51:14.000000000 -0500
+++ gdm-2.28.2/daemon/gdm-xdmcp-display-factory.c 2010-04-24 12:58:15.000000000 -0400
@@ -373,9 +373,6 @@
if (ai->ai_flags & AI_NUMERICHOST) {
g_string_append (str, "numhost ");
}
- if (ai->ai_flags & AI_NUMERICSERV) {
- g_string_append (str, "numserv ");
- }
if (ai->ai_flags & AI_V4MAPPED) {
g_string_append (str, "v4mapped ");
}
diff -Nurd -x'*~' gdm-2.28.2.orig/gui/simple-chooser/Makefile.in gdm-2.28.2/gui/simple-chooser/Makefile.in
--- gdm-2.28.2.orig/gui/simple-chooser/Makefile.in 2009-12-16 18:07:11.000000000 -0500
+++ gdm-2.28.2/gui/simple-chooser/Makefile.in 2010-04-24 14:17:02.000000000 -0400
@@ -354,6 +354,7 @@
$(EXTRA_CHOOSER_LIBS) \
$(SIMPLE_CHOOSER_LIBS) \
$(XDMCP_LIBS) \
+ $(XLIB_LIBS) \
$(NULL)

gdm_host_chooser_SOURCES = \
@@ -372,6 +373,7 @@
$(EXTRA_CHOOSER_LIBS) \
$(SIMPLE_CHOOSER_LIBS) \
$(XDMCP_LIBS) \
+ $(XLIB_LIBS) \
$(NULL)

EXTRA_DIST = \
diff -Nurd -x'*~' gdm-2.28.2.orig/gui/simple-greeter/Makefile.in gdm-2.28.2/gui/simple-greeter/Makefile.in
--- gdm-2.28.2.orig/gui/simple-greeter/Makefile.in 2009-12-16 18:07:11.000000000 -0500
+++ gdm-2.28.2/gui/simple-greeter/Makefile.in 2010-04-24 14:44:30.000000000 -0400
@@ -500,6 +500,7 @@
$(NULL)

libgdmuser_la_LIBADD = \
+ $(INTLLIBS) \
$(NULL)

libgdmuser_la_LDFLAGS = \
@@ -602,6 +603,7 @@

test_filesystem_type_LDADD = \
$(COMMON_LIBS) \
+ $(INTLLIBS) \
$(NULL)

test_language_chooser_SOURCES = \
@@ -625,6 +627,7 @@

test_language_chooser_LDADD = \
$(GTK_LIBS) \
+ $(INTLLIBS) \
$(NULL)

test_layout_chooser_SOURCES = \
@@ -648,6 +651,7 @@
test_layout_chooser_LDADD = \
$(GTK_LIBS) \
$(LIBXKLAVIER_LIBS) \
+ $(INTLLIBS) \
$(NULL)

test_languages_SOURCES = \
@@ -659,6 +663,7 @@

test_languages_LDADD = \
$(GTK_LIBS) \
+ $(INTLLIBS) \
$(NULL)

test_sessions_SOURCES = \
@@ -669,6 +674,7 @@

test_sessions_LDADD = \
$(GTK_LIBS) \
+ $(INTLLIBS) \
$(NULL)

test_user_chooser_SOURCES = \
diff -Nurd -x'*~' gdm-2.28.2.orig/gui/simple-greeter/gdm-user-manager.c gdm-2.28.2/gui/simple-greeter/gdm-user-manager.c
--- gdm-2.28.2.orig/gui/simple-greeter/gdm-user-manager.c 2009-12-16 17:51:14.000000000 -0500
+++ gdm-2.28.2/gui/simple-greeter/gdm-user-manager.c 2010-04-24 13:08:15.000000000 -0400
@@ -1372,11 +1372,7 @@
new_users = NULL;

errno = 0;
- fp = fopen (PATH_PASSWD, "r");
- if (fp == NULL) {
- g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
- goto out;
- }
+ setpwent();

g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
@@ -1390,7 +1386,7 @@
}
}

- for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
+ for (pwent = getpwent(); pwent != NULL; pwent = getpwent()) {
GdmUser *user;

user = NULL;
@@ -1461,7 +1457,6 @@
out:
/* Cleanup */

- fclose (fp);

g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
diff -Nurd -x'*~' gdm-2.28.2.orig/gui/simple-greeter/libnotificationarea/Makefile.in gdm-2.28.2/gui/simple-greeter/libnotificationarea/Makefile.in
--- gdm-2.28.2.orig/gui/simple-greeter/libnotificationarea/Makefile.in 2009-12-16 18:07:11.000000000 -0500
+++ gdm-2.28.2/gui/simple-greeter/libnotificationarea/Makefile.in 2010-04-24 15:26:15.000000000 -0400
@@ -344,6 +344,7 @@

libnotificationarea_la_LIBADD = \
$(GTK_LIBS) \
+ $(XLIB_LIBS) \
$(NULL)

libnotificationarea_la_LDFLAGS = \
diff -Nurd -x'*~' gdm-2.28.2.orig/utils/Makefile.in gdm-2.28.2/utils/Makefile.in
--- gdm-2.28.2.orig/utils/Makefile.in 2009-12-16 18:07:12.000000000 -0500
+++ gdm-2.28.2/utils/Makefile.in 2010-04-24 15:24:50.000000000 -0400
@@ -340,6 +340,7 @@
gdmflexiserver_LDADD = \
$(GTK_LIBS) \
$(COMMON_LIBS) \
+ $(INTLLIBS) \
$(NULL)

gdm_screenshot_SOURCES = \
@@ -350,6 +351,8 @@
$(GTK_LIBS) \
$(CANBERRA_GTK_LIBS) \
$(COMMON_LIBS) \
+ $(INTLLIBS) \
+ $(XLIB_LIBS) \
$(NULL)

EXTRA_DIST = \