diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:47:04 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:47:04 -0300 |
commit | 79f56eaaa1e752a2f67072051b612acf5c648f69 (patch) | |
tree | a466c8fa3a070419d3a816b79a2d38ec80ad04ce /gnome-unstable/gdm/fix-consolekit-registration.patch | |
parent | 37ac99de3bc1df2e6c5e0cd8b6af631d589cb4ab (diff) | |
parent | d739da01541d53414129d3171df221cfe2440fe5 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/antiword/PKGBUILD
community/apcupsd/PKGBUILD
community/busybox/PKGBUILD
community/chrpath/PKGBUILD
community/driftnet/PKGBUILD
community/emesene/PKGBUILD
community/fdm/PKGBUILD
community/fftw2/PKGBUILD
community/gsynaptics/PKGBUILD
community/gtk-rezlooks-engine/PKGBUILD
community/httptunnel/PKGBUILD
community/libnfnetlink/PKGBUILD
community/libopenraw/PKGBUILD
community/mashup/PKGBUILD
community/pcb/PKGBUILD
community/portaudio_cpp/PKGBUILD
community/preload/PKGBUILD
community/rlog/PKGBUILD
community/scponly/PKGBUILD
community/splint/PKGBUILD
community/wmname/PKGBUILD
community/xosd/PKGBUILD
community/xxkb/PKGBUILD
community/znc/PKGBUILD
core/glibc/PKGBUILD
core/libtool/PKGBUILD
extra/at/PKGBUILD
extra/autogen/PKGBUILD
extra/bmp-musepack/PKGBUILD
extra/capi4k-utils/PKGBUILD
extra/cdrdao/PKGBUILD
extra/chkrootkit/PKGBUILD
extra/cmt/PKGBUILD
extra/compface/PKGBUILD
extra/dasher/PKGBUILD
extra/dcfldd/PKGBUILD
extra/dmapi/PKGBUILD
extra/docker/PKGBUILD
extra/dvd+rw-tools/PKGBUILD
extra/dvdrtools/PKGBUILD
extra/fcgi/PKGBUILD
extra/festival/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gecko-sharp-2.0/PKGBUILD
extra/gimp-gap/PKGBUILD
extra/gmetadom/PKGBUILD
extra/gnome-speech/PKGBUILD
extra/gnome-vfsmm/PKGBUILD
extra/gnutls/PKGBUILD
extra/graphite/PKGBUILD
extra/i8kutils/PKGBUILD
extra/id3/PKGBUILD
extra/java-access-bridge/PKGBUILD
extra/kdelibs/PKGBUILD
extra/koffice/PKGBUILD
extra/ladspa/PKGBUILD
extra/libcddb/PKGBUILD
extra/libcroco/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libdca/PKGBUILD
extra/libgee/PKGBUILD
extra/libglademm/PKGBUILD
extra/libgnomecanvasmm/PKGBUILD
extra/libsigsegv/PKGBUILD
extra/libstdc++5/PKGBUILD
extra/libwebkit/PKGBUILD
extra/libytnef/PKGBUILD
extra/lua/PKGBUILD
extra/mcpp/PKGBUILD
extra/metalog/PKGBUILD
extra/mp3wrap/PKGBUILD
extra/mt-st/PKGBUILD
extra/naim/PKGBUILD
extra/ocaml/PKGBUILD
extra/oxine/PKGBUILD
extra/php/PKGBUILD
extra/poppler/PKGBUILD
extra/pstoedit/PKGBUILD
extra/qt/PKGBUILD
extra/speex/PKGBUILD
extra/sweep/PKGBUILD
extra/t1lib/PKGBUILD
extra/taglib-extras/PKGBUILD
extra/unixodbc/PKGBUILD
extra/wireshark/PKGBUILD
extra/ypbind-mt/PKGBUILD
gnome-unstable/caribou/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/cogl/PKGBUILD
gnome-unstable/dconf/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/empathy/empathy.install
gnome-unstable/eog/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gconf/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gdm/fix_external_program_directories.patch
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/gnome-contacts/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-menus/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gnome-power-manager/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gnome-utils/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwnck3/PKGBUILD
gnome-unstable/mash/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/mx/PKGBUILD
gnome-unstable/pulseaudio/PKGBUILD
gnome-unstable/pygobject/PKGBUILD
gnome-unstable/pygobject2/PKGBUILD
gnome-unstable/seahorse/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/totem/PKGBUILD
gnome-unstable/upower/PKGBUILD
gnome-unstable/vala/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-gtk/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nspr/PKGBUILD
multilib/lib32-nss/PKGBUILD
multilib/lib32-nss/add_spi+cacert_ca_certs.patch
multilib/lib32-openssl/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/wine/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'gnome-unstable/gdm/fix-consolekit-registration.patch')
-rw-r--r-- | gnome-unstable/gdm/fix-consolekit-registration.patch | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/gnome-unstable/gdm/fix-consolekit-registration.patch b/gnome-unstable/gdm/fix-consolekit-registration.patch new file mode 100644 index 000000000..282d7705e --- /dev/null +++ b/gnome-unstable/gdm/fix-consolekit-registration.patch @@ -0,0 +1,98 @@ +From 984038d2df357750f49658ad0c5bfe0d2e812ffd Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Tue, 06 Sep 2011 15:41:07 +0000 +Subject: daemon: fix consolekit registration + +ioni pointed out on IRC, that since commit +647cad5bf59a4ff3776ba1ae5cda6b1aaaa1cfb2 + +the greeter session isn't getting fully registered +with consolekit and so udev acls weren't being +properly applied. + +This commit passes the tty to the worker process +so that it can be used for registration. + +It also passes hostname, merely for completeness. +--- +diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c +index 1d5c16a..c25bc9b 100644 +--- a/daemon/gdm-session-direct.c ++++ b/daemon/gdm-session-direct.c +@@ -1401,6 +1401,8 @@ do_introspect (DBusConnection *connection, + " <signal name=\"SetupForProgram\">\n" + " <arg name=\"service_name\" type=\"s\"/>\n" + " <arg name=\"x11_display_name\" type=\"s\"/>\n" ++ " <arg name=\"display_device\" type=\"s\"/>\n" ++ " <arg name=\"hostname\" type=\"s\"/>\n" + " <arg name=\"x11_authority_file\" type=\"s\"/>\n" + " <arg name=\"log_file\" type=\"s\"/>\n" + " </signal>\n" +@@ -2052,6 +2054,8 @@ send_setup_for_program (GdmSessionDirect *session, + DBusMessage *message; + DBusMessageIter iter; + const char *display_name; ++ const char *display_device; ++ const char *display_hostname; + const char *display_x11_authority_file; + GdmSessionConversation *conversation; + +@@ -2062,6 +2066,16 @@ send_setup_for_program (GdmSessionDirect *session, + } else { + display_name = ""; + } ++ if (session->priv->display_hostname != NULL) { ++ display_hostname = session->priv->display_hostname; ++ } else { ++ display_hostname = ""; ++ } ++ if (session->priv->display_device != NULL) { ++ display_device = session->priv->display_device; ++ } else { ++ display_device = ""; ++ } + if (session->priv->display_x11_authority_file != NULL) { + display_x11_authority_file = session->priv->display_x11_authority_file; + } else { +@@ -2077,6 +2091,8 @@ send_setup_for_program (GdmSessionDirect *session, + dbus_message_iter_init_append (message, &iter); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &service_name); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_name); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_device); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_hostname); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_x11_authority_file); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &log_file); + +diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c +index 2b46ca8..c402e6c 100644 +--- a/daemon/gdm-session-worker.c ++++ b/daemon/gdm-session-worker.c +@@ -2597,6 +2597,8 @@ on_setup_for_program (GdmSessionWorker *worker, + DBusError error; + char *service; + char *x11_display_name; ++ char *console; ++ char *hostname; + char *x11_authority_file; + char *log_file; + dbus_bool_t res; +@@ -2611,6 +2613,8 @@ on_setup_for_program (GdmSessionWorker *worker, + &error, + DBUS_TYPE_STRING, &service, + DBUS_TYPE_STRING, &x11_display_name, ++ DBUS_TYPE_STRING, &console, ++ DBUS_TYPE_STRING, &hostname, + DBUS_TYPE_STRING, &x11_authority_file, + DBUS_TYPE_STRING, &log_file, + DBUS_TYPE_INVALID); +@@ -2621,6 +2625,8 @@ on_setup_for_program (GdmSessionWorker *worker, + worker->priv->service = g_strdup (service); + worker->priv->username = g_strdup (GDM_USERNAME); + worker->priv->x11_display_name = g_strdup (x11_display_name); ++ worker->priv->hostname = g_strdup (hostname); ++ worker->priv->display_device = g_strdup (console); + worker->priv->x11_authority_file = g_strdup (x11_authority_file); + worker->priv->log_file = g_strdup (log_file); + worker->priv->is_program_session = TRUE; +-- +cgit v0.9.0.2 |