diff options
| -rw-r--r-- | gdm/.footprint.i686 | 12 | ||||
| -rw-r--r-- | gdm/.footprint.x86_64 | 12 | ||||
| -rwxr-xr-x | gdm/Pkgfile | 27 | ||||
| -rwxr-xr-x | gdm/post-install | 11 | ||||
| -rwxr-xr-x | gdm/pre-install | 15 |
5 files changed, 22 insertions, 55 deletions
diff --git a/gdm/.footprint.i686 b/gdm/.footprint.i686 index 9cc77f4..5b0b9c8 100644 --- a/gdm/.footprint.i686 +++ b/gdm/.footprint.i686 @@ -1,7 +1,5 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/X11/ -drwxr-xr-x root/root etc/X11/dm/ -drwxr-xr-x root/root etc/X11/dm/Sessions/ drwxr-xr-x root/root etc/X11/gdm/ drwxr-xr-x root/root etc/X11/gdm/Init/ -rwxr-xr-x root/root etc/X11/gdm/Init/Default @@ -21,12 +19,11 @@ drwxr-xr-x root/root etc/dconf/db/ -rw-r--r-- root/root etc/dconf/db/gdm drwxr-xr-x root/root etc/dconf/profile/ -rw-r--r-- root/root etc/dconf/profile/gdm -drwxr-xr-x root/root etc/gconf/ drwxr-xr-x root/root etc/pam.d/ -rw-r--r-- root/root etc/pam.d/gdm -rw-r--r-- root/root etc/pam.d/gdm-autologin -rw-r--r-- root/root etc/pam.d/gdm-fingerprint -lrwxrwxrwx root/root etc/pam.d/gdm-password -> gdm +-rw-r--r-- root/root etc/pam.d/gdm-password -rw-r--r-- root/root etc/pam.d/gdm-smartcard -rw-r--r-- root/root etc/pam.d/gdm-welcome drwxr-xr-x root/root usr/ @@ -46,7 +43,6 @@ drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/gdm-host-chooser -rwxr-xr-x root/root usr/lib/gdm-product-slave -rwxr-xr-x root/root usr/lib/gdm-session-worker --rwxr-xr-x root/root usr/lib/gdm-set-default-session -rwxr-xr-x root/root usr/lib/gdm-simple-chooser -rwxr-xr-x root/root usr/lib/gdm-simple-greeter -rwxr-xr-x root/root usr/lib/gdm-simple-slave @@ -200,7 +196,6 @@ drwxr-xr-x root/root usr/share/pixmaps/ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/cache/ drwxr-xr-t root/gdm var/cache/gdm/ -drwxrwx--T root/gdm var/gdm/ drwxr-xr-x root/root var/lib/ drwxrwx--T root/gdm var/lib/gdm/ drwxr-xr-x root/root var/lib/gdm/.config/ @@ -212,7 +207,4 @@ drwxr-xr-x root/root var/lib/gdm/.local/ drwxr-xr-x root/root var/lib/gdm/.local/share/ drwxr-xr-x gdm/gdm var/lib/gdm/.local/share/applications/ drwxr-xr-x root/root var/log/ -drwxr-xr-x root/root var/log/gdm/ -drwxr-xr-x root/root var/run/ -drwx--x--x root/gdm var/run/gdm/ -drwxr-xr-x gdm/gdm var/run/gdm/greeter/ +drwxrwx--T root/root var/log/gdm/ diff --git a/gdm/.footprint.x86_64 b/gdm/.footprint.x86_64 index 9cc77f4..5b0b9c8 100644 --- a/gdm/.footprint.x86_64 +++ b/gdm/.footprint.x86_64 @@ -1,7 +1,5 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/X11/ -drwxr-xr-x root/root etc/X11/dm/ -drwxr-xr-x root/root etc/X11/dm/Sessions/ drwxr-xr-x root/root etc/X11/gdm/ drwxr-xr-x root/root etc/X11/gdm/Init/ -rwxr-xr-x root/root etc/X11/gdm/Init/Default @@ -21,12 +19,11 @@ drwxr-xr-x root/root etc/dconf/db/ -rw-r--r-- root/root etc/dconf/db/gdm drwxr-xr-x root/root etc/dconf/profile/ -rw-r--r-- root/root etc/dconf/profile/gdm -drwxr-xr-x root/root etc/gconf/ drwxr-xr-x root/root etc/pam.d/ -rw-r--r-- root/root etc/pam.d/gdm -rw-r--r-- root/root etc/pam.d/gdm-autologin -rw-r--r-- root/root etc/pam.d/gdm-fingerprint -lrwxrwxrwx root/root etc/pam.d/gdm-password -> gdm +-rw-r--r-- root/root etc/pam.d/gdm-password -rw-r--r-- root/root etc/pam.d/gdm-smartcard -rw-r--r-- root/root etc/pam.d/gdm-welcome drwxr-xr-x root/root usr/ @@ -46,7 +43,6 @@ drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/gdm-host-chooser -rwxr-xr-x root/root usr/lib/gdm-product-slave -rwxr-xr-x root/root usr/lib/gdm-session-worker --rwxr-xr-x root/root usr/lib/gdm-set-default-session -rwxr-xr-x root/root usr/lib/gdm-simple-chooser -rwxr-xr-x root/root usr/lib/gdm-simple-greeter -rwxr-xr-x root/root usr/lib/gdm-simple-slave @@ -200,7 +196,6 @@ drwxr-xr-x root/root usr/share/pixmaps/ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/cache/ drwxr-xr-t root/gdm var/cache/gdm/ -drwxrwx--T root/gdm var/gdm/ drwxr-xr-x root/root var/lib/ drwxrwx--T root/gdm var/lib/gdm/ drwxr-xr-x root/root var/lib/gdm/.config/ @@ -212,7 +207,4 @@ drwxr-xr-x root/root var/lib/gdm/.local/ drwxr-xr-x root/root var/lib/gdm/.local/share/ drwxr-xr-x gdm/gdm var/lib/gdm/.local/share/applications/ drwxr-xr-x root/root var/log/ -drwxr-xr-x root/root var/log/gdm/ -drwxr-xr-x root/root var/run/ -drwx--x--x root/gdm var/run/gdm/ -drwxr-xr-x gdm/gdm var/run/gdm/greeter/ +drwxrwx--T root/root var/log/gdm/ diff --git a/gdm/Pkgfile b/gdm/Pkgfile index 8fa5c47..ef4d358 100755 --- a/gdm/Pkgfile +++ b/gdm/Pkgfile @@ -2,12 +2,12 @@ # URL: http://projects.gnome.org/gdm/ # Maintainer: NuTyX GNOME team # Packager: piernov <piernov@piernov.org> -# Depends on: gnome-session, intltool, gnome-doc-utils, gtk, librsvg, libgnomecanvas, desktop-file-utils, linux-pam, upower, accountsservice, xorg-xrdb, xorg, consolekit -# Run on: gnome-session,librsvg,libgnomecanvas,desktop-file-utils,linux-pam,upower,accountsservice,xorg-xrdb,xorg,consolekit +# Depends on: gnome-session, intltool, gnome-doc-utils, libxklavier, libcanberra, desktop-file-utils, linux-pam, upower, accountsservice, xorg-xrdb, xorg, consolekit +# Run on: gnome-session,libxklavier,libcanberra,desktop-file-utils,linux-pam,upower,accountsservice,xorg-xrdb,xorg,consolekit name=gdm version=3.1.90 -release=3 +release=4 source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz \ patch/fix_external_program_paths.patch patch/vt-allocation-hack.patch @@ -21,7 +21,7 @@ build() { cd $name-$version patch -p1 -i ../fix_external_program_paths.patch patch -p1 -i ../vt-allocation-hack.patch - patch -p1 -i ../default_session.patch +# patch -p1 -i ../default_session.patch patch -p1 -i ../switch_user.patch patch -p1 -i ../time_display_on_greeter.patch autoreconf -if @@ -32,7 +32,7 @@ build() { --with-sysconfsubdir=X11/gdm \ --with-pam-prefix=/etc \ --with-dmconfdir=/etc/X11/dm \ - --with-at-spi-registryd-directory=/usr/lib/at-spi \ + --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ --enable-ipv6=yes \ --disable-scrollkeeper \ --with-console-kit=yes \ @@ -44,16 +44,13 @@ build() { install -m755 -d $PKG/usr/share/gconf/schemas gconf-merge-schema $PKG/usr/share/gconf/schemas/$name.schemas --domain gdm $PKG/etc/gconf/schemas/*.schemas - rm -r $PKG/etc/gconf/schemas/ + rm -r $PKG/etc/gconf/ - rm -f $PKG/etc/X11/PreSession/Default - rm -f $PKG/etc/X11/PostSession/Default + install -m644 ../gdm-autologin.pam $PKG/etc/pam.d/gdm-autologin + install -m644 ../gdm.pam $PKG/etc/pam.d/gdm + sed -e 's/include\s*system-auth/required\tpam_unix.so/' -i $PKG/etc/pam.d/gdm-welcome - mkdir -p $PKG/etc/X11/dm/Sessions - install -v -m755 -d $PKG/var/log/gdm - - cp -f ../gdm-autologin.pam $PKG/etc/pam.d/gdm-autologin - cp -f ../gdm.pam $PKG/etc/pam.d/gdm - rm -f $PKG/etc/pam.d/gdm-password - ln -s gdm $PKG/etc/pam.d/gdm-password + rm -rf $PKG/var/gdm + chmod 1770 $PKG/var/log/gdm + rm -rf $PKG/var/run } diff --git a/gdm/post-install b/gdm/post-install index a78c64d..08b1b0d 100755 --- a/gdm/post-install +++ b/gdm/post-install @@ -2,8 +2,13 @@ port=gdm +getent group gdm > /dev/null 2>&1 || /usr/sbin/groupadd -g 21 gdm +getent passwd gdm > /dev/null 2>&1 || /usr/sbin/useradd -c 'Gnome Display Manager' -u 21 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm +/bin/passwd -l gdm +/bin/chown -R gdm:gdm /var/lib/gdm + # corrige le répertoire de gdm -sed "s|gdm:x:21:21:GDM Daemon User:/dev/null:/sbin/nologin|gdm:x:21:21:GDM Daemon User:/var/gdm:/sbin/nologin|" -i /etc/passwd +sed "s|gdm:x:21:21:GDM Daemon User:/dev/null:/sbin/nologin|gdm:x:21:21:GDM Daemon User:/var/lib/gdm:/sbin/nologin|" -i /etc/passwd # gconf schemas gconfpkg --install $port @@ -19,11 +24,7 @@ do scrollkeeper-install -q -p /var/lib/scrollkeeper /$SCROLL > /dev/null done -# desktop database -update-desktop-database -q - # icon cache gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor # End of file - diff --git a/gdm/pre-install b/gdm/pre-install deleted file mode 100755 index 4555481..0000000 --- a/gdm/pre-install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ -z "`grep '^gdm:' /etc/group`" ] -then - /usr/sbin/groupadd -g 21 gdm -fi - -if [ -z "`grep '^gdm:' /etc/passwd`" ] -then - /usr/sbin/useradd -u 21 -g gdm -d /var/gdm -s /bin/false gdm - /bin/passwd -l gdm -fi - -# End of file - |