kalev pushed to gdm (f22). "Update to 3.16.1"

[notifications at fedoraproject.org]

>From 62131b92b35fc6b37529697b6754d0401d8272f4 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Thu, 16 Apr 2015 11:37:48 +0200
Subject: Update to 3.16.1


diff --git a/.gitignore b/.gitignore
index 5bb2a0a..6010692 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ gdm-2.30.2.tar.bz2
 /gdm-3.15.92.tar.xz
 /gdm-3.16.0.tar.xz
 /gdm-3.16.0.1.tar.xz
+/gdm-3.16.1.tar.xz
diff --git a/0001-gdm-x-session-set-XORG_RUN_AS_USER_OK-1-environment-.patch b/0001-gdm-x-session-set-XORG_RUN_AS_USER_OK-1-environment-.patch
deleted file mode 100644
index ce3f31a..0000000
--- a/0001-gdm-x-session-set-XORG_RUN_AS_USER_OK-1-environment-.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 798a1ad79bdb937c4b0c9008562cd543acaf3206 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 27 Mar 2015 10:10:54 -0400
-Subject: [PATCH] gdm-x-session: set XORG_RUN_AS_USER_OK=1 environment variable
-
-This lets the X server know that it can safely drop privileges.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=746891
----
- daemon/gdm-x-session.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
-index dfd6016..3cc7d40 100644
---- a/daemon/gdm-x-session.c
-+++ b/daemon/gdm-x-session.c
-@@ -195,60 +195,61 @@ spawn_x_server (State        *state,
- {
-         GPtrArray           *arguments = NULL;
-         GSubprocessLauncher *launcher = NULL;
-         GSubprocess         *subprocess = NULL;
-         GInputStream        *input_stream = NULL;
-         GDataInputStream    *data_stream = NULL;
-         GError              *error = NULL;
- 
-         char     *auth_file;
-         gboolean  is_running = FALSE;
-         int       ret;
-         int       pipe_fds[2];
-         char     *display_fd_string = NULL;
-         char     *vt_string = NULL;
-         char     *display_number;
-         gsize     display_number_size;
- 
-         auth_file = prepare_auth_file ();
- 
-         g_debug ("Running X server");
- 
-         ret = g_unix_open_pipe (pipe_fds, FD_CLOEXEC, &error);
- 
-         if (!ret) {
-                 g_debug ("could not open pipe: %s", error->message);
-                 goto out;
-         }
- 
-         arguments = g_ptr_array_new ();
-         launcher = g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDIN_INHERIT);
-+        g_subprocess_launcher_setenv (launcher, "XORG_RUN_AS_USER_OK", "1", TRUE);
-         g_subprocess_launcher_take_fd (launcher, pipe_fds[1], DISPLAY_FILENO);
- 
-         if (g_getenv ("XDG_VTNR") != NULL) {
-                 int vt;
- 
-                 vt = atoi (g_getenv ("XDG_VTNR"));
- 
-                 if (vt > 0 && vt < 64) {
-                         vt_string = g_strdup_printf ("vt%d", vt);
-                 }
-         }
- 
-         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- 
-         g_ptr_array_add (arguments, X_SERVER);
- 
-         if (vt_string != NULL) {
-                 g_ptr_array_add (arguments, vt_string);
-         }
- 
-         g_ptr_array_add (arguments, "-displayfd");
-         g_ptr_array_add (arguments, display_fd_string);
- 
-         g_ptr_array_add (arguments, "-auth");
-         g_ptr_array_add (arguments, auth_file);
- 
-         if (!allow_remote_connections) {
-                 g_ptr_array_add (arguments, "-nolisten");
-                 g_ptr_array_add (arguments, "tcp");
-         }
--- 
-2.3.3
-
diff --git a/gdm.spec b/gdm.spec
index ad37b65..6b307d3 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -10,8 +10,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 3.16.0.1
-Release: 3%{?dist}
+Version: 3.16.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -19,7 +19,6 @@ URL: https://wiki.gnome.org/Projects/GDM
 #VCS: git:git://git.gnome.org/gdm
 Source: http://download.gnome.org/sources/gdm/3.16/gdm-%{version}.tar.xz
 Source1: org.gnome.login-screen.gschema.override
-Patch0: 0001-gdm-x-session-set-XORG_RUN_AS_USER_OK-1-environment-.patch
 
 BuildRequires: pam-devel >= 0:%{pam_version}
 BuildRequires: fontconfig >= 0:%{fontconfig_version}
@@ -105,7 +104,6 @@ files needed to build custom greeters.
 
 %prep
 %setup -q
-%patch0 -p1 -b .xorg-run-as-user-ok
 
 autoreconf -i -f
 intltoolize -f
@@ -300,6 +298,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gdm.pc
 
 %changelog
+* Thu Apr 16 2015 Kalev Lember <kalevlember at gmail.com> 3.16.1-1
+- Update to 3.16.1
+
 * Tue Apr 07 2015 Ray Strode <rstrode at redhat.com> 3.16.0.1-3
 - Fix permissions on /var/lib/gdm/.local/share
 - Fixes starting Xorg without root on machines that started out
diff --git a/sources b/sources
index 356970c..69f2faf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aaa25131a812538bc7eb2974673ca372  gdm-3.16.0.1.tar.xz
+fcaf85a46d8de0132eccd1f0c02d7d7c  gdm-3.16.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gdm.git/commit/?h=f22&id=62131b92b35fc6b37529697b6754d0401d8272f4