From 6558765c2fc0b9217113c6b93fb138e71d221c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Wed, 4 Sep 2024 15:37:36 +0200 Subject: [PATCH] community/fprintd: rebuild against pam under /usr/lib Including a patch from a MR upstream that fixes the instalation path --- community/fprintd/215.patch | 25 +++++++++++++++++++++++++ community/fprintd/APKBUILD | 6 ++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 community/fprintd/215.patch diff --git a/community/fprintd/215.patch b/community/fprintd/215.patch new file mode 100644 index 00000000000..f1386af3bdc --- /dev/null +++ b/community/fprintd/215.patch @@ -0,0 +1,25 @@ +From daef1b06597b690228dcf62602a7d52b37f8c8d5 Mon Sep 17 00:00:00 2001 +From: "Brett T. Warden" +Date: Tue, 7 May 2024 10:48:09 -0700 +Subject: [PATCH] Use prefix to determine pam_modules_dir + +--- + pam/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pam/meson.build b/pam/meson.build +index 8b5bc7e..9f9691b 100644 +--- a/pam/meson.build ++++ b/pam/meson.build +@@ -1,7 +1,7 @@ + mapfile = files('pam_fprintd.ver') + pam_modules_dir = get_option('pam_modules_dir') + if pam_modules_dir == '' +- pam_modules_dir = '/' / get_option('libdir') / 'security' ++ pam_modules_dir = get_option('prefix') / get_option('libdir') / 'security' + endif + + pam_fprintd = shared_module('pam_fprintd', +-- +GitLab + diff --git a/community/fprintd/APKBUILD b/community/fprintd/APKBUILD index b649ff9794b..157b5964795 100644 --- a/community/fprintd/APKBUILD +++ b/community/fprintd/APKBUILD @@ -4,7 +4,7 @@ # TODO: Figure out how to ditch out Polkit (make it optional). pkgname=fprintd pkgver=1.94.3 -pkgrel=1 +pkgrel=2 pkgdesc="Daemon that provides fingerprint scanning functionality over D-Bus" url="https://fprint.freedesktop.org/" arch="all" @@ -32,6 +32,7 @@ source="https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v$pkgver/fpri pam-include-time.patch pam-use-basu-and-remove-sd-login.patch fix-missing-libintl.patch + 215.patch " builddir="$srcdir/$pkgname-v$pkgver" options="!check" # tests are broken, they expect fprintd installed in "/" @@ -60,7 +61,7 @@ pam() { pkgdesc="PAM module for fingerprint authentication" install_if="$pkgname=$pkgver-r$pkgrel linux-pam" - amove lib/security + amove usr/lib/security } sha512sums=" @@ -69,4 +70,5 @@ b708581858084f8541026785dbdea4a2a783d082c53e4d9544a1a3f9ec03dfed0afbe0ca1e307087 08d489d3dce24f921777f5e90f716596aee99f8d1dfe794368bf92bd39313731225e0750375826454c22974316fd9d13b7e6405ae3f1f5b54dd418e61d512589 pam-include-time.patch 0fd20371cb710095db6ab0ca80db6308e876b44455be22f77297c756e7ed8a5292687706928f33015477ddc01b4f939ba7e111d56a90396ced863f5dc6948a84 pam-use-basu-and-remove-sd-login.patch 4e1aee3c3250924a48f45a28f2f624f15641fe9957987bdd61df8f4af1253e7d56d913570101fd05c37cd0e917be1391d44ae6ab7246119b462515e1159ad952 fix-missing-libintl.patch +079abf1eab6148f0c568e254fedb30fc4ac14552d5920cbb3d27af6f369a778cb6695183021bc50183418f7b92dacd79cb05996a66bd1a219a500fcbdd719255 215.patch "