SHA256
1
0
forked from pool/gdm
OBS User unknown 2007-08-31 13:46:08 +00:00 committed by Git OBS Bridge
parent d8d1326fe4
commit 7730c2470f
6 changed files with 159 additions and 70 deletions

View File

@ -1,7 +1,8 @@
diff -upr gdm-2.19.5-pre/daemon/gdm.c gdm-2.19.5-post/daemon/gdm.c
--- gdm-2.19.5-pre/daemon/gdm.c 2007-08-03 20:26:08.000000000 -0500
+++ gdm-2.19.5-post/daemon/gdm.c 2007-08-03 20:24:56.000000000 -0500
@@ -4389,7 +4389,7 @@ gdm_handle_user_message (GdmConnection *
Index: gdm-2.19.7/daemon/gdm.c
===================================================================
--- gdm-2.19.7.orig/daemon/gdm.c
+++ gdm-2.19.7/daemon/gdm.c
@@ -4395,7 +4395,7 @@ gdm_handle_user_message (GdmConnection *
}
static void
@ -10,7 +11,7 @@ diff -upr gdm-2.19.5-pre/daemon/gdm.c gdm-2.19.5-post/daemon/gdm.c
{
GSList *li;
@@ -4397,11 +4397,23 @@ gdm_reset_local_displays (void)
@@ -4403,11 +4403,23 @@ gdm_reset_local_displays (void)
GdmDisplay *d = li->data;
if (d->attached)
@ -35,7 +36,7 @@ diff -upr gdm-2.19.5-pre/daemon/gdm.c gdm-2.19.5-post/daemon/gdm.c
gdm_watch_for_security_tokens (void)
{
DBusGConnection *conn;
@@ -4422,7 +4434,7 @@ gdm_watch_for_security_tokens (void)
@@ -4428,7 +4440,7 @@ gdm_watch_for_security_tokens (void)
MONITOR_INTERFACE);
dbus_g_proxy_add_signal (monitor, "SecurityTokenInserted", G_TYPE_STRING, G_TYPE_INVALID);
@ -44,9 +45,10 @@ diff -upr gdm-2.19.5-pre/daemon/gdm.c gdm-2.19.5-post/daemon/gdm.c
dbus_g_proxy_add_signal (monitor, "SecurityTokenRemoved", G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (monitor, "SecurityTokenRemoved", G_CALLBACK (gdm_reset_local_displays), NULL, NULL);
diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config.c gdm-2.19.5-post/daemon/gdm-daemon-config.c
--- gdm-2.19.5-pre/daemon/gdm-daemon-config.c 2007-07-30 13:51:14.000000000 -0500
+++ gdm-2.19.5-post/daemon/gdm-daemon-config.c 2007-08-03 20:24:56.000000000 -0500
Index: gdm-2.19.7/daemon/gdm-daemon-config.c
===================================================================
--- gdm-2.19.7.orig/daemon/gdm-daemon-config.c
+++ gdm-2.19.7/daemon/gdm-daemon-config.c
@@ -552,7 +552,8 @@ gdm_daemon_config_key_to_string_per_disp
if (strcmp (group, "greeter") == 0 ||
@ -57,10 +59,11 @@ diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config.c gdm-2.19.5-post/daemon/gdm-d
ret = gdm_daemon_config_key_to_string (file, keystring, retval);
}
diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-entries.h gdm-2.19.5-post/daemon/gdm-daemon-config-entries.h
--- gdm-2.19.5-pre/daemon/gdm-daemon-config-entries.h 2007-08-03 20:26:08.000000000 -0500
+++ gdm-2.19.5-post/daemon/gdm-daemon-config-entries.h 2007-08-03 20:24:56.000000000 -0500
@@ -212,6 +212,7 @@ typedef enum {
Index: gdm-2.19.7/daemon/gdm-daemon-config-entries.h
===================================================================
--- gdm-2.19.7.orig/daemon/gdm-daemon-config-entries.h
+++ gdm-2.19.7/daemon/gdm-daemon-config-entries.h
@@ -211,6 +211,7 @@ typedef enum {
GDM_ID_SYSTEM_COMMANDS_IN_MENU,
GDM_ID_ALLOW_LOGOUT_ACTIONS,
GDM_ID_RBAC_SYSTEM_COMMAND_KEYS,
@ -68,7 +71,7 @@ diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-entries.h gdm-2.19.5-post/daem
GDK_ID_LAST
} GdmConfigKey;
@@ -368,6 +369,7 @@ static const GdmConfigEntry gdm_daemon_c
@@ -366,6 +367,7 @@ static const GdmConfigEntry gdm_daemon_c
{ GDM_CONFIG_GROUP_SECURITY, "RetryDelay", GDM_CONFIG_VALUE_INT, "1", GDM_ID_RETRY_DELAY },
{ GDM_CONFIG_GROUP_SECURITY, "DisallowTCP", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_DISALLOW_TCP },
{ GDM_CONFIG_GROUP_SECURITY, "PamStack", GDM_CONFIG_VALUE_STRING, "gdm", GDM_ID_PAM_STACK },
@ -76,10 +79,11 @@ diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-entries.h gdm-2.19.5-post/daem
{ GDM_CONFIG_GROUP_SECURITY, "NeverPlaceCookiesOnNFS", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_NEVER_PLACE_COOKIES_ON_NFS },
{ GDM_CONFIG_GROUP_SECURITY, "PasswordRequired", GDM_CONFIG_VALUE_BOOL, "false", GDM_ID_PASSWORD_REQUIRED },
diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h
--- gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h 2007-08-03 20:26:08.000000000 -0500
+++ gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h 2007-08-03 20:24:56.000000000 -0500
@@ -106,6 +106,7 @@ G_BEGIN_DECLS
Index: gdm-2.19.7/daemon/gdm-daemon-config-keys.h
===================================================================
--- gdm-2.19.7.orig/daemon/gdm-daemon-config-keys.h
+++ gdm-2.19.7/daemon/gdm-daemon-config-keys.h
@@ -105,6 +105,7 @@ G_BEGIN_DECLS
#define GDM_KEY_RETRY_DELAY "security/RetryDelay=1"
#define GDM_KEY_DISALLOW_TCP "security/DisallowTCP=true"
#define GDM_KEY_PAM_STACK "security/PamStack=gdm"
@ -87,7 +91,7 @@ diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.5-post/daemon/
#define GDM_KEY_NEVER_PLACE_COOKIES_ON_NFS "security/NeverPlaceCookiesOnNFS=true"
#define GDM_KEY_PASSWORD_REQUIRED "security/PasswordRequired=false"
#define GDM_KEY_UTMP_LINE_ATTACHED "security/UtmpLineAttached="
@@ -234,6 +235,7 @@ G_BEGIN_DECLS
@@ -230,6 +231,7 @@ G_BEGIN_DECLS
#define GDM_NOTIFY_GO "GO"
#define GDM_NOTIFY_TWIDDLE_POINTER "TWIDDLE_POINTER"
#define GDM_NOTIFY_RESET "RESET"
@ -95,10 +99,11 @@ diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.5-post/daemon/
G_END_DECLS
diff -upr gdm-2.19.5-pre/daemon/gdm-socket-protocol.h gdm-2.19.5-post/daemon/gdm-socket-protocol.h
--- gdm-2.19.5-pre/daemon/gdm-socket-protocol.h 2007-08-03 20:26:08.000000000 -0500
+++ gdm-2.19.5-post/daemon/gdm-socket-protocol.h 2007-08-03 20:24:56.000000000 -0500
@@ -77,6 +77,7 @@
Index: gdm-2.19.7/daemon/gdm-socket-protocol.h
===================================================================
--- gdm-2.19.7.orig/daemon/gdm-socket-protocol.h
+++ gdm-2.19.7/daemon/gdm-socket-protocol.h
@@ -75,6 +75,7 @@
#define GDM_INTERRUPT_CUSTOM_CMD 'M'
#define GDM_INTERRUPT_CANCEL 'X'
#define GDM_INTERRUPT_SELECT_LANG 'O'
@ -106,10 +111,11 @@ diff -upr gdm-2.19.5-pre/daemon/gdm-socket-protocol.h gdm-2.19.5-post/daemon/gdm
/* List delimiter for config file lists */
#define GDM_DELIMITER_MODULES ":"
diff -upr gdm-2.19.5-pre/daemon/slave.c gdm-2.19.5-post/daemon/slave.c
--- gdm-2.19.5-pre/daemon/slave.c 2007-08-03 20:26:08.000000000 -0500
+++ gdm-2.19.5-post/daemon/slave.c 2007-08-03 20:32:16.000000000 -0500
@@ -134,6 +134,8 @@ static gboolean do_system_reboot =
Index: gdm-2.19.7/daemon/slave.c
===================================================================
--- gdm-2.19.7.orig/daemon/slave.c
+++ gdm-2.19.7/daemon/slave.c
@@ -143,6 +143,8 @@ static gboolean do_configurator =
static gboolean do_cancel = FALSE; /* If this is true, go back to
username entry & unselect
face browser (if present) */
@ -118,15 +124,7 @@ diff -upr gdm-2.19.5-pre/daemon/slave.c gdm-2.19.5-post/daemon/slave.c
static gboolean do_restart_greeter = FALSE; /* If this is true, whack the
greeter and try again */
static gboolean restart_greeter_now = FALSE; /* Restart_greeter_when the
@@ -2091,6 +2093,7 @@ get_root_auth (const gchar *message, str
gdm_slave_greeter_ctl_no_ret (GDM_SETLOGIN, (*pwent)->pw_name);
login_user = gdm_verify_user (d,
(*pwent)->pw_name,
+ FALSE,
FALSE);
gdm_daemon_config_set_value_bool (GDM_KEY_ALLOW_ROOT, oldAllowRoot);
@@ -2160,11 +2163,14 @@ get_root_auth (const gchar *message, str
@@ -2079,11 +2081,14 @@ play_login_sound (const char *sound_file
static void
gdm_slave_wait_for_login (void)
{
@ -141,7 +139,7 @@ diff -upr gdm-2.19.5-pre/daemon/slave.c gdm-2.19.5-post/daemon/slave.c
/* Chat with greeter */
while (login_user == NULL) {
/* init to a sane value */
@@ -2188,9 +2194,14 @@ gdm_slave_wait_for_login (void)
@@ -2107,9 +2112,14 @@ gdm_slave_wait_for_login (void)
gdm_debug ("gdm_slave_wait_for_login: In loop");
username = d->preset_user;
d->preset_user = NULL;
@ -158,7 +156,7 @@ diff -upr gdm-2.19.5-pre/daemon/slave.c gdm-2.19.5-post/daemon/slave.c
g_free (username);
gdm_debug ("gdm_slave_wait_for_login: end verify for '%s'",
@@ -5384,6 +5395,11 @@ gdm_slave_handle_usr2_message (void)
@@ -5395,6 +5405,11 @@ gdm_slave_handle_usr2_message (void)
gdm_fdprintf (slave_fd_out, "%c%c%c\n",
STX, BEL, GDM_INTERRUPT_CANCEL);
}
@ -170,7 +168,7 @@ diff -upr gdm-2.19.5-pre/daemon/slave.c gdm-2.19.5-post/daemon/slave.c
}
} else if (s[0] == GDM_SLAVE_NOTIFY_RESPONSE) {
gdm_got_ack = TRUE;
@@ -5592,6 +5608,10 @@ check_for_interruption (const char *msg)
@@ -5595,6 +5610,10 @@ check_for_interruption (const char *msg)
do_restart_greeter = TRUE;
}
break;
@ -181,11 +179,10 @@ diff -upr gdm-2.19.5-pre/daemon/slave.c gdm-2.19.5-post/daemon/slave.c
default:
break;
}
Only in gdm-2.19.5-post/daemon: slave.c~
Only in gdm-2.19.5-post/daemon: slave.c.rej
diff -upr gdm-2.19.5-pre/daemon/verify-crypt.c gdm-2.19.5-post/daemon/verify-crypt.c
--- gdm-2.19.5-pre/daemon/verify-crypt.c 2007-07-30 13:51:14.000000000 -0500
+++ gdm-2.19.5-post/daemon/verify-crypt.c 2007-08-03 20:29:12.000000000 -0500
Index: gdm-2.19.7/daemon/verify-crypt.c
===================================================================
--- gdm-2.19.7.orig/daemon/verify-crypt.c
+++ gdm-2.19.7/daemon/verify-crypt.c
@@ -101,7 +101,8 @@ print_cant_auth_errbox (void)
gchar *
gdm_verify_user (GdmDisplay *d,
@ -196,11 +193,10 @@ diff -upr gdm-2.19.5-pre/daemon/verify-crypt.c gdm-2.19.5-post/daemon/verify-cry
{
gchar *login, *passwd, *ppasswd;
struct passwd *pwent;
Only in gdm-2.19.5-post/daemon: verify-crypt.c~
Only in gdm-2.19.5-post/daemon: verify-crypt.c.rej
diff -upr gdm-2.19.5-pre/daemon/verify.h gdm-2.19.5-post/daemon/verify.h
--- gdm-2.19.5-pre/daemon/verify.h 2007-07-30 13:51:14.000000000 -0500
+++ gdm-2.19.5-post/daemon/verify.h 2007-08-03 20:34:40.000000000 -0500
Index: gdm-2.19.7/daemon/verify.h
===================================================================
--- gdm-2.19.7.orig/daemon/verify.h
+++ gdm-2.19.7/daemon/verify.h
@@ -26,7 +26,8 @@
* the timed login timer */
gchar *gdm_verify_user (GdmDisplay *d,
@ -211,12 +207,11 @@ diff -upr gdm-2.19.5-pre/daemon/verify.h gdm-2.19.5-post/daemon/verify.h
void gdm_verify_cleanup (GdmDisplay *d);
void gdm_verify_check (void);
void gdm_verify_select_user (const char *user);
Only in gdm-2.19.5-post/daemon: verify.h~
Only in gdm-2.19.5-post/daemon: verify.h.rej
diff -upr gdm-2.19.5-pre/daemon/verify-pam.c gdm-2.19.5-post/daemon/verify-pam.c
--- gdm-2.19.5-pre/daemon/verify-pam.c 2007-08-03 20:26:08.000000000 -0500
+++ gdm-2.19.5-post/daemon/verify-pam.c 2007-08-03 20:33:44.000000000 -0500
@@ -887,7 +887,8 @@ log_to_audit_system(const char *login,
Index: gdm-2.19.7/daemon/verify-pam.c
===================================================================
--- gdm-2.19.7.orig/daemon/verify-pam.c
+++ gdm-2.19.7/daemon/verify-pam.c
@@ -878,7 +878,8 @@ log_to_audit_system(const char *login,
gchar *
gdm_verify_user (GdmDisplay *d,
const char *username,
@ -226,7 +221,7 @@ diff -upr gdm-2.19.5-pre/daemon/verify-pam.c gdm-2.19.5-post/daemon/verify-pam.c
{
gint pamerr = 0;
struct passwd *pwent = NULL;
@@ -947,8 +948,10 @@ gdm_verify_user (GdmDisplay *d,
@@ -938,8 +939,10 @@ gdm_verify_user (GdmDisplay *d,
* PAM Stacks, in case one display should use a different
* authentication mechanism than another display.
*/
@ -239,11 +234,10 @@ diff -upr gdm-2.19.5-pre/daemon/verify-pam.c gdm-2.19.5-post/daemon/verify-pam.c
if ( ! create_pamh (d, pam_stack, login, &pamc, d->name, &pamerr)) {
if (started_timer)
Only in gdm-2.19.5-post/daemon: verify-pam.c~
Only in gdm-2.19.5-post/daemon: verify-pam.c.rej
diff -upr gdm-2.19.5-pre/daemon/verify-shadow.c gdm-2.19.5-post/daemon/verify-shadow.c
--- gdm-2.19.5-pre/daemon/verify-shadow.c 2007-07-30 13:51:14.000000000 -0500
+++ gdm-2.19.5-post/daemon/verify-shadow.c 2007-08-03 20:27:55.000000000 -0500
Index: gdm-2.19.7/daemon/verify-shadow.c
===================================================================
--- gdm-2.19.7.orig/daemon/verify-shadow.c
+++ gdm-2.19.7/daemon/verify-shadow.c
@@ -102,7 +102,8 @@ print_cant_auth_errbox (void)
gchar *
gdm_verify_user (GdmDisplay *d,
@ -254,6 +248,3 @@ diff -upr gdm-2.19.5-pre/daemon/verify-shadow.c gdm-2.19.5-post/daemon/verify-sh
{
gchar *login, *passwd, *ppasswd;
struct passwd *pwent;
Only in gdm-2.19.5-post/daemon: verify-shadow.c~
Only in gdm-2.19.5-post/daemon: verify-shadow.c.rej
Only in gdm-2.19.5-post: error.19199

View File

@ -0,0 +1,10 @@
--- daemon/slave.c.orig 2007-08-30 18:32:03.526283719 +0000
+++ daemon/slave.c 2007-08-30 18:32:27.536993351 +0000
@@ -2104,6 +2104,7 @@
gdm_slave_greeter_ctl_no_ret (GDM_SETLOGIN, (*pwent)->pw_name);
login_user = gdm_verify_user (d,
(*pwent)->pw_name,
+ FALSE,
FALSE);
gdm_daemon_config_set_value_bool (GDM_KEY_ALLOW_ROOT, oldAllowRoot);

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13cbc8aaea85a549d1a65ff5a0a569bf927bd52b91725b8e11c01cd17b82bd68
size 3663736

3
gdm-2.19.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4bad5bdb2cdab516da9de48f3b0484503c3c948a0be324d0dae9c14ea0f132e6
size 3770113

View File

@ -1,3 +1,54 @@
-------------------------------------------------------------------
Thu Aug 30 20:35:45 CEST 2007 - maw@suse.de
- Update to version 2.19.7:
+ from 2.19.5 to 2.19.6:
- Fix gdmflexiserver so when used to start a "Nested Display" (a login
in a window), it does not pop-up the window showing the user what
VT's are already logged in. That window should only show up when
starting Flexi (VT) displays, not Nested displays. (Brian Cameron)
- Remove XInput code from the dwellmouselistener accessibility module.
Bug #457998 reported that this code was not working and causing
devices to fail. (Ray Strode)
- Fix bug #461822 which caused entries in the [servers] section of the
configuration to get ignored if more than one referenced the same
[server-foo] server. This was working in 2.18 but got broken during
the cleanup. (Brian Cameron)
- Fix gdm_fail function so that it cleans up and exits, so now GDM
will better handle critical failures. This was working in 2.18
but got broken during the cleanup. (Brian Cameron)
- Now gdmsetup sets "Use 24 Hour Clock" to "yes" when this is its
value. (Sebastien Bacher)
- Fixes for utmpx processing so it now works with utmp and also on
FreeBSD. (Brian Cameron, Joe Marcus Clarke)
- Fix IPv6 check when starting VT so that if IPv6 reports that the
network is not reachable, it falls back to IPv4. (Brian Cameron)
- Fix string translation issues. (Lukasz Zalewski)
- From 2.19.6 to 2.19.7:
- Disable autocompletion in the face browser since it wasn't
working properly. (Ray Strode)
- Many corrections to the theme xml files (Dave Fincher and Brian
Cameron)
- Fix compile when using a compiler that doesn't like #ifdefs
in macro calls. (Jens Granseuer)
- The greeter.dtd file has been updated. Now the default GDM themes
validate with this dtd. (Dave Fincher)
- Plus translation updates for a plethora of locales.
-------------------------------------------------------------------
Fri Aug 17 00:20:34 CEST 2007 - hpj@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package gdm (Version 2.19.5)
# spec file for package gdm (Version 2.19.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -21,8 +21,8 @@ PreReq: %fillup_prereq
PreReq: %insserv_prereq
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.19.5
Release: 12
Version: 2.19.7
Release: 1
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@ -51,6 +51,8 @@ Patch34: gdm-2.17.7-vt-fallback.patch
Patch35: gdm-2.19.3-reset-pam.patch
Patch36: gdm-2.19.3-dbus-security-tokens.patch
Patch37: gdm-2.19.3-token-login.patch
# don't ask.
Patch38: gdm-2.19.3-token-login2.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@ -103,6 +105,7 @@ gnome-patch-translation-prepare
%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p0
gnome-patch-translation-update
%build
@ -223,6 +226,40 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
%files lang -f %{name}.lang
%changelog
* Thu Aug 30 2007 - maw@suse.de
- Update to version 2.19.7:
+ from 2.19.5 to 2.19.6:
- Fix gdmflexiserver so when used to start a "Nested Display" (a login
in a window), it does not pop-up the window showing the user what
VT's are already logged in. That window should only show up when
starting Flexi (VT) displays, not Nested displays. (Brian Cameron)
- Remove XInput code from the dwellmouselistener accessibility module.
Bug #457998 reported that this code was not working and causing
devices to fail. (Ray Strode)
- Fix bug #461822 which caused entries in the [servers] section of the
configuration to get ignored if more than one referenced the same
[server-foo] server. This was working in 2.18 but got broken during
the cleanup. (Brian Cameron)
- Fix gdm_fail function so that it cleans up and exits, so now GDM
will better handle critical failures. This was working in 2.18
but got broken during the cleanup. (Brian Cameron)
- Now gdmsetup sets "Use 24 Hour Clock" to "yes" when this is its
value. (Sebastien Bacher)
- Fixes for utmpx processing so it now works with utmp and also on
FreeBSD. (Brian Cameron, Joe Marcus Clarke)
- Fix IPv6 check when starting VT so that if IPv6 reports that the
network is not reachable, it falls back to IPv4. (Brian Cameron)
- Fix string translation issues. (Lukasz Zalewski)
- From 2.19.6 to 2.19.7:
- Disable autocompletion in the face browser since it wasn't
working properly. (Ray Strode)
- Many corrections to the theme xml files (Dave Fincher and Brian
Cameron)
- Fix compile when using a compiler that doesn't like #ifdefs
in macro calls. (Jens Granseuer)
- The greeter.dtd file has been updated. Now the default GDM themes
validate with this dtd. (Dave Fincher)
- Plus translation updates for a plethora of locales.
* Fri Aug 17 2007 - hpj@suse.de
- Fixed missing configuration variable definition in
gdm-2.8.0.7-domain-entry.patch.