diff options
Diffstat (limited to 'sys-auth')
50 files changed, 541 insertions, 786 deletions
diff --git a/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild b/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild deleted file mode 100644 index d86746427953..000000000000 --- a/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -DESCRIPTION="Official authentication app for German ID cards and residence permits" -HOMEPAGE="https://www.ausweisapp.bund.de/" -SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="EUPL-1.2" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=" - dev-qt/qtshadertools:6 - dev-qt/qttools:6[linguist] - virtual/pkgconfig" - -RDEPEND=" - dev-libs/openssl:0= - dev-qt/qtbase:6[concurrent,network,widgets] - dev-qt/qtdeclarative:6[widgets] - dev-qt/qtscxml:6[qml] - dev-qt/qtsvg:6 - dev-qt/qtwebsockets:6[qml] - net-libs/http-parser:0= - sys-apps/pcsc-lite - virtual/udev" - -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/sys-auth/AusweisApp/AusweisApp-2.0.3.ebuild b/sys-auth/AusweisApp/AusweisApp-2.1.1.ebuild index f791a20ba107..f791a20ba107 100644 --- a/sys-auth/AusweisApp/AusweisApp-2.0.3.ebuild +++ b/sys-auth/AusweisApp/AusweisApp-2.1.1.ebuild diff --git a/sys-auth/AusweisApp/Manifest b/sys-auth/AusweisApp/Manifest index bb557a4dc39f..62a301f7430c 100644 --- a/sys-auth/AusweisApp/Manifest +++ b/sys-auth/AusweisApp/Manifest @@ -1,2 +1 @@ -DIST AusweisApp-2.0.3.tar.gz 9125557 BLAKE2B 6d32e0d451259bfb44ac99dce9dee3e66afd07d5c78c8f033703213888fb68c5d3ee9f8374d1ab79cd364061e78d98ce0c21fc5d6957f601bd88e5e3e6b2489d SHA512 4f492d137c1f38d3ff5ae70afc28d44bd86ce2034166e8ea7ca44e91161301a739ddcf985c76b14147485f6bc4e30e316db50db86eda7e2de1b7344c37091cd4 -DIST AusweisApp-2.1.0.tar.gz 5876657 BLAKE2B 54c8676dda53a667104f8edf8fc70fc4ca736b1207bea0ce2a5fc0a628216ce4f001adac03308fceccbb8ad834d171f364ac6b4e948ada26d6983ede827fd10e SHA512 a7186bdfe3ebd6779588dc6fa219fcc2f60d36c62a8b9956bbdc86e4962120e46b39266e7207cf0de4d84f9212d1616bbec9f8901cb0a112bcfcae1684f3ff75 +DIST AusweisApp-2.1.1.tar.gz 5878477 BLAKE2B c2948b51a7a04e36aa5bdfb805cd4ecb565fff5c67e040c0159adb4c10fd7e956e1968f5e12df48057bcd5c09dfd91d79aee781fb2a26319a0c2a3ef1a131d85 SHA512 124e92238b81ae2fd7865bc018ce64723a4d237e214b5166385fe191ae5365b5c9e260ecae8d249355d8dc61df08beea0988a622f6712132e7b164cb7f832674 diff --git a/sys-auth/elogind/elogind-252.9.ebuild b/sys-auth/elogind/elogind-252.9.ebuild index 4cb66f04f2f6..1da0c8672fff 100644 --- a/sys-auth/elogind/elogind-252.9.ebuild +++ b/sys-auth/elogind/elogind-252.9.ebuild @@ -55,6 +55,7 @@ DOCS=( README.md) PATCHES=( "${FILESDIR}/${P}-nodocs.patch" "${FILESDIR}/${PN}-252.9-musl-lfs.patch" + "${FILESDIR}/${PN}-252.9-musl-1.2.5.patch" ) python_check_deps() { @@ -97,6 +98,8 @@ src_configure() { python_setup + EMESON_BUILDTYPE="$(usex debug debug release)" + local emesonargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" @@ -114,7 +117,6 @@ src_configure() { -Ddefault-kill-user-processes=false -Dacl=$(usex acl true false) -Daudit=$(usex audit true false) - -Dbuildtype=$(usex debug debug release) -Dhtml=$(usex doc auto false) -Dpam=$(usex pam true false) -Dselinux=$(usex selinux true false) diff --git a/sys-auth/elogind/files/elogind-252.9-musl-1.2.5.patch b/sys-auth/elogind/files/elogind-252.9-musl-1.2.5.patch new file mode 100644 index 000000000000..cfd979170795 --- /dev/null +++ b/sys-auth/elogind/files/elogind-252.9-musl-1.2.5.patch @@ -0,0 +1,34 @@ + +This is a backport from +https://github.com/elogind/elogind/commit/d8dc8f66d6e64dfb45fc55c430a31b08b27c5165?diff=split&w=0 +effectively squashing several commits. + +diff -ruN elogind-252.9.orig/meson.build elogind-252.9/meson.build +--- elogind-252.9.orig/meson.build 2024-05-01 02:51:35.602756227 +1100 ++++ elogind-252.9/meson.build 2024-05-01 02:53:31.763434742 +1100 +@@ -655,7 +655,8 @@ + # ['pivot_root', '''#include <stdlib.h> + # #include <unistd.h>'''], # no known header declares pivot_root + #endif // 0 +-#if 1 /// elogind supports musl, but upstream refuses to add qsort_r ++#if 1 /// elogind supports musl, but upstream refuses to add qsort_r and has removed basename ++ ['basename', '''#include <string.h>'''], # _GNU_SOURCE is defined, so test for GNU basename() + ['qsort_r', '''#include <stdlib.h>'''], + #endif // 1 + ['ioprio_get', '''#include <sched.h>'''], # no known header declares ioprio_get +diff -ruN elogind-252.9.orig/src/basic/musl_missing.h elogind-252.9/src/basic/musl_missing.h +--- elogind-252.9.orig/src/basic/musl_missing.h 2023-05-15 22:35:29.000000000 +1100 ++++ elogind-252.9/src/basic/musl_missing.h 2024-05-01 02:54:48.293885181 +1100 +@@ -44,6 +44,12 @@ + # define HAVE_SECURE_GETENV 1 + #endif // HAVE_[__]SECURE_GETENV + ++#if ! HAVE_BASENAME ++/* Poor man's basename */ ++# define basename(path) \ ++ (strrchr(path, '/') ? strrchr(path, '/')+1 : path) ++#endif // HAVE_BASENAME ++ + /* strndupa may already be defined in another compatibility header */ + #if !defined(strndupa) + #define strndupa(x_src, x_n) \ diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest index be1f143b213a..7d197571e4b1 100644 --- a/sys-auth/fprintd/Manifest +++ b/sys-auth/fprintd/Manifest @@ -1,2 +1,2 @@ -DIST fprintd-v1.94.1.tar.bz2 658149 BLAKE2B 734da268e308b08b04cbc661d889f52c4e8b2dd61d7a67961eaba5a6aa130f6972525820a17e8b6dd53d38508629139a5a0be20b69eaea45430cc60da5cd9a27 SHA512 ff22087e09ab9f75e458e71f595d611ea97240596a25bd96f41a0fb1de865336f8c2edbd49d5e7c8132a7e554d8311337ec02991dde358cba1962d4cb182447d DIST fprintd-v1.94.2.tar.bz2 657989 BLAKE2B 5855ab453ae6d73e08c60c699a95609262fd121ab020f9ffeafb8d1891a60f761f47e4acd11554179b6d9cbed8a734aafb012a4b6de3e9ad67d4160534a0e6c6 SHA512 0b5ebc595b617fbe9167c41a80e31ae74e7bdc87350b0420839e1a6229d7709e51ff2836858c46d8d30549a1f0811b0f697034fcdd09512b5c1099f0f0a3b112 +DIST fprintd-v1.94.3.tar.bz2 661765 BLAKE2B 9cb1170092616cb095322cde4f55b354ad9f1481600fa4faf9d48d4dc22d3e71c1ff332877211d3ea4382cf37a8865a4b5aebb4f679b485d345abcb1d7ceb239 SHA512 bd6d9c6a78e445e55e0fb9da57d46ac354a1e768f34f2f1220e123db5d8d31773020fff43952b495262bb0188bb9b330682ff04ce6767c59043b511c03f55848 diff --git a/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch b/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch deleted file mode 100644 index e7f78320d1b9..000000000000 --- a/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch +++ /dev/null @@ -1,121 +0,0 @@ -https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch -https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch -https://bugs.gentoo.org/831753 - -From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz@archlinux.org> -Date: Tue, 11 Jan 2022 21:06:35 -0500 -Subject: [PATCH] use more idiomatic/correct embedded shell scripting - -Formatting arguments into code is fragile, and meson natively knows how -to pass files as arguments via argv. So pass them as arguments to the -shell. ---- - doc/dbus/meson.build | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build -index 802938e..861da64 100644 ---- a/doc/dbus/meson.build -+++ b/doc/dbus/meson.build -@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files - capture: true, - command: [ - bash, '-c', -- 'cat @INPUT@;' + -- xsltproc.path() + ' @0@/@1@ '.format( -- meson.source_root(), -- files('spec-to-docbook.xsl')[0]) + -- interface_file.full_path() + '| tail -n +2;', -+ 'cat "$1"; "$2" "$3" "$4" | tail -n +2', -+ '_', # argv0 ignored -+ '@INPUT@', -+ xsltproc, files('spec-to-docbook.xsl')[0], interface_file - ], - ) - endforeach --- -GitLab - -From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz@archlinux.org> -Date: Tue, 11 Jan 2022 20:46:29 -0500 -Subject: [PATCH] remove pointless copying of files into build directory - -I'm not entirely sure what this did, but it seems to be obsoleted by -commit 93bad825406d13ed5eb2cf27541dc58194bef8f3. ---- - doc/dbus/meson.build | 6 +++--- - src/meson.build | 20 ++++++------------- - ....xml => net.reactivated.Fprint.Device.xml} | 0 - ...xml => net.reactivated.Fprint.Manager.xml} | 0 - 4 files changed, 9 insertions(+), 17 deletions(-) - rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%) - rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%) - -diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build -index 861da64..431127d 100644 ---- a/doc/dbus/meson.build -+++ b/doc/dbus/meson.build -@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header', - ) - - dbus_interfaces_refs = [] --foreach interface_file: dbus_interfaces_files -- basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip() -+foreach interface_file: dbus_interfaces -+ basename = run_command('basename', interface_file, '.xml').stdout().strip() - dbus_interfaces_refs += custom_target(basename + '_ref', - input: docbook_xml_header, - output: basename + '.ref.xml', - build_by_default: true, -- depends: interface_file, -+ depend_files: interface_file, - capture: true, - command: [ - bash, '-c', -diff --git a/src/meson.build b/src/meson.build -index 1df6216..a7ce3fe 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,22 +1,14 @@ - bash = find_program('bash') --dbus_interfaces = ['Manager', 'Device'] --dbus_interfaces_files = [] -+dbus_interfaces = files( -+ 'net.reactivated.Fprint.Manager.xml', -+ 'net.reactivated.Fprint.Device.xml', -+) - --foreach interface_name: dbus_interfaces -- interface = interface_name.to_lower() -- interface_file = interface + '.xml' -- dbus_interfaces_files += custom_target('dbus_interface_' + interface, -- input: interface_file, -- output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name), -- command: ['cp', '@INPUT@', '@OUTPUT@'], -- install: true, -- install_dir: dbus_interfaces_dir, -- ) --endforeach -+install_data(dbus_interfaces, install_dir: dbus_interfaces_dir) - - # NOTE: We should pass "--glib-min-required 2.64" but cannot - fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus', -- sources: dbus_interfaces_files, -+ sources: dbus_interfaces, - autocleanup: 'all', - interface_prefix: 'net.reactivated.Fprint.', - namespace: 'FprintDBus', -diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml -similarity index 100% -rename from src/device.xml -rename to src/net.reactivated.Fprint.Device.xml -diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml -similarity index 100% -rename from src/manager.xml -rename to src/net.reactivated.Fprint.Manager.xml --- -GitLab - - diff --git a/sys-auth/fprintd/files/fprintd-1.94.3-test-optional.patch b/sys-auth/fprintd/files/fprintd-1.94.3-test-optional.patch new file mode 100644 index 000000000000..859c8376def1 --- /dev/null +++ b/sys-auth/fprintd/files/fprintd-1.94.3-test-optional.patch @@ -0,0 +1,81 @@ +https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/199 + +From 494df63b916bbf3ebf5e0bfc843a1b5298de63b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + <zboszor@gmail.com> +Date: Thu, 30 Mar 2023 15:06:14 +0200 +Subject: [PATCH] Make building tests optional +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> +--- + meson.build | 10 +++++++++- + meson_options.txt | 4 ++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 859bcf2..2abdd1f 100644 +--- a/meson.build ++++ b/meson.build +@@ -137,13 +137,16 @@ endif + polkit_policy_directory = polkit_gobject_dep.get_pkgconfig_variable('policydir') + + # Tests dependencies ++if get_option('tests') + pam_wrapper_dep = dependency('pam_wrapper', required: false) + if get_option('pam') and not pam_wrapper_dep.found() + warning('Dependency "pam_wrapper" required by test suite not found') + endif ++endif + + xmllint = find_program('xmllint', required: false) + python3 = find_program('python3') # No meson without it! ++if get_option('tests') + python3_test_modules = { + 'cairo': true, + 'dbus': true, +@@ -159,6 +162,7 @@ foreach module, required : python3_test_modules + warning('Python3 module \'' + module + '\' required by test suite not found') + endif + endforeach ++endif + + cdata = configuration_data() + cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +@@ -182,7 +186,9 @@ endif + if get_option('gtk_doc') + subdir('doc') + endif +-subdir('tests') ++if get_option('tests') ++ subdir('tests') ++endif + subdir('po') + + output = [] +@@ -205,6 +211,8 @@ output += ' Manuals: ' + get_option('man').to_string() + output += ' GTK Doc: ' + get_option('gtk_doc').to_string() + output += ' XML Linter ' + xmllint.found().to_string() + output += '\nTest setup:\n' ++if get_option('tests') + output += ' With address sanitizer: ' + address_sanitizer.to_string() ++endif + + message('\n'+'\n'.join(output)+'\n') +diff --git a/meson_options.txt b/meson_options.txt +index 286889e..73b28f2 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -28,3 +28,7 @@ option('gtk_doc', + type: 'boolean', + value: false, + description: 'Use gtk-doc to build documentation') ++option('tests', ++ type: 'boolean', ++ value: true, ++ description: 'Run tests') +-- +GitLab + diff --git a/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch b/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch deleted file mode 100644 index 409c18ea0d7b..000000000000 --- a/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://bugs.launchpad.net/ubuntu/+source/fprintd/+bug/1976256 -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009395 -https://salsa.debian.org/debian/fprintd/-/blob/debian/debian/patches/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch - -From: Benjamin Berg <bberg@redhat.com> -Date: Tue, 3 May 2022 12:01:37 +0200 -Subject: tests: Fix dbusmock AddDevice calls to include optional argument - -The dbusmock code checks that all parameters wanted by the dbus -signature are given. As such, pass them, even though the parameters is -optional on the python side. - -Origin: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa98 ---- - tests/pam/test_pam_fprintd.py | 8 ++++---- - tests/test_fprintd_utils.py | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/pam/test_pam_fprintd.py b/tests/pam/test_pam_fprintd.py -index 99f8259..bd43497 100644 ---- a/tests/pam/test_pam_fprintd.py -+++ b/tests/pam/test_pam_fprintd.py -@@ -82,7 +82,7 @@ class TestPamFprintd(dbusmock.DBusTestCase): - self.p_mock.wait() - - def setup_device(self): -- device_path = self.obj_fprintd_mock.AddDevice('FDO Trigger Finger Laser Reader', 3, 'swipe') -+ device_path = self.obj_fprintd_mock.AddDevice('FDO Trigger Finger Laser Reader', 3, 'swipe', False) - self.device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path) - self.device_mock.SetEnrolledFingers('toto', ['left-little-finger', 'right-little-finger']) - -@@ -232,7 +232,7 @@ class TestPamFprintd(dbusmock.DBusTestCase): - self.assertRegex(res.errors[0], r'Failed to match fingerprint') - - def test_pam_fprintd_dual_reader_auth(self): -- device_path = self.obj_fprintd_mock.AddDevice('FDO Sandpaper Reader', 3, 'press') -+ device_path = self.obj_fprintd_mock.AddDevice('FDO Sandpaper Reader', 3, 'press', False) - sandpaper_device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path) - sandpaper_device_mock.SetEnrolledFingers('toto', ['left-middle-finger', 'right-middle-finger']) - script = [ -@@ -251,12 +251,12 @@ class TestPamFprintd(dbusmock.DBusTestCase): - - def test_pam_fprintd_multi_reader_not_all_enrolled(self): - # Add a 1st device with actual enrolled prints -- device_path = self.obj_fprintd_mock.AddDevice('FDO Empty reader', 3, 'press') -+ device_path = self.obj_fprintd_mock.AddDevice('FDO Empty reader', 3, 'press', False) - empty_reader = self.dbus_con.get_object('net.reactivated.Fprint', device_path) - empty_reader.SetEnrolledFingers('toto', dbus.Array(set([]), signature='s')) - - # Add a 2nd device with actual enrolled prints -- device_path = self.obj_fprintd_mock.AddDevice('FDO Most Used Reader', 3, 'press') -+ device_path = self.obj_fprintd_mock.AddDevice('FDO Most Used Reader', 3, 'press', False) - sandpaper_device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path) - sandpaper_device_mock.SetEnrolledFingers('toto', ['left-middle-finger', 'right-middle-finger']) - script = [ -diff --git a/tests/test_fprintd_utils.py b/tests/test_fprintd_utils.py -index f10d4b0..efa5893 100755 ---- a/tests/test_fprintd_utils.py -+++ b/tests/test_fprintd_utils.py -@@ -88,7 +88,7 @@ class TestFprintdUtilsBase(dbusmock.DBusTestCase): - - def setup_device(self): - self.device_path = self.obj_fprintd_mock.AddDevice( -- 'FDO Trigger Finger Laser Reader', 3, 'swipe') -+ 'FDO Trigger Finger Laser Reader', 3, 'swipe', False) - self.device_mock = self.dbus_con.get_object('net.reactivated.Fprint', - self.device_path) - self.set_enrolled_fingers(['left-little-finger', 'right-little-finger']) diff --git a/sys-auth/fprintd/fprintd-1.94.2.ebuild b/sys-auth/fprintd/fprintd-1.94.2.ebuild index 452126569d70..fedf15b5b50c 100644 --- a/sys-auth/fprintd/fprintd-1.94.2.ebuild +++ b/sys-auth/fprintd/fprintd-1.94.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson pam python-any-r1 systemd diff --git a/sys-auth/fprintd/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.3.ebuild index 726954ce8249..9b1e12181f22 100644 --- a/sys-auth/fprintd/fprintd-1.94.1.ebuild +++ b/sys-auth/fprintd/fprintd-1.94.3.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson pam python-any-r1 systemd MY_P="${PN}-v${PV}" + DESCRIPTION="D-Bus service to access fingerprint readers" HOMEPAGE="https://gitlab.freedesktop.org/libfprint/fprintd" SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" -IUSE="doc pam systemd test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc pam selinux systemd test" RESTRICT="!test? ( test )" RDEPEND=" @@ -25,9 +27,10 @@ RDEPEND=" sys-auth/polkit pam? ( sys-libs/pam - systemd? ( sys-apps/systemd ) - !systemd? ( sys-auth/elogind ) - )" + systemd? ( sys-apps/systemd:= ) + !systemd? ( sys-auth/elogind:= ) + ) +" DEPEND=" ${RDEPEND} @@ -38,7 +41,8 @@ DEPEND=" dev-python/pycairo[${PYTHON_USEDEP}] pam? ( sys-libs/pam_wrapper[${PYTHON_USEDEP}] ) ') - )" + ) +" BDEPEND=" dev-lang/perl @@ -48,25 +52,23 @@ BDEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-util/gtk-doc - )" + ) +" + +RDEPEND+=" selinux? ( sec-policy/selinux-fprintd )" PATCHES=( - "${FILESDIR}/${PN}-1.90.7_0001-add-test-feature-and-make-tests-optional.patch" - "${FILESDIR}/${PN}-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch" - "${FILESDIR}/${P}-fix-meson-0.61-build.patch" - "${FILESDIR}/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch" + "${FILESDIR}/fprintd-1.94.3-test-optional.patch" ) -S="${WORKDIR}/${MY_P}" - python_check_deps() { if use test; then - has_version -d "sys-libs/pam_wrapper[${PYTHON_USEDEP}]" + python_has_version -d "sys-libs/pam_wrapper[${PYTHON_USEDEP}]" fi - has_version -d "dev-python/python-dbusmock[${PYTHON_USEDEP}]" && - has_version -d "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version -d "dev-python/pycairo[${PYTHON_USEDEP}]" + python_has_version -d "dev-python/python-dbusmock[${PYTHON_USEDEP}]" && + python_has_version -d "dev-python/dbus-python[${PYTHON_USEDEP}]" && + python_has_version -d "dev-python/pycairo[${PYTHON_USEDEP}]" } pkg_setup() { @@ -74,16 +76,16 @@ pkg_setup() { } src_configure() { - local emesonargs=( - $(meson_feature test) - $(meson_use pam) - -Dgtk_doc=$(usex doc true false) - -Dman=true - -Dsystemd_system_unit_dir=$(systemd_get_systemunitdir) - -Dpam_modules_dir=$(getpam_mod_dir) - -Dlibsystemd=$(usex systemd libsystemd libelogind) - ) - meson_src_configure + local emesonargs=( + $(meson_use test tests) + $(meson_use pam) + -Dgtk_doc=$(usex doc true false) + -Dman=true + -Dsystemd_system_unit_dir=$(systemd_get_systemunitdir) + -Dpam_modules_dir=$(getpam_mod_dir) + -Dlibsystemd=$(usex systemd libsystemd libelogind) + ) + meson_src_configure } src_install() { diff --git a/sys-auth/google-authenticator/Manifest b/sys-auth/google-authenticator/Manifest index dc3e70fca857..5d3e7ab2a6fa 100644 --- a/sys-auth/google-authenticator/Manifest +++ b/sys-auth/google-authenticator/Manifest @@ -1,2 +1 @@ -DIST google-authenticator-1.08.tar.gz 62767 BLAKE2B ae1f5b1feac40da9beec28c81f39edfcc5e46df4cad4575d76deda9a183e8324ded79af9b7831c0572682749bb209b5371747b98a114af404d3225b9b0ff15f8 SHA512 f53d2fc20b5fa0f4621566509a2ef746077e3345de289bd2c9565440eb972e3a80807bf50a2cce8e2cc520df72c2e236629a921e3fce90fd635aff0c0ef36f75 -DIST google-authenticator-1.09.tar.gz 62944 BLAKE2B 85ddb0a9eec3d49eba1f9e84ca1375783fd21d19bd969ab9ca4324fd956628aea7bb937a2441bdb300ab0e157891962c9d9c979de17cc542df425f3528f00d95 SHA512 c71cec3200214f7a6c7f7f33fdc0f00e812b378940be92017785bbba82236b90d443977a2af12465285316e3dade0313f4d6df1f3d85f37f830d9877c7c33754 +DIST google-authenticator-1.10.tar.gz 64409 BLAKE2B c0941c226362688cfc6cf9777515dd7c8af3d711952559bd1c9e5fb1102fa5f43234cee15b1e72a1ff0575957752f8a5ea903d92e5a4d4192459a9357758f4a1 SHA512 6e2448f1e643d33c67e126e09a8de5a134e9b3b7a91fc6b7ee5e27a95020348cad8d3bb3a73a8ba17ab5312baee7ab14e4370b3ae4c67034a2938877b699a6e1 diff --git a/sys-auth/google-authenticator/google-authenticator-1.09.ebuild b/sys-auth/google-authenticator/google-authenticator-1.09.ebuild deleted file mode 100644 index 27600a569c7e..000000000000 --- a/sys-auth/google-authenticator/google-authenticator-1.09.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/google/google-authenticator-libpam.git" - inherit git-r3 -else - SRC_URI="https://github.com/google/google-authenticator-libpam/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - S="${WORKDIR}/google-authenticator-libpam-${PV}" -fi - -DESCRIPTION="PAM Module for two step verification via mobile platform" -HOMEPAGE="https://github.com/google/google-authenticator-libpam" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -DEPEND="sys-libs/pam" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/1.08-remove-failing-tests.patch" ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # We might want to use getpam_mod_dir from pam eclass, - # but the build already appends "/security" for us. - econf --libdir="/$(get_libdir)" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "For further information see" - elog "https://wiki.gentoo.org/wiki/Google_Authenticator" - elog "" - elog "If you want support for QR-Codes, install media-gfx/qrencode." - fi -} diff --git a/sys-auth/google-authenticator/google-authenticator-1.08.ebuild b/sys-auth/google-authenticator/google-authenticator-1.10.ebuild index 27600a569c7e..317d23976683 100644 --- a/sys-auth/google-authenticator/google-authenticator-1.08.ebuild +++ b/sys-auth/google-authenticator/google-authenticator-1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest index 5a4b54078971..9642a956d20a 100644 --- a/sys-auth/libfprint/Manifest +++ b/sys-auth/libfprint/Manifest @@ -1,4 +1,2 @@ -DIST libfprint-1.94.3.tar.gz 10409543 BLAKE2B 33e25715313cfc37f0c05ad47eca6d315a041a067cfc7dfac9d71fcf5231a11f54888dd837c083b8cca03ca2b4b0bced30340e8966ab4c989d4a33c59ceb483e SHA512 22290bd393b54ada75c4655b3e901b6ee25f389a396a9b29bc1e76c0333d9718483b2059c927deb5b8d8e0acf632fecc9c4535b3f161910d5c51fad508d3e7a4 DIST libfprint-1.94.4.tar.gz 10408480 BLAKE2B 492ea10777d223ce7d610f0dca2871c8eae08cb5dd7d30187194d6cc139a60d5350e5908f759434065614c05a72192347be19c1d6fe5641e08a2f6419bdcede7 SHA512 425efdfde373179a237805c4b5561e3531616798c41ccd4358f1c521f1e21af01f8ca61aaf8c959e2c68a69e4dfda23960e696acaaad2228ffef6f999986468e -DIST libfprint-1.94.5.tar.bz2 8922994 BLAKE2B b79292dc77426d76e5e9cb1cbf8662867224f19ff9cf2434d000689d02e7d4609c9ca94a016185f71500e4a58e9522a7647684e1eaa841c02a40f27e0d22055e SHA512 6a73b3d05bd61b5c74e64d52eba7dab6e97dcf149e32c882e05f15dc7241fd8e78f115957ed52a9657ff0b21642ec633c27cc905cbd4697ed41369508957c989 DIST libfprint-1.94.7.tar.bz2 9066931 BLAKE2B 5df859c4e38a8016b8f91785d8634d85e023cc19b837e928dd2de6392ed77b7a82c26e6c1485df2fa1fb2041421d4dd05441d5df24c2fc5399783dcc174d5afc SHA512 b91a71ef998b03a64b08d9439a1d26027f196f07fd1344bbe45f2dbeb3ace5752af9b7504ee8537eb40d896e43a517e3759a7b3735baded4cc3fb6c0ca3b0ece diff --git a/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch b/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch new file mode 100644 index 000000000000..7d2d6b20ecff --- /dev/null +++ b/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch @@ -0,0 +1,106 @@ +https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/4b72f27de6706a6001e82b477b647ced30cc37b5 +https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/7dbb21e77ace03bf28dc9a6b37b43d551282389f + +From 4b72f27de6706a6001e82b477b647ced30cc37b5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net> +Date: Tue, 20 Feb 2024 08:22:42 +0100 +Subject: [PATCH] build: Look for sh just once + +--- + meson.build | 1 + + tests/meson.build | 10 +++++----- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 435827ce..28ee27a2 100644 +--- a/meson.build ++++ b/meson.build +@@ -91,6 +91,7 @@ gusb_dep = dependency('gusb', version: '>= 0.2.0') + mathlib_dep = cc.find_library('m', required: false) + + # The following dependencies are only used for tests ++sh = find_program('sh', required: true) + cairo_dep = dependency('cairo', required: false) + + # introspection scanning and Gio-2.0.gir +diff --git a/tests/meson.build b/tests/meson.build +index f68ed406..8c8f5d07 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -151,7 +151,7 @@ if get_option('introspection') + endif + else + test(vdtest, +- find_program('sh'), ++ sh, + args: ['-c', 'exit 77'] + ) + endif +@@ -205,7 +205,7 @@ if get_option('introspection') + endif + else + test(driver_test, +- find_program('sh'), ++ sh, + args: ['-c', 'exit 77'] + ) + endif +@@ -224,13 +224,13 @@ if get_option('introspection') + else + warning('Skipping all driver tests as introspection bindings are missing') + test('virtual-image', +- find_program('sh'), ++ sh, + args: ['-c', 'exit 77'] + ) + + foreach driver_test: drivers_tests + test(driver_test, +- find_program('sh'), ++ sh, + args: ['-c', 'exit 77'] + ) + endforeach +@@ -273,7 +273,7 @@ foreach test_name: unit_tests + # Create a dummy test that always skips instead + warning('Test @0@ cannot be compiled due to missing dependencies'.format(test_name)) + test(test_name, +- find_program('sh'), ++ sh, + suite: ['unit-tests'], + args: ['-c', 'exit 77'], + ) +-- +GitLab + +From 7dbb21e77ace03bf28dc9a6b37b43d551282389f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net> +Date: Tue, 20 Feb 2024 08:24:12 +0100 +Subject: [PATCH] build/tests: Skip a test if the test requires it during + inspection + +In case we don't have dependencies, we should skip the test, otherwise +we can just fail at test time +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -100,11 +100,17 @@ if get_option('introspection') + base_args = files(vdtest + '.py') + suite = ['virtual-driver'] + +- r = run_command(unittest_inspector, files(vdtest + '.py'), check: true) ++ r = run_command(unittest_inspector, files(vdtest + '.py'), check: false) + unit_tests = r.stdout().strip().split('\n') + + if r.returncode() == 0 and unit_tests.length() > 0 + suite += vdtest ++ elif r.returncode() == 77 ++ test(vdtest, ++ sh, ++ args: ['-c', 'exit 77'] ++ ) ++ continue + else + unit_tests = [vdtest] + endif +-- +GitLab diff --git a/sys-auth/libfprint/libfprint-1.94.3.ebuild b/sys-auth/libfprint/libfprint-1.94.3.ebuild deleted file mode 100644 index e08911022880..000000000000 --- a/sys-auth/libfprint/libfprint-1.94.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson udev - -DESCRIPTION="Library to add support for consumer fingerprint readers" -HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint" -SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86" -IUSE="examples gtk-doc +introspection" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libgudev - dev-libs/libgusb - dev-libs/nss - virtual/libusb:1= - x11-libs/libX11 - x11-libs/libXv - x11-libs/pixman - !>=sys-auth/libfprint-1.90:0 - examples? ( - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( - dev-libs/gobject-introspection - dev-libs/libgusb[introspection] - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.2-fix-implicit-declaration.patch - "${FILESDIR}"/${PN}-1.94.1-test-timeout.patch -) - -src_configure() { - local emesonargs=( - $(meson_use examples gtk-examples) - $(meson_use gtk-doc doc) - $(meson_use introspection) - -Ddrivers=all - -Dudev_rules=enabled - -Dudev_rules_dir=$(get_udevdir)/rules.d - --libdir=/usr/$(get_libdir) - ) - meson_src_configure -} diff --git a/sys-auth/libfprint/libfprint-1.94.5.ebuild b/sys-auth/libfprint/libfprint-1.94.5.ebuild deleted file mode 100644 index f60ff3e9d76e..000000000000 --- a/sys-auth/libfprint/libfprint-1.94.5.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson udev - -MY_P="${PN}-v${PV}" - -DESCRIPTION="Library to add support for consumer fingerprint readers" -HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint https://gitlab.freedesktop.org/libfprint/libfprint" -SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" -IUSE="examples gtk-doc +introspection" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libgudev - dev-libs/nss - dev-python/pygobject - dev-libs/libgusb - x11-libs/pixman - examples? ( - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( - dev-libs/gobject-introspection - dev-libs/libgusb[introspection] - ) -" - -PATCHES=( "${FILESDIR}/${PN}-1.94.1-test-timeout.patch" ) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local emesonargs=( - $(meson_use examples gtk-examples) - $(meson_use gtk-doc doc) - $(meson_use introspection introspection) - -Ddrivers=all - -Dudev_rules=enabled - -Dudev_rules_dir=$(get_udevdir)/rules.d - --libdir=/usr/$(get_libdir) - ) - - meson_src_configure -} diff --git a/sys-auth/libfprint/libfprint-1.94.7.ebuild b/sys-auth/libfprint/libfprint-1.94.7.ebuild index 7ece93fa19d2..bedb3c55755b 100644 --- a/sys-auth/libfprint/libfprint-1.94.7.ebuild +++ b/sys-auth/libfprint/libfprint-1.94.7.ebuild @@ -43,11 +43,16 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-1.94.1-test-timeout.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.94.1-test-timeout.patch" + "${FILESDIR}/${PN}-1.94.7-skip-test-dep.patch" +) S="${WORKDIR}/${MY_P}" src_configure() { + # TODO: wire up test deps (cairo, pygobject, etc) for extra tests + # currently skipped. local emesonargs=( $(meson_use examples gtk-examples) $(meson_use gtk-doc doc) diff --git a/sys-auth/libfprint/metadata.xml b/sys-auth/libfprint/metadata.xml index 9e7ea48833c1..ee1304226c06 100644 --- a/sys-auth/libfprint/metadata.xml +++ b/sys-auth/libfprint/metadata.xml @@ -4,6 +4,7 @@ <!-- maintainer-needed --> <upstream> <remote-id type="freedesktop-gitlab">libfprint/libfprint</remote-id> + <remote-id type="github">freedesktop/libfprint</remote-id> <bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=libfprint</bugs-to> </upstream> </pkgmetadata> diff --git a/sys-auth/microsoft-identity-broker/Manifest b/sys-auth/microsoft-identity-broker/Manifest new file mode 100644 index 000000000000..c712e5f50e48 --- /dev/null +++ b/sys-auth/microsoft-identity-broker/Manifest @@ -0,0 +1 @@ +DIST microsoft-identity-broker_2.0.0_amd64.deb 83941724 BLAKE2B 6e7c347cd466b4fb77841c4c19cf368538adf17a1b197fcf5a8ca6555f3660f8d6684d6bcb400441f9cc06f0765b26cf379d29a16f15d2f90da445d80f89ae89 SHA512 60535f64f867fcd748f550b4dd5a9bb29d527b3632dc7d44a72041ad36ccb691e762417bdc0230ead6ad8c0ab3099f0a343a5be7ab4c982fd3c27753712ac462 diff --git a/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-22.04 b/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-22.04 new file mode 100644 index 000000000000..58947887cf3e --- /dev/null +++ b/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-22.04 @@ -0,0 +1,4 @@ +DISTRIB_ID=Ubuntu +DISTRIB_RELEASE=22.04 +DISTRIB_CODENAME=jammy +DISTRIB_DESCRIPTION="Ubuntu 22.04.4 LTS" diff --git a/sys-auth/microsoft-identity-broker/files/os-release-ubuntu-22.04 b/sys-auth/microsoft-identity-broker/files/os-release-ubuntu-22.04 new file mode 100644 index 000000000000..290cf851f61a --- /dev/null +++ b/sys-auth/microsoft-identity-broker/files/os-release-ubuntu-22.04 @@ -0,0 +1,12 @@ +NAME="Ubuntu" +VERSION="22.04.4 LTS (Jammy Jellyfish)" +ID=ubuntu +ID_LIKE=debian +PRETTY_NAME="Ubuntu 22.04.4 LTS" +VERSION_ID="22.04" +HOME_URL="https://www.ubuntu.com/" +SUPPORT_URL="https://help.ubuntu.com/" +BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" +PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" +VERSION_CODENAME=jammy +UBUNTU_CODENAME=jammy diff --git a/sys-auth/microsoft-identity-broker/files/wrapper b/sys-auth/microsoft-identity-broker/files/wrapper new file mode 100644 index 000000000000..f419769bebba --- /dev/null +++ b/sys-auth/microsoft-identity-broker/files/wrapper @@ -0,0 +1,9 @@ +#!/bin/sh + +exec bwrap \ + --bind / / \ + --dev-bind /dev /dev \ + --ro-bind /etc/microsoft-identity-broker/lsb-release /etc/lsb-release \ + --ro-bind /etc/microsoft-identity-broker/os-release /etc/os-release \ + -- \ + /usr/share/microsoft-identity-broker/bin/"${0##*/}" "${@}" diff --git a/sys-auth/pam_ssh/metadata.xml b/sys-auth/microsoft-identity-broker/metadata.xml index f57c2717374a..374cd4dedb33 100644 --- a/sys-auth/pam_ssh/metadata.xml +++ b/sys-auth/microsoft-identity-broker/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">pam-ssh</remote-id> - </upstream> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> </pkgmetadata> diff --git a/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.0.ebuild b/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.0.ebuild new file mode 100644 index 000000000000..f2f58f3974aa --- /dev/null +++ b/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-pkg-2 prefix systemd unpacker + +FAKE_OS="ubuntu-22.04" +DESCRIPTION="Microsoft Authentication Broker to access a corporate environment" +HOMEPAGE="https://learn.microsoft.com/mem/intune/" +SRC_URI="https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_amd64.deb" +S="${WORKDIR}" +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64" +RESTRICT="bindist mirror" + +RDEPEND=" + acct-user/microsoft-identity-broker + acct-group/microsoft-identity-broker + sys-apps/bubblewrap + sys-apps/dbus + virtual/jre:11 +" + +src_unpack() { + unpack_deb ${A} +} + +src_configure() { + sed -i -r "s:^Exec(Start)?=.*/([^/]+):Exec\1=${EPREFIX}/usr/bin/\2:" \ + usr/lib/systemd/*/*.service usr/share/dbus-1/*/*.service || die +} + +src_install() { + newbin $(prefixify_ro "${FILESDIR}"/wrapper) microsoft-identity-broker + dosym microsoft-identity-broker /usr/bin/microsoft-identity-device-broker + + java-pkg_dojar opt/microsoft/identity-broker/lib/*.jar + + java-pkg_dolauncher microsoft-identity-broker \ + --main com.microsoft.identity.broker.service.IdentityBrokerService \ + --java_args '${MICROSOFT_IDENTITY_BROKER_OPTS}' \ + -into /usr/share/${PN} + + java-pkg_dolauncher microsoft-identity-device-broker \ + --main com.microsoft.identity.broker.service.DeviceBrokerService \ + --java_args '${MICROSOFT_IDENTITY_DEVICE_BROKER_OPTS}' \ + -into /usr/share/${PN} + + insinto /etc/microsoft-identity-broker + newins "${FILESDIR}/lsb-release-${FAKE_OS}" lsb-release + newins "${FILESDIR}/os-release-${FAKE_OS}" os-release + + insinto /usr/share + doins -r usr/share/dbus-1 + + systemd_dounit usr/lib/systemd/system/* + systemd_douserunit usr/lib/systemd/user/* +} diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild index 0f8f3074c0d5..e84c116ffdc6 100644 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild +++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools python-r1 s6 systemd tmpfiles multilib-minimal DESCRIPTION="NSS module for name lookups using LDAP" diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r3.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r3.ebuild index dea33acdbfbb..ea0d0a14c8e4 100644 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r3.ebuild +++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools python-r1 s6 systemd tmpfiles multilib-minimal DESCRIPTION="NSS module for name lookups using LDAP" diff --git a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2-r2.ebuild b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2-r2.ebuild index cf3ad756ccad..5fbe0e0d8d22 100644 --- a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2-r2.ebuild +++ b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/pam-pgsql/" if [[ ${PV} == *_p* ]]; then SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.gz" else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" fi LICENSE="GPL-2" diff --git a/sys-auth/pam_abl/pam_abl-0.6.0.ebuild b/sys-auth/pam_abl/pam_abl-0.6.0.ebuild index d1dafd1016f5..07926d858ec9 100644 --- a/sys-auth/pam_abl/pam_abl-0.6.0.ebuild +++ b/sys-auth/pam_abl/pam_abl-0.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ inherit cmake db-use pam DESCRIPTION="PAM module for blacklisting hosts and users repeatedly failed authentication" HOMEPAGE="http://pam-abl.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/sys-auth/pam_mount/pam_mount-2.18-r1.ebuild b/sys-auth/pam_mount/pam_mount-2.18-r1.ebuild index c8c8a3d853b4..844ad0b1839b 100644 --- a/sys-auth/pam_mount/pam_mount-2.18-r1.ebuild +++ b/sys-auth/pam_mount/pam_mount-2.18-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A PAM module that can mount volumes for a user session" HOMEPAGE="http://pam-mount.sourceforge.net" -SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/pam-mount/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest deleted file mode 100644 index 6bfa6ad84183..000000000000 --- a/sys-auth/pam_ssh/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pam_ssh-2.3.tar.xz 380396 BLAKE2B e228e30c6f353f631c0a1c41e82e31e7a8c573b04ab1cad4038a245b500666b42c0efa9f686d28f2386688596de761085afb1318b94fef5541f8c0ffc1e18b25 SHA512 e3ddcf851ffd8f6fb831e2dee7269c1b89283ae2f8f6aa3487bf7b1bc71d26ac9bcbd2a01c5a67a983b980bbb5151e991402940f4752741286d057843c817895 diff --git a/sys-auth/pam_ssh/files/pam_ssh-2.1-dot-ssh-check.patch b/sys-auth/pam_ssh/files/pam_ssh-2.1-dot-ssh-check.patch deleted file mode 100644 index a0737b377bea..000000000000 --- a/sys-auth/pam_ssh/files/pam_ssh-2.1-dot-ssh-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/503424#c5 -https://sourceforge.net/p/pam-ssh/bugs/16/ - ---- a/pam_ssh.c -+++ b/pam_ssh.c -@@ -867,6 +867,7 @@ - int attempt; /* No. of attempt to contact agent */ - const char *user; /* username */ - struct options options; /* PAM options */ -+ struct stat sb; /* to check for existing .ssh */ - - #if HAVE_PAM_STRUCT_OPTIONS || !HAVE_PAM_STD_OPTION - memset(&options, 0, sizeof options); -@@ -916,7 +917,7 @@ - openpam_restore_cred(pamh); - return PAM_SERVICE_ERR; - } -- if ((access(dotdir,F_OK)) == -1) { -+ if (stat(dotdir, &sb) == -1) { - pam_ssh_log(LOG_DEBUG, "inexistent configuration directory"); - free(dotdir); - openpam_restore_cred(pamh); diff --git a/sys-auth/pam_ssh/files/pam_ssh-gcc10-fix.patch b/sys-auth/pam_ssh/files/pam_ssh-gcc10-fix.patch deleted file mode 100644 index 9871b4297c7b..000000000000 --- a/sys-auth/pam_ssh/files/pam_ssh-gcc10-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ge25519.h -+++ b/ge25519.h -@@ -28,7 +28,7 @@ - fe25519 t; - } ge25519; - --const ge25519 ge25519_base; -+extern const ge25519 ge25519_base; - - int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]); - diff --git a/sys-auth/pam_ssh/files/pam_symbols.ver b/sys-auth/pam_ssh/files/pam_symbols.ver deleted file mode 100644 index dbc677b77a2d..000000000000 --- a/sys-auth/pam_ssh/files/pam_symbols.ver +++ /dev/null @@ -1,4 +0,0 @@ -{ - global: pam_sm_*; - local: *; -}; diff --git a/sys-auth/pam_ssh/pam_ssh-2.3-r1.ebuild b/sys-auth/pam_ssh/pam_ssh-2.3-r1.ebuild deleted file mode 100644 index 112b2a4121ad..000000000000 --- a/sys-auth/pam_ssh/pam_ssh-2.3-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam flag-o-matic readme.gentoo-r1 - -DESCRIPTION="Uses ssh-agent to provide single sign-on" -HOMEPAGE="http://pam-ssh.sourceforge.net/" -SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz" - -LICENSE="BSD-2 BSD ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - -# Only supports OpenSSH via `ssh-agent` #282993 -DEPEND="sys-libs/pam - dev-libs/openssl:0=" - -RDEPEND="${DEPEND} - virtual/openssh" - -PATCHES=( - # 503424#c5 - "${FILESDIR}"/${PN}-2.1-dot-ssh-check.patch - "${FILESDIR}"/${PN}-gcc10-fix.patch -) - -src_configure() { - # hide all the otherwise-exported symbols that may clash with - # other software loading the PAM modules (see bug #274924 as an - # example). - append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver - - # Set the cache var so the configure script doesn't go probing hardcoded - # file system paths and picking up the wrong thing. - export ac_cv_openssldir='' - - # not needed now - export ac_cv_exeext=no - - # Avoid cross-compiling funkiness and requiring openssh at build time. - export PATH_SSH_AGENT="${EPREFIX}/usr/bin/ssh-agent" - - econf \ - "--with-pam-dir=$(getpam_mod_dir)" -} - -src_install() { - default - - # pam_ssh only builds plugins - find "${D}" -name '*.la' -delete || die - - local DOC_CONTENTS=" - You can enable pam_ssh for system authentication by enabling - the pam_ssh USE flag on sys-auth/pambase. - " - readme.gentoo_create_doc -} - -pkg_preinst() { - local i - for i in "${REPLACING_VERSIONS}"; do - if [[ ${i} == 1.* ]]; then #554150 - ewarn "Upstream pam_ssh has changed where ssh keys live. Only keys in your" - ewarn "~/.ssh/login-keys.d/ will be accepted for authentication." - return - fi - done -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.3.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.3.ebuild index 0f8057731085..63b0e18f716b 100644 --- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.3.ebuild +++ b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/jbeverly/${PN}.git" inherit git-r3 else - SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2 + SRC_URI="https://downloads.sourceforge.net/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2 https://dev.gentoo.org/~juippis/distfiles/tmp/pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch" KEYWORDS="~amd64 ~arm ~x86" fi diff --git a/sys-auth/pambase/pambase-20240128.ebuild b/sys-auth/pambase/pambase-20240128.ebuild index c1dce4ea185f..cca2add220e0 100644 --- a/sys-auth/pambase/pambase-20240128.ebuild +++ b/sys-auth/pambase/pambase-20240128.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://gitweb.gentoo.org/proj/pambase.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="MIT" diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest index 6827b9281360..34ff79b9441b 100644 --- a/sys-auth/polkit/Manifest +++ b/sys-auth/polkit/Manifest @@ -1,3 +1,2 @@ -DIST polkit-122.tar.bz2 704972 BLAKE2B 601ed969de816d061a974b07490d64c144940898a75d4e1761462ee1ff0f00686b068298fa6fdc901879d8cd4bea4334c0187aa5bde50acf90728c37e73e21f4 SHA512 a7c0a951bbcdb09899adbc128296c74fc062441e996f4d6a782b214178f0936137e2fdc489eaa86a00599b988711735a5bd9b5c3b93bdb42fb915db9f9b04e26 DIST polkit-123.tar.bz2 707480 BLAKE2B 27d8764606d8156118269fb4cd5eda1cfd0d56df219e4157cd78fd4c2a2d001c474271b7bb31e7e82ca376eacd26411418695058cc888700690606348b4d014a SHA512 4306363d3ed7311243de462832199bd10ddda35e36449104daff0895725d8189b07a4c88340f28607846fdf761c23470da2d43288199c46aa816426384124bb6 DIST polkit-124.tar.bz2 715490 BLAKE2B ecfc1ec73a7e1bbdf7374642ad4e1dbe534149a27e75bb1235eaa446ff912466ee0cdd978c34b7f110bc62a49b25ffddc9011e280686e3f304a234454be85a40 SHA512 db520882b0bedf1c96052570bf4c55d7e966d8172f6d26acf0791d98c4b911fce5ee39e6d830f06122ac8df33c6b43c252cdb7ba3a54523804824ebf355405dc diff --git a/sys-auth/polkit/files/polkit-124-c99-fixes.patch b/sys-auth/polkit/files/polkit-124-c99-fixes.patch new file mode 100644 index 000000000000..00d3cbbd2664 --- /dev/null +++ b/sys-auth/polkit/files/polkit-124-c99-fixes.patch @@ -0,0 +1,111 @@ +https://bugs.gentoo.org/925440 +https://github.com/polkit-org/polkit/commit/0d78d1e4bf5ab3ce11678005b220aac0cfc5bee5 + +From: Vincent Mihalkovic <vmihalko@redhat.com> +Date: Fri, 8 Mar 2024 14:04:33 +0100 +Subject: [PATCH 3/3] mocklibc: move the print_indent function to the file + where it is used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes build error with GCC >= 14 and clang >= 17, +failing on: +``` +../subprojects/mocklibc-1.0/src/netgroup-debug.c:25:3: error: implicit declaration of function ‘print_indent’ [-Wimplicit-function-declaration] + 25 | print_indent(stream, indent); + | ^~~~~~~~~~~~ +``` + +Closes: #6 +--- + subprojects/mocklibc.wrap | 2 + + .../packagefiles/mocklibc-print-indent.diff | 68 +++++++++++++++++++ + 2 files changed, 70 insertions(+) + create mode 100644 subprojects/packagefiles/mocklibc-print-indent.diff + +diff --git a/subprojects/mocklibc.wrap b/subprojects/mocklibc.wrap +index af82298..539ee83 100644 +--- a/subprojects/mocklibc.wrap ++++ b/subprojects/mocklibc.wrap +@@ -8,3 +8,5 @@ source_hash = b2236a6af1028414783e9734a46ea051916ec226479d6a55a3bb823bff68f120 + patch_url = https://wrapdb.mesonbuild.com/v1/projects/mocklibc/1.0/2/get_zip + patch_filename = mocklibc-1.0-2-wrap.zip + patch_hash = 0280f96a2eeb3c023e5acf4e00cef03d362868218d4a85347ea45137c0ef6c56 ++ ++diff_files = mocklibc-print-indent.diff +diff --git a/subprojects/packagefiles/mocklibc-print-indent.diff b/subprojects/packagefiles/mocklibc-print-indent.diff +new file mode 100644 +index 0000000..d8b2029 +--- /dev/null ++++ b/subprojects/packagefiles/mocklibc-print-indent.diff +@@ -0,0 +1,68 @@ ++From: Vincent Mihalkovic <vmihalko@redhat.com> ++Date: Fri, 8 Mar 2024 14:04:33 +0100 ++Subject: [PATCH 3/3] mocklibc: move the print_indent function to the file ++ where it is used ++MIME-Version: 1.0 ++Content-Type: text/plain; charset=UTF-8 ++Content-Transfer-Encoding: 8bit ++ ++This fixes build error with GCC >= 14 and clang >= 17, ++failing on: ++``` ++../subprojects/mocklibc-1.0/src/netgroup-debug.c:25:3: error: implicit declaration of function ‘print_indent’ [-Wimplicit-function-declaration] ++ 25 | print_indent(stream, indent); ++ | ^~~~~~~~~~~~ ++``` ++ ++Closes: #6 ++--- ++ src/netgroup-debug.c | 11 +++++++++++ ++ src/netgroup.c | 11 ----------- ++ 2 files changed, 11 insertions(+), 11 deletions(-) ++ ++diff --git a/src/netgroup-debug.c b/src/netgroup-debug.c ++index 81d6e72..46e5b25 100644 ++--- a/src/netgroup-debug.c +++++ b/src/netgroup-debug.c ++@@ -21,6 +21,17 @@ ++ #include <stdio.h> ++ #include <stdlib.h> ++ +++/** +++ * Print a varaible indentation to the stream. +++ * @param stream Stream to print to +++ * @param indent Number of indents to use +++ */ +++static void print_indent(FILE *stream, unsigned int indent) { +++ int i; +++ for (i = 0; i < indent; i++) +++ fprintf(stream, " "); +++} +++ ++ void netgroup_debug_print_entry(struct entry *entry, FILE *stream, unsigned int indent) { ++ print_indent(stream, indent); ++ ++diff --git a/src/netgroup.c b/src/netgroup.c ++index 06a8a89..e16e451 100644 ++--- a/src/netgroup.c +++++ b/src/netgroup.c ++@@ -71,17 +71,6 @@ static char *parser_copy_word(char **cur) { ++ return result; ++ } ++ ++-/** ++- * Print a varaible indentation to the stream. ++- * @param stream Stream to print to ++- * @param indent Number of indents to use ++- */ ++-void print_indent(FILE *stream, unsigned int indent) { ++- int i; ++- for (i = 0; i < indent; i++) ++- fprintf(stream, " "); ++-} ++- ++ /** ++ * Connect entries with 'child' type to their child entries. ++ * @param headentry Head of list of entries that need to be connected ++-- ++2.43.0 +-- diff --git a/sys-auth/polkit/polkit-122-r1.ebuild b/sys-auth/polkit/polkit-122-r1.ebuild deleted file mode 100644 index fc80a36e0f16..000000000000 --- a/sys-auth/polkit/polkit-122-r1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit meson pam pax-utils python-any-r1 systemd xdg-utils - -DESCRIPTION="Policy framework for controlling privileges for system-wide services" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit" -if [[ ${PV} == *_p* ]] ; then - # Upstream don't make releases very often. Test snapshots throughly - # and review commits, but don't shy away if there's useful stuff there - # we want. - MY_COMMIT="" - SRC_URI="https://gitlab.freedesktop.org/polkit/polkit/-/archive/${MY_COMMIT}/polkit-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" - - S="${WORKDIR}"/${PN}-${MY_COMMIT} -else - SRC_URI="https://gitlab.freedesktop.org/polkit/polkit/-/archive/${PV}/${P}.tar.bz2" -fi - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test" -# https://gitlab.freedesktop.org/polkit/polkit/-/issues/181 for test restriction -RESTRICT="!test? ( test ) test" - -# This seems to be fixed with 121? -#if [[ ${PV} == *_p* ]] ; then -# RESTRICT="!test? ( test )" -#else -# # Tests currently don't work with meson in the dist tarballs. See -# # https://gitlab.freedesktop.org/polkit/polkit/-/issues/144 -# RESTRICT="test" -#fi - -BDEPEND=" - acct-user/polkitd - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xsl-stylesheets - dev-libs/glib - dev-libs/gobject-introspection-common - dev-libs/libxslt - dev-util/glib-utils - sys-devel/gettext - virtual/pkgconfig - introspection? ( dev-libs/gobject-introspection ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - ) -" -DEPEND=" - dev-libs/glib:2 - dev-libs/expat - daemon? ( - duktape? ( dev-lang/duktape:= ) - !duktape? ( dev-lang/spidermonkey:102[-debug] ) - ) - pam? ( - sys-auth/pambase - sys-libs/pam - ) - !pam? ( virtual/libcrypt:= ) - systemd? ( sys-apps/systemd:0=[policykit] ) - !systemd? ( sys-auth/elogind ) -" -RDEPEND="${DEPEND} - acct-user/polkitd - selinux? ( sec-policy/selinux-policykit ) -" -PDEPEND=" - gtk? ( || ( - >=gnome-extra/polkit-gnome-0.105 - >=lxde-base/lxsession-0.5.2 - ) ) - kde? ( kde-plasma/polkit-kde-agent ) -" - -DOCS=( docs/TODO HACKING.md NEWS.md README.md ) - -QA_MULTILIB_PATHS=" - usr/lib/polkit-1/polkit-agent-helper-1 - usr/lib/polkit-1/polkitd -" - -PATCHES=( - "${FILESDIR}"/${PN}-122-libs-only-postinstall.patch -) - -python_check_deps() { - python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # bug #401513 - sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die -} - -src_configure() { - xdg_environment_reset - - local emesonargs=( - --localstatedir="${EPREFIX}"/var - -Dauthfw="$(usex pam pam shadow)" - -Dexamples=false - -Dgtk_doc=false - -Dman=true - -Dos_type=gentoo - -Dsession_tracking="$(usex systemd libsystemd-login libelogind)" - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - -Djs_engine=$(usex duktape duktape mozjs) - $(meson_use !daemon libs-only) - $(meson_use introspection) - $(meson_use test tests) - $(usex pam "-Dpam_module_dir=$(getpam_mod_dir)" '') - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - - # Required for polkitd on hardened/PaX due to spidermonkey's JIT - pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest -} - -src_install() { - meson_src_install - - if use examples ; then - docinto examples - dodoc src/examples/{*.c,*.policy*} - fi - - if use daemon; then - if [[ ${EUID} == 0 ]]; then - diropts -m 0700 -o polkitd - fi - keepdir /etc/polkit-1/rules.d - fi -} - -pkg_postinst() { - if use daemon && [[ ${EUID} == 0 ]]; then - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - fi -} diff --git a/sys-auth/polkit/polkit-124-r1.ebuild b/sys-auth/polkit/polkit-124-r1.ebuild index d5ae6fcf9f54..4c81ceeb4ef9 100644 --- a/sys-auth/polkit/polkit-124-r1.ebuild +++ b/sys-auth/polkit/polkit-124-r1.ebuild @@ -22,19 +22,9 @@ fi LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test" -# https://gitlab.freedesktop.org/polkit/polkit/-/issues/181 for test restriction -RESTRICT="!test? ( test ) test" - -# This seems to be fixed with 121? -#if [[ ${PV} == *_p* ]] ; then -# RESTRICT="!test? ( test )" -#else -# # Tests currently don't work with meson in the dist tarballs. See -# # https://gitlab.freedesktop.org/polkit/polkit/-/issues/144 -# RESTRICT="test" -#fi +RESTRICT="!test? ( test )" BDEPEND=" acct-user/polkitd @@ -92,6 +82,7 @@ QA_MULTILIB_PATHS=" PATCHES=( "${FILESDIR}"/${PN}-124-systemd.patch "${FILESDIR}"/${PN}-124-systemd-fixup.patch + "${FILESDIR}"/${PN}-124-c99-fixes.patch ) python_check_deps() { diff --git a/sys-auth/rtkit/rtkit-0.13-r2.ebuild b/sys-auth/rtkit/rtkit-0.13-r2.ebuild index fd13fbac19c3..1afb11d51866 100644 --- a/sys-auth/rtkit/rtkit-0.13-r2.ebuild +++ b/sys-auth/rtkit/rtkit-0.13-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/heftig/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-3 BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="selinux systemd" BDEPEND="virtual/pkgconfig" diff --git a/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild b/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild index ddde94c6da84..fc69019e6ff3 100644 --- a/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild +++ b/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -15,7 +15,6 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 sparc x86" -IUSE="" DEPEND="${PYTHON_DEPS}" RDEPEND=" diff --git a/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild b/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild deleted file mode 100644 index 66f383c14cac..000000000000 --- a/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 - -DESCRIPTION="Utility to securely retrieve an SSH public key and install it locally" -HOMEPAGE="https://launchpad.net/ssh-import-id" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 sparc x86" -IUSE="" - -DEPEND="${PYTHON_DEPS}" -RDEPEND=" - dev-python/distro[${PYTHON_USEDEP}] -" - -src_install() { - distutils-r1_src_install - doman usr/share/man/man1/ssh-import-id.1 -} diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild index 999f36b3d109..e8fea5540d52 100644 --- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild +++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 diff --git a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild index b13cfa812394..97800581c05c 100644 --- a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild +++ b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools linux-info pam udev DESCRIPTION="Support for the UPEK/SGS Thomson fingerprint reader, common in Thinkpads" HOMEPAGE="http://thinkfinger.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest index af1e0303fc16..881856fd979b 100644 --- a/sys-auth/yubico-piv-tool/Manifest +++ b/sys-auth/yubico-piv-tool/Manifest @@ -1,2 +1,3 @@ DIST yubico-piv-tool-2.3.1.tar.gz 1315267 BLAKE2B 9b7d96129f3cab4fd68d18d0bbbf8dfa5fdda383ffb8099f898e23c99d0f1caf387a26cb9d01582521a070b93bac941b8a10faac736137cb72c86fbf5c95d2f8 SHA512 44cd9c482f2a2942d10a238ac2cb2d40df7cd11ddc27d6df88912512e956746b5634018b421d5cc4b947e4c36f9841898d5a08eb613bf22558089103dab95988 DIST yubico-piv-tool-2.4.2.tar.gz 1332497 BLAKE2B ba08b19fe4659842fdfad06d662120a9d2858e25a56d56f63edc88e607c5b56a79f5ca90826fb8b78295e218ff1a728a168d04f330b7f640a9f3e804528320ed SHA512 032a91c9ac50cb5604a56ec0d0a84cf64bfff5440930a1643bddcd15cf02fc44d33d949286b2595eb4c196cb31050c13f507b32f3156d4600fdad46057b65b56 +DIST yubico-piv-tool-2.5.1.tar.gz 1340147 BLAKE2B 96638e22bf03046daae5ba4b4d689cfe6d7e1f8ebbf64695bd3e259ca7e53513ff92933c935294536c504fc96b2ed1c7df4b9962b1789803eb9576b51715f00e SHA512 736aeeac3d9368699b33e928cfb5b54ad6aa1450acf734397bc689ba9ccc82077f46f7ea2bd06dd1457b91eb50f7a0231a57914b3ea2ff0f07d425b4d27b96e4 diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.4.2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.4.2.ebuild index 6e1c0cfda2c5..42a6ee70a2dc 100644 --- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.4.2.ebuild +++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz" LICENSE="BSD-2" SLOT="0/2" -KEYWORDS="~amd64 ~arm64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.5.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.5.1.ebuild new file mode 100644 index 000000000000..68122cc758d6 --- /dev/null +++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.5.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application" +HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool" +SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/2" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND="sys-apps/pcsc-lite + dev-libs/openssl:=[-bindist(-)]" +DEPEND="${RDEPEND} + test? ( dev-libs/check )" +BDEPEND="dev-util/gengetopt + sys-apps/help2man + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.1-tests-optional.patch + "${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch + "${FILESDIR}"/${PN}-2.3.0-no-Werror.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_STATIC_LIB=OFF + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \ + || die "Failed to generate p11-kit module configuration" + insinto /usr/share/p11-kit/modules + doins ${PN}.module +} |