aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2020-11-05 10:12:13 +0100
committerLeo <thinkabit.ukim@gmail.com>2020-11-06 12:35:02 +0000
commit1d651a701f846a02586af0a0b17767c05f8e44fe (patch)
tree3bcf8e77210e10beced839dcd762b28649c18f40
parentc2a1e925cbb7004d7d6e41ad895efa5c7dd44b90 (diff)
downloadaports-1d651a701f846a02586af0a0b17767c05f8e44fe.tar.gz
aports-1d651a701f846a02586af0a0b17767c05f8e44fe.tar.bz2
aports-1d651a701f846a02586af0a0b17767c05f8e44fe.tar.xz
community/sddm: upgrade to 0.19.0
-rw-r--r--community/sddm/APKBUILD46
-rw-r--r--community/sddm/fix-with-pam-1.4.patch19
2 files changed, 32 insertions, 33 deletions
diff --git a/community/sddm/APKBUILD b/community/sddm/APKBUILD
index f10f9d2d4f..ee52d0abbb 100644
--- a/community/sddm/APKBUILD
+++ b/community/sddm/APKBUILD
@@ -1,29 +1,47 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=sddm
-pkgver=0.18.1
-pkgrel=9
+pkgver=0.19.0
+pkgrel=0
pkgdesc="Simple Desktop Display Manager"
url="https://github.com/sddm/sddm/"
arch="all !armhf" # armhf blocked by qt5-qtdeclarative
license="GPL-2.0-only"
-depends="elogind xorg-server dbus-x11 upower linux-pam>=1.4"
-makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev
- elogind-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev utmps-dev
- py3-docutils"
+depends="
+ dbus-x11
+ elogind
+ linux-pam>=1.4
+ upower
+ xorg-server
+ "
+makedepends="
+ elogind-dev
+ extra-cmake-modules
+ libxcb-dev
+ linux-pam-dev
+ py3-docutils
+ qt5-qtbase-dev
+ qt5-qtdeclarative-dev
+ qt5-qttools-dev
+ upower-dev
+ utmps-dev
+ "
subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc"
install="sddm.pre-install"
langdir="/usr/share/sddm/translations"
pkgusers="sddm"
pkggroups="sddm"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sddm/sddm/archive/v$pkgver.tar.gz
- fix-with-pam-1.4.patch
+source="https://github.com/sddm/sddm/archive/v$pkgver/sddm-v$pkgver.tar.gz
pam-path-fix.patch
sddm.initd
"
+# secfixes:
+# 0.19.0-r0:
+# - CVE-2020-28049
+
build() {
- cmake \
+ cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -33,19 +51,19 @@ build() {
-DUSE_ELOGIND=ON \
-DUID_MIN=500 \
-DUID_MAX=65000
- make
+ cmake --build build
}
check() {
- "$builddir"/test/ConfigurationTest
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- DESTDIR="$pkgdir" make install
+ DESTDIR="$pkgdir" cmake --build build --target install
install -Dm755 "$srcdir"/sddm.initd "$pkgdir"/etc/init.d/sddm
}
-sha512sums="18d5b9ee5e4d022ac86e10cde1c70c5475aeaff86d41d8b9897bc26953f5b6d042a7fef1d6e727865ebeb003a730455656765ba53350a665891113afd4dfa7d8 sddm-0.18.1.tar.gz
-ba45572d647037a24311f4e2c1a49f555922448e6777003c4a77e5b807c38e1063be241cedb867261a1c3cf46a6a982fdde5eb7a537ed5ae0ad1c167d5613704 fix-with-pam-1.4.patch
+sha512sums="f4de3d2da844caa8c5639ec39d4f41305d4fcad9ca29fe381c2c1d4b1bba0e54d47b8644e2c72d41fe9d11f3792959c3dd14f76d9ebc0de2b8ab7675c3e9acf7 sddm-v0.19.0.tar.gz
f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch
8762f9f1ce4922ef1e5df9e95c403a54363faad22b5703bbb0c64998887cfc1bd31178f489208648155f032bc12aa839d8c0ce9f5c57766ffa1df75531f0ac6f sddm.initd"
diff --git a/community/sddm/fix-with-pam-1.4.patch b/community/sddm/fix-with-pam-1.4.patch
deleted file mode 100644
index d6a0e5e8c3..0000000000
--- a/community/sddm/fix-with-pam-1.4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Reason: PAM 1.4 removed the pam_tally module
-Upstream: No
-diff --git a/services/sddm-autologin.pam b/services/sddm-autologin.pam
-index 4c82048..4006ebb 100755
---- a/services/sddm-autologin.pam
-+++ b/services/sddm-autologin.pam
-@@ -1,9 +1,11 @@
- #%PAM-1.0
-+auth required pam_faillock.so preauth
- auth required pam_env.so
--auth required pam_tally.so file=/var/log/faillog onerr=succeed
- auth required pam_shells.so
- auth required pam_nologin.so
- auth required pam_permit.so
-+auth required pam_faillock.so authfail
-+auth required pam_faillock.so authsucc
- -auth optional pam_gnome_keyring.so
- -auth optional pam_kwallet5.so
- account include system-local-login