r10692 - in /desktop/unstable/gdm/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed May 2 09:24:06 UTC 2007
Author: lool
Date: Wed May 2 09:24:06 2007
New Revision: 10692
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10692
Log:
- Refresh patches 30_hardcode-standard-x-server, 41_config-files,
42_pam-and-timed-login, 48_random-greeter-theme,
53_remove-ok-and-cancel-from-included-themes, 57_gdm-is-local,
62_reference-manual-docbook-entity-reference, 64_vt-auto-allocation-fix,
67_C-locale-fallback, 68_doc-build-add-revnumber, 69_misc-config-typos.
- Drop patch 55_hurd-no-pipe-buf, merged upstream.
- Update patches:
. 35_gdm.conf: Update reference to System Configuration file.
. 45_use-gksu-for-gdmsetup: Update to use the full path to gdmsetup.
. 50_close-fds: Update to match upstream changes which closed even more
fds than in the past; convert some Debian specific closes to use
VE_IGNORE_EINTR() too; leave the upstream code in the source.
. 65_french-translation-typo: Update to upstream rewording of this
string.
Modified:
desktop/unstable/gdm/debian/changelog
desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch
desktop/unstable/gdm/debian/patches/35_gdm.conf.patch
desktop/unstable/gdm/debian/patches/41_config-files.patch
desktop/unstable/gdm/debian/patches/42_pam-and-timed-login.patch
desktop/unstable/gdm/debian/patches/45_use-gksu-for-gdmsetup.patch
desktop/unstable/gdm/debian/patches/48_random-greeter-theme.patch
desktop/unstable/gdm/debian/patches/50_close-fds.patch
desktop/unstable/gdm/debian/patches/53_remove-ok-and-cancel-from-included-themes.patch
desktop/unstable/gdm/debian/patches/57_gdm-is-local.patch
desktop/unstable/gdm/debian/patches/62_reference-manual-docbook-entity-reference.patch
desktop/unstable/gdm/debian/patches/64_vt-auto-allocation-fix.patch
desktop/unstable/gdm/debian/patches/65_french-translation-typo.patch
desktop/unstable/gdm/debian/patches/67_C-locale-fallback.patch
desktop/unstable/gdm/debian/patches/68_doc-build-add-revnumber.patch
desktop/unstable/gdm/debian/patches/69_misc-config-typos.patch
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=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Wed May 2 09:24:06 2007
@@ -58,8 +58,22 @@
closes: #409428.
* New upstream releases; *** WIP ***
- Build-dep on libdbus-glib-1-dev (>= 0.30) for ConsoleKit support.
-
- -- Loic Minier <lool at dooz.org> Tue, 01 May 2007 22:55:52 +0200
+ - Refresh patches 30_hardcode-standard-x-server, 41_config-files,
+ 42_pam-and-timed-login, 48_random-greeter-theme,
+ 53_remove-ok-and-cancel-from-included-themes, 57_gdm-is-local,
+ 62_reference-manual-docbook-entity-reference, 64_vt-auto-allocation-fix,
+ 67_C-locale-fallback, 68_doc-build-add-revnumber, 69_misc-config-typos.
+ - Drop patch 55_hurd-no-pipe-buf, merged upstream.
+ - Update patches:
+ . 35_gdm.conf: Update reference to System Configuration file.
+ . 45_use-gksu-for-gdmsetup: Update to use the full path to gdmsetup.
+ . 50_close-fds: Update to match upstream changes which closed even more
+ fds than in the past; convert some Debian specific closes to use
+ VE_IGNORE_EINTR() too; leave the upstream code in the source.
+ . 65_french-translation-typo: Update to upstream rewording of this
+ string.
+
+ -- Loic Minier <lool at dooz.org> Wed, 02 May 2007 11:20:44 +0200
gdm (2.16.4-1.1) unstable; urgency=low
Modified: desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch (original)
+++ desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch Wed May 2 09:24:06 2007
@@ -1,8 +1,10 @@
Debian #362925, #363160; Hardcode StandardXServer to /usr/bin/X.
---- gdm-2.16.4.orig/configure.ac
-+++ gdm-2.16.4/configure.ac
-@@ -969,7 +969,12 @@
+Index: gdm-2.18.1/configure.ac
+===================================================================
+--- gdm-2.18.1.orig/configure.ac 2007-04-09 07:15:16.000000000 +0200
++++ gdm-2.18.1/configure.ac 2007-05-02 10:20:56.000000000 +0200
+@@ -1010,7 +1010,12 @@
# symlink to each other, and configure should use the more stable
# location (the real directory) if possible.
#
Modified: desktop/unstable/gdm/debian/patches/35_gdm.conf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/35_gdm.conf.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/35_gdm.conf.patch (original)
+++ desktop/unstable/gdm/debian/patches/35_gdm.conf.patch Wed May 2 09:24:06 2007
@@ -3,18 +3,28 @@
* update comments
* update pathnames
---- gdm-2.16.4.orig/config/gdm.conf.in
-+++ gdm-2.16.4/config/gdm.conf.in
-@@ -1,7 +1,7 @@
- # GDM Configuration file.
- #
- # This file should not be updated by hand. Since GDM 2.13.0.4,
--# configuration choices in the /etc/X11/gdm/gdm.conf-custom file will
-+# configuration choices in the /etc/gdm/gdm.conf file will
- # override the default values specified in this file (installation
- # locations of the configuration files may vary for different distros).
- # This defaults.conf file may be overwritten on upgrade, so to ensure
-@@ -30,11 +30,13 @@
+Index: gdm-2.18.1/config/gdm.conf.in
+===================================================================
+--- gdm-2.18.1.orig/config/gdm.conf.in 2007-04-09 07:15:16.000000000 +0200
++++ gdm-2.18.1/config/gdm.conf.in 2007-05-02 10:38:10.000000000 +0200
+@@ -1,14 +1,8 @@
+ # GDM System Defaults Configuration file.
+ #
+ # This file should not be updated by hand. Since GDM 2.13.0.4, configuration
+-# choices in the GDM Custom Configuration file will override the default
+-# values specified in this file. This GDM System Defaults Configuration file
+-# may be overwritten on upgrade, so to ensure that your configuration choices
+-# are not lost, please make sure that your changes are made only the GDM Custom
+-# Configuration file. The GDM Custom Configuration file is found at the
+-# following location:
+-#
+-# @GDM_CUSTOM_CONF@
++# choices in the GDM System Configuration file (/etc/gdm/gdm.conf) will
++# override the default values specified in this file.
+ #
+ # If you were using an older version of GDM, your system may have the the older
+ # gdm.conf configuration file on the system. If so, then this file is used
+@@ -31,11 +25,13 @@
#
# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable".
#
@@ -33,7 +43,7 @@
#
# For full reference documentation see the GNOME help browser under
# GNOME|System category. You can also find the docs in HTML form on
-@@ -67,7 +69,7 @@
+@@ -68,7 +64,7 @@
# The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to
# get the new graphical greeter.
@@ -42,7 +52,7 @@
# The greeter for xdmcp logins, usually you want a less graphically intensive
# greeter here so it's better to leave this with gdmlogin
-@@ -82,13 +84,9 @@
+@@ -83,13 +79,9 @@
#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
# Default path to set. The profile scripts will likely override this value.
@@ -58,7 +68,7 @@
# If you are having trouble with using a single server for a long time and want
# GDM to kill/restart the server, turn this on. On Solaris, this value is
-@@ -104,7 +102,7 @@
+@@ -105,7 +97,7 @@
# To try to kill all clients started at greeter time or in the Init script.
# does not always work, only if those clients have a window of their own.
#KillInitClients=true
@@ -67,7 +77,7 @@
# You should probably never change this value unless you have a weird setup.
PidFile=/var/run/gdm.pid
-@@ -124,9 +122,9 @@
+@@ -125,9 +117,9 @@
XKeepsCrashing=@gdmconfdir@/XKeepsCrashing
# Reboot, Halt and suspend commands, you can add different commands separated
# by a semicolon. GDM will use the first one it can find.
@@ -80,7 +90,7 @@
# Probably should not touch the below this is the standard setup.
ServAuthDir=@authdir@
# This is our standard startup script. A bit different from a normal X
-@@ -135,11 +133,10 @@
+@@ -136,11 +128,10 @@
BaseXsession=@gdmconfdir@/Xsession
# This is a directory where .desktop files describing the sessions live. It is
# really a PATH style variable since 2.4.4.2 to allow actual interoperability
@@ -95,7 +105,7 @@
# Better leave this blank and HOME will be used. You can use syntax ~/ below
# to indicate home directory of the user. You can also set this to something
# like /tmp if you don't want the authorizations to be in home directories.
-@@ -165,8 +162,8 @@
+@@ -177,8 +168,8 @@
# Automatic VT allocation. Right now only works on Linux. This way we force
# X to use specific vts. turn VTAllocation to false if this is causing
# problems.
@@ -106,7 +116,7 @@
# Should double login be treated with a warning (and possibility to change VT's
# on Linux and FreeBSD systems for console logins)
#DoubleLoginWarning=true
-@@ -205,7 +202,7 @@
+@@ -217,7 +208,7 @@
[security]
# Allow root to login. It makes sense to turn this off for kiosk use, when
# you want to minimize the possibility of break in.
@@ -115,7 +125,7 @@
# Allow login as root via XDMCP. This value will be overridden and set to
# false if the /etc/default/login file exists and contains
# "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
-@@ -215,7 +212,7 @@
+@@ -227,7 +218,7 @@
AllowRemoteAutoLogin=false
# 0 is the most restrictive, 1 allows group write permissions, 2 allows all
# write permissions.
@@ -124,7 +134,7 @@
# Check if directories are owned by logon user. Set to false, if you have, for
# example, home directories owned by some other user.
CheckDirOwner=true
-@@ -232,7 +229,7 @@
+@@ -246,7 +237,7 @@
# Note: Anytime we find a -query or -indirect on the command line we do not add
# a "-nolisten tcp", as then the query just wouldn't work, so this setting only
# affects truly local sessions.
@@ -133,7 +143,7 @@
# By default never place cookies if we "detect" NFS. We detect NFS by
# detecting "root-squashing". It seems bad practice to place cookies on things
# that go over the network by default and thus we do not do it by default.
-@@ -339,7 +336,7 @@
+@@ -353,7 +344,7 @@
# User ID's less than the MinimalUID value will not be included in the face
# browser or in the gdmselection list for Automatic/Timed login. They will not
# be displayed regardless of the settings for Include and Exclude.
@@ -142,7 +152,7 @@
# Users listed in Include will be included in the face browser and in the
# gdmsetup selection list for Automatic/Timed login. Users should be separated
# by commas.
-@@ -348,7 +345,7 @@
+@@ -362,7 +353,7 @@
# gdmsetup selection list for Automatic/Timed login. Excluded users will still
# be able to log in, but will have to type their username. Users should be
# separated by commas.
@@ -151,7 +161,7 @@
# By default, an empty include list means display no users. By setting
# IncludeAll to true, the password file will be scanned and all users will be
# displayed except users excluded via the Exclude setting and user ID's less
-@@ -356,16 +353,16 @@
+@@ -370,16 +361,16 @@
# large numbers of users and this feature should not be used in such
# environments. The setting of IncludeAll does nothing if Include is set to a
# non-empty value.
@@ -171,7 +181,7 @@
# Logo shown on file chooser button in gdmsetup (do not modify this value).
#ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
# The standard greeter should shake if a user entered the wrong username or
-@@ -454,8 +451,8 @@
+@@ -468,8 +459,8 @@
# list then provide a list that is delimited by /: to the GraphicalThemes
# key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme
# and specify just one theme.
@@ -182,7 +192,7 @@
GraphicalThemeDir=@datadir@/gdm/themes/
GraphicalThemeRand=false
-@@ -558,7 +555,7 @@
+@@ -572,7 +563,7 @@
# Definition of the standard X server.
[server-Standard]
name=Standard server
Modified: desktop/unstable/gdm/debian/patches/41_config-files.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/41_config-files.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/41_config-files.patch (original)
+++ desktop/unstable/gdm/debian/patches/41_config-files.patch Wed May 2 09:24:06 2007
@@ -3,12 +3,13 @@
/etc to look at our configfile, and not one that might be in root's homedir.
XXX Clarify the two changes below; one seem to ignore a compatibility file, the
-other sets HOME, but it might need some adaptation to be sent upstream, perhaps
-ignoring /root/gdm.conf explicitely?
+other sets HOME to avoid /root/xorg.conf, but this seems to be a xorg bug.
---- gdm-2.16.4.orig/daemon/gdmconfig.c
-+++ gdm-2.16.4/daemon/gdmconfig.c
-@@ -593,11 +593,22 @@
+Index: gdm-2.18.1/daemon/gdmconfig.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/gdmconfig.c 2007-04-09 07:15:16.000000000 +0200
++++ gdm-2.18.1/daemon/gdmconfig.c 2007-05-02 10:38:20.000000000 +0200
+@@ -627,11 +627,22 @@
* file has all the keys in it (except new ones). But
* that would be what the user wants.
*/
@@ -31,9 +32,11 @@
VE_IGNORE_EINTR (r = g_stat (GDM_CUSTOM_CONF, statbuf));
if (r >= 0) {
---- gdm-2.16.4.orig/daemon/server.c
-+++ gdm-2.16.4/daemon/server.c
-@@ -1255,11 +1255,20 @@
+Index: gdm-2.18.1/daemon/server.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/server.c 2007-04-09 07:15:15.000000000 +0200
++++ gdm-2.18.1/daemon/server.c 2007-05-02 10:38:20.000000000 +0200
+@@ -1268,11 +1268,20 @@
(int)d->server_uid);
_exit (SERVER_ABORT);
}
Modified: desktop/unstable/gdm/debian/patches/42_pam-and-timed-login.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/42_pam-and-timed-login.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/42_pam-and-timed-login.patch (original)
+++ desktop/unstable/gdm/debian/patches/42_pam-and-timed-login.patch Wed May 2 09:24:06 2007
@@ -4,9 +4,11 @@
XXX To be splitted further and clarified
---- gdm-2.16.4.orig/daemon/verify-pam.c
-+++ gdm-2.16.4/daemon/verify-pam.c
-@@ -825,17 +825,18 @@
+Index: gdm-2.18.1/daemon/verify-pam.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/verify-pam.c 2007-04-09 07:15:15.000000000 +0200
++++ gdm-2.18.1/daemon/verify-pam.c 2007-05-02 10:38:29.000000000 +0200
+@@ -826,17 +826,18 @@
started_timer = FALSE;
null_tok = 0;
@@ -33,7 +35,7 @@
}
cur_gdm_disp = d;
-@@ -1111,8 +1112,10 @@
+@@ -1165,8 +1166,10 @@
if ( ! error_msg_given &&
gdm_slave_action_pending ()) {
/* I'm not sure yet if I should display this message for any other issues - heeten */
Modified: desktop/unstable/gdm/debian/patches/45_use-gksu-for-gdmsetup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/45_use-gksu-for-gdmsetup.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/45_use-gksu-for-gdmsetup.patch (original)
+++ desktop/unstable/gdm/debian/patches/45_use-gksu-for-gdmsetup.patch Wed May 2 09:24:06 2007
@@ -1,14 +1,16 @@
Debian #189615, #238337; Use gksu to start gdmsetup as it needs root
permissions.
---- gdm-2.16.4.orig/gui/gdmsetup.desktop.in.in
-+++ gdm-2.16.4/gui/gdmsetup.desktop.in.in
-@@ -4,7 +4,7 @@
- _GenericName=Login Window Preferences
- _Comment=Configure the login window (GNOME Display Manager)
+Index: gdm-2.18.1/gui/gdmsetup.desktop.in.in
+===================================================================
+--- gdm-2.18.1.orig/gui/gdmsetup.desktop.in.in 2007-04-09 07:15:10.000000000 +0200
++++ gdm-2.18.1/gui/gdmsetup.desktop.in.in 2007-05-02 10:38:54.000000000 +0200
+@@ -3,7 +3,7 @@
+ _Name=Login Window
+ _Comment=Configure GDM login window appearance and behavior
TryExec=@sbindir@/gdmsetup
--Exec=gdmsetup
-+Exec=gksu gdmsetup
+-Exec=@sbindir@/gdmsetup
++Exec=gksu @sbindir@/gdmsetup
Icon=gdm-setup
StartupNotify=true
Terminal=false
Modified: desktop/unstable/gdm/debian/patches/48_random-greeter-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/48_random-greeter-theme.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/48_random-greeter-theme.patch (original)
+++ desktop/unstable/gdm/debian/patches/48_random-greeter-theme.patch Wed May 2 09:24:06 2007
@@ -1,8 +1,10 @@
Debian #217250; use a random greeter theme from all the available ones.
---- gdm-2.16.4.orig/gui/greeter/greeter.c
-+++ gdm-2.16.4/gui/greeter/greeter.c
-@@ -92,15 +92,22 @@
+Index: gdm-2.18.1/gui/greeter/greeter.c
+===================================================================
+--- gdm-2.18.1.orig/gui/greeter/greeter.c 2007-04-09 07:15:10.000000000 +0200
++++ gdm-2.18.1/gui/greeter/greeter.c 2007-05-02 10:39:11.000000000 +0200
+@@ -95,15 +95,22 @@
ignore_buttons = val;
}
@@ -29,7 +31,7 @@
themes_list = gdm_config_get_string (GDM_KEY_GRAPHICAL_THEMES);
-@@ -115,9 +122,26 @@
+@@ -118,9 +125,26 @@
for (size = 0; vec[size] != NULL; size++) {}
/* Get Random Theme from list */
Modified: desktop/unstable/gdm/debian/patches/50_close-fds.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/50_close-fds.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/50_close-fds.patch (original)
+++ desktop/unstable/gdm/debian/patches/50_close-fds.patch Wed May 2 09:24:06 2007
@@ -4,22 +4,63 @@
* Don't unset MAIL environment variable
* Set PWD environment variable
---- gdm-2.16.4.orig/daemon/display.c
-+++ gdm-2.16.4/daemon/display.c
-@@ -304,8 +304,8 @@
+Index: gdm-2.18.1/daemon/display.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/display.c 2007-04-09 07:15:15.000000000 +0200
++++ gdm-2.18.1/daemon/display.c 2007-05-02 11:00:12.000000000 +0200
+@@ -306,8 +306,17 @@
closelog ();
- /* Close everything */
- gdm_close_all_descriptors (0 /* from */, fds[0] /* except */, slave_fifo_pipe_fd /* except2 */);
++ /* Debian changes */
++#if 0
++ /* upstream version */
++- /* Close everything */
++- gdm_close_all_descriptors (0 /* from */, fds[0] /* except */, slave_fifo_pipe_fd /* except2 */);
++#endif
+ /* Close stdin/stdout/stderr. Leave others, as pam modules may have them open */
-+ close(0); close(1); close(2);
++ VE_IGNORE_EINTR (close (0));
++ VE_IGNORE_EINTR (close (1));
++ VE_IGNORE_EINTR (close (2));
++ /* End of Debian changes */
/* No error checking here - if it's messed the best response
* is to ignore & try to continue */
---- gdm-2.16.4.orig/daemon/slave.c
-+++ gdm-2.16.4/daemon/slave.c
-@@ -1750,7 +1750,6 @@
+Index: gdm-2.18.1/daemon/slave.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/slave.c 2007-04-09 07:15:15.000000000 +0200
++++ gdm-2.18.1/daemon/slave.c 2007-05-02 10:54:29.000000000 +0200
+@@ -1635,6 +1635,9 @@
+
+ closelog ();
+
++ /* Debian changes */
++#if 0
++ /* upstream version */
+ gdm_close_all_descriptors (0 /* from */, p[1] /* except */, -1 /* except2 */);
+
+ /* No error checking here - if it's messed the best response
+@@ -1642,6 +1645,17 @@
+ gdm_open_dev_null (O_RDONLY); /* open stdin - fd 0 */
+ gdm_open_dev_null (O_RDWR); /* open stdout - fd 1 */
+ gdm_open_dev_null (O_RDWR); /* open stderr - fd 2 */
++#endif
++ /* Leave stderr open to the log */
++ VE_IGNORE_EINTR (close (0));
++ VE_IGNORE_EINTR (close (1));
++ gdm_close_all_descriptors (3 /* from */, p[1] /* except */, -1 /* except2 */);
++
++ /* No error checking here - if it's messed the best response
++ * is to ignore & try to continue */
++ gdm_open_dev_null (O_RDONLY); /* open stdin - fd 0 */
++ gdm_open_dev_null (O_RDWR); /* open stdout - fd 1 */
++ /* End of Debian changes */
+
+ openlog ("gdm", LOG_PID, LOG_DAEMON);
+
+@@ -1793,10 +1807,12 @@
g_setenv ("RUNNING_UNDER_GDM", "true", TRUE);
if ( ! ve_string_empty (display->theme_name))
g_setenv ("GDM_GTK_THEME", display->theme_name, TRUE);
@@ -27,21 +68,31 @@
closelog ();
-@@ -2475,9 +2474,10 @@
++ /* Debian changes */
++#if 0
++ /* upstream version */
+ gdm_close_all_descriptors (0 /* from */, slave_fifo_pipe_fd /* except */, d->slave_notify_fd /* except2 */);
- closelog ();
+ /* No error checking here - if it's messed the best response
+@@ -1804,6 +1820,17 @@
+ gdm_open_dev_null (O_RDONLY); /* open stdin - fd 0 */
+ gdm_open_dev_null (O_RDWR); /* open stdout - fd 1 */
+ gdm_open_dev_null (O_RDWR); /* open stderr - fd 2 */
++#endif
++ /* Leave stderr open to the log */
++ VE_IGNORE_EINTR (close (0));
++ VE_IGNORE_EINTR (close (1));
++ gdm_close_all_descriptors (3 /* from */, slave_fifo_pipe_fd /* except */, d->slave_notify_fd /* except2 */);
++
++ /* No error checking here - if it's messed the best response
++ * is to ignore & try to continue */
++ gdm_open_dev_null (O_RDONLY); /* open stdin - fd 0 */
++ gdm_open_dev_null (O_RDWR); /* open stdout - fd 1 */
++ /* End of Debian changes */
-- gdm_close_all_descriptors (2 /* from */, -1 /* except */, -1 /* except2 */);
--
-- gdm_open_dev_null (O_RDWR); /* open stderr - fd 2 */
-+ /*
-+ * Leave stderr open to the log
-+ */
-+ gdm_close_all_descriptors (3 /* from */, -1 /* except */, -1 /* except2 */);
+ openlog ("gdm", LOG_PID, LOG_DAEMON);
- openlog ("gdm", LOG_PID, LOG_DAEMON);
-
-@@ -2511,7 +2511,6 @@
+@@ -2560,7 +2587,6 @@
g_setenv ("GDM_GREETER_PROTOCOL_VERSION",
GDM_GREETER_PROTOCOL_VERSION, TRUE);
g_setenv ("GDM_VERSION", VERSION, TRUE);
@@ -49,19 +100,7 @@
pwent = getpwnam (gdmuser);
if G_LIKELY (pwent != NULL) {
-@@ -2945,10 +2944,9 @@
- closelog ();
-
- VE_IGNORE_EINTR (close (0));
-- gdm_close_all_descriptors (2 /* from */, -1 /* except */, -1 /* except2 */);
-+ gdm_close_all_descriptors (3 /* from */, -1 /* except */, -1 /* except2 */);
-
- gdm_open_dev_null (O_RDONLY); /* open stdin - fd 0 */
-- gdm_open_dev_null (O_RDWR); /* open stderr - fd 2 */
-
- openlog ("gdm", LOG_PID, LOG_DAEMON);
-
-@@ -2979,8 +2977,6 @@
+@@ -3062,8 +3088,6 @@
g_setenv ("GDM_VERSION", VERSION, TRUE);
@@ -70,10 +109,10 @@
pwent = getpwnam (gdmuser);
if G_LIKELY (pwent != NULL) {
/* Note that usually this doesn't exist */
-@@ -3434,10 +3430,10 @@
- g_setenv ("USER", pwent->pw_name, TRUE);
- g_setenv ("USERNAME", pwent->pw_name, TRUE);
- g_setenv ("HOME", home_dir, TRUE);
+@@ -3528,10 +3552,10 @@
+ g_setenv ("XDG_SESSION_COOKIE", ck_session_cookie, TRUE);
+ }
+ #endif
+ g_setenv ("PWD", home_dir, TRUE);
g_setenv ("GDMSESSION", session, TRUE);
g_setenv ("DESKTOP_SESSION", session, TRUE);
@@ -82,7 +121,7 @@
if (d->type == TYPE_STATIC) {
g_setenv ("GDM_XSERVER_LOCATION", "local", TRUE);
-@@ -5299,7 +5295,6 @@
+@@ -5461,7 +5485,6 @@
g_setenv ("RUNNING_UNDER_GDM", "true", TRUE);
if ( ! ve_string_empty (d->theme_name))
g_setenv ("GDM_GTK_THEME", d->theme_name, TRUE);
@@ -90,7 +129,7 @@
argv = ve_split (script);
VE_IGNORE_EINTR (execv (argv[0], argv));
syslog (LOG_ERR, _("%s: Failed starting: %s"), "gdm_slave_exec_script",
-@@ -5438,7 +5433,6 @@
+@@ -5600,7 +5623,6 @@
g_setenv ("RUNNING_UNDER_GDM", "true", TRUE);
if ( ! ve_string_empty (d->theme_name))
g_setenv ("GDM_GTK_THEME", d->theme_name, TRUE);
Modified: desktop/unstable/gdm/debian/patches/53_remove-ok-and-cancel-from-included-themes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/53_remove-ok-and-cancel-from-included-themes.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/53_remove-ok-and-cancel-from-included-themes.patch (original)
+++ desktop/unstable/gdm/debian/patches/53_remove-ok-and-cancel-from-included-themes.patch Wed May 2 09:24:06 2007
@@ -1,8 +1,10 @@
Debian #377934; remove Ok and Cancel buttons from included themes.
---- gdm-2.16.4.orig/gui/greeter/themes/circles/circles.xml
-+++ gdm-2.16.4/gui/greeter/themes/circles/circles.xml
-@@ -84,14 +84,6 @@
+Index: gdm-2.18.1/gui/greeter/themes/circles/circles.xml
+===================================================================
+--- gdm-2.18.1.orig/gui/greeter/themes/circles/circles.xml 2007-04-09 07:15:09.000000000 +0200
++++ gdm-2.18.1/gui/greeter/themes/circles/circles.xml 2007-05-02 11:04:25.000000000 +0200
+@@ -78,14 +78,6 @@
</item>
</fixed>
</item>
@@ -17,9 +19,11 @@
<item type="label" id="pam-message">
<pos anchor="n" x="50%"/>
<normal color="#000000" font="Sans 12"/>
---- gdm-2.16.4.orig/gui/greeter/themes/happygnome/happygnome.xml
-+++ gdm-2.16.4/gui/greeter/themes/happygnome/happygnome.xml
-@@ -84,14 +84,6 @@
+Index: gdm-2.18.1/gui/greeter/themes/happygnome/happygnome.xml
+===================================================================
+--- gdm-2.18.1.orig/gui/greeter/themes/happygnome/happygnome.xml 2007-04-09 07:15:09.000000000 +0200
++++ gdm-2.18.1/gui/greeter/themes/happygnome/happygnome.xml 2007-05-02 11:04:25.000000000 +0200
+@@ -90,14 +90,6 @@
</item>
</fixed>
</item>
@@ -34,9 +38,11 @@
<item type="label" id="pam-message">
<pos anchor="n" x="50%"/>
<normal color="#000000" font="Sans 12"/>
---- gdm-2.16.4.orig/gui/greeter/themes/happygnome-list/happygnome.xml
-+++ gdm-2.16.4/gui/greeter/themes/happygnome-list/happygnome.xml
-@@ -95,14 +95,6 @@
+Index: gdm-2.18.1/gui/greeter/themes/happygnome-list/happygnome.xml
+===================================================================
+--- gdm-2.18.1.orig/gui/greeter/themes/happygnome-list/happygnome.xml 2007-04-09 07:15:08.000000000 +0200
++++ gdm-2.18.1/gui/greeter/themes/happygnome-list/happygnome.xml 2007-05-02 11:04:25.000000000 +0200
+@@ -101,14 +101,6 @@
</item>
</fixed>
</item>
Modified: desktop/unstable/gdm/debian/patches/57_gdm-is-local.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/57_gdm-is-local.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/57_gdm-is-local.patch (original)
+++ desktop/unstable/gdm/debian/patches/57_gdm-is-local.patch Wed May 2 09:24:06 2007
@@ -2,9 +2,11 @@
XXX Clarify the purpose; this is pre 2.6.0.8-1
---- gdm-2.16.4.orig/gui/gdmcommon.c
-+++ gdm-2.16.4/gui/gdmcommon.c
-@@ -264,10 +264,6 @@
+Index: gdm-2.18.1/gui/gdmcommon.c
+===================================================================
+--- gdm-2.18.1.orig/gui/gdmcommon.c 2007-04-09 07:15:11.000000000 +0200
++++ gdm-2.18.1/gui/gdmcommon.c 2007-05-02 11:07:11.000000000 +0200
+@@ -268,10 +268,6 @@
{
guint sid;
@@ -14,8 +16,8 @@
-
sid = g_signal_lookup ("activate",
GTK_TYPE_MENU_ITEM);
- if (sid != NULL) {
-@@ -307,10 +303,6 @@
+ if (sid != 0) {
+@@ -311,10 +307,6 @@
EntryBlink *eb;
GtkSettings *settings;
Modified: desktop/unstable/gdm/debian/patches/62_reference-manual-docbook-entity-reference.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/62_reference-manual-docbook-entity-reference.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/62_reference-manual-docbook-entity-reference.patch (original)
+++ desktop/unstable/gdm/debian/patches/62_reference-manual-docbook-entity-reference.patch Wed May 2 09:24:06 2007
@@ -1,10 +1,12 @@
---- gdm-2.16.4.orig/docs/C/gdm.xml
-+++ gdm-2.16.4/docs/C/gdm.xml
+Index: gdm-2.18.1/docs/C/gdm.xml
+===================================================================
+--- gdm-2.18.1.orig/docs/C/gdm.xml 2007-04-09 07:18:26.000000000 +0200
++++ gdm-2.18.1/docs/C/gdm.xml 2007-05-02 11:07:19.000000000 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+ "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd" [
<!ENTITY legal SYSTEM "legal.xml">
- <!ENTITY version "2.15.1">
- <!ENTITY date "05/12/2006">
+ <!ENTITY version "2.18.0">
+ <!ENTITY date "03/12/2007">
Modified: desktop/unstable/gdm/debian/patches/64_vt-auto-allocation-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/64_vt-auto-allocation-fix.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/64_vt-auto-allocation-fix.patch (original)
+++ desktop/unstable/gdm/debian/patches/64_vt-auto-allocation-fix.patch Wed May 2 09:24:06 2007
@@ -1,8 +1,10 @@
Debian #339790; GNOME #322137; patch from CVS to fix new auto VT allocation
method.
---- gdm-2.16.4.orig/gui/Makefile.am
-+++ gdm-2.16.4/gui/Makefile.am
+Index: gdm-2.18.1/gui/Makefile.am
+===================================================================
+--- gdm-2.18.1.orig/gui/Makefile.am 2007-04-09 07:15:11.000000000 +0200
++++ gdm-2.18.1/gui/Makefile.am 2007-05-02 11:07:23.000000000 +0200
@@ -119,10 +119,7 @@
$(PANGO_LIBS) \
$(GDKPIXBUF_LIBS) \
@@ -27,9 +29,11 @@
gdmphotosetup_LDADD = \
libgdmcommon.a \
---- gdm-2.16.4.orig/gui/greeter/Makefile.am
-+++ gdm-2.16.4/gui/greeter/Makefile.am
-@@ -85,10 +85,7 @@
+Index: gdm-2.18.1/gui/greeter/Makefile.am
+===================================================================
+--- gdm-2.18.1.orig/gui/greeter/Makefile.am 2007-04-09 07:15:10.000000000 +0200
++++ gdm-2.18.1/gui/greeter/Makefile.am 2007-05-02 11:07:23.000000000 +0200
+@@ -87,10 +87,7 @@
$(GDK_LIBS) \
$(GDKPIXBUF_LIBS) \
$(GREETER_LIBS) \
Modified: desktop/unstable/gdm/debian/patches/65_french-translation-typo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/65_french-translation-typo.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/65_french-translation-typo.patch (original)
+++ desktop/unstable/gdm/debian/patches/65_french-translation-typo.patch Wed May 2 09:24:06 2007
@@ -1,13 +1,15 @@
Debian #392611; typo in french translation.
---- gdm-2.16.4.orig/po/fr.po
-+++ gdm-2.16.4/po/fr.po
-@@ -400,7 +400,7 @@
- #: ../daemon/gdm.c:661
+Index: gdm-2.18.1/po/fr.po
+===================================================================
+--- gdm-2.18.1.orig/po/fr.po 2007-04-09 07:15:02.000000000 +0200
++++ gdm-2.18.1/po/fr.po 2007-05-02 11:08:09.000000000 +0200
+@@ -402,7 +402,7 @@
+ #: ../daemon/gdm.c:669
#, c-format
msgid "System is shutting down, please wait ..."
--msgstr "Le système est en train de s'arrêter, veuillez patientez..."
-+msgstr "Le système est en train de s'arrêter, veuillez patienter..."
+-msgstr "Le système est en train de s'éteindre, veuillez patientez..."
++msgstr "Le système est en train de s'éteindre, veuillez patienter..."
- #: ../daemon/gdm.c:672
+ #: ../daemon/gdm.c:680
msgid "Master halting..."
Modified: desktop/unstable/gdm/debian/patches/67_C-locale-fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/67_C-locale-fallback.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/67_C-locale-fallback.patch (original)
+++ desktop/unstable/gdm/debian/patches/67_C-locale-fallback.patch Wed May 2 09:24:06 2007
@@ -3,9 +3,11 @@
XXX Can probably be sent upstream; this is pre 2.6.0.8-1.
---- gdm-2.16.4.orig/gui/gdmlanguages.c
-+++ gdm-2.16.4/gui/gdmlanguages.c
-@@ -242,6 +242,7 @@
+Index: gdm-2.18.1/gui/gdmlanguages.c
+===================================================================
+--- gdm-2.18.1.orig/gui/gdmlanguages.c 2007-04-09 07:15:10.000000000 +0200
++++ gdm-2.18.1/gui/gdmlanguages.c 2007-05-02 11:08:20.000000000 +0200
+@@ -296,6 +296,7 @@
gdm_lang_init (void)
{
int i;
@@ -13,7 +15,7 @@
if (lang_names != NULL)
return;
-@@ -468,7 +469,6 @@
+@@ -524,7 +525,6 @@
char curline[256];
GList *langs = NULL;
GHashTable *dupcheck;
@@ -21,7 +23,7 @@
Language *language;
gboolean clean;
char *curlocale;
-@@ -560,21 +560,15 @@
+@@ -616,21 +616,15 @@
g_hash_table_insert (dupcheck, g_strdup (lang),
GINT_TO_POINTER (1));
Modified: desktop/unstable/gdm/debian/patches/68_doc-build-add-revnumber.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/68_doc-build-add-revnumber.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/68_doc-build-add-revnumber.patch (original)
+++ desktop/unstable/gdm/debian/patches/68_doc-build-add-revnumber.patch Wed May 2 09:24:06 2007
@@ -1,10 +1,10 @@
-Index: gdm-2.16.4/docs/C/gdm.xml
+Index: gdm-2.18.1/docs/C/gdm.xml
===================================================================
---- gdm-2.16.4.orig/docs/C/gdm.xml 2007-05-01 12:34:32.000000000 +0200
-+++ gdm-2.16.4/docs/C/gdm.xml 2007-05-01 12:34:49.000000000 +0200
-@@ -10,6 +10,13 @@
- <articleinfo>
- <title>Gnome Display Manager Reference Manual</title>
+--- gdm-2.18.1.orig/docs/C/gdm.xml 2007-05-02 11:07:19.000000000 +0200
++++ gdm-2.18.1/docs/C/gdm.xml 2007-05-02 11:08:26.000000000 +0200
+@@ -17,6 +17,13 @@
+ </revision>
+ </revhistory>
+ <revhistory>
+ <revision>
Modified: desktop/unstable/gdm/debian/patches/69_misc-config-typos.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/69_misc-config-typos.patch?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/69_misc-config-typos.patch (original)
+++ desktop/unstable/gdm/debian/patches/69_misc-config-typos.patch Wed May 2 09:24:06 2007
@@ -1,10 +1,10 @@
-Index: gdm-2.16.4/config/gdm.conf.in
+Index: gdm-2.18.1/config/gdm.conf.in
===================================================================
---- gdm-2.16.4.orig/config/gdm.conf.in 2007-05-01 18:21:48.000000000 +0200
-+++ gdm-2.16.4/config/gdm.conf.in 2007-05-01 18:23:25.000000000 +0200
-@@ -93,9 +93,9 @@
+--- gdm-2.18.1.orig/config/gdm.conf.in 2007-05-02 10:38:10.000000000 +0200
++++ gdm-2.18.1/config/gdm.conf.in 2007-05-02 11:08:29.000000000 +0200
+@@ -88,9 +88,9 @@
# always true and this configuration setting is ignored.
- #AlwaysRestartServer=false
+ #AlwaysRestartServer=@ALWAYS_RESTART_SERVER@
-# User and group used for running GDM GUI applicaitons. By default this is set
+# User and group used for running GDM GUI applications. By default this is set
@@ -14,16 +14,16 @@
User=gdm
Group=gdm
-@@ -160,7 +160,7 @@
- # The X nest command.
- Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
+@@ -166,7 +166,7 @@
+ XnestUnscaledFontPath=@X_XNEST_UNSCALED_FONTPATH@
+
# Automatic VT allocation. Right now only works on Linux. This way we force
-# X to use specific vts. turn VTAllocation to false if this is causing
+# X to use specific vts. Turn VTAllocation to false if this is causing
# problems.
FirstVT=7
VTAllocation=true
-@@ -247,7 +247,7 @@
+@@ -255,7 +255,7 @@
# XDMCP is the protocol that allows remote login. If you want to log into GDM
# remotely (I'd never turn this on on open network, use ssh for such remote
Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=10692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series (original)
+++ desktop/unstable/gdm/debian/patches/series Wed May 2 09:24:06 2007
@@ -9,7 +9,6 @@
48_random-greeter-theme.patch
50_close-fds.patch
53_remove-ok-and-cancel-from-included-themes.patch
-55_hurd-no-pipe-buf.patch
57_gdm-is-local.patch
60_logname-is-log-name-in-PostLogin.patch
61_gdm-manpage-section.patch
More information about the pkg-gnome-commits
mailing list