Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=d52625560214d76a97d436f6fb8ae37ef29fe2e2
commit d52625560214d76a97d436f6fb8ae37ef29fe2e2 Author: Baste <[email protected]> Date: Thu Oct 18 14:08:13 2012 +0200 gdm-3.6.1-1-x86_64 * Version bump diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 5fd84e9..3daa15d 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: bouleetbil <[email protected]> pkgname=gdm -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/"; @@ -19,7 +19,7 @@ _F_gnome_ext=".tar.xz" Finclude gnome #source=($source org.gnome.login-screen.gschema.override gdmshell.patch) source=($source org.gnome.login-screen.gschema.override) -sha1sums=('6999463adcaa7c4c875be14deee15d035561361e' \ +sha1sums=('06d4732adce9a96db9213ba5252f57939da84a9b' \ '974832a3878a020c87a833f5ba99a0c7d5d27b57') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums @@ -42,86 +42,21 @@ build() { Fmake --with-pam-prefix=/etc \ --enable-split-authentication \ --enable-console-helper \ - --with-lang-file=/etc/profile.d/lang.sh \ + --with-lang-file=/etc/locale.conf \ --enable-more-warnings \ - --enable-debug -# --disable-scrollkeeper \ + --enable-debug \ + --with-default-pam-config=exherbo \ + --without-console-kit \ + --with-initial-vt=12 +x# --disable-scrollkeeper \ # --with-console-kit Fmakeinstall chmod a+r $Fdestdir/var/lib/gdm || Fdie - chown root:root $Fdestdir/var/lib/gdm || Fdie - Fmkdir var/spool/gdm - - #delete PAM default rules - Frm etc/pam.d/* - -cat > $Fdestdir/etc/pam.d/gdm-autologin << "EOF" -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_permit.so -account required pam_unix.so -password required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session required pam_systemd.so -EOF - -cat > $Fdestdir/etc/pam.d/gdm-launch-environment << "EOF" -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so - -account required pam_nologin.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so force revoke -EOF - -cat > $Fdestdir/etc/pam.d/gdm-password << "EOF" -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_unix.so nullok -auth optional pam_gnome_keyring.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_unix.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so force revoke -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start -EOF - - #bash completion fix -# Fsed "#!/bin/sh" "#!/bin/bash" $Fdestdir/usr/sbin/gdm - - Frm var/gdm + #chown root:root $Fdestdir/var/lib/gdm || Fdie + #Fmkdir var/spool/gdm chmod 1770 $Fdestdir/var/log/gdm || Fdie - # systemd tmpfiles - Frm var/run - Fmkdir /etc/tmpfiles.d - cat > $Fdestdir/etc/tmpfiles.d/gdm.conf << EOF -d $Flocalstatedir/run/gdm 0711 root gdm - -d $Flocalstatedir/run/gdm/greeter 0755 gdm gdm - -EOF - # add logo to shell greeter Fcp ../org.gnome.login-screen.gschema.override usr/share/glib-2.0/schemas/ # gets rebuilt in posttrans diff --git a/source/gnome/gdm/gdm.install b/source/gnome/gdm/gdm.install index ae6b09e..7bb3dfb 100644 --- a/source/gnome/gdm/gdm.install +++ b/source/gnome/gdm/gdm.install @@ -25,16 +25,11 @@ post_install() /usr/sbin/usermod -d /var/lib/gdm -s /sbin/nologin gdm >/dev/null 2>&1 # ignore errors, as we can't disambiguate between gdm already existe - - chown -R gdm:gdm /var/lib/gdm &> /dev/null echo -n "updating scrollkeeper catalogue... " rarian-sk-update -q > /dev/null 2>&1 echo "done." - sed -i 's|usr/bin/gdm|usr/sbin/gdm|' /etc/sysconfig/desktop - sed -i 's|usr/sbin/gdm -nodaemon|usr/sbin/gdm --nodaemon|' /etc/sysconfig/desktop - sed 's|^#desktop="/usr/sbin/gdm --nodaemon"$|desktop="/usr/sbin/gdm --nodaemon"|' -i /etc/sysconfig/desktop /sbin/ldconfig UpdateIconCache glib-compile-schemas /usr/share/glib-2.0/schemas @@ -51,7 +46,6 @@ post_remove() echo -n "updating scrollkeeper catalogue... " rarian-sk-update -q > /dev/null 2>&1 echo "done." - sed -i 's|^desktop="/usr/sbin/gdm --nodaemon"$|#desktop="/usr/sbin/gdm --nodaemon"|' /etc/sysconfig/desktop dconf update UpdateIconCache } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
