SHA256
1
0
forked from pool/gdm
OBS User unknown 2007-09-19 16:54:33 +00:00 committed by Git OBS Bridge
parent 5bfe0c2113
commit 5e81a90d79
8 changed files with 195 additions and 45 deletions

View File

@ -1,12 +0,0 @@
diff -upr gdm-2.19.7-pre/daemon/verify-pam.c gdm-2.19.7-post/daemon/verify-pam.c
--- gdm-2.19.7-pre/daemon/verify-pam.c 2007-09-02 20:29:36.000000000 -0500
+++ gdm-2.19.7-post/daemon/verify-pam.c 2007-09-02 20:34:26.000000000 -0500
@@ -699,7 +699,7 @@ gdm_verify_standalone_pam_conv (int num_
text = g_strdup (m);
/* PAM requested textual input with echo off */
- question_msg = g_strdup_printf ("question_msg=%s$$echo=%d", text, TRUE);
+ question_msg = g_strdup_printf ("question_msg=%s$$echo=%d", text, FALSE);
gdm_slave_send_string (GDM_SOP_SHOW_QUESTION_DIALOG, question_msg);

View File

@ -1,22 +0,0 @@
--- gdm-2.19.7/daemon/auth.c~ 2007-08-27 12:08:20.000000000 -0400
+++ gdm-2.19.7/daemon/auth.c 2007-09-11 17:45:12.000000000 -0400
@@ -322,7 +322,7 @@ add_auth_entry_for_addr (GdmDisplay
unsigned short family;
switch (ss->ss_family) {
-#if IPV6_ENABLED
+#ifdef ENABLE_IPV6
case AF_INET6:
family = FamilyInternetV6;
addr = (const char *) &SIN6 (ss)->sin6_addr;
--- gdm-2.19.7/common/gdm-common.c~ 2007-08-27 12:07:59.000000000 -0400
+++ gdm-2.19.7/common/gdm-common.c 2007-09-11 18:37:35.000000000 -0400
@@ -87,7 +87,7 @@ gdm_address_is_loopback (struct sockaddr
break;
#endif
case AF_INET:
- return (INADDR_LOOPBACK == (((struct sockaddr_in *)sa)->sin_addr.s_addr));
+ return (INADDR_LOOPBACK == htonl (((struct sockaddr_in *)sa)->sin_addr.s_addr));
break;
default:
break;

View File

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ae2393685d965b3aa48a06a92cb8c19c1df605f3bb0ee12373c2fba49aba2f7
size 3728770

View File

@ -7,7 +7,7 @@
+ if (d->hostname != NULL && d->hostname [0] != '\0') {
+ g_setenv ("XAUTHLOCALHOSTNAME", d->hostname, TRUE);
+ } else {
+ g_setenv ("XAUTHLOCALHOSTNAME", "localhost.localdomain", TRUE);
+ g_setenv ("XAUTHLOCALHOSTNAME", "localhost", TRUE);
+ }
+
if (d->type == TYPE_STATIC) {

117
gdm-language-hang.patch Normal file
View File

@ -0,0 +1,117 @@
--- daemon/slave.c 2007-09-12 18:59:56.000000000 +0200
+++ daemon/slave.c 2007-09-15 01:04:02.000000000 +0200
@@ -192,7 +192,7 @@
* the slave can talk to itself from its sig handler
* using the greeter ipc mechanism
*/
-static int slave_fd_out = -1;
+//static int slave_fd_out = -1;
#ifdef HAVE_TSOL
static gboolean have_suntsol_extension = FALSE;
@@ -682,6 +682,18 @@
}
static void
+whack_greeter_fds (void)
+{
+ if (greeter_fd_out > 0)
+ VE_IGNORE_EINTR (close (greeter_fd_out));
+ greeter_fd_out = -1;
+ if (greeter_fd_in > 0)
+ VE_IGNORE_EINTR (close (greeter_fd_in));
+ greeter_fd_in = -1;
+}
+
+/*
+static void
whack_greeter_and_slave_fds (void)
{
if (greeter_fd_out > 0)
@@ -690,10 +702,12 @@
if (greeter_fd_in > 0)
VE_IGNORE_EINTR (close (greeter_fd_in));
greeter_fd_in = -1;
+
if (slave_fd_out > 0)
VE_IGNORE_EINTR (close (slave_fd_out));
slave_fd_out = -1;
}
+*/
static void
term_session_stop_and_quit (void)
@@ -1178,7 +1192,8 @@
d->greetpid = 0;
- whack_greeter_and_slave_fds ();
+ //whack_greeter_and_slave_fds ();
+ whack_greeter_fds ();
gdm_slave_send_num (GDM_SOP_GREETPID, 0);
@@ -2027,7 +2042,8 @@
d->greetpid = 0;
- whack_greeter_and_slave_fds ();
+ //whack_greeter_and_slave_fds ();
+ whack_greeter_fds ();
gdm_slave_send_num (GDM_SOP_GREETPID, 0);
}
@@ -2945,10 +2961,13 @@
default:
VE_IGNORE_EINTR (close (pipe1[0]));
+ // added
+ VE_IGNORE_EINTR (close (pipe2[1]));
- whack_greeter_and_slave_fds ();
+ //whack_greeter_and_slave_fds ();
+ whack_greeter_fds ();
- slave_fd_out = pipe2[1];
+ //slave_fd_out = pipe2[1];
greeter_fd_out = pipe1[1];
greeter_fd_in = pipe2[0];
@@ -5301,7 +5320,8 @@
greet = FALSE;
d->greetpid = 0;
- whack_greeter_and_slave_fds ();
+ //whack_greeter_and_slave_fds ();
+ whack_greeter_fds ();
gdm_slave_send_num (GDM_SOP_GREETPID, 0);
do_restart_greeter = TRUE;
@@ -5313,7 +5333,8 @@
continue;
}
- whack_greeter_and_slave_fds ();
+ //whack_greeter_and_slave_fds ();
+ whack_greeter_fds ();
/* if greet is TRUE, then the greeter died outside of our
* control really, so clean up and die, something is wrong
@@ -5456,7 +5477,7 @@
gdm_wait_for_go = FALSE;
} else if (strcmp (&s[1], GDM_NOTIFY_TWIDDLE_POINTER) == 0) {
gdm_twiddle_pointer (d);
- } else if (strcmp (&s[1], GDM_NOTIFY_RESET) == 0) {
+ } /*else if (strcmp (&s[1], GDM_NOTIFY_RESET) == 0) {
if (!d->logged_in) {
gdm_fdprintf (slave_fd_out, "%c%c%c\n",
STX, BEL, GDM_INTERRUPT_CANCEL);
@@ -5466,7 +5487,7 @@
gdm_fdprintf (slave_fd_out, "%c%c%c\n",
STX, BEL, GDM_INTERRUPT_TOKEN_LOGIN);
}
- }
+ }*/
} else if (s[0] == GDM_SLAVE_NOTIFY_RESPONSE) {
gdm_got_ack = TRUE;
if (gdm_ack_response)

View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Tue Sep 18 20:43:21 CEST 2007 - hpj@suse.de
- Updated gdm-2.8.0.0-any-hostname-auth.patch to use localhost
instead of localhost.localdomain for xauth tokens. Related to
Novell bug #304632.
-------------------------------------------------------------------
Tue Sep 18 17:15:51 CEST 2007 - sbrabec@suse.cz
- Updated to version 2.20.0:
* Now support --with-atspi-dir so you can specify a non-default
directory where the at-spi-registryd daemon exists.
* Improve keymouselistener a11y gesture listener so it does not
fail on Ubuntu, and does a better job freeing memory. Fix
dwellmouselistener a11y gesture listener so it doesn't generate
warnings.
* Fix bug in IPv6 logic.
* Fix Macedonian language so the language choice also appears in
the local language
* Fix bug where GDM was not properly executing a custom Xserver
start script.
* Fix bug with ConsoleKit that occurs when the session is going
to migrate. Previous code was failing to send the notification
when the greeter is not TYPE_FLEXI.
* Set invisible character to '*' for gdmgreeter.
* When using gdm_verify_standalone_pam_conv (used by automatic
login) set echo to FALSE when PAM_PROMPT_ECHO_OFF is handled.
* Make it possible to configure system dependant options by
setting environment variables before running configure. Also
support /usr/X11/bin/Xorg when setting X_PATH, etc.
* Translation updates
-------------------------------------------------------------------
Mon Sep 17 19:04:05 CEST 2007 - banderso@suse.de
- added patch gdm-language-hang.patch to fix Novell bugs #308378 and
#309064. The patch matches changes that were made to upstream code.
-------------------------------------------------------------------
Fri Sep 14 20:31:41 CEST 2007 - sreeves@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package gdm (Version 2.19.7)
# spec file for package gdm (Version 2.20.0)
#
# 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.7
Release: 15
Version: 2.20.0
Release: 1
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@ -53,10 +53,9 @@ 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
Patch39: gdm-2.19.7-pam-hide-password.patch
Patch40: gdm-XKeepsCrashing-SaX2.patch
Patch41: gdm-2.19.7-vncxauth.patch
Patch42: fix-desktop-files.diff
Patch43: gdm-language-hang.patch
Url: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
DocDir: %{_defaultdocdir}
@ -110,10 +109,9 @@ gnome-patch-translation-prepare
%patch36 -p1
%patch37 -p1
%patch38 -p0
%patch39 -p1
%patch40
%patch41 -p1
#%patch42 - dont think this patch is needed with suse_udpate_desktop_file -g working.
%patch43
gnome-patch-translation-update
%build
@ -247,6 +245,36 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
%files lang -f %{name}.lang
%changelog
* Tue Sep 18 2007 - hpj@suse.de
- Updated gdm-2.8.0.0-any-hostname-auth.patch to use localhost
instead of localhost.localdomain for xauth tokens. Related to
Novell bug #304632.
* Tue Sep 18 2007 - sbrabec@suse.cz
- Updated to version 2.20.0:
* Now support --with-atspi-dir so you can specify a non-default
directory where the at-spi-registryd daemon exists.
* Improve keymouselistener a11y gesture listener so it does not
fail on Ubuntu, and does a better job freeing memory. Fix
dwellmouselistener a11y gesture listener so it doesn't generate
warnings.
* Fix bug in IPv6 logic.
* Fix Macedonian language so the language choice also appears in
the local language
* Fix bug where GDM was not properly executing a custom Xserver
start script.
* Fix bug with ConsoleKit that occurs when the session is going
to migrate. Previous code was failing to send the notification
when the greeter is not TYPE_FLEXI.
* Set invisible character to '*' for gdmgreeter.
* When using gdm_verify_standalone_pam_conv (used by automatic
login) set echo to FALSE when PAM_PROMPT_ECHO_OFF is handled.
* Make it possible to configure system dependant options by
setting environment variables before running configure. Also
support /usr/X11/bin/Xorg when setting X_PATH, etc.
* Translation updates
* Mon Sep 17 2007 - banderso@suse.de
- added patch gdm-language-hang.patch to fix Novell bugs #308378 and
[#309064]. The patch matches changes that were made to upstream code.
* Fri Sep 14 2007 - sreeves@suse.de
- Fix for Bug #308471 - gdm intentionally changed to storing the .desktop
files under /usr/share/gdm which the suse_update_desktop_file script