From b251c3a0c6d6f9530c396da9d0874361cc42a715 Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 7 Jun 2024 17:22:05 +0200 Subject: [PATCH 1/3] elogind: split udev uaccess rules --- srcpkgs/elogind-uaccess | 1 + srcpkgs/elogind/template | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/elogind-uaccess diff --git a/srcpkgs/elogind-uaccess b/srcpkgs/elogind-uaccess new file mode 120000 index 00000000000000..49be2e0cf598f0 --- /dev/null +++ b/srcpkgs/elogind-uaccess @@ -0,0 +1 @@ +elogind \ No newline at end of file diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 3275f48acc8238..b8015dcf8359e8 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,7 +1,7 @@ # Template file for 'elogind' pkgname=elogind version=252.9 -revision=2 +revision=3 build_style=meson configure_args="-Dcgroup-controller=elogind -Ddefault-hierarchy=legacy -Ddefault-kill-user-processes=false -Dhalt-path=/usr/bin/halt @@ -12,7 +12,7 @@ hostmakedepends="docbook-xsl glib-devel gperf gettext libxslt m4 pkg-config python3-Jinja2 shadow" makedepends="acl-devel eudev-libudev-devel libcap-devel libglib-devel libseccomp-devel pam-devel" -depends="dbus" +depends="dbus elogind-uaccess" short_desc="Standalone logind fork" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.0-or-later" @@ -78,3 +78,10 @@ libelogind_package() { vmove "usr/lib/libelogind.so.*" } } + +elogind-uaccess_package() { + short_desk+=" - uaccess rules" + pkg_install() { + vmove usr/lib/udev/rules.d/70-uaccess.rules + } +} From 7d1b57ead83b3f9fd7e14efa88a6309de2bd2817 Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 5 Jun 2024 14:45:45 -0400 Subject: [PATCH 2/3] pam-base: add pam_uaccess --- srcpkgs/pam-base/files/system-login | 1 + srcpkgs/pam-base/template | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/pam-base/files/system-login b/srcpkgs/pam-base/files/system-login index 72c4638f07d3fe..dd2501cc95c2b0 100644 --- a/srcpkgs/pam-base/files/system-login +++ b/srcpkgs/pam-base/files/system-login @@ -16,5 +16,6 @@ session optional pam_motd.so motd=/etc/motd session optional pam_mail.so dir=/var/mail standard quiet -session optional pam_turnstile.so -session optional pam_elogind.so +-session optional pam_uaccess.so -session optional pam_dumb_runtime_dir.so session required pam_env.so diff --git a/srcpkgs/pam-base/template b/srcpkgs/pam-base/template index 38bfa74cd88560..07c14e873cb5fd 100644 --- a/srcpkgs/pam-base/template +++ b/srcpkgs/pam-base/template @@ -1,7 +1,7 @@ # Template file for 'pam-base' pkgname=pam-base version=0.4 -revision=3 +revision=4 short_desc="PAM base configuration files" maintainer="Érico Nogueira " license="Public Domain" From 2cc7866568300d283053ffcfd60c6df045aef933 Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 5 Jun 2024 14:45:26 -0400 Subject: [PATCH 3/3] new package: pam_uaccess --- srcpkgs/pam_uaccess/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/pam_uaccess/template diff --git a/srcpkgs/pam_uaccess/template b/srcpkgs/pam_uaccess/template new file mode 100644 index 00000000000000..8f0c9b002065bf --- /dev/null +++ b/srcpkgs/pam_uaccess/template @@ -0,0 +1,19 @@ +# Template file for 'pam_uaccess' +pkgname=pam_uaccess +version=0 +revision=1 +_commit=54fbf043c63cc500b4850b0b4a12ea14078f2b53 +build_style=meson +hostmakedepends="pkg-config" +makedepends="acl-devel eudev-libudev-devel pam-devel" +depends="elogind-uaccess" +short_desc="PAM module that grants access to devices tagged uaccess" +maintainer="dkwo " +license="MIT" +homepage="https://git.sr.ht/~kennylevinsen/pam_uaccess" +distfiles="https://git.sr.ht/~kennylevinsen/pam_uaccess/archive/${_commit}.tar.gz" +checksum=44986d6fb341a3ca4e98ad7410037d97b010bb6510ac20e3765693249a1dbc3d + +post_install() { + vlicense LICENSE +}