diff options
Diffstat (limited to 'app-admin')
563 files changed, 10694 insertions, 8951 deletions
diff --git a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r2.ebuild index 0d3bdf8f5554..bf0ab56be575 100644 --- a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild +++ b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 DESCRIPTION="Init script to setup Amazon EC2 instance parameters" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="" +S="${WORKDIR}" # Amazon only provides x86 and amd64 Linux Xen guests, possibly FreeBSD, # so just don't go adding further keywords. @@ -13,13 +13,8 @@ KEYWORDS="-* ~amd64 ~x86" LICENSE="GPL-2" SLOT="0" -IUSE="" RDEPEND="net-misc/wget" -DEPEND="" - -# EAPI 4+ requires $S to be set -S="${WORKDIR}" src_install() { newinitd "${FILESDIR}/amazon-ec2.init" amazon-ec2 diff --git a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild index ad4db81a3892..f3f8a39a1804 100644 --- a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild +++ b/app-admin/ananicy/ananicy-2.2.1-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} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit python-single-r1 @@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" +KEYWORDS="amd64 ~arm ~arm64" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} diff --git a/app-admin/ananicy/metadata.xml b/app-admin/ananicy/metadata.xml index cb2e8d8db595..88aaec308a1f 100644 --- a/app-admin/ananicy/metadata.xml +++ b/app-admin/ananicy/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>lssndrbarbieri@gmail.com</email> - <name>Alessandro Barbieri</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <bugs-to>https://github.com/Nefelim4ag/Ananicy/issues</bugs-to> <remote-id type="github">Nefelim4ag/Ananicy</remote-id> diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest index 83ae48519e84..0e97f0c84c5e 100644 --- a/app-admin/ansible-core/Manifest +++ b/app-admin/ansible-core/Manifest @@ -1,5 +1,6 @@ -DIST ansible-core-2.12.10.tar.gz 7762154 BLAKE2B deffcc42c124a40ce34ce9a26a0c400b1199018cb05478ea8860500e1a507f9f604c1f40f0d006682fc14ad8f0cc3d035b8ffb1307ee37d26191be3c68e33253 SHA512 8b4eb0e923f976680e81ffbe942c4ddc7ddaaaffe83d14c20f78f7c6ab4f548f21920cdfa57b48de2bc24683028e744a92ac4ca45fecc459ea2b042de8c40737 -DIST ansible-core-2.13.7.tar.gz 13940230 BLAKE2B fd3556514f7692b48a66987ff5a084b132217c910ba0b216f2533cd1e542a9b6da6d2aa96e8e32142ab3a6ed7357fc1b68b9827ceaf44b91238bfbcb15b5d026 SHA512 f46d8acb07fa1d397e6e640c52237ed70b575ae0760eeb82b9e41afc6c06d99d341856d6af3452edb82e63a708600c2f348782b8bebc18c0ea9b03a4df80594a -DIST ansible-core-2.13.8.tar.gz 13985893 BLAKE2B c0fd9ebde2dacd590588a654df29ed56e681ee67f3df41f1d1e91351259c22a0b01f0eb108763596198133e4d980c2130317f79d4f8f25ea1e36dac9325a8b40 SHA512 a3abeaca7076a590892b31735c901447654b5f1db59ca3095ad1d98c8de11b982e1375a22f1814712545fe84a870f57132d87c2ca47fa6a779bd53cd99d17ba4 -DIST ansible-core-2.14.2.tar.gz 11514103 BLAKE2B f908ca83497f4a444ab738cd0f7f75a00e1ee6f2e7dc9c32a67c7e5fcfba166fe7b2938168c8a0fdbafdfcdf5bc08e582cc1c98ab0c032e3768a8fb4e21a99af SHA512 210dcd32b3a7faa50028200cc7f2ef4b8a8c5ee90fdfdf31cb61d2bc6d03c86aeb644a751e0c14aea3c1a95ea9e18703de1de304beeedcda4a98780f3e79cfec -DIST ansible-core-2.14.3.tar.gz 11516886 BLAKE2B 95c209842c1ccd090467e529f8c84def76cb3df69863b02c01f61a1ac6d4fa911134cc336e51e087215939efa91883ad51d4c01d2b3f4c124b82c540ab0e3be0 SHA512 95278d9c55d3eef2f66db1ee62648b5493e138f19513c32780684c55631c1ec49f94988a8d0f5eede44dbcceca7b4dd34aca10fa67d17dbe90ef8cf37051581d +DIST ansible-core-2.14.13.tar.gz 3145413 BLAKE2B 75b11feaaefa9a63c6f83f64c796ceacf7c6b08322ac0b85f6dcf968db7b80cc97262ea6f8f839e5e41e800ad7cae610e96f312c1ae0f58882c8891246a81b8a SHA512 195885815d40448d8497eae9533a4104c4b9f17ab3a812d544a403f41d2e77e7be2c15bae5a6df07563499052beb273580a569d51b667d0a9c5a16e55b35258a +DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e0618a3ea52c67ebcd51667f31220cb038dda35506e7843d177d555b77a55a9d2c6245a916741ab1dcdf222c535afb5f83d SHA512 020191ef4b005abbf799204da68270bd4f13a85c7f23cb9dffe85b1c5c093c0ad86e061211ab9fcc8fd0be9367717fb0baadefb1ebecd3579471120fb2e8647f +DIST ansible-core-2.16.2.tar.gz 3163899 BLAKE2B 6365dd573ae4a2f3ebfc870ae3ea399b268615333de2ddf7e21323189dfdd9bf61ae836b536c86d713f4a934468ed36835084e06e4b6d9b32c4b633f55353ad9 SHA512 6e2389fc6b34645c0f1566eca960da36616619a5ed5e35b46f3d659979fe519db20d89b4f598344a389f4b6ac33bb660ea91a1a6509002bbf4ac791ea3cb4cbd +DIST ansible-core-2.16.4.tar.gz 3170397 BLAKE2B 8226641621ce4b2a8cd564f831cd21e36345b2db6680f8d9f3d3388a05ff66df74f4d286300dbb1b73601a0bf4a781d266e62e9fd0c894a79f89d545930c854a SHA512 d05737eec9a6a0e71891821acd4540576b3a993f59d88c12c2da8e7f075bc11c712e0eba850b3f7a2643e3c970f51938267fed6fa7f99f2c4c205b64f9b13259 +DIST ansible-core-2.16.5.tar.gz 3171617 BLAKE2B cb620cf9fc9fd509edb62bf75ab19b5ffe80f4d8520be76bbeb030c74953945295e0f4f30102f51d20247d2ce4a18b15e488e47b4346319f5442979593402821 SHA512 dbe5d68fbc3a0ef611791d6995297bca5bba6aed1f4871964136ea81810458646bc78c2146739f887de3c2e3017cf4e6d4d09652e41c2ca046c4bc88eca6c5d8 +DIST ansible_core-2.16.6.tar.gz 3176041 BLAKE2B 37aa15e8d9165eb89db0704f7670f78f3e3a50915e17bb1d56689e65e6cfc0bb15b7e01768d25c5d2a9a00802411a6eefdb9ad70aa38877d7115bc40faafea59 SHA512 cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409 diff --git a/app-admin/ansible-core/ansible-core-2.12.10.ebuild b/app-admin/ansible-core/ansible-core-2.12.10.ebuild deleted file mode 100644 index ae2fbf2fa73b..000000000000 --- a/app-admin/ansible-core/ansible-core-2.12.10.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -DISTUTILS_USE_SETUPTOOLS=bdepend - -inherit distutils-r1 - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ansible/ansible.git" - EGIT_BRANCH="devel" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="test" -RESTRICT="test" - -RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] - <dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh -" -DEPEND=" - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - dev-vcs/git - )" - -python_compile() { - export ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} - -python_test() { - nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die -} diff --git a/app-admin/ansible-core/ansible-core-2.14.13-r1.ebuild b/app-admin/ansible-core/ansible-core-2.14.13-r1.ebuild new file mode 100644 index 000000000000..113c9aeb164f --- /dev/null +++ b/app-admin/ansible-core/ansible-core-2.14.13-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 + +inherit distutils-r1 + +DESCRIPTION="Model-driven deployment, config management, and command execution framework" +HOMEPAGE="https://www.ansible.com/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ansible/ansible.git" + EGIT_BRANCH="devel" +else + inherit pypi + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" +fi + +LICENSE="GPL-3" +SLOT="0" +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/resolvelib.patch" +) + +RDEPEND=" + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/netaddr[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] + <dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}] + net-misc/sshpass + virtual/ssh +" +BDEPEND=" + >=dev-python/packaging-16.6[${PYTHON_USEDEP}] + test? ( + dev-python/botocore[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +python_compile() { + export ANSIBLE_SKIP_CONFLICT_CHECK=1 + distutils-r1_python_compile +} diff --git a/app-admin/ansible-core/ansible-core-2.14.2.ebuild b/app-admin/ansible-core/ansible-core-2.15.8-r1.ebuild index ee8d323e90b5..45fc573d4107 100644 --- a/app-admin/ansible-core/ansible-core-2.14.2.ebuild +++ b/app-admin/ansible-core/ansible-core-2.15.8-r1.ebuild @@ -1,10 +1,11 @@ -# 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} ) -DISTUTILS_USE_SETUPTOOLS=bdepend +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 inherit distutils-r1 @@ -16,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ansible/ansible.git" EGIT_BRANCH="devel" else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + inherit pypi KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" fi @@ -34,7 +35,7 @@ RDEPEND=" dev-python/netaddr[${PYTHON_USEDEP}] dev-python/pexpect[${PYTHON_USEDEP}] >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] - <dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}] + <dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}] net-misc/sshpass virtual/ssh " diff --git a/app-admin/ansible-core/ansible-core-2.13.7.ebuild b/app-admin/ansible-core/ansible-core-2.16.2-r1.ebuild index ee8d323e90b5..45fc573d4107 100644 --- a/app-admin/ansible-core/ansible-core-2.13.7.ebuild +++ b/app-admin/ansible-core/ansible-core-2.16.2-r1.ebuild @@ -1,10 +1,11 @@ -# 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} ) -DISTUTILS_USE_SETUPTOOLS=bdepend +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 inherit distutils-r1 @@ -16,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ansible/ansible.git" EGIT_BRANCH="devel" else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + inherit pypi KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" fi @@ -34,7 +35,7 @@ RDEPEND=" dev-python/netaddr[${PYTHON_USEDEP}] dev-python/pexpect[${PYTHON_USEDEP}] >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] - <dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}] + <dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}] net-misc/sshpass virtual/ssh " diff --git a/app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild b/app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild new file mode 100644 index 000000000000..51f3b5d36db1 --- /dev/null +++ b/app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 + +inherit distutils-r1 + +DESCRIPTION="Model-driven deployment, config management, and command execution framework" +HOMEPAGE="https://www.ansible.com/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ansible/ansible.git" + EGIT_BRANCH="devel" +else + inherit pypi + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" +fi + +LICENSE="GPL-3" +SLOT="0" +RESTRICT="test" + +RDEPEND=" + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/netaddr[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] + <dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}] + net-misc/sshpass + virtual/ssh +" +BDEPEND=" + >=dev-python/packaging-16.6[${PYTHON_USEDEP}] + test? ( + dev-python/botocore[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +python_compile() { + export ANSIBLE_SKIP_CONFLICT_CHECK=1 + distutils-r1_python_compile +} diff --git a/app-admin/ansible-core/ansible-core-2.14.3.ebuild b/app-admin/ansible-core/ansible-core-2.16.5.ebuild index e9f5858cfb36..a9e25609de36 100644 --- a/app-admin/ansible-core/ansible-core-2.14.3.ebuild +++ b/app-admin/ansible-core/ansible-core-2.16.5.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=8 -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_SETUPTOOLS=bdepend +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 inherit distutils-r1 @@ -35,7 +35,7 @@ RDEPEND=" dev-python/netaddr[${PYTHON_USEDEP}] dev-python/pexpect[${PYTHON_USEDEP}] >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] - <dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}] + <dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}] net-misc/sshpass virtual/ssh " diff --git a/app-admin/ansible-core/ansible-core-2.13.8.ebuild b/app-admin/ansible-core/ansible-core-2.16.6.ebuild index 84f6bffd432f..45a1511c7489 100644 --- a/app-admin/ansible-core/ansible-core-2.13.8.ebuild +++ b/app-admin/ansible-core/ansible-core-2.16.6.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=8 -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_SETUPTOOLS=bdepend +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ansible/ansible.git" EGIT_BRANCH="devel" else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + inherit pypi KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" fi @@ -34,7 +34,7 @@ RDEPEND=" dev-python/netaddr[${PYTHON_USEDEP}] dev-python/pexpect[${PYTHON_USEDEP}] >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] - <dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}] + <dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}] net-misc/sshpass virtual/ssh " diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild index e9f5858cfb36..a9e25609de36 100644 --- a/app-admin/ansible-core/ansible-core-9999.ebuild +++ b/app-admin/ansible-core/ansible-core-9999.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=8 -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_SETUPTOOLS=bdepend +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 inherit distutils-r1 @@ -35,7 +35,7 @@ RDEPEND=" dev-python/netaddr[${PYTHON_USEDEP}] dev-python/pexpect[${PYTHON_USEDEP}] >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] - <dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}] + <dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}] net-misc/sshpass virtual/ssh " diff --git a/app-admin/ansible-core/files/resolvelib.patch b/app-admin/ansible-core/files/resolvelib.patch new file mode 100644 index 000000000000..c38f10945d52 --- /dev/null +++ b/app-admin/ansible-core/files/resolvelib.patch @@ -0,0 +1,124 @@ +From e30959723a9603ff94bc18ba58ee3adbf305a6b6 Mon Sep 17 00:00:00 2001 +From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com> +Date: Sun, 12 Mar 2023 23:27:41 +0800 +Subject: [PATCH] ansible-galaxy - support `resolvelib >= 0.5.3, < 1.1.0` + +<https://pypi.org/project/resolvelib/1.0.1> released on 2023-03-09: + +- <https://github.com/sarugaku/resolvelib/blob/main/CHANGELOG.rst#101-2023-03-09> +- <https://github.com/sarugaku/resolvelib/releases/tag/1.0.1> + +Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com> +--- + changelogs/fragments/80196-resolvelib_lt_1_1_0.yml | 2 ++ + lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++-- + requirements.txt | 2 +- + test/lib/ansible_test/_data/requirements/ansible.txt | 2 +- + test/sanity/code-smell/docs-build.requirements.in | 2 +- + test/sanity/code-smell/docs-build.requirements.txt | 2 +- + test/sanity/code-smell/package-data.requirements.in | 2 +- + test/sanity/code-smell/package-data.requirements.txt | 2 +- + 8 files changed, 10 insertions(+), 8 deletions(-) + create mode 100644 changelogs/fragments/80196-resolvelib_lt_1_1_0.yml + +diff --git a/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml +new file mode 100644 +index 00000000000000..6fd419f0d4f929 +--- /dev/null ++++ b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml +@@ -0,0 +1,2 @@ ++minor_changes: ++ - ansible-galaxy - support ``resolvelib >= 0.5.3, < 1.1.0``. +diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py +index d52006b24d7a77..1dcaf1c8d2cff1 100644 +--- a/lib/ansible/galaxy/dependency_resolution/providers.py ++++ b/lib/ansible/galaxy/dependency_resolution/providers.py +@@ -42,7 +42,7 @@ class AbstractProvider: # type: ignore[no-redef] + + # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback + RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3") +-RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0") ++RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0") + RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version)) + + +@@ -220,7 +220,7 @@ def get_preference(self, *args, **kwargs): + Mapping of identifier, list of named tuple pairs. + The named tuples have the entries ``requirement`` and ``parent``. + +- resolvelib >=0.8.0, <= 0.8.1 ++ resolvelib >=0.8.0, <= 1.0.1 + + :param identifier: The value returned by ``identify()``. + +diff --git a/requirements.txt b/requirements.txt +index d096901ec2bcdb..a07aa985063b6a 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10' + # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69 + # NOTE: When updating the upper bound, also update the latest version used + # NOTE: in the ansible-galaxy-collection test suite. +-resolvelib >= 0.5.3, < 0.9.0 # dependency resolver used by ansible-galaxy ++resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy +diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt +index d096901ec2bcdb..a07aa985063b6a 100644 +--- a/test/lib/ansible_test/_data/requirements/ansible.txt ++++ b/test/lib/ansible_test/_data/requirements/ansible.txt +@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10' + # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69 + # NOTE: When updating the upper bound, also update the latest version used + # NOTE: in the ansible-galaxy-collection test suite. +-resolvelib >= 0.5.3, < 0.9.0 # dependency resolver used by ansible-galaxy ++resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy +diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in +index 80e8f66bc7f6fb..9209dd34ebecdf 100644 +--- a/test/sanity/code-smell/docs-build.requirements.in ++++ b/test/sanity/code-smell/docs-build.requirements.in +@@ -1,6 +1,6 @@ + jinja2 + pyyaml +-resolvelib < 0.9.0 ++resolvelib < 1.1.0 + sphinx == 4.2.0 + sphinx-notfound-page + sphinx-ansible-theme +diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt +index 663e2c6c53d28a..7b4d563574c595 100644 +--- a/test/sanity/code-smell/docs-build.requirements.txt ++++ b/test/sanity/code-smell/docs-build.requirements.txt +@@ -27,7 +27,7 @@ Pygments==2.14.0 + pytz==2022.2.1 + PyYAML==6.0 + requests==2.28.1 +-resolvelib==0.8.1 ++resolvelib==1.0.1 + rstcheck==3.5.0 + semantic-version==2.10.0 + sh==1.14.3 +diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in +index acec62eff91ff8..50e8568c5cf8bc 100644 +--- a/test/sanity/code-smell/package-data.requirements.in ++++ b/test/sanity/code-smell/package-data.requirements.in +@@ -1,6 +1,6 @@ + docutils < 0.18 # match version required by sphinx in the docs-build sanity test + jinja2 + pyyaml # ansible-core requirement +-resolvelib < 0.9.0 ++resolvelib < 1.1.0 + rstcheck < 4 # match version used in other sanity tests + antsibull-changelog +diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt +index 6411020e47c67b..afc3cd6418e84d 100644 +--- a/test/sanity/code-smell/package-data.requirements.txt ++++ b/test/sanity/code-smell/package-data.requirements.txt +@@ -5,7 +5,7 @@ Jinja2==3.1.2 + MarkupSafe==2.1.1 + packaging==21.3 + pyparsing==3.0.9 + PyYAML==6.0 +-resolvelib==0.8.1 ++resolvelib==1.0.1 + rstcheck==3.5.0 + semantic-version==2.10.0 + types-docutils==1.5.0 diff --git a/app-admin/ansible-core/metadata.xml b/app-admin/ansible-core/metadata.xml index 86dea112ad49..7e75c7575290 100644 --- a/app-admin/ansible-core/metadata.xml +++ b/app-admin/ansible-core/metadata.xml @@ -5,10 +5,6 @@ <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> <upstream> <remote-id type="pypi">ansible-core</remote-id> <remote-id type="github">ansible/ansible</remote-id> diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 6bcd16bbd187..2b8fc9c59daf 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,2 +1,2 @@ -DIST ansible-lint-6.12.1.tar.gz 466371 BLAKE2B f43b3403c5d3db80d3ec3e3526cafc22bee68b31b5458e378a73bbec900de5411c597e9fc079a77cffc66a278a37bf0fc9ecfcaba3beccf74c6eecbe5b6148b9 SHA512 05c92c930d91419c212a9513aed5506c99e993acbce9437b6f8f3b95bd78ca5b0ff8e1a7d39f32907df72d858a2e4e6c74f47443c0f937b3644c7a18d1d59252 -DIST ansible-lint-6.14.2.tar.gz 473090 BLAKE2B 7ee73ab0b9539ae56cdf0220d79b271c45747fc1379f818e14f99b0d361e87cd7410548261e369a1d90cb3dceeb53bd46d614b041c837253ef643b653430bf51 SHA512 bb7350b56b9f81d398509b612cf1631020c21bed4f08ea8dda482460c18a1c0388269af513833778f29f1003a114366af885e7b7f31149731bad2067a904d30a +DIST ansible-lint-24.2.0.tar.gz 513719 BLAKE2B 54e05acf982cf13cb2142a10bf04250171f07936df14933525dfae68b312a0d92ceb30867603dc7ce686206b7de010f6ca4eb9ab532ca000fc3c15c77c354c81 SHA512 3276d28c7b85a6087a0142cc56442efddf9ff3e81155455c74686015a2ab45ece64847b0243373ad01145e67599d8449866c122efe8ae404cd819011e41c5235 +DIST ansible-lint-24.2.2.tar.gz 515822 BLAKE2B e9d8e689dfe4e4efbd4dad44ff3567f50412400ed979f2d60150f09f17c5f63f2441f25a33ecdf0112024ced07e62ac16b8a2dbc1c01d62855ec785fc75d1b9a SHA512 3de6b14e4b64ba577abcb67920a45dbf45fedb84e21091cd6a29e3c52a7a91555a152ee3e265624aafbf9dddba96d04241c2598a18f2103ce2cae48706142446 diff --git a/app-admin/ansible-lint/ansible-lint-6.14.2.ebuild b/app-admin/ansible-lint/ansible-lint-24.2.0.ebuild index ee1d61c5c73c..1995f0728a37 100644 --- a/app-admin/ansible-lint/ansible-lint-6.14.2.ebuild +++ b/app-admin/ansible-lint/ansible-lint-24.2.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ansible/ansible-lint" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" # Upstream has stated explicitly that all tests require Internet access PROPERTIES="test_network" @@ -22,22 +22,25 @@ RESTRICT="test" RDEPEND=" >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}] - >=dev-python/ansible-compat-2.2.7[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-4.1.11[${PYTHON_USEDEP}] >=dev-python/black-22.8.0[${PYTHON_USEDEP}] >=dev-python/filelock-3.8.0[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.0[${PYTHON_USEDEP}] >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/pathspec-0.10.3[${PYTHON_USEDEP}] >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}] >=dev-python/rich-12.0.0[${PYTHON_USEDEP}] - >=dev-python/ruamel-yaml-0.17.21[${PYTHON_USEDEP}] + >=dev-python/ruamel-yaml-0.18.5[${PYTHON_USEDEP}] >=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}] - >=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}] + >=dev-util/yamllint-1.30.0[${PYTHON_USEDEP}] dev-vcs/git" BDEPEND=" >=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}] test? ( + dev-python/mypy[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] - >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.6[${PYTHON_USEDEP}] >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] )" diff --git a/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild b/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild index 70acfb5c1344..e8e336e27738 100644 --- a/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild +++ b/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild @@ -1,20 +1,20 @@ -# 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} ) DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" HOMEPAGE="https://github.com/ansible/ansible-lint" -SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~riscv" +KEYWORDS="~amd64 ~arm64 ~riscv" # Upstream has stated explicitly that all tests require Internet access PROPERTIES="test_network" @@ -22,22 +22,25 @@ RESTRICT="test" RDEPEND=" >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}] - >=dev-python/ansible-compat-2.2.7[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-4.1.11[${PYTHON_USEDEP}] >=dev-python/black-22.8.0[${PYTHON_USEDEP}] >=dev-python/filelock-3.8.0[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.0[${PYTHON_USEDEP}] >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/pathspec-0.10.3[${PYTHON_USEDEP}] >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}] >=dev-python/rich-12.0.0[${PYTHON_USEDEP}] - >=dev-python/ruamel-yaml-0.17.21[${PYTHON_USEDEP}] + >=dev-python/ruamel-yaml-0.18.5[${PYTHON_USEDEP}] >=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}] - >=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}] + >=dev-util/yamllint-1.30.0[${PYTHON_USEDEP}] dev-vcs/git" BDEPEND=" >=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}] test? ( + dev-python/mypy[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] - >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.6[${PYTHON_USEDEP}] >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] )" diff --git a/app-admin/ansible-lint/metadata.xml b/app-admin/ansible-lint/metadata.xml index 094d18cbba43..8ec7574bc4cb 100644 --- a/app-admin/ansible-lint/metadata.xml +++ b/app-admin/ansible-lint/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> - <maintainer type="person"> <email>marecki@gentoo.org</email> <name>Marek Szuba</name> </maintainer> diff --git a/app-admin/ansible-modules-hashivault/Manifest b/app-admin/ansible-modules-hashivault/Manifest index 444113cd74a7..dd593c9ebb12 100644 --- a/app-admin/ansible-modules-hashivault/Manifest +++ b/app-admin/ansible-modules-hashivault/Manifest @@ -1,2 +1,2 @@ -DIST ansible-modules-hashivault-4.6.2.tar.gz 91244 BLAKE2B 475ecce4110d985876c556da7ec386b45feaa34e516ae9ac49b43b75f39a3ddb3c0969dc5c3dee4c31a9dea9c6f643c4bbfe9d6035d1c32f5d105c7c78bfd284 SHA512 4e4ff741c5652277f71cd211425404dad865838546d6c3dc4983333187201f9463ddaf819e5a675a962f5866fea4db3564c11dbe6a886739c2126a678607590f DIST ansible-modules-hashivault-4.6.8.tar.gz 94253 BLAKE2B 2b6a315cfd051a2e16d889a8784a9185b86b98b3d96ba19f6bdde8b628ce94622c360b60cb59dfcae790fc822f2c41eacd5428356b48324aa2704f0048821c2d SHA512 4b3487e553e6dea5fbefbb383ce22d018ed9f83378d601574badfb2be8dd3f98c54caf975690d3116df6cca970d8e2d3932f0d0ccb1f18f7145aee0beae79f96 +DIST ansible-modules-hashivault-5.1.0.gh.tar.gz 100025 BLAKE2B 6bedb1269a5f39be777ab24e973a52a708d5871cf99f6e7018caa703bc4e8222fec9a40b6b5b980c67e2574034511fe810cba656278336dce0ca3b52f880bcb6 SHA512 cc442a80a4a15e013352202912af6db889afe793aa5baebd8056312eea42c7a819fdae32c9199ec297b9c4aa30719017bff964934d7f94571f368996328619ab diff --git a/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-4.6.2.ebuild b/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-5.1.0.ebuild index e0c9ec778f8e..054808151350 100644 --- a/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-4.6.2.ebuild +++ b/app-admin/ansible-modules-hashivault/ansible-modules-hashivault-5.1.0.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_9 ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 DESCRIPTION="Ansible module for hashicorp vault" @@ -12,18 +13,23 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/TerryHowe/ansible-modules-hashivault.git" else - SRC_URI="https://github.com/TerryHowe/ansible-modules-hashivault/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + SRC_URI="https://github.com/TerryHowe/ansible-modules-hashivault/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~arm64" fi LICENSE="MIT" SLOT="0" RDEPEND=" - >=app-admin/ansible-2.0.0[${PYTHON_USEDEP}] - >=dev-python/hvac-0.9.5[${PYTHON_USEDEP}] + >=app-admin/ansible-5.0.0[${PYTHON_USEDEP}] + >=dev-python/hvac-1.0.0[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] " # The tests require a private instance of vault RESTRICT="test" + +python_prepare_all() { + sed -i 's:description-file:description_file:' setup.cfg || die + distutils-r1_python_prepare_all +} diff --git a/app-admin/ansible-modules-hashivault/metadata.xml b/app-admin/ansible-modules-hashivault/metadata.xml index 7bb74a69d033..48548a10aa89 100644 --- a/app-admin/ansible-modules-hashivault/metadata.xml +++ b/app-admin/ansible-modules-hashivault/metadata.xml @@ -10,4 +10,7 @@ <name>Patrick McLean</name> </maintainer> <stabilize-allarches/> + <upstream> + <remote-id type="github">TerryHowe/ansible-modules-hashivault</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest index a927a79ed492..948c0d4c840d 100644 --- a/app-admin/ansible-molecule/Manifest +++ b/app-admin/ansible-molecule/Manifest @@ -1,2 +1,2 @@ -DIST ansible-molecule-4.0.1.tar.gz 301517 BLAKE2B 73cf7a2257368c737b9003236bf77011de167dd6f692166702e7948c136202b33bcce1c70893b61a95af9baa90e7b5266a5fa889e3bba0e5a8c9c1e6f48fec9a SHA512 7515e07bf791d5586e1f5fb4ce0d2f731c94c8268c589155340b2bdc1528534084870e66e492b2d883f9e9764293c93799a4c75478523502a2f37ad0642a472d -DIST ansible-molecule-4.0.4.tar.gz 337260 BLAKE2B 14c493fa8aaa15466ebca19af9e5325ddb824c151d07d800136dcb714a430ea2dc42b38c9ec6e805e29ec3226376a532793d51c5d0544d6d5105510e5365ca8c SHA512 d7c1ceefbf74cbc27a397e7a40d855b23325bbde31a4cd1920961413a7db950e9fc530fec180de877eb37984bac8603033aa5a582e68e7f4c4ac2a10721c6630 +DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d +DIST molecule-5.1.0.tar.gz 335161 BLAKE2B 55c2f3c181bef6ab848cf7b52b19649fd861dbdbd68b92d3de9e0a1330755b9b887affd8f78e92ab33145ed60e7131d3cf1ffb7b4d8f10c1c3cab8dd58288af9 SHA512 4d025a512e3a6ac7f424318f06bb23b2c1ef1cc122d31d012430bfccf4efeeb3c7ddf2450abd78378c1c50f54fffb1fa8f366f14eebe58125f177ced8cec3ff5 diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild index b7f03fadc438..dc56df03c582 100644 --- a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild +++ b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild @@ -1,30 +1,42 @@ -# 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 ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + >=dev-python/mkdocs-ansible-24.3.0 + dev-python/mkdocs-autorefs + dev-python/mkdocstrings-python + media-gfx/cairosvg +" +PYPI_PN="molecule" -inherit distutils-r1 optfeature - -MY_PN="${PN#ansible-}" -MY_P="${MY_PN}-${PV}" +inherit distutils-r1 docs optfeature pypi DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles" -HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible-community/molecule/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~riscv" +KEYWORDS="~amd64 ~arm64 ~riscv" IUSE="selinux" +# Since around the time of the switch to the yy.m.patchlevel versioning scheme +# the test suite has been completely incompatible with Portage, with several +# tests which do pass under Tox failing even with disabled sandboxing. +# Nb. As of 24.2.1 two tests fail even under Tox, for both PyPI and GitHub +# tarballs. +RESTRICT="test" + RDEPEND="$(python_gen_cond_dep ' - >=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}] - dev-python/cerberus[${PYTHON_USEDEP}] + >=app-admin/ansible-core-2.12.10[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-4.1.8[${PYTHON_USEDEP}] >=dev-python/click-8.0[${PYTHON_USEDEP}] + <dev-python/click-9[${PYTHON_USEDEP}] >=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}] >=dev-python/enrich-1.2.7[${PYTHON_USEDEP}] >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}] @@ -33,30 +45,29 @@ RDEPEND="$(python_gen_cond_dep ' <dev-python/pluggy-2.0[${PYTHON_USEDEP}] >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] >=dev-python/rich-9.5.1[${PYTHON_USEDEP}] - >=dev-util/cookiecutter-1.7.3[${PYTHON_USEDEP}] selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] ) ')" BDEPEND="$(python_gen_cond_dep ' - >=dev-python/setuptools-scm-3.5.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm_git_archive-1.1[${PYTHON_USEDEP}] + >=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}] doc? ( - app-admin/ansible-core[${PYTHON_USEDEP}] - dev-python/ansible-pygments[${PYTHON_USEDEP}] - >=dev-python/simplejson-3.17.2[${PYTHON_USEDEP}] + dev-python/pillow[truetype,${PYTHON_USEDEP}] + media-fonts/roboto ) test? ( - >=dev-python/ansi2html-1.6.0[${PYTHON_USEDEP}] - dev-python/filelock[${PYTHON_USEDEP}] + >=app-admin/ansible-lint-6.12.1[${PYTHON_USEDEP}] + app-misc/check-jsonschema[${PYTHON_USEDEP}] + >=dev-python/ansi2html-1.8.0[${PYTHON_USEDEP}] + >=dev-python/filelock-3.9.0[${PYTHON_USEDEP}] <dev-python/pexpect-5[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}] - >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] - >=dev-python/pytest-testinfra-6.1.0[${PYTHON_USEDEP}] - >=dev-python/pytest-xdist-2.1.0[${PYTHON_USEDEP}] - dev-util/yamllint + >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}] + >=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}] ) ')" -S="${WORKDIR}"/${MY_P} +PATCHES=( + "${FILESDIR}"/${PN}-24.2.1-mkdocs_google_fonts.patch +) # test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py: # - quite a few of these tests use the network; @@ -68,7 +79,6 @@ EPYTEST_DESELECT=( src/molecule/test/unit/command/init/test_role.py ) -distutils_enable_sphinx docs '>=dev-python/sphinx-notfound-page-0.7.1' '<dev-python/sphinx_ansible_theme-0.10.0' distutils_enable_tests pytest pkg_postinst() { diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild b/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild index 15dd9cdede34..66a672771a29 100644 --- a/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild +++ b/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild @@ -6,25 +6,30 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + >=dev-python/mkdocs-ansible-0.1.4 + dev-python/mkdocs-autorefs + dev-python/mkdocstrings-python + media-gfx/cairosvg +" +PYPI_PN="molecule" -inherit distutils-r1 optfeature - -MY_PN="${PN#ansible-}" -MY_P="${MY_PN}-${PV}" +inherit distutils-r1 docs optfeature pypi DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles" -HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible-community/molecule/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" IUSE="selinux" RDEPEND="$(python_gen_cond_dep ' - >=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}] - dev-python/cerberus[${PYTHON_USEDEP}] + >=app-admin/ansible-core-2.12.10[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-4.1.2[${PYTHON_USEDEP}] >=dev-python/click-8.0[${PYTHON_USEDEP}] + <dev-python/click-9[${PYTHON_USEDEP}] >=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}] >=dev-python/enrich-1.2.7[${PYTHON_USEDEP}] >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}] @@ -37,26 +42,27 @@ RDEPEND="$(python_gen_cond_dep ' selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] ) ')" BDEPEND="$(python_gen_cond_dep ' - >=dev-python/setuptools-scm-3.5.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm_git_archive-1.1[${PYTHON_USEDEP}] + <dev-python/setuptools-scm-8[${PYTHON_USEDEP}] doc? ( - app-admin/ansible-core[${PYTHON_USEDEP}] - dev-python/ansible-pygments[${PYTHON_USEDEP}] - >=dev-python/simplejson-3.17.2[${PYTHON_USEDEP}] + dev-python/pillow[truetype,${PYTHON_USEDEP}] + media-fonts/roboto ) test? ( - >=dev-python/ansi2html-1.6.0[${PYTHON_USEDEP}] - dev-python/filelock[${PYTHON_USEDEP}] + >=app-admin/ansible-lint-6.12.1[${PYTHON_USEDEP}] + app-misc/check-jsonschema[${PYTHON_USEDEP}] + >=dev-python/ansi2html-1.8.0[${PYTHON_USEDEP}] + >=dev-python/filelock-3.9.0[${PYTHON_USEDEP}] <dev-python/pexpect-5[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}] - >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] - >=dev-python/pytest-testinfra-6.1.0[${PYTHON_USEDEP}] - >=dev-python/pytest-xdist-2.1.0[${PYTHON_USEDEP}] - dev-util/yamllint + >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}] + >=dev-python/pytest-testinfra-7.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}] ) ')" -S="${WORKDIR}"/${MY_P} +PATCHES=( + "${FILESDIR}"/${PN}-5.1.0-mkdocs_google_fonts.patch +) # test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py: # - quite a few of these tests use the network; @@ -68,7 +74,6 @@ EPYTEST_DESELECT=( src/molecule/test/unit/command/init/test_role.py ) -distutils_enable_sphinx docs '>=dev-python/sphinx-notfound-page-0.7.1' '<dev-python/sphinx_ansible_theme-0.10.0' distutils_enable_tests pytest pkg_postinst() { diff --git a/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch new file mode 100644 index 000000000000..bf8883258f79 --- /dev/null +++ b/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch @@ -0,0 +1,10 @@ +--- a/mkdocs.yml ++++ b/mkdocs.yml +@@ -9,6 +9,7 @@ + + theme: + name: ansible ++ font: false + features: + - announce.dismiss + - content.action.edit diff --git a/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch new file mode 100644 index 000000000000..2b3f6af82dcc --- /dev/null +++ b/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch @@ -0,0 +1,10 @@ +--- a/mkdocs.yml ++++ b/mkdocs.yml +@@ -19,6 +19,7 @@ + - navigation.indexes + - navigation.tracking + - toc.integrate ++ font: false + palette: + - media: "(prefers-color-scheme: light)" + primary: teal diff --git a/app-admin/ansible-molecule/metadata.xml b/app-admin/ansible-molecule/metadata.xml index dff0e96953cf..fb47216c4e5e 100644 --- a/app-admin/ansible-molecule/metadata.xml +++ b/app-admin/ansible-molecule/metadata.xml @@ -8,6 +8,6 @@ <stabilize-allarches/> <upstream> <remote-id type="pypi">molecule</remote-id> - <remote-id type="github">ansible-community/molecule</remote-id> + <remote-id type="github">ansible/molecule</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index 3fff4e4744d5..28e77d767d29 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,4 +1,5 @@ -DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385 -DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a -DIST ansible-7.2.0.tar.gz 36997591 BLAKE2B 3652ff103cf9d6c415387537d5abe1d11ec9c2b7f8b1e8728308532b2ba449bd3efa08d49d2edb8424d3f845c1c3694557c1acae99b7dcdf93f0e97c6b8623a2 SHA512 30d7f912cd6b2e41f1e5d880b014f00d332b4cc533512be8de885e95b63cf890ffb38a616de74c6b7fd9d6a961b7e2a1843bfe758fbcd9f3c962f1c856f20725 -DIST ansible-7.3.0.tar.gz 37218246 BLAKE2B 04a1a4d00c8f33fa81b907d71f76988ea58e66bb88817475ed4f53fd0fef61468e9e2623ff9224e37f7ea06301aad34ebc39f68e51bdfe049e110d683e6b0171 SHA512 078bda71b6de438c083068902da1543b97f160265a6607fdbf9a386361b0932ba673cf46192c5a3521bc52724489ea9fc0900b0f742756ff4dbf5d2b7d4471bc +DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9 +DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983 +DIST ansible-9.1.0.tar.gz 48839908 BLAKE2B caa652b339fb93334bff7246d1bab6bbdd9672a096637aa0695cd94a7f50d0e5ca7a1bfeb559792833c97eb9d16486965776b609354dc05ca63b1474d43e767b SHA512 ec6d86b3d05e66053001720b6b7d7bd1dba8bd50917c913e1f08a63b0c94f76a5d69732c78e793d038622a0b8c652860290a89cee1dfb22491a81763923ef843 +DIST ansible-9.3.0.tar.gz 38240168 BLAKE2B 0cd243a21b12163fcb37f014a69f6041f9c48dae84d1aeea342713daf8150246efa14ac94f43890e449896d111f1839ebe2dba7d9c48c2359fb01e4aadfd270b SHA512 71eff05455aee0a013b69790145a73325ac7037fc509545a7cdca358aa54c1731f7dc6fb0169f602d668e9da9e41a0879ff48ba1243d372e02dae9382ac46c5c +DIST ansible-9.4.0.tar.gz 38389836 BLAKE2B a2e08088565e6f248c1185ee96ac2365fc1385993d3f3fe68f941e8acb0e567c3defeec3ea376a30213921f02881bce0a0ac737323fc3ec82dc77d2d4a550dbd SHA512 4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2 diff --git a/app-admin/ansible/ansible-7.3.0.ebuild b/app-admin/ansible/ansible-7.7.0.ebuild index b74fccd0afab..0cefb7045e40 100644 --- a/app-admin/ansible/ansible-7.3.0.ebuild +++ b/app-admin/ansible/ansible-7.7.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.ansible.com/" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" RESTRICT="test" RDEPEND=">=app-admin/ansible-core-2.14.0 diff --git a/app-admin/ansible/ansible-6.7.0.ebuild b/app-admin/ansible/ansible-8.7.0.ebuild index e86ed09f9862..5116f9b3eeac 100644 --- a/app-admin/ansible/ansible-6.7.0.ebuild +++ b/app-admin/ansible/ansible-8.7.0.ebuild @@ -1,23 +1,22 @@ -# 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} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Model-driven deployment, config management, and command execution framework" HOMEPAGE="https://www.ansible.com/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" RESTRICT="test" -RDEPEND=">=app-admin/ansible-core-2.13.0 - <app-admin/ansible-core-2.14" +RDEPEND=">=app-admin/ansible-core-2.15.0 + <app-admin/ansible-core-2.16" python_compile() { local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 diff --git a/app-admin/ansible/ansible-7.2.0.ebuild b/app-admin/ansible/ansible-9.1.0.ebuild index 4cf9c0b2b4d4..09a9b1e9bd54 100644 --- a/app-admin/ansible/ansible-7.2.0.ebuild +++ b/app-admin/ansible/ansible-9.1.0.ebuild @@ -1,23 +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 +DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Model-driven deployment, config management, and command execution framework" HOMEPAGE="https://www.ansible.com/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" RESTRICT="test" -RDEPEND=">=app-admin/ansible-core-2.14.0 - <app-admin/ansible-core-2.15" +RDEPEND=">=app-admin/ansible-core-2.16.0 + <app-admin/ansible-core-2.17" python_compile() { local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 diff --git a/app-admin/ansible/ansible-5.10.0.ebuild b/app-admin/ansible/ansible-9.3.0.ebuild index 12f65b55fe84..51baea072b8f 100644 --- a/app-admin/ansible/ansible-5.10.0.ebuild +++ b/app-admin/ansible/ansible-9.3.0.ebuild @@ -1,23 +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 +DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Model-driven deployment, config management, and command execution framework" HOMEPAGE="https://www.ansible.com/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" RESTRICT="test" -RDEPEND=">=app-admin/ansible-core-2.12.0 - <app-admin/ansible-core-2.13" +RDEPEND=">=app-admin/ansible-core-2.16.0 + <app-admin/ansible-core-2.17" python_compile() { local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 diff --git a/app-admin/ansible/ansible-9.4.0.ebuild b/app-admin/ansible/ansible-9.4.0.ebuild new file mode 100644 index 000000000000..51baea072b8f --- /dev/null +++ b/app-admin/ansible/ansible-9.4.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DISTUTILS_USE_PEP517=setuptools + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Model-driven deployment, config management, and command execution framework" +HOMEPAGE="https://www.ansible.com/" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" +RESTRICT="test" + +RDEPEND=">=app-admin/ansible-core-2.16.0 + <app-admin/ansible-core-2.17" + +python_compile() { + local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 + distutils-r1_python_compile +} +python_install() { + local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 + distutils-r1_python_install +} diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml index 73a2e474e953..32affbcfbda2 100644 --- a/app-admin/ansible/metadata.xml +++ b/app-admin/ansible/metadata.xml @@ -5,10 +5,6 @@ <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> <upstream> <remote-id type="pypi">ansible</remote-id> <remote-id type="github">ansible/ansible</remote-id> diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index f20dba62d411..3c228281999e 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,3 +1,3 @@ -DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18 -DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b SHA512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb -DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101 SHA512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12 +DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155 +DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1 +DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild b/app-admin/apache-tools/apache-tools-2.4.57.ebuild index b104b44b2d30..f3af585656d2 100644 --- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.57.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="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ssl" RESTRICT="test" @@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} - sys-devel/libtool" + dev-build/libtool" BDEPEND=" virtual/pkgconfig " diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild b/app-admin/apache-tools/apache-tools-2.4.58.ebuild index f00c44d65fff..f3af585656d2 100644 --- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.58.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="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ssl" RESTRICT="test" @@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} - sys-devel/libtool" + dev-build/libtool" BDEPEND=" virtual/pkgconfig " diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild b/app-admin/apache-tools/apache-tools-2.4.59.ebuild index 78acadb3488b..ff67bbf7dac4 100644 --- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.59.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="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ssl" RESTRICT="test" @@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} - sys-devel/libtool" + dev-build/libtool" BDEPEND=" virtual/pkgconfig " diff --git a/app-admin/apachetop/apachetop-0.23.2.ebuild b/app-admin/apachetop/apachetop-0.23.2.ebuild index 53d345d859e7..e76b94f46fed 100644 --- a/app-admin/apachetop/apachetop-0.23.2.ebuild +++ b/app-admin/apachetop/apachetop-0.23.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~hppa ~mips ppc sparc x86" IUSE="fam pcre" RDEPEND=" diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml index 42a6908bb91a..926d74e0de11 100644 --- a/app-admin/apg/metadata.xml +++ b/app-admin/apg/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">wilx/apg</remote-id> </upstream> diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest index b7ae68751fe0..43fdf3c50b0e 100644 --- a/app-admin/augeas/Manifest +++ b/app-admin/augeas/Manifest @@ -1 +1 @@ -DIST augeas-1.14.0.tar.gz 2651463 BLAKE2B 428e708cfdc485feeb7fe80b8642c5b63a8563f508350ae4751a718888d187bab5d8ca8e82b5e9106527b86bb53d3c5a5a2a6e9ef35d18dae308030286039b6a SHA512 06ef6f735686ae09ec8733a3daf36f6838fa56e761dc6d89e5c44420ea2403a4649bec162b8e49b2c3fe32f0eced8413eba1f2c551103a43860bba823315f1ef +DIST augeas-1.14.1.tar.gz 2653776 BLAKE2B 65a0403f5fcaa1b1dfe7493e0f6ee6a8d73ce69f4c2c9a35f5f7842b6db537a5d7b9c33e1989f43636122da4b0a0d97d69bbce50b944d6d1e14c8e77ebddc5e0 SHA512 fddb2e243f979e71fc09f9d45d569d6307b35485b2d885bf7bcbc032ba5617fe7ab2071a041422c3efe2dd62eda74aba41016d248c0636e947d4f1c9144375aa diff --git a/app-admin/augeas/augeas-1.14.0-r2.ebuild b/app-admin/augeas/augeas-1.14.0-r2.ebuild deleted file mode 100644 index a8fbc7adbc26..000000000000 --- a/app-admin/augeas/augeas-1.14.0-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="A library for changing configuration files" -HOMEPAGE="http://augeas.net/" -SRC_URI="https://github.com/hercules-team/augeas/releases/download/release-${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libxml2 - sys-libs/readline:=" -DEPEND="${RDEPEND}" -BDEPEND=" - >=app-doc/NaturalDocs-1.40 - virtual/pkgconfig - test? ( dev-lang/ruby ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.14.0-musl-strerror_r.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # selinux needs to be implemented - econf --without-selinux -} - -src_compile() { - addpredict /usr/share/NaturalDocs/Config/Languages.txt - addpredict /usr/share/NaturalDocs/Config/Topics.txt - - default -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-admin/augeas/augeas-1.14.0-r1.ebuild b/app-admin/augeas/augeas-1.14.1.ebuild index 5a56cc583629..913b0e54711c 100644 --- a/app-admin/augeas/augeas-1.14.0-r1.ebuild +++ b/app-admin/augeas/augeas-1.14.1.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 @@ -20,14 +20,11 @@ RDEPEND=" sys-libs/readline:=" DEPEND="${RDEPEND}" BDEPEND=" - >=app-doc/NaturalDocs-1.40 + >=app-text/NaturalDocs-1.40 virtual/pkgconfig test? ( dev-lang/ruby ) " -PATCHES=( -) - src_prepare() { default eautoreconf diff --git a/app-admin/augeas/files/augeas-1.14.0-musl-strerror_r.patch b/app-admin/augeas/files/augeas-1.14.0-musl-strerror_r.patch deleted file mode 100644 index 07cda4c4ae02..000000000000 --- a/app-admin/augeas/files/augeas-1.14.0-musl-strerror_r.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/hercules-team/augeas/pull/791 - -From 46ecd3542820604603ab4f046f9fb3e6195f60aa Mon Sep 17 00:00:00 2001 -From: Dimitry Andric <dimitry@andric.com> -Date: Thu, 8 Dec 2022 13:08:53 +0100 -Subject: [PATCH] Only use GNU specific strerror_r() API when __GLIBC__ is - defined. - ---- a/src/internal.c -+++ b/src/internal.c -@@ -431,8 +431,8 @@ char *cleanpath(char *path) { - - const char *xstrerror(int errnum, char *buf, size_t len) { - #ifdef HAVE_STRERROR_R --# ifdef __USE_GNU -- /* Annoying linux specific API contract */ -+# if defined(__USE_GNU) && defined(__GLIBC__) -+ /* Annoying GNU specific API contract */ - return strerror_r(errnum, buf, len); - # else - strerror_r(errnum, buf, len); - diff --git a/app-admin/aws-elb-tools/Manifest b/app-admin/aws-elb-tools/Manifest deleted file mode 100644 index bf014026b901..000000000000 --- a/app-admin/aws-elb-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ElasticLoadBalancing-1.0.15.1.zip 6717939 BLAKE2B deef8cfb32a9c0d3627af26f32430efbe27a7712acd7c5dd9b7e8947b7c16ac866cec64100dd1bc315c4a2729451d181da8d16f133ea81fc927452cce6cc4f9b SHA512 813f00d632b483a5ec98632d830be4b02fc1bc71aa7bd845faa477f7d05bda7c801e5d83992c111dfc136bf5e1204bf96b00a1c24e5b19438decb356d0841725 diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild deleted file mode 100644 index ab4c2ae10a56..000000000000 --- a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Serves as the client interface to the Elastic Load Balancing web service" -HOMEPAGE="http://aws.amazon.com/developertools/Amazon-EC2/2536" -SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip" - -LICENSE="Amazon" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" -RESTRICT="mirror" - -DEPEND="app-arch/unzip" -RDEPEND="virtual/jre" - -S="${WORKDIR}/ElasticLoadBalancing-${PV}" - -src_prepare() { - default - find . -name '*.cmd' -delete || die -} - -src_install() { - insinto /opt/${PN}/lib - doins -r lib/. - - exeinto /opt/${PN}/bin - doexe bin/* - - cat > "${T}"/99${PN} <<- EOF || die - AWS_ELB_HOME=/opt/${PN} - PATH=/opt/${PN}/bin - ROOTPATH=/opt/${PN}/bin - EOF - doenvd "${T}"/99${PN} - - dodoc THIRDPARTYLICENSE.TXT -} - -pkg_postinst() { - ewarn "Remember to run: env-update && source /etc/profile if you plan" - ewarn "to use these tools in a shell before logging out (or restarting" - ewarn "your login manager)" - - elog - elog "You need to put the following in your ~/.bashrc replacing the" - elog "values with the full path to your AWS credentials file." - elog - elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file" - elog - elog "It should contains two lines: the first line lists the AWS Account's" - elog "AWS Access Key ID, and the second line lists the AWS Account's" - elog "Secret Access Key. For example:" - elog - elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE" - elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY" -} diff --git a/app-admin/aws-elb-tools/metadata.xml b/app-admin/aws-elb-tools/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/app-admin/aws-elb-tools/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest index 3831b3ea5929..a1b53a91f770 100644 --- a/app-admin/awscli-bin/Manifest +++ b/app-admin/awscli-bin/Manifest @@ -1,8 +1,6 @@ -DIST awscli-exe-linux-aarch64-2.7.20.zip 46289081 BLAKE2B 1750e609bef53775e4bf66f1be78e2b05f763bde7677be99867ae89e252f1deb81dddf6011718ceafe1f97b53ac4871657f2644c478887eb4d021e14be400121 SHA512 f519aaaf2ebc3e163ae55abdb85b08dd49e148f902a06e671f582879790bdfa07e32f8d8e773ddeb95494aee3a38dc3fbdf91a93b14215f63e13ae87cdf3de4a -DIST awscli-exe-linux-aarch64-2.7.24.zip 46460084 BLAKE2B c24cf41c888b1469a793354c9a97cec4273f6a762ec74b4079ab8626d0eddeb95dec5ef66270764a1c8d3b1525a5460e63009441ac83ef966b43f68efe41b00a SHA512 ee4201a193e393cf7fd1e9c473eaf41a1d7934e342035b931c3d69e985bc9e74434d31d0b46bf176c27c41d1b1000bbd487a514d62c8ccdf8d7c7e82c621d1f4 -DIST awscli-exe-linux-aarch64-2.7.28.zip 46543587 BLAKE2B aba4c360ed9ce37406f552db1df9ddd69b46b2f87a9c12c46a5026d9259202ce485a25f7cc1d768ab9c3caff3165e56f13529f3ccc1e65935e327b5980a16af5 SHA512 b126bf26c52e2ab32bf4b7f425527960fcf5a07f0e446aaf2fe0deced802419e12cc48f9c87e0cbe4fc01430264a48b1103a9b5ea5e871a811b8e8b8c8a691d6 -DIST awscli-exe-linux-aarch64-2.9.23.zip 47582887 BLAKE2B 3159308e20f54462c04c9e290fdbcc1d0433973fba36ba53fe7886f9ecd16eac0ecea6ac10a1f1cf49eb71c1ee704b84a6cdf18373fc94a1f9c648741ac5bcf0 SHA512 4f407c722c38a4f6adfda4e938f1039208774a897d62e9ccceb52f905a751a4dcb022342180d74fa39dd0cfd2af6787c550f8a214707b922d7bd135465074179 -DIST awscli-exe-linux-x86_64-2.7.20.zip 47092365 BLAKE2B 26320deb54f66043693aa40cd2fee2e110f2dbf1710278ce431781d49096860dacd906bd91a01160c69c484020cc1ca497954283213e85d42206ab2dba3f1c92 SHA512 6f5ab60fe3b59a7c8ad73e81b3d3003660736fe9da35e5e44b8d222a94cf195676a4802e8ea391bbefb9cbece77860148be1f616f32281d18726af126c7daa4b -DIST awscli-exe-linux-x86_64-2.7.24.zip 47216162 BLAKE2B f99393a089bc495fc82d4f208f555bce144adf817b15c2995ad97493c16e18e38ee6cb77fb29c9225ff144193f878a7334ef90c318a5770d5c58b1f7e2209632 SHA512 2c25637fa421117aa3629ddfe8f9ead7ad3d7f04ead819b958e2b274621c858ea9e1ba2d9c111e63511ab75a1a7f0db275f653da2fef58dd5ee03274b1e7e8b7 -DIST awscli-exe-linux-x86_64-2.7.28.zip 47299458 BLAKE2B 3ac11104ad062ccf70fe697406a65cc08949f9b89784c5cf3f8e80c33629f5fde44853c35f8160f1f285405e576e65a73d9ba9a42b3e31a11120ee50cfccd83c SHA512 a86a2b73a11b74fa7a9b30095adaacacc7ea3a84136a9d5d63bcd776b98a6f6e005cb815fa34451cee85b55e6d1693a906bb8601a1ded3a5eff0416dd79bbc28 -DIST awscli-exe-linux-x86_64-2.9.23.zip 49149732 BLAKE2B 3a2500dc6edd2de1747e49b123de67606fa64c41da9f7e364899ae3d23c81d07105102b0afbc858a68a7db189448b171dfdb1ce6ca9ead8f4d607cc896cfcc68 SHA512 ca379e527e4e82b9970b257367f3a5eaf5c59612a2661a6802a9695b96ca16806369b549bfb3203542ebf2948ba3d59ed816f893db34c8ed950eeb9f52ac386a +DIST awscli-exe-linux-aarch64-2.11.17.zip 56500418 BLAKE2B ced68deac081666c71d73bea7d48f19aa27c8a78835ad13acaa06dac65db8569e9cf446900c0a8ede169bf177168e47ad3bebd06ad295a5626d926d59e4ed57b SHA512 6424cfcd079007cf1519f0018555c589a154639c1f28596d51d227c9078abbcd16660488d9c7984468bd223a7e4a89296c42c8fbdb8b6d085e32163e71d1f641 +DIST awscli-exe-linux-aarch64-2.12.0.zip 56282131 BLAKE2B 147d200a134dc3f4ca3b6dff285b447d98eedb52207f923354cd748102ed0bf8e9bd4e883d59536f8bbe3a249de99102c8b5f239271cdef66d73df069add1491 SHA512 e0e72d951b0d3136b99b15d8abcc0b38492ef0c92a915e4f92a902318895ff580fface1ee202a5c06cf99a9f4ab935b2393e7318d1efc3df90152c18ed745b7f +DIST awscli-exe-linux-aarch64-2.13.11.zip 56601642 BLAKE2B 27c7914d3aeb157188e071c8add664ea6d95784a86d271035e3e618fcc2a07973dc271cbecdca3b8e4e802fdd92f72d33cd4c00d78fa7b11ee434ebf1e74107c SHA512 72515f5cd33fa3d18a9001b4789cfc881146d0f25fb60791fbb8e39df1b4d25ffa2bcf1db4bbbf313601c7244b247cffeefee1b4b5791647265e960a8d709ae3 +DIST awscli-exe-linux-x86_64-2.11.17.zip 57614965 BLAKE2B 0a711bc968b53dd08810ef857c9d51d332b016fd969491850f9dd8fc84e912f815e2b0a6e38223fe29c321ee784ad2ee41644b7027af3439742d3c2141f10098 SHA512 c05ada15a4e896850adbe04cc159141d84fabc955f3baf6d053200c6595cc77c8a75886ce5f1bd18370fe34a2c1c3d294312aa471a028104266fa45fa5aa4334 +DIST awscli-exe-linux-x86_64-2.12.0.zip 57965257 BLAKE2B 9c8fec1d30795af94807d60c62b28eeb84e682d99cbacc0c8ad5b022c569e310fe781d00a6e9bd0cc0222c0104d9e0d2521bf3fb2102f60fe76de75bfec90cf8 SHA512 c4688e09fa17ed89495c807ebb1826e0517c1a7e7e4e62981e17e86a11227434eb1c59b9e7fffbd8e9e7ff6cc05846bf6cf7cc1769e099c9c146d9d11c400ab5 +DIST awscli-exe-linux-x86_64-2.13.11.zip 58360364 BLAKE2B 46cbc0136a19f198f9ec7ef16e49dba72edf03365d96e79d9dc81d04f57f82de031138b36096091160f304e1662c9231bfd7f618ccbf3aed37e84f9f83cbdef0 SHA512 7ae315275947d60654613c24b52997976e70f1cbb94df65ed9a2937f3cd834a83c8567b8aafa946a08b83ef7b4b72d666ba400eee1550e8dbd6e1acd36121d53 diff --git a/app-admin/awscli-bin/awscli-bin-2.9.23.ebuild b/app-admin/awscli-bin/awscli-bin-2.11.17.ebuild index b87ef9ec0311..b87ef9ec0311 100644 --- a/app-admin/awscli-bin/awscli-bin-2.9.23.ebuild +++ b/app-admin/awscli-bin/awscli-bin-2.11.17.ebuild diff --git a/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild b/app-admin/awscli-bin/awscli-bin-2.12.0.ebuild index 84c6be57c790..b87ef9ec0311 100644 --- a/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild +++ b/app-admin/awscli-bin/awscli-bin-2.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild b/app-admin/awscli-bin/awscli-bin-2.13.11.ebuild index 84c6be57c790..b87ef9ec0311 100644 --- a/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild +++ b/app-admin/awscli-bin/awscli-bin-2.13.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-admin/awscli-bin/awscli-bin-2.7.28.ebuild b/app-admin/awscli-bin/awscli-bin-2.7.28.ebuild deleted file mode 100644 index 84c6be57c790..000000000000 --- a/app-admin/awscli-bin/awscli-bin-2.7.28.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="command line interface for Amazon Web Services" -HOMEPAGE=" - https://aws.amazon.com/cli/ - https://github.com/aws/aws-cli/ - " -SRC_URI=" - amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip ) - arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip ) - " - -LICENSE=" - Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception - openssl PSF-2 BSD-2 GPL-3+ public-domain - " -SLOT="0" -KEYWORDS="-* ~amd64 ~arm64" - -RDEPEND="!app-admin/awscli - sys-libs/glibc" -BDEPEND="app-arch/unzip" - -QA_PREBUILT="*" -RESTRICT="strip" -S="${WORKDIR}" - -# This code is based on the install script in the upstream archive. - -set_global_vars() { - ROOT_INSTALL_DIR=/opt/aws-cli - BIN_DIR=/usr/bin - - EXE_NAME="aws" - COMPLETER_EXE_NAME="aws_completer" - INSTALLER_DIR="aws" - INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist" - INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}" - AWS_EXE_VERSION=${PV} - - INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}" - # INSTALL_DIR="${INSTALL_DIR}" - INSTALL_DIST_DIR="${INSTALL_DIR}/dist" - INSTALL_BIN_DIR="${INSTALL_DIR}/bin" - INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}" - INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}" - - CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current" - CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}" - CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}" - - BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}" - BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}" -} - -create_install_dir() { - dodir "${INSTALL_DIR}" - setup_install_dist - setup_install_bin - create_current_symlink -} - -setup_install_dist() { - cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die -} - -setup_install_bin() { - dodir "${INSTALL_BIN_DIR}" - dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}" - dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}" -} - -create_current_symlink() { - dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}" -} - -create_bin_symlinks() { - dodir "${BIN_DIR}" - dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}" - dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}" -} - -src_install() { - set_global_vars - create_install_dir - create_bin_symlinks -} diff --git a/app-admin/awscli-bin/metadata.xml b/app-admin/awscli-bin/metadata.xml index db463f3eeb66..b60727e29e46 100644 --- a/app-admin/awscli-bin/metadata.xml +++ b/app-admin/awscli-bin/metadata.xml @@ -5,4 +5,7 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <upstream> + <remote-id type="github">aws/aws-cli</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 728d8f96d21b..e8b7c1361e7a 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,7 +1,7 @@ -DIST aws-cli-1.27.84.gh.tar.gz 2378573 BLAKE2B b85d7eeb22b0a2a9264b49a27f2e3d3da9d35dbc44de205521c39522fcec31948ef8b67dfc3ce919b772ba85fa59cfc5a4d69e3c67aadd9cbb029da883ad699e SHA512 1d31d1b800b0795a8473af0dc334feb69f62d2fd8fcb88e0e4e7e4068435f6f37792d2c9382ec1b0c6b074d5eca09142e52f6e36c472145df9d57db2cc4ee078 -DIST aws-cli-1.27.89.gh.tar.gz 2382599 BLAKE2B 3a2dae3cc1928e149dd605de1e9a350989e1cf4f813dc14466ba40c0a2747e69b6a8c5716d48f2526920798f0d341dcaa7ec0c2fd95af1b5decd3830814a243b SHA512 9a90c933e5ae3f25271ec369607cb6c44adf96dc9d324205714c9790b6744d7f2c8e4c6b901d4bb4f58b6871c315e0543b3f846cf530e7f95ed31d196f8c3326 -DIST aws-cli-1.27.93.gh.tar.gz 2385084 BLAKE2B 18dc59339303b9f32e297ca6a37c5d2a9466a2ac2b2f8795baeb686465dfe561ecb5abb29c38d37f32f44408b9ff1e083c330fbe23a5bf3c19a05033993dc533 SHA512 ce979f35966f2c48d8bf74ed95d27e5d6de9e33990bc01556bba660fd5692dd3751002d1dafbba11121e768a21d97130d9e76d309640ade5377193ba79ba1628 -DIST aws-cli-1.27.94.gh.tar.gz 2385480 BLAKE2B 8712056c53d704e368f81d38779201d0ef28d0b633ac4a877957b5d6338a6daf45b5408dcf0bee3f6c48a0b10af625bfee835f63e837814b42ec3a57745e4d61 SHA512 48dc09f0af71eb9b9d93ffd2c008511e2379f2a47d4913c6c4296804d3ec3c30a1811564c017388329cac9261b1c3021fadc60771ca9d0952982401f5e4f7c59 -DIST aws-cli-1.27.95.gh.tar.gz 2385780 BLAKE2B 4df38ab1d3d22571dd7d4afa896316b65bf903c61a5644c6d7988d3e841971a85bb7eb449edb0d9c0141e6c768e36ccc19ee155e4a5937050f4876060b3b2df8 SHA512 9b478901a62fbfd45fc23a82b7a8039dbff6e3e5c406153ea435e18b54ec7a263f7e5410cd1a5ac5916906ef9e8f8219f0da46a885ae4f33a43227059e56833f -DIST aws-cli-1.27.96.gh.tar.gz 2386115 BLAKE2B 5f8be75fbc97b466667929490fcfeda73900004f6bd66aedbaa7014854a6ad148101f617ccbc2cfc9d0fe7ac373b8671897b6ebdddf36f4d04863e331db23467 SHA512 20b15213c56dbaf7f9286b5f618c9636e2db3fc00d2d1feb5f81846ece2291503578e55066a8ca1b8f942a4641cec33c1faa3831e95bb6441a5e1baf9a1c94a1 -DIST aws-cli-1.27.97.gh.tar.gz 2386486 BLAKE2B 8bd9b59a0987d7da625b15c529695df85c07a244f84a84e2dc1c220b225be810b011b8d009b49b9a51514095eb1a83d0da9dba1eeadae6436f8fdc4b51520ef5 SHA512 edf2ab51a5f083a4d8ff88ee620d4534ffe60cf098c4e9af6c651b1d74bbcff35b040e34698b3a77adf35926b99ea9d7a8ca0aadf969e6dbc5a4b53ee07f9534 +DIST aws-cli-1.32.79.gh.tar.gz 2685785 BLAKE2B 3bbfad927d9d882e6b502f47919ce963df498c614a92730c5d6b1fb4efd7a8bd805a5c8cc82c705b97d8ee0ddbee4d6ddfa9cb46661fe7e9337add53bda3d9a1 SHA512 e0e369b6a5fca4d72365e54ef99c862e2d6f68caed61ac431516777e82ec8b292cf50516f379d8e94787b2a0ee58ad6e68d0951624f1ed742079295c4d2987ce +DIST aws-cli-1.32.84.gh.tar.gz 2691519 BLAKE2B 4cb78f14975d74013803af0f6397d959294cca6046ee19c1a907ca3e60fd224539d39535416ddcc2713b1de653b78ba03965dc78415dd915e80d11fcd6fbe02f SHA512 19d2030201806b336ede2c5e09f761e39959a156057d68316180145232e54013f2e5fa57023146488d407aa7e655fdb2245058e45eb5c4d6778eecd867f6eac1 +DIST aws-cli-1.32.88.gh.tar.gz 2693435 BLAKE2B 043f4eb08711760b7f8e15a5eba879524788cb65823215ed9d1c8ee5337a085ab6975dfc1c90aea29b7137f050a6d4f201eba57e8c8c83c09625401d8075eb6c SHA512 cb0ed179b9549d988e19963607fe28ca6fb02c92280c451c8651a8149d60a929158f9ae04a1c764540648b8b42417e908cb956fe71ce787c4b788f83cc2ef488 +DIST aws-cli-1.32.89.gh.tar.gz 2693748 BLAKE2B 006de47c4328c191120c09d5b738283ae1beeaa205ed65c80ff5cfab2a4ed91c2b560c65e78e11d099d0fdf9e1ceadfd58831ad0759a7aa10197e88a64b21e20 SHA512 f9ec547a969c9b0a81207ac9ab95235323d44422e2fbab81f76cd604e3c211e9bea494658d7105ea9019341df4dd335eca9987ce2788af3225f271e22aac4c0e +DIST aws-cli-1.32.90.gh.tar.gz 2694763 BLAKE2B ebe21c4589b1a386fc067740703e42f08153dc1ecd960115ea7f8e57444ded9e14c340c4fb5c3fc2ec021eb9d9e26cb5cf5cf70cc77a60a4dc991304b7949ee0 SHA512 96060564f3371ddacede05e6bb1917f263d785413f2d6e00e5f6f4eed14dff8cfa20c3136c387b53571d46557ba87fecc175c4f9f84044d598c2aace865cc9e6 +DIST aws-cli-1.32.91.gh.tar.gz 2694732 BLAKE2B 418d8fa3525842a9abacb75b05bc5e9499398b9cd1c0e89c5db9e11b63daecd6c2496170fbca328b92a4711214cc19e3e6af937a818d92cd0dc3770f54f3eb18 SHA512 332c91f04dd639a273100bfbb49be71aa0b575c28930dd8943373f4aac28f09fe49f06421858503b2c34222ebd609f80e68d04a480331c267dd338b43f896d3b +DIST aws-cli-1.32.92.gh.tar.gz 2695697 BLAKE2B 702324003fa4db30d21ed03f177463df02ca05ce4e07ca721d257c3fa4efb01f0adc60e56e9d45c0339284e2e3d0b70ff4d8303b6ded1fd3ec4792238bdaed6b SHA512 bfffdc08ef3a48c78d1b3f1c26bf2517687d013fd7a033244c241c8fac302d4552b71e614c88e30185800fd40de9a01913eb153616ec63961805f499e3619373 diff --git a/app-admin/awscli/awscli-1.27.96.ebuild b/app-admin/awscli/awscli-1.27.96.ebuild deleted file mode 100644 index 62c19f3a63fb..000000000000 --- a/app-admin/awscli/awscli-1.27.96.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit bash-completion-r1 distutils-r1 multiprocessing - -MY_P=aws-cli-${PV} -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE=" - https://github.com/aws/aws-cli/ - https://pypi.org/project/awscli/ -" -SRC_URI=" - https://github.com/aws/aws-cli/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -# botocore is x.(y+2).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # do not rely on bundled deps in botocore (sic!) - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - # strip overzealous upper bounds on requirements - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid - ) - - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.27.97.ebuild b/app-admin/awscli/awscli-1.27.97.ebuild deleted file mode 100644 index 62c19f3a63fb..000000000000 --- a/app-admin/awscli/awscli-1.27.97.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit bash-completion-r1 distutils-r1 multiprocessing - -MY_P=aws-cli-${PV} -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE=" - https://github.com/aws/aws-cli/ - https://pypi.org/project/awscli/ -" -SRC_URI=" - https://github.com/aws/aws-cli/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -# botocore is x.(y+2).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # do not rely on bundled deps in botocore (sic!) - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - # strip overzealous upper bounds on requirements - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid - ) - - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.27.84.ebuild b/app-admin/awscli/awscli-1.32.79.ebuild index 2d91a172182b..b7c9ceb6d88f 100644 --- a/app-admin/awscli/awscli-1.27.84.ebuild +++ b/app-admin/awscli/awscli-1.32.79.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 distutils-r1 multiprocessing +inherit bash-completion-r1 distutils-r1 MY_P=aws-cli-${PV} DESCRIPTION="Universal Command Line Environment for AWS" @@ -31,17 +31,18 @@ RDEPEND=" dev-python/colorama[${PYTHON_USEDEP}] dev-python/docutils[${PYTHON_USEDEP}] dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] !app-admin/awscli-bin " BDEPEND=" test? ( + dev-python/packaging[${PYTHON_USEDEP}] dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] ) " +EPYTEST_XDIST=1 distutils_enable_tests pytest src_prepare() { @@ -56,16 +57,25 @@ src_prepare() { } python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked + epytest tests/{functional,unit} } python_install_all() { diff --git a/app-admin/awscli/awscli-1.27.93.ebuild b/app-admin/awscli/awscli-1.32.84.ebuild index 62c19f3a63fb..4a677affdbc4 100644 --- a/app-admin/awscli/awscli-1.27.93.ebuild +++ b/app-admin/awscli/awscli-1.32.84.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 distutils-r1 multiprocessing +inherit bash-completion-r1 distutils-r1 MY_P=aws-cli-${PV} DESCRIPTION="Universal Command Line Environment for AWS" @@ -31,17 +31,18 @@ RDEPEND=" dev-python/colorama[${PYTHON_USEDEP}] dev-python/docutils[${PYTHON_USEDEP}] dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] !app-admin/awscli-bin " BDEPEND=" test? ( + dev-python/packaging[${PYTHON_USEDEP}] dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] ) " +EPYTEST_XDIST=1 distutils_enable_tests pytest src_prepare() { @@ -56,16 +57,25 @@ src_prepare() { } python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked + epytest tests/{functional,unit} } python_install_all() { diff --git a/app-admin/awscli/awscli-1.27.95.ebuild b/app-admin/awscli/awscli-1.32.88.ebuild index 62c19f3a63fb..4a677affdbc4 100644 --- a/app-admin/awscli/awscli-1.27.95.ebuild +++ b/app-admin/awscli/awscli-1.32.88.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 distutils-r1 multiprocessing +inherit bash-completion-r1 distutils-r1 MY_P=aws-cli-${PV} DESCRIPTION="Universal Command Line Environment for AWS" @@ -31,17 +31,18 @@ RDEPEND=" dev-python/colorama[${PYTHON_USEDEP}] dev-python/docutils[${PYTHON_USEDEP}] dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] !app-admin/awscli-bin " BDEPEND=" test? ( + dev-python/packaging[${PYTHON_USEDEP}] dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] ) " +EPYTEST_XDIST=1 distutils_enable_tests pytest src_prepare() { @@ -56,16 +57,25 @@ src_prepare() { } python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked + epytest tests/{functional,unit} } python_install_all() { diff --git a/app-admin/awscli/awscli-1.27.94.ebuild b/app-admin/awscli/awscli-1.32.89.ebuild index 62c19f3a63fb..4a677affdbc4 100644 --- a/app-admin/awscli/awscli-1.27.94.ebuild +++ b/app-admin/awscli/awscli-1.32.89.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 distutils-r1 multiprocessing +inherit bash-completion-r1 distutils-r1 MY_P=aws-cli-${PV} DESCRIPTION="Universal Command Line Environment for AWS" @@ -31,17 +31,18 @@ RDEPEND=" dev-python/colorama[${PYTHON_USEDEP}] dev-python/docutils[${PYTHON_USEDEP}] dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] !app-admin/awscli-bin " BDEPEND=" test? ( + dev-python/packaging[${PYTHON_USEDEP}] dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] ) " +EPYTEST_XDIST=1 distutils_enable_tests pytest src_prepare() { @@ -56,16 +57,25 @@ src_prepare() { } python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked + epytest tests/{functional,unit} } python_install_all() { diff --git a/app-admin/awscli/awscli-1.27.89.ebuild b/app-admin/awscli/awscli-1.32.90.ebuild index 62c19f3a63fb..4a677affdbc4 100644 --- a/app-admin/awscli/awscli-1.27.89.ebuild +++ b/app-admin/awscli/awscli-1.32.90.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 distutils-r1 multiprocessing +inherit bash-completion-r1 distutils-r1 MY_P=aws-cli-${PV} DESCRIPTION="Universal Command Line Environment for AWS" @@ -31,17 +31,18 @@ RDEPEND=" dev-python/colorama[${PYTHON_USEDEP}] dev-python/docutils[${PYTHON_USEDEP}] dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] !app-admin/awscli-bin " BDEPEND=" test? ( + dev-python/packaging[${PYTHON_USEDEP}] dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] ) " +EPYTEST_XDIST=1 distutils_enable_tests pytest src_prepare() { @@ -56,16 +57,25 @@ src_prepare() { } python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked + epytest tests/{functional,unit} } python_install_all() { diff --git a/app-admin/awscli/awscli-1.32.91.ebuild b/app-admin/awscli/awscli-1.32.91.ebuild new file mode 100644 index 000000000000..4a677affdbc4 --- /dev/null +++ b/app-admin/awscli/awscli-1.32.91.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 + +MY_P=aws-cli-${PV} +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE=" + https://github.com/aws/aws-cli/ + https://pypi.org/project/awscli/ +" +SRC_URI=" + https://github.com/aws/aws-cli/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +# botocore is x.(y+2).z +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + # strip overzealous upper bounds on requirements + sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die + distutils-r1_src_prepare +} + +python_test() { + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored + ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} +} + +python_install_all() { + newbashcomp bin/aws_bash_completer aws + + insinto /usr/share/zsh/site-functions + newins bin/aws_zsh_completer.sh _aws + + distutils-r1_python_install_all + + rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die +} diff --git a/app-admin/awscli/awscli-1.32.92.ebuild b/app-admin/awscli/awscli-1.32.92.ebuild new file mode 100644 index 000000000000..4a677affdbc4 --- /dev/null +++ b/app-admin/awscli/awscli-1.32.92.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 + +MY_P=aws-cli-${PV} +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE=" + https://github.com/aws/aws-cli/ + https://pypi.org/project/awscli/ +" +SRC_URI=" + https://github.com/aws/aws-cli/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +# botocore is x.(y+2).z +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + # strip overzealous upper bounds on requirements + sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die + distutils-r1_src_prepare +} + +python_test() { + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored + ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + + local EPYTEST_DESELECT=( "${serial_tests[@]}" ) + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} +} + +python_install_all() { + newbashcomp bin/aws_bash_completer aws + + insinto /usr/share/zsh/site-functions + newins bin/aws_zsh_completer.sh _aws + + distutils-r1_python_install_all + + rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die +} diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest index c4bfd3c087ed..3567b1970501 100644 --- a/app-admin/bitwarden-desktop-bin/Manifest +++ b/app-admin/bitwarden-desktop-bin/Manifest @@ -1,2 +1,3 @@ -DIST Bitwarden-2022.12.0-amd64.deb 65434808 BLAKE2B 81e7f1b0d7a95fa08554fced72440d65c4fb5fb86371f4ce773904f53543a3586f56eb53d2a4f79034a475430d3b2926404a2bc178e49bb97999295100a6a352 SHA512 ca1fafe48b3dcbab8c2152ed84337c7ebd8cc1934f24d2eabf7ef65733c163e84fc9e49f8566cf2201ab557144e81360db8d8ee1883a92c275804d7c3ddf886b -DIST Bitwarden-2022.9.1-amd64.deb 64957370 BLAKE2B 05d1f206503b41ed2a118948b3bd74cb6418dde661f3e620644abe15108391fcd48e3211cb6ff48560eb6092dc2bd08620f3df24bb92de5b832301202456ecb9 SHA512 5907b58d4da1933809342f482f26833b4513e2b2d2a62a7f2ddec02e571069f3d0a5b509a57c4390f00677dd9c6a6164217e32a5911268da683ef94713345505 +DIST Bitwarden-2024.2.0-amd64.deb 79917282 BLAKE2B 2066dc71bed9cddbcedccfd9129e3e81ac9f8a71217d2c651fb8a067b3e318574e26104b447a7ccd6734efded64ef3620cf4a7e36f0a577ed98f5468839540cb SHA512 c9394914fd6c82096fc5336e73b539e250727c6917af97961df0bd7de241f955b9eb87da154f32972c73ea1ce59bf0d79660658277185c89e099360ec4c3ea26 +DIST Bitwarden-2024.3.0-amd64.deb 80463348 BLAKE2B 668fd4c18507b349e5892e7511b4898764a33d9da0a837379c7856caa054782fbf6a3337b03a779a8c8111d2458f560b31c32856850ff931694a8f18d889bdc9 SHA512 9297367e82e76870b7f12becfca6ec3bc0ce8f6515f4e17e9830d4df599891c839a8f5990c97b684528c8a4ad1c24ddd3bc99c1552620aee84b81c1cbf115771 +DIST Bitwarden-2024.4.1-amd64.deb 80470012 BLAKE2B 64b451c3fbbac303782c68a366c66c32c49d0ecb52bcbc085451157216cc99fa888941e8c911c14f6a68aa6bb0413463b4296f108386e7b5b3ca8925c6dcc871 SHA512 e6edcd84f44062ccfa4152baf7dab230915d006f7f31de0ffcbe1acb62525777c7d653a7cb7c51509fb9ebcf5ba4219df97e5128853813a54aadbfd92ff2c819 diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.12.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.2.0.ebuild index b6d1c4a5245a..a98f129ada65 100644 --- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.12.0.ebuild +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.2.0.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 @@ -17,21 +17,19 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/expat dev-libs/glib - sys-libs/glibc dev-libs/nspr dev-libs/nss + dev-libs/wayland media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-apps/util-linux + sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.ebuild index 37c4e935a975..a98f129ada65 100644 --- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.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=8 @@ -17,21 +17,19 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/expat dev-libs/glib - sys-libs/glibc dev-libs/nspr dev-libs/nss + dev-libs/wayland media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-apps/util-linux + sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild new file mode 100644 index 000000000000..a98f129ada65 --- /dev/null +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop unpacker xdg-utils + +MY_PN="Bitwarden" + +DESCRIPTION="Bitwarden password manager desktop client" +HOMEPAGE="https://bitwarden.com/" +SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb" +S="${WORKDIR}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret + dev-libs/expat + dev-libs/glib + dev-libs/nspr + dev-libs/nss + dev-libs/wayland + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/dbus + sys-apps/util-linux + sys-libs/glibc + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbcommon + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libxshmfence + x11-libs/libXtst + x11-libs/pango +" +IDEPEND=" + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache +" + +QA_PREBUILT=" + opt/Bitwarden/*.so* + opt/Bitwarden/bitwarden + opt/Bitwarden/chrome-sandbox + opt/Bitwarden/chrome_crashpad_handler +" + +src_install() { + insinto /opt + doins -r opt/${MY_PN} + fperms 755 /opt/Bitwarden/bitwarden + fperms 4755 /opt/Bitwarden/chrome-sandbox + + domenu usr/share/applications/bitwarden.desktop + + local x + for x in 16 32 64 128 256 512; do + doicon -s ${x} usr/share/icons/hicolor/${x}*/* + done +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/app-admin/bitwarden-desktop-bin/metadata.xml b/app-admin/bitwarden-desktop-bin/metadata.xml index df0ddc652ae7..4f192903ad6e 100644 --- a/app-admin/bitwarden-desktop-bin/metadata.xml +++ b/app-admin/bitwarden-desktop-bin/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>kensington@gentoo.org</email> - <name>Michael Palimaka</name> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> </maintainer> <upstream> <remote-id type="github">bitwarden/desktop</remote-id> diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 9301d4735645..30eda62874ab 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1 +1,2 @@ DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f +DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc SHA512 6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2 diff --git a/app-admin/calamares/calamares-3.2.60-r1.ebuild b/app-admin/calamares/calamares-3.2.60-r1.ebuild deleted file mode 100644 index 0a569c256030..000000000000 --- a/app-admin/calamares/calamares-3.2.60-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PYTHON_COMPAT=( python3_{9..10} ) - -inherit ecm python-single-r1 - -DESCRIPTION="Distribution-independent installer framework" -HOMEPAGE="https://calamares.io" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="5" -KEYWORDS="~amd64" -IUSE="+networkmanager +upower" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -COMMON_DEPEND="${PYTHON_DEPS} - dev-cpp/yaml-cpp:= - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-libs/libpwquality[${PYTHON_USEDEP}] - ') - dev-qt/qtconcurrent:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kcrash:5 - kde-frameworks/kpackage:5 - kde-frameworks/kparts:5 - kde-frameworks/kservice:5 - sys-apps/dbus - sys-apps/dmidecode - sys-auth/polkit-qt - >=sys-libs/kpmcore-4.0.0:5= - virtual/libcrypt:= -" -DEPEND="${COMMON_DEPEND} - test? ( dev-qt/qttest:5 ) -" -RDEPEND="${COMMON_DEPEND} - app-admin/sudo - dev-libs/libatasmart - net-misc/rsync - || ( sys-boot/grub:2 sys-boot/systemd-boot ) - sys-boot/os-prober - sys-fs/squashfs-tools - sys-libs/timezone-data - virtual/udev - networkmanager? ( net-misc/networkmanager ) - upower? ( sys-power/upower ) -" - -PATCHES=( - "${FILESDIR}/${P}-ldflags.patch" -) - -src_prepare() { - ecm_src_prepare - export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ - PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ - PYTHON_CFLAGS="$(python_get_CFLAGS)"\ - PYTHON_LIBS="$(python_get_LIBS)" - - sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \ - calamares.desktop || die - sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \ - calamares.desktop || die -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_CONFIG=ON - -DWEBVIEW_FORCE_WEBKIT=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON - -DWITH_PYTHONQT=OFF - ) - - ecm_src_configure -} - -src_test() { - local myctestargs=( - # Skipped tests: - # load-dracut: tries and fails to find Dracut config - # libcalamaresnetworktest: needs network - # libcalamaresutilstest: inspects /tmp (expects namespace?) - # - # Need investigation: - # test_libcalamaresuipaste - # validate-netinstall - # validate-services-systemd - # localetest - # machineidtest - # packagechoosertest - -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)" - ) - - cmake_src_test -} - -src_install() { - ecm_src_install - dobin "${FILESDIR}"/calamares-pkexec -} diff --git a/app-admin/calamares/calamares-3.2.60-r2.ebuild b/app-admin/calamares/calamares-3.2.60-r5.ebuild index 138ba7e10169..592c5af31d92 100644 --- a/app-admin/calamares/calamares-3.2.60-r2.ebuild +++ b/app-admin/calamares/calamares-3.2.60-r5.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 @@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS} kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode - sys-auth/polkit-qt + sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= virtual/libcrypt:= " @@ -55,7 +55,12 @@ RDEPEND="${COMMON_DEPEND} app-admin/sudo dev-libs/libatasmart net-misc/rsync - || ( sys-boot/grub:2 sys-boot/systemd-boot ) + || ( + sys-boot/grub:2 + sys-apps/systemd[gnuefi(-)] + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot] + ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data diff --git a/app-admin/calamares/calamares-3.3.5.ebuild b/app-admin/calamares/calamares-3.3.5.ebuild new file mode 100644 index 000000000000..18227c7ccfcf --- /dev/null +++ b/app-admin/calamares/calamares-3.3.5.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_{10..11} ) + +inherit ecm python-single-r1 + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="https://calamares.io" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="5" +KEYWORDS="~amd64" +IUSE="+networkmanager qt6 +upower" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +QT5_MIN="5.15.0" +KF_QT5_MIN="5.78" +QT6_MIN="6.5.0" +KF_QT6_MIN="5.240" + +BDEPEND=" + qt6? ( + >=dev-qt/qttools-${QT6_MIN}:6[linguist] + >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN} + ) + !qt6? ( + >=dev-qt/linguist-tools-${QT5_MIN}:5 + >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN} + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + dev-cpp/yaml-cpp:= + $(python_gen_cond_dep ' + >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}] + dev-libs/libpwquality[${PYTHON_USEDEP}] + ') + qt6? ( + >=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QT6_MIN}:6 + >=dev-qt/qtsvg-${QT6_MIN}:6 + >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets] + dev-qt/kdsingleapplication[qt6] + >=kde-frameworks/kconfig-${KF_QT6_MIN}:6 + >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6 + >=kde-frameworks/kcrash-${KF_QT6_MIN}:6 + >=kde-frameworks/ki18n-${KF_QT6_MIN}:6 + >=kde-frameworks/kpackage-${KF_QT6_MIN}:6 + >=kde-frameworks/kparts-${KF_QT6_MIN}:6 + >=kde-frameworks/kservice-${KF_QT6_MIN}:6 + >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6 + sys-auth/polkit-qt[qt6(-)] + >=sys-libs/kpmcore-24.01.75:6= + ) + !qt6? ( + >=dev-qt/qtconcurrent-${QT5_MIN}:5 + >=dev-qt/qtdbus-${QT5_MIN}:5 + >=dev-qt/qtdeclarative-${QT5_MIN}:5 + >=dev-qt/qtgui-${QT5_MIN}:5 + >=dev-qt/qtnetwork-${QT5_MIN}:5 + >=dev-qt/qtsvg-${QT5_MIN}:5 + >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets] + >=dev-qt/qtwidgets-${QT5_MIN}:5 + >=dev-qt/qtxml-${QT5_MIN}:5 + dev-qt/kdsingleapplication[-qt6] + >=kde-frameworks/kconfig-${KF_QT5_MIN}:5 + >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5 + >=kde-frameworks/kcrash-${KF_QT5_MIN}:5 + >=kde-frameworks/ki18n-${KF_QT5_MIN}:5 + >=kde-frameworks/kpackage-${KF_QT5_MIN}:5 + >=kde-frameworks/kparts-${KF_QT5_MIN}:5 + >=kde-frameworks/kservice-${KF_QT5_MIN}:5 + >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5 + sys-auth/polkit-qt[qt5(+)] + >=sys-libs/kpmcore-20.04.0:5= + ) + sys-apps/dbus + sys-apps/dmidecode + virtual/libcrypt:= +" +DEPEND="${COMMON_DEPEND} + test? ( + !qt6? ( dev-qt/qttest:5 ) + ) +" +RDEPEND="${COMMON_DEPEND} + app-admin/sudo + dev-libs/libatasmart + net-misc/rsync + || ( + sys-boot/grub:2 + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot] + ) + sys-boot/os-prober + sys-fs/squashfs-tools + sys-libs/timezone-data + virtual/udev + networkmanager? ( net-misc/networkmanager ) + upower? ( sys-power/upower ) +" + +src_prepare() { + ecm_src_prepare + export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ + PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ + PYTHON_CFLAGS="$(python_get_CFLAGS)"\ + PYTHON_LIBS="$(python_get_LIBS)" + + sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \ + calamares.desktop || die + sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \ + calamares.desktop || die + + cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file" +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_CONFIG=ON + -DINSTALL_COMPLETION=ON + -DINSTALL_POLKIT=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + -DWITH_PYTHON=ON + # Use system instead + -DWITH_PYBIND11=OFF + -DBUILD_APPDATA=ON + -DWITH_QT6="$(usex qt6)" + ) + + ecm_src_configure +} + +src_test() { + local myctestargs=( + # Skipped tests: + # load-dracut: tries and fails to find Dracut config + # libcalamaresnetworktest: needs network + # libcalamaresutilstest: inspects /tmp (expects namespace?) + # + # Need investigation: + # test_libcalamaresuipaste + # validate-netinstall + # validate-services-systemd + # localetest + # machineidtest + # packagechoosertest + # + # Requires removed dev-python/toml + # lint-displaymanager + # + # E1101 + # lint-dummypython + -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)" + ) + + cmake_src_test +} + +src_install() { + ecm_src_install + dobin "${FILESDIR}"/calamares-pkexec +} diff --git a/app-admin/calamares/files/calamares-gentoo-branding.desc b/app-admin/calamares/files/calamares-gentoo-branding.desc new file mode 100644 index 000000000000..9b107b45e3e2 --- /dev/null +++ b/app-admin/calamares/files/calamares-gentoo-branding.desc @@ -0,0 +1,239 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Product branding information. This influences some global +# user-visible aspects of Calamares, such as the product +# name, window behavior, and the slideshow during installation. +# +# Additional styling can be done using the stylesheet.qss +# file, also in the branding directory. +--- +componentName: default + + +### WELCOME / OVERALL WORDING +# +# These settings affect some overall phrasing and looks, +# which are most visible in the welcome page. + +# This selects between different welcome texts. When false, uses +# the traditional "Welcome to the %1 installer.", and when true, +# uses "Welcome to the Calamares installer for %1." This allows +# to distinguish this installer from other installers for the +# same distribution. +welcomeStyleCalamares: true + +# Should the welcome image (productWelcome, below) be scaled +# up beyond its natural size? If false, the image does not grow +# with the window but remains the same size throughout (this +# may have surprising effects on HiDPI monitors). +welcomeExpandingLogo: true + +### WINDOW CONFIGURATION +# +# The settings here affect the placement of the Calamares +# window through hints to the window manager and initial +# sizing of the Calamares window. + +# Size and expansion policy for Calamares. +# - "normal" or unset, expand as needed, use *windowSize* +# - "fullscreen", start as large as possible, ignore *windowSize* +# - "noexpand", don't expand automatically, use *windowSize* +windowExpanding: normal + +# Size of Calamares window, expressed as w,h. Both w and h +# may be either pixels (suffix px) or font-units (suffix em). +# e.g. "800px,600px" +# "60em,480px" +# This setting is ignored if "fullscreen" is selected for +# *windowExpanding*, above. If not set, use constants defined +# in CalamaresUtilsGui, 800x520. +windowSize: 800px,520px + +# Placement of Calamares window. Either "center" or "free". +# Whether "center" actually works does depend on the window +# manager in use (and only makes sense if you're not using +# *windowExpanding* set to "fullscreen"). +windowPlacement: center + +### PANELS CONFIGURATION +# +# Calamares has a main content area, and two panels (navigation +# and progress / sidebar). The panels can be controlled individually, +# or switched off. If both panels are switched off, the layout of +# the main content area loses its margins, on the assumption that +# you're doing something special. + +# Kind of sidebar (panel on the left, showing progress). +# - "widget" or unset, use traditional sidebar (logo, items) +# - "none", hide it entirely +# - "qml", use calamares-sidebar.qml from branding folder +# In addition, you **may** specify a side, separated by a comma, +# from the kind. Valid sides are: +# - "left" (if not specified, uses this) +# - "right" +# - "top" +# - "bottom" +# For instance, "widget,right" is valid; so is "qml", which defaults +# to putting the sidebar on the left. Also valid is "qml,top". +# While "widget,top" is valid, the widgets code is **not** flexible +# and results will be terrible. +sidebar: widget + +# Kind of navigation (button panel on the bottom). +# - "widget" or unset, use traditional navigation +# - "none", hide it entirely +# - "qml", use calamares-navigation.qml from branding folder +# In addition, you **may** specify a side, separated by a comma, +# from the kind. The same sides are valid as for *sidebar*, +# except the default is *bottom*. +navigation: widget + + +### STRINGS, IMAGES AND COLORS +# +# This section contains the "branding proper" of names +# and images, rather than global-look settings. + +# These are strings shown to the user in the user interface. +# There is no provision for translating them -- since they +# are names, the string is included as-is. +# +# The four Url strings are the Urls used by the buttons in +# the welcome screen, and are not shown to the user. Clicking +# on the "Support" button, for instance, opens the link supportUrl. +# If a Url is empty, the corresponding button is not shown. +# +# bootloaderEntryName is how this installation / distro is named +# in the boot loader (e.g. in the GRUB menu). +# +# These strings support substitution from /etc/os-release +# if KDE Frameworks 5.58 are available at build-time. When +# enabled, ${varname} is replaced by the equivalent value +# from os-release. All the supported var-names are in all-caps, +# and are listed on the FreeDesktop.org site, +# https://www.freedesktop.org/software/systemd/man/os-release.html +# Note that ANSI_COLOR and CPE_NAME don't make sense here, and +# are not supported (the rest are). Remember to quote the string +# if it contains substitutions, or you'll get YAML exceptions. +# +# The *Url* entries are used on the welcome page, and they +# are visible as buttons there if the corresponding *show* keys +# are set to "true" (they can also be overridden). +strings: + productName: ${PRETTY_NAME} + shortProductName: ${NAME} + version: ${VERSION_ID} + shortVersion: ${VERSION_ID} + versionedName: ${PRETTY_NAME} ${VERSION_ID} + shortVersionedName: ${NAME} ${VERSION_ID} + bootloaderEntryName: ${NAME} + productUrl: ${HOME_URL} + supportUrl: ${SUPPORT_URL} + knownIssuesUrl: ${BUG_REPORT_URL} + releaseNotesUrl: ${HOME_URL} + donateUrl: ${HOME_URL} + +# These images are loaded from the branding module directory. +# +# productBanner is an optional image, which if present, will be shown +# on the welcome page of the application, above the welcome text. +# It is intended to have a width much greater than height. +# It is displayed at 64px height (also on HiDPI). +# Recommended size is 64px tall, and up to 460px wide. +# productIcon is used as the window icon, and will (usually) be used +# by the window manager to represent the application. This image +# should be square, and may be displayed by the window manager +# as small as 16x16 (but possibly larger). +# productLogo is used as the logo at the top of the left-hand column +# which shows the steps to be taken. The image should be square, +# and is displayed at 80x80 pixels (also on HiDPI). +# productWallpaper is an optional image, which if present, will replace +# the normal solid background on every page of the application. +# It can be any size and proportion, +# and will be tiled to fit the entire window. +# For a non-tiled wallpaper, the size should be the same as +# the overall window, see *windowSize* above (800x520). +# productWelcome is shown on the welcome page of the application in +# the middle of the window, below the welcome text. It can be +# any size and proportion, and will be scaled to fit inside +# the window. Use `welcomeExpandingLogo` to make it non-scaled. +# Recommended size is 320x150. +# +# These filenames can also use substitutions from os-release (see above). +images: + # productBanner: "banner.png" + productIcon: "squid.png" + productLogo: "squid.png" + # productWallpaper: "wallpaper.png" + productWelcome: "languages.png" + +# Colors for text and background components. +# +# - SidebarBackground is the background of the sidebar +# - SidebarText is the (foreground) text color +# - SidebarBackgroundCurrent sets the background of the current step. +# Optional, and defaults to the application palette. +# - SidebarTextCurrent is the text color of the current step. +# +# These colors can **also** be set through the stylesheet, if the +# branding component also ships a stylesheet.qss. Then they are +# the corresponding CSS attributes of #sidebarApp. +style: + SidebarBackground: "#292F34" + SidebarText: "#FFFFFF" + SidebarTextCurrent: "#292F34" + SidebarBackgroundCurrent: "#D35400" + +### SLIDESHOW +# +# The slideshow is displayed during execution steps (e.g. when the +# installer is actually writing to disk and doing other slow things). + +# The slideshow can be a QML file (recommended) which can display +# arbitrary things -- text, images, animations, or even play a game -- +# during the execution step. The QML **is** abruptly stopped when the +# execution step is done, though, so maybe a game isn't a great idea. +# +# The slideshow can also be a sequence of images (not recommended unless +# you don't want QML at all in your Calamares). The images are displayed +# at a rate of 1 every 2 seconds during the execution step. +# +# To configure a QML file, list a single filename: +# slideshow: "show.qml" +# To configure images, like the filenames (here, as an inline list): +# slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ] +slideshow: "show.qml" + +# There are two available APIs for a QML slideshow: +# - 1 (the default) loads the entire slideshow when the installation- +# slideshow page is shown and starts the QML then. The QML +# is never stopped (after installation is done, times etc. +# continue to fire). +# - 2 loads the slideshow on startup and calls onActivate() and +# onLeave() in the root object. After the installation is done, +# the show is stopped (first by calling onLeave(), then destroying +# the QML components). +# +# An image slideshow does not need to have the API defined. +slideshowAPI: 2 + + +# These options are to customize online uploading of logs to pastebins: +# - type : Defines the kind of pastebin service to be used. Currently +# it accepts two values: +# - none : disables the pastebin functionality +# - fiche : use fiche pastebin server +# - url : Defines the address of pastebin service to be used. +# Takes string as input. Important bits are the host and port, +# the scheme is not used. +# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted. +# The option must be set, to have the log option work. +# Takes integer as input. If < 0, no limit will be forced, +# else only last (approximately) 'n' KiB of log file will be pasted. +# Please note that upload size may be slightly over the limit (due +# to last minute logging), so provide a suitable value. +uploadServer : + type : "fiche" + url : "http://termbin.com:9999" + sizeLimit : -1 diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r5.ebuild index b85ce3b6ab6a..ee9d43a6124f 100644 --- a/app-admin/ccze/ccze-0.2.1-r4.ebuild +++ b/app-admin/ccze/ccze-0.2.1-r5.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools fixheadtails toolchain-funcs DESCRIPTION="A flexible and fast logfile colorizer" -HOMEPAGE="https://github.com/madhouse/ccze/releases" +HOMEPAGE="https://git.madhouse-project.org/archive/ccze" SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm ppc x86" -RESTRICT="test" +RESTRICT="test" # bug 913965 DEPEND="dev-libs/libpcre sys-libs/ncurses:0=" diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest index 7a1cdeaca1f7..b8cd97b961dd 100644 --- a/app-admin/checksec/Manifest +++ b/app-admin/checksec/Manifest @@ -1,3 +1,4 @@ DIST checksec-2.4.0.tar.gz 2242079 BLAKE2B c1878c1312d13591147f0efd1a2d535ae8e75292dbc53e7ba0802c8d165b18b4bc0b22a5cc3a9159ddcf05a1518d58c18cb54700ea5a52ff29d261068194b96a SHA512 1a02dfac48b5979cb5c2eb7b8f1fe290d3ac090726d1b95a14864bfc4bc3d32eefc10e2cc227c9dc01809c78fe003d1faea9b720d5cb5fbc16599fc0e2512947 DIST checksec-2.5.0.tar.gz 2623122 BLAKE2B b4a876dfc8b9f02d5d74b6720b59ee216fbdab4e7df471aa4a78e7e6a98830b1b03f9a66d8b9dd344261fe1a253db4e5e9bede53f47e1fd171b2d23b0e04f031 SHA512 dd76061976d7f97c250b9d24b9cc7c6ea26c9df7e3521e3a1f39f56812485afaae6d60c611e1b7f4817b1585d10fc2116eaa032bb690e39a0243529e324943ab DIST checksec-2.6.0.tar.gz 2624551 BLAKE2B bfda79dfdfc672119d70612497893ba91f093719f95e2b387d27da81d7f8b50e2bc54e9d030d84db76dc2a599bb1f866608529149896259ce517450318640c82 SHA512 71ba0f24b7db0c7fa74dfeaa74b2722ffe792c77941316da916dc7aae888f147c81f98d1522f63b96aa3a76aff7bb1d98522a02efa312b3b3a9dd9a137239010 +DIST checksec-2.7.0.tar.gz 2631553 BLAKE2B c44bcc1a5090a29563ce7e8694ead74230d43f469a71e8388c06138afe5192280366315f3921961adddb367cbab81a1948f45096cbb64a7d8fdb6de849dc1698 SHA512 194a6f33042fcec94bbc463659066abdda644da42f68dd8001ba263a2679bd49a4443229cd5ddffd75afe693d255dc7f081c95eeeff940ac8a0e53313972f03b diff --git a/app-admin/checksec/checksec-2.4.0-r1.ebuild b/app-admin/checksec/checksec-2.4.0-r1.ebuild index 67293f88dcbb..7348d36d15ed 100644 --- a/app-admin/checksec/checksec-2.4.0-r1.ebuild +++ b/app-admin/checksec/checksec-2.4.0-r1.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="7" @@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 ~riscv ~sparc x86" IUSE="" S="${WORKDIR}"/${MY_PN}-${PV} diff --git a/app-admin/checksec/checksec-2.6.0-r1.ebuild b/app-admin/checksec/checksec-2.6.0-r1.ebuild index 3be8fd79b6c4..0321a7407061 100644 --- a/app-admin/checksec/checksec-2.6.0-r1.ebuild +++ b/app-admin/checksec/checksec-2.6.0-r1.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" @@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="" S="${WORKDIR}"/${MY_PN}-${PV} diff --git a/app-admin/checksec/checksec-2.7.0.ebuild b/app-admin/checksec/checksec-2.7.0.ebuild new file mode 100644 index 000000000000..a2f8d3fd3f08 --- /dev/null +++ b/app-admin/checksec/checksec-2.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +MY_PN=${PN}.sh +DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)" +HOMEPAGE="https://github.com/slimm609/checksec.sh" +SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="" + +S="${WORKDIR}"/${MY_PN}-${PV} + +RDEPEND="!<dev-util/pwntools-4.10.0_beta0-r2" + +DOCS=( ChangeLog README.md ) + +src_prepare() { + sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die + rm Makefile || die + default +} + +src_install() { + default + + doman extras/man/* + + insinto /usr/share/zsh/site-functions + doins extras/zsh/_${PN} + + dobin ${PN} +} diff --git a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild index 3bd3f207dfdb..a2b83781f3df 100644 --- a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild +++ b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Chroot any dynamically linked application in a safe and sane manner" -HOMEPAGE="http://chrootsafe.sourceforge.net/" +HOMEPAGE="https://chrootsafe.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz" LICENSE="MIT" diff --git a/app-admin/chrpath/chrpath-0.16-r1.ebuild b/app-admin/chrpath/chrpath-0.16-r1.ebuild index 287cacc4a7d6..2018b65c7b1e 100644 --- a/app-admin/chrpath/chrpath-0.16-r1.ebuild +++ b/app-admin/chrpath/chrpath-0.16-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris" PATCHES=( "${FILESDIR}"/${P}-multilib.patch diff --git a/app-admin/clog/clog-1.3.0-r1.ebuild b/app-admin/clog/clog-1.3.0-r1.ebuild index cf737f78194c..cc6689579c1b 100644 --- a/app-admin/clog/clog-1.3.0-r1.ebuild +++ b/app-admin/clog/clog-1.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,13 +9,16 @@ DESCRIPTION="clog is a colorized log tail utility" HOMEPAGE="https://taskwarrior.org/docs/clog/" SRC_URI="https://gothenburgbitfactory.org/download/${P}.tar.gz" -KEYWORDS="~amd64 ~x86 ~x64-macos" LICENSE="MIT" SLOT="0" +KEYWORDS="~amd64 ~x86 ~x64-macos" RESTRICT="test" # No test suite on tar.gz +PATCHES=( + "${FILESDIR}"/${PN}-1.3.0-gcc13.patch +) + src_prepare() { - default sed -i -e 's|share/doc/clog|share/clog|' CMakeLists.txt || die cmake_src_prepare } diff --git a/app-admin/clog/files/clog-1.3.0-gcc13.patch b/app-admin/clog/files/clog-1.3.0-gcc13.patch new file mode 100644 index 000000000000..3bdbc464a90e --- /dev/null +++ b/app-admin/clog/files/clog-1.3.0-gcc13.patch @@ -0,0 +1,11 @@ +https://github.com/GothenburgBitFactory/libshared/pull/71 +--- a/src/libshared/src/JSON2.h ++++ b/src/libshared/src/JSON2.h +@@ -27,6 +27,7 @@ + #ifndef INCLUDED_JSON2 + #define INCLUDED_JSON2 + ++#include <cstdint> + #include <string> + + class JSON2 diff --git a/app-admin/clog/metadata.xml b/app-admin/clog/metadata.xml index 85e4ed814fa2..e7c3b330a17a 100644 --- a/app-admin/clog/metadata.xml +++ b/app-admin/clog/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">GothenburgBitFactory/clog</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/clsync/clsync-0.4.5.ebuild b/app-admin/clsync/clsync-0.4.5.ebuild index 239047ab2b24..84dc0971fc9d 100644 --- a/app-admin/clsync/clsync-0.4.5.ebuild +++ b/app-admin/clsync/clsync-0.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ LICENSE="GPL-3+" SLOT="0" IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug examples extra-debug extra-hardened gio +hardened +highload-locks -+inotify +lto mhash namespaces seccomp socket-library static-libs" ++inotify mhash namespaces seccomp socket-library static-libs" REQUIRED_USE=" || ( clsync socket-library ) @@ -29,7 +29,7 @@ REQUIRED_USE=" " BDEPEND=" virtual/pkgconfig - apidoc? ( app-doc/doxygen[dot] ) + apidoc? ( app-text/doxygen[dot] ) " DEPEND=" caps? ( sys-libs/libcap ) @@ -65,7 +65,9 @@ src_configure() { use debug && debug_level=1 use extra-debug && debug_level=2 + # --enable-lto just appends -flto econf \ + --disable-lto \ --enable-debug=${debug_level} \ --enable-paranoid=${harden_level} \ --without-bsm \ @@ -75,7 +77,6 @@ src_configure() { $(use_enable cluster) \ $(use_enable control-socket socket) \ $(use_enable highload-locks) \ - $(use_enable lto) \ $(use_enable namespaces unshare) \ $(use_enable seccomp) \ $(use_enable socket-library) \ diff --git a/app-admin/clsync/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild index 3c91bb41d6fe..f97b3e7c2752 100644 --- a/app-admin/clsync/clsync-9999.ebuild +++ b/app-admin/clsync/clsync-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ LICENSE="GPL-3+" SLOT="0" IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug examples extra-debug extra-hardened gio +hardened +highload-locks -+inotify +lto mhash namespaces seccomp socket-library static-libs" ++inotify mhash namespaces seccomp socket-library static-libs" REQUIRED_USE=" || ( clsync socket-library ) @@ -29,7 +29,7 @@ REQUIRED_USE=" " BDEPEND=" virtual/pkgconfig - apidoc? ( app-doc/doxygen[dot] ) + apidoc? ( app-text/doxygen[dot] ) " DEPEND=" caps? ( sys-libs/libcap ) @@ -65,7 +65,9 @@ src_configure() { use debug && debug_level=1 use extra-debug && debug_level=2 + # --enable-lto just appends -flto econf \ + --disable-lto \ --enable-debug=${debug_level} \ --enable-paranoid=${harden_level} \ --without-bsm \ @@ -75,7 +77,6 @@ src_configure() { $(use_enable cluster) \ $(use_enable control-socket socket) \ $(use_enable highload-locks) \ - $(use_enable lto) \ $(use_enable namespaces unshare) \ $(use_enable seccomp) \ $(use_enable socket-library) \ diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml index 84cf8e321890..b151837c352f 100644 --- a/app-admin/clsync/metadata.xml +++ b/app-admin/clsync/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> Clsync recursively watches for source directory and executes external program to sync the changes. Clsync is adapted to be used together with rsync. @@ -24,7 +21,6 @@ <flag name="extra-hardened">Enable extra security checks. This will hurt performance.</flag> <flag name="gio">Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended; if both are compiled, may be selected at runtime).</flag> <flag name="highload-locks">Allows to use spinlocks for short delays instead of mutexes, but only on SMP systems.</flag> - <flag name="lto">Build with link time optimization (LTO).</flag> <flag name="namespaces">Enable namespaces isolation.</flag> <flag name="socket-library">Build the control and monitoring socket library: libclsync.</flag> </use> diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest index 033fde6eedbc..6a70beb978ec 100644 --- a/app-admin/clustershell/Manifest +++ b/app-admin/clustershell/Manifest @@ -1,2 +1 @@ -DIST clustershell-1.9.1.gh.tar.gz 383917 BLAKE2B 90d8c8390453a2c843bbb909a741d24d5f8e4b8eb03631bbe81b98973fce95d96dd3e68d0b951bc23d067057222c858e5041a3bafde200e0e2d14a0be995689f SHA512 32ee8b43d92e7ada8c81facc6a0609c39beee9189fa6fb9c2237387a58134f99fb2e6ab6e5de35c8e6fc8d3cef57f74f4c08b14968484546859071dff2594eb1 -DIST clustershell-1.9.gh.tar.gz 382574 BLAKE2B 031eb9683db330f3b90ac06fa9a0409ea72c1be3d83c8d0519e0080ead715386043c925a6dbaeafdb38351c54f1508c050279603cd81bc2de60ba2df5733f636 SHA512 9eb4e9663a6381fa27311d1d70002ba64066ee6e2e08aaf772974d8097c6ca2d020563fc8478064e76bc6e56d37ed7eefc2919db99a2f5b26bd878fa7b764a15 +DIST ClusterShell-1.9.2.tar.gz 400880 BLAKE2B d10c78696268cabd001e1da1c28f1850d6b2fd9d20e73f9aeab378c855a0b937f32d706869e2d3fcdf109b2e98175abbec8f06fe0c6d2c4139d2da14f1c5b610 SHA512 852c9dcbe333965fa853e4360da7305c448dc037348ede18c0417d763e68d4bafad0a60480fce421f1815a86dd0a20e07d32fd8828aa185e7e1b88ed292014fc diff --git a/app-admin/clustershell/clustershell-1.9.1.ebuild b/app-admin/clustershell/clustershell-1.9.1.ebuild deleted file mode 100644 index a630103853a9..000000000000 --- a/app-admin/clustershell/clustershell-1.9.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="Python framework for efficient cluster administration" -HOMEPAGE="https://github.com/cea-hpc/clustershell/" -SRC_URI=" - https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND=" - test? ( - app-shells/pdsh - net-misc/openssh - sys-devel/bc - ) -" - -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" - -distutils_enable_tests unittest - -src_prepare() { - default - - # remove test sets that require working ssh connection - rm tests/{CLIClush,TaskDistant*}Test.py || die -} - -python_test() { - cd tests || die - # Automatic discovery does not work - "${EPYTHON}" -m unittest_or_fail -v *.py || die "Tests failed with ${EPYTHON}" -} - -src_install() { - distutils-r1_src_install - - mv "${ED}/usr/etc" "${ED}/etc" || die -} - -pkg_postinst() { - einfo "Some default system-wide config files have been installed into" - einfo "/etc/${PN}" -} diff --git a/app-admin/clustershell/clustershell-1.9.ebuild b/app-admin/clustershell/clustershell-1.9.2.ebuild index 70fb3e30d7c4..30dcc094b0f4 100644 --- a/app-admin/clustershell/clustershell-1.9.ebuild +++ b/app-admin/clustershell/clustershell-1.9.2.ebuild @@ -1,35 +1,35 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYPI_NO_NORMALIZE=1 +PYPI_PN=ClusterShell +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Python framework for efficient cluster administration" -HOMEPAGE="https://github.com/cea-hpc/clustershell/" -SRC_URI=" - https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz +HOMEPAGE=" + https://github.com/cea-hpc/clustershell/ + https://pypi.org/project/ClusterShell/ " LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~x86" +RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" BDEPEND=" test? ( app-shells/pdsh - net-misc/openssh - sys-devel/bc + virtual/openssh + app-alternatives/bc ) " -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" - distutils_enable_tests unittest src_prepare() { @@ -41,15 +41,17 @@ src_prepare() { python_test() { cd tests || die + local runner=unittest_or_fail + if [[ ${EPYTHON} == python3.12 ]]; then + runner=unittest + fi # Automatic discovery does not work - "${EPYTHON}" -m unittest_or_fail -v *.py || die "Tests failed with ${EPYTHON}" + "${EPYTHON}" -m "${runner}" -v *.py || die "Tests failed with ${EPYTHON}" } src_install() { distutils-r1_src_install - doman doc/man/man*/* - mv "${ED}/usr/etc" "${ED}/etc" || die } diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml index e2b4026b0bf5..6589872592ea 100644 --- a/app-admin/clustershell/metadata.xml +++ b/app-admin/clustershell/metadata.xml @@ -2,18 +2,11 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> + <remote-id type="pypi">ClusterShell</remote-id> <remote-id type="github">cea-hpc/clustershell</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index ff2edad84a26..f55d8c5c81e5 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,4 +1,2 @@ -DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516 -DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db -DIST conky-1.18.1.tar.gz 1703018 BLAKE2B ba3c0f9624bfcf229de4376a9446ad05285db4241d1caf4a7a8ac92971f57d022192504c9831a786e3c02db140d70f10cf34d7e146c8647cb2a2b923e6acc2cc SHA512 e390d2aa8a3f3b570b2e3dc43ef71ff0001e36f3b42ce5a9c01b8dca656a23b1af80ee2ee138f38b12b4581dd03711562445fb53e23ca0f26e8b8af878aa2ba1 -DIST conky-1.18.3.tar.gz 1710600 BLAKE2B 5664c504bab8ddda14e4442fce3c4bda70033b8b1efb0642901f154306adee300673756a776e304a151214fc9a3d7dd8277336ffd13305ff1d86c4d65819cfb4 SHA512 702932bad88265619cb6de60b2fe86e834e7828343f31e966df1838c6742d5da2998aab71704bb22e4b0bdc3d05e3c082c9ab6231124b310e8c14c89bd80ad52 +DIST conky-1.19.6.tar.gz 1727487 BLAKE2B 2ef2b0acd354559679b9d7d442de7a709e932418e27459b02bdf2f8b6dbdcf7911964932ab9851bab213e7f68d9a82034acab96892752544ab1a26d68c174c09 SHA512 9f1900f495125c668835334239b69fc098c30fe450a384786d873eb3d3e955ff0f06ca70c3a94f47a4b38a42d4510be77efd13873411f11ff84d8bfdc2869fde +DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4 diff --git a/app-admin/conky/conky-1.13.1.ebuild b/app-admin/conky/conky-1.13.1.ebuild deleted file mode 100644 index 5cc04259da16..000000000000 --- a/app-admin/conky/conky-1.13.1.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-3 ) - -inherit cmake linux-info lua-single readme.gentoo-r1 xdg - -DESCRIPTION="An advanced, highly configurable system monitor for X" -HOMEPAGE="https://github.com/brndnmtthws/conky" -SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3 BSD LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86" -IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib - intel-backlight iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc - mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd - thinkpad truetype vim-syntax weather-metar webserver wifi X xinerama - xmms2" - -COMMON_DEPEND=" - cmus? ( media-sound/cmus ) - curl? ( net-misc/curl ) - ical? ( dev-libs/libical:= ) - iconv? ( virtual/libiconv ) - imlib? ( media-libs/imlib2[X] ) - irc? ( net-libs/libircclient ) - lua-cairo? ( x11-libs/cairo[X] ) - lua-imlib? ( media-libs/imlib2[X] ) - lua-rsvg? ( gnome-base/librsvg ) - mysql? ( dev-db/mysql-connector-c ) - ncurses? ( sys-libs/ncurses:= ) - nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) - pulseaudio? ( media-sound/pulseaudio ) - rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) - systemd? ( sys-apps/systemd ) - truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) - wifi? ( net-wireless/wireless-tools ) - weather-metar? ( net-misc/curl ) - webserver? ( net-libs/libmicrohttpd ) - X? ( - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXext - ) - xinerama? ( x11-libs/libXinerama ) - xmms2? ( media-sound/xmms2 ) - ${LUA_DEPS} -" -RDEPEND=" - ${COMMON_DEPEND} - apcupsd? ( sys-power/apcupsd ) - hddtemp? ( app-admin/hddtemp ) - moc? ( media-sound/moc ) - nano-syntax? ( app-editors/nano ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) -" -DEPEND=" - ${COMMON_DEPEND} - doc? ( app-text/docbook2X dev-libs/libxslt ) -" - -REQUIRED_USE=" - imlib? ( X ) - lua-cairo? ( X bundled-toluapp ) - lua-imlib? ( X bundled-toluapp ) - lua-rsvg? ( X bundled-toluapp ) - nvidia? ( X ) - truetype? ( X ) - xinerama? ( X ) -" - -CONFIG_CHECK="~IPV6" - -DOCS=( README.md AUTHORS ) - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}. -To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf -and edit it to your liking. - -There are pretty html docs available at the conky homepage -or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc. - -Also see https://wiki.gentoo.org/wiki/Conky/HOWTO" - -pkg_setup() { - use ipv6 && linux-info_pkg_setup - - lua-single_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - xdg_environment_reset - - sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \ - cmake/ConkyPlatformChecks.cmake || die -} - -src_configure() { - local mycmakeargs=() - - if use X; then - mycmakeargs+=( - -DBUILD_ARGB=yes - -DBUILD_X11=yes - -DBUILD_XDAMAGE=yes - -DBUILD_XDBE=yes - -DBUILD_XSHAPE=yes - -DOWN_WINDOW=yes - ) - else - mycmakeargs+=( - -DBUILD_X11=no - ) - fi - - mycmakeargs+=( - -DBUILD_APCUPSD=$(usex apcupsd) - -DBUILD_AUDACIOUS=no - -DBUILD_BUILTIN_CONFIG=yes - -DBUILD_CMUS=$(usex cmus) - -DBUILD_CURL=$(usex curl) - -DBUILD_DOCS=$(usex doc) - -DBUILD_HDDTEMP=$(usex hddtemp) - -DBUILD_HTTP=$(usex webserver) - -DBUILD_I18N=yes - -DBUILD_IBM=$(usex thinkpad) - -DBUILD_ICAL=$(usex ical) - -DBUILD_ICONV=$(usex iconv) - -DBUILD_IMLIB2=$(usex imlib) - -DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight) - -DBUILD_IOSTATS=$(usex iostats) - -DBUILD_IPV6=$(usex ipv6) - -DBUILD_IRC=$(usex irc) - -DBUILD_JOURNAL=$(usex systemd) - -DBUILD_LUA_CAIRO=$(usex lua-cairo) - -DBUILD_LUA_IMLIB2=$(usex lua-imlib) - -DBUILD_LUA_RSVG=$(usex lua-rsvg) - -DBUILD_MATH=$(usex math) - -DBUILD_MOC=$(usex moc) - -DBUILD_MPD=$(usex mpd) - -DBUILD_MYSQL=$(usex mysql) - -DBUILD_NCURSES=$(usex ncurses) - -DBUILD_NVIDIA=$(usex nvidia) - -DBUILD_OLD_CONFIG=yes - -DBUILD_PORT_MONITORS=$(usex portmon) - -DBUILD_PULSEAUDIO=$(usex pulseaudio) - -DBUILD_RSS=$(usex rss) - -DBUILD_WEATHER_METAR=$(usex weather-metar) - -DBUILD_WLAN=$(usex wifi) - -DBUILD_XFT=$(usex truetype) - -DBUILD_XINERAMA=$(usex xinerama) - -DBUILD_XMMS2=$(usex xmms2) - -DDOC_PATH=/usr/share/doc/${PF} - -DMAINTAINER_MODE=no - -DRELEASE=yes - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/ftdetect - doins "${S}"/extras/vim/ftdetect/conkyrc.vim - - insinto /usr/share/vim/vimfiles/syntax - doins "${S}"/extras/vim/syntax/conkyrc.vim - fi - - if use nano-syntax; then - insinto /usr/share/nano/ - doins "${S}"/extras/nano/conky.nanorc - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - xdg_pkg_postinst -} diff --git a/app-admin/conky/conky-1.17.0.ebuild b/app-admin/conky/conky-1.17.0.ebuild deleted file mode 100644 index 3d636bcc7df5..000000000000 --- a/app-admin/conky/conky-1.17.0.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-3 ) -PYTHON_COMPAT=( python{3_9,3_10,3_11} ) - -inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg - -DESCRIPTION="An advanced, highly configurable system monitor for X" -HOMEPAGE="https://github.com/brndnmtthws/conky" -SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3 BSD LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86" -IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib - intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd - mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype - wayland webserver wifi X xinerama xmms2" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - ical? ( dev-libs/libical:= ) - iconv? ( virtual/libiconv ) - imlib? ( media-libs/imlib2[X] ) - irc? ( net-libs/libircclient ) - lua-cairo? ( x11-libs/cairo[X] ) - lua-imlib? ( media-libs/imlib2[X] ) - lua-rsvg? ( gnome-base/librsvg ) - mysql? ( dev-db/mysql-connector-c ) - ncurses? ( sys-libs/ncurses:= ) - nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) - pulseaudio? ( media-libs/libpulse ) - rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) - systemd? ( sys-apps/systemd ) - truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) - wayland? ( - dev-libs/wayland - x11-libs/pango - ) - wifi? ( net-wireless/wireless-tools ) - webserver? ( net-libs/libmicrohttpd ) - X? ( - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXext - ) - xinerama? ( x11-libs/libXinerama ) - xmms2? ( media-sound/xmms2 ) - ${LUA_DEPS} -" -RDEPEND=" - ${COMMON_DEPEND} - apcupsd? ( sys-power/apcupsd ) - cmus? ( media-sound/cmus ) - hddtemp? ( app-admin/hddtemp ) - moc? ( media-sound/moc ) - extras? ( - app-editors/nano - || ( app-editors/vim app-editors/gvim ) - ) -" -DEPEND=" - ${COMMON_DEPEND} - wayland? ( - dev-libs/wayland-protocols - ) -" -BDEPEND=" - doc? ( - virtual/pandoc - $(python_gen_any_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - ') - ) - extras? ( - $(python_gen_any_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - ') - ) - wayland? ( dev-util/wayland-scanner ) -" - -python_check_deps() { - use doc || use extras || return 0 - python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -REQUIRED_USE=" - imlib? ( X ) - lua-cairo? ( X bundled-toluapp ) - lua-imlib? ( X bundled-toluapp ) - lua-rsvg? ( X bundled-toluapp ) - nvidia? ( X ) - truetype? ( X ) - xinerama? ( X ) -" - -CONFIG_CHECK="~IPV6" - -DOCS=( README.md AUTHORS ) - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}. -To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking. - -There are pretty html docs available at https://conky.cc/. - -Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky" - -pkg_setup() { - linux-info_pkg_setup - lua-single_pkg_setup - if use doc || use extras; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - cmake_src_prepare - xdg_environment_reset -} - -src_configure() { - local mycmakeargs=() - - if use X; then - mycmakeargs+=( - -DBUILD_ARGB=yes - -DBUILD_X11=yes - -DBUILD_XDAMAGE=yes - -DBUILD_XDBE=yes - -DBUILD_XSHAPE=yes - -DBUILD_MOUSE_EVENTS=yes - -DOWN_WINDOW=yes - ) - else - mycmakeargs+=( - -DBUILD_X11=no - ) - fi - - mycmakeargs+=( - -DBUILD_APCUPSD=$(usex apcupsd) - -DBUILD_AUDACIOUS=no - -DBUILD_BUILTIN_CONFIG=yes - -DBUILD_CMUS=$(usex cmus) - -DBUILD_CURL=$(usex curl) - -DBUILD_DOCS=$(usex doc) - -DBUILD_EXTRAS=$(usex extras) - -DBUILD_HDDTEMP=$(usex hddtemp) - -DBUILD_HTTP=$(usex webserver) - -DBUILD_I18N=yes - -DBUILD_IBM=$(usex thinkpad) - -DBUILD_ICAL=$(usex ical) - -DBUILD_ICONV=$(usex iconv) - -DBUILD_IMLIB2=$(usex imlib) - -DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight) - -DBUILD_IOSTATS=$(usex iostats) - -DBUILD_IPV6=yes - -DBUILD_IRC=$(usex irc) - -DBUILD_JOURNAL=$(usex systemd) - -DBUILD_LUA_CAIRO=$(usex lua-cairo) - -DBUILD_LUA_IMLIB2=$(usex lua-imlib) - -DBUILD_LUA_RSVG=$(usex lua-rsvg) - -DBUILD_MATH=$(usex math) - -DBUILD_MOC=$(usex moc) - -DBUILD_MPD=$(usex mpd) - -DBUILD_MYSQL=$(usex mysql) - -DBUILD_NCURSES=$(usex ncurses) - -DBUILD_NVIDIA=$(usex nvidia) - -DBUILD_OLD_CONFIG=yes - -DBUILD_PORT_MONITORS=$(usex portmon) - -DBUILD_PULSEAUDIO=$(usex pulseaudio) - -DBUILD_RSS=$(usex rss) - -DBUILD_WAYLAND=$(usex wayland) - -DBUILD_WLAN=$(usex wifi) - -DBUILD_XFT=$(usex truetype) - -DBUILD_XINERAMA=$(usex xinerama) - -DBUILD_XMMS2=$(usex xmms2) - -DDOC_PATH=/usr/share/doc/${PF} - -DMAINTAINER_MODE=no - -DRELEASE=yes - ) - - if use doc || use extras; then - mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use extras; then - insinto /usr/share/vim/vimfiles/ftdetect - doins "${S}"/extras/vim/ftdetect/conkyrc.vim - - insinto /usr/share/vim/vimfiles/syntax - doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim - - insinto /usr/share/nano/ - doins "${BUILD_DIR}"/extras/nano/conky.nanorc - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - xdg_pkg_postinst -} diff --git a/app-admin/conky/conky-1.18.3.ebuild b/app-admin/conky/conky-1.19.6-r2.ebuild index ff1244c36105..780a97784f42 100644 --- a/app-admin/conky/conky-1.18.3.ebuild +++ b/app-admin/conky/conky-1.19.6-r2.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=8 LUA_COMPAT=( lua5-4 ) -PYTHON_COMPAT=( python{3_9,3_10,3_11} ) +PYTHON_COMPAT=( python{3_10,3_11} ) inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg @@ -14,11 +14,12 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86" IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd - mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype - wayland webserver wifi X xinerama xmms2" + mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad + truetype wayland webserver wifi X xinerama xmms2" +RESTRICT="!test? ( test )" COMMON_DEPEND=" curl? ( net-misc/curl ) @@ -33,15 +34,22 @@ COMMON_DEPEND=" ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) - rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) + rss? ( + dev-libs/libxml2 + net-misc/curl + dev-libs/glib:2 + ) systemd? ( sys-apps/systemd ) - truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) + truetype? ( + x11-libs/libXft + >=media-libs/freetype-2 + ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) - webserver? ( net-libs/libmicrohttpd ) + webserver? ( net-libs/libmicrohttpd:= ) X? ( x11-libs/libX11 x11-libs/libXdamage @@ -58,13 +66,12 @@ RDEPEND=" cmus? ( media-sound/cmus ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) - extras? ( - app-editors/nano - || ( app-editors/vim app-editors/gvim ) - ) " DEPEND=" ${COMMON_DEPEND} + test? ( + dev-cpp/catch + ) wayland? ( dev-libs/wayland-protocols ) @@ -93,6 +100,7 @@ python_check_deps() { } REQUIRED_USE=" + ${LUA_REQUIRED_USE} imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) @@ -107,7 +115,7 @@ CONFIG_CHECK="~IPV6" DOCS=( README.md AUTHORS ) DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}. +DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}. To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking. There are pretty html docs available at https://conky.cc/. @@ -140,6 +148,7 @@ src_configure() { -DBUILD_X11=yes -DBUILD_XDAMAGE=yes -DBUILD_XDBE=yes + -DBUILD_XFIXES=yes -DBUILD_XSHAPE=yes -DBUILD_MOUSE_EVENTS=yes -DOWN_WINDOW=yes @@ -183,6 +192,7 @@ src_configure() { -DBUILD_PORT_MONITORS=$(usex portmon) -DBUILD_PULSEAUDIO=$(usex pulseaudio) -DBUILD_RSS=$(usex rss) + -DBUILD_TESTS=$(usex test) -DBUILD_WAYLAND=$(usex wayland) -DBUILD_WLAN=$(usex wifi) -DBUILD_XFT=$(usex truetype) diff --git a/app-admin/conky/conky-1.18.1.ebuild b/app-admin/conky/conky-1.19.8.ebuild index f60c0ae116e7..3c34a84c0eba 100644 --- a/app-admin/conky/conky-1.18.1.ebuild +++ b/app-admin/conky/conky-1.19.8.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=8 LUA_COMPAT=( lua5-4 ) -PYTHON_COMPAT=( python{3_9,3_10,3_11} ) +PYTHON_COMPAT=( python3_{10,11,12} ) inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg @@ -14,34 +14,47 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86" IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd - mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype - wayland webserver wifi X xinerama xmms2" + mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad + truetype wayland webserver wifi X xinerama xmms2" +RESTRICT="!test? ( test )" + +# Note: toluapp is bundled in conky since 1.11.2 +# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug +# which creates debug symbols and enables "-DBUILD_TESTS" which also +# results in conky_core debug library getting installed COMMON_DEPEND=" curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) - imlib? ( media-libs/imlib2[X] ) + imlib? ( >=media-libs/imlib2-1.11.0[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) - lua-imlib? ( media-libs/imlib2[X] ) + lua-imlib? ( >=media-libs/imlib2-1.11.0[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) - rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) + rss? ( + dev-libs/libxml2 + net-misc/curl + dev-libs/glib:2 + ) systemd? ( sys-apps/systemd ) - truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) + truetype? ( + x11-libs/libXft + >=media-libs/freetype-2 + ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) - webserver? ( net-libs/libmicrohttpd ) + webserver? ( net-libs/libmicrohttpd:= ) X? ( x11-libs/libX11 x11-libs/libXdamage @@ -58,13 +71,12 @@ RDEPEND=" cmus? ( media-sound/cmus ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) - extras? ( - app-editors/nano - || ( app-editors/vim app-editors/gvim ) - ) " DEPEND=" ${COMMON_DEPEND} + test? ( + dev-cpp/catch + ) wayland? ( dev-libs/wayland-protocols ) @@ -93,6 +105,7 @@ python_check_deps() { } REQUIRED_USE=" + ${LUA_REQUIRED_USE} imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) @@ -107,7 +120,7 @@ CONFIG_CHECK="~IPV6" DOCS=( README.md AUTHORS ) DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}. +DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}. To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking. There are pretty html docs available at https://conky.cc/. @@ -124,7 +137,7 @@ pkg_setup() { src_prepare() { # pin lua 5.4 - sed -i -e 's|include(FindLua)|find_package(Lua "5.4" EXACT)|g' \ + sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \ cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake" cmake_src_prepare @@ -140,7 +153,9 @@ src_configure() { -DBUILD_X11=yes -DBUILD_XDAMAGE=yes -DBUILD_XDBE=yes + -DBUILD_XFIXES=yes -DBUILD_XSHAPE=yes + -DBUILD_XINPUT=yes -DBUILD_MOUSE_EVENTS=yes -DOWN_WINDOW=yes ) @@ -183,6 +198,7 @@ src_configure() { -DBUILD_PORT_MONITORS=$(usex portmon) -DBUILD_PULSEAUDIO=$(usex pulseaudio) -DBUILD_RSS=$(usex rss) + -DBUILD_TESTS=$(usex test) -DBUILD_WAYLAND=$(usex wayland) -DBUILD_WLAN=$(usex wifi) -DBUILD_XFT=$(usex truetype) diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml index 41e021e389b6..2caf95af9ae7 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -29,11 +29,9 @@ <flag name="math">Enable support for glibc's libm math library</flag> <flag name="moc">Enable monitoring of music played by <pkg>media-sound/moc</pkg></flag> <flag name="mpd">Enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag> - <flag name="nano-syntax">Enable syntax highlighting for <pkg>app-editors/nano</pkg></flag> <flag name="nvidia">Enable reading of nvidia card temperature sensors via <pkg>x11-drivers/nvidia-drivers</pkg></flag> <flag name="portmon">Enable support for tcp (ip4) port monitoring</flag> <flag name="thinkpad">Enable support for IBM/Lenovo notebooks</flag> - <flag name="weather-metar">Enable support for metar weather service</flag> <flag name="webserver">Enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag> <flag name="xmms2">Enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag> </use> diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml index 074a03ff4090..f239675c0bab 100644 --- a/app-admin/conserver/metadata.xml +++ b/app-admin/conserver/metadata.xml @@ -5,10 +5,6 @@ <email>dan@danweeks.net</email> <name>Dan Weeks</name> </maintainer> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest index 9f9605c32056..94b93a5de3bc 100644 --- a/app-admin/consul-template/Manifest +++ b/app-admin/consul-template/Manifest @@ -1,7 +1,2 @@ -DIST consul-template-0.29.0-deps.tar.xz 37430348 BLAKE2B 9e0af3e245420bb3166a56bf2e570300ae0d35d9d93a6f6ae08bced79b26bae102339faa955a989f0617453cd5e40c6a3358a0b265ed49f4bc2dd7cb07e605c9 SHA512 fc3ed6150bb53c27c4a8e8e8b4d2d96cf4fada966016c8fbff48d4f61d392d08fc8bd53e9fa52256c84b1e5249a34e2fe361fd96a860841337a308bc3caa7f3a -DIST consul-template-0.29.0.tar.gz 244446 BLAKE2B 9ff2b33d9a3ca296913bf4f5e6928b789341438a566b63e841e04b0ad528d13588bcdb34994a1d3a829c7d64593b9811480fcf9395d3527a09d473d90bdf4e23 SHA512 e562d89c753ca2bbd14ae57e084e7e2b0aac28c92c210357e22d32d5c3c138054a46f5fb8883a44f64bdd8e9654f457230cef3b24513fa7eeaefd177fd8004c7 -DIST consul-template-0.29.1-deps.tar.xz 59041120 BLAKE2B dd822c41cf9fdfe773ed48edbc02eb409b4840c9bd6f6b66c590d2fa6a44ccea3bcac89569abf318abd2c97e7515e600ee2f1f6c469c60d068959f90e3487831 SHA512 37fd93e9ce064251941626c6ac6b6770e7c019d82cd5f6c113d2adb09460a02fb1644af26714b34f9634e6312346edb98cd841aee6b6805f7d06a07fc7c997d7 -DIST consul-template-0.29.1.tar.gz 254592 BLAKE2B 4ad5e7c1bf2edc06d72ec1ed48f9546c698d22f8562c4c9924106891c44511b912abecc94517ed2359592b709f1f8fd05fcb00cea52893de29c62b34b61fd71e SHA512 edcfe45a3d98b9affda8b5d07fb375a647a78473c7041a87f1f5a2aa2faef2bfdef26a7037d228f6a86d0c446397e7452e7005ce16beff2bc68edabf2268a6f9 -DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B 9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30f9999afc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848 SHA512 3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9 -DIST consul-template-0.29.4.tar.gz 262539 BLAKE2B 487902c2a05561db325e6d2638a70d2733a27dd31f678b65883d0b4925b4efa38fe4fbe6c7128c9473af4d4a21f467288a2c1945da399f6feab39216b67dd5aa SHA512 3bc5fcd1877fe125398d6bf0bd4938af88cacf726441af3e82142e651ab458185593eec3cb7c5916669a0e39dff8059c049556509ec279bf572f03b4c915d757 -DIST consul-template-0.29.5.tar.gz 262722 BLAKE2B 1e3ddf259d76cf487872cebbe8c8b5bb313b89d073b26496340d39cc55c4e56ec531cbefec4bc1c0dd5c8bb3bd707c9bebfd15011e421badf12ea59a5bbbdbe3 SHA512 f753c2ec7f6c97ac73b34820b40568b5b16a3b8d4bebc7390905614a96744e8d4afd4a63b8b911989ba084ea91d85a21e3283d67a36bf65a685aa63154361a14 +DIST consul-template-0.37.4-deps.tar.xz 1548760 BLAKE2B 34a4e7926f41578071e60c715c534a8a50c49db3a78b06ae6ee49ed1a1c857faea753f27921cb6345bbc94f44ab81da58d3ffd1d27a0e29220bd2631bb35b58a SHA512 e28e29034407a5fbf78f9872b2cd85c0d6414cb5ec3c4b023b080c227583ae34ead6ab5b98c6ff4e1d278d9af137e895cedc79def10017d073f2b99561f1d483 +DIST consul-template-0.37.4.tar.gz 288565 BLAKE2B 69fc82a482c7fce4201621ee43aca689b328be4e34bb99e1cd552ba844787744a97fb64364adc7d9a180fd424d30881deaed45077851bc10fa037799ea99d189 SHA512 e36a5e444801c8700577df28fb3fbc7398b825d8f549d620c07445d86099a7597d0e95d56ce24daedd44eb573cc33e40dd1bb1e7a6def2c2a1788133bb811c38 diff --git a/app-admin/consul-template/consul-template-0.29.1.ebuild b/app-admin/consul-template/consul-template-0.29.1.ebuild deleted file mode 100644 index 612bb41f3539..000000000000 --- a/app-admin/consul-template/consul-template-0.29.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module systemd - -DESCRIPTION="Generic template rendering and notifications with Consul" -HOMEPAGE="https://github.com/hashicorp/consul-template" -SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2" -SLOT="0" -KEYWORDS="~amd64" - -COMMON_DEPEND=" - acct-group/consul-template - acct-user/consul-template" - -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# TODO: debug test failures -RESTRICT+=" test" - -src_prepare() { - default - # remove -s and -w from the linker flags - sed \ - -e '/-s \\/d' \ - -e '/-w \\/d' \ - -i Makefile || die -} - -src_compile() { - emake GOBIN="${S}"/bin dev -} - -src_test() { - emake GOBIN="${S}"/bin test -} - -src_install() { - dobin bin/${PN} - dodoc CHANGELOG.md README.md - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - - keepdir /etc/${PN}.d - - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-admin/consul-template/consul-template-0.29.4.ebuild b/app-admin/consul-template/consul-template-0.29.4.ebuild deleted file mode 100644 index 612bb41f3539..000000000000 --- a/app-admin/consul-template/consul-template-0.29.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module systemd - -DESCRIPTION="Generic template rendering and notifications with Consul" -HOMEPAGE="https://github.com/hashicorp/consul-template" -SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2" -SLOT="0" -KEYWORDS="~amd64" - -COMMON_DEPEND=" - acct-group/consul-template - acct-user/consul-template" - -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# TODO: debug test failures -RESTRICT+=" test" - -src_prepare() { - default - # remove -s and -w from the linker flags - sed \ - -e '/-s \\/d' \ - -e '/-w \\/d' \ - -i Makefile || die -} - -src_compile() { - emake GOBIN="${S}"/bin dev -} - -src_test() { - emake GOBIN="${S}"/bin test -} - -src_install() { - dobin bin/${PN} - dodoc CHANGELOG.md README.md - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - - keepdir /etc/${PN}.d - - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-admin/consul-template/consul-template-0.29.5.ebuild b/app-admin/consul-template/consul-template-0.29.5.ebuild deleted file mode 100644 index 6727d40a8f93..000000000000 --- a/app-admin/consul-template/consul-template-0.29.5.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module systemd - -DESCRIPTION="Generic template rendering and notifications with Consul" -HOMEPAGE="https://github.com/hashicorp/consul-template" -SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/consul-template-0.29.4-deps.tar.xz" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2" -SLOT="0" -KEYWORDS="~amd64" - -COMMON_DEPEND=" - acct-group/consul-template - acct-user/consul-template" - -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# TODO: debug test failures -RESTRICT+=" test" - -src_prepare() { - default - # remove -s and -w from the linker flags - sed \ - -e '/-s \\/d' \ - -e '/-w \\/d' \ - -i Makefile || die -} - -src_compile() { - emake GOBIN="${S}"/bin dev -} - -src_test() { - emake GOBIN="${S}"/bin test -} - -src_install() { - dobin bin/${PN} - dodoc CHANGELOG.md README.md - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - - keepdir /etc/${PN}.d - - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-admin/consul-template/consul-template-0.29.0.ebuild b/app-admin/consul-template/consul-template-0.37.4.ebuild index 612bb41f3539..adf2f99b89be 100644 --- a/app-admin/consul-template/consul-template-0.29.0.ebuild +++ b/app-admin/consul-template/consul-template-0.37.4.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit go-module systemd DESCRIPTION="Generic template rendering and notifications with Consul" HOMEPAGE="https://github.com/hashicorp/consul-template" -SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" +SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2" +LICENSE="MPL-2.0" +LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2" SLOT="0" KEYWORDS="~amd64" diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest index f97ac05df344..9532d6fa5036 100644 --- a/app-admin/consul/Manifest +++ b/app-admin/consul/Manifest @@ -1 +1,5 @@ -DIST consul-1.14.3-vendor.tar.gz 40650363 BLAKE2B 1c15333d1a1053da871ccf032c8b21f6b1265a5c222395f217444de3c4472c755d205bad82d83ecdb520081830d11e4c7f113207fe83a7dac4860497518d5be8 SHA512 b1764b845bea8681d72858de4558fdfce4de1faaaf1fb5221eab12d8c9f512efbf1b8a118ea68c829660e23410381a2b71d12fc6d995a64be041d74ad616a663 +DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B 9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144 SHA512 d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05 +DIST consul-1.15.11.tar.gz 28951114 BLAKE2B 02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31 SHA512 1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688 +DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B 7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64 SHA512 b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256 +DIST consul-1.18.1-deps.tar.xz 10161908 BLAKE2B da7e3e63470f082bf0f1e92252a2d30cce90c4268e5ad3d180ab4bfed6601e92e26e0a108fe7477a1d596cf44114e97551712bce4c2b3d13c06c3fae0fa948e5 SHA512 f0d3961de4c38052209d79817ba6570fc43f3b9c472c959d591cc8fd23029f32070a98c59c70c02f56b80c214ae60d4a2711ca2ec31472758209538ba00ef786 +DIST consul-1.18.1.tar.gz 34424463 BLAKE2B 1c205471fa5d2500e4421eae37159dc3a3f8ebb46ab50266440302ca814834d39fddf0c27f4da5e78a103a2d7411eebf74bd256153b3954c6bc3c384de660a2f SHA512 023ee6f2dff82343f9c3382b531c8fa7f032e1820e09d18f67201c8ae839dfc89b145a8197be2f9c241709541a915a073dd117f5523e17ba0cdaa665bffc2f4c diff --git a/app-admin/consul/consul-1.15.11.ebuild b/app-admin/consul/consul-1.15.11.ebuild new file mode 100644 index 000000000000..f0597622b535 --- /dev/null +++ b/app-admin/consul/consul-1.15.11.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module systemd + +DESCRIPTION="A tool for service discovery, monitoring and configuration" +HOMEPAGE="https://www.consul.io" +GIT_COMMIT="4fc94919996f7b7e5d16145f8d89cc5ee644b094" + +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" +LICENSE="BUSL-1.1 MPL-2.0" +LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" +RESTRICT="test" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +BDEPEND="dev-go/gox" +COMMON_DEPEND=" + acct-group/consul + acct-user/consul" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" + +S=${WORKDIR}/${P} + +src_prepare() { + default + sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:43:41Z|' -i GNUmakefile || die +} + +src_compile() { + if use x86; then + #924629 pie breaks build on x86 + GOFLAGS=${GOFLAGS//-buildmode=pie} + fi + # The dev target sets causes build.sh to set appropriate XC_OS + # and XC_ARCH, and skips generation of an unused zip file, + # avoiding a dependency on app-arch/zip. + GIT_DESCRIBE="v${PV}" \ + GIT_DIRTY="" \ + GIT_COMMIT="${GIT_COMMIT}" \ + emake dev-build +} + +src_install() { + dobin bin/consul + + keepdir /etc/consul.d + insinto /etc/consul.d + doins "${FILESDIR}/"*.json.example + + keepdir /var/log/consul + fowners consul:consul /var/log/consul + + newinitd "${FILESDIR}/consul.initd" "${PN}" + newconfd "${FILESDIR}/consul.confd" "${PN}" + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + systemd_dounit "${FILESDIR}/consul.service" +} diff --git a/app-admin/consul/consul-1.14.3.ebuild b/app-admin/consul/consul-1.15.3.ebuild index 65a0b54229bf..b3e17cbf517a 100644 --- a/app-admin/consul/consul-1.14.3.ebuild +++ b/app-admin/consul/consul-1.15.3.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit go-module systemd DESCRIPTION="A tool for service discovery, monitoring and configuration" HOMEPAGE="https://www.consul.io" -GIT_COMMIT="bd257019c580a7f06b3ef99168698929b74f4bfc" +GIT_COMMIT="7ce982ce1846ca14e567a91fa7f088084e736155" SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz" LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" -RESTRICT+=" test" +RESTRICT="test" SLOT="0" KEYWORDS="amd64 ~arm64 ~x86" @@ -26,10 +26,14 @@ S=${WORKDIR}/${P}-vendor src_prepare() { default - sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-12-13T17:13:55Z|' -i GNUmakefile || die + sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-03-30T17:51:19Z|' -i GNUmakefile || die } src_compile() { + if use x86; then + #924629 pie breaks build on x86 + GOFLAGS=${GOFLAGS//-buildmode=pie} + fi # The dev target sets causes build.sh to set appropriate XC_OS # and XC_ARCH, and skips generation of an unused zip file, # avoiding a dependency on app-arch/zip. diff --git a/app-admin/consul/consul-1.18.1.ebuild b/app-admin/consul/consul-1.18.1.ebuild new file mode 100644 index 000000000000..b54c5f6b26e6 --- /dev/null +++ b/app-admin/consul/consul-1.18.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module systemd + +DESCRIPTION="A tool for service discovery, monitoring and configuration" +HOMEPAGE="https://www.consul.io" +GIT_COMMIT="98cb473cc11f2de0ccb61106381b0c7e92819c58" + +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" +LICENSE="BUSL-1.1 MPL-2.0" +LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" +SLOT="0" +RESTRICT="test" +KEYWORDS="~amd64 ~arm64 ~x86" + +BDEPEND="dev-go/gox" +COMMON_DEPEND=" + acct-group/consul + acct-user/consul" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" + +src_prepare() { + default + sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:59:08Z|' -i Makefile || die +} + +src_compile() { + if use x86; then + #924629 pie breaks build on x86 + GOFLAGS=${GOFLAGS//-buildmode=pie} + fi + # The dev target sets causes build.sh to set appropriate XC_OS + # and XC_ARCH, and skips generation of an unused zip file, + # avoiding a dependency on app-arch/zip. + GIT_DESCRIBE="v${PV}" \ + GIT_DIRTY="" \ + GIT_COMMIT="${GIT_COMMIT}" \ + emake dev-build +} + +src_install() { + dobin bin/consul + + keepdir /etc/consul.d + insinto /etc/consul.d + doins "${FILESDIR}/"*.json.example + + keepdir /var/log/consul + fowners consul:consul /var/log/consul + + newinitd "${FILESDIR}/consul.initd" "${PN}" + newconfd "${FILESDIR}/consul.confd" "${PN}" + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + systemd_dounit "${FILESDIR}/consul.service" +} diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd index 00a65695fa2b..22004ec346ab 100644 --- a/app-admin/consul/files/consul.initd +++ b/app-admin/consul/files/consul.initd @@ -9,7 +9,7 @@ user=${user:-${RC_SVCNAME}} pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} rc_ulimit=${rc_ulimit-"-n 65536"} command="/usr/bin/${RC_SVCNAME}" -command_args="agent ${command_args:-config-dir=/etc/consul.d}" +command_args="agent ${command_args:--config-dir=/etc/consul.d}" command_background="true" start_stop_daemon_args="--user ${user} --group ${group} \ --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \ diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest index a4a54c346ec9..09487a44a762 100644 --- a/app-admin/cpulimit/Manifest +++ b/app-admin/cpulimit/Manifest @@ -1 +1 @@ -DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0 +DIST cpulimit-2.8.tar.gz 24860 BLAKE2B 6d4002d2cbc46da9ce102da77b701e6a99c2e7d16e2e7989baa1e07ef335b126a8c717c4779d121aee1e580ebf057a16b4f83c1bc6a29c904a7532debc4c490a SHA512 aeb121739a5dc9f94c6ddb0905ed05eb7d146c9d0e71c34ba46aad798bda2c30b7ccc548338b4c468f9885f09d97a4565c00199c8df6af74dc9b6f23940c540e diff --git a/app-admin/cpulimit/cpulimit-2.4.ebuild b/app-admin/cpulimit/cpulimit-2.4.ebuild deleted file mode 100644 index 13e5d1a86317..000000000000 --- a/app-admin/cpulimit/cpulimit-2.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Limits the CPU usage of a process" -HOMEPAGE="http://cpulimit.sourceforge.net" -SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~riscv x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_prepare() { - tc-export CC - # set correct VERSION - #sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c \ - # || die 'sed on VERSION string failed' - - default -} - -src_install() { - local DOCS=( CHANGELOG README ) - dosbin ${PN} - doman ${PN}.1 - einstalldocs -} diff --git a/app-admin/cpulimit/cpulimit-2.8.ebuild b/app-admin/cpulimit/cpulimit-2.8.ebuild new file mode 100644 index 000000000000..713b9c1decb1 --- /dev/null +++ b/app-admin/cpulimit/cpulimit-2.8.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Limits the CPU usage of a process" +HOMEPAGE="https://cpulimit.sourceforge.net" +SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~riscv x86" + +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" + "${FILESDIR}/${P}-inline-func.patch" # Bug #686528 +) + +src_compile() { + emake CC=$(tc-getCC) +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc CHANGELOG README +} diff --git a/app-admin/cpulimit/files/cpulimit-2.8-inline-func.patch b/app-admin/cpulimit/files/cpulimit-2.8-inline-func.patch new file mode 100644 index 000000000000..12b516223a01 --- /dev/null +++ b/app-admin/cpulimit/files/cpulimit-2.8-inline-func.patch @@ -0,0 +1,11 @@ +--- a/cpulimit.c 2023-02-06 19:07:19.450894524 +0300 ++++ b/cpulimit.c 2023-02-06 19:07:28.834337797 +0300 +@@ -125,7 +125,7 @@ + + + //return ta-tb in microseconds (no overflow checks!) +-inline long timediff(const struct timespec *ta,const struct timespec *tb) { ++static long timediff(const struct timespec *ta,const struct timespec *tb) { + unsigned long us = (ta->tv_sec-tb->tv_sec)*1000000 + (ta->tv_nsec/1000 - tb->tv_nsec/1000); + return us; + } diff --git a/app-admin/cpulimit/files/cpulimit-2.8-makefile.patch b/app-admin/cpulimit/files/cpulimit-2.8-makefile.patch new file mode 100644 index 000000000000..7daf8a7092ab --- /dev/null +++ b/app-admin/cpulimit/files/cpulimit-2.8-makefile.patch @@ -0,0 +1,25 @@ +--- a/Makefile 2023-02-06 18:47:21.311693323 +0300 ++++ b/Makefile 2023-02-06 18:48:23.392517904 +0300 +@@ -2,6 +2,7 @@ + PREFIX?=/usr + CFLAGS?=-Wall -O2 + CC?=clang ++DESTDIR= + + all: cpulimit + +@@ -21,10 +22,10 @@ + $(MAKE) -C test + + install: cpulimit +- mkdir -p ${PREFIX}/bin +- mkdir -p ${PREFIX}/share/man/man1 +- cp cpulimit ${PREFIX}/bin +- cp cpulimit.1 ${PREFIX}/share/man/man1 ++ mkdir -p ${DESTDIR}/${PREFIX}/bin ++ mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1 ++ cp cpulimit ${DESTDIR}/${PREFIX}/bin ++ cp cpulimit.1 ${DESTDIR}/${PREFIX}/share/man/man1 + + deinstall: + rm -f ${PREFIX}/bin/cpulimit diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml index 2f011b11fe67..301d5fbb3d91 100644 --- a/app-admin/cpulimit/metadata.xml +++ b/app-admin/cpulimit/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">limitcpu</remote-id> </upstream> diff --git a/app-admin/cronlocker/metadata.xml b/app-admin/cronlocker/metadata.xml index db463f3eeb66..5e93affc2408 100644 --- a/app-admin/cronlocker/metadata.xml +++ b/app-admin/cronlocker/metadata.xml @@ -5,4 +5,7 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <upstream> + <remote-id type="github">viafintech/cronlocker</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild b/app-admin/cronolog/cronolog-1.6.2-r6.ebuild index f8b32bd5968e..913f65fbd788 100644 --- a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild +++ b/app-admin/cronolog/cronolog-1.6.2-r6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools diff --git a/app-admin/cronolog/cronolog-1.6.2-r7.ebuild b/app-admin/cronolog/cronolog-1.6.2-r7.ebuild new file mode 100644 index 000000000000..32788154300e --- /dev/null +++ b/app-admin/cronolog/cronolog-1.6.2-r7.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Log rotation software" +HOMEPAGE="https://github.com/fordmason/cronolog" +SRC_URI="http://cronolog.org/download/${P}.tar.gz" + +LICENSE="GPL-2+ Apache-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" + +PATCHES=( + "${FILESDIR}"/${PV}-patches + # rename and move into ${PV}-patches after -r3 removal + "${FILESDIR}"/${P}-umask.patch +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} + +src_compile() { + emake AR="$(tc-getAR)" +} diff --git a/app-admin/cygwin-rebase/Manifest b/app-admin/cygwin-rebase/Manifest deleted file mode 100644 index 7dd1c0b357fd..000000000000 --- a/app-admin/cygwin-rebase/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cygwin-rebase-4.4.4.tar.gz 114445 BLAKE2B f0741513fb3b636876ce6e33b882e4075d41606118ec1c663939b2e9a9d8690360011352f27ebfeffc49a644b5de8c5026bcab0fb7fb9b41ff36ee6cd6c031c8 SHA512 d155b05f663fab971c70b6618755ac528d49b96e17017c0fcabf26332e4a50c46ee346705fc59490f741bf37625e94a2bba8cc36d41c23f5643d54d08eb1051b -DIST cygwin-rebase-4.4.4_merge-files-flag-0.patch 15409 BLAKE2B 6f8061903439c9baa508eb130f43fe5e9fe8b71725ab5efe92d6d8a667b71c467f2f0fddd8b4ca22c68087e24bbafc2db6c288ef87d125b23c8f8d35bb1b5a37 SHA512 b067751218026867681c24003a4f224599b5fd6a29920c3662b7964a3447db8b6b680acfaab637de911ecea08c3196bf268eba3237b92830dcbf531e05842fb2 diff --git a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild deleted file mode 100644 index 43e174d3f559..000000000000 --- a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Core of the automatic rebase facility during postinstall on Cygwin" -HOMEPAGE="https://cygwin.com" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -inherit autotools - -if [[ ${PV} == 9999 ]] -then - EGIT_REPO_URI="https://sourceware.org/git/cygwin-apps/rebase.git" - EGIT_REPO_URI="https://github.com/haubi/cygwin-rebase.git" - EGIT_BRANCH="gentoo" - inherit git-r3 -else - # Upstream does not provide archived source tarballs from git release tags, - # only non archived cygwin distro packages with embedded source tarballs. - # For now, we download from haubi's github mirror repo, having - # repo name "cygwin-rebase" and tag names like "rebase-4-4-4". - MY_PN=cygwin-rebase-rebase - MY_PV=${PV//./-} - S="${WORKDIR}/${MY_PN}-${MY_PV}" - SRC_URI=" - https://github.com/haubi/cygwin-rebase/archive/rebase-${MY_PV}.tar.gz -> ${P}.tar.gz - https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch - " - PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" ) - KEYWORDS="-* ~x64-cygwin" -fi - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - -src_prepare() { - default - # do not bother upstream with bug reports yet - sed -e "/AC_INIT/{s|rebase|${PN}|;s|cygwin@cygwin.com|https://bugs.gentoo.org/|}" \ - -i configure.ac || die - eautoreconf -} - -src_configure() { - econf --with-posix-shell="${BASH}" -} - -src_install() { - default - # do not work nor make so much sense in Gentoo Prefix - rm -f "${ED}"/usr/bin/{rebase,peflags}all || die -} - -pkg_preinst() { - local rebasedb - local baseaddr - case ${CHOST} in - i686-*-cygwin*) - rebasedb=/etc/rebase.db.i386 - baseaddr=0x70000000 - ;; - x86_64-*-cygwin*) - rebasedb=/etc/rebase.db.x86_64 - baseaddr=0x1000000000 - ;; - esac - [[ ${rebasedb} ]] || die "CHOST ${CHOST} is not supported for ${PN}." - - [[ -s ${EROOT}${rebasedb} ]] && return 0 - - einfo "Creating initial rebase database with default base address ${baseaddr}..." - cp /bin/cygwin1.dll "${T}/initial.dll" || die - "${ED}/usr/bin/rebase" --verbose "--base=${baseaddr}" --database "${T}/initial.dll" || die - eend $? -} diff --git a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild deleted file mode 100644 index 43e174d3f559..000000000000 --- a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Core of the automatic rebase facility during postinstall on Cygwin" -HOMEPAGE="https://cygwin.com" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -inherit autotools - -if [[ ${PV} == 9999 ]] -then - EGIT_REPO_URI="https://sourceware.org/git/cygwin-apps/rebase.git" - EGIT_REPO_URI="https://github.com/haubi/cygwin-rebase.git" - EGIT_BRANCH="gentoo" - inherit git-r3 -else - # Upstream does not provide archived source tarballs from git release tags, - # only non archived cygwin distro packages with embedded source tarballs. - # For now, we download from haubi's github mirror repo, having - # repo name "cygwin-rebase" and tag names like "rebase-4-4-4". - MY_PN=cygwin-rebase-rebase - MY_PV=${PV//./-} - S="${WORKDIR}/${MY_PN}-${MY_PV}" - SRC_URI=" - https://github.com/haubi/cygwin-rebase/archive/rebase-${MY_PV}.tar.gz -> ${P}.tar.gz - https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch - " - PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" ) - KEYWORDS="-* ~x64-cygwin" -fi - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - -src_prepare() { - default - # do not bother upstream with bug reports yet - sed -e "/AC_INIT/{s|rebase|${PN}|;s|cygwin@cygwin.com|https://bugs.gentoo.org/|}" \ - -i configure.ac || die - eautoreconf -} - -src_configure() { - econf --with-posix-shell="${BASH}" -} - -src_install() { - default - # do not work nor make so much sense in Gentoo Prefix - rm -f "${ED}"/usr/bin/{rebase,peflags}all || die -} - -pkg_preinst() { - local rebasedb - local baseaddr - case ${CHOST} in - i686-*-cygwin*) - rebasedb=/etc/rebase.db.i386 - baseaddr=0x70000000 - ;; - x86_64-*-cygwin*) - rebasedb=/etc/rebase.db.x86_64 - baseaddr=0x1000000000 - ;; - esac - [[ ${rebasedb} ]] || die "CHOST ${CHOST} is not supported for ${PN}." - - [[ -s ${EROOT}${rebasedb} ]] && return 0 - - einfo "Creating initial rebase database with default base address ${baseaddr}..." - cp /bin/cygwin1.dll "${T}/initial.dll" || die - "${ED}/usr/bin/rebase" --verbose "--base=${baseaddr}" --database "${T}/initial.dll" || die - eend $? -} diff --git a/app-admin/cygwin-rebase/metadata.xml b/app-admin/cygwin-rebase/metadata.xml deleted file mode 100644 index abddd2ee172c..000000000000 --- a/app-admin/cygwin-rebase/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - The rebaseall utility is a convenient way for users that suffer from the - Cygwin rebase problem to rebase their entire system (i.e., all of their - DLLs). The following is a list of known Cygwin applications that are - affected by the rebase problem: - - Apache - Perl - Python - - The rebase problem is due to fork() failing when it is unable to load - DLLs in the child at the same address as in the parent. This is caused - by DLLs which have conflicting base addresses. - </longdescription> - <upstream> - <remote-id type="github">haubi/cygwin-rebase</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-admin/diradm/diradm-2.9.7.1.ebuild b/app-admin/diradm/diradm-2.9.7.1-r1.ebuild index ea60e0708244..604412d14c12 100644 --- a/app-admin/diradm/diradm-2.9.7.1.ebuild +++ b/app-admin/diradm/diradm-2.9.7.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP" #HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/" @@ -16,26 +16,29 @@ IUSE="automount irixpasswd samba test" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( automount irixpasswd samba )" -RDEPEND=">=net-nds/openldap-2.3 - sys-apps/gawk +RDEPEND=" + app-shells/bash:* + dev-lang/perl + >=net-nds/openldap-2.3 sys-apps/coreutils + sys-apps/gawk sys-apps/grep - dev-lang/perl - app-shells/bash:* sys-apps/sed virtual/perl-MIME-Base64 samba? ( dev-perl/Crypt-SmbHash >=net-fs/samba-3.0.6 - )" -DEPEND=" - ${RDEPEND} + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" test? ( dev-perl/Crypt-SmbHash - >=net-fs/samba-3.0.6 dev-util/dejagnu + >=net-fs/samba-3.0.6 net-nds/openldap[-minimal] - )" + ) +" src_configure() { econf \ diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild index 155ae489821a..2a5bb8a3b82e 100644 --- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild +++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild @@ -1,18 +1,18 @@ -# 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 DESCRIPTION="Make tinydns and dnscache logs human-readable" -HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml" -SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz" +HOMEPAGE="https://michael.orlitzky.com/code/djbdns-logparse.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" LICENSE="AGPL-3+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild deleted file mode 100644 index 0b6d3d669797..000000000000 --- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild +++ /dev/null @@ -1,31 +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="Make tinydns and dnscache logs human-readable" -HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml" -SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz" -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -# djbdns-logparse pipes the logs through the "tai64nlocal" program -# that comes with sys-process/daemontools. -RDEPEND="sys-process/daemontools" -BDEPEND="test? ( ${RDEPEND} )" - -python_install_all() { - doman "doc/man1/${PN}.1" - local DOCS=( doc/README ) - distutils-r1_python_install_all -} - -python_test() { - esetup.py test -} diff --git a/app-admin/doas/doas-6.8.2.ebuild b/app-admin/doas/doas-6.8.2.ebuild index c439e825e527..e34836072634 100644 --- a/app-admin/doas/doas-6.8.2.ebuild +++ b/app-admin/doas/doas-6.8.2.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=8 @@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="ISC" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="pam persist" BDEPEND="app-alternatives/yacc" diff --git a/app-admin/drush/drush-6.7.0-r4.ebuild b/app-admin/drush/drush-6.7.0-r6.ebuild index 888cfc09e2bd..4f0d63ad593b 100644 --- a/app-admin/drush/drush-6.7.0-r4.ebuild +++ b/app-admin/drush/drush-6.7.0-r6.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=8 @@ -12,9 +12,7 @@ SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" -DEPEND="" RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml] dev-php/PEAR-Console_Table" @@ -23,6 +21,8 @@ PATCHES=( "${FILESDIR}/array-syntax.patch" "${FILESDIR}/${P}-php8.0.patch" "${FILESDIR}/${P}-gzip-mime.patch" + "${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch" + "${FILESDIR}/${P}-batch-signature-fix.patch" ) src_prepare() { diff --git a/app-admin/drush/drush-6.7.0-r7.ebuild b/app-admin/drush/drush-6.7.0-r7.ebuild new file mode 100644 index 000000000000..1329345e4dc0 --- /dev/null +++ b/app-admin/drush/drush-6.7.0-r7.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +DESCRIPTION="Command line shell and scripting interface for Drupal" +HOMEPAGE="https://github.com/drush-ops/drush" +SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml] + dev-php/PEAR-Console_Table" + +PATCHES=( + "${FILESDIR}/update-bash-completion-script-for-2.1.patch" + "${FILESDIR}/array-syntax.patch" + "${FILESDIR}/${P}-php8.0.patch" + "${FILESDIR}/${P}-gzip-mime.patch" + "${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch" + "${FILESDIR}/${P}-batch-signature-fix-r1.patch" +) + +src_prepare() { + default + + # dodoc compresses all of the documentation, so we fix the filenames + # in a few places. + # + # First, the README location in bootstrap.inc. + sed -i -e \ + "s!/share/doc/drush!/share/doc/${PF}!" \ + -e "s!README\.md!\0.bz2!g" \ + includes/bootstrap.inc || die + + # Next, the list of documentation in docs.drush.inc. Note that + # html files don't get compressed. + sed -i \ + -e "s!\.bashrc'!.bashrc.bz2'!" \ + -e "s!\.inc'!.inc.bz2'!" \ + -e "s!\.ini'!.ini.bz2'!" \ + -e "s!\.md'!.md.bz2'!" \ + -e "s!\.php'!.php.bz2'!" \ + -e "s!\.script'!.script.bz2'!" \ + -e "s!\.txt'!.txt.bz2'!" \ + commands/core/docs.drush.inc || die +} + +src_install() { + # Always install the examples; they're referenced within the source + # code and too difficult to exorcise. + dodoc -r README.md docs examples + + insinto /usr/share/drush + doins -r classes commands includes lib misc + doins drush_logo-black.png drush.info drush.php + + exeinto /usr/share/drush + doexe drush + dosym ../share/drush/drush /usr/bin/drush + + keepdir /etc/drush + newbashcomp drush.complete.sh drush +} diff --git a/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch b/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch new file mode 100644 index 000000000000..14ee72b7dc4a --- /dev/null +++ b/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch @@ -0,0 +1,46 @@ +From 1acd52cff0d516ebfa7f177c38ed7f851c4f472a Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 16 Aug 2023 21:21:39 -0400 +Subject: [PATCH] includes/batch.inc: synchronize sub and superclass signatures + +The DrushBatchContext class overrides the offsetSet() method of its +superclass, ArrayObject, but changes its signature: + + Error: Return type of DrushBatchContext::offsetSet($name, $value) + should either be compatible with ArrayObject::offsetSet(mixed $key, + mixed $value): void, or the #[\ReturnTypeWillChange] attribute should + be used to temporarily suppress the notice in .../batch.inc, line 37 + +Renaming the parameter to $key and adding type hints fixes the issue. + +Signed-off-by: Michael Orlitzky <michael@orlitzky.com> +--- + includes/batch.inc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/includes/batch.inc b/includes/batch.inc +index dd4adc9..d26fabb 100644 +--- a/includes/batch.inc ++++ b/includes/batch.inc +@@ -34,14 +34,14 @@ + * @see _drush_batch_worker(). + */ + class DrushBatchContext extends ArrayObject { +- function offsetSet($name, $value) { +- if ($name == 'message') { ++ function offsetSet(mixed $key, mixed $value): void { ++ if ($key == 'message') { + drush_log(strip_tags($value), 'ok'); + } +- elseif ($name == 'error_message') { ++ elseif ($key == 'error_message') { + drush_set_error('DRUSH_BATCH_ERROR', strip_tags($value)); + } +- parent::offsetSet($name, $value); ++ parent::offsetSet($key, $value); + } + } + +-- +2.43.2 + diff --git a/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch b/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch new file mode 100644 index 000000000000..8d5aa74fed46 --- /dev/null +++ b/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch @@ -0,0 +1,46 @@ +From 31d7a945230eaf1f8ab94d5f782619434f7f2b8c Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 16 Aug 2023 21:21:39 -0400 +Subject: [PATCH 1/1] includes/batch.inc: synchronize sub and superclass + parameter names + +The DrushBatchContext class overrides the offsetSet() method of its +superclass, ArrayObject, but changes the first parameter's name from +$key to $name. This makes php-8.1 unhappy: + + Error: Return type of DrushBatchContext::offsetSet($name, $value) + should either be compatible with ArrayObject::offsetSet(mixed $key, + mixed $value): void, or the #[\ReturnTypeWillChange] attribute should + be used to temporarily suppress the notice in .../batch.inc, line 37 + +Renaming the parameter to $key throughout the function fixes the issue. +--- + includes/batch.inc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/includes/batch.inc b/includes/batch.inc +index dd4adc9..785f411 100644 +--- a/includes/batch.inc ++++ b/includes/batch.inc +@@ -34,14 +34,14 @@ + * @see _drush_batch_worker(). + */ + class DrushBatchContext extends ArrayObject { +- function offsetSet($name, $value) { +- if ($name == 'message') { ++ function offsetSet($key, $value) { ++ if ($key == 'message') { + drush_log(strip_tags($value), 'ok'); + } +- elseif ($name == 'error_message') { ++ elseif ($key == 'error_message') { + drush_set_error('DRUSH_BATCH_ERROR', strip_tags($value)); + } +- parent::offsetSet($name, $value); ++ parent::offsetSet($key, $value); + } + } + +-- +2.41.0 + diff --git a/app-admin/drush/files/drush-6.7.0-dont-pass-null-to-strtoupper.patch b/app-admin/drush/files/drush-6.7.0-dont-pass-null-to-strtoupper.patch new file mode 100644 index 000000000000..408a271ce38f --- /dev/null +++ b/app-admin/drush/files/drush-6.7.0-dont-pass-null-to-strtoupper.patch @@ -0,0 +1,26 @@ +From 621cb8db059f3dff434dc369ab46faf3a2efa539 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Thu, 3 Aug 2023 08:52:35 -0400 +Subject: [PATCH 1/1] includes/environment.inc: don't pass null to + strtoupper(). + +--- + includes/environment.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/includes/environment.inc b/includes/environment.inc +index 7837104..dd2c71d 100644 +--- a/includes/environment.inc ++++ b/includes/environment.inc +@@ -736,7 +736,7 @@ function _drush_get_os($os = NULL) { + // that the path be converted to /cygdrive/c/path, even on DOS or Powershell. + // The special os "RSYNC" can be used to indicate that we want to assume + // "CWRSYNC" when cwrsync is installed, or default to the local OS otherwise. +- if (strtoupper($os) == "RSYNC") { ++ if (isset($os) && strtoupper($os) == "RSYNC") { + $os = _drush_get_os("LOCAL"); + // For now we assume that cwrsync is always installed on Windows, and never installed son any other platform. + return drush_is_windows($os) ? "CWRSYNC" : $os; +-- +2.39.3 + diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest deleted file mode 100644 index ca2f24660aca..000000000000 --- a/app-admin/ec2-ami-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ec2-ami-tools-1.5.7.zip 156611 BLAKE2B f3e4c05a1f25e1d47a6981981b92db551953028f0621e3f175e3ab5db8823d72f56d2145376c52dc6d134ec2a167c14d64997e969785991589f9c97b93277f78 SHA512 2754ded47cbe842f58e12207c4bb7f81c8cd366dc506cbadfa9bda74d91fd5f8e1cafbb117612b14833368ff5943c4943a072d1679f23f591c15f2f49b61b4c2 diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild deleted file mode 100644 index e9a0ebb7de0e..000000000000 --- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby26 ruby27" -inherit ruby-single - -DESCRIPTION="Command-line tools that serve as client interface to the Amazon EC2 web service" -HOMEPAGE="https://aws.amazon.com/en/tools/" -SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip" - -LICENSE="Amazon || ( Ruby GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="app-arch/unzip" -RDEPEND=" - ${RUBY_DEPS} - virtual/ruby-ssl - net-misc/rsync - net-misc/curl" - -src_prepare() { - # Remove a left behind license file. - rm -f lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.' - - default -} - -src_install() { - dobin bin/* - - insinto /usr - doins -r lib - - insinto /etc/ec2/amitools - doins etc/ec2/amitools/* - - dodir /etc/env.d - echo "EC2_AMITOOL_HOME=/usr" >> "${T}"/99${PN} || die "Can't write environment variable." - doenvd "${T}"/99${PN} -} - -pkg_postinst() { - ewarn "Remember to run \`env-update && source /etc/profile\` if you plan" - ewarn "to use these tools in a shell before logging out (or restarting" - ewarn "your login manager)." -} diff --git a/app-admin/ec2-ami-tools/metadata.xml b/app-admin/ec2-ami-tools/metadata.xml deleted file mode 100644 index bef24d2c2337..000000000000 --- a/app-admin/ec2-ami-tools/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest index 3a9863ade4f4..6f1c08679920 100644 --- a/app-admin/eclean-kernel/Manifest +++ b/app-admin/eclean-kernel/Manifest @@ -1,2 +1 @@ -DIST eclean-kernel-2.99.3.tar.gz 20031 BLAKE2B 70830639eb00bde810e29361dec7c7b90f5b85b79b5be865f23cf45254cbf6139ef335fb5bfef08e2512512e57867df62f6468ce8de1da58cc9a4cfa27a26244 SHA512 edbe373b81a2eb5c7fca8794f9577c68ab66305e9085cc7535cd5d8a8fdd549b2035cb0b5f3e5a69cc735146c2eef81dc5c1f5284ef255420aca0cda9e518b14 -DIST eclean-kernel-2.99.4.gh.tar.gz 21856 BLAKE2B ff9815e69054f7f7db84088ea0b1f9a8915927d4696f2cae51d7f3f96e423b7e5938f935808cf46666dba473f4c4ef4fda2acbe9662892cfbfbb8ad653724042 SHA512 8e5bfc6b4bdfb70d4d0139afbb0fbcb6772ae2ba0d4d4449705068b65d4f6239d08918c824326c7440172161513adcd66e477a8879a65964f8fc7965cb827535 +DIST eclean_kernel-2.99.7.tar.gz 25393 BLAKE2B 74f803f1007a1c54d87f087287a34a8380b21b9c66ad75a0ae64463815d5df39de0387f5d0cfd366e33efdaf039fce5dad923f1e55f93a2836830e303c3ca2df SHA512 dd43f65c1beebef59ee7a2e41375797fa5ea77171d8e4cf465b2b6a46e8e4500fb1723f664f2ce59e5b6e79d2dedd4abbaaa303a77e8349b9ee90c56e00e799e diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild deleted file mode 100644 index 2baa79fdd983..000000000000 --- a/app-admin/eclean-kernel/eclean-kernel-2.99.3.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 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 - -DESCRIPTION="Remove outdated built kernels" -HOMEPAGE="https://github.com/projg2/eclean-kernel/" -SRC_URI="https://github.com/projg2/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="lz4 lzo zstd" - -RDEPEND=" - kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] ) - lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) - lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] ) - zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] ) -" - -distutils_enable_tests pytest diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.4.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild index 3fe788b30189..7829c8eaafb0 100644 --- a/app-admin/eclean-kernel/eclean-kernel-2.99.4.ebuild +++ b/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Remove outdated built kernels" -HOMEPAGE="https://github.com/projg2/eclean-kernel/" -SRC_URI=" - https://github.com/projg2/eclean-kernel/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz +HOMEPAGE=" + https://github.com/projg2/eclean-kernel/ + https://pypi.org/project/eclean-kernel/ " LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~riscv x86" IUSE="lz4 lzo zstd" RDEPEND=" diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild index 76d6ba8bf3a3..993e9658085c 100644 --- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild +++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 git-r3 diff --git a/app-admin/eclean-kernel/metadata.xml b/app-admin/eclean-kernel/metadata.xml index 11fd9db9c6da..565dc4677af8 100644 --- a/app-admin/eclean-kernel/metadata.xml +++ b/app-admin/eclean-kernel/metadata.xml @@ -13,5 +13,6 @@ </maintainer> <bugs-to>https://github.com/projg2/eclean-kernel2/issues/</bugs-to> <remote-id type="github">projg2/eclean-kernel2</remote-id> + <remote-id type="pypi">eclean-kernel</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest index 765dadecf43c..64b82fca614e 100644 --- a/app-admin/emacs-updater/Manifest +++ b/app-admin/emacs-updater/Manifest @@ -1 +1 @@ -DIST emacs-updater-1.16.tar.xz 7112 BLAKE2B 82160ef71b4c22a385a45765c1f60b7d428297cfb3b51f84bd44b176d1bd302165f9ccdde803aae628a2dab9e0520098082232c513b2006ae5facfa283f287ab SHA512 3de3126debc49ea47bd57802c1a3aa82a0769ab392741fb891c93ffb66141f05f58025fa0de746ec78795fc34c135536740e447e1f6a4ae59aa847d21bd6215b +DIST emacs-updater-1.17.tar.xz 7236 BLAKE2B f39a19eba794cd57b25fbfc38998775a7818d98c81bbbdf485b33ed273815dfb3a74c26ca410f0e3b8e4bd46f2114b96155485cdcf87d5bec70a96dfe1a3a279 SHA512 461f496075bd7fc057290d40d408e5243ec464d8814abbe0c47c77a223b314ba2bcc35e20bf5e22e6dcee485a024ab93ced7155fa5212bc2d9c3b6362f168c52 diff --git a/app-admin/emacs-updater/emacs-updater-1.16.ebuild b/app-admin/emacs-updater/emacs-updater-1.17.ebuild index 040aa15149a5..193e60a52c26 100644 --- a/app-admin/emacs-updater/emacs-updater-1.16.ebuild +++ b/app-admin/emacs-updater/emacs-updater-1.17.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Rebuild Emacs packages" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs" @@ -9,12 +9,12 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" DEPEND="|| ( sys-apps/util-linux app-misc/getopt )" RDEPEND="${DEPEND} >=app-editors/emacs-23.1:* - >=app-portage/portage-utils-0.3" + >=app-portage/portage-utils-0.80" src_prepare() { default diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest index c8b74aab047e..4d3e78c93ae2 100644 --- a/app-admin/entr/Manifest +++ b/app-admin/entr/Manifest @@ -1 +1 @@ -DIST entr-5.3.tar.gz 20905 BLAKE2B 79b4c39ee3f9530db1d8a6cd62a6aa925e201d6b5b370b25c3884b160a83658688204005db612b1d18743ba39f0de6ccad8492910142ebfff7b550a5ec48516d SHA512 b160cb60de99a743226b472256d937ef6ace54f5350a83420f59ac2706cd0fb042d6f85fcac6c73e76c161c6225b956df8b00156dea9ce55d8b8225e8ca13e7f +DIST entr-5.5.tar.gz 21225 BLAKE2B 8a160894220b63c510fe432a033ba7770e8811da4c5d642391a61a11ca1865293675bc3adbb505b70da9d01b258c27770bc07fad18de7a993e172b2b1214df9b SHA512 5150744142cf1639289c2d845cf8cd3cbc0ef57fce8285bc0e2908c430d8344659ff064810e175e69bd8a6f06144734b2efa4d733e0fba7fec83a1f48d053a0d diff --git a/app-admin/entr/entr-5.3-r1.ebuild b/app-admin/entr/entr-5.5.ebuild index 1c8d1773e7a2..a894b25423a4 100644 --- a/app-admin/entr/entr-5.3-r1.ebuild +++ b/app-admin/entr/entr-5.5.ebuild @@ -27,10 +27,6 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/${P}-no-which.patch" -) - src_configure() { tc-export CC export PREFIX="${EPREFIX}/usr" diff --git a/app-admin/entr/files/entr-5.3-no-which.patch b/app-admin/entr/files/entr-5.3-no-which.patch deleted file mode 100644 index fbc96fe697f4..000000000000 --- a/app-admin/entr/files/entr-5.3-no-which.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-PR: https://github.com/eradman/entr/pull/108 - -diff --git a/system_test.sh b/system_test.sh -index 2687bb3..dbec661 100755 ---- a/system_test.sh -+++ b/system_test.sh -@@ -40,7 +40,7 @@ trap "$clear_tty; $clear_tmux; $clear_tmp" EXIT - - utils="file pgrep git vim tmux" - for util in $utils; do -- p=$(which $util 2> /dev/null) || { -+ p=$(command -pv $util) || { - echo "ERROR: could not locate the '$util' utility" >&2 - echo "System tests depend on the following: $utils" >&2 - exit 1 --- diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml index c54583354751..82225571628c 100644 --- a/app-admin/entr/metadata.xml +++ b/app-admin/entr/metadata.xml @@ -1,22 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> - <name>Petr Vaněk</name> - </maintainer> <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> + <email>arkamar@gentoo.org</email> + <name>Petr Vaněk</name> </maintainer> <maintainer type="project"> <email>shell-tools@gentoo.org</email> <name>Gentoo Shell Tools Project</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="github">eradman/entr</remote-id> </upstream> diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest index d22db10b0ff3..5cd4e19cf408 100644 --- a/app-admin/eselect/Manifest +++ b/app-admin/eselect/Manifest @@ -1,3 +1,2 @@ -DIST eselect-1.4.20.tar.xz 180272 BLAKE2B 424653d00eda45335c3aaae50f6fbf2e89486da4529f657596516352f3b7fcb9859ceb2dc5b9762a34c44fb64e645fa27c46b86453bf50be6e8ae820664a4289 SHA512 9589ed89c4d5d31f71d535886eb50da67b84dec8a13a5df081e7569efee861dede4eaa43a0bfb9930c5b95d4f334e19245cb8820a73f7361527da262da1d1fb2 -DIST eselect-1.4.21.tar.xz 182780 BLAKE2B 64db8ec3655bc78ad0e40be3c83625f46c49b1cd88e881dba843f05cdc56aba4e746b5fd27ab5c6663947dacc93211a98b224d48aeccc0154e203d3929d49116 SHA512 0dfb771401af3ce5f4002ac6717b37351b3a37b0421cf292b7b5a432f4ee2cff1705a44a45f8e5b3dee73440c7b49b2b76a69fb1cfa727874dd64285d1097eb7 -DIST eselect-1.4.22.tar.xz 183480 BLAKE2B 8f86bdddaf98bc075694bdf7283cbd366e0ef93635472b3bbac11fdd9765984cd82e493b16836bae66e4b2c42a9cb33ad0d2aacaaf8529b59e4898e11f172d26 SHA512 73a10278d604f462aefa099df398eec2b08aee33da69419351ff2faf1cf4c0f3de0f301d92015e52da63046fe7e2c1c388e11ac84b7deb3def505a59fa291dac +DIST eselect-1.4.26.tar.xz 184332 BLAKE2B ee1e8890802fc50646c8d1d5219f1ab0ec5cfc0138c758f73ad6baccf673992bbf3e763d8e84491f33e724ba4e1cf3bed6971ba7fa4373e0f06464ff4a5fa1e6 SHA512 397ae2f15d90d722eb84225b08f1afaaf6f89758bfae5d93b0a1c3eddc997c21e74ab62e09ee5e71941d3a8587b3372b64336d12054c3bbf0e56e1ba398a26f9 +DIST eselect-1.4.27.tar.xz 184464 BLAKE2B 718874f4d0651194f361ca3202e5140982812bf486c8efe82354944d55206b0113fa135992203e8baa00019c3fd773a90ddaf67157c16f4ac2d69965d9822fbd SHA512 f534785fc1f79869840f420b4ab2b2bf35593c504cce878a6d3d07f75012cf32288009ea9ac2a5607dba216a794110a64c5f2c54d5d8a3c641328489cecc024b diff --git a/app-admin/eselect/eselect-1.4.22.ebuild b/app-admin/eselect/eselect-1.4.22.ebuild deleted file mode 100644 index db0f598986ef..000000000000 --- a/app-admin/eselect/eselect-1.4.22.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 - -DESCRIPTION="Gentoo's multi-purpose configuration and management tool" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect" -SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz" - -LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs vim-syntax" - -DEPEND="sys-apps/sed - || ( - sys-apps/coreutils - app-misc/realpath - )" -RDEPEND="${DEPEND} - sys-apps/file - sys-libs/ncurses:0" -BDEPEND="doc? ( dev-python/docutils )" -PDEPEND="emacs? ( app-emacs/eselect-mode ) - vim-syntax? ( app-vim/eselect-syntax )" - -src_compile() { - emake - use doc && emake html -} - -src_install() { - emake DESTDIR="${D}" install - newbashcomp misc/${PN}.bashcomp ${PN} - dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt - if use doc; then - docinto html - dodoc *.html doc/*.html doc/*.css - fi - - # needed by news module - keepdir /var/lib/gentoo/news - if ! use prefix; then - fowners root:portage /var/lib/gentoo/news - fperms g+w /var/lib/gentoo/news - fi -} - -pkg_postinst() { - # fowners in src_install doesn't work for the portage group: - # merging changes the group back to root - if ! use prefix; then - chgrp portage "${EROOT}/var/lib/gentoo/news" \ - && chmod g+w "${EROOT}/var/lib/gentoo/news" - fi -} diff --git a/app-admin/eselect/eselect-1.4.21.ebuild b/app-admin/eselect/eselect-1.4.26-r1.ebuild index db0f598986ef..7651d332b72a 100644 --- a/app-admin/eselect/eselect-1.4.21.ebuild +++ b/app-admin/eselect/eselect-1.4.26-r1.ebuild @@ -3,6 +3,11 @@ EAPI=7 +# Packages sharing a common release tarball: +# app-admin/eselect +# app-emacs/eselect-mode +# Please bump and mark them stable together! + inherit bash-completion-r1 DESCRIPTION="Gentoo's multi-purpose configuration and management tool" @@ -11,14 +16,12 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz" LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs vim-syntax" -DEPEND="sys-apps/sed - || ( - sys-apps/coreutils - app-misc/realpath - )" +# coreutils for realpath +DEPEND="sys-apps/coreutils + sys-apps/sed" RDEPEND="${DEPEND} sys-apps/file sys-libs/ncurses:0" diff --git a/app-admin/eselect/eselect-1.4.20.ebuild b/app-admin/eselect/eselect-1.4.27-r1.ebuild index 338c3aba0442..7591adecec8d 100644 --- a/app-admin/eselect/eselect-1.4.20.ebuild +++ b/app-admin/eselect/eselect-1.4.27-r1.ebuild @@ -3,6 +3,11 @@ EAPI=7 +# Packages sharing a common release tarball: +# app-admin/eselect +# app-emacs/eselect-mode +# Please bump and mark them stable together! + inherit bash-completion-r1 DESCRIPTION="Gentoo's multi-purpose configuration and management tool" @@ -11,14 +16,12 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz" LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs vim-syntax" -DEPEND="sys-apps/sed - || ( - sys-apps/coreutils - app-misc/realpath - )" +# coreutils for realpath +DEPEND="sys-apps/coreutils + sys-apps/sed" RDEPEND="${DEPEND} sys-apps/file sys-libs/ncurses:0" diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild index 5922f93c46e0..6c2f3d7252b2 100644 --- a/app-admin/eselect/eselect-9999.ebuild +++ b/app-admin/eselect/eselect-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,11 +14,9 @@ LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )" SLOT="0" IUSE="doc emacs vim-syntax" -DEPEND="sys-apps/sed - || ( - sys-apps/coreutils - app-misc/realpath - )" +# coreutils for realpath +DEPEND="sys-apps/coreutils + sys-apps/sed" RDEPEND="${DEPEND} sys-apps/file sys-libs/ncurses:0" diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest index 1ac14f2c1641..ec87aec67339 100644 --- a/app-admin/exo/Manifest +++ b/app-admin/exo/Manifest @@ -1 +1 @@ -DIST exo-1.66.0.gh.tar.gz 5543430 BLAKE2B 26b52cfb118219fa4ee1203cf96c5cbe321eaee86ddbca31ecc9ceb287744b08cbeed659dbb54f8ffa4deadcb03fdea810c24dea11dd1cbbb3f1d1aa3220669e SHA512 3886f2e73d8a6ae41cbbdeb390c4f3036537249d61507cf7e397feeb588bfa70498a49e379933bffe16ef5b7df2018f1b5e975717adb8c65efb8c077a411d15d +DIST exo-1.77.1.gh.tar.gz 11091028 BLAKE2B 0aa0f82cff7e3807bd5237fc9c8f77583eb98c8b10a6c49a529c19f95017e60a752478e093f072f5e7b52b2f9b7386a60786f40938d43f0cef996d77fa969c38 SHA512 815b82761947eaf39b8336eb7f24b5db16b8fb5904b4234cbf20d1b1cec058182079b04f5eca9020475b60f3c9e93410e58e2bf1eafa30f341b9962c542437e4 diff --git a/app-admin/exo/exo-1.66.0.ebuild b/app-admin/exo/exo-1.77.1.ebuild index 8b7ec86e5d08..832c2c26b861 100644 --- a/app-admin/exo/exo-1.66.0.ebuild +++ b/app-admin/exo/exo-1.77.1.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 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -DEPEND="dev-lang/go:=" +DEPEND=">=dev-lang/go-1.16:=" RESTRICT="strip" QA_FLAGS_IGNORED=".*" diff --git a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild b/app-admin/fetchlog/fetchlog-1.4-r2.ebuild index 0c118b1a4e6c..5602f38821e8 100644 --- a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild +++ b/app-admin/fetchlog/fetchlog-1.4-r2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Displays the last new messages of a logfile" -HOMEPAGE="http://fetchlog.sourceforge.net/" +HOMEPAGE="https://fetchlog.sourceforge.net/" SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="snmp" @@ -19,7 +19,6 @@ RDEPEND=" >=dev-perl/Net-SNMP-4.0.1-r2 >=net-analyzer/net-snmp-5.0.6 )" -DEPEND="" PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch ) @@ -39,7 +38,7 @@ pkg_preinst() { elog "This utility can be used together with Nagios" elog "To make use of these features you need to" elog "install net-analyzer/nagios." - elog "This feature depends on SNMP, so make use you" + elog "This feature depends on SNMP, so make sure you" elog "have 'snmp' in your USE flags" elog } diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest index ba3b49b49b23..959d598d56fb 100644 --- a/app-admin/fifo-cronolog/Manifest +++ b/app-admin/fifo-cronolog/Manifest @@ -1 +1 @@ -DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8 SHA512 3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90 +DIST fifo-cronolog-1.2.3.tar.gz 4518 BLAKE2B c227304d98b2467a1ed7352399b1e53aba4dc005fa30a1be73b8cc96d61ee49d5f6a3703ccddd1ffef652c4090e9b5dfed9cce3f1254b959a1ccc07aac78b3f6 SHA512 557be1a663c5754a293092078b8a3710474bb1939c1ee65e4c560056238ca646e941e4ad82c0a90c02834fc90ddb2aae9047a4e73d42cf8c2c013f2a5d2c839c diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild index 93447d0b0efb..27cfe32f20a1 100644 --- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild +++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild @@ -1,27 +1,34 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit systemd DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on" -HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git" -SRC_URI="mirror://gentoo/${P}.tar.bz2" +HOMEPAGE="https://gitweb.gentoo.org/proj/fifo-cronolog.git" +SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz" LICENSE="BSD-2 GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="" RDEPEND="app-admin/cronolog" +src_compile() { + emake all +} + src_install() { dosbin fifo-cronolog + dosym fifo-cronolog /usr/sbin/squid-cronolog + dosbin fifo-cronolog-setup - newinitd fifo-cronolog.initd fifo-cronolog - newconfd fifo-cronolog.confd fifo-cronolog + newinitd openrc/fifo-cronolog.initd fifo-cronolog + newconfd openrc/fifo-cronolog.confd fifo-cronolog - dosym fifo-cronolog /usr/sbin/squid-cronolog + systemd_dounit systemd/fifo-cronolog@.service + dodoc README.md systemd/fifo-cronolog@example.service.env } pkg_postinst() { diff --git a/app-admin/fifo-cronolog/metadata.xml b/app-admin/fifo-cronolog/metadata.xml index 2d9f84796876..0e5cad21f726 100644 --- a/app-admin/fifo-cronolog/metadata.xml +++ b/app-admin/fifo-cronolog/metadata.xml @@ -8,4 +8,7 @@ <maintainer type="person"> <email>robbat2@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="gentoo">proj/fifo-cronolog</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest index 9fe067eea46f..07c5058dfc36 100644 --- a/app-admin/filebeat/Manifest +++ b/app-admin/filebeat/Manifest @@ -1,4 +1,2 @@ -DIST filebeat-7.17.3-deps.tar.xz 548178056 BLAKE2B 3c149f839405a7fda885c8269c58bdf973645470d5de1e916094fa018ebcc7c2e735ded1cc35e2607917186d0a1bb45b5ff16acb35e8d2a67a7e4106d5bc2f10 SHA512 f71fc619326b2dffc295f191a259641a473403e2528a6788ade6ac5a9d127c1c49ac6ae70123263897d30d1aac9f723f36b80af6d677dddd6958bff210280026 -DIST filebeat-7.17.3.tar.gz 101455865 BLAKE2B 57159a2495dfdcead4539a49422fb5509ca21820b68051082f74c6b2adea79c5a9066183a06c518382f74208611e1e25422e9b63d543290c63ae992a9e0593c6 SHA512 40b1cf3bafc50f9e33b0350f1432952b47a1b695aa9368bc029303f834bc795c691a2f4732fbba615d826e14bd21b8b74dca23157b796cd302db1844c186bc02 -DIST filebeat-7.17.5-deps.tar.xz 548163248 BLAKE2B 720a91b3e5a2fe16394ef3502f133837bd64d326bda6fadc066ae6517d9682a82614c6c699f9edacbe6d987ef326542bbf875a4063e2a4513ea296259f9b2445 SHA512 3b3cc39bdd966998a5b7867e60d390a539e1dd80ec7b8d68e3b0b9c1aab9eecca3810d1e989c74f15c20385a7c9a41e820129e28d33c2e47c2ba90d5e236a077 -DIST filebeat-7.17.5.tar.gz 101518610 BLAKE2B 4736a097e82741981841b78b18947b47fef32a50d6f6b498b4377f2e9ffedc79196b9ea0d70398a9830864f36520538ee868fcdf6081ea5b157e69aabe316ab9 SHA512 c82bc5c85492b6fe85b172d52d3faf4a6a2e8d8ec3f1964549beea6eda5a5e76ad0c55e084ad42ce429d0caac18fc7f0da769b9242c7959558800e0e3de7e14b +DIST filebeat-7.17.16-deps.tar.xz 633004812 BLAKE2B c10790fc07e6fcc583f88944a4d114cb712f8c27e27006d11bdbea5dfe2e36b504f767034c0b033af4363b44e3c38c92f6a490b4a65303d5aee49ebfe76c9f29 SHA512 91ed7b7e55d6659b52ce89756e49364595322e8486c3b9f13199f98871909d88c4fd0515e3867af43173b1b966965c992cc48c71de026a7e2a401a515092809f +DIST filebeat-7.17.16.tar.gz 101629004 BLAKE2B c67eed28574948022673737dba4d39409c23f5b4b94f3a9935090acd7a1c34d9302b35b42f6ab6e58cdf25a2dd948adbefc145f1075cd574e8196af000cf129c SHA512 db52d802f0f253e714a6e26436bbec82bfcf74f38d8f2a8f862a9318375b020676d3980a4b20f468ced0215de1eb0a009915a33a61652fe11de8098cd8542bfe diff --git a/app-admin/filebeat/filebeat-7.17.3.ebuild b/app-admin/filebeat/filebeat-7.17.16.ebuild index 808b401322c3..1cab002e7398 100644 --- a/app-admin/filebeat/filebeat-7.17.3.ebuild +++ b/app-admin/filebeat/filebeat-7.17.16.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 inherit go-module DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch" HOMEPAGE="https://www.elastic.co/products/beats" -SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://media.githubusercontent.com/media/hydrapolic/gentoo-dist/master/filebeat/${P}-deps.tar.xz" +SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/hydrapolic/gentoo-dist-filebeat/releases/download/${PV}/${P}-deps.tar.xz" LICENSE="Apache-2.0 BSD-2 MIT" SLOT="0" diff --git a/app-admin/filebeat/filebeat-7.17.5.ebuild b/app-admin/filebeat/filebeat-7.17.5.ebuild deleted file mode 100644 index 0adc1d2035d7..000000000000 --- a/app-admin/filebeat/filebeat-7.17.5.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit go-module - -DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch" -HOMEPAGE="https://www.elastic.co/products/beats" -SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://media.githubusercontent.com/media/hydrapolic/gentoo-dist/master/filebeat/${P}-deps.tar.xz" - -LICENSE="Apache-2.0 BSD-2 MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" -RESTRICT="test" - -S="${WORKDIR}/beats-${PV}" - -src_prepare() { - default - - # avoid Elastic license - rm -r x-pack || die - - # use ${PV} instead of git commit id - sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die -} - -src_compile() { - emake -C "${S}/filebeat" -} - -src_install() { - keepdir /etc/${PN} - keepdir /var/{lib,log}/${PN} - - fperms 0750 /var/{lib,log}/${PN} - - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd.1" ${PN} - - docinto examples - dodoc ${PN}/{filebeat.yml,filebeat.reference.yml} - - dobin filebeat/filebeat -} - -pkg_postinst() { - if [[ -n "${REPLACING_VERSIONS}" ]]; then - elog "Please read the migration guide at:" - elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html" - elog "" - fi - - elog "Example configurations:" - elog "${EROOT}/usr/share/doc/${PF}/examples" -} diff --git a/app-admin/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd deleted file mode 100644 index de4bf3ae8434..000000000000 --- a/app-admin/filebeat/files/filebeat.initd +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -FILEBEAT_USER="${FILEBEAT_USER:-root}" -FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}" -FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}" -FILEBEAT_DATADIR="${FILEBEAT_DATADIR:-/var/lib/filebeat}" -FILEBEAT_LOGDIR="${FILEBEAT_LOGDIR:-/var/log/filebeat}" -FILEBEAT_OPTS="${FILEBEAT_OPTS:-}" - -command="/usr/bin/filebeat" -command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS} -path.config $(dirname $FILEBEAT_CONFIG) \ - -path.data ${FILEBEAT_DATADIR} -path.home ${FILEBEAT_DATADIR} -path.logs ${FILEBEAT_LOGDIR}" -command_background="true" -command_user="${FILEBEAT_USER}:${FILEBEAT_GROUP}" -extra_commands="checkconfig" -pidfile="/run/filebeat.pid" -retry="TERM/5/KILL/5" -start_stop_daemon_args="--chdir ${FILEBEAT_DATADIR}" - -depend() { - use net - after elasticsearch -} - -checkconfig() { - if [ ! -e ${FILEBEAT_CONFIG} ]; then - eend "Please create a configuration file at ${FILEBEAT_CONFIG}" - return 1 - fi - - ebegin "Checking your configuration" - ${command} ${command_args} -configtest - eend $? "Configuration error. Please fix your configuration files." -} - -start_pre() { - checkconfig || return 1 - - checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_DATADIR}" - checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_LOGDIR}" -} diff --git a/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild index db9d3becf660..950b9a0df02f 100644 --- a/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild +++ b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="File control configuration system and IDS" HOMEPAGE="https://sourceforge.net/projects/filewatcher/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest index d372c73abf84..030120f0dd95 100644 --- a/app-admin/fluentd/Manifest +++ b/app-admin/fluentd/Manifest @@ -1 +1 @@ -DIST fluentd-1.14.4.gem 852480 BLAKE2B d358a067dbfd50164583e629133632039543560104ba5c2b71fb44e3eba0d4119e73556a64f20f60d1c4d67c9c430fa4ab9e3c37e6d0cba166de9396a9dc339b SHA512 09770d0a02e1a29cc0504cd384365fff9445ba5257950b7154f7ba939dbaefcc6b9b1441838cb89d4ddb3101f1715c271de27e1cf46aac430daf968ce145fbe0 +DIST fluentd-1.16.3.gem 880128 BLAKE2B c3b7379acf671bdf339cf4e7f2cc83aafebf4b8146203b04dcf7e1608263734979a77f3514373d9ff5740b421daa51edc3f10ab2b112b61cfac6aae4375efa55 SHA512 fb7d5fc9bd020ae4cd5c45d89740ed9a218156e9f64c170c9c6869448d111755a8e225c3539b8b2626a312406a329b5660d5d9ba2aa863eb1ee8ab69fb9c72a0 diff --git a/app-admin/fluentd/files/fluent.conf b/app-admin/fluentd/files/fluent.conf deleted file mode 100644 index 099d1b4af47d..000000000000 --- a/app-admin/fluentd/files/fluent.conf +++ /dev/null @@ -1,139 +0,0 @@ -# In v1 configuration, type and id are @ prefix parameters. -# @type and @id are recommended. type and id are still available for backward compatibility - -## built-in TCP input -## $ echo <json> | fluent-cat <tag> -#<source> -# @type forward -# @id forward_input -#</source> - -## built-in UNIX socket input -#<source> -# @type unix -#</source> - -# HTTP input -# http://localhost:8888/<tag>?json=<json> -#<source> -# @type http -# @id http_input - -# port 8888 -#</source> - -## File input -## read apache logs with tag=apache.access -#<source> -# @type tail -# format apache -# path /var/log/httpd-access.log -# tag apache.access -#</source> - -## Mutating event filter -## Add hostname and tag fields to apache.access tag events -#<filter apache.access> -# @type record_transformer -# <record> -# hostname ${hostname} -# tag ${tag} -# </record> -#</filter> - -## Selecting event filter -## Remove unnecessary events from apache prefixed tag events -#<filter apache.**> -# @type grep -# include1 method GET # pass only GET in 'method' field -# exclude1 message debug # remove debug event -#</filter> - -# Listen HTTP for monitoring -# http://localhost:24220/api/plugins -# http://localhost:24220/api/plugins?type=TYPE -# http://localhost:24220/api/plugins?tag=MYTAG -#<source> -# @type monitor_agent -# @id monitor_agent_input - -# port 24220 -#</source> - -# Listen DRb for debug -#<source> -# @type debug_agent -# @id debug_agent_input - -# bind 127.0.0.1 -# port 24230 -#</source> - -## match tag=apache.access and write to file -#<match apache.access> -# @type file -# path /var/log/fluent/access -#</match> - -## match tag=debug.** and dump to console -<match debug.**> - @type stdout - @id stdout_output -</match> - -# match tag=system.** and forward to another fluent server -#<match system.**> -# @type forward -# @id forward_output - -# <server> -# host 192.168.0.11 -# </server> -# <secondary> -# <server> -# host 192.168.0.12 -# </server> -# </secondary> -#</match> - -## match tag=myapp.** and forward and write to file -#<match myapp.**> -# @type copy -# <store> -# @type forward -# buffer_type file -# buffer_path /var/log/fluent/myapp-forward -# retry_limit 50 -# flush_interval 10s -# <server> -# host 192.168.0.13 -# </server> -# </store> -# <store> -# @type file -# path /var/log/fluent/myapp -# </store> -#</match> - -## match fluent's internal events -#<match fluent.**> -# @type null -#</match> - -## match not matched logs and write to file -#<match **> -# @type file -# path /var/log/fluent/else -# compress gz -#</match> - -## Label: For handling complex event routing -#<label @STAGING> -# <match system.**> -# @type forward -# @id staging_forward_output -# <server> -# host 192.168.0.101 -# </server> -# </match> -#</label> diff --git a/app-admin/fluentd/fluentd-1.14.4.ebuild b/app-admin/fluentd/fluentd-1.16.3.ebuild index 61c666cd7a7b..4b5c6efc3d20 100644 --- a/app-admin/fluentd/fluentd-1.14.4.ebuild +++ b/app-admin/fluentd/fluentd-1.16.3.ebuild @@ -1,11 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -USE_RUBY="ruby26 ruby27" -# ruby30 should be fine according to fluent docs but http_parser_rb and serverengine below doesn't. - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" +EAPI=8 +USE_RUBY="ruby31 ruby32" inherit ruby-fakegem @@ -18,19 +15,30 @@ KEYWORDS="~amd64" COMMON_DEPEND="acct-group/fluentd acct-user/fluentd" -DEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + test? ( + dev-ruby/async + dev-ruby/test-unit-rr + dev-ruby/rr[test] + dev-ruby/timecop + ) +" RDEPEND="${COMMON_DEPEND}" ruby_add_rdepend " + dev-ruby/bundler >=dev-ruby/coolio-1.4.5 >=dev-ruby/http_parser_rb-0.5.1 >=dev-ruby/msgpack-1.3.1 - >=dev-ruby/serverengine-2.0.4 + >=dev-ruby/serverengine-2.2.5 >=dev-ruby/sigdump-0.2.2 - >=dev-ruby/strptime-0.2.2 + >=dev-ruby/strptime-0.2.4 >=dev-ruby/tzinfo-1.0 + =dev-ruby/webrick-1.7* >=dev-ruby/yajl-ruby-1.0" +ruby_add_depend "test? ( dev-ruby/flexmock )" + all_ruby_prepare() { sed -i \ -e '/tzinfo-data/d' \ diff --git a/app-admin/fluentd/metadata.xml b/app-admin/fluentd/metadata.xml index 14214be60b30..effd619d79fe 100644 --- a/app-admin/fluentd/metadata.xml +++ b/app-admin/fluentd/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> + <maintainer type="person" proxied="yes"> + <email>jaco@uls.co.za</email> + <name>Jaco Kroon</name> </maintainer> - <maintainer type="project"> - <email>ruby@gentoo.org</email> - <name>Gentoo Ruby Project</name> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription lang="en"> Fluentd is an open source data collector which lets you unify diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest index 6230e2cc48f2..a72a447762d0 100644 --- a/app-admin/fsvs/Manifest +++ b/app-admin/fsvs/Manifest @@ -1 +1 @@ -DIST fsvs-1.2.5.tar.bz2 427494 BLAKE2B ac445bd6572ccdc589ec3d9e21127446a0553d29ac62b1e99e60b767cb1c06d8be13469bcdef03382fa6088bb3fdb740a10a0e39fc5707fbfba749472523bc12 SHA512 36ab5d04491d506b2891548f3ad458e7977bbd2e7d4b03e135b13d07adb22aedb261c28d5ddd3df895771806ef54c1bca6a1ef7bc5aa2e50e4b234ddf6cbe19c +DIST fsvs-1.2.11.tar.gz 498514 BLAKE2B 8683fe3c22a0ea0d4762d631e520596dc02d69059f4ff5d8719bd44405134e5b5100c594a260d1b55a9dd7c6d240a84a0c5e05a18006a7a5f193ce76178d934c SHA512 72f883dfef85cb8aeb4d3baf3a2de5bfb6b5479273027f86b52edfdd2ea6dac4b2271b83a9879add3d7c9008f80a2fef13671b9e5ed61958c72ff144d9fad086 diff --git a/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch b/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch new file mode 100644 index 000000000000..93daf9521d3e --- /dev/null +++ b/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch @@ -0,0 +1,68 @@ +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ + @echo '' + @false + +-configure: configure.in ++configure: configure.ac + @echo Generating configure. + autoconf + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -11,10 +11,11 @@ + ################################ Definitions ################################ + DIR := /usr/share/doc + +-VERSION := $(shell git describe --tags --always) ++VERSION := 1.2.11 + ++CC := @CC@ + CFLAGS := @CFLAGS@ +-CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' -Wno-deprecated-declarations ++CFLAGS += -Wall -funsigned-char -DFSVS_VERSION='"$(VERSION)"' -Wno-deprecated-declarations + LDFLAGS := @LDFLAGS@ + FSVS_LDFLAGS = $(LDFLAGS) + BASELIBS := -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre2-8 -lgdbm -ldl +@@ -48,11 +49,7 @@ + + + ################################ Targets ################################### +-ifeq (@CHROOTER_JAIL@, ) +-all: deps tags check-version check-dox $(DEST) lsDEST +-else +-all: tools/fsvs-chrooter +-endif ++all: fsvs + + + check-version: config.h fsvs.c +@@ -145,18 +142,11 @@ + + + ################################ Rules ###################################### +-%.o: %.c +- @echo " CC $<" +- @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + + # if the Makefile has changed, the output will (at least sometimes) + # change, too. + $(DEST): $(C_FILES:%.c=%.o) +- @echo " Link $@" +- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) +-ifeq (@ENABLE_RELEASE@, 1) +- -strip $@ +-endif ++ $(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) + + + # For debugging: generate preprocessed, generate assembler +@@ -171,7 +161,6 @@ + .%.d: %.c + @echo " deps for $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@ +-include $(D_FILES) + + tools/fsvs-chrooter: tools/fsvs-chrooter.c + tools/fsvs-chrooter: interface.h config.h diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch deleted file mode 100644 index f06070f4beee..000000000000 --- a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fixes --as-needed support(bug #294834) -Verbose build -Fixes underlinking(bug #463684) - patch went upstream - ---- fsvs-1.2.5/src/Makefile.in.orig 2011-11-11 22:19:12.000000000 +0400 -+++ fsvs-1.2.5/src/Makefile.in 2013-08-19 13:30:16.186082295 +0400 -@@ -18,7 +18,7 @@ - CFLAGS := @CFLAGS@ @NEED_FNESTED_FUNCTIONS@ - CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' - LDFLAGS := @LDFLAGS@ --FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -+FSVS_LIBS = -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -ldl - EXTRALIBS := @EXTRALIBS@ - WAA_CHARS?= @WAA_WC_MD5_CHARS@ - -@@ -146,13 +146,13 @@ - ################################ Rules ###################################### - %.o: %.c - @echo " CC $<" -- @$(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) -c -o $@ $< - - # if the Makefile has changed, the output will (at least sometimes) - # change, too. - $(DEST): $(C_FILES:%.c=%.o) - @echo " Link $@" -- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^ -+ $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(LIBS) $(FSVS_LIBS) $(EXTRALIBS) - ifeq (@ENABLE_RELEASE@, 1) - -strip $@ - endif diff --git a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild b/app-admin/fsvs/fsvs-1.2.11.ebuild index 35d79e90877b..20acd526eda7 100644 --- a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild +++ b/app-admin/fsvs/fsvs-1.2.11.ebuild @@ -1,38 +1,33 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit autotools DESCRIPTION="Backup/restore for subversion backends" -HOMEPAGE="http://fsvs.tigris.org/" -SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2" +HOMEPAGE="https://github.com/phmarek/fsvs" +SRC_URI="https://github.com/phmarek/fsvs/archive/refs/tags/${P}.tar.gz" +S="${WORKDIR}/fsvs-${P}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND="dev-vcs/subversion - dev-libs/libpcre - sys-libs/gdbm +RDEPEND=" dev-libs/apr-util - dev-util/ctags" + dev-libs/libpcre + dev-util/ctags + dev-vcs/subversion + sys-libs/db:* + sys-libs/gdbm" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${P}-as-needed.patch" -) +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_prepare() { - # fix #570596 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 default -} - -src_compile() { - # respect compiler - emake CC="$(tc-getCC)" + eautoreconf } src_install() { diff --git a/app-admin/fsvs/metadata.xml b/app-admin/fsvs/metadata.xml index 85e4ed814fa2..a2f4c00fbe77 100644 --- a/app-admin/fsvs/metadata.xml +++ b/app-admin/fsvs/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">phmarek/fsvs</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild index 41bd95f667fa..1c47d6fb1349 100644 --- a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild +++ b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild @@ -16,7 +16,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="debug" RDEPEND=">=dev-libs/glib-2:2 diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild index 5a58fce90093..1a6c7f1c05ae 100644 --- a/app-admin/gamin/gamin-0.1.10-r1.ebuild +++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org/~veillard/gamin/" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" RDEPEND=" !app-admin/fam diff --git a/app-admin/genromfs/genromfs-0.5.2.ebuild b/app-admin/genromfs/genromfs-0.5.2.ebuild index 830e6620cbee..66652e4daaf2 100644 --- a/app-admin/genromfs/genromfs-0.5.2.ebuild +++ b/app-admin/genromfs/genromfs-0.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,12 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Create space-efficient, small, read-only romfs filesystems" -HOMEPAGE="http://romfs.sourceforge.net/" +HOMEPAGE="https://romfs.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 arm64 ppc ~ppc64 ~s390 x86" +KEYWORDS="amd64 arm64 ~loong ppc ~ppc64 ~s390 x86" PATCHES=( "${FILESDIR}"/${P}-build.patch ) diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest index 8738eea007a7..4d9d955a16a8 100644 --- a/app-admin/gentoo-perl-helpers/Manifest +++ b/app-admin/gentoo-perl-helpers/Manifest @@ -1,2 +1 @@ -DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458720ec1d40d19ac3db3a6a57b26115603f224f2f1c4155ecd3190866dfa0ab648fdd3a98a90e9ed576e7bd3ad8bdaf9a73c6 SHA512 dce6addfebbdfd16da3b580776c34346eb60b2eaef9cc7bed03d5ae0bf028de7a0175fbf7f68113d44b645c3d5ca7f5175389478655b08c115a5342ff930e096 DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild deleted file mode 100644 index 75bf546bafd3..000000000000 --- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl" -HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers" -SRC_URI=" - https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz - mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz -" -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" - -# Assumed System: -# sys-apps/coreutils -# sys-apps/grep -# sys-apps/sed -# app-shells/bash -# sys-apps/gawk -# app-arch/tar - -RDEPEND=" - $(: --format support) - >=app-portage/portage-utils-0.60 - sys-apps/portage -" -DEPEND="" - -src_prepare() { - sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" \ - -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \ - "${S}/bin/gentoo-perl" \ - "${S}/lib/core-functions.sh" \ - || die "Can't patch bin/gentoo-perl" - default -} -src_compile() { :; } -src_install() { - exeinto /usr/bin - doexe "${S}/bin/"* - - exeinto /usr/libexec/gentoo-perl-helpers - doexe "${S}/libexec/"* - - insinto /usr/lib/gentoo-perl-helpers - doins -r "${S}/lib/"* - - dodoc "${S}/README.mkdn" "${S}/Changes" -} diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild index 968cd0d04e4a..8e302419914b 100644 --- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild +++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl" HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers" @@ -13,7 +13,6 @@ SRC_URI=" LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="" # Assumed System: # sys-apps/coreutils @@ -23,11 +22,11 @@ IUSE="" # sys-apps/gawk # app-arch/tar +# multiple --quiet, --format and anti-slot support) RDEPEND=" - $(: multiple --quiet, --format and anti-slot support) >=app-portage/portage-utils-0.80_pre20190620 " -DEPEND="app-arch/xz-utils[extra-filters]" +BDEPEND="app-arch/xz-utils[extra-filters]" src_prepare() { sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" \ @@ -37,7 +36,9 @@ src_prepare() { || die "Can't patch bin/gentoo-perl" default } + src_compile() { :; } + src_install() { exeinto /usr/bin doexe "${S}/bin/"* diff --git a/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild b/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild index 02746bc07a02..425f585ae197 100644 --- a/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild +++ b/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-single-r1 DESCRIPTION="Scripts to help retiring Gentoo developers" diff --git a/app-admin/git-credential-gopass/Manifest b/app-admin/git-credential-gopass/Manifest index 22eacff3571d..3366a7842e2a 100644 --- a/app-admin/git-credential-gopass/Manifest +++ b/app-admin/git-credential-gopass/Manifest @@ -1,4 +1,4 @@ -DIST git-credential-gopass-1.15.3-deps.tar.xz 36895816 BLAKE2B 16b480c0e0f40f8b8e5802f25ef45d117dc96853d9fab89c9c7f11bda57bd681fb3f03bf7231a5b848196e079bb6717775389c86e8130e2b1f2238791ff2148b SHA512 7952aa7223839b8d0967b96b3dedbd2361df50b5108210de98237d7445d5941c06d98e295a7f7e25e57e466fd062933f6ef71a630cbbbfbf8d55a035a46c9558 -DIST git-credential-gopass-1.15.3.tar.gz 20583 BLAKE2B caf091710a0fa4f6ac461c6beec4fe2add797cbaf7794a4675544fd3e878cd0e57c27280040605cca3879598922912194b70aa70e237a688362dfd9186b5824e SHA512 c3be30d502d77865dba660780903d195c2d328045150627a7a3412ec987f92ed931995e6fc6663a623b32de637cb600f878e633175ce5b813bfcafb0fc4a1b8d -DIST git-credential-gopass-1.15.4-deps.tar.xz 33138508 BLAKE2B 7cbb930e55f1ed53f3ce8c47e51d8066d1a518801d5d364b8c8b90b376910e916e34c5f2493cb062ac5c03e0b9aeb96119f129a8655b6ad3f1d9fec4600cb0a1 SHA512 14ecefd8b36513195cae86d355d974d596e859c46450121350af2d2aaf27f592b54e55e697c200eb89e94959f278e65712dbb4d534d0c1bcbc711fb4db829625 -DIST git-credential-gopass-1.15.4.tar.gz 20592 BLAKE2B 2fef319cb7c1d90c89512f305fffbbe88ce5efa25bde798adfebdbf1a29847b1c62d51ca4ece4262c6746e5abb0f31e01804e827de8fdd364fa6bfbe2a9fd414 SHA512 4e456c35fb5fb4d91fada4c2ccafa5a48c9261746653dd363638b1fccfeea647f465d0956146a18bb0d50ffb8bd2c7502497efcac54095db7d37441074aeb6cb +DIST git-credential-gopass-1.15.11-deps.tar.xz 288548804 BLAKE2B 5c59db36a25762169ee3cbb9e5b7f9c91bd3d97b5ef6dea2e45f0345240bae05a6998359d3880fe5ed240b0c57888f7fe00229d6b0c930843ae1c3aa51004863 SHA512 ccc70e912e92c70de7ec49e824d559db2bd4ef0c907813ce0063b758b88c39c75dcc5d307d8527c13650edbcc0ebad20d981b8f2fcb32c32272e945bfe18a38b +DIST git-credential-gopass-1.15.11.tar.gz 24602 BLAKE2B 3f479403071af80a08f9d28e9cce3fa492829fb7d6eb230f73ff1d84eaf3c4435fc82f3bfb2a7b29aa96c9a6c1c446d3160df5e0d3e3ff89b9e873e344b9afcf SHA512 50f5496a0ae6f60b9074d9c1a29d6dbcddeb6a0976859b6071ccf1fdb2b6796038d2f6dd5f8a3ce4644c5c31ad5f3447037bc87e9276287172174058ef75adfa +DIST git-credential-gopass-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938 +DIST git-credential-gopass-1.15.13.tar.gz 19323 BLAKE2B 6889fbb0f22b5a9ca882893bf0860bb41319e0f3ed01ea6c542caf8c94d4762116f5b84f907380dd723ffe1c57a7359a20cc1e05e7d3958d9f3a3debbd39c659 SHA512 f95d9ce853c5f9b46148d53504cad5992f701c776c3c4a2d53b10b7e94717651231ef5ab7cec7ab572c2badb75a0972c129ba09576598cf067bc4140f6c42196 diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.15.3.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.15.11.ebuild index 7f46921b8f13..974e33be5d96 100644 --- a/app-admin/git-credential-gopass/git-credential-gopass-1.15.3.ebuild +++ b/app-admin/git-credential-gopass/git-credential-gopass-1.15.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ inherit go-module DESCRIPTION="Gopass git-credentials helper" HOMEPAGE="https://github.com/gopasspw/git-credential-gopass" -SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.15.4.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild index ab81da8481dc..50939531c011 100644 --- a/app-admin/git-credential-gopass/git-credential-gopass-1.15.4.ebuild +++ b/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ inherit go-module DESCRIPTION="Gopass git-credentials helper" HOMEPAGE="https://github.com/gopasspw/git-credential-gopass" -SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest index c11b5468fc2f..faf378eb7a06 100644 --- a/app-admin/github-backup-utils/Manifest +++ b/app-admin/github-backup-utils/Manifest @@ -1,3 +1,4 @@ DIST github-backup-utils-3.0.0.tar.gz 104088 BLAKE2B f01229e6b152231eb832dec8bef41bb158cc200bbdd3c59c1abab299c572902efe6d27d093491bd8b0bf8f3e834d2938eb0127d5f28700ba75dcbdbcc8a21bb8 SHA512 e86420ef9d86d44560e27e00361ff1bb8ba7c15fb116ad9981e3196bc4c7c25bcff9a9f7dc8dae9bbbb9b2f3380b434199dbbe1ef7db5b1ba04ec1233aec320d DIST github-backup-utils-3.3.2.tar.gz 109517 BLAKE2B b9c48de60f10d1d20eda96d0fa69c7d1835c0cdca7dbb3a3659e2a527706d6d793c426d5032e2bd1ead58255cdca6cdf424da0cb6a06484c4a5b5a9b0d4bcbba SHA512 c8013d5775a0ad8193266c36b0afa91bd452dfd70499c74239c6e62a0c9d88ecd92e16495ad4bd64319e42ad7b781125c136b1a9945146d09add5a2165d31b16 DIST github-backup-utils-3.5.0.tar.gz 113871 BLAKE2B e6835c3efe04332df792827e2fdc54449e73a1fec055e7677174a1eaf2b4c9d43a2bc4c82741b056265fbf4eeea75ad62819d9d357d800ff3d4befcf5fcd4e39 SHA512 d77e30fe426b231c8d8aa1ca7867861a3427a5829d46184283a1beaea22b697dd6cf7343d1e65f40c9f6f9bcd05fea0c45892080292707b6b897599d4cbb566b +DIST github-backup-utils-3.8.0.tar.gz 116694 BLAKE2B 481f0c4345d1de791d023c906d58424d96bf9e96fd3e5d50f081f6cbdd29b4e068f4414db6e808511adb8110e609416490ba36140b5dfabcf2e738b7b91e6121 SHA512 327d777f0134838ab6d1b3e3dc702b35e81f8a682339638b248dfdd9580fdea5435cad5a4a539c65d91832a8b02f86e3bdd546c312fcfe9c1ef13d858bbadb9f diff --git a/app-admin/github-backup-utils/github-backup-utils-3.8.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.8.0.ebuild new file mode 100644 index 000000000000..ff176f840c72 --- /dev/null +++ b/app-admin/github-backup-utils/github-backup-utils-3.8.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit python-any-r1 + +DESCRIPTION="Backup and recovery utilities for GitHub Enterprise" +HOMEPAGE="https://github.com/github/backup-utils" +SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN/#github-/}-${PV} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +# moreutils parallel is now used for speedups in main code: +# https://github.com/github/backup-utils/pull/635 +RDEPEND="app-misc/jq + app-arch/pigz + net-misc/rsync + sys-apps/moreutils" + +# tests invoke parallel & rsync +DEPEND="test? ( + ${RDEPEND} + dev-util/checkbashisms + ${PYTHON_DEPS} +)" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_compile() { + :; +} + +src_install() { + dobin bin/* + insinto usr/share/${PN} + doins share/${PN}/version + + exeinto usr/share/${PN} + doexe share/${PN}/bm.sh + doexe share/${PN}/ghe-* + + insinto etc/${PN} + newins backup.config-example backup.config + + dodoc -r docs/* +} + +src_test() { + emake test +} diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest deleted file mode 100644 index 76808251a8df..000000000000 --- a/app-admin/gixy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e diff --git a/app-admin/gixy/files/gixy-0.1.20-backports.patch b/app-admin/gixy/files/gixy-0.1.20-backports.patch deleted file mode 100644 index 36c9cb693577..000000000000 --- a/app-admin/gixy/files/gixy-0.1.20-backports.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/gixy/core/regexp.py b/gixy/core/regexp.py -index 7a96187..f360604 100644 ---- a/gixy/core/regexp.py -+++ b/gixy/core/regexp.py -@@ -3,7 +3,11 @@ import logging - import re - import random - import itertools --from cached_property import cached_property -+ -+try: -+ from functools import cached_property -+except ImportError: -+ from cached_property import cached_property - - import gixy.core.sre_parse.sre_parse as sre_parse - -diff --git a/gixy/directives/block.py b/gixy/directives/block.py -index 5e5b1ed..cc9bcb0 100644 ---- a/gixy/directives/block.py -+++ b/gixy/directives/block.py -@@ -1,4 +1,7 @@ --from cached_property import cached_property -+try: -+ from functools import cached_property -+except ImportError: -+ from cached_property import cached_property - - from gixy.directives.directive import Directive - from gixy.core.variable import Variable -diff --git a/gixy/parser/raw_parser.py b/gixy/parser/raw_parser.py -index 6a30b7f..0f43308 100644 ---- a/gixy/parser/raw_parser.py -+++ b/gixy/parser/raw_parser.py -@@ -1,7 +1,11 @@ - import logging - import codecs - import six --from cached_property import cached_property -+ -+try: -+ from functools import cached_property -+except ImportError: -+ from cached_property import cached_property - - from pyparsing import ( - Literal, Suppress, White, Word, alphanums, Forward, Group, Optional, Combine, -diff --git a/requirements.txt b/requirements.txt -index dbf6d5f..47a1b54 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,6 +1,6 @@ - pyparsing>=1.5.5 --cached-property>=1.2.0 -+cached-property>=1.2.0;python_version<"3.8" - argparse>=1.4.0 - six>=1.1.0 - Jinja2>=2.8 --ConfigArgParse>=0.11.0 -\ No newline at end of file -+ConfigArgParse>=0.11.0 -diff --git a/setup.py b/setup.py -index e4314a6..e57842b 100644 ---- a/setup.py -+++ b/setup.py -@@ -18,8 +18,8 @@ setup( - url='https://github.com/yandex/gixy', - install_requires=[ - 'pyparsing>=1.5.5', -- 'cached-property>=1.2.0', -- 'argparse>=1.4.0', -+ 'cached-property>=1.2.0;python_version<"3.8"', -+ 'argparse>=1.4.0;python_version<"3.2"', - 'six>=1.1.0', - 'Jinja2>=2.8', - 'ConfigArgParse>=0.11.0' diff --git a/app-admin/gixy/gixy-0.1.20-r1.ebuild b/app-admin/gixy/gixy-0.1.20-r1.ebuild deleted file mode 100644 index 57fe1ddc0203..000000000000 --- a/app-admin/gixy/gixy-0.1.20-r1.ebuild +++ /dev/null @@ -1,28 +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="Nginx configuration static analyzer" -HOMEPAGE="https://github.com/yandex/gixy" -# Use GitHub source insted PyPi to get tarball with tests -SRC_URI="https://github.com/yandex/gixy/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}] - >=dev-python/ConfigArgParse-0.11.0[${PYTHON_USEDEP}] - >=dev-python/jinja-2.8[${PYTHON_USEDEP}] - >=dev-python/six-1.1.0[${PYTHON_USEDEP}]" - -distutils_enable_tests nose - -PATCHES=( - "${FILESDIR}"/${P}-backports.patch -) diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild deleted file mode 100644 index 136f4e903e33..000000000000 --- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop systemd toolchain-funcs - -DESCRIPTION="Single process stack of various system monitors" -HOMEPAGE="http://gkrellm.srcbox.net/" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.srcbox.net/gkrellm" -else - SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -fi -LICENSE="GPL-3+" -SLOT="2" -IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X" - -RDEPEND=" - acct-group/gkrellmd - acct-user/gkrellmd - dev-libs/glib:2 - hddtemp? ( app-admin/hddtemp ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - lm-sensors? ( sys-apps/lm-sensors:= ) - nls? ( virtual/libintl ) - ntlm? ( net-libs/libntlm ) - X? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/pango - )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.5-config.patch - "${FILESDIR}"/${PN}-2.3.5-width.patch - "${FILESDIR}"/${PN}-2.3.5-sansfont.patch -) - -DOCS=( Changelog CREDITS README ) - -pkg_pretend() { - if use gnutls && ! use ssl ; then - ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag." - ewarn "No ssl backend will be built!" - fi -} - -src_prepare() { - sed -e 's:-O2 ::' \ - -e 's:override CC:CFLAGS:' \ - -e 's:-L/usr/X11R6/lib::' \ - -i */Makefile || die "sed Makefile(s) failed" - - sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \ - -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \ - -i src/${PN}.h || die "sed ${PN}.h failed" - - default -} - -src_compile() { - TARGET= - - if use X ; then - emake \ - ${TARGET} \ - CC="$(tc-getCC)" \ - STRIP="" \ - INSTALLROOT="${EPREFIX}/usr" \ - INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \ - LOCALEDIR="${EPREFIX}/usr/share/locale" \ - $(usex nls "" "enable_nls=0") \ - $(usex lm-sensors "" "without-libsensors=yes") \ - $(usex ntlm "" "without-ntlm=yes") \ - $(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes') - else - cd server || die - emake \ - ${TARGET} \ - CC="$(tc-getCC)" \ - LINK_FLAGS="$LDFLAGS -Wl,-E" \ - STRIP="" \ - $(usex nls "" "enable_nls=0") \ - $(usex lm-sensors "" "without-libsensors=yes") - fi -} - -src_install() { - if use X ; then - emake \ - install${TARGET:+_}${TARGET} \ - $(usex nls "" "enable_nls=0") \ - STRIP="" \ - INSTALLDIR="${ED}/usr/bin" \ - INCLUDEDIR="${ED}/usr/include" \ - LOCALEDIR="${ED}/usr/share/locale" \ - PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \ - MANDIR="${ED}/usr/share/man/man1" - - docinto html - dodoc *.html - - newicon src/icon.xpm ${PN}.xpm - make_desktop_entry ${PN} GKrellM ${PN} - else - dobin server/gkrellmd - - insinto /usr/include/gkrellm2 - doins server/gkrellmd.h - doins shared/log.h - fi - - newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd - newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd - - systemd_dounit "${FILESDIR}"/gkrellmd.service - - insinto /etc - doins server/gkrellmd.conf - - einstalldocs -} diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild deleted file mode 100644 index b2ba84f7d156..000000000000 --- a/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop systemd toolchain-funcs - -DESCRIPTION="Single process stack of various system monitors" -HOMEPAGE="http://gkrellm.srcbox.net/" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git" -else - SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -fi -LICENSE="GPL-3+" -SLOT="2" -IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X" - -RDEPEND=" - acct-group/gkrellmd - acct-user/gkrellmd - dev-libs/glib:2 - hddtemp? ( app-admin/hddtemp ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - lm-sensors? ( sys-apps/lm-sensors:= ) - nls? ( virtual/libintl ) - ntlm? ( net-libs/libntlm ) - X? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/pango - ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - nls? ( sys-devel/gettext ) -" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.5-config.patch" - "${FILESDIR}/${PN}-2.3.5-width.patch" - "${FILESDIR}/${PN}-2.3.5-sansfont.patch" -) - -DOCS=( Changelog CREDITS README ) - -pkg_pretend() { - if use gnutls && ! use ssl ; then - ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag." - ewarn "No ssl backend will be built!" - fi -} - -src_prepare() { - sed -e 's:-O2 ::' \ - -e 's:override CC:CFLAGS:' \ - -e 's:-L/usr/X11R6/lib::' \ - -i */Makefile || die "sed Makefile(s) failed" - - sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \ - -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \ - -i src/${PN}.h || die "sed ${PN}.h failed" - - default -} - -src_compile() { - TARGET= - - if use X ; then - emake \ - ${TARGET} \ - CC="$(tc-getCC)" \ - STRIP="" \ - INSTALLROOT="${EPREFIX}/usr" \ - INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \ - LOCALEDIR="${EPREFIX}/usr/share/locale" \ - $(usex nls "" "enable_nls=0") \ - $(usex lm-sensors "" "without-libsensors=yes") \ - $(usex ntlm "" "without-ntlm=yes") \ - $(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes') - else - cd server || die - emake \ - ${TARGET} \ - CC="$(tc-getCC)" \ - LINK_FLAGS="$LDFLAGS -Wl,-E" \ - STRIP="" \ - $(usex nls "" "enable_nls=0") \ - $(usex lm-sensors "" "without-libsensors=yes") - fi -} - -src_install() { - if use X ; then - emake \ - install${TARGET:+_}${TARGET} \ - $(usex nls "" "enable_nls=0") \ - STRIP="" \ - INSTALLDIR="${ED}/usr/bin" \ - INCLUDEDIR="${ED}/usr/include" \ - LOCALEDIR="${ED}/usr/share/locale" \ - PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \ - MANDIR="${ED}/usr/share/man/man1" - - docinto html - dodoc *.html - - newicon src/icon.xpm ${PN}.xpm - make_desktop_entry ${PN} GKrellM ${PN} - else - dobin server/gkrellmd - - insinto /usr/include/gkrellm2 - doins server/gkrellmd.h - doins shared/log.h - fi - - newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd - newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd - - systemd_dounit "${FILESDIR}"/gkrellmd.service - - insinto /etc - doins server/gkrellmd.conf - - einstalldocs -} diff --git a/app-admin/go-updater/go-updater-0.2.0.ebuild b/app-admin/go-updater/go-updater-0.2.0-r1.ebuild index 78dc6698a598..40d7411844b6 100644 --- a/app-admin/go-updater/go-updater-0.2.0.ebuild +++ b/app-admin/go-updater/go-updater-0.2.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Checks if Gentoo go packages are compiled with the system's golang version" HOMEPAGE="https://github.com/mrueg/go-updater" @@ -10,15 +10,12 @@ SRC_URI="https://github.com/mrueg/go-updater/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="" RDEPEND="dev-go/goversion" -src_compile() { - :; -} +src_compile() { :; } src_install() { - dobin ${PN} + dobin "${PN}" dodoc README.md } diff --git a/app-admin/gopass-hibp/Manifest b/app-admin/gopass-hibp/Manifest index ddb056fcd474..2c3e36606a58 100644 --- a/app-admin/gopass-hibp/Manifest +++ b/app-admin/gopass-hibp/Manifest @@ -1,4 +1,4 @@ -DIST gopass-hibp-1.15.3-deps.tar.xz 37693396 BLAKE2B 24bb949660e9e38fe03ab2c6d1af2a4c46501352149d0532a99d1f8bede20aa10936af02d4cc4e94036eee50db21cab7e91c31aa9d15e34b4bf4ae88cc31e284 SHA512 060bf251850efb39590028a40d2922d3a2299550b4259c96b58e52a5ebc99e52bd341811f1a27676c5b5a0ab25d7094de3514e7f2d733caf64537bdb1cee56f6 -DIST gopass-hibp-1.15.3.tar.gz 24961 BLAKE2B 477a5bdd285e1ff53a24e1f9f7e860b3226bc936a1283d058ba7b614a9578bdaa36fae9367584b182057c0dc114f10dafebea11149f1d3841ff7d263a7a7edd2 SHA512 da0e894a3429c40a3c5351f09edd21a9eb0552fde7cabee9f33f0b37346ef61af24d66aed0e81cc99d8f1ada716a5bf0182c2e604c1bf2b8d38de077c359ad18 -DIST gopass-hibp-1.15.4-deps.tar.xz 33365976 BLAKE2B 15c125423cc52b89a93d650c30a94b95452d923884ef3637c5e04aef9885e89dfce4e1f2205ab18a362eea6624439accdb15420bc8fa950d4755cc741638deb6 SHA512 7f1312372ea9f134e81069de62d97d475c402e899248534923a9e5b3557360004dd92a01ca4bb0f1e3289c599bc027999742a9d24aa6922d8b2653f0e18a1f40 -DIST gopass-hibp-1.15.4.tar.gz 24968 BLAKE2B 04c20ac2e29fd4268a01aca998ac32884c41b8e9a5f40772427a54a737ada5bcd6da0224a5e5939db082ddb5cc216deb24c9eea6db9320f8c89618bbff5fcfbe SHA512 64cd2beed3c1089b0be474722caba9511abdfac875c1a47ee29d2ec26591edf613801d0d3687a58d1cb67d9235093922fe5372effc96a373f49b09e7ffec54b1 +DIST gopass-hibp-1.15.11-deps.tar.xz 288522100 BLAKE2B 623d425a5bbeea5c5746e18d0dd44d198fa4b54fd5112fc870a5e95f092324e4a477565260ee68bccf903601997561429ab5546c6b7aaa3cec6de816076fcbff SHA512 db7f26676aeb2c67ae0b8645e9feed57540adefc04bed4dba0072c6766cd020921def0a8dae8c26a29c10e26ad27d84983b76350d885118f8d6393e25fddaf3f +DIST gopass-hibp-1.15.11.tar.gz 28709 BLAKE2B 0ec749f89896067f1a1b444f1dbf4508e67129cd012ea565edadcb87779c9f6ea1b62d4ea5fe1bef37f5fde7615e8254c003dd36ad9f1be488f8679b10211383 SHA512 781393893567c7f0a8089a0a61e9bf794661a00ae01d7505dd7a851093d6f3d2b75bf5c494aaf6c9696f400b95debd737f3f4719cd974dc94c3bfc1eb7db91ea +DIST gopass-hibp-1.15.13-deps.tar.xz 29737100 BLAKE2B 25cce3936716dda6fd1c760d055a6df6e412f50678295f139724eb84291f6a4447f6cfc05f57b636e67316fab29e94b164615d1ac86dd8738f46e8ddde9b5e71 SHA512 21afb52268e527d4b58bebdab62af8b812a0b2977532c0a99ea092d8e549221169c3f7260b75949d5abc689a9fb1ca6bdcb1e7235f1f2d6360a915c170059ba2 +DIST gopass-hibp-1.15.13.tar.gz 24047 BLAKE2B 79da4ca110585b6b928a27c7fdbf9094ce8110ac4d4bd99e645ae192caf816ab2f9f89d988bff60d84469853d3d08ffdda8eb51de9ccdf53474cedd3017b9687 SHA512 eb2eff7ffd16c166ee9ebfaa52273893b4f349fddba900ea966d0b39bf5f6f22b37cb76de8e0a327002138f1013d227bb066afcb9ff785b9afded97ebba17030 diff --git a/app-admin/gopass-hibp/gopass-hibp-1.15.3.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.15.11.ebuild index 37f93d67124f..e30950cff996 100644 --- a/app-admin/gopass-hibp/gopass-hibp-1.15.3.ebuild +++ b/app-admin/gopass-hibp/gopass-hibp-1.15.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ inherit go-module DESCRIPTION="Gopass haveibeenpwnd.com integration" HOMEPAGE="https://github.com/gopasspw/gopass-hibp" -SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/gopass-hibp/gopass-hibp-1.15.4.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild index f3c5b3ef350d..dcc9f7b6470b 100644 --- a/app-admin/gopass-hibp/gopass-hibp-1.15.4.ebuild +++ b/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ inherit go-module DESCRIPTION="Gopass haveibeenpwnd.com integration" HOMEPAGE="https://github.com/gopasspw/gopass-hibp" -SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/gopass-jsonapi/Manifest b/app-admin/gopass-jsonapi/Manifest index 09e429a28b69..502172becc97 100644 --- a/app-admin/gopass-jsonapi/Manifest +++ b/app-admin/gopass-jsonapi/Manifest @@ -1,4 +1,4 @@ -DIST gopass-jsonapi-1.15.3-deps.tar.xz 37462824 BLAKE2B c6ec5937e0b029f70f378cc5ebda5b3dd70f426d67e0327f1851f68712fa6fc438841f2b1c6a403283a3a8a339c683970c10d11191d2ca282e0ebcc7c912876e SHA512 d41ff73f693283d33d9c0812ba929cf9fa2df51e616d653652cb2b2ffc8dd56f5b0a123cbdcf0659b579eb7dd6aa7895dd3a20b6df0420dc112dbdf48d5f5a72 -DIST gopass-jsonapi-1.15.3.tar.gz 32273 BLAKE2B ed0befce03a00336329f322a9d682a8237e72fc01816b1d3df35813cc360711f19051614fea8562e0fe47e1cd96607f4347cf57a08f5372b0a60896fa9fb88ed SHA512 90f1ddb51ed006e7504895f3b686192eec7571243601c3ab24e7525144c0ed338519a710258b5edd8d5b0b9b0bc8c6c319f37e3fb67ba1c938273be30b739989 -DIST gopass-jsonapi-1.15.4-deps.tar.xz 33151484 BLAKE2B 40ce78be07dcc3a795da0e76f5b66b2a2a95b222170655773f5ee62e849780d8d6c618233f19f28af3087e116935d6fc7f5ac0ba653158b5ea27014776d9ed26 SHA512 820f92f7ae7dbe9b546ddf7573c72a3b4a2516610932e499e6e15dbcb6a2fc16a5a8710b02c730d0e7654dd1ac9c0e57eb753df1236ef1b6edc2ae86b2e999b5 -DIST gopass-jsonapi-1.15.4.tar.gz 32293 BLAKE2B 5796bf2c8eceb50dc05643e27ec8673ca4bb350a57776b57e6b3aaa7379c643efbafe9eea1662af9615a68adad03ef82eb76fa01ae209fa59a0cffaecfe225a7 SHA512 9471210eb1feb6bdefd88c2c051fd2327ac0915963c6958f9ca2991139437e21c964e7da549d1803367c2b77b6755211921651ffaa2a14925b00826410cb4651 +DIST gopass-jsonapi-1.15.11-deps.tar.xz 288583480 BLAKE2B f914d07a5b00f82bb1baa3114736fdde720a8bfb4b2378c60015501c281a14b595fff96c40b06c0f9f8d867e5b2004a43aa9eed4e3cf4016bdfb2a8acb221a78 SHA512 220f31aae7db0a268b4658f1464c8b1256958f2d220ebc028701db1ab2eda998b92d493e0facf741fc4d83135cf53d3fda5ac24f84365cd567da3d825623b0f6 +DIST gopass-jsonapi-1.15.11.tar.gz 36121 BLAKE2B cc9832c9473d1ed0095ff10f6fbbe763d0b4a3a76fb891089f75a0cd0eb677e1c1c87598ff8beb1494d5790870c39d78df0c52ce9be68a127e0d8d725a9dcdc0 SHA512 7231edc6bf6a529761a193fda40fdf254ffdaab6853d9a265d4d7ff3fcdc08fb418f9c4f1a05f32180eccde5add1a5276fa01133fc90a61c57c4c9793a9abc3a +DIST gopass-jsonapi-1.15.13-deps.tar.xz 149388536 BLAKE2B 2b5068a830edef67e330f918081bbdf218a2a0e80dc6c26e3d7b9d1d3779919dd869f57af32b0580f5be4787dc6df1325b5b1aba864c0bf0c2fd9d3e1c65364f SHA512 b6034103e0df9897cb95db3b8c9dc2895d7680385de14afcf7ab20db1d7eb537fa86ec56447267623b8493788802b1a1d6a9abff5c9d76f171847b79994cfa16 +DIST gopass-jsonapi-1.15.13.tar.gz 32433 BLAKE2B 6e16c2b060f2a380ede13840bea419b76b5e00cbc0dd29bbf72fc41900acfdeb6bb63908d09bfecbdc89c8c7266274a722fbb6d4b5848ee42fd986d36c3e30ca SHA512 e4b92558d17b27f4f4aada045ccfae4237e2021310ce1c64f3c29406c17f9f73ff61891ede96baebd741b4af15c0584ba8fe9fcb9693e288d17947e606d837b3 diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.3.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.11.ebuild index ddab8fe42629..828cd8d04aa5 100644 --- a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.3.ebuild +++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ inherit go-module DESCRIPTION="Gopass Browser Bindings" HOMEPAGE="https://github.com/gopasspw/gopass-jsonapi" -SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.4.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild index a25268591243..699540bb5843 100644 --- a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.4.ebuild +++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ inherit go-module DESCRIPTION="Gopass Browser Bindings" HOMEPAGE="https://github.com/gopasspw/gopass-jsonapi" -SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/gopass-summon-provider/Manifest b/app-admin/gopass-summon-provider/Manifest index 5165dbf9420f..e41c0b45e045 100644 --- a/app-admin/gopass-summon-provider/Manifest +++ b/app-admin/gopass-summon-provider/Manifest @@ -1,4 +1,4 @@ -DIST gopass-summon-provider-1.15.3-deps.tar.xz 37377176 BLAKE2B 52da3b10cd05df981c2f1fc74d3a37b4136ac383f8388965d384573562ba70a52fa6894440f9f19378b24a4df6116ef7882684a4c3c4c2f30a5408715fcb2894 SHA512 e616b6ef0c6d300f62761e63a9184a243d34630269e0a2a85c9294e6b209a349421fba73c21b50df93c2e7ffd70582e162681b50c28c3effecae51d766b1515c -DIST gopass-summon-provider-1.15.3.tar.gz 17573 BLAKE2B 641f84b3ad27fa3af961a3d2463e7b476343238284b45575f9a76b12d811f1426943888129b19c1e60ca22debb560854ebded9b9966c16b0dc91e30f929892ff SHA512 d06734997651492aeb3d6b91bf8b15a48da3c2b7a5e7c8dec6fa40fa90e4e0e05ba89a73e100f27e1523f2c426e30f6fb07faf14151e98fe81e7403a468dcc33 -DIST gopass-summon-provider-1.15.4-deps.tar.xz 33138508 BLAKE2B 7cbb930e55f1ed53f3ce8c47e51d8066d1a518801d5d364b8c8b90b376910e916e34c5f2493cb062ac5c03e0b9aeb96119f129a8655b6ad3f1d9fec4600cb0a1 SHA512 14ecefd8b36513195cae86d355d974d596e859c46450121350af2d2aaf27f592b54e55e697c200eb89e94959f278e65712dbb4d534d0c1bcbc711fb4db829625 -DIST gopass-summon-provider-1.15.4.tar.gz 17546 BLAKE2B 9c0a8fc50ed4f39139d5b14e389066afc42814ff60036022877fe933b598f100b2169455b4576a2d83d18ea19c8ebce852510940e2c24e8a61073f074509c444 SHA512 6ba06f561379284bc1344ca6982f8bb7ed6641c790bc4907b235fc5a330551f829b21aadb4a72f962692d5d36bde68845f798eb9cc4116787a9015fd2bfc65d3 +DIST gopass-summon-provider-1.15.11-deps.tar.xz 288548804 BLAKE2B 5c59db36a25762169ee3cbb9e5b7f9c91bd3d97b5ef6dea2e45f0345240bae05a6998359d3880fe5ed240b0c57888f7fe00229d6b0c930843ae1c3aa51004863 SHA512 ccc70e912e92c70de7ec49e824d559db2bd4ef0c907813ce0063b758b88c39c75dcc5d307d8527c13650edbcc0ebad20d981b8f2fcb32c32272e945bfe18a38b +DIST gopass-summon-provider-1.15.11.tar.gz 21218 BLAKE2B e042b2a003fa63fd79eaa24f3c50f1864238b7ae5c8d879c88c74c3795b6a9f97208c0b8ab51f3cde07a6a66155841a13517f49d900fd8fd49518775691e3926 SHA512 ae80aabe2216f37e1ac59509b3f7b2d785c0c0e20e7cc9fd42c170f7924be900e2b827daf117e174c69257595650ab287489017981c2988e6a5c1e4007ab1720 +DIST gopass-summon-provider-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938 +DIST gopass-summon-provider-1.15.13.tar.gz 16086 BLAKE2B b3b7656daf1189454c77772915120ab77615cf953ca1434919c901c5c0b708f0b1e124cfa63e9d8fa847d1aa12e403b630ccd023e16d6d3ef4d4cb507c7b36b9 SHA512 74809663c6b754894dc2f86c2153325b49bac862dbd29794b1997a11de34fd2bec4ddc583fefc19d4b920df64deedd7d9c508798d90426051d73648c3b545b7e diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.3.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.11.ebuild index 5e5d48b3911a..3dd1d2e881c7 100644 --- a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.3.ebuild +++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ inherit go-module DESCRIPTION="Gopass Summon Provider" HOMEPAGE="https://github.com/gopasspw/gopass-summon-provider" -SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.4.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild index ee10d170bf67..44e42f854afe 100644 --- a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.4.ebuild +++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ inherit go-module DESCRIPTION="Gopass Summon Provider" HOMEPAGE="https://github.com/gopasspw/gopass-summon-provider" -SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest index 08d8376794ab..e65f6f8ffda2 100644 --- a/app-admin/gopass/Manifest +++ b/app-admin/gopass/Manifest @@ -1,4 +1,4 @@ -DIST gopass-1.15.3-deps.tar.xz 36970888 BLAKE2B e338ba7a6a248694d33116a68aefc3abbe3b6b3a9a86896b5a0c5286824bffb94bb2715c8e9c1fc6ad0715897fa39e8fd46c0734adaafe5318dcdbc0eb0ac4b2 SHA512 2a5a011b170cf2635ab33399dec5661bb7ce297508878a82f38a3b6090c4b75086592da59ff07b81873ee67786be345d3092c69730b7e3c4234b048df1898ae4 -DIST gopass-1.15.3.tar.gz 2293686 BLAKE2B f6a5191dbb6642f448103d0b5017d792be2d7ab7d1156ceeebe52dc7bdaf9b027bf417982f0eb7a189ad09a8df06eab1fc2a637c8219a72721d583542ab51372 SHA512 1638c681c4343ff42247d7de5c153e9f992d34fc46b97a5199047c38f2658d968e8bd81029447f7768b39bf432464eb2a24d25215a7cff228e108b3ca4536220 -DIST gopass-1.15.4-deps.tar.xz 34045072 BLAKE2B d8525a166df31c99b20a1a7262c2e287b7e429dcd010183585fbac7e58ae8ce4d5430fb936da0b9a85fd8a2f0ff08555d02140a649fddc07c818e11b3bcdb287 SHA512 0953101962d77116e788858652a98ffa3b8c0bd58137f59791da45d6e73cfd5fa39e40edd400c5d881cc549fc1b155b17dda48c6f59d9e06b6c000b259098d2a -DIST gopass-1.15.4.tar.gz 2301976 BLAKE2B f947d0e7b7ba599743404a231d9b09380d0069489543e1cc306eb11a3dbf369368dc8c8a464abac04558907fa6c93982a56575b79b7920ee84a46c94beb815ae SHA512 c6cf67de3b3ace253822ea9890a50ecbd2829eb7b625d05327d1b3549ed3ff6b84d1155f71276fa94b6392012b0c87b4b9e488ca0d14915d40af77fc21325603 +DIST gopass-1.15.11-deps.tar.xz 288006888 BLAKE2B 527cef72eb493425111c6fd0a872bb31c63381226c823143e5d722cb59172a08901a50fce7042d329370bc83dd66205833e85608d68ce9b2037db89eb1a1b8a7 SHA512 978c5a915d382b8fe6360744c45c696f8c3c571df1341496537be73896d100eda78be1630b2f4a3ccd73d828d566a483bc057a302683aa4ddf92f46b8fa49e03 +DIST gopass-1.15.11.tar.gz 2319860 BLAKE2B 923be5effa8ca5a77a12bcd2692d2a07b68c6d068a579022e359a5f6e485813c37dc7e34acfeb1f0deec4e1075a54dd75b408ef0e07713cf7ffc2cfde2e9ac38 SHA512 ec3231f6cf903ba3a70f4721f04613ddf0e28e820c98a708c861ae68c993162a1346f62332132c00abd218f82f0ed0da0f8b86297427e813b0688a8eee5128be +DIST gopass-1.15.13-deps.tar.xz 284979668 BLAKE2B 12e42b897dfc613de810cc4c42e2318b5cad013e14b007daba454b800092f6e408e5ca10731b14d895673cd9426b322d94615a45954e3a0871b0b46533b6f6c9 SHA512 5e4a2f564d0140d77cdaf52a3784d75984db8b68152bf7137d3fbd727238e9509d56d280ceb1106fa47198bb8bc52980637652c10bd95524063bf1e3e962fdfb +DIST gopass-1.15.13.tar.gz 2328529 BLAKE2B 276ea675c7978ac1627cb313b595d9f252cc3aae29245eca758aed3b6632ddcdfa0da93cdc06f4c0767a2d5f58ded41fcccfac774b5001351bb4b743e976c595 SHA512 b7fcc7814ccad0cf0e3116eac848df080338e313ddcbb0cc8413cb353a1596b250aed427c97e791326e04c6c4241dbb529e112398218f2a905fc0fb48bc49963 diff --git a/app-admin/gopass/gopass-1.15.3.ebuild b/app-admin/gopass/gopass-1.15.11.ebuild index 67107d2d0faf..b0173b8ad5a6 100644 --- a/app-admin/gopass/gopass-1.15.3.ebuild +++ b/app-admin/gopass/gopass-1.15.11.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 @@ -7,8 +7,8 @@ inherit go-module optfeature DESCRIPTION="a simple but powerful password manager for the terminal" HOMEPAGE="https://www.gopass.pw/" -SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/gopass/gopass-1.15.4.ebuild b/app-admin/gopass/gopass-1.15.13.ebuild index c54c2b1d89a1..a01fea7d6355 100644 --- a/app-admin/gopass/gopass-1.15.4.ebuild +++ b/app-admin/gopass/gopass-1.15.13.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 @@ -7,8 +7,8 @@ inherit go-module optfeature DESCRIPTION="a simple but powerful password manager for the terminal" HOMEPAGE="https://www.gopass.pw/" -SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" +SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" diff --git a/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-musl-setlocale.patch b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-musl-setlocale.patch new file mode 100644 index 000000000000..9542324599e2 --- /dev/null +++ b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-musl-setlocale.patch @@ -0,0 +1,11 @@ +Bug: https://bugs.gentoo.org/894204 +--- a/src/main.c ++++ b/src/main.c +@@ -17,6 +17,7 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA */ ++#include <locale.h> + + #include "configure.h" + #include "interface.h" diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r1.ebuild new file mode 100644 index 000000000000..4b4beb5a39c2 --- /dev/null +++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Graphical tool to show free disk space like df" +HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree" +COMMIT="bdda379b9109a226a37801505a19da91494144a6" +SRC_URI="https://gitlab.com/mazes_80/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="gtk2" + +RDEPEND=" + dev-libs/glib + x11-libs/cairo + x11-libs/gdk-pixbuf + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.4-musl-setlocale.patch +) + +src_configure() { + if use gtk2 ; then + econf $(use_with gtk2) + else + econf --enable-old-color-selector + fi +} diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20221113.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20221113.ebuild index 8ffa6e29080b..45b556292c66 100644 --- a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20221113.ebuild +++ b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20221113.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=8 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${ LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm64 ppc64 ~riscv x86" IUSE="debug" RDEPEND="dev-libs/glib:2 diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild index 2f775dc95ae0..ba1f73bb9e86 100644 --- a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild +++ b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild @@ -3,16 +3,17 @@ EAPI=8 +# ebuild generated by hackport 0.8.0.0.9999 + CABAL_FEATURES="nocabaldep" inherit haskell-cabal DESCRIPTION="Rebuild Haskell dependencies in Gentoo" -HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" +HOMEPAGE="https://github.com/gentoo-haskell/haskell-updater#readme" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" DEPEND=">=dev-lang/ghc-6.12.1:=" diff --git a/app-admin/haskell-updater/haskell-updater-9999.ebuild b/app-admin/haskell-updater/haskell-updater-9999.ebuild new file mode 100644 index 000000000000..05dcc8087bf7 --- /dev/null +++ b/app-admin/haskell-updater/haskell-updater-9999.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.8.0.0.9999 +#hackport: flags: +pedantic + +CABAL_FEATURES="nocabaldep" +inherit haskell-cabal git-r3 + +DESCRIPTION="Rebuild Haskell dependencies in Gentoo" +HOMEPAGE="https://github.com/gentoo-haskell/haskell-updater#readme" +EGIT_REPO_URI="https://github.com/gentoo-haskell/haskell-updater.git" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="" + +# Need a lower version for portage to get --keep-going +RDEPEND="|| ( >=sys-apps/portage-2.1.6 + sys-apps/pkgcore )" +DEPEND=">=dev-lang/ghc-6.12.1" + +src_prepare() { + default + + if use prefix; then + sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \ + "${S}/Distribution/Gentoo/Packages.hs" || die + + sed -i -e 's,"/","'"${EPREFIX}"'/",g' \ + "${S}/Distribution/Gentoo/GHC.hs" || die + fi + + sed -e 's/^version:.*/&.9999/' -i ${PN}.cabal || die # just to distinct from release install +} + +src_configure() { + haskell-cabal_src_configure \ + --flag=pedantic \ + --bindir="${EPREFIX}/usr/sbin" \ + --constraint="Cabal == $(cabal-version)" +} + +src_install() { + cabal_src_install + + dodoc TODO +} diff --git a/app-admin/haskell-updater/metadata.xml b/app-admin/haskell-updater/metadata.xml index 937381521944..1764e6586336 100644 --- a/app-admin/haskell-updater/metadata.xml +++ b/app-admin/haskell-updater/metadata.xml @@ -5,4 +5,8 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> + <upstream> + <remote-id type="hackage">haskell-updater</remote-id> + <remote-id type="github">gentoo-haskell/haskell-updater</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest index 57ee4ab50bf6..65239aedf187 100644 --- a/app-admin/hcloud/Manifest +++ b/app-admin/hcloud/Manifest @@ -1 +1,2 @@ -DIST hcloud-1.31.1.tar.xz 1735560 BLAKE2B 66b2deaefbf61a72bf6a9e004c29d1198e5cfd40956e9936d5db27903aff5f8151c230da61b33ce4231885613d53ba5c96f99fb10df03fdcc241ec32fa465de5 SHA512 b61683ea54455be1db0ae196615642d0247e56ca51f3848847fba09124a45606aea2495f4408694acc5e819d9dc79ffdb2b9ce4e85aade7dea0335be94461066 +DIST hcloud-1.42.0.tar.xz 1876444 BLAKE2B e7ed2e01a7c6bb106a5c46e21e26d8b6bdd7636b64c7b354674364c3db8c1776f09f199ea022e2f311e873490b737490ea22045aa00147c6066ff0a7fb96d563 SHA512 dab916666ec17b9675ba0a559170859779289c36739ac4c3d72445c87fb440df475e55e52ed628fd8d1a52421c6df4d47b0b51713e476753a66da74b3a7bf11c +DIST hcloud-1.43.1.tar.xz 1889004 BLAKE2B 563cde962cf1fd180bbef60127b714419c09da198afeb4923f8fc1cd48850131b3b91de243de43e269497f36d14757a1e71941d30dfbee98baebb533f20e6cdd SHA512 c8fa46e9d3e2c73cc2d86e597bebf6e1dbf28b7145dbc272c403607807251ac27eee14b9ad267fdf2aa730da16ce52be4d2b0d94653612b4f375f1779c95d90b diff --git a/app-admin/hcloud/hcloud-1.31.1.ebuild b/app-admin/hcloud/hcloud-1.42.0.ebuild index ff665c30f1cc..c073e3b5e053 100644 --- a/app-admin/hcloud/hcloud-1.31.1.ebuild +++ b/app-admin/hcloud/hcloud-1.42.0.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit go-module DESCRIPTION="A command-line interface for Hetzner Cloud" HOMEPAGE="https://github.com/hetznercloud/cli" @@ -11,13 +13,8 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64" -IUSE="" -DEPEND="dev-lang/go:=" -RESTRICT="strip" -QA_FLAGS_IGNORED=".*" - src_compile() { - go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed" + ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} } src_test() { diff --git a/app-admin/hcloud/hcloud-1.43.1.ebuild b/app-admin/hcloud/hcloud-1.43.1.ebuild new file mode 100644 index 000000000000..c4449b25b091 --- /dev/null +++ b/app-admin/hcloud/hcloud-1.43.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="A command-line interface for Hetzner Cloud" +HOMEPAGE="https://github.com/hetznercloud/cli" +SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +src_compile() { + ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.versionPrerelease=gentoo" ./cmd/${PN} +} + +src_test() { + # For upstream a simple test is run 'hcloud version' + ./hcloud version + if [[ $? -ne 0 ]] + then + die "Test failed" + fi +} + +src_install() { + dobin ${PN} +} diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest index ceaf44e85172..8be10b71633c 100644 --- a/app-admin/helm/Manifest +++ b/app-admin/helm/Manifest @@ -1,4 +1,6 @@ -DIST helm-3.10.1-deps.tar.xz 125283080 BLAKE2B 3a7354a910174a2b6e80da90da37c7e5884273cdec2657e101e444587f92fcdda243e3539c481a1339bc1c20314ded1126b7953064758756d590bd82fb9bca42 SHA512 99ad12cc7b7b873f3b1988e5f9d53c55b8d54a29081804e6d4f9b233aebaeb9d0454c7e5aff9ca4a370fda96f4fda8f40e5fade3af4075da15340e44ee8f3973 -DIST helm-3.9.4-deps.tar.xz 126444776 BLAKE2B b506593f17afcc1c4e70b99eed44c2142c114503c92f01c19ae7bbf92867899a9058d80806bb16ff470e1c81bf2490183651d522a242487aa1c5ce29d7f63ad3 SHA512 ed07887c740d74b66d489eb5e0419a3e61cfc575684a8c02b507cb297bdbc12d80beb6a13b502349c3fc9806db16e0d2625d3f13747baf68d108cca22eb9c7c7 -DIST k8s-helm-3.10.1.tar.gz 701955 BLAKE2B 869e93ffdedbfd0dc405b287ca6fcd7dc3943f6d51b13c5482a48589235ada7e080aa8d0fcbd3b640e486c90e795bf563a5c6367f4f6116be6357a6cd1052113 SHA512 5d72ef0031b9988ad3d263ed349dd0e1770ccdbeb0e05e057f375a5b6c3bdf5d214f8d7bd004b8500846269e4acdde6f51206d8c422a4a4af7341baa6cdd348e -DIST k8s-helm-3.9.4.tar.gz 704880 BLAKE2B c96e474ca882fe0b7ba5d9045f04a4e6af62f4d9d3c735f0ae89d03eac06c0c8118ba1b7ffcb7594ad23707c88c7e10d781de4701b8300e124ae767f8917dae1 SHA512 8a02d094744036bcbfeefdd369b2e5e725c0e08cc2891e07aaebf4656fc62030e91ea00b97c1f8ebe33f2e436927d380b24e416509c944468165d35c892bf846 +DIST helm-3.11.2-deps.tar.xz 125570640 BLAKE2B 7dd267c0070add0bd9ce70bc115cf9d2b427e32c5040f900ff750218aafcee331712ddc8da8c9655f06522696c5f4923a73ba8b94a13f16d09b8973d447817ad SHA512 4223461fa3d0032826387a4170492df561f828546fd4f4307ec5f2006e2abb77275382ebab57baea81767de97bcaa3642d88a022b07448e452e151d83fc04652 +DIST helm-3.12.3-deps.tar.xz 156473664 BLAKE2B 88e2e99465f977b1bec52350a3c4988a595152bacf8db0208e81b38c050ccbadb48f97e3c239ddae5fa8d16d04be5bff6d76fa09ce8fdfc73487c2a44980a2ab SHA512 211775262e51d2ebabd4bf991ba7ecc8fc0fa6b9fa06e35cb6edf127bbc21143fd04a6441759dba423950def31951067407e253b3554b9efd56b4ed93444f7ea +DIST helm-3.13.2-deps.tar.xz 148836588 BLAKE2B 517f09305f68ef0c5ee34aecf2c5cd846a455a2fde725b4ef7befbb04bb731f8ba4c675b95d8d00be591ab02a60c707345ac4517bf235025fc3a5383ecd390cc SHA512 6785d15244fd94f884177db702436255dcee91e8d866ba5258d25d5a3d21d91c3de7b1644bf43a139d353005708c0ff615da1b09b3a18b3547efc05441d27ae2 +DIST k8s-helm-3.11.2.tar.gz 733884 BLAKE2B 2077927a61b8dcbf5907f8b2760445c8f846c186d504fc9bc9037fdafa4ad15cd8ccaaed3033be7d96cc3e05c74c283bf84c69d666721fef43198c44529db681 SHA512 32b251abf520692490e5dc9affa33b73955540a90854c84cc645364be8a4ca7afa1a9bf356a19be1efba6d35d36ef69f7b420402f73b96790f04635e9e881756 +DIST k8s-helm-3.12.3.tar.gz 721672 BLAKE2B d426d77e8fc8bb4ccd149e05bb3ee6f2ac38260a609bd2a5301a6318b961fb2ac19cd30f0c1372eaad67c5b8d301e356f310653ed8a682eba77d980cb0bf35e7 SHA512 25015a8ce8f04887ebb3add1a151670ff500c24b5b8933cfe3a956db1478483902a9c9c5bf57887b9f4b891e8d479752d9422ee68b43b9140fa0edc37cf38753 +DIST k8s-helm-3.13.2.tar.gz 718707 BLAKE2B 10fa4c7212eeb9bfd3bbe1f3881c67ae0de83ec8931c20cb2fb5e35b5a10207fc9960d21e81c0796e6e37353fd4a2e5afe325bbaadd6d28afaff6d7b68b7f1ae SHA512 989bdc7f3a0ab5c460a8882c2bbd07c0736dee506e3247c0cc0bd9830a321d187f26ef51954c7b81307bd1064754f805be3e5980c5be7eefe4a954f254722902 diff --git a/app-admin/helm/helm-3.9.4.ebuild b/app-admin/helm/helm-3.11.2.ebuild index 68afbf1f982b..4f4a89ee621a 100644 --- a/app-admin/helm/helm-3.9.4.ebuild +++ b/app-admin/helm/helm-3.11.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit bash-completion-r1 go-module -GIT_COMMIT=dbc6d8e20fe1d58d50e6ed30f09a04a77e4c68db -GIT_SHA=dbc6d8e2 +GIT_COMMIT=912ebc1cd10d38d340f048efaf0abda047c3468e +GIT_SHA=912ebc1c MY_PV=${PV/_rc/-rc.} DESCRIPTION="Kubernetes Package Manager" @@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv" +KEYWORDS="amd64 ~arm64 ~loong ~riscv" RESTRICT=" test" diff --git a/app-admin/helm/helm-3.10.1.ebuild b/app-admin/helm/helm-3.12.3.ebuild index bc68205d21a4..c73593f6e142 100644 --- a/app-admin/helm/helm-3.10.1.ebuild +++ b/app-admin/helm/helm-3.12.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit bash-completion-r1 go-module -GIT_COMMIT=9f88ccb6aee40b9a0535fcc7efea6055e1ef72c9 -GIT_SHA=9f88ccb6 +GIT_COMMIT=3a31588ad33fe3b89af5a2a54ee1d25bfe6eaa5e +GIT_SHA=3a31588a MY_PV=${PV/_rc/-rc.} DESCRIPTION="Kubernetes Package Manager" diff --git a/app-admin/helm/helm-3.13.2.ebuild b/app-admin/helm/helm-3.13.2.ebuild new file mode 100644 index 000000000000..c82d02143876 --- /dev/null +++ b/app-admin/helm/helm-3.13.2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit bash-completion-r1 go-module +GIT_COMMIT=2a2fb3b98829f1e0be6fb18af2f6599e0f4e8243 +GIT_SHA=2a2fb3b9 +MY_PV=${PV/_rc/-rc.} + +DESCRIPTION="Kubernetes Package Manager" +HOMEPAGE="https://github.com/helm/helm https://helm.sh" +SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv" + +RESTRICT=" test" + +src_compile() { + emake \ + GOFLAGS="${GOFLAGS}" \ + LDFLAGS="" \ + GIT_COMMIT=${GIT_COMMIT} \ + GIT_SHA=${GIT_SHA} \ + GIT_TAG=v${MY_PV} \ + GIT_DIRTY=clean \ + build + bin/${PN} completion bash > ${PN}.bash || die + bin/${PN} completion zsh > ${PN}.zsh || die +} + +src_install() { + newbashcomp ${PN}.bash ${PN} + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} + + dobin bin/${PN} + dodoc README.md +} diff --git a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild b/app-admin/ide-smart/ide-smart-1.4-r3.ebuild index b064d1e5e222..c83f7dcaf4b6 100644 --- a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild +++ b/app-admin/ide-smart/ide-smart-1.4-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="A tool to read SMART information from harddiscs" HOMEPAGE="http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html" @@ -12,10 +12,9 @@ SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="" src_compile() { - $(tc-getCC) ${CFLAGS} -Wall ${LDFLAGS} -o ${PN} ${PN}.c || die "compile" + edo $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -Wall ${LDFLAGS} -o ${PN} ${PN}.c } src_install() { diff --git a/app-admin/integrit/integrit-4.2_rc1.ebuild b/app-admin/integrit/integrit-4.2_rc1.ebuild index 53abf496b359..1068aba7c9ff 100644 --- a/app-admin/integrit/integrit-4.2_rc1.ebuild +++ b/app-admin/integrit/integrit-4.2_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit autotools MY_PV="${PV/_/-}" DESCRIPTION="file integrity verification program" -HOMEPAGE="http://integrit.sourceforge.net/" +HOMEPAGE="https://integrit.sourceforge.net/" SRC_URI="https://github.com/integrit/integrit/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest index 92b3d0126d99..1c35ecef078a 100644 --- a/app-admin/keepass/Manifest +++ b/app-admin/keepass/Manifest @@ -1 +1,3 @@ DIST KeePass-2.49-Source.zip 5135190 BLAKE2B bf5a9aab0065a97545bd1b81a74b5ab113e4c4802873445719ce2a571745b04c69ab5d8be9a67dc59a713947f0955cbcccc782b6628f722a0d564283b943eee6 SHA512 7a25de6acb2637bd8820fb70866ab4ced4ece4b3e64172f616c2fb59d2a4e7a2f340435db10731ed3d7e66db7761487925cf1c7941b0bac12e72c5fcd9e8b7d3 +DIST KeePass-2.53-Source.zip 5201820 BLAKE2B a87918278915f1a54d8f6d6b8ef05d5a86f41a58887a1c80a8217112061fd40d59393012ae7b69d6c2110a7b0b36c57ecce4292a68e9161e99e1762b1622192e SHA512 8d35ec83ada7142e91be6a5889eabb98f1d8fe32140a3b904db76d64f42bed0ce1cc0378f38560b7f1307df545f00a398da599ef9fc44474e8c16722433d4e4e +DIST KeePass-2.56-Source.zip 5231868 BLAKE2B d7ed0baf6db6a0398ce9bceb9a61088ef7cc14ba0c5b13a01123f9c7fca37e52bf352c438c3100ba32d59cfcfa90de790a07649684a971224bba6eb554cbed34 SHA512 cee9d8569e59a29044760dc94c4ab3ee6f1eb26aaa12d18a36d9e1b87e421291b49a3747fdb340a7af06494d65fe4d37579f16a577b0af2c053504b80e8a1c60 diff --git a/app-admin/keepass/files/keepass-2.53-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.53-xsl-path-detection.patch new file mode 100644 index 000000000000..3fed7593a1de --- /dev/null +++ b/app-admin/keepass/files/keepass-2.53-xsl-path-detection.patch @@ -0,0 +1,22 @@ +--- a/KeePass/Forms/AboutForm.cs ++++ b/KeePass/Forms/AboutForm.cs +@@ -135,7 +135,18 @@ + m_lvComponents.Columns.Add(strValueColumn, 100);
+
+ string strExe = WinUtil.GetExecutable();
+- string strDir = UrlUtil.GetFileDirectory(strExe, true, false);
++ string strDir = null;
++ if (KeePassLib.Native.NativeLib.IsUnix())
++ {
++ string strBPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
++ strBPath = UrlUtil.EnsureTerminatingSeparator(strBPath, false);
++ strBPath += PwDefs.ShortProductName.ToLower();
++ strDir = UrlUtil.EnsureTerminatingSeparator(strBPath, false);
++ }
++ else
++ {
++ strDir = UrlUtil.GetFileDirectory(strExe, true, false);
++ }
+
+ AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
+
diff --git a/app-admin/keepass/keepass-2.49.ebuild b/app-admin/keepass/keepass-2.49.ebuild index 7d5fde39dc39..2e453b7a9ddf 100644 --- a/app-admin/keepass/keepass-2.49.ebuild +++ b/app-admin/keepass/keepass-2.49.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="aot" BDEPEND="app-arch/unzip" diff --git a/app-admin/keepass/keepass-2.53.ebuild b/app-admin/keepass/keepass-2.53.ebuild new file mode 100644 index 000000000000..465f3b38acb4 --- /dev/null +++ b/app-admin/keepass/keepass-2.53.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop optfeature wrapper xdg-utils + +MY_PN="KeePass" +DESCRIPTION="A free, open source, light-weight and easy-to-use password manager" +HOMEPAGE="https://keepass.info/" +SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="aot" + +BDEPEND="app-arch/unzip" +DEPEND="dev-lang/mono" +RDEPEND=" + ${DEPEND} + dev-dotnet/libgdiplus[cairo] +" + +PATCHES=( "${FILESDIR}/${PN}-2.53-xsl-path-detection.patch" ) + +# bug #687052 +# file generated by mono --aot where *FLAGS don't make sense +QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so" + +src_prepare() { + # KeePass looks for some XSL files in the same folder as the executable, + # we prefer to have it in /usr/share/KeePass. Apply patch using base function. + # This XSL file will not be upstreamed since the KeePass creator said that + # including this patch would break the Portable USB version of KeePass + # (which keeps/looks for xsl files in its own folder) + default + + # Switch into build dir so the mono prepration script works correctly + pushd Build || die + source PrepMonoDev.sh || die + popd || die +} + +src_compile() { + export MONO_REGISTRY_PATH=/dev/null # bug 659808 + + # bug 704358 + export LANG=C LC_ALL=C + + # Build with Release target + xbuild /target:KeePass /property:Configuration=Release || die + + # Run Ahead Of Time compiler on the binary + if use aot; then + cp Ext/KeePass.exe.config Build/KeePass/Release/ || die + mono --aot -O=all Build/KeePass/Release/KeePass.exe || die + fi +} + +src_install() { + # Wrapper script to launch mono + make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe" + + # Some XSL files + insinto "/usr/share/${PN}/XSL" + doins Ext/XSL/* + + insinto "/usr/$(get_libdir)/${PN}" + exeinto "/usr/$(get_libdir)/${PN}" + + doins Ext/KeePass.exe.config + + # Default configuration, simply says to use user-specific configuration + doins Ext/KeePass.config.xml + + # The actual executable + doexe Build/KeePass/Release/KeePass.exe + + # Copy the AOT compilation result + if use aot; then + doexe Build/KeePass/Release/KeePass.exe.so + fi + + # Prepare the icons + newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png" + newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png" + + # Create a desktop entry and associate it with the KeePass mime type + make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;" + + # MIME descriptor for .kdbx files + insinto /usr/share/mime/packages + doins "${FILESDIR}/${PN}.xml" + + # sed, because patching this really sucks + sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + + optfeature "enables autotype/autofill" x11-misc/xdotool + + elog "Some systems may experience issues with copy and paste operations." + elog "If you encounter this, please install x11-misc/xsel." +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-admin/keepass/keepass-2.56.ebuild b/app-admin/keepass/keepass-2.56.ebuild new file mode 100644 index 000000000000..439e07752469 --- /dev/null +++ b/app-admin/keepass/keepass-2.56.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop optfeature wrapper xdg-utils + +MY_PN="KeePass" +DESCRIPTION="A free, open source, light-weight and easy-to-use password manager" +HOMEPAGE="https://keepass.info/" +SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="aot" + +BDEPEND="app-arch/unzip" +DEPEND="dev-lang/mono" +RDEPEND=" + ${DEPEND} + dev-dotnet/libgdiplus[cairo] +" + +PATCHES=( "${FILESDIR}/${PN}-2.53-xsl-path-detection.patch" ) + +# bug #687052 +# file generated by mono --aot where *FLAGS don't make sense +QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so" + +src_prepare() { + # KeePass looks for some XSL files in the same folder as the executable, + # we prefer to have it in /usr/share/KeePass. Apply patch using base function. + # This XSL file will not be upstreamed since the KeePass creator said that + # including this patch would break the Portable USB version of KeePass + # (which keeps/looks for xsl files in its own folder) + default + + # Switch into build dir so the mono prepration script works correctly + pushd Build || die + source PrepMonoDev.sh || die + popd || die +} + +src_compile() { + export MONO_REGISTRY_PATH=/dev/null # bug 659808 + + # bug 704358 + export LANG=C LC_ALL=C + + # Build with Release target + xbuild /target:KeePass /property:Configuration=Release || die + + # Run Ahead Of Time compiler on the binary + if use aot; then + cp Ext/KeePass.exe.config Build/KeePass/Release/ || die + mono --aot -O=all Build/KeePass/Release/KeePass.exe || die + fi +} + +src_install() { + # Wrapper script to launch mono + make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe" + + # Some XSL files + insinto "/usr/share/${PN}/XSL" + doins Ext/XSL/* + + insinto "/usr/$(get_libdir)/${PN}" + exeinto "/usr/$(get_libdir)/${PN}" + + doins Ext/KeePass.exe.config + + # Default configuration, simply says to use user-specific configuration + doins Ext/KeePass.config.xml + + # The actual executable + doexe Build/KeePass/Release/KeePass.exe + + # Copy the AOT compilation result + if use aot; then + doexe Build/KeePass/Release/KeePass.exe.so + fi + + # Prepare the icons + newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png" + newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png" + + # Create a desktop entry and associate it with the KeePass mime type + make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;" + + # MIME descriptor for .kdbx files + insinto /usr/share/mime/packages + doins "${FILESDIR}/${PN}.xml" + + # sed, because patching this really sucks + sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + + optfeature "enables autotype/autofill" x11-misc/xdotool + + elog "Some systems may experience issues with copy and paste operations." + elog "If you encounter this, please install x11-misc/xsel." +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml index 0de39b024dc7..390a212c5de7 100644 --- a/app-admin/keepass/metadata.xml +++ b/app-admin/keepass/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>kensington@gentoo.org</email> - <name>Michael Palimaka</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="aot">Generate native code at build time, rather than runtime.</flag> </use> diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 40e3c23e67d0..d9b76c352e07 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,3 +1,2 @@ -DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9 -DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842 -DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb +DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe SHA512 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812 +DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926 diff --git a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch deleted file mode 100644 index 52ca2b7eb610..000000000000 --- a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 776c40d9..477bf179 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -233,9 +233,6 @@ if(WITH_XC_BROWSER) - LIBS ${TEST_LIBRARIES}) - endif() - --add_unit_test(NAME testcli SOURCES TestCli.cpp -- LIBS testsupport cli ${TEST_LIBRARIES}) -- - if(WITH_GUI_TESTS) - add_subdirectory(gui) - endif(WITH_GUI_TESTS) diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild deleted file mode 100644 index bf2430003375..000000000000 --- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org" - -if [[ "${PV}" != *9999 ]] ; then - if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_/-}" - else - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - #SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" - fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" - [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype browser doc keeshare +network test yubikey" - -RESTRICT="!test? ( test )" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/botan:2= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - media-gfx/qrencode:= - sys-libs/readline:0= - sys-libs/zlib:= - autotype? ( - x11-libs/libX11 - x11-libs/libXtst - ) - keeshare? ( sys-libs/zlib:=[minizip] ) - yubikey? ( - dev-libs/libusb:1 - sys-apps/pcsc-lite - ) -" -DEPEND="${RDEPEND} - dev-qt/qttest:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) -" - -src_prepare() { - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then - printf '%s' "${PV}" > .version || die - fi - - cmake_src_prepare -} - -src_configure() { - # https://github.com/keepassxreboot/keepassxc/issues/5801 - filter-flags -flto* - - local mycmakeargs=( - # Gentoo users enable ccache via e.g. FEATURES=ccache or - # other means. We don't want the build system to enable it for us. - -DWITH_CCACHE=OFF - -DWITH_GUI_TESTS=OFF - -DWITH_TESTS="$(usex test)" - -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_DOCS="$(usex doc)" - -DWITH_XC_BROWSER="$(usex browser)" - -DWITH_XC_FDOSECRETS=ON - -DWITH_XC_KEESHARE="$(usex keeshare)" - -DWITH_XC_NETWORKING="$(usex network)" - -DWITH_XC_SSHAGENT=ON - -DWITH_XC_UPDATECHECK=OFF - -DWITH_XC_YUBIKEY="$(usex yubikey)" - ) - if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) - fi - cmake_src_configure -} diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild b/app-admin/keepassxc/keepassxc-2.7.6.ebuild index 7608f162fbff..0ca6281dbb85 100644 --- a/app-admin/keepassxc/keepassxc-2.7.4.ebuild +++ b/app-admin/keepassxc/keepassxc-2.7.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,11 +11,10 @@ HOMEPAGE="https://keepassxc.org/ if [[ "${PV}" != *9999 ]] ; then if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P/_/-}" else - #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" + SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" fi else @@ -33,7 +32,7 @@ REQUIRED_USE="autotype? ( X )" RDEPEND=" app-crypt/argon2:= - dev-libs/botan:2= + dev-libs/botan:3= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -63,7 +62,7 @@ BDEPEND=" doc? ( dev-ruby/asciidoctor ) " -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) +PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch ) src_prepare() { if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then @@ -75,7 +74,7 @@ src_prepare() { src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 - filter-flags -flto* + filter-lto local mycmakeargs=( # Gentoo users enable ccache via e.g. FEATURES=ccache or @@ -86,6 +85,7 @@ src_configure() { -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BOTAN3=ON -DWITH_XC_FDOSECRETS=ON -DWITH_XC_KEESHARE="$(usex keeshare)" -DWITH_XC_NETWORKING="$(usex network)" diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild index fe3795ec295f..6d17e534e3b4 100644 --- a/app-admin/keepassxc/keepassxc-2.7.3.ebuild +++ b/app-admin/keepassxc/keepassxc-2.7.7-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=8 @@ -11,15 +11,16 @@ HOMEPAGE="https://keepassxc.org/ if [[ "${PV}" != *9999 ]] ; then if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P/_/-}" else - #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" + SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" + + KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" fi else inherit git-r3 + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" fi @@ -33,7 +34,7 @@ REQUIRED_USE="autotype? ( X )" RDEPEND=" app-crypt/argon2:= - dev-libs/botan:2= + dev-libs/botan:3= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -43,27 +44,33 @@ RDEPEND=" dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= - sys-libs/zlib:= - X? ( dev-qt/qtx11extras:5 ) + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) - keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-qt/qttest:5 " BDEPEND=" dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) + doc? ( + dev-ruby/asciidoctor + ) " -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) +PATCHES=( + "${FILESDIR}/${PN}-2.7.4-tests.patch" +) src_prepare() { if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then @@ -75,9 +82,9 @@ src_prepare() { src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 - filter-flags -flto* + filter-lto - local mycmakeargs=( + local -a mycmakeargs=( # Gentoo users enable ccache via e.g. FEATURES=ccache or # other means. We don't want the build system to enable it for us. -DWITH_CCACHE=OFF @@ -86,6 +93,8 @@ src_configure() { -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)" + -DWITH_XC_BOTAN3=ON -DWITH_XC_FDOSECRETS=ON -DWITH_XC_KEESHARE="$(usex keeshare)" -DWITH_XC_NETWORKING="$(usex network)" diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 0e1b46d2f295..4b24b9ee85b7 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.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=8 @@ -11,15 +11,16 @@ HOMEPAGE="https://keepassxc.org/ if [[ "${PV}" != *9999 ]] ; then if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P/_/-}" else - #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" + SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi else inherit git-r3 + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" fi @@ -33,7 +34,7 @@ REQUIRED_USE="autotype? ( X )" RDEPEND=" app-crypt/argon2:= - dev-libs/botan:2= + dev-libs/botan:3= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -43,24 +44,28 @@ RDEPEND=" dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= - sys-libs/zlib:= - X? ( dev-qt/qtx11extras:5 ) + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) - keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-qt/qttest:5 " BDEPEND=" dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) + doc? ( + dev-ruby/asciidoctor + ) " src_prepare() { @@ -73,9 +78,9 @@ src_prepare() { src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 - filter-flags -flto* + filter-lto - local mycmakeargs=( + local -a mycmakeargs=( # Gentoo users enable ccache via e.g. FEATURES=ccache or # other means. We don't want the build system to enable it for us. -DWITH_CCACHE=OFF @@ -84,6 +89,7 @@ src_configure() { -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BOTAN3=ON -DWITH_XC_FDOSECRETS=ON -DWITH_XC_KEESHARE="$(usex keeshare)" -DWITH_XC_NETWORKING="$(usex network)" diff --git a/app-admin/kernel-hardening-checker/Manifest b/app-admin/kernel-hardening-checker/Manifest new file mode 100644 index 000000000000..dced1798de98 --- /dev/null +++ b/app-admin/kernel-hardening-checker/Manifest @@ -0,0 +1 @@ +DIST kernel-hardening-checker-0.6.6.gh.tar.gz 3262987 BLAKE2B b3dd5ab4732755b4ea56a65a89d923e8a70eb7c9446231b30f5ca27753883602dbda2ec64e5cabb00f074e3edad584d7819454d0ad5cd214b5ac0d6856979588 SHA512 1c8b71fe5c3befe3e4a76b3a840fe0c057ff334a74c82648134189d95e54c7b5b36fdfef9689d8fa9d1d5afe6c0e296472d244295f3dd18124d815f8dcd75ef8 diff --git a/app-admin/kernel-hardening-checker/kernel-hardening-checker-0.6.6.ebuild b/app-admin/kernel-hardening-checker/kernel-hardening-checker-0.6.6.ebuild new file mode 100644 index 000000000000..059355f21457 --- /dev/null +++ b/app-admin/kernel-hardening-checker/kernel-hardening-checker-0.6.6.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="A tool for checking the security hardening options of the Linux kernel" +HOMEPAGE="https://github.com/a13xp0p0v/kernel-hardening-checker" +LICENSE="GPL-3" +SLOT="0" + +SRC_URI="https://github.com/a13xp0p0v/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +KEYWORDS="~amd64" + +distutils_enable_tests pytest diff --git a/app-admin/mcollective/metadata.xml b/app-admin/kernel-hardening-checker/metadata.xml index 7077b45eb0cd..12cd93e8c026 100644 --- a/app-admin/mcollective/metadata.xml +++ b/app-admin/kernel-hardening-checker/metadata.xml @@ -2,12 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> + <email>ago@gentoo.org</email> + <name>Agostino Sarubbo</name> </maintainer> - <use> - <flag name="client">Install client utilities</flag> - </use> <upstream> - <remote-id type="github">puppetlabs/marionette-collective</remote-id> + <remote-id type="github">a13xp0p0v/kernel-hardening-checker</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/kpcli/kpcli-3.8.1.ebuild b/app-admin/kpcli/kpcli-3.8.1.ebuild index 7bdf2c3eb097..eb4c7909de23 100644 --- a/app-admin/kpcli/kpcli-3.8.1.ebuild +++ b/app-admin/kpcli/kpcli-3.8.1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit optfeature -DESCRIPTION="A command line interface to KeePass database files" -HOMEPAGE="http://kpcli.sourceforge.net" +DESCRIPTION="Command line interface to KeePass database files" +HOMEPAGE="https://kpcli.sourceforge.io/" SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl" LICENSE="|| ( Artistic GPL-1+ )" diff --git a/app-admin/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml index bdd610aa0541..1876693ca7bb 100644 --- a/app-admin/kpcli/metadata.xml +++ b/app-admin/kpcli/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>juippis@gentoo.org</email> - <name>Joonas Niilola</name> - </maintainer> + <!-- maintainer-needed --> <stabilize-allarches/> <upstream> <remote-id type="sourceforge">kpcli</remote-id> diff --git a/app-admin/kubectx/kubectx-0.9.4.ebuild b/app-admin/kubectx/kubectx-0.9.4.ebuild index 8bede99acaa2..00534984d208 100644 --- a/app-admin/kubectx/kubectx-0.9.4.ebuild +++ b/app-admin/kubectx/kubectx-0.9.4.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 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" src_compile() { GOBIN="${S}"/bin ego install ./cmd/kube{ctx,ns} diff --git a/app-admin/lib_users/lib_users-0.15-r1.ebuild b/app-admin/lib_users/lib_users-0.15-r1.ebuild new file mode 100644 index 000000000000..45ccbc10dde4 --- /dev/null +++ b/app-admin/lib_users/lib_users-0.15-r1.ebuild @@ -0,0 +1,44 @@ +# 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="Check for mapped libs and open files that are marked as deleted" +HOMEPAGE="https://github.com/klausman/lib_users" +SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + test? ( + dev-python/nose2[${PYTHON_USEDEP}] + )" +RDEPEND="${PYTHON_DEPS}" + +src_test() { + python_foreach_impl nose2 --verbosity=2 +} + +my_install() { + python_newscript lib_users.py lib_users + python_newscript fd_users.py fd_users + # lib_users_util/ contains a test script we don't want, so do things by hand + python_moduleinto lib_users_util + python_domodule lib_users_util/common.py + python_domodule lib_users_util/__init__.py +} + +src_install() { + python_foreach_impl my_install + dodoc README.md TODO +} diff --git a/app-admin/linode-cli/Manifest b/app-admin/linode-cli/Manifest new file mode 100644 index 000000000000..822bb234b6ca --- /dev/null +++ b/app-admin/linode-cli/Manifest @@ -0,0 +1,3 @@ +DIST linode-cli-5.47.1.tar.gz 128364 BLAKE2B db21cdd9a1bfbe17fb17b8b0e27ca36bb15c7d3b16ddde4dcc59a9ce64cd34d644d3d5d120efb88bb146767cf9b2c3ee820a847a2fcff487a11bc3abd6973870 SHA512 b61ac1e7c97a1395b150227fe822bc2e7199ed15a44c6d93d71bfdbc2f919827e87e89cf41a47b069be06144a849f5ab11c9dd7f38d138f80ce80563f55bf75a +DIST linode-cli-5.48.3.tar.gz 142927 BLAKE2B 48ae197d780f77a7a4dbf54d4e9959d28c117d90e052f401f563f1557dc11155afc5d16da1140e9ed2828fa3e19243e91205759636247d2fb893383975d89f43 SHA512 9efd3f0392848ebcd896becff191e94c90cbec01cc2b805c0262ecb3c40c51346d0b42891ddaadb9191d75e379083f68e4c9aa35f9ba7c6309c74ae3febbde7a +DIST linode_cli-5.48.4.tar.gz 142928 BLAKE2B 28b1c90bb0709afc594b7023ef846b6d59e0376730f05d9701ebbc6744376f33536ad5a6f53b7b26a25805b258dc58378a76b0e6a4157e149f83e691d862dec8 SHA512 b07a3612afc329fc346b523412ac03932c84213d6bc23726f4c0e5edc737100bf65ec84f8131943439444fee268646789dc4d135cd61b2362311d1ab18601c3e diff --git a/app-admin/linode-cli/linode-cli-5.47.1.ebuild b/app-admin/linode-cli/linode-cli-5.47.1.ebuild new file mode 100644 index 000000000000..45ee6333667a --- /dev/null +++ b/app-admin/linode-cli/linode-cli-5.47.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi + +DESCRIPTION="Linode Command Line Interface" +HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/boto3[${PYTHON_USEDEP}] + dev-python/openapi3[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + <dev-python/urllib3-3[${PYTHON_USEDEP}] +" diff --git a/app-admin/linode-cli/linode-cli-5.48.3.ebuild b/app-admin/linode-cli/linode-cli-5.48.3.ebuild new file mode 100644 index 000000000000..2ce8851657d3 --- /dev/null +++ b/app-admin/linode-cli/linode-cli-5.48.3.ebuild @@ -0,0 +1,31 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi + +DESCRIPTION="Linode Command Line Interface" +HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +# Tests require network, a linode account and an API key. +# WARNING: tests will incur costs and will wipe the account. +RESTRICT="test" + +RDEPEND=" + dev-python/boto3[${PYTHON_USEDEP}] + dev-python/linode-metadata[${PYTHON_USEDEP}] + dev-python/openapi3[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + <dev-python/urllib3-3[${PYTHON_USEDEP}] +" diff --git a/app-admin/linode-cli/linode-cli-5.48.4.ebuild b/app-admin/linode-cli/linode-cli-5.48.4.ebuild new file mode 100644 index 000000000000..0e1692e8e982 --- /dev/null +++ b/app-admin/linode-cli/linode-cli-5.48.4.ebuild @@ -0,0 +1,30 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi + +DESCRIPTION="Linode Command Line Interface" +HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +# Tests require network, a linode account and an API key. +# WARNING: tests will incur costs and will wipe the account. +RESTRICT="test" + +RDEPEND=" + dev-python/boto3[${PYTHON_USEDEP}] + dev-python/linode-metadata[${PYTHON_USEDEP}] + dev-python/openapi3[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + <dev-python/urllib3-3[${PYTHON_USEDEP}] +" diff --git a/app-admin/linode-cli/metadata.xml b/app-admin/linode-cli/metadata.xml new file mode 100644 index 000000000000..d323d0d15b1e --- /dev/null +++ b/app-admin/linode-cli/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'> +<pkgmetadata> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> + <name>Viorel Munteanu</name> + </maintainer> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <upstream> + <remote-id type="github">linode/linode-cli</remote-id> + <remote-id type="pypi">linode-cli</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest index f458805e36e4..8561cd07dd0a 100644 --- a/app-admin/lnav/Manifest +++ b/app-admin/lnav/Manifest @@ -1,2 +1,2 @@ -DIST lnav-0.11.0.tar.gz 9586979 BLAKE2B fa333d2dbc3c2a5cb8b96ea4cbf84412be117b9d9ec999bab784e7aefab25cd01edcb65617468b8a1fbc46d554cf20a02bc901c9d75f2c5831359da37a19fd22 SHA512 f10938aacb1e170a6912090c5de8e85e9aae5bc456e57b49192a21020e7dfa20414d1f5b66fd25b3c1ea5a3d1fd3bd92af6fe7e0c6b73953688c3d861266fd97 DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef +DIST lnav-0.11.2.tar.gz 12379373 BLAKE2B 513e10f44d3770fb0135ad7fd035d07b35d2a44b2745acf700de0bf82ef428eb1549f9fd389ae4d6e3e268378a980f59f164479390a2a3faea16555941d3c9ca SHA512 a48c81e075923a5e1cdb051dd18329ff417f628518c8273fc19d0787226414668e1c29645edf20a46173fdf65a2b8978517948317fdc8b45c772fdc82cb82154 diff --git a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch b/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch deleted file mode 100644 index a0396182b8af..000000000000 --- a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b16833392b74826f8cd437675fc29e4a0b88efcd Mon Sep 17 00:00:00 2001 -From: Randy Barlow <randy@electronsweatshop.com> -Date: Sun, 4 Sep 2022 00:03:33 -0400 -Subject: [PATCH] Only build ssh keys when needed - -I believe the test/remote folder only needs to be setup for -test/test_remote.sh. Prior to this commit, it was being built during -make, rather than just during make check. This commit adjusts things so -that the test/remote folder is only generated during make check, and -only when test/test_remote.sh is being executed. - -Fixes #1040 - -Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - test/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Makefile.am b/test/Makefile.am -index fd09a656..457f3cb0 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -478,7 +478,7 @@ DISTCLEANFILES = \ - empty \ - scripts-empty - --all-local: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa -+test_remote.sh.log: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa - - distclean-local: - $(RM_V)rm -rf remote remote-tmp not:a:remote:dir --- -2.37.2 - diff --git a/app-admin/lnav/lnav-0.11.1-r1.ebuild b/app-admin/lnav/lnav-0.11.1-r2.ebuild index 5889cf19ccf9..18fee38a20e9 100644 --- a/app-admin/lnav/lnav-0.11.1-r1.ebuild +++ b/app-admin/lnav/lnav-0.11.1-r2.ebuild @@ -28,7 +28,7 @@ RDEPEND=" # The tests use ssh-keygen and use dsa and rsa keys (which is why ssl is required) DEPEND="${RDEPEND} test? ( - net-misc/openssh[ssl] + virtual/openssh[ssl] dev-cpp/doctest )" diff --git a/app-admin/lnav/lnav-0.11.0.ebuild b/app-admin/lnav/lnav-0.11.2.ebuild index 7847867ce5a0..1545017c774c 100644 --- a/app-admin/lnav/lnav-0.11.0.ebuild +++ b/app-admin/lnav/lnav-0.11.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ RDEPEND=" app-arch/bzip2:0= app-arch/libarchive:= >=dev-db/sqlite-3.9.0 - dev-libs/libpcre[cxx] + dev-libs/libpcre2 >=net-misc/curl-7.23.0 sys-libs/ncurses:= sys-libs/readline:= @@ -28,16 +28,14 @@ RDEPEND=" # The tests use ssh-keygen and use dsa and rsa keys (which is why ssl is required) DEPEND="${RDEPEND} test? ( - net-misc/openssh[ssl] + virtual/openssh[ssl] dev-cpp/doctest )" -DOCS=( AUTHORS NEWS README ) +DOCS=( AUTHORS NEWS.md README ) PATCHES=( "${FILESDIR}"/${PN}-0.11.0-disable-tests.patch - # https://github.com/tstack/lnav/pull/1041 - "${FILESDIR}"/${PN}-0.11.0-conditional-ssh-keygen.patch ) src_prepare() { diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest new file mode 100644 index 000000000000..91a93a36c6bc --- /dev/null +++ b/app-admin/logcheck/Manifest @@ -0,0 +1 @@ +DIST logcheck-1.4.3.tar.gz 168176 BLAKE2B f319a644afa0de5533e37b288456f35bdc47daa6c76c413dc916d05f162b24467f70d73bba97eb9cdbc162973e9495daa48263d9f04a2f0151f7ddc5b66a6a37 SHA512 c853493d693dd44f477561596be4de1ad74c4b4380f83f86d6204e0de59c7edccdc4c8d6ec53a96f6eefa4d1995910e9e395c7573b0e2ee8f75d632abb104e09 diff --git a/app-admin/logcheck/files/logcheck-r4.cron b/app-admin/logcheck/files/logcheck-r4.cron new file mode 100644 index 000000000000..1a8809ffe154 --- /dev/null +++ b/app-admin/logcheck/files/logcheck-r4.cron @@ -0,0 +1,11 @@ +#!/bin/sh +# +# To enable sync via cron, execute "runuser -u logcheck touch /etc/logcheck/cron-logcheck-enabled" +if [[ ! -f /etc/logcheck/cron-logcheck-enabled ]]; then + exit +fi +if [ ! -d /var/lock/logcheck ]; then + mkdir -p /var/lock/logcheck + chown logcheck:logcheck /var/lock/logcheck +fi +/sbin/runuser -u logcheck -- nice -n10 /usr/sbin/logcheck "$@" diff --git a/app-admin/logcheck/files/logcheck.cron b/app-admin/logcheck/files/logcheck.cron new file mode 100644 index 000000000000..091e1bd895b7 --- /dev/null +++ b/app-admin/logcheck/files/logcheck.cron @@ -0,0 +1,11 @@ +#!/bin/sh +# +# To enable sync via cron, execute "sudo -u logcheck touch /etc/logcheck/cron-logcheck-enabled" +if [[ ! -f /etc/logcheck/cron-logcheck-enabled ]]; then + exit +fi +if [ ! -d /var/lock/logcheck ]; then + mkdir -p /var/lock/logcheck + chown logcheck:logcheck /var/lock/logcheck +fi +sudo -u logcheck nice -n10 /usr/sbin/logcheck diff --git a/app-admin/logcheck/files/logcheck.cron.d b/app-admin/logcheck/files/logcheck.cron.d new file mode 100644 index 000000000000..bd95c1a95b5c --- /dev/null +++ b/app-admin/logcheck/files/logcheck.cron.d @@ -0,0 +1 @@ +@reboot sleep 60; /etc/cron.hourly/logcheck -R diff --git a/app-admin/logcheck/files/logcheck.service b/app-admin/logcheck/files/logcheck.service new file mode 100644 index 000000000000..8d5cd4ac467c --- /dev/null +++ b/app-admin/logcheck/files/logcheck.service @@ -0,0 +1,11 @@ +[Unit] +Description=Mails anomalies in the system logfiles to the administrator + +[Service] +Type=oneshot +ExecStart=/usr/sbin/logcheck +SyslogIdentifier=logcheck +User=logcheck + +[Install] +WantedBy=multi-user.target diff --git a/app-admin/logcheck/files/logcheck.timer b/app-admin/logcheck/files/logcheck.timer new file mode 100644 index 000000000000..db5fc229a16e --- /dev/null +++ b/app-admin/logcheck/files/logcheck.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Mails anomalies in the system logfiles to the administrator + +[Timer] +OnCalendar=hourly + +[Install] +WantedBy=timers.target diff --git a/app-admin/logcheck/files/logcheck.tmpfiles b/app-admin/logcheck/files/logcheck.tmpfiles new file mode 100644 index 000000000000..7d358900103a --- /dev/null +++ b/app-admin/logcheck/files/logcheck.tmpfiles @@ -0,0 +1,2 @@ +# logcheck lock directory +d /var/lock/logcheck 0755 logcheck logcheck - diff --git a/app-admin/logcheck/logcheck-1.4.3-r2.ebuild b/app-admin/logcheck/logcheck-1.4.3-r2.ebuild new file mode 100644 index 000000000000..951cee59aaa5 --- /dev/null +++ b/app-admin/logcheck/logcheck-1.4.3-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 systemd tmpfiles + +DESCRIPTION="Mails anomalies in the system logfiles to the administrator" +HOMEPAGE="https://logcheck.org/" +SRC_URI="https://salsa.debian.org/debian/logcheck/-/archive/debian/${PV}/logcheck-debian-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-debian-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~sparc ~x86" +IUSE="cron systemd" +# Test (emake system-test) requires access to system logs +RESTRICT="test" + +DEPEND=" + acct-group/logcheck + acct-user/logcheck[systemd?] +" + +RDEPEND=" + ${DEPEND} + !app-admin/logsentry + app-misc/lockfile-progs + dev-lang/perl + dev-perl/mime-construct + virtual/mailx + cron? ( app-admin/sudo ) +" + +DOC_CONTENTS=" + Please read the guide at https://wiki.gentoo.org/wiki/Logcheck + for installation instructions. +" + +src_prepare() { + default + # Set version from PV, without using dpkg + sed -i -e "s/^VERSION=unknown/VERSION=\"${PV}\"/" "${S}/src/logcheck" || die + + # QA-fix remove call to non existent command | Bug: #911281 + sed -i "/dpkg-parsechangelog/d" "${S}/Makefile" || die + + # Add /var/log/messages to checked logs + echo "/var/log/messages" >> "${S}/etc/logcheck.logfiles.d/syslog.logfiles" || die + + # QA-fix Remove install of empty dirs to be created at runtime + sed -i "/install -d \$(DESTDIR)\/var\/lock\/logcheck/d" "${S}/Makefile" || die + + # Comment systemd journal check if systemd use flag is not set | Bug: #913857 + if ! use systemd; then + sed -i -e "s/^journal/#journal/" "${S}/etc/logcheck.logfiles.d/journal.logfiles" || die + fi +} + +src_install() { + default + + keepdir /var/lib/logcheck + + dodoc docs/README.* + doman docs/logtail.8 docs/logtail2.8 + + if use cron; then + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/${PN}.cron ${PN} + DOC_CONTENTS="${DOC_CONTENTS}\n + \n + Read /etc/cron.hourly/logcheck.cron to activate hourly cron-based check!" + fi + + if use systemd; then + DOC_CONTENTS="${DOC_CONTENTS}\n + \n + To enable the systemd timer, run the following command:\n + systemctl enable --now logcheck.timer" + fi + + systemd_dounit "${FILESDIR}/${PN}."{service,timer} + newtmpfiles "${FILESDIR}/logcheck.tmpfiles" logcheck.conf + + readme.gentoo_create_doc + + fowners -R logcheck:logcheck /etc/logcheck /var/lib/logcheck +} + +pkg_postinst() { + tmpfiles_process logcheck.conf + + readme.gentoo_print_elog +} diff --git a/app-admin/logcheck/logcheck-1.4.3-r4.ebuild b/app-admin/logcheck/logcheck-1.4.3-r4.ebuild new file mode 100644 index 000000000000..0cd2197b813f --- /dev/null +++ b/app-admin/logcheck/logcheck-1.4.3-r4.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 systemd tmpfiles + +DESCRIPTION="Mails anomalies in the system logfiles to the administrator" +HOMEPAGE="https://logcheck.org/" +SRC_URI="https://salsa.debian.org/debian/logcheck/-/archive/debian/${PV}/logcheck-debian-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-debian-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="cron systemd" +# Test (emake system-test) requires access to system logs +RESTRICT="test" + +DEPEND=" + acct-group/logcheck + acct-user/logcheck[systemd?] +" + +RDEPEND=" + ${DEPEND} + !app-admin/logsentry + app-misc/lockfile-progs + dev-lang/perl + dev-perl/mime-construct + virtual/mailx + cron? ( sys-apps/util-linux ) +" + +DOC_CONTENTS=" + Please read the guide at https://wiki.gentoo.org/wiki/Logcheck + for installation instructions. +" + +src_prepare() { + default + # Set version from PV, without using dpkg + sed -i -e "s/^VERSION=unknown/VERSION=\"${PV}\"/" "${S}/src/logcheck" || die + + # QA-fix remove call to non existent command | Bug: #911281 + sed -i "/dpkg-parsechangelog/d" "${S}/Makefile" || die + + # Add /var/log/messages to checked logs + echo "/var/log/messages" >> "${S}/etc/logcheck.logfiles.d/syslog.logfiles" || die + + # QA-fix Remove install of empty dirs to be created at runtime + sed -i "/install -d \$(DESTDIR)\/var\/lock\/logcheck/d" "${S}/Makefile" || die + + # Comment systemd journal check if systemd use flag is not set | Bug: #913857 + if ! use systemd; then + sed -i -e "s/^journal/#journal/" "${S}/etc/logcheck.logfiles.d/journal.logfiles" || die + fi +} + +src_install() { + default + + keepdir /var/lib/logcheck + + dodoc docs/README.* + doman docs/logtail.8 docs/logtail2.8 + + if use cron; then + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/"${PN}"-r4.cron ${PN} + insinto /etc/cron.d + newins "${FILESDIR}"/${PN}.cron.d ${PN} + DOC_CONTENTS="${DOC_CONTENTS}\n + \n + Read /etc/cron.hourly/logcheck.cron to activate hourly cron-based check!\n + \n + To send mail after reboot you should enable the cronjob in /etc/cron.d/logcheck." + fi + + if use systemd; then + DOC_CONTENTS="${DOC_CONTENTS}\n + \n + To enable the systemd timer, run the following command:\n + systemctl enable --now logcheck.timer" + fi + + systemd_dounit "${FILESDIR}/${PN}."{service,timer} + newtmpfiles "${FILESDIR}/logcheck.tmpfiles" logcheck.conf + + readme.gentoo_create_doc + + fowners -R logcheck:logcheck /etc/logcheck /var/lib/logcheck +} + +pkg_postinst() { + tmpfiles_process logcheck.conf + + readme.gentoo_print_elog +} diff --git a/app-admin/logcheck/metadata.xml b/app-admin/logcheck/metadata.xml new file mode 100644 index 000000000000..4ef48a7a9e21 --- /dev/null +++ b/app-admin/logcheck/metadata.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + Logcheck is a simple utility which is designed to allow a system administrator to view the logfiles which are produced upon hosts under their control. + It does this by mailing summaries of the logfiles to them, after first filtering out "normal" entries. + Normal entries are entries which match one of the many included regular expression files contain in the database. + </longdescription> + <use> + <flag name="cron">Adds file to enable hourly cron job to run logcheck"</flag> + </use> + <upstream> + <maintainer status="active"> + <name>Mathias Gibbens</name> + <email>gibmat@debian.org</email> + </maintainer> + <maintainer status="active"> + <name>Jose M Calhariz</name> + <email>calhariz@debian.org</email> + </maintainer> + <maintainer status="active"> + <name>Debian logcheck Team</name> + <email>logcheck@packages.debian.org</email> + </maintainer> + <bugs-to>https://bugs.debian.org/logcheck</bugs-to> + <changelog>https://metadata.ftp-master.debian.org/changelogs/main/l/logcheck/unstable_changelog</changelog> + </upstream> +</pkgmetadata> diff --git a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild index 868b758df65f..83351a930bbc 100644 --- a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild +++ b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/kamildudka.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kamildudka.asc inherit systemd tmpfiles verify-sig DESCRIPTION="Rotates, compresses, and mails system logs" diff --git a/app-admin/logrotate/logrotate-3.21.0.ebuild b/app-admin/logrotate/logrotate-3.21.0.ebuild index 274d7c986b0e..d32061f9eee4 100644 --- a/app-admin/logrotate/logrotate-3.21.0.ebuild +++ b/app-admin/logrotate/logrotate-3.21.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/kamildudka.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kamildudka.asc inherit systemd tmpfiles verify-sig DESCRIPTION="Rotates, compresses, and mails system logs" diff --git a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild b/app-admin/logsentry/logsentry-1.1.1-r3.ebuild index 7d4b1f56c3b7..8676acdc4a74 100644 --- a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild +++ b/app-admin/logsentry/logsentry-1.1.1-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -14,12 +14,15 @@ S="${WORKDIR}"/logcheck-${PV} LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm ~mips ppc ~s390 sparc x86" +IUSE="selinux" -RDEPEND="virtual/mailx" +RDEPEND=" + virtual/mailx + selinux? ( sec-policy/selinux-logsentry ) +" -src_compile() { - einfo "compile and install mixed in the package makefile" -} +# compile and install mixed in the package makefile" +src_compile() { :; } src_install() { dodir /usr/bin /var/tmp/logcheck /etc/logcheck @@ -44,18 +47,18 @@ src_install() { dodoc README* CHANGES CREDITS dodoc systems/linux/README.* - cat << EOF > "${S}"/logsentry.cron || die -#!/bin/sh -# -# Uncomment the following if you want -# logsentry (logcheck) to run hourly -# -# this is part of the logsentry package -# -# + cat <<- EOF > "${S}"/logsentry.cron || die + #!/bin/sh + # + # Uncomment the following if you want + # logsentry (logcheck) to run hourly + # + # this is part of the logsentry package + # + # -#/bin/sh /etc/logcheck/logcheck.sh -EOF + #/bin/sh /etc/logcheck/logcheck.sh + EOF exeinto /etc/cron.hourly doexe logsentry.cron diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest index 9a651eeb0cd6..833df9cd200c 100644 --- a/app-admin/logstash-bin/Manifest +++ b/app-admin/logstash-bin/Manifest @@ -1,2 +1,2 @@ -DIST logstash-7.17.9-linux-x86_64.tar.gz 364476389 BLAKE2B b02e52e0a9e9a8b7d6b7487333417a95363316dab8530c180b8a42e63f35a20628d9830cd596a6a960d6cb67603dd1f1bfc293ba2705a4683824aafafd8acbc6 SHA512 a43d592e70f023a594f31a3fba365a9cca6611599bd61f998cb1fc38ddd177d459bce23eaf54f811fe0a87a47cdd4bf4b4d4c8008dab1ac03173371f63b91b6c -DIST logstash-oss-7.17.9-linux-x86_64.tar.gz 364275206 BLAKE2B 06befbe70974ebe740caad79527b92d78d034de37461bf1883862463fe6b063d7a3759729a6191277c2c5724faaccec315c77c77ac384858f34a9594d400abfa SHA512 7c3f9867853582e5d06b9f895b4740abf56a9b6ce34dfbfb624cf9a4b956f489145cd13f3194a7fb16efc52410f55e797c269dc2957a35bdebf9e1aaa3547eaa +DIST logstash-7.17.16-linux-x86_64.tar.gz 364241317 BLAKE2B 1abb5d3cb4c47596b2df44ca177d9352f53c3b1497e2218f8c483c5298646754c1bf934fc262796eb72fbfc79adde8ba6fadd2b7cc46ff7b11d72f1f52a2bd62 SHA512 cded2127150708de766cec54b39ba90e3eb8b48139f0fd814e8c3691a0a8e87ade46217dadf4d3ccd90daff842984804fbfa056e0484b8e40bcfee86dfbdd10d +DIST logstash-oss-7.17.16-linux-x86_64.tar.gz 364037570 BLAKE2B 112d8138213c366704676c29ffaeb7af3090953fd42d3652751ef5b5d94d79338fafd119741d913a0eb6308714f896392385938d0595ea08cf681630213ece3b SHA512 382f60c7bea4f9131d8ea70392b24235b3d84906a67b275d6983315080747e85710a6a3a52f6dd7306465d12cf3e7f798a7f2b60e0a3bcfa01926ba9890c3dc5 diff --git a/app-admin/logstash-bin/logstash-bin-7.17.9.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.16.ebuild index 684ea639d771..3fd750a91df6 100644 --- a/app-admin/logstash-bin/logstash-bin-7.17.9.ebuild +++ b/app-admin/logstash-bin/logstash-bin-7.17.16.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 diff --git a/app-admin/longrun/Manifest b/app-admin/longrun/Manifest deleted file mode 100644 index 15924ea63ff0..000000000000 --- a/app-admin/longrun/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST longrun-0.9.tar.bz2 11539 BLAKE2B a308dc7f350399da0bf593e2eee8109a90103b298d943976f0da143c52105362aa100763dcdd3cacd4c3244cdd5a7eb9a1b355aa803a69a2225ea18c6e5a60dd SHA512 6b38160f54d0cb9124c46c0e3ba22faf4ba4376ef58f7db40aabbab20836b1551dd839d28e5bf49540a5ce0e13312bd1d7332cc59ce45fa49f81d0b9746ef055 -DIST longrun_0.9-19.diff.gz 14697 BLAKE2B 98a7497679df5be0346a37b6119a9418c7fba80672eb2c345784628c3517c6f1fbc8d953abe2696a3b576310cd489e5c1d3595153bbfa9d82dfb44697c246116 SHA512 591519183017dd84d6f78554eea9f215be9346efc3f30889f5a25d01c6b68bd5a949507b9a0c871f9aca0b49e415c4fa261821d4158b24c93481394403b83e35 diff --git a/app-admin/longrun/files/0.9-makefile_cflags.patch b/app-admin/longrun/files/0.9-makefile_cflags.patch deleted file mode 100644 index 8848dc667866..000000000000 --- a/app-admin/longrun/files/0.9-makefile_cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -2,8 +2,8 @@ - - all: longrun README stamp-po - --longrun: longrun.c -- gcc -DLOCALEDIR=\"$(LOCALEDIR)\" -g -O2 -W -Wall -o longrun longrun.c -+CFLAGS += -W -Wall -+CPPFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" - - README: longrun.1 - groff -Tascii -man longrun.1 | col -bx > README diff --git a/app-admin/longrun/files/0.9-replace-loff_t.patch b/app-admin/longrun/files/0.9-replace-loff_t.patch deleted file mode 100644 index 589c0947b155..000000000000 --- a/app-admin/longrun/files/0.9-replace-loff_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -Use off_t instead of loff_t. Both pread() and pwrite() take -off_t not loff_t types. This breaks the build on musl. See - -https://bugs.gentoo.org/show_bug.cgi?id=541694 - -diff -Naur longrun.orig/longrun.c longrun/longrun.c ---- longrun.orig/longrun.c 2015-03-07 19:05:19.166652462 +0000 -+++ longrun/longrun.c 2015-03-07 19:06:05.419651899 +0000 -@@ -181,7 +181,7 @@ - } - - /* note: if an output is NULL, then don't set it */ --void read_msr(loff_t address, int *lower, int *upper) -+void read_msr(off_t address, int *lower, int *upper) - { - uint32_t data[2]; - -@@ -193,7 +193,7 @@ - if (upper) *upper = data[1]; - } - --void write_msr(loff_t address, int lower, int upper) -+void write_msr(off_t address, int lower, int upper) - { - uint32_t data[2]; - -@@ -206,7 +206,7 @@ - } - - /* note: if an output is NULL, then don't set it */ --void read_cpuid(loff_t address, int *eax, int *ebx, int *ecx, int *edx) -+void read_cpuid(off_t address, int *eax, int *ebx, int *ecx, int *edx) - { - uint32_t data[4]; - diff --git a/app-admin/longrun/longrun-0.9-r4.ebuild b/app-admin/longrun/longrun-0.9-r4.ebuild deleted file mode 100644 index 7992acb965bd..000000000000 --- a/app-admin/longrun/longrun-0.9-r4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info toolchain-funcs - -DESCRIPTION="A utility to control Transmeta's Crusoe and Efficeon processors" -HOMEPAGE="http://freshmeat.net/projects/longrun/" - -DEBIAN_PATCH_VERSION="19" -DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff" -SRC_URI=" - https://www.kernel.org/pub/linux/utils/cpu/crusoe/${P}.tar.bz2 - mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-ppc x86" -IUSE="" - -DEPEND="sys-apps/groff" - -S=${WORKDIR}/${PN} - -CONFIG_CHECK="~X86_MSR ~X86_CPUID" -ERROR_X86_MSR=" -Longrun needs a MSR device to function. Please select -MSR under Processor type and features. It can be build -directly into the kernel or as a module." -ERROR_X86_CPUID=" -Longrun needs a CPUID device to function. Please select -CPUID under Processor type and features. It can be -build directly into the kernel or as a module." - -PATCHES=( - "${WORKDIR}"/${DEBIAN_PATCH} - "${FILESDIR}"/${PV}-makefile_cflags.patch - "${FILESDIR}"/${PV}-replace-loff_t.patch -) - -src_configure() { - tc-export CC -} - -src_install() { - default - dodoc MAKEDEV-cpuid-msr -} - -pkg_postinst() { - if linux_config_exists; then - if linux_chkconfig_module X86_MSR; then - elog "You have compiled MSR as a module." - elog "You need to load it before using Longrun." - elog "The module is called msr." - elog - fi - - if linux_chkconfig_module X86_CPUID; then - elog "You have compiled CPUID as a module." - elog "You need to load it before using Longrun." - elog "The module is called cpuid." - fi - else - elog "You have no kernel configuration available." - elog "Longrun needs both CPUID and MSR capabilites," - elog "in the kernel you intend to run it under." - fi -} diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml deleted file mode 100644 index 5e882ed16b13..000000000000 --- a/app-admin/longrun/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - Longrun is a user space utility program for controlling the Longrun - thermal and power save functionalities found in the processors made - by Transmeta. - </longdescription> -</pkgmetadata> diff --git a/app-admin/lsyncd/lsyncd-2.2.3.ebuild b/app-admin/lsyncd/lsyncd-2.2.3.ebuild index 2f2808d63a72..afa60bc84968 100644 --- a/app-admin/lsyncd/lsyncd-2.2.3.ebuild +++ b/app-admin/lsyncd/lsyncd-2.2.3.ebuild @@ -1,40 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG" LUA_COMPAT=( lua5-{2,3} ) LUA_REQ_USE="deprecated" inherit cmake lua-single DESCRIPTION="Live Syncing (Mirror) Daemon" -HOMEPAGE="https://github.com/axkibe/lsyncd" -SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/lsyncd/lsyncd" +SRC_URI="https://github.com/lsyncd/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-release-${PV}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" REQUIRED_USE="${LUA_REQUIRED_USE}" -CDEPEND="${LUA_DEPS}" -DEPEND="${CDEPEND} - app-text/asciidoc - virtual/pkgconfig" -RDEPEND="${CDEPEND} +DEPEND="${LUA_DEPS}" +RDEPEND="${LUA_DEPS} net-misc/rsync" # Both lua and luac are invoked at build time -BDEPEND="${CDEPEND}" +BDEPEND="${LUA_DEPS} + app-text/asciidoc + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2.2.3-cmake_lua_version.patch "${FILESDIR}"/${PN}-2.2.3-mandir.patch ) -S=${WORKDIR}/${PN}-release-${PV} - src_configure() { local mycmakeargs=( -DLUA_ABI_VERSION=$(ver_cut 1-2 $(lua_get_version)) diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml index 2db3b587221b..106e2736434c 100644 --- a/app-admin/lsyncd/metadata.xml +++ b/app-admin/lsyncd/metadata.xml @@ -4,6 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="google-code">lsyncd</remote-id> - <remote-id type="github">axkibe/lsyncd</remote-id> + <remote-id type="github">lsyncd/lsyncd</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10-r1.ebuild index c445af8a5b5d..6c7d6c2668a6 100644 --- a/app-admin/makepasswd/makepasswd-1.10.ebuild +++ b/app-admin/makepasswd/makepasswd-1.10-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Random password generator" HOMEPAGE="https://packages.debian.org/stable/admin/makepasswd" @@ -9,8 +9,7 @@ SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="dev-lang/perl" diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest index 58f9ba78e3fd..a14181dcd744 100644 --- a/app-admin/mcelog/Manifest +++ b/app-admin/mcelog/Manifest @@ -1,3 +1,2 @@ -DIST mcelog-190.tar.gz 314409 BLAKE2B 287b5ccba24ef7afe4b2653f2ab8ddd9ae94451e1131941d61031042a039cb9ed633f75b0ddf0035f3fef023cdf67c5c0b01169d0afac4ae47f9badcc55d16ef SHA512 26347d5255c602189961c63f8bf44f0c73b8f7fb0d455108c604a84e73e00303646961759101aab42157d12a7678f8c47277829b0460b0832a64c8b5c913d952 -DIST mcelog-191.tar.gz 317354 BLAKE2B a02df41304aac994a37f4abd7be65408bd19d72e2aa20a15a3b55b6b152aebfad09309c9bfbb710e6bde493da980004a9f664ca71efeaf5ccd2ca0f0e1452adf SHA512 8716c2a63660d61da0fc9f1f8c5065cacc77c696456eed2167cd451e74e665e838bf5ab1d865d073379cb2fda2ff7c71e946cb74e905585d6c5d714159603a78 -DIST mcelog-192.tar.gz 317443 BLAKE2B 071c9e29aa049a2b559feb692d258df0685baaec614c4866d09cc8e9c8e8dad1e5064e661215c179649792cf3375e98aaa70fbe2629f5ba2b51b489ed9198b20 SHA512 dbdab35a4d3d2a3d395adb6384143d6ce53a2f598a9868e8777bd0588837621f7be74fdf6299b9949a4195ab6b242d9069686d07fe14fe23447d13e2dcfe7966 +DIST mcelog-197.tar.gz 319167 BLAKE2B cbeac1b29ab0b9b7d23470213f5b186f1c1c2a1095617436ccb9a29824fbf6d461642df32e69f7d743a2b3dfce5e06fcffbe5af3cc90a99c00bf9ba4796514b7 SHA512 4975f533fa6546b956190a33f51974614911aa8b707e07f73abf1e0055cd13997eeacaeedaf84762debcea9fd9b95e7d537befc0f818ba29873dd72be4ceed1a +DIST mcelog-198.tar.gz 319372 BLAKE2B c1a6eed5b77843cd3963ac82d20270ed915562b3e2940ee685f4aa827b6e05c656eb55b57e380d582c8fda2f3d1ee3d13ff40c0771fd410d504d03e62f71eaeb SHA512 5168a1d1d83c7fa69438412db4b5f559528439f84ad65348b147117c7fdfe689c9ab3273350ff5321ed351ef0fe17065ee9073aac5115e87cf27878b8e2ff7df diff --git a/app-admin/mcelog/mcelog-191.ebuild b/app-admin/mcelog/mcelog-191.ebuild deleted file mode 100644 index 7d504ed20d59..000000000000 --- a/app-admin/mcelog/mcelog-191.ebuild +++ /dev/null @@ -1,51 +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 linux-info python-any-r1 systemd toolchain-funcs - -DESCRIPTION="A tool to log and decode Machine Check Exceptions" -HOMEPAGE="http://mcelog.org/" -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="selinux" - -RDEPEND="selinux? ( sec-policy/selinux-mcelog )" -DEPEND="${PYTHON_DEPS}" - -# TODO: add mce-inject to the tree to support test phase -RESTRICT="test" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - local CONFIG_CHECK="~X86_MCE" - kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY" - check_extra_config - fi -} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \ - "${FILESDIR}"/${PN}-129-debugflags.patch - eapply_user - tc-export CC - python_fix_shebang genconfig.py -} - -src_install() { - default - - insinto /etc/logrotate.d/ - newins ${PN}.logrotate ${PN} - - newinitd "${FILESDIR}"/${PN}.init-r1 ${PN} - systemd_dounit ${PN}.service - - dodoc *.pdf -} diff --git a/app-admin/mcelog/mcelog-190.ebuild b/app-admin/mcelog/mcelog-197.ebuild index fb4a73adcb20..b689f7a70a9c 100644 --- a/app-admin/mcelog/mcelog-190.ebuild +++ b/app-admin/mcelog/mcelog-197.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2022 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 linux-info python-any-r1 systemd toolchain-funcs DESCRIPTION="A tool to log and decode Machine Check Exceptions" HOMEPAGE="http://mcelog.org/" -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -22,6 +22,11 @@ DEPEND="${PYTHON_DEPS}" # TODO: add mce-inject to the tree to support test phase RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch + "${FILESDIR}"/${PN}-129-debugflags.patch +) + pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then local CONFIG_CHECK="~X86_MCE" @@ -31,9 +36,7 @@ pkg_pretend() { } src_prepare() { - eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \ - "${FILESDIR}"/${PN}-129-debugflags.patch - eapply_user + default tc-export CC python_fix_shebang genconfig.py } diff --git a/app-admin/mcelog/mcelog-192.ebuild b/app-admin/mcelog/mcelog-198.ebuild index 7d504ed20d59..07d93a66d81f 100644 --- a/app-admin/mcelog/mcelog-192.ebuild +++ b/app-admin/mcelog/mcelog-198.ebuild @@ -1,15 +1,15 @@ -# 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 linux-info python-any-r1 systemd toolchain-funcs DESCRIPTION="A tool to log and decode Machine Check Exceptions" HOMEPAGE="http://mcelog.org/" -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -22,6 +22,11 @@ DEPEND="${PYTHON_DEPS}" # TODO: add mce-inject to the tree to support test phase RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch + "${FILESDIR}"/${PN}-129-debugflags.patch +) + pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then local CONFIG_CHECK="~X86_MCE" @@ -31,9 +36,7 @@ pkg_pretend() { } src_prepare() { - eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \ - "${FILESDIR}"/${PN}-129-debugflags.patch - eapply_user + default tc-export CC python_fix_shebang genconfig.py } diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest deleted file mode 100644 index 9f6962f131d1..000000000000 --- a/app-admin/mcollective/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mcollective-2.12.5.tar.gz 1517727 BLAKE2B b5d91c748bb1bfc63c7c040fb067d7ba39badede094d975f0b87587fe3a6c5bb6757a5be73f887be5d83f99dfefb0272bd48da6c9e79b4aee34c8d5f51e2e6c5 SHA512 639458d83b3f25d9aa433c205b9d16ded5ec689c1efb4827457fc3075c000d7abc2b70c9c8cf741c8bea03c1e47284015e69bf834e7a5670c68a40097e45891b diff --git a/app-admin/mcollective/files/mcollectived.initd b/app-admin/mcollective/files/mcollectived.initd deleted file mode 100644 index 8e295ceaa41c..000000000000 --- a/app-admin/mcollective/files/mcollectived.initd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the Apache License, Version 2.0 - -mcollectived="/usr/sbin/mcollectived" -pidfile="/var/run/mcollectived" - -depend() { - need net -} - -start() { - ebegin "Starting mcollectived" - ${mcollectived} --pid=${pidfile} --config="/etc/mcollective/server.cfg" - eend $? -} - -stop() { - ebegin "Stopping mcollectived" - kill `cat ${pidfile}` - eend $? -} - -restart() { - svc_stop - sleep 2 - svc_start -} diff --git a/app-admin/mcollective/mcollective-2.12.5.ebuild b/app-admin/mcollective/mcollective-2.12.5.ebuild deleted file mode 100644 index 0c30f90cf894..000000000000 --- a/app-admin/mcollective/mcollective-2.12.5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -USE_RUBY="ruby25 ruby26 ruby27" - -inherit ruby-ng - -DESCRIPTION="Framework to build server orchestration or parallel job execution -systems" -HOMEPAGE="https://docs.puppet.com/mcollective/" -SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/all/marionette-collective-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc +client" - -DEPEND="" -RDEPEND=">=dev-ruby/stomp-1.4.4" - -src_compile() { - einfo "nothing to compile" -} - -each_ruby_install() { - cd "marionette-collective-${PV}" - doruby -r lib/* - insinto /usr/share/mcollective - use client && dosbin bin/mco - dosbin bin/mcollectived - if use doc ; then - dodoc -r ext - docinto html - dodoc -r doc/. - docompress -x /usr/share/doc/${PF}/{ext,html} - fi - newinitd "${FILESDIR}"/mcollectived.initd mcollectived - insinto /etc/mcollective - cd etc - for cfg in *.dist ; do - newins "${cfg}" "${cfg%%.dist}" - sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \ - "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed" - done - insinto /etc/mcollective/plugin.d -} - -pkg_postinst() { - einfo "Mcollective requires a stomp server installed and functioning before" - einfo "you can use it. The recommended server to use is ActiveMQ [1] but" - einfo "any other stomp compatible server should work." - einfo - einfo "It is recommended you read the \'getting started\' guide [2] if this" - einfo "is a new installation" - einfo - einfo "[1] https://activemq.apache.org/" - einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted" -} diff --git a/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild b/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild index 7335bb484d59..cc63862630b8 100644 --- a/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild +++ b/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit vcs-snapshot linux-info toolchain-funcs @@ -10,10 +10,9 @@ HOMEPAGE="https://github.com/mjg59/mei-amt-check/" COMMIT="d07672120ce7a0c79e949e537f3d19efecec1700" SRC_URI="https://github.com/mjg59/mei-amt-check/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="|| ( BSD GPL-2 )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" CONFIG_CHECK="~INTEL_MEI_ME" ERROR_INTEL_MEI_ME="Need to activate INTEL_MEI_ME to run the tool" diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest index 0a23e8626c02..24d3adf61687 100644 --- a/app-admin/metalog/Manifest +++ b/app-admin/metalog/Manifest @@ -1 +1,2 @@ DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd +DIST metalog-20230719.tar.gz 42579 BLAKE2B 6088c86fad90185fcb22a96ff88686647eac1fb4216884f43c07dff23274efc748c908f6f98162f743d2528437748f79809dfe6911d8d47e6cf7e58c8f3ca3b4 SHA512 a717dca5e00e9e66b97a84c3dbb0cdda522cbe628fad4cfbcb5256ee69659c63149bbb1e8797028bbab55d97787661c1d7316c7c2cbfe3b65932f84d64af15f6 diff --git a/app-admin/metalog/files/metalog-20230719-metalog-conf.patch b/app-admin/metalog/files/metalog-20230719-metalog-conf.patch new file mode 100644 index 000000000000..504c2a28291f --- /dev/null +++ b/app-admin/metalog/files/metalog-20230719-metalog-conf.patch @@ -0,0 +1,13 @@ +diff --git a/metalog.conf b/metalog.conf +index 8f53b87..54332c6 100644 +--- a/metalog.conf ++++ b/metalog.conf +@@ -44,6 +44,8 @@ maxfiles = 5 + # merely write $@ to some device (your console for messages): + # echo "$@" > /dev/tty10 + # ++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog ++# + #console logging: + # facility = "*" + # command = "/sbin/consolelog.sh" diff --git a/app-admin/metalog/metalog-20220214.ebuild b/app-admin/metalog/metalog-20220214.ebuild index ef771039b142..4d63d0832473 100644 --- a/app-admin/metalog/metalog-20220214.ebuild +++ b/app-admin/metalog/metalog-20220214.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 @@ -12,12 +12,12 @@ S="${WORKDIR}"/${PN}-${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="unicode" RDEPEND="dev-libs/libpcre2" DEPEND="${RDEPEND}" -BDEPEND="sys-devel/autoconf-archive +BDEPEND="dev-build/autoconf-archive virtual/pkgconfig" PATCHES=( diff --git a/app-admin/metalog/metalog-20230719.ebuild b/app-admin/metalog/metalog-20230719.ebuild new file mode 100644 index 000000000000..623f82164f01 --- /dev/null +++ b/app-admin/metalog/metalog-20230719.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="A highly configurable replacement for syslogd/klogd" +HOMEPAGE="https://github.com/hvisage/metalog" +SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="unicode" + +RDEPEND=" + dev-libs/libpcre2 +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/metalog-20230719-metalog-conf.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf $(use_with unicode) +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS ChangeLog README NEWS metalog.conf + + into / + newsbin "${FILESDIR}"/consolelog.sh-r1 consolelog.sh + + newinitd "${FILESDIR}"/metalog.initd-r1 metalog + newconfd "${FILESDIR}"/metalog.confd metalog + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service +} + +pkg_preinst() { + if [[ -d "${ROOT}"/etc/metalog && ! -e "${ROOT}"/etc/metalog.conf ]] ; then + mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf + rmdir "${ROOT}"/etc/metalog + export MOVED_METALOG_CONF=true + else + export MOVED_METALOG_CONF=false + fi +} + +pkg_postinst() { + if ${MOVED_METALOG_CONF} ; then + ewarn "The default metalog.conf file has been moved" + ewarn "from ${EROOT}/etc/metalog/metalog.conf to just" + ewarn "${EROOT}/etc/metalog.conf. If you had a standard" + ewarn "setup, the file has been moved for you." + fi +} diff --git a/app-admin/mkosi/Manifest b/app-admin/mkosi/Manifest index 90977acf8eff..8886610352bc 100644 --- a/app-admin/mkosi/Manifest +++ b/app-admin/mkosi/Manifest @@ -1 +1 @@ -DIST mkosi-12.tar.gz 164750 BLAKE2B b4b43e3cd64bc75eaa1993504baa02cc7f35c77fc76d24a88ccc06d4ab566477aa9febca58ac1c397cd32057aa2da8545480e89a1c9b4bd4d4fa516d812237b0 SHA512 ae59789e3b4855400d130714fac0b3b599b3e69631bc6a5267916697d0722c05a6c788cd70d224917261c931fe93fa287d3d23f6f00849cb80ff9794a13dc04e +DIST mkosi-20.2.tar.gz 198966 BLAKE2B 1ab2332427d205871adea24ddd50c41e716801dd320f17167dc2e990d449084d59fc58efb20de01a80d438ce85b900f9752f9acc2372a5d5e8ccead0d371b9ed SHA512 62095d81f21d18a1b7f25c73ea2989f9f5b8fe1e335185b3ce6774af2739df9124ca8f5860514a8f570d565ffbf07edf3abc53a0622059127f5c35ed23bd8f65 diff --git a/app-admin/mkosi/metadata.xml b/app-admin/mkosi/metadata.xml index 4d83ae8b4b54..a90d799e8b1e 100644 --- a/app-admin/mkosi/metadata.xml +++ b/app-admin/mkosi/metadata.xml @@ -9,4 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">systemd/mkosi</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/mkosi/mkosi-12-r1.ebuild b/app-admin/mkosi/mkosi-20.2-r1.ebuild index 42cff127c935..eeac67318dcb 100644 --- a/app-admin/mkosi/mkosi-12-r1.ebuild +++ b/app-admin/mkosi/mkosi-20.2-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..12} ) inherit distutils-r1 optfeature @@ -15,14 +16,26 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64" RDEPEND=" - dev-vcs/git - sys-apps/portage - sys-apps/systemd app-emulation/qemu - sys-firmware/edk2-ovmf" + sys-apps/bubblewrap + sys-apps/systemd + || ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2-ovmf )" +BDEPEND="virtual/pandoc" distutils_enable_tests pytest +src_compile() { + distutils-r1_src_compile + + ./tools/make-man-page.sh || die +} + +src_install() { + distutils-r1_src_install + + doman mkosi/resources/mkosi.1 +} + pkg_postinst() { optfeature "For debian support: " dev-util/debootstrap } diff --git a/app-admin/mktwpol/mktwpol-1.0.1.ebuild b/app-admin/mktwpol/mktwpol-1.0.1-r1.ebuild index d9a3ada6c1fe..dab3db576eab 100644 --- a/app-admin/mktwpol/mktwpol-1.0.1.ebuild +++ b/app-admin/mktwpol/mktwpol-1.0.1-r1.ebuild @@ -1,24 +1,25 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files" HOMEPAGE="https://sourceforge.net/projects/mktwpol" -SRC_URI="mirror://sourceforge/mktwpol/${PF}.tar.gz" +SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz" +S=${WORKDIR}/${P} LICENSE="CC-BY-SA-3.0" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" RDEPEND="app-admin/tripwire" -S=${WORKDIR}/${PF} - src_prepare() { default - sed -i -e 's:/usr/local:/usr:' Makefile || die + sed -i \ + -e 's:/usr/local:/usr:' \ + -e "s|^docdir.*|docdir = \"${EPREFIX}/usr/share/doc/${PF}\"|g" \ + Makefile || die } pkg_preinst() { @@ -52,17 +53,5 @@ pkg_preinst() { elog "To use an alternative policy-generating rules file," elog "copy it to /etc/tripwire, uncompress and \`touch\` it." elog - fi - # ewarn message if a version change from 0.x.x - if [[ "${REPLACING_VERSIONS:0:1}" == "0" ]] ; then - ewarn - ewarn "Mktwpol default policy-generating rules no longer sort by package." - ewarn - ewarn " This change does not reduce the scope of system inspection!" - ewarn " It only affects the tripwire report format." - ewarn - ewarn " The previous default reporting format is still available, at" - ewarn " /usr/share/doc/${PF}/mktwpol-gentoo-packages.rules*" - ewarn fi } diff --git a/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild b/app-admin/mongo-tools/mongo-tools-100.4.1-r1.ebuild index 52cc5e43f884..cd615af4e5cd 100644 --- a/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild +++ b/app-admin/mongo-tools/mongo-tools-100.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,10 +12,12 @@ SLOT="0" KEYWORDS="amd64 ~arm64 ~riscv" IUSE="sasl ssl" -DEPEND="dev-lang/go:= +DEPEND=" net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) - ssl? ( dev-libs/openssl:0= )" + ssl? ( dev-libs/openssl:0= ) +" +BDEPEND="dev-lang/go" # Do not complain about CFLAGS etc since go projects do not use them. QA_FLAGS_IGNORED='.*' diff --git a/app-admin/mongo-tools/mongo-tools-100.5.1.ebuild b/app-admin/mongo-tools/mongo-tools-100.5.1-r1.ebuild index 5fdee0d14afe..cd615af4e5cd 100644 --- a/app-admin/mongo-tools/mongo-tools-100.5.1.ebuild +++ b/app-admin/mongo-tools/mongo-tools-100.5.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,10 +12,12 @@ SLOT="0" KEYWORDS="amd64 ~arm64 ~riscv" IUSE="sasl ssl" -DEPEND="dev-lang/go:= +DEPEND=" net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) - ssl? ( dev-libs/openssl:0= )" + ssl? ( dev-libs/openssl:0= ) +" +BDEPEND="dev-lang/go" # Do not complain about CFLAGS etc since go projects do not use them. QA_FLAGS_IGNORED='.*' diff --git a/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.15-r1.ebuild index 82253adc9ab4..18d33ebdac8a 100644 --- a/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild +++ b/app-admin/mongo-tools/mongo-tools-4.2.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,10 +15,12 @@ SLOT="0" KEYWORDS="amd64 ~arm64" IUSE="sasl ssl" -DEPEND="dev-lang/go:= +DEPEND=" net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) - ssl? ( dev-libs/openssl:0= )" + ssl? ( dev-libs/openssl:0= ) +" +BDEPEND="dev-lang/go" # Do not complain about CFLAGS etc since go projects do not use them. QA_FLAGS_IGNORED='.*' diff --git a/app-admin/mongo-tools/mongo-tools-4.2.17.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.17-r1.ebuild index 1c622b0ee6a7..b241e07817c3 100644 --- a/app-admin/mongo-tools/mongo-tools-4.2.17.ebuild +++ b/app-admin/mongo-tools/mongo-tools-4.2.17-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,10 +15,12 @@ SLOT="0" KEYWORDS="~amd64 ~arm64" IUSE="sasl ssl" -DEPEND="dev-lang/go:= +DEPEND=" net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) - ssl? ( dev-libs/openssl:0= )" + ssl? ( dev-libs/openssl:0= ) +" +BDEPEND="dev-lang/go" # Do not complain about CFLAGS etc since go projects do not use them. QA_FLAGS_IGNORED='.*' diff --git a/app-admin/mongosh-bin/Manifest b/app-admin/mongosh-bin/Manifest index 15b50d854cbb..45692de8e73d 100644 --- a/app-admin/mongosh-bin/Manifest +++ b/app-admin/mongosh-bin/Manifest @@ -1,4 +1,4 @@ -DIST mongosh-1.1.9_arm64.tgz 60765908 BLAKE2B 9658285f084b22ea60eaaf0c6aca78362e483b65a0153da1da37ea4d2d233509a145e2aa7f88425169815dda4443eeae9a890fc2a91020294118089260419e20 SHA512 35d7bc3409e5bec874203d8868b863ad13f6b66e82ac933848b245aaae4ab85a7c0db3879e262e62435af44f7aa0f6c46ec27e6b21f5e0d227cda5dfd623f7e2 -DIST mongosh-1.1.9_x64.tgz 62020005 BLAKE2B 2b634fe864bef24bd93f6676acf57d877d745e1407ec150a75e26c498affa39dbfb5918d6645ac33a3c0990a2c33dc464ad2748e7bd9b536111a86dc856a21cb SHA512 99f2b66a7adbd8a395d46e610fa493eff974ace54b2e5cf395b572e023270e5ce3fdf7e7b73bedd3f7f31c2f46964647920920c32ac7460def71dfc5630c26b8 DIST mongosh-1.3.1_arm64.tgz 61196774 BLAKE2B 6d48f06d2378d0d1f46f896b445e4022a5a8c0f7d6b9225dadf909734a721255eb0d4b6daccf52886db07a1f3186125abef10603e4cf91791b4d93c0d6ca2a30 SHA512 46519e1ccda8490ac1336014c17250392402c7497b34fdb4cdefdab322913f740b2699e2f1a94aeee5441157025586900f1ffe3bac40e4eca5e1858cdc2e406b DIST mongosh-1.3.1_x64.tgz 62428646 BLAKE2B f92434ff73890ba38498bc51d9a497d7feab240e7bbe380565b1bf54fa58018d24250c70f20f634248b481b5b41d0c4bdea0bf130347a1fdd547cfc7d655de67 SHA512 2650f05f40594736985e11cede4d59dcce0c620654ab7c136084a94b816bafd3d2cc6ab8be05e1c844cad9221f436e9aa2e9e670cbae6505fe6d28c12cf608dd +DIST mongosh-2.0.2_arm64.tgz 70059224 BLAKE2B 3039ddbf28ff8e11e2f8568f3b2b9aadc021b28705b96930e97c5b6352825c0ad625b68ca2c0cd55015b03aeb71c52d357d13625007e577344ed1bf9cb608146 SHA512 7569a39426fd76d6cfe6e98d7986d0f5aac443d0f227a1e479493a0d438ca291f02ae191d9b33648e797d006e6d2833608948e74d73294a21d14a9a6cfadcb56 +DIST mongosh-2.0.2_x64.tgz 71429653 BLAKE2B c6059cbb786ee29bbda63267cc7abadec38e9a4ca09162c737005de0e71c4fc8ae7cea4434117d62b9881f956b5d0dad0800013fa45f5edc6dda44b8c6897c45 SHA512 e29a4bafd2bcc57bde1f58f857a4127cc52b756078cd065434c55d910870bd3b18f732b2e1dda17afb4f338c2519ca9a64cc13216e48f5116b3cabbd38cb0a82 diff --git a/app-admin/mongosh-bin/mongosh-bin-1.1.9.ebuild b/app-admin/mongosh-bin/mongosh-bin-2.0.2.ebuild index 6598d4ea50ad..4dd1b1251ab8 100644 --- a/app-admin/mongosh-bin/mongosh-bin-1.1.9.ebuild +++ b/app-admin/mongosh-bin/mongosh-bin-2.0.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 MY_PN="${PN%-bin}" MY_P=${MY_PN}-${PV} diff --git a/app-admin/monit/monit-5.29.0.ebuild b/app-admin/monit/monit-5.29.0.ebuild index d388c1122d50..0787c2d3edd8 100644 --- a/app-admin/monit/monit-5.29.0.ebuild +++ b/app-admin/monit/monit-5.29.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,8 +21,8 @@ RDEPEND="sys-libs/zlib:= " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " src_prepare() { diff --git a/app-admin/monit/monit-5.31.0.ebuild b/app-admin/monit/monit-5.31.0.ebuild index 54708e6c5d9e..253ee81a7bac 100644 --- a/app-admin/monit/monit-5.31.0.ebuild +++ b/app-admin/monit/monit-5.31.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,8 +21,8 @@ RDEPEND="sys-libs/zlib:= " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " src_prepare() { diff --git a/app-admin/monit/monit-5.32.0.ebuild b/app-admin/monit/monit-5.32.0.ebuild index 54708e6c5d9e..253ee81a7bac 100644 --- a/app-admin/monit/monit-5.32.0.ebuild +++ b/app-admin/monit/monit-5.32.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,8 +21,8 @@ RDEPEND="sys-libs/zlib:= " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " src_prepare() { diff --git a/app-admin/monit/monit-5.33.0.ebuild b/app-admin/monit/monit-5.33.0.ebuild index 1f5faf3c1cfd..253ee81a7bac 100644 --- a/app-admin/monit/monit-5.33.0.ebuild +++ b/app-admin/monit/monit-5.33.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,8 +21,8 @@ RDEPEND="sys-libs/zlib:= " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " src_prepare() { diff --git a/app-admin/needrestart/needrestart-3.6.ebuild b/app-admin/needrestart/needrestart-3.6.ebuild index 310ca120f7fb..c6ba2e67cc91 100644 --- a/app-admin/needrestart/needrestart-3.6.ebuild +++ b/app-admin/needrestart/needrestart-3.6.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=8 @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then SRC_URI="" else SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm arm64 x86" fi DESCRIPTION="Restart daemons after library updates" diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest deleted file mode 100644 index 74338d4fc15d..000000000000 --- a/app-admin/newsyslog/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST newsyslog-1.1.0.81.tar.gz 174411 BLAKE2B d7916396ecf7dda9928891c3bd1020be45354c9623e53d9a52170567c811b3cad3e82efec8145f51a68ed851c46a6c3fb6e8bf944bedf935f2a6589e4b45d3e1 SHA512 de7ae2f71fb5a2a3fad0eaaa793da1ff2b36bc5757a30c70e8f740da8ea2647aea0422c13c1cc1a5e082e41938cbb590c8bb0ecf46d5d584466069f319db47c2 diff --git a/app-admin/newsyslog/files/newsyslog-1.1.0.81-fno-common.patch b/app-admin/newsyslog/files/newsyslog-1.1.0.81-fno-common.patch deleted file mode 100644 index b63e439064ee..000000000000 --- a/app-admin/newsyslog/files/newsyslog-1.1.0.81-fno-common.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.gentoo.org/707452 ---- a/sig2str.c -+++ b/sig2str.c -@@ -63,7 +63,7 @@ extern const unsigned int sys_nsigname; /* also from sys_signame.c */ - #endif - - #if !defined(SYS_SIGNAME_DECLARED) --const char *const sys_signame[]; /* defined in sys_signame.c */ -+extern const char *const sys_signame[]; /* defined in sys_signame.c */ - #endif - - #if !defined(HAVE_DECL_SIG2STR) ---- a/str2sig.c -+++ b/str2sig.c -@@ -29,7 +29,7 @@ static const char rcsid[] = - #include "newsyslog.h" /* generic portability definitions */ - - #if !defined(SYS_SIGNAME_DECLARED) --const char *const sys_signame[]; /* defined in signame.c */ -+extern const char *const sys_signame[]; /* defined in signame.c */ - #endif - - /* NetBSD gained sys_nsig sometime just prior to 1.4 */ -@@ -65,7 +65,7 @@ extern const unsigned int sys_nsigname; /* also from sys_signame.c */ - #endif - - #if !defined(SYS_SIGNAME_DECLARED) --const char *const sys_signame[]; /* defined in sys_signame.c */ -+extern const char *const sys_signame[]; /* defined in sys_signame.c */ - #endif - - #if !defined(HAVE_DECL_STR2SIG) ---- a/sys_signame.c -+++ b/sys_signame.c -@@ -22,7 +22,7 @@ - #include "config.h" - #include <sys/types.h> - --const char *const sys_signame[] = { -+extern const char *const sys_signame[] = { - /* 0 */ "Signal 0", /* Fake value for zero */ - /* 1 */ "HUP", /* Control TTY hangup */ - /* 2 */ "INT", /* Control TTY interrupt */ diff --git a/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch b/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch deleted file mode 100644 index 1e2b07019f35..000000000000 --- a/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -763,7 +763,7 @@ - - .8.8.html: - @rm -f $@ -- ($(TBL) $< | $(NROFF) -mdoc2html > $@) || (rm -f $@; exit 1) -+ ($(TBL) $< | $(NROFF) -mhtml > $@) || (rm -f $@; exit 1) - - .5.5.ps: - @rm -f $@ -@@ -771,7 +771,7 @@ - - .5.5.html: - @rm -f $@ -- ($(TBL) $< | $(NROFF) -mdoc2html > $@) || (rm -f $@; exit 1) -+ ($(TBL) $< | $(NROFF) -mhtml > $@) || (rm -f $@; exit 1) - - .cat5.cat5-dist: - @rm -f $@ diff --git a/app-admin/newsyslog/metadata.xml b/app-admin/newsyslog/metadata.xml deleted file mode 100644 index 4c0d3032d69c..000000000000 --- a/app-admin/newsyslog/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> -</pkgmetadata> diff --git a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild b/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild deleted file mode 100644 index cf05de58e7b6..000000000000 --- a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="a highly configurable program for managing and archiving log files" -HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html" -SRC_URI="http://download.openpkg.org/components/cache/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86" - -BDEPEND="sys-apps/groff" -RDEPEND=" - virtual/cron - app-arch/gzip" - -PATCHES=( - "${FILESDIR}"/${P}-html.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_configure() { - local myconf=( - --with-gzip - --with-newsyslog_conf="${EPREFIX}"/etc/newsyslog.conf - ) - if has_version 'app-admin/syslog-ng'; then - myconf+=( --with-syslogd_pid="${EPREFIX}"/var/run/syslog-ng.pid ) - else - myconf+=( --with-syslogd_pid="${EPREFIX}"/var/run/syslog.pid ) - fi - - econf "${myconf[@]}" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - catmandir="${T}"/dont-install \ - install - - einstalldocs - dodoc newsyslog.conf ToDo -} diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r2.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild index ecc615db2851..873152bf9eb5 100644 --- a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r2.ebuild +++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild @@ -1,9 +1,10 @@ -# 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} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" inherit distutils-r1 @@ -17,11 +18,9 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -RDEPEND=" - dev-python/docopt[${PYTHON_USEDEP}] +RDEPEND="dev-python/docopt[${PYTHON_USEDEP}] dev-python/pyparsing[${PYTHON_USEDEP}] dev-python/tabulate[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-0.0.2-py3.patch ) diff --git a/app-admin/ocsinventory-agent/Manifest b/app-admin/ocsinventory-agent/Manifest new file mode 100644 index 000000000000..6c6c3a4cc23d --- /dev/null +++ b/app-admin/ocsinventory-agent/Manifest @@ -0,0 +1 @@ +DIST Ocsinventory-Unix-Agent-2.10.0.tar.gz 2319357 BLAKE2B 5a4a403d90dc68f95ac8b1efb22b3d4fe700a6a819aea44c991f13346c2aacb0fef2f63e9cc83607054e8b7518d48c11c431e0245fa91dc20ad0c4cafcd46cf3 SHA512 61881caaebd869abf39ebe641feb6dfceb31cfc64b2208de4be7ddf6923c2c7382b0832bb932a6378d32ffb0d5969e0ebb8d976ac09e2493c0ac5ffd938bd2e8 diff --git a/app-admin/ocsinventory-agent/files/modules.conf b/app-admin/ocsinventory-agent/files/modules.conf new file mode 100644 index 000000000000..7e3eb3fed7f6 --- /dev/null +++ b/app-admin/ocsinventory-agent/files/modules.conf @@ -0,0 +1,10 @@ +# this list of module will be loaded by the agent at run time +# to check its syntax do: +# $perl modules.conf +# You must have NO error. Else the content will be ignored + +use Ocsinventory::Agent::Modules::Download; +use Ocsinventory::Agent::Modules::Snmp; + +# DO NO REMOVE the 1; +1; diff --git a/app-admin/ocsinventory-agent/files/ocsinventory-agent.cfg b/app-admin/ocsinventory-agent/files/ocsinventory-agent.cfg new file mode 100644 index 000000000000..30dec1a71c4f --- /dev/null +++ b/app-admin/ocsinventory-agent/files/ocsinventory-agent.cfg @@ -0,0 +1 @@ +server=servername.yourdomain.com diff --git a/app-admin/ocsinventory-agent/files/ocsinventory-agent.crond b/app-admin/ocsinventory-agent/files/ocsinventory-agent.crond new file mode 100644 index 000000000000..66cb83335b7d --- /dev/null +++ b/app-admin/ocsinventory-agent/files/ocsinventory-agent.crond @@ -0,0 +1 @@ +43 2 * * * root /usr/bin/ocsinventory-agent --lazy > /dev/null 2>&1 diff --git a/app-admin/ocsinventory-agent/files/ocsinventory-agent.service b/app-admin/ocsinventory-agent/files/ocsinventory-agent.service new file mode 100644 index 000000000000..daf311e98c8a --- /dev/null +++ b/app-admin/ocsinventory-agent/files/ocsinventory-agent.service @@ -0,0 +1,10 @@ +[Unit] +Description=Cron job for OCS-Inventory agent +After=network.target + +[Service] +User=root +ExecStart=/usr/bin/ocsinventory-agent --lazy + +[Install] +WantedBy=multi-user.target diff --git a/app-admin/ocsinventory-agent/files/ocsinventory-agent.timer b/app-admin/ocsinventory-agent/files/ocsinventory-agent.timer new file mode 100644 index 000000000000..01dd060c8960 --- /dev/null +++ b/app-admin/ocsinventory-agent/files/ocsinventory-agent.timer @@ -0,0 +1,11 @@ +[Unit] +Description=Launch audit + +[Timer] +OnCalendar=daily +AccuracySec=1h +RandomizedDelaySec=240 +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/app-admin/gixy/metadata.xml b/app-admin/ocsinventory-agent/metadata.xml index 90dabf33f4e3..444bedc3a166 100644 --- a/app-admin/gixy/metadata.xml +++ b/app-admin/ocsinventory-agent/metadata.xml @@ -2,10 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> + <email>pacho@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">yandex/gixy</remote-id> + <remote-id type="github">OCSInventory-NG/UnixAgent</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/ocsinventory-agent/ocsinventory-agent-2.10.0.ebuild b/app-admin/ocsinventory-agent/ocsinventory-agent-2.10.0.ebuild new file mode 100644 index 000000000000..68cdbc95dde1 --- /dev/null +++ b/app-admin/ocsinventory-agent/ocsinventory-agent-2.10.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit perl-module systemd + +DESCRIPTION="Hardware and software inventory tool (client)" +HOMEPAGE="http://www.ocsinventory-ng.org https://github.com/OCSInventory-NG/UnixAgent" +SRC_URI="https://github.com/OCSInventory-NG/UnixAgent/releases/download/v${PV}/Ocsinventory-Unix-Agent-${PV}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-perl/Crypt-SSLeay + dev-perl/Net-IP + dev-perl/Net-SNMP + dev-perl/Net-SSLeay + dev-perl/Proc-Daemon + dev-perl/XML-NamespaceSupport + dev-perl/XML-SAX + dev-perl/XML-Simple + dev-perl/libwww-perl + sys-apps/dmidecode + sys-apps/pciutils +" +RDEPEND="${DEPEND}" +BDEPEND="" + +S="${WORKDIR}/Ocsinventory-Unix-Agent-${PV}" + +src_compile() { + perl-module_src_compile + rm run-postinst || die +} + +src_install() { + perl-module_src_install + + keepdir "/var/lib/${PN}" + keepdir "/var/log/${PN}" + + insinto /etc/ocsinventory + doins "${FILESDIR}/${PN}.cfg" + doins "${FILESDIR}/modules.conf" + + insinto /etc/cron.d + newins "${FILESDIR}/${PN}.crond" ${PN} + systemd_dounit "${FILESDIR}/${PN}".{service,timer} + + insinto /etc/logrotate.d + doins "contrib/cron/${PN}.logrotate" +} diff --git a/app-admin/op-cli-bin/Manifest b/app-admin/op-cli-bin/Manifest index 7d1d3b038af0..51e143ee1091 100644 --- a/app-admin/op-cli-bin/Manifest +++ b/app-admin/op-cli-bin/Manifest @@ -1,2 +1,5 @@ +DIST op_linux_386_v2.23.0.zip 8074987 BLAKE2B 52adc360f9f9f19bf75761ecc2efe0a66385fc883b2b658c099dd53aed1927e401faf492a003350bd7dc41e08bd27953bb76462a595c838d6272b45dd56a2ebc SHA512 7227702e9ff31fad463e56f457d3af3bf6e14757412d030c7d36b49df771b84e711a644c74ea005dcf6d569dcc3b42203b30af15a77209e266d6d351ae91ae6f DIST op_linux_amd64_v1.12.3.zip 3902883 BLAKE2B d68aef3e102e39019a2cf1423b4f4ec64642475c37d92acf1551d66f0f453c8f1ed51d730443bba90aceebd7730d4d485c9c1c45067f7f9c68dff785ec85ffb5 SHA512 064b741e961b60febcf1c883f73968aea3718251a3ead2e94747be63010a10498dbffc7789c02e330f360d2a323fde04dee8a922e2ed5546a6beae7ddb5cb7db -DIST op_linux_amd64_v1.7.0.zip 3989846 BLAKE2B 074bcc248438c1cfa0436726fb3b101e5d60c477c406434d00bb7689d6004796373d8562e22fa870239c9d2234cfae21d7a8aa2b90e7807cb15df8870b2afd64 SHA512 7ab0792ba737a8f95ec874dc111fdb6cd45d552c5b5cfb9d35423a76f444c15718269e77faae978d773bfcaa7e7607f4b8b7e93616c8f7fc91caafb35c856a5e +DIST op_linux_amd64_v2.23.0.zip 8542636 BLAKE2B ff8e75278f522b50d1984ed0ea060da46d520d1a1bafc49016a4d38eab30c05f6cd6189122992100dbb443edf04f83a77f1adff169f0111a6d07df4e19ff5256 SHA512 92706f6f2e1164a24cf038be6d13fa6f816845f4d540c5f91ba35bc79d9c0fbda4a49dacc91efb872cf9b7e8d6656f2d3f289745a1afb66545e697493d7519f3 +DIST op_linux_arm64_v2.23.0.zip 7767872 BLAKE2B 346347a3f8612ce955a32c819ce984ef2d1bf6e4672842231ce67aa270a2fbb264cba3b49fa9d1512a310c5467cbdd29f5e3bf083cc509c72d9c71dc6e6ee71e SHA512 9c94dfe703ff8c7ab63f2c2131e0f1cf4201e0ef0d05cf3ebfcfee1574431484c1ac3bb33a2ed3ff6a235227eedb95393a4c790215839a8f7e6f3aba88d77aa7 +DIST op_linux_arm_v2.23.0.zip 7996772 BLAKE2B d960a840dcd5f86bacc0bbd9c3dc51e6811e0874871b0de09bf08541e78d5ee1968ffbc25c7ceb09f4463c9c0455197eb65557bcc427ad9334da2d3c5e16335c SHA512 bd711ab5bdc53220648a70087472a3098ccf6425534ab03c8f0b85acf8930c9fefa15cca96da6f17e4e804a8fb3ec3da1d1c0956f4140476ba70ffb8e7c04a17 diff --git a/app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild b/app-admin/op-cli-bin/op-cli-bin-2.23.0.ebuild index 1e1b0736b834..a81011435df1 100644 --- a/app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild +++ b/app-admin/op-cli-bin/op-cli-bin-2.23.0.ebuild @@ -1,16 +1,21 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="command line interface for the 1password password manager" HOMEPAGE="https://1password.com/downloads/command-line/" -SITE="https://cache.agilebits.com/dist/1P/op/pkg/v${PV}/" -SRC_URI="${SITE}/op_linux_amd64_v${PV}.zip" +SITE="https://cache.agilebits.com/dist/1P/op2/pkg/v${PV}" +SRC_URI=" +amd64? ( ${SITE}/op_linux_amd64_v${PV}.zip ) +arm? ( ${SITE}/op_linux_arm_v${PV}.zip ) +arm64? ( ${SITE}/op_linux_arm64_v${PV}.zip ) +x86? ( ${SITE}/op_linux_386_v${PV}.zip ) +" LICENSE="all-rights-reserved" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" BDEPEND="app-arch/unzip" diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest index d987b4525e14..949a17ea68f6 100644 --- a/app-admin/openrc-settingsd/Manifest +++ b/app-admin/openrc-settingsd/Manifest @@ -1,2 +1 @@ -DIST openrc-settingsd-v1.1.0.tar.bz2 41781 BLAKE2B 1a508c5751a3b2c734b533ebdf72d4c5fa97b67743caf5e47f06fc505a286e92167715e0ec706528a4e9a74d0aed9d78d6b6b2d542c1df3781d5bd76ff700b91 SHA512 f63aa624097a806094c51a6da8fc6f4962c3302ea0acf02be17744db9d5caf4cfd68294a8e8916e62eeeca722cadc571715b9751730f9d9cf1f9be66e93510f7 -DIST openrc-settingsd-v1.2.0.tar.bz2 41713 BLAKE2B e4630e934fc55549b3d81cc448adb35cb22cb99b898363a1113909a24acc0709d5693841a9c651b4ecf52044c3a45cc4b8207f9c9a3d0e1e8a4f85edefb23d65 SHA512 b1862e80454d3ca22d083f283f4ef3215dfad4da6d2aa495211fa31014c66fb6891ae87a3a1c6932944ed4c1e7100d247e80abc659f37868adcf5fce3b90385b +DIST openrc-settingsd-v1.4.0.tar.bz2 41420 BLAKE2B 3890c65e22f1cc55aa8f067ae7d8a46de25618c7ab98acb8e01f38662da4d73f3d0d16583a0526ded3331c4fb4d80bf0b6852917ed875adfa0035d19e19219e6 SHA512 aa5bd4d2afb1b959c4c2d532b30d369ee0bd637010ea75adc8ca7444cdb13bf651ae4c6946141d326c8460f23ba4482c1a3f639a0b48190009a88298a17c22e3 diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild deleted file mode 100644 index 498b8704eb9e..000000000000 --- a/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="System settings D-Bus service for OpenRC" -HOMEPAGE="https://gitlab.com/postmarketOS/openrc-settingsd/" -SRC_URI="https://gitlab.com/postmarketOS/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="systemd" - -DEPEND=" - >=dev-libs/glib-2.30:2 - dev-libs/libdaemon:0= - sys-apps/dbus - sys-apps/openrc:= - sys-auth/polkit -" -RDEPEND=" - ${DEPEND} - systemd? ( >=sys-apps/systemd-197 ) - !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd ) -" -BDEPEND=" - dev-util/gdbus-codegen - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}-v${PV}" - -src_prepare() { - default - eautoreconf - sed -i -e 's:/sbin/runscript:/sbin/openrc-run:g' data/init.d/openrc-settingsd.in || die -} - -src_configure() { - econf \ - --with-pidfile="${EPREFIX}"/run/openrc-settingsd.pid -} - -src_install() { - default - if use systemd; then - # Avoid file collision with systemd - rm -vr "${ED}"/usr/share/{dbus-1,polkit-1} "${ED}"/etc/dbus-1 || die "rm failed" - fi -} - -pkg_postinst() { - if use systemd; then - elog "You installed ${PN} with USE=systemd. In this mode," - elog "${PN} will not start via simple dbus activation, so you" - elog "will have to manually enable it as an rc service:" - elog " # /etc/init.d/openrc-settingsd start" - elog " # rc-update add openrc-settingsd default" - fi -} diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.2.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.4.0.ebuild index 9152df573104..bf6db6a6c1a9 100644 --- a/app-admin/openrc-settingsd/openrc-settingsd-1.2.0.ebuild +++ b/app-admin/openrc-settingsd/openrc-settingsd-1.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/postmarketOS/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="systemd" DEPEND=" @@ -24,7 +24,7 @@ DEPEND=" RDEPEND=" ${DEPEND} systemd? ( >=sys-apps/systemd-197 ) - !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd ) + elibc_glibc? ( !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd ) ) " BDEPEND=" dev-util/gdbus-codegen @@ -38,6 +38,7 @@ src_configure() { -Dopenrc=enabled -Denv-update=/usr/bin/env-update -Dhostname-style=gentoo + -Dlocale-style=gentoo ) meson_src_configure } diff --git a/app-admin/opentofu/Manifest b/app-admin/opentofu/Manifest new file mode 100644 index 000000000000..d8ffd6841e91 --- /dev/null +++ b/app-admin/opentofu/Manifest @@ -0,0 +1,6 @@ +DIST opentofu-1.6.0-deps.tar.xz 332007504 BLAKE2B 1c2a7d2350944d34308baa0566977aad914b3c4f989ba90d51cb52e3001d11e56952906b0dab7adc5cef261290b748c0567e35c66f6701d62d750e18d0acea5f SHA512 5c5644b2caef5439e50865569abec133ba57a6e6581d8f8d38500671818079b471afcd86422858475b1ca912bdb75fe0b91227012f5c597bcaabe1a215b2eb09 +DIST opentofu-1.6.0.tar.gz 3696642 BLAKE2B e224ce14f04d07638d03b9a11ab251cd820acc86774f9c82f38f5bcfc38b62bbdbc70377e722a4dd2bd65f917ba0fc200ccaaeafdbd9430af66586491c7627eb SHA512 758f4ff79e526e9494e1e98dd927dbeb803b45df1f8bc15c3a9bca8343d7285b9130bfe5f19f6ddd7fd403b72d852b0d51542c058174e4bd5eed3c729b394bdb +DIST opentofu-1.6.1-deps.tar.xz 332000152 BLAKE2B bfa5bee3c7ba8cc79cd8f81137fb611abce0b806813475deab0e5546542910cc391252ebb3054badf3a8bfe17f25d30ce570065591aaa6148ad6bd7c42aa8e2e SHA512 10e5519b1be53a5ec1191dec8f73960da72ca53cc5284ef9a72139ce0e1db2a9213fbed696088644414ef0fb589c26a7980f695b79192f0e5f039f3dfcfc91e8 +DIST opentofu-1.6.1.tar.gz 3709010 BLAKE2B 3d172a4228ff10608dc74da6980eda38ec9afa13ac4bbfeb4ae3fb3142af81fc30988a99fea01ee7988b7ad057efbe1b270b4b880e4152ec3d87939f29ae8614 SHA512 6d98e5f03340853ad3f516ad890fe297c4239c03c0c5d4b0e7efc490b734ce2948bbd3ee5d1375d9eade2ea4a6ef71dbb22a5dd48fc81df5a9440ce73090a92e +DIST opentofu-1.6.2-deps.tar.xz 106556484 BLAKE2B fe6ed9507aa3589e34f8c3189d6ee03044b6397a650663c9746c94e45066dbc6e15529f9b4ed3c57649083580a7589596c0b710fdcf0ec832816e76d5137607e SHA512 d8c2e66ab9254d0031aa8fd7dc6fb0ef1aa748282a0b7d9d277398c2f50bceb097b52389a19b70c67d5d0abba9ef289f3d19a786436f16f7549b293bf6b46a48 +DIST opentofu-1.6.2.tar.gz 3708735 BLAKE2B 07c48de78e5510c87413447bf2393ee3e93a91ea562a28849e9db6342eccb7b85745cea0aaa3d8e3861a10127905f4b3614b77863b62a21a0a8c8f5163afac22 SHA512 25fac0e6837f2d125d35f780c3091139819a00ae3f96c2e62a1c3c544e425a60c9880c84b4e1aa6727771c5523c81e8dbab38d5151b854bbc470d7819746567c diff --git a/app-admin/opentofu/metadata.xml b/app-admin/opentofu/metadata.xml new file mode 100644 index 000000000000..cbe6b0ede320 --- /dev/null +++ b/app-admin/opentofu/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <upstream> + <changelog>https://github.com/opentofu/opentofu/blob/main/CHANGELOG.md</changelog> + <remote-id type="github">opentofu/opentofu</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-admin/terraform/terraform-1.2.7.ebuild b/app-admin/opentofu/opentofu-1.6.0.ebuild index 193e06323d6e..544c2e0b5f16 100644 --- a/app-admin/terraform/terraform-1.2.7.ebuild +++ b/app-admin/opentofu/opentofu-1.6.0.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit go-module -DESCRIPTION="A tool for building, changing, and combining infrastructure safely" -HOMEPAGE="https://www.terraform.io/" -SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="The open source infrastructure as code tool" +HOMEPAGE="https://www.opentofu.org/" +SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv" +KEYWORDS="~amd64" BDEPEND="dev-go/gox" @@ -24,9 +24,9 @@ src_compile() { gox \ -os=$(go env GOOS) \ -arch=$(go env GOARCH) \ - -output bin/terraform \ + -output bin/tofu \ -verbose \ - . || die + ./cmd/tofu || die } src_install() { @@ -36,5 +36,5 @@ src_install() { pkg_postinst() { elog "If you would like to install shell completions please run:" - elog " terraform -install-autocomplete" + elog " tofu -install-autocomplete" } diff --git a/app-admin/opentofu/opentofu-1.6.1.ebuild b/app-admin/opentofu/opentofu-1.6.1.ebuild new file mode 100644 index 000000000000..544c2e0b5f16 --- /dev/null +++ b/app-admin/opentofu/opentofu-1.6.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module + +DESCRIPTION="The open source infrastructure as code tool" +HOMEPAGE="https://www.opentofu.org/" +SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-go/gox" + +RESTRICT="test" + +DOCS=( {README,CHANGELOG}.md ) + +src_compile() { + export CGO_ENABLED=0 + gox \ + -os=$(go env GOOS) \ + -arch=$(go env GOARCH) \ + -output bin/tofu \ + -verbose \ + ./cmd/tofu || die +} + +src_install() { + dobin bin/* + einstalldocs +} + +pkg_postinst() { + elog "If you would like to install shell completions please run:" + elog " tofu -install-autocomplete" +} diff --git a/app-admin/opentofu/opentofu-1.6.2.ebuild b/app-admin/opentofu/opentofu-1.6.2.ebuild new file mode 100644 index 000000000000..544c2e0b5f16 --- /dev/null +++ b/app-admin/opentofu/opentofu-1.6.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module + +DESCRIPTION="The open source infrastructure as code tool" +HOMEPAGE="https://www.opentofu.org/" +SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-go/gox" + +RESTRICT="test" + +DOCS=( {README,CHANGELOG}.md ) + +src_compile() { + export CGO_ENABLED=0 + gox \ + -os=$(go env GOOS) \ + -arch=$(go env GOARCH) \ + -output bin/tofu \ + -verbose \ + ./cmd/tofu || die +} + +src_install() { + dobin bin/* + einstalldocs +} + +pkg_postinst() { + elog "If you would like to install shell completions please run:" + elog " tofu -install-autocomplete" +} diff --git a/app-admin/pass-otp/pass-otp-1.2.0-r1.ebuild b/app-admin/pass-otp/pass-otp-1.2.0-r1.ebuild index ee71ab2bb604..f8ad938f5c05 100644 --- a/app-admin/pass-otp/pass-otp-1.2.0-r1.ebuild +++ b/app-admin/pass-otp/pass-otp-1.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018-2022 Gentoo Authors +# Copyright 2018-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/app-admin/pass/pass-1.7.4-r2.ebuild b/app-admin/pass/pass-1.7.4-r2.ebuild index d0e16c5f3ac4..a70dea5f4464 100644 --- a/app-admin/pass/pass-1.7.4-r2.ebuild +++ b/app-admin/pass/pass-1.7.4-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 @@ -12,7 +12,7 @@ S="${WORKDIR}/password-store-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~arm64-macos ~x64-macos" IUSE="+git wayland X emacs dmenu importers" RDEPEND=" diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest index 4cb3c9dc2d2b..5301b99b1991 100644 --- a/app-admin/passwordsafe/Manifest +++ b/app-admin/passwordsafe/Manifest @@ -1 +1,2 @@ -DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738 +DIST passwordsafe-1.17.0.tar.gz 15463920 BLAKE2B e64c73139c829b16b5f825d3c078f1cb3285cb15400be988e35b64e4ce701a5241e099a09092a576e487f709464b6fa5d5911f5f68e096d194329cd0214ac8cd SHA512 de1ef537c2f6c17e35d93a53cf46e86b7c1f1a4439282f8c2b98443845e3d381e113448acd739fc6ccdb5eee8ff7ebfd8c0e4306cda517ab623eaf5b9354d39d +DIST passwordsafe-1.18.2.tar.gz 15613801 BLAKE2B e4ad44fe3aae6230c6a1d07e644b7b02831ec5bc815decd85050099c6f43e83bc09cd7d8f88ddfa5b63e5636db774f4b295bb34739e15115ba55c5142d3b08ae SHA512 09fb19133ff325832fa5d284aa1b1e7eda1788c4298424701132ede27fbb17956d874c0007ac00a2b9367d279175666744e192523ec79786baf626fb461abec7 diff --git a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch deleted file mode 100644 index c960c9ca2688..000000000000 --- a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/pwsafe/pwsafe/pull/865 -https://bugs.gentoo.org/854144 ---- a/src/os/unix/pws_time.h -+++ b/src/os/unix/pws_time.h -@@ -10,9 +10,7 @@ - - #include "../typedefs.h" - #include <stdint.h> --#ifdef __FreeBSD__ - #include <time.h> --#endif - - #ifndef __TIME64_T_TYPE - #define __TIME64_T_TYPE uint64_t diff --git a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild index bc3fbce0c6ee..fb5458c1a459 100644 --- a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild +++ b/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild @@ -1,27 +1,26 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 WX_GTK_VER="3.0-gtk3" -inherit cmake desktop flag-o-matic optfeature wxwidgets xdg +inherit cmake desktop optfeature wxwidgets xdg MY_PV="${PV/_beta/BETA}" DESCRIPTION="Password manager with wxGTK based frontend" HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/" SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/pwsafe-${MY_PV}" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="qr test +xml yubikey" RESTRICT="!test? ( test )" -DEPEND=" - dev-libs/openssl:0= +RDEPEND=" net-misc/curl - sys-apps/file sys-apps/util-linux x11-libs/libXt x11-libs/libXtst @@ -29,23 +28,15 @@ DEPEND=" qr? ( media-gfx/qrencode ) xml? ( dev-libs/xerces-c ) yubikey? ( sys-auth/ykpers )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" BDEPEND=" app-arch/zip + dev-lang/perl sys-devel/gettext + virtual/pkgconfig test? ( dev-cpp/gtest )" -S="${WORKDIR}/pwsafe-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.15.0-gcc12-time.patch -) - -pkg_pretend() { - einfo "Checking for -std=c++11 support in compiler" - test-flags-CXX -std=c++11 > /dev/null || die -} - src_configure() { setup-wxwidgets diff --git a/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild b/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild new file mode 100644 index 000000000000..9581dc5e6d16 --- /dev/null +++ b/app-admin/passwordsafe/passwordsafe-1.18.2.ebuild @@ -0,0 +1,85 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" + +inherit cmake desktop optfeature wxwidgets xdg + +MY_PV="${PV/_beta/BETA}" +DESCRIPTION="Password manager with wxGTK based frontend" +HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/" +SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/pwsafe-${MY_PV}" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="qr test +xml yubikey" +RESTRICT="!test? ( test )" + +RDEPEND=" + net-misc/curl + sys-apps/util-linux + x11-libs/libXt + x11-libs/libXtst + x11-libs/wxGTK:${WX_GTK_VER}[X] + qr? ( media-gfx/qrencode ) + xml? ( dev-libs/xerces-c ) + yubikey? ( sys-auth/ykpers )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-arch/zip + dev-lang/perl + sys-devel/gettext + virtual/pkgconfig + test? ( dev-cpp/gtest )" + +src_configure() { + setup-wxwidgets + + local mycmakeargs=( + -DNO_QR=$(usex !qr) + -DNO_GTEST=$(usex !test) + -DGTEST_BUILD=OFF + -DXML_XERCESC=$(usex xml) + -DNO_YUBI=$(usex !yubikey) + ) + + cmake_src_configure +} + +src_install() { + pushd "${BUILD_DIR}" || die + + dobin pwsafe + dobin cli/pwsafe-cli + dosym pwsafe /usr/bin/${PN} + dosym pwsafe-cli /usr/bin/${PN}-cli + + insinto /usr/share/locale + doins -r src/ui/wxWidgets/I18N/mos/* + + insinto /usr/share/${PN}/help + doins help/*.zip + + popd || die + + newman docs/pwsafe.1 ${PN}.1 + + dodoc README.md README.LINUX.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt} + + insinto /usr/share/${PN} + doins -r xml + + doicon -s 48 install/graphics/pwsafe.png + newmenu install/desktop/pwsafe.desktop ${PN}.desktop +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + optfeature "on-screen keyboard for password entry" x11-misc/xvkbd +} diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r2.ebuild index 2919e526c917..0cc7aa297a4e 100644 --- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild +++ b/app-admin/paxtest/paxtest-0.9.15-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,11 +12,8 @@ SRC_URI="https://grsecurity.net/~spender/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="" -RDEPEND="" -DEPEND="${RDEPEND} - sys-apps/paxctl" +DEPEND="sys-apps/paxctl" # EI_PAX flags are not strip safe. RESTRICT="strip" @@ -26,10 +23,10 @@ PATCHES=( ) src_prepare() { - mv Makefile.psm Makefile + mv Makefile.psm Makefile || die default - sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile - sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile + sed -e "s/^CC := gcc/CC := $(tc-getCC)/" -i Makefile || die + sed -e "s/^LD := ld/LD := $(tc-getLD)/" -i Makefile || die } src_compile() { @@ -37,7 +34,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install + emake DESTDIR="${ED}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install newman debian/manpage.1.ex paxtest.1 dodoc ChangeLog README diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest index 4d0f6ffb4ea9..c30f5f7e453f 100644 --- a/app-admin/perl-cleaner/Manifest +++ b/app-admin/perl-cleaner/Manifest @@ -1 +1 @@ -DIST perl-cleaner-2.30.tar.bz2 6963 BLAKE2B 8983060c7a904266ac82a67eba7b5d2184803b59c077f947a35d07e9af3046953705d31840b9508116578b8f3e8a8b97d77cf21eeac3b70f1c3fb5c1d71ae64e SHA512 436d26727bbb598bcd3c4f31e6b81e415a797cdba82dccfd55e54ee179bd2d6c1dc443e865f6f0a05b59f47ffd231dd10e55d5ea97a9a6875235ea1b49b68898 +DIST perl-cleaner-2.31.tar.bz2 6914 BLAKE2B 4b13ae42ab06ad75b6dbcb1306f3f4f476315db4504d0ffbc4c56d4d66a2da3a751d3682305daca6bcbae1861d182f16296c92f9a8d25687e35ab03a6f8734e3 SHA512 c4df0437604d41dbfdce0b72d72f975d464cf0c44f417c708917f01829e498ef8d6b47a78cee517836cac9344791ad49db98f29da5f78599e80b000e41b8127e diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml index 97ce6f33156c..e0aae08711fb 100644 --- a/app-admin/perl-cleaner/metadata.xml +++ b/app-admin/perl-cleaner/metadata.xml @@ -11,4 +11,7 @@ and <pkg>app-portage/portage-utils</pkg>. </flag> </use> + <upstream> + <remote-id type="github">gentoo-perl/perl-cleaner</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild deleted file mode 100644 index 0f206b5ca18b..000000000000 --- a/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit prefix - -DESCRIPTION="User land tool for cleaning up old perl installs" -HOMEPAGE="https://www.gentoo.org/proj/en/perl/" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man" - -RDEPEND="app-shells/bash - dev-lang/perl - || ( - ( sys-apps/portage app-portage/portage-utils ) - sys-apps/pkgcore - ) -" - -src_prepare() { - default - eprefixify ${PN} -} - -src_install() { - dosbin perl-cleaner - doman perl-cleaner.1 -} diff --git a/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.31.ebuild index 2815a4ee92b0..f730b83859c0 100644 --- a/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild +++ b/app-admin/perl-cleaner/perl-cleaner-2.31.ebuild @@ -6,20 +6,18 @@ EAPI=8 inherit prefix DESCRIPTION="User land tool for cleaning up old perl installs" -HOMEPAGE="https://www.gentoo.org/proj/en/perl/" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl" if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git" else - SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" SLOT="0" -# TODO: Detect at runtime what's available and fallback if needed, possibly -# integrate with eselect-package-manager, bug #779007. IUSE="pkgcore" [[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man" diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild index 87ae00a7f9e3..b7bf446c4729 100644 --- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild +++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,14 +6,14 @@ EAPI=8 inherit prefix DESCRIPTION="User land tool for cleaning up old perl installs" -HOMEPAGE="https://www.gentoo.org/proj/en/perl/" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl" if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git" else - SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild b/app-admin/petrovich/petrovich-1.0.0-r2.ebuild index f5ca36fa2d0a..f3ec7ada6321 100644 --- a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild +++ b/app-admin/petrovich/petrovich-1.0.0-r2.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Filesystem Integrity Checker" -SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz" HOMEPAGE="https://sourceforge.net/projects/petrovich" +SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" @@ -13,8 +14,6 @@ KEYWORDS="amd64 ppc sparc x86" RDEPEND="virtual/perl-Digest-MD5" -S="${WORKDIR}/${PN}" - PATCHES=( "${FILESDIR}/${P}-gentoo.diff" ) HTML_DOCS=( CHANGES.HTML LICENSE.HTML README.HTML TODO.HTML USAGE.HTML ) diff --git a/app-admin/pprocm/Manifest b/app-admin/pprocm/Manifest index 53596a95ad5d..74e5dccbdc34 100644 --- a/app-admin/pprocm/Manifest +++ b/app-admin/pprocm/Manifest @@ -1 +1,2 @@ DIST PProcM-1.0.tar.gz 29007 BLAKE2B 511934eedb0f2269d505affbe15d9ba151ba4e6647885787caf045bdb52080ca26072f5a8986e8fdbd12fc8a0516d9c35f0d0dfd1d42ec268777c1288c55b00f SHA512 d592455719babb9dd55c0d63ea097fb110747eb481e81b237779543f7bc90c8fcc0a4e7ecb94e3287afe9ac9f707e1e90c28ab634dd8d0e2bd7708aee8e79277 +DIST pprocm-1.0.tar.gz 13388 BLAKE2B 9ef3ce2965108397ad8de25d0f3f447edb32584a7767841ee14782904f124a69e492543f36ee809f19795ef3a3393ce02ac8491267a0e3d32729b9d8161a5f34 SHA512 72d816e2bf210b8724da12e360cd637cb7ed130ae36e0435900b3561bfdcad7a1b0656e2fb55c6778141193e0717308c726d1099dfbe677d93f1bbf8d1f4723f diff --git a/app-admin/pprocm/metadata.xml b/app-admin/pprocm/metadata.xml index 85e4ed814fa2..f62d36ead7f1 100644 --- a/app-admin/pprocm/metadata.xml +++ b/app-admin/pprocm/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="github">ZachGoldberg/Perl-Proc-Monitor-PProcM</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/pprocm/pprocm-1.0-r2.ebuild b/app-admin/pprocm/pprocm-1.0-r3.ebuild index a91f192678ca..ce36cdee03d4 100644 --- a/app-admin/pprocm/pprocm-1.0-r2.ebuild +++ b/app-admin/pprocm/pprocm-1.0-r3.ebuild @@ -1,31 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PN="PProcM" MY_P="${MY_PN}-${PV}" DESCRIPTION="ncurses-based program to monitor CPU, disk, network and memory usage" -HOMEPAGE="http://www.fusedcreations.com/PProcM/" +HOMEPAGE="https://github.com/ZachGoldberg/Perl-Proc-Monitor-PProcM" SRC_URI="http://www.fusedcreations.com/PProcM/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -DEPEND=" +RDEPEND=" + dev-lang/perl + dev-perl/IO-Pipely dev-perl/POE dev-perl/Sys-Statistics-Linux - dev-perl/IO-Pipely - dev-lang/perl" - -RDEPEND=" - ${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -DOCS=( AUTHORS README ) +" src_install() { newbin "${MY_PN}" "${PN}" diff --git a/app-admin/pprocm/pprocm-1.0-r4.ebuild b/app-admin/pprocm/pprocm-1.0-r4.ebuild new file mode 100644 index 000000000000..126c1a0902a8 --- /dev/null +++ b/app-admin/pprocm/pprocm-1.0-r4.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="PProcM" +GIT_COMMIT="98ca63f43afb9ec8491cceb81f62850ff00379e0" + +DESCRIPTION="Ncurses-based program to monitor CPU, disk, network and memory usage" +HOMEPAGE="https://github.com/ZachGoldberg/Perl-Proc-Monitor-PProcM/" +SRC_URI="https://github.com/ZachGoldberg/Perl-Proc-Monitor-PProcM/archive/${GIT_COMMIT}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}/Perl-Proc-Monitor-PProcM-${GIT_COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + dev-lang/perl + dev-perl/IO-Pipely + dev-perl/POE + dev-perl/Sys-Statistics-Linux +" + +src_install() { + newbin "${MY_PN}" "${PN}" + einstalldocs +} diff --git a/app-admin/profile-cleaner/profile-cleaner-2.37.ebuild b/app-admin/profile-cleaner/profile-cleaner-2.37.ebuild index 58bda70cbd32..2a8d9c77bd69 100644 --- a/app-admin/profile-cleaner/profile-cleaner-2.37.ebuild +++ b/app-admin/profile-cleaner/profile-cleaner-2.37.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND="app-shells/bash - sys-devel/bc + app-alternatives/bc sys-apps/coreutils sys-apps/findutils sys-apps/grep diff --git a/app-admin/ps_mem/ps_mem-3.14.ebuild b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild index cb5d9972bcbf..b5474c4c3e05 100644 --- a/app-admin/ps_mem/ps_mem-3.14.ebuild +++ b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild @@ -1,9 +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 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 @@ -14,8 +15,7 @@ SRC_URI="https://github.com/pixelb/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P} LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc64 sparc x86" -IUSE="" +KEYWORDS="amd64 ~arm64 ppc64 sparc x86" python_install() { distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index 6abb2afd46ce..a695258bc7d4 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -1,4 +1,10 @@ -DIST puppet-agent_7.21.0-1focal_amd64.deb 32897404 BLAKE2B 5075c0c77ae2199a3743edcc7fda94802f7b845b37084a613547705a3dc403259908698036bad95e36d7ba18c8b165971d98b81b64e56e6b40f3360e00c4fc5b SHA512 cad621b9add8c7397c681684696b78d57c149b174a43830c3c45ea1679aba791005b634a64b48b3a9d276fb00d7e1ca8e2a73f6a02756d020914f507a35dc56a -DIST puppet-agent_7.21.0-1focal_arm64.deb 32630670 BLAKE2B 634fed97c79ca3b317ee079366a262c898ef217236014dc683cf1c11e83f2fd74bc21c18ff5242ebd2a4b15b73852ed727976134f684e0d416ac0a3ee54221c3 SHA512 be6a0566db5b1ab72b8f53bdf061c0ad4fb93794d690c6ebe697c9eb5aae45b7838b266619c5c33f3c4499a7264fb083d3f2bbb1fbf70b73458c8aa24470e3c3 -DIST puppet-agent_7.23.0-1focal_amd64.deb 32923766 BLAKE2B eac170179de27e3c25af3115e45596e7c5190037926e7d3db163b208f401f2278d0c49d11688d25e04bbf859965be37b60f3e7ed15cfb96a5db0c652c501db2d SHA512 90cd6bde4c25fe72dd906ae515d58f56d3e6a7378fea300247854c2cbfb4f7a51adc78d98a68a7f90f7295eeee6a385bb0a1828cc9b809c5bd9ee7a2231777f8 -DIST puppet-agent_7.23.0-1focal_arm64.deb 32668574 BLAKE2B ff01899f7a6b0994eccd330dcc83ea51933e287ea4c1ce3ecdcee91e227c22256f4d4464c7d461d5023a1e6f4aac9868134fccf5dd84de2ba11de16c79be0d9f SHA512 7f3b0940d739410b2f4dd3b3ae852c9677c8db33fccee0db5291613f8b8602f8770c52eff3f577c81382be36044714b6737df8f8468a3481997cae52989fdeb8 +DIST puppet-agent_7.24.0-1focal_amd64.deb 31418478 BLAKE2B 201c0a5adbeca2b6f572d3f8b89df06314171e5c7bb95f574311cee5af1910bdf7f5574eaa5f514bcf0c1ceb5c04c30a2079069183c4b37dd90581596a70092e SHA512 7912360597c21abf048d578783262821210d6568dc41f79b2d21cdb08851f8bd4cbe5a6114aa8af302c9046de424b8b15fe34be1fc51b529f36ccb99445bc7dc +DIST puppet-agent_7.24.0-1focal_arm64.deb 31160744 BLAKE2B 22dfc3f0855c2e88c7202f2a9d98efd4ad9ef3a191ab9b5b8c37a6869306a47d1225d568fec9f0fc52cdf236f8258b5ca206a360049cc39e1825f1f8afc5d4af SHA512 db1b7cb25a04d6aeedd7f3bb125fe0fcac420c2881f9f3aba729143e253908376cd118073753de018d8fd1a6d7f38139766b4ec4bfb23f840ca7ee32143a8a48 +DIST puppet-agent_8.4.0-1focal_amd64.deb 35930626 BLAKE2B ad299aaceba51bd2831c6aa15a1794c12e03026866e7b1fd59c49d078d7c32bc8af2f0eba9f699f21e0bde98147b3a7edb88db3ada2ec8cb9601c2ed64210240 SHA512 18148a6cbd237afc66bbce1bc5d9eec63426efd5d7a2625e4f8a7d962a97c25da7e5ef208972323ea10e35c174beaacacc131d7dd1043a9013f1d8c8ae8a8c70 +DIST puppet-agent_8.4.0-1focal_arm64.deb 35421066 BLAKE2B 348f4cb16b83e0703fe8ec1fc6a5ebd992384c02f51b8d38d597d629b19f070f21e0f944ba1c6188bd9d93d0689e66ef10a4c717847ffca2534b4c6a3fa0eb4d SHA512 5ba2d6d41e6d98e0e7830fc6140500173e1e18efd9c228c84ec124c5154df847657f4c43f994d05830774fc6431b49d57081ded579ed1215927623c7b83155a7 +DIST puppet-agent_8.5.0-1focal_amd64.deb 35945720 BLAKE2B 485fa3e93006c63265df27ba99e61e1c9b253f71976aa92af1bc0ee474b575c27d3e1d3ddde21a919f5a21e151777b1ab8f7d849f5927a48898ca58b14edaa8b SHA512 a252240e206fb93bfc882f88e593a93b29c61442bb7fc95e1d3465e30af6b7bd82a362287590a36460ed04d4759fc244d3eff118ef8790885112ef78206a14f9 +DIST puppet-agent_8.5.0-1focal_arm64.deb 35436786 BLAKE2B 712f893f05f9f75bf7af0cf40556f0746a81fabbd8e588ad598f59856bfe4948c53eb92e2eaa7a621507183c572d17ecb2b426b13a91bbd0b98cc2463070a60e SHA512 ce1752d13b2d4b9442ef11006e8bc0edf98e855df051491efd2760b6919c41f0dda2030910e5794658ae99d3b8341e9bf64aa57c65069f9d83a3f328f1d2dd41 +DIST puppet-agent_8.5.1-1focal_amd64.deb 35945834 BLAKE2B 8c839eabf8abbc6cf87ab8a1c942b97be7fc08b9053695d07a7fc4bbf69886192063553c43f81e73521327cf8b89af18fe43d41ef3f71229d218fe123426f50c SHA512 324ea532d005a1bbb0f25fdd411f3f68a1c18371cb494f8934d73d87c19e3bbf46c653a9afbe767ed2ab6e788115f31ccef4bd084351ee6f73e4e656aab5d65a +DIST puppet-agent_8.5.1-1focal_arm64.deb 35436770 BLAKE2B 16ead6317dab6f8b65b8ea5269eec5593697f4da6d1ec0323e074f4eab3c8518dab10af48853e591aecc62c63a5ff4e135cf02bb1d7f7d565c5200bfae98ff86 SHA512 f3acc097563d9a56cb677df72250ee25ab0e1e361eb40a2cd36b3d694854edc3850f08099b916aefbc16580f78a194e9f3bf33b1cb585836d55c6e8dcf03a379 +DIST puppet-agent_8.6.0-1focal_amd64.deb 35966100 BLAKE2B a27e5fd32c73dd798612cc78a2e4abc150b425215592e9c7a88c7d3b54a2f6dcaffd557575e7c6f64116228fdd50e15a503f8b4c8c496c0f970ee772d5a88e6c SHA512 10a89f73219da6b59e63e8d2aba63968ef2236e773077c54ef6001b010b20b3e384676880cc10b8be4fc16336bb123783de88b0fd1d5c5d91c2455f410458363 +DIST puppet-agent_8.6.0-1focal_arm64.deb 35459524 BLAKE2B 5c9bc90eb3b2857176988acb41ebf0eed173077adabe74a6570ada92f9c2c829a57b949ea0c1cb1cae2e7b562b52882da58fab1552934e18bd676163c10e1924 SHA512 f91d82dcb66667891c6155e171739f34a174529a09c376fc7e1a829cd6862e52d26dc39ab3b0d273e32b56e52c62193c8d574d5164f3152bab6e50b4872c5e52 diff --git a/app-admin/puppet-agent/files/puppet.initd2 b/app-admin/puppet-agent/files/puppet.initd2 index 90ebd0481701..c8949013918d 100644 --- a/app-admin/puppet-agent/files/puppet.initd2 +++ b/app-admin/puppet-agent/files/puppet.initd2 @@ -14,7 +14,7 @@ command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPP depend() { need localmount - use dns logger puppetserver netmount nfsmount + use dns logger puppetserver netmount } start_pre() { diff --git a/app-admin/puppet-agent/puppet-agent-7.21.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.24.0-r1.ebuild index 81bc5f74414a..455e04b0f0d6 100644 --- a/app-admin/puppet-agent/puppet-agent-7.21.0.ebuild +++ b/app-admin/puppet-agent/puppet-agent-7.24.0-r1.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=7 diff --git a/app-admin/puppet-agent/puppet-agent-7.23.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.4.0-r1.ebuild index 81bc5f74414a..32089749d68e 100644 --- a/app-admin/puppet-agent/puppet-agent-7.23.0.ebuild +++ b/app-admin/puppet-agent/puppet-agent-8.4.0-r1.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=7 @@ -6,8 +6,8 @@ inherit systemd unpacker tmpfiles DESCRIPTION="general puppet client utils along with hiera and facter" HOMEPAGE="https://puppetlabs.com/" -SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb ) -arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )" +SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb ) +arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )" LICENSE="Apache-2.0" SLOT="0" diff --git a/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild new file mode 100644 index 000000000000..32089749d68e --- /dev/null +++ b/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd unpacker tmpfiles + +DESCRIPTION="general puppet client utils along with hiera and facter" +HOMEPAGE="https://puppetlabs.com/" +SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb ) +arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm64" +IUSE="puppetdb selinux" +RESTRICT="strip" + +# virtual/libcrypt:= is in here despite being a pre-built package +# to ensure that the has_version logic for the symlink doesn't become stale +CDEPEND="!app-admin/puppet + !dev-ruby/hiera + !dev-ruby/facter + app-emulation/virt-what + acct-user/puppet + acct-group/puppet + virtual/libcrypt:=" + +DEPEND=" + ${CDEPEND} + app-admin/augeas" +RDEPEND="${CDEPEND} + app-portage/eix + sys-apps/dmidecode + sys-libs/libselinux + sys-libs/glibc + sys-libs/readline:0/8 + sys-libs/libxcrypt[compat] + sys-libs/ncurses:0[tinfo] + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" + +S=${WORKDIR} + +QA_PREBUILT="*" + +src_install() { + # conf.d + doconfd etc/default/puppet + doconfd etc/default/pxp-agent + # logrotate.d + insinto /etc/logrotate.d + doins etc/logrotate.d/pxp-agent + # puppet itself + insinto /etc/puppetlabs + doins -r etc/puppetlabs/* + # logdir for systemd + keepdir var/log/puppetlabs/puppet/ + chmod 0750 var/log/puppetlabs/puppet/ + # the rest + insinto /opt + dodir opt/puppetlabs/puppet/cache + doins -r opt/* + fperms 0750 /opt/puppetlabs/puppet/cache + # init + newinitd "${FILESDIR}/puppet.initd2" puppet + systemd_dounit lib/systemd/system/puppet.service + systemd_dounit lib/systemd/system/pxp-agent.service + newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf + # symlinks + chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" + dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter + dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera + dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet + + # Handling of the path to the crypt library during the ongoing migration + # from glibc[crypt] to libxcrypt + # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html + if has_version "sys-libs/glibc[crypt]"; then + local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' + else + local crypt_target='../../../../usr/lib/libcrypt.so.1' + fi + dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 +} + +pkg_postinst() { + tmpfiles_process puppet-agent.conf +} diff --git a/app-admin/puppet-agent/puppet-agent-8.5.1.ebuild b/app-admin/puppet-agent/puppet-agent-8.5.1.ebuild new file mode 100644 index 000000000000..32089749d68e --- /dev/null +++ b/app-admin/puppet-agent/puppet-agent-8.5.1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd unpacker tmpfiles + +DESCRIPTION="general puppet client utils along with hiera and facter" +HOMEPAGE="https://puppetlabs.com/" +SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb ) +arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm64" +IUSE="puppetdb selinux" +RESTRICT="strip" + +# virtual/libcrypt:= is in here despite being a pre-built package +# to ensure that the has_version logic for the symlink doesn't become stale +CDEPEND="!app-admin/puppet + !dev-ruby/hiera + !dev-ruby/facter + app-emulation/virt-what + acct-user/puppet + acct-group/puppet + virtual/libcrypt:=" + +DEPEND=" + ${CDEPEND} + app-admin/augeas" +RDEPEND="${CDEPEND} + app-portage/eix + sys-apps/dmidecode + sys-libs/libselinux + sys-libs/glibc + sys-libs/readline:0/8 + sys-libs/libxcrypt[compat] + sys-libs/ncurses:0[tinfo] + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" + +S=${WORKDIR} + +QA_PREBUILT="*" + +src_install() { + # conf.d + doconfd etc/default/puppet + doconfd etc/default/pxp-agent + # logrotate.d + insinto /etc/logrotate.d + doins etc/logrotate.d/pxp-agent + # puppet itself + insinto /etc/puppetlabs + doins -r etc/puppetlabs/* + # logdir for systemd + keepdir var/log/puppetlabs/puppet/ + chmod 0750 var/log/puppetlabs/puppet/ + # the rest + insinto /opt + dodir opt/puppetlabs/puppet/cache + doins -r opt/* + fperms 0750 /opt/puppetlabs/puppet/cache + # init + newinitd "${FILESDIR}/puppet.initd2" puppet + systemd_dounit lib/systemd/system/puppet.service + systemd_dounit lib/systemd/system/pxp-agent.service + newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf + # symlinks + chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" + dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter + dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera + dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet + + # Handling of the path to the crypt library during the ongoing migration + # from glibc[crypt] to libxcrypt + # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html + if has_version "sys-libs/glibc[crypt]"; then + local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' + else + local crypt_target='../../../../usr/lib/libcrypt.so.1' + fi + dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 +} + +pkg_postinst() { + tmpfiles_process puppet-agent.conf +} diff --git a/app-admin/puppet-agent/puppet-agent-8.6.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.6.0.ebuild new file mode 100644 index 000000000000..32089749d68e --- /dev/null +++ b/app-admin/puppet-agent/puppet-agent-8.6.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd unpacker tmpfiles + +DESCRIPTION="general puppet client utils along with hiera and facter" +HOMEPAGE="https://puppetlabs.com/" +SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb ) +arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm64" +IUSE="puppetdb selinux" +RESTRICT="strip" + +# virtual/libcrypt:= is in here despite being a pre-built package +# to ensure that the has_version logic for the symlink doesn't become stale +CDEPEND="!app-admin/puppet + !dev-ruby/hiera + !dev-ruby/facter + app-emulation/virt-what + acct-user/puppet + acct-group/puppet + virtual/libcrypt:=" + +DEPEND=" + ${CDEPEND} + app-admin/augeas" +RDEPEND="${CDEPEND} + app-portage/eix + sys-apps/dmidecode + sys-libs/libselinux + sys-libs/glibc + sys-libs/readline:0/8 + sys-libs/libxcrypt[compat] + sys-libs/ncurses:0[tinfo] + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" + +S=${WORKDIR} + +QA_PREBUILT="*" + +src_install() { + # conf.d + doconfd etc/default/puppet + doconfd etc/default/pxp-agent + # logrotate.d + insinto /etc/logrotate.d + doins etc/logrotate.d/pxp-agent + # puppet itself + insinto /etc/puppetlabs + doins -r etc/puppetlabs/* + # logdir for systemd + keepdir var/log/puppetlabs/puppet/ + chmod 0750 var/log/puppetlabs/puppet/ + # the rest + insinto /opt + dodir opt/puppetlabs/puppet/cache + doins -r opt/* + fperms 0750 /opt/puppetlabs/puppet/cache + # init + newinitd "${FILESDIR}/puppet.initd2" puppet + systemd_dounit lib/systemd/system/puppet.service + systemd_dounit lib/systemd/system/pxp-agent.service + newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf + # symlinks + chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" + dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter + dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera + dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet + + # Handling of the path to the crypt library during the ongoing migration + # from glibc[crypt] to libxcrypt + # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html + if has_version "sys-libs/glibc[crypt]"; then + local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' + else + local crypt_target='../../../../usr/lib/libcrypt.so.1' + fi + dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 +} + +pkg_postinst() { + tmpfiles_process puppet-agent.conf +} diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest index 917a731feec5..9b60d332f792 100644 --- a/app-admin/puppet-lint/Manifest +++ b/app-admin/puppet-lint/Manifest @@ -1 +1,6 @@ -DIST puppet-lint-2.5.2.gem 91136 BLAKE2B cae884b3994c7862f337a214903ecd4d7bb297e9e2bb7495fb94030304f53fa7ae98080b62944d5c96f2af0d208352d00030415a89259e8e188ec53da2a2b643 SHA512 996a5fda970c318a3f58a196c7b9aba7e712aae2b24d936b917f1dd9eb6bf5d706df28f70d88e1e174e175aabb13f1d22c8c90289314d5a1dd4ff9207ebbfe03 +DIST puppet-lint-3.4.0.gem 83456 BLAKE2B fa6b274b3e6e84095fdaff6f024864dc301f0afc605198cc40b4dd8df7a9de66adfb91982195af9a0ad35301409c23e99d8d6ba5d3c43d3ee4dd57235de2b8cc SHA512 47c025ef925618cba3c1f579a3ef62bd5f9fd8ee7f8f9a68ed84daafeb7f9071e558619b24f0a249fcbe85d8c1b27e715938cc352792f9aa91de131820103e9c +DIST puppet-lint-4.0.0.gem 80896 BLAKE2B 6e674deaec43c3b45e2c162ef3d09648bd3cdd589a3ae6ce92e21617633529705fe9999f4c6c361c3c1f041a3d25d1a03079f2f97705c01199253661bc9355dc SHA512 a23d316f60cb7d34c394bdaee0ad08070098d732210a92294a3d330cff7330aefe2be6bd9a60219d7538173c2f187c1ed427c6671a345f868286986164ea3a33 +DIST puppet-lint-4.2.1.gem 81920 BLAKE2B 5e291e4c1743092be9935231280f04ce3affdc1d530180f26a6ace0535a15e11bc9b33dd89d8eeafb44ebc7cae16f2656e293a6e8e8fbc4fd2cfde896996d59a SHA512 d39a287d3ae0ecbf27254c289e73918b62b50bbf8f44f51248e5e8042b194c32facd1215d7b24ab768714aeb9ae58647964bdc8b8b4650d1cebe6e2e749d782c +DIST puppet-lint-4.2.2.gem 81920 BLAKE2B cad796866f323113a8c2aa5cf86b6187423f27186032ea76ebd1f158937c34f315d93de3d92b01acc0b160947b720bd987550c52aaa53a51f165396de776ec88 SHA512 e8a591e615db87dc2edc22fc4d53c03004e0227748896005d2252fab8b77193ecd30f9167702c6c4fd6551daaa0894789f3d9d50fb705eecaed4a22573a94afc +DIST puppet-lint-4.2.3-pr181-fix-warnings.patch 5601 BLAKE2B a04fdf9d8627cc888924b4282a09e076d7e029eda008fc8da138a121a21e227cff45a54ddbe770a286a2a15e43d4402526a6201c805f6e574755a11a1d13d7d7 SHA512 15638f2d4a81c969aa77b51f2f147a1fba5544dd7e52f3127dc9949afaabbd161f815a22dc5091f19d3d16bc2be97bb50f455a3a67c503aff58e737288f80e49 +DIST puppet-lint-4.2.3.gem 81920 BLAKE2B ee98aaed336a4302c4d67d94c83f30f6fdfc111192b483f39a2c096f00daff2f7caf54bfa11c4b8217648a0ca68c6c8da5a4a6f2d0cab8efb6e2d7e814155780 SHA512 2f2192a48ed460371092ce99755b8cde55526ed96ee72d2a5b7989f7df7afb6abce5d3e8e7a0dca577b199bb380935e8734a92a53248697bb7195091da4cb9f6 diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml index 502f0bda3823..c56aec524553 100644 --- a/app-admin/puppet-lint/metadata.xml +++ b/app-admin/puppet-lint/metadata.xml @@ -9,4 +9,8 @@ <email>ruby@gentoo.org</email> <name>Gentoo Ruby Project</name> </maintainer> +<upstream> + <remote-id type="github">puppetlabs/puppet-lint</remote-id> + <remote-id type="rubygems">puppetlabs-puppet-lint</remote-id> +</upstream> </pkgmetadata> diff --git a/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild b/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild new file mode 100644 index 000000000000..a45d6de2d480 --- /dev/null +++ b/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby30 ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_BINWRAP="puppet-lint" + +inherit ruby-fakegem + +DESCRIPTION="A linter for puppet DSL" +HOMEPAGE="https://github.com/puppetlabs/puppet-lint" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~x86" + +ruby_add_bdepend "test? ( + dev-ruby/rspec-its:1 + dev-ruby/rspec-collection_matchers:1 + dev-ruby/rspec-json_expectations )" + +all_ruby_prepare() { + # Skip acceptance tests due to unpackages puppet_litmus which in turn + # has a number of unpackaged dependencies. + rm -rf spec/acceptance || die + rm -f spec/spec_helper_acceptance.rb || die +} diff --git a/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild b/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild new file mode 100644 index 000000000000..a45d6de2d480 --- /dev/null +++ b/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby30 ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_BINWRAP="puppet-lint" + +inherit ruby-fakegem + +DESCRIPTION="A linter for puppet DSL" +HOMEPAGE="https://github.com/puppetlabs/puppet-lint" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~x86" + +ruby_add_bdepend "test? ( + dev-ruby/rspec-its:1 + dev-ruby/rspec-collection_matchers:1 + dev-ruby/rspec-json_expectations )" + +all_ruby_prepare() { + # Skip acceptance tests due to unpackages puppet_litmus which in turn + # has a number of unpackaged dependencies. + rm -rf spec/acceptance || die + rm -f spec/spec_helper_acceptance.rb || die +} diff --git a/app-admin/puppet-lint/puppet-lint-2.5.2.ebuild b/app-admin/puppet-lint/puppet-lint-4.2.1.ebuild index cc17602bfb8c..64f15156527c 100644 --- a/app-admin/puppet-lint/puppet-lint-2.5.2.ebuild +++ b/app-admin/puppet-lint/puppet-lint-4.2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby26 ruby27 ruby30" +USE_RUBY="ruby31 ruby32" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -13,14 +13,20 @@ RUBY_FAKEGEM_BINWRAP="puppet-lint" inherit ruby-fakegem DESCRIPTION="A linter for puppet DSL" -HOMEPAGE="http://puppet-lint.com/" +HOMEPAGE="https://github.com/puppetlabs/puppet-lint" LICENSE="MIT" SLOT="0" -IUSE="" KEYWORDS="amd64 ~x86" ruby_add_bdepend "test? ( dev-ruby/rspec-its:1 dev-ruby/rspec-collection_matchers:1 dev-ruby/rspec-json_expectations )" + +all_ruby_prepare() { + # Skip acceptance tests due to unpackages puppet_litmus which in turn + # has a number of unpackaged dependencies. + rm -rf spec/acceptance || die + rm -f spec/spec_helper_acceptance.rb || die +} diff --git a/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild b/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild new file mode 100644 index 000000000000..14e7e001cb52 --- /dev/null +++ b/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_BINWRAP="puppet-lint" + +inherit ruby-fakegem + +DESCRIPTION="A linter for puppet DSL" +HOMEPAGE="https://github.com/puppetlabs/puppet-lint" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +ruby_add_bdepend "test? ( + dev-ruby/rspec-its:1 + dev-ruby/rspec-collection_matchers:1 + dev-ruby/rspec-json_expectations )" + +all_ruby_prepare() { + # Skip acceptance tests due to unpackages puppet_litmus which in turn + # has a number of unpackaged dependencies. + rm -rf spec/acceptance || die + rm -f spec/spec_helper_acceptance.rb || die +} diff --git a/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild b/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild new file mode 100644 index 000000000000..b57aa7a47bc0 --- /dev/null +++ b/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_BINWRAP="puppet-lint" + +inherit ruby-fakegem + +DESCRIPTION="A linter for puppet DSL" +HOMEPAGE="https://github.com/puppetlabs/puppet-lint" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCH_NAME="${PN}-4.2.3-pr181-fix-warnings.patch" +SRC_URI+=" https://github.com/puppetlabs/puppet-lint/pull/181.patch -> ${PATCH_NAME} " + +PATCHES=( + "${DISTDIR}/${PATCH_NAME}" +) + +ruby_add_bdepend "test? ( + dev-ruby/rspec-its:1 + dev-ruby/rspec-collection_matchers:1 + dev-ruby/rspec-json_expectations )" + +all_ruby_prepare() { + # Skip acceptance tests due to unpackages puppet_litmus which in turn + # has a number of unpackaged dependencies. + rm -rf spec/acceptance || die + rm -f spec/spec_helper_acceptance.rb || die +} diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index 616ddef96389..aa69cc8b22a8 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -1,3 +1,7 @@ -DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58 -DIST puppet-7.21.0.tar.gz 2819997 BLAKE2B 96de8ceefeea12c51288e05af5d7b126811d23388492053b0d581856f11976f0492064eb89bc585ff7f455df537d5c04fb318814945a158d531d32efdd54ff02 SHA512 b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6 -DIST puppet-7.23.0.tar.gz 2820654 BLAKE2B c9e2b544400c7fa9e59dd1d40bf89d1444ee62664b11e7aafa30aecd5fd14aa217dfe0bc24795a951c5e04b04762adb0239f6d7289b431b8f2a040716e95c642 SHA512 a66ef2bdbe38741a176e825cf7cdf117616459548731d4f5482b49263b08dcb3550305e5f0e35d228f873b330b730b682c02d38b4243f5f8bb4a190ed0f60310 +DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9 +DIST puppet-7.27.0.tar.gz 2825666 BLAKE2B dffc2329c28588a5b4a08996f5fbff95c092961aa68af6287c4216ffb3e5b6ab811df876b8efb0f6724d9990b21ad1c56d65bd9fd8d502008ba385f4460f0591 SHA512 a864357f5079c9fad53c2cff35f73f0bc25900359e25b5fb1130e3a3e6f77f63bc38ef59c0ce1b37913eb0acb1e42f39891ed7de0fe39ab138faa426ab2a9392 +DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3158cfede2ffda90ee23ebcfecfdabcf35459d1a048c3a204e13611f67852028233e4da4b9ed2ea08cad07a37c9 SHA512 d570452ceec764c657f4678f7179400d30f8513766edc6f020db35c3a4246c1d857615a647ca481920a7d1a40cf9a15057432468ccd4697e4335dca55e121faa +DIST puppet-8.4.0.tar.gz 2882328 BLAKE2B de46a8fbdc7522f022d19953845c73e6872ed430a9380f157809bb95e7d7315063f136b5159468708dcb5dcb4353cc89eacffffbd4045458351c63261a6d9bd0 SHA512 23d5aede9ba55e4e63a7f815fd1d274e97d5d0c35aa1b5444c24b223a59d5d913ac5b4652acc2258b1721a213e4c24e1e8b4a146ca6a1b81a1536a51ed856270 +DIST puppet-8.5.0.tar.gz 1565122 BLAKE2B c787b981c64f2b52cc3c8998516599891980bb176cb3bce6596cb4b139fbae2f58e156fb007a3aa2bd2a5bb069dc63eb7fc36bde3f3533c27729fccfa19ee0e7 SHA512 1adf88f69b3b5a7071a2ee5dad66c3cd3fc1db57fdeaf7945f8cb167d1b76dcf12e85e17eefc418cda67952a4c75a6b43d320d0c0f1db610411d188304994cdc +DIST puppet-8.5.1.tar.gz 1565085 BLAKE2B f352f9f70e090c4a32edd45ced5c01ed4eff891fb46c0f2d753ceeba43250960356ceb2d9047e7308732585ec114c5f728ec29a65b6a08348b74a9709ec92a89 SHA512 f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f +DIST puppet-8.6.0.tar.gz 1567398 BLAKE2B 749cc055c6797e5715907fdb768264774efba62e4681733a59a457cfda9dd2682990a96331cc04d313a367e32b820ce351fb103e19891976e900d99c30ca7ba5 SHA512 b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init index ad7a638bebb8..9821134c8ae3 100644 --- a/app-admin/puppet/files/puppet.init +++ b/app-admin/puppet/files/puppet.init @@ -14,7 +14,7 @@ command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPP depend() { need localmount - use dns logger puppetmaster netmount nfsmount + use dns logger puppetmaster netmount } start_pre() { diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init-4.x deleted file mode 100644 index f7106e6f0294..000000000000 --- a/app-admin/puppet/files/puppet.init-4.x +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}" - -pidfile="${PUPPET_PID_DIR}/puppet.pid" -PUPPET_LOG_DIR="/var/log/puppet" - -command="/usr/bin/puppet" -extra_started_commands="reload" - -command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}" - -depend() { - need localmount - use dns logger puppetmaster netmount nfsmount -} - -start_pre() { - checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}" - checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR} -} - -reload() { - ebegin "Reloading $RC_SVCNAME" - start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" - eend $? -} diff --git a/app-admin/puppet/files/puppetmaster.confd b/app-admin/puppet/files/puppetmaster.confd deleted file mode 100644 index afecf479a6a1..000000000000 --- a/app-admin/puppet/files/puppetmaster.confd +++ /dev/null @@ -1,18 +0,0 @@ -# Location of PID files -PUPPETMASTER_PID_DIR="/var/run/puppet" - -# Where to log general messages to. -# Specify syslog to send log messages to the system log. -#PUPPETMASTER_LOG="syslog" - -# You may specify other parameters to the puppetmaster here -#PUPPETMASTER_EXTRA_OPTS="--noca" - -# You may specify an alternate port on which puppetmaster should listen. -# Default is: 8140 -#PUPPETMASTER_PORT="8140" - -# To start multiple servers: -# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141 -# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141 -# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT) diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x deleted file mode 100644 index 286f7e67579a..000000000000 --- a/app-admin/puppet/files/puppetmaster.init-4.x +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -if [ "${SVCNAME}" = "puppetmaster" ] ; then - PUPPETMASTER_PID="master" -else - PUPPETMASTER_PID="${SVCNAME#*.}" -fi -PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}" -pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid" -PUPPET_LOG_DIR="/var/log/puppet" - -command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}" -if [ -n "${PUPPETMASTER_PORT}" ] ; then - command_args="${command_args} --masterport ${PUPPETMASTER_PORT}" -fi - -command="/usr/bin/puppet" -extra_started_commands="reload" - -depend() { - need localmount - use dns logger slapd netmount nfsmount -} - -start_pre() { - checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}" - checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR} - checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log" -} - -reload() { - ebegin "Reloading $RC_SVCNAME" - start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" - eend $? -} diff --git a/app-admin/puppet/files/tmpfiles.d b/app-admin/puppet/files/tmpfiles.d deleted file mode 100644 index cd33231df7f7..000000000000 --- a/app-admin/puppet/files/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -D /var/run/puppet 0755 puppet puppet - diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml index 74bbc6466d28..8f56170190b1 100644 --- a/app-admin/puppet/metadata.xml +++ b/app-admin/puppet/metadata.xml @@ -4,10 +4,6 @@ <maintainer type="person"> <email>prometheanfire@gentoo.org</email> </maintainer> - <maintainer type="person"> - <email>graaff@gentoo.org</email> - <description>Puppet 5.x only</description> - </maintainer> <maintainer type="project"> <email>sysadmin@gentoo.org</email> <name>Gentoo Sysadmin Project</name> @@ -33,6 +29,7 @@ <!-- <flag name='puppetdb'>Enable puppetdb support</flag> --> <flag name="augeas">Enable augeas support</flag> <flag name="diff">Enable diff support</flag> + <flag name="hiera">Enable hiera support</flag> <flag name="rrdtool">Enable rrdtool support</flag> <flag name="shadow">Enable shadow support</flag> </use> diff --git a/app-admin/puppet/puppet-7.23.0-r1.ebuild b/app-admin/puppet/puppet-7.24.0-r1.ebuild index 491d52e9696e..e6415c71f2b2 100644 --- a/app-admin/puppet/puppet-7.23.0-r1.ebuild +++ b/app-admin/puppet/puppet-7.24.0-r1.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="7" diff --git a/app-admin/puppet/puppet-5.5.22-r2.ebuild b/app-admin/puppet/puppet-7.27.0-r1.ebuild index 7f79dde74e75..b23327410b34 100644 --- a/app-admin/puppet/puppet-5.5.22-r2.ebuild +++ b/app-admin/puppet/puppet-7.27.0-r1.ebuild @@ -1,35 +1,31 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -USE_RUBY="ruby26 ruby27" +EAPI="7" +USE_RUBY="ruby27 ruby30 ruby31" RUBY_FAKEGEM_RECIPE_TEST="rspec3" - RUBY_FAKEGEM_TASK_DOC="doc:all" - RUBY_FAKEGEM_EXTRAINSTALL="locales" inherit ruby-fakegem systemd tmpfiles DESCRIPTION="A system automation and configuration management software" HOMEPAGE="https://puppet.com/" -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" RESTRICT="test" ruby_add_rdepend " - >=dev-ruby/hiera-3.2.1:0 - =dev-ruby/facter-3* - >=dev-ruby/fast_gettext-1.1.2:0 - >=dev-ruby/locale-2.1:0 - >=dev-ruby/multi_json-1.10:0 - dev-ruby/sync + dev-ruby/hiera + dev-ruby/json:= + dev-ruby/semantic_puppet + >=dev-ruby/facter-3.0.0 + dev-ruby/concurrent-ruby augeas? ( dev-ruby/ruby-augeas ) diff? ( dev-ruby/diff-lcs ) doc? ( dev-ruby/rdoc ) @@ -78,7 +74,8 @@ all_ruby_prepare() { each_ruby_install() { each_fakegem_install -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ +# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" } all_ruby_install() { @@ -88,12 +85,10 @@ all_ruby_install() { systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" # openrc init stuff - newinitd "${FILESDIR}"/puppet.init-4.x puppet - newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster - newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster + newinitd "${FILESDIR}"/puppet.init puppet keepdir /etc/puppetlabs/puppet/ssl @@ -109,13 +104,10 @@ all_ruby_install() { fowners -R :puppet /etc/puppetlabs fowners -R :puppet /var/lib/puppet - if use ldap ; then - insinto /etc/openldap/schema; doins ext/ldap/puppet.schema - fi - # ext and examples files for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})"; dodoc "${f}" + docinto "$(dirname ${f})" + dodoc "${f}" done } @@ -129,13 +121,8 @@ pkg_postinst() { elog "Portage Puppet module with Gentoo-specific resources:" elog "http://forge.puppetlabs.com/gentoo/portage" elog - - for v in ${REPLACING_VERSIONS}; do - if [ "$(ver_cut 1 "$v")" -eq "4" ]; then - elog - elog "Please see the following url for the release notes for puppet-5" - elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x" - elog - fi - done + elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" + elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" + elog "not already done so." + elog } diff --git a/app-admin/puppet/puppet-7.21.0-r1.ebuild b/app-admin/puppet/puppet-7.28.0-r1.ebuild index 5d56b2e46a6e..2331b40f31d2 100644 --- a/app-admin/puppet/puppet-7.21.0-r1.ebuild +++ b/app-admin/puppet/puppet-7.28.0-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="7" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" RUBY_FAKEGEM_RECIPE_TEST="rspec3" RUBY_FAKEGEM_TASK_DOC="doc:all" RUBY_FAKEGEM_EXTRAINSTALL="locales" diff --git a/app-admin/puppet/puppet-8.4.0-r1.ebuild b/app-admin/puppet/puppet-8.4.0-r1.ebuild new file mode 100644 index 000000000000..da3eb9487a0c --- /dev/null +++ b/app-admin/puppet/puppet-8.4.0-r1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_RUBY="ruby31" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="doc:all" +RUBY_FAKEGEM_EXTRAINSTALL="locales" + +inherit ruby-fakegem systemd tmpfiles + +DESCRIPTION="A system automation and configuration management software" +HOMEPAGE="https://puppet.com/" +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax" +RESTRICT="test" + +ruby_add_rdepend " + hiera? ( dev-ruby/hiera ) + dev-ruby/json:= + dev-ruby/semantic_puppet + >=dev-ruby/facter-3.0.0 + dev-ruby/deep_merge + dev-ruby/concurrent-ruby + augeas? ( dev-ruby/ruby-augeas ) + diff? ( dev-ruby/diff-lcs ) + doc? ( dev-ruby/rdoc ) + ldap? ( dev-ruby/ruby-ldap ) + shadow? ( dev-ruby/ruby-shadow ) + sqlite? ( dev-ruby/sqlite3 ) + virtual/ruby-ssl + dev-ruby/hocon" + +ruby_add_bdepend " + doc? ( dev-ruby/yard ) + test? ( + dev-ruby/mocha + dev-ruby/rack + dev-ruby/rspec-its + )" +# this should go in the above lists, but isn't because of test deps not being keyworded +# dev-ruby/rspec-collection_matchers + +RDEPEND+=" ${RDEPEND} + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) + >=app-portage/eix-0.18.0 + acct-user/puppet + acct-group/puppet" +PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" + +all_ruby_prepare() { + # Avoid spec that require unpackaged json-schema. + rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die + + # fix systemd path + eapply -p0 "${FILESDIR}/puppet-systemd.patch" + + # Avoid specs that can only run in the puppet.git repository. This + # should be narrowed down to the specific specs. + rm spec/integration/parser/compiler_spec.rb || die + + # Avoid failing spec that need further investigation. + rm spec/unit/module_tool/metadata_spec.rb || die +} + +each_ruby_install() { + each_fakegem_install +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ +# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" +} + +all_ruby_install() { + all_fakegem_install + + # systemd stuffs + systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" + + # tmpfiles stuff + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" + + # openrc init stuff + newinitd "${FILESDIR}"/puppet.init puppet + + keepdir /etc/puppetlabs/puppet/ssl + + keepdir /var/lib/puppet/facts + keepdir /var/lib/puppet/files + fowners -R puppet:puppet /var/lib/puppet + + fperms 0750 /var/lib/puppet + + fperms 0750 /etc/puppetlabs + fperms 0750 /etc/puppetlabs/puppet + fperms 0750 /etc/puppetlabs/puppet/ssl + fowners -R :puppet /etc/puppetlabs + fowners -R :puppet /var/lib/puppet + + # ext and examples files + for f in $(find ext examples -type f) ; do + docinto "$(dirname ${f})" + dodoc "${f}" + done +} + +pkg_postinst() { + tmpfiles_process puppet.conf + + elog + elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" + elog "cause puppet to hang while installing packages." + elog + elog "Portage Puppet module with Gentoo-specific resources:" + elog "http://forge.puppetlabs.com/gentoo/portage" + elog +} diff --git a/app-admin/puppet/puppet-8.5.0.ebuild b/app-admin/puppet/puppet-8.5.0.ebuild new file mode 100644 index 000000000000..6ee8a0e304c8 --- /dev/null +++ b/app-admin/puppet/puppet-8.5.0.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_RUBY="ruby31" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="doc:all" +RUBY_FAKEGEM_EXTRAINSTALL="locales" + +inherit ruby-fakegem systemd tmpfiles + +DESCRIPTION="A system automation and configuration management software" +HOMEPAGE="https://puppet.com/" +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax" +RESTRICT="test" + +ruby_add_rdepend " + hiera? ( dev-ruby/hiera ) + dev-ruby/json:= + dev-ruby/semantic_puppet + >=dev-ruby/facter-3.0.0 + dev-ruby/deep_merge + dev-ruby/concurrent-ruby + augeas? ( dev-ruby/ruby-augeas ) + diff? ( dev-ruby/diff-lcs ) + doc? ( dev-ruby/rdoc ) + ldap? ( dev-ruby/ruby-ldap ) + shadow? ( dev-ruby/ruby-shadow ) + sqlite? ( dev-ruby/sqlite3 ) + virtual/ruby-ssl + dev-ruby/hocon" + +ruby_add_bdepend " + doc? ( dev-ruby/yard ) + test? ( + dev-ruby/mocha + dev-ruby/rack + dev-ruby/rspec-its + )" +# this should go in the above lists, but isn't because of test deps not being keyworded +# dev-ruby/rspec-collection_matchers + +RDEPEND+=" ${RDEPEND} + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) + >=app-portage/eix-0.18.0 + acct-user/puppet + acct-group/puppet" +PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" + +all_ruby_prepare() { + # fix systemd path + eapply -p0 "${FILESDIR}/puppet-systemd.patch" +} + +each_ruby_install() { + each_fakegem_install +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ +# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" +} + +all_ruby_install() { + all_fakegem_install + + # systemd stuffs + systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" + + # tmpfiles stuff + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" + + # openrc init stuff + newinitd "${FILESDIR}"/puppet.init puppet + + keepdir /etc/puppetlabs/puppet/ssl + + keepdir /var/lib/puppet/facts + keepdir /var/lib/puppet/files + fowners -R puppet:puppet /var/lib/puppet + + fperms 0750 /var/lib/puppet + + fperms 0750 /etc/puppetlabs + fperms 0750 /etc/puppetlabs/puppet + fperms 0750 /etc/puppetlabs/puppet/ssl + fowners -R :puppet /etc/puppetlabs + fowners -R :puppet /var/lib/puppet + + # ext and examples files + for f in $(find ext examples -type f) ; do + docinto "$(dirname ${f})" + dodoc "${f}" + done +} + +pkg_postinst() { + tmpfiles_process puppet.conf + + elog + elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" + elog "cause puppet to hang while installing packages." + elog + elog "Portage Puppet module with Gentoo-specific resources:" + elog "http://forge.puppetlabs.com/gentoo/portage" + elog +} diff --git a/app-admin/puppet/puppet-8.5.1.ebuild b/app-admin/puppet/puppet-8.5.1.ebuild new file mode 100644 index 000000000000..6ee8a0e304c8 --- /dev/null +++ b/app-admin/puppet/puppet-8.5.1.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_RUBY="ruby31" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="doc:all" +RUBY_FAKEGEM_EXTRAINSTALL="locales" + +inherit ruby-fakegem systemd tmpfiles + +DESCRIPTION="A system automation and configuration management software" +HOMEPAGE="https://puppet.com/" +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax" +RESTRICT="test" + +ruby_add_rdepend " + hiera? ( dev-ruby/hiera ) + dev-ruby/json:= + dev-ruby/semantic_puppet + >=dev-ruby/facter-3.0.0 + dev-ruby/deep_merge + dev-ruby/concurrent-ruby + augeas? ( dev-ruby/ruby-augeas ) + diff? ( dev-ruby/diff-lcs ) + doc? ( dev-ruby/rdoc ) + ldap? ( dev-ruby/ruby-ldap ) + shadow? ( dev-ruby/ruby-shadow ) + sqlite? ( dev-ruby/sqlite3 ) + virtual/ruby-ssl + dev-ruby/hocon" + +ruby_add_bdepend " + doc? ( dev-ruby/yard ) + test? ( + dev-ruby/mocha + dev-ruby/rack + dev-ruby/rspec-its + )" +# this should go in the above lists, but isn't because of test deps not being keyworded +# dev-ruby/rspec-collection_matchers + +RDEPEND+=" ${RDEPEND} + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) + >=app-portage/eix-0.18.0 + acct-user/puppet + acct-group/puppet" +PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" + +all_ruby_prepare() { + # fix systemd path + eapply -p0 "${FILESDIR}/puppet-systemd.patch" +} + +each_ruby_install() { + each_fakegem_install +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ +# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" +} + +all_ruby_install() { + all_fakegem_install + + # systemd stuffs + systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" + + # tmpfiles stuff + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" + + # openrc init stuff + newinitd "${FILESDIR}"/puppet.init puppet + + keepdir /etc/puppetlabs/puppet/ssl + + keepdir /var/lib/puppet/facts + keepdir /var/lib/puppet/files + fowners -R puppet:puppet /var/lib/puppet + + fperms 0750 /var/lib/puppet + + fperms 0750 /etc/puppetlabs + fperms 0750 /etc/puppetlabs/puppet + fperms 0750 /etc/puppetlabs/puppet/ssl + fowners -R :puppet /etc/puppetlabs + fowners -R :puppet /var/lib/puppet + + # ext and examples files + for f in $(find ext examples -type f) ; do + docinto "$(dirname ${f})" + dodoc "${f}" + done +} + +pkg_postinst() { + tmpfiles_process puppet.conf + + elog + elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" + elog "cause puppet to hang while installing packages." + elog + elog "Portage Puppet module with Gentoo-specific resources:" + elog "http://forge.puppetlabs.com/gentoo/portage" + elog +} diff --git a/app-admin/puppet/puppet-8.6.0.ebuild b/app-admin/puppet/puppet-8.6.0.ebuild new file mode 100644 index 000000000000..6ee8a0e304c8 --- /dev/null +++ b/app-admin/puppet/puppet-8.6.0.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_RUBY="ruby31" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="doc:all" +RUBY_FAKEGEM_EXTRAINSTALL="locales" + +inherit ruby-fakegem systemd tmpfiles + +DESCRIPTION="A system automation and configuration management software" +HOMEPAGE="https://puppet.com/" +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax" +RESTRICT="test" + +ruby_add_rdepend " + hiera? ( dev-ruby/hiera ) + dev-ruby/json:= + dev-ruby/semantic_puppet + >=dev-ruby/facter-3.0.0 + dev-ruby/deep_merge + dev-ruby/concurrent-ruby + augeas? ( dev-ruby/ruby-augeas ) + diff? ( dev-ruby/diff-lcs ) + doc? ( dev-ruby/rdoc ) + ldap? ( dev-ruby/ruby-ldap ) + shadow? ( dev-ruby/ruby-shadow ) + sqlite? ( dev-ruby/sqlite3 ) + virtual/ruby-ssl + dev-ruby/hocon" + +ruby_add_bdepend " + doc? ( dev-ruby/yard ) + test? ( + dev-ruby/mocha + dev-ruby/rack + dev-ruby/rspec-its + )" +# this should go in the above lists, but isn't because of test deps not being keyworded +# dev-ruby/rspec-collection_matchers + +RDEPEND+=" ${RDEPEND} + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) + >=app-portage/eix-0.18.0 + acct-user/puppet + acct-group/puppet" +PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" + +all_ruby_prepare() { + # fix systemd path + eapply -p0 "${FILESDIR}/puppet-systemd.patch" +} + +each_ruby_install() { + each_fakegem_install +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ +# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" +} + +all_ruby_install() { + all_fakegem_install + + # systemd stuffs + systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" + + # tmpfiles stuff + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" + + # openrc init stuff + newinitd "${FILESDIR}"/puppet.init puppet + + keepdir /etc/puppetlabs/puppet/ssl + + keepdir /var/lib/puppet/facts + keepdir /var/lib/puppet/files + fowners -R puppet:puppet /var/lib/puppet + + fperms 0750 /var/lib/puppet + + fperms 0750 /etc/puppetlabs + fperms 0750 /etc/puppetlabs/puppet + fperms 0750 /etc/puppetlabs/puppet/ssl + fowners -R :puppet /etc/puppetlabs + fowners -R :puppet /var/lib/puppet + + # ext and examples files + for f in $(find ext examples -type f) ; do + docinto "$(dirname ${f})" + dodoc "${f}" + done +} + +pkg_postinst() { + tmpfiles_process puppet.conf + + elog + elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" + elog "cause puppet to hang while installing packages." + elog + elog "Portage Puppet module with Gentoo-specific resources:" + elog "http://forge.puppetlabs.com/gentoo/portage" + elog +} diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 38cf0202d675..06e36dacebc9 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,2 +1,4 @@ -DIST puppetdb-7.11.1.tar.gz 49075994 BLAKE2B deb1a031999f18988c44b1439670ebb370d654a7dd99f20f44cdce027fa48088eadc96adca4fc8efe298c4dcc9b62d0d607262d8a5de4d07de0f2405a0f05a36 SHA512 98238e61ae7798912e345d69ff321bd7236dea6d5230a1f9ae37c533993d29611890522dde085e18e83b87bccb5a53e49e4ad38b930bb09ce7e9f22d45776a60 -DIST puppetdb-7.12.1.tar.gz 49891988 BLAKE2B d5201d443d991fc04e1a7c67d3f4df693365435354447cb4c18fd8143aa032be9a1dc6845cb6da07add830e2eee8539eb43fb37c3f1790f4ef02dc882de76ab9 SHA512 a86e293505c25e9f15b9c1a768540683b271002e197860bd1e24fc3d3afc88f104eefe3df3e44e7baab2e8ad4953f729b992de934ade57edef00d95290c5f1d2 +DIST puppetdb-7.13.0.tar.gz 49917440 BLAKE2B 7cb01b2dbd6b6b22aad11a7fbcabff1c8452d51437bd0b3db3c8afe9d72bb853b66a9c8056c4c7c33f284efc4a90c788a05411fe6f80ae081ef817bb7f609bf3 SHA512 ba94031b3c15d38a2719390145e034be453a5f8368b5c53420bf3b371cc36a49f0b416447ec4d9de41ef0618b32ec806b9bae996ec3c4ca0ce05fb152940c2f2 +DIST puppetdb-8.2.0.tar.gz 59250096 BLAKE2B ed1009e87cad366a1d3399eb55b51d8aaad325f1b2da9c2fc5f77a1ad43581009ebc23f5e6756cd86430eb300d389a9022b14c29bdd4ea392cf956627df0f1fe SHA512 59d894710c2591566f9900a7fc1a396f971152e66ae423b54d73b0b9d474eaf4f58926fb6dc4815865dac8bd2dc458161685876ffdc9db5a3d049d0ffeb9b601 +DIST puppetdb-8.4.1.tar.gz 60378645 BLAKE2B eb107fd2016335f814ce9de5431abb2573fd71e8b1a37faf3dad0079ca464f15785bde79eaa49f343a8dd146b9977dbb9ce4e23bce61ba39e5526e422995a497 SHA512 89f405e5364eff1ecf1482ff620de1a7fbb818b3a7ab2463f6ff47fcba0552ac440639c72f2875de956127ea3da9a5d59aa3bb220e59d0994ed3683cac22309c +DIST puppetdb-8.5.0.tar.gz 60440356 BLAKE2B 8c3116b040c91a1b406e56b419ddd7e31a5ecc7aae97c73b03fcecebeedefb1b8eed44ce54b07881cbbb025b79bfa076618c6fd6df861a6dcf03c047e7c8f480 SHA512 92808758271c43eabbd508fcb321b3e52a92d0aa860f2c9b42d1df6dcffedb41110c8cc2e72c599fa1762404112f1fc76699f449858a627dd1ca5caa84a2d381 diff --git a/app-admin/puppetdb/puppetdb-7.12.1.ebuild b/app-admin/puppetdb/puppetdb-7.13.0.ebuild index 3dc4767ab7ca..3dc4767ab7ca 100644 --- a/app-admin/puppetdb/puppetdb-7.12.1.ebuild +++ b/app-admin/puppetdb/puppetdb-7.13.0.ebuild diff --git a/app-admin/puppetdb/puppetdb-7.11.1.ebuild b/app-admin/puppetdb/puppetdb-8.2.0.ebuild index 7eb8ddf2bae8..44b569aab29c 100644 --- a/app-admin/puppetdb/puppetdb-7.11.1.ebuild +++ b/app-admin/puppetdb/puppetdb-8.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SLOT="0" IUSE="" KEYWORDS="amd64 x86" -RDEPEND+=">=virtual/jdk-1.8.0" +RDEPEND+=">=virtual/jdk-11" DEPEND+="acct-user/puppetdb acct-group/puppetdb" diff --git a/app-admin/puppetdb/puppetdb-8.4.1.ebuild b/app-admin/puppetdb/puppetdb-8.4.1.ebuild new file mode 100644 index 000000000000..4b5a495abffd --- /dev/null +++ b/app-admin/puppetdb/puppetdb-8.4.1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="PuppetDB collects data generated by Puppet" +HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" +SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" +KEYWORDS="amd64 x86" + +RDEPEND+=">=virtual/jdk-11" +DEPEND+="acct-user/puppetdb + acct-group/puppetdb" + +src_prepare() { + sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die + sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die + sed -i 's/sysconfig/conf\.d/g' install.sh || die + sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die + sed -i 's/var\/run/run/g' install.sh || die + default +} + +src_compile() { + einfo "not compiling" +} + +src_install() { + dodir /opt/puppetlabs/server/data/puppetdb + insinto /opt/puppetlabs/server/apps/puppetdb + insopts -m0744 + doins ext/ezbake-functions.sh + insopts -m0644 + doins ext/ezbake.manifest + doins puppetdb.jar + insinto /etc/puppetlabs/puppetdb + doins ext/config/logback.xml + doins ext/config/bootstrap.cfg + doins ext/config/request-logging.xml + insinto /etc/puppetlabs/puppetdb/conf.d + doins ext/config/conf.d/jetty.ini + doins ext/config/conf.d/repl.ini + doins ext/config/conf.d/database.ini + doins ext/config/conf.d/config.ini + doins ext/config/conf.d/auth.conf + insopts -m0755 + insinto /opt/puppetlabs/server/apps/puppetdb/scripts + doins install.sh + insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps + doins ext/cli/foreground + doins ext/cli/ssl-setup + doins ext/cli/config-migration + doins ext/cli/foreground + doins ext/cli/anonymize + doins ext/cli/reload + doins ext/cli/start + doins ext/cli/stop + insinto /opt/puppetlabs/server/apps/puppetdb/bin + doins ext/bin/puppetdb + insopts -m0644 + dodir /opt/puppetlabs/server/bin + dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb + dodir /opt/puppetlabs/bin + dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb + dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb + # init type tasks + newconfd ext/default puppetdb + systemd_dounit ext/redhat/puppetdb.service + newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf + newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb + # misc + insinto /etc/logrotate.d + newins ext/puppetdb.logrotate.conf puppetdb + fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb + fperms -R 770 /opt/puppetlabs/server/data/puppetdb +} + +pkg_postinst() { + tmpfiles_process puppetdb.conf + + elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" + elog + elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" +} diff --git a/app-admin/puppetdb/puppetdb-8.5.0.ebuild b/app-admin/puppetdb/puppetdb-8.5.0.ebuild new file mode 100644 index 000000000000..4b5a495abffd --- /dev/null +++ b/app-admin/puppetdb/puppetdb-8.5.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="PuppetDB collects data generated by Puppet" +HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" +SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" +KEYWORDS="amd64 x86" + +RDEPEND+=">=virtual/jdk-11" +DEPEND+="acct-user/puppetdb + acct-group/puppetdb" + +src_prepare() { + sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die + sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die + sed -i 's/sysconfig/conf\.d/g' install.sh || die + sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die + sed -i 's/var\/run/run/g' install.sh || die + default +} + +src_compile() { + einfo "not compiling" +} + +src_install() { + dodir /opt/puppetlabs/server/data/puppetdb + insinto /opt/puppetlabs/server/apps/puppetdb + insopts -m0744 + doins ext/ezbake-functions.sh + insopts -m0644 + doins ext/ezbake.manifest + doins puppetdb.jar + insinto /etc/puppetlabs/puppetdb + doins ext/config/logback.xml + doins ext/config/bootstrap.cfg + doins ext/config/request-logging.xml + insinto /etc/puppetlabs/puppetdb/conf.d + doins ext/config/conf.d/jetty.ini + doins ext/config/conf.d/repl.ini + doins ext/config/conf.d/database.ini + doins ext/config/conf.d/config.ini + doins ext/config/conf.d/auth.conf + insopts -m0755 + insinto /opt/puppetlabs/server/apps/puppetdb/scripts + doins install.sh + insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps + doins ext/cli/foreground + doins ext/cli/ssl-setup + doins ext/cli/config-migration + doins ext/cli/foreground + doins ext/cli/anonymize + doins ext/cli/reload + doins ext/cli/start + doins ext/cli/stop + insinto /opt/puppetlabs/server/apps/puppetdb/bin + doins ext/bin/puppetdb + insopts -m0644 + dodir /opt/puppetlabs/server/bin + dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb + dodir /opt/puppetlabs/bin + dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb + dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb + # init type tasks + newconfd ext/default puppetdb + systemd_dounit ext/redhat/puppetdb.service + newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf + newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb + # misc + insinto /etc/logrotate.d + newins ext/puppetdb.logrotate.conf puppetdb + fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb + fperms -R 770 /opt/puppetlabs/server/data/puppetdb +} + +pkg_postinst() { + tmpfiles_process puppetdb.conf + + elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" + elog + elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" +} diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index a78d47d45bd2..dc63dc02c5fb 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,2 +1,4 @@ -DIST puppetserver-7.9.3.tar.gz 59951239 BLAKE2B 818eee0e7bd115e0b335b1e13d7b0016933190e95a3bf71ad2498f87097de4251a1e6e2f9dfb933a1ee49c981ae0adf74f9994ec0e36a4b77aad567ab00e1fdd SHA512 d2ce573bf15c0db7cb7a9fd0a35a8286acc77ca9b2eddfe0f2dd8549034793600c04973d9f8a72ab543282325f18795727e05a723b3a3b67b027b382ded3d3eb -DIST puppetserver-7.9.5.tar.gz 59954391 BLAKE2B dd9c1c4bcac006ed711e9d29f2c1e96fbacbbb9f85a70e34e5b42909b20108b970bad58562acf2c3d60ed17c81144826ad4426357948f014b4ec3039f642a9d1 SHA512 c12df0d2778c3f768bf60ed4d9867eb976dc10671383f92ba63a06ad10c4552ec3109f42a9157816d2cd83481ee5cfad10c662812621b1afedf5eac25fbfe1b9 +DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79 +DIST puppetserver-8.3.0.tar.gz 63318772 BLAKE2B 863337c364573b340b802b83f0593fdc510424bfbcf6c6b9f8a8e56729a4db689ce5d4c0d9e1a91399e123e05f42ed0547e6a2e86905d0166c189c79966cd9f3 SHA512 c9aa0f84f989dc544ee5d8d268f753b0961f6766531d832a2c99012701dd219d1c2abf4371835242b3445428a7518e86718552678b559b3bf9b027cbf72977fb +DIST puppetserver-8.5.0.tar.gz 64463953 BLAKE2B 305f75165f919299301209c5a502237bf931342a9d0bf77d91f81f7801760faa421f1767eff283ac82e2cc49792b94126354b177e7b68bda9be61430d123621f SHA512 cb826e2450aa36380a93e95ee8055e6187944d2eecc6d5c339d4b183662d4a56d1e14847fd17b2bc50316f029dbe36791441947832686c9bfb6b0176edf7b22e +DIST puppetserver-8.6.0.tar.gz 64667765 BLAKE2B bb367a2ed980a6335a6d1e2bc09ad10ccdcc636eee6b658cab5d4bc530f656c76d75545d17e11d7b58288867edcb39bd54af0ddfd5bde2f13cb5000ed33d0bd0 SHA512 e780c78371865e754a3a7fc5343b11f9a0319caf34dcf6ca998295243d1fa2137a617867782878d9bb735c96d5dd1f3e3174898eef240353d3af63eb87cdc4a2 diff --git a/app-admin/puppetserver/puppetserver-7.9.3.ebuild b/app-admin/puppetserver/puppetserver-7.11.0.ebuild index feb570fae895..feb570fae895 100644 --- a/app-admin/puppetserver/puppetserver-7.9.3.ebuild +++ b/app-admin/puppetserver/puppetserver-7.11.0.ebuild diff --git a/app-admin/puppetserver/puppetserver-7.9.5.ebuild b/app-admin/puppetserver/puppetserver-8.3.0.ebuild index feb570fae895..34a4a96140ca 100644 --- a/app-admin/puppetserver/puppetserver-7.9.5.ebuild +++ b/app-admin/puppetserver/puppetserver-8.3.0.ebuild @@ -16,7 +16,7 @@ IUSE="puppetdb" KEYWORDS="amd64" RDEPEND+=" - >=virtual/jdk-1.8.0 + >=virtual/jdk-11 app-admin/puppet-agent[puppetdb?]" DEPEND+="acct-user/puppet acct-group/puppet" diff --git a/app-admin/puppetserver/puppetserver-8.5.0.ebuild b/app-admin/puppetserver/puppetserver-8.5.0.ebuild new file mode 100644 index 000000000000..198d1e787156 --- /dev/null +++ b/app-admin/puppetserver/puppetserver-8.5.0.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents" +HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" +SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="puppetdb" +# will need the same keywords in puppet-agent (puppet-agent now has arm64) +KEYWORDS="amd64" + +RDEPEND+=" + >=virtual/jdk-11 + app-admin/puppet-agent[puppetdb?]" +DEPEND+="acct-user/puppet + acct-group/puppet" + +src_prepare() { + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die + sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die + sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die + sed -i 's/var\/run/run/g' install.sh || die + default +} + +src_compile() { + einfo "not compiling" +} + +src_install() { + insinto /opt/puppetlabs/server/apps/puppetserver + insopts -m0774 + doins ext/ezbake-functions.sh + insopts -m0644 + doins ext/ezbake.manifest + doins puppet-server-release.jar + insinto /etc/puppetlabs/puppetserver + doins ext/config/logback.xml + doins ext/config/request-logging.xml + insinto /etc/puppetlabs/puppetserver/services.d + doins ext/system-config/services.d/bootstrap.cfg + doins ext/config/services.d/ca.cfg + insinto /etc/puppetlabs/puppetserver/conf.d + doins ext/config/conf.d/puppetserver.conf + doins ext/config/conf.d/auth.conf + doins ext/config/conf.d/global.conf + doins ext/config/conf.d/web-routes.conf + doins ext/config/conf.d/metrics.conf + doins ext/config/conf.d/webserver.conf + insopts -m0755 + insinto /opt/puppetlabs/server/apps/puppetserver/scripts + doins install.sh + insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps + doins ext/cli/ca + doins ext/cli/irb + doins ext/cli/foreground + doins ext/cli/gem + doins ext/cli/ruby + doins ext/cli/reload + doins ext/cli/start + doins ext/cli/stop + insinto /opt/puppetlabs/server/apps/puppetserver/cli + doins ext/cli_defaults/cli-defaults.sh + insinto /opt/puppetlabs/server/apps/puppetserver/bin + doins ext/bin/puppetserver + insopts -m0644 + dodir /opt/puppetlabs/server/bin + dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver + dodir /opt/puppetlabs/bin + dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver + dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver + dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d + # other sys stuff + dodir /etc/puppetlabs/code + # needed for systemd + keepdir /var/log/puppetlabs/puppetserver + dodir /etc/puppetlabs/puppet/ssl + fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl + fperms -R 771 /etc/puppetlabs/puppet/ssl + # systemd type things + insinto /etc/systemd/system/puppetserver.service.d/ + systemd_dounit ext/redhat/puppetserver.service + insinto /etc/default + newins ext/default puppetserver + # normal init type tasks + dosym ../default/puppetserver /etc/conf.d/puppetserver + newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver + # misc + insinto /etc/logrotate.d + newins ext/puppetserver.logrotate.conf puppetserver + # cleanup + dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems + fowners -R puppet:puppet /opt/puppetlabs/server/data + fperms -R 775 /opt/puppetlabs/server/data/puppetserver + fperms -R 700 /var/log/puppetlabs/puppetserver + insinto /opt/puppetlabs/server/data + doins ext/build-scripts/jruby-gem-list.txt + doins ext/build-scripts/mri-gem-list-no-dependencies.txt + newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf +} + +pkg_postinst() { + tmpfiles_process puppetserver.conf + + elog "to install you may want to run the following:" + elog + elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" + elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" + elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" + elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" + elog "puppet config set --section master codedir /etc/puppetlabs/code" + elog + elog "# install puppetserver gems" + elog "cd /opt/puppetlabs/server/apps/puppetserver" + elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" + elog "while read LINE; do" + elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" + elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" + elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" + elog "while read LINE; do" + elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" + elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" +} diff --git a/app-admin/puppetserver/puppetserver-8.6.0.ebuild b/app-admin/puppetserver/puppetserver-8.6.0.ebuild new file mode 100644 index 000000000000..198d1e787156 --- /dev/null +++ b/app-admin/puppetserver/puppetserver-8.6.0.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents" +HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" +SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="puppetdb" +# will need the same keywords in puppet-agent (puppet-agent now has arm64) +KEYWORDS="amd64" + +RDEPEND+=" + >=virtual/jdk-11 + app-admin/puppet-agent[puppetdb?]" +DEPEND+="acct-user/puppet + acct-group/puppet" + +src_prepare() { + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die + sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die + sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die + sed -i 's/var\/run/run/g' install.sh || die + default +} + +src_compile() { + einfo "not compiling" +} + +src_install() { + insinto /opt/puppetlabs/server/apps/puppetserver + insopts -m0774 + doins ext/ezbake-functions.sh + insopts -m0644 + doins ext/ezbake.manifest + doins puppet-server-release.jar + insinto /etc/puppetlabs/puppetserver + doins ext/config/logback.xml + doins ext/config/request-logging.xml + insinto /etc/puppetlabs/puppetserver/services.d + doins ext/system-config/services.d/bootstrap.cfg + doins ext/config/services.d/ca.cfg + insinto /etc/puppetlabs/puppetserver/conf.d + doins ext/config/conf.d/puppetserver.conf + doins ext/config/conf.d/auth.conf + doins ext/config/conf.d/global.conf + doins ext/config/conf.d/web-routes.conf + doins ext/config/conf.d/metrics.conf + doins ext/config/conf.d/webserver.conf + insopts -m0755 + insinto /opt/puppetlabs/server/apps/puppetserver/scripts + doins install.sh + insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps + doins ext/cli/ca + doins ext/cli/irb + doins ext/cli/foreground + doins ext/cli/gem + doins ext/cli/ruby + doins ext/cli/reload + doins ext/cli/start + doins ext/cli/stop + insinto /opt/puppetlabs/server/apps/puppetserver/cli + doins ext/cli_defaults/cli-defaults.sh + insinto /opt/puppetlabs/server/apps/puppetserver/bin + doins ext/bin/puppetserver + insopts -m0644 + dodir /opt/puppetlabs/server/bin + dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver + dodir /opt/puppetlabs/bin + dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver + dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver + dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d + # other sys stuff + dodir /etc/puppetlabs/code + # needed for systemd + keepdir /var/log/puppetlabs/puppetserver + dodir /etc/puppetlabs/puppet/ssl + fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl + fperms -R 771 /etc/puppetlabs/puppet/ssl + # systemd type things + insinto /etc/systemd/system/puppetserver.service.d/ + systemd_dounit ext/redhat/puppetserver.service + insinto /etc/default + newins ext/default puppetserver + # normal init type tasks + dosym ../default/puppetserver /etc/conf.d/puppetserver + newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver + # misc + insinto /etc/logrotate.d + newins ext/puppetserver.logrotate.conf puppetserver + # cleanup + dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems + fowners -R puppet:puppet /opt/puppetlabs/server/data + fperms -R 775 /opt/puppetlabs/server/data/puppetserver + fperms -R 700 /var/log/puppetlabs/puppetserver + insinto /opt/puppetlabs/server/data + doins ext/build-scripts/jruby-gem-list.txt + doins ext/build-scripts/mri-gem-list-no-dependencies.txt + newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf +} + +pkg_postinst() { + tmpfiles_process puppetserver.conf + + elog "to install you may want to run the following:" + elog + elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" + elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" + elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" + elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" + elog "puppet config set --section master codedir /etc/puppetlabs/code" + elog + elog "# install puppetserver gems" + elog "cd /opt/puppetlabs/server/apps/puppetserver" + elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" + elog "while read LINE; do" + elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" + elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" + elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" + elog "while read LINE; do" + elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" + elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" +} diff --git a/app-admin/pwgen/files/pwgen-2.08-c2x.patch b/app-admin/pwgen/files/pwgen-2.08-c2x.patch new file mode 100644 index 000000000000..d6cc05734d3c --- /dev/null +++ b/app-admin/pwgen/files/pwgen-2.08-c2x.patch @@ -0,0 +1,62 @@ +replace antiquated C syntax constructs for function declarations + +Signed-off-by: Fabian Groffen <grobian@gentoo.org> + +--- pwgen-2.08/randnum.c 2017-08-07 06:36:54.000000000 +0200 ++++ pwgen-2.08/randnum.c 2023-04-20 14:46:50.107904416 +0200 +@@ -43,8 +43,7 @@ + * Generate a random number n, where 0 <= n < max_num, using + * /dev/urandom if possible. + */ +-int pw_random_number(max_num) +- int max_num; ++int pw_random_number(int max_num) + { + unsigned int rand_num; + int i, fd = get_random_fd(); +--- pwgen-2.08/sha1.c 2007-07-04 23:39:35.000000000 +0200 ++++ pwgen-2.08/sha1.c 2023-04-20 14:48:25.048635027 +0200 +@@ -42,8 +42,7 @@ + (b)[(i) + 3] = (uint8) ( (n) ); \ + } + +-void sha1_starts(ctx) +- sha1_context *ctx; ++void sha1_starts(sha1_context *ctx) + { + ctx->total[0] = 0; + ctx->total[1] = 0; +@@ -55,9 +54,7 @@ + ctx->state[4] = 0xC3D2E1F0; + } + +-void sha1_process(ctx, data) +- sha1_context *ctx; +- uint8 data[64]; ++void sha1_process(sha1_context *ctx, uint8 data[64]) + { + uint32 temp, W[16], A, B, C, D, E; + +@@ -213,10 +210,7 @@ + ctx->state[4] += E; + } + +-void sha1_update(ctx, input, length ) +- sha1_context *ctx; +- uint8 *input; +- uint32 length; ++void sha1_update(sha1_context *ctx, uint8 *input, uint32 length) + { + uint32 left, fill; + +@@ -263,9 +257,7 @@ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + +-void sha1_finish( ctx, digest ) +- sha1_context *ctx; +- uint8 digest[20]; ++void sha1_finish(sha1_context *ctx, uint8 digest[20]) + { + uint32 last, padn; + uint32 high, low; diff --git a/app-admin/pwgen/pwgen-2.08-r1.ebuild b/app-admin/pwgen/pwgen-2.08-r1.ebuild index da6ea96e8361..5b502f541a14 100644 --- a/app-admin/pwgen/pwgen-2.08-r1.ebuild +++ b/app-admin/pwgen/pwgen-2.08-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="livecd" src_configure() { diff --git a/app-admin/pwgen/pwgen-2.08-r2.ebuild b/app-admin/pwgen/pwgen-2.08-r2.ebuild new file mode 100644 index 000000000000..8ad678195b59 --- /dev/null +++ b/app-admin/pwgen/pwgen-2.08-r2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Password Generator" +HOMEPAGE="https://sourceforge.net/projects/pwgen/" +SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="livecd" + +PATCHES=( + "${FILESDIR}"/${P}-c2x.patch +) + +src_configure() { + econf --sysconfdir="${EPREFIX}"/etc/pwgen +} + +src_install() { + default + + use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen +} diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest index 29a35022f5d4..0f77c15a2e52 100644 --- a/app-admin/pwman3/Manifest +++ b/app-admin/pwman3/Manifest @@ -1,2 +1 @@ -DIST pwman3-0.11.1.tar.gz 76992 BLAKE2B cd7289781436f0f8b941d587c61b2d8a5cad52f3d57d01106d73b3da5930de2bd2df15fe5a4bcfbdce5e5733b7328764d6e4e2d18cba8a575cadad8835218e75 SHA512 111713e23b64a7492b5e2735b0d0117a81759bd9f25a87327a2aa4a465fbbc8a0aa0fbfa86b84cbcd40eb1540d05cdbc6fb81982fe61953df91979e674ce5640 DIST pwman3-0.12.2.tar.gz 76744 BLAKE2B 5223169a267f0c35bcb26499138c9b768c6e29c4ce39d4fb89c56eb72d24a9729159bed93af24e12f1e0e6c1569586772eb36954afd51afc7c97c9de898346e5 SHA512 587839e7d532ef3c53e2c429b086eb6bd59290ce43687034400f8e0772cc4e97c9296694ad83c5fa3fdde37b8d8fef5bc150e9f81fcb9fe8712ffafb4be8b400 diff --git a/app-admin/pwman3/pwman3-0.11.1.ebuild b/app-admin/pwman3/pwman3-0.11.1.ebuild deleted file mode 100644 index af696aad1fb2..000000000000 --- a/app-admin/pwman3/pwman3-0.11.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE="sqlite" -inherit distutils-r1 optfeature - -DESCRIPTION="A lightweight password-manager with multiple database backends" -HOMEPAGE="https://pwman3.github.io/pwman3/" -SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] - >=dev-python/colorama-0.3.0[${PYTHON_USEDEP}] -" -BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )" - -distutils_enable_tests setup.py - -pkg_postinst() { - optfeature "Support for mongodb" dev-python/pymongo - optfeature "Support for postgresql" dev-python/psycopg:2 - optfeature "Support for mysql" dev-python/pymysql -} diff --git a/app-admin/pwman3/pwman3-0.12.2.ebuild b/app-admin/pwman3/pwman3-0.12.2.ebuild index 5fb9d641fba2..671c2afbb0dc 100644 --- a/app-admin/pwman3/pwman3-0.12.2.ebuild +++ b/app-admin/pwman3/pwman3-0.12.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} ) PYTHON_REQ_USE="sqlite" DISTUTILS_USE_PEP517=setuptools @@ -16,15 +16,22 @@ SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" +IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] >=dev-python/colorama-0.4.0[${PYTHON_USEDEP}] " -BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )" +BDEPEND=" + test? ( + dev-python/pexpect[${PYTHON_USEDEP}] + ) +" -distutils_enable_tests setup.py +python_test() { + "${EPYTHON}" -m tests.test_pwman || die "Tests fail with ${EPYTHON}" +} pkg_postinst() { optfeature "Support for mongodb" dev-python/pymongo diff --git a/app-admin/pydf/metadata.xml b/app-admin/pydf/metadata.xml index 4c0d3032d69c..115e9d64a669 100644 --- a/app-admin/pydf/metadata.xml +++ b/app-admin/pydf/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-admin/pydf/pydf-12-r2.ebuild b/app-admin/pydf/pydf-12-r2.ebuild index 5af2a2313680..08f2836810a4 100644 --- a/app-admin/pydf/pydf-12-r2.ebuild +++ b/app-admin/pydf/pydf-12-r2.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..10} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-r1 diff --git a/app-admin/qpage/Manifest b/app-admin/qpage/Manifest deleted file mode 100644 index 1e77ba4c7e42..000000000000 --- a/app-admin/qpage/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qpage-3.3.tar.Z 225689 BLAKE2B 25ac50bbe1e5a623a95f0ca8ad53255693647ca49763d80bb571ce36cf941618b6cbecc1681035d5d56d559a30e2da2a8d3621588925b00b9cac7ad278ec4a44 SHA512 d6062fb9e9cd6cfd60cadb923d29d36fd649c27adff2a36fd4e768798b90780153b78e7d0d1a13dcad94971ac98b32c1c5a3b415d5a1b4aa1cfbac564514a3e9 diff --git a/app-admin/qpage/files/qpage b/app-admin/qpage/files/qpage deleted file mode 100644 index 81ffe86d9950..000000000000 --- a/app-admin/qpage/files/qpage +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -checkconfig() { - if [ ! -e /etc/qpage/qpage.cf ] ; then - eerror "You need a /etc/qpage/qpage.cf file first." - eerror "There is a sample file in /etc/qpage/." - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting qpage" - start-stop-daemon --start --quiet --exec /usr/bin/qpage -- -q 10 - eend $? -} - -stop() { - ebegin "Stopping qpage" - start-stop-daemon --stop --quiet --exec /usr/bin/qpage - eend $? -} diff --git a/app-admin/qpage/files/qpage-3.3-fix-build-system.patch b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch deleted file mode 100644 index 0fd091df8e0e..000000000000 --- a/app-admin/qpage/files/qpage-3.3-fix-build-system.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -65,12 +65,12 @@ - @exit 1 - - install: all -- $(RM) $(bindir)/$(PROG) -- $(MKDIR) -p $(bindir) -- $(CP) $(PROG) $(bindir) -- $(RM) $(mandir)/man1/$(PROG).1 -- $(MKDIR) -p $(mandir)/man1 -- $(CP) $(PROG).man $(mandir)/man1/$(PROG).1 -+ $(RM) $(DESTDIR)$(bindir)/$(PROG) -+ $(MKDIR) -p $(DESTDIR)$(bindir) -+ $(CP) $(PROG) $(DESTDIR)$(bindir) -+ $(RM) $(DESTDIR)$(mandir)/man1/$(PROG).1 -+ $(MKDIR) -p $(DESTDIR)$(mandir)/man1 -+ $(CP) $(PROG).man $(DESTDIR)$(mandir)/man1/$(PROG).1 - - # $(INSTALL) S99qpage /etc/rc3.d - # ln /etc/rc3.d/S99qpage /etc/init.d/qpage diff --git a/app-admin/qpage/files/qpage-3.3-fix-warning.patch b/app-admin/qpage/files/qpage-3.3-fix-warning.patch deleted file mode 100644 index 722677648250..000000000000 --- a/app-admin/qpage/files/qpage-3.3-fix-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN qpage-3.3.orig/srvrsnpp.c qpage-3.3/srvrsnpp.c ---- qpage-3.3.orig/srvrsnpp.c 1998-10-25 14:55:05.000000000 -0500 -+++ qpage-3.3/srvrsnpp.c 2006-01-25 15:49:57.000000000 -0500 -@@ -1061,7 +1061,7 @@ - if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0) - p->ident = strdup(ptr); - -- ptr = eval_hostinfo(&request.client); -+ ptr = eval_hostinfo(&request.client[0]); - - if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0) - p->hostname = strdup(ptr); diff --git a/app-admin/qpage/files/qpage-3.3-gentoo.patch b/app-admin/qpage/files/qpage-3.3-gentoo.patch deleted file mode 100644 index 72baf899764e..000000000000 --- a/app-admin/qpage/files/qpage-3.3-gentoo.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/config.input -+++ b/config.input -@@ -20,7 +20,7 @@ - # See the QuickPage documentation for complete details about - # the syntax of the configuration file. - # --QPAGE_CONFIG="/etc/qpage.cf" -+QPAGE_CONFIG="/etc/qpage/qpage.cf" - - - # -@@ -41,7 +41,7 @@ - # copies of the configuration file. Only one filename - # may be specified. - # --SNPP_SERVER_FILE="/etc/qpage.servers" -+SNPP_SERVER_FILE="/etc/qpage/qpage.servers" - - - # ---- a/qpage.man -+++ b/qpage.man -@@ -867,7 +867,7 @@ - must be able to detect when it's safe to send dial commands to the modem. - .LP - .SH FILES --/etc/qpage.cf -+/etc/qpage/qpage.cf - .SH SEE ALSO - .B RFC-1861 - .SH KNOWN BUGS ---- a/example.cf -+++ b/example.cf -@@ -21,7 +21,7 @@ - # - # modem=<modem name> - # text=<optional text, no whitespace allowed> --# device=<modem device e.g. /dev/ttya> -+# device=<modem device e.g. /dev/tts/0> - # initcmd=<modem initialization command> - # dialcmd=<modem dial command not including phone number> - # -@@ -64,14 +64,15 @@ - - queuedir=/var/spool/qpage - -+lockdir=/var/lock/subsys/qpage -+ - identtimeout=5 - snpptimeout=60 - --modem=ttya device=/dev/cua/a --modem=ttyb device=/dev/cua/b -+modem=ttyS0 device=/dev/tts/0 - - service=default -- device=ttya,ttyb -+ device=ttyS0 - baudrate=1200 - parity=even - allowpid=yes ---- a/ixo.c -+++ b/ixo.c -@@ -192,7 +192,7 @@ - if ((i = read_modem(fd, seconds)) < 0) - return(NULL); - -- if (i == '\r') { -+ if (i == '\r' || i == '\n') { - *ptr = '\0'; - got_full_packet++; - } diff --git a/app-admin/qpage/metadata.xml b/app-admin/qpage/metadata.xml deleted file mode 100644 index 827a55e8820e..000000000000 --- a/app-admin/qpage/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>chutzpah@gentoo.org</email> - <name>Patrick McLean</name> - </maintainer> - <longdescription lang="en"> - QuickPage is a client/server software package that enables you to send messages - to an alphanumeric pager. The client accepts a message from the user and - forwards it to a server using SNPP. The server uses a modem to transmit the - message to the recipient's paging service using the TAP protocol (also known as - the IXO protocol). - </longdescription> -</pkgmetadata> diff --git a/app-admin/qpage/qpage-3.3.ebuild b/app-admin/qpage/qpage-3.3.ebuild deleted file mode 100644 index 6438da0b64eb..000000000000 --- a/app-admin/qpage/qpage-3.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Sends messages to an alphanumeric pager via TAP protocol" -HOMEPAGE="http://www.qpage.org/" -SRC_URI="http://www.qpage.org/download/${P}.tar.Z" - -LICENSE="qpage" -SLOT="0" -KEYWORDS="~alpha amd64 x86" -IUSE="tcpd" - -DEPEND="tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND="${DEPEND} - virtual/mta" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-fix-warning.patch - "${FILESDIR}"/${P}-fix-build-system.patch -) - -src_configure() { - tc-export CC - default - - # There doesn't seem to be a clean way to disable tcp wrappers in - # this package if you have it installed, but don't want to use it. - if ! use tcpd ; then - sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile || die - echo '#undef TCP_WRAPPERS' >> config.h || die - fi -} - -src_install() { - default - - dodir /var/spool/qpage - fowners daemon:daemon /var/spool/qpage - fperms 770 /var/spool/qpage - - dodir /var/lock/subsys/qpage - fowners daemon:daemon /var/lock/subsys/qpage - fperms 770 /var/lock/subsys/qpage - - insinto /etc/qpage - doins example.cf - - doinitd "${FILESDIR}"/qpage -} - -pkg_postinst() { - elog - elog "Post-installation tasks:" - elog - elog "1. Create /etc/qpage/qpage.cf (see example.cf in that dir)." - elog "2. Insure that the serial port selected in qpage.cf" - elog " is writable by user or group daemon." - elog "3. Set automatic startup with rc-update add qpage default" - elog "4. Send mail to tomiii@qpage.org telling him how" - elog " you like qpage! :-)" - elog -} diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest index f8284027bcd5..78f1fc36a962 100644 --- a/app-admin/qtpass/Manifest +++ b/app-admin/qtpass/Manifest @@ -1 +1,2 @@ DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a SHA512 9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10 +DIST qtpass-1.4.0.tar.gz 581368 BLAKE2B 12bf414ea781bad34d97fe28ae39f44e17812039f0d798162b6d875918f20a1583f7a53a1e98ed917edf41c15709c7693c7651205c5e4ec85860ee773350f075 SHA512 47c1284c10e0d8a3bf63c049fc29d785d1a53bef6f183bbe22efebf466371dd454a6e43c944739f487d609f3cde188701ba538e9cb8e2c7e5530f8fa6f992625 diff --git a/app-admin/qtpass/qtpass-1.4.0.ebuild b/app-admin/qtpass/qtpass-1.4.0.ebuild new file mode 100644 index 000000000000..d942091a7152 --- /dev/null +++ b/app-admin/qtpass/qtpass-1.4.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop qmake-utils virtualx + +DESCRIPTION="Multi-platform GUI for pass, the standard unix password manager" +HOMEPAGE="https://qtpass.org https://github.com/IJHack/qtpass" +SRC_URI="https://github.com/IJHack/qtpass/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/QtPass-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="|| ( app-admin/pass app-admin/gopass ) + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + net-misc/x11-ssh-askpass" +DEPEND="${RDEPEND} + dev-qt/qtsvg:5 + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" + +DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md ) + +src_prepare() { + default + + if ! use test ; then + sed -i '/SUBDIRS += src /s/tests //' \ + qtpass.pro || die "sed for qtpass.pro failed" + fi +} + +src_configure() { + eqmake5 PREFIX="${EPREFIX}"/usr +} + +src_test() { + virtx default +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs + + insinto /usr/share/qtpass/translations + doins src/.qm/*.qm + + doman qtpass.1 + domenu qtpass.desktop + newicon artwork/icon.png qtpass-icon.png + insinto /usr/share/metainfo + doins qtpass.appdata.xml +} diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest index f31e8b39ce28..525219668f42 100644 --- a/app-admin/r10k/Manifest +++ b/app-admin/r10k/Manifest @@ -1 +1,4 @@ -DIST r10k-3.15.0.gem 257536 BLAKE2B 50ddb734bef782d9b061f17338d05c8fd824d0cc1e6005c538c4ef91c584bfe9ecbfb5bc5dc033317344bad7b14825cea6a56e136efec5081778582b8c714b18 SHA512 97cbb0a3e6f23591370de339e3320d9cbff726968b3b73d2bb00ebca7637406a371d1464d3ac955b7aacc4f5cfa898b828095aebaebe24bffd7d90be462457a9 +DIST r10k-3.16.0.tar.gz 253547 BLAKE2B 683fdd5588c7b3c3b47ae0d28d75fbfb929d5595c715531eed86b8d89f76708c91f38f9ca558040b36fac38c038211086a74fdf109b37350126bc78b25f8b751 SHA512 399a357cf8617427632516e0f439a40464ba0c8201ee7b6ce15c893ae029bfd9ae1438b76aff3b9601685d14febf8fc71dbdd2954eb3352d6ce713e769cb586d +DIST r10k-4.0.0.tar.gz 254074 BLAKE2B 8053d435691d33cd1d8b3c55c2cb3a153cd952112a93f2eeb4b715c6c0b92e9192c65f8809b4187d5ff4f5f6b9ed8f67a644d7920bf8d8294dd0b5d8fd735836 SHA512 a6b92fabcc405fe6678da724743e43d9dc3a286e3a973a3320ac94c25dd385315baaaf495dbd1706005d31f13d4c52f1c425148d3b397448fed07fd83acb04fa +DIST r10k-4.0.1.tar.gz 254147 BLAKE2B 83c71c39f50aaf390ef75b8d87a693ba8d131297fcb12c3e408665565e35119d3e9e2832b8172b0616145459368dd5af38bcecca666ac1020ba96a59abc83657 SHA512 74583a79637d8c60f3935cd7ea382fff189beb7d6825b10b9c6bfc0a625a62f81648795cefc878cec608d96ba2396749f7fc0a1c7bdfa9bfcf914848135a0675 +DIST r10k-4.0.2.tar.gz 254228 BLAKE2B b98a665200978a023dc2566bc4b3c141eed6c950d27dc0401c8c7e8d1096f5fa0562874bd1a0e1726dd687a046cf345c0ce5003d5a2a7f72bf397d91b07065c3 SHA512 5f4d9b5fdcd45ffe5b9c2ef95fff7b7ae3136adefcee754782815bb523d0281ec3ee50615600b2fe80ee9d98b75d80747072c425c4d15c795cd7dcb27d1f192b diff --git a/app-admin/r10k/r10k-3.15.0.ebuild b/app-admin/r10k/r10k-3.16.0.ebuild index c5f67b298dd7..a3baf5d7fa01 100644 --- a/app-admin/r10k/r10k-3.15.0.ebuild +++ b/app-admin/r10k/r10k-3.16.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby27 ruby30" +USE_RUBY="ruby31" RUBY_FAKEGEM_RECIPE_DOC="none" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -15,6 +15,7 @@ inherit ruby-fakegem DESCRIPTION="Puppet environment and module deployment" HOMEPAGE="https://github.com/puppetlabs/r10k" +SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -24,13 +25,14 @@ IUSE="+git" ruby_add_rdepend " ~dev-ruby/colored2-3.1.2 >=dev-ruby/cri-2.15.10:0 - >=dev-ruby/gettext-setup-0.24:0 + || ( dev-ruby/gettext-setup:1 >=dev-ruby/gettext-setup-0.24:0 ) || ( dev-ruby/fast_gettext:2 >=dev-ruby/fast_gettext-1.1:0 ) - =dev-ruby/jwt-2.2* >=dev-ruby/jwt-2.2.3 + >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2 >=dev-ruby/ruby-gettext-3.0.2:0 ~dev-ruby/log4r-1.1.10 + >=dev-ruby/minitar-0.9:0 >=dev-ruby/multi_json-1.10:0 - >=dev-ruby/puppet_forge-2.3 + =dev-ruby/puppet_forge-3* " ruby_add_bdepend "test? ( @@ -41,8 +43,6 @@ RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" all_ruby_prepare() { sed -e '/s.files/d' \ - -e '/fast_gettext/ s/1.1.0/1.1/' \ - -e "/gettext/ s/'< 3.3.0'//" \ -i ${RUBY_FAKEGEM_GEMSPEC} || die # Avoid specs for unpackaged rugget git provider diff --git a/app-admin/r10k/r10k-4.0.0.ebuild b/app-admin/r10k/r10k-4.0.0.ebuild new file mode 100644 index 000000000000..fa99e710fd2f --- /dev/null +++ b/app-admin/r10k/r10k-4.0.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_DOC="none" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" +RUBY_FAKEGEM_EXTRAINSTALL=locales + +inherit ruby-fakegem + +DESCRIPTION="Puppet environment and module deployment" +HOMEPAGE="https://github.com/puppetlabs/r10k" +SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+git" + +ruby_add_rdepend " + ~dev-ruby/colored2-3.1.2 + >=dev-ruby/cri-2.15.10:0 + || ( dev-ruby/gettext-setup:1 >=dev-ruby/gettext-setup-0.24:0 ) + >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2 + >=dev-ruby/ruby-gettext-3.0.2:0 + ~dev-ruby/log4r-1.1.10 + >=dev-ruby/minitar-0.9:0 + >=dev-ruby/multi_json-1.10:0 + dev-ruby/puppet_forge:5 +" + +ruby_add_bdepend "test? ( + >=dev-ruby/minitar-0.9 +)" + +RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" + +all_ruby_prepare() { + sed -e '/s.files/d' \ + -i ${RUBY_FAKEGEM_GEMSPEC} || die + + # Avoid specs for unpackaged rugget git provider + rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die + + # Avoid spec making assumptions on availability of relative symlinks + rm -f spec/integration/util/purageable_spec.rb || die +} diff --git a/app-admin/r10k/r10k-4.0.1.ebuild b/app-admin/r10k/r10k-4.0.1.ebuild new file mode 100644 index 000000000000..471bb42a9be4 --- /dev/null +++ b/app-admin/r10k/r10k-4.0.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_DOC="none" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" +RUBY_FAKEGEM_EXTRAINSTALL=locales + +inherit ruby-fakegem + +DESCRIPTION="Puppet environment and module deployment" +HOMEPAGE="https://github.com/puppetlabs/r10k" +SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+git" + +ruby_add_rdepend " + ~dev-ruby/colored2-3.1.2 + >=dev-ruby/cri-2.15.10:0 + dev-ruby/gettext-setup:1 + >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2 + >=dev-ruby/ruby-gettext-3.0.2:0 + ~dev-ruby/log4r-1.1.10 + >=dev-ruby/minitar-0.9:0 + >=dev-ruby/multi_json-1.10:0 + dev-ruby/puppet_forge:5 +" + +ruby_add_bdepend "test? ( + >=dev-ruby/minitar-0.9 +)" + +RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" + +all_ruby_prepare() { + sed -e '/s.files/d' \ + -i ${RUBY_FAKEGEM_GEMSPEC} || die + + # Avoid specs for unpackaged rugget git provider + rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die + + # Avoid spec making assumptions on availability of relative symlinks + rm -f spec/integration/util/purageable_spec.rb || die +} diff --git a/app-admin/r10k/r10k-4.0.2.ebuild b/app-admin/r10k/r10k-4.0.2.ebuild new file mode 100644 index 000000000000..28655c6c3ecb --- /dev/null +++ b/app-admin/r10k/r10k-4.0.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_DOC="none" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" +RUBY_FAKEGEM_EXTRAINSTALL=locales + +inherit ruby-fakegem + +DESCRIPTION="Puppet environment and module deployment" +HOMEPAGE="https://github.com/puppetlabs/r10k" +SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+git" + +ruby_add_rdepend " + ~dev-ruby/colored2-3.1.2 + >=dev-ruby/cri-2.15.10:0 + dev-ruby/gettext-setup:1 + >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2 + >=dev-ruby/ruby-gettext-3.0.2:0 + ~dev-ruby/log4r-1.1.10 + >=dev-ruby/minitar-0.9:0 + >=dev-ruby/multi_json-1.10:0 + dev-ruby/puppet_forge:5 +" + +RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" + +all_ruby_prepare() { + sed -e '/s.files/d' \ + -i ${RUBY_FAKEGEM_GEMSPEC} || die + + # Avoid specs for unpackaged rugget git provider + rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die + + # Avoid spec making assumptions on availability of relative symlinks + rm -f spec/integration/util/purageable_spec.rb || die +} diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest index 4ce4630f3ac4..9a9fb8255bc2 100644 --- a/app-admin/rasdaemon/Manifest +++ b/app-admin/rasdaemon/Manifest @@ -1,3 +1 @@ -DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30 -DIST rasdaemon-0.7.0.tar.bz2 433555 BLAKE2B cf73f59558d8a6f3138fea20e7096a1b1214dd44a4518da88a4b1f0c4c92a6df4eb7922e9a2e76d5012364219067cf66e220d8f54588ab22acf09937e41aa2dc SHA512 a7938ccd8171d849b5d89df6ab90942278c824a3dbd17abda8ae3d80ce5227cbc3fe23b31806609114482606d780ec7f0676a0fedfa950ed8cb5a59f3583bd57 DIST rasdaemon-0.8.0.tar.bz2 394983 BLAKE2B 24209f468fea2bc4e85dcac51e363e44a8a44b224b448ec1330bcd15a5b2b4b3cceeec78dbc86b4a88f5a378ecacba62cdba8e9c3e2b1b3a70be85a18af166ab SHA512 f6262f098fd2a08d35fef2c25e2452a202151d4cc93a1829e821abd564acf7dcf80b08f819cbd7f04244dcc9f1dec5d9138aa013bb43c8fcf19d340233275614 diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch deleted file mode 100644 index 6a3beaae217c..000000000000 --- a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch +++ /dev/null @@ -1,186 +0,0 @@ -https://github.com/mchehab/rasdaemon/pull/81 - -From 9632f63c3855b119ab4b02300e27ab357bddcf03 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 29 Dec 2022 17:23:47 +0000 -Subject: [PATCH] configure.ac: fix bashisms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -configure scripts need to be runnable with a POSIX-compliant /bin/sh. - -On many (but not all!) systems, /bin/sh is provided by Bash, so errors -like this aren't spotted. Notably Debian defaults to /bin/sh provided -by dash which doesn't tolerate such bashisms as '=='. - -This retains compatibility with bash. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -27,14 +27,14 @@ AC_ARG_ENABLE([all], - AC_ARG_ENABLE([sqlite3], - AS_HELP_STRING([--enable-sqlite3], [enable storing data at SQL lite database (currently experimental)])) - --AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_CHECK_LIB(sqlite3, sqlite3_open,[echo "found sqlite3"] , AC_MSG_ERROR([*** Unable to find sqlite3 library]), ) - SQLITE3_LIBS="-lsqlite3" - AC_DEFINE(HAVE_SQLITE3,1,"have sqlite3") - AC_SUBST([WITH_SQLITE3]) - ]) - --AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_SQLITE3], [USE_SQLITE3="yes"], [USE_SQLITE3="no"]) - - AC_SUBST([SQLITE3_LIBS]) -@@ -43,122 +43,122 @@ AC_SUBST([SQLITE3_LIBS]) - AC_ARG_ENABLE([aer], - AS_HELP_STRING([--enable-aer], [enable PCIe AER events (currently experimental)])) - --AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_AER,1,"have PCIe AER events collect") - AC_SUBST([WITH_AER]) - ]) --AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_AER], [USE_AER="yes"], [USE_AER="no"]) - - - AC_ARG_ENABLE([non_standard], - AS_HELP_STRING([--enable-non-standard], [enable NON_STANDARD events (currently experimental)])) - --AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_NON_STANDARD,1,"have UNKNOWN_SEC events collect") - AC_SUBST([WITH_NON_STANDARD]) - ]) --AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_NON_STANDARD], [USE_NON_STANDARD="yes"], [USE_NON_STANDARD="no"]) - - AC_ARG_ENABLE([arm], - AS_HELP_STRING([--enable-arm], [enable ARM events (currently experimental)])) - --AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_ARM,1,"have ARM events collect") - AC_SUBST([WITH_ARM]) - ]) --AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_ARM], [USE_ARM="yes"], [USE_ARM="no"]) - - AC_ARG_ENABLE([mce], - AS_HELP_STRING([--enable-mce], [enable MCE events (currently experimental)])) - --AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_MCE,1,"have PCIe MCE events collect") - AC_SUBST([WITH_MCE]) - ]) --AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_MCE], [USE_MCE="yes"], [USE_MCE="no"]) - - AC_ARG_ENABLE([extlog], - AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)])) - --AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect") - AC_SUBST([WITH_EXTLOG]) - ]) --AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_EXTLOG], [USE_EXTLOG="yes"], [USE_EXTLOG="no"]) - - AC_ARG_ENABLE([devlink], - AS_HELP_STRING([--enable-devlink], [enable devlink health events (currently experimental)])) - --AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_DEVLINK,1,"have devlink health events collect") - AC_SUBST([WITH_DEVLINK]) - ]) --AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_DEVLINK], [USE_DEVLINK="yes"], [USE_DEVLINK="no"]) - - AC_ARG_ENABLE([diskerror], - AS_HELP_STRING([--enable-diskerror], [enable disk I/O error events (currently experimental)])) - --AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_DISKERROR,1,"have disk I/O errors collect") - AC_SUBST([WITH_DISKERROR]) - ]) --AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_DISKERROR], [USE_DISKERROR="yes"], [USE_DISKERROR="no"]) - - AC_ARG_ENABLE([memory_failure], - AS_HELP_STRING([--enable-memory-failure], [enable memory failure events (currently experimental)])) - --AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_MEMORY_FAILURE,1,"have memory failure events collect") - AC_SUBST([WITH_MEMORY_FAILURE]) - ]) --AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_MEMORY_FAILURE], [USE_MEMORY_FAILURE="yes"], [USE_MEMORY_FAILURE="no"]) - - AC_ARG_ENABLE([abrt_report], - AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)])) - --AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT") - AC_SUBST([WITH_ABRT_REPORT]) - ]) --AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_ABRT_REPORT], [USE_ABRT_REPORT="yes"], [USE_ABRT_REPORT="no"]) - - AC_ARG_ENABLE([hisi_ns_decode], - AS_HELP_STRING([--enable-hisi-ns-decode], [enable HISI_NS_DECODE events (currently experimental)])) - --AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_HISI_NS_DECODE,1,"have HISI UNKNOWN_SEC events decode") - AC_SUBST([WITH_HISI_NS_DECODE]) - ]) --AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_HISI_NS_DECODE], [USE_HISI_NS_DECODE="yes"], [USE_HISI_NS_DECODE="no"]) - - AC_ARG_ENABLE([memory_ce_pfa], - AS_HELP_STRING([--enable-memory-ce-pfa], [enable memory Corrected Error predictive failure analysis])) - --AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_MEMORY_CE_PFA,1,"have memory corrected error predictive failure analysis") - AC_SUBST([WITH_MEMORY_CE_PFA]) - ]) --AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_MEMORY_CE_PFA], [USE_MEMORY_CE_PFA="yes"], [USE_MEMORY_CE_PFA="no"]) - - AC_ARG_ENABLE([amp_ns_decode], - AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)])) - --AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [ -+AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [ - AC_DEFINE(HAVE_AMP_NS_DECODE,1,"have AMP UNKNOWN_SEC events decode") - AC_SUBST([WITH_AMP_NS_DECODE]) - ]) --AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all == xyes]) -+AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all = xyes]) - AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="no"]) - - test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc - diff --git a/app-admin/rasdaemon/files/rasdaemon-0.8.0-check-online-cpus-not-configured.patch b/app-admin/rasdaemon/files/rasdaemon-0.8.0-check-online-cpus-not-configured.patch new file mode 100644 index 000000000000..0d3e60976659 --- /dev/null +++ b/app-admin/rasdaemon/files/rasdaemon-0.8.0-check-online-cpus-not-configured.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/890286 +https://github.com/mchehab/rasdaemon/issues/77 +https://github.com/mchehab/rasdaemon/commit/f1ea76375281001cdf4a048c1a4a24d86c6fbe48 + +From f1ea76375281001cdf4a048c1a4a24d86c6fbe48 Mon Sep 17 00:00:00 2001 +From: Zeph / Liz Loss-Cutler-Hull <warp-spam_git@aehallh.com> +Date: Sun, 9 Jul 2023 04:57:19 -0700 +Subject: [PATCH] Check CPUs online, not configured. + +When the number of CPUs detected is greater than the number of CPUs in +the system, rasdaemon will crash when it receives some events. + +Looking deeper, we also fail to use the poll method for similar reasons +in this case. + +All of this can be prevented by checking to see how many CPUs are +currently online (sysconf(_SC_NPROCESSORS_ONLN)) instead of how many +CPUs the current kernel was configured to support +(sysconf(_SC_NPROCESSORS_CONF)). + +For the kernel side of the discussion, see https://lore.kernel.org/lkml/CAM6Wdxft33zLeeXHhmNX5jyJtfGTLiwkQSApc=10fqf+rQh9DA@mail.gmail.com/T/ +Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> +--- + ras-events.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ras-events.c b/ras-events.c +index a82dab2..5935163 100644 +--- a/ras-events.c ++++ b/ras-events.c +@@ -350,7 +350,7 @@ static void parse_ras_data(struct pthread_data *pdata, struct kbuffer *kbuf, + + static int get_num_cpus(struct ras_events *ras) + { +- return sysconf(_SC_NPROCESSORS_CONF); ++ return sysconf(_SC_NPROCESSORS_ONLN); + #if 0 + char fname[MAX_PATH + 1]; + int num_cpus = 0; + diff --git a/app-admin/rasdaemon/files/rasdaemon-0.8.0-table-create-offline-cpus.patch b/app-admin/rasdaemon/files/rasdaemon-0.8.0-table-create-offline-cpus.patch new file mode 100644 index 000000000000..4eb3977930c6 --- /dev/null +++ b/app-admin/rasdaemon/files/rasdaemon-0.8.0-table-create-offline-cpus.patch @@ -0,0 +1,179 @@ +https://bugs.gentoo.org/890286 +https://github.com/mchehab/rasdaemon/issues/77 +https://github.com/mchehab/rasdaemon/commit/6f7851f72d8464c7a20a248d4abf4362de8f0ba9 + +From 6f7851f72d8464c7a20a248d4abf4362de8f0ba9 Mon Sep 17 00:00:00 2001 +From: Shiju Jose <shiju.jose@huawei.com> +Date: Sun, 5 Mar 2023 23:14:42 +0000 +Subject: [PATCH] rasdaemon: fix table create if some cpus are offline + +Fix for regression in ras_mc_create_table() if some cpus are offline +at the system start + +Issue: + +Regression in the ras_mc_create_table() if some of the cpus are offline +at the system start when run the rasdaemon. + +This issue is reproducible in ras_mc_create_table() with decode and +record non-standard events and reproducible sometimes with +ras_mc_create_table() for the standard events. + +Also in the multi thread way, there is memory leak in ras_mc_event_opendb() +as struct sqlite3_priv *priv and sqlite3 *db allocated/initialized per +thread, but stored in the common struct ras_events ras in pthread data, +which is shared across the threads. + +Reason: + +when the system starts with some of the cpus offline and then run +the rasdaemon, read_ras_event_all_cpus() exit with error and switch to +the multi thread way. However read() in read_ras_event() return error in +threads for each of the offline CPUs and does clean up including calling +ras_mc_event_closedb(). + +Since the 'struct ras_events ras' passed in the pthread_data to each of the +threads is common, struct sqlite3_priv *priv and sqlite3 *db allocated/ +initialized per thread and stored in the common 'struct ras_events ras', +are getting overwritten in each ras_mc_event_opendb()(which called from +pthread per cpu), result memory leak. + +Also when ras_mc_event_closedb() is called in the above error case from +the threads corresponding to the offline cpus, close the sqlite3 *db and +free sqlite3_priv *priv stored in the common 'struct ras_events ras', +result regression when accessing priv->db in the ras_mc_create_table() +from another context later. + +Solution: + +In ras_mc_event_opendb(), allocate struct sqlite3_priv *priv, +init sqlite3 *db and create tables common for the threads with shared +'struct ras_events ras' based on a reference count and free them in the +same way. + +Also protect critical code ras_mc_event_opendb() and ras_mc_event_closedb() +using mutex in the multi thread case from any regression caused by the +thread pre-emption. + +Reported-by: Lei Feng <fenglei47@h-partners.com> +Signed-off-by: Shiju Jose <shiju.jose@huawei.com> +Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> +--- + ras-events.c | 16 +++++++++++++++- + ras-events.h | 4 +++- + ras-record.c | 12 ++++++++++++ + 3 files changed, 30 insertions(+), 2 deletions(-) + +diff --git a/ras-events.c b/ras-events.c +index 49e4f9a..5fe8e19 100644 +--- a/ras-events.c ++++ b/ras-events.c +@@ -625,19 +625,25 @@ static void *handle_ras_events_cpu(void *priv) + + log(TERM, LOG_INFO, "Listening to events on cpu %d\n", pdata->cpu); + if (pdata->ras->record_events) { ++ pthread_mutex_lock(&pdata->ras->db_lock); + if (ras_mc_event_opendb(pdata->cpu, pdata->ras)) { ++ pthread_mutex_unlock(&pdata->ras->db_lock); + log(TERM, LOG_ERR, "Can't open database\n"); + close(fd); + kbuffer_free(kbuf); + free(page); + return 0; + } ++ pthread_mutex_unlock(&pdata->ras->db_lock); + } + + read_ras_event(fd, pdata, kbuf, page); + +- if (pdata->ras->record_events) ++ if (pdata->ras->record_events) { ++ pthread_mutex_lock(&pdata->ras->db_lock); + ras_mc_event_closedb(pdata->cpu, pdata->ras); ++ pthread_mutex_unlock(&pdata->ras->db_lock); ++ } + + close(fd); + kbuffer_free(kbuf); +@@ -993,6 +999,11 @@ int handle_ras_events(int record_events) + + /* Poll doesn't work on this kernel. Fallback to pthread way */ + if (rc == -255) { ++ if (pthread_mutex_init(&ras->db_lock, NULL) != 0) { ++ log(SYSLOG, LOG_INFO, "sqlite db lock init has failed\n"); ++ goto err; ++ } ++ + log(SYSLOG, LOG_INFO, + "Opening one thread per cpu (%d threads)\n", cpus); + for (i = 0; i < cpus; i++) { +@@ -1005,6 +1016,8 @@ int handle_ras_events(int record_events) + i); + while (--i) + pthread_cancel(data[i].thread); ++ ++ pthread_mutex_destroy(&ras->db_lock); + goto err; + } + } +@@ -1012,6 +1025,7 @@ int handle_ras_events(int record_events) + /* Wait for all threads to complete */ + for (i = 0; i < cpus; i++) + pthread_join(data[i].thread, NULL); ++ pthread_mutex_destroy(&ras->db_lock); + } + + log(SYSLOG, LOG_INFO, "Huh! something got wrong. Aborting.\n"); +diff --git a/ras-events.h b/ras-events.h +index 6c9f507..649b0c0 100644 +--- a/ras-events.h ++++ b/ras-events.h +@@ -56,7 +56,9 @@ struct ras_events { + time_t uptime_diff; + + /* For ras-record */ +- void *db_priv; ++ void *db_priv; ++ int db_ref_count; ++ pthread_mutex_t db_lock; + + /* For the mce handler */ + struct mce_priv *mce_priv; +diff --git a/ras-record.c b/ras-record.c +index a367939..adc97a4 100644 +--- a/ras-record.c ++++ b/ras-record.c +@@ -763,6 +763,10 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras) + + printf("Calling %s()\n", __FUNCTION__); + ++ ras->db_ref_count++; ++ if (ras->db_ref_count > 1) ++ return 0; ++ + ras->db_priv = NULL; + + priv = calloc(1, sizeof(*priv)); +@@ -912,6 +916,13 @@ int ras_mc_event_closedb(unsigned int cpu, struct ras_events *ras) + + printf("Calling %s()\n", __func__); + ++ if (ras->db_ref_count > 0) ++ ras->db_ref_count--; ++ else ++ return -1; ++ if (ras->db_ref_count > 0) ++ return 0; ++ + if (!priv) + return -1; + +@@ -1018,6 +1029,7 @@ int ras_mc_event_closedb(unsigned int cpu, struct ras_events *ras) + log(TERM, LOG_ERR, + "cpu %u: Failed to shutdown sqlite: error = %d\n", cpu, rc); + free(priv); ++ ras->db_priv = NULL; + + return 0; + } + diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild deleted file mode 100644 index 63c05654e834..000000000000 --- a/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic linux-info systemd - -DESCRIPTION="Reliability, Availability and Serviceability logging tool" -HOMEPAGE="https://github.com/mchehab/rasdaemon" -SRC_URI="https://github.com/mchehab/rasdaemon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -DEPEND=" - dev-db/sqlite - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND=" - ${DEPEND} - dev-perl/DBI - dev-perl/DBD-SQLite - sys-apps/dmidecode -" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.8-bashisms-configure.patch -) - -pkg_setup() { - linux-info_pkg_setup - local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS" - check_extra_config -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myconfargs=( - --enable-sqlite3 - --enable-abrt-report - --enable-aer - --enable-arm - --enable-extlog - --enable-hisi-ns-decode - --enable-mce - --enable-non-standard - --enable-devlink - --enable-diskerror - --enable-memory-ce-pfa - --includedir="/usr/include/${PN}" - --localstatedir=/var - ) - - use elibc_musl && append-libs -largp - - econf "${myconfargs[@]}" -} - -src_install() { - default - - keepdir "/var/lib/${PN}" - - systemd_dounit misc/*.service - - newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon - newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl - newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon -} diff --git a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild deleted file mode 100644 index c0ee30e744f2..000000000000 --- a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic linux-info systemd - -DESCRIPTION="Reliability, Availability and Serviceability logging tool" -HOMEPAGE="https://github.com/mchehab/rasdaemon" -SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -DEPEND=" - dev-db/sqlite - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND=" - ${DEPEND} - dev-perl/DBI - dev-perl/DBD-SQLite - sys-apps/dmidecode -" -BDEPEND="sys-devel/gettext" - -pkg_setup() { - linux-info_pkg_setup - local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS" - check_extra_config -} - -src_configure() { - local myconfargs=( - --enable-sqlite3 - --enable-abrt-report - --enable-aer - --enable-arm - --enable-extlog - --enable-hisi-ns-decode - --enable-mce - --enable-non-standard - --enable-devlink - --enable-diskerror - --enable-memory-ce-pfa - --includedir="/usr/include/${PN}" - --localstatedir=/var - ) - - use elibc_musl && append-libs -largp - - econf "${myconfargs[@]}" -} - -src_install() { - default - - keepdir "/var/lib/${PN}" - - systemd_dounit misc/*.service - - newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon - newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl - newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon -} diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0-r2.ebuild index b2387b6618dc..491390c49008 100644 --- a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild +++ b/app-admin/rasdaemon/rasdaemon-0.8.0-r2.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 @@ -16,7 +16,8 @@ fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="selinux" DEPEND=" dev-db/sqlite @@ -28,11 +29,14 @@ RDEPEND=" dev-perl/DBI dev-perl/DBD-SQLite sys-apps/dmidecode + selinux? ( sec-policy/selinux-rasdaemon ) " BDEPEND="sys-devel/gettext" PATCHES=( "${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch + "${FILESDIR}"/${PN}-0.8.0-table-create-offline-cpus.patch + "${FILESDIR}"/${PN}-0.8.0-check-online-cpus-not-configured.patch ) pkg_setup() { diff --git a/app-admin/redfishtool/Manifest b/app-admin/redfishtool/Manifest new file mode 100644 index 000000000000..7634202c1d56 --- /dev/null +++ b/app-admin/redfishtool/Manifest @@ -0,0 +1 @@ +DIST redfishtool-1.1.8.tar.gz 83028 BLAKE2B 376d7513776aaf72bdc249d27312f25134c16ede12584ce334d7f89b07fc2abd986baa775fbc5f497d0679fba6997d5f908062af32186364b6609625fcb6e0c5 SHA512 c9aee7461013144e7d2ba2825f750cca52270cd658bb07e65764923c0ba489ec1e8a5ecb12a1b4f43ef8c0227fbe195a6869c2ae264ed778a5dddc513cbaa542 diff --git a/app-admin/redfishtool/metadata.xml b/app-admin/redfishtool/metadata.xml new file mode 100644 index 000000000000..18acf7851c64 --- /dev/null +++ b/app-admin/redfishtool/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <upstream> + <remote-id type="pypi">redfishtool</remote-id> + <remote-id type="github">DMTF/Redfishtool</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-admin/redfishtool/redfishtool-1.1.8.ebuild b/app-admin/redfishtool/redfishtool-1.1.8.ebuild new file mode 100644 index 000000000000..4c2064451254 --- /dev/null +++ b/app-admin/redfishtool/redfishtool-1.1.8.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Python package and command-line tool for accessing the Redfish API" +HOMEPAGE="https://github.com/DMTF/Redfishtool" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +RDEPEND=" + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] +" diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest index 2dcb999931ce..b8434950c777 100644 --- a/app-admin/restart-services/Manifest +++ b/app-admin/restart-services/Manifest @@ -1 +1,3 @@ DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c00482c8297b7fee634f302f09cfa09e206bcf9d5a558d2a91e5de1d97318025fa995fbc3a61f0d0e74b8dfb1af3db8670b SHA512 c11ca431fbbc6899ab268e8979049144448479d953ed7373cc7483cca2c03cd4041a1ca1e47c0e810f91a18a43aa32cc305a4ea791e8b992246f972e0fbb19ab +DIST restart-services-1.2.tgz 27526 BLAKE2B 3936a4145767f917d4f1c856c65ee2b6445b495988e77ada488ff4b43d87abaaca7b9d59e48c89c59a666559d0416d5cf1a6171c5d903ee0385dabb922929882 SHA512 815fb40c4616afaf2e27877a4cbba86c0d44432cbf4be04991431e71f5e495dcb92f66bda020dca47d5363388455fbeaa3f3e35d2e9451785301386c73f724c0 +DIST restart-services-1.3.tgz 27740 BLAKE2B b49fce16771c055aa93b8ac55f5eb37af18cc66b3c63152c276a34b6e8b6e953af651d190e167f036c003d9d615727b3efb382c9e770d55a8885974e9158a750 SHA512 1f45d333be5d342d2bc206380c1fbe4713d2e02d17547b7c9e648ee7be568900042b7e240c16e8d018020ecefd018a5564268c57a32fe3d9f2f660fc062bc45a diff --git a/app-admin/restart-services/restart-services-0.17.0.ebuild b/app-admin/restart-services/restart-services-0.17.0-r1.ebuild index 5faa3c0459de..aee74d1cc63c 100644 --- a/app-admin/restart-services/restart-services-0.17.0.ebuild +++ b/app-admin/restart-services/restart-services-0.17.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted" HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/" @@ -10,13 +10,11 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" -IUSE="" -DEPEND="" RDEPEND=" app-admin/lib_users - || ( sys-apps/openrc sys-apps/systemd ) app-portage/portage-utils + || ( sys-apps/openrc sys-apps/systemd ) " src_install() { @@ -27,8 +25,8 @@ src_install() { doins restart-services.conf dodoc README CHANGES - sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf - cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF + sed -i -e 's/^#include/include/' "${ED}"/etc/restart-services.conf || die + cat > "${ED}"/etc/restart-services.d/00-local.conf <<- EOF || die # You may put your local changes here or in any other *.conf file # in this directory so you can leave /etc/restart-services.conf as is. # Example: @@ -38,26 +36,26 @@ src_install() { } pkg_postinst() { - local MAJOR MINOR # migrate config data for versions < 0.13.2 - if [[ $REPLACING_VERSIONS ]]; then - MAJOR=${REPLACING_VERSIONS%%.*} - MINOR=${REPLACING_VERSIONS%.*} - MINOR=${MINOR#*.} + if [[ -n ${REPLACING_VERSIONS} ]]; then - if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then - einfo "Checking for old config" + if [[ $(ver_cut 1 ${REPLACING_VERSIONS}) -eq 0 ]] \ + && [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 14 ]]; then + local have_old_config=0 + ebegin "Checking for old config" if [[ -f /etc/restart_services.conf ]]; then + have_old_config=1 ewarn "Old config file found: /etc/restart_services.conf" ewarn "It will be ignored so please migrate settings to a file in" ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf" fi if [[ -d /etc/restart_services.d ]]; then + have_old_config=1 ewarn "Old config directory found: /etc/restart_services.d" ewarn "It will be ignored so please migrate files to /etc/restart-services.d" ewarn "and/or remove /etc/restart_services.d" fi - einfo "done" + eend ${have_old_config} fi fi } diff --git a/app-admin/restart-services/restart-services-1.2.ebuild b/app-admin/restart-services/restart-services-1.2.ebuild new file mode 100644 index 000000000000..10daef1472d7 --- /dev/null +++ b/app-admin/restart-services/restart-services-1.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted" +HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/" +SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + app-admin/lib_users + app-portage/portage-utils + || ( sys-apps/openrc sys-apps/systemd ) +" + +src_install() { + dosbin restart-services + doman restart-services.1 + keepdir /etc/restart-services.d + insinto /etc + doins restart-services.conf + dodoc README CHANGES + + sed -i -e 's/^#include/include/' "${ED}"/etc/restart-services.conf || die + cat > "${ED}"/etc/restart-services.d/00-local.conf <<- EOF || die + # You may put your local changes here or in any other *.conf file + # in this directory so you can leave /etc/restart-services.conf as is. + # Example: + # *extend* SV_ALWAYS to match 'myservice' + # SV_ALWAYS+=( myservice ) + EOF +} diff --git a/app-admin/restart-services/restart-services-1.3.ebuild b/app-admin/restart-services/restart-services-1.3.ebuild new file mode 100644 index 000000000000..10daef1472d7 --- /dev/null +++ b/app-admin/restart-services/restart-services-1.3.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted" +HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/" +SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + app-admin/lib_users + app-portage/portage-utils + || ( sys-apps/openrc sys-apps/systemd ) +" + +src_install() { + dosbin restart-services + doman restart-services.1 + keepdir /etc/restart-services.d + insinto /etc + doins restart-services.conf + dodoc README CHANGES + + sed -i -e 's/^#include/include/' "${ED}"/etc/restart-services.conf || die + cat > "${ED}"/etc/restart-services.d/00-local.conf <<- EOF || die + # You may put your local changes here or in any other *.conf file + # in this directory so you can leave /etc/restart-services.conf as is. + # Example: + # *extend* SV_ALWAYS to match 'myservice' + # SV_ALWAYS+=( myservice ) + EOF +} diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest index d3f9f9a6da8c..4ec16dbe7b4d 100644 --- a/app-admin/rex/Manifest +++ b/app-admin/rex/Manifest @@ -1,3 +1 @@ -DIST Rex-1.13.3.tar.gz 349550 BLAKE2B c2ccc2144e56761d33ed2b5d790febd49863639d2e3bba8028b7937b43eb51e7e59e9e99cb1d67f247b2dff8ef91aa04776afd6277ad8a2370f35d71e0b528dd SHA512 beab22aef8ba620b6e74847698eab99977844d2e9632812a9ae0e1ee303cbe4e5a6489000bd5209d76e42e3bb4bb799a90408ed6fb14e034f68132a4d37766dc -DIST Rex-1.13.4.tar.gz 351011 BLAKE2B ec046b88f4443b03c05efbabb40900085293c61dab0ee9818a8c4d05be3cc0a1c1f53738b72cc245aaa2dfbcb00541f0e1e31b0c20f2464e9fc6586ed10707ef SHA512 27b76f4b527b42ea0b06dc1de05254dbd6e2fa3bc9a8a708af7557789ef22aec374a5d0585bf3ec4ee878a5387d51b881cf95855dbd05149b7b23929de12027d -DIST Rex-1.14.1.tar.gz 354512 BLAKE2B e82248fa58b10e92f2256c57b589e8db6fc61a03532eac00a28431f2527b4a7e5fdaebbf4a0bdbdfa5b775be95826fb26fa831b58ecf354d6758f5a26649dc32 SHA512 c3cb3e64fb443858a47fbf0afabc9e57ca0a7646447ea259c109a5385a57b4347664dde23575e529afa17881f400bd1735994793362aa101519747805153cb75 +DIST Rex-1.14.3.tar.gz 377627 BLAKE2B 40285856b42488f8b557ee2621c3c4ba1019b014d93e3d2e05c09590cb9d1cfa2738e3588aa8cb102ceb3c645cf5aa8113c279a18e23636ad80db09db0825d19 SHA512 7a64221b76f6949f2c5176adc86af9acaff80e9745ad19bc54ffc93d9542bb3c5250d4c511250a0917afb58b92d7a2cf2b24f6915331237c4e2635a760230b70 diff --git a/app-admin/rex/rex-1.13.3.ebuild b/app-admin/rex/rex-1.13.3.ebuild deleted file mode 100644 index e0bfb6a838a7..000000000000 --- a/app-admin/rex/rex-1.13.3.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == 9999 ]]; then - GITHUB_USER=RexOps - GITHUB_REPO=Rex - EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git" - EGIT_BRANCH="master" - EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git" - VCS_ECLASS="git-r3" -else - # This is intentional to stop perl-module.eclass doing magic things when it - # shouldn't. Like making ${S} contain "Rex" when the git clone has "rex" - # Also prevents perl-module.eclass provisioning SRC_URI - DIST_AUTHOR=FERKI - DIST_NAME=Rex - KEYWORDS="~amd64 ~x86" -fi -inherit bash-completion-r1 perl-module ${VCS_ECLASS} - -DESCRIPTION="(R)?ex, the friendly automation framework" -HOMEPAGE="https://metacpan.org/dist/Rex https://www.rexify.org" - -SLOT="0" -IUSE="minimal test" -RESTRICT="!test? ( test )" - -DZIL_DEPENDS=" - dev-perl/Dist-Zilla - dev-perl/Dist-Zilla-Plugin-CheckExtraTests - dev-perl/Dist-Zilla-Plugin-ContributorsFile - dev-perl/Dist-Zilla-Plugin-Git - dev-perl/Dist-Zilla-Plugin-Git-Contributors - dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome - dev-perl/Dist-Zilla-Plugin-Meta-Contributors - dev-perl/Dist-Zilla-Plugin-MetaProvides-Package - dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic - dev-perl/Dist-Zilla-Plugin-OSPrereqs - dev-perl/Dist-Zilla-Plugin-OurPkgVersion - dev-perl/Dist-Zilla-Plugin-Run - dev-perl/Software-License -" -RDEPEND=" - !minimal? ( - dev-perl/DBI - dev-perl/Expect - dev-perl/IPC-Shareable - dev-perl/XML-LibXML - ) - virtual/perl-Carp - virtual/perl-Data-Dumper - dev-perl/Data-Validate-IP - dev-perl/Devel-Caller - dev-perl/Digest-HMAC - virtual/perl-Digest-MD5 - virtual/perl-Exporter - virtual/perl-File-Spec - dev-perl/HTTP-Message - dev-perl/Hash-Merge - virtual/perl-IO - dev-perl/IO-String - dev-perl/IO-Tty - dev-perl/JSON-MaybeXS - virtual/perl-MIME-Base64 - dev-perl/Net-OpenSSH - dev-perl/Net-SFTP-Foreign - >=virtual/perl-Scalar-List-Utils-1.450.0 - dev-perl/Parallel-ForkManager - dev-perl/Sort-Naturally - dev-perl/String-Escape - virtual/perl-Storable - dev-perl/TermReadKey - virtual/perl-Test-Simple - dev-perl/Text-Glob - virtual/perl-Text-Tabs+Wrap - virtual/perl-Time-HiRes - dev-perl/URI - dev-perl/XML-Simple - dev-perl/libwww-perl - dev-perl/YAML - virtual/perl-version -" -# NB: would add test? !minimal? Test-mysqld, but I can't get that to work -BDEPEND=" - ${RDEPEND} - >=virtual/perl-CPAN-Meta-Requirements-2.120.620 - >=virtual/perl-ExtUtils-MakeMaker-7.110.100 - >=dev-perl/File-ShareDir-Install-0.60.0 - virtual/perl-Module-Metadata - test? ( - !minimal? ( - dev-perl/File-LibMagic - ) - virtual/perl-File-Temp - dev-perl/Test-Deep - dev-perl/Test-Output - dev-perl/Test-UseAllModules - virtual/perl-autodie - ) -" - -[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - "${VCS_ECLASS}"_src_unpack - mkdir -p "${S}" || die "Can't make ${S}" - else - default - fi -} - -dzil_src_prep() { - einfo "Patching dist.ini" - - # This block of sed invocations removes all plugins that aren't - # useful for users to have on Gentoo, because all of them are - # conditional and subjective style checks, which don't indicate - # a real issue for users, and paying the price of their dependencies is undesired. - - # The {N;d} trick adds the [n]ext line after the match to the pattern-space - # so that the final [d]elete deletes the next line too. Can be expanded for each - # line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match. - sed -e '/^\[Test::Kwalitee\]/d' \ - -e '/^\[PodSyntaxTests\]/d' \ - -e '/^Perl::Critic::Freenode =/d' \ - -e '/^Perl::Critic::TooMuchCode =/d' \ - -e '/^Test::Kwalitee =/d' \ - -e '/^Test::PerlTidy =/d' \ - -e '/^Test::Pod =/d' \ - -e '/^\[Test::CPAN::Changes\]/{N;d}' \ - -e '/^\[OptionalFeature/,/^$/d' \ - -e '/^\[Test::MinimumVersion\]/{N;d}' \ - -i dist.ini || die "Can't patch dist.ini" - - # Removals/additions have to be tracked by git or dzil build fails - # Spurious warning during src_prepare - git rm -f xt/author/critic-progressive.t || die "Can't rm author/critic-progressive.t" - # Spurious warning during src_prepare - git rm -f xt/author/perltidy.t || die "Can't rm author/perltidy.t" -} -dzil_env_setup() { - # NextRelease noise :( - mkdir -p ~/.dzil/ || die "mkdir -p ~/.dzil/ failed" - local user="$(whoami)" - local host="$(hostname)" - printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini - -} -dzil_to_distdir() { - local dzil_root dest has_missing modname dzil_version - dzil_root="$1" - dest="$2" - - cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'"; - - S="${dzil_root}" dzil_src_prep - dzil_env_setup - - dzil_version="$(dzil version)" || die "Error invoking 'dzil version'" - einfo "Generating CPAN dist with ${dzil_version}" - - has_missing="" - - einfo "Checking dzil authordeps" - while IFS= read -d $'\n' -r modname; do - if [[ -z "${has_missing}" ]]; then - has_missing=1 - eerror "'dzil authordeps' indicates missing build dependencies" - eerror "These will prevent building, please report a bug" - eerror "Missing:" - fi - eerror " ${modname}" - done < <( dzil authordeps --missing --versions ) - - [[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first" - - einfo "Checking dzil build deps" - while IFS= read -d $'\n' -r modname; do - if [[ -z "${has_missing}" ]]; then - has_missing=1 - ewarn "'dzil listdeps' indicates missing build dependencies" - ewarn "These may prevent building, please report a bug if they do" - ewarn "Missing:" - fi - ewarn " ${modname}" - done < <( dzil listdeps --missing --versions --author ) - - einfo "Generating release" - dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'" -} - -src_prepare() { - if [[ ${PV} == 9999 ]]; then - # Uses git sources in WORKDIR/rex-git - # to generate a CPAN-style tree in ${S} - # before letting perl-module.eclass do the rest - dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}" - fi - cd "${S}" || die "Can't enter build dir" - - # If you DIY installed Test::mysqld, but didn't patch - # it to handle the fact on Gentoo, mysql_install_db is NOT in PATH - # tests fail. So this test is patched out if mysql_install_db is not in PATH - if perl_has_module "Test::mysqld" && ! type -P mysql_install_db >/dev/null; then - perl_rm_files "t/db.t" - fi - perl-module_src_prepare -} - -src_install() { - newbashcomp "share/${PN}-tab-completion.bash" "${PN}" - - insinto /usr/share/zsh/site-functions - newins "share/${PN}-tab-completion.zsh" "_${PN}" - - perl-module_src_install -} diff --git a/app-admin/rex/rex-1.13.4.ebuild b/app-admin/rex/rex-1.13.4.ebuild deleted file mode 100644 index e0bfb6a838a7..000000000000 --- a/app-admin/rex/rex-1.13.4.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == 9999 ]]; then - GITHUB_USER=RexOps - GITHUB_REPO=Rex - EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git" - EGIT_BRANCH="master" - EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git" - VCS_ECLASS="git-r3" -else - # This is intentional to stop perl-module.eclass doing magic things when it - # shouldn't. Like making ${S} contain "Rex" when the git clone has "rex" - # Also prevents perl-module.eclass provisioning SRC_URI - DIST_AUTHOR=FERKI - DIST_NAME=Rex - KEYWORDS="~amd64 ~x86" -fi -inherit bash-completion-r1 perl-module ${VCS_ECLASS} - -DESCRIPTION="(R)?ex, the friendly automation framework" -HOMEPAGE="https://metacpan.org/dist/Rex https://www.rexify.org" - -SLOT="0" -IUSE="minimal test" -RESTRICT="!test? ( test )" - -DZIL_DEPENDS=" - dev-perl/Dist-Zilla - dev-perl/Dist-Zilla-Plugin-CheckExtraTests - dev-perl/Dist-Zilla-Plugin-ContributorsFile - dev-perl/Dist-Zilla-Plugin-Git - dev-perl/Dist-Zilla-Plugin-Git-Contributors - dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome - dev-perl/Dist-Zilla-Plugin-Meta-Contributors - dev-perl/Dist-Zilla-Plugin-MetaProvides-Package - dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic - dev-perl/Dist-Zilla-Plugin-OSPrereqs - dev-perl/Dist-Zilla-Plugin-OurPkgVersion - dev-perl/Dist-Zilla-Plugin-Run - dev-perl/Software-License -" -RDEPEND=" - !minimal? ( - dev-perl/DBI - dev-perl/Expect - dev-perl/IPC-Shareable - dev-perl/XML-LibXML - ) - virtual/perl-Carp - virtual/perl-Data-Dumper - dev-perl/Data-Validate-IP - dev-perl/Devel-Caller - dev-perl/Digest-HMAC - virtual/perl-Digest-MD5 - virtual/perl-Exporter - virtual/perl-File-Spec - dev-perl/HTTP-Message - dev-perl/Hash-Merge - virtual/perl-IO - dev-perl/IO-String - dev-perl/IO-Tty - dev-perl/JSON-MaybeXS - virtual/perl-MIME-Base64 - dev-perl/Net-OpenSSH - dev-perl/Net-SFTP-Foreign - >=virtual/perl-Scalar-List-Utils-1.450.0 - dev-perl/Parallel-ForkManager - dev-perl/Sort-Naturally - dev-perl/String-Escape - virtual/perl-Storable - dev-perl/TermReadKey - virtual/perl-Test-Simple - dev-perl/Text-Glob - virtual/perl-Text-Tabs+Wrap - virtual/perl-Time-HiRes - dev-perl/URI - dev-perl/XML-Simple - dev-perl/libwww-perl - dev-perl/YAML - virtual/perl-version -" -# NB: would add test? !minimal? Test-mysqld, but I can't get that to work -BDEPEND=" - ${RDEPEND} - >=virtual/perl-CPAN-Meta-Requirements-2.120.620 - >=virtual/perl-ExtUtils-MakeMaker-7.110.100 - >=dev-perl/File-ShareDir-Install-0.60.0 - virtual/perl-Module-Metadata - test? ( - !minimal? ( - dev-perl/File-LibMagic - ) - virtual/perl-File-Temp - dev-perl/Test-Deep - dev-perl/Test-Output - dev-perl/Test-UseAllModules - virtual/perl-autodie - ) -" - -[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - "${VCS_ECLASS}"_src_unpack - mkdir -p "${S}" || die "Can't make ${S}" - else - default - fi -} - -dzil_src_prep() { - einfo "Patching dist.ini" - - # This block of sed invocations removes all plugins that aren't - # useful for users to have on Gentoo, because all of them are - # conditional and subjective style checks, which don't indicate - # a real issue for users, and paying the price of their dependencies is undesired. - - # The {N;d} trick adds the [n]ext line after the match to the pattern-space - # so that the final [d]elete deletes the next line too. Can be expanded for each - # line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match. - sed -e '/^\[Test::Kwalitee\]/d' \ - -e '/^\[PodSyntaxTests\]/d' \ - -e '/^Perl::Critic::Freenode =/d' \ - -e '/^Perl::Critic::TooMuchCode =/d' \ - -e '/^Test::Kwalitee =/d' \ - -e '/^Test::PerlTidy =/d' \ - -e '/^Test::Pod =/d' \ - -e '/^\[Test::CPAN::Changes\]/{N;d}' \ - -e '/^\[OptionalFeature/,/^$/d' \ - -e '/^\[Test::MinimumVersion\]/{N;d}' \ - -i dist.ini || die "Can't patch dist.ini" - - # Removals/additions have to be tracked by git or dzil build fails - # Spurious warning during src_prepare - git rm -f xt/author/critic-progressive.t || die "Can't rm author/critic-progressive.t" - # Spurious warning during src_prepare - git rm -f xt/author/perltidy.t || die "Can't rm author/perltidy.t" -} -dzil_env_setup() { - # NextRelease noise :( - mkdir -p ~/.dzil/ || die "mkdir -p ~/.dzil/ failed" - local user="$(whoami)" - local host="$(hostname)" - printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini - -} -dzil_to_distdir() { - local dzil_root dest has_missing modname dzil_version - dzil_root="$1" - dest="$2" - - cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'"; - - S="${dzil_root}" dzil_src_prep - dzil_env_setup - - dzil_version="$(dzil version)" || die "Error invoking 'dzil version'" - einfo "Generating CPAN dist with ${dzil_version}" - - has_missing="" - - einfo "Checking dzil authordeps" - while IFS= read -d $'\n' -r modname; do - if [[ -z "${has_missing}" ]]; then - has_missing=1 - eerror "'dzil authordeps' indicates missing build dependencies" - eerror "These will prevent building, please report a bug" - eerror "Missing:" - fi - eerror " ${modname}" - done < <( dzil authordeps --missing --versions ) - - [[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first" - - einfo "Checking dzil build deps" - while IFS= read -d $'\n' -r modname; do - if [[ -z "${has_missing}" ]]; then - has_missing=1 - ewarn "'dzil listdeps' indicates missing build dependencies" - ewarn "These may prevent building, please report a bug if they do" - ewarn "Missing:" - fi - ewarn " ${modname}" - done < <( dzil listdeps --missing --versions --author ) - - einfo "Generating release" - dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'" -} - -src_prepare() { - if [[ ${PV} == 9999 ]]; then - # Uses git sources in WORKDIR/rex-git - # to generate a CPAN-style tree in ${S} - # before letting perl-module.eclass do the rest - dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}" - fi - cd "${S}" || die "Can't enter build dir" - - # If you DIY installed Test::mysqld, but didn't patch - # it to handle the fact on Gentoo, mysql_install_db is NOT in PATH - # tests fail. So this test is patched out if mysql_install_db is not in PATH - if perl_has_module "Test::mysqld" && ! type -P mysql_install_db >/dev/null; then - perl_rm_files "t/db.t" - fi - perl-module_src_prepare -} - -src_install() { - newbashcomp "share/${PN}-tab-completion.bash" "${PN}" - - insinto /usr/share/zsh/site-functions - newins "share/${PN}-tab-completion.zsh" "_${PN}" - - perl-module_src_install -} diff --git a/app-admin/rex/rex-1.14.1.ebuild b/app-admin/rex/rex-1.14.3.ebuild index c6c604f1e599..1b5ca9f0db12 100644 --- a/app-admin/rex/rex-1.14.1.ebuild +++ b/app-admin/rex/rex-1.14.3.ebuild @@ -48,6 +48,7 @@ RDEPEND=" dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML + net-misc/rsync ) virtual/perl-Carp virtual/perl-Data-Dumper @@ -92,7 +93,8 @@ BDEPEND=" virtual/perl-Module-Metadata test? ( !minimal? ( - dev-perl/File-LibMagic + || ( dev-perl/File-LibMagic sys-apps/file ) + dev-vcs/git ) virtual/perl-File-Temp dev-perl/Sub-Override diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild index c6c604f1e599..1b5ca9f0db12 100644 --- a/app-admin/rex/rex-9999.ebuild +++ b/app-admin/rex/rex-9999.ebuild @@ -48,6 +48,7 @@ RDEPEND=" dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML + net-misc/rsync ) virtual/perl-Carp virtual/perl-Data-Dumper @@ -92,7 +93,8 @@ BDEPEND=" virtual/perl-Module-Metadata test? ( !minimal? ( - dev-perl/File-LibMagic + || ( dev-perl/File-LibMagic sys-apps/file ) + dev-vcs/git ) virtual/perl-File-Temp dev-perl/Sub-Override diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 62ea15a0f00b..2d4f225b28ee 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,10 +1,6 @@ -DIST rsyslog-8.2206.0.tar.gz 3246829 BLAKE2B cfe88f12821146011914610e33cb907bd96f19b6e67c0eb3f9bd88b749eebd3a91ae27e445688842a806719cfe9757778d3f9705cd2d6a497d358015c9ddf36b SHA512 000d2a05ef4823879e615a347f62f76d3af7d43cddb119e7f57a8470aade00139475368579385ba008a1d5979082128ef6148e0fac2478f6e0ccb26e68d317b7 -DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73 -DIST rsyslog-8.2210.0.tar.gz 3266727 BLAKE2B fc94e7d9b7d828c35e6117ff44d40aa421b79ecd9072cc143177cb77ac6e84adaa5e2b9ae9a66e4bb70d8b93411715f63f0e3707e53c965ef892d9146ec43c92 SHA512 c665b7f7a3c5ef31c9b62b50f815cfbb52db0cbe4a06934f4f1c3cd2a56fb49c319d33857ee92ab843aa5894cac16c16b8eccdf83714f31ab57a95049c4af231 -DIST rsyslog-8.2212.0.tar.gz 3268012 BLAKE2B 72347c8281ce537cade415b73a5f15b80ad035ccf9091bcbb72952da32790064a8dd88416d3b7682e6fb77f23dbd51cb2b596587498d4cbccedf21c41c2c6305 SHA512 ca8c3d4c035f9dd5fb6b2d27c66f5e3211458cb1afbf2a73d3e268424a40e3e8746499d7db2e313cf2833f2f73640eb79924770198fb3009ef5461479cf80d15 -DIST rsyslog-8.2302.0.tar.gz 3273655 BLAKE2B 41ab639dcc93e325b6e092bc7c2c8fa60ce6192ec20033665930573ed5944af5830fc91aa3e607501c2b4759775efcd55631f82096e18ff1df67f00c3e956d6b SHA512 ebdf179c320425a137d1d20eef15163b342165435879e55531aa0dd9ae459fa35266696cc80fecae63a7e1eef31be51ba4154360e5dbe3c00471a84883c03168 -DIST rsyslog-doc-8.2206.0.tar.gz 6553532 BLAKE2B 51288f5e819393ad6b5af1acfa030b262c1a97c9cc791606c16792201eb8f7bbc9750bb004e7592a99fa1261b971911a6c2bbe6c0b82a6c3bb067b077ce22641 SHA512 23d686241bb6422146602420e21a53208ff82f39f76258d7147dc0b5c06863f8229e1e2df06bfcae63408d06e70b68f7a0b0d216671b78302527d436091a698a -DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0 -DIST rsyslog-doc-8.2210.0.tar.gz 6572454 BLAKE2B feb865e3585ee441117f38de61748a6ca99767dae113cfcf2cd0d0a124cc692889be713134163fc91f4ab43b9fe530e3c7c0b84e4bd4e70081c4539297ae1406 SHA512 e7847a9307a91fdf87d6cf91d2391eb75869679905b9598310c456fb3fe1864fc06dbdc649778f5b3788e47ffda0a6d89cb894258e55db441f7df7e74b0ae9f4 -DIST rsyslog-doc-8.2212.0.tar.gz 6574799 BLAKE2B b81bef5a15c2c76a517617cb64682c663809f3308ffb2427beca180db7c91b4000fa72041ef83440134917e10ee6f4cd16ff58633d719bdb895c7316a87d8dc9 SHA512 bbecf2b9b9752f7d8a10bc3125c55e4def2a61108a65a717d7d86e7b63634e010ecd31fe40b2256611822d3dd17be20cbf9eb65efd787315723aba6b29cb3a8a -DIST rsyslog-doc-8.2302.0.tar.gz 6586882 BLAKE2B bd79d53670234df46fae79234e03bbee05129dcd5bfe36d74595ce90e91ed8efa2d32cc817dadc9634a67eab7b9e640ad686685495cff75ebb1ff16730c8e904 SHA512 b922a4ed3e7b7235aa4a00c26a45b3b9f3a092679a7ce324543eea0c59cb34ad5a0ee2cac3a37e8964a4bc059cbcc661932496c7ff5765ef4f2da19cb6d35ee2 +DIST rsyslog-8.2312.0.tar.gz 3358109 BLAKE2B 8b463c07a44efa60b6faeaa466498a2540eefc158efa759479cc6fc36acb04a718dd6ee4015f311343e6b66b6e074d5ed40db29cbcad6c71b42286a58cb92d7c SHA512 a65ca1c6fe2d9dd853d073d93cfd4d007c3533bd10c633113fcf94c4746192945ed0a2b2ff84f9174b55de90ade2a062a0bd556ffe375864fad3772ef8ce39e3 +DIST rsyslog-8.2402.0.tar.gz 3404026 BLAKE2B fc33244f0e4699d446ffab19aa8078ac49518b1722a5d7e72e57d7768ef42565bc3fa54b6c594e857715b5d5439ef675811eee888c81aadec3d1e05d5416c51e SHA512 dea9a14abc6ea25b3e5b676eda6a772c0c6266afd95eea0446ea85b29b2f98c058e1495cbdc16dba1c78d5d0919980e4fdfc13ef597082e7f3bf8b6be4cb5723 +DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1 +DIST rsyslog-doc-8.2312.0.tar.gz 6621561 BLAKE2B 2aca14d24606e3a125259cad5fa43af61da2b70ba0b1916e5496f3d4eb6a28b612287bb83c3fa610f0f367deedcec4f0b3e93a552643194fdcf552dff3d408b6 SHA512 2fe8ab0e37a6899a545c09ea2586c33ab89a3e3d93ff079f99b15e9b1743423bbe54931684ba8509ed4f578a4b55ea22f6306aca256ee2245f88115a5f44e400 +DIST rsyslog-doc-8.2402.0.tar.gz 6525910 BLAKE2B 20bc3398db00cc2a0e92b610032cb86bcf17b71b31f70a47213b608c7ea9a1a81e9aad5caa74b7f23f0a28fdab7ef3627ec89f5910d535ac1ade5408b3300939 SHA512 dfffb6138cff6121020648c7ed20cec7c881020af956295f88ea297c3198ed6dd49a7fbcb651164c6a774520391d00743a3c34c7acc5f705b668c8048c289eea +DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264 diff --git a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch deleted file mode 100644 index 4f6c6cf944b6..000000000000 --- a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards <rgerhards@adiscon.com> -Date: Thu, 20 Oct 2022 18:08:11 +0200 -Subject: [PATCH] core bugfix: local hostname invalid if no global() config - object given - -The local hostname is invalidly set to "[localhost]" on rsyslog startup -if no global() config object is present in rsyslog.conf. Sending a HUP -corrects the hostname. - -This is a regression from ba00a9f25293f - -closes https://github.com/rsyslog/rsyslog/issues/4975, -closes https://github.com/rsyslog/rsyslog/issues/4825 ---- - runtime/glbl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/runtime/glbl.c b/runtime/glbl.c -index 3a9350b903..ed9a307804 100644 ---- a/runtime/glbl.c -+++ b/runtime/glbl.c -@@ -1396,6 +1396,7 @@ glblDoneLoadCnf(void) - stddbg = -1; - } - -+finalize_it: - /* we have now read the config. We need to query the local host name now - * as it was set by the config. - * -@@ -1404,8 +1405,7 @@ glblDoneLoadCnf(void) - * are taken from that queue, the hostname will be adapted. - */ - queryLocalHostname(); -- --finalize_it: RETiRet; -+ RETiRet; - } - - diff --git a/app-admin/rsyslog/rsyslog-8.2206.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.2206.0-r2.ebuild deleted file mode 100644 index 1b15762cfb81..000000000000 --- a/app-admin/rsyslog/rsyslog-8.2206.0-r2.ebuild +++ /dev/null @@ -1,495 +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 autotools linux-info python-any-r1 systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 x86" - - SRC_URI=" - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) - " -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" - -IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" -IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" -IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" -IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" -IUSE+=" systemd test usertools +uuid xxhash zeromq" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - kubernetes? ( normalize ) - ssl? ( || ( gnutls openssl ) ) -" - -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 - sys-apps/lsb-release - virtual/pkgconfig - test? ( - jemalloc? ( <sys-libs/libfaketime-0.9.7 ) - !jemalloc? ( sys-libs/libfaketime ) - ${PYTHON_DEPS} - )" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.8:= - >=dev-libs/libestr-0.1.9 - >=sys-libs/zlib-1.2.5 - curl? ( >=net-misc/curl-7.35.0 ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - imhttp? ( - dev-libs/apr-util - www-servers/civetweb - virtual/libcrypt:= - ) - impcap? ( net-libs/libpcap ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - kubernetes? ( >=net-misc/curl-7.35.0 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( dev-db/mysql-connector-c:= ) - normalize? ( - >=dev-libs/liblognorm-2.0.3:= - ) - clickhouse? ( >=net-misc/curl-7.35.0 ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( - >=dev-libs/hiredis-0.11.0:= - dev-libs/libevent[threads(+)] - ) - relp? ( >=dev-libs/librelp-1.2.17:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - >=dev-libs/openssl-0.9.8y:0= - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23:0= ) - openssl? ( - dev-libs/openssl:0= - ) - ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - xxhash? ( dev-libs/xxhash:= ) - zeromq? ( - >=net-libs/czmq-4:=[drafts] - )" - -DEPEND=" - ${RDEPEND} - elibc_musl? ( sys-libs/queue-standalone ) -" - -if [[ ${PV} == "9999" ]]; then - BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" - BDEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz - fi - fi -} - -src_prepare() { - default - - # https://github.com/rsyslog/rsyslog/issues/3626 - sed -i \ - -e '\|^#!/bin/bash$|a exit 77' \ - tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - --disable-liblogging-stdlog - $(use_enable test testbench) - $(use_enable test libfaketime) - $(use_enable test extended-tests) - # Input Plugins without dependencies - --enable-imbatchreport - --enable-imdiag - --enable-imdocker - --enable-imfile - --enable-improg - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without dependencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmtaghostname - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-fmhash - --enable-fmunflatten - $(use_enable xxhash fmhash-xxhash) - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmdb2diag - --enable-pmlastmsg - $(use_enable normalize pmnormalize) - --enable-pmnull - --enable-pmpanngfw - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis imhiredis) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug valgrind) - # Misc - $(use_enable clickhouse) - $(use_enable curl fmhttp) - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable imhttp) - $(use_enable impcap) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable kubernetes mmkubernetes) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable omhttp) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable gnutls) - $(use_enable openssl) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} - - systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/${PN}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/${PN}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - if ! hash certtool &>/dev/null; then - die "certtool not found! Is net-libs/gnutls[tools] is installed?" - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.2302.0.ebuild b/app-admin/rsyslog/rsyslog-8.2302.0.ebuild deleted file mode 100644 index 0d3d01886462..000000000000 --- a/app-admin/rsyslog/rsyslog-8.2302.0.ebuild +++ /dev/null @@ -1,496 +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 autotools linux-info python-any-r1 systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86" - - SRC_URI=" - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) - " -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" - -IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" -IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" -IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" -IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" -IUSE+=" systemd test usertools +uuid xxhash zeromq" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - kubernetes? ( normalize ) - ssl? ( || ( gnutls openssl ) ) -" - -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 - sys-apps/lsb-release - virtual/pkgconfig - test? ( - jemalloc? ( <sys-libs/libfaketime-0.9.7 ) - !jemalloc? ( sys-libs/libfaketime ) - ${PYTHON_DEPS} - )" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.8:= - >=dev-libs/libestr-0.1.9 - >=sys-libs/zlib-1.2.5 - curl? ( >=net-misc/curl-7.35.0 ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - imhttp? ( - dev-libs/apr-util - www-servers/civetweb - virtual/libcrypt:= - ) - impcap? ( net-libs/libpcap ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - kubernetes? ( >=net-misc/curl-7.35.0 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( dev-db/mysql-connector-c:= ) - normalize? ( - >=dev-libs/liblognorm-2.0.3:= - ) - clickhouse? ( >=net-misc/curl-7.35.0 ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( - >=dev-libs/hiredis-0.11.0:= - dev-libs/libevent[threads(+)] - ) - relp? ( >=dev-libs/librelp-1.2.17:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - >=dev-libs/openssl-0.9.8y:0= - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23:0= ) - openssl? ( - dev-libs/openssl:0= - ) - ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - xxhash? ( dev-libs/xxhash:= ) - zeromq? ( - >=net-libs/czmq-4:=[drafts] - )" - -DEPEND=" - ${RDEPEND} - elibc_musl? ( sys-libs/queue-standalone ) -" - -if [[ ${PV} == "9999" ]]; then - BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" - BDEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz - fi - fi -} - -src_prepare() { - default - - # https://github.com/rsyslog/rsyslog/issues/3626 - sed -i \ - -e '\|^#!/bin/bash$|a exit 77' \ - tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - --disable-liblogging-stdlog - --disable-imfile-tests # Some imfile tests fail (noticed in version 8.2208.0) - $(use_enable test testbench) - $(use_enable test libfaketime) - $(use_enable test extended-tests) - # Input Plugins without dependencies - --enable-imbatchreport - --enable-imdiag - --enable-imdocker - --enable-imfile - --enable-improg - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without dependencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmtaghostname - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-fmhash - --enable-fmunflatten - $(use_enable xxhash fmhash-xxhash) - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmdb2diag - --enable-pmlastmsg - $(use_enable normalize pmnormalize) - --enable-pmnull - --enable-pmpanngfw - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis imhiredis) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug valgrind) - # Misc - $(use_enable clickhouse) - $(use_enable curl fmhttp) - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable imhttp) - $(use_enable impcap) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable kubernetes mmkubernetes) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable omhttp) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable gnutls) - $(use_enable openssl) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} - - systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/${PN}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/${PN}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - if ! hash certtool &>/dev/null; then - die "certtool not found! Is net-libs/gnutls[tools] is installed?" - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.2208.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.2312.0.ebuild index ad15bf7f10b5..166eeab07c63 100644 --- a/app-admin/rsyslog/rsyslog-8.2208.0-r2.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2312.0.ebuild @@ -1,28 +1,27 @@ -# 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 autotools linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" HOMEPAGE="https://www.rsyslog.com/" -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" inherit git-r3 else - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" - SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) " + + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -41,7 +40,7 @@ REQUIRED_USE=" ssl? ( || ( gnutls openssl ) ) " -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 +BDEPEND=">=dev-build/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( @@ -107,36 +106,37 @@ DEPEND=" elibc_musl? ( sys-libs/queue-standalone ) " -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" + BDEPEND+=" >=app-alternatives/lex-2.5.39-r1" + BDEPEND+=" >=app-alternatives/yacc-2.4.3" BDEPEND+=" >=dev-python/docutils-0.12" fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" -PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) +PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" ) pkg_setup() { use test && python-any-r1_pkg_setup } src_unpack() { - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then git-r3_fetch git-r3_checkout else - unpack ${P}.tar.gz + unpack "${P}.tar.gz" fi if use doc; then - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then local _EGIT_BRANCH= if [[ -n "${EGIT_BRANCH}" ]]; then # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} + _EGIT_BRANCH="${EGIT_BRANCH}" + unset EGIT_BRANCH fi @@ -151,6 +151,7 @@ src_unpack() { cd "${S}" || die "Cannot change dir into '${S}'" mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" + unpack ${PN}-doc-${PV}.tar.gz fi fi @@ -159,11 +160,21 @@ src_unpack() { src_prepare() { default - # https://github.com/rsyslog/rsyslog/issues/3626 + # Bug: https://github.com/rsyslog/rsyslog/issues/3626 sed -i \ -e '\|^#!/bin/bash$|a exit 77' \ tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" + || die "Failed to disable known test failure mmkubernetes-cache-expir*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/omprog-close-unresponsive*.sh \ + || die "Failed to disable test omprog-close-unresponsive*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/uxsock_simple.sh \ + || die "Failed to disable test uxsock_simple.sh" eautoreconf } diff --git a/app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.2402.0.ebuild index bad48a9477b4..254da55994a5 100644 --- a/app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2402.0.ebuild @@ -1,28 +1,30 @@ -# 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 autotools linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/ + https://github.com/rsyslog/rsyslog/" -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" inherit git-r3 else - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" - SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + doc? ( + https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz + ) " + + KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -41,7 +43,7 @@ REQUIRED_USE=" ssl? ( || ( gnutls openssl ) ) " -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 +BDEPEND=">=dev-build/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( @@ -107,39 +109,37 @@ DEPEND=" elibc_musl? ( sys-libs/queue-standalone ) " -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" + BDEPEND+=" >=app-alternatives/lex-2.5.39-r1" + BDEPEND+=" >=app-alternatives/yacc-2.4.3" BDEPEND+=" >=dev-python/docutils-0.12" fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" -PATCHES=( - "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch - "${FILESDIR}"/${P}-5004-hostname.patch -) +PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" ) pkg_setup() { use test && python-any-r1_pkg_setup } src_unpack() { - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then git-r3_fetch git-r3_checkout else - unpack ${P}.tar.gz + unpack "${P}.tar.gz" fi if use doc; then - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then local _EGIT_BRANCH= if [[ -n "${EGIT_BRANCH}" ]]; then # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} + _EGIT_BRANCH="${EGIT_BRANCH}" + unset EGIT_BRANCH fi @@ -154,7 +154,8 @@ src_unpack() { cd "${S}" || die "Cannot change dir into '${S}'" mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz + + unpack "${PN}-doc-${PV}.tar.gz" fi fi } @@ -162,11 +163,21 @@ src_unpack() { src_prepare() { default - # https://github.com/rsyslog/rsyslog/issues/3626 + # Bug: https://github.com/rsyslog/rsyslog/issues/3626 sed -i \ -e '\|^#!/bin/bash$|a exit 77' \ tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" + || die "Failed to disable known test failure mmkubernetes-cache-expir*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/omprog-close-unresponsive*.sh \ + || die "Failed to disable test omprog-close-unresponsive*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/uxsock_simple.sh \ + || die "Failed to disable test uxsock_simple.sh" eautoreconf } @@ -182,12 +193,12 @@ src_configure() { # upstream PR 129 and 136) so we need to export HIREDIS_* # variables because rsyslog's build system depends on pkg-config. - if use redis; then + if use redis ; then export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" fi - local myeconfargs=( + local -a myeconfargs=( --disable-debug-symbols --disable-generate-man-pages --without-valgrind-testbench @@ -276,7 +287,6 @@ src_configure() { $(use_enable uuid) $(use_enable zeromq imczmq) $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) econf "${myeconfargs[@]}" @@ -321,13 +331,13 @@ src_test() { } src_install() { - local DOCS=( + local -a DOCS=( AUTHORS ChangeLog "${FILESDIR}"/README.gentoo ) - use doc && local HTML_DOCS=( "${S}/docs/build/." ) + use doc && local -a HTML_DOCS=( "${S}/docs/build/." ) default @@ -400,9 +410,10 @@ pkg_postinst() { } pkg_config() { - if ! use ssl; then + if ! use ssl ; then einfo "There is nothing to configure for rsyslog unless you" einfo "used USE=ssl to build it." + return 0 fi diff --git a/app-admin/rsyslog/rsyslog-8.2212.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild index 0d3d01886462..bb01f397f550 100644 --- a/app-admin/rsyslog/rsyslog-8.2212.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild @@ -1,28 +1,30 @@ -# 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 autotools linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/ + https://github.com/rsyslog/rsyslog/" -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86" - SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + doc? ( + https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz + ) " + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -41,7 +43,7 @@ REQUIRED_USE=" ssl? ( || ( gnutls openssl ) ) " -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 +BDEPEND=">=dev-build/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( @@ -107,36 +109,37 @@ DEPEND=" elibc_musl? ( sys-libs/queue-standalone ) " -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" + BDEPEND+=" >=app-alternatives/lex-2.5.39-r1" + BDEPEND+=" >=app-alternatives/yacc-2.4.3" BDEPEND+=" >=dev-python/docutils-0.12" fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" -PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) +PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" ) pkg_setup() { use test && python-any-r1_pkg_setup } src_unpack() { - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then git-r3_fetch git-r3_checkout else - unpack ${P}.tar.gz + unpack "${P}.tar.gz" fi if use doc; then - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then local _EGIT_BRANCH= if [[ -n "${EGIT_BRANCH}" ]]; then # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} + _EGIT_BRANCH="${EGIT_BRANCH}" + unset EGIT_BRANCH fi @@ -151,7 +154,8 @@ src_unpack() { cd "${S}" || die "Cannot change dir into '${S}'" mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz + + unpack "${PN}-doc-${PV}.tar.gz" fi fi } @@ -159,11 +163,21 @@ src_unpack() { src_prepare() { default - # https://github.com/rsyslog/rsyslog/issues/3626 + # Bug: https://github.com/rsyslog/rsyslog/issues/3626 sed -i \ -e '\|^#!/bin/bash$|a exit 77' \ tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" + || die "Failed to disable known test failure mmkubernetes-cache-expir*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/omprog-close-unresponsive*.sh \ + || die "Failed to disable test omprog-close-unresponsive*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/uxsock_simple.sh \ + || die "Failed to disable test uxsock_simple.sh" eautoreconf } @@ -179,12 +193,12 @@ src_configure() { # upstream PR 129 and 136) so we need to export HIREDIS_* # variables because rsyslog's build system depends on pkg-config. - if use redis; then + if use redis ; then export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" fi - local myeconfargs=( + local -a myeconfargs=( --disable-debug-symbols --disable-generate-man-pages --without-valgrind-testbench @@ -273,7 +287,6 @@ src_configure() { $(use_enable uuid) $(use_enable zeromq imczmq) $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) econf "${myeconfargs[@]}" @@ -318,13 +331,13 @@ src_test() { } src_install() { - local DOCS=( + local -a DOCS=( AUTHORS ChangeLog "${FILESDIR}"/README.gentoo ) - use doc && local HTML_DOCS=( "${S}/docs/build/." ) + use doc && local -a HTML_DOCS=( "${S}/docs/build/." ) default @@ -397,9 +410,10 @@ pkg_postinst() { } pkg_config() { - if ! use ssl; then + if ! use ssl ; then einfo "There is nothing to configure for rsyslog unless you" einfo "used USE=ssl to build it." + return 0 fi diff --git a/app-admin/ryzen_monitor/Manifest b/app-admin/ryzen_monitor/Manifest index f45ef7417127..ee751332af82 100644 --- a/app-admin/ryzen_monitor/Manifest +++ b/app-admin/ryzen_monitor/Manifest @@ -1,2 +1,4 @@ DIST ryzen_monitor-1.0.4.tar.gz 33716 BLAKE2B f755cc946b26ea5566c1bd304f84e3a3aee80383d151ec8e702919837d04287d4b3b4000b4f9587003cb20b2be45d4af727eb941c0080772b5f94104d68f8b78 SHA512 93cb55b64db75596da88d8f1f3c5eab38cce52d7ae9bb8b7895d62d39ec0b4c0157bad3ed688c32cc0aecf09eb211614b81159a31c704a0f028751ded46723c5 DIST ryzen_monitor-1.0.5.tar.gz 37372 BLAKE2B 021b417a60a284020e7f9e96348f5e0745aede68e01c1b560e2205c4738fd504d4565bbc5b9c6824ea697a8c0a1d981722f9e6e178a8cfa9213b2e703c5f6b72 SHA512 8e1f02f59f40a3e4fe84c805a1053939a20d21e5c40223bb6b7c41716eff361b86e87fc67fd90078d3ffa9d78d2016284af5362aad2212b9cf35979427906ca8 +DIST ryzen_monitor-1.0.6_pre20220901.tar.gz 37992 BLAKE2B 550e3f4da0d5d22a503953c0746c35c2508915e7722230678943a0227a3a0f8b675a044b0e742fb4b1e77ed8abbb5b6ce5bd256e4ed4cd434076a739a761a5a2 SHA512 1f09759ef7c68c5240bbcaf756d6ed87047f452522352a47d07d7121bc21a230fd679fd4b400728919f489009b162ded050aaa8c3eb0cace15bebe9049cfdb87 +DIST ryzen_smu-v0.1.5.tar.bz2 415723 BLAKE2B 0fed89aad85a5080d4c1a6ecdaaef6ffe2b70f0cebbf58392c725f1aa626151e4b5335096bd63cf73ff29d6f5768ce6e0a844dc7030e8c1e4dc5e04990521651 SHA512 5793beae8204a16800ed876da2a07d2f477a21cef706fed6076e1dcc6e74118b7c45a330e264302d644fdb49f7c44e4fca53dc67e43b2f2a62b3b1ea4ad00d8f diff --git a/app-admin/ryzen_monitor/metadata.xml b/app-admin/ryzen_monitor/metadata.xml index 8ac26ba5990d..9b7061eac788 100644 --- a/app-admin/ryzen_monitor/metadata.xml +++ b/app-admin/ryzen_monitor/metadata.xml @@ -1,8 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> + <maintainer type="person" proxied="yes"> + <email>negril.nx+gentoo@gmail.com</email> + <name>Paul Zander</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">hattedsquirrel/ryzen_monitor</remote-id> + <remote-id type="gitlab">leogx9r/ryzen_smu</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild index 479eb87145be..5d9fb162e31b 100644 --- a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild +++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,9 +13,7 @@ HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor" SLOT="0" LICENSE="AGPL-3" -IUSE="" -DEPEND="" RDEPEND="app-admin/ryzen_smu" PATCHES=( diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5-r1.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5-r1.ebuild new file mode 100644 index 000000000000..114ebd84d7ca --- /dev/null +++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +SMU_PN="ryzen_smu" +SMU_PV="0.1.5" +inherit toolchain-funcs + +DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU" +HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor" +SRC_URI=" + https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://gitlab.com/leogx9r/${SMU_PN}/-/archive/v${SMU_PV}/${SMU_PN}-v${SMU_PV}.tar.bz2 +" + +LICENSE="AGPL-3 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-admin/ryzen_smu" + +src_unpack() { + unpack "${P}.tar.gz" "${SMU_PN}-v${SMU_PV}.tar.bz2" +} + +src_prepare() { + rm "src/lib/"* || die + cp -a "${WORKDIR}/${SMU_PN}-v${SMU_PV}/lib/libsmu."{c,h} "src/lib/" || die + + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin src/ryzen_monitor +} diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild index 459081339bb6..ca726d03e03d 100644 --- a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild +++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,9 +13,7 @@ HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor" SLOT="0" LICENSE="AGPL-3" -IUSE="" -DEPEND="" RDEPEND="app-admin/ryzen_smu" src_compile() { diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.6_pre20220901.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.6_pre20220901.ebuild new file mode 100644 index 000000000000..910c64f20721 --- /dev/null +++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.6_pre20220901.ebuild @@ -0,0 +1,43 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GIT_COMMIT="7529c7cfc2688d9781912c84adfc0343d83dc78c" +SMU_PN="ryzen_smu" +SMU_PV="0.1.5" +inherit toolchain-funcs + +DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU" +HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor" +SRC_URI=" + https://github.com/hattedsquirrel/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz + https://gitlab.com/leogx9r/${SMU_PN}/-/archive/v${SMU_PV}/${SMU_PN}-v${SMU_PV}.tar.bz2 +" + +LICENSE="AGPL-3 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-admin/ryzen_smu" + +S="${WORKDIR}/${PN}-${GIT_COMMIT}" + +src_unpack() { + unpack "${P}.tar.gz" "${SMU_PN}-v${SMU_PV}.tar.bz2" +} + +src_prepare() { + rm "src/lib/"* || die + cp -a "${WORKDIR}/${SMU_PN}-v${SMU_PV}/lib/libsmu."{c,h} "src/lib/" || die + + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin src/ryzen_monitor +} diff --git a/app-admin/ryzen_smu/Manifest b/app-admin/ryzen_smu/Manifest index b515364afb69..595450b0211e 100644 --- a/app-admin/ryzen_smu/Manifest +++ b/app-admin/ryzen_smu/Manifest @@ -1,3 +1,4 @@ DIST ryzen_smu-0.1.2.tar.gz 169644 BLAKE2B 48445c857d10077b87513d1ccaf6b94d46f6c9179f327de4309d699a17bdd6b41f956e29e324a466451fb2ed68218730c0a02a19b820909cc606eaeea85ed9ab SHA512 7a47b193c7143c3b6bcc2943f9ee895fa1184c9c14953e728cda4f6c8416bef19f0c5fa34344bc47e21101f47816961c4a5f222fd70a7d29401452f90c75ba04 DIST ryzen_smu-0.1.2_p20210627.tar.xz 151900 BLAKE2B c3845755753256aeee4e68d106e2f61c3c2578a31035eebac60d6e484f60a592de1c67574519d48cf251403cc118dd98efd030d4d7eee23f58b8f7b0d2e0ca8c SHA512 65578d8696fe3b8d002895614df72d57700fb1a5b8587fe0671a6863446fad72425400f9f6767abfdc636927132820e63b7f780fd9e88b5ab4b13668be405ed0 DIST ryzen_smu-0.1.2_p20211205.tar.xz 386260 BLAKE2B eea0466f6abd93a18c670fbbf603be7efb60807865151543341b6a0a9f248eff8a99d8ecda864bebab6e5e2471ff7239681a83ae9b3dded3b1350a7f363ee62c SHA512 93f7eaac4811ac6e3d46abeb012b1ff4e334fc9247a3747ca67489a35ea04dce20806ae2e57f46e930e5238d1d2a966e8d0b83f8bf090a735d0c2d078f3256f3 +DIST ryzen_smu-v0.1.5.tar.bz2 415723 BLAKE2B 0fed89aad85a5080d4c1a6ecdaaef6ffe2b70f0cebbf58392c725f1aa626151e4b5335096bd63cf73ff29d6f5768ce6e0a844dc7030e8c1e4dc5e04990521651 SHA512 5793beae8204a16800ed876da2a07d2f477a21cef706fed6076e1dcc6e74118b7c45a330e264302d644fdb49f7c44e4fca53dc67e43b2f2a62b3b1ea4ad00d8f diff --git a/app-admin/ryzen_smu/metadata.xml b/app-admin/ryzen_smu/metadata.xml index 8ac26ba5990d..724cb7041d8f 100644 --- a/app-admin/ryzen_smu/metadata.xml +++ b/app-admin/ryzen_smu/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> + <maintainer type="person" proxied="yes"> + <email>negril.nx+gentoo@gmail.com</email> + <name>Paul Zander</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="gitlab">leogx9r/ryzen_smu</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205-r1.ebuild b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205-r1.ebuild new file mode 100644 index 000000000000..e755b5a98fce --- /dev/null +++ b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="Kernel driver for AMD Ryzen's System Management Unit" +HOMEPAGE="https://github.com/leogx9r/ryzen_smu" +SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +src_compile() { + local modlist=( ryzen_smu ) + local modargs=( KERNEL_BUILD="${KV_OUT_DIR}" ) + + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + + insinto /usr/lib/modules-load.d + doins "${FILESDIR}"/ryzen_smu.conf +} diff --git a/app-admin/ryzen_smu/ryzen_smu-0.1.5.ebuild b/app-admin/ryzen_smu/ryzen_smu-0.1.5.ebuild new file mode 100644 index 000000000000..98aa6724dab5 --- /dev/null +++ b/app-admin/ryzen_smu/ryzen_smu-0.1.5.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="Kernel driver for AMD Ryzen's System Management Unit" +HOMEPAGE="https://gitlab.com/leogx9r/ryzen_smu" +SRC_URI="https://gitlab.com/leogx9r/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +S="${WORKDIR}/${PN}-v${PV}" + +src_compile() { + local modlist=( ryzen_smu ) + local modargs=( KERNEL_BUILD="${KV_OUT_DIR}" ) + + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + + insinto /usr/lib/modules-load.d + doins "${FILESDIR}"/ryzen_smu.conf +} diff --git a/app-admin/sagan-rules/sagan-rules-20210208.ebuild b/app-admin/sagan-rules/sagan-rules-20210208.ebuild index 2bfc68a94370..e29a6c2950eb 100644 --- a/app-admin/sagan-rules/sagan-rules-20210208.ebuild +++ b/app-admin/sagan-rules/sagan-rules-20210208.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Rules for Sagan log analyzer" -HOMEPAGE="https://quadrantsec.com/sagan_log_analysis_engine/" +HOMEPAGE="https://github.com/quadrantsec/sagan-rules" SRC_URI="https://quadrantsec.com/rules/${P}.tar.gz" S="${WORKDIR}/rules" diff --git a/app-admin/sagan-rules/sagan-rules-99999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild index b12d742ec043..61b8716315fa 100644 --- a/app-admin/sagan-rules/sagan-rules-99999999.ebuild +++ b/app-admin/sagan-rules/sagan-rules-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit git-r3 EGIT_REPO_URI="https://github.com/beave/sagan-rules.git" DESCRIPTION="Rules for Sagan log analyzer" -HOMEPAGE="https://quadrantsec.com/sagan_log_analysis_engine/" +HOMEPAGE="https://github.com/quadrantsec/sagan-rules" LICENSE="BSD" SLOT="0" diff --git a/app-admin/sagan/sagan-2.0.1-r6.ebuild b/app-admin/sagan/sagan-2.0.1-r6.ebuild index 14f8ab78fe09..0ec8735bbd45 100644 --- a/app-admin/sagan/sagan-2.0.1-r6.ebuild +++ b/app-admin/sagan/sagan-2.0.1-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit autotools flag-o-matic tmpfiles systemd DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system" -HOMEPAGE="https://sagan.quadrantsec.com/" +HOMEPAGE="https://github.com/quadrantsec/sagan" SRC_URI="https://sagan.quadrantsec.com/download/${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 9fc008112f31..779c5a6e36ea 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -1,3 +1,4 @@ -DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef -DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50 -DIST salt-3005.tar.gz 17894520 BLAKE2B 67e755bdbe772991f620d09f61836f8ccfa2039722c3281ec4cfaa8ef76e34c57e4db861cc652545e37eb965ab765f6b6ba0250407d7d7448aa5d4685ad9492a SHA512 c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18 +DIST salt-3005.5.tar.gz 17940104 BLAKE2B c7a820bc946c2cd8124fb6f559608ab1dc3cd85d6f0e7d0a2a87b7bc0dda361178e83b307c2fecd8a47d59032f85dc9f4caeef5698e98c0e349d1c6979f9f68a SHA512 1332c9751a225dbf569601eb1932fe3ebea93c8d8be7485b1b8150d5200ad2e82954c970d59ba0e888860062d059db78a50bffe69fc367bdb7b2388b62e19f32 +DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23 +DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d +DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1d6d4665b640dcc430f5a33847f231f94fd574c5d8df7b14e2854511c80610a37cd19be5429c4643be8bd9e0eb SHA512 0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b diff --git a/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch deleted file mode 100644 index 804b6a8704f0..000000000000 --- a/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py -index 6ee6aeb002..db9aeaee95 100644 ---- a/tests/unit/modules/test_boto_apigateway.py -+++ b/tests/unit/modules/test_boto_apigateway.py -@@ -154,6 +154,7 @@ def _has_required_botocore(): - return True - - -+@skipIf(True, "Causes machines to OOM") - class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): - conn = None - -@@ -190,6 +191,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): - self.addCleanup(delattr, self, "utils") - - -+@skipIf(True, "Causes machines to OOM") - class BotoApiGatewayTestCaseMixin: - def _diff_list_dicts(self, listdict1, listdict2, sortkey): - """ diff --git a/app-admin/salt/files/salt-3004.1-py310.patch b/app-admin/salt/files/salt-3004.1-py310.patch deleted file mode 100644 index 7e30d7687a66..000000000000 --- a/app-admin/salt/files/salt-3004.1-py310.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a58bbbe058df8f45872c43a95992f6a7a7914ab9 Mon Sep 17 00:00:00 2001 -From: piterpunk <piterpunk@slackware.com> -Date: Fri, 15 Oct 2021 11:03:20 -0300 -Subject: [PATCH] Fix _compat.py importlib logic for Python 3.10 - -Use the same logic in _compat.py and entrypoints.py to load -the same importlib.metadata. Python's built in implementation for -Python >= 3.10 and the Salt one for others. ---- - salt/_compat.py | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) - -diff --git a/salt/_compat.py b/salt/_compat.py -index 8149657bea61..a402f17a3c71 100644 ---- a/salt/_compat.py -+++ b/salt/_compat.py -@@ -11,19 +11,23 @@ - else: - import salt.ext.ipaddress as ipaddress - -+if sys.version_info >= (3, 10): -+ # Python 3.10 will include a fix in importlib.metadata which allows us to -+ # get the distribution of a loaded entry-point -+ import importlib.metadata # pylint: disable=no-member,no-name-in-module -+else: -+ # importlib_metadata before version 3.3.0 does not include the functionality we need. -+ try: -+ import importlib_metadata - --# importlib_metadata before version 3.3.0 does not include the functionality we need. --try: -- import importlib_metadata -- -- importlib_metadata_version = [ -- int(part) -- for part in importlib_metadata.version("importlib_metadata").split(".") -- if part.isdigit() -- ] -- if tuple(importlib_metadata_version) < (3, 3, 0): -+ importlib_metadata_version = [ -+ int(part) -+ for part in importlib_metadata.version("importlib_metadata").split(".") -+ if part.isdigit() -+ ] -+ if tuple(importlib_metadata_version) < (3, 3, 0): -+ # Use the vendored importlib_metadata -+ import salt.ext.importlib_metadata as importlib_metadata -+ except ImportError: - # Use the vendored importlib_metadata - import salt.ext.importlib_metadata as importlib_metadata --except ImportError: -- # Use the vendored importlib_metadata -- import salt.ext.importlib_metadata as importlib_metadata diff --git a/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch deleted file mode 100644 index 99d432158215..000000000000 --- a/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt -index 62cb775d87..ffa1589043 100644 ---- a/requirements/zeromq.txt -+++ b/requirements/zeromq.txt -@@ -1,6 +1,4 @@ - -r base.txt - -r crypto.txt - --pyzmq<=20.0.0 ; python_version < "3.6" --pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9" --pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9" -+pyzmq diff --git a/app-admin/salt/files/salt-3004.1-tests.patch b/app-admin/salt/files/salt-3004.1-tests.patch deleted file mode 100644 index 956cf1b0041c..000000000000 --- a/app-admin/salt/files/salt-3004.1-tests.patch +++ /dev/null @@ -1,311 +0,0 @@ -diff --git a/tests/pytests/functional/fileserver/test_roots.py b/tests/pytests/functional/fileserver/test_roots.py -index c65efc8d52..9060fb61e2 100644 ---- a/tests/pytests/functional/fileserver/test_roots.py -+++ b/tests/pytests/functional/fileserver/test_roots.py -@@ -15,6 +15,7 @@ def configure_loader_modules(base_env_state_tree_root_dir): - return {roots: {"__opts__": opts}} - - -+@pytest.mark.skip("needs network access") - # nox -e pytest-zeromq-3.8(coverage=False) -- -vvv --run-slow --run-destructive tests\pytests\functional\fileserver\test_roots.py - def test_symlink_list(base_env_state_tree_root_dir): - with pytest.helpers.temp_file( -diff --git a/tests/pytests/functional/pillar/test_gpg.py b/tests/pytests/functional/pillar/test_gpg.py -index aaa4733f1d..b55cc9b4cf 100644 ---- a/tests/pytests/functional/pillar/test_gpg.py -+++ b/tests/pytests/functional/pillar/test_gpg.py -@@ -203,7 +203,7 @@ def gpg_homedir(salt_master, pillar_state_tree): - universal_newlines=True, - ) - ret = ProcessResult( -- exitcode=proc.returncode, -+ returncode=proc.returncode, - stdout=proc.stdout, - stderr=proc.stderr, - cmdline=proc.args, -@@ -220,7 +220,7 @@ def gpg_homedir(salt_master, pillar_state_tree): - input=TEST_KEY, - ) - ret = ProcessResult( -- exitcode=proc.returncode, -+ returncode=proc.returncode, - stdout=proc.stdout, - stderr=proc.stderr, - cmdline=proc.args, -@@ -250,7 +250,7 @@ def gpg_homedir(salt_master, pillar_state_tree): - input="KILLAGENT", - ) - ret = ProcessResult( -- exitcode=proc.returncode, -+ returncode=proc.returncode, - stdout=proc.stdout, - stderr=proc.stderr, - cmdline=proc.args, -diff --git a/tests/pytests/integration/cli/test_salt_proxy.py b/tests/pytests/integration/cli/test_salt_proxy.py -index c32c7e11e2..a9ee9fbd8d 100644 ---- a/tests/pytests/integration/cli/test_salt_proxy.py -+++ b/tests/pytests/integration/cli/test_salt_proxy.py -@@ -40,6 +40,7 @@ def test_exit_status_no_proxyid(salt_master, proxy_minion_id): - assert "error: salt-proxy requires --proxyid" in exc.value.stderr, exc.value - - -+@pytest.mark.skip("Currently broken") - @pytest.mark.skip_on_windows(reason="Windows does not do user checks") - def test_exit_status_unknown_user(salt_master, proxy_minion_id): - """ -@@ -66,7 +67,7 @@ def test_exit_status_unknown_argument(salt_master, proxy_minion_id): - factory = salt_master.salt_proxy_minion_daemon(proxy_minion_id) - factory.start("--unknown-argument", start_timeout=10, max_start_attempts=1) - -- assert exc.value.exitcode == salt.defaults.exitcodes.EX_USAGE, exc.value -+ assert exc.value.returncode == salt.defaults.exitcodes.EX_USAGE, exc.value - assert "Usage" in exc.value.stderr, exc.value - assert "no such option: --unknown-argument" in exc.value.stderr, exc.value - -@@ -89,8 +90,8 @@ def test_exit_status_correct_usage(salt_master, proxy_minion_id, salt_cli): - assert factory.is_running() - # Let's issue a ping before terminating - ret = salt_cli.run("test.ping", minion_tgt=proxy_minion_id) -- assert ret.exitcode == 0 -+ assert ret.returncode == 0 - assert ret.json is True - # Terminate the proxy minion - ret = factory.terminate() -- assert ret.exitcode == salt.defaults.exitcodes.EX_OK, ret -+ assert ret.returncode == salt.defaults.exitcodes.EX_OK, ret -diff --git a/tests/pytests/integration/sdb/test_vault.py b/tests/pytests/integration/sdb/test_vault.py -index 7dc4c55417..6c48296a0c 100644 ---- a/tests/pytests/integration/sdb/test_vault.py -+++ b/tests/pytests/integration/sdb/test_vault.py -@@ -107,7 +107,7 @@ def vault_container_version(request, salt_call_cli, vault_port): - if proc.returncode == 0: - break - ret = ProcessResult( -- exitcode=proc.returncode, -+ returncode=proc.returncode, - stdout=proc.stdout, - stderr=proc.stderr, - cmdline=proc.args, -@@ -133,7 +133,7 @@ def vault_container_version(request, salt_call_cli, vault_port): - ) - if proc.returncode != 0: - ret = ProcessResult( -- exitcode=proc.returncode, -+ returncode=proc.returncode, - stdout=proc.stdout, - stderr=proc.stderr, - cmdline=proc.args, -@@ -150,7 +150,7 @@ def vault_container_version(request, salt_call_cli, vault_port): - universal_newlines=True, - ) - ret = ProcessResult( -- exitcode=proc.returncode, -+ returncode=proc.returncode, - stdout=proc.stdout, - stderr=proc.stderr, - cmdline=proc.args, -diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py -index bc1d2818aa..3bd93862b7 100644 ---- a/tests/pytests/unit/modules/test_cmdmod.py -+++ b/tests/pytests/unit/modules/test_cmdmod.py -@@ -440,6 +440,7 @@ def test_run_cwd_doesnt_exist_issue_7154(): - cmdmod.run_all(cmd, cwd=cwd) - - -+@pytest.mark.skip("needs root access") - @pytest.mark.skip_on_darwin - @pytest.mark.skip_on_windows - def test_run_cwd_in_combination_with_runas(): -diff --git a/tests/pytests/unit/modules/test_portage_config.py b/tests/pytests/unit/modules/test_portage_config.py -index 5cc6b90596..db37d2c4f1 100644 ---- a/tests/pytests/unit/modules/test_portage_config.py -+++ b/tests/pytests/unit/modules/test_portage_config.py -@@ -29,6 +29,7 @@ def test_get_config_file_wildcards(): - assert portage_config._get_config_file("mask", atom) == expected - - -+@pytest.mark.skip("test needs root access") - def test_enforce_nice_config(tmp_path): - atoms = [ - ("*/*::repo", "repo"), -diff --git a/tests/pytests/unit/state/test_state_compiler.py b/tests/pytests/unit/state/test_state_compiler.py -index fc43cf154d..7aa511c9f7 100644 ---- a/tests/pytests/unit/state/test_state_compiler.py -+++ b/tests/pytests/unit/state/test_state_compiler.py -@@ -679,6 +679,7 @@ def test_verify_retry_parsing(): - assert set(expected_result).issubset(set(state_obj.call(low_data))) - - -+@pytest.mark.skip("test requires root access") - def test_render_requisite_require_disabled(): - """ - Test that the state compiler correctly deliver a rendering -@@ -719,6 +720,7 @@ def test_render_requisite_require_disabled(): - assert run_num == 0 - - -+@pytest.mark.skip("test requires root access") - def test_render_requisite_require_in_disabled(): - """ - Test that the state compiler correctly deliver a rendering -diff --git a/tests/pytests/unit/state/test_state_format_slots.py b/tests/pytests/unit/state/test_state_format_slots.py -index 57b7bb2b87..7d2abce8d0 100644 ---- a/tests/pytests/unit/state/test_state_format_slots.py -+++ b/tests/pytests/unit/state/test_state_format_slots.py -@@ -218,6 +218,7 @@ def test_slot_append(state_obj): - assert cdata == {"args": ["arg"], "kwargs": {"key": "value1thing~"}} - - -+@pytest.mark.skip("test needs root") - # Skip on windows like integration.modules.test_state.StateModuleTest.test_parallel_state_with_long_tag - @skipIf( - salt.utils.platform.is_windows(), -diff --git a/tests/pytests/unit/test_minion.py b/tests/pytests/unit/test_minion.py -index 985ec99276..eb8a476e30 100644 ---- a/tests/pytests/unit/test_minion.py -+++ b/tests/pytests/unit/test_minion.py -@@ -493,6 +493,7 @@ def test_scheduler_before_connect(): - minion.destroy() - - -+@pytest.mark.skip("test needs root access") - def test_minion_module_refresh(): - """ - Tests that the 'module_refresh' just return in case there is no 'schedule' -@@ -520,6 +521,7 @@ def test_minion_module_refresh(): - minion.destroy() - - -+@pytest.mark.skip("test needs root access") - def test_minion_module_refresh_beacons_refresh(): - """ - Tests that 'module_refresh' calls beacons_refresh and that the -diff --git a/tests/pytests/unit/test_version.py b/tests/pytests/unit/test_version.py -index bc6bbfeadd..2653b558b0 100644 ---- a/tests/pytests/unit/test_version.py -+++ b/tests/pytests/unit/test_version.py -@@ -140,6 +140,7 @@ def test_sha(commit, match): - assert ret is None - - -+@pytest.mark.skip("test is broken if some optional deps aren't installed") - def test_version_report_lines(): - """ - Validate padding in versions report is correct -diff --git a/tests/support/helpers.py b/tests/support/helpers.py -index d82b14cb90..751018162c 100644 ---- a/tests/support/helpers.py -+++ b/tests/support/helpers.py -@@ -40,7 +40,7 @@ import salt.utils.platform - import salt.utils.pycrypto - import salt.utils.stringutils - import salt.utils.versions --from saltfactories.exceptions import FactoryFailure as ProcessFailed -+from pytestshellutils.exceptions import FactoryFailure as ProcessFailed - from saltfactories.utils.ports import get_unused_localhost_port - from saltfactories.utils.processes import ProcessResult - from tests.support.mock import patch -@@ -1720,7 +1720,7 @@ class VirtualEnv: - kwargs.setdefault("env", self.environ) - proc = subprocess.run(args, check=False, **kwargs) - ret = ProcessResult( -- exitcode=proc.returncode, -+ returncode=proc.returncode, - stdout=proc.stdout, - stderr=proc.stderr, - cmdline=proc.args, -@@ -1735,7 +1735,7 @@ class VirtualEnv: - cmdline=proc.args, - stdout=proc.stdout, - stderr=proc.stderr, -- exitcode=proc.returncode, -+ returncode=proc.returncode, - ) - return ret - -diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py -index 1d3d1393a9..df331761e2 100644 ---- a/tests/unit/modules/test_boto_route53.py -+++ b/tests/unit/modules/test_boto_route53.py -@@ -4,6 +4,8 @@ from collections import namedtuple - - import pkg_resources # pylint: disable=3rd-party-module-not-gated - -+import pytest -+ - import salt.config - import salt.loader - import salt.utils.versions -@@ -99,6 +101,7 @@ class BotoRoute53TestCase(TestCase, LoaderModuleMockMixin): - def tearDown(self): - del self.opts - -+ @pytest.mark.skip("test currently broken") - @mock_route53_deprecated - def test_create_healthcheck(self): - """ -diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py -index 907c67f477..3f68cfe8f3 100644 ---- a/tests/unit/utils/test_parsers.py -+++ b/tests/unit/utils/test_parsers.py -@@ -6,6 +6,8 @@ import os - import shutil - import tempfile - -+import pytest -+ - import salt.config - import salt.log.setup as log - import salt.syspaths -@@ -983,6 +985,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): - if os.path.exists(self.log_file): - os.unlink(self.log_file) - -+ @pytest.mark.skip("needs root access") - def test_jid_option(self): - jid = salt.utils.jid.gen_jid({}) - args = ["--jid", jid] -@@ -991,6 +994,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): - parser.parse_args(args) - assert parser.options.jid == jid - -+ @pytest.mark.skip("needs root access") - def test_jid_option_invalid(self): - jid = salt.utils.jid.gen_jid({}) + "A" - args = ["--jid", jid] -@@ -1041,6 +1045,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): - if os.path.exists(self.ssh_log_file): - os.unlink(self.ssh_log_file) - -+ @pytest.mark.skip("needs root access") - def test_jid_option(self): - jid = salt.utils.jid.gen_jid({}) - args = ["--jid", jid] + self.args -@@ -1049,6 +1054,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): - parser.parse_args(args) - assert parser.options.jid == jid - -+ @pytest.mark.skip("needs root access") - def test_jid_option_invalid(self): - jid = salt.utils.jid.gen_jid({}) + "A" - args = ["--jid", jid] + self.args -diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py -index 8c648f5288..74b9bc6981 100644 ---- a/tests/unit/utils/test_schema.py -+++ b/tests/unit/utils/test_schema.py -@@ -872,6 +872,7 @@ class ConfigTestCase(TestCase): - }, - ) - -+ @skipIf(True, "Does not work in network sandbox") - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") - def test_hostname_config_validation(self): - class TestConf(schema.Schema): -@@ -2098,6 +2099,7 @@ class ConfigTestCase(TestCase): - item = schema.NotItem(item=schema.BooleanItem()) - self.assertEqual(item.serialize(), {"not": item.item.serialize()}) - -+ @skipIf(True, "Does not work in network sandbox") - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") - def test_not_config_validation(self): - class TestConf(schema.Schema): diff --git a/app-admin/salt/files/salt-3004.2-importlib.patch b/app-admin/salt/files/salt-3004.2-importlib.patch deleted file mode 100644 index 599b17290d5b..000000000000 --- a/app-admin/salt/files/salt-3004.2-importlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/salt/_compat.py 2022-06-28 01:50:45.630746476 -0000 -+++ b/salt/_compat.py 2022-06-28 01:51:52.970217848 -0000 -@@ -14,7 +14,7 @@ - if sys.version_info >= (3, 10): - # Python 3.10 will include a fix in importlib.metadata which allows us to - # get the distribution of a loaded entry-point -- import importlib.metadata # pylint: disable=no-member,no-name-in-module -+ import importlib.metadata as importlib_metadata # pylint: disable=no-member,no-name-in-module - else: - # importlib_metadata before version 3.3.0 does not include the functionality we need. - try: diff --git a/app-admin/salt/files/salt-3004.2-jinja-3.patch b/app-admin/salt/files/salt-3004.2-jinja-3.patch deleted file mode 100644 index 271921fd4564..000000000000 --- a/app-admin/salt/files/salt-3004.2-jinja-3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py -index 6502831aff..dec847364a 100644 ---- a/tests/unit/utils/test_jinja.py -+++ b/tests/unit/utils/test_jinja.py -@@ -22,7 +22,8 @@ import salt.utils.files - import salt.utils.json - import salt.utils.stringutils - import salt.utils.yaml --from jinja2 import DictLoader, Environment, Markup, exceptions -+from jinja2 import DictLoader, Environment, exceptions -+from markupsafe import Markup - from salt.exceptions import SaltRenderError - from salt.utils.decorators.jinja import JinjaFilter - from salt.utils.jinja import ( diff --git a/app-admin/salt/files/salt-3004.2-pyzmq-23.patch b/app-admin/salt/files/salt-3004.2-pyzmq-23.patch deleted file mode 100644 index d912757ba7b8..000000000000 --- a/app-admin/salt/files/salt-3004.2-pyzmq-23.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/salt/log/handlers/logstash_mod.py b/salt/log/handlers/logstash_mod.py -index bc462018f5..7e0d98c5ba 100644 ---- a/salt/log/handlers/logstash_mod.py -+++ b/salt/log/handlers/logstash_mod.py -@@ -160,6 +160,8 @@ import logging - import logging.handlers - import os - -+import zmq -+ - import salt.utils.json - import salt.utils.network - import salt.utils.stringutils -@@ -435,7 +437,7 @@ class ZMQLogstashHander(logging.Handler, NewStyleClassMixIn): - # Above the defined high water mark(unsent messages), start - # dropping them - self._publisher.setsockopt(zmq.HWM, self._zmq_hwm) -- except AttributeError: -+ except (AttributeError, zmq.error.ZMQError): - # In ZMQ >= 3.0, there are separate send and receive HWM - # settings - self._publisher.setsockopt(zmq.SNDHWM, self._zmq_hwm) -diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py -index dc024d7eff..4c989095a5 100644 ---- a/salt/transport/zeromq.py -+++ b/salt/transport/zeromq.py -@@ -902,7 +902,7 @@ class ZeroMQPubServerChannel(salt.transport.server.PubServerChannel): - try: - pub_sock.setsockopt(zmq.HWM, self.opts.get("pub_hwm", 1000)) - # in zmq >= 3.0, there are separate send and receive HWM settings -- except AttributeError: -+ except (AttributeError, zmq.error.ZMQError): - # Set the High Water Marks. For more information on HWM, see: - # http://api.zeromq.org/4-1:zmq-setsockopt - pub_sock.setsockopt(zmq.SNDHWM, self.opts.get("pub_hwm", 1000)) diff --git a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch deleted file mode 100644 index ff47115af210..000000000000 --- a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt -index eb4d796418..ffa1589043 100644 ---- a/requirements/zeromq.txt -+++ b/requirements/zeromq.txt -@@ -1,6 +1,4 @@ - -r base.txt - -r crypto.txt - --pyzmq<=20.0.0 ; python_version < "3.6" --pyzmq>=17.0.0 ; python_version < "3.9" --pyzmq>19.0.2 ; python_version >= "3.9" -+pyzmq diff --git a/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch b/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch deleted file mode 100644 index e4b19d6bfd7f..000000000000 --- a/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit b676e6338a7c094cb3335d11f851ac0e12222017 -Author: MKLeb <calebb@vmware.com> -Date: Wed Oct 5 15:49:37 2022 -0400 - - Allow entrypoint compatibility for importlib-metadata>=5.0.0 - -diff --git a/salt/utils/entrypoints.py b/salt/utils/entrypoints.py -index 3effa0b494..ac65ae2df4 100644 ---- a/salt/utils/entrypoints.py -+++ b/salt/utils/entrypoints.py -@@ -38,13 +38,20 @@ def iter_entry_points(group, name=None): - entry_points_listing = [] - entry_points = importlib_metadata.entry_points() - -- for entry_point_group, entry_points_list in entry_points.items(): -- if entry_point_group != group: -- continue -- for entry_point in entry_points_list: -- if name is not None and entry_point.name != name: -+ # pre importlib-metadata 5.0.0 -+ if hasattr(entry_points, "items"): -+ for entry_point_group, entry_points_list in entry_points.items(): -+ if entry_point_group != group: - continue -- entry_points_listing.append(entry_point) -+ for entry_point in entry_points_list: -+ if name is not None and entry_point.name != name: -+ continue -+ entry_points_listing.append(entry_point) -+ # starting with importlib-metadata 5.0.0 -+ for entry_point in entry_points.select(group=group): -+ if name is not None and entry_point.name != name: -+ continue -+ entry_points_listing.append(entry_point) - - return entry_points_listing - diff --git a/app-admin/salt/files/salt-3006.2-tests.patch b/app-admin/salt/files/salt-3006.2-tests.patch new file mode 100644 index 000000000000..abec5157df30 --- /dev/null +++ b/app-admin/salt/files/salt-3006.2-tests.patch @@ -0,0 +1,114 @@ +diff --git a/tests/pytests/unit/modules/dockermod/test_module.py b/tests/pytests/unit/modules/dockermod/test_module.py +index 8fb7806497..584d416412 100644 +--- a/tests/pytests/unit/modules/dockermod/test_module.py ++++ b/tests/pytests/unit/modules/dockermod/test_module.py +@@ -354,10 +354,6 @@ def test_update_mine(): + mine_mock.assert_called_once() + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_list_networks(): + """ + test list networks. +@@ -378,10 +374,6 @@ def test_list_networks(): + client.networks.assert_called_once_with(names=["foo"], ids=["01234"]) + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_create_network(): + """ + test create network. +@@ -422,10 +414,6 @@ def test_create_network(): + ) + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_remove_network(): + """ + test remove network. +@@ -444,10 +432,6 @@ def test_remove_network(): + client.remove_network.assert_called_once_with("foo") + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_inspect_network(): + """ + test inspect network. +@@ -466,10 +450,6 @@ def test_inspect_network(): + client.inspect_network.assert_called_once_with("foo") + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_connect_container_to_network(): + """ + test connect_container_to_network +@@ -491,10 +471,6 @@ def test_connect_container_to_network(): + client.connect_container_to_network.assert_called_once_with("container", "foo") + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_disconnect_container_from_network(): + """ + test disconnect_container_from_network +@@ -513,10 +489,6 @@ def test_disconnect_container_from_network(): + client.disconnect_container_from_network.assert_called_once_with("container", "foo") + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_list_volumes(): + """ + test list volumes. +@@ -539,10 +511,6 @@ def test_list_volumes(): + ) + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_create_volume(): + """ + test create volume. +@@ -569,10 +537,6 @@ def test_create_volume(): + ) + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_remove_volume(): + """ + test remove volume. +@@ -591,10 +555,6 @@ def test_remove_volume(): + client.remove_volume.assert_called_once_with("foo") + + +-@pytest.mark.skipif( +- docker_mod.docker.version_info < (1, 5, 0), +- reason="docker module must be installed to run this test or is too old. >=1.5.0", +-) + def test_inspect_volume(): + """ + test inspect volume. diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml index 618790903e88..4e6f05022cda 100644 --- a/app-admin/salt/metadata.xml +++ b/app-admin/salt/metadata.xml @@ -27,7 +27,6 @@ backbone of cloud and data center management. <flag name="libvirt">Support managing virtual machines with <pkg>app-emulation/libvirt</pkg>.</flag> <flag name="genshi">Enable support for <pkg>dev-python/genshi</pkg></flag> <flag name="gnupg">Enable support for gnupg via python-gnupg.</flag> - <flag name="keyring">Enable support for keyrings via python-keyring.</flag> <flag name="mako">Add support for using the mako template engine for parsing salt states.</flag> <flag name="mongodb">Support returning data to a mongodb server.</flag> <flag name="neutron">Support the OpenStack neutron network service.</flag> diff --git a/app-admin/salt/salt-3004.2-r2.ebuild b/app-admin/salt/salt-3004.2-r2.ebuild deleted file mode 100644 index f2a1fbff233e..000000000000 --- a/app-admin/salt/salt-3004.2-r2.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_10 ) - -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/tomli[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - <dev-python/importlib_metadata-5[${PYTHON_USEDEP}] - libvirt? ( - dev-python/libvirt-python[${PYTHON_USEDEP}] - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] - ) - neutron? ( - >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/passlib - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-1.0.0_rc13[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/libcloud[${PYTHON_USEDEP}] - net-dns/bind-tools - >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3003.1-tests.patch" - "${FILESDIR}/salt-3004.2-jinja-3.patch" - "${FILESDIR}/salt-3004.1-tests.patch" - "${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch" - "${FILESDIR}/salt-3004.1-py310.patch" - "${FILESDIR}/salt-3004.2-importlib.patch" - "${FILESDIR}/salt-3004.2-pyzmq-23.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm tests/pytests/functional/transport/server/test_req_channel.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm -r tests/integration/cloud || die - rm -r tests/kitchen/tests/wordpress/tests || die - rm tests/kitchen/test_kitchen.py || die - rm tests/unit/modules/test_network.py || die - rm tests/pytests/functional/modules/test_pip.py || die - rm tests/pytests/unit/client/ssh/test_ssh.py || die - - # tests require root access - rm tests/integration/pillar/test_git_pillar.py || die - rm tests/integration/states/test_supervisord.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die - - # removes contextvars, see bug: https://bugs.gentoo.org/799431 - sed -i '/^contextvars/d' requirements/base.txt || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - # testsuite likes lots of files - ulimit -n 4096 || die - - # ${T} is too long a path for the tests to work - local TMPDIR - TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" - ( - export TMPDIR - cleanup() { rm -rf "${TMPDIR}" || die; } - - trap cleanup EXIT - - addwrite "${TMPDIR}" - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - "${EPYTHON}" -m pytest -vv \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - : -} diff --git a/app-admin/salt/salt-3005-r1.ebuild b/app-admin/salt/salt-3005-r1.ebuild deleted file mode 100644 index 1ec597170af1..000000000000 --- a/app-admin/salt/salt-3005-r1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_10 ) - -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE=" - cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax -" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/tomli[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - <dev-python/importlib_metadata-5[${PYTHON_USEDEP}] - libcloud? ( - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/aiosignal[${PYTHON_USEDEP}] - dev-python/async-timeout[${PYTHON_USEDEP}] - >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] - ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - dev-python/libvirt-python[${PYTHON_USEDEP}] - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] - ) - neutron? ( - >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - dev-python/cherrypy[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] - dev-python/passlib - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - >=dev-python/pytest-7.0.1[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] - dev-python/pytest-skip-markers[${PYTHON_USEDEP}] - dev-python/pytest-system-statistics[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/libcloud[${PYTHON_USEDEP}] - net-dns/bind-tools - >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] - dev-util/yamllint[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] ) - ) -" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3003.1-tests.patch" - "${FILESDIR}/salt-3005-relax-pyzmq-dep.patch" - "${FILESDIR}/salt-3005-tests.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die - rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm tests/pytests/functional/transport/server/test_req_channel.py || die - rm tests/pytests/functional/utils/test_async_event_publisher.py || die - rm tests/pytests/functional/runners/test_winrepo.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm -r tests/integration/cloud || die - rm -r tests/kitchen/tests/wordpress/tests || die - rm tests/kitchen/test_kitchen.py || die - rm tests/unit/modules/test_network.py || die - rm tests/pytests/functional/modules/test_pip.py || die - rm tests/pytests/unit/client/ssh/test_ssh.py || die - rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die - - # tests require root access - rm tests/integration/pillar/test_git_pillar.py || die - rm tests/integration/states/test_supervisord.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die - - # removes contextvars, see bug: https://bugs.gentoo.org/799431 - sed -i '/^contextvars/d' requirements/base.txt || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - # testsuite likes lots of files - ulimit -n 4096 || die - - # ${T} is too long a path for the tests to work - local TMPDIR - TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" - ( - export TMPDIR - cleanup() { rm -rf "${TMPDIR}" || die; } - - trap cleanup EXIT - - addwrite "${TMPDIR}" - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - "${EPYTHON}" -m pytest -vv \ - || die "testing failed with ${EPYTHON}" - ) -} diff --git a/app-admin/salt/salt-3005.1-r1.ebuild b/app-admin/salt/salt-3005.1-r1.ebuild deleted file mode 100644 index f0e9fcb05059..000000000000 --- a/app-admin/salt/salt-3005.1-r1.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_10 ) - -DISTUTILS_USE_PEP517=setuptools -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" -else - inherit pypi - KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE=" - cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax -" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}] - dev-python/jmespath[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/tomli[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/aiosignal[${PYTHON_USEDEP}] - dev-python/async-timeout[${PYTHON_USEDEP}] - >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] - ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - dev-python/libvirt-python[${PYTHON_USEDEP}] - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] - ) - neutron? ( - >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - dev-python/cherrypy[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] - dev-python/passlib - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - >=dev-python/pytest-7.0.1[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] - dev-python/pytest-skip-markers[${PYTHON_USEDEP}] - dev-python/pytest-system-statistics[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/libcloud[${PYTHON_USEDEP}] - net-dns/bind-tools - >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] - dev-util/yamllint[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] ) - ) -" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3003.1-tests.patch" - "${FILESDIR}/salt-3005-relax-pyzmq-dep.patch" - "${FILESDIR}/salt-3005-tests.patch" - "${FILESDIR}/salt-3005.1-no-entry-points.patch" - "${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch" - "${FILESDIR}/salt-3005.1-tests.patch" - "${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die - rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm tests/pytests/functional/transport/server/test_req_channel.py || die - rm tests/pytests/functional/utils/test_async_event_publisher.py || die - rm tests/pytests/functional/runners/test_winrepo.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm -r tests/integration/cloud || die - rm -r tests/kitchen/tests/wordpress/tests || die - rm tests/kitchen/test_kitchen.py || die - rm tests/unit/modules/test_network.py || die - rm tests/pytests/functional/modules/test_pip.py || die - rm tests/pytests/unit/client/ssh/test_ssh.py || die - rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die - - # tests require root access - rm tests/integration/pillar/test_git_pillar.py || die - rm tests/integration/states/test_supervisord.py || die - - # removes contextvars, see bug: https://bugs.gentoo.org/799431 - sed -i '/^contextvars/d' requirements/base.txt || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - # testsuite likes lots of files - ulimit -n 4096 || die - - local -a disable_tests=( - # doesn't like the distutils warning - batch_retcode - multiple_modules_in_batch - # hangs indefinitely - master_type_disable - # needs root - runas_env_sudo_group - # don't like sandbox - split_multibyte_characters_{shiftjis,unicode} - # doesn't like sandbox env - log_sanitize - ) - local textexpr - testexpr=$(printf 'not %s and ' "${disable_tests[@]}") - - # ${T} is too long a path for the tests to work - local TMPDIR - TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die - ( - export TMPDIR - cleanup() { rm -rf "${TMPDIR}" || die; } - - trap cleanup EXIT - - addwrite "${TMPDIR}" - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - "${EPYTHON}" -m pytest -vv -k "${testexpr%and }" \ - || die "testing failed with ${EPYTHON}" - ) -} diff --git a/app-admin/salt/salt-3005.1.ebuild b/app-admin/salt/salt-3005.1.ebuild deleted file mode 100644 index 1c1747cfaa93..000000000000 --- a/app-admin/salt/salt-3005.1.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_10 ) - -DISTUTILS_USE_PEP517=setuptools -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE=" - cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax -" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}] - dev-python/jmespath[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/tomli[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/aiosignal[${PYTHON_USEDEP}] - dev-python/async-timeout[${PYTHON_USEDEP}] - >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] - ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - dev-python/libvirt-python[${PYTHON_USEDEP}] - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] - ) - neutron? ( - >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - dev-python/cherrypy[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] - dev-python/passlib - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - >=dev-python/pytest-7.0.1[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] - dev-python/pytest-skip-markers[${PYTHON_USEDEP}] - dev-python/pytest-system-statistics[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/libcloud[${PYTHON_USEDEP}] - net-dns/bind-tools - >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] - dev-util/yamllint[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] ) - ) -" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3003.1-tests.patch" - "${FILESDIR}/salt-3005-relax-pyzmq-dep.patch" - "${FILESDIR}/salt-3005-tests.patch" - "${FILESDIR}/salt-3005.1-no-entry-points.patch" - "${FILESDIR}/salt-3005.1-importlib-metadata-5.patch" - "${FILESDIR}/salt-3005.1-tests.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die - rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm tests/pytests/functional/transport/server/test_req_channel.py || die - rm tests/pytests/functional/utils/test_async_event_publisher.py || die - rm tests/pytests/functional/runners/test_winrepo.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm -r tests/integration/cloud || die - rm -r tests/kitchen/tests/wordpress/tests || die - rm tests/kitchen/test_kitchen.py || die - rm tests/unit/modules/test_network.py || die - rm tests/pytests/functional/modules/test_pip.py || die - rm tests/pytests/unit/client/ssh/test_ssh.py || die - rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die - - # tests require root access - rm tests/integration/pillar/test_git_pillar.py || die - rm tests/integration/states/test_supervisord.py || die - - # removes contextvars, see bug: https://bugs.gentoo.org/799431 - sed -i '/^contextvars/d' requirements/base.txt || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - # testsuite likes lots of files - ulimit -n 4096 || die - - local -a disable_tests=( - # doesn't like the distutils warning - batch_retcode - multiple_modules_in_batch - # hangs indefinitely - master_type_disable - # needs root - runas_env_sudo_group - # don't like sandbox - split_multibyte_characters_{shiftjis,unicode} - # doesn't like sandbox env - log_sanitize - ) - local textexpr - testexpr=$(printf 'not %s and ' "${disable_tests[@]}") - - # ${T} is too long a path for the tests to work - local TMPDIR - TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die - ( - export TMPDIR - cleanup() { rm -rf "${TMPDIR}" || die; } - - trap cleanup EXIT - - addwrite "${TMPDIR}" - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - "${EPYTHON}" -m pytest -vv -k "${testexpr%and }" \ - || die "testing failed with ${EPYTHON}" - ) -} diff --git a/app-admin/salt/salt-3005.5-r1.ebuild b/app-admin/salt/salt-3005.5-r1.ebuild new file mode 100644 index 000000000000..835496219717 --- /dev/null +++ b/app-admin/salt/salt-3005.5-r1.ebuild @@ -0,0 +1,312 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_10 ) + +DISTUTILS_USE_PEP517=setuptools +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" +else + inherit pypi + KEYWORDS="amd64 ~arm arm64 ~riscv x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE=" + cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax +" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( + dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/aiosignal[${PYTHON_USEDEP}] + >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}] + dev-python/async-timeout[${PYTHON_USEDEP}] + ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + dev-python/libvirt-python[${PYTHON_USEDEP}] + ) + openssl? ( + dev-libs/openssl:0=[-bindist(-)] + >=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] + ) + neutron? ( + >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + dev-python/apache-libcloud[${PYTHON_USEDEP}] + >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] + dev-python/pytest-system-statistics[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + dev-util/yamllint[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] ) + ) +" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" + "${FILESDIR}/salt-3002-tests.patch" + "${FILESDIR}/salt-3003.1-tests.patch" + "${FILESDIR}/salt-3005-tests.patch" + "${FILESDIR}/salt-3005.1-no-entry-points.patch" + "${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch" + "${FILESDIR}/salt-3005.1-tests.patch" + "${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch" + "${FILESDIR}/salt-3006.2-tests.patch" +) + +python_prepare_all() { + local -a remove_test_files=( + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + tests/pytests/functional/fileserver/test_roots.py + tests/pytests/functional/modules/file/test_readlink.py + tests/pytests/functional/modules/file/test_replace.py + tests/pytests/functional/modules/file/test_symlink.py + tests/pytests/functional/modules/state/requisites/test_mixed.py + tests/pytests/functional/modules/state/test_jinja_renderer.py + tests/pytests/functional/modules/state/test_state.py + tests/pytests/functional/pillar/test_top.py + tests/pytests/functional/runners/test_winrepo.py + tests/pytests/functional/transport/server/test_req_channel.py + tests/pytests/functional/utils/functools/test_namespaced_function.py + tests/pytests/functional/utils/test_async_event_publisher.py + tests/pytests/integration/modules/state/test_state.py + tests/pytests/integration/pillar/cache/test_pillar_cache.py + tests/pytests/integration/pillar/test_pillar_include.py + tests/pytests/integration/proxy/test_deltaproxy.py + tests/pytests/integration/returners/test_noop_return.py + tests/pytests/integration/runners/test_manage.py + tests/pytests/integration/utils/test_templates.py + tests/pytests/unit/loader/test_lazy.py + tests/pytests/unit/modules/state/test_top_file_merge.py + tests/pytests/unit/roster/test_dir.py + tests/pytests/unit/state/test_multi_env_highstate.py + tests/pytests/unit/state/test_state_highstate.py + tests/pytests/unit/states/file/test_keyvalue.py + tests/pytests/unit/utils/jinja/test_get_template.py + tests/pytests/unit/utils/jinja/test_salt_cache_loader.py + tests/pytests/unit/utils/test_cache.py + tests/pytests/unit/utils/test_versions.py + tests/support/gitfs.py + tests/unit/modules/test_boto_{vpc,secgroup,elb}.py + tests/unit/runners/test_git_pillar.py + tests/unit/states/test_boto_vpc.py + tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py + + # tests that require network access + tests/integration/cloud + tests/kitchen/test_kitchen.py + tests/kitchen/tests/wordpress/tests + tests/pytests/functional/cli/test_salt_cloud.py + tests/pytests/functional/modules/state/requisites/test_listen.py + tests/pytests/functional/modules/state/requisites/test_onchanges.py + tests/pytests/functional/modules/state/requisites/test_onfail.py + tests/pytests/functional/modules/state/requisites/test_prereq.py + tests/pytests/functional/modules/state/requisites/test_require.py + tests/pytests/functional/modules/state/requisites/test_unless.py + tests/pytests/functional/modules/state/requisites/test_use.py + tests/pytests/functional/modules/state/requisites/test_watch.py + tests/pytests/functional/modules/test_pip.py + tests/pytests/functional/pillar/test_gpg.py + tests/pytests/functional/states/file/test_comment.py + tests/pytests/functional/states/file/test_rename.py + tests/pytests/integration/cli/test_batch.py + tests/pytests/integration/cli/test_salt_deltaproxy.py + tests/pytests/integration/cli/test_salt_proxy.py + tests/pytests/integration/master/test_clear_funcs.py + tests/pytests/integration/modules/test_state.py + tests/pytests/integration/proxy/test_simple.py + tests/pytests/integration/runners/state/orchestrate/test_events.py + tests/pytests/integration/wheel/test_pillar_roots.py + tests/pytests/unit/client/ssh/test_ssh.py + tests/pytests/unit/cloud/test_map.py + tests/pytests/unit/fileserver/test_roots.py + tests/pytests/unit/modules/state/test_state.py + tests/pytests/unit/proxy/test_netmiko_px.py + tests/pytests/unit/test_client.py + tests/pytests/unit/test_ext_importers.py + tests/pytests/unit/test_master.py + tests/pytests/{integration,functional}/netapi tests/integration/netapi + tests/unit/cloud/clouds/test_joyent.py + tests/unit/config/schemas/test_ssh.py + tests/unit/modules/test_boto3_elasticsearch.py + tests/unit/modules/test_boto3_route53.py + tests/unit/modules/test_network.py + tests/unit/netapi/rest_tornado/test_saltnado.py + tests/unit/{states,modules}/test_zcbuildout.py + + # tests require root access + tests/integration/pillar/test_git_pillar.py + tests/integration/states/test_supervisord.py + ) + + rm -r "${remove_test_files[@]}" || die + + # axe the boto dep (bug #888235) + find "${S}/tests" -name 'test_boto_*.py' -delete || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die + + # called_once should be assert_called_once_with + find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local -a EPYTEST_DESELECT=( + # hangs indefinitely + tests/pytests/unit/test_minion.py::test_master_type_disable + # don't like sandbox + tests/pytests/functional/modules/test_saltutil.py::test__get_top_file_envs + tests/pytests/functional/modules/state/requisites/test_onlyif.py::test_onlyif_req_retcode + tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order + tests/pytests/integration/states/test_ini_manage.py::test_options_present + + tests/pytests/functional/cli/test_salt.py::test_versions_report + tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock + tests/pytests/unit/test_master.py::test_fileserver_duration + tests/pytests/unit/utils/test_vt.py::test_log_sanitize + tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_array_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode + + # need root + tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group + ) + + # https://bugs.gentoo.org/924377 + has_version 'sys-apps/systemd' || EPYTEST_DESELECT+=( + tests/pytests/unit/modules/test_aptpkg.py::test_autoremove + tests/pytests/unit/modules/test_aptpkg.py::test_upgrade + tests/pytests/unit/modules/test_aptpkg.py::test_upgrade_downloadonly + tests/pytests/unit/modules/test_aptpkg.py::test_upgrade_allow_downgrades + tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_default + tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_with_kwargs + tests/pytests/unit/modules/test_linux_sysctl.py::test_persist_no_conf_failure + tests/pytests/unit/modules/test_yumpkg.py::test_latest_version_with_options + tests/pytests/unit/modules/test_yumpkg.py::test_list_repo_pkgs_with_options + tests/pytests/unit/modules/test_yumpkg.py::test_list_upgrades_dnf + tests/pytests/unit/modules/test_yumpkg.py::test_list_upgrades_yum + tests/pytests/unit/modules/test_yumpkg.py::test_refresh_db_with_options + tests/pytests/unit/modules/test_yumpkg.py::test_call_yum_default + tests/pytests/unit/modules/test_yumpkg.py::test_call_yum_with_kwargs + tests/unit/modules/test_kernelpkg_linux_yum.py::YumKernelPkgTestCase::test_remove_error + tests/unit/modules/test_kernelpkg_linux_yum.py::YumKernelPkgTestCase::test_remove_success + tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_remove_purge + ) + + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die + ( + export TMPDIR + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + epytest + ) +} diff --git a/app-admin/salt/salt-3006.5-r1.ebuild b/app-admin/salt/salt-3006.5-r1.ebuild new file mode 100644 index 000000000000..42a1f42b6498 --- /dev/null +++ b/app-admin/salt/salt-3006.5-r1.ebuild @@ -0,0 +1,342 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_10 ) + +DISTUTILS_USE_PEP517=setuptools +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" +else + inherit pypi + KEYWORDS="~amd64 ~riscv ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE=" + cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax +" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}] + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + dev-python/looseversion[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( + dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/aiosignal[${PYTHON_USEDEP}] + >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}] + dev-python/async-timeout[${PYTHON_USEDEP}] + ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + dev-python/libvirt-python[${PYTHON_USEDEP}] + ) + openssl? ( + dev-libs/openssl:0=[-bindist(-)] + >=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] + ) + neutron? ( + >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + dev-python/build[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + dev-python/apache-libcloud[${PYTHON_USEDEP}] + dev-python/boto3[${PYTHON_USEDEP}] + >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc28[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] + dev-python/pytest-system-statistics[${PYTHON_USEDEP}] + dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + dev-util/yamllint[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] ) + ) +" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" + "${FILESDIR}/salt-3005.1-no-entry-points.patch" +) + +python_prepare_all() { + local -a remove_test_files=( + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + tests/pytests/functional/modules/file/test_readlink.py + tests/pytests/functional/modules/file/test_symlink.py + tests/pytests/functional/modules/state/test_jinja_filters.py + tests/pytests/functional/modules/state/test_jinja_renderer.py + tests/pytests/functional/modules/state/test_mako_renderer.py + tests/pytests/functional/modules/state/test_pyobjects_renderer.py + tests/pytests/functional/pillar/test_gpg.py + tests/pytests/functional/runners/test_winrepo.py + tests/pytests/functional/states/file/test_keyvalue.py + tests/pytests/functional/states/file/test_patch.py + tests/pytests/functional/transport/server/test_req_channel.py + tests/pytests/functional/utils/test_async_event_publisher.py + tests/pytests/integration/master/test_clear_funcs.py + tests/pytests/integration/minion/test_reauth.py + tests/pytests/integration/returners/test_noop_return.py + tests/pytests/integration/runners/test_manage.py + tests/pytests/integration/states/test_ini_manage.py + tests/pytests/integration/states/test_state_test.py + tests/pytests/integration/utils/test_templates.py + tests/pytests/unit/loader/test_lazy.py + tests/pytests/unit/modules/test_aptpkg.py + tests/pytests/unit/roster/test_dir.py + tests/pytests/unit/states/file/test_keyvalue.py + tests/pytests/unit/utils/jinja/test_get_template.py + tests/pytests/unit/utils/jinja/test_salt_cache_loader.py + tests/unit/modules/test_boto_{vpc,secgroup,elb}.py + tests/unit/netapi/rest_tornado/test_saltnado.py + tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py + + # tests that require network access + tests/integration/cloud + tests/integration/netapi + tests/kitchen/test_kitchen.py + tests/kitchen/tests/wordpress/tests + tests/pytests/functional/cli/test_salt_cloud.py + tests/pytests/functional/cli/test_salt_run_.py + tests/pytests/functional/modules/test_http.py + tests/pytests/functional/modules/test_pip.py + tests/pytests/integration/cli/test_salt_proxy.py + tests/pytests/integration/modules/state/test_state.py + tests/pytests/integration/modules/state/test_state_state_events.py + tests/pytests/integration/modules/test_jinja.py + tests/pytests/integration/modules/test_state.py + tests/pytests/integration/modules/test_test.py + tests/pytests/integration/pillar/cache/test_pillar_cache.py + tests/pytests/integration/pillar/test_pillar_include.py + tests/pytests/integration/proxy/test_simple.py + tests/pytests/integration/runners/state/orchestrate/test_events.py + tests/pytests/integration/wheel/test_pillar_roots.py + tests/pytests/unit/client/ssh/test_ssh.py + tests/pytests/unit/test_client.py + tests/pytests/{integration,functional}/netapi + tests/unit/modules/test_boto3_elasticsearch.py + tests/unit/modules/test_boto3_route53.py + tests/unit/modules/test_network.py + tests/unit/{states,modules}/test_zcbuildout.py + + # tests require root access + tests/integration/pillar/test_git_pillar.py + tests/integration/states/test_supervisord.py + tests/pytests/functional/states/file/test_accumulated.py + tests/pytests/scenarios/performance/test_performance.py + tests/pytests/unit/cloud/test_map.py + tests/pytests/unit/modules/state/test_state.py + tests/pytests/unit/modules/state/test_top_file_merge.py + tests/pytests/unit/proxy/test_netmiko_px.py + tests/pytests/unit/proxy/test_ssh_sample.py + tests/pytests/unit/roster/test_sshknownhosts.py + ) + + rm -r "${remove_test_files[@]}" || die + + # axe the boto dep (bug #888235) + find "${S}/tests" -name 'test_boto_*.py' -delete || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die + + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die + # pycryptodome rather than pycryptodomex + find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die + + # called_once should be assert_called_once_with + find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local -a EPYTEST_DESELECT=( + # doesn't like the distutils warning + tests/pytests/integration/cli/test_batch.py::test_batch_retcode + tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch + + # hangs indefinitely + tests/pytests/unit/test_minion.py::test_master_type_disable + + # needs root + tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group + tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config + tests/pytests/integration/modules/test_cmdmod.py::test_long_stdout + + # don't like sandbox + tests/pytests/functional/cli/test_salt.py::test_help_log + tests/pytests/functional/cli/test_salt.py::test_versions_report + tests/pytests/functional/fileserver/test_roots.py::test_symlink_list + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline + tests/pytests/functional/modules/test_defaults.py::test_defaults_get + tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match + tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd + tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043 + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name + tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites + tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls + tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path + tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208 + tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data + tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff + tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case + tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter + tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source[False] + tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source[True] + tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg + tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd + tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775 + tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing + tests/pytests/integration/ssh/test_pillar_compilation.py::test_gpg_pillar + tests/pytests/integration/ssh/test_pillar_compilation.py::test_saltutil_runner + tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush + tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers + tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args + tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate + tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock + tests/pytests/unit/modules/test_msteams.py::test_post_card + tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config + tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache + tests/pytests/unit/modules/test_saltutil.py::test_list_extmods + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config + tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk + tests/pytests/unit/renderers/test_yamlex.py::test_basic + tests/pytests/unit/renderers/test_yamlex.py::test_complex + tests/pytests/unit/states/test_file.py::test_file_recurse_directory_test + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/test_master.py::test_fileserver_duration + tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup + tests/pytests/unit/utils/test_cache.py::test_context_wrapper + tests/pytests/unit/utils/test_cache.py::test_refill_cache + tests/pytests/unit/utils/test_cache.py::test_set_cache + tests/pytests/unit/utils/test_http.py::test_requests_session_verify_ssl_false + tests/pytests/unit/utils/test_vt.py::test_log_sanitize + tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_array_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_array_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation + tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation + tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis + tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode + + # tests that need network access + tests/pytests/unit/utils/test_http.py::test_query_proxy + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true + tests/pytests/unit/utils/test_network.py::test_isportopen + ) + + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die + ( + export TMPDIR + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + epytest + ) +} diff --git a/app-admin/salt/salt-3006.7-r1.ebuild b/app-admin/salt/salt-3006.7-r1.ebuild new file mode 100644 index 000000000000..6536ba08a015 --- /dev/null +++ b/app-admin/salt/salt-3006.7-r1.ebuild @@ -0,0 +1,358 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_1{0..1} ) + +DISTUTILS_USE_PEP517=setuptools +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" +else + inherit pypi + KEYWORDS="amd64 ~riscv ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE=" + cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax +" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}] + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + dev-python/looseversion[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( + dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/aiosignal[${PYTHON_USEDEP}] + >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}] + dev-python/async-timeout[${PYTHON_USEDEP}] + ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + dev-python/libvirt-python[${PYTHON_USEDEP}] + ) + openssl? ( + dev-libs/openssl:0=[-bindist(-)] + >=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] + ) + neutron? ( + >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + dev-python/build[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + app-arch/zip + dev-python/apache-libcloud[${PYTHON_USEDEP}] + dev-python/boto3[${PYTHON_USEDEP}] + >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] + <dev-python/moto-5[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc28[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] + dev-python/pytest-system-statistics[${PYTHON_USEDEP}] + dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + dev-util/yamllint[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] ) + ) +" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" + "${FILESDIR}/salt-3005.1-no-entry-points.patch" +) + +python_prepare_all() { + local -a remove_test_files=( + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + tests/pytests/functional/modules/file/test_readlink.py + tests/pytests/functional/modules/file/test_symlink.py + tests/pytests/functional/modules/state/test_jinja_filters.py + tests/pytests/functional/modules/state/test_jinja_renderer.py + tests/pytests/functional/modules/state/test_mako_renderer.py + tests/pytests/functional/modules/state/test_pyobjects_renderer.py + tests/pytests/functional/pillar/test_gpg.py + tests/pytests/functional/runners/test_winrepo.py + tests/pytests/functional/states/file/test_keyvalue.py + tests/pytests/functional/states/file/test_patch.py + tests/pytests/functional/transport/server/test_req_channel.py + tests/pytests/functional/utils/test_async_event_publisher.py + tests/pytests/integration/master/test_clear_funcs.py + tests/pytests/integration/minion/test_reauth.py + tests/pytests/integration/modules/test_cmdmod.py + tests/pytests/integration/modules/test_jinja.py + tests/pytests/integration/returners/test_noop_return.py + tests/pytests/integration/runners/test_manage.py + tests/pytests/integration/ssh/test_pillar_compilation.py + tests/pytests/integration/states/test_ini_manage.py + tests/pytests/integration/states/test_state_test.py + tests/pytests/integration/utils/test_templates.py + tests/pytests/pkg/integration/test_check_imports.py + tests/pytests/pkg/integration/test_clean_zmq_teardown.py + tests/pytests/pkg/integration/test_enabled_disabled.py + tests/pytests/pkg/integration/test_help.py + tests/pytests/pkg/integration/test_logrotate_config.py + tests/pytests/pkg/integration/test_pkg.py + tests/pytests/pkg/integration/test_python.py + tests/pytests/unit/loader/test_lazy.py + tests/pytests/unit/renderers/test_yamlex.py + tests/pytests/unit/roster/test_dir.py + tests/pytests/unit/states/file/test_keyvalue.py + tests/pytests/unit/utils/jinja/test_get_template.py + tests/pytests/unit/utils/jinja/test_salt_cache_loader.py + tests/pytests/unit/utils/test_cache.py + tests/pytests/unit/utils/test_versions.py + tests/unit/modules/test_boto_{vpc,secgroup,elb}.py + tests/unit/netapi/rest_tornado/test_saltnado.py + tests/unit/states/test_boto_vpc.py + tests/unit/states/test_module.py + tests/unit/utils/test_schema.py + tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py + + # tests that require network access + tests/integration/cloud + tests/kitchen/test_kitchen.py + tests/kitchen/tests/wordpress/tests + tests/pytests/functional/cli/test_salt_cloud.py + tests/pytests/functional/cli/test_salt_run_.py + tests/pytests/functional/modules/test_http.py + tests/pytests/functional/modules/test_pip.py + tests/pytests/integration/cli/test_salt_proxy.py + tests/pytests/integration/modules/state/test_state.py + tests/pytests/integration/modules/state/test_state_state_events.py + tests/pytests/integration/pillar/cache/test_pillar_cache.py + tests/pytests/integration/pillar/test_pillar_include.py + tests/pytests/integration/proxy/test_simple.py + tests/pytests/integration/runners/state/orchestrate/test_events.py + tests/pytests/integration/wheel/test_pillar_roots.py + tests/pytests/pkg/downgrade/test_salt_downgrade.py + tests/pytests/pkg/integration/test_pip.py + tests/pytests/pkg/integration/test_pip_upgrade.py + tests/pytests/pkg/integration/test_salt_api.py + tests/pytests/pkg/integration/test_salt_call.py + tests/pytests/pkg/integration/test_salt_exec.py + tests/pytests/pkg/integration/test_salt_grains.py + tests/pytests/pkg/integration/test_salt_key.py + tests/pytests/pkg/integration/test_salt_minion.py + tests/pytests/pkg/integration/test_salt_output.py + tests/pytests/pkg/integration/test_salt_pillar.py + tests/pytests/pkg/integration/test_salt_state_file.py + tests/pytests/pkg/integration/test_salt_ufw.py + tests/pytests/pkg/integration/test_salt_user.py + tests/pytests/pkg/integration/test_systemd_config.py + tests/pytests/pkg/integration/test_version.py + tests/pytests/pkg/upgrade/test_salt_upgrade.py + tests/pytests/unit/client/ssh/test_ssh.py + tests/pytests/unit/loader/test_loading_modules.py + tests/pytests/unit/test_client.py + tests/pytests/unit/utils/test_aws.py + tests/pytests/unit/utils/test_http.py + tests/pytests/{integration,functional}/netapi tests/integration/netapi + tests/unit/modules/test_boto3_elasticsearch.py + tests/unit/modules/test_boto3_route53.py + tests/unit/modules/test_network.py + tests/unit/{states,modules}/test_zcbuildout.py + + # tests require root access + tests/integration/pillar/test_git_pillar.py + tests/integration/states/test_supervisord.py + tests/pytests/functional/cli/test_salt.py + tests/pytests/functional/states/file/test_accumulated.py + tests/pytests/scenarios/performance/test_performance.py + tests/pytests/unit/cloud/test_map.py + tests/pytests/unit/modules/state/test_state.py + tests/pytests/unit/modules/state/test_top_file_merge.py + tests/pytests/unit/proxy/test_netmiko_px.py + tests/pytests/unit/proxy/test_ssh_sample.py + tests/pytests/unit/roster/test_sshknownhosts.py + ) + + rm -r "${remove_test_files[@]}" || die + + # axe the boto dep (bug #888235) + find "${S}/tests" -name 'test_boto_*.py' -delete || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die + + # called_once should be assert_called_once_with + find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local -a EPYTEST_DESELECT=( + # doesn't like the distutils warning + tests/pytests/integration/cli/test_batch.py::test_batch_retcode + tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch + + # hangs indefinitely + tests/pytests/unit/test_minion.py::test_master_type_disable + + # needs root + tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group + tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config + + # don't like sandbox + tests/pytests/functional/fileserver/test_roots.py::test_symlink_list + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline + tests/pytests/functional/modules/test_defaults.py::test_defaults_get + tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match + tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd + tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043 + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name + tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites + tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls + tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path + tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208 + tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data + tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff + tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case + tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter + tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg + tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd + tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775 + tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing + tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order + tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings + tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate + tests/pytests/unit/grains/test_core.py::test_get_machine_id + tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed + tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache + tests/pytests/unit/modules/test_saltutil.py::test_list_extmods + tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk + tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina + tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument + tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror + + # tests that need network access + tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none + tests/pytests/unit/utils/test_http.py::test_query_proxy + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true + tests/pytests/unit/utils/test_network.py::test_isportopen + ) + [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=( + tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black + tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black + ) + [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=( + tests/integration/modules/test_hosts.py::HostsModuleTest::test_set_host + ) + + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die + ( + export TMPDIR + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + epytest + ) +} diff --git a/app-admin/salt/salt-3007.0-r1.ebuild b/app-admin/salt/salt-3007.0-r1.ebuild new file mode 100644 index 000000000000..13e5222fc45f --- /dev/null +++ b/app-admin/salt/salt-3007.0-r1.ebuild @@ -0,0 +1,610 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_1{0..2} ) + +DISTUTILS_USE_PEP517=setuptools +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" +else + inherit pypi + KEYWORDS="amd64 ~riscv ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE=" + cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova portage profile redis selinux test raet + +zeromq vim-syntax +" + +RDEPEND=" + sys-apps/pciutils + dev-libs/openssl:0=[-bindist(-)] + dev-python/aiohttp[${PYTHON_USEDEP}] + >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}] + >=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + dev-python/looseversion[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}] + dev-python/python-gnupg[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/tornado[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( + >=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}] + dev-python/aiosignal[${PYTHON_USEDEP}] + >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}] + dev-python/async-timeout[${PYTHON_USEDEP}] + ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + dev-python/libvirt-python[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1}) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1}) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + sys-apps/findutils + dev-python/build[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + app-arch/zip + dev-python/apache-libcloud[${PYTHON_USEDEP}] + dev-python/boto3[${PYTHON_USEDEP}] + >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] + <dev-python/moto-5[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pygit2[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc29[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] + dev-python/pytest-system-statistics[${PYTHON_USEDEP}] + dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + dev-util/yamllint[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] ) + ) +" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE=" + || ( raet zeromq ) + test? ( cheetah genshi ) + nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) + neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) +" +RESTRICT=" + !test? ( test ) + x86? ( test ) +" + +PATCHES=( + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" +) + +python_prepare_all() { + local -a remove_test_files=( + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + tests/integration/externalapi/test_venafiapi.py + tests/integration/modules/test_rabbitmq.py + tests/integration/modules/test_supervisord.py + tests/integration/states/test_match.py + tests/pytests/functional/fileserver/hgfs/test_hgfs.py + tests/pytests/functional/loader/test_loader.py + tests/pytests/functional/modules/file/test_readlink.py + tests/pytests/functional/modules/file/test_symlink.py + tests/pytests/functional/modules/state/test_jinja_filters.py + tests/pytests/functional/modules/state/test_jinja_renderer.py + tests/pytests/functional/modules/state/test_mako_renderer.py + tests/pytests/functional/modules/state/test_pyobjects_renderer.py + tests/pytests/functional/modules/test_aptpkg.py + tests/pytests/functional/modules/test_dockermod.py + tests/pytests/functional/modules/test_etcd_mod.py + tests/pytests/functional/modules/test_grains.py + tests/pytests/functional/modules/test_mac_service.py + tests/pytests/functional/modules/test_saltcheck.py + tests/pytests/functional/modules/test_saltutil.py + tests/pytests/functional/modules/test_test.py + tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py + tests/pytests/functional/pillar/test_git_pillar.py + tests/pytests/functional/pillar/test_gpg.py + tests/pytests/functional/returners/test_etcd_return.py + tests/pytests/functional/runners/test_winrepo.py + tests/pytests/functional/sdb/test_etcd_db.py + tests/pytests/functional/state/test_masterless_tops.py + tests/pytests/functional/states/file/test_keyvalue.py + tests/pytests/functional/states/file/test_patch.py + tests/pytests/functional/states/file/test_rename.py + tests/pytests/functional/states/rabbitmq + tests/pytests/functional/states/test_docker_container.py + tests/pytests/functional/states/test_docker_network.py + tests/pytests/functional/states/test_etcd_mod.py + tests/pytests/functional/states/test_module.py + tests/pytests/functional/states/test_mysql.py + tests/pytests/functional/states/test_svn.py + tests/pytests/functional/states/test_virtualenv_mod.py + tests/pytests/functional/test_version.py + tests/pytests/functional/utils/test_vault.py + tests/pytests/integration/cli/test_syndic_eauth.py + tests/pytests/integration/daemons/test_memory_leak.py + tests/pytests/integration/grains/test_grains.py + tests/pytests/integration/master/test_clear_funcs.py + tests/pytests/integration/minion/test_reauth.py + tests/pytests/integration/modules/grains/test_append.py + tests/pytests/integration/modules/grains/test_module.py + tests/pytests/integration/modules/saltutil/test_grains.py + tests/pytests/integration/modules/saltutil/test_modules.py + tests/pytests/integration/modules/saltutil/test_wheel.py + tests/pytests/integration/modules/state/test_state_pillar_errors.py + tests/pytests/integration/modules/state/test_state_test.py + tests/pytests/integration/modules/test_cmdmod.py + tests/pytests/integration/modules/test_event.py + tests/pytests/integration/modules/test_file.py + tests/pytests/integration/modules/test_jinja.py + tests/pytests/integration/modules/test_pillar.py + tests/pytests/integration/modules/test_pip.py + tests/pytests/integration/modules/test_vault.py + tests/pytests/integration/modules/test_virt.py + tests/pytests/integration/modules/test_x509_v2.py + tests/pytests/integration/proxy/test_deltaproxy.py + tests/pytests/integration/proxy/test_shell.py + tests/pytests/integration/reactor/test_reactor.py + tests/pytests/integration/returners/test_noop_return.py + tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py + tests/pytests/integration/runners/test_cache.py + tests/pytests/integration/runners/test_jobs.py + tests/pytests/integration/runners/test_manage.py + tests/pytests/integration/runners/test_saltutil.py + tests/pytests/integration/runners/test_vault.py + tests/pytests/integration/sdb/test_vault.py + tests/pytests/integration/ssh/state/test_pillar_override.py + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py + tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py + tests/pytests/integration/ssh/state/test_retcode_render_exception.py + tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py + tests/pytests/integration/ssh/state/test_retcode_run_fail.py + tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py + tests/pytests/integration/ssh/state/test_state.py + tests/pytests/integration/ssh/state/test_with_import_dir.py + tests/pytests/integration/ssh/test_cmdmod.py + tests/pytests/integration/ssh/test_config.py + tests/pytests/integration/ssh/test_cp.py + tests/pytests/integration/ssh/test_deploy.py + tests/pytests/integration/ssh/test_grains.py + tests/pytests/integration/ssh/test_jinja_mods.py + tests/pytests/integration/ssh/test_master.py + tests/pytests/integration/ssh/test_mine.py + tests/pytests/integration/ssh/test_pillar.py + tests/pytests/integration/ssh/test_pillar_compilation.py + tests/pytests/integration/ssh/test_pre_flight.py + tests/pytests/integration/ssh/test_publish.py + tests/pytests/integration/ssh/test_py_versions.py + tests/pytests/integration/ssh/test_raw.py + tests/pytests/integration/ssh/test_saltcheck.py + tests/pytests/integration/ssh/test_slsutil.py + tests/pytests/integration/states/test_beacon.py + tests/pytests/integration/states/test_file.py + tests/pytests/integration/states/test_include.py + tests/pytests/integration/states/test_ini_manage.py + tests/pytests/integration/states/test_state_test.py + tests/pytests/integration/states/test_x509_v2.py + tests/pytests/integration/utils/test_templates.py + tests/pytests/integration/wheel/test_key.py + tests/pytests/pkg/integration/test_check_imports.py + tests/pytests/pkg/integration/test_clean_zmq_teardown.py + tests/pytests/pkg/integration/test_enabled_disabled.py + tests/pytests/pkg/integration/test_help.py + tests/pytests/pkg/integration/test_logrotate_config.py + tests/pytests/pkg/integration/test_pkg.py + tests/pytests/pkg/integration/test_python.py + tests/pytests/scenarios/compat/test_with_versions.py + tests/pytests/unit/loader/test_lazy.py + tests/pytests/unit/modules/test_mongodb.py + tests/pytests/unit/modules/test_mysql.py + tests/pytests/unit/modules/test_schedule.py + tests/pytests/unit/pillar/test_consul_pillar.py + tests/pytests/unit/pillar/test_mysql.py + tests/pytests/unit/renderers/test_yamlex.py + tests/pytests/unit/roster/test_ansible.py + tests/pytests/unit/roster/test_dir.py + tests/pytests/unit/runners/test_reactor.py + tests/pytests/unit/states/file/test_keyvalue.py + tests/pytests/unit/utils/jinja/test_get_template.py + tests/pytests/unit/utils/jinja/test_salt_cache_loader.py + tests/pytests/unit/utils/test_cache.py + tests/pytests/unit/utils/test_etcd_util.py + tests/pytests/unit/utils/test_package.py + tests/pytests/unit/utils/test_versions.py + tests/unit/ext/test_ipaddress.py + tests/unit/modules/test_boto_elb.py + tests/unit/modules/test_boto_secgroup.py + tests/unit/modules/test_boto_vpc.py + tests/unit/modules/test_elasticsearch.py + tests/unit/modules/test_k8s.py + tests/unit/modules/test_kubernetesmod.py + tests/unit/modules/test_vsphere.py + tests/unit/netapi/rest_tornado/test_saltnado.py + tests/unit/states/test_boto_vpc.py + tests/unit/states/test_module.py + tests/unit/test_module_names.py + tests/unit/test_zypp_plugins.py + tests/unit/utils/test_extend.py + tests/unit/utils/test_pbm.py + tests/unit/utils/test_schema.py + tests/unit/utils/test_vmware.py + tests/unit/utils/test_vsan.py + + # tests that require network access + tests/integration/cloud + tests/integration/netapi + tests/kitchen/test_kitchen.py + tests/kitchen/tests/wordpress/tests + tests/pytests/functional/cli/test_salt_cloud.py + tests/pytests/functional/cli/test_salt_run_.py + tests/pytests/functional/modules/test_ansiblegate.py + tests/pytests/functional/modules/test_http.py + tests/pytests/functional/modules/test_pip.py + tests/pytests/functional/netapi + tests/pytests/functional/utils/test_etcd_util.py + tests/pytests/functional/utils/test_http.py + tests/pytests/integration/cli/test_salt_proxy.py + tests/pytests/integration/daemons/test_masterapi.py + tests/pytests/integration/modules/state/test_state.py + tests/pytests/integration/modules/state/test_state_state_events.py + tests/pytests/integration/netapi + tests/pytests/integration/pillar/cache/test_pillar_cache.py + tests/pytests/integration/pillar/test_fileclient.py + tests/pytests/integration/pillar/test_pillar_include.py + tests/pytests/integration/proxy/test_simple.py + tests/pytests/integration/runners/state/orchestrate/test_events.py + tests/pytests/integration/wheel/test_pillar_roots.py + tests/pytests/pkg/downgrade/test_salt_downgrade.py + tests/pytests/pkg/integration/test_pip.py + tests/pytests/pkg/integration/test_pip_upgrade.py + tests/pytests/pkg/integration/test_salt_api.py + tests/pytests/pkg/integration/test_salt_call.py + tests/pytests/pkg/integration/test_salt_exec.py + tests/pytests/pkg/integration/test_salt_grains.py + tests/pytests/pkg/integration/test_salt_key.py + tests/pytests/pkg/integration/test_salt_minion.py + tests/pytests/pkg/integration/test_salt_output.py + tests/pytests/pkg/integration/test_salt_pillar.py + tests/pytests/pkg/integration/test_salt_state_file.py + tests/pytests/pkg/integration/test_salt_ufw.py + tests/pytests/pkg/integration/test_salt_user.py + tests/pytests/pkg/integration/test_systemd_config.py + tests/pytests/pkg/integration/test_version.py + tests/pytests/pkg/upgrade/test_salt_upgrade.py + tests/pytests/scenarios/cluster/test_cluster.py + tests/pytests/unit/client/ssh/test_ssh.py + tests/pytests/unit/cloud/clouds/vmware + tests/pytests/unit/loader/test_loading_modules.py + tests/pytests/unit/runners/test_net.py + tests/pytests/unit/states/file/test_mod_beacon.py + tests/pytests/unit/test_client.py + tests/pytests/unit/utils/test_aws.py + tests/pytests/unit/utils/test_http.py + tests/unit/modules/test_boto3_elasticsearch.py + tests/unit/modules/test_boto3_route53.py + tests/unit/modules/test_network.py + tests/unit/modules/test_zcbuildout.py + tests/unit/states/test_zcbuildout.py + + # tests require root access + tests/integration/pillar/test_git_pillar.py + tests/integration/states/test_lxd_container.py + tests/integration/states/test_lxd_image.py + tests/integration/states/test_lxd_profile.py + tests/integration/states/test_supervisord.py + tests/pytests/functional/cache/test_mysql.py + tests/pytests/functional/cli/test_salt.py + tests/pytests/functional/modules/test_mysql.py + tests/pytests/functional/modules/test_vault.py + tests/pytests/functional/states/file/test_accumulated.py + tests/pytests/functional/utils/test_gitfs.py + tests/pytests/functional/utils/test_pillar.py + tests/pytests/scenarios/performance/test_performance.py + tests/pytests/unit/cloud/test_map.py + tests/pytests/unit/engines/test_slack_bolt_engine.py + tests/pytests/unit/modules/state/test_state.py + tests/pytests/unit/modules/state/test_top_file_merge.py + tests/pytests/unit/proxy/test_netmiko_px.py + tests/pytests/unit/proxy/test_ssh_sample.py + tests/pytests/unit/roster/test_sshknownhosts.py + + # tests that require boto + tests/pytests/unit/engines/test_sqs_events.py + + # first test always fails + tests/pytests/unit/utils/parsers/test_log_parsers.py + ) + + rm -r "${remove_test_files[@]}" || die + + # axe the boto dep (bug #888235) + find "${S}/tests" -name 'test_boto_*.py' -delete || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die + + # called_once should be assert_called_once_with + find "${S}/tests" -name '*.py' -print0 \ + | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + local -x USE_SETUPTOOLS=1 + distutils-r1_python_install_all + + local svc + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local -a EPYTEST_DESELECT=( + # doesn't like the distutils warning + tests/pytests/integration/cli/test_batch.py::test_batch_retcode + tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch + + # hangs indefinitely + tests/pytests/unit/test_minion.py::test_master_type_disable + + # needs root + tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group + tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure + + # don't like sandbox + tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest + tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward + tests/pytests/functional/fileserver/test_roots.py::test_symlink_list + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline + tests/pytests/functional/modules/test_defaults.py::test_defaults_get + tests/pytests/functional/modules/test_system.py::test_get_system_date_time + tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc + tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match + tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd + tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source + tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043 + tests/pytests/functional/states/file/test_comment.py::test_issue_62121 + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name + tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites + tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls + tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path + tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208 + tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data + tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff + tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case + tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter + tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg + tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd + tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775 + tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings + tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state + tests/pytests/functional/states/test_pip_state.py::test_issue_54755 + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env + tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]" + tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing + tests/pytests/functional/utils/test_pillar.py::test_gitpython_env + tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request + tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos + tests/pytests/functional/utils/test_pillar.py::test_pygit2_env + tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos + tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple + tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple + tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout + tests/pytests/integration/minion/test_return_retries.py::test_publish_retry + tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]" + tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]" + tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order + tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings + tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call + tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]" + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]" + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]" + tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime + tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster + tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate + tests/pytests/unit/grains/test_core.py::test_get_machine_id + tests/pytests/unit/grains/test_package.py::test_grain_package_type + tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed + tests/pytests/unit/modules/test_beacons.py::test_add + tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_delete + tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_disable + tests/pytests/unit/modules/test_beacons.py::test_enable + tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_save + tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar + tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase + tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache + tests/pytests/unit/modules/test_saltutil.py::test_list_extmods + tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk + tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message + tests/pytests/unit/states/test_pkg.py::test_mod_beacon + tests/pytests/unit/states/test_service.py::test_mod_beacon + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina + tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument + tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror + tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode + tests/unit/utils/test_vt.py::VTTestCase::test_vt_size + + # tests that need network access + tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true + tests/pytests/unit/utils/test_http.py::test_query_proxy + tests/pytests/unit/utils/test_network.py::test_isportopen + + # tests that need root access + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2 + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1 + ) + [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=( + tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black + tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black + ) + [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=( + tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt + tests/integration/modules/test_mine.py::MineTest::test_mine_delete + tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt + tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state + tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate + tests/integration/output/test_output.py::OutputReturnTest::test_output_json + tests/integration/output/test_output.py::OutputReturnTest::test_output_nested + tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint + tests/integration/output/test_output.py::OutputReturnTest::test_output_raw + tests/integration/output/test_output.py::OutputReturnTest::test_output_txt + tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml + tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper + tests/integration/output/test_output.py::OutputReturnTest::test_static_simple + tests/integration/runners/test_manage.py::ManageTest::test_down + tests/integration/runners/test_manage.py::ManageTest::test_up + tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized + tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false + tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]" + tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is + tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed + tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]" + tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info + tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors + ) + + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die + ( + test_exports=( + TMPDIR + SHELL="/bin/bash" + USE_SETUPTOOLS=1 + NO_INTERNET=1 + PYTHONDONTWRITEBYTECODE=1 + ) + export "${test_exports[@]}" + + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + epytest --run-slow + ) +} diff --git a/app-admin/selint/selint-1.2.1.ebuild b/app-admin/selint/selint-1.2.1.ebuild index 358b8be6eee1..e32de56f5c31 100644 --- a/app-admin/selint/selint-1.2.1.ebuild +++ b/app-admin/selint/selint-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git" else SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest index a66d0d5bd131..eeed98dadb74 100644 --- a/app-admin/serf/Manifest +++ b/app-admin/serf/Manifest @@ -1,6 +1,3 @@ -DIST serf-0.10.0-deps.tar.xz 24363004 BLAKE2B f0fed10ffa8ff536263f6fde5a87e9584c35a681e7821a91d123aa8bd149ca1b9024d454f8163de458e4b928e887736c3247661afbc3f46b2ba38bef09d4516d SHA512 73815e512fda8aa00241bff84e1ee2414106a4b1a6189e66aa80967152acafde56eeafd15b87cbaefcbedc093f1c42cfb19b9d5776473c4c580416c2b671931a -DIST serf-0.10.0.tar.gz 446394 BLAKE2B 627e9ee776e217db09dde4bb22d1f317c884f887d918ba69de9bb65160eb00280c1ae5f53119570732f462c35381bd24a81405761b8ec63193295b6245298049 SHA512 53cb42b4a5f94fbb9e099739af0e31bb00cc261ea16325c3e5b9f081bb31299b5b8e42bc92d0f83ae78e511854589a95ab011930f373c1ad148c152b73adf485 DIST serf-0.10.1-deps.tar.xz 24356192 BLAKE2B f635b7f4ea496aeac3148132ff0c4fcd2de037a2fc4c7c0c3943f2531b816a8002eb1e14a2204a30c206630f94400f953ae872e18bd2164c1d688f80961d54b8 SHA512 401e5bb706b3bf6521401ad4d40b02b331e71c6a0886796002046c83dffcffc735b803634d96bff5220d1069f418881daa9432412c4bcf6b7f3b37036d1a3a20 +DIST serf-0.10.1-r1-deps.tar.xz 760452 BLAKE2B 3e2b55d59fd2d94e8cee9082346e827fc1d7ff7d3fb01663d4ae0001a5c29c47212a29c3a98a544dbd4576f157c4c49abea8477c204f96c012b3f4c469724886 SHA512 2a288309d3e5a9486231ddbcd86cee28e950c778dda60247a23692d7e57f0386fdc88e6aff45f5407acd4e604e122f7b010111668340eee1e77f85c80e69803a DIST serf-0.10.1.tar.gz 447396 BLAKE2B a5b1aadf2e7d9b807406d8bd1d2db799f7a629a4db3abb3558c405b7bf81b5bef618157e51887ac631f3b42ca9eab3107ead8ead938ed0a1267299b2c47e0a18 SHA512 50febac6a634b7e19e58a2591371228fe7c1865673f48d082ed57cff1ac9c404d6a3b328d85b82cb92f05973a34396b824fdd9cb81f3e12c586b3f56d6734fa8 -DIST serf-0.9.8-deps.tar.xz 24178272 BLAKE2B 6a82fa025245f0c393b55d87a10195a9ed5f314b3cb772b54b01b858b9f6b393991cc206f269b39efe9a9061aeff948191ae48070eb7c1e5bf77781c97173952 SHA512 ec12d4b27044f58e897984adb3855413e2d3a624f62dffe981353bb5bfbbcbe64501080ef543bc446633716bbfe3ef29c3c93c44db8599b5639e2ef8d20d8eee -DIST serf-0.9.8.tar.gz 444968 BLAKE2B 023413f75444f8e785bd7c5029e84ef58abca1c227f69dd8c16111c30afb38ff331e39cd8c30539f133229829bb9517516ff0e18e49b2dc9fb53df2ed40224b3 SHA512 1501ad6587f77840f7ad95d2886aafa3c28ffa533e862df0ebe5a4822078de09370c2ca1826d47dc6ff84e8598fb3711125a16e399a935ac39bad887e532c402 diff --git a/app-admin/serf/serf-0.10.0.ebuild b/app-admin/serf/serf-0.10.0.ebuild deleted file mode 100644 index 540d5af97180..000000000000 --- a/app-admin/serf/serf-0.10.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module systemd - -KEYWORDS="~amd64" -EGO_PN="github.com/hashicorp/serf" -DESCRIPTION="Service orchestration and management tool" -HOMEPAGE="https://www.serfdom.io/" -SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" - -SLOT="0" -LICENSE="MPL-2.0 Apache-2.0 BSD MIT" -IUSE="" -RESTRICT+=" test" -BDEPEND="" -RDEPEND=" - acct-user/serf - acct-group/serf" - -src_prepare() { - default - sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \ - -e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \ - -e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \ - -i GNUmakefile || die -} - -src_compile() { - mkdir -p ./bin - go build -o ./bin/serf ./cmd/serf || die -} - -src_install() { - local x - - dobin "${S}/bin/${PN}" - - keepdir /etc/serf.d - insinto /etc/serf.d - - for x in /var/{lib,log}/${PN}; do - keepdir "${x}" - fowners serf:serf "${x}" - done - - newinitd "${FILESDIR}/serf.initd" "${PN}" - newconfd "${FILESDIR}/serf.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/serf.service" -} diff --git a/app-admin/serf/serf-0.9.8.ebuild b/app-admin/serf/serf-0.10.1-r1.ebuild index 540d5af97180..97a6a9dac3d6 100644 --- a/app-admin/serf/serf-0.9.8.ebuild +++ b/app-admin/serf/serf-0.10.1-r1.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit go-module systemd -KEYWORDS="~amd64" -EGO_PN="github.com/hashicorp/serf" DESCRIPTION="Service orchestration and management tool" HOMEPAGE="https://www.serfdom.io/" SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" + https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz" +LICENSE="MPL-2.0" +LICENSE+=" Apache-2.0 BSD MIT" SLOT="0" -LICENSE="MPL-2.0 Apache-2.0 BSD MIT" -IUSE="" +KEYWORDS="~amd64" RESTRICT+=" test" -BDEPEND="" RDEPEND=" acct-user/serf acct-group/serf" +PATCHES=("${S}/go-mod-sum.patch") src_prepare() { default @@ -31,7 +30,7 @@ src_prepare() { src_compile() { mkdir -p ./bin - go build -o ./bin/serf ./cmd/serf || die + ego build -o ./bin/serf ./cmd/serf || die } src_install() { diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index 56a07eb8e38a..2e475c76c75d 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1 +1,2 @@ -DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8 +DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1 +DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e diff --git a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch deleted file mode 100644 index 3137f1a89f9a..000000000000 --- a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 32eed2ae8fcd868179a317d48cfd61d828c834df Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Sun, 19 Sep 2021 14:12:44 +0200 -Subject: [PATCH] __init__.py: Make NetworkX dep optional - -selinux commit ba23ba068364ab11ff51f52bd1e20e3c63798a62 -"python: Import specific modules from setools for less deps" -Makes userspace tools only need specific parts of setools so that the -NetworkX dep can be dropped for minimal installations. -Unfortunately the __init__ still imports the parts which require -NetworkX. Wrap them in try except to guard for missing NetworkX. - -$ semanage export -Traceback (most recent call last): - File "/usr/lib/python-exec/python3.9/semanage", line 29, in <module> - import seobject - File "/usr/lib/python3.9/site-packages/seobject.py", line 33, in <module> - import sepolicy - File "/usr/lib/python3.9/site-packages/sepolicy/__init__.py", line 15, in <module> - from setools.boolquery import BoolQuery - File "/usr/lib/python3.9/site-packages/setools/__init__.py", line 94, in <module> - from .infoflow import InfoFlowAnalysis - File "/usr/lib/python3.9/site-packages/setools/infoflow.py", line 24, in <module> - import networkx as nx -ModuleNotFoundError: No module named 'networkx' - -Bug: https://bugs.gentoo.org/809038 -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - setools/__init__.py | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/setools/__init__.py b/setools/__init__.py -index d72d343..e583737 100644 ---- a/setools/__init__.py -+++ b/setools/__init__.py -@@ -91,11 +91,20 @@ from .pcideviceconquery import PcideviceconQuery - from .devicetreeconquery import DevicetreeconQuery - - # Information Flow Analysis --from .infoflow import InfoFlowAnalysis -+try: -+ from .infoflow import InfoFlowAnalysis -+except ImportError: -+ # NetworkX is optional -+ pass -+ - from .permmap import PermissionMap, RuleWeight, Mapping - - # Domain Transition Analysis --from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition -+try: -+ from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition -+except ImportError: -+ # NetworkX is optional -+ pass - - # Policy difference - from .diff import PolicyDifference --- -2.32.0 - diff --git a/app-admin/setools/files/setools-4.4.1-cython3.patch b/app-admin/setools/files/setools-4.4.1-cython3.patch new file mode 100644 index 000000000000..386b92f44576 --- /dev/null +++ b/app-admin/setools/files/setools-4.4.1-cython3.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/898664 +https://github.com/SELinuxProject/setools/pull/105/commits/fc443b5a0379f3644e071a458e996ea6115ccba3 +(cherry-picked from https://github.com/SELinuxProject/setools/commit/31e104c3a9ca97038e09d3a4549fe2b8c8df36e8) + +From fc443b5a0379f3644e071a458e996ea6115ccba3 Mon Sep 17 00:00:00 2001 +From: Chris PeBenito <chpebeni@linux.microsoft.com> +Date: Mon, 17 Jul 2023 16:08:21 -0400 +Subject: [PATCH] SELinuxPolicy: Add explicit cast for libspol message + callback. + +Cython 3.0 is more strict. The change fixes this issue: + +setools/policyrep/selinuxpolicy.pxi:685:46: Cannot assign type 'void (void *, sepol_handle_t *, const char *, ...) except *' to 'msg_callback' + +Additionally, the msg_callback is not typedef-ed in sepol/debug.h, so it must +be explicitly defined in sepol.pxd for the casting to work. + +Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com> +--- a/setools/policyrep/selinuxpolicy.pxi ++++ b/setools/policyrep/selinuxpolicy.pxi +@@ -668,7 +668,7 @@ cdef class SELinuxPolicy: + if self.sh == NULL: + raise MemoryError + +- sepol.sepol_msg_set_callback(self.sh, sepol_logging_callback, self.handle) ++ sepol.sepol_msg_set_callback(self.sh, <sepol.msg_callback>sepol_logging_callback, self.handle) + + if sepol.sepol_policydb_create(&self.handle) < 0: + raise MemoryError +--- a/setools/policyrep/sepol.pxd ++++ b/setools/policyrep/sepol.pxd +@@ -16,8 +16,10 @@ cdef extern from "<sepol/handle.h>": + void sepol_handle_destroy(sepol_handle_t *sh) + + ++ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) ++ ++ + cdef extern from "<sepol/debug.h>": +- ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) + void sepol_msg_set_callback(sepol_handle * handle, msg_callback cb, void *cb_arg) + + diff --git a/app-admin/setools/files/setools-4.4.0-remove-gui.patch b/app-admin/setools/files/setools-4.4.2-remove-gui.patch index 01b40adb29db..49d16ec66b56 100644 --- a/app-admin/setools/files/setools-4.4.0-remove-gui.patch +++ b/app-admin/setools/files/setools-4.4.2-remove-gui.patch @@ -1,6 +1,6 @@ ---- a/setup.py 2021-03-17 22:56:42.016632635 +0000 -+++ b/setup.py 2021-03-17 23:02:33.625713629 +0000 -@@ -139,10 +139,10 @@ setup(name='setools', +--- a/setup.py ++++ b/setup.py +@@ -139,12 +139,10 @@ setup(name='setools', author_email='pebenito@ieee.org', url='https://github.com/SELinuxProject/setools', cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand}, @@ -9,8 +9,10 @@ + packages=['setools', 'setools.checker', 'setools.diff'], + scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'], data_files=installed_data, -- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, -+ package_data={'setools': ['perm_map']}, +- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map', +- 'policyrep.pyi', +- 'py.typed']}, ++ package_data={'setools': ['perm_map', 'policyrep.pyi', 'py.typed']}, ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'], annotate=cython_annotate, compiler_directives={"language_level": 3, diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml index 9e77647c601c..2367a4105f5c 100644 --- a/app-admin/setools/metadata.xml +++ b/app-admin/setools/metadata.xml @@ -5,9 +5,6 @@ <email>selinux@gentoo.org</email> <name>SELinux Team</name> </maintainer> - <use> - <flag name="infoflow">Depend on <pkg>dev-python/networkx</pkg> to use seinfoflow</flag> - </use> <upstream> <remote-id type="github">SELinuxProject/setools</remote-id> </upstream> diff --git a/app-admin/setools/setools-4.4.0-r3.ebuild b/app-admin/setools/setools-4.4.2.ebuild index a0cb642ddea6..a0fdba4cdd9d 100644 --- a/app-admin/setools/setools-4.4.0-r3.ebuild +++ b/app-admin/setools/setools-4.4.2.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI="8" + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 @@ -13,43 +15,47 @@ HOMEPAGE="https://github.com/SELinuxProject/setools/wiki" if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git" + S="${WORKDIR}/${P}" else SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2" KEYWORDS="amd64 arm arm64 x86" + S="${WORKDIR}/${PN}" fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="test infoflow X" +IUSE="test X" RESTRICT="!test? ( test )" -S="${WORKDIR}/${PN}" RDEPEND="${PYTHON_DEPS} dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= - infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) X? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] test? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] sys-apps/checkpolicy )" +PATCHES=( + "${FILESDIR}"/${PN}-4.4.1-cython3.patch +) + +distutils_enable_tests pytest + python_prepare_all() { - sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch ) - use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) distutils-r1_python_prepare_all } python_test() { - esetup.py test + rm -rf setools || die + epytest } diff --git a/app-admin/setools/setools-4.4.0-r2.ebuild b/app-admin/setools/setools-4.4.4.ebuild index 88109fb61e5a..d74e1d12b4bf 100644 --- a/app-admin/setools/setools-4.4.0-r2.ebuild +++ b/app-admin/setools/setools-4.4.4.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI="8" + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -13,43 +15,43 @@ HOMEPAGE="https://github.com/SELinuxProject/setools/wiki" if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git" + S="${WORKDIR}/${P}" else SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2" KEYWORDS="amd64 arm arm64 x86" + S="${WORKDIR}/${PN}" fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="test infoflow X" +IUSE="test X" RESTRICT="!test? ( test )" -S="${WORKDIR}/${PN}" RDEPEND="${PYTHON_DEPS} - dev-python/setuptools + >=dev-python/networkx-2.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= - infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) X? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-python/cython-0.27 - dev-python/setuptools +BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] test? ( - >=dev-python/networkx-2.0[${PYTHON_USEDEP}] sys-apps/checkpolicy )" +distutils_enable_tests pytest + python_prepare_all() { - sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch ) - use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) distutils-r1_python_prepare_all } python_test() { - esetup.py test + rm -rf setools || die + epytest } diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild index 2ab393f30dcc..ec3d11050109 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI="8" + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -22,34 +24,34 @@ fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="test infoflow X" +IUSE="test X" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} + >=dev-python/networkx-2.0[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= - infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) X? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] test? ( - >=dev-python/networkx-2.0[${PYTHON_USEDEP}] sys-apps/checkpolicy )" +distutils_enable_tests pytest + python_prepare_all() { - sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - use X || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) distutils-r1_python_prepare_all } python_test() { - esetup.py test + rm -rf setools || die + epytest } diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest index 9239d8649321..1e0238844f74 100644 --- a/app-admin/spectre-meltdown-checker/Manifest +++ b/app-admin/spectre-meltdown-checker/Manifest @@ -1,7 +1,2 @@ -DIST spectre-meltdown-checker-0.39.tar.gz 43785 BLAKE2B c8688b28eac8951b3cf813cd591adc9cb01756a1da149129d2045274bf3d01c56a9145c4dd9154f6229d53a993dd8803e6c0cca866710ba09973f13421be4e6f SHA512 175bc147356e9730fb13f71c66e8826e85e3ad4e0d7f1fbb075f8310e1763f442b3da85fae70f107dcd77172d498fb24857c9e8343cb6813857039d55e9eab6f -DIST spectre-meltdown-checker-0.40.tar.gz 52463 BLAKE2B d0cbaf695bea41bf918900d1356b8dd26cd7ab7b66ce8a82b2e82a0554dcfe5435bb20262490dcab312e2be4962a2fabb1defba0295a84ee62b5fa876f20f5b8 SHA512 da2d63d9aa513a529537dc58f9370c811577f70ecd856ee001888108a871351484f47697cdefb1b0711be3fb342ba733e78b75fd154eec98c4c9a8504e6adcf9 -DIST spectre-meltdown-checker-0.41.tar.gz 56170 BLAKE2B 07ec1a56dd13c15463696d136652f67d771d71be5ff39ed0024ab69b5dc84b1bef0c695771b0966c89e7311a9c894e2f7b9ddb8ad2c4120da183948b63044c2c SHA512 4391098cd969a211ed77e386e79df3ea2c2482bc1817e9b037720922cbd845457c4192e1de7b0a62ec971c3b6c551240cf2ef29191fadce1698256af43737b26 -DIST spectre-meltdown-checker-0.42.tar.gz 57491 BLAKE2B b13fdf74e0b63db1dd1aaa6bc154ab2717ee4a3ca601d7c6fb18578e42d03545010fe74cb72fe17ccc8c2ff949d47af49704cd8bd7431b5ec3cf1d7fbd288d49 SHA512 721e9287ce367648e367850b94866a6465b92561a0c2f1699599ef333921fda988979db02004b2c83ec9c808f625f793d43eacdd84d44a9d1eba59b2b300174c -DIST spectre-meltdown-checker-0.43.tar.gz 51651 BLAKE2B f94ad2d144709511738a0149ed133da1e46a57546eaf0a702e1713c66529155b6fe3772911099bd0228fb295a04cacbe4ea39998555c139cddb1bb4b2beff1fc SHA512 68ca476025e5862466ca5e12e6950a538b84f36e08dfb0650ab6d13b6e94762dda8a49d9f5e20d0ee585103199ed0ddaa9dcf7cd72378156a7e1e6c87f70afda -DIST spectre-meltdown-checker-0.44.tar.gz 54325 BLAKE2B 120c7a6fd9e4df27daf605f8c9d62fb999f164578c02499651d19e48ca9af88fbc09338f85b6e05a2b139ac7d83193768f337651e276af7099fdee22bf1c5354 SHA512 05ac99cee08cd52f8ec2c8066fe9bb090310eed9b668008d0a58ffc4ecc0df72a5bf198492dd3c19f9b85e31102a9ca7aab2e4a9a93c7f5f0ea447053e664804 DIST spectre-meltdown-checker-0.45.tar.gz 64268 BLAKE2B 14d49f40458167ab9af04cc31c9a0b9f8cb5f1e9417f5ac0bab0290be01cf14a737c716d8d28873fee1870535c0b36a56dac2d39f2cc7a000d27f0643a94cff7 SHA512 8662417f94066ae25d44a32e3db99788417c799b89ef8dd452b05ea38a8a2746eaf83e4577633732b175dfa9fc2649d131e10506a9cb1ce29c932166cae9b8e7 +DIST spectre-meltdown-checker-0.46.tar.gz 67595 BLAKE2B 355469c2176fffa8fb40695b47174959c9112e66cd870545ed424ef7b6ef4c10a5aa94bfbc6912510c979e16b0f8a18c0b822200eb69e9ded8300305d779fa79 SHA512 02464340b88673cdcd66f8953246e33beb68c2de49e118afc24af2e1153a7313ef561a236b27e7f7d6ada8c7f23c4780d435c6a396d838952093eb3c401aab22 diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.39.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.39.ebuild deleted file mode 100644 index efd53926560f..000000000000 --- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.39.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git" -else - SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux" -HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker" - -LICENSE="GPL-3+" -SLOT="0" - -src_install() { - default - newbin spectre-meltdown-checker.sh spectre-meltdown-checker -} diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.40.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.40.ebuild deleted file mode 100644 index 79630a20430e..000000000000 --- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.40.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git" -else - SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux" -HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker" - -LICENSE="GPL-3+" -SLOT="0" - -src_install() { - default - newbin spectre-meltdown-checker.sh spectre-meltdown-checker -} diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.41.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.41.ebuild deleted file mode 100644 index 3d7f2444be11..000000000000 --- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.41.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git" -else - SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux" -HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker" - -LICENSE="GPL-3+" -SLOT="0" - -src_install() { - default - newbin spectre-meltdown-checker.sh spectre-meltdown-checker -} diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild deleted file mode 100644 index 6b4c5b8281fa..000000000000 --- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git" -else - SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux" -HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker" - -LICENSE="GPL-3+" -SLOT="0" - -src_install() { - default - newbin spectre-meltdown-checker.sh spectre-meltdown-checker -} diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild deleted file mode 100644 index 899c7e4ecc8a..000000000000 --- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git" -else - SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 x86" -fi - -DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux" -HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker" - -LICENSE="GPL-3+" -SLOT="0" - -src_install() { - default - newbin spectre-meltdown-checker.sh spectre-meltdown-checker -} diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.45.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.45.ebuild index 0e0bdb41594c..020346717994 100644 --- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.45.ebuild +++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.45.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git" else SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 arm arm64 x86" fi DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux" diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.46.ebuild index e66122d3d838..020346717994 100644 --- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild +++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.46.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} == *9999 ]]; then inherit git-r3 diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest index ad5c04e8077a..adfbb50991e0 100644 --- a/app-admin/sshguard/Manifest +++ b/app-admin/sshguard/Manifest @@ -1 +1 @@ -DIST sshguard-2.4.2.tar.gz 835431 BLAKE2B f76cbe41ced4d23448ba09750d073a47dae263616c34ec2e2efd7d6367339d352925958b5d9d711a3c4a8c2da10fae2474384a3de14434c0dff19bd645325058 SHA512 f2fe35180af8698d4b2053e9ffbf17df9f033b0c2fcc045caa085467d14174e17aa266d2ef3ce9536037e54f7d3ea42de9e32e7faee65612894294793082862a +DIST sshguard-2.4.3.tar.gz 1118756 BLAKE2B 8e3bd297c5712b4a411de6581e96a21db03203974cedba443bf16dd042e3b1b54c68cbacfa5af1610e738e1f847f1f0fae4792b52b618946f8b13fb0f5d4e338 SHA512 eeecea1007c1a21a28835a6d29c2cbffc647b3ab09a3525600e91b978d4ebdda9e6a7e2884da26bb1d7f64de561ac8bd1788bb776730d37b7a4fa49b22885b4a diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml index 41341d704f0f..cb67516a6d39 100644 --- a/app-admin/sshguard/metadata.xml +++ b/app-admin/sshguard/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">sshguard</remote-id> + <remote-id type="bitbucket">sshguard/sshguard</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/sshguard/sshguard-2.4.2.ebuild b/app-admin/sshguard/sshguard-2.4.3.ebuild index 4333d820bc82..d0bd1ebaa85d 100644 --- a/app-admin/sshguard/sshguard-2.4.2.ebuild +++ b/app-admin/sshguard/sshguard-2.4.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools systemd DESCRIPTION="protects hosts from brute force attacks against ssh" @@ -19,7 +19,7 @@ LICENSE="BSD" SLOT="0" DEPEND=" - sys-devel/flex + app-alternatives/lex " RDEPEND=" virtual/logger diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild index ee4653a215e3..d2b3282e1a88 100644 --- a/app-admin/sshguard/sshguard-99999.ebuild +++ b/app-admin/sshguard/sshguard-99999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools systemd DESCRIPTION="protects hosts from brute force attacks against ssh" @@ -12,14 +12,14 @@ if [[ "${PV}" == 99999 ]] ; then EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}" else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="BSD" SLOT="0" DEPEND=" - sys-devel/flex + app-alternatives/lex " RDEPEND=" virtual/logger diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest index 07d6f52021dc..5b130944a5ec 100644 --- a/app-admin/stow/Manifest +++ b/app-admin/stow/Manifest @@ -1,2 +1,4 @@ DIST stow-2.3.1.tar.bz2 556921 BLAKE2B cd946dd1537bec063e21c91cc60c0c8f3a8a5609960536020e7e4b970ff2daa628151258487492b1b44fb5539e1d75a8955152fdfbe91384b7e174ab420a9cf6 SHA512 3d6cec3d50e2dc0ffa92646c45015ced3fca32cef9dd24418fada3fc2e4472a1f335877debb3a1284812aef281a432925c3a3e7afa112d92f127facd3150079c DIST stow-2.3.1.tar.bz2.sig 833 BLAKE2B a236d67fca2dabb965021b7ef23ec680ffd48c1b23d3637cf4bd2c31da58b55ad9d190ee88c7f9bb8ce676f85a0bb133b963bc8252fea7c8d5bd5c0042c65681 SHA512 0a0ad10781c29ee6cd69dc8cb05592e779e5cb53412b8bc6c7bce12846c1e1480e2763eaaab329f2cf945a263d15217adb102387247bc2bec313856b3d7535c4 +DIST stow-2.4.0.tar.bz2 635343 BLAKE2B 578d3cf5084a97110eb90faed96d7ae1b167176795b7c4a3a65d5fc43a59983f5106fbb9d8ea136df92363e041f81c72483cd748cef9e051c2089795af53a6a6 SHA512 c479a0ba5d6af9a2a4860f4bf4095dbd586794e781766c22e6cda657bbf984915f4661e03825db02a300412aa49305e06b8107ffc96077bd64ba4e7a1eb27314 +DIST stow-2.4.0.tar.bz2.sig 833 BLAKE2B df8665e5d8189177138313de95ed1edcd1a38deca753f064cb9e6e1e5447c55467330c4d8f8ffefd05be12528788738e4ecd427db14bf36fdd070161b69a7422 SHA512 02bb9549a1d27c532f7dfbd42d5a6dcd92d0de7692f8e43c74ebd662c63e6cae656edc045379eb81e9908f88ee89100edd8b9fe416e4c13399357579c4836f66 diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild index 885c958580cc..2c8d731bfc35 100644 --- a/app-admin/stow/stow-2.3.1.ebuild +++ b/app-admin/stow/stow-2.3.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/adamspiers.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/adamspiers.asc inherit perl-functions verify-sig DESCRIPTION="GNU Stow is a symlink farm manager" diff --git a/app-admin/stow/stow-2.4.0.ebuild b/app-admin/stow/stow-2.4.0.ebuild new file mode 100644 index 000000000000..a69e14905be7 --- /dev/null +++ b/app-admin/stow/stow-2.4.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/adamspiers.asc +inherit perl-functions verify-sig + +DESCRIPTION="GNU Stow is a symlink farm manager" +HOMEPAGE="https://www.gnu.org/software/stow/ https://git.savannah.gnu.org/cgit/stow.git" +SRC_URI="mirror://gnu/stow/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-lang/perl:=" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-perl/IO-stringy + virtual/perl-Test-Harness + dev-perl/Test-Output + ) + verify-sig? ( sec-keys/openpgp-keys-adamspiers ) +" + +src_configure() { + perl_set_version + econf "--with-pmdir=${VENDOR_LIB}" +} diff --git a/app-admin/su-exec/su-exec-0.2.ebuild b/app-admin/su-exec/su-exec-0.2.ebuild index 119e2dc77348..50948421a60d 100644 --- a/app-admin/su-exec/su-exec-0.2.ebuild +++ b/app-admin/su-exec/su-exec-0.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 1e49c18bb66f..90f9f2b10c40 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,4 +1,2 @@ -DIST sudo-1.9.12p2.tar.gz 4909431 BLAKE2B 79eac710b757acae7aa98e6e6f495a475e5236be456e4687fb1441345ee296672ff80a5a60902cffcd257aa81a01fbc3857f3c52e51bb46f56c060fd299e0c05 SHA512 5e035246137d5820691f7ddfc13faec3886e3cf1563ed56633667d86ab4f1306f34cc0e27808f56790b6c6a4614826e54c5b7e47b31eb009b96dde3e52170c45 -DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf5c5fb2e660d1f8777cdb209928912ddd8d89d878bd2218df3acd1e7fee5aa850e8d01a1cfac6ab310c788149fa SHA512 0b2f10488c44bfcd94eed97002865d89f4a03a92ef3b890fac3121ef0f9e6c55387771ddead1a94dc92d85c35e3d28b4730f35cdc2aafb51128594555ea29876 -DIST sudo-1.9.13p3.tar.gz 5100355 BLAKE2B 46218ecf4cf06d2280ccf4c257b12a6f697eda17b96a6b7aa56f6c7f22d847ec2a8036b9f615c3328d985656539c95f37a40c6c72dfa5f65786ab45a28cf353f SHA512 c0c5cd0c6308868afdad2ecf55b86fdcf1f49889b30831c9db3bc56a63dc3a07686c285c20b2500494b2a76653e2ec69196abdc583312609a5db1c81a6e4e737 -DIST sudo-1.9.13p3.tar.gz.sig 566 BLAKE2B 5b59c7178bf157b67500d972fe1b373bc86ab09345f59733cffa85700221ceec0d5be10bce4838f16e9238154c90a972570a7a933f48dbd56bc64b38dbc0043f SHA512 eebf36e86ebd03daca05838bc56d9b1fb7ea8584a83a9f0e03c5ff07e612d36472b23797c628eff1cf4301832d139de0de62ddc8b17e20f1498f769a4db1249a +DIST sudo-1.9.15p5.tar.gz 5306611 BLAKE2B 73ee598c2a2848d5be24f97492b13eba2f326c514799220e43a1aeafc6692224a7555fb7cc0a96a2720751d3e4d98e752804db589ac3c1476f24e71f5b9bc720 SHA512 ebac69719de2fe7bd587924701bdd24149bf376a68b17ec02f69b2b96d4bb6fa5eb8260a073ec5ea046d3ac69bb5b1c0b9d61709fe6a56f1f66e40817a70b15a +DIST sudo-1.9.15p5.tar.gz.sig 566 BLAKE2B ddd8fed1b3721aafdb32b762834168063c3f0f003ef5d83f1883615320da6fe89b08d72c8e893c8b2bf9fd892a40e47cc77d72672e43b5a24db50e7194d9bc4c SHA512 97480a3d27b546a93e997c3a1e8169904a7625ab8fa6198d0b7e1d2d040f55b2d58462cd08e5cc97c2f1c817b12343e35cdd7db207aee42785f2b95b17c600b0 diff --git a/app-admin/sudo/sudo-1.9.13_p3.ebuild b/app-admin/sudo/sudo-1.9.13_p3.ebuild deleted file mode 100644 index 2d77e6863bd9..000000000000 --- a/app-admin/sudo/sudo-1.9.13_p3.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit pam libtool tmpfiles toolchain-funcs - -MY_P="${P/_/}" -MY_P="${MY_P/beta/b}" - -DESCRIPTION="Allows users or groups to run commands as other users" -HOMEPAGE="https://www.sudo.ws/" - -if [[ ${PV} == 9999 ]] ; then - inherit mercurial - EHG_REPO_URI="https://www.sudo.ws/repos/sudo" -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc - inherit verify-sig - - uri_prefix= - case ${P} in - *_beta*|*_rc*) uri_prefix=beta/ ;; - esac - - SRC_URI=" - https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz - ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz - verify-sig? ( - https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig - ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig - ) - " - - if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris" - fi - - BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )" -fi - -S="${WORKDIR}/${MY_P}" - -# Basic license is ISC-style as-is, some files are released under -# 3-clause BSD license -LICENSE="ISC BSD" -SLOT="0" -IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd" - -DEPEND=" - sys-libs/zlib:= - virtual/libcrypt:= - gcrypt? ( dev-libs/libgcrypt:= ) - ldap? ( - >=net-nds/openldap-2.1.30-r1:= - sasl? ( - dev-libs/cyrus-sasl - net-nds/openldap:=[sasl] - ) - ) - pam? ( sys-libs/pam ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( sys-libs/libselinux ) - skey? ( >=sys-auth/skey-1.1.5-r1 ) - ssl? ( dev-libs/openssl:0= ) - sssd? ( sys-auth/sssd[sudo] ) -" -RDEPEND=" - ${DEPEND} - >=app-misc/editor-wrapper-3 - virtual/editor - ldap? ( dev-lang/perl ) - pam? ( sys-auth/pambase ) - selinux? ( sec-policy/selinux-sudo ) - sendmail? ( virtual/mta ) -" -BDEPEND+=" - sys-devel/bison - virtual/pkgconfig -" - -REQUIRED_USE=" - ?? ( pam skey ) - ?? ( gcrypt ssl ) -" - -MAKEOPTS+=" SAMPLES=" - -src_prepare() { - default - - elibtoolize -} - -set_secure_path() { - # First extract the default ROOTPATH from build env - SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}") - - case "${SECURE_PATH}" in - */usr/sbin*) - ;; - *) - SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}") - ;; - esac - - if [[ -z ${SECURE_PATH} ]] ; then - ewarn " Failed to detect SECURE_PATH, please report this" - fi - - # Then remove duplicate path entries - cleanpath() { - local newpath thisp IFS=: - for thisp in $1 ; do - if [[ :${newpath}: != *:${thisp}:* ]] ; then - newpath+=:${thisp} - else - einfo " Duplicate entry ${thisp} removed..." - fi - done - SECURE_PATH=${newpath#:} - } - cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} - - # Finally, strip gcc paths, bug #136027 - rmpath() { - local e newpath thisp IFS=: - for thisp in ${SECURE_PATH} ; do - for e ; do - [[ ${thisp} == ${e} ]] && continue 2 ; - done - newpath+=:${thisp} - done - SECURE_PATH=${newpath#:} - } - rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*' -} - -src_configure() { - local SECURE_PATH - - set_secure_path - - # bug #767712 - tc-export PKG_CONFIG - - # - audit: somebody got to explain me how I can test this before I - # enable it.. - Diego - # - plugindir: autoconf code is crappy and does not delay evaluation - # until `make` time, so we have to use a full path here rather than - # basing off other values. - local myeconfargs=( - # We set all of the relevant options by ourselves (patched - # into the toolchain) and setting these in the build system - # actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3 - # (it'll downgrade to =2). So, this has no functional effect on - # the hardening for users. It's safe. - --disable-hardening - - # requires some python eclass - --disable-python - --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d - --enable-zlib=system - --with-editor="${EPREFIX}"/usr/libexec/editor - --with-env-editor - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo - --with-rundir="${EPREFIX}"/run/sudo - --with-vardir="${EPREFIX}"/var/db/sudo - --without-linux-audit - --without-opie - $(use_enable gcrypt) - $(use_enable nls) - $(use_enable sasl) - $(use_enable ssl openssl) - $(use_with ldap) - $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) - $(use_with offensive insults) - $(use_with offensive all-insults) - $(use_with pam) - $(use_with pam pam-login) - $(use_with secure-path secure-path "${SECURE_PATH}") - $(use_with selinux) - $(use_with sendmail) - $(use_with skey) - $(use_with sssd) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use ldap ; then - dodoc README.LDAP.md - - cat <<-EOF > "${T}"/ldap.conf.sudo - # See ldap.conf(5) and README.LDAP.md for details - # This file should only be readable by root - - # supported directives: host, port, ssl, ldap_version - # uri, binddn, bindpw, sudoers_base, sudoers_debug - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key} - EOF - - if use sasl ; then - cat <<-EOF >> "${T}"/ldap.conf.sudo - - # SASL directives: use_sasl, sasl_mech, sasl_auth_id - # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname - EOF - fi - - insinto /etc - doins "${T}"/ldap.conf.sudo - fperms 0440 /etc/ldap.conf.sudo - - insinto /etc/openldap/schema - newins docs/schema.OpenLDAP sudo.schema - fi - - if use pam ; then - pamd_mimic system-auth sudo auth account session - pamd_mimic system-auth sudo-i auth account session - fi - - keepdir /var/db/sudo/lectured - fperms 0700 /var/db/sudo/lectured - # bug #652958 - fperms 0711 /var/db/sudo - - # Don't install into /run as that is a tmpfs most of the time - # (bug #504854) - rm -rf "${ED}"/run || die - - # bug #697812 - find "${ED}" -type f -name "*.la" -delete || die -} - -pkg_postinst() { - tmpfiles_process sudo.conf - - # bug #652958 - local sudo_db="${EROOT}/var/db/sudo" - if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then - chmod 711 "${sudo_db}" || die - fi - - if use ldap ; then - ewarn - ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration." - ewarn - if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then - ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" - ewarn "configured in ${ROOT}/etc/nsswitch.conf." - ewarn - ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:" - ewarn " sudoers: ldap files" - ewarn - fi - fi - if use prefix ; then - ewarn - ewarn "To use sudo on Prefix, you need to change file ownership and permissions" - ewarn "with root privileges, as follows:" - ewarn - ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo" - ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d" - ewarn " # chown root:root ${EPREFIX}/var/db/sudo" - ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo" - ewarn - fi - - elog "To use the -A (askpass) option, you need to install a compatible" - elog "password program from the following list. Starred packages will" - elog "automatically register for the use with sudo (but will not force" - elog "the -A option):" - elog "" - elog " [*] net-misc/ssh-askpass-fullscreen" - elog " net-misc/x11-ssh-askpass" - elog "" - elog "You can override the choice by setting the SUDO_ASKPASS environmnent" - elog "variable to the program you want to use." -} diff --git a/app-admin/sudo/sudo-1.9.12_p2.ebuild b/app-admin/sudo/sudo-1.9.15_p5.ebuild index a609ac940882..b130fe70e0ad 100644 --- a/app-admin/sudo/sudo-1.9.12_p2.ebuild +++ b/app-admin/sudo/sudo-1.9.15_p5.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 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit mercurial EHG_REPO_URI="https://www.sudo.ws/repos/sudo" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc inherit verify-sig uri_prefix= @@ -33,10 +33,10 @@ else " if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi - BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )" fi S="${WORKDIR}/${MY_P}" @@ -62,7 +62,7 @@ DEPEND=" sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) sssd? ( sys-auth/sssd[sudo] ) " RDEPEND=" @@ -75,7 +75,7 @@ RDEPEND=" sendmail? ( virtual/mta ) " BDEPEND+=" - sys-devel/bison + app-alternatives/yacc virtual/pkgconfig " diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index d4ffc3496774..8f632cd98d7b 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.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=8 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit mercurial EHG_REPO_URI="https://www.sudo.ws/repos/sudo" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc inherit verify-sig uri_prefix= @@ -33,10 +33,10 @@ else " if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi - BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )" fi S="${WORKDIR}/${MY_P}" @@ -62,7 +62,7 @@ DEPEND=" sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) sssd? ( sys-auth/sssd[sudo] ) " RDEPEND=" @@ -75,7 +75,7 @@ RDEPEND=" sendmail? ( virtual/mta ) " BDEPEND+=" - sys-devel/bison + app-alternatives/yacc virtual/pkgconfig " diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest index 635d9abb518d..d23b71bbe800 100644 --- a/app-admin/supervisor/Manifest +++ b/app-admin/supervisor/Manifest @@ -1,3 +1 @@ -DIST supervisor-4.2.2.tar.gz 463657 BLAKE2B 766feffcbd70b575b6b7dfd6ed98e3510e0fd9362c423b677d44a2b5dd23ded14a349a279d3d28d4fd9e04a2175c8f00e24c07df310b61d34c7f69f60d26a4ac SHA512 f787206e6c6a5d3dfc4284974a4a87cbcaeac0c705afb2b8eae53f066413bd9e68095c5309e29625e01469a4748613370e1ac0d7be84b9d72c3623244bdd2eb3 -DIST supervisor-4.2.4.tar.gz 465151 BLAKE2B 91b99a64950dc874bdc008ba53ca8b1962cc34981fee27c2fd82956d73ace9eaaf91439ef6be40530c4860fe1eee193e19b51ab81050f7368aa7d31f8444c785 SHA512 38c55aeadb8664337b667aad891a3a2134ae4af88e90d636054e6be9aebc8a3ef87d79d15fcafd2b9966af562deeedc96ac3730bde9439dde30208f0a874f2d7 DIST supervisor-4.2.5.tar.gz 466073 BLAKE2B 54b45c824a1ad2960b04ca4ca9e54337f8c4da1a13008b559103f9efb9043588e72b3ee97c41218eb9252606d717575ad2615d12136047734f83d843d0a63bfa SHA512 ea80c8c91356646deccf20735e065fd9b341f3be6d56838d333989297a912b0a59142338925b2eb08690e038f0617814e03447673701a19093aa483432ce6d41 diff --git a/app-admin/supervisor/supervisor-4.2.2.ebuild b/app-admin/supervisor/supervisor-4.2.2.ebuild deleted file mode 100644 index 7abf6bfe8d59..000000000000 --- a/app-admin/supervisor/supervisor-4.2.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{9..10} ) -# xml.etree.ElementTree module required. -PYTHON_REQ_USE="xml(+)" -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 systemd - -DESCRIPTION="A system for controlling process state under UNIX" -HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="repoze ZPL BSD HPND GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="acct-group/supervisor" - -distutils_enable_sphinx docs -distutils_enable_tests pytest - -python_prepare_all() { - # The workaround can be dropped once this is merged: - # https://github.com/Supervisor/supervisor/pull/1413 - sed -i "/ setup.py test/d" docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - newinitd "${FILESDIR}/init.d-r2" supervisord - newconfd "${FILESDIR}/conf.d-r1" supervisord - dodoc supervisor/skel/sample.conf - keepdir /etc/supervisord.d - insinto /etc - doins "${FILESDIR}/supervisord.conf" - keepdir /var/log/supervisor - systemd_dounit "${FILESDIR}/supervisord.service" -} - -pkg_preinst() { - fowners :supervisor /var/log/supervisor - fperms 750 /var/log/supervisor -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "You may install your configuration files in ${EROOT}/etc/supervisord.d" - elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2" - elog "" - elog "By default, only members of the supervisor group can run supervisorctl." - fi -} diff --git a/app-admin/supervisor/supervisor-4.2.4.ebuild b/app-admin/supervisor/supervisor-4.2.4.ebuild deleted file mode 100644 index b21850baeb58..000000000000 --- a/app-admin/supervisor/supervisor-4.2.4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( pypy3 python3_{9..10} ) -# xml.etree.ElementTree module required. -PYTHON_REQ_USE="xml(+)" -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 systemd - -DESCRIPTION="A system for controlling process state under UNIX" -HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="repoze ZPL BSD HPND GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" - -RDEPEND="acct-group/supervisor" - -distutils_enable_sphinx docs -distutils_enable_tests pytest - -python_install_all() { - distutils-r1_python_install_all - newinitd "${FILESDIR}/init.d-r2" supervisord - newconfd "${FILESDIR}/conf.d-r1" supervisord - dodoc supervisor/skel/sample.conf - keepdir /etc/supervisord.d - insinto /etc - doins "${FILESDIR}/supervisord.conf" - keepdir /var/log/supervisor - systemd_dounit "${FILESDIR}/supervisord.service" -} - -pkg_preinst() { - fowners :supervisor /var/log/supervisor - fperms 750 /var/log/supervisor -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "You may install your configuration files in ${EROOT}/etc/supervisord.d" - elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2" - elog "" - elog "By default, only members of the supervisor group can run supervisorctl." - fi -} diff --git a/app-admin/supervisor/supervisor-4.2.5.ebuild b/app-admin/supervisor/supervisor-4.2.5.ebuild index ae3d0855ae95..d067658aa814 100644 --- a/app-admin/supervisor/supervisor-4.2.5.ebuild +++ b/app-admin/supervisor/supervisor-4.2.5.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/" LICENSE="repoze ZPL BSD HPND GPL-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" RDEPEND="acct-group/supervisor" diff --git a/app-admin/sxid/sxid-4.2-r2.ebuild b/app-admin/sxid/sxid-4.2-r3.ebuild index 8e2f23878d45..42953f3c0b36 100644 --- a/app-admin/sxid/sxid-4.2-r2.ebuild +++ b/app-admin/sxid/sxid-4.2-r3.ebuild @@ -1,32 +1,35 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="suid, sgid file and directory checking" -HOMEPAGE="http://linukz.org/sxid.shtml https://github.com/taem/sxid" -SRC_URI="http://linukz.org/download/${P}.tar.gz" +HOMEPAGE="https://linukz.org/sxid.shtml https://github.com/taem/sxid" +SRC_URI="https://linukz.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" +IUSE="selinux" -RDEPEND="virtual/mailx" +RDEPEND=" + virtual/mailx + selinux? ( sec-policy/selinux-sxid ) +" -DOCS=( docs/sxid.{conf,cron}.example ) +DOCS=( NEWS README docs/sxid.{conf,cron}.example ) src_prepare() { default # this is an admin application and really requires root to run correctly # we need to move the binary to the sbin directory - sed -i s/bindir/sbindir/g source/Makefile.in || die + sed -i 's/bindir/sbindir/g' source/Makefile.in || die + sed -i -e 's/configure.in/configure.ac/g' Makefile || die eautoreconf } pkg_postinst() { - elog elog "You will need to configure sxid.conf for your system using the manpage and example" - elog } diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest index da7cc3c7b7e8..28a9f11671bc 100644 --- a/app-admin/sysklogd/Manifest +++ b/app-admin/sysklogd/Manifest @@ -1 +1,4 @@ DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 218d9487440ab3fa395f596e5e4a9fa95df9dfa416470da658a9ac742437050c81a6e62b42763b038b8dc5d8cfab2ba30d049e269b08a66882f6d3f99863ee7b SHA512 434609dd11951b37d62b5371a2aef66424bb15ae4c98cba44762e8338ac135b37a453e5a4f40492ab80bce9b72faefc9a0ad065753f4cc5f7595911477b26e4a +DIST sysklogd-2.5.0.tar.gz 459695 BLAKE2B ab8185e114f7da2c35b6ba3e3b42e13f3697155b43ccfa923229d95150e3734f74db6f732bcbc999068d8a2f8124a404ee893d2e6ce4c154f89301b3b523df39 SHA512 4599f153b046317977de990455b1eea195967da81f68451f1bda4fadba6fe685d7fe533aba3b39f4daa456d6c4931743162a021067e0a16f072a7c77908286f9 +DIST sysklogd-2.5.1.tar.gz 461179 BLAKE2B efb1e1ef6456644935b0c5341bf844fe87ed910aec3fd0725da2cc2d6b3f0e1f8d4667e45525b61fa3a249387a23757291daa33aac2a72d4fcd89d325e12ab89 SHA512 24d8a76cab4c25b646d879676b46f98bb56c2079badab4f351bf983015479134e4a3e4d64fb50faade26fea8dd7e31c2c45610c17420c147c36bbbe054634983 +DIST sysklogd-2.5.2.tar.gz 459292 BLAKE2B c61a89e80d6fde10f5955cf3a7a563fbe9e00799eb1199bc9a2995585c074e7ab2b4fe6a30ae8bc224876448a521c3be9031853ae4710db2555279789aeda95d SHA512 0c160236d0f5ec31d0c5679c04b6f0f40a35af2b5b159af8b2b9dd2d37f5959efbe550dfc50c0b0419bea702b91a6594f2e141c2fbb78fdb20715ee8b2d27805 diff --git a/app-admin/sysklogd/sysklogd-2.5.0.ebuild b/app-admin/sysklogd/sysklogd-2.5.0.ebuild new file mode 100644 index 000000000000..24bef0bd0a53 --- /dev/null +++ b/app-admin/sysklogd/sysklogd-2.5.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Standard log daemons" +HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd" + +if [[ ${PV} == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git" +else + SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="logger logrotate" +# Needs network access +RESTRICT="test" + +DEPEND=" + logger? ( sys-apps/util-linux[-logger(+)] ) +" +RDEPEND=" + ${DEPEND} + logrotate? ( app-admin/logrotate ) +" + +DOCS=( ChangeLog.md README.md ) + +src_prepare() { + default + + [[ ${PV} == *9999 ]] && eautoreconf +} + +src_configure() { + append-lfs-flags + tc-export CC + + local myeconfargs=( + --disable-static + --runstatedir="${EPREFIX}"/run + --with-systemd=$(systemd_get_systemunitdir) + $(use_with logger) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + insinto /etc + doins syslog.conf + keepdir /etc/syslog.d + + newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd + newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd + + if use logrotate ; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/sysklogd.logrotate sysklogd + sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die + fi + + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_postinst() { + if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then + elog "Starting with version 2.0 syslogd has built in log rotation" + elog "functionality that does no longer require a running cron daemon." + elog "So we no longer install any log rotation cron files for sysklogd." + fi + + if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then + elog "Starting with version 2.1 sysklogd no longer provides klogd." + elog "syslogd now also logs kernel messages." + fi +} diff --git a/app-admin/sysklogd/sysklogd-2.5.1.ebuild b/app-admin/sysklogd/sysklogd-2.5.1.ebuild new file mode 100644 index 000000000000..37e1d34a56e8 --- /dev/null +++ b/app-admin/sysklogd/sysklogd-2.5.1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Standard log daemons" +HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd" + +if [[ ${PV} == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git" +else + SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="logger logrotate" +# Needs network access +RESTRICT="test" + +DEPEND=" + logger? ( sys-apps/util-linux[-logger(+)] ) +" +RDEPEND=" + ${DEPEND} + logrotate? ( app-admin/logrotate ) +" + +DOCS=( ChangeLog.md README.md ) + +src_prepare() { + default + + [[ ${PV} == *9999 ]] && eautoreconf +} + +src_configure() { + append-lfs-flags + tc-export CC + + local myeconfargs=( + --disable-static + --runstatedir="${EPREFIX}"/run + --with-systemd=$(systemd_get_systemunitdir) + $(use_with logger) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + insinto /etc + doins syslog.conf + keepdir /etc/syslog.d + + newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd + newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd + + if use logrotate ; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/sysklogd.logrotate sysklogd + sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die + fi + + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_postinst() { + if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then + elog "Starting with version 2.0 syslogd has built in log rotation" + elog "functionality that does no longer require a running cron daemon." + elog "So we no longer install any log rotation cron files for sysklogd." + fi + + if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then + elog "Starting with version 2.1 sysklogd no longer provides klogd." + elog "syslogd now also logs kernel messages." + fi +} diff --git a/app-admin/sysklogd/sysklogd-2.5.2.ebuild b/app-admin/sysklogd/sysklogd-2.5.2.ebuild new file mode 100644 index 000000000000..60d1d34765ce --- /dev/null +++ b/app-admin/sysklogd/sysklogd-2.5.2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Standard log daemons" +HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd" + +if [[ ${PV} == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git" +else + SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="logger logrotate" +# Needs network access +RESTRICT="test" + +DEPEND=" + logger? ( sys-apps/util-linux[-logger(+)] ) +" +RDEPEND=" + ${DEPEND} + logrotate? ( app-admin/logrotate ) +" + +DOCS=( ChangeLog.md README.md ) + +src_prepare() { + default + + [[ ${PV} == *9999 ]] && eautoreconf +} + +src_configure() { + append-lfs-flags + tc-export CC + + local myeconfargs=( + --disable-static + --runstatedir="${EPREFIX}"/run + --with-systemd=$(systemd_get_systemunitdir) + $(use_with logger) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + insinto /etc + doins syslog.conf + keepdir /etc/syslog.d + + newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd + newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd + + if use logrotate ; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/sysklogd.logrotate sysklogd + sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die + fi + + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_postinst() { + if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then + elog "Starting with version 2.0 syslogd has built in log rotation" + elog "functionality that does no longer require a running cron daemon." + elog "So we no longer install any log rotation cron files for sysklogd." + fi + + if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then + elog "Starting with version 2.1 sysklogd no longer provides klogd." + elog "syslogd now also logs kernel messages." + fi +} diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild index b823887c4367..24bef0bd0a53 100644 --- a/app-admin/sysklogd/sysklogd-9999.ebuild +++ b/app-admin/sysklogd/sysklogd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,10 +23,7 @@ IUSE="logger logrotate" RESTRICT="test" DEPEND=" - logger? ( - !<sys-apps/util-linux-2.34-r3 - !>=sys-apps/util-linux-2.34-r3[logger] - ) + logger? ( sys-apps/util-linux[-logger(+)] ) " RDEPEND=" ${DEPEND} diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 50c22bc534d6..6fa45b03cdb1 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,2 +1,6 @@ -DIST syslog-ng-3.38.1.tar.gz 5405048 BLAKE2B 7819cbe0caab7f580ca9f71181c84d64da838a238a6f8b8b79c8816e37e5691e72e1284de57d5066d3c681d8751950e5a32d65a1b1af4e064dd82f2c59899fe3 SHA512 3a3ef5c72d8c211ed2914791380061dcd48ea1ea95f636a1a8649dc5dee731a11e9ae000a37cbeeba624f4053b623b697e6c7f945a81153106c2365f4f09a847 DIST syslog-ng-4.0.1.tar.gz 5452824 BLAKE2B a5c0328f3c88a38dbc07bb7af2a74c0037a6679525a29fca58620a8ef6b05ec13f3942d26767aded0049376ed30ce6a525686501914648a509997c5de2b48eb4 SHA512 5f83ee3cc4935218feb19f3f5065a68099e3ee291d806ad8810499ded9f9ef3b326b4b22841cd736354ed6a2ebc1ce8ae73f6abe981aa6f64c42da9ee3b1e22f +DIST syslog-ng-4.1.1.tar.gz 5556174 BLAKE2B 3e1a9c394b8a88cc7b39a026950760cbc7796d67b62bb3c0f2970fd80c296e9bd75d1057fe81a0d22ac8488789d13607f19abc6aa38b3a38a30ff450ee66e3a0 SHA512 89abb7a53570b6f7c0dc76905c97d207447117f1db1aa0c0da97c17366ea833b6404f9c7fc318436fd01be2bab032eccca9712063a7c683780026e7e52493dc8 +DIST syslog-ng-4.2.0.tar.gz 5763000 BLAKE2B 7dfa6a1aff896072cc742c6dba5dc1680955e06ce4400fde5b0ddecedd984c039a687f35286685d66e7a5580c7da94f00a14b10f6eb8c162233683bf170e37fb SHA512 85442b57b7934e8afbb4e7d8285ed1fd16aaad2a8d853e3765db4f885d88bee4910a3b5d271f1cbd100c2d3a3f81f1a4fe845bc948fe68c22d32bc9b730af04b +DIST syslog-ng-4.3.1.tar.gz 6091641 BLAKE2B 7cd6b9831d7ad917ee3c7048d3944e9c9f8a100a51a08e4a9e93b117b7ed3725f91097c2e6e9a377c33ab28d92cdb1b3e6ac301d3cf75d84552dcd93e0fe7aa8 SHA512 571f6080765983326ee912f2a7e87cdc8527296ef555a0b16589c04ed332c0db58e24c70251dc39b1c79151ca7d463e6409835df99aa45c19734d7003a69ce61 +DIST syslog-ng-4.4.0.tar.gz 6208437 BLAKE2B 4d719c980f40437661014aa607b01952039694cc1a7e3173efdf1ae682af0e5956098f23009bbbba941c12e26fef515fba0664b170810e654f82f4ae2ac2afc8 SHA512 1cf18c43321e523d0f49b25a4839fd10ec301b207da1b2c407df5167dba557ac0a7781b07f1c1e5d18241376966b8099d9e41dffa55030f6a8052388139c4107 +DIST syslog-ng-4.6.0.tar.gz 6671746 BLAKE2B 44efa3efa4e65744318a314adbefc11e7faa68876bca7be7d053262d8effecb80ecd1efc21af653db8e8f2c16496b5a64ea245a8adaa16e845954a13dedfd5c5 SHA512 7c4fbf1ac5377240afa7a1db8d72772399d2c62657fffc3c59e82b2dea6f12031f02320c4f567f981311bd1d8bbfd98962aeb59720ca857867a51b6bf83afb4b diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in-r1 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in-r1 new file mode 100644 index 000000000000..fe3b6ee99a99 --- /dev/null +++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in-r1 @@ -0,0 +1,115 @@ +@version: @SYSLOGNG_VERSION@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# https://bugs.gentoo.org/426814 +@include "scl.conf" + +# +# Syslog-ng configuration file, compatible with default hardened installations. +# + +options { + threaded(yes); + chain_hostnames(no); + stats(freq(43200)); +}; + +source src { + system(); + internal(); +}; + +source kernsrc { + file("/proc/kmsg"); +}; + +#source net { udp(); }; +#log { source(net); destination(net_logs); }; +#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); }; + +destination authlog { file("/var/log/auth.log"); }; +destination _syslog { file("/var/log/syslog"); }; +destination cron { file("/var/log/cron.log"); }; +destination daemon { file("/var/log/daemon.log"); }; +destination kern { file("/var/log/kern.log"); }; +destination lpr { file("/var/log/lpr.log"); }; +destination user { file("/var/log/user.log"); }; +destination uucp { file("/var/log/uucp.log"); }; +#destination ppp { file("/var/log/ppp.log"); }; +destination mail { file("/var/log/mail.log"); }; + +destination avc { file("/var/log/avc.log"); }; +destination audit { file("/var/log/audit.log"); }; +destination pax { file("/var/log/pax.log"); }; +destination grsec { file("/var/log/grsec.log"); }; + +destination mailinfo { file("/var/log/mail.info"); }; +destination mailwarn { file("/var/log/mail.warn"); }; +destination mailerr { file("/var/log/mail.err"); }; + +destination newscrit { file("/var/log/news/news.crit"); }; +destination newserr { file("/var/log/news/news.err"); }; +destination newsnotice { file("/var/log/news/news.notice"); }; + +destination debug { file("/var/log/debug"); }; +destination messages { file("/var/log/messages"); }; +destination console { usertty("root"); }; +destination console_all { file("/dev/tty12"); }; +#destination loghost { udp("loghost" port(999)); }; + +destination xconsole { pipe("/dev/xconsole"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { not facility(authpriv, mail); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kern { facility(kern); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +#filter f_ppp { facility(ppp); }; +filter f_news { facility(news); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) + and not facility(auth, authpriv, mail, news); }; +filter f_emergency { level(emerg); }; + +filter f_info { level(info); }; + +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; + +filter f_avc { message(".*avc: .*"); }; +filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); }; +filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); }; +filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); }; + +log { source(src); filter(f_authpriv); destination(authlog); }; +log { source(src); filter(f_syslog); destination(_syslog); }; +log { source(src); filter(f_cron); destination(cron); }; +log { source(src); filter(f_daemon); destination(daemon); }; +log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); }; +log { source(src); filter(f_lpr); destination(lpr); }; +log { source(src); filter(f_mail); destination(mail); }; +log { source(src); filter(f_user); destination(user); }; +log { source(src); filter(f_uucp); destination(uucp); }; +log { source(kernsrc); filter(f_pax); destination(pax); }; +log { source(kernsrc); filter(f_grsec); destination(grsec); }; +log { source(kernsrc); filter(f_audit); destination(audit); }; +log { source(kernsrc); filter(f_avc); destination(avc); }; +log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); }; +log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); }; +log { source(src); filter(f_mail); filter(f_err); destination(mailerr); }; +log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; +log { source(src); filter(f_news); filter(f_err); destination(newserr); }; +log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; +log { source(src); filter(f_debug); destination(debug); }; +log { source(src); filter(f_messages); destination(messages); }; +log { source(src); filter(f_emergency); destination(console); }; +#log { source(src); filter(f_ppp); destination(ppp); }; +log { source(src); destination(console_all); }; diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in-r1 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in-r1 new file mode 100644 index 000000000000..9940491ec78f --- /dev/null +++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in-r1 @@ -0,0 +1,36 @@ +@version: @SYSLOGNG_VERSION@ +# +# Syslog-ng default configuration file for Gentoo Linux + +# https://bugs.gentoo.org/426814 +@include "scl.conf" + +options { + threaded(yes); + chain_hostnames(no); + + # The default action of syslog-ng is to log a STATS line + # to the file every 10 minutes. That's pretty ugly after a while. + # Change it to every 12 hours so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats(freq(43200)); + # The default action of syslog-ng is to log a MARK line + # to the file every 20 minutes. That's seems high for most + # people so turn it down to once an hour. Set it to zero + # if you don't want the functionality at all. + mark_freq(3600); +}; + +source src { system(); internal(); }; + +destination messages { file("/var/log/messages"); }; + +# By default messages are logged to tty12... +destination console_all { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +log { source(src); destination(messages); }; +log { source(src); destination(console_all); }; diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml index d14d65a0a573..abf7ad17f64d 100644 --- a/app-admin/syslog-ng/metadata.xml +++ b/app-admin/syslog-ng/metadata.xml @@ -12,10 +12,12 @@ <use> <flag name="amqp">Enable support for AMQP destinations</flag> <flag name="geoip2">Add support for geo lookup based on IPs via <pkg>dev-libs/libmaxminddb</pkg></flag> + <flag name="grpc">Enable GRPC based driver support (OpenTelemetry) via <pkg>net-libs/grpc</pkg></flag> <flag name="http">Enable support for HTTP destinations</flag> <flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag> <flag name="kafka">Enable support for Kafka destinations</flag> <flag name="mongodb">Enable support for mongodb destinations</flag> + <flag name="mqtt">Enable MQTT support via <pkg>net-libs/paho-mqtt-c</pkg></flag> <flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag> <flag name="redis">Enable support for Redis destinations</flag> <flag name="smtp">Enable support for SMTP destinations</flag> diff --git a/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild b/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild index ca7e9ae7a1a9..4ba1fa54003f 100644 --- a/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.0.1.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 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz LICENSE="GPL-2+ LGPL-2.1+" 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="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( python )" @@ -44,7 +44,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/criterion )" BDEPEND=" >=sys-devel/bison-3.7.6 - sys-devel/flex + app-alternatives/lex virtual/pkgconfig" DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} diff --git a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild index 4c8f2a77d56d..e92f8f960cff 100644 --- a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.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 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz LICENSE="GPL-2+ LGPL-2.1+" 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="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( python )" @@ -32,7 +32,12 @@ RDEPEND=" json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) - python? ( ${PYTHON_DEPS} ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) @@ -44,7 +49,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/criterion )" BDEPEND=" >=sys-devel/bison-3.7.6 - sys-devel/flex + app-alternatives/lex virtual/pkgconfig" DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} @@ -61,6 +66,10 @@ pkg_setup() { src_prepare() { local f + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + use python && python_fix_shebang . # remove bundled libs @@ -111,6 +120,7 @@ src_configure() { --with-ivykis=system --with-module-dir=/usr/$(get_libdir)/syslog-ng --with-pidfile-dir=/var/run + --with-python-packages=none --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" $(use_enable amqp) $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) diff --git a/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild new file mode 100644 index 000000000000..48fa3d466610 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools python-single-r1 systemd + +MY_PV_MM=$(ver_cut 1-2) +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre-6.1:= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1= ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + >=sys-devel/bison-3.7.6 + app-alternatives/lex + virtual/pkgconfig" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in-r1 \ + syslog-ng.conf.gentoo.in-r1; do + sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + done + + default + eautoreconf +} + +src_configure() { + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-python-packages=none + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable http) + $(use_enable ipv6) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/syslog-ng/syslog-ng-4.2.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.2.0.ebuild new file mode 100644 index 000000000000..b19189c2836e --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-4.2.0.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools python-single-r1 systemd + +MY_PV_MM=$(ver_cut 1-2) +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre-6.1 + dev-libs/openssl:0= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1 ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + >=sys-devel/bison-3.7.6 + sys-devel/flex + virtual/pkgconfig" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in-r1 \ + syslog-ng.conf.gentoo.in-r1; do + sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + done + + default + eautoreconf +} + +src_configure() { + # Needs bison/flex. + unset YACC LEX + + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-python-packages=none + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable http) + $(use_enable ipv6) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/syslog-ng/syslog-ng-4.3.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.3.1-r1.ebuild new file mode 100644 index 000000000000..4118e51815de --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-4.3.1-r1.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-single-r1 systemd + +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre2-10.0 + dev-libs/openssl:0= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1 ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + >=sys-devel/bison-3.7.6 + sys-devel/flex + virtual/pkgconfig" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in-r1 \ + syslog-ng.conf.gentoo.in-r1; do + sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + done + + default + eautoreconf +} + +src_configure() { + # Needs bison/flex. + unset YACC LEX + + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-ipv6 + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-python-packages=none + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable http) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/syslog-ng/syslog-ng-4.4.0-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.4.0-r1.ebuild new file mode 100644 index 000000000000..6f66fd33b1b4 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-4.4.0-r1.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-single-r1 systemd + +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre2-10.0 + dev-libs/openssl:0= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1 ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + >=sys-devel/bison-3.7.6 + sys-devel/flex + virtual/pkgconfig" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in-r1 \ + syslog-ng.conf.gentoo.in-r1; do + sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + done + + default + eautoreconf +} + +src_configure() { + # Needs bison/flex. + unset YACC LEX + + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-ipv6 + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-python-packages=none + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable http) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/syslog-ng/syslog-ng-4.4.0-r2.ebuild b/app-admin/syslog-ng/syslog-ng-4.4.0-r2.ebuild new file mode 100644 index 000000000000..7913301d52da --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-4.4.0-r2.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-single-r1 systemd + +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre2-10.0 + dev-libs/openssl:0= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + grpc? ( + dev-libs/protobuf:= + net-libs/grpc:= + ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1 ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + >=sys-devel/bison-3.7.6 + sys-devel/flex + virtual/pkgconfig + grpc? ( dev-libs/protobuf:= )" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in-r1 \ + syslog-ng.conf.gentoo.in-r1; do + sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + done + + default + eautoreconf +} + +src_configure() { + # Needs bison/flex. + unset YACC LEX + + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-ipv6 + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-python-packages=none + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(use_with amqp librabbitmq-client system) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable grpc) + $(use_enable grpc cpp) + $(use_enable http) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/syslog-ng/syslog-ng-4.4.0-r3.ebuild b/app-admin/syslog-ng/syslog-ng-4.4.0-r3.ebuild new file mode 100644 index 000000000000..eebbe85eca29 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-4.4.0-r3.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-single-r1 systemd + +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb mqtt pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre2-10.0 + dev-libs/openssl:0= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + grpc? ( + dev-libs/protobuf:= + net-libs/grpc:= + ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + mqtt? ( net-libs/paho-mqtt-c:1.3 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1 ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + >=sys-devel/bison-3.7.6 + sys-devel/flex + virtual/pkgconfig + grpc? ( dev-libs/protobuf:= )" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in-r1 \ + syslog-ng.conf.gentoo.in-r1; do + sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + done + + default + eautoreconf +} + +src_configure() { + # Needs bison/flex. + unset YACC LEX + + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-ipv6 + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-python-packages=none + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(use_with amqp librabbitmq-client system) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable grpc) + $(use_enable grpc cpp) + $(use_enable http) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(use_enable mqtt) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.6.0-r1.ebuild new file mode 100644 index 000000000000..eebbe85eca29 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-4.6.0-r1.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-single-r1 systemd + +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb mqtt pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre2-10.0 + dev-libs/openssl:0= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + grpc? ( + dev-libs/protobuf:= + net-libs/grpc:= + ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + mqtt? ( net-libs/paho-mqtt-c:1.3 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1 ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + >=sys-devel/bison-3.7.6 + sys-devel/flex + virtual/pkgconfig + grpc? ( dev-libs/protobuf:= )" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in-r1 \ + syslog-ng.conf.gentoo.in-r1; do + sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + done + + default + eautoreconf +} + +src_configure() { + # Needs bison/flex. + unset YACC LEX + + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-ipv6 + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-python-packages=none + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(use_with amqp librabbitmq-client system) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable grpc) + $(use_enable grpc cpp) + $(use_enable http) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(use_enable mqtt) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild new file mode 100644 index 000000000000..22c7aa4bc2da --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-single-r1 systemd + +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre2-10.0 + dev-libs/openssl:0= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + grpc? ( + dev-libs/protobuf:= + net-libs/grpc:= + ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1 ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + >=sys-devel/bison-3.7.6 + sys-devel/flex + virtual/pkgconfig + grpc? ( dev-libs/protobuf:= )" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + # disable python-modules test as it requires additional python modules not + # packaged in Gentoo + sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in-r1 \ + syslog-ng.conf.gentoo.in-r1; do + sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + done + + default + eautoreconf +} + +src_configure() { + # Needs bison/flex. + unset YACC LEX + + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-ipv6 + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-python-packages=none + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(use_with amqp librabbitmq-client system) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable grpc) + $(use_enable grpc cpp) + $(use_enable http) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest index a0533e13a097..5c30b4b2b191 100644 --- a/app-admin/syslog-summary/Manifest +++ b/app-admin/syslog-summary/Manifest @@ -1 +1 @@ -DIST syslog-summary-1.14.tar.gz 7278 BLAKE2B 609e506c099b734be87ba6d6e21f70283d4654ab5c6d3794da71099f3e590d178348c13ab271ddb84682220091adfd702c107bf2dee792419de3ce14d2a9c9db SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277 +DIST syslog-summary-1.14.gh.tar.gz 7380 BLAKE2B eae488de0490416864eb20c8d36d06707214163bed2bb510e53653a169df75a181732ea439530f174c7d74e08b515c45e630b96983e78e975024b420a738faf1 SHA512 dab82f9d5e0e452d880e7e503c1de148d902c461abaf6fc1a0768516bd010c6a4e5cdbb61fd1d6e0283d55c8de9a11d02bd5828fab31cae98b59ca336a7f1a73 diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild index 25e5456e09c0..b90a328f094b 100644 --- a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild +++ b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild @@ -9,7 +9,7 @@ inherit python-single-r1 DESCRIPTION="Summarizes the contents of a syslog log file" HOMEPAGE="https://github.com/dpaleino/syslog-summary" -SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/dpaleino/syslog-summary/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="GPL-3+" SLOT="0" @@ -21,11 +21,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="" RDEPEND="${PYTHON_DEPS}" -PATCHES=( \ - "${FILESDIR}/${P}-fix-ignore-code.patch" \ - "${FILESDIR}/${P}-remove-file-magic.patch" \ - "${FILESDIR}/${P}-py3.patch" \ - ) +PATCHES=( + "${FILESDIR}/${P}-fix-ignore-code.patch" + "${FILESDIR}/${P}-remove-file-magic.patch" + "${FILESDIR}/${P}-py3.patch" +) src_prepare() { python_fix_shebang -f syslog-summary diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest index f9a7539fec8a..128a93c378bd 100644 --- a/app-admin/sysstat/Manifest +++ b/app-admin/sysstat/Manifest @@ -1,2 +1 @@ DIST sysstat-12.6.2.tar.gz 1455025 BLAKE2B aba2d8fd5fae8d6df740173d7ccd60beb0628c4c2205342f72ec03d6c48995d397de0d6f2cace24accf1a9274da37cf3bba86888717bc8d62d262ffd1c6f995e SHA512 376047de55598c6f671b999203809219a40206a9c58499399681af9ebe6048dd4da96c8ef5827d75cc369a7b69c3f1aadef1a5e8deec318a12b230d61f09fc08 -DIST sysstat-12.7.1.tar.gz 1464847 BLAKE2B dd4cb510d45879665945d7c3efcb9e1011f6b77d152c7f989ef6a3e8f203c05c1ca708959030cb864c31810ec27a5e880a9cfcd805f26c4f3537d55bdd9fd763 SHA512 5c1da0f5a1bf26091f029c5ea138f836616becb1e531843aa2c150a66ddc1f07b43cffeac98445855bf70319942fe22838a682c2f7685893bead7d8de7e9e2a8 diff --git a/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch new file mode 100644 index 000000000000..413cdad8b015 --- /dev/null +++ b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch @@ -0,0 +1,27 @@ +From 954ff2e2673cef48f0ed44668c466eab041db387 Mon Sep 17 00:00:00 2001 +From: Pavel Kopylov <pkopylov@cloudlinux.com> +Date: Wed, 17 May 2023 11:33:45 +0200 +Subject: [PATCH] Fix an overflow which is still possible for some values. + +--- + common.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/common.c b/common.c +index 48493b5f..12cd8d9f 100644 +--- a/common.c ++++ b/common.c +@@ -431,8 +431,11 @@ int check_dir(char *dirname) + void check_overflow(unsigned int val1, unsigned int val2, + unsigned int val3) + { +- if ((unsigned long long) val1 * (unsigned long long) val2 * +- (unsigned long long) val3 > UINT_MAX) { ++ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && ++ (((unsigned long long)UINT_MAX / (unsigned long long)val1 < ++ (unsigned long long)val2) || ++ ((unsigned long long)UINT_MAX / ((unsigned long long)val1 * ++ (unsigned long long)val2) < (unsigned long long)val3))) { + #ifdef DEBUG + fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", + __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * diff --git a/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch new file mode 100644 index 000000000000..854a66219ff9 --- /dev/null +++ b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch @@ -0,0 +1,18 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -94,10 +94,14 @@ + endif + + # Compiler flags ++ifndef CPPFLAGS ++CPPFLAGS = @CPPFLAGS@ ++endif ++CPPFLAGS += @DEFS@ + ifndef CFLAGS + CFLAGS = @CFLAGS@ + endif +-CFLAGS += -Wall -Wstrict-prototypes -pipe -O2 ++CFLAGS += $(CPPFLAGS) + + ifndef DFLAGS + DFLAGS = @DFLAGS@ diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml index 6e1b41958fce..b1ea97d19a2d 100644 --- a/app-admin/sysstat/metadata.xml +++ b/app-admin/sysstat/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <maintainer type="person"> <email>marecki@gentoo.org</email> <name>Marek Szuba</name> </maintainer> @@ -14,6 +10,5 @@ </upstream> <use> <flag name="dcron">Adjust cronjobs to work properly under <pkg>sys-process/dcron</pkg></flag> - <flag name="lto">Build using Link Time Optimizations (LTO)</flag> </use> </pkgmetadata> diff --git a/app-admin/sysstat/sysstat-12.7.1.ebuild b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild index 530eee907026..bb65c56dfae5 100644 --- a/app-admin/sysstat/sysstat-12.7.1.ebuild +++ b/app-admin/sysstat/sysstat-12.6.2-r1.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=8 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="dcron debug nls lm-sensors lto selinux systemd" +IUSE="dcron debug nls lm-sensors selinux systemd" BDEPEND=" virtual/pkgconfig @@ -34,6 +34,10 @@ RDEPEND=" REQUIRED_USE="dcron? ( !systemd )" +PATCHES=( + "${FILESDIR}"/${PN}-12.6.2-check_overflow.patch +) + src_prepare() { if use dcron; then sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die @@ -44,12 +48,12 @@ src_prepare() { src_configure() { tc-export AR + # --enable-lto only appends -flto sa_lib_dir=/usr/lib/sa \ conf_dir=/etc \ econf \ $(use_enable !systemd use-crond) \ $(use_enable lm-sensors sensors) \ - $(use_enable lto) \ $(use_enable nls) \ $(usex debug --enable-debuginfo '') \ --disable-compress-manpg \ diff --git a/app-admin/sysstat/sysstat-12.6.2.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild index 03c2a5211075..2645fb504348 100644 --- a/app-admin/sysstat/sysstat-12.6.2.ebuild +++ b/app-admin/sysstat/sysstat-12.6.2-r2.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,8 +11,8 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="dcron debug nls lm-sensors lto selinux systemd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="dcron debug nls lm-sensors selinux systemd" BDEPEND=" virtual/pkgconfig @@ -34,6 +34,11 @@ RDEPEND=" REQUIRED_USE="dcron? ( !systemd )" +PATCHES=( + "${FILESDIR}"/${PN}-12.6.2-check_overflow.patch + "${FILESDIR}"/${PN}-12.6.2-defs_and_flags.patch +) + src_prepare() { if use dcron; then sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die @@ -44,12 +49,12 @@ src_prepare() { src_configure() { tc-export AR + # --enable-lto only appends -flto sa_lib_dir=/usr/lib/sa \ conf_dir=/etc \ econf \ $(use_enable !systemd use-crond) \ $(use_enable lm-sensors sensors) \ - $(use_enable lto) \ $(use_enable nls) \ $(usex debug --enable-debuginfo '') \ --disable-compress-manpg \ @@ -61,10 +66,6 @@ src_configure() { --with-systemdsystemunitdir=$(systemd_get_systemunitdir) } -src_compile() { - LFLAGS="${LDFLAGS}" default -} - src_install() { keepdir /var/log/sa diff --git a/app-admin/system-config-printer/files/system-config-printer-1.5.18-fix-debugprint-exception.patch b/app-admin/system-config-printer/files/system-config-printer-1.5.18-fix-debugprint-exception.patch new file mode 100644 index 000000000000..829166ad9d8e --- /dev/null +++ b/app-admin/system-config-printer/files/system-config-printer-1.5.18-fix-debugprint-exception.patch @@ -0,0 +1,22 @@ +From 399b3334d6519639cfe7f1c0457e2475b8ee5230 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal <zdohnal@redhat.com> +Date: Thu, 13 Oct 2022 14:03:37 +0200 +Subject: [PATCH] Fix debugprint() in options.py (fixes #291) + +--- + options.py | 2 +- + 1 file changed, 1 insertions(+), 1 deletion(-) + +diff --git a/options.py b/options.py +index d756f98dc..d7c236deb 100644 +--- a/options.py ++++ b/options.py +@@ -423,7 +423,7 @@ def __init__(self, name, value, supported, on_change): + debugprint("Unknown value for %s: %s" % (name, value)) + debugprint("Choices: %s" % (supported)) + if len(supported) > 0: +- debugprint("Selecting from choices:", supported[0]) ++ debugprint("Selecting from choices: %s" % supported[0]) + self.selector.set_active(0) + self.selector.connect("changed", self.changed) + diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild index 2d949358637b..eac1dbdb254b 100644 --- a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild +++ b/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild @@ -1,22 +1,25 @@ -# 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} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" -inherit python-single-r1 systemd udev xdg + +inherit distutils-r1 systemd udev xdg DESCRIPTION="Graphical user interface for CUPS administration" -HOMEPAGE="https://github.com/OpenPrinting/system-config-printer" -SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz" +HOMEPAGE="https://github.com/OpenPrinting/system-config-printer/" +SRC_URI=" + https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz +" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="gnome-keyring policykit" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - +IUSE="keyring policykit" # Needs cups running, bug 284005 RESTRICT="test" @@ -24,7 +27,7 @@ RESTRICT="test" # gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ? # python samba client: smbc # selinux: needed for troubleshooting -COMMON_DEPEND="${PYTHON_DEPS} +DEPEND=" dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 @@ -33,7 +36,7 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/libnotify[introspection] x11-libs/pango[introspection] " -DEPEND="${COMMON_DEPEND} +BDEPEND=" app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-perl/XML-Parser @@ -41,7 +44,8 @@ DEPEND="${COMMON_DEPEND} >=sys-devel/gettext-0.20 virtual/pkgconfig " -RDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${DEPEND} $(python_gen_cond_dep ' dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] @@ -50,13 +54,14 @@ RDEPEND="${COMMON_DEPEND} dev-python/requests[${PYTHON_USEDEP}] dev-python/urllib3[${PYTHON_USEDEP}] ') - gnome-keyring? ( app-crypt/libsecret[introspection] ) + keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper ) " -pkg_setup() { - python-single-r1_pkg_setup -} +PATCHES=( + # git master (1.5.19) + "${FILESDIR}/${P}-fix-debugprint-exception.patch" +) src_configure() { local myeconfargs=( @@ -64,21 +69,20 @@ src_configure() { --enable-nls --with-desktop-vendor=Gentoo --with-udev-rules - --with-systemdsystemunitdir=$(systemd_get_systemunitdir) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) econf "${myeconfargs[@]}" } src_compile() { - default - python_optimize cupshelpers + emake PYTHON=: + distutils-r1_src_compile } src_install() { - default + emake DESTDIR="${D}" PYTHON=: install python_fix_shebang "${ED}" - python_optimize - python_domodule cupshelpers + distutils-r1_src_install } pkg_postinst() { diff --git a/app-admin/systemdgenie/metadata.xml b/app-admin/systemdgenie/metadata.xml index 274bd0f534a1..5066380bcf2b 100644 --- a/app-admin/systemdgenie/metadata.xml +++ b/app-admin/systemdgenie/metadata.xml @@ -13,5 +13,6 @@ <email>rthomsen6@gmail.com</email> <name>Ragnar Thomsen</name> </maintainer> + <remote-id type="kde-invent">system/systemdgenie</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest index 24fd5a0aa8a8..e816a967c38b 100644 --- a/app-admin/terraform/Manifest +++ b/app-admin/terraform/Manifest @@ -1,10 +1,4 @@ -DIST terraform-1.2.2-deps.tar.xz 264293344 BLAKE2B 939e0385d04a535af85ccd45d80781277d6c4aecb779679e484208418892b38fd1546973c99117df353d5552671ea275f6b1d7458f400aa57bb12bd86e4d95b5 SHA512 ab13901478193e67705b93c02552794c4d4630cf6a5b1bbe1a298e0bc0a9ce85c86a4fbc99ff8aa25e06bd0c2aade7679caa5120f1d90ca5670a04e447687564 -DIST terraform-1.2.2.tar.gz 5179827 BLAKE2B 28a5d4e9c7c4f2001a76acafa039d808996eb41b20af21f013f6ecb1368f11a9891b2b17abedc41fa9a881081e3e89a42958c6a6868df19070d9fd8ed3abc1f2 SHA512 0bd56c2c281848a1f3e983e76a6ee13b7a483b02c35dcdf09084a2bee0aa39e9cc9380be35cb1b13cf895430c42117884c6bd2e27d487953d1fc73caac070f9f -DIST terraform-1.2.3-deps.tar.xz 264283836 BLAKE2B 5b8305463b5978c903499d0a813acc3217d5cbd0298e6d0eb62d30a25b7a6dd29f6d7a3991f16ab23b5f5b99a073bb79fe8600b9af782efcbb1d274ce0f3d205 SHA512 2bb63e46e5e9a8f52620661cd186c82aefb74d92dffbc71c8b7e38e3861ca958a6d7ab1656d22e1f011ddacb32b4624bb4aee74e00fb051dae8fdf0e31dd9d6f -DIST terraform-1.2.3.tar.gz 5181975 BLAKE2B 120db2c139726b3c1a5c76dcf048de6508f0a99b1f7a8abc2bc7fdb596a72453b4543806090062d804d68157dcb42255119e9e13c462668077baeca83016d287 SHA512 f2aa7436ac82fad365fbae22428984c6a62cb9a7ffa339af035c06f5002fae1b3b440265fdb97e0f4a4aeaebf3838f5a05cd3c40bca1a50273f0560ad4482fda -DIST terraform-1.2.4-deps.tar.xz 264291608 BLAKE2B 4c0dd8d76bbf2b062f80225ff65342bccdf1f9efb03f0a309a42cdb64f139dbf31fb9ab6cf1754c0dde36c57123ffb7d5bb078d195ab879d29f29b2338761402 SHA512 e4440e541096a4311f713f8338d0653dd35fb7169cf39b1f06d8b1a7ad59d9b55d8115ae56edee9ce3da744d85180e606a9428b4907d1d6badcf8c77f72df36d -DIST terraform-1.2.4.tar.gz 5183520 BLAKE2B 51b9353dfe40e988c8c621f9e09ec9d3e8facfa7b682832671b3f0f12f52d0836dd6ff1851bebfe6ca590248cd029c508dc35b437b637a51ace4c36ad5807730 SHA512 43dfc4745dbcb3f29577fac610771258c5a9551bf33019d1f6bd3059a808cd365f432842c565522c530b03abf18aeada53fc390604eaeafce4464afd9edcb463 -DIST terraform-1.2.7-deps.tar.xz 264297220 BLAKE2B 0052fe5519c5b9aec060dcb6a68d0a48ed069a7c4f37f8cfc9088f2fec5865c7e3e515be176e316f50eabd00c2658d7371ecb3a728d3bcf28fca120553bc39b3 SHA512 a9d77a8c26ec6fb7da3c8a574b10fd6559b8828539b5fe89ea98c29979bedf33488bb10b1b2ea1624841ea23dc33d5c5b350b1d6ba3b31fdcbc7e067aa9c8601 -DIST terraform-1.2.7.tar.gz 4694193 BLAKE2B e32f7a304aad5b4cfb0866d890036f772eafbd1c767941999c0db44ed7a9e0e931890a466518af5b7715dcff2a0bac1d379c230fa032f9ebae45ad9df041b9d1 SHA512 d77db9040bd19f4a6e2988a61ecb7dc5adecf46f798d90e1232f9ffe385668ecb0869f1877d5f6ea8a36d48e1e47fffa463b9809046b524af741ddb5b67b469e -DIST terraform-1.3.9-deps.tar.xz 246904620 BLAKE2B 26577614ff95fa03dcf0362050f0e2a10eaa500f71d992b2927f6c44475341e899f62141e203ce9231bf329dc03825076d3f615c693a6c33c11190d4420b042f SHA512 9587b6022d320a104f3ad67dda9f1b931e258f78e7f6b6f87a8302732206b55d7d4af555b09517994ea1f53f069d8e1b5e2ca05c129efbbe4d7c3b75cbd27c69 -DIST terraform-1.3.9.tar.gz 4964672 BLAKE2B bfe823a2c1bc8d6188d339c8b5d452be4873adf1063aa0a880457d7e5b4e042d2d8c2ba93eb20eb46bad209c184bfe628b5093d6bdd6163e1bc57934c6770ad2 SHA512 3e951142120b5d71830b5bde34ef3e8907b1585f461f51f83e16170a46e1fc21934d4d1935f1a49963add3d894f68a5cf267ef91293347d0dd9a4b90978ea751 +DIST terraform-1.7.2-deps.tar.xz 334339964 BLAKE2B 1f1e8b41dd164bb92271d8a29a8ec31a9aa34272c3ce8530518b0a2fdc1706a97581f6096b8bc564aa1291e6c53c1a5833a32af841fcc410b0c9880412a5edee SHA512 f8979165039a1c928a5de4759b96155b1c76ffa9ff5dd21081007f0b695f52b035d6cc8925cddfa20da3e252120642b2e58db3b76c47b4ccc845022440ac550b +DIST terraform-1.7.2.tar.gz 6135908 BLAKE2B 252fbc41171a00c5077d7f07af25d912507215d1dd51be2c73b79a185a60c2eb486e5dd6ffd55bce06e1d2996b908930b5dc3cd73069fe78f7ac2e75cf144c26 SHA512 e9843cfa4a1f830fac10908257d05d08a6490edd9caeb8b83b45a6d1d282f98b6db0d07a4b2bc12439a76c0eb6a0bd0ab343a30cd92de6670c1ad9473d51c6d1 +DIST terraform-1.7.5-deps.tar.xz 107757204 BLAKE2B 07f788ed4d97724190e2201e5e66318ee2906a4dbf680a7359c329f388f8e9a82dd45dcda874cceb1d51df4af0c6ce0d6de517522bdf24e753db19db32b34dda SHA512 988be8a5b2adad5300d67f1b6861f2fc15285910af5982e4215aebb443414e0445acd3f9de5d6bb569453f2478f146b93a0d79ecc6979173ba22d1f5902f7a97 +DIST terraform-1.7.5.tar.gz 6137112 BLAKE2B 8cf8c1ebd2ee79ba0332ebe8b5614700dfe3bcf2f74a52a72cf971da35a1b5c32d3ed611f9e3ff5360215529ef94804b5acee2041a7d4240749c4f866251af36 SHA512 344942400cee43e2ba0c6de933f618b7dc5a7997567e613bf420d7da1f6314f7f9a42ffc32b27974d86f8a7f867f67727f1472ea120510df16d73061b11166fe diff --git a/app-admin/terraform/terraform-1.2.2.ebuild b/app-admin/terraform/terraform-1.2.2.ebuild deleted file mode 100644 index 6679713533cb..000000000000 --- a/app-admin/terraform/terraform-1.2.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module - -DESCRIPTION="A tool for building, changing, and combining infrastructure safely" -HOMEPAGE="https://www.terraform.io/" -SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" -SLOT="0" -KEYWORDS="amd64 ~arm64" - -RESTRICT="test" - -DOCS=( {README,CHANGELOG}.md ) - -src_compile() { - ego build -} - -src_install() { - dobin terraform - einstalldocs -} - -pkg_postinst() { - elog "If you would like to install shell completions please run:" - elog " terraform -install-autocomplete" -} diff --git a/app-admin/terraform/terraform-1.2.3.ebuild b/app-admin/terraform/terraform-1.2.3.ebuild deleted file mode 100644 index a4ce65dbc118..000000000000 --- a/app-admin/terraform/terraform-1.2.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module - -DESCRIPTION="A tool for building, changing, and combining infrastructure safely" -HOMEPAGE="https://www.terraform.io/" -SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -RESTRICT="test" - -DOCS=( {README,CHANGELOG}.md ) - -src_compile() { - ego build -} - -src_install() { - dobin terraform - einstalldocs -} - -pkg_postinst() { - elog "If you would like to install shell completions please run:" - elog " terraform -install-autocomplete" -} diff --git a/app-admin/terraform/terraform-1.2.4.ebuild b/app-admin/terraform/terraform-1.7.2.ebuild index 411e61a46d05..78692f4a1150 100644 --- a/app-admin/terraform/terraform-1.2.4.ebuild +++ b/app-admin/terraform/terraform-1.7.2.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=8 @@ -9,11 +9,12 @@ HOMEPAGE="https://www.terraform.io/" SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" -LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" +LICENSE="BUSL-1.1" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64 ~riscv" -BDEPEND="dev-go/gox" +BDEPEND="dev-go/gox + >=dev-lang/go-1.21.5" RESTRICT="test" diff --git a/app-admin/terraform/terraform-1.3.9.ebuild b/app-admin/terraform/terraform-1.7.5.ebuild index e3ee07fe5929..6366b8f6f5db 100644 --- a/app-admin/terraform/terraform-1.3.9.ebuild +++ b/app-admin/terraform/terraform-1.7.5.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 @@ -9,11 +9,12 @@ HOMEPAGE="https://www.terraform.io/" SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" -LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC" +LICENSE="BUSL-1.1" SLOT="0" KEYWORDS="~amd64 ~arm64 ~riscv" -BDEPEND="dev-go/gox" +BDEPEND="dev-go/gox + >=dev-lang/go-1.21.5" RESTRICT="test" diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index eb6decb01775..bef94bf92ce7 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1 +1 @@ -DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5 +DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239 SHA512 f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26 diff --git a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch deleted file mode 100644 index 4ef379f0021f..000000000000 --- a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2b0a0fcde875a89e2beffbe5c43c7518f682b482 Mon Sep 17 00:00:00 2001 -From: Christophe Grenier <grenier@cgsecurity.org> -Date: Wed, 6 Apr 2022 07:43:45 +0200 -Subject: [PATCH] src/ntfs_io.c: fix ntfs_device_testdisk_io_ioctl() prototype - for ntfs-3g - ---- -Gentoo note: link to upstream commit: -https://git.cgsecurity.org/cgit/testdisk/commit/?id=2b0a0fcde875a89e2beffbe5c43c7518f682b482 - - src/ntfs_io.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/ntfs_io.c b/src/ntfs_io.c -index 5ca494a5..fa056724 100644 ---- a/src/ntfs_io.c -+++ b/src/ntfs_io.c -@@ -159,6 +159,7 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu - return -1; - } - -+#ifdef HAVE_LIBNTFS - static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request, - void *argp) - { -@@ -168,6 +169,17 @@ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request, - #endif - return -1; - } -+#else -+static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, unsigned long request, -+ void *argp) -+{ -+ log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n"); -+#ifdef ENOTSUP -+ errno = ENOTSUP; -+#endif -+ return -1; -+} -+#endif - - /** - * Device operations for working with unix style devices and files. --- -2.37.4 - diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml index adbd9697dcd6..0cde64481bdc 100644 --- a/app-admin/testdisk/metadata.xml +++ b/app-admin/testdisk/metadata.xml @@ -13,6 +13,7 @@ <flag name="ntfs">Include the ability to read NTFS filesystems</flag> <flag name="reiserfs">Include reiserfs reading ability</flag> <flag name="ewf">Include ewf library</flag> + <flag name="sudo">Enable sudo helper integration</flag> </use> <upstream> <remote-id type="github">cgsecurity/testdisk</remote-id> diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild index b280e54ecc04..ea419d0652ee 100644 --- a/app-admin/testdisk/testdisk-7.1-r2.ebuild +++ b/app-admin/testdisk/testdisk-7.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=7 @@ -11,14 +11,20 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86" -IUSE="ewf jpeg ntfs gui reiserfs static zlib" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib" REQUIRED_USE="static? ( !gui )" +QA_CONFIG_IMPL_DECL_SKIP=( + 'ntfs_mbstoucs' # configure script checking NTFS, has fallbacks +) + # WARNING: reiserfs support does NOT work with reiserfsprogs # you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). +# sudo is detected during configure for extra functionality, see bug #892904 DEPEND=" + sudo? ( app-admin/sudo ) static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] @@ -45,13 +51,15 @@ DEPEND=" !arm? ( ewf? ( app-forensics/libewf:= ) ) ) " -RDEPEND="!static? ( ${DEPEND} )" +RDEPEND=" + sudo? ( app-admin/sudo ) + !static? ( ${DEPEND} ) +" BDEPEND="gui? ( dev-qt/linguist-tools:5 )" DOCS=() PATCHES=( - "${FILESDIR}"/${P}-backport-ntfs-3g-ioctl-prototype.patch ) src_configure() { @@ -59,12 +67,12 @@ src_configure() { export PATH="$(qt5_get_bindir):${PATH}" local myconf=( - --enable-sudo - --without-ntfs + --without-ntfs # old NTFS implementation, use ntfs-3g instead. $(use_with ewf) $(use_with jpeg) $(use_with ntfs ntfs3g) $(use_enable gui qt) + $(use_enable sudo) $(use_with reiserfs) $(use_with zlib) ) diff --git a/app-admin/tmpreaper/metadata.xml b/app-admin/tmpreaper/metadata.xml index f3c3855de177..03578cee3b06 100644 --- a/app-admin/tmpreaper/metadata.xml +++ b/app-admin/tmpreaper/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> tmpreaper is a program that can be used to clean out temporary-file directories. It recursively searches the directory, refusing to chdir() diff --git a/app-admin/tmpreaper/tmpreaper-1.6.17.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.17.ebuild index 63119a323422..f838192a0c34 100644 --- a/app-admin/tmpreaper/tmpreaper-1.6.17.ebuild +++ b/app-admin/tmpreaper/tmpreaper-1.6.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" IUSE="" DEPEND="sys-apps/util-linux diff --git a/app-admin/tpm/metadata.xml b/app-admin/tpm/metadata.xml index 40605a691828..4472545e0c4d 100644 --- a/app-admin/tpm/metadata.xml +++ b/app-admin/tpm/metadata.xml @@ -5,9 +5,9 @@ <email>orbea@riseup.net</email> <name>orbea</name> </maintainer> - <maintainer type="person" proxied="proxy"> - <email>sam@gentoo.org</email> - <name>Sam James</name> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription> tpm is a tiny shell script which is heavily inspired and diff --git a/app-admin/ttyplot/Manifest b/app-admin/ttyplot/Manifest new file mode 100644 index 000000000000..108e1ef82876 --- /dev/null +++ b/app-admin/ttyplot/Manifest @@ -0,0 +1,4 @@ +DIST ttyplot-1.5.1.gh.tar.gz 43629 BLAKE2B 98c46c27587a6ed98f7ed146b402dcbb6f5835f2f34780ccd706dc56b674dec3792dfb8bf84c8d260c040952ef0431341df09c16d032f32d4621c5f3971857d7 SHA512 3eb255375366bc3a773364388dc709f4f5b9961e1c99404dfd192503b20a8eb064f5089811b8c894a8214f84d24e14d040adb0b34712915311eb28972586bf0b +DIST ttyplot-1.5.2.gh.tar.gz 44023 BLAKE2B a8ebf0529f1d3e65ec5887d0fc45c51840ddb26ed982ea5bc2e47d66c03878a642576c7b3052c717f296af9b3fe0fca15080cbf252cb274238e6b664372f219e SHA512 ffdeba5d1ad4a0abbb04d76d914a2f209471ac6f601447c4693de594b0cdb1c162e42b49bb1bf0bb50e2d9b0d9b0452fb9f3d8949c5b9143cc9b6faae50ad28f +DIST ttyplot-1.6.1.gh.tar.gz 53746 BLAKE2B f78c5b7ef53e0bd1921138db965edcb9aff95d359263f1343ad2f33b075ff49ef0147354a7467de8cc5cc3a1f2508f9cf81fcbc6195c600d1fd07d0760de9b42 SHA512 cb21b28c86e1364536bdd417a99fa952a8c46623dbca5e6da31bf34763415fa7fcf0ecd6d02a8fc355a483ba64883412d4b448c2cdc1e397b81195c9fb1beffa +DIST ttyplot-1.6.2.gh.tar.gz 56277 BLAKE2B c7a818a69774fc7c5f6b498e5bf2f9c3ec644dc23d54daf59adaf13962f614c23918ca1d84614e27c60e75d1b98b3eb3c548dc14b59b539acceb3327dafabe0c SHA512 7ede447667a0a8f4b164a2a409e1264c36c95c22eeeda348c894678cb8d7209e742bb90f48a8a5260dd457ae7ff0a090a7d8b7eb25b20e20ada575e00cc4eb0b diff --git a/app-admin/ttyplot/metadata.xml b/app-admin/ttyplot/metadata.xml new file mode 100644 index 000000000000..ae2c63465dde --- /dev/null +++ b/app-admin/ttyplot/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'> +<pkgmetadata> + <maintainer type="person"> + <email>sping@gentoo.org</email> + <name>Sebastian Pipping</name> + </maintainer> + <upstream> + <remote-id type="github">tenox7/ttyplot</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-admin/ttyplot/ttyplot-1.5.1.ebuild b/app-admin/ttyplot/ttyplot-1.5.1.ebuild new file mode 100644 index 000000000000..31b1533c83eb --- /dev/null +++ b/app-admin/ttyplot/ttyplot-1.5.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="Realtime plotting utility with data input from stdin" +HOMEPAGE="https://github.com/tenox7/ttyplot" +SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="sys-libs/ncurses" +RDEPEND="${DEPEND}" + +src_install() { + local args=( + PREFIX=/usr + MANPREFIX=/usr/share/man + DESTDIR="${D}" + ) + emake "${args[@]}" install +} diff --git a/app-admin/ttyplot/ttyplot-1.5.2.ebuild b/app-admin/ttyplot/ttyplot-1.5.2.ebuild new file mode 100644 index 000000000000..31b1533c83eb --- /dev/null +++ b/app-admin/ttyplot/ttyplot-1.5.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="Realtime plotting utility with data input from stdin" +HOMEPAGE="https://github.com/tenox7/ttyplot" +SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="sys-libs/ncurses" +RDEPEND="${DEPEND}" + +src_install() { + local args=( + PREFIX=/usr + MANPREFIX=/usr/share/man + DESTDIR="${D}" + ) + emake "${args[@]}" install +} diff --git a/app-admin/ttyplot/ttyplot-1.6.1.ebuild b/app-admin/ttyplot/ttyplot-1.6.1.ebuild new file mode 100644 index 000000000000..b2ae208ee667 --- /dev/null +++ b/app-admin/ttyplot/ttyplot-1.6.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="Realtime plotting utility with data input from stdin" +HOMEPAGE="https://github.com/tenox7/ttyplot" +SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="virtual/pkgconfig" +DEPEND="${RDEPEND} + sys-libs/ncurses[tinfo]" + +src_install() { + local args=( + PREFIX=/usr + MANPREFIX=/usr/share/man + DESTDIR="${D}" + ) + emake "${args[@]}" install +} diff --git a/app-admin/ttyplot/ttyplot-1.6.2-r1.ebuild b/app-admin/ttyplot/ttyplot-1.6.2-r1.ebuild new file mode 100644 index 000000000000..a0e31d253379 --- /dev/null +++ b/app-admin/ttyplot/ttyplot-1.6.2-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit toolchain-funcs + +DESCRIPTION="Realtime plotting utility with data input from stdin" +HOMEPAGE="https://github.com/tenox7/ttyplot" +SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="virtual/pkgconfig" +DEPEND="${RDEPEND} + sys-libs/ncurses[tinfo]" + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + local args=( + PREFIX=/usr + MANPREFIX=/usr/share/man + DESTDIR="${D}" + ) + emake "${args[@]}" install +} diff --git a/app-admin/ttyplot/ttyplot-1.6.2.ebuild b/app-admin/ttyplot/ttyplot-1.6.2.ebuild new file mode 100644 index 000000000000..1d6a43c8b979 --- /dev/null +++ b/app-admin/ttyplot/ttyplot-1.6.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="Realtime plotting utility with data input from stdin" +HOMEPAGE="https://github.com/tenox7/ttyplot" +SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="virtual/pkgconfig" +DEPEND="${RDEPEND} + sys-libs/ncurses[tinfo]" + +src_install() { + local args=( + PREFIX=/usr + MANPREFIX=/usr/share/man + DESTDIR="${D}" + ) + emake "${args[@]}" install +} diff --git a/app-admin/usbview/Manifest b/app-admin/usbview/Manifest index 8ce3f4a8ee71..ddb1c1d8a7dd 100644 --- a/app-admin/usbview/Manifest +++ b/app-admin/usbview/Manifest @@ -1,2 +1,2 @@ -DIST usbview-2.2.tar.gz 378077 BLAKE2B 85edd8b4e7a36e6be4402024c4e4eb04ad28a1f402011ddb9e7a5182e8af02e3c4e01713e0d93c85d9eb61d1d70fd08b9292592975956b54eb40a37c2ad38dd1 SHA512 07684667310a9e073de05d4cb14a56370e72d4c1a2a81038331d7e0f5a546c65cb0cacedc6117702c116bb5863551f6ae730b4a9e6313d45fb052c9ce7823d16 DIST usbview-3.0.tar.gz 375159 BLAKE2B 3c95e8c1e37c7209f086206305ab22ff7d26868e8b5eeae07111c82f5bc60eccf8d4ba4021cb57d2d299775f6a4ca7c006ebbf41b7ce24baa7b976cab976b565 SHA512 65cfc933eac44e83df48ebc79e9eb85db64f817b9c09b708ba06471d7845ac575cdec1a4a06a5792cb2b8d80b046dadc118200c455a350300b0285b80221aac5 +DIST usbview-3.1.tar.gz 374228 BLAKE2B a0836049c8075831a5fc2c19532870478ea610ba9616d9809a25f6ca39c53e40695f134e794d378d4259dc102fa50e7f730c9bdc00558db1342694e6cc117cad SHA512 edc60d9543e5ebb377d4d1e71b8ca83d055cee9c12270a4d189a19503c12c8574103637fd6b9a13741c6dc9375a80c7c57daf4d6ccf0520d55e843e07be09479 diff --git a/app-admin/usbview/metadata.xml b/app-admin/usbview/metadata.xml index 9a0cbad9a0eb..d4b9dfd24c64 100644 --- a/app-admin/usbview/metadata.xml +++ b/app-admin/usbview/metadata.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>telans@posteo.de</email> - <name>James Beddek</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <name>Proxy Maintainers</name> - <email>proxy-maint@gentoo.org</email> + <maintainer type="person"> + <email>soap@gentoo.org</email> + <name>David Seifert</name> </maintainer> <upstream> <remote-id type="github">gregkh/usbview</remote-id> diff --git a/app-admin/usbview/usbview-2.2.ebuild b/app-admin/usbview/usbview-3.1.ebuild index 15b921b80152..0a78c3e5780f 100644 --- a/app-admin/usbview/usbview-2.2.ebuild +++ b/app-admin/usbview/usbview-3.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit linux-info +inherit linux-info xdg DESCRIPTION="Display the topology of devices on the USB bus" HOMEPAGE="http://www.kroah.com/linux-usb/ https://github.com/gregkh/usbview" @@ -16,15 +16,10 @@ KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" RDEPEND=" dev-libs/glib:2 x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 -" + x11-libs/gtk+:3" DEPEND="${RDEPEND}" BDEPEND=" virtual/imagemagick-tools[png,svg] - virtual/pkgconfig -" + virtual/pkgconfig" -pkg_setup() { - CONFIG_CHECK="~DEBUG_FS" - linux-info_pkg_setup -} +CONFIG_CHECK="~DEBUG_FS" diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest index 3172a34db5a4..8eb33f53ee11 100644 --- a/app-admin/vault/Manifest +++ b/app-admin/vault/Manifest @@ -1,14 +1,10 @@ -DIST vault-1.10.7-vendor.tar.gz 50109804 BLAKE2B 59a10957b34842fe0eb24cbb2de108c1fdf11b2ea6c31472944d5e607a78a5e1272caa105ef38fce733fe082e4c4257903804bacc78694f41d1149ca632f96e5 SHA512 4efb49e48fd217d3483a7114cc797d1f78c8d01a9358270905576e3056fe42a157a0056994ddceaf9ceee9b725611836b85bca80c8daec306d2c0fad772219f1 -DIST vault-1.10.7-webui.tar.xz 1258120 BLAKE2B 82acff201b446be456377f9470552626ba85aeb0233e029f34979c2a45547803e297c9cb1a051400181c41369116ffa1b72d14512bf4adf6f7aecb90b4df33d2 SHA512 1e8eb28f0033a8748c10bd63033e4f5f72c4fd9343b328e1fb98ac4ebfb999ab64bb29502cc3b9a805fa725844077b38c9795b4fb5ea3c6c9c67cdd9d5bd5bd7 -DIST vault-1.10.8-vendor.tar.gz 50130552 BLAKE2B 916d5eb0a1574547ce42e7747e57356e423d131692fcc0742dfd1c610b548ba661c7c9ef4f9ab2264f55e85df4ba463c05b6e10daae89c52bf40f0e876785fe3 SHA512 e66ec97793fa9c998dba9ed3cb9b3a6023dae6ee30517ecd51952cf70ddf2e57288be0b8dc925b342a2b10a3b3d2960cac0f87803309cdefc25abf51bfc9be25 -DIST vault-1.10.8-webui.tar.xz 1258244 BLAKE2B d6e6100048b52bcef1a9c10f9e5e42c05121a0256ac0a171d9c8d7942758eebf72967c5a9c76da3df59fa578a3ac9256cd0075719ab6751e13e806d8a93b760a SHA512 60b7ff82562ab3c061219221a2f9ce49ad53b494ace7d14252b25334c7a0c5dab0ac62de28e20bfe73cdcae438368ecfe1fd9a94b2ce1a434dde939898e30f4d -DIST vault-1.11.4-vendor.tar.gz 52097178 BLAKE2B 3f0fdddff8d9a834dff77bfb696c8c440660083f20c328c84a2b45e270defaa19fb461abf1a7ecca23ef8f8b2ad57cca33fa19103c87a8c9d5d2c947562a96c7 SHA512 5ada435c7bc75f06c381f4f75ca4717044cc17ec009283647175d1a68fdacb3175052e2292d7a739ae8475715e8592d3bf7f3fe4f3e8dc027688a15b771ca935 -DIST vault-1.11.4-webui.tar.xz 1335580 BLAKE2B 9c2c58448083e781e74d4bd9e6bc9128224a9d10020c6b30af111c869a86467bde4683825908b892f20f7024eda081d026d2fa01b9ee0fb02fa94d7f412dacb4 SHA512 6739ac2845eaf2e82b7f5177bbfc42ccaf05a1fd1c50b2e53e296faf8a631846f9495d2d19269735723cc60f2ecbd5c90533a9fa88efd7c8d9c8c6575e4801d9 -DIST vault-1.11.5-vendor.tar.gz 52130355 BLAKE2B 0047b52439c12512e6da4b797742b079ca2dcd6f858b7f27637e409c3061de04a9d38b4d05269bd440c2178fd9547b1323bc680d65cb74a3ce98816303d72c1f SHA512 70db863583ee5f1180068b70ddf8baaf95e61a31d816db2e212703e1052c1a70b7098bfd53b2b28319dbf21e168b660e16cc5907b503e5e558c6763540d70eba -DIST vault-1.11.5-webui.tar.xz 1335704 BLAKE2B 7a8161070fd9762645a01e00fb88ab7ef4847810856e0c7e9a478cb149401db53789ca4d377a06ed4843b3cc77c655cee7036510c5625bc503f6dd9f7e347420 SHA512 d6b49dd31877bf8a9cf7b7588df58163c35c9fe5fe225b595ca421209acd4c823b71d21195a2f217dc8b63a825b5323b3475e1fe42be6d2c8d471d91e6f75097 -DIST vault-1.12.0-vendor.tar.gz 53774794 BLAKE2B 2aa91274bcd3efe2c34c9acdc3000af9903e2d1d67dcd0484b4046a78dbc140b460d2f5f9dc73f96302991245da5381483d4c24444f83c0f642b56956e9ea6a4 SHA512 42593ea9b731d02c8a6d6ec7adb2adb7dc5b5a41c549a44991eb66e79dce8b3cac3553157ef1c34202f662279de1da03da87271090649a6c773f53d5d6971e25 -DIST vault-1.12.0-webui.tar.xz 1413084 BLAKE2B 5f681ac61b14694e64be0a55445d0849b9b7481dc2456c923297f496b60d843ffae2d7f27b029ed33b4e7efd3029d99c1cb30110da3ad3162ee4135f3856d60e SHA512 4399f2e4c85712cd83b8265315186d6f7161fa545e0708a56ff7c56fbde335eb2ab9a357720850c0007e55679b94edbaadd3c2318671676e658f270f4d04de34 -DIST vault-1.12.1-vendor.tar.gz 53818036 BLAKE2B 58bf72efa345d737dd74a58bd56be3740d19fa5849d11f4aa4bc3ccb46ca42e84b1aa85bcf9f76e4ae5a72c3b954519a1ac989ff0f779c5fd25a42fe17b573c6 SHA512 55ccb2c61e6baf69627e1443ce6f524c2d6f8bf1ff59103173acd74e1a3a0a79a90a5dab95790f002ca7261e80c38dc2c8c27f95553bac65e2d0fa7f48254b23 -DIST vault-1.12.1-webui.tar.xz 1413308 BLAKE2B 1a6008bc67f08037a0dbd966d004c424b249597cd9f1002e30a23262bd1df6ddc388e7d863ff3f62350d8a4b3807de40a1d33da08ade1fe5ec84d4cecc64ade8 SHA512 87d30c77772fa982a110cfe4fa0d118b302796e7dcdfa71b94e6bd1cca0369cb0555169ef48acc68e16d11a1ab47ef096cc91e204be3189f4779125449cd9cd1 -DIST vault-1.12.2-vendor.tar.gz 53842063 BLAKE2B 42917c6310ca53254be9d6339a786902327074635297ad84fcacd2a73b9b2d974830f91f527116f6764ea8f848809944fd52e623c3ecc2ac88dae698aa6f4636 SHA512 8c6fd33c363099bda13a2992200356d4a877ff4c52ca4613f1cb2c8d2cbabaf0f9f760dcd6bcd3d4e4453324edce3efe07d27700f30bced85da0f56ef9321697 -DIST vault-1.12.2-webui.tar.xz 1413036 BLAKE2B 7d773274c27d93ca8f492d792390896b6b7ab0e52b3636428f182a62161049d1593aef5280826dd83535e9ad86e925edba234ca982f2c9d1d06d2012c9757779 SHA512 0076e7b75fc0d3c400022a95cc6abc4a9224fd76d3d9716f7d4a80e4856c9deb1890ba13e7e5adf86ee81486c2f530f2eb48e49d8bdb7fde6eab5bb83f815293 +DIST vault-1.14.5-vendor.tar.gz 71839384 BLAKE2B 845416db5d69c400d5e9603bd42b2d73112b1cea884a03ac1345afad627b0d8ed0ff983d97b3086ed69462713cc706aa67f46164df4c1e4e3226aafb66cf0e89 SHA512 ac55e4f9b76ac80eb0f82e5d63ed234c65a9b5c737fcb6f7ad8c9cb9dbe303b6d18a11b329f8223d9fbdcea1a7ee982c622184537fce45fe005df89b8392bbe5 +DIST vault-1.14.5-webui.tar.xz 1670796 BLAKE2B 8629de337f2c708553752409a1c8ddc94e421adb34c7b31116f4154e06eed6e7ffb0355cd7ff91d7ec42f1fb1a35737732d530a8587cf515a0636b0a5dbffb38 SHA512 32ff0d720282f0539288f3ee111b91d43b9098bd4ea309d11f638c9f0c4a0a9276fe2f940573d9d664dcea33945f08ac33488ad05d37b372042e859b6d2f7e97 +DIST vault-1.14.9-vendor.tar.gz 71845081 BLAKE2B ea25a6ba8ac293971170688b4ce3845ba19a5af746c3d96860420d74f8c0af33ea118a47d17117dbd520675739c44ed76118ef126c5b53e4c4adb0924cda58d5 SHA512 00ff45f986889d17ebe59c27aeaf8132270e5f06883bf84ce10721c9e2943a25ad8b86be3271991c824369ad5545258b3c01600f1dda06487751ff806b1d76b9 +DIST vault-1.14.9-webui.tar.xz 1677212 BLAKE2B db4da051a8c0a62e99c1f2070f3c022fc934350b255d21b360b3b3b53555942f1ac6c4ef15ed7d8a2519f05752406add63837317615afb387b0fc407f5ab8410 SHA512 2f54dd24fb9a4e2e774dd4212a605126a9d4e4975a97a01c88c94bce8e6f10174fe07235d402dd43ae31aacf4371f77272e4446d972d2e7304745186b0e6dbb7 +DIST vault-1.15.6-deps.tar.xz 20736608 BLAKE2B 53e21d0664f9bbd8c851a486334e04d3b3151aaee709c8fe88ab4969a81ebd4562cf3a350e383647140bd4826a0aa75b34ef136c81920b868dff7ae6f0522e37 SHA512 c1c24c2c646a441c551849af2d3165fc15db2b61f261608f44b7371214cdef0e76263b5b2f295c19606057e80316b4864fff64bc5603b99901fc8a5d900c6550 +DIST vault-1.15.6-webui.tar.xz 1721320 BLAKE2B 3f2d31767c6086e7b17f7445f0cff34ce4ebd7a6a1daeaede96443758096a6b8b94b971af5a74e8bcfb2c95c07b496b1babf3f8ce82f9b360fafe5a4d5138cac SHA512 6a532258a5c7734863967926d95699b2611959177b9dbf4e60cff115331237e65f3dbc41e842443ee5af9020c69280b27a511f887528dc914f9d9e642f9a3a63 +DIST vault-1.15.6.tar.gz 31923253 BLAKE2B 8a4e7b9d8d6753b6f717c6699b2d4822cecff299e3cebd8945d3c34232ff77611611d4e6259ab9c9c4ff91a2e52b7eef707df7da68960be36c314ceba18b124b SHA512 52be0e47f3028f9c1f3ce5d2a72356c955f20fcaf6e8396a6d5938226d72cd8353bed398ba66a6821fc609aaed465e82c3449aeaa0dfaabe80ff0412a73779b3 +DIST vault-1.16.1-deps.tar.xz 21476528 BLAKE2B 2ba0bd2165ce41bfae6fb56a0ff97fe4ed30ac5e16f30ceba14d618e30851b9bb31a964cf5035cd4089baf87c2cda5acd17558bb363acbbcc371ddf47b453c73 SHA512 a0262f421eacfc729a0bc98c137a580d3ca7b384b5b7a8e3bb81cc27b0791b81fdb9005ff9721159cccaf49f2ec6e86dafe7f4e2dde4b5c8d806a8bf1c68de2c +DIST vault-1.16.1-webui.tar.xz 2213524 BLAKE2B 40c0811c84c849beba934f110afa21fe1ebe60f9a01750fcb4c6442f6a8ef28babd4c32157e6bb3eaf7545b683a81122f445a1a0d717cf7442a678e87206f67a SHA512 ca25ffaa85445070310fad9d5a05d6ff477729d64707a4da8bc433781d7f2283e18e680a9a06d6aa37496a21b148ac3bdc5eb3f475246ee3fe3cf4a8db096ffb +DIST vault-1.16.1.tar.gz 32997180 BLAKE2B e8c6ccf19ce2c48eee1b4b7544c6d164bd98be3d06a08397b06049bbb6aed9304df592bcb5103e943a629aca4c2e83f661b16469e3353c022e3ca552fa1afedb SHA512 e970004343abb2792aeea4db55a002d1c18701d309caab4a49e3f387028083b70dfa67b7ff34b60c5d4d34ffa8ac3bef308b7218a0344dffde3b000b0e5d43a9 diff --git a/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch b/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch new file mode 100644 index 000000000000..5b47f39cb81b --- /dev/null +++ b/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch @@ -0,0 +1,92 @@ +From cd6d0e1c593e158b8641529410d95e4b1722d5b2 Mon Sep 17 00:00:00 2001 +From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> +Date: Thu, 4 Jan 2024 17:03:09 -0600 +Subject: [PATCH] Allow stubmaker to work outside of a git repository + +https://github.com/hashicorp/vault/pull/24678 + +Fixes: https://github.com/hashicorp/vault/issues/24677 +--- + tools/stubmaker/main.go | 58 +++++++++++++++++++++++------------------ + 1 file changed, 33 insertions(+), 25 deletions(-) + +diff --git a/tools/stubmaker/main.go b/tools/stubmaker/main.go +index 53676e08b8c84..15e95b6a45f60 100644 +--- a/tools/stubmaker/main.go ++++ b/tools/stubmaker/main.go +@@ -43,15 +43,21 @@ func main() { + DetectDotGit: true, + }) + if err != nil { +- fatal(err) ++ if err.Error() != "repository does not exist" { ++ fatal(err) ++ } ++ repo = nil + } + +- wt, err := repo.Worktree() +- if err != nil { +- fatal(err) +- } +- if !isEnterprise(wt) { +- return ++ var wt *git.Worktree ++ if repo != nil { ++ wt, err = repo.Worktree() ++ if err != nil { ++ fatal(err) ++ } ++ if !isEnterprise(wt) { ++ return ++ } + } + + // Read the file and figure out if we need to do anything. +@@ -80,26 +86,28 @@ func main() { + + // We'd like to write the file, but first make sure that we're not going + // to blow away anyone's work or overwrite a file already in git. +- head, err := repo.Head() +- if err != nil { +- fatal(err) +- } +- obj, err := repo.Object(plumbing.AnyObject, head.Hash()) +- if err != nil { +- fatal(err) +- } ++ if repo != nil { ++ head, err := repo.Head() ++ if err != nil { ++ fatal(err) ++ } ++ obj, err := repo.Object(plumbing.AnyObject, head.Hash()) ++ if err != nil { ++ fatal(err) ++ } + +- st, err := wt.Status() +- if err != nil { +- fatal(err) +- } ++ st, err := wt.Status() ++ if err != nil { ++ fatal(err) ++ } + +- tracked, err := inGit(wt, st, obj, outputFile) +- if err != nil { +- fatal(err) +- } +- if tracked { +- fatal(fmt.Errorf("output file %s exists in git, not overwriting", outputFile)) ++ tracked, err := inGit(wt, st, obj, outputFile) ++ if err != nil { ++ fatal(err) ++ } ++ if tracked { ++ fatal(fmt.Errorf("output file %s exists in git, not overwriting", outputFile)) ++ } + } + + // Now we can finally write the file diff --git a/app-admin/vault/vault-1.10.7.ebuild b/app-admin/vault/vault-1.10.7.ebuild deleted file mode 100644 index 1e115bc0fbe9..000000000000 --- a/app-admin/vault/vault-1.10.7.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fcaps go-module systemd - -DESCRIPTION="A tool for managing secrets" -HOMEPAGE="https://vaultproject.io/" - -VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" -SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz - webui? ( - https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} - )" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="+webui" - -BDEPEND=" - app-arch/zip - dev-go/gox - >=dev-lang/go-1.15.3" -COMMON_DEPEND="acct-group/vault - acct-user/vault" - DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - -FILECAPS=( - -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} -) - -RESTRICT+=" test" -S=${WORKDIR}/${P}-vendor - -src_unpack() { - default -} - -src_prepare() { - default - # Avoid the need to have a git checkout - sed -e 's:^\(GIT_COMMIT=\).*:\1:' \ - -e 's:^\(GIT_DIRTY=\).*:\1:' \ - -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \ - -i scripts/build.sh || die - sed -e "/hooks/d" \ - -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \ - -e "s/gofumpt/gofmt/g" \ - -i Makefile || die - if [[ -d "${WORKDIR}/http/web_ui" ]]; then - rm -rf "${S}/http/web_ui" || die - mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" || - die "mv failed" - else - mkdir -p "${S}/http/web_ui" || die - touch "${S}/http/web_ui/no_web_ui" || die - fi -} - -src_compile() { - mkdir "${T}"/bin || die - BUILD_TAGS="$(usex webui ui '')" \ - GOPATH="${T}" \ - XC_ARCH=$(go env GOARCH) \ - XC_OS=$(go env GOOS) \ - XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \ - emake bin -} - -src_install() { - dobin bin/${PN} - dodoc CHANGELOG.md CONTRIBUTING.md README.md - insinto /etc/${PN}.d - doins "${FILESDIR}/"*.json.example - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-admin/vault/vault-1.10.8.ebuild b/app-admin/vault/vault-1.10.8.ebuild deleted file mode 100644 index 1e115bc0fbe9..000000000000 --- a/app-admin/vault/vault-1.10.8.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fcaps go-module systemd - -DESCRIPTION="A tool for managing secrets" -HOMEPAGE="https://vaultproject.io/" - -VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" -SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz - webui? ( - https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} - )" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="+webui" - -BDEPEND=" - app-arch/zip - dev-go/gox - >=dev-lang/go-1.15.3" -COMMON_DEPEND="acct-group/vault - acct-user/vault" - DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - -FILECAPS=( - -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} -) - -RESTRICT+=" test" -S=${WORKDIR}/${P}-vendor - -src_unpack() { - default -} - -src_prepare() { - default - # Avoid the need to have a git checkout - sed -e 's:^\(GIT_COMMIT=\).*:\1:' \ - -e 's:^\(GIT_DIRTY=\).*:\1:' \ - -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \ - -i scripts/build.sh || die - sed -e "/hooks/d" \ - -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \ - -e "s/gofumpt/gofmt/g" \ - -i Makefile || die - if [[ -d "${WORKDIR}/http/web_ui" ]]; then - rm -rf "${S}/http/web_ui" || die - mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" || - die "mv failed" - else - mkdir -p "${S}/http/web_ui" || die - touch "${S}/http/web_ui/no_web_ui" || die - fi -} - -src_compile() { - mkdir "${T}"/bin || die - BUILD_TAGS="$(usex webui ui '')" \ - GOPATH="${T}" \ - XC_ARCH=$(go env GOARCH) \ - XC_OS=$(go env GOOS) \ - XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \ - emake bin -} - -src_install() { - dobin bin/${PN} - dodoc CHANGELOG.md CONTRIBUTING.md README.md - insinto /etc/${PN}.d - doins "${FILESDIR}/"*.json.example - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-admin/vault/vault-1.11.5.ebuild b/app-admin/vault/vault-1.11.5.ebuild deleted file mode 100644 index 004b6dd49b57..000000000000 --- a/app-admin/vault/vault-1.11.5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fcaps go-module systemd - -DESCRIPTION="A tool for managing secrets" -HOMEPAGE="https://vaultproject.io/" - -VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" -SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz - webui? ( - https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} - )" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="+webui" - -BDEPEND=" - app-arch/zip - dev-go/gox - >=dev-lang/go-1.15.3" -COMMON_DEPEND="acct-group/vault - acct-user/vault" - DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - -FILECAPS=( - -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} -) - -RESTRICT+=" test" -S=${WORKDIR}/${P}-vendor - -src_unpack() { - default -} - -src_prepare() { - default - # Avoid the need to have a git checkout - sed -e 's:^\(GIT_COMMIT=\).*:\1:' \ - -e 's:^\(GIT_DIRTY=\).*:\1:' \ - -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \ - -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \ - -i scripts/build.sh || die - sed -e "/hooks/d" \ - -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \ - -e "s/gofumpt/gofmt/g" \ - -i Makefile || die - if [[ -d "${WORKDIR}/http/web_ui" ]]; then - rm -rf "${S}/http/web_ui" || die - mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" || - die "mv failed" - else - mkdir -p "${S}/http/web_ui" || die - touch "${S}/http/web_ui/no_web_ui" || die - fi -} - -src_compile() { - mkdir "${T}"/bin || die - BUILD_TAGS="$(usex webui ui '')" \ - GOPATH="${T}" \ - XC_ARCH=$(go env GOARCH) \ - XC_OS=$(go env GOOS) \ - XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \ - emake bin -} - -src_install() { - dobin bin/${PN} - dodoc CHANGELOG.md CONTRIBUTING.md README.md - insinto /etc/${PN}.d - doins "${FILESDIR}/"*.json.example - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-admin/vault/vault-1.11.4.ebuild b/app-admin/vault/vault-1.14.5.ebuild index 004b6dd49b57..8158ce887ad1 100644 --- a/app-admin/vault/vault-1.11.4.ebuild +++ b/app-admin/vault/vault-1.14.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit fcaps go-module systemd @@ -16,7 +16,7 @@ SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64 ~riscv" IUSE="+webui" BDEPEND=" @@ -32,7 +32,7 @@ FILECAPS=( -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} ) -RESTRICT+=" test" +RESTRICT="test" S=${WORKDIR}/${P}-vendor src_unpack() { diff --git a/app-admin/vault/vault-1.12.0.ebuild b/app-admin/vault/vault-1.14.9.ebuild index aaad01680cec..1ca68af3ed4e 100644 --- a/app-admin/vault/vault-1.12.0.ebuild +++ b/app-admin/vault/vault-1.14.9.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit fcaps go-module systemd @@ -22,7 +22,7 @@ IUSE="+webui" BDEPEND=" app-arch/zip dev-go/gox - >=dev-lang/go-1.15.3" + >=dev-lang/go-1.21" COMMON_DEPEND="acct-group/vault acct-user/vault" DEPEND="${COMMON_DEPEND}" @@ -32,7 +32,7 @@ FILECAPS=( -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} ) -RESTRICT+=" test" +RESTRICT="test" S=${WORKDIR}/${P}-vendor src_unpack() { diff --git a/app-admin/vault/vault-1.12.1.ebuild b/app-admin/vault/vault-1.15.6.ebuild index aaad01680cec..2a8f84f25ca1 100644 --- a/app-admin/vault/vault-1.12.1.ebuild +++ b/app-admin/vault/vault-1.15.6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit fcaps go-module systemd @@ -9,10 +9,9 @@ DESCRIPTION="A tool for managing secrets" HOMEPAGE="https://vaultproject.io/" VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" -SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz - webui? ( - https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} - )" +SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" webui? ( https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" @@ -22,7 +21,7 @@ IUSE="+webui" BDEPEND=" app-arch/zip dev-go/gox - >=dev-lang/go-1.15.3" + >=dev-lang/go-1.21" COMMON_DEPEND="acct-group/vault acct-user/vault" DEPEND="${COMMON_DEPEND}" @@ -32,8 +31,9 @@ FILECAPS=( -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} ) -RESTRICT+=" test" -S=${WORKDIR}/${P}-vendor +RESTRICT="test" +S=${WORKDIR}/${P} +PATCHES=("${FILESDIR}/${P}-stubmaker-outside-git-repo-24678.patch") src_unpack() { default diff --git a/app-admin/vault/vault-1.12.2.ebuild b/app-admin/vault/vault-1.16.1.ebuild index aaad01680cec..9956d1f746c1 100644 --- a/app-admin/vault/vault-1.12.2.ebuild +++ b/app-admin/vault/vault-1.16.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit fcaps go-module systemd @@ -9,12 +9,12 @@ DESCRIPTION="A tool for managing secrets" HOMEPAGE="https://vaultproject.io/" VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" -SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz - webui? ( - https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} - )" +SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" webui? ( https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )" +SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" +LICENSE="BUSL-1.1 MPL-2.0" +LICENSE+=" Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" KEYWORDS="~amd64 ~arm64 ~riscv" IUSE="+webui" @@ -22,7 +22,7 @@ IUSE="+webui" BDEPEND=" app-arch/zip dev-go/gox - >=dev-lang/go-1.15.3" + >=dev-lang/go-1.21" COMMON_DEPEND="acct-group/vault acct-user/vault" DEPEND="${COMMON_DEPEND}" @@ -32,8 +32,9 @@ FILECAPS=( -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} ) -RESTRICT+=" test" -S=${WORKDIR}/${P}-vendor +RESTRICT="test" +S=${WORKDIR}/${P} +PATCHES=("${FILESDIR}/${PN}-1.15.6-stubmaker-outside-git-repo-24678.patch") src_unpack() { default diff --git a/app-admin/webalizer/webalizer-2.23.08-r1.ebuild b/app-admin/webalizer/webalizer-2.23.08-r1.ebuild index 4599eb628b61..06ed7a36b4d5 100644 --- a/app-admin/webalizer/webalizer-2.23.08-r1.ebuild +++ b/app-admin/webalizer/webalizer-2.23.08-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # uses webapp.eclass to create directories with right permissions @@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86" -IUSE="bzip2 xtended geoip nls" +IUSE="bzip2 xtended geoip nls selinux" DEPEND=" >=sys-libs/db-4.2:* @@ -39,8 +39,12 @@ DEPEND=" >=media-libs/libpng-1.2:0= >=media-libs/gd-1.8.3[png] dev-libs/geoip - bzip2? ( app-arch/bzip2 )" -RDEPEND="${DEPEND}" + bzip2? ( app-arch/bzip2 ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-webalizer ) +" pkg_setup() { webapp_pkg_setup diff --git a/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch new file mode 100644 index 000000000000..cb1ba1a8593e --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch @@ -0,0 +1,11 @@ +--- a/WebappConfig/protect.py ++++ b/WebappConfig/protect.py +@@ -78,7 +78,7 @@ + + numbers = [] + prefix = self.protect_prefix +- rep = re.compile(prefix.replace('.','\.') + '(\d{4})_') ++ rep = re.compile(prefix.replace('.',r'\.') + r'(\d{4})_') + + for i in entries: + rem = rep.match(i) diff --git a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild index daf5ce1eeff8..befaf688f6f1 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild @@ -1,19 +1,19 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 prefix if [[ ${PV} = 9999* ]] then - EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" inherit git-r3 else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2" + SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.bz2" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi @@ -30,6 +30,18 @@ RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" python_prepare_all() { + # make the source from svn mirror the one in the tarball + if [[ ${PV} == 9999* ]]; then + mkdir ../webapp-config || die "Cannot create temp directory." + cp -r * ../webapp-config || die "Cannot copy all into the temp directory." + mv ../webapp-config . || die "Cannot move temp directory to its final position." + + # Installation fails if version is 1.55-git + sed -e 's/-git//' \ + -i webapp-config/WebappConfig/version.py \ + -i WebappConfig/version.py || die "Cannot fix version." + fi + distutils-r1_python_prepare_all eprefixify WebappConfig/eprefix.py config/webapp-config } @@ -55,6 +67,9 @@ python_install() { python_install_all() { distutils-r1_python_install_all + # distutils-r1 installs the scripts in /usr/bin in PEP517 mode + mv "${ED}"/usr/bin "${ED}"/usr/sbin || die "Cannot rename scripts directory to /usr/sbin" + insinto /etc/vhosts doins config/webapp-config diff --git a/app-admin/webapp-config/webapp-config-1.55-r4.ebuild b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild new file mode 100644 index 000000000000..cc2e8028b578 --- /dev/null +++ b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 prefix + +if [[ ${PV} = 9999* ]] +then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Gentoo's installer for web-based applications" +HOMEPAGE="https://sourceforge.net/projects/webapp-config/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+portage" + +DEPEND="app-text/xmlto + sys-apps/gentoo-functions" +RDEPEND=" + portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch +) + +python_prepare_all() { + # make the source from svn mirror the one in the tarball + if [[ ${PV} == 9999* ]]; then + mkdir ../webapp-config || die "Cannot create temp directory." + cp -r * ../webapp-config || die "Cannot copy all into the temp directory." + mv ../webapp-config . || die "Cannot move temp directory to its final position." + + # Installation fails if version is 1.55-git + sed -e 's/-git//' \ + -i webapp-config/WebappConfig/version.py \ + -i WebappConfig/version.py || die "Cannot fix version." + fi + + distutils-r1_python_prepare_all + eprefixify WebappConfig/eprefix.py config/webapp-config +} + +python_compile_all() { + emake -C doc/ +} + +python_test() { + PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v || + die "Testing failed with ${EPYTHON}" +} + +python_install() { + # According to this discussion: + # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html + # distutils does not provide for specifying two different script install + # locations. Since we only install one script here the following should + # be ok + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" +} + +python_install_all() { + distutils-r1_python_install_all + + # distutils-r1 installs the scripts in /usr/bin in PEP517 mode + mv "${ED}"/usr/bin "${ED}"/usr/sbin || die "Cannot rename scripts directory to /usr/sbin" + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] +} + +pkg_postinst() { + elog "Now that you have upgraded webapp-config, you **must** update your" + elog "config files in /etc/vhosts/webapp-config before you emerge any" + elog "packages that use webapp-config." +} diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild index 9aad95348cfe..cc2e8028b578 100644 --- a/app-admin/webapp-config/webapp-config-9999.ebuild +++ b/app-admin/webapp-config/webapp-config-9999.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 prefix if [[ ${PV} = 9999* ]] then - EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" inherit git-r3 else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Gentoo's installer for web-based applications" @@ -29,7 +29,23 @@ DEPEND="app-text/xmlto RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch +) + python_prepare_all() { + # make the source from svn mirror the one in the tarball + if [[ ${PV} == 9999* ]]; then + mkdir ../webapp-config || die "Cannot create temp directory." + cp -r * ../webapp-config || die "Cannot copy all into the temp directory." + mv ../webapp-config . || die "Cannot move temp directory to its final position." + + # Installation fails if version is 1.55-git + sed -e 's/-git//' \ + -i webapp-config/WebappConfig/version.py \ + -i WebappConfig/version.py || die "Cannot fix version." + fi + distutils-r1_python_prepare_all eprefixify WebappConfig/eprefix.py config/webapp-config } @@ -55,6 +71,9 @@ python_install() { python_install_all() { distutils-r1_python_install_all + # distutils-r1 installs the scripts in /usr/bin in PEP517 mode + mv "${ED}"/usr/bin "${ED}"/usr/sbin || die "Cannot rename scripts directory to /usr/sbin" + insinto /etc/vhosts doins config/webapp-config diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest index 8bd3cc3efe66..b6b56c6115d9 100644 --- a/app-admin/xkcdpass/Manifest +++ b/app-admin/xkcdpass/Manifest @@ -1 +1,2 @@ -DIST xkcdpass-1.19.3.tar.gz 2570967 BLAKE2B bd3576b707db2652e6979ea25476fcda51df7bc84a5182668ff1cf2878a57c89ab56a7272fe2030c38533bf4f75855facd7fd8aefa6e5c6335a00c8ef80b228f SHA512 5336e57edd7fbeb655573910b0c0868381a8b43d5ccbb8d388cc24ef16ba094c27517a4fe7b11dbfc7ff906b65a303f90b20cdf9bc551b844453640378b5e555 +DIST xkcdpass-1.19.8.tar.gz 2689908 BLAKE2B 68d0e6b2799773433962ee19ede47f5983839f4e4cecd4939205c2f0872228b4da5a107176d3931fc41aa47be8e51b7fb7383c1da1898684484be98913c088f9 SHA512 f218a9afdf103444558233f9fe32655d2c604f3553d2782a923f73baa4d69495871557a753a5f38be4607bd373df43cf425c0cc6675b0b1b34723098fdeff7b5 +DIST xkcdpass-1.19.9.tar.gz 2689919 BLAKE2B 089997c82569afa40fd2f7d2046b0dd284491d080597513f963c4e6af49ad20c4e01397af0f1dc3b91a23b95666b492eaaf85c3ac1c8f87d3250e012fd00bdc1 SHA512 b326160e181f0e0485514f10efa6cd8e98e139a8a89af37bad511713a7f46750f6da3ff1eeab20b850e0b5c607d0e329966d100d6bd4fe43b80d3edce090a2c1 diff --git a/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild index 57d1ac6aff4c..206d383064ae 100644 --- a/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild +++ b/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild @@ -1,9 +1,10 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 pypi DESCRIPTION="Password generator inspired by XKCD 936" diff --git a/app-admin/xkcdpass/xkcdpass-1.19.9.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.9.ebuild new file mode 100644 index 000000000000..206d383064ae --- /dev/null +++ b/app-admin/xkcdpass/xkcdpass-1.19.9.ebuild @@ -0,0 +1,40 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) +inherit distutils-r1 pypi + +DESCRIPTION="Password generator inspired by XKCD 936" +HOMEPAGE="https://github.com/redacted/XKCD-password-generator" + +LICENSE="BSD CC-BY-3.0 + l10n_de? ( GPL-3 ) + l10n_it? ( CC-BY-SA-3.0 ) + l10n_no? ( CC-BY-4.0 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt" + +distutils_enable_tests pytest +REQUIRED_USE="test? ( l10n_en )" + +src_prepare() { + default + + use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist} + use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy} + use l10n_es || rm ${PN}/static/spa-mich + use l10n_fi || rm ${PN}/static/fin-kotus + use l10n_fr || rm ${PN}/static/fr-* + use l10n_it || rm ${PN}/static/ita-wiki + use l10n_no || rm ${PN}/static/nor-nb + use l10n_pt || rm ${PN}/static/pt-* +} + +python_install_all() { + distutils-r1_python_install_all + doman ${PN}.1 +} diff --git a/app-admin/xstow/xstow-1.1.0.ebuild b/app-admin/xstow/xstow-1.1.0.ebuild index 7b39d09e8eeb..827b9a734e87 100644 --- a/app-admin/xstow/xstow-1.1.0.ebuild +++ b/app-admin/xstow/xstow-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit autotools DESCRIPTION="Replacement for GNU stow with extensions" -HOMEPAGE="http://xstow.sourceforge.net/" +HOMEPAGE="https://xstow.sourceforge.net/" SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2" LICENSE="GPL-2" diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest index 29db1d436867..1845101b5b08 100644 --- a/app-admin/yadm/Manifest +++ b/app-admin/yadm/Manifest @@ -1,2 +1 @@ -DIST yadm-3.2.1.tar.gz 109838 BLAKE2B 4e0b829ca6f74c1300b78831d64fd95250bcea7779cca672707751e38129a7e618e8a69b2f3862ac6e87cb086de09380e4e624d54c4672c125d16ea8cc3ea11c SHA512 8ce9bc66a33fc3841e47293e002b834fac5760dc771ede37adfc47a9e911ddade23c0ef5379cf8f00cf9b24853abbc1263198b8439ca4e8a3acd5787fbd935cb DIST yadm-3.2.2.tar.gz 111249 BLAKE2B 24dceda15f8bcb85df64fce987409feb4a94fac4dacb34f246ee11557e280ca1df3569f6b110fb2de02e6b756e82261a4da1896187b670df1c5e8edf123353cc SHA512 c61da3f644c2f587079fd717d4ef566861f20224f287906ef5b6d07169bc5f02aef7974afd8d4441267a92417a4fd0c7edda562b8f0cf2fc104c91fc0f5f85ff diff --git a/app-admin/yadm/yadm-3.2.1.ebuild b/app-admin/yadm/yadm-3.2.1.ebuild deleted file mode 100644 index 02095ec7674a..000000000000 --- a/app-admin/yadm/yadm-3.2.1.ebuild +++ /dev/null @@ -1,90 +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 bash-completion-r1 python-any-r1 - -DESCRIPTION="Git based tool for managing dotfiles" -HOMEPAGE="https://github.com/TheLocehiliosan/yadm" -SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - app-shells/bash - app-crypt/gnupg - dev-vcs/git -" - -BDEPEND=" - test? ( - ${RDEPEND} - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/pytest[${PYTHON_USEDEP}] - ') - dev-tcltk/expect - ) -" - -DOCS=( CHANGES README.md ${PN}.md ) - -python_check_deps() { - python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_compile() { - emake "${PN}.md" -} - -src_test() { - # prevent system config having influence on tests - local -x GIT_CONFIG_NOSYSTEM=1 - - # prevent git branch warning, it confuses tests - local -x GIT_CONFIG_GLOBAL="${HOME}/.gitconfig" - git config --global init.defaultBranch master || die "setting default branch name failed" - - # un-hardcode path to tmp, otherwise encryption tests fail - sed -e "/^cache_dir/s@/tmp@${T}@" -i pytest.ini || die "cannot patch cache dir" - - local EPYTEST_DESELECT=( - test/test_alt.py # requires envtpl, not packaged - test/test_compat_jinja.py # ditto - test/test_unit_template_j2.py # ditto - test/test_syntax.py # needs new yamllint, not packaged yet - test/test_upgrade.py::test_upgrade # needs old version of yadm - test/test_compat_alt.py # tests obsolete features, broken - test/test_unit_template_esh.py # requires esh, not packaged - test/test_encryption.py::test_symmetric_encrypt[clean-encrypt_exists-bad_phrase] # hangs in sandbox - test/test_encryption.py::test_symmetric_encrypt[overwrite-encrypt_exists-bad_phrase] # ditto - ) - - epytest -} - -src_install() { - einstalldocs - - dobin "${PN}" - doman "${PN}.1" - - dobashcomp completion/bash/yadm - - insinto /usr/share/zsh/site-functions - doins completion/zsh/_${PN} - - insinto /usr/share/fish/vendor_completions.d - doins completion/fish/${PN}.fish -} diff --git a/app-admin/yadm/yadm-3.2.2.ebuild b/app-admin/yadm/yadm-3.2.2.ebuild index 84a40d3dccec..154ee7556273 100644 --- a/app-admin/yadm/yadm-3.2.2.ebuild +++ b/app-admin/yadm/yadm-3.2.2.ebuild @@ -3,18 +3,20 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit bash-completion-r1 python-any-r1 DESCRIPTION="Git based tool for managing dotfiles" HOMEPAGE="https://github.com/TheLocehiliosan/yadm" -SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz +" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" IUSE="test" - RESTRICT="!test? ( test )" RDEPEND=" |