Date: Tuesday, November 3, 2020 @ 10:51:45 Author: arojas Revision: 399206
Update to 0.19.0 Modified: sddm/trunk/PKGBUILD Deleted: sddm/trunk/pam-faillock.diff -------------------+ PKGBUILD | 43 ++++++++++++++++--------------------------- pam-faillock.diff | 12 ------------ 2 files changed, 16 insertions(+), 39 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-03 10:29:31 UTC (rev 399205) +++ PKGBUILD 2020-11-03 10:51:45 UTC (rev 399206) @@ -3,52 +3,41 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=sddm -pkgver=0.18.1 -pkgrel=3 +pkgver=0.19.0 +pkgrel=1 pkgdesc='QML based X11 and Wayland display manager' -arch=('x86_64') +arch=(x86_64) url='https://github.com/sddm/sddm' -license=('GPL') -depends=('qt5-declarative' 'xorg-xauth' 'xorg-server') -makedepends=('extra-cmake-modules' 'python-docutils' 'qt5-tools') +license=(GPL) +depends=(qt5-declarative xorg-xauth xorg-server) +makedepends=(extra-cmake-modules python-docutils qt5-tools) backup=('usr/share/sddm/scripts/Xsetup' 'usr/share/sddm/scripts/Xstop' 'etc/pam.d/sddm' 'etc/pam.d/sddm-autologin' 'etc/pam.d/sddm-greeter') -provides=('display-manager') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz" - sddm.sysusers sddm.tmpfiles pam-faillock.diff) -sha256sums=('07296fc747010a5dd58a45f16c3224b439997afad42566e4b043c841b1b71700' +provides=(display-manager) +source=($pkgname-$pkgver.tar.gz::"https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" + sddm.sysusers sddm.tmpfiles) +sha256sums=('e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41' '9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f' - 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677' - '1ac9d20f6476cbfc5123460e924bd46ac9fcd0aa5131758054d762ffa86db516') + 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677') -prepare() { - mkdir -p build - cd ${srcdir}/${pkgname}-${pkgver} - # fix pam 1.4.x #67372 - patch -Np1 -i ${srcdir}/pam-faillock.diff -} - build() { - cd build - cmake ../${pkgname}-${pkgver} \ + cmake -B build -S $pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ -DDBUS_CONFIG_DIR=/usr/share/dbus-1/system.d \ -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \ -DBUILD_MAN_PAGES=ON - - make + cmake --build build } package() { - cd build - make DESTDIR="${pkgdir}" install + DESTDIR="$pkgdir" cmake --install build - install -Dm644 "$srcdir"/sddm.sysusers "$pkgdir"/usr/lib/sysusers.d/sddm.conf - install -Dm644 "$srcdir"/sddm.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/sddm.conf + install -Dm644 sddm.sysusers "$pkgdir"/usr/lib/sysusers.d/sddm.conf + install -Dm644 sddm.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/sddm.conf install -d "$pkgdir"/usr/lib/sddm/sddm.conf.d "$pkgdir"/usr/bin/sddm --example-config > "$pkgdir"/usr/lib/sddm/sddm.conf.d/default.conf Deleted: pam-faillock.diff =================================================================== --- pam-faillock.diff 2020-11-03 10:29:31 UTC (rev 399205) +++ pam-faillock.diff 2020-11-03 10:51:45 UTC (rev 399206) @@ -1,12 +0,0 @@ -diff --git a/services/sddm-autologin.pam b/services/sddm-autologin.pam -index 4c82048..b42991e 100755 ---- a/services/sddm-autologin.pam -+++ b/services/sddm-autologin.pam -@@ -1,6 +1,6 @@ - #%PAM-1.0 - auth required pam_env.so --auth required pam_tally.so file=/var/log/faillog onerr=succeed -+auth required pam_faillock.so preauth - auth required pam_shells.so - auth required pam_nologin.so - auth required pam_permit.so