From 27c1d146e5ee9e472a31a7958ad4dc70a5451ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Jun 2023 15:29:04 +0100 Subject: gentoo auto-resync : 02:06:2023 - 15:29:04 --- app-admin/Manifest.gz | Bin 31726 -> 31739 bytes app-admin/awscli/Manifest | 2 + app-admin/awscli/awscli-1.27.145.ebuild | 80 +++++++++++++++++++++++++++++ app-admin/sysklogd/Manifest | 4 +- app-admin/sysklogd/sysklogd-2.5.0.ebuild | 85 +++++++++++++++++++++++++++++++ app-admin/sysklogd/sysklogd-9999.ebuild | 7 +-- 6 files changed, 172 insertions(+), 6 deletions(-) create mode 100644 app-admin/awscli/awscli-1.27.145.ebuild create mode 100644 app-admin/sysklogd/sysklogd-2.5.0.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 39eef405726f..0ae367044d67 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 6d3c227799eb..1a04d581400a 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -3,9 +3,11 @@ DIST aws-cli-1.27.137.gh.tar.gz 2423020 BLAKE2B 9cdc1cab324eaa2b2bc17418180bf8be DIST aws-cli-1.27.142.gh.tar.gz 2426758 BLAKE2B 587791e0102d51b9681718a71c1225c673f1545f98d2cbd679d266c559ae4252e92ec2c41a640584b5ce1e4aced885489723edb90e0700846e3fd74968be42bd SHA512 cb2ba71dc955ddd5a738f6e703a16216effdbd1232fa4e14c5974bf59c6f871ba80a4a61614dccb0fc110c689ce24f466c4142967be83f48c5de41699450d092 DIST aws-cli-1.27.143.gh.tar.gz 2428987 BLAKE2B 3cc1d312e2a5cb4187234615d42f69c1296ad810a317adb2ebce05514168aee5b58b9ff0240e84bd31d4000d6f6cc76d476bee739ea6d394a833ee25ec422dce SHA512 f82634435ac67ba1cd2b43913d86c66ebe0dd06d40a708ae63a2bfc150a9733f1c80ff82362b48834ede5bba317c970d88d5e70d133860bb0ef022fd00ac07a1 DIST aws-cli-1.27.144.gh.tar.gz 2429624 BLAKE2B 63b447244a5e1d110d30d69d02c6f895fcd667870c25e7f85abb0f51c47fe7547494010930bd0167861c187a0cfef3d298e55e83d1aaa77614687ee90b69da35 SHA512 979a38e3b089258d6828d55294ac5ba664df8b1a62180a3ecbdd98e0554676952e785c6ee917ff31eed32ec36cde0e08cf8cf98489eaff6b2242d6923493d2a3 +DIST aws-cli-1.27.145.gh.tar.gz 2429805 BLAKE2B ea5b6c44dc96cca32037a68de01c613c6452cb654b135688ebfc926716f9eaeba2a6fdbd708859d0f9a5fa64b2d110d65196d85aec56188861714ace0b3bb43f SHA512 e019c06de19fcde6a4a191291076fb109c5bbb80eddf74aaa38c64242e0700dea030927e9bc5d95183eff728737084a03af732ba6f6a8ab9f9e6f21f9f33fd73 EBUILD awscli-1.27.133.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b EBUILD awscli-1.27.137.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 EBUILD awscli-1.27.142.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 EBUILD awscli-1.27.143.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 EBUILD awscli-1.27.144.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 +EBUILD awscli-1.27.145.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab diff --git a/app-admin/awscli/awscli-1.27.145.ebuild b/app-admin/awscli/awscli-1.27.145.ebuild new file mode 100644 index 000000000000..62c19f3a63fb --- /dev/null +++ b/app-admin/awscli/awscli-1.27.145.ebuild @@ -0,0 +1,80 @@ +# 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/sysklogd/Manifest b/app-admin/sysklogd/Manifest index 3f6ec85cb03c..16595e5bb19c 100644 --- a/app-admin/sysklogd/Manifest +++ b/app-admin/sysklogd/Manifest @@ -2,6 +2,8 @@ AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4 DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 218d9487440ab3fa395f596e5e4a9fa95df9dfa416470da658a9ac742437050c81a6e62b42763b038b8dc5d8cfab2ba30d049e269b08a66882f6d3f99863ee7b SHA512 434609dd11951b37d62b5371a2aef66424bb15ae4c98cba44762e8338ac135b37a453e5a4f40492ab80bce9b72faefc9a0ad065753f4cc5f7595911477b26e4a +DIST sysklogd-2.5.0.tar.gz 459695 BLAKE2B ab8185e114f7da2c35b6ba3e3b42e13f3697155b43ccfa923229d95150e3734f74db6f732bcbc999068d8a2f8124a404ee893d2e6ce4c154f89301b3b523df39 SHA512 4599f153b046317977de990455b1eea195967da81f68451f1bda4fadba6fe685d7fe533aba3b39f4daa456d6c4931743162a021067e0a16f072a7c77908286f9 EBUILD sysklogd-2.4.4.ebuild 2100 BLAKE2B 9445ba98080898d1423312f377c871742a2d3c1cc14555418743cbe567d2e165dd1aca21ec8ce713e679a343140b914e140ea95c4d3eb58e7c704511d1a4ce9b SHA512 6098d606062db317788d64b74d0acdc5425c7dae3180c4a08bdca4c182482d3a02c05511604f00adb09175a10a6a99456c482f2aea1dc11921eaa98045902f39 -EBUILD sysklogd-9999.ebuild 2106 BLAKE2B a8385ac39db7d3a9b2b92d338f4aab266f2773d6f53ef8fe479417477172fa25330cc61e95a51d7e640edf2488f5c3229161cfc8f5067c4cfa2d8034cef3da37 SHA512 b7e2e4f7b55e9d55ee01d4bc6541f87a8f9e4ab5c57d9a7686a9cfd4ec4591b6183e7f8b6a4574586c88e65c2abea60292d284ca44086fbe57ae0f1a70aacab6 +EBUILD sysklogd-2.5.0.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4 +EBUILD sysklogd-9999.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4 MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27 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-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[logger] - ) + logger? ( sys-apps/util-linux[-logger(+)] ) " RDEPEND=" ${DEPEND} -- cgit v1.2.3