summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2021-06-26 14:24:34 +0200
committerPiotr Gorski2021-06-26 14:24:34 +0200
commitf72b3ce541b9156a8366b52a041d62a1d01852f2 (patch)
tree71254009bab5dfa2596cd11fdbd35f06ecef8a40
parent9cea7111f943d5ee730e4bc5d19f93c032493a94 (diff)
downloadaur-f72b3ce541b9156a8366b52a041d62a1d01852f2.tar.gz
Drop pam-faillock.patch
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, 4 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0cfd28ce079a..8520535e333b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sddm-git
pkgdesc = The Simple Desktop Display Manager
- pkgver = 0.19.0.31.g9881225
+ pkgver = 0.19.0.41.g0b3f399
pkgrel = 1
url = https://github.com/sddm/sddm
arch = x86_64
@@ -23,10 +23,8 @@ pkgbase = sddm-git
source = git://github.com/sddm/sddm.git#branch=develop
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 1943b3ed753e..17b8cb312202 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgbase="sddm"
pkgname="$_pkgbase-git"
-pkgver=0.19.0.31.g9881225
+pkgver=0.19.0.41.g0b3f399
pkgrel=1
pkgdesc="The Simple Desktop Display Manager"
arch=("x86_64")
@@ -19,12 +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=develop"
-sddm.sysusers sddm.tmpfiles
-pam-faillock.patch)
+sddm.sysusers sddm.tmpfiles)
sha256sums=('SKIP'
'9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f'
- 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677'
- '441f441fc63c16c5dbd83411a305d88b17e50836c958677db881b9b6c13c668a')
+ 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677')
pkgver() {
cd $_pkgbase
@@ -33,10 +31,6 @@ 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
deleted file mode 100644
index 91c44bb66226..000000000000
--- a/pam-faillock.patch
+++ /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_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