diff options
Diffstat (limited to 'app-admin')
30 files changed, 1146 insertions, 245 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 317b2c9799ae..e244b2d061c0 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest index cb6a8c3e0023..60a3ab460bfb 100644 --- a/app-admin/abrt/Manifest +++ b/app-admin/abrt/Manifest @@ -1,7 +1,5 @@ AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f7182d4bf9e7bebf1f80f6178acbce4ffddff7ab292c773685148621d53528b96c3099d96dcd0f26b1280 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81 -DIST abrt-2.14.2.tar.gz 6113632 BLAKE2B 904ec2ca4c3aa70b62573ca2730742689f4446c1e5f04bfb6dc4267a4a9a6d44ef8c2b6e82c1e0aba04876b400c3a965a879da65bbff7ec729846f1b5c28cdf9 SHA512 82ba10cb151b4585024e3dfc626f46a7d967797e0375158cd76355c4f6a66c59578cc7b41bc5d5aaa3e694b3653b8658650df458676225660cfe95ec318c6886 -DIST abrt-2.14.5.tar.gz 6056105 BLAKE2B 22e797a431237bd3d4ef6f2467842c5f08e2ef3ca51e7857e3c55e45ed93a9499843fe40b081c70affb5def8f2cfe78d61e865c51c969fb2c9936225bdfe4996 SHA512 a8672735c6d3263ddff006e6e186d9b71e6d9375a8c909c2a85bbbf736a6687b6fe4aa74640a07664f14fd886895a86babf41218a8c2365d6fccd347630ccc9e -EBUILD abrt-2.14.2.ebuild 3123 BLAKE2B bc1b6fd277f756dd59fcd34a045f0768c5ac418636e576ce2b1b43ef73a2e994c857635e9cbd311382868930c94032ffdef0b0dc716371e2e7e2f4a59604fa3c SHA512 b9585478516532464b1c966ce04e60d1a32b9148960b03a15e0107248bfa00a56e3d3bc350973c11c0c659a0da485563f6dece86aed1af4f33fb39195411247e -EBUILD abrt-2.14.5.ebuild 3123 BLAKE2B bc1b6fd277f756dd59fcd34a045f0768c5ac418636e576ce2b1b43ef73a2e994c857635e9cbd311382868930c94032ffdef0b0dc716371e2e7e2f4a59604fa3c SHA512 b9585478516532464b1c966ce04e60d1a32b9148960b03a15e0107248bfa00a56e3d3bc350973c11c0c659a0da485563f6dece86aed1af4f33fb39195411247e +DIST abrt-2.14.6.tar.gz 6057661 BLAKE2B 2ef74203181c89818f283a801c4a1a0f22a01c92ca2415d245dc180ee721b3e29cb75c95e45d738f88b6bbf339fe8bef4e499ab6fecad33399dc8a5af8f98d4c SHA512 eb1ba2f624d51eeccd203bb23060493347f5a9142fad7d0570d46134071d870a9c66b4fbfb8210e7d6f87c0c039f31eb486d18a36b10fba318e2180aa09df9fe +EBUILD abrt-2.14.6.ebuild 3196 BLAKE2B 32d8f82d2f5cc01200de4ec824fa9964be155e3efdac820b6b5c0161738f6ae71f94632954a4e8f53a6968e6d83c061d3792733cc44151b5eefbbe5a918a9fa9 SHA512 086dc81758a3a80a02440c3962f3f44fa48e86e41ebc49e4255a27459727017f0bf912b63b6b2a3762073c85b8332319b310f36b4a6da8e7a35ce06cb6f813a8 MISC metadata.xml 317 BLAKE2B 2c9d95904b60edd29cc9b42cb603b03e5b7b7243849dee3766c9810dfd94a8ea0c5215677acdabd5205cdff65e58557f9ef08db1ca9da7b6551b660386e46789 SHA512 eb0425972ad2086e847c4162c8a0aa6725ff77ad58ff6719f025e51d483369c4caf1134e8ff8ff77bbb2b1ca6821f3e1ba7fa3e929db0167d39acb6ab55f18f6 diff --git a/app-admin/abrt/abrt-2.14.5.ebuild b/app-admin/abrt/abrt-2.14.5.ebuild deleted file mode 100644 index 6756dd1e66a6..000000000000 --- a/app-admin/abrt/abrt-2.14.5.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) - -inherit autotools python-single-r1 xdg-utils - -DESCRIPTION="Automatic bug detection and reporting tool" -HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="selinux test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.56:2 - >=dev-libs/libreport-2.13.0[gtk,python] - dev-libs/libxml2:2 - >=gnome-base/gsettings-desktop-schemas-3.15.1 - net-libs/libsoup:2.4 - sys-apps/dbus - sys-apps/systemd:0= - sys-auth/polkit - sys-libs/libcap - sys-fs/inotify-tools - x11-libs/gtk+:3 -" -RDEPEND="${DEPEND} - acct-user/abrt - acct-group/abrt - app-arch/cpio - app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}] - dev-libs/elfutils - dev-libs/json-c:0= - sys-apps/util-linux - >=sys-devel/gdb-7 - $(python_gen_cond_dep ' - dev-libs/satyr[${PYTHON_USEDEP}] - dev-python/argcomplete[${PYTHON_USEDEP}] - dev-python/argh[${PYTHON_USEDEP}] - dev-python/humanize[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - test? ( - $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') - ) - app-text/asciidoc - app-text/xmlto - >=dev-util/intltool-0.35.0 - virtual/pkgconfig - >=sys-devel/gettext-0.17 -" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - python_fix_shebang . - default - - # Install under proper directory - sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die - - # Ensure this works for systems with and without /usr merge - sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die - - # Fix hardcoded "pytest-3" - sed -i -e "s:pytest-3:pytest:" \ - configure.ac src/python-problem/tests/Makefile.am src/cli/test || die - - # pyhook test is sensitive to the format of python's error messages, and - # fails with certain python versions - sed -e '/pyhook.at/ d' \ - -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed" - ./gen-version || die # Needed to be run before autoreconf - eautoreconf -} - -src_configure() { - myeconfargs=( - --libdir="${EPREFIX}/usr/$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-bodhi - # package breaks due to not finding libreport-web with bodhi plugin enabled - --without-rpm - $(usex selinux "" "--without-selinux") - --with-python3 - --without-pythondoc - # package breaks due to no sphinx-build-3 - $(use_with test pythontests) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - python_optimize - - keepdir /var/run/abrt - # /var/spool/abrt is created by dev-libs/libreport - - diropts -m 700 -o abrt -g abrt - keepdir /var/spool/abrt-upload - - diropts -m 775 -o abrt -g abrt - keepdir /var/cache/abrt-di - - find "${D}" -name '*.la' -delete || die - - newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt - newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-admin/abrt/abrt-2.14.2.ebuild b/app-admin/abrt/abrt-2.14.6.ebuild index 6756dd1e66a6..4218d5a78a57 100644 --- a/app-admin/abrt/abrt-2.14.2.ebuild +++ b/app-admin/abrt/abrt-2.14.6.ebuild @@ -4,10 +4,10 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..9} ) -inherit autotools python-single-r1 xdg-utils +inherit autotools python-single-r1 tmpfiles xdg DESCRIPTION="Automatic bug detection and reporting tool" -HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project" +HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project https://github.com/abrt/abrt" SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" @@ -15,12 +15,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="selinux test" -RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + DEPEND="${PYTHON_DEPS} >=dev-libs/glib-2.56:2 - >=dev-libs/libreport-2.13.0[gtk,python] + >=dev-libs/libreport-2.13.0:=[gtk,python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 @@ -48,6 +49,7 @@ RDEPEND="${DEPEND} ') " BDEPEND=" + $(python_gen_cond_dep 'dev-python/python-systemd[${PYTHON_USEDEP}]') test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) @@ -105,25 +107,20 @@ src_install() { default python_optimize - keepdir /var/run/abrt # /var/spool/abrt is created by dev-libs/libreport - diropts -m 700 -o abrt -g abrt keepdir /var/spool/abrt-upload - diropts -m 775 -o abrt -g abrt - keepdir /var/cache/abrt-di - find "${D}" -name '*.la' -delete || die newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt -} -pkg_postinst() { - xdg_icon_cache_update + # Drop empy dirs, handled by tmpfiles + rm -r "${ED}"/var/run/ || die } -pkg_postrm() { - xdg_icon_cache_update +pkg_postinst() { + xdg_pkg_postinst + tmpfiles_process abrt.conf } diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest index 5a2034125b1d..3ce0a68f9c4c 100644 --- a/app-admin/ansible-base/Manifest +++ b/app-admin/ansible-base/Manifest @@ -5,6 +5,6 @@ DIST ansible-core-2.11.4.tar.gz 6843603 BLAKE2B fa8e72a9e77633b1b43a9a290d92db00 EBUILD ansible-base-2.10.10.ebuild 1633 BLAKE2B 425db4ea1e64c960b86d56cccddeb59edd838f389bb685c145babd0e885677de76b364383b801f7ffbdc61fd6a46f8baa24c26e45f00e984aa162bbcac4ae24b SHA512 2b67326ac2653e03b37829db0952232183b2f79d7e66c3d5a78847f17b2f5f93f27bccf39e164af56f80c1ee8acb69c3379bb6107c0e987aeeabb6caf3547c52 EBUILD ansible-base-2.10.9.ebuild 1630 BLAKE2B 1893c43eb9482e3899c4695a6378f85f945fb71ae968845672a6f806be576d5746ef505b0ef63c87b49e4e7a406d772353846ae923c363844d2fe2dc66b5a33b SHA512 66db0cdc15878cc5378a8b63644b7e143fad646342d763c83b8a58de3cc117093495f8a5945daffb93b3219beaa47a0c1564c8fba14611c5a1054789ac8dc99b EBUILD ansible-base-2.11.3.ebuild 1603 BLAKE2B 8ca4f3d4c4a1e494e0efe5bba55de5e71ca5e229c86c5046181d8d89e890115b823ad99d133c3ec22b06dd653cd23b65b159bc83cdbe990c2c527c0bb8bca9f5 SHA512 2513a5654edbce7a6161044f6983f3b8f041f1b158598c64d14e242afc642309be559b89899472ceec5b253a1792909ccc1bd20d3bf82175eeac360ef6568d4a -EBUILD ansible-base-2.11.4.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f +EBUILD ansible-base-2.11.4.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6 EBUILD ansible-base-9999.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32 diff --git a/app-admin/ansible-base/ansible-base-2.11.4.ebuild b/app-admin/ansible-base/ansible-base-2.11.4.ebuild index 459607c5a037..18cd0f14676d 100644 --- a/app-admin/ansible-base/ansible-base-2.11.4.ebuild +++ b/app-admin/ansible-base/ansible-base-2.11.4.ebuild @@ -19,7 +19,7 @@ else MY_PN="${PN/-base/-core}" MY_P="${MY_PN}-${PV}" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" S="${WORKDIR}"/${MY_P} fi diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index 72e8507a8797..b3fd588b66d1 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -3,5 +3,5 @@ DIST ansible-4.1.0.tar.gz 33999079 BLAKE2B b7c512ed01f220dbfdd5c90cd67c88cc3b50d DIST ansible-4.3.0.tar.gz 35135987 BLAKE2B 6f4bf55f07275b7264a7fba693816bf925d574d4da3d4d13af9b85c44d4b5adf9e823b9bd936408a0e424273f8f2aa529e960105842444d26eb3f45973109ec5 SHA512 035a236d0762e425c4ce4ffd709386075aee438bb8085a25920543bb2378feb07fb8f0a50ce9fb6b0d1f5dde1f27a408b828c286bfc1173d38da5f8c7b572c3a EBUILD ansible-2.10.7.ebuild 1480 BLAKE2B b69ca1d077f02df2047cc868fbf47a1d7b5fb254e5d3b1df1b338185817d62e754d9a7ec1dbd7142a70693b05e39cdb521e8857602ff1cf8687ed42047ba0a0f SHA512 b7c2c77bfed222420589930162c334b2ddc5ee5db2cf5476886bc6197025d25b57459b01e7988b74a11b7fafb11e1f1f9914d306ea3dba7eeccc176aa464c14f EBUILD ansible-4.1.0.ebuild 604 BLAKE2B b7a1d083d07356d05fffab56e1154c81e641cdd03cc0944fed45d6ac64c5dc8c02cc774a9d949b555ac0081219e8d49a03ee50d18b141d3ee6776c9831d8255e SHA512 35f8cb7f3c876b8a19cfcccba9156e22a13e042d5847fd6be6813b16ad620a90d8abee0f3c83d514a157c8575ae4272cd8f1f107663372afcf43fea3bdbfa26c -EBUILD ansible-4.3.0.ebuild 694 BLAKE2B a90c02e47057da9ef270d615a44be25fca41500156a296572048534b2d97da44269d220738cba30cde7cc002998c7eaa3d502ba2aa1a23eeed80a4ccdf915980 SHA512 ffbc14601b2cadb6157b30eddc20ec3e83131fd38e25aa71377b7636391f138c76ba266f5e04d9b015c502c70082a4d7508b1831d386e0e6a64d2cec69a874c2 +EBUILD ansible-4.3.0.ebuild 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548 MISC metadata.xml 725 BLAKE2B 3d7a1655261b538ceb1511d626df23c93d0c30a0ab3b1ba38e560b4b43ffe7a82c6e207d991680bc321f6698596b1a61ec2182ae1c42c296a91b9f98896cff70 SHA512 bb3b5e0d20f530c1961bf19060ce1e5d087384008c116c4bc0af3e86368e9e9fdbce84d22b6f7b4f6760f039b180805364478e8e3d98b9b4d4d2600f9de62e6f diff --git a/app-admin/ansible/ansible-4.3.0.ebuild b/app-admin/ansible/ansible-4.3.0.ebuild index 44f65f4dbc22..d96231433bb4 100644 --- a/app-admin/ansible/ansible-4.3.0.ebuild +++ b/app-admin/ansible/ansible-4.3.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" RESTRICT="test" RDEPEND=">=app-admin/ansible-base-2.11.1 diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index a0f4954e4662..8f4df31423c7 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -3,10 +3,18 @@ DIST awscli-1.20.15.tar.gz 2048948 BLAKE2B e7d378c9cb1752f4b7e014578d07fdc5f7bd9 DIST awscli-1.20.21.tar.gz 2055227 BLAKE2B 6448527363ca25f039fa9e461bf5f6451e2ecb308a29b3b62c2303d756476c45f60b5356bf32894d780deb8d9e459d83e2520ce09f5ea5f3b1e9435f8180d4ce SHA512 58b9323b8bdb07bd48814cf11fc03f9c4ffda01d1d0c85d4a77425ca37848a2cb3a6222b12c31e5897b348ef265cc94d842d9fd6b4a66bb3cfc8b37b038361cf DIST awscli-1.20.28.tar.gz 2058578 BLAKE2B 3f6993a41f46ad9d8d45cebc0d5ea95a954e15c73d236426590c389aba6de6a99b6a5000f065f932733151c14f3112bacc25c670a05d2a991a976669ce54554e SHA512 b75974450cea3744ed15cf00ca82a35aa377c55e0ef67bb5536ed136e768d5030e6707f12e2e7de8bfce48296295ff4ed4c9f9b15c642104ea34c7492291135b DIST awscli-1.20.35.tar.gz 2069361 BLAKE2B e19666a42ae7b39297d62532d5028beb099ba195e80233f43f28697184be10c3abb859db5271980e45cade0c6d580988b63d0c2b5e3adc66aee97e76c7883144 SHA512 7fecf089e72a520004aef0d002b2ec07c524b8f927c27e4a497cedfcbcd38e0db57c3ce7e67d4e7f4a4fd78a0ec3e950ef6d7f6d2f7918e0d03a5fb3b2ff8ddf +DIST awscli-1.20.36.tar.gz 2069853 BLAKE2B b524091d27b8200954086ffa1dc444efe3a17e34b4873098d7e50183ad5517adcd1427f8501e1c0c3f882dc0b74bd36774aa06434d1b269f8770a7e05d01d82f SHA512 690881772620d125064acafc42440307890c25d49f75c0c407eeafd094af82eb8c9583140321f53ba4c1346e8c9e4b687b3c812717fc22125045e01afd53e256 +DIST awscli-1.20.37.tar.gz 2070925 BLAKE2B 836cecbe36c03d47879128649bd643738ef58130f486e8f541a74b4612679f4fc04d317020516090f5781d1baaf05b555e8dd0f3131aa3bb5efae4a928d0d942 SHA512 39a67fb3fa6893d0e26557b37c1ee4f06703e46b6f42e9f1fb3bbad8ea442be015f60e4d4343b93df6528b86ed73889f5b5da7e653adc47d199d3e56a9b5dde2 +DIST awscli-1.20.38.tar.gz 2071046 BLAKE2B 424eb993ea86784093ed3664d41664da513dbeaae8f8ef9f2255abfb2af3054bcc363aef2a862d8460b8916d14d1389ca1c495a4004cba52b9ae6580da658c37 SHA512 9ef326e01ec219d8726eeb117fc1ac55a4d96b63eef985329721800216667f0f8d76bd585a71cedb3bc754eea321def47bab6c54d2e7a6d0144517db99a11315 +DIST awscli-1.20.39.tar.gz 2071279 BLAKE2B 6e59d0cfdc3507121a163b45b70dce11c7b3e5707492801425a7174f4866a6236e28eb8a173ab5d7616e7dce41043b3e8c5c6b322974670414756ab2f7bd570a SHA512 2669297760dc846b1372817bb4ae6f677b39819e4eec1fcec08c11d28fb2d043e9242993e9aa91e3740c2a2b0d4afa0ec3088c1c8c5a737c5a96a8a243565d36 DIST awscli-1.20.7.tar.gz 2045304 BLAKE2B d8f086d8d2eb36645e77fa3d9ae7c196ed3a3fddcc2a0218696f92bd69e10b453be1340b965a8d8e6697bbd3c45013d72de3ed0d31b5823515a5a0092a812858 SHA512 a41bd3ebc34a65add66ef95d5194ba07907a08f7368b0fcd6551af2070c46c4a509af47d30aeadabddce19d1a61200a58faf40a7e2f759e64915cfb2826666ab EBUILD awscli-1.20.15.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c EBUILD awscli-1.20.21.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c EBUILD awscli-1.20.28.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c EBUILD awscli-1.20.35.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c +EBUILD awscli-1.20.36.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c +EBUILD awscli-1.20.37.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c +EBUILD awscli-1.20.38.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c +EBUILD awscli-1.20.39.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c EBUILD awscli-1.20.7.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635 diff --git a/app-admin/awscli/awscli-1.20.36.ebuild b/app-admin/awscli/awscli-1.20.36.ebuild new file mode 100644 index 000000000000..ff429f8d3a3e --- /dev/null +++ b/app-admin/awscli/awscli-1.20.36.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE="https://pypi.org/project/awscli/" +#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/aws-cli-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~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.4.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests --install nose + +PATCHES=( + "${FILESDIR}"/awscli-1.19.47-py39.patch +) + +python_test() { + distutils_install_for_testing + # integration tests require AWS credentials and Internet access + nosetests -v tests/{functional,unit} || + die "Tests failed for ${EPYTHON}" +} + +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.20.37.ebuild b/app-admin/awscli/awscli-1.20.37.ebuild new file mode 100644 index 000000000000..ff429f8d3a3e --- /dev/null +++ b/app-admin/awscli/awscli-1.20.37.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE="https://pypi.org/project/awscli/" +#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/aws-cli-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~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.4.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests --install nose + +PATCHES=( + "${FILESDIR}"/awscli-1.19.47-py39.patch +) + +python_test() { + distutils_install_for_testing + # integration tests require AWS credentials and Internet access + nosetests -v tests/{functional,unit} || + die "Tests failed for ${EPYTHON}" +} + +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.20.38.ebuild b/app-admin/awscli/awscli-1.20.38.ebuild new file mode 100644 index 000000000000..ff429f8d3a3e --- /dev/null +++ b/app-admin/awscli/awscli-1.20.38.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE="https://pypi.org/project/awscli/" +#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/aws-cli-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~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.4.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests --install nose + +PATCHES=( + "${FILESDIR}"/awscli-1.19.47-py39.patch +) + +python_test() { + distutils_install_for_testing + # integration tests require AWS credentials and Internet access + nosetests -v tests/{functional,unit} || + die "Tests failed for ${EPYTHON}" +} + +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.20.39.ebuild b/app-admin/awscli/awscli-1.20.39.ebuild new file mode 100644 index 000000000000..ff429f8d3a3e --- /dev/null +++ b/app-admin/awscli/awscli-1.20.39.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE="https://pypi.org/project/awscli/" +#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/aws-cli-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~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.4.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests --install nose + +PATCHES=( + "${FILESDIR}"/awscli-1.19.47-py39.patch +) + +python_test() { + distutils_install_for_testing + # integration tests require AWS credentials and Internet access + nosetests -v tests/{functional,unit} || + die "Tests failed for ${EPYTHON}" +} + +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/hcloud/Manifest b/app-admin/hcloud/Manifest index 6ac0086d9081..ff61f767069c 100644 --- a/app-admin/hcloud/Manifest +++ b/app-admin/hcloud/Manifest @@ -1,5 +1,5 @@ DIST hcloud-1.25.1.tar.xz 1164932 BLAKE2B 21d3a0def3684a25c0cb629320f5617c93090d33cc95e66c42355c01afaf3189f8da858028220350bc1f1f53992b289ea75b56196d94ae41323602c4e8fee1a8 SHA512 aba79869553b19f6a117dc4d9f31935582e9ad89d12d9fd8f70087064383b76324483c78890ddb5965f98f2ca783ca46a17dee97b21716a1ff916647c1267a67 -DIST hcloud-1.28.0.tar.xz 1169076 BLAKE2B 3748dba34586e70ccc0faee1920250152a29fd842816ea80658886f846d24471e37351b00e6ba8579de066777d9deefccd9edabfccd0ce341f270cd65dc76eae SHA512 7b441c0dd074ed7c9014283322c743759cc677c891aeb3be5d034829be8ed48de54b797c8664b23db3395a0c8ff74e9cc00e6c7a443fcacdc0c6bdb50de12b8f +DIST hcloud-1.28.1.tar.xz 1498600 BLAKE2B 9489f1c119d941999a3dd6794545704e9946850bb4fef4799a1560fbc50fecc928a93437c3d7221cedbf5435d23d500bec5ffbe4b16dd754ebe934b0e7f57aeb SHA512 146fb1673fcf0939c20ed0259bc69bf05e8971fe20a25cf560023ced4631ac6d470dd270e92c44e26a1131f6cffa3ce339d4524401318764540d8a06ac3cc11f EBUILD hcloud-1.25.1.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27 -EBUILD hcloud-1.28.0.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24 +EBUILD hcloud-1.28.1.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a diff --git a/app-admin/hcloud/hcloud-1.28.0.ebuild b/app-admin/hcloud/hcloud-1.28.1.ebuild index 77d54006fe99..77d54006fe99 100644 --- a/app-admin/hcloud/hcloud-1.28.0.ebuild +++ b/app-admin/hcloud/hcloud-1.28.1.ebuild diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 0f83dbdda616..b1024b00bde1 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -2,5 +2,5 @@ AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830 AUX logrotate.conf 740 BLAKE2B ade43681e1929aa8b7e167a2be0c8569f3842680687381c202ac04b5cf97cd85481f6ca7fbf6f0dffa64caa3b1d9cb0f1e2154af8882a3ce7008337f2a5ede6f SHA512 6411acd842fac1a8af72142cddfa76b567f6ba859bed91dab56f1d26b48f3dcaa3ffee6c8094860fe9c43f9b6bc398199c8f4047856b91d6d12333d0fc7aef96 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36 DIST logrotate-3.18.1.tar.gz 225226 BLAKE2B 6f40dfe89f9c6202263f16204a9cff07b921abc9a298b58649bb4968c9f498626741be334c47d4092da564ed75642b687ff6ef8781f69f5e25364f8635646d9d SHA512 c40f920686aee014c652f087c64f2a85e9e866a8717d1bd3f32a9dd7959a02962e6174de28ae685428b442e12079d0c8d91485611ca34a873ffae872a54ec9fe -EBUILD logrotate-3.18.1-r1.ebuild 2252 BLAKE2B 116708c1f1247a84699afbfe7241b0d62fa12b140e72ef74eed0e5837d48aa847045f6245cf9541becf1ab0833f965c830a0a027f96d699067039448c6e77b89 SHA512 0617442fc69bdd598d31f99d216799dc265de36d72f7ca07a1a1471c7eab17ecb82eab49a160773f7ef9bc3a7d3aac07b14c679f9fd2fed44851beac7c35e65f +EBUILD logrotate-3.18.1-r1.ebuild 2259 BLAKE2B c24e5e395434a367bcfb58cd2dfc010f9d425c0b625a8e17b60ee2c79462f9713db9fd327bfad16c9219cc41de7f28df39e803494cef73f8c07d8e0bf18e67a3 SHA512 f58fa43a2710ebfea68f2568a935d4cbbcecf36df5db55d43910c68bea03f446693e1b4a0c615c9f23f686095682dec98d09caeb6c5f6aff98bfc4ee903a282c MISC metadata.xml 1206 BLAKE2B c52b227a223e5d7db50f2009b3766d6af0f2c0ca51bdf3f6098d56d16c6586c08826b795f50a6f3f2e50f29ed4f9def8c53268a533eac985e3ab22042c418f7a SHA512 9d184f5b4c025416b7a2f6019f982a12e65e39da3532d7d024759e1e73d2b55d0e949e38c4cd0926e552059b600c114daa5beb135433d71e8f85d0f732d0b791 diff --git a/app-admin/logrotate/logrotate-3.18.1-r1.ebuild b/app-admin/logrotate/logrotate-3.18.1-r1.ebuild index e5eeab2ecc63..2d5867e5be92 100644 --- a/app-admin/logrotate/logrotate-3.18.1-r1.ebuild +++ b/app-admin/logrotate/logrotate-3.18.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="acl +cron selinux" DEPEND=" diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 4d8b38487ffa..864b86973122 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -18,10 +18,12 @@ AUX salt-3001.6-tests.patch 766 BLAKE2B 979c29a00fe1d67529b204c1ce74ef8a94ed070b AUX salt-3002-dont-realpath-on-tmpdir.patch 1808 BLAKE2B 2ce464fef827cb98490b8a2c4aecbdaaa8bd53b3aef1acc96496bde162a0102064a400dff768c2cd5faddfe33a433922c5295b30dfef38e68841ebfe1a119644 SHA512 ce002f4fdf0d1e75cfbe9c2d3a6c98e08c21b0c436c500b70a0405c4ee10a1b1849446fab47dd681c71c9a847587fe97537de095768ecf650df9b53f3778ca62 AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb2bbf98c295da87f0abd456cfc8f25c11fe10a1c4571d4eb25390c6d89b0e300bd2ae6d82212d1685af8ed30 SHA512 7f9d6f8c4a5d34381c516c72d77de6613ed646fb88f89b7c4180afebb0bf0ee34a99ed02a7e8d7a6836a61c01653fe97a13c8caa18898a507a03091cff8e9d30 AUX salt-3002.5-tests.patch 1437 BLAKE2B 7c0ddc9ab12c7ed3d07e18a22623f5f9e24f47bf7e871ad7b71f0d1c482790f1ac994b628bbaa0692344deacf57526496c79f1aa7fc1a68092dea67392c0ce45 SHA512 1551757f01348d64de94b8b5830ad45333a06e1cd54d457702a33031b1f741ce12c23c9452e25d3498a0fa6a8c80ec425b0618809af7c3860ce1064946491cbb +AUX salt-3002.7-tests.patch 439 BLAKE2B 241d1efab22509c73e23d1e4e397fff5c6dadd7481cf8156df5d8c2b79e6b332c3e55e40e00582ed57c67da61dbad97a8be6df62209bd435db638e6e8a9d06c6 SHA512 c9145592a810a135111079d39d9a28cd0f4b7530e19864ee87b144b44c951b9a43e876f935f05a8ea8428da7fe3cfbcc49020baf46baf7b840816b15aff3f190 AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e9112b5545af40ba215c7859520ef95a9824001274e837929ef6c25f8e1c35a8ac73f1033e63336bcbaf48dbd4b54c2d42c SHA512 c8a4649ac241f219cf576b0896f48dffc0d5a273118713829c0ad34594f77cffceaa4f06a4d0f47a17b13d6e71b5787fc27f8ee97c774e53a6d15d1b282f99b3 AUX salt-3003-skip-tests-that-oom-machine.patch 732 BLAKE2B b9e10cf8d9ce7f36371fd30fcf592dce4933a05ca2d85c41b2159233272f2e7c90315fbd998c4064f3733b5b1944f9f96816418ed7eb434f3b9df324de2e859b SHA512 e7bc9c63d95a9af4e85372ca973c5023660c332b67486382ce898e7d60c3f50e2aca59e2634a2e87ab7fa8b34e45bfd3a781e04b8003108efbfcc67cd921aff4 AUX salt-3003-tests.patch 5792 BLAKE2B 6a383c400bfb1f261d284844dc12bfabe4fc1741c5bc840131440ea991d64e61432f4e9ac4059d5bc8680b7752c6ceed16c474d0908b53657f15560a7c6f0e8f SHA512 fdb3eef283b62da9955cbe88d7f99f889c23147d3b60af7d49e4a54f61d158903ea77ff321764e0f3aa62b38ac7045d46d9f17ccfb2870c56b8b32baa856b6a8 AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc +AUX salt-3003.3-tests.patch 9888 BLAKE2B b8785f6498246e3a61079721c060aebda15a595232600aad408e01cae052ccf15d0b482efd17c12de74bd227cabaf2e95812420f157bdc97edac60e9a25d1c44 SHA512 4709c63ffe1c8205672238855f07adcc28556d8d8fcb746402e07651552015ce8ae6754f2a6ec07545d58f4c018a27d14273e8cbba1ecfdc7a1527007ee7a928 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed @@ -32,13 +34,19 @@ DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7 DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800 DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f SHA512 94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092 DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f SHA512 e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c +DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013 DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1 +DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938 DIST salt-3003.1.tar.gz 16010476 BLAKE2B 3cd141061d8fa6ad00fe60615e8d36fda9fb26264adb2722d34e0b93c626fe09d78c3b9280ad8fe98924469a1ede1ad93cc06bde24a121c3db8c957be0ab7d75 SHA512 bf5ec7f1d16c776be5c2e90bff30e11817f369c3b08c0fe8bd991e7be31179b10cbd244048fb08c05aff30d7b6037c0575c311da4a0f300ce02bcf677aa6616f +DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3 DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38 EBUILD salt-3000.8-r1.ebuild 6619 BLAKE2B edeb4e38aab16c71206a6fea80e6e72d89659e427af66961235a854368ee785963a4cf1800cb4a725722fd433a56349b4e5fbb58626ee563c489de2c1b4fbc13 SHA512 439fca4963d8ec8f840c4fc2a3d49c04256ba53ef4f222887188b3c877bd0cdbbe24a081bfbcf75d02a5a6e39c0544bbb634fc6aacf850983825549b84cf372d EBUILD salt-3000.9-r1.ebuild 6661 BLAKE2B 0234da9585d1606983d13022f59878394d47d4b3389655568164d22a45f1de52af53c8f1ff9978f4c41abc2c3531d1a25687ed7300011fb9372756836093e8c4 SHA512 08d14c253e18b99cd85b07ae3eaa1f5161881badf4fb9a744093704b5f3da1f693a81f415c6a95360bd3c54762657a3be549a45f4f3c9743d6e893f8c6482b6d EBUILD salt-3001.6-r1.ebuild 6242 BLAKE2B 570ba5f2830435467db7eb562c58f3f45199b2519ce0f88eee298e66b3b05a9d5f111dc399709bc70e97d6c109275a676dcb2b8fb0a3eeb55fffb4a053974ce2 SHA512 06a37ac98911040244f18b562affe9732315ed8feb0944f00a5c82e31061966d173cc33e138be8ce852da755532e436742f778130c5a61aa9e38b966e8d2c811 +EBUILD salt-3001.8.ebuild 6231 BLAKE2B 78d78cc0a2a17fc6febcd1afa8a7b9b63f44e9bc09c57f24bb7038762ca66af04887fdf480b91bc259ef76f4a6db1779fb7f9b4de6d09e37cf3ba7934f068a3c SHA512 d0dd479fab9dd1889d26fd53a1044a2a2ceb78dae7da6504f1d5d3435f3639d71f422fff25adf18fe87135323225adcb74ce72af4bac578e3e78fbaaa2f402f5 EBUILD salt-3002.5-r1.ebuild 6273 BLAKE2B e9768ac7fcd7a11c6c05bf8b9900428af79aa63cd1332208ec15295cfc769945bf77e16afaa696e26efbdcba525df1ab520838bffce7319470a742133544a759 SHA512 ceee568eba9776ccb8bacbabf914899f1bd4d27fdcc777a2296b046169601cdb269c2e32e2dba7d052dc780a5990e0d1deb5dee2c4180f6383ea9a45922e33c5 +EBUILD salt-3002.7.ebuild 6504 BLAKE2B 0633314b7c3b2ffff780c7b9d2aa2bcc329b5591e910ae5b98c03cd5a4174058dd79e2a0b5abf807153fed62c3c520cdaf028301bac223551888787105bd5ce1 SHA512 e5adfabfc656bcd479e9c18627ed42f2206af26916714ca421c3b552feac4e0180dcc3f939c768d98e69824211257baf8d80d418476c3a8e436da4bd45c70eb7 EBUILD salt-3003-r1.ebuild 6578 BLAKE2B 3741769a693c4d2bd6868c0cd3ef47697e25a97675336c08c2af482702d48c43e6a54ed71092f1ba754c52938533d8dc8a94e6f5e678c77419824b2b51e04924 SHA512 c5bb47ee8a74e07bae14a368ad48f7ae5906a738ee04a48c4d2efea32f6cf65475e1d4db4107d61fd9fd267cf105d36a682171ae4af4745eed51e587a78514a7 EBUILD salt-3003.1-r1.ebuild 6810 BLAKE2B a66ce2731f94e3a870a0ffb5ba0e2627a7c6cf345009b33b1095bd3e7439fb12450abc2d9aa858106bf590cceb198fbe449dd50b32e3bb2214bb96e9bc560309 SHA512 009ab916c2f44a7e99bc5fbc1e50709a361eaf395d26babadf88f5e05322a0b44596911cbd310fc4089928fbc1f100923b274307f759d169a40c604c6b377a31 +EBUILD salt-3003.3.ebuild 6801 BLAKE2B 2c345cc59f23ef925346a72f5e5613ec921a8bcf104ee793c4e004a414e780ab5068e66baf9d4adba85785378c48fcc17ce12876b7b8eb4d9ca198cdec182fc4 SHA512 cf3f92b3753f716f3ee11b9cfabe3dac2ce880fc30281fdc508bd6e7cdfcc61590049ad3ccfc0d6ecba45854356f7b4a2a6d6744c00acfb3baf9a19f605de7b6 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5 diff --git a/app-admin/salt/files/salt-3002.7-tests.patch b/app-admin/salt/files/salt-3002.7-tests.patch new file mode 100644 index 000000000000..828b7eee76eb --- /dev/null +++ b/app-admin/salt/files/salt-3002.7-tests.patch @@ -0,0 +1,12 @@ +diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py +index e745f8f8c6..a2bb2a7ef2 100644 +--- a/tests/unit/modules/test_boto_route53.py ++++ b/tests/unit/modules/test_boto_route53.py +@@ -80,6 +80,7 @@ def _has_required_moto(): + return True + + ++@skipIf(True, "skipping broken test") + @skipIf(HAS_MOTO is False, "The moto module must be installed.") + @skipIf( + _has_required_moto() is False, diff --git a/app-admin/salt/files/salt-3003.3-tests.patch b/app-admin/salt/files/salt-3003.3-tests.patch new file mode 100644 index 000000000000..049d8c164c55 --- /dev/null +++ b/app-admin/salt/files/salt-3003.3-tests.patch @@ -0,0 +1,233 @@ +diff --git a/salt/transport/ipc.py b/salt/transport/ipc.py +index 29210d7522..4fd648116f 100644 +--- a/salt/transport/ipc.py ++++ b/salt/transport/ipc.py +@@ -2,7 +2,6 @@ + IPC transport classes + """ + +- + import errno + import logging + import socket +@@ -20,6 +19,7 @@ from salt.ext.tornado.ioloop import IOLoop + from salt.ext.tornado.ioloop import TimeoutError as TornadoTimeoutError + from salt.ext.tornado.iostream import IOStream, StreamClosedError + from salt.ext.tornado.locks import Lock ++import tornado.iostream + + log = logging.getLogger(__name__) + +@@ -693,11 +693,11 @@ class IPCMessageSubscriber(IPCClient): + if not first_sync_msg: + # We read at least one piece of data and we're on sync run + break +- except TornadoTimeoutError: ++ except TornadoTimeoutError if isinstance(TornadoTimeoutError, BaseException) else (salt.ext.tornado.ioloop.TimeoutError): + # In the timeout case, just return None. + # Keep 'self._read_stream_future' alive. + ret = None +- except StreamClosedError as exc: ++ except StreamClosedError if isinstance(StreamClosedError, BaseException) else (tornado.iostream.StreamClosedError) as exc: + log.trace("Subscriber disconnected from IPC %s", self.socket_path) + self._read_stream_future = None + except Exception as exc: # pylint: disable=broad-except +diff --git a/tests/integration/grains/test_core.py b/tests/integration/grains/test_core.py +index 5f1cf11e24..8affb398ff 100644 +--- a/tests/integration/grains/test_core.py ++++ b/tests/integration/grains/test_core.py +@@ -21,6 +21,7 @@ def _freebsd_or_openbsd(): + return salt.utils.platform.is_freebsd() or salt.utils.platform.is_openbsd() + + ++@pytest.mark.skip("Tests only should run on FreeBSD and OpenBSD") + @pytest.mark.windows_whitelisted + class TestGrainsCore(ModuleCase): + """ +diff --git a/tests/integration/states/test_x509.py b/tests/integration/states/test_x509.py +index 2321689ef5..574de51e56 100644 +--- a/tests/integration/states/test_x509.py ++++ b/tests/integration/states/test_x509.py +@@ -468,7 +468,7 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== + first_run[key]["changes"]["Certificate"]["New"]["Not After"], + "%Y-%m-%d %H:%M:%S", + ) +- self.assertEqual(29, (expiry - datetime.datetime.now()).days) ++ self.assertEqual(30, (expiry - datetime.datetime.now()).days) + self.assertTrue(os.path.exists(crtfile), "Certificate was not created.") + + with salt.utils.files.fopen(crtfile, "r") as first_cert: +@@ -485,14 +485,14 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== + }, + ) + self.assertEqual( +- "Certificate needs renewal: 29 days remaining but it needs to be at least 90", ++ "Certificate needs renewal: 30 days remaining but it needs to be at least 90", + second_run[key]["changes"]["Status"]["Old"], + ) + expiry = datetime.datetime.strptime( + second_run[key]["changes"]["Certificate"]["New"]["Not After"], + "%Y-%m-%d %H:%M:%S", + ) +- self.assertEqual(179, (expiry - datetime.datetime.now()).days) ++ self.assertEqual(180, (expiry - datetime.datetime.now()).days) + with salt.utils.files.fopen(crtfile, "r") as second_cert: + self.assertNotEqual( + cert_contents, +diff --git a/tests/pytests/functional/modules/state/requisites/test_listen.py b/tests/pytests/functional/modules/state/requisites/test_listen.py +index b7a90d0ca0..26030f403b 100644 +--- a/tests/pytests/functional/modules/state/requisites/test_listen.py ++++ b/tests/pytests/functional/modules/state/requisites/test_listen.py +@@ -292,43 +292,3 @@ def test_listen_requisite_resolution_names(state, state_tree): + assert "test_|-listener_service_|-nginx_|-mod_watch" in ret + assert "test_|-listener_service_|-crond_|-mod_watch" in ret + +- +-def test_onlyif_req(state, subtests): +- onlyif = [{}] +- state_id = "test_|-onlyif test_|-onlyif test_|-succeed_with_changes" +- with subtests.test(onlyif=onlyif): +- ret = state.single( +- name="onlyif test", fun="test.succeed_with_changes", onlyif=onlyif +- ) +- assert ret[state_id]["result"] is True +- assert ret[state_id]["comment"] == "Success!" +- +- onlyif = [{"fun": "test.true"}] +- state_id = "test_|-onlyif test_|-onlyif test_|-succeed_without_changes" +- with subtests.test(onlyif=onlyif): +- ret = state.single( +- name="onlyif test", fun="test.succeed_without_changes", onlyif=onlyif +- ) +- assert ret[state_id]["result"] is True +- assert not ret[state_id]["changes"] +- assert ret[state_id]["comment"] == "Success!" +- +- onlyif = [{"fun": "test.false"}] +- state_id = "test_|-onlyif test_|-onlyif test_|-fail_with_changes" +- with subtests.test(onlyif=onlyif): +- ret = state.single( +- name="onlyif test", fun="test.fail_with_changes", onlyif=onlyif +- ) +- assert ret[state_id]["result"] is True +- assert not ret[state_id]["changes"] +- assert ret[state_id]["comment"] == "onlyif condition is false" +- +- onlyif = [{"fun": "test.true"}] +- state_id = "test_|-onlyif test_|-onlyif test_|-fail_with_changes" +- with subtests.test(onlyif=onlyif): +- ret = state.single( +- name="onlyif test", fun="test.fail_with_changes", onlyif=onlyif +- ) +- assert ret[state_id]["result"] is False +- assert ret[state_id]["changes"] +- assert ret[state_id]["comment"] == "Failure!" +diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py +index 5424514160..0564b59593 100644 +--- a/tests/pytests/unit/modules/test_cmdmod.py ++++ b/tests/pytests/unit/modules/test_cmdmod.py +@@ -438,6 +438,7 @@ def test_run_cwd_doesnt_exist_issue_7154(): + + @pytest.mark.skip_on_darwin + @pytest.mark.skip_on_windows ++@pytest.mark.skip("does not work in sandbox environment") + def test_run_cwd_in_combination_with_runas(): + """ + cmd.run executes command in the cwd directory +diff --git a/tests/unit/ext/test_ipaddress.py b/tests/unit/ext/test_ipaddress.py +index 3b91757a03..5fa0f88e78 100644 +--- a/tests/unit/ext/test_ipaddress.py ++++ b/tests/unit/ext/test_ipaddress.py +@@ -2707,6 +2707,7 @@ class IpaddrUnitTest(TestCase): + "2001:658:22a:cafe:200::1/::ffff:ffff:ffff:ffff", + ) + ++ @pytest.mark.skip("_cache no longer present in python3.8+") + def testNetworkElementCaching(self): + # V4 - make sure we're empty + self.assertNotIn("broadcast_address", self.ipv4_network._cache) +diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py +index e745f8f8c6..ab36a90a79 100644 +--- a/tests/unit/modules/test_boto_route53.py ++++ b/tests/unit/modules/test_boto_route53.py +@@ -80,6 +80,7 @@ def _has_required_moto(): + return True + + ++@skipIf(True, "test case appears to be broken") + @skipIf(HAS_MOTO is False, "The moto module must be installed.") + @skipIf( + _has_required_moto() is False, +diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py +index 907c67f477..2429d27641 100644 +--- a/tests/unit/utils/test_parsers.py ++++ b/tests/unit/utils/test_parsers.py +@@ -5,6 +5,7 @@ + import os + import shutil + import tempfile ++import pytest + + import salt.config + import salt.log.setup as log +@@ -983,6 +984,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): + if os.path.exists(self.log_file): + os.unlink(self.log_file) + ++ @pytest.mark.skip("Tries to write to /var") + def test_jid_option(self): + jid = salt.utils.jid.gen_jid({}) + args = ["--jid", jid] +@@ -991,6 +993,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): + parser.parse_args(args) + assert parser.options.jid == jid + ++ @pytest.mark.skip("Tries to write to /var") + def test_jid_option_invalid(self): + jid = salt.utils.jid.gen_jid({}) + "A" + args = ["--jid", jid] +@@ -1041,6 +1044,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): + if os.path.exists(self.ssh_log_file): + os.unlink(self.ssh_log_file) + ++ @pytest.mark.skip("Tries to write to /var") + def test_jid_option(self): + jid = salt.utils.jid.gen_jid({}) + args = ["--jid", jid] + self.args +@@ -1049,6 +1053,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): + parser.parse_args(args) + assert parser.options.jid == jid + ++ @pytest.mark.skip("Tries to write to /var") + 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_vt.py b/tests/unit/utils/test_vt.py +index bf7a323e26..3c8ce3a128 100644 +--- a/tests/unit/utils/test_vt.py ++++ b/tests/unit/utils/test_vt.py +@@ -17,6 +17,8 @@ import subprocess + import sys + import time + ++import pytest ++ + import salt.utils + import salt.utils.files + import salt.utils.platform +@@ -275,6 +277,7 @@ class VTTestCase(TestCase): + salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290" + ) + @fixStdOutErrFileNoIfNeeded ++ @pytest.mark.skip("Does not work in sandbox environment") + def test_split_multibyte_characters_unicode(self): + """ + Tests that the vt correctly handles multibyte characters that are +@@ -342,6 +345,7 @@ class VTTestCase(TestCase): + salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290" + ) + @fixStdOutErrFileNoIfNeeded ++ @pytest.mark.skip("Does not work in sandbox environment") + def test_split_multibyte_characters_shiftjis(self): + """ + Tests that the vt correctly handles multibyte characters that are diff --git a/app-admin/salt/salt-3001.8.ebuild b/app-admin/salt/salt-3001.8.ebuild new file mode 100644 index 000000000000..6e4d6f481757 --- /dev/null +++ b/app-admin/salt/salt-3001.8.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..8} ) + +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="git://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 ~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[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.7[${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/toml[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) + ) + 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[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}] + dev-python/pytest-salt-factories[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] + net-dns/bind-tools + !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3001.1-tests.patch" + "${FILESDIR}/salt-3001.6-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,cache}}.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 + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.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 +} + +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 tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + + ( + cleanup() { rm -f "${tempdir}" || die; } + + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose \ + || die "testing failed with ${EPYTHON}" + ) +} + +pkg_postinst() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +} diff --git a/app-admin/salt/salt-3002.7.ebuild b/app-admin/salt/salt-3002.7.ebuild new file mode 100644 index 000000000000..d20e3e59a373 --- /dev/null +++ b/app-admin/salt/salt-3002.7.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +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="git://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 ~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[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.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/toml[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) + ) + 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[${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-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.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/pip[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] + net-dns/bind-tools + !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE=" + || ( raet zeromq ) + test? ( cheetah genshi ) +" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" + "${FILESDIR}/salt-3002-tests.patch" + "${FILESDIR}/salt-3002.5-tests.patch" + "${FILESDIR}/salt-3002.7-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,cache}}.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 + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.py || die + + sed -i 's:log.trace(:log.debug(:' \ + salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die + + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + # 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 +} + +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 tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + + ( + cleanup() { rm -f "${tempdir}" || die; } + + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose \ + || die "testing failed with ${EPYTHON}" + ) +} + +pkg_postinst() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +} diff --git a/app-admin/salt/salt-3003.3.ebuild b/app-admin/salt/salt-3003.3.ebuild new file mode 100644 index 000000000000..bbf19fc2c44c --- /dev/null +++ b/app-admin/salt/salt-3003.3.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +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="git://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 ~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[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.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/toml-0.10.2[${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}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) + ) + 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[${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-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-2.2.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/pip[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-0.121.1[${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.0.20[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.3.15[${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.3-tests.patch" + "${FILESDIR}/salt-3003.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_{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 + + # tests require root access + rm tests/integration/pillar/test_git_pillar.py || die + rm tests/integration/states/test_supervisord.py || die + rm tests/pytests/unit/client/test_ssh.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() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +} diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 9cb93b786586..5842eeac1c85 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,8 +1,8 @@ DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745 -DIST sudo-1.9.7p1.tar.gz 4197591 BLAKE2B fff3eab8b4de6276135229c5fe12e7eced98af988b7686600e6a63b8615f6357ab2c5f95ef6f1872534476c4398a28c4f468ffc316e0cff7d4b32e6068aa97d4 SHA512 bc85d9de1566de24883375edd1c4cd24b1f24437bb16d181bfa3c9c94cead220c69ad00d6727560ca195765ced970e95d69b9ce01dbea448de39afac9a902fb4 DIST sudo-1.9.7p2.tar.gz 4200036 BLAKE2B b977c423670e5e34e84f3b009d5fe5f0379a0027e828fb903aa7ff1b11581572e8d5452a3666d963df3edfe1b83ffe16fbf8bddbf07881284f4507c8138859ad SHA512 39184127122014d0d1d194d455644191009835ffdcc0efda3a99028fe346ca3ff6b15341016f85029556e9f1f9deeaf83b52160effc47d1a5713affb36b99386 +DIST sudo-1.9.8rc2.tar.gz 4302195 BLAKE2B 49a9ee0f3dca52b1ce4a7443ccbceaee1b7e12fc5ecf6c1f5571f33f6461fc6e381c2c22a5071f1466967aaee53acba32fef6906f8376b68bbace4f3d67ff082 SHA512 56dc2e8935f0cc6b1ccb273ad816c31df68523284a6b5d43f35940d7a5373cf1184982a78b26e6111aead3a035d1a10f6a1eba95b613e776fd48528a1429f7cb EBUILD sudo-1.9.6_p1-r2.ebuild 6725 BLAKE2B 620c20c144bb7fd723e3e46022dd3e6152084978091e2e3af0a95a961dc027defeb5d20dcee4b0e36959e04124586a2c53d65c8137af9d1f52a6044392c08aea SHA512 fc61898d795187d7ab0876001c725bdb2c5f0c98ab38adc8427f69abc1da8b33be6ef8ebe1353ead193f10f48ed042fe12a13f90c181bc3a0d3cceed352bc262 -EBUILD sudo-1.9.7_p1-r1.ebuild 6686 BLAKE2B c088c8a2cad0fcc78dc91ca5ec04b1ed36a7eff66349d4abbc2de78074395c9dfa6dfba2662f180e53f86a84f9118d93a0a7da2f52e10131c94caff2721594fe SHA512 ccc8a5c262cd07b3c456ed3e5100f4787b814308a223a7c3c2a9c60db3dd308e60812607c289381230948ee184f71c3503de4dabb4dee388b174b65c502b447e EBUILD sudo-1.9.7_p2.ebuild 6686 BLAKE2B c088c8a2cad0fcc78dc91ca5ec04b1ed36a7eff66349d4abbc2de78074395c9dfa6dfba2662f180e53f86a84f9118d93a0a7da2f52e10131c94caff2721594fe SHA512 ccc8a5c262cd07b3c456ed3e5100f4787b814308a223a7c3c2a9c60db3dd308e60812607c289381230948ee184f71c3503de4dabb4dee388b174b65c502b447e +EBUILD sudo-1.9.8_rc2.ebuild 6686 BLAKE2B c088c8a2cad0fcc78dc91ca5ec04b1ed36a7eff66349d4abbc2de78074395c9dfa6dfba2662f180e53f86a84f9118d93a0a7da2f52e10131c94caff2721594fe SHA512 ccc8a5c262cd07b3c456ed3e5100f4787b814308a223a7c3c2a9c60db3dd308e60812607c289381230948ee184f71c3503de4dabb4dee388b174b65c502b447e EBUILD sudo-9999.ebuild 6740 BLAKE2B 8b9f2a5fa1e912a46f3ce6af924fa9b13c01a917c0d34874992413a9af0873c4db96bdf537fc92e20d6af433bbf0569bcdfa68ecf694e51c4343743d96b60608 SHA512 94d95b089753f5ce476a5d26dddd4e095fa98410c3f1f90048a75206b285544c9c3d1f94fbccbe966cdc98d508a5f4fe236845b19cecbc8ad02c5b26910aa213 MISC metadata.xml 1049 BLAKE2B 7b4bbe6469dc6e683d73b81d055ca3b7b3ae610e2889edcde54b735cafa91d1a186268d70c96f5e90a4fcf90f4750ecee9eb4823fcbde5b47dfb9ebf27845b2e SHA512 7a9a9c9e0f457ba15355d5f14dbe0fd187485df6f9fad0c32a4e39850947e4bf1329370a52e4eb7396e0ee55c81fc31ea8569895e0d4608983b4b703d0dcc761 diff --git a/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild b/app-admin/sudo/sudo-1.9.8_rc2.ebuild index 82fffc77e5e4..82fffc77e5e4 100644 --- a/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild +++ b/app-admin/sudo/sudo-1.9.8_rc2.ebuild diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest index 5e26a324b37a..c73426b05396 100644 --- a/app-admin/sysklogd/Manifest +++ b/app-admin/sysklogd/Manifest @@ -1,9 +1,7 @@ AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62a354470448f91950a5ffe76104e80307543922bbb5777b9e3d096af8740d66a4dd637f4aa3adac5 SHA512 80a2159d24b343a5b14da054bd073015ffc8f81c6e5b47114429b6c069b81a3331392c88baafd9a5ac1e0d778119fa7ca10def17eeb9b88c7f5cca1c0d31c6b2 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4 -DIST sysklogd-2.2.2.tar.gz 441106 BLAKE2B b99c63027468967083bb1338a6299bf2f58415c1d20a43f23ff613a5ce318c45c43640824bc82fe3ea423cd9432930a070354bb7a51281bd113b4d088bf17643 SHA512 5db5b0fc58530634627463a5b79ebc3b27c54284b371ce8c37cb6de4ed542640fb8a36e594bb73c0a541d22c6fa0ff985ad06cb2b76cd30cce988741ded86903 DIST sysklogd-2.2.3.tar.gz 441630 BLAKE2B e23b95aea9d98effc6a88dd14c4fafa358274ea839e7a07ab51bd0257fe0398a1ba6b629c4711d679fffaf03f04c177454f536bdd78dcad2b9f2ae36ff91138e SHA512 db1675256f0f0b0874e2e6a68fb086294bef1d6d3f3e9a6470f8d797ae504b2ab03ed23dc2753c8108a230c3f617e67c4a71e099a2ffeb7ffc8a0efdd07e8d17 -EBUILD sysklogd-2.2.2.ebuild 2105 BLAKE2B d5b44d227c6d5b66ce0a19ca580f4cbc4d044c3c10ac991a0f50b9f9a5628cb274fcb9ae372e8007b85c9d8fe07ad99dae124b58e88bafda28b407cd0a5628cd SHA512 ea12b83058cfdbd1d7277b569cc2028588b7e95b6505511306e060b8da92d7e39cca6d9a298e0816c6e4d1b79f3245514c554e0bffdc2af1ba958261b7a12364 -EBUILD sysklogd-2.2.3.ebuild 2105 BLAKE2B d5b44d227c6d5b66ce0a19ca580f4cbc4d044c3c10ac991a0f50b9f9a5628cb274fcb9ae372e8007b85c9d8fe07ad99dae124b58e88bafda28b407cd0a5628cd SHA512 ea12b83058cfdbd1d7277b569cc2028588b7e95b6505511306e060b8da92d7e39cca6d9a298e0816c6e4d1b79f3245514c554e0bffdc2af1ba958261b7a12364 +EBUILD sysklogd-2.2.3.ebuild 2112 BLAKE2B ff6edffeb81325fe496976f16b5e31f338aaeb82aa45d876225d348e172c17d7e923f253f7b83a26c4c281354e573a78fe3711c9311edc1131dd5b1ba0fa1888 SHA512 da1991d152bd49fcec68c5133657fedc4548cdd4b7c513e2b3bddcbe6716aa82d3f4ed18d1a99e956b1d3bdd261575aef7001f8ea9f2421d727b057dc8eb7587 EBUILD sysklogd-9999.ebuild 2111 BLAKE2B 380deab4839155c659052403cd67e098c53717468ab8cb464d2bf274cfad0965f077cf8f82af8813090c748db3aeb5afb767c5924f871db4940bbf77d23569bf SHA512 541b2164b31189e74fc82de2717864e8ccfd7f4cd1b2b33524c2f239f64a24ff67ddc21f4dde18b88a87c31ec18ea397fcfcdcf19f0a1e4410c2d1b6a597be43 MISC metadata.xml 432 BLAKE2B 6333f9e73c96d80b69a0ae252660f93ae1466fc44fa379a461e7b611dae4841d0511887ce9a1ec3aa1f49bdb33a98fedce734be92b53580578f0e6a5ca67f192 SHA512 37d1ffbcdd86f5e94f5e38902bcb710fce1eb1c2702c06e05b00d56b02f51c6babbc05b8d1aa43317d336ab58af1df88e173dd152e4b62ca4fce411fe4a8ac23 diff --git a/app-admin/sysklogd/sysklogd-2.2.2.ebuild b/app-admin/sysklogd/sysklogd-2.2.2.ebuild deleted file mode 100644 index 28b6cb446dec..000000000000 --- a/app-admin/sysklogd/sysklogd-2.2.2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~s390 sparc x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="logger logrotate systemd" -RESTRICT="test" - -DEPEND=" - logger? ( - !<sys-apps/util-linux-2.34-r3 - !>=sys-apps/util-linux-2.34-r3[logger] - ) -" -RDEPEND="${DEPEND} - logrotate? ( app-admin/logrotate )" - -DOCS=( ChangeLog.md README.md ) - -pkg_setup() { - append-lfs-flags - tc-export CC -} - -src_prepare() { - default - [[ "${PV}" == *9999 ]] && eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - --runstatedir="${EPREFIX}"/run - $(use_with logger) - $(use_with systemd systemd $(systemd_get_systemunitdir)) - ) - 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.2.3.ebuild b/app-admin/sysklogd/sysklogd-2.2.3.ebuild index 28b6cb446dec..baf95bc3eca5 100644 --- a/app-admin/sysklogd/sysklogd-2.2.3.ebuild +++ b/app-admin/sysklogd/sysklogd-2.2.3.ebuild @@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then 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 ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="BSD" diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest index 584c25141986..68cfb0f8d3b6 100644 --- a/app-admin/xkcdpass/Manifest +++ b/app-admin/xkcdpass/Manifest @@ -1,3 +1,5 @@ DIST xkcdpass-1.19.2.tar.gz 2073808 BLAKE2B 19ad3f505ab672b1a2554e534896b15c77eb9741e7da01e22efff44d069ff6a482c122ec7fa616bc3789d2ce4bd5f6050c06bcff9661476d15fbc78edc505c36 SHA512 20376fc22fb4d251e2b921d4db48fea2109a4c42832614d41e807b262130111c58e01d1ded2019fad230a458953a2f185d92cfe95f3950aaa0a97750b3b3a2b6 +DIST xkcdpass-1.19.3.tar.gz 2570967 BLAKE2B bd3576b707db2652e6979ea25476fcda51df7bc84a5182668ff1cf2878a57c89ab56a7272fe2030c38533bf4f75855facd7fd8aefa6e5c6335a00c8ef80b228f SHA512 5336e57edd7fbeb655573910b0c0868381a8b43d5ccbb8d388cc24ef16ba094c27517a4fe7b11dbfc7ff906b65a303f90b20cdf9bc551b844453640378b5e555 EBUILD xkcdpass-1.19.2.ebuild 1082 BLAKE2B eeec356a8473d534469fadedaccb99472350bc270dd00738b46b88610a4f602a95d45f154bf7f9d2bd63b5aa7aa1ba13b968c98ab142464a4f4f4ff3f46bbfc9 SHA512 7cd61c38abee095ec1d40f74e37fb114c5cd9c1bd63b6a6f5d90a0a4416fb3ae5dfa7d8b0ea79dccf5baa3fd2cf1d1ba9124088f5d3c8393c0c74a3ac4ec13c1 +EBUILD xkcdpass-1.19.3.ebuild 1080 BLAKE2B c88e2de2a5d2d41f4985bd203124254bb729dc9e532fc6805cec804c1d0d675071c0ffa1c5bb794daffeb62ceb55e064720b1f8b513fbd97c8698b62b1ba1fee SHA512 486615b3c38907eaffd4dd82065c94ac60d88a1cf81c1a0374c2b72452c7cbd724ade716f11a9311410a86e6fd989c0c38e86933331ff13edb1c0364de9e4ed9 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784 diff --git a/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild new file mode 100644 index 000000000000..4838b290ff93 --- /dev/null +++ b/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +inherit distutils-r1 + +DESCRIPTION="Password generator inspired by XKCD 936" +HOMEPAGE="https://github.com/redacted/XKCD-password-generator" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +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 +} |