summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2020-11-05 21:06:56 +0100
committerPiotr Gorski2020-11-05 21:06:56 +0100
commitc01052c508d19554a9dec2013667609f34a93a2f (patch)
tree17e577ab201d4c3a0de51bc6d11824f826c4cb6d
parenta86151a0a7a5ef0e9b4a690834f2d47d7c3c1aea (diff)
downloadaur-c01052c508d19554a9dec2013667609f34a93a2f.tar.gz
Sync with Arch
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--pam-faillock.patch12
3 files changed, 24 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 34982f1ae6db..a118c57e79b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sddm-git
pkgdesc = The Simple Desktop Display Manager
pkgver = 0.19.0.8.gfc3e286
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/sddm/sddm
arch = x86_64
license = GPL
@@ -23,9 +23,11 @@ pkgbase = sddm-git
source = git://github.com/sddm/sddm.git#branch=master
source = sddm.sysusers
source = sddm.tmpfiles
+ source = pam-faillock.patch
sha256sums = SKIP
sha256sums = 9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f
sha256sums = db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677
+ sha256sums = 441f441fc63c16c5dbd83411a305d88b17e50836c958677db881b9b6c13c668a
pkgname = sddm-git
diff --git a/PKGBUILD b/PKGBUILD
index a4f897d81492..c38ad2fe7a47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgbase="sddm"
pkgname="$_pkgbase-git"
pkgver=0.19.0.8.gfc3e286
-pkgrel=1
+pkgrel=2
pkgdesc="The Simple Desktop Display Manager"
arch=("x86_64")
url="https://github.com/sddm/sddm"
@@ -19,10 +19,12 @@ 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)
+sddm.sysusers sddm.tmpfiles
+pam-faillock.patch)
sha256sums=('SKIP'
'9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f'
- 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677')
+ 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677'
+ '441f441fc63c16c5dbd83411a305d88b17e50836c958677db881b9b6c13c668a')
pkgver() {
cd $_pkgbase
@@ -31,6 +33,10 @@ pkgver() {
git describe --tags --long | sed 's/^v//;s/-/./g'
}
+prepare() {
+ patch -d $_pkgbase -p1 -i ../pam-faillock.patch # Port away from deprecated pam_tally2
+}
+
build() {
cmake -B build -S $_pkgbase \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/pam-faillock.patch b/pam-faillock.patch
new file mode 100644
index 000000000000..91c44bb66226
--- /dev/null
+++ b/pam-faillock.patch
@@ -0,0 +1,12 @@
+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_tally2.so file=/var/log/tallylog onerr=succeed
++auth required pam_faillock.so preauth
+ auth required pam_shells.so
+ auth required pam_nologin.so
+ auth required pam_permit.so