2010-08-10 Brian Cameron <
[email protected]>
* base-specs/gdm.spec, patches/gdm-03-sdtlogin.diff,
patches/gdm-05-default.diff, patches/gdm-23-firsttime-helper.diff:
Update to 2.30.5 and rework patches so they apply. This fixes
upstream GNOME bugzilla bugs #619588 and #626564.
--- a/ChangeLog Wed Aug 11 11:38:23 2010 +0000
+++ b/ChangeLog Fri Aug 13 16:04:51 2010 +0000
@@ -1,3 +1,10 @@
+2010-08-10 Brian Cameron <[email protected]>
+
+ * base-specs/gdm.spec, patches/gdm-03-sdtlogin.diff,
+ patches/gdm-05-default.diff, patches/gdm-23-firsttime-helper.diff:
+ Update to 2.30.5 and rework patches so they apply. This fixes
+ upstream GNOME bugzilla bugs #619588 and #626564.
+
2010-08-10 Brian Cameron <[email protected]>
* patches/xscreensaver-13-trusted.diff,
--- a/base-specs/gdm.spec Wed Aug 11 11:38:23 2010 +0000
+++ b/base-specs/gdm.spec Fri Aug 13 16:04:51 2010 +0000
@@ -13,7 +13,7 @@
Name: gdm
License: GPL v2, LGPL v2, MIT
Group: System/GUI/GNOME
-Version: 2.30.4
+Version: 2.30.5
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
@@ -143,6 +143,7 @@
test ! -d ./m4 && mkdir ./m4
glib-gettextize -f
intltoolize --force --copy --automake
+libtoolize --force
aclocal $ACLOCAL_FLAGS -I . -I ./m4
autoheader
gnome-doc-prepare --force
@@ -231,6 +232,8 @@
%{_localstatedir}/lib/gdm
%changelog
+* Wed Aug 11 2010 - [email protected]
+- Bump to 2.30.5.
* Mon Jul 19 2010 - [email protected]
- Add patch gdm-24-restart-buttons.diff.
* Wed Jul 07 2010 - [email protected]
--- a/patches/gdm-03-sdtlogin.diff Wed Aug 11 11:38:23 2010 +0000
+++ b/patches/gdm-03-sdtlogin.diff Fri Aug 13 16:04:51 2010 +0000
@@ -56,7 +56,7 @@
#include <security/pam_appl.h>
#include <glib.h>
-@@ -64,6 +71,7 @@
+@@ -65,6 +72,7 @@
#endif
#include "gdm-session-settings.h"
@@ -64,7 +64,7 @@
#define GDM_SESSION_WORKER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SESSION_WORKER, GdmSessionWorkerPrivate))
-@@ -156,12 +164,115 @@ static void gdm_session_worker_finalize (GObject *object);
+@@ -155,12 +163,115 @@ static void gdm_session_worker_final
static void queue_state_change (GdmSessionWorker *worker);
typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int,
@@ -181,7 +181,7 @@
GQuark
gdm_session_worker_error_quark (void)
{
-@@ -592,7 +703,11 @@ static gboolean
+@@ -591,7 +702,11 @@ static gboolean
gdm_session_worker_get_username (GdmSessionWorker *worker,
char **username)
{
@@ -193,7 +193,7 @@
g_assert (worker->priv->pam_handle != NULL);
-@@ -861,7 +976,7 @@ gdm_session_worker_process_pam_message (GdmSessionWorker *worker,
+@@ -865,7 +980,7 @@ gdm_session_worker_process_pam_message (
static int
gdm_session_worker_pam_new_messages_handler (int number_of_messages,
@@ -202,9 +202,9 @@
struct pam_response **responses,
GdmSessionWorker *worker)
{
-@@ -1987,6 +2102,11 @@ gdm_session_worker_start_user_session (GdmSessionWorker *worker,
+@@ -2016,6 +2131,11 @@ gdm_session_worker_start_user_session (G
- passwd_entry = getpwnam (worker->priv->username);
+ gdm_get_pwent_for_name (worker->priv->username, &passwd_entry);
+#ifdef __sun
+ solaris_xserver_cred (worker->priv->username,
--- a/patches/gdm-05-default.diff Wed Aug 11 11:38:23 2010 +0000
+++ b/patches/gdm-05-default.diff Fri Aug 13 16:04:51 2010 +0000
@@ -11,15 +11,15 @@
--- gdm-2.30.1/common/gdm-common.c-orig 2009-03-30 14:59:24.837987000 -0500
+++ gdm-2.30.1/common/gdm-common.c 2009-03-30 15:00:41.625204000 -0500
-@@ -26,6 +26,7 @@
- #include <locale.h>
+@@ -27,6 +27,7 @@
#include <fcntl.h>
#include <sys/wait.h>
+ #include <pwd.h>
+#include <deflt.h>
#include <glib.h>
#include <glib/gi18n.h>
-@@ -451,3 +452,27 @@ gdm_generate_random_bytes (gsize size
+@@ -470,3 +471,27 @@ gdm_generate_random_bytes (gsize size
close (fd);
return bytes;
}
--- a/patches/gdm-23-firsttime-helper.diff Wed Aug 11 11:38:23 2010 +0000
+++ b/patches/gdm-23-firsttime-helper.diff Fri Aug 13 16:04:51 2010 +0000
@@ -1,14 +1,6 @@
diff -ruN gdm-2.30.4.orig/common/gdm-common.c gdm-2.30.4/common/gdm-common.c
--- gdm-2.30.4.orig/common/gdm-common.c 2010-08-04 15:18:17.691778644 +0500
+++ gdm-2.30.4/common/gdm-common.c 2010-08-04 15:19:03.618516634 +0500
-@@ -26,6 +26,7 @@
- #include <locale.h>
- #include <fcntl.h>
- #include <sys/wait.h>
-+#include <pwd.h>
- #include <deflt.h>
-
- #include <glib.h>
@@ -476,3 +477,26 @@
return retval;
}