From 9404a35136aa0719fa0eaa3bf80b3be5ffd3c69b Mon Sep 17 00:00:00 2001 From: Joshua Clifton Date: Sun, 5 May 2024 16:54:14 -0500 Subject: [PATCH 1/5] gui-wm/swayfx: Adds fcaps and fixes missing dep. ty theo. Signed-off-by: Joshua Clifton --- gui-wm/swayfx/swayfx-0.4.ebuild | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gui-wm/swayfx/swayfx-0.4.ebuild b/gui-wm/swayfx/swayfx-0.4.ebuild index 8c71f91b0b..b5d1f2593d 100644 --- a/gui-wm/swayfx/swayfx-0.4.ebuild +++ b/gui-wm/swayfx/swayfx-0.4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson optfeature +inherit fcaps meson optfeature DESCRIPTION="SwayFX: Sway, but with eye candy!" HOMEPAGE="https://github.com/WillPower3309/swayfx" @@ -15,10 +15,12 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm64" IUSE="+man +swaybar +swaynag tray wallpapers X" +REQUIRED_USE="tray? ( swaybar )" DEPEND=" >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.21.0:0= + virtual/libudev sys-auth/seatd:= dev-libs/libpcre2 >=dev-libs/wayland-1.21.0 @@ -54,7 +56,10 @@ BDEPEND=" virtual/pkgconfig " BDEPEND+="man? ( >=app-text/scdoc-1.9.2 )" -REQUIRED_USE="tray? ( swaybar )" + +FILECAPS=( + cap_sys_nice usr/bin/sway # reflect "gui-wm/sway-1.9" +) src_configure() { local emesonargs=( @@ -80,6 +85,8 @@ src_install() { } pkg_postinst() { + fcaps_pkg_postinst + optfeature_header "There are several packages that may be useful with swayfx:" optfeature "wallpaper utility" gui-apps/swaybg optfeature "idle management utility" gui-apps/swayidle From 99f2f25aff907b524259b22f9b18fc421aba3747 Mon Sep 17 00:00:00 2001 From: Joshua Clifton Date: Sun, 5 May 2024 16:55:51 -0500 Subject: [PATCH 2/5] gui-wm/swayfx: drop 0.3 Signed-off-by: Joshua Clifton --- gui-wm/swayfx/Manifest | 1 - gui-wm/swayfx/swayfx-0.3.ebuild | 99 --------------------------------- 2 files changed, 100 deletions(-) delete mode 100644 gui-wm/swayfx/swayfx-0.3.ebuild diff --git a/gui-wm/swayfx/Manifest b/gui-wm/swayfx/Manifest index c3c1fd0744..04ce973043 100644 --- a/gui-wm/swayfx/Manifest +++ b/gui-wm/swayfx/Manifest @@ -1,4 +1,3 @@ DIST swayfx-0.2.tar.gz 5534158 BLAKE2B e01ac28ea24743d5fe937d953114c8316f3de27b7813f83cce0f6f76bf524f079357be810845791c4431db7e315f096411e6d7a0e2174673e4247d16e3e44bc1 SHA512 0884513a0851b19546f2cc647d8590c7d82494604028ed71b2e6fefbac7f3fff141be26e783ccc504b8da84bbed6c1e12a2194f0713c920e1cc34a6360ac318c DIST swayfx-0.3.2.tar.gz 5684837 BLAKE2B ffe2a5d4a756f30007fb65824471196b6c51034a4e205558a82f547211714be8b0ae03763f32203c9d99fab4d3d69320f2244975a7c279d813091b8629d0c20a SHA512 0cffa25fc4b4d40621b14d9dc430f1aa9956ad935124cfda7dd1a63cbf997f0d506922b1168c7ad13250fa909cc1328526818f75ec936aa8d6cc40152dfbb358 -DIST swayfx-0.3.tar.gz 5746551 BLAKE2B 6455416f54d9e36d33f2f17146c3f2c41ff77a154fcb49f12906c5ba5b2ced3eecb9f052423ad5916885a9e6602160a404bd9fe351272c34cc5b375656b75604 SHA512 a6054d167c9d41a6e3fe9247683267c40ac55637a565649724fad0d7caf340d8aa51ab65767a7f8becc0480eced1eb42a5c851dfc5d815a73c3ae99eb1c39572 DIST swayfx-0.4.tar.gz 17603249 BLAKE2B eda975a0598ba9363066f015d0f5e1a5574775b5cb75a9cf9e7020d04ab16c236b5472b726c40ccd765bf743b6cd659323334915064ac887164b07b798cd58c5 SHA512 a6b30d5b466eb20ca1090daf442377f4f911a97e3089e2966420352c98a8e5b3384abb128118889b9b214f50e6bd65bb744ad941acb05ae105331e60a5e67293 diff --git a/gui-wm/swayfx/swayfx-0.3.ebuild b/gui-wm/swayfx/swayfx-0.3.ebuild deleted file mode 100644 index aecc9fedbe..0000000000 --- a/gui-wm/swayfx/swayfx-0.3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson optfeature - -DESCRIPTION="SwayFX: Sway, but with eye candy!" -HOMEPAGE="https://github.com/WillPower3309/swayfx" - -SRC_URI="https://github.com/WillPower3309/swayfx/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - -LICENSE="MIT" -SLOT="0" -IUSE="grimshot +man +swaybar +swaynag tray wallpapers X" - -DEPEND=" - >=dev-libs/json-c-0.13:0= - >=dev-libs/libinput-1.21.0:0= - sys-auth/seatd:= - dev-libs/libpcre - >=dev-libs/wayland-1.20.0 - x11-libs/cairo - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman - media-libs/mesa[gles2,libglvnd(+)] - swaybar? ( x11-libs/gdk-pixbuf:2 ) - tray? ( || ( - sys-apps/systemd - sys-auth/elogind - sys-libs/basu - ) ) - wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] ) - X? ( x11-libs/libxcb:0= ) -" -DEPEND+=" - >=gui-libs/wlroots-0.16:=[X?] - Date: Mon, 6 May 2024 01:58:04 +0300 Subject: [PATCH 3/5] app-crypt/sac-core: add new ebuild SafeNet Authentication Client is a widely used middleware for qualified digital certificates and other auth mechanisms for EU government services. Unfortunately it is not open source, however it integrates well with pcslite and ccid and is useable for proving gov id for various services. Signed-off-by: Adrian Ratiu --- app-crypt/sac-core/Manifest | 1 + .../files/safenetauthenticationclient.service | 8 ++ app-crypt/sac-core/metadata.xml | 17 +++++ app-crypt/sac-core/sac-core-10.8.1050.ebuild | 73 +++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 app-crypt/sac-core/Manifest create mode 100644 app-crypt/sac-core/files/safenetauthenticationclient.service create mode 100644 app-crypt/sac-core/metadata.xml create mode 100644 app-crypt/sac-core/sac-core-10.8.1050.ebuild diff --git a/app-crypt/sac-core/Manifest b/app-crypt/sac-core/Manifest new file mode 100644 index 0000000000..f27558e4ee --- /dev/null +++ b/app-crypt/sac-core/Manifest @@ -0,0 +1 @@ +DIST SAC_Linux_10.8.105_R1_GA.zip 118355633 BLAKE2B 19040c84e10290f64b9225a7e093ff86f4b2e6dbf0dae2798526fecf754daf39c74db6dc257a4d90b4fac8a536c1707cde4458b4905f826d84ad2e03f3583f8e SHA512 6f3fac16a73f0d1074abf59039e4efea7dfb07193b24e24bf3944a7b2779c00d74c4e9471fa39571701c3694c2e4260ff9d7792ddfdbae8b6a5337dcf3ac7634 diff --git a/app-crypt/sac-core/files/safenetauthenticationclient.service b/app-crypt/sac-core/files/safenetauthenticationclient.service new file mode 100644 index 0000000000..1bbed78053 --- /dev/null +++ b/app-crypt/sac-core/files/safenetauthenticationclient.service @@ -0,0 +1,8 @@ +[Unit] +Description=Thales eToken SACSrv daemon + +[Service] +ExecStart=/usr/bin/SACSrv + +[Install] +WantedBy=multi-user.target diff --git a/app-crypt/sac-core/metadata.xml b/app-crypt/sac-core/metadata.xml new file mode 100644 index 0000000000..2fc7dcd221 --- /dev/null +++ b/app-crypt/sac-core/metadata.xml @@ -0,0 +1,17 @@ + + + + + SAC is a Public Key Infrastructure (PKI) middleware that provides a secure + method for exchanging information based on public key cryptography, enabling + trusted third-party verification of user identities. + + It utilizes a system of digital certificates, Certificate Authorities, and + other registration authorities that verify and authenticate the validity of + each party involved in an internet transaction. + + + Adrian Ratiu + adrian.ratiu@collabora.com + + diff --git a/app-crypt/sac-core/sac-core-10.8.1050.ebuild b/app-crypt/sac-core/sac-core-10.8.1050.ebuild new file mode 100644 index 0000000000..65c5d5cb20 --- /dev/null +++ b/app-crypt/sac-core/sac-core-10.8.1050.ebuild @@ -0,0 +1,73 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Thales/Gemalto SafeNet Authentication Client for eToken 5110/5300 & IDPrime (core PKCS#11 modules)" + +SRC_URI="https://nullroute.lt/tmp/2023/pkg/SAC_Linux_10.8.105_R1_GA.zip" + +HOMEPAGE="https://cpl.thalesgroup.com/access-management/security-applications/authentication-client-token-management" +# see usr/share/doc copyright file +LICENSE="no-source-code EULA" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+ssl" + +# binaries are already stripped +RESTRICT="strip" + +inherit systemd + +RDEPEND=" + dev-libs/openssl + sys-apps/pcsc-lite + app-crypt/ccid + virtual/libusb:0 + ssl? ( dev-libs/libp11 ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}" + +src_unpack() { + default + + cd "$S" || die + + unpack "SAC Linux ${PV} R1 GA/Installation/withoutUI/Ubuntu-2204/safenetauthenticationclient-core_${PV}_amd64.deb" || die + unpack "./data.tar.gz" || die +} + +src_install() { + # v10.8 is 64bit only, so move to the proper libdir + mv usr/lib usr/$(get_libdir) || die + + # libs are not marked as executable + chmod 755 usr/$(get_libdir)/lib*.${PV} || die + + # move docs to proper location + mkdir -p "usr/share/doc/${PF}" || die + mv usr/share/doc/safenetauthenticationclient-core "usr/share/doc/${PF}/" || die + + # exclude already compressed file from compression + docompress -x "/usr/share/doc/${PF}/safenetauthenticationclient-core/changelog.gz" || die + + # Create missing SONAME symlinks + ln -s libSACLog.so.${PV} "usr/$(get_libdir)/libSACLog.so.10" || die + ln -s libeTokenHID.so.${PV} "usr/$(get_libdir)/libeTokenHID.so.10" || die + ln -s libIDPrimePKCS11.so.${PV} "usr/$(get_libdir)/libIDPrimePKCS11.so.10" || die + ln -s libIDPrimeTokenEngine.so.${PV} "usr/$(get_libdir)/libIDPrimeTokenEngine.so.10" || die + ln -s libIDClassicSISTokenEngine.so.${PV} "usr/$(get_libdir)/libIDClassicSISTokenEngine.so.10" || die + ln -s libIDPrimeSISTokenEngine.so.${PV} "usr/$(get_libdir)/libIDPrimeSISTokenEngine.so.10" || die + + mv usr/ "${D}/" || die + mv etc/ "${D}/" || die + + systemd_dounit "${FILESDIR}/safenetauthenticationclient.service" +} + +pkg_posintst() { + einfo "To allow pcscd access to usb devices:" + einfo "usermod -aG usb pcscd" +} From d566b14ee79d5f601821b622b5435342edd903e9 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 6 May 2024 11:36:58 +0200 Subject: [PATCH 4/5] sys-apps/dool: add 1.3.1 Signed-off-by: Florian Schmaus --- sys-apps/dool/Manifest | 1 + sys-apps/dool/dool-1.3.1.ebuild | 60 +++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 sys-apps/dool/dool-1.3.1.ebuild diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest index c627d0a668..3d056cb416 100644 --- a/sys-apps/dool/Manifest +++ b/sys-apps/dool/Manifest @@ -1,2 +1,3 @@ DIST dool-1.0.0-fix-proc-diskstats-parsing.patch 7784 BLAKE2B 0c819c124ad5ec66800f2b8700f1b6d533311e91f978c0db16909ef089997605fe4660de8042533f3a8130db521671fbbe7c9064f1a08f108f39f4472d4720ce SHA512 8611cfc39eb1b3b7353c72234b28d13501f9bff544815ae7d939f37b2c1c18ec8b26f7e72db592d6c55481397b31ba0cd5929e0ad80547d3457dca685e9b589d DIST dool-1.1.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968 +DIST dool-1.3.1.tar.gz 150933 BLAKE2B 9aadd4e196cfb7c57fc5fd539f1211b3249b0da955aa2869c43c66b2c2a63816f5cb3e5bcffefada47269f8bd4e3f4b0ace8512f6b0de07e66e0e830ae50c0c2 SHA512 20cabbcbe09152c1ebcaed08bd182586e20d0bae297b61031f1cc52bfce3b9827cc84843e5e5a3dc0d3e790ef2d6da5eb5925d287647f80023925611eb9b04ee diff --git a/sys-apps/dool/dool-1.3.1.ebuild b/sys-apps/dool/dool-1.3.1.ebuild new file mode 100644 index 0000000000..eff98f06ff --- /dev/null +++ b/sys-apps/dool/dool-1.3.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-r1 + +DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat (clone of dstat)" +HOMEPAGE="https://github.com/scottchiefbaker/dool" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/scottchiefbaker/dool.git" + inherit git-r3 +else + SRC_URI=" + https://github.com/scottchiefbaker/dool/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + " +fi + +if [[ "${PV}" != "9999" ]]; then + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc examples" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" + +src_compile() { + : +} + +src_install() { + python_foreach_impl python_doscript "${PN}" + + insinto "/usr/share/${PN}" + newins "${PN}" "${PN}.py" + doins plugins/${PN}_*.py + + doman "docs/${PN}.1" + + einstalldocs + + if use examples; then + dodoc examples/{mstat,read}.py + fi + if use doc; then + dodoc docs/*.html + fi +} + +src_test() { + python_foreach_impl emake test +} From 1887bf52f03c51c5f59c13f18bd644135d4d2c7f Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 6 May 2024 11:37:53 +0200 Subject: [PATCH 5/5] sys-apps/dool: sync live Signed-off-by: Florian Schmaus --- sys-apps/dool/dool-9999.ebuild | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild index 3239402b05..eff98f06ff 100644 --- a/sys-apps/dool/dool-9999.ebuild +++ b/sys-apps/dool/dool-9999.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_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-r1 @@ -14,13 +14,10 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/scottchiefbaker/dool.git" inherit git-r3 else - DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d" SRC_URI=" - https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz - https://github.com/stanford-rc/dool/commit/fa079a43c97f772a4809304386dbed5f4afa9a54.patch - -> ${PN}-1.0.0-fix-proc-diskstats-parsing.patch + https://github.com/scottchiefbaker/dool/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz " - S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}" fi if [[ "${PV}" != "9999" ]]; then @@ -35,10 +32,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" -PATCHES=( - "${DISTDIR}"/${PN}-1.0.0-fix-proc-diskstats-parsing.patch -) - src_compile() { : }