From d1ca298d4a4e87edbbb754f3ed8187ff3405af58 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 25 Nov 2009 08:33:39 -0800 Subject: gdm: update to 2.28.1 --- recipes/gnome/gdm-2.28.0/%gconf-tree.xml | 492 ------------------------- recipes/gnome/gdm-2.28.0/cross-xdetection.diff | 66 ---- recipes/gnome/gdm-2.28.0/gdm | 89 ----- recipes/gnome/gdm-2.28.0/gdm-nodocs.patch | 12 - recipes/gnome/gdm-2.28.0/gdm-pam | 11 - recipes/gnome/gdm-2.28.0/gdm.conf | 80 ---- recipes/gnome/gdm-2.28.0/other | 17 - recipes/gnome/gdm-2.28.1/%gconf-tree.xml | 492 +++++++++++++++++++++++++ recipes/gnome/gdm-2.28.1/cross-xdetection.diff | 66 ++++ recipes/gnome/gdm-2.28.1/gdm | 89 +++++ recipes/gnome/gdm-2.28.1/gdm-nodocs.patch | 12 + recipes/gnome/gdm-2.28.1/gdm-pam | 11 + recipes/gnome/gdm-2.28.1/gdm.conf | 80 ++++ recipes/gnome/gdm-2.28.1/other | 17 + recipes/gnome/gdm_2.28.0.bb | 77 ---- recipes/gnome/gdm_2.28.1.bb | 80 ++++ 16 files changed, 847 insertions(+), 844 deletions(-) delete mode 100644 recipes/gnome/gdm-2.28.0/%gconf-tree.xml delete mode 100644 recipes/gnome/gdm-2.28.0/cross-xdetection.diff delete mode 100755 recipes/gnome/gdm-2.28.0/gdm delete mode 100644 recipes/gnome/gdm-2.28.0/gdm-nodocs.patch delete mode 100644 recipes/gnome/gdm-2.28.0/gdm-pam delete mode 100644 recipes/gnome/gdm-2.28.0/gdm.conf delete mode 100644 recipes/gnome/gdm-2.28.0/other create mode 100644 recipes/gnome/gdm-2.28.1/%gconf-tree.xml create mode 100644 recipes/gnome/gdm-2.28.1/cross-xdetection.diff create mode 100755 recipes/gnome/gdm-2.28.1/gdm create mode 100644 recipes/gnome/gdm-2.28.1/gdm-nodocs.patch create mode 100644 recipes/gnome/gdm-2.28.1/gdm-pam create mode 100644 recipes/gnome/gdm-2.28.1/gdm.conf create mode 100644 recipes/gnome/gdm-2.28.1/other delete mode 100644 recipes/gnome/gdm_2.28.0.bb create mode 100644 recipes/gnome/gdm_2.28.1.bb (limited to 'recipes/gnome') diff --git a/recipes/gnome/gdm-2.28.0/%gconf-tree.xml b/recipes/gnome/gdm-2.28.0/%gconf-tree.xml deleted file mode 100644 index f8c2e9cc20..0000000000 --- a/recipes/gnome/gdm-2.28.0/%gconf-tree.xml +++ /dev/null @@ -1,492 +0,0 @@ - - - - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - - - - - - - - - - - - - - - - - /bin/true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /bin/true - - - gdm-screenshot - - - - - disabled - - - disabled - - - disabled - - - disabled - - - disabled - - - disabled - - - disabled - - - Print - - - disabled - - - disabled - - - - - - - - - - - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - gdm-screenshot - - -
  • - cube -
    • -
  • - decoration -
    • -
  • - gconf -
    • -
  • - glib -
    • -
  • - move -
    • -
  • - place -
    • -
  • - resize -
    • -
  • - screenshot -
    • -
  • - wobbly -
    • -     -     -     -     -     - - - - - - - - - - - - - - - - -     -     diff --git a/recipes/gnome/gdm-2.28.0/cross-xdetection.diff b/recipes/gnome/gdm-2.28.0/cross-xdetection.diff deleted file mode 100644 index 150f79763a..0000000000 --- a/recipes/gnome/gdm-2.28.0/cross-xdetection.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- gdm-2.26.1/configure.ac-orig 2009-03-16 12:50:10.000000000 -0700 -+++ gdm-2.26.1/configure.ac 2009-06-12 16:40:40.000000000 -0700 -@@ -1085,62 +1085,10 @@ dnl ------------------------------------ - # and /usr/X11 since they often symlink to each other, and configure - # should use the more stable location (the real directory) if possible. - # --if test -x /usr/X11/bin/Xserver; then -- X_PATH="/usr/X11/bin" -- X_SERVER_PATH="/usr/X11/bin" -- X_SERVER="/usr/X11/bin/Xserver" -- X_CONFIG_OPTIONS="-audit 0" --elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then -- X_PATH="/usr/X11R6/bin" -- X_SERVER_PATH="/usr/X11R6/bin" -- X_SERVER="/usr/X11R6/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then -- X_PATH="/usr/X11/bin" -- X_SERVER_PATH="/usr/X11/bin" -- X_SERVER="/usr/X11/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/X11R6/bin/X; then -- X_PATH="/usr/X11R6/bin" -- X_SERVER_PATH="/usr/X11R6/bin" -- X_SERVER="/usr/X11R6/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/bin/Xorg; then -- X_PATH="/usr/bin" -- X_SERVER_PATH="/usr/bin" -- X_SERVER="/usr/bin/Xorg" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/X11/bin/X; then -- X_PATH="/usr/X11/bin" -- X_SERVER_PATH="/usr/X11/bin" -- X_SERVER="/usr/X11/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/openwin/bin/Xsun; then -- # Do not add /usr/openwin/bin here because on Solaris you need -- # /usr/openwin/bin in your PATH even if you are using the Xorg -- # Xserver. We add this to the path below. -- X_PATH="/usr/openwin/bin" -- X_SERVER_PATH="/usr/openwin/bin" -- X_SERVER="/usr/openwin/bin/Xsun" -- X_CONFIG_OPTIONS="-audit 0 -nobanner" --elif test -x /opt/X11R6/bin/X; then -- X_PATH="/opt/X11R6/bin" -- X_SERVER_PATH="/opt/X11R6/bin" -- X_SERVER="/opt/X11R6/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/bin/X; then - X_PATH="/usr/bin" - X_SERVER_PATH="/usr/bin" -- X_SERVER="/usr/bin/X" -+ X_SERVER="/usr/bin/X" - X_CONFIG_OPTIONS="-audit 0" --else -- # what to do, what to do, this is wrong, but this just sets the -- # defaults, perhaps this user is cross compiling or some such -- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin" -- X_SERVER_PATH="/usr/X11R6/bin" -- X_SERVER="/usr/X11R6/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --fi - - dnl --------------------------------------------------------------------------- - dnl - Check for Xnest / Xephyr support diff --git a/recipes/gnome/gdm-2.28.0/gdm b/recipes/gnome/gdm-2.28.0/gdm deleted file mode 100755 index 43eae95177..0000000000 --- a/recipes/gnome/gdm-2.28.0/gdm +++ /dev/null @@ -1,89 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: gdm -# Should-Start: console-screen acpid dbus hal network-manager -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: GNOME Display Manager -# Description: Debian init script for the GNOME Display Manager -### END INIT INFO -# -# Author: Ryan Murray -# -set -e - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/gdm - -test -x $DAEMON || exit 0 - -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE -fi - -# To start gdm even if it is not the default display manager, change -# HEED_DEFAULT_DISPLAY_MANAGER to "false." -HEED_DEFAULT_DISPLAY_MANAGER=true -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -case "$1" in - start) - # make needed directories in volatile - - if [ -e /var/log/gdm ] ; then - rm -rf /var/log/gdm - fi - - mkdir -m 01770 /var/log/gdm - chown gdm:gdm /var/log/gdm - - if [ -e /tmp/.ICE-unix ] ; then - rm -rf /tmp/.ICE-unix - fi - - mkdir -m 01777 /tmp/.ICE-unix - chown root:root /tmp/.ICE-unix - - CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)") - if grep -wqs text /proc/cmdline; then - echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline." - elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \ - [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \ - [ "$CONFIGURED_DAEMON" != gdm ] ; then - echo "Not starting GNOME Display Manager; it is not the default display manager" - else - echo "Starting GNOME Display Manager" "gdm" - start-stop-daemon --start -b --exec $DAEMON - fi - ;; - stop) - echo "Stopping GNOME Display Manager" "gdm" - set +e - start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \ - --name gdm --retry 5 - set -e - ;; - reload) - echo "Scheduling reload of GNOME Display Manager configuration" "gdm" - set +e - start-stop-daemon --stop --signal USR1 --quiet --pidfile \ - /var/run/gdm.pid --name gdm - set -e - ;; - status) - status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $? - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/recipes/gnome/gdm-2.28.0/gdm-nodocs.patch b/recipes/gnome/gdm-2.28.0/gdm-nodocs.patch deleted file mode 100644 index 395fa627eb..0000000000 --- a/recipes/gnome/gdm-2.28.0/gdm-nodocs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- /tmp/Makefile.am 2006-07-26 11:37:52.000000000 +0200 -+++ gdm-2.14.9/Makefile.am 2006-07-26 11:38:01.734411000 +0200 -@@ -5,8 +5,7 @@ - vicious-extensions \ - daemon \ - gui \ -- utils \ -- docs -+ utils - - # add these when help gets added back - # docs omf-install diff --git a/recipes/gnome/gdm-2.28.0/gdm-pam b/recipes/gnome/gdm-2.28.0/gdm-pam deleted file mode 100644 index f9fafed9d6..0000000000 --- a/recipes/gnome/gdm-2.28.0/gdm-pam +++ /dev/null @@ -1,11 +0,0 @@ -# -# default; standard UN*X access -# -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so - -auth optional pam_gnome_keyring.so -session optional pam_gnome_keyring.so auto_start - diff --git a/recipes/gnome/gdm-2.28.0/gdm.conf b/recipes/gnome/gdm-2.28.0/gdm.conf deleted file mode 100644 index 559823b863..0000000000 --- a/recipes/gnome/gdm-2.28.0/gdm.conf +++ /dev/null @@ -1,80 +0,0 @@ -# GDM Custom Configuration file. -# -# This file is the appropriate place for specifying your customizations to the -# GDM configuration. If you run gdmsetup, it will automatically edit this -# file for you and will cause the daemon and any running GDM GUI programs to -# automatically update with the new configuration. Not all configuration -# options are supported by gdmsetup, so to modify some values it may be -# necessary to modify this file directly by hand. -# -# This file overrides the default configuration settings. These settings -# are stored in the GDM System Defaults configuration file, which is found -# at the following location. -# -# /usr/share/gdm/defaults.conf. -# -# This file contains comments about the meaning of each configuration option, -# so is also a useful reference. Also refer to the documentation links at -# the end of this comment for further information. In short, to hand-edit -# this file, simply add or modify the key=value combination in the -# appropriate section in the template below this comment section. -# -# For example, if you want to specify a different value for the Enable key -# in the "[debug]" section of your GDM System Defaults configuration file, -# then add "Enable=true" in the "[debug]" section of this file. If the -# key already exists in this file, then simply modify it. -# -# Older versions of GDM used the "gdm.conf" file for configuration. If your -# system has an old gdm.conf file on the system, it will be used instead of -# this file - so changes made to this file will not take effect. Consider -# migrating your configuration to this file and removing the gdm.conf file. -# -# If you hand edit a GDM configuration file, you can run the following -# command and the GDM daemon will immediately reflect the change. Any -# running GDM GUI programs will also be notified to update with the new -# configuration. -# -# gdmflexiserver --command="UPDATE_CONFIG " -# -# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable". -# -# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and -# re-read the new configuration settings. You can also restart GDM by sending -# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes -# any user session started by GDM to exit immediately while USR1 behaves like -# gdm-safe-restart and will wait until all users log out before restarting GDM. -# -# For full reference documentation see the gnome help browser under -# GNOME|System category. You can also find the docs in HTML form on -# http://www.gnome.org/projects/gdm/ -# -# NOTE: Lines that begin with "#" are considered comments. -# -# Have fun! - -[daemon] - -[security] - -[xdmcp] - -[gui] - -[greeter] - -[chooser] - -[debug] - -# Note that to disable servers defined in the GDM System Defaults -# configuration file (such as 0=Standard, you must put a line in this file -# that says 0=inactive, as described in the Configuration section of the GDM -# documentation. -# -[servers] - -# Also note, that if you redefine a [server-foo] section, then GDM will -# use the definition in this file, not the GDM System Defaults configuration -# file. It is currently not possible to disable a [server-foo] section -# defined in the GDM System Defaults configuration file. -# diff --git a/recipes/gnome/gdm-2.28.0/other b/recipes/gnome/gdm-2.28.0/other deleted file mode 100644 index 1fe5756178..0000000000 --- a/recipes/gnome/gdm-2.28.0/other +++ /dev/null @@ -1,17 +0,0 @@ -# -# /etc/pam.d/other - specify the PAM fallback behaviour -# -# Note that this file is used for any unspecified service; for example -#if /etc/pam.d/cron specifies no session modules but cron calls -#pam_open_session, the session module out of /etc/pam.d/other is -#used. If you really want nothing to happen then use pam_permit.so or -#pam_deny.so as appropriate. - -# -# default; standard UN*X access -# -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so - diff --git a/recipes/gnome/gdm-2.28.1/%gconf-tree.xml b/recipes/gnome/gdm-2.28.1/%gconf-tree.xml new file mode 100644 index 0000000000..f8c2e9cc20 --- /dev/null +++ b/recipes/gnome/gdm-2.28.1/%gconf-tree.xml @@ -0,0 +1,492 @@ + + + + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + /bin/true + + + + + + + + + + + + + + + + + + + + + /bin/true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /bin/true + + + gdm-screenshot + + + + + disabled + + + disabled + + + disabled + + + disabled + + + disabled + + + disabled + + + disabled + + + Print + + + disabled + + + disabled + + + + + + + + + + + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + Disabled + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gdm-screenshot + + +
  • + cube +
    • +
  • + decoration +
    • +
  • + gconf +
    • +
  • + glib +
    • +
  • + move +
    • +
  • + place +
    • +
  • + resize +
    • +
  • + screenshot +
    • +
  • + wobbly +
    • +     +     +     +     +     + + + + + + + + + + + + + + + + +     +     diff --git a/recipes/gnome/gdm-2.28.1/cross-xdetection.diff b/recipes/gnome/gdm-2.28.1/cross-xdetection.diff new file mode 100644 index 0000000000..150f79763a --- /dev/null +++ b/recipes/gnome/gdm-2.28.1/cross-xdetection.diff @@ -0,0 +1,66 @@ +--- gdm-2.26.1/configure.ac-orig 2009-03-16 12:50:10.000000000 -0700 ++++ gdm-2.26.1/configure.ac 2009-06-12 16:40:40.000000000 -0700 +@@ -1085,62 +1085,10 @@ dnl ------------------------------------ + # and /usr/X11 since they often symlink to each other, and configure + # should use the more stable location (the real directory) if possible. + # +-if test -x /usr/X11/bin/Xserver; then +- X_PATH="/usr/X11/bin" +- X_SERVER_PATH="/usr/X11/bin" +- X_SERVER="/usr/X11/bin/Xserver" +- X_CONFIG_OPTIONS="-audit 0" +-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then +- X_PATH="/usr/X11R6/bin" +- X_SERVER_PATH="/usr/X11R6/bin" +- X_SERVER="/usr/X11R6/bin/X" +- X_CONFIG_OPTIONS="-audit 0" +-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then +- X_PATH="/usr/X11/bin" +- X_SERVER_PATH="/usr/X11/bin" +- X_SERVER="/usr/X11/bin/X" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/X11R6/bin/X; then +- X_PATH="/usr/X11R6/bin" +- X_SERVER_PATH="/usr/X11R6/bin" +- X_SERVER="/usr/X11R6/bin/X" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/bin/Xorg; then +- X_PATH="/usr/bin" +- X_SERVER_PATH="/usr/bin" +- X_SERVER="/usr/bin/Xorg" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/X11/bin/X; then +- X_PATH="/usr/X11/bin" +- X_SERVER_PATH="/usr/X11/bin" +- X_SERVER="/usr/X11/bin/X" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/openwin/bin/Xsun; then +- # Do not add /usr/openwin/bin here because on Solaris you need +- # /usr/openwin/bin in your PATH even if you are using the Xorg +- # Xserver. We add this to the path below. +- X_PATH="/usr/openwin/bin" +- X_SERVER_PATH="/usr/openwin/bin" +- X_SERVER="/usr/openwin/bin/Xsun" +- X_CONFIG_OPTIONS="-audit 0 -nobanner" +-elif test -x /opt/X11R6/bin/X; then +- X_PATH="/opt/X11R6/bin" +- X_SERVER_PATH="/opt/X11R6/bin" +- X_SERVER="/opt/X11R6/bin/X" +- X_CONFIG_OPTIONS="-audit 0" +-elif test -x /usr/bin/X; then + X_PATH="/usr/bin" + X_SERVER_PATH="/usr/bin" +- X_SERVER="/usr/bin/X" ++ X_SERVER="/usr/bin/X" + X_CONFIG_OPTIONS="-audit 0" +-else +- # what to do, what to do, this is wrong, but this just sets the +- # defaults, perhaps this user is cross compiling or some such +- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin" +- X_SERVER_PATH="/usr/X11R6/bin" +- X_SERVER="/usr/X11R6/bin/X" +- X_CONFIG_OPTIONS="-audit 0" +-fi + + dnl --------------------------------------------------------------------------- + dnl - Check for Xnest / Xephyr support diff --git a/recipes/gnome/gdm-2.28.1/gdm b/recipes/gnome/gdm-2.28.1/gdm new file mode 100755 index 0000000000..43eae95177 --- /dev/null +++ b/recipes/gnome/gdm-2.28.1/gdm @@ -0,0 +1,89 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: gdm +# Should-Start: console-screen acpid dbus hal network-manager +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: GNOME Display Manager +# Description: Debian init script for the GNOME Display Manager +### END INIT INFO +# +# Author: Ryan Murray +# +set -e + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/gdm + +test -x $DAEMON || exit 0 + +if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG LANGUAGE +fi + +# To start gdm even if it is not the default display manager, change +# HEED_DEFAULT_DISPLAY_MANAGER to "false." +HEED_DEFAULT_DISPLAY_MANAGER=true +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +case "$1" in + start) + # make needed directories in volatile + + if [ -e /var/log/gdm ] ; then + rm -rf /var/log/gdm + fi + + mkdir -m 01770 /var/log/gdm + chown gdm:gdm /var/log/gdm + + if [ -e /tmp/.ICE-unix ] ; then + rm -rf /tmp/.ICE-unix + fi + + mkdir -m 01777 /tmp/.ICE-unix + chown root:root /tmp/.ICE-unix + + CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)") + if grep -wqs text /proc/cmdline; then + echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline." + elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \ + [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \ + [ "$CONFIGURED_DAEMON" != gdm ] ; then + echo "Not starting GNOME Display Manager; it is not the default display manager" + else + echo "Starting GNOME Display Manager" "gdm" + start-stop-daemon --start -b --exec $DAEMON + fi + ;; + stop) + echo "Stopping GNOME Display Manager" "gdm" + set +e + start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \ + --name gdm --retry 5 + set -e + ;; + reload) + echo "Scheduling reload of GNOME Display Manager configuration" "gdm" + set +e + start-stop-daemon --stop --signal USR1 --quiet --pidfile \ + /var/run/gdm.pid --name gdm + set -e + ;; + status) + status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $? + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/gnome/gdm-2.28.1/gdm-nodocs.patch b/recipes/gnome/gdm-2.28.1/gdm-nodocs.patch new file mode 100644 index 0000000000..395fa627eb --- /dev/null +++ b/recipes/gnome/gdm-2.28.1/gdm-nodocs.patch @@ -0,0 +1,12 @@ +--- /tmp/Makefile.am 2006-07-26 11:37:52.000000000 +0200 ++++ gdm-2.14.9/Makefile.am 2006-07-26 11:38:01.734411000 +0200 +@@ -5,8 +5,7 @@ + vicious-extensions \ + daemon \ + gui \ +- utils \ +- docs ++ utils + + # add these when help gets added back + # docs omf-install diff --git a/recipes/gnome/gdm-2.28.1/gdm-pam b/recipes/gnome/gdm-2.28.1/gdm-pam new file mode 100644 index 0000000000..f9fafed9d6 --- /dev/null +++ b/recipes/gnome/gdm-2.28.1/gdm-pam @@ -0,0 +1,11 @@ +# +# default; standard UN*X access +# +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so + +auth optional pam_gnome_keyring.so +session optional pam_gnome_keyring.so auto_start + diff --git a/recipes/gnome/gdm-2.28.1/gdm.conf b/recipes/gnome/gdm-2.28.1/gdm.conf new file mode 100644 index 0000000000..559823b863 --- /dev/null +++ b/recipes/gnome/gdm-2.28.1/gdm.conf @@ -0,0 +1,80 @@ +# GDM Custom Configuration file. +# +# This file is the appropriate place for specifying your customizations to the +# GDM configuration. If you run gdmsetup, it will automatically edit this +# file for you and will cause the daemon and any running GDM GUI programs to +# automatically update with the new configuration. Not all configuration +# options are supported by gdmsetup, so to modify some values it may be +# necessary to modify this file directly by hand. +# +# This file overrides the default configuration settings. These settings +# are stored in the GDM System Defaults configuration file, which is found +# at the following location. +# +# /usr/share/gdm/defaults.conf. +# +# This file contains comments about the meaning of each configuration option, +# so is also a useful reference. Also refer to the documentation links at +# the end of this comment for further information. In short, to hand-edit +# this file, simply add or modify the key=value combination in the +# appropriate section in the template below this comment section. +# +# For example, if you want to specify a different value for the Enable key +# in the "[debug]" section of your GDM System Defaults configuration file, +# then add "Enable=true" in the "[debug]" section of this file. If the +# key already exists in this file, then simply modify it. +# +# Older versions of GDM used the "gdm.conf" file for configuration. If your +# system has an old gdm.conf file on the system, it will be used instead of +# this file - so changes made to this file will not take effect. Consider +# migrating your configuration to this file and removing the gdm.conf file. +# +# If you hand edit a GDM configuration file, you can run the following +# command and the GDM daemon will immediately reflect the change. Any +# running GDM GUI programs will also be notified to update with the new +# configuration. +# +# gdmflexiserver --command="UPDATE_CONFIG " +# +# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable". +# +# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and +# re-read the new configuration settings. You can also restart GDM by sending +# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes +# any user session started by GDM to exit immediately while USR1 behaves like +# gdm-safe-restart and will wait until all users log out before restarting GDM. +# +# For full reference documentation see the gnome help browser under +# GNOME|System category. You can also find the docs in HTML form on +# http://www.gnome.org/projects/gdm/ +# +# NOTE: Lines that begin with "#" are considered comments. +# +# Have fun! + +[daemon] + +[security] + +[xdmcp] + +[gui] + +[greeter] + +[chooser] + +[debug] + +# Note that to disable servers defined in the GDM System Defaults +# configuration file (such as 0=Standard, you must put a line in this file +# that says 0=inactive, as described in the Configuration section of the GDM +# documentation. +# +[servers] + +# Also note, that if you redefine a [server-foo] section, then GDM will +# use the definition in this file, not the GDM System Defaults configuration +# file. It is currently not possible to disable a [server-foo] section +# defined in the GDM System Defaults configuration file. +# diff --git a/recipes/gnome/gdm-2.28.1/other b/recipes/gnome/gdm-2.28.1/other new file mode 100644 index 0000000000..1fe5756178 --- /dev/null +++ b/recipes/gnome/gdm-2.28.1/other @@ -0,0 +1,17 @@ +# +# /etc/pam.d/other - specify the PAM fallback behaviour +# +# Note that this file is used for any unspecified service; for example +#if /etc/pam.d/cron specifies no session modules but cron calls +#pam_open_session, the session module out of /etc/pam.d/other is +#used. If you really want nothing to happen then use pam_permit.so or +#pam_deny.so as appropriate. + +# +# default; standard UN*X access +# +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so + diff --git a/recipes/gnome/gdm_2.28.0.bb b/recipes/gnome/gdm_2.28.0.bb deleted file mode 100644 index 1fc5e74f73..0000000000 --- a/recipes/gnome/gdm_2.28.0.bb +++ /dev/null @@ -1,77 +0,0 @@ -DESCRIPTION = "Graphical login manager" -LICENSE = "GPL" - -DEPENDS = "tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb" - -PR = "r3" - -inherit gnome update-rc.d - -RDEPENDS_${PN} += "grep" - -SRC_URI += " \ - file://cross-xdetection.diff;patch=1 \ - file://%gconf-tree.xml \ - file://gdm \ - file://gdm.conf \ - file://gdm-pam \ - file://other \ - " - -EXTRA_OECONF = " --enable-authentication-scheme=shadow \ - --enable-debug=yes \ - --with-console-kit \ - --disable-scrollkeeper " - -do_install_prepend() { - mkdir -p ${D}/var/lib/gdm/.gconf.mandatory - cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ - - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ - - install -d ${D}/${sysconfdir}/gdm - install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ - - install -d ${D}/${sysconfdir}/pam.d - install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm - install -m 0755 ${WORKDIR}/other ${D}/${sysconfdir}/pam.d/ -} - -FILES_${PN} += "${datadir}/icon* \ - ${datadir}/xsession* \ - " - -CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm" - -INITSCRIPT_NAME = "gdm" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." - -pkg_postinst_${PN} () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - grep "^gdm:" /etc/group > /dev/null || addgroup gdm - grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm - -if [ -d /var/lib/gdm ]; then - chown -R gdm:gdm /var/lib/gdm - chmod 0750 /var/lib/gdm -fi - -# Register up as default dm -mkdir -p ${sysconfdir}/X11/ -echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager - -} - -pkg_postrm_${PN} () { - deluser gdm || true - delgroup gdm || true - sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true -} - - - - diff --git a/recipes/gnome/gdm_2.28.1.bb b/recipes/gnome/gdm_2.28.1.bb new file mode 100644 index 0000000000..ef3b9f411a --- /dev/null +++ b/recipes/gnome/gdm_2.28.1.bb @@ -0,0 +1,80 @@ +DESCRIPTION = "Graphical login manager" +LICENSE = "GPL" + +DEPENDS = "tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb" + +inherit gnome update-rc.d + +RDEPENDS_${PN} += "grep" + +SRC_URI += " \ + file://cross-xdetection.diff;patch=1 \ + file://%gconf-tree.xml \ + file://gdm \ + file://gdm.conf \ + file://gdm-pam \ + file://other \ + " + +EXTRA_OECONF = " --enable-authentication-scheme=shadow \ + --enable-debug=yes \ + --with-console-kit \ + --disable-scrollkeeper " + +do_install_prepend() { + mkdir -p ${D}/var/lib/gdm/.gconf.mandatory + cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ +} + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ + + install -d ${D}/${sysconfdir}/gdm + install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ + + install -d ${D}/${sysconfdir}/gdm/PreSession + install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/PreSession + + install -d ${D}/${sysconfdir}/pam.d + install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm + install -m 0755 ${WORKDIR}/other ${D}/${sysconfdir}/pam.d/ +} + +FILES_${PN} += "${datadir}/icon* \ + ${datadir}/xsession* \ + " + +CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm" + +INITSCRIPT_NAME = "gdm" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." + +pkg_postinst_${PN} () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep "^gdm:" /etc/group > /dev/null || addgroup gdm + grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm + +if [ -d /var/lib/gdm ]; then + chown -R gdm:gdm /var/lib/gdm + chmod 0750 /var/lib/gdm +fi + +# Register up as default dm +mkdir -p ${sysconfdir}/X11/ +echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager + +} + +pkg_postrm_${PN} () { + deluser gdm || true + delgroup gdm || true + sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true +} + + + + -- cgit v1.2.3 From 911c3b5a210a98e5394badfea3e1527fdc850656 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 25 Nov 2009 08:45:20 -0800 Subject: gnome-system-monitor: fix typo --- recipes/gnome/gnome-system-monitor_2.28.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes/gnome') diff --git a/recipes/gnome/gnome-system-monitor_2.28.0.bb b/recipes/gnome/gnome-system-monitor_2.28.0.bb index c4eeaaa42d..13f6732cd7 100644 --- a/recipes/gnome/gnome-system-monitor_2.28.0.bb +++ b/recipes/gnome/gnome-system-monitor_2.28.0.bb @@ -20,6 +20,6 @@ FILES_${PN} += "${datadir}/icons \ ${datadir}/gnome/autostart \ " -FILE_{PN}-doc += "${datadir}/omf \ - ${datadir}/gnome/help " +FILES_${PN}-doc += "${datadir}/omf \ + ${datadir}/gnome/help " -- cgit v1.2.3 From ba2d1b5e6d2256f90734e5618fffdbe17479d79f Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 25 Nov 2009 08:46:35 -0800 Subject: system-tools-backends: fix packaging --- recipes/gnome/system-tools-backends_2.6.1.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'recipes/gnome') diff --git a/recipes/gnome/system-tools-backends_2.6.1.bb b/recipes/gnome/system-tools-backends_2.6.1.bb index 23ccb240b9..08086188be 100644 --- a/recipes/gnome/system-tools-backends_2.6.1.bb +++ b/recipes/gnome/system-tools-backends_2.6.1.bb @@ -33,5 +33,4 @@ FILES_${PN} += " ${libdir}/pkgconfig" FILES_${PN} += " ${datadir}/dbus-1/system-services" FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files" FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts" -FILES_${PN} += " ${datadir}/system-tools-backends-2.0/modules" -- cgit v1.2.3