summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2020-11-03 16:19:56 +0100
committerPiotr Gorski2020-11-03 16:19:56 +0100
commita86151a0a7a5ef0e9b4a690834f2d47d7c3c1aea (patch)
tree499421a244ce6f0a1719ac818c54f0f5d668a654
parent6335bc6f8b15256196290810f57f6b00cd31573c (diff)
downloadaur-a86151a0a7a5ef0e9b4a690834f2d47d7c3c1aea.tar.gz
Sync with Arch
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
-rw-r--r--pam-faillock.diff12
3 files changed, 8 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d33986ca2da5..34982f1ae6db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sddm-git
pkgdesc = The Simple Desktop Display Manager
- pkgver = 0.18.1.1.g5342323
- pkgrel = 3
+ pkgver = 0.19.0.8.gfc3e286
+ pkgrel = 1
url = https://github.com/sddm/sddm
arch = x86_64
license = GPL
@@ -23,11 +23,9 @@ pkgbase = sddm-git
source = git://github.com/sddm/sddm.git#branch=master
source = sddm.sysusers
source = sddm.tmpfiles
- source = pam-faillock.diff
sha256sums = SKIP
sha256sums = 9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f
sha256sums = db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677
- sha256sums = 1ac9d20f6476cbfc5123460e924bd46ac9fcd0aa5131758054d762ffa86db516
pkgname = sddm-git
diff --git a/PKGBUILD b/PKGBUILD
index ebb9a7d9ef43..a4f897d81492 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
_pkgbase="sddm"
pkgname="$_pkgbase-git"
-pkgver=0.18.1.1.g5342323
-pkgrel=3
+pkgver=0.19.0.8.gfc3e286
+pkgrel=1
pkgdesc="The Simple Desktop Display Manager"
arch=("x86_64")
url="https://github.com/sddm/sddm"
@@ -19,11 +19,10 @@ backup=('usr/share/sddm/scripts/Xsetup'
'etc/pam.d/sddm-autologin'
'etc/pam.d/sddm-greeter')
source=("git://github.com/sddm/sddm.git#branch=master"
-sddm.sysusers sddm.tmpfiles pam-faillock.diff)
+sddm.sysusers sddm.tmpfiles)
sha256sums=('SKIP'
'9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f'
- 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677'
- '1ac9d20f6476cbfc5123460e924bd46ac9fcd0aa5131758054d762ffa86db516')
+ 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677')
pkgver() {
cd $_pkgbase
@@ -32,10 +31,6 @@ pkgver() {
git describe --tags --long | sed 's/^v//;s/-/./g'
}
-prepare() {
- patch -d $_pkgbase -p1 -i ../pam-faillock.diff
-}
-
build() {
cmake -B build -S $_pkgbase \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -49,8 +44,8 @@ build() {
package() {
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
diff --git a/pam-faillock.diff b/pam-faillock.diff
deleted file mode 100644
index 8f96af2b5a8c..000000000000
--- a/pam-faillock.diff
+++ /dev/null
@@ -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