2009-09-25 Brian Cameron <
[email protected]>
* base-specs/gdm.spec/ patches/gdm-13-no-sigkill.diff,
patches/gdm-14-wtmp.diff: Add patch 13 to fix bugster CR #6871744
so that GDM never kills the Xserver with SIGKILL, causing problems
for console display. Patch 14 simply fixes GDM so that it uses
the correct wtmp/btmp file on Solaris.
--- a/ChangeLog Tue Sep 22 10:22:53 2009 +0000
+++ b/ChangeLog Sun Sep 27 04:51:15 2009 +0000
@@ -1,3 +1,11 @@
+2009-09-25 Brian Cameron <[email protected]>
+
+ * base-specs/gdm.spec/ patches/gdm-13-no-sigkill.diff,
+ patches/gdm-14-wtmp.diff: Add patch 13 to fix bugster CR #6871744
+ so that GDM never kills the Xserver with SIGKILL, causing problems
+ for console display. Patch 14 simply fixes GDM so that it uses
+ the correct wtmp/btmp file on Solaris.
+
2009-09-22 Ginn Chen <[email protected]>
* SUNWthunderbird.spec:
@@ -5,7 +13,8 @@
2009-09-11 Harry Fu <[email protected]>
- * base-specs/gdm.spec, patches/gdm-12-newlocales.diff: Add 28 new locales.
+ * base-specs/gdm.spec, patches/gdm-12-newlocales.diff: Add 28 new
+ locales.
* closed/SUNWzz-gnome-l10n.spec: Add symbol links for 28 new locales.
* po-sun/gdm/po-sun/*.po: Update translations for the new locale names.
--- a/base-specs/gdm.spec Tue Sep 22 10:22:53 2009 +0000
+++ b/base-specs/gdm.spec Sun Sep 27 04:51:15 2009 +0000
@@ -55,6 +55,10 @@
Patch11: gdm-11-fbconsole.diff
#owner:funix date:2009-09-11 type:bug bugster:6859805
Patch12: gdm-12-newlocales.diff
+#owner:yippi date:2009-09-17 type:bug bugster:6871744
+Patch13: gdm-13-no-sigkill.diff
+#owner:yippi date:2009-09-17 type:bug bugster:6885146
+Patch14: gdm-14-wtmp.diff
URL: www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@@ -140,6 +144,8 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
%build
%ifos linux
@@ -259,6 +265,11 @@
%config /etc/security/*
%changelog
+* Wed Sep 23 2009 - [email protected]
+- Add patch gdm-14-wtmp.diff so that wtmp records are written properly.
+* Thu Sep 17 2009 - [email protected]
+- Add patch gdm-13-no-sigkill.diff so that now GDM avoids killing processes
+ with SIGKILL. Fixing bug #6871744.
* Fri Sep 11 2009 - [email protected]
- Add patch gdm-12-newlocales.diff to support 28 new locales.
* Fri Sep 04 2009 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-13-no-sigkill.diff Sun Sep 27 04:51:15 2009 +0000
@@ -0,0 +1,54 @@
+--- gdm-2.20.10/daemon/gdm.c-orig 2009-09-17 19:01:48.685077659 -0500
++++ gdm-2.20.10/daemon/gdm.c 2009-09-17 19:04:18.284449021 -0500
+@@ -522,7 +522,7 @@ deal_with_x_crashes (GdmDisplay *d)
+ storeerrno = errno;
+ if ((ret <= 0) && gdm_daemon_config_signal_terminthup_was_notified ()) {
+ kill (-(extra_process), killsignal);
+- killsignal = SIGKILL;
++ killsignal = SIGTERM;
+ }
+ } while (ret == 0 || (ret < 0 && storeerrno == EINTR));
+ }
+--- gdm-2.20.10/daemon/display.c-orig 2009-09-17 18:56:09.905910605 -0500
++++ gdm-2.20.10/daemon/display.c 2009-09-17 19:04:30.046298454 -0500
+@@ -295,9 +295,9 @@ wait_again:
+ killed ourselves */
+ if ((gdm_daemon_config_signal_terminthup_was_notified ()) ||
+ (t + 10 <= time (NULL))) {
+- gdm_debug ("whack_old_slave: GOT ANOTHER SIGTERM (or it was 10 secs already), killing slave again with SIGKILL");
++ gdm_debug ("whack_old_slave: GOT ANOTHER SIGTERM (or it was 10 secs already), killing slave again with SIGTERM");
+ t = time (NULL);
+- kill (d->slavepid, SIGKILL);
++ kill (d->slavepid, SIGTERM);
+ goto wait_again;
+ } else if (ret < 0 && errno == EINTR) {
+ goto wait_again;
+--- gdm-2.20.10/daemon/slave.c-orig 2009-09-17 19:02:25.460469640 -0500
++++ gdm-2.20.10/daemon/slave.c 2009-09-17 19:05:06.744584560 -0500
+@@ -5223,10 +5223,10 @@ gdm_slave_term_handler (int sig)
+ /* be very very very nasty to the extra process if the user is really
+ trying to get rid of us */
+ if (extra_process > 1)
+- kill (-(extra_process), SIGKILL);
++ kill (-(extra_process), SIGTERM);
+ /* also be very nasty to the X server at this stage */
+ if (d->servpid > 1)
+- kill (d->servpid, SIGKILL);
++ kill (d->servpid, SIGTERM);
+ gdm_sigchld_block_pop ();
+ gdm_in_signal--;
+ got_term_before = TRUE;
+--- gdm-2.20.10/daemon/server.c-orig 2009-09-17 19:02:08.227372918 -0500
++++ gdm-2.20.10/daemon/server.c 2009-09-17 19:04:41.929288217 -0500
+@@ -190,9 +190,9 @@ gdm_server_stop (GdmDisplay *disp)
+ servpid = disp->servpid;
+
+ if (waiting_for_server) {
+- gdm_error ("gdm_server_stop: Some problem killing server, whacking with SIGKILL");
++ gdm_error ("gdm_server_stop: Some problem killing server, whacking with SIGTERM");
+ if (disp->servpid > 1)
+- kill (disp->servpid, SIGKILL);
++ kill (disp->servpid, SIGTERM);
+
+ } else {
+ if (disp->servpid > 1 &&
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-14-wtmp.diff Sun Sep 27 04:51:15 2009 +0000
@@ -0,0 +1,23 @@
+--- gdm-2.20.10/daemon/slave.c-orig 2009-09-23 20:39:08.237545928 -0500
++++ gdm-2.20.10/daemon/slave.c 2009-09-23 20:39:42.188367695 -0500
+@@ -120,12 +120,20 @@
+ #endif
+
+ #ifndef GDM_BAD_RECORDS_FILE
++#ifdef __sun
++#define GDM_BAD_RECORDS_FILE "/var/adm/btmp"
++#else
+ #define GDM_BAD_RECORDS_FILE "/var/log/btmp"
+ #endif
++#endif
+
+ #ifndef GDM_NEW_RECORDS_FILE
++#ifdef __sun
++#define GDM_NEW_RECORDS_FILE "/var/adm/wtmpx"
++#else
+ #define GDM_NEW_RECORDS_FILE "/var/log/wtmp"
+ #endif
++#endif
+
+ /* Per-slave globals */
+