r10707 - in /desktop/unstable/gdm/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed May 2 16:54:24 UTC 2007
Author: lool
Date: Wed May 2 16:54:16 2007
New Revision: 10707
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10707
Log:
* Split patches:
. 42_pam-and-timed-login into 42_timed-login and 68_pam-authinfo-unavail.
. 43_clearenv-no-lang-and-buf-decl into 43_clearenv-no-lang and
63_buf-decl.
. 50_close-fds into 50_close-fds and 51_misc-env-var-fixes.
* Add GNOME bug to 66_socket-in-var-run-for-fhs.
Added:
desktop/unstable/gdm/debian/patches/42_timed-login.patch
desktop/unstable/gdm/debian/patches/43_clearenv-no-lang.patch
desktop/unstable/gdm/debian/patches/51_misc-env-var-fixes.patch
desktop/unstable/gdm/debian/patches/63_buf-decl.patch
desktop/unstable/gdm/debian/patches/68_pam-authinfo-unavail.patch
Removed:
desktop/unstable/gdm/debian/patches/42_pam-and-timed-login.patch
desktop/unstable/gdm/debian/patches/43_clearenv-no-lang-and-buf-decl.patch
Modified:
desktop/unstable/gdm/debian/changelog
desktop/unstable/gdm/debian/patches/50_close-fds.patch
desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.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=10707&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Wed May 2 16:54:16 2007
@@ -102,8 +102,14 @@
* Disabling patch 66_socket-in-var-run-for-fhs for now as it requires
changes in gnome-session, gnome-panel, and fast-switch-user-applet at the
same time; thanks Sébastien Bacher.
-
- -- Loic Minier <lool at dooz.org> Wed, 02 May 2007 18:27:22 +0200
+ * Split patches:
+ . 42_pam-and-timed-login into 42_timed-login and 68_pam-authinfo-unavail.
+ . 43_clearenv-no-lang-and-buf-decl into 43_clearenv-no-lang and
+ 63_buf-decl.
+ . 50_close-fds into 50_close-fds and 51_misc-env-var-fixes.
+ * Add GNOME bug to 66_socket-in-var-run-for-fhs.
+
+ -- Loic Minier <lool at dooz.org> Wed, 02 May 2007 18:50:19 +0200
gdm (2.16.4-1.1) unstable; urgency=low
Added: desktop/unstable/gdm/debian/patches/42_timed-login.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/42_timed-login.patch?rev=10707&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/42_timed-login.patch (added)
+++ desktop/unstable/gdm/debian/patches/42_timed-login.patch Wed May 2 16:54:16 2007
@@ -1,0 +1,33 @@
+Don't start a timed login if an username was already entered.
+
+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;
+
+- /* start the timer for timed logins */
+- if ( ! ve_string_empty (gdm_get_value_string (GDM_KEY_TIMED_LOGIN)) &&
+- d->timed_login_ok &&
+- (local || gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_AUTOLOGIN))) {
+- gdm_slave_greeter_ctl_no_ret (GDM_STARTTIMER, "");
+- started_timer = TRUE;
+- }
+-
++ /* don't start a time login if we've already entered a username */
+ if (username != NULL) {
+ login = g_strdup (username);
+ gdm_slave_greeter_ctl_no_ret (GDM_SETLOGIN, login);
++ } else {
++ /* start the timer for timed logins */
++ if ( ! ve_string_empty (gdm_get_value_string (GDM_KEY_TIMED_LOGIN)) &&
++ d->timed_login_ok &&
++ (local || gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_AUTOLOGIN))) {
++ gdm_slave_greeter_ctl_no_ret (GDM_STARTTIMER, "");
++ started_timer = TRUE;
++ }
+ }
+
+ cur_gdm_disp = d;
Added: desktop/unstable/gdm/debian/patches/43_clearenv-no-lang.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/43_clearenv-no-lang.patch?rev=10707&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/43_clearenv-no-lang.patch (added)
+++ desktop/unstable/gdm/debian/patches/43_clearenv-no-lang.patch Wed May 2 16:54:16 2007
@@ -1,0 +1,45 @@
+Drop gdm_clearenv_no_lang() which clears the environment but keeps the i18n
+environment variables.
+
+XXX To be clarified
+
+--- gdm-2.16.4.orig/daemon/misc.c
++++ gdm-2.16.4/daemon/misc.c
+@@ -344,37 +344,6 @@
+ }
+
+ /*
+- * Clear environment, but keep the i18n ones,
+- * note that this leaks memory so only use before exec
+- * (keep LD_* if preserve_ld_vars is true)
+- */
+-void
+-gdm_clearenv_no_lang (void)
+-{
+- int i;
+- GList *li, *envs = NULL;
+-
+- for (i = 0; environ[i] != NULL; i++) {
+- char *env = environ[i];
+- if (strncmp (env, "LC_", 3) == 0 ||
+- strncmp (env, "LANG", 4) == 0 ||
+- strncmp (env, "LINGUAS", 7) == 0)
+- envs = g_list_prepend (envs, g_strdup (env));
+- if (preserve_ld_vars &&
+- strncmp (env, "LD_", 3) == 0)
+- envs = g_list_prepend (envs, g_strdup (env));
+- }
+-
+- ve_clearenv ();
+-
+- for (li = envs; li != NULL; li = li->next) {
+- putenv (li->data);
+- }
+-
+- g_list_free (envs);
+-}
+-
+-/*
+ * Clear environment completely
+ * note that this leaks memory so only use before exec
+ * (keep LD_* if preserve_ld_vars is true)
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=10707&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/50_close-fds.patch (original)
+++ desktop/unstable/gdm/debian/patches/50_close-fds.patch Wed May 2 16:54:16 2007
@@ -1,13 +1,11 @@
Debian #308825; don't close all descriptors before starting the slave.
-XXX needs to be splitted and clarified:
-* Don't unset MAIL environment variable
-* Set PWD environment variable
+XXX needs to be clarified and perhaps merged upstream
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
+--- gdm-2.18.1.orig/daemon/display.c 2007-05-02 18:38:48.000000000 +0200
++++ gdm-2.18.1/daemon/display.c 2007-05-02 18:41:44.000000000 +0200
@@ -306,8 +306,17 @@
closelog ();
@@ -30,8 +28,8 @@
* is to ignore & try to continue */
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
+--- gdm-2.18.1.orig/daemon/slave.c 2007-05-02 18:38:48.000000000 +0200
++++ gdm-2.18.1/daemon/slave.c 2007-05-02 18:42:54.000000000 +0200
@@ -1635,6 +1635,9 @@
closelog ();
@@ -60,11 +58,7 @@
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);
-- g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+@@ -1797,6 +1811,9 @@
closelog ();
@@ -74,7 +68,7 @@
gdm_close_all_descriptors (0 /* from */, slave_fifo_pipe_fd /* except */, d->slave_notify_fd /* except2 */);
/* No error checking here - if it's messed the best response
-@@ -1804,6 +1820,17 @@
+@@ -1804,6 +1821,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 */
@@ -92,48 +86,3 @@
openlog ("gdm", LOG_PID, LOG_DAEMON);
-@@ -2560,7 +2587,6 @@
- g_setenv ("GDM_GREETER_PROTOCOL_VERSION",
- GDM_GREETER_PROTOCOL_VERSION, TRUE);
- g_setenv ("GDM_VERSION", VERSION, TRUE);
-- g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
-
- pwent = getpwnam (gdmuser);
- if G_LIKELY (pwent != NULL) {
-@@ -3062,8 +3088,6 @@
-
- g_setenv ("GDM_VERSION", VERSION, TRUE);
-
-- g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
--
- pwent = getpwnam (gdmuser);
- if G_LIKELY (pwent != NULL) {
- /* Note that usually this doesn't exist */
-@@ -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);
- g_setenv ("SHELL", pwent->pw_shell, TRUE);
-- g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
-
- if (d->type == TYPE_STATIC) {
- g_setenv ("GDM_XSERVER_LOCATION", "local", TRUE);
-@@ -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);
-- g_unsetenv ("MAIL");
- argv = ve_split (script);
- VE_IGNORE_EINTR (execv (argv[0], argv));
- syslog (LOG_ERR, _("%s: Failed starting: %s"), "gdm_slave_exec_script",
-@@ -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);
-- g_unsetenv ("MAIL");
-
- argv = ve_split (str->str);
- VE_IGNORE_EINTR (execv (argv[0], argv));
Added: desktop/unstable/gdm/debian/patches/51_misc-env-var-fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/51_misc-env-var-fixes.patch?rev=10707&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/51_misc-env-var-fixes.patch (added)
+++ desktop/unstable/gdm/debian/patches/51_misc-env-var-fixes.patch Wed May 2 16:54:16 2007
@@ -1,0 +1,62 @@
+* Don't unset MAIL environment variable
+* Set PWD environment variable
+
+XXX Might need some clarification
+
+Index: gdm-2.18.1/daemon/slave.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/slave.c 2007-05-02 18:42:54.000000000 +0200
++++ gdm-2.18.1/daemon/slave.c 2007-05-02 18:48:05.000000000 +0200
+@@ -1807,7 +1807,6 @@
+ g_setenv ("RUNNING_UNDER_GDM", "true", TRUE);
+ if ( ! ve_string_empty (display->theme_name))
+ g_setenv ("GDM_GTK_THEME", display->theme_name, TRUE);
+- g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+
+ closelog ();
+
+@@ -2588,7 +2587,6 @@
+ g_setenv ("GDM_GREETER_PROTOCOL_VERSION",
+ GDM_GREETER_PROTOCOL_VERSION, TRUE);
+ g_setenv ("GDM_VERSION", VERSION, TRUE);
+- g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+
+ pwent = getpwnam (gdmuser);
+ if G_LIKELY (pwent != NULL) {
+@@ -3090,8 +3088,6 @@
+
+ g_setenv ("GDM_VERSION", VERSION, TRUE);
+
+- g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+-
+ pwent = getpwnam (gdmuser);
+ if G_LIKELY (pwent != NULL) {
+ /* Note that usually this doesn't exist */
+@@ -3556,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);
+ g_setenv ("SHELL", pwent->pw_shell, TRUE);
+- g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+
+ if (d->type == TYPE_STATIC) {
+ g_setenv ("GDM_XSERVER_LOCATION", "local", TRUE);
+@@ -5489,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);
+- g_unsetenv ("MAIL");
+ argv = ve_split (script);
+ VE_IGNORE_EINTR (execv (argv[0], argv));
+ syslog (LOG_ERR, _("%s: Failed starting: %s"), "gdm_slave_exec_script",
+@@ -5628,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);
+- g_unsetenv ("MAIL");
+
+ argv = ve_split (str->str);
+ VE_IGNORE_EINTR (execv (argv[0], argv));
Added: desktop/unstable/gdm/debian/patches/63_buf-decl.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/63_buf-decl.patch?rev=10707&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/63_buf-decl.patch (added)
+++ desktop/unstable/gdm/debian/patches/63_buf-decl.patch Wed May 2 16:54:16 2007
@@ -1,0 +1,17 @@
+Switch a "buf" declaration from char to unsigned char.
+
+XXX clarify and send upstream
+
+Index: gdm-2.18.1/daemon/misc.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/misc.c 2007-05-02 18:38:14.000000000 +0200
++++ gdm-2.18.1/daemon/misc.c 2007-05-02 18:38:14.000000000 +0200
+@@ -1360,7 +1360,7 @@
+ int
+ gdm_fdgetc (int fd)
+ {
+- char buf[1];
++ unsigned char buf[1];
+ int bytes;
+
+ VE_IGNORE_EINTR (bytes = read (fd, buf, 1));
Modified: desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch?rev=10707&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch (original)
+++ desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch Wed May 2 16:54:16 2007
@@ -1,5 +1,5 @@
-Ubuntu #79620; use /var/run for the gdm_socket file to comply with the FHS and
-to avoid issues with bootclean; found in the Ubuntu package.
+GNOME #331059; Ubuntu #79620; use /var/run for the gdm_socket file to comply
+with the FHS and to avoid issues with bootclean; found in the Ubuntu package.
Index: gdm-2.18.1/daemon/gdm.h
===================================================================
Added: desktop/unstable/gdm/debian/patches/68_pam-authinfo-unavail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/68_pam-authinfo-unavail.patch?rev=10707&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/68_pam-authinfo-unavail.patch (added)
+++ desktop/unstable/gdm/debian/patches/68_pam-authinfo-unavail.patch Wed May 2 16:54:16 2007
@@ -1,0 +1,19 @@
+Debian #157792, #160578, #184218; handle PAM's AUTHINFO_UNAVAIL in incorrect
+password error handler.
+
+Index: gdm-2.18.1/daemon/verify-pam.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/verify-pam.c 2007-05-02 18:29:52.000000000 +0200
++++ gdm-2.18.1/daemon/verify-pam.c 2007-05-02 18:34:14.000000000 +0200
+@@ -1166,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 */
++ /* at least AUTHINFO_UNAVAIL -- it's what user unknown is! */
+ if (pamerr == PAM_AUTH_ERR ||
+- pamerr == PAM_USER_UNKNOWN) {
++ pamerr == PAM_USER_UNKNOWN ||
++ pamerr == PAM_AUTHINFO_UNAVAIL) {
+ gboolean is_capslock = FALSE;
+ const char *basemsg;
+ char *msg;
Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=10707&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series (original)
+++ desktop/unstable/gdm/debian/patches/series Wed May 2 16:54:16 2007
@@ -3,23 +3,26 @@
35_gdm.conf.patch
37_manpage-binaries.patch
41_config-files.patch
-42_pam-and-timed-login.patch
-43_clearenv-no-lang-and-buf-decl.patch
+42_timed-login.patch
+43_clearenv-no-lang.patch
45_use-gksu-for-gdmsetup.patch
46_kde-substitude-uid.patch
47_XKeepsCrashing-restore-keyboard.patch
48_random-greeter-theme.patch
50_close-fds.patch
+51_misc-env-var-fixes.patch
53_remove-ok-and-cancel-from-included-themes.patch
55_use-theme-gtkrc.patch
57_gdm-is-local.patch
60_logname-is-log-name-in-PostLogin.patch
61_gdm-manpage-section.patch
62_reference-manual-docbook-entity-reference.patch
+63_buf-decl.patch
64_vt-auto-allocation-fix.patch
65_french-translation-typo.patch
#66_socket-in-var-run-for-fhs.patch
67_C-locale-fallback.patch
+68_pam-authinfo-unavail.patch
69_misc-config-typos.patch
70_mandatory-relibtoolize.patch
90_from_svn_fix_gdm_restart.patch
More information about the pkg-gnome-commits
mailing list