cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gdm-3.6.2.

Browse Source
This commit is contained in:
ajacoutot 2012-11-14 17:28:35 +00:00
parent 5948dc8133
commit b298cdc8f9
7 changed files with 21 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/gdm/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.140 2012/10/26 07:34:22 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.141 2012/11/14 17:28:35 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 3.6.1
REVISION= 2
GNOME_VERSION= 3.6.2
HOMEPAGE= http://projects.gnome.org/gdm/

4
x11/gnome/gdm/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gdm-3.6.1.tar.xz) = r/ad3lXhG1QBRQAslc+WbNFjdpECg7OFUgQxztEMUDE=
SIZE (gnome/gdm-3.6.1.tar.xz) = 1627088
SHA256 (gnome/gdm-3.6.2.tar.xz) = +/Qb1oKZ7M3PRWwIaXcZmfddPZvw9XzhA42wi1Toy7k=
SIZE (gnome/gdm-3.6.2.tar.xz) = 1627356

10
x11/gnome/gdm/patches/patch-common_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_Makefile_in,v 1.5 2012/10/16 07:02:58 ajacoutot Exp $
--- common/Makefile.in.orig Tue Oct 16 04:28:35 2012
+++ common/Makefile.in Tue Oct 16 08:56:02 2012
@@ -526,7 +526,7 @@ gdm_crash_logger_CPPFLAGS = \
$OpenBSD: patch-common_Makefile_in,v 1.6 2012/11/14 17:28:35 ajacoutot Exp $
--- common/Makefile.in.orig Wed Nov 14 18:01:39 2012
+++ common/Makefile.in Wed Nov 14 18:14:13 2012
@@ -528,7 +528,7 @@ gdm_crash_logger_CPPFLAGS = \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
$(NULL)
@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.5 2012/10/16 07:02:58 ajacoutot Exp $
@MKDTEMP_MISSING_FALSE@MKDTEMP_FILES =
@MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h
libgdmcommon_la_SOURCES = \
@@ -575,6 +575,7 @@ libgdmcommon_la_CFLAGS = \
@@ -577,6 +577,7 @@ libgdmcommon_la_CFLAGS = \
$(NULL)
libgdmcommon_la_LIBADD = \

8
x11/gnome/gdm/patches/patch-configure
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.25 2012/10/16 07:02:58 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.26 2012/11/14 17:28:35 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Tue Oct 16 04:28:32 2012
+++ configure Tue Oct 16 08:56:02 2012
@@ -16949,6 +16949,9 @@ else
--- configure.orig Wed Nov 14 18:01:38 2012
+++ configure Wed Nov 14 18:14:13 2012
@@ -16954,6 +16954,9 @@ else
fi
;;

8
x11/gnome/gdm/patches/patch-daemon_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-daemon_Makefile_in,v 1.4 2012/10/16 07:02:58 ajacoutot Exp $
$OpenBSD: patch-daemon_Makefile_in,v 1.5 2012/11/14 17:28:35 ajacoutot Exp $
undefined reference to `logwtmp'...
--- daemon/Makefile.in.orig Tue Oct 16 04:28:35 2012
+++ daemon/Makefile.in Tue Oct 16 08:56:02 2012
@@ -755,6 +755,7 @@ gdm_session_worker_LDFLAGS = \
--- daemon/Makefile.in.orig Wed Nov 14 18:01:39 2012
+++ daemon/Makefile.in Wed Nov 14 18:14:13 2012
@@ -757,6 +757,7 @@ gdm_session_worker_LDFLAGS = \
gdm_session_worker_LDADD = \
$(top_builddir)/common/libgdmcommon.la \
$(DAEMON_LIBS) \

92
x11/gnome/gdm/patches/patch-daemon_gdm-dbus-util_c
View File

@ -1,92 +0,0 @@
$OpenBSD: patch-daemon_gdm-dbus-util_c,v 1.1 2012/10/16 15:53:30 ajacoutot Exp $
From 0b5e101580761d060343b484b78caf5923b38dc6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 16 Oct 2012 14:32:00 +0000
Subject: gdm-dbus-util: make socket world accessible
From f6d6a664e1591d0485c52907caf5f4d0b612b504 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 16 Oct 2012 14:53:08 +0000
Subject: gdm-dbus-util: don't try to generate abstract socket address ourselves
--- daemon/gdm-dbus-util.c.orig Thu Oct 4 00:03:41 2012
+++ daemon/gdm-dbus-util.c Tue Oct 16 17:29:33 2012
@@ -19,6 +19,9 @@
*/
#include "gdm-dbus-util.h"
+#include <string.h>
+
+#include <glib/gstdio.h>
#include <gio/gunixsocketaddress.h>
/* a subset of org.freedesktop.DBus interface, to be used by internal servers */
@@ -68,57 +71,34 @@ handle_connection (GDBusServer *server,
return FALSE;
}
-/* Note: Use abstract sockets like dbus does by default on Linux. Abstract
- * sockets are only available on Linux.
- */
-static char *
-generate_address (void)
-{
- char *path;
-
- if (g_unix_socket_address_abstract_names_supported ()) {
- int i;
- char tmp[9];
-
- for (i = 0; i < 8; i++) {
- if (g_random_int_range (0, 2) == 0) {
- tmp[i] = g_random_int_range ('a', 'z' + 1);
- } else {
- tmp[i] = g_random_int_range ('A', 'Z' + 1);
- }
- }
- tmp[8] = '\0';
-
- path = g_strdup_printf ("unix:abstract=/tmp/gdm-greeter-%s", tmp);
- } else {
- path = g_strdup ("unix:tmpdir=/tmp");
- }
-
- return path;
-}
-
GDBusServer *
gdm_dbus_setup_private_server (GDBusAuthObserver *observer,
GError **error)
{
- char *address, *guid;
+ char *guid;
+ const char *client_address;
GDBusServer *server;
- address = generate_address ();
guid = g_dbus_generate_guid ();
- server = g_dbus_server_new_sync (address,
+ server = g_dbus_server_new_sync ("unix:tmpdir=/tmp",
G_DBUS_SERVER_FLAGS_NONE,
guid,
observer,
NULL,
error);
+ client_address = g_dbus_server_get_client_address (server);
+
+ if (g_str_has_prefix (client_address, "unix:path=")) {
+ client_address += strlen("unix:path=");
+ g_chmod (client_address, 0666);
+ }
+
g_signal_connect (server, "new-connection",
G_CALLBACK (handle_connection),
NULL);
- g_free (address);
g_free (guid);
return server;

8
x11/gnome/gdm/patches/patch-gui_simple-greeter_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gui_simple-greeter_Makefile_in,v 1.5 2012/10/16 07:02:58 ajacoutot Exp $
--- gui/simple-greeter/Makefile.in.orig Tue Oct 16 04:28:37 2012
+++ gui/simple-greeter/Makefile.in Tue Oct 16 08:56:02 2012
@@ -574,7 +574,7 @@ AM_CPPFLAGS = \
$OpenBSD: patch-gui_simple-greeter_Makefile_in,v 1.6 2012/11/14 17:28:35 ajacoutot Exp $
--- gui/simple-greeter/Makefile.in.orig Wed Nov 14 18:01:40 2012
+++ gui/simple-greeter/Makefile.in Wed Nov 14 18:14:13 2012
@@ -576,7 +576,7 @@ AM_CPPFLAGS = \
-DGDMCONFDIR=\"$(gdmconfdir)\" \
-DDATADIR=\""$(datadir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \