diff options
Diffstat (limited to 'app-admin')
29 files changed, 96 insertions, 1370 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex bbcba37810f4..0e9d9b18493f 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 17e103a07812..e8d8f8607e29 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -2,5 +2,5 @@ AUX ansible-lint-24.7.0-warnings.patch 960 BLAKE2B 8305b941970c5f06e466052545b35 DIST ansible_lint-24.12.2.tar.gz 548046 BLAKE2B 07a1907b4d542dafd27681229206de2b6f8a6ed1c106d2a1986b3e6d27641cdeec8ab77e541357b8b578beb0ab7b48cd96ecb2b2d3b283fae3099429d553cb02 SHA512 0050f5c14165dc4114846096518d500fe2c400f05a6a943d36331042b02f8ae038ede8924a6a036e846eafa03c6bde8e24699b41cef85bcf6d770289f71fc162 DIST ansible_lint-24.9.2.tar.gz 536244 BLAKE2B db7195d569698a2c5d43b0b0293dc2fa97cf3f5de8807b95e43f991b12432cdaedaa0b4a7165cd7af5a67142062eaa981ccb642888153d97296ae4125fe4019d SHA512 ae570ae86e31b83ab89e1b4c7f0996165ecb40299a8374fd5baac4ff955aa17f0a05542a7d14683e43e680fc6e55acb862589fa48b86b82a11dc31bf6a0d6aab EBUILD ansible-lint-24.12.2.ebuild 1871 BLAKE2B e7dfc7fad0d5befae5d6cebb70e8dc21d67b9495025b288ecfe11e66dc973954805b620655f7d9635a9bb805224bdd0ae32a0402e37ff58b3c008e814ab51eac SHA512 8baf8076e522dc80dfaad3db5fe4531ce6b0858daac5a99b9559b9b701bb4d35bb1b2d8c7f4deb265670d52383f66dc225bbd110636cf01c602cf0554d494753 -EBUILD ansible-lint-24.9.2.ebuild 1819 BLAKE2B 4653a27258838ada2720af8aecbe964576ea97dd86fba16812bbb10028734a780b6c3a55d84c01c240126a2cd985074bc1d5091b9d59bac3849485b6008b9d21 SHA512 1b3338d414eef8399d2006cae1175362dc1896b6f4c9959dd855e672cd5e67f721adb48853d6df93d69128fe11c5f1e1d295ea92b77b931f1516543e6535fa49 +EBUILD ansible-lint-24.9.2.ebuild 1819 BLAKE2B 110b23a4d0a9fa20cb7f72cd94888d7d50158867c74528c03e606a9c264481c16d3c05fd38d3f97bc4051caa2d2886566dcaa8303ae7ca0ac3f8a19e24442616 SHA512 5680c52481d7b939ff597539a6cf7204b70f06397489ff3d89d5cd3570fb9c27fd210759405e2c7630b78b5678d53f4b017ae8ab69bcf700ee6ff6b2a0851412 MISC metadata.xml 601 BLAKE2B 48a208d7526866289af9c33182cc7826cc18d06c0e5de31b7bd2ef45592ea52ad0dfd279a23423268db5842a57fab70c742fb6ff245673e91262b3d043f4add4 SHA512 294746891e5a2b280e59fa177cfa07d1570efc8360a86269895616202c24cbab94a88f49b1b5f9f6bddf869b6610ab0506955421e8bacf2e51f570e8262936da diff --git a/app-admin/ansible-lint/ansible-lint-24.9.2.ebuild b/app-admin/ansible-lint/ansible-lint-24.9.2.ebuild index 3664a1a3efd0..abe1d7d17dd7 100644 --- a/app-admin/ansible-lint/ansible-lint-24.9.2.ebuild +++ b/app-admin/ansible-lint/ansible-lint-24.9.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..12} ) inherit distutils-r1 pypi diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest index 7f9d81833dc6..19cad33638cd 100644 --- a/app-admin/ansible-molecule/Manifest +++ b/app-admin/ansible-molecule/Manifest @@ -1,6 +1,6 @@ AUX ansible-molecule-24.2.1-mkdocs_google_fonts.patch 156 BLAKE2B e311c1a4c1d3cc9a087611a70dfa6a5634d0842afdd426a708a390b7391507e330d2d9680a5b5a85949d9985beafb80fb146a53742d645d1b8ccb78f5f7a4f64 SHA512 66113e61b0f97243e15afc7b7fea8657cee0cabfa450a2bbe6a1b751cdd9cd82be6bfad6b36802377fd3261e9e55d3d0e37eb44e9c26838110495cd43773cc9f DIST molecule-24.12.0.tar.gz 4412418 BLAKE2B 0dba13534a7d4d9b1095c38e9694cd51b3e750cb9ab611b3078972182d09319a7b858e3dba018c370a9b7c6a8065036f60d8cab58da1e7ee9660be746b9bdf34 SHA512 6d709832091514b55f697ed70d7c7ae4695537a868ed3e8a0b0cb1c868ce5b161baf849412f94fbe723fae491a4ca4e510179ba69c40a3b48711aef36cedc2ba DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d -EBUILD ansible-molecule-24.12.0.ebuild 2769 BLAKE2B ad0b48c0b880b5ccad97b6a8ce6a88eb272d564f6ea9c4d14443e6b74bbe9580fc54b240a44c3e90ba4152338b290dda52e14ddcf600a0625930a857e36c1f9c SHA512 a9215edeca6a61b8e2a9bede6cd7070758f724adc6eb8b4e233b0e04673f1f0d28acbf5abfe76f34f6035d11884b97c00e3fa39a9ea8cd3d75cc3929617def16 -EBUILD ansible-molecule-24.2.1.ebuild 3013 BLAKE2B 978335a99c499a3d4ac8fa13dab0207f6ed085c72f84dd8c08703b481fd0a6e0c8419e0729cefbd5aebd1d3e37d308fcf60a42301d6b93c9b051718751cbc51f SHA512 62d34a4887da28d71e9a045bfee64bc5b79e4502b9a8f13e32353e3fcfab66b46ad6b678050720beedd91f3f3589affb447a883192b51c0ed8de3e8e02d29eaf +EBUILD ansible-molecule-24.12.0.ebuild 2769 BLAKE2B 0e75828171dc2822f975fffd3d7fefff0e50ba757b051e4d2e580fe33524553493b3cead82bd3bc955cbd5b775c5a5c251c17489b405eea4b9f00cd12c63d5d1 SHA512 4b1ae75150f56f422d97d8ad240dae0f19a37bef617eba9b7c01807d580d06b0b13938f3e09f3c606b8b2a964087f71478bf074cdd96fa3a9291ef7d46299f47 +EBUILD ansible-molecule-24.2.1.ebuild 3013 BLAKE2B 09a564d6bfbdb24f4b21a85fdb7fb0d2628d0eca850d1fc432e02fbbbb8fad54e9fd18e4dad62cffddb0b892cc75a134bce7e038661a602946a964e1f609ecb3 SHA512 522f75b7c647be53e1f29aec012b680b4faaf8d3952e4f81e29e1fd5acb80ff33641d2511504cc1d0c772c8c2b85a46feb3818124f685f2b0520b964cb272096 MISC metadata.xml 319 BLAKE2B e21046964335743f016597d0b19ef5edba9452c5cadeaf9db45a3443cdf3320b8c766a8e2302cecc203aa333cbd9c988ffe0330a7e07a083c3d157ae4b8e91c1 SHA512 b082b103d0c47df58411d7ad1e67cf274d287f8398d4235fe83d2a6f7e722d72e9441ec919510f98965b2d01ebe1d9fd25fe987a358786d2cc55ea375c7fed3d diff --git a/app-admin/ansible-molecule/ansible-molecule-24.12.0.ebuild b/app-admin/ansible-molecule/ansible-molecule-24.12.0.ebuild index b2ef4a306e45..bb26dfb43631 100644 --- a/app-admin/ansible-molecule/ansible-molecule-24.12.0.ebuild +++ b/app-admin/ansible-molecule/ansible-molecule-24.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild index 9efa988673a9..a2543fe03054 100644 --- a/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild +++ b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools DOCS_BUILDER="mkdocs" diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 82e53b9fdd94..c64832b6a807 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,15 +1,7 @@ -DIST aws-cli-1.37.11.gh.tar.gz 2900600 BLAKE2B eed7e50f8b481fa3f7ff1cbb4d6c953545b6d5285decd84ed75b29f89c5a182ed9db299d9cbba8ad75ef6c31da25f80559c55bc9a868d25cf6dea815bd57265e SHA512 a445764336804219cbe18a5f2b929c956c67d63958b4b01b7a4a263801061223941b92e551f223d4966a68d95c711933db0de2e6043c4c85e79376b973088c51 DIST aws-cli-1.37.16.gh.tar.gz 2903703 BLAKE2B 0d3333bef89222e9e84de2c469a98c6fd19177ba6c7e69278e43f459f1909d67e07cdc4150189dd3fd2ce1573ae43a22c944d172738de6102ecf7c7ea00404cf SHA512 d9916ecfedd8bd9086608b6350f95374efad96f3af6adc8b372a254021e4b9f00c43a7c5759cd74f20082f60806fc6eb13d8daf7569fad303995f6d180958cb9 DIST aws-cli-1.37.21.gh.tar.gz 2907762 BLAKE2B e42e9aed28ef3cee1b83f2e57f90ce81a9894bc23a960fef487096ce8b8bab16d23121658aed0547070919ae78a0476176f9517d583a84be90bb016c7cdd9bf7 SHA512 3c7b347627b799d7a3edc7a8cae3d6110ec3cc5bfcdecc247876135faebc2235546a514afbdaf95fec50cfe787ca30b125cae7a8e7be84134d83493a0f869b1a -DIST aws-cli-1.37.22.gh.tar.gz 2907598 BLAKE2B 00555a7fb5bbd4c527de2be1b0dc17b0de23e0aed9f9de8ef584e427632bb30da411b4e7d7a2deeb51c768dad00a3463542c7eac302080dc94b024d6e71c1088 SHA512 886ccbfe6536312129b0059f26eb81d0d3e334014740516f33c3b648cd1bb3e41482c99bb10639fb3e7e84d730d7dcb698500b65536ee9a9c7f07267d4e82fd6 -DIST aws-cli-1.37.23.gh.tar.gz 2907789 BLAKE2B d24999f8f416f2917bb841edda4a5827124bd51c0a421fcc658e1d526c35ea4177418351c3fc0c5d3908d65cc5b3b1e1e06f1c72985829600b3d405760f68eb8 SHA512 d45be9e18a48d4d7692ad2ab58c67571b083580e582c232f4e65eae6ca63e71b37f3f887b192589e5c74d78b4e7a22b813f866ceca8b13bbb1b191bef1a17377 -DIST aws-cli-1.37.24.gh.tar.gz 2908649 BLAKE2B cca5622db09b728eaa9ac34316311dcd506b4286881b28da276ae1d4f8bcf8e1355deaa96b5443146f7f1a0f12f8e83b76fbff6d908749945d2b55003c4cc063 SHA512 b33856151554a166be9dbab1f10f1c707005ccb16bb1e0aed1865119070d67300be9ebe7102d4539c8fb93efc99f211a7402ba6aa85d9f82f8ad20970c82b6e1 -DIST aws-cli-1.37.25.gh.tar.gz 2909499 BLAKE2B 6c71b195278e41b651d52bc54b21038b34149d8225c1626fe6f67b40580273de2cebaa16e7145bf3848f146053491b11ed6430a25bece50ad6bda8ebdaa5ad5a SHA512 f3b14c1eb93df8906c7173a2744a5eb934418209b02cfea923fe369eac68eecfbbf977a3f8ff497b39747bcb7af6a0c89b78f9aef71059f7e91d86c101a29a14 -EBUILD awscli-1.37.11.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f -EBUILD awscli-1.37.16.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb +DIST aws-cli-1.37.26.gh.tar.gz 2909650 BLAKE2B 77843b52fa77410c9568dcc402774352b839591264f16ce4b27c58f5b52fe159afe029756b702132c1b6e611f2e40d5a27f26d830928c2716ec285e58201ac16 SHA512 0396541bead54c81c9c9219403aa1d7dcf8f0a60b58d8ef33ff1900ae3d44cd362b4d0f2fdd93fee89a068bba1b5afefac44bcd8f5624368b2a02044acd070d9 +EBUILD awscli-1.37.16.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f EBUILD awscli-1.37.21.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb -EBUILD awscli-1.37.22.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb -EBUILD awscli-1.37.23.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb -EBUILD awscli-1.37.24.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb -EBUILD awscli-1.37.25.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb +EBUILD awscli-1.37.26.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab diff --git a/app-admin/awscli/awscli-1.37.11.ebuild b/app-admin/awscli/awscli-1.37.11.ebuild deleted file mode 100644 index 2bb0ee1db5bd..000000000000 --- a/app-admin/awscli/awscli-1.37.11.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -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-1).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}" - - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - # 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.37.16.ebuild b/app-admin/awscli/awscli-1.37.16.ebuild index 4a8e0ae852e0..2bb0ee1db5bd 100644 --- a/app-admin/awscli/awscli-1.37.16.ebuild +++ b/app-admin/awscli/awscli-1.37.16.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" # botocore is x.(y-1).z BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)" diff --git a/app-admin/awscli/awscli-1.37.23.ebuild b/app-admin/awscli/awscli-1.37.23.ebuild deleted file mode 100644 index 4a8e0ae852e0..000000000000 --- a/app-admin/awscli/awscli-1.37.23.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -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-1).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}" - - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - # 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.37.24.ebuild b/app-admin/awscli/awscli-1.37.24.ebuild deleted file mode 100644 index 4a8e0ae852e0..000000000000 --- a/app-admin/awscli/awscli-1.37.24.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -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-1).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}" - - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - # 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.37.25.ebuild b/app-admin/awscli/awscli-1.37.25.ebuild deleted file mode 100644 index 4a8e0ae852e0..000000000000 --- a/app-admin/awscli/awscli-1.37.25.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -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-1).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}" - - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - # 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.37.22.ebuild b/app-admin/awscli/awscli-1.37.26.ebuild index 4a8e0ae852e0..4a8e0ae852e0 100644 --- a/app-admin/awscli/awscli-1.37.22.ebuild +++ b/app-admin/awscli/awscli-1.37.26.ebuild diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 586c45527a4d..e82f1b07a079 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,5 +1,5 @@ DIST conky-1.21.7.tar.gz 1961997 BLAKE2B 80ca17e0d1065655c410d8108668b3f09df574b761d57e374a2d51c946b51bd1ce4d29d320def0a197d465401cb4a665fb84a394406611903877c0acf42b4ad3 SHA512 52b6621e3e693654610ebd1b9e1adbeaec2ae2a2aaed4b038882a6825e6573f4afdea85f9156e1ffaa5999e30b3b05170b6b101f415980f0edab5c85151e9e6c DIST conky-1.22.0.tar.gz 2030830 BLAKE2B b262b76fac24d74db0fe099e6e1c54be463d9453c5e9bcb9de33beeccda9e7b063287c189018f673bf0fc1d46029de9ac4f6c333c579b3f7fc86e2a7866e761e SHA512 df110bbec225127b6b9e2cb8998a21d99beb00225c7df6a6d35d6758135c8882d3e06c796f5c94eec7653da73af32f7a87ae631755b0e715306799f89de63cdd EBUILD conky-1.21.7.ebuild 6191 BLAKE2B 73e7886b22f926d38e91a5df4963f6a516fd79cd01dcd7dc88b432e9b4301d00b49f3448200c14ee03420bffcee24b966cdf54fbcabd013917a44ad56174e9f6 SHA512 db3bca80c15821fc298092144e2898a2d048a18281d780df6c9f5c7d2a387af5db295da7cc406fdffd7acfde38ceb8d4a89191bd3ed7c6112c52981c1eff4fd7 -EBUILD conky-1.22.0.ebuild 6190 BLAKE2B 406bb475ed1a912d5bad442e21b8b6b00a8ddd4aed931d00227201e281fa700bcf3b40a735bacd3de047b6848761ea6ff67a94df16e85ca5268d2cf3cc1854f7 SHA512 dfcb5a294ed706d892cfb96de56920bbbf0ed30df968777f11423728f7742ce327c938e347cc92f53564fc8810e545c5fae53433c178d72349c7a1059ad9e5f6 +EBUILD conky-1.22.0.ebuild 6189 BLAKE2B fff5c99acc6a1cdbc8b818628a90bdb855506cb2368f118c5ad998a86dfc97126c6c73e36bef06bb547541698fd8545a53a57ed47a3e395ff626c46945de2df0 SHA512 c1c2f527fb184197036645f13316aba5f28d2d733549d3c875d991098f31790c956bf423c759cd68322e597c3968eba50bfc1a5fbcce4a281dae53a4dcc1ec82 MISC metadata.xml 2706 BLAKE2B ccd856ef7d804a1d4cea72124dc575dc3b94b6cad0b98b4bff8248f70f84b1705d862a58b0c98d1a67ea17c412e7d967a32d31678e8b51d5234c215d54389a57 SHA512 65bd968350ff45ed491a2cc36bb7d5640e38f3a4b4a0e0e3fe22d4e74563c2bf2a3d9f3cd9f3c67a0e9f8b756c387f72fcf8581c6876941112470f7f04e47ddf diff --git a/app-admin/conky/conky-1.22.0.ebuild b/app-admin/conky/conky-1.22.0.ebuild index 8b0c49ed4571..b7b768c3f6bc 100644 --- a/app-admin/conky/conky-1.22.0.ebuild +++ b/app-admin/conky/conky-1.22.0.ebuild @@ -14,7 +14,7 @@ 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 colour-name-map curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest index c27c85ef7351..392d9c325514 100644 --- a/app-admin/consul/Manifest +++ b/app-admin/consul/Manifest @@ -15,9 +15,12 @@ DIST consul-1.20.1-deps.tar.xz 10033856 BLAKE2B dcd9df79d1f5948eb7ed1c6279a679d1 DIST consul-1.20.1.tar.gz 35647978 BLAKE2B 3287c57ea426f5fc0be6c023bd5c3701908d1d2f2309dcb815a1087f2b2c10bc40895d362c56ac53a1daac90d65c8dbb03b55126244608d18eb7bb19f79a8bb0 SHA512 88ddb750f60d87d31713dabd6cc22590fd96ec12d912d08f1d4690839c64e896254e207c029001233b7e47ddf03b171e0daaf24a26437c36199c30632b183163 DIST consul-1.20.2-deps.tar.xz 10069664 BLAKE2B 7a6ac97367625da734fd9a399e14744e284ae0b1beb27f50176f10ec448a7b177a6e4897e3b1eca313e9d0a31d7c9764187c0812bfbcf05b603533be288dc2c5 SHA512 759c8346b04f1e7a8c273c46bbcf7da28b388243564ae3d834d388c27a099e74f92a5da4676b953e5851a45a5f1bb1c31fda10d44f69b13cca36c604829d8fc3 DIST consul-1.20.2.tar.gz 39310768 BLAKE2B 9d6d05a6d16e842fd0cdb1a8d8a93adedfc82388fbf72bb8088ab1fd96ac9d98762f0e67c0b22c240e801655bc2c478ba09d0cfc563b3151c2d56f59e4f001f5 SHA512 687c30b55aedcd0b9154ae4a05c6a828e453146ae171a1407497fb45aed952fc888306c48590cc9243dd7c1f59795b345f04f36c2de183f64e13e35e4a61d66b +DIST consul-1.20.4-deps.tar.xz 10083416 BLAKE2B a2cd1e661d5ffe51681d757918990e4912ec58a774631e51281f7029b2e452a0d6d5f4923970e545f277eb1becb013666d678e950a8c162c129466af1284ab9a SHA512 f8cdb9f06f9c29da5f2d345a9d41ba2f5c50994a66b39dca99ccc41a2003884c464d7f79f47397769655eebafa5403e9829a8340edc33c3fd33e54c5055dd1f2 +DIST consul-1.20.4.tar.gz 39216717 BLAKE2B ed7fd3d7b0c9cb8a8e7d41a38dda7bb2d337a047ea69f66fe75a418b52e1b98a9364aafc5b90f9ec419eafc5683beb4f5f78442bae0e3bdf8df9a93484a66f50 SHA512 664b12e2ced795b1627a3614018f182313fac8c72e366bc81d72e8ad454de09814711f0cd58fa920f4521c96253ca0a7673ea83d474be1b30171df11abf06845 EBUILD consul-1.18.1.ebuild 1573 BLAKE2B cd959989546b1b7c133a1e7a63e8e0e7c005b73c5823474513712ae4fc4ca3e3d8eedba2cccb55823fe741bc04de09f3afabe773b868cbb91bf89a16c74de16d SHA512 d1a1939d8653a952c80fe3f4191f86db65992728bc470ccfab106cba4a31c63cd0d20299fedb4a2ebb1237ea7f8ac2e7149bf731c0f8050f81f5da2d4ea27d5a EBUILD consul-1.18.2.ebuild 1597 BLAKE2B f9a4c7afc46daf60b808b5d2f09dc59b7620de8d9100ac6e55833da4010d10cda3e8a4cb48cfebef7e445fd753acb2582d60d48e82d29b224c6745eda8a1ce68 SHA512 e5e37b20f4b674559947a25697918a6987a1ee007033f71ebd61dc0ce1477543d81868cd074dc4a4288dea320dbf898608eb24cc2c0d6bd2bda2b5f3febfb45c EBUILD consul-1.19.1.ebuild 1651 BLAKE2B 6a5e0b1b2df67b5346f170d161dd6101cf7ccaa5277c5d9af58ea8bcd77e016dfd0a907b98425be29ce80225026563e6b88904470ed810361c3c5dcb607fe2d2 SHA512 4239a8b6b2b2a832345c85690029d773591ddd56910467e6e187bdea37a984d77e10ed06bde028bc365dde3ce5dccbf08d3a17cc404cfc8ae78d02fad985f070 EBUILD consul-1.20.1.ebuild 1651 BLAKE2B c0114e3d16975bc717a505585ff756e0c8951080598554e0798af2e209f77a1c1434f0b270a182e8fe8cecae5b248cd1580916a20a6e2e0db2cfc7db6cb69993 SHA512 f0f82be52a006ae402cc8205d76f8858f6fd2a85481312a1c17675d783a6e6f99041badda425bac37dc4367e3c3fe07edaefb29abd3fd8b76cd9eb327a54a62e EBUILD consul-1.20.2.ebuild 1651 BLAKE2B 40c31263a445f140df8fc9caf733cb8fa8c4bf1d6aa6dfd522995b79c9603039f650762189f51dbbd31a4d20684e1bc5fc10d8367db36038997deef581b42696 SHA512 c9c277578e9b3c0a4a78427e252537804db0a78d7774eb1835cd3b8ad7a65e549d90affbae275bc3efd4cd1e4c430edea01178090198bc7017075c32b3141330 +EBUILD consul-1.20.4.ebuild 1651 BLAKE2B 5fedb25b902f27e7a3bf3356ce9c2b3a55ed42e3abcb0af79c7ffaddc573073d6dd608b94064a489ebfbcdaa64367464e873083fd7d4fe30a0c87cd19cd69be9 SHA512 6247885b0560d5cab933594602a70290e11782c0fb4bcce5f2c332e14bb1dc62230922290340ab2fc172da43d771adc73daced60baedb638d9aa12b72d61830a MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1 diff --git a/app-admin/consul/consul-1.20.4.ebuild b/app-admin/consul/consul-1.20.4.ebuild new file mode 100644 index 000000000000..7eac14647040 --- /dev/null +++ b/app-admin/consul/consul-1.20.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2025 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="9e308779f1f5cad578daebefe9a26bcd7c0462fc" +GIT_DATE="2025-02-20T12:49:28Z" # source build-support/functions/10-util.sh; git_date + +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" +KEYWORDS="~amd64 ~arm64 ~x86" +RESTRICT="test" + +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=${GIT_DATE}|" -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/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 0f783a0f036f..aca376581c75 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -24,5 +24,5 @@ EBUILD rsyslog-8.2404.0-r3.ebuild 13409 BLAKE2B cea8fc4910d249603b02dab91f4f05bf EBUILD rsyslog-8.2406.0-r1.ebuild 13412 BLAKE2B 4c1c66954037705e0f46ce4d5fecd5dd60886d1a53f9271cf11c1157aa50f841eb67edd624dc58019493e2ad4a36d326d64fb64eeaa6c68997d09572d8f502a3 SHA512 9e1aa591cad361b6a0e54d5b60ad6d638263aafbb87293c94b29186e0995515e5eca8c41a0ec52ec355f5d4557543d1e3476426b238686765dc70e7ffd8e707b EBUILD rsyslog-8.2408.0-r1.ebuild 13412 BLAKE2B 4c1c66954037705e0f46ce4d5fecd5dd60886d1a53f9271cf11c1157aa50f841eb67edd624dc58019493e2ad4a36d326d64fb64eeaa6c68997d09572d8f502a3 SHA512 9e1aa591cad361b6a0e54d5b60ad6d638263aafbb87293c94b29186e0995515e5eca8c41a0ec52ec355f5d4557543d1e3476426b238686765dc70e7ffd8e707b EBUILD rsyslog-8.2410.0-r3.ebuild 13637 BLAKE2B 3af511308d9d2e4f33f4817404f4567aa736c242a48fc78a5afacc3cbb69957000cadb6b0a6bfc09988d3b69013014f608358ab146c3cae48c7d476a1e87fed1 SHA512 2046b68a3ca403504cf906cb90057030d204ddcdeabe2b4e081126269188051957021180621ad7400f4e93061a987d711d1862d7c9c728d293a68007d1476c0b -EBUILD rsyslog-8.2412.0.ebuild 13644 BLAKE2B 17ee6936ada7cb49c48f315d7b3113326e593825949f67614253d667381d7d992d239fc9e081be6e200d62099d06081c184c2be7fd573f9d1e0988e7eccf0733 SHA512 a9fb5ffecf6c8610a9c033a9216b90c7a620797ca700290498307b291c90aa9404b5e4b940a88c1335bb0f7c866559528c868dac715fbf72d2076a2d21bcf5e3 +EBUILD rsyslog-8.2412.0.ebuild 13640 BLAKE2B 26dca8467a7df648bad4fe6528d188eb725b2af602c7b5e2fdc592966337dbfbbf8d124ce5159f6d58c26a9dbf47bbe106ee0308222263d54d8e3203e2cf8a2d SHA512 69c621fd8c5577fbb96bd3830d233c8e7951107ec3d977bf8e62e4f91729d5c101cf8d53f1460f0c4d44cceda987183e47c93210fb44893b383740b95de48fae MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365 diff --git a/app-admin/rsyslog/rsyslog-8.2412.0.ebuild b/app-admin/rsyslog/rsyslog-8.2412.0.ebuild index 5fa3a7af05c9..457822e62a9c 100644 --- a/app-admin/rsyslog/rsyslog-8.2412.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2412.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ else ) " - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 00e906a29991..57e22555b9af 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,15 +1,5 @@ -AUX sudo-1.9.16-allow-disabling-secure-path.patch 2350 BLAKE2B 40a3ccddb78a307c6ea6883eb9c5fb2af4a6cbcb9d18ffffdb5e7958d2988eec997896c8ea43256ddede5d1e1a5a51a67609345600d2aabe4753d01c4a0d379f SHA512 6941b6fe9484a9d1ec57071d4f1288193b91a66f880b99f5480a6aa91b1a5558458109317c241d62d8ea847f2c52f125acefb3b1ae5d03e971d6b8a1397ca360 -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 -DIST sudo-1.9.16.tar.gz 5392026 BLAKE2B 19daa789af3ca2c4832950f0dd6f26a97285fdc155f0d7c18ec1f1accafce9b86f2f5730d3bb0b8e7717c0c55f4079928e03acb3974cb2652c58d4bcb2f74a12 SHA512 1b0254eb5b75422bffd31a2ae8c56cb4e8e2ecc08e2fa687eddb638d4f2de2585fa7621c868c03423e9d636bfb5679a3758d504155dbdfd3eebfbdcbd8b58f7c -DIST sudo-1.9.16.tar.gz.sig 566 BLAKE2B 9eb9fd2db0de5b9ce965c2109a9722e0b5f0793b7c9003123b1540d7cb5b8178043221296fd51c7f0b24ce1b1cda9f196a6d50083da172ca2afcb8f130d8eae1 SHA512 edf066f9ffdf2653468f8b45866a65214f0dff0164318d5f6bd9252f6211e82522161b1b9621798fbc9112253e6940d7137d18e8b42e8c6e5ba52ccac64d99cf -DIST sudo-1.9.16p1.tar.gz 5396038 BLAKE2B 7f973510658e91af54121d8c4c634b26231ef270abac50f658c9ad8a446a7dbbc44cb878561fb8da51e4ec15ebc8873fdaed05be142907f96964ff42c7e4f896 SHA512 3239d16513c431383b6d54cf40690a9b8fcf905d9b8f5a2085679dd5daeaacbd7efb153b41fd672fc634277c3203aaa1dc18e6a6c01799ebc9948763ec93a038 -DIST sudo-1.9.16p1.tar.gz.sig 566 BLAKE2B 0f68bb4a653cfaacf05d6c148f690ae0022035090e6e60df7efde6b25193ac46d12905ca898e5aadb8339ca3f08e27a4408edeb75f26f7e483f136026835aa24 SHA512 96cdd7f646d2fe7eeefce7710ba421be12a9bfd6811284ba8ccb3f7288b328531bbd7215cf0182c13670f2ec7c0ee25dfd6396214ddd61ee4ee153fec19bef7e DIST sudo-1.9.16p2.tar.gz 5398419 BLAKE2B ef9f1c2cd4044454a808d1dff5f865355e1bd061d1b5c93a005207e28e9b9df7c267cf01358ce60dd2c98f6844b51dab00eac4e7a08bade1d621235c3a4774bf SHA512 1e2ea762671890a03b0ea4b95b3849f2d3a4c301432db8767433e9d80c517efd8b7a68e0bbce1b178aff5857907600f1f5e0d889779cb27e38c2f602395f6f06 DIST sudo-1.9.16p2.tar.gz.sig 566 BLAKE2B 90f90658a7d6ec3b32f6a726a2cd28e156826a65749a88a2a29d970e97804d2d75de856bc85c9a459233b59e35564c5fbf93aff53ffe42d17d0e94dd23724acd SHA512 7f0e3269c9befada535590b2cfc36f96cd70831b5c030df5b3bf8c7cb3eff296d22193429f940db4a0df849b4d8080e4006086c49869b4bbae663836b2632b49 -EBUILD sudo-1.9.15_p5-r1.ebuild 7482 BLAKE2B df84493d45ee882a4be94981285ed34fce78e3a5f191bc31b37c126778722aa420212adc502ef71effe578fedb64fd9dade84c3cd7bf0cb19e6bbcb654a1e324 SHA512 9542bc31b786d1a9789d7722527ac159e7c17a57f2efa7037e793ee620ccc379ae07ad74cb541fbd353f65bb9088d7adf7b5622092d50f080544b83c097d24eb -EBUILD sudo-1.9.16-r2.ebuild 7719 BLAKE2B b514bf8f1fdb9d2d9e6aa29e440a4a16b07069e8284cc53e0b15e264ff95956a6e19e7451d6357b197bff76068586222683e65dc01e3f1f2840c6dc19139bee6 SHA512 e6fb3785f2314db3e14079ba0d8f657bad20c3e41c78affd1d70c1ef68bfb621cd7009bfc2b48f3e4451833744f3121d7c0eeba3110da37af1f60f6a70e264f4 -EBUILD sudo-1.9.16_p1-r1.ebuild 7588 BLAKE2B 16fc31f2aaf3b40ca36e79d2cd9f980d6950507c35e7f67da24ef1e211d56b74a8639f63ae3e2985ad416d6f98d77c88343ac010a6f63614014a17dbe3055628 SHA512 c951ade9637030054080be98bce9fbbd0198a99e37a60b530782adb3c2ad9e5d8db066f665846458a190d908276e6897fc6092a96cf1c481e9b9e09a8639ca7e -EBUILD sudo-1.9.16_p2-r1.ebuild 7502 BLAKE2B f9308ad2e38db49f112ef646a1d76bfb01e527a1cb41e37ba30d2bacf058a588c6e90a9e2e6158839a9a8757b72bf1e3ce19635a93d16b4af7f872af49ebfe39 SHA512 861003bd705547fdb588c3dc86b5eb67ff7b31894b52936132aebd2c17cadfaf8e67cdfca33e16a12806b0a8185fb1d1bbefc196f6c277e2dd89b56f91fdccf6 -EBUILD sudo-9999.ebuild 7588 BLAKE2B 16fc31f2aaf3b40ca36e79d2cd9f980d6950507c35e7f67da24ef1e211d56b74a8639f63ae3e2985ad416d6f98d77c88343ac010a6f63614014a17dbe3055628 SHA512 c951ade9637030054080be98bce9fbbd0198a99e37a60b530782adb3c2ad9e5d8db066f665846458a190d908276e6897fc6092a96cf1c481e9b9e09a8639ca7e +EBUILD sudo-1.9.16_p2-r1.ebuild 7370 BLAKE2B 99853177585d050697f102bc5d13131f9990f6147d0ee140d357b9c02d36c0146a4be9b47b779aea567147539eae83555bf1663f69abb808a1903f2a77ddc865 SHA512 6a4646d6eb9e9c0f8f6ec60d8ad17d0a31eb5840c59b3b7689150d59861dde1706220783d970c156dc9a929ad419085c2e068641a2e222f770ca4c4fd575213a +EBUILD sudo-9999.ebuild 7378 BLAKE2B 47f1f8a849ba44806ec625fdbcdd951badea287015dbb455781fa5025e521ac3f797186a1faf15553275552a042eb05ff7acf8f912679b2c9bc6f89fda64681c SHA512 9e955160c53628ee1489c12b46fdd8a3cab02578acebe0403e428ad9f2aba4d9af11f150cfa6cfab355f899e021f8229ad81940f3a1e749200d207e44b3f4a67 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6 diff --git a/app-admin/sudo/files/sudo-1.9.16-allow-disabling-secure-path.patch b/app-admin/sudo/files/sudo-1.9.16-allow-disabling-secure-path.patch deleted file mode 100644 index 8fda41a2b73f..000000000000 --- a/app-admin/sudo/files/sudo-1.9.16-allow-disabling-secure-path.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://github.com/sudo-project/sudo/commit/131e7e2de02ab53cfefefe93978d7fee4cb8142d - -From 131e7e2de02ab53cfefefe93978d7fee4cb8142d Mon Sep 17 00:00:00 2001 -From: Andy Fiddaman <illumos@fiddaman.net> -Date: Tue, 17 Sep 2024 12:49:13 +0000 -Subject: [PATCH] Allow --secure-path-value=no - -This adds support for --with-secure-path-value=no to allow packagers -to ship the sudoers configuration file with the secure path -line commented out if required. ---- a/configure.ac -+++ b/configure.ac -@@ -177,6 +177,7 @@ AC_SUBST([sssd_lib]) - AC_SUBST([nsswitch_conf]) - AC_SUBST([netsvc_conf]) - AC_SUBST([secure_path]) -+AC_SUBST([secure_path_config]) - AC_SUBST([secure_path_status]) - AC_SUBST([editor]) - AC_SUBST([pam_session]) -@@ -230,6 +231,7 @@ sesh_file="$libexecdir/sudo/sesh" - visudo="$sbindir/visudo" - nsswitch_conf=/etc/nsswitch.conf - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -+secure_path_config= - secure_path_status="disabled" - pam_session=on - pam_login_service=sudo -@@ -1068,9 +1070,11 @@ AC_ARG_WITH(ldap-secret-file, [AS_HELP_STRING([--with-ldap-secret-file], [path t - test -n "$with_ldap_secret_file" && ldap_secret="$with_ldap_secret_file" - SUDO_DEFINE_UNQUOTED(_PATH_LDAP_SECRET, "$ldap_secret", [Path to the ldap.secret file]) - --AC_ARG_WITH(secure-path-value, [AS_HELP_STRING([--with-secure-path-value], [value of secure_path in the default sudoers file])], -+AC_ARG_WITH(secure-path-value, [AS_HELP_STRING([--with-secure-path-value], [value of secure_path in the default sudoers file, or "no" to comment out by default])], - [case $with_secure_path_value in -- yes|no) AC_MSG_ERROR([must give --secure-path-value an argument.]) -+ yes) AC_MSG_ERROR([must give --with-secure-path-value an argument.]) -+ ;; -+ no) secure_path_config="# " - ;; - *) secure_path="$with_secure_path_value" - ;; ---- a/plugins/sudoers/sudoers.in -+++ b/plugins/sudoers/sudoers.in -@@ -48,7 +48,7 @@ Defaults!@visudo@ env_keep += "SUDO_EDITOR EDITOR VISUAL" - ## Use a hard-coded PATH instead of the user's to find commands. - ## This also helps prevent poorly written scripts from running - ## artbitrary commands under sudo. --Defaults secure_path="@secure_path@" -+@secure_path_config@Defaults secure_path="@secure_path@" - ## - ## You may wish to keep some of the following environment variables - ## when running commands via sudo. - diff --git a/app-admin/sudo/sudo-1.9.15_p5-r1.ebuild b/app-admin/sudo/sudo-1.9.15_p5-r1.ebuild deleted file mode 100644 index 918c0435412a..000000000000 --- a/app-admin/sudo/sudo-1.9.15_p5-r1.ebuild +++ /dev/null @@ -1,289 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic 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=/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - 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:= ) - 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+=" - app-alternatives/yacc - 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 - - # https://github.com/sudo-project/sudo/issues/420 - append-cflags -std=gnu17 - - # - 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.16-r2.ebuild b/app-admin/sudo/sudo-1.9.16-r2.ebuild deleted file mode 100644 index 2403907f5ce8..000000000000 --- a/app-admin/sudo/sudo-1.9.16-r2.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic pam 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=/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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - 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:= ) - 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+=" - app-alternatives/yacc - virtual/pkgconfig -" - -REQUIRED_USE=" - ?? ( pam skey ) - ?? ( gcrypt ssl ) -" - -MAKEOPTS+=" SAMPLES=" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.16-allow-disabling-secure-path.patch -) - -src_prepare() { - default - - # eautoreconf temporarily for allow-disabling-secure-path patch - # in 1.9.16; revert to elibtoolize once that is gone. - eautoreconf -} - -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 - - # https://github.com/sudo-project/sudo/issues/420 - append-cflags -std=gnu17 - - # - 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) - "$(use_with secure-path secure-path-value "${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.16_p1-r1.ebuild b/app-admin/sudo/sudo-1.9.16_p1-r1.ebuild deleted file mode 100644 index a4c126a9a273..000000000000 --- a/app-admin/sudo/sudo-1.9.16_p1-r1.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic pam 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 autotools mercurial - EHG_REPO_URI="https://www.sudo.ws/repos/sudo" -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc - inherit libtool 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - 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:= ) - 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+=" - app-alternatives/yacc - virtual/pkgconfig -" - -REQUIRED_USE=" - ?? ( pam skey ) - ?? ( gcrypt ssl ) -" - -MAKEOPTS+=" SAMPLES=" - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - elibtoolize - fi -} - -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 - - # https://github.com/sudo-project/sudo/issues/420 - append-cflags -std=gnu17 - - # - 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) - "$(use_with secure-path secure-path-value "${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.16_p2-r1.ebuild b/app-admin/sudo/sudo-1.9.16_p2-r1.ebuild index 3c7cda145851..9d6ed763c84c 100644 --- a/app-admin/sudo/sudo-1.9.16_p2-r1.ebuild +++ b/app-admin/sudo/sudo-1.9.16_p2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic pam tmpfiles toolchain-funcs +inherit pam tmpfiles toolchain-funcs MY_P="${P/_/}" MY_P="${MY_P/beta/b}" @@ -25,10 +25,8 @@ else 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 ) " diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index a4c126a9a273..8fff95b78b8b 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic pam tmpfiles toolchain-funcs +inherit pam tmpfiles toolchain-funcs MY_P="${P/_/}" MY_P="${MY_P/beta/b}" @@ -25,10 +25,8 @@ else 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 ) " @@ -148,9 +146,6 @@ src_configure() { # bug #767712 tc-export PKG_CONFIG - # https://github.com/sudo-project/sudo/issues/420 - append-cflags -std=gnu17 - # - 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 diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest index 4f40457ee98c..2f670df3f1dd 100644 --- a/app-admin/sysklogd/Manifest +++ b/app-admin/sysklogd/Manifest @@ -4,6 +4,6 @@ AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6 DIST sysklogd-2.5.2.tar.gz 459292 BLAKE2B c61a89e80d6fde10f5955cf3a7a563fbe9e00799eb1199bc9a2995585c074e7ab2b4fe6a30ae8bc224876448a521c3be9031853ae4710db2555279789aeda95d SHA512 0c160236d0f5ec31d0c5679c04b6f0f40a35af2b5b159af8b2b9dd2d37f5959efbe550dfc50c0b0419bea702b91a6594f2e141c2fbb78fdb20715ee8b2d27805 DIST sysklogd-2.6.2.tar.gz 462950 BLAKE2B 591bf168cd9249af888feefd45ed10b8f90e7bdb71c75fbc8a95867dba0abfd20c08b0bbc13f80de2eb9ccf69ab9f77690978963ce96bf17472d2c036f96bb15 SHA512 4fb5ccba9e94c273e92ca4a55c6a7234a3dd6bbfd4568c8227b515c0ac5eeb6fdca452c82c989432e86a667dcf13df87f96aef302141e6023d630dc90466224d EBUILD sysklogd-2.5.2-r1.ebuild 2081 BLAKE2B d195730424a0c8a3164734e6302302d14b1a5bee7d0d605a4d6c1bcd5415658da70436d4aabbf48aa8827f95ded5852b4e693589ad27c6aa977461abfb4cd16b SHA512 5d8143bf24ea059ee74396f8c5c16a5d5576b6c2ef74509f442f5a5a6a01d47340746f94baddb4f7cdb0e828c27c320657c147701a1121c0502693981717534b -EBUILD sysklogd-2.6.2-r1.ebuild 2081 BLAKE2B d195730424a0c8a3164734e6302302d14b1a5bee7d0d605a4d6c1bcd5415658da70436d4aabbf48aa8827f95ded5852b4e693589ad27c6aa977461abfb4cd16b SHA512 5d8143bf24ea059ee74396f8c5c16a5d5576b6c2ef74509f442f5a5a6a01d47340746f94baddb4f7cdb0e828c27c320657c147701a1121c0502693981717534b -EBUILD sysklogd-9999.ebuild 2088 BLAKE2B 75100f7070c0244a9449a1f164d5866cc09cdb97ecb00e604748dd0c7306163434226b8716a56d7c8af3845527f2f48bed376195e522514174006fb54feb6e3e SHA512 9448681727487c6ea8eeaabb30fe6ac90ff0cfdd4a3d04f61a74d3a3838a66d95faa14c01a778967dafbdb4b9475c9b45d0499fab8027ff7d66751a13b561917 +EBUILD sysklogd-2.6.2-r1.ebuild 1989 BLAKE2B 5d8bb0cbac55469a4623936483030190cb4013a57db7c69479f23a9eb0507cf6a7bdb61ed9ff7ddf59c0e0d1941c201c1ad7ffb7adabffb10b3f040ebb2f889a SHA512 73d3fa0aa0d290b70c6ec5626655d4a4d0c4d8280d71e1601e4b6fbd35669d3c1265f5d226095b7b9cd95ff61330a789fdd11b89b60f5a2bf6112de9e0f43de8 +EBUILD sysklogd-9999.ebuild 1996 BLAKE2B a696c8b89202e8df3e6c202cf286a417a16a238a16ccd1b5389ca4fa05f134710749729cbaa92b1d14b88898b502a460d2bc2bf2f646256607f98bf89799693f SHA512 8b449b8ec5fa7c592a4e8b0940f2e4d84fac81fd1314b7769d6b9629dda844430952a1cca3b2abde4b3dc36e6cd37c119c2a81638c643d4c169a91e3a836ccb5 MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27 diff --git a/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild b/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild index 56b5bae68e17..b1b4185137a4 100644 --- a/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild +++ b/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic systemd toolchain-funcs +inherit eapi9-ver flag-o-matic systemd toolchain-funcs DESCRIPTION="Standard log daemons" HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd" @@ -73,13 +73,13 @@ src_install() { } pkg_postinst() { - if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then + if ! use logrotate && ver_replacing -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 + if ver_replacing -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 47b85d4229cc..9a1198818fec 100644 --- a/app-admin/sysklogd/sysklogd-9999.ebuild +++ b/app-admin/sysklogd/sysklogd-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic systemd toolchain-funcs +inherit eapi9-ver flag-o-matic systemd toolchain-funcs DESCRIPTION="Standard log daemons" HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd" @@ -73,13 +73,13 @@ src_install() { } pkg_postinst() { - if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then + if ! use logrotate && ver_replacing -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 + if ver_replacing -lt 2.1 ; then elog "Starting with version 2.1 sysklogd no longer provides klogd." elog "syslogd now also logs kernel messages." fi |