[arch-commits] Commit in gdm/trunk (6 files)
Jan de Groot
jgc at archlinux.org
Sat Oct 11 22:59:35 UTC 2008
Date: Saturday, October 11, 2008 @ 18:59:34
Author: jgc
Revision: 15005
upgpkg: gdm 2.20.8-1
Modified:
gdm/trunk/PKGBUILD
gdm/trunk/defaults.conf
gdm/trunk/gdm
gdm/trunk/gdm.install
gdm/trunk/gdm.pam
Deleted:
gdm/trunk/gdm-stop.diff
---------------+
PKGBUILD | 40 +++++++++++++++++++---------------------
defaults.conf | 8 ++++----
gdm | 3 +--
gdm-stop.diff | 40 ----------------------------------------
gdm.install | 11 +++--------
gdm.pam | 2 ++
6 files changed, 29 insertions(+), 75 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-10-11 22:20:45 UTC (rev 15004)
+++ PKGBUILD 2008-10-11 22:59:34 UTC (rev 15005)
@@ -1,13 +1,13 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gdm
-pkgver=2.20.1
-pkgrel=2
+pkgver=2.20.8
+pkgrel=1
pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
arch=(i686 x86_64)
license=('GPL')
-depends=('pam>=0.99.8' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.20.1' 'librsvg>=2.18.2' 'gksu' 'xorg-xsm' 'dbus-glib>=0.7.4')
-makedepends=('perlxml' 'zenity>=2.20.0' 'gnome-doc-utils>=0.12.0' 'pkgconfig')
+depends=('pam>=1.0.2' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.20.1.1' 'librsvg>=2.22.3' 'gksu>=2.0.0' 'xorg-xsm' 'dbus-glib>=0.76' 'consolekit' 'zenity>=2.24.0')
+makedepends=('perlxml' 'gnome-doc-utils>=0.14.0' 'pkgconfig')
install=gdm.install
url="http://www.gnome.org"
groups=('gnome-extra')
@@ -18,16 +18,15 @@
defaults.conf
gdm.pam
gdm-autologin.pam)
-md5sums=('ed7b7efcb7fd97cc400e2416e0093e71' '770fe5aeb8d35271a5a2330ce01508f0'
- '0fbc2d17fad5a3e979e742e0403c19d5' 'b20fe3c8487a039050986d60e45233a9'
- '157f32e089a7aab50732dc122e592b35')
+md5sums=('c183b017280e6ef25ad38d618aac2271'
+ '2fdb6d6fd7fd8124b1e00621b3d238f9'
+ 'c7cff1c785d59e7266f05be16b1ab933'
+ '2e52f326dccc833e9c135f8df8297b12'
+ '157f32e089a7aab50732dc122e592b35')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
-
+ cd "${srcdir}/${pkgname}-${pkgver}"
sed -i -e 's|/dev/tty%d|/dev/vc/%d|' daemon/getvt.c || return 1
-
- cd ${startdir}/src/${pkgname}-${pkgver}
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gdm \
--localstatedir=/var/lib --disable-static \
@@ -35,20 +34,19 @@
--enable-secureremote
sed -i -e 's|${prefix}|/usr|' config.h || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install
- mkdir -p ${startdir}/pkg/etc/rc.d
+ make DESTDIR="${pkgdir}" install
+
#PAM, we use our own, not Redhat stuff
- install -m644 ${startdir}/src/gdm-autologin.pam ${startdir}/pkg/etc/pam.d/gdm-autologin
- install -m644 ${startdir}/src/gdm.pam ${startdir}/pkg/etc/pam.d/gdm
+ install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin" || return 1
+ install -m644 "${srcdir}/gdm.pam" "${pkgdir}/etc/pam.d/gdm" || return 1
#init script and configuration
- install -m755 ${startdir}/src/gdm ${startdir}/pkg/etc/rc.d/
- install -m444 ${startdir}/defaults.conf ${startdir}/pkg/usr/share/gdm/
+ install -m755 -d "${pkgdir}/etc/rc.d"
+ install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/" || return 1
+ install -m444 "${srcdir}/defaults.conf" "${pkgdir}/usr/share/gdm/" || return 1
- #Remove the session .desktop file, we have this one in gnome-session now.
- rm -rf ${startdir}/pkg/usr/share/xsessions
-
+ rm -f ${pkgdir}/usr/share/xsessions/gnome.desktop
# fix gdmsetup
- sed -i -e 's|^Exec=|Exec=gksu |' ${startdir}/pkg/usr/share/gdm/applications/gdmsetup.desktop
+ sed -i -e 's|^Exec=|Exec=gksu |' "${pkgdir}/usr/share/gdm/applications/gdmsetup.desktop" || return 1
}
Modified: defaults.conf
===================================================================
--- defaults.conf 2008-10-11 22:20:45 UTC (rev 15004)
+++ defaults.conf 2008-10-11 22:59:34 UTC (rev 15005)
@@ -99,7 +99,7 @@
# User and group used for running GDM GUI applications. By default this is set
# to user "gdm" and group "gdm". This user/group should have very limited
# permissions and access to only the gdm directories and files.
-User=nobody
+User=gdm
Group=gdm
# To try to kill all clients started at greeter time or in the Init script.
@@ -126,8 +126,8 @@
#
# Reboot, Halt and suspend commands, you can add different commands separated
# by a semicolon. GDM will use the first one it can find.
-RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now
-HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now
+RebootCommand=/sbin/reboot;/sbin/shutdown -r now
+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now
SuspendCommand=/usr/sbin/pm-suspend
# The following options specify how GDM system commands are supported.
@@ -192,7 +192,7 @@
# Xorg Xnest: /usr/X11/bin/Xnest -audit 0 -name Xnest
# Xsun Xnest: /usr/openwin/bin/Xnest -audit 0 -name Xnest -pn
# Xephyr: /usr/X11/bin/Xephyr -audit 0
-Xnest=
+Xnest=/usrbin/Xephyr -audit 0
# Xsun Xnest does not support font paths (passed into Xnest -fp argument)
# that include the ":unscaled" suffix after a path name. Setting this to
# false will strip any ":unscaled" suffix from the font path. If not
Modified: gdm
===================================================================
--- gdm 2008-10-11 22:20:45 UTC (rev 15004)
+++ gdm 2008-10-11 22:59:34 UTC (rev 15005)
@@ -3,7 +3,6 @@
. /etc/rc.conf
. /etc/rc.d/functions
-PID=`pidof -o %PPID /usr/sbin/gdm-binary`
case "$1" in
start)
stat_busy "Starting GDM"
@@ -17,7 +16,7 @@
;;
stop)
stat_busy "Stopping GDM"
- /usr/sbin/gdm-stop
+ /usr/sbin/gdm-stop > /dev/null 2>&1
if [ $? -gt 0 ]; then
stat_fail
else
Deleted: gdm-stop.diff
===================================================================
--- gdm-stop.diff 2008-10-11 22:20:45 UTC (rev 15004)
+++ gdm-stop.diff 2008-10-11 22:59:34 UTC (rev 15005)
@@ -1,40 +0,0 @@
---- gdm-stop 2006-04-08 05:48:44.000000000 +1000
-+++ gdm-stop 2006-04-08 07:34:49.000000000 +1000
-@@ -1,7 +1,12 @@
- #!/bin/sh
-
--PIDFILE=`gdmflexiserver --command="GET_CONFIG daemon/PidFile"`
--CHECKPIDFILE=`echo $PIDFILE | sed 's/^\([^ ]*\) .*$/\1/'`
-+if [ "x$(pidof X)" != "x" ]; then
-+ PIDFILE=`/usr/bin/gdmflexiserver --command="GET_CONFIG daemon/PidFile"`
-+ CHECKPIDFILE=`echo $PIDFILE | sed 's/^\([^ ]*\) .*$/\1/'`
-+fi
-+
-+RUNLEVEL=`runlevel | awk '{ print $2 }'`
-+
- if [ "x$CHECKPIDFILE" = "xOK" ]; then
- PIDFILE=`echo $PIDFILE | sed 's/^.* \(.*\)$/\1/'`
- else
-@@ -9,13 +14,18 @@
- fi
-
- if test x$PIDFILE = x ; then
-- echo "Can't find the PID file in the configuration file, going to try:"
-- echo "/var/run/gdm.pid"
-+ if [ $RUNLEVEL -gt 0 ] && [ $RUNLEVEL -lt 6 ]; then
-+ echo "Can't find the PID file in the configuration file, going to try:"
-+ echo "/var/run/gdm.pid"
-+ fi
- PIDFILE=/var/run/gdm.pid
- fi
- if test '!' -f $PIDFILE ; then
-- echo "$PIDFILE doesn't exist, perhaps GDM isn't running"
-- exit 1
-+ if [ $RUNLEVEL -gt 0 ] && [ $RUNLEVEL -lt 6 ]; then
-+ echo "$PIDFILE doesn't exist, perhaps GDM isn't running"
-+ exit 1
-+ fi
-+ exit 0
- fi
- # exec the kill to get the correct return code
- exec kill -TERM `cat $PIDFILE`
Modified: gdm.install
===================================================================
--- gdm.install 2008-10-11 22:20:45 UTC (rev 15004)
+++ gdm.install 2008-10-11 22:59:34 UTC (rev 15005)
@@ -2,10 +2,11 @@
post_install() {
getent group gdm >/dev/null 2>&1 || groupadd gdm
- chown root.gdm /var/lib/gdm > /dev/null
+ getent passwd gdm >/dev/null 2>&1 || usr/sbin/useradd -c 'PolicyKit' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+ passwd -l gdm
+ chown root:gdm /var/lib/gdm > /dev/null
chmod 1770 /var/lib/gdm > /dev/null
- update-desktop-database -q
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
@@ -25,11 +26,5 @@
}
post_remove() {
- update-desktop-database -q
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
-
-op=$1
-shift
-
-$op $*
Modified: gdm.pam
===================================================================
--- gdm.pam 2008-10-11 22:20:45 UTC (rev 15004)
+++ gdm.pam 2008-10-11 22:59:34 UTC (rev 15005)
@@ -2,7 +2,9 @@
auth requisite pam_nologin.so
auth required pam_env.so
auth required pam_unix.so
+auth optional pam_gnome_keyring.so
account required pam_unix.so
session required pam_limits.so
session required pam_unix.so
+session optional pam_gnome_keyring.so auto_start
password required pam_unix.so
More information about the arch-commits
mailing list