[arch-commits] Commit in lightdm/trunk (4 files)
Date: Sunday, December 17, 2017 @ 21:14:56
Author: alucryd
Revision: 313278
systemd-sysusers todo: lightdm 1:1.24.0-2
Added:
lightdm/trunk/lightdm.sysusers
Modified:
lightdm/trunk/PKGBUILD
lightdm/trunk/lightdm.tmpfiles
Deleted:
lightdm/trunk/lightdm.install
--+
PKGBUILD | 17 ++---
lightdm.install | 11 ---
lightdm.sysusers |3 +++
lightdm.tmpfiles |6 +-
4 files changed, 14 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-17 20:53:06 UTC (rev 313277)
+++ PKGBUILD2017-12-17 21:14:56 UTC (rev 313278)
@@ -5,7 +5,7 @@
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
pkgver=1.24.0
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='A lightweight display manager'
arch=('x86_64')
@@ -16,6 +16,7 @@
'libxklavier' 'pam' 'polkit' 'qt4' 'qt5-base' 'vala')
source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/lightdm-${pkgver}.tar.xz;
'lightdm.service'
+'lightdm.sysusers'
'lightdm.tmpfiles'
'lightdm.pam'
'lightdm-autologin.pam'
@@ -24,7 +25,8 @@
'Xsession')
sha256sums=('cd509b74382bcf382c6e3e4b54ac30ba804022fec968d6993d134552ea1a43a2'
'0db37a14521be729411a767f157fbd07adb738b14006277def53a1efe4dacfb8'
-'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
+'19acdbf64c342f77662c08aa53a5ab932ef7faad6e16452b0fbe7758fa935345'
+'a905d0059e76fb01204912674cd47fa4757dfc0bb0ccf9a337cefb68573287bc'
'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
'33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
@@ -71,7 +73,6 @@
'etc/pam.d/lightdm'
'etc/pam.d/lightdm-autologin'
'etc/pam.d/lightdm-greeter')
- install='lightdm.install'
cd lightdm-${pkgver}
@@ -81,13 +82,6 @@
rm -rf "${pkgdir}"/etc/init
rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-*
- install -dm 755 "${pkgdir}"/var/cache/lightdm
- install -dm 770 "${pkgdir}"/var/lib/lightdm{,-data}
- install -dm 711 "${pkgdir}"/var/log/lightdm
- chmod +t "${pkgdir}"/var/{cache/lightdm,lib/lightdm{,-data}}
- chown 620:620 -R "${pkgdir}"/var/lib/lightdm{,-data}
- chgrp 620 "${pkgdir}"/var/log/lightdm
-
# PAM
install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
install -m 644 ../lightdm-autologin.pam
"${pkgdir}"/etc/pam.d/lightdm-autologin
@@ -97,8 +91,9 @@
install -m 644 ../lightdm.rules
"${pkgdir}"/usr/share/polkit-1/rules.d/lightdm.rules
# Systemd
- install -dm 755 "${pkgdir}"/usr/lib/{systemd/system,tmpfiles.d}
+ install -dm 755 "${pkgdir}"/usr/lib/{systemd/system,sysusers.d,tmpfiles.d}
install -m 644 ../lightdm.service
"${pkgdir}"/usr/lib/systemd/system/lightdm.service
+ install -m 644 ../lightdm.sysusers
"${pkgdir}"/usr/lib/sysusers.d/lightdm.conf
install -m 644 ../lightdm.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/lightdm.conf
}
Deleted: lightdm.install
===
--- lightdm.install 2017-12-17 20:53:06 UTC (rev 313277)
+++ lightdm.install 2017-12-17 21:14:56 UTC (rev 313278)
@@ -1,11 +0,0 @@
-post_install() {
-getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
-getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display
Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /usr/bin/nologin lightdm
-passwd -l lightdm > /dev/null
-}
-
-post_upgrade() {
-post_install
-}
-
-# vim: ts=2 sw=2 et:
Added: lightdm.sysusers
===
--- lightdm.sysusers(rev 0)
+++ lightdm.sysusers2017-12-17 21:14:56 UTC (rev 313278)
@@ -0,0 +1,3 @@
+g lightdm 620 -
+u lightdm 620 "Light Display Manager" /var/lib/lightdm
+
Modified: lightdm.tmpfiles
===
--- lightdm.tmpfiles2017-12-17 20:53:06 UTC (rev 313277)
+++ lightdm.tmpfiles2017-12-17 21:14:56 UTC (rev 313278)
@@ -1 +1,5 @@
-d /run/lightdm 0711 lightdm lightdm
+d /run/lightdm 0711 root lightdm 0
+d /var/cache/lightdm 0711 root lightdm -
+d /var/lib/lightdm 1770 lightdm lightdm -
+d /var/lib/lightdm-data 1770 lightdm lightdm -
+d /var/log/lightdm 0711 root lightdm -
[arch-commits] Commit in lightdm/trunk (4 files)
Date: Friday, July 18, 2014 @ 12:27:22
Author: alucryd
Revision: 115899
upgpkg: lightdm 1:1.10.1-3
Added:
lightdm/trunk/lightdm-userlist.patch
Modified:
lightdm/trunk/PKGBUILD
lightdm/trunk/lightdm-default-config.patch
lightdm/trunk/lightdm.install
--+
PKGBUILD |7 +--
lightdm-default-config.patch |2 +-
lightdm-userlist.patch | 13 +
lightdm.install |2 +-
4 files changed, 20 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-18 08:31:22 UTC (rev 115898)
+++ PKGBUILD2014-07-18 10:27:22 UTC (rev 115899)
@@ -5,7 +5,7 @@
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
pkgver=1.10.1
-pkgrel=2
+pkgrel=3
epoch=1
pkgdesc='A lightweight display manager'
arch=('i686' 'x86_64')
@@ -19,6 +19,7 @@
'lightdm-autologin.pam'
'lightdm.rules'
'lightdm-default-config.patch'
+'lightdm-userlist.patch'
'Xsession')
sha256sums=('737123001a7ae2ab126c75f61dcebb767d082ec043c012285eab6fa6b0d6a58f'
'0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
@@ -26,12 +27,14 @@
'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
'33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
-'20de3152b9ea037be1cbb9a32c052cb53d3362daf7c4ebd3d8669a1af0f13723'
+'756437add6021bb10f1e8884dab518ea544f0f04a8201f5b72d6d6e0e8cc2a24'
+'50bbf183eee1f87b0f10e02c70ff0323f383006c914c4314a48843df547fa0b2'
'4d5674906742200b3c171f978457e943560f2c10a2b9156fcd44da3796d185a2')
prepare() {
cd ${pkgbase}-${pkgver}
+ patch -Np0 -i ../lightdm-userlist.patch
patch -Np1 -i ../lightdm-default-config.patch
}
Modified: lightdm-default-config.patch
===
--- lightdm-default-config.patch2014-07-18 08:31:22 UTC (rev 115898)
+++ lightdm-default-config.patch2014-07-18 10:27:22 UTC (rev 115899)
@@ -37,7 +37,7 @@
@@ -9,6 +9,6 @@
# hidden-shells = Shells that indicate a user cannot login
#
- [UserAccounts]
+ [UserList]
-minimum-uid=500
+minimum-uid=1000
hidden-users=nobody nobody4 noaccess
Added: lightdm-userlist.patch
===
--- lightdm-userlist.patch (rev 0)
+++ lightdm-userlist.patch 2014-07-18 10:27:22 UTC (rev 115899)
@@ -0,0 +1,13 @@
+=== modified file 'data/users.conf'
+--- data/users.conf2011-10-18 02:41:06 +
data/users.conf2014-05-19 20:10:41 +
+@@ -8,7 +8,7 @@
+ # hidden-users = Users that are not shown to the user
+ # hidden-shells = Shells that indicate a user cannot login
+ #
+-[UserAccounts]
++[UserList]
+ minimum-uid=500
+ hidden-users=nobody nobody4 noaccess
+ hidden-shells=/bin/false /usr/sbin/nologin
+
Property changes on: lightdm/trunk/lightdm-userlist.patch
___
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: lightdm.install
===
--- lightdm.install 2014-07-18 08:31:22 UTC (rev 115898)
+++ lightdm.install 2014-07-18 10:27:22 UTC (rev 115899)
@@ -1,6 +1,6 @@
post_install() {
getent group lightdm /dev/null 21 || groupadd -g 620 lightdm
-getent passwd lightdm /dev/null 21 || useradd -c 'Light Display
Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
+getent passwd lightdm /dev/null 21 || useradd -c 'Light Display
Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /usr/bin/nologin lightdm
passwd -l lightdm /dev/null
systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
}
[arch-commits] Commit in lightdm/trunk (4 files)
Date: Wednesday, March 13, 2013 @ 19:30:11
Author: alucryd
Revision: 86226
upgpkg: lightdm 1.5.1-5
Modified:
lightdm/trunk/PKGBUILD
lightdm/trunk/Xsession
lightdm/trunk/lightdm-autologin.pam
lightdm/trunk/lightdm.pam
---+
PKGBUILD | 22 ++
Xsession |6 +-
lightdm-autologin.pam | 29 ++---
lightdm.pam | 17 ++---
4 files changed, 31 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-13 15:08:23 UTC (rev 86225)
+++ PKGBUILD2013-03-13 18:30:11 UTC (rev 86226)
@@ -5,7 +5,7 @@
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
pkgver=1.5.1
-pkgrel=4
+pkgrel=5
pkgdesc=A lightweight display manager
arch=('i686' 'x86_64')
url=https://launchpad.net/lightdm;
@@ -25,13 +25,13 @@
sha256sums=('645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86'
'2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
'ec10378992907f06a6960c4644aba2f81744fbcaf38f6bdc7c364979be3207e4'
-'db5526d0a76be0d2ed39d19c83a83e1a4774b93e9651aa4f5d1feadcd4fe4c34'
-'6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2'
+'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
+'cd0a9591b61118c6de1b07e1cd9a1b74cd74e9e95288f8b41eba32e26fd22023'
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
'4bb044fc1d0524535e108627197facf95687dc21acde5ad77799d97ad16bb3eb'
'8c8432294d361475293852f45673bc042eb252dbc58a17445fd10e5e874dc608'
'4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
-'fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9')
+'66e12ef7ed34df78f8c17fb211b9e25f33446a2a702c34141f4917d6413ce883')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -48,14 +48,12 @@
package_lightdm() {
depends=('libgcrypt' 'libxklavier' 'pam')
-optdepends=('xorg-server-xephyr: run lightdm in test mode'
-'accountsservice: limit account shown by the greeter')
-backup=(etc/apparmor.d/lightdm-guest-session
-etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
-etc/lightdm/keys.conf
-etc/lightdm/lightdm.conf
-etc/lightdm/users.conf
-etc/pam.d/lightdm)
+optdepends=('xorg-server-xephyr: LightDM test mode'
+'accountsservice: limit visible accounts')
+backup=('etc/apparmor.d/lightdm-guest-session'
+'etc/lightdm/keys.conf'
+'etc/lightdm/lightdm.conf'
+'etc/lightdm/users.conf')
install=${pkgbase}.install
cd ${srcdir}/${pkgbase}-${pkgver}
Modified: Xsession
===
--- Xsession2013-03-13 15:08:23 UTC (rev 86225)
+++ Xsession2013-03-13 18:30:11 UTC (rev 86226)
@@ -27,7 +27,7 @@
setxkbmap `cat $file`
XKB_IN_USE=yes
fi
-done
+done
# Load xmodmap if not using XKB
if [ -z $XKB_IN_USE ]; then
@@ -63,6 +63,10 @@
fi
done
fi
+if [ -x $HOME/.Xsession -a -f $HOME/.Xsession ]; then
+echo Loading user X session script
+. $HOME/.Xsession
+fi
echo X session wrapper complete, running session $@
Modified: lightdm-autologin.pam
===
--- lightdm-autologin.pam 2013-03-13 15:08:23 UTC (rev 86225)
+++ lightdm-autologin.pam 2013-03-13 18:30:11 UTC (rev 86226)
@@ -1,20 +1,11 @@
#%PAM-1.0
-authrequisite pam_nologin.so
-authrequiredpam_env.so
-
-authrequisite pam_permit.so
-
-authsufficient pam_succeed_if.so uid = 1000 quiet
-authrequiredpam_deny.so
-
-account requiredpam_access.so
-account requiredpam_time.so
-account requiredpam_unix.so
-
-passwordrequiredpam_deny.so
-
-session requiredpam_loginuid.so
--sessionoptionalpam_systemd.so
-session optionalpam_keyinit.so revoke
-session requiredpam_limits.so
-session requiredpam_unix.so
+authrequiredpam_env.so$
+authrequiredpam_tally.so file=/var/log/faillog onerr=succeed$
+authrequiredpam_shells.so$
+authrequiredpam_nologin.so$
+authrequiredpam_permit.so$
+-auth optionalpam_gnome_keyring.so$
+account include system-local-login$
+passwordinclude system-local-login$
+session include system-local-login$
+-sessionoptionalpam_gnome_keyring.so auto_start
Modified: lightdm.pam
===
--- lightdm.pam 2013-03-13 15:08:23 UTC (rev 86225)
+++ lightdm.pam 2013-03-13 18:30:11
[arch-commits] Commit in lightdm/trunk (4 files)
Date: Wednesday, March 13, 2013 @ 19:50:57
Author: alucryd
Revision: 86228
upgpkg: lightdm 1.5.1-6
Added:
lightdm/trunk/xsession
Modified:
lightdm/trunk/PKGBUILD
lightdm/trunk/lightdm-default-config.patch
Deleted:
lightdm/trunk/Xsession
--+
PKGBUILD | 10 ++---
Xsession | 73 -
lightdm-default-config.patch |2 -
xsession | 73 +
4 files changed, 79 insertions(+), 79 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-13 18:31:03 UTC (rev 86227)
+++ PKGBUILD2013-03-13 18:50:57 UTC (rev 86228)
@@ -5,7 +5,7 @@
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
pkgver=1.5.1
-pkgrel=5
+pkgrel=6
pkgdesc=A lightweight display manager
arch=('i686' 'x86_64')
url=https://launchpad.net/lightdm;
@@ -21,17 +21,17 @@
'lightdm-default-config.patch'
'lightdm-1.5.1-systemd_login1_power.patch'
'lightdm-lock-screen-before-switch.patch'
-'Xsession')
+'xsession')
sha256sums=('645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86'
'2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
'ec10378992907f06a6960c4644aba2f81744fbcaf38f6bdc7c364979be3207e4'
'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
'cd0a9591b61118c6de1b07e1cd9a1b74cd74e9e95288f8b41eba32e26fd22023'
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
-'4bb044fc1d0524535e108627197facf95687dc21acde5ad77799d97ad16bb3eb'
+'51ec7eb1c50c0ba0b96b846662707533ebc1d6558cea75cb7424afddf0d064f0'
'8c8432294d361475293852f45673bc042eb252dbc58a17445fd10e5e874dc608'
'4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
-'66e12ef7ed34df78f8c17fb211b9e25f33446a2a702c34141f4917d6413ce883')
+'7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -61,7 +61,7 @@
# Install
make DESTDIR=${pkgdir} install
make DESTDIR=${pkgdir} -C liblightdm-qt uninstall
- install -m 755 ../Xsession ${pkgdir}/etc/lightdm/Xsession
+ install -m 755 ../xsession ${pkgdir}/etc/lightdm/xsession
rm -rf ${pkgdir}/etc/init
# PAM
Deleted: Xsession
===
--- Xsession2013-03-13 18:31:03 UTC (rev 86227)
+++ Xsession2013-03-13 18:50:57 UTC (rev 86228)
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# LightDM wrapper to run around X sessions.
-
-echo Running X session wrapper
-
-# Load profile
-for file in /etc/profile $HOME/.profile /etc/xprofile $HOME/.xprofile;
do
-if [ -f $file ]; then
-echo Loading profile from $file;
-. $file
-fi
-done
-
-# Load resources
-for file in /etc/X11/Xresources $HOME/.Xresources; do
-if [ -f $file ]; then
-echo Loading resource: $file
-xrdb -nocpp -merge $file
-fi
-done
-
-# Load keymaps
-for file in /etc/X11/Xkbmap $HOME/.Xkbmap; do
-if [ -f $file ]; then
-echo Loading keymap: $file
-setxkbmap `cat $file`
-XKB_IN_USE=yes
-fi
-done
-
-# Load xmodmap if not using XKB
-if [ -z $XKB_IN_USE ]; then
-for file in /etc/X11/Xmodmap $HOME/.Xmodmap; do
-if [ -f $file ]; then
- echo Loading modmap: $file
- xmodmap $file
-fi
-done
-fi
-
-unset XKB_IN_USE
-
-# Run all system xinitrc shell scripts.
-xinitdir=/etc/X11/xinit/xinitrc.d
-if [ -d $xinitdir ]; then
-for script in $xinitdir/*; do
-echo Loading xinit script $script
-if [ -x $script -a ! -d $script ]; then
-. $script
-fi
-done
-fi
-
-# Load Xsession scripts
-xsessionddir=/etc/X11/Xsession.d
-if [ -d $xsessionddir ]; then
-for i in `ls $xsessionddir`; do
-script=$xsessionddir/$i
-echo Loading X session script $script
-if [ -r $script -a -f $script ] expr $i :
'^[[:alnum:]_-]\+$' /dev/null; then
-. $script
-fi
-done
-fi
-if [ -x $HOME/.Xsession -a -f $HOME/.Xsession ]; then
-echo Loading user X session script
-. $HOME/.Xsession
-fi
-
-echo X session wrapper complete, running session $@
-
-exec $@
Modified: lightdm-default-config.patch
===
--- lightdm-default-config.patch2013-03-13 18:31:03 UTC (rev 86227)
+++ lightdm-default-config.patch2013-03-13 18:50:57 UTC (rev 86228)
@@ -15,7 +15,7 @@
#allow-guest=true
#guest-session=UNIMPLEMENTED
-#session-wrapper=lightdm-session
-+session-wrapper=/etc/lightdm/Xsession
++session-wrapper=/etc/lightdm/xsession
#display-setup-script=
#greeter-setup-script=
#session-setup-script=
Added: xsession
