diff --git a/lightdm/.footprint b/lightdm/.footprint index 614158d0c..8a4b4eb37 100644 --- a/lightdm/.footprint +++ b/lightdm/.footprint @@ -1,4 +1,12 @@ drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/dbus-1/ +drwxr-xr-x root/root etc/dbus-1/system.d/ +-rw-r--r-- root/root etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf +drwxr-xr-x root/root etc/lightdm/ +-rwxr-xr-x root/root etc/lightdm/Xsession +-rw-r--r-- root/root etc/lightdm/keys.conf +-rw-r--r-- root/root etc/lightdm/lightdm.conf +-rw-r--r-- root/root etc/lightdm/users.conf drwxr-xr-x root/root etc/pam.d/ -rw-r--r-- root/root etc/pam.d/lightdm -rw-r--r-- root/root etc/pam.d/lightdm-autologin @@ -9,15 +17,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/dm-tool -rwxr-xr-x root/root usr/bin/lightdm -drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/dbus-1/ -drwxr-xr-x root/root usr/etc/dbus-1/system.d/ --rw-r--r-- root/root usr/etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf -drwxr-xr-x root/root usr/etc/lightdm/ --rwxr-xr-x root/root usr/etc/lightdm/Xsession --rw-r--r-- root/root usr/etc/lightdm/keys.conf --rw-r--r-- root/root usr/etc/lightdm/lightdm.conf --rw-r--r-- root/root usr/etc/lightdm/users.conf drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/lightdm-gobject-1/ -rw-r--r-- root/root usr/include/lightdm-gobject-1/lightdm.h @@ -30,14 +29,14 @@ drwxr-xr-x root/root usr/include/lightdm-gobject-1/lightdm/ -rw-r--r-- root/root usr/include/lightdm-gobject-1/lightdm/system.h -rw-r--r-- root/root usr/include/lightdm-gobject-1/lightdm/user.h drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/ame/ --rwxr-xr-x root/root usr/lib/ame/lightdm-guest-session drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/LightDM-1.typelib -rwxr-xr-x root/root usr/lib/liblightdm-gobject-1.la lrwxrwxrwx root/root usr/lib/liblightdm-gobject-1.so -> liblightdm-gobject-1.so.0.0.0 lrwxrwxrwx root/root usr/lib/liblightdm-gobject-1.so.0 -> liblightdm-gobject-1.so.0.0.0 -rwxr-xr-x root/root usr/lib/liblightdm-gobject-1.so.0.0.0 +drwxr-xr-x root/root usr/lib/lightdm/ +-rwxr-xr-x root/root usr/lib/lightdm/lightdm-guest-session drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/liblightdm-gobject-1.pc drwxr-xr-x root/root usr/share/ @@ -62,6 +61,10 @@ drwxr-xr-x root/root usr/share/polkit-1/actions/ -rw-r--r-- root/root usr/share/polkit-1/actions/org.freedesktop.DisplayManager.AccountsService.policy drwxr-x--- root/root usr/share/polkit-1/rules.d/ -rw-r--r-- root/root usr/share/polkit-1/rules.d/lightdm.rules +drwxr-xr-x root/root usr/share/vala/ +drwxr-xr-x root/root usr/share/vala/vapi/ +-rw-r--r-- root/root usr/share/vala/vapi/liblightdm-gobject-1.deps +-rw-r--r-- root/root usr/share/vala/vapi/liblightdm-gobject-1.vapi drwxr-xr-x root/root var/ drwxr-xr-x root/root var/cache/ drwxr-xr-t root/root var/cache/lightdm/ diff --git a/lightdm/.signature b/lightdm/.signature index 0cb14ab41..8167c74ba 100644 --- a/lightdm/.signature +++ b/lightdm/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30/8gG/jkkNM70x9lZD+kYdu+WnMqUxQkdEG0+XSvLgyyA9N1jjKtgQFemGT1OlzjINk1u18srqq5d/Y+RBlZgE= -SHA256 (Pkgfile) = 9f9438bcecac8c862e7e73c67a2610a9ba1f956b594be0dd5ce7c03d57ff4f5f -SHA256 (.footprint) = 8d913072ba8918f22f7285e60750b0256a95dce8a059ebef82fbf3f2a6c828c1 +RWSagIOpLGJF3+rPX2hXc6T4cShMdPH0hVFrfT+ZRZ4GMaf1P7JCRqENGl4LRf6LiRv1vopuJqjQQ+NevUDvC71eoMM7DlWkbws= +SHA256 (Pkgfile) = 3342e615d85b0485cfd6874155785703934970b2e98befa2596677e46ba7dd3a +SHA256 (.footprint) = 8d625819c58237773926014fa3ce97d25c08792702011321713f37721b2b7626 SHA256 (lightdm-1.30.0.tar.xz) = a118779650a3a5b20f05d53c4f9e377b484fbc1810a6b0914a60840d9a581f95 SHA256 (Xsession) = d30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5 SHA256 (lightdm-default-config.patch) = 6f6f1005956702a489530a62f14f2ae54fd25a672e95689e3e0be68ebb7a3b91 diff --git a/lightdm/Pkgfile b/lightdm/Pkgfile index b031caa09..e4776b13f 100644 --- a/lightdm/Pkgfile +++ b/lightdm/Pkgfile @@ -5,7 +5,7 @@ name=lightdm version=1.30.0 -release=2 +release=3 source=( https://github.com/CanonicalLtd/lightdm/releases/download/$version/$name-$version.tar.xz Xsession @@ -16,13 +16,14 @@ lightdm.pam lightdm-autologin.pam lightdm-greeter.pam build() { cd $name-$version - ./configure --prefix='/usr' \ - --localstatedir='/var' \ - --sbindir='/usr/bin' \ - --libexecdir='/usr/lib/$name' \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/$name \ --enable-liblightdm-qt5=no \ - --with-greeter-user='lightdm' \ - --with-greeter-session='lightdm-mini-greeter' \ + --with-greeter-user=lightdm \ + --with-greeter-session=lightdm-mini-greeter \ --disable-static \ --disable-nls \ --disable-gtk-doc \ @@ -33,7 +34,7 @@ build() { rm -rf $PKG/usr/etc/init # install Xsession wrapper to use with lightdm - install -m 755 $SRC/Xsession $PKG/usr/etc/lightdm/Xsession + install -m 755 $SRC/Xsession $PKG/etc/lightdm/Xsession install -dm 755 $PKG/var/cache/lightdm install -dm 770 $PKG/var/lib/lightdm{,-data} install -dm 711 $PKG/var/log/lightdm @@ -41,14 +42,8 @@ build() { chown 620:620 -R $PKG/var/lib/lightdm{,-data} chgrp 620 $PKG/var/log/lightdm - # install PAM configurations - install -d $PKG/etc/pam.d - install -m644 $SRC/lightdm.pam $PKG/etc/pam.d/lightdm - install -m644 $SRC/lightdm-autologin.pam $PKG/etc/pam.d/lightdm-autologin - install -m644 $SRC/lightdm-greeter.pam $PKG/etc/pam.d/lightdm-greeter - # adjust users.conf to accept userid<500 - sed -i 's/500/100/g' $PKG/usr/etc/lightdm/users.conf + sed -i 's/500/100/g' $PKG/etc/lightdm/users.conf # install PolKit rules install -dm 750 -g root $PKG/usr/share/polkit-1/rules.d @@ -60,5 +55,11 @@ build() { # remove junk rm -fr $PKG/usr/share/{locale,gtk-doc,help} - rm -fr $PKG/usr/etc/{init,apparmor.d,pam.d} + rm -fr $PKG/etc/{init,apparmor.d,pam.d} + + # install PAM configurations + install -d $PKG/etc/pam.d + install -m644 $SRC/lightdm.pam $PKG/etc/pam.d/lightdm + install -m644 $SRC/lightdm-autologin.pam $PKG/etc/pam.d/lightdm-autologin + install -m644 $SRC/lightdm-greeter.pam $PKG/etc/pam.d/lightdm-greeter }