[arch-commits] Commit in fprintd/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Thursday, July 1, 2021 @ 20:40:24
  Author: heftig
Revision: 418874

archrelease: copy trunk to extra-x86_64

Added:
  fprintd/repos/extra-x86_64/PKGBUILD
    (from rev 418873, fprintd/trunk/PKGBUILD)
Deleted:
  fprintd/repos/extra-x86_64/0001-data-Use-the-correct-mode-for-the-state-dir.patch
  fprintd/repos/extra-x86_64/PKGBUILD

--------------------------------------------------------+
 0001-data-Use-the-correct-mode-for-the-state-dir.patch |   25 ----
 PKGBUILD                                               |   92 +++++++--------
 2 files changed, 43 insertions(+), 74 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:40:08 UTC (rev 418873)
+++ 0001-data-Use-the-correct-mode-for-the-state-dir.patch	2021-07-01 20:40:24 UTC (rev 418874)
@@ -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
- 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-01 20:40:08 UTC (rev 418873)
+++ PKGBUILD	2021-07-01 20:40:24 UTC (rev 418874)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Nikolay Rysev <mad.f3ka at gmail.com>
-
-pkgname=fprintd
-pkgver=1.90.9
-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)
-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')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^v//;s/^V_//;s/_/./g;s/-/+/g'
-}
-
-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() {
-  arch-meson $pkgname build \
-    -D pam_modules_dir=/usr/lib/security \
-    -D gtk_doc=true
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  depends+=(libfprint-2.so)
-
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: fprintd/repos/extra-x86_64/PKGBUILD (from rev 418873, fprintd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-07-01 20:40:24 UTC (rev 418874)
@@ -0,0 +1,43 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Nikolay Rysev <mad.f3ka at gmail.com>
+
+pkgname=fprintd
+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 systemd)
+makedepends=(gtk-doc git meson pam_wrapper python-cairo python-dbus
+             python-dbusmock)
+groups=(fprint)
+_commit=b760a82ac68177516bd0a36656a3d2c040e8fcf7  # tags/v1.92.0^0
+source=("git+https://gitlab.freedesktop.org/libfprint/fprintd.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/^V_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  arch-meson $pkgname build \
+    -D pam_modules_dir=/usr/lib/security \
+    -D gtk_doc=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  depends+=(libfprint-2.so)
+
+  meson install -C build --destdir "$pkgdir"
+}