[arch-commits] Commit in sddm/repos/extra-x86_64 (7 files)

Antonio Rojas arojas at archlinux.org
Wed Nov 4 09:24:00 UTC 2020


    Date: Wednesday, November 4, 2020 @ 09:24:00
  Author: arojas
Revision: 399263

archrelease: copy trunk to extra-x86_64

Added:
  sddm/repos/extra-x86_64/PKGBUILD
    (from rev 399262, sddm/trunk/PKGBUILD)
  sddm/repos/extra-x86_64/pam-faillock.patch
    (from rev 399262, sddm/trunk/pam-faillock.patch)
  sddm/repos/extra-x86_64/sddm.sysusers
    (from rev 399262, sddm/trunk/sddm.sysusers)
  sddm/repos/extra-x86_64/sddm.tmpfiles
    (from rev 399262, sddm/trunk/sddm.tmpfiles)
Deleted:
  sddm/repos/extra-x86_64/PKGBUILD
  sddm/repos/extra-x86_64/sddm.sysusers
  sddm/repos/extra-x86_64/sddm.tmpfiles

--------------------+
 PKGBUILD           |  102 +++++++++++++++++++++++++++------------------------
 pam-faillock.patch |   12 ++++++
 sddm.sysusers      |    4 +-
 sddm.tmpfiles      |    2 -
 4 files changed, 69 insertions(+), 51 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-04 09:23:48 UTC (rev 399262)
+++ PKGBUILD	2020-11-04 09:24:00 UTC (rev 399263)
@@ -1,48 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=sddm
-pkgver=0.19.0
-pkgrel=1
-pkgdesc='QML based X11 and Wayland display manager'
-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)
-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)
-sha256sums=('e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41'
-            '9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f'
-            'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677')
-
-build() {
-  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
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-
-  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
-# Don't set PATH in sddm.conf
-  sed -r 's|DefaultPath=.*|DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin|g' -i "$pkgdir"/usr/lib/sddm/sddm.conf.d/default.conf
-# Unset InputMethod https://github.com/sddm/sddm/issues/952
-  sed -e "/^InputMethod/s/qtvirtualkeyboard//" -i "$pkgdir"/usr/lib/sddm/sddm.conf.d/default.conf
-}

Copied: sddm/repos/extra-x86_64/PKGBUILD (from rev 399262, sddm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-04 09:24:00 UTC (rev 399263)
@@ -0,0 +1,54 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=sddm
+pkgver=0.19.0
+pkgrel=2
+pkgdesc='QML based X11 and Wayland display manager'
+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)
+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.patch)
+sha256sums=('e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41'
+            '9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f'
+            'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677'
+            '441f441fc63c16c5dbd83411a305d88b17e50836c958677db881b9b6c13c668a')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../pam-faillock.patch # Port away from deprecated pam_tally2
+}
+
+build() {
+  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
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+
+  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
+# Don't set PATH in sddm.conf
+  sed -r 's|DefaultPath=.*|DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin|g' -i "$pkgdir"/usr/lib/sddm/sddm.conf.d/default.conf
+# Unset InputMethod https://github.com/sddm/sddm/issues/952
+  sed -e "/^InputMethod/s/qtvirtualkeyboard//" -i "$pkgdir"/usr/lib/sddm/sddm.conf.d/default.conf
+}

Copied: sddm/repos/extra-x86_64/pam-faillock.patch (from rev 399262, sddm/trunk/pam-faillock.patch)
===================================================================
--- pam-faillock.patch	                        (rev 0)
+++ pam-faillock.patch	2020-11-04 09:24:00 UTC (rev 399263)
@@ -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

Deleted: sddm.sysusers
===================================================================
--- sddm.sysusers	2020-11-04 09:23:48 UTC (rev 399262)
+++ sddm.sysusers	2020-11-04 09:24:00 UTC (rev 399263)
@@ -1,2 +0,0 @@
-u sddm - "Simple Desktop Display Manager" /var/lib/sddm
-m sddm video

Copied: sddm/repos/extra-x86_64/sddm.sysusers (from rev 399262, sddm/trunk/sddm.sysusers)
===================================================================
--- sddm.sysusers	                        (rev 0)
+++ sddm.sysusers	2020-11-04 09:24:00 UTC (rev 399263)
@@ -0,0 +1,2 @@
+u sddm - "Simple Desktop Display Manager" /var/lib/sddm
+m sddm video

Deleted: sddm.tmpfiles
===================================================================
--- sddm.tmpfiles	2020-11-04 09:23:48 UTC (rev 399262)
+++ sddm.tmpfiles	2020-11-04 09:24:00 UTC (rev 399263)
@@ -1 +0,0 @@
-d /var/lib/sddm 0755 sddm sddm

Copied: sddm/repos/extra-x86_64/sddm.tmpfiles (from rev 399262, sddm/trunk/sddm.tmpfiles)
===================================================================
--- sddm.tmpfiles	                        (rev 0)
+++ sddm.tmpfiles	2020-11-04 09:24:00 UTC (rev 399263)
@@ -0,0 +1 @@
+d /var/lib/sddm 0755 sddm sddm


More information about the arch-commits mailing list