[arch-commits] Commit in fprintd/trunk (2 files)

[Jan Steffens]

    Date: Thursday, July 1, 2021 @ 20:40:08
  Author: heftig
Revision: 418873

1.92.0-1

Modified:
  fprintd/trunk/PKGBUILD
Deleted:
  fprintd/trunk/0001-data-Use-the-correct-mode-for-the-state-dir.patch

--------------------------------------------------------+
 0001-data-Use-the-correct-mode-for-the-state-dir.patch |   25 ---------------
 PKGBUILD                                               |   18 +++-------
 2 files changed, 6 insertions(+), 37 deletions(-)

Deleted: 0001-data-Use-the-correct-mode-for-the-state-dir.patch
===================================================================
--- 0001-data-Use-the-correct-mode-for-the-state-dir.patch	2021-07-01 20:37:26 UTC (rev 418872)
+++ 0001-data-Use-the-correct-mode-for-the-state-dir.patch	2021-07-01 20:40:08 UTC (rev 418873)
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig at archlinux.org>
-Date: Tue, 19 Jan 2021 22:18:55 +0000
-Subject: [PATCH] data: Use the correct mode for the state dir
-
-The code (in file_storage.c) expects mode 0700. However, systemd
-defaults to 0755. This causes strange behavior.
-
-https://bugs.archlinux.org/task/68932
----
- data/fprintd.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/fprintd.service.in b/data/fprintd.service.in
-index 9ea7a2a..02bd13e 100644
---- a/data/fprintd.service.in
-+++ b/data/fprintd.service.in
-@@ -13,6 +13,7 @@ ProtectKernelTunables=true
- ProtectControlGroups=true
- # This always corresponds to /var/lib/fprint
- StateDirectory=fprint
-+StateDirectoryMode=0700
- ProtectHome=true
- PrivateTmp=true
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-01 20:37:26 UTC (rev 418872)
+++ PKGBUILD	2021-07-01 20:40:08 UTC (rev 418873)
@@ -2,21 +2,19 @@
 # Contributor: Nikolay Rysev <mad.f3ka at gmail.com>
 
 pkgname=fprintd
-pkgver=1.90.9
+pkgver=1.92.0
 pkgrel=1
 pkgdesc="D-Bus service to access fingerprint readers"
 url="https://fprint.freedesktop.org/"
 arch=(x86_64)
 license=(GPL)
-depends=(glib2 libfprint polkit dbus dbus-glib libsystemd)
+depends=(glib2 libfprint polkit dbus dbus-glib systemd)
 makedepends=(gtk-doc git meson pam_wrapper python-cairo python-dbus
              python-dbusmock)
 groups=(fprint)
-_commit=da60bddb3e5be024c6c1958437cb13e0ce0ffac8  # tags/v1.90.9^0
-source=("git+https://gitlab.freedesktop.org/libfprint/fprintd.git#commit=$_commit"
-        0001-data-Use-the-correct-mode-for-the-state-dir.patch)
-sha256sums=('SKIP'
-            'da1fa15963d004db79176f9795f1b42899d6295380c4275e420627eff02d7db1')
+_commit=b760a82ac68177516bd0a36656a3d2c040e8fcf7  # tags/v1.92.0^0
+source=("git+https://gitlab.freedesktop.org/libfprint/fprintd.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -25,10 +23,6 @@
 
 prepare() {
   cd $pkgname
-
-  # https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/119
-  # https://bugs.archlinux.org/task/68932
-  git apply -3 ../0001-data-Use-the-correct-mode-for-the-state-dir.patch
 }
 
 build() {
@@ -45,5 +39,5 @@
 package() {
   depends+=(libfprint-2.so)
 
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }