diff options
Diffstat (limited to 'app-admin')
72 files changed, 1135 insertions, 841 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 4c5683d4c3eb..56148abde01f 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest index 171f1071c918..80151bf3684c 100644 --- a/app-admin/ansible-base/Manifest +++ b/app-admin/ansible-base/Manifest @@ -1,10 +1,8 @@ DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cbdfb2ef97c2881bca60be5c23e3245262e15304a63431704d8b69fff56594e25517c0e5e1f2641b3eca5ad6a1e76e4d7b3 SHA512 b599b498a20b77cd3346f5b865b5a0436cdd835af250e8cc4ed20d61ac6a4929bf4ceef9a95c6e7b8e825c5f513d33ea32b24661c58e2f1d285db0569d71fc1b -DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a DIST ansible-core-2.11.3.tar.gz 6841255 BLAKE2B fde1143515d04121de79ddb2c14bf326f9efa596c39418b9def1679539dd144551b64dff83c66795e44f48e776dbc60bc456125904bbb64970f8c44e072b5abf SHA512 93a28200dd0ab289cc05add5fbe46a1cfbbd4ba91fc7d7e95ee4060dc4f126bf4bd4affce5e44dac9cf2c12792b2a2a10b97d96b795f5bed579959391b7c4a65 DIST ansible-core-2.11.4.tar.gz 6843603 BLAKE2B fa8e72a9e77633b1b43a9a290d92db009e95ed87357f666059ed7898031f584c993ebeb6acec8cad29376666f3a714a742f4e52ac8f2baaf5d01c02796b64acd SHA512 9385a3877e6e9a25d244c855cf50c0c6b62a91cc9cebc5e7b5b5ec23424b3e3dcddd71e7367482a03996fcd5d591ad29771edd19d62758ae61473f97a5c9351d DIST ansible-core-2.11.5.tar.gz 6847600 BLAKE2B 83a80dcfda427b5d41eb3288d6b60cf710124a82edce2817a6bd5bbed0dc0157fed444b45db6428640dd25164306c987af9aba6f87ef52c63229ae113754b7c3 SHA512 73cfdb65e984856b84a0f7d0e1164a97ddbcdc38e00479f15c4a335297ba3a8f43dc503dc5b4a3f1fea06f91a3c4590b66dd680adb95b765c034207a8de5d589 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 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6 EBUILD ansible-base-2.11.5.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6 diff --git a/app-admin/ansible-base/ansible-base-2.10.9.ebuild b/app-admin/ansible-base/ansible-base-2.10.9.ebuild deleted file mode 100644 index 46ca9a204a02..000000000000 --- a/app-admin/ansible-base/ansible-base-2.10.9.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://ansible.com/" -SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos" -IUSE="test" -RESTRICT="test" -# doc removed due to https://github.com/ansible/ansible/issues/71395 - -RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh - !<app-admin/ansible-2.10 -" -# ansible-2.10 or above is needed for the collections -DEPEND=" - !<app-admin/ansible-2.10 - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - dev-vcs/git - )" - -python_compile() { - # disable version checks on upgrade - export ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} - -python_test() { - nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die -} - -python_install_all() { - distutils-r1_python_install_all - dodoc -r examples -} diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 7554fecc40c4..21615d264eaa 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,3 +1,3 @@ DIST ansible-lint-5.0.12.tar.gz 348478 BLAKE2B 3ea2a0adb82bd21322fa9a2d4c8dd4f41345f909401341748e8395aa8acf92bfc8058ee679a594c886327480bb808e69622e874c9def97c406265a0828a314eb SHA512 06b84d098253ab70f9c3fb59e1d2ba4d30918f1e7c6f3decc8f73fe8cdb7d697527eff3efcc7238fc952bc07b7179d37582d5fb9968e691e2df5495741802404 -EBUILD ansible-lint-5.0.12.ebuild 1034 BLAKE2B 82f232255a8d6566b9f04b643ceb29d58aaf0fb86ac1e6fa22c902dfb307529617b2dfa3c6d4adcf51182888af4e809d0212226dbdae9d87466b41175b7e4a74 SHA512 8507cf813ac8fb69ed9602a1e9020e2f7bd86e795be34cf615273e30cb08f92c1ea787cce69dc1167e93600eb0f5581415c07fc9f65c42d079287016edd159f9 +EBUILD ansible-lint-5.0.12.ebuild 1041 BLAKE2B a24614528178bce403262aceedc58347f410f57e4232cc1f0c66cef594fca22ad836b045edd9d421ab12f7bac745a6036405f022b31734bc3566d19360ac2977 SHA512 a8d0cfce9cb8a50d3238202eed7d3e84ab6b1be1dc44ca26ef0ecafa35c0adca8a6adfa89b07b7c72ac431cf98ac2ba31fe94b4cd2a94d91b867178962a4cba1 MISC metadata.xml 469 BLAKE2B 4acaadbad709838b23835873187e93d09ba017ad2da196807739b5b89f4d2e99d58744924fa9226077e35c4d084ca3a9c5b3e1e38b9ea3cade658c3ab69c8f33 SHA512 0a02016b26baa9e83e3a4ffeca28c6d678f4753c153dbd273c909a4141e524c1ac2138df62c91c6fe70046fd9560ead66c85e92029d36596fabae8aa31c43fee diff --git a/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild b/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild index 32408b53d62f..26d21b063dc2 100644 --- a/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild +++ b/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..9} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~riscv" # tests are broken at the moment RESTRICT="test" diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index 127814ebd2be..435c2cf455e9 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,9 +1,5 @@ -DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191 -DIST ansible-4.1.0.tar.gz 33999079 BLAKE2B b7c512ed01f220dbfdd5c90cd67c88cc3b50dce5a83a783b798afafe88d75d96ae7abd9a512a1d4fc4e1ad0305c72e6d2b4ebe3811addf78faf2d14dab7dd188 SHA512 603a5aa6b63d447efcb6e2f04f40c1bf5d7cc888f344bdc00ca3f9bca92c406554328a0e77cf3d5f2633addc9d6459d7b9d9176d14ecc506c67013fc8180b0c0 DIST ansible-4.3.0.tar.gz 35135987 BLAKE2B 6f4bf55f07275b7264a7fba693816bf925d574d4da3d4d13af9b85c44d4b5adf9e823b9bd936408a0e424273f8f2aa529e960105842444d26eb3f45973109ec5 SHA512 035a236d0762e425c4ce4ffd709386075aee438bb8085a25920543bb2378feb07fb8f0a50ce9fb6b0d1f5dde1f27a408b828c286bfc1173d38da5f8c7b572c3a DIST ansible-4.5.0.tar.gz 35530106 BLAKE2B 3176f374df6b9e7fdb8554187f8132a25b474627d66729c776e5935ee0eb84c296e951a511afec6787bb1cebda8d72670f9305e1904cff221229a459a671ddf7 SHA512 fd8461d22d6d3fd325a12480d78009cf65580c790c56164a50c5d74061034a1f387772f687bc730d23192a9a72221f87e11a44e984d05308311b9d6d2441a976 -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 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548 EBUILD ansible-4.5.0.ebuild 704 BLAKE2B 89f8adde05724b84dd372ca4513a9f90f3a09587ca59e0c305a74d82558057d9250e8bbb6154d85cdb4e5756383f553e937823c34106de8560fed64a9d2ba7cc SHA512 dbe013ad6887395617645669b5395bbf9d8af7e15d8183811d1a2357b689c0dd9328b0984a6e2f3d7b34a4dd628c00be20fb13cfd7a6807c73a2cb2866fca641 MISC metadata.xml 726 BLAKE2B 92c09d65c38a346db34eddf78f75aba7d914df678e37dcd54b1a47cf3d7f043604fad89b435fa08877bb0c7254fb1a99db32bdd298f2b12af6f8089828f1e67e SHA512 40b712fc2055cfc60fdcb33705757509adc97feb893c46dab1e6e7d8b88ab2026b3b0ada66d7504f86b25072a4d3bffee023a5aa0e8b5286bcf58a8cb18c5ac3 diff --git a/app-admin/ansible/ansible-2.10.7.ebuild b/app-admin/ansible/ansible-2.10.7.ebuild deleted file mode 100644 index 1e2357818c8a..000000000000 --- a/app-admin/ansible/ansible-2.10.7.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=bdepend - -inherit distutils-r1 - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://ansible.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ansible/ansible.git" - EGIT_BRANCH="devel" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="test" -RESTRICT="test" - -RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh - <app-admin/ansible-base-2.11 -" -DEPEND=" - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - <app-admin/ansible-base-2.11 - test? ( - ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - dev-vcs/git - )" - -python_compile() { - export ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} - -python_test() { - nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die -} diff --git a/app-admin/ansible/ansible-4.1.0.ebuild b/app-admin/ansible/ansible-4.1.0.ebuild deleted file mode 100644 index e7cb69449a0f..000000000000 --- a/app-admin/ansible/ansible-4.1.0.ebuild +++ /dev/null @@ -1,25 +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 distutils-r1 - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos" -RESTRICT="test" - -RDEPEND=">=app-admin/ansible-base-2.11.1 - <app-admin/ansible-base-2.12" - -python_compile() { - local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index da4d15dfbb03..1d97c56a8a29 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -2,7 +2,9 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c57 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724 +DIST httpd-2.4.49.tar.bz2 7199599 BLAKE2B 78614647335a2351ce3ffb67f79bffd4aa0f42080a46de1f8d8a75c2ccae24998f5d505e60e9d4a710ff763e6a8cb3abee3da34ff6a7f2e18b68029a8abe80b7 SHA512 418e277232cf30a81d02b8554e31aaae6433bbea842bdb81e47a609469395cc4891183fb6ee02bd669edb2392c2007869b19da29f5998b8fd5c7d3142db310dd EBUILD apache-tools-2.4.46-r1.ebuild 2507 BLAKE2B fda19f030d70903240275e0885f52cd200e1d6c7a157da0a061fe77c78afff72fcbf295496f0cc002e3056c22e2519bfe0bc6868f0ddc5805e461ae609613f87 SHA512 603ccb716b54f27c804049ed71eb19c2ecc072115d9a9ee65b5ded7368e60fea4c845eec67e1ee653bad07a24e4a9af1833ce58dbf2dca83b8acdc7b1f54b7e5 EBUILD apache-tools-2.4.47-r1.ebuild 2516 BLAKE2B a6694ce1f0971df73b64bb2a1058b479535ff1e1c364f9ed54b490a0f8ecc16f04ab598e24a0d659901e48d1d67ae3b910c6572d9ac3b223f091f5534a0122dc SHA512 09dcae7c3d6a5929dab3ebdc3730d30f748e52608b176f744ad6016cd81ca7dac25c514350069c20a259cf00a0ccdad0292592e19a38180f38a10c9e84028610 EBUILD apache-tools-2.4.48-r1.ebuild 2516 BLAKE2B 9ba9c90064db3b642870ffe5d0d7815932f2513a889c216584fbf2d43bdc8add8ac27cb69761fc54af6f863de290a2b2d208a7a0b3ae30a088dfce04b165d95c SHA512 70eacf18eb5179b219a371350a4b4605c9290dca59c6c95c107d7bc62de6e6165068539641f1d01601ef77220cccddd9b64a1658e1147b03de278f4517e4c93f +EBUILD apache-tools-2.4.49.ebuild 2523 BLAKE2B 8cb6d2f971ba89bdadd0686e98585b455d8616e10b96aff10b6567596715c3113ed8477a7164dfa7b65cf87cbcdd62c6dad98ca0911c2bc0c3be933ed256a16d SHA512 ce18dab8f8c003778c68329376ef317b544107b052fe86265972eea6a336cb059e395231d27e360241eca0df84e5e44d11cfe2b2f5e5f80500455eacb918e652 MISC metadata.xml 469 BLAKE2B d94d7a27ad1d65eb651c92ff82f5e8f4181737a65ad8dae29843693c4fd639d15b82e419f39ff12273c964b2cd4cbb6eb9850ef358e02b6ebe6a25a2fe2f5877 SHA512 409c831b4c337d40b71fd41a48c5aa9ad4e922baa86d931e3aa2bd556c2312154022fa5297daa03084da08d7f9739e37be87446f25c784c30b3df992b0165189 diff --git a/app-admin/apache-tools/apache-tools-2.4.49.ebuild b/app-admin/apache-tools/apache-tools-2.4.49.ebuild new file mode 100644 index 000000000000..36aa23dc38c7 --- /dev/null +++ b/app-admin/apache-tools/apache-tools-2.4.49.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" +HOMEPAGE="https://httpd.apache.org/" +SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" +IUSE="ssl" +RESTRICT="test" + +RDEPEND=">=dev-libs/apr-1.5.0:1= + dev-libs/apr-util:1= + dev-libs/expat + dev-libs/libpcre + virtual/libcrypt:= + kernel_linux? ( sys-apps/util-linux ) + ssl? ( dev-libs/openssl:0= )" +DEPEND="${RDEPEND} + sys-devel/libtool" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/httpd-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446 +) + +src_prepare() { + default + + # This package really should upgrade to using pcre's .pc file. + cat <<-\EOF >"${T}"/pcre-config + #!/bin/bash + flags=() + for flag; do + if [[ ${flag} == "--version" ]]; then + flags+=( --modversion ) + else + flags+=( "${flag}" ) + fi + done + exec ${PKG_CONFIG} libpcre "${flags[@]}" + EOF + chmod a+x "${T}"/pcre-config || die +} + +src_configure() { + # Brain dead check. + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" + + tc-export PKG_CONFIG + + local myeconfargs=( + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules + --sbindir="${EPREFIX}"/usr/sbin + --with-perl="${EPREFIX}"/usr/bin/perl + --with-expat="${EPREFIX}"/usr + --with-z="${EPREFIX}"/usr + --with-apr="${SYSROOT}${EPREFIX}"/usr + --with-apr-util="${SYSROOT}${EPREFIX}"/usr + --with-pcre="${T}"/pcre-config + $(use_enable ssl) + $(usex ssl '--with-ssl="${EPREFIX}"/usr' '') + ) + # econf overwrites the stuff from config.layout. + ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \ + econf "${myeconfargs[@]}" + sed -i \ + -e '/^LTFLAGS/s:--silent::' \ + build/rules.mk build/config_vars.mk || die +} + +src_compile() { + emake -C support +} + +src_install() { + emake -C support DESTDIR="${D}" install + dodoc CHANGES + doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \ + docs/man/{htcacheclean,rotatelogs}.8 + + # Providing compatiblity symlinks for #177697 (which we'll stop to install + # at some point). + pushd "${ED}"/usr/sbin >/dev/null || die + local i + for i in *; do + dosym ${i} /usr/sbin/${i}2 + done + popd >/dev/null || die + + # Provide a symlink for ab-ssl + if use ssl ; then + dosym ab /usr/bin/ab-ssl + dosym ab /usr/bin/ab2-ssl + fi +} diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 16e9d4756fb7..e7eb0c49c390 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -3,8 +3,20 @@ DIST awscli-1.20.28.tar.gz 2058578 BLAKE2B 3f6993a41f46ad9d8d45cebc0d5ea95a954e1 DIST awscli-1.20.40.tar.gz 2071857 BLAKE2B b2511d610c13b4ddf8b1f5c6442f0939072eecf81d97805800bd83b6f481d744ad4344dace6e6553e3d4b7cbf9546f911398311cb04fb698a418579e784539a3 SHA512 aa39a8d67cd8efc63687929f19d5878269ce7f3155a0a64ca2f271251a334f57d2358aa4f0aee76415aee33fe23a1e3b19eb2c6dcfa21e8c0fb7409f5d29a001 DIST awscli-1.20.41.tar.gz 2071927 BLAKE2B 4d7ec9e3c2af3f44cbce9459ef12c8191ae72b3313e266a2ac8f39cd2197129ae66893152c6077326c8315d4098608cb11019ad3cc19fdd057508db4f6c3a0d8 SHA512 6d022575d2bded2245bb17e8605e929a8ff2e91e79f907e21a0eaaf027e2fb657b96573531226cd63a34b0a0523a6747c7c4f9652ee10b09fd8b6d09e9c8fc9c DIST awscli-1.20.42.tar.gz 2072504 BLAKE2B 5f6f38f8c96350b670c15cd6cfdd1556cbbfab95b7bfec5ff3ac9a96b56d733bb112b18f04d5d5ce9674a0ebb3d41e7b7f1ad81881c486f99463ce22270e0574 SHA512 29daa2c526b7605fbd1c588b00906f3cdf159570a543cc9c442e28af9f98725b8a0a8f9d61110e90f56744dea6a6abf92f052b85695f3a84bddabb24eff650f6 +DIST awscli-1.20.43.tar.gz 2073056 BLAKE2B e4d3301022083db4b4dd59ce9d0acc5b2ef2ba2359236bebb11b024dcf681deedbd0df8a7cf143503318dc66a9d69305fefc97dc3407bdb77985fd0854ba7915 SHA512 5fb9a6f18a04640bdee94b80aa5b5893dbcc9316c06f543ec8491fef3db4394d6d1aa2cf35972cec04e6c8c74c9111fab71d007b63c4a3152aad80b099d5c43e +DIST awscli-1.20.44.tar.gz 2073627 BLAKE2B 906e03139bde50724348b445750bcc2b286fe33c0ba8873e0373bfc4f62124a25a400821cd8d3608f3f52fe8a3649218c5c10bebad8a5887b131088aab80220d SHA512 58a7232e1708791cf4d9149aab6afebca50e422a0cdf10215aed9ea1e4f71daeb64253bcc12c4934737fe2f5688dc50e6cf8fde1335c99338804590030b0973c +DIST awscli-1.20.45.tar.gz 2074157 BLAKE2B 4ff9af5217bf241c89de1fb601ff5c41f22072ac122cf5ec3ebed017df2871d064f0d16f26795eec99954d7d67d76db1d93ddab21b7157c56a83fb0880d1287a SHA512 a842d83f33217f9e6298df28ed3cd0ea4a66964239ba25c09c7c7e7749e0f5c405f379a556827960f1c4525d0f7c80dd7aa87c016b92d74a2d6d6636c1c0f486 +DIST awscli-1.20.46.tar.gz 2079078 BLAKE2B c5e4f7c3f068dbcba9e6c8b4b96e3d41e60b0bf58aecfc06fa93cc918d570bdac77f3ccc28819c04f4cc7be25627d505c1180d78cb4ccd9fae4ea4c7b517e3bb SHA512 b0c46fce82497a399725bb4965700a7c9a41be4ca62115da6028ba2b7c7420b72301c4ad46133067d0da42690a8ca5575f54f54977d158090d01995308a2b785 +DIST awscli-1.20.47.tar.gz 2079314 BLAKE2B 2c202ed3e3527a6881c3f9ca73e8639732442948c6cd6a79fc3fe64de38ff56f7e595f0a0e4badeade81624f8a0323f435b63199a138ce90acb0a1785a326dcf SHA512 ad7be0753549c6f82f6f9a8631cbb8c56526ef17eb0152298bb78365735d4454ec4efb44a6858d01f31cff2ae54ad6a11e0afff3277dde2b70415d58bfb81c86 +DIST awscli-1.20.48.tar.gz 2079233 BLAKE2B 9871d66b2acfb83572e200c8c6951f8ccab0c26ee4296c5e64329be6757727be7f33cc8c5788852191425c528524ab8a5917331b933fc16efc3e41a5f24e8500 SHA512 1ba5d2da32fbb7fe9bed552b06e793ccb97f40c9391f2c08f0799ec49efef832c855347168a8d42fc6757cb88ef68fa15ae4cc50fce60024ebb0e341abcf0b37 EBUILD awscli-1.20.28.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f EBUILD awscli-1.20.40.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c EBUILD awscli-1.20.41.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c EBUILD awscli-1.20.42.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c +EBUILD awscli-1.20.43.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c +EBUILD awscli-1.20.44.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c +EBUILD awscli-1.20.45.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c +EBUILD awscli-1.20.46.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1 +EBUILD awscli-1.20.47.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1 +EBUILD awscli-1.20.48.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1 MISC metadata.xml 447 BLAKE2B a149ec992aad58d4e48ff13549d5126e6203321a087676519d20208719e076394b7cf6a699e98fc2012ea627ff267311630ed5a0adc8ba01ff469c2746a60d12 SHA512 91d8fe7cf0ddee1fe098931369f2a13835bce06efd8f66de96ebb21f6f42e0194c1bd35d340a21a36b240a1e37ea58286e11b68308937439d0c18edaf6dad348 diff --git a/app-admin/awscli/awscli-1.20.43.ebuild b/app-admin/awscli/awscli-1.20.43.ebuild new file mode 100644 index 000000000000..ff429f8d3a3e --- /dev/null +++ b/app-admin/awscli/awscli-1.20.43.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.44.ebuild b/app-admin/awscli/awscli-1.20.44.ebuild new file mode 100644 index 000000000000..ff429f8d3a3e --- /dev/null +++ b/app-admin/awscli/awscli-1.20.44.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.45.ebuild b/app-admin/awscli/awscli-1.20.45.ebuild new file mode 100644 index 000000000000..ff429f8d3a3e --- /dev/null +++ b/app-admin/awscli/awscli-1.20.45.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.46.ebuild b/app-admin/awscli/awscli-1.20.46.ebuild new file mode 100644 index 000000000000..95a3e5aaa0df --- /dev/null +++ b/app-admin/awscli/awscli-1.20.46.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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}] +" + +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.47.ebuild b/app-admin/awscli/awscli-1.20.47.ebuild new file mode 100644 index 000000000000..95a3e5aaa0df --- /dev/null +++ b/app-admin/awscli/awscli-1.20.47.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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}] +" + +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.48.ebuild b/app-admin/awscli/awscli-1.20.48.ebuild new file mode 100644 index 000000000000..95a3e5aaa0df --- /dev/null +++ b/app-admin/awscli/awscli-1.20.48.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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}] +" + +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/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest index 13502d8f48ff..421f487a9388 100644 --- a/app-admin/bitwarden-desktop-bin/Manifest +++ b/app-admin/bitwarden-desktop-bin/Manifest @@ -1,5 +1,5 @@ -DIST Bitwarden-1.26.5-amd64.deb 58215042 BLAKE2B 216e5042e925bc12a9feb1c038cacddc05b6c4aad8b76413ec50771cbfdab399c64e8388277d571708094e6b14b7d89b3c20ffd3d23d4010340b9d94068560cc SHA512 c2506a9f64d47138e6ce53bb7211e2562f9bb9847f4b48b059dd504eec312f6852571aaa550830f54488c0d67d02c0eb67bcac049a688098d1b8a55492b008f7 DIST Bitwarden-1.27.1-amd64.deb 58099834 BLAKE2B 285d737cd38c60966778657537efa1d5e53edd46fbf25721631d6d8b50b097093ee5ba41a475c3c9aec6ddbffae48cadb0d8a994c9f6ec88cf005af1bf5c1cdc SHA512 92a6a5d3d64a17ddf2b742d9328adf27566da466c9c4d22fff910eb9dabeda77f65fad07424e6abc8c4cace04c365ada84588d05270a5cf615eda36a5741e81c -EBUILD bitwarden-desktop-bin-1.26.5.ebuild 1542 BLAKE2B 11501d3da996b5cc3654875d7b63e4923d4c35e5a068ab06d90a3274a757d2a6a7fe9f450f2e15fe9d4f56aa2cda8b4eaa37071743ec7e05e4040e690d447a26 SHA512 c136b33d192e8cf381c9e52f6244fd8673f0ea9fb2040c1147b478baa548fb6fd92fd2203c40a9b987407c3fe9730b0e0a5b04737d2d1597a989bcec8c3cde50 +DIST Bitwarden-1.28.2-amd64.deb 58190436 BLAKE2B e95575fa944b8f71559d2cd058deb35ce5648ca76a36169faaed05812057e6a5be086c1a583d256e915d81494faf098a61a66fd93e8fd30c53a3eb9372add813 SHA512 7538565c55638d7d416a3a03f4f579b5cc5cc23d11b8f1b637616c3860415f81066e2e344752c5cbe445ffe0523854cff3a06b589b03185f0b58872a81f7073b EBUILD bitwarden-desktop-bin-1.27.1.ebuild 1542 BLAKE2B 11501d3da996b5cc3654875d7b63e4923d4c35e5a068ab06d90a3274a757d2a6a7fe9f450f2e15fe9d4f56aa2cda8b4eaa37071743ec7e05e4040e690d447a26 SHA512 c136b33d192e8cf381c9e52f6244fd8673f0ea9fb2040c1147b478baa548fb6fd92fd2203c40a9b987407c3fe9730b0e0a5b04737d2d1597a989bcec8c3cde50 +EBUILD bitwarden-desktop-bin-1.28.2.ebuild 1542 BLAKE2B 324483af52fcb98c827708310ed05bfd5f47b3576367bb54b78f8a292206299bb8515c32c050c2dd5ff65cd4ea00e222abb5cad92f7d0bddcf4719e9c53dcb4f SHA512 89cdb08e3f11101f0c84631cbe984ce5bca3e8e13f07c9f1155f2d9535136263af1dd7a63e843eae8190e1083068f7f96dc60c935fafd875534660b73fbc620f MISC metadata.xml 304 BLAKE2B 3b097bba82eaaf8865a9a7108be55d121cf2cb215a0129b3633dc25a68684a909015027769fa3ea174267c2a180e60e30fb4cae54355e01fd4c49e9c0c9fb78f SHA512 73e09224d5f17b1772cf75edc53f43c6207c25fae2bd528e1124dc4dbaab842fddc9ff76f02722b5bd628cc57850ab9970e8911149beaaa434c4f52d200ed39e diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.26.5.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.28.2.ebuild index 1adffd714ed2..c25ff6563c3f 100644 --- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.26.5.ebuild +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.28.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit unpacker xdg-utils diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest index d0cd8b6ad87a..218350ed06ab 100644 --- a/app-admin/checksec/Manifest +++ b/app-admin/checksec/Manifest @@ -2,5 +2,5 @@ AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1 DIST checksec-2.2.3.tar.gz 2241535 BLAKE2B 850977dc14d1b57dc947f81af904aca71a7d664bf695619de2b6f7a1014a95176813c4fcd8c39a6c89b028291fa1a08a2beaf6f4dce27f53624202bb0e72ed2c SHA512 d1516dc4321f30a57f88d3279fa228b4dbb0f16345c3c7e9d89575ddc3ed9dffae42f392e76321a5a9aba876717aae959365fc829f0abb58c1c21f34dbbf59b7 DIST checksec-2.4.0.tar.gz 2242079 BLAKE2B c1878c1312d13591147f0efd1a2d535ae8e75292dbc53e7ba0802c8d165b18b4bc0b22a5cc3a9159ddcf05a1518d58c18cb54700ea5a52ff29d261068194b96a SHA512 1a02dfac48b5979cb5c2eb7b8f1fe290d3ac090726d1b95a14864bfc4bc3d32eefc10e2cc227c9dc01809c78fe003d1faea9b720d5cb5fbc16599fc0e2512947 EBUILD checksec-2.2.3.ebuild 757 BLAKE2B f0752c0d0636142ecadf0abd561bebe82ee923570ef55374cfe567776d22785ad99e1ccd1cd5660723a24c0a2a9a9d428f43f3622e5bb472a4347514d8bf7692 SHA512 aa6e146d7ce82d49ada59ffb4f2f327c99608b5b2c164af317d4c0a627f28f10a8760f4b958678f1726fcaa496f87689165185f8a6e9bd2cb0c1cbb297fb7f91 -EBUILD checksec-2.4.0.ebuild 774 BLAKE2B 97747f2d65082b19f1186e0dc9a6d8e52d41f42dd14ab1fb1dfd83b28f57f6f013935c8579982864d067b390cb47e80d703a04795a17d5e7c051d77a2886db36 SHA512 21693c6e0460bb595f84a0b1e1a27a5e22bade3a0e4854ea8c493c214b110a9e2adf8f45fa4bb7d61e38d3e0400130d132fc6a7b6ec2ba346d312c71385e4394 +EBUILD checksec-2.4.0.ebuild 781 BLAKE2B 00490a46040ca8941022cf242fd98033e1dea0b923085c39c4d294aa632de3822eb32ce055c5f67fb65668beaba54c5b53d0de6b6b938ea35f937d5420c95685 SHA512 afcd0a3a9aa2690a9ef0881045e58907d1ddb42930a8f2e199ad4f71ddb074952c20c800fe0d5c803d44f401e144312898fbb0ef85a53800908c79bc1a0c867b MISC metadata.xml 335 BLAKE2B 99e07579c1f644b8fa7d4b52de2110716ff7aef864466b323567f923623b41b6b1eccdfab55a0acb64ab0d8400497aa0b48bbb2095b2e115ecffb693a3ae40fe SHA512 c48521c1ce01a289d48974025a9aa8e6d8e00437bb89e1f35f862764872f73a988e17e53a903cf2c4ccfbebbaaa1cf57e548fc1741fabb0f958e991b4e0a02e5 diff --git a/app-admin/checksec/checksec-2.4.0.ebuild b/app-admin/checksec/checksec-2.4.0.ebuild index 353e4abb9e29..d0139d89d00f 100644 --- a/app-admin/checksec/checksec-2.4.0.ebuild +++ b/app-admin/checksec/checksec-2.4.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="" S="${WORKDIR}"/${MY_PN}-${PV} diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest index 5f2b8bba2e46..a3a3e08f126a 100644 --- a/app-admin/entr/Manifest +++ b/app-admin/entr/Manifest @@ -1,5 +1,3 @@ -DIST entr-4.9.tar.gz 25501 BLAKE2B 2d4690636585ee64c7273402c2a87516614d8b08547606198947677a26c8966b3f8784da880e1fc4608df7170801e4f21a33717d13c3bf7ad169f909e41d867b SHA512 b05595be5ae1c6fbd39ea886331b9b77563460d03eae8889c7ad0cc156a44c6f50477dc3448eefe715e124a79ab08b9baf7c53a9059dcf137e5782bf7b499751 DIST entr-5.0.tar.gz 25480 BLAKE2B 5de00d6b1042667e209b2c33d7d019bad4833a0711a18d47eddb129ef60f5518c42fc2af3169510f57eb39f861d416ab67d7cd83e4a631cfcaa4cc7ac266f82d SHA512 f485efb7d05f1d099c85d8af2f313e3ed2f36720483afc3004479b5b8754c60c52a108b827efd017c674f01d6ced2878a317addef3960c8cdf9e6b142f2ad5fd -EBUILD entr-4.9.ebuild 564 BLAKE2B 97ef65f24c107b5e7391e56280e2cdace0a58d6ec49566120b5e24400be4e97bd8ad4eccad8ece912badf473482e205fbdf26b60a3ffe6e2c316b21da966cb16 SHA512 dda08109bb7c71ad5f876ff0c97847f4fe8b20bdca78d84a371a4c327182f6d980a72a79fefa73f796874273b1fc54bacb644dcd97862f0e34d5bc63e1cce00e EBUILD entr-5.0.ebuild 564 BLAKE2B 97ef65f24c107b5e7391e56280e2cdace0a58d6ec49566120b5e24400be4e97bd8ad4eccad8ece912badf473482e205fbdf26b60a3ffe6e2c316b21da966cb16 SHA512 dda08109bb7c71ad5f876ff0c97847f4fe8b20bdca78d84a371a4c327182f6d980a72a79fefa73f796874273b1fc54bacb644dcd97862f0e34d5bc63e1cce00e MISC metadata.xml 378 BLAKE2B 7dfd6f3df156040cf1c245d5a8376d42fab7dd63d38eeaf173c61ad5174cdac63f80e96de17777b6214dc2c7e39a201e0370cc8caf7ceb2cf55f41077c415e99 SHA512 bacc3fb8f1db6ddeb1678314b2d184234e856ad0ad29df11b9d3a0885675b3b3e690a15b964a9d2522bdcf5ebf4c5288498c291d40328272c88806c29580337b diff --git a/app-admin/entr/entr-4.9.ebuild b/app-admin/entr/entr-4.9.ebuild deleted file mode 100644 index 88a8eb810fa6..000000000000 --- a/app-admin/entr/entr-4.9.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Run arbitrary commands when files change" -HOMEPAGE="https://eradman.com/entrproject/" -SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 x86" - -src_configure() { - sh configure || die - sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die -} - -src_compile() { - export CC=$(tc-getCC) - default -} - -src_test() { - export CC=$(tc-getCC) - default -} diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest index 2ef19385c74d..a1bcf34f310d 100644 --- a/app-admin/exo/Manifest +++ b/app-admin/exo/Manifest @@ -1,3 +1,3 @@ -DIST exo-1.40.5.tar.gz 5488454 BLAKE2B d6312b5d843ba0989899133af651b7fa1cbf04cd6b9bd68ecdbeab5ca59e2322bebcba45fdb82aa10097c3c5d7619371869c8502490bb46cd7612d8099ba75cf SHA512 a2f7b95b6687754295dcd2f05f25cbadb91e43b2f71543f39e9b9c1f60d7326b240e8ab9baff1dadac4b3dc293df2f57fbffe985d1ea456a8fe8365e21f7d99d -EBUILD exo-1.40.5.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f +DIST exo-1.44.0.tar.gz 5507722 BLAKE2B b42424a1327f0cb28b78f721f465b156eed6a223937e7d08f0f16a3829b497dd1c6a9d450d6d4d4cbf1db033729d91fa1566fa9c7871a07f32556cd2a153bfcd SHA512 8baaea5c727cdcf1b8b4272820d6f2b2740320e688c16b5efc7c9e51ce38c7951fd8252bf41d736ca0c3f7da605d751f56b79544af75f8d0ef0f671e867b6d59 +EBUILD exo-1.44.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f MISC metadata.xml 334 BLAKE2B 230d1a47a3e39f796c16a9e9a622fbc27560c951da0c49adf7aca135970c0c944f42da7eb624c7193d44830c72cf95da9d69d977562853de6a00fd8fb6408977 SHA512 cd1366d99abc260c6f2899000e2a517be9a4c43e921078764fdc996871df34c1827e512087c3eb6f95bf3b685c2f34cbc1f1462eaa303a948640a362b4501b01 diff --git a/app-admin/exo/exo-1.40.5.ebuild b/app-admin/exo/exo-1.44.0.ebuild index 49b1772f318b..49b1772f318b 100644 --- a/app-admin/exo/exo-1.40.5.ebuild +++ b/app-admin/exo/exo-1.44.0.ebuild diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest index 4eb311dbea52..c01dd4c4541e 100644 --- a/app-admin/hddtemp/Manifest +++ b/app-admin/hddtemp/Manifest @@ -10,5 +10,5 @@ AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511 -EBUILD hddtemp-0.3_beta15-r29.ebuild 2714 BLAKE2B 81070724086181329790f2438be03a576ea308f2a88df6b63631f51ee24e7874cee8d463f5fe29e2faf5f7496a2b75b6ee42fa2c137aa3b46bf572a0b6a90a01 SHA512 7b368d0895c8903c053c657727a5fede22208e3575cc085dbb7800c99bb21fa03266f1157792e516345aadcdc07b22b5fd0d07809a0f372922f8c6a13dbdc438 +EBUILD hddtemp-0.3_beta15-r29.ebuild 2713 BLAKE2B 0af8b05d6632ccc238ef7c2957e91381a72a80465788e62b0d68f00c4df96f03f07eeb0e98b2ee7055c477adf0392f4ead240bfaa511ec4bf4db59850a18bd66 SHA512 1ead521f54599f840a460db2dce8ab2ca544aa183de1e99c7a44b996f1c3fc99869192893be3fc49b4bd5f6ccf18d4b14e4a39849d60fb3dc3d5a53ef000600c MISC metadata.xml 261 BLAKE2B ad85ce24f1ddb319b32b2092fc7367c4c8874d9ad594b35b26b6d389d8c713454c11763b592cdd75fa9c3b5aae1faf1a08ddbce48b27b414e52d9cf85fa8efcd SHA512 e5a808d82e549cc05a1fc6dfa295f39c3ac2a983c5ebeb7093dfb63c7478181f93cb3cc434b2447e600c593da4d14e246d1f9633d6e94a211bd662ec76f75c39 diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild index b2b589ab5190..2a2fa7f83702 100644 --- a/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild +++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86" IUSE="network-cron nls selinux" DEPEND="" diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest index ee944b257a89..8aed42c953c5 100644 --- a/app-admin/keepass/Manifest +++ b/app-admin/keepass/Manifest @@ -1,9 +1,9 @@ AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb DIST KeePass-2.46-Source.zip 5054069 BLAKE2B 81567ab4589e53ae5cc1b75fa42cc61d9d0f390edfa8f8d860dd118a95185a8d2ca417b30b29e2b544b1d4eeeb0069fab2f0be7900fd4d7fb87d41c417b99876 SHA512 ca045cb7363092f948d72243991fe398836b13183cc2685477d7ce5dd629213b5803b4216134c7ba6451726b79ca43d1e93a1934c9cbff46293fa916b9348219 -DIST KeePass-2.47-Source.zip 5100005 BLAKE2B 9a71706efbb734244a0de6e1ba705ebaeb550368a77b1e74eaae47ec5a9c7dd12139740d7502dd5ad40e6b90e179f037ca5eae1650c2659a0a64260a93cd595f SHA512 df0f4dc9702198b4d31e78ac4fa1e85746dc7618529ab5ceaae1f6e1cc68a9a574f7892caff99e767f583fe102d87f0bfaf579f375eb227bf6f28fce6253a8f1 DIST KeePass-2.48.1-Source.zip 5123663 BLAKE2B 919a109d114a8bc404a02f063a81013581f64e4e97fe0f024e3e0ca7a3da773a6a4af20447ab3641c3a9e82c861b8b7095793f917f0bbd69d8b443d2ce022a9f SHA512 1faa9f770fc7030f884a661d95f9d2d6d50627153fdf56331b7ad2cbaa4648e263697c999ca15e62a9946e0c6d4df45cf004ae21b715d99949967e25f4728d18 +DIST KeePass-2.49-Source.zip 5135190 BLAKE2B bf5a9aab0065a97545bd1b81a74b5ab113e4c4802873445719ce2a571745b04c69ab5d8be9a67dc59a713947f0955cbcccc782b6628f722a0d564283b943eee6 SHA512 7a25de6acb2637bd8820fb70866ab4ced4ece4b3e64172f616c2fb59d2a4e7a2f340435db10731ed3d7e66db7761487925cf1c7941b0bac12e72c5fcd9e8b7d3 EBUILD keepass-2.46.ebuild 3134 BLAKE2B e98f684a58e0ab1b9f663ab0dc2805514898f012d4fe7fb0a35e107cbbcd2e065beddcc673ad07f54da8628a08bde9de2b9e56e642ccd747d46318c752ce768c SHA512 cc24dcee297f3732ea2ac9dfd815f5770b4d2f750c7c6b03dbf76086c470e17e01968620183ca98b28fe77e2a9b22617b2611c9340eaae449b8f0749ae401451 -EBUILD keepass-2.47.ebuild 3175 BLAKE2B 878525ed7dde9c0125aa301568436e1825902d6d95091ad89a701db68e769d5f7736f0d98bde52e31beb389b9b1f4e9752931fc24e96afedc041c94115cfebed SHA512 1cbd71474e625077503bcc40ad3492de050be0a64022a39ca61db2e4119aebc5d66002fd618508ec414ae84f5ae620196435b34e34dc27a0557aa661818fa6d8 EBUILD keepass-2.48.1.ebuild 3175 BLAKE2B 878525ed7dde9c0125aa301568436e1825902d6d95091ad89a701db68e769d5f7736f0d98bde52e31beb389b9b1f4e9752931fc24e96afedc041c94115cfebed SHA512 1cbd71474e625077503bcc40ad3492de050be0a64022a39ca61db2e4119aebc5d66002fd618508ec414ae84f5ae620196435b34e34dc27a0557aa661818fa6d8 +EBUILD keepass-2.49.ebuild 3175 BLAKE2B b2a8196b616faba52d80d2a393360cd7701d4f35089d824e5e696bec370253df29c5ddf2dd6709b914c9ec50d6730f7ac1eab27f2996f1ef3b1df2b98b690874 SHA512 cc536ea3c4b6b7a5d081cd8e2d2742e9434b26c2cd10fabe40cdc4540a3ba8ee7990fb0c4af7b1ba35ae938bd92852cd3ca72bb02a61c2c4a574de9ab9f6b4ad MISC metadata.xml 682 BLAKE2B 5499e44d9e2d6740c1cf229d9ab1b7cea2f71fb81dc569b3c9ff5c246ea41e273eba955e4a6863d48df364328e92567d027d9eb569b460138b967a70e225b56f SHA512 4c3f93962d1773c61ea8648ef658ff590ba4eaa7259803a17c54a33c7065b6ea0fe724da69e601df725cd5d6a7d4d2dd03c184c975f27d86c670427cc03b9d35 diff --git a/app-admin/keepass/keepass-2.47.ebuild b/app-admin/keepass/keepass-2.49.ebuild index afa3624b3df1..f603d70fa8c1 100644 --- a/app-admin/keepass/keepass-2.47.ebuild +++ b/app-admin/keepass/keepass-2.49.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop optfeature wrapper xdg-utils diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest index bae1a945ab06..ad6e446a178a 100644 --- a/app-admin/lnav/Manifest +++ b/app-admin/lnav/Manifest @@ -1,12 +1,13 @@ +AUX lnav-0.10.0-disable-remote-tests.patch 3986 BLAKE2B 62dcbb23d92a86caefdbd718d76a9c624d5d71249c60bb104dc0ce9db00c521fd99868e0ad7924d18a7895f437455a8af2ae36316d7d3271c08419b3b89012d3 SHA512 b956427959500ea80ca647c85530cd7a5c2db8368d5ed387e4c7153ba536d5840db0e627c17c911d51ce511f7db07377f51b868ae011cce2db55b0e1a4c99b98 +AUX lnav-0.10.0-disable-tests.patch 915 BLAKE2B 5a96465a1870d670af76c28b46c31ce725e82d98da89ed3912d08c3051161dbd2d384234b3567fd605959d9a3fbd6960275b17474a1db5dfa0de1673dc53a273 SHA512 30d0a832ebe38db0c904d2032523ea904f4ea4636dace68c2a1e5d33029c14b97fe54cf3278d6db88fb89c61a49e3606eef96966b846c1a118e482495e8a5970 AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489 AUX lnav-0.9.0-bug639332-tinfow.patch 579 BLAKE2B 17707472f4fa764e27d98a1ae426f65a1ad45dacdc34e4c19b608298b7bbc094ddf3c49ded6987ac2c2f145dc58ff9f520a49c44551b277182b76ef13b2fc2fb SHA512 b69da2eac944affd7c70bdf9bcc2be333d5d67d1415e05ebbfd87bff85369ffbe61399b05440637941bdfa4d220ae1ba100342a9e028ee789f3c9f0f1e2dec2c -AUX lnav-0.9.0-bug713600_0.patch 1077 BLAKE2B e4f2978bac67ec15e6c0320d2136a1edf020941d26bc1b7a63ba23a0139b8a00731c9a8e4e3d5667d9179d05b46e795f99dada4eeafca0b97f24d805ba754e25 SHA512 a90ec77439c9ab74d7b5742542fb2904f154219f63c27ab4e91656f674387bad0cc316c02a60cad72623952e2260b7f4c42dba2f4bdb96c549e2122942ebb039 -AUX lnav-0.9.0-bug713600_1.patch 1090 BLAKE2B 2bf0a77205fa38fd5bd5ca28c65f2b67562b3cbcffd740ee82f1d59e017b1fce9a8ce3a70282d642ce34667a69de2c3a20b20f0fdf9640dc6f9cdb644c923e91 SHA512 821e9f49cd990edff0061f694666a6c9875b023bda2218cd598ef2e2a5d6ae5b6c405249834259035d7d2ee6a91de72f915977ef0bc9ba1bb4936ece72597c95 -AUX lnav-0.9.0-bug786456.patch 12401 BLAKE2B 698644b7b573dd15e3c91125ad80f6794be037f1ccbd8e9505166a0a13968222515672ca502dfc85acffd2d3e594ba8d3802f5561825f7c2a25943970f565f0e SHA512 8c2f6da60355aa9b0b90e9cdbe00b389e5b473bbf2b7705635b1167ab22c2add8c6fd3ec4e8903f6e457c6b1c5e60536b393357b4e5b3403a124f83413d4de33 -AUX lnav-0.9.0-bug792582.patch 3615 BLAKE2B 3e1c71ea871aa909067f3d6a1fa75dc314e4000dc4c8875fa806fcd92bdfd74c2fff4f248742691aa0c1797b7343700f9ab03450ec4504f993750b6e2f020a8f SHA512 2704893f2ae634cf4f15d61a40b3276fc27d40b08373d928b05123e16bc364f0f874dd09c34eeb493604e5f92676d69a7e552c3f9f7362c27998214060bc79ee -DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe +AUX lnav-0.9.0-bug713600_0.patch 896 BLAKE2B 2fbd1d499a615051438bbeaf1a57ee6120f42bc8b99d4fe368f929a19bfcb6e745fe2a6942fe28d4085a9c939110865ec71dd62d52be50b9e1be5105d1f38b95 SHA512 433b60e379c582b25db5a321b91cbf332deb84430149b0a3d31e0cb8ce2c5cce0c6b01b35660e82550259768dcd42eb4758d21d5064739b8f4831029c77692b4 +AUX lnav-0.9.0-bug713600_1.patch 914 BLAKE2B 407c737471d4cda95c12aff862dbd3a1709c103c9c3c764aa26f7622f61590331e98ca72a29b18c92a72d6ff07c4e2292aa25f817575c6f3a41508beab10e927 SHA512 eb5fa19c29e496a2e3cedca5f7df9e8f5bd306959116257fa029f32d26a9316cd1879be22c071ace082d34ef9228fc685f0a8c1d5aaa541a45788eb79e870d5e +AUX lnav-0.9.0-bug786456.patch 12017 BLAKE2B 0200e3b741e9b5d62cdeabf83c96d94be091f4895db492990404dfc0f41d8017aafe1afb8492688061c497e98bb0ea62bd96ed8c36f365782868ffed04904281 SHA512 94ae1e0590dab749923ca51bb407efc37db555c891df402f07143901077e8907b6bf90c1a6a7ec2d8365555d22e38d772ad39d7d4db86f0e76fbf98f5c10cffc +AUX lnav-0.9.0-bug792582.patch 3148 BLAKE2B 8392a375e0d47996a9e2afd6d34a5c0b38efd5ad187e83ecfad9d4badec3565cff549dbe5ad64ae7417e1c2bedeb4f5461dcf96f54e6301b3ac0496a1ae7326e SHA512 4bf60c52f8678189f6e61415d5ca1859122f67603ccbfddd991ad4f825fcda4c01ae4992f2696e93c726f19d83488231da83b02c8d20bf6ee3f7def022e73547 +DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151 -EBUILD lnav-0.8.5-r1.ebuild 771 BLAKE2B 609d5809483dfc348a4979ed7760e804bf3b12f7391c4ef54e3df7062a33deccbaa538f72d1ba743cff7d1ffa7c582b5415bd6b7d0e4829348ef959a44f7d19b SHA512 9e17a7aa378d23baeb26c55c74e947b868f60fbcbacda28795add54ed6f83d5f6e12f5562b5bb01e45e9be62d82e7071d6d8f944296c863ae90de893404e2ef4 -EBUILD lnav-0.9.0-r2.ebuild 946 BLAKE2B 2588e27c8d698fc0f225327433a9a740d46f5137399586bf66466d99ec3d710e04b57c46e6da12fb1478ca962633456cdf5d46d3b8452190dd8e7580dd652e48 SHA512 b38de5ff9bf039a45ef8ab9e2444a9395650b99a684b8c80cce8eea58f5686fae55d19bca9c595541d0801c7706d0a8028bbdbeae075ffed5c2288d2096347eb +EBUILD lnav-0.10.0-r1.ebuild 868 BLAKE2B 21f7e1abdb467c1dcbeae316d3d8f96fe844ad9ff9dd13ae2208ef4e81688664e71918217ca0010c88082a536807dfe7dfa540ada306cb46f6a6e9c134ea49bf SHA512 b01777e82754e0300582edd9037ccd1c478b97ccf51f1fa51756bb305d0cad62a0b29fc0a3df5d001eb13c6a86738413677a6ef23df794997be6ec0aaedbb29d EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b MISC metadata.xml 781 BLAKE2B 6c7ff3da9a9dc1a5369ca51771ac4f11185426296f806e674a67a95a341ee5b466261387913ccc96e1d9c1b10c3719ae52f529f24004f5a464cb3f6d884e9fdd SHA512 b928e1a51306e3e48dfb27a50b240f2d855380988b6bbd4650cc04583b73385cf052f947cbd7ed089efa4e1131d23503f4c3fe539c20c724dd29c6e43195a48f diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch new file mode 100644 index 000000000000..5e8c80fb90a5 --- /dev/null +++ b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch @@ -0,0 +1,75 @@ +--- a/test/test_remote.sh ++++ b/test/test_remote.sh +@@ -76,38 +76,38 @@ + error: unable to open file: nonexistent-host: -- failed to ssh to host: ... + EOF + +-run_test ${lnav_test} -d /tmp/lnav.err -n \ +- localhost:nonexistent-file ++# run_test ${lnav_test} -d /tmp/lnav.err -n \ ++# localhost:nonexistent-file + +-check_error_output "no error for nonexistent-file?" <<EOF +-error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2] +-EOF +- +-run_test ${lnav_test} -d /tmp/lnav.err -n \ +- localhost:${test_dir}/logfile_access_log.0 +- +-check_output "could not download remote file?" <<EOF +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" +-EOF +- +-run_test ${lnav_test} -d /tmp/lnav.err -n \ +- "localhost:${test_dir}/logfile_access_log.*" +- +-check_output "could not download remote file?" <<EOF +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" +-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-" +-EOF +- +-run_test ${lnav_test} -d /tmp/lnav.err -n \ +- "localhost:${test_dir}/remote-log-dir" +- +-check_output "could not download remote file?" <<EOF +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" +-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-" +-EOF ++# check_error_output "no error for nonexistent-file?" <<EOF ++# error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2] ++# EOF ++ ++# run_test ${lnav_test} -d /tmp/lnav.err -n \ ++# localhost:${test_dir}/logfile_access_log.0 ++ ++# check_output "could not download remote file?" <<EOF ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" ++# EOF ++ ++# run_test ${lnav_test} -d /tmp/lnav.err -n \ ++# "localhost:${test_dir}/logfile_access_log.*" ++ ++# check_output "could not download remote file?" <<EOF ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" ++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-" ++# EOF ++ ++# run_test ${lnav_test} -d /tmp/lnav.err -n \ ++# "localhost:${test_dir}/remote-log-dir" ++ ++# check_output "could not download remote file?" <<EOF ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" ++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-" ++# EOF diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch new file mode 100644 index 000000000000..c7a49d45f1d7 --- /dev/null +++ b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch @@ -0,0 +1,34 @@ +# Certain tests commented out for stability reasons: +# listview: Fails when building inside sandbox +# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911 +# logfile: Flaky. Fails some times and not others. i.e. Race condition +# tui: Can hang the build +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -355,14 +355,14 @@ + test_cli.sh \ + test_cmds.sh \ + test_config.sh \ +- test_listview.sh \ ++ #test_listview.sh \ + test_meta.sh \ +- test_mvwattrline.sh \ ++ #test_mvwattrline.sh \ + test_grep_proc.sh \ + test_grep_proc2 \ + test_json_format.sh \ + test_log_accel \ +- test_logfile.sh \ ++ #test_logfile.sh \ + test_reltime \ + test_remote.sh \ + test_scripts.sh \ +@@ -376,7 +376,7 @@ + test_sql_str_func.sh \ + test_sql_time_func.sh \ + test_sql_xml_func.sh \ +- test_tui.sh \ ++ #test_tui.sh \ + test_data_parser.sh \ + test_pretty_print.sh \ + test_view_colors.sh \ diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch index 47aef6d593da..d2f26a436ff8 100644 --- a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch +++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch @@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:23:56 -0800 Subject: [PATCH] [tests] fix test to make it insensitive to the current date Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - test/test_sql.sh | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/test/test_sql.sh b/test/test_sql.sh -index c7480ecc..bbb98dce 100644 --- a/test/test_sql.sh +++ b/test/test_sql.sh @@ -1012,13 +1012,13 @@ EOF @@ -31,6 +25,3 @@ index c7480ecc..bbb98dce 100644 EOF --- -2.31.1 - diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch index 58aa7264a0de..83380fae4d8c 100644 --- a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch +++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch @@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:26:57 -0800 Subject: [PATCH] [tests] update another date-sensitive test Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - test/test_sql.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/test/test_sql.sh b/test/test_sql.sh -index bbb98dce..22941c2a 100644 --- a/test/test_sql.sh +++ b/test/test_sql.sh @@ -1023,11 +1023,11 @@ EOF @@ -27,6 +21,3 @@ index bbb98dce..22941c2a 100644 EOF # Create a dummy database for the next couple of tests to consume. --- -2.31.1 - diff --git a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch index e77dd17854e5..0d3ab64282c3 100644 --- a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch +++ b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch @@ -7,16 +7,6 @@ Subject: [PATCH] [logfile] add notes for automatic decisions and fix compile Fixes #864 Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - m4/ax_cxx_compile_stdcxx.m4 | 462 +++++++++++++++++++++++++++++++++--- - src/base/result.h | 1 + - src/logfile.hh | 13 + - src/optional.hpp | 45 +++- - src/pcrepp/pcrepp.hh | 1 + - 5 files changed, 482 insertions(+), 40 deletions(-) - -diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 -index 2c18e49c..9413da62 100644 --- a/m4/ax_cxx_compile_stdcxx.m4 +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -1,5 +1,5 @@ diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch index 9059712242a6..125f86b57a6e 100644 --- a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch +++ b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch @@ -7,14 +7,6 @@ Subject: [PATCH] [view_curses] use VC_ROLE instead of VC_STYLE where possible Fixes #806 Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - src/highlighter.cc | 4 +++- - src/logfile_sub_source.cc | 17 ++++++++++------- - src/view_curses.cc | 9 ++++++--- - 3 files changed, 19 insertions(+), 11 deletions(-) - -diff --git a/src/highlighter.cc b/src/highlighter.cc -index 24aafebd..110ca03f 100644 --- a/src/highlighter.cc +++ b/src/highlighter.cc @@ -115,7 +115,9 @@ void highlighter::annotate(attr_line_t &al, int start) const @@ -28,8 +20,6 @@ index 24aafebd..110ca03f 100644 } sa.emplace_back(lr, &view_curses::VC_STYLE, attrs); -diff --git a/src/logfile_sub_source.cc b/src/logfile_sub_source.cc -index 14e87002..dce0d4ae 100644 --- a/src/logfile_sub_source.cc +++ b/src/logfile_sub_source.cc @@ -468,25 +468,28 @@ void logfile_sub_source::text_attrs_for_line(textview_curses &lv, @@ -68,8 +58,6 @@ index 14e87002..dce0d4ae 100644 } lr.lr_start = 0; -diff --git a/src/view_curses.cc b/src/view_curses.cc -index 4a36a3ad..2456d53d 100644 --- a/src/view_curses.cc +++ b/src/view_curses.cc @@ -402,13 +402,16 @@ void view_curses::mvwattrline(WINDOW *window, @@ -92,6 +80,3 @@ index 4a36a3ad..2456d53d 100644 attr_range.lr_end = min(line_width_chars, attr_range.lr_end - lr_chars.lr_start); --- -2.31.1 - diff --git a/app-admin/lnav/lnav-0.8.5-r1.ebuild b/app-admin/lnav/lnav-0.10.0-r1.ebuild index 2e91e591669e..50823da7ecce 100644 --- a/app-admin/lnav/lnav-0.8.5-r1.ebuild +++ b/app-admin/lnav/lnav-0.10.0-r1.ebuild @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="A curses-based tool for viewing and analyzing log files" HOMEPAGE="https://lnav.org" -SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="0" @@ -16,7 +16,8 @@ IUSE="unicode" RDEPEND=" app-arch/bzip2:0= - dev-db/sqlite:3 + app-arch/libarchive:= + >=dev-db/sqlite-3.9.0 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:=[unicode(+)?] @@ -25,7 +26,10 @@ RDEPEND=" DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README ) -PATCHES=( "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-0.10.0-disable-tests.patch + "${FILESDIR}"/${PN}-0.10.0-disable-remote-tests.patch +) src_prepare() { default diff --git a/app-admin/lnav/lnav-0.9.0-r2.ebuild b/app-admin/lnav/lnav-0.9.0-r2.ebuild deleted file mode 100644 index 6849f2beec08..000000000000 --- a/app-admin/lnav/lnav-0.9.0-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A curses-based tool for viewing and analyzing log files" -HOMEPAGE="https://lnav.org" -SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="unicode" - -RDEPEND=" - app-arch/bzip2:0= - >=dev-db/sqlite-3.9.0 - dev-libs/libpcre[cxx] - >=net-misc/curl-7.23.0 - sys-libs/ncurses:=[unicode(+)?] - sys-libs/readline:0= - sys-libs/zlib:0=" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS NEWS README ) -PATCHES=( - "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch - # bug 723242 - "${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch - # bug 713600 - "${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch - "${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - $(use_with unicode ncursesw) -} diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest index 1e893dd48809..240938a90da9 100644 --- a/app-admin/ps_mem/Manifest +++ b/app-admin/ps_mem/Manifest @@ -1,3 +1,3 @@ DIST ps_mem-3.13_p20201212.tar.gz 18513 BLAKE2B f3eea2008dbb60d34f8f3f1b6369f426685f35e5a39d40eb40dc682b01d20722f54cf965e3ee6a08ccaa14c17341c1c2ae3adbcb4b55c64798ed31ceb6f29ff7 SHA512 7f3f382d803ed2c5c7005f6b79ff8d19cb3d1aa1155717b5eeb94582c49886bce2e18d5ed41133294b7e3b7f2fbfe1d0a517619d0be6bbaf36fc71c7c5a181b6 -EBUILD ps_mem-3.13_p20201212.ebuild 718 BLAKE2B 55502cd434c015639491d5ba845a963642e00aa093481334545a11b0f82c3616259de5e8e682a926adc52e0c76d7d75bca51267bbfd3b79b30d5e42160b45c66 SHA512 169a19e94a0dc6420c7ed5ed7b7d7d6342475f413abb3c65765d268d119861f3b25569ad6e1bd60ebe6a88c3a1cc5d61ebc623f063ce914c021deb969d53ca9d +EBUILD ps_mem-3.13_p20201212.ebuild 685 BLAKE2B 38431e698e9075de18aa51c73567a0318e6b3fdc76855eb86cf069111fd599bda48ba759802c6e90a341dfdf66b8b8e7bd6bb1faa8638b661a65b1318ee84ca0 SHA512 fd8caffb94a70595f28b69d3bec15f50314295e115ea32c2888d517a1ed4867a79cf6afc1c59cd35261b7cc0d0a2698221d863a8e68165d896a1954a965129b7 MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7 diff --git a/app-admin/ps_mem/ps_mem-3.13_p20201212.ebuild b/app-admin/ps_mem/ps_mem-3.13_p20201212.ebuild index 32448460e08a..daed2c4134c2 100644 --- a/app-admin/ps_mem/ps_mem-3.13_p20201212.ebuild +++ b/app-admin/ps_mem/ps_mem-3.13_p20201212.ebuild @@ -5,7 +5,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{8,9,10} ) DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 vcs-snapshot diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index 900d86125c10..11188e1e9afa 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -1,10 +1,8 @@ AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170 DIST puppet-agent_7.10.0-1focal_amd64.deb 20964600 BLAKE2B 160a5abf3dccb57b325283f9ec6f908be73aaa065787bc6cefe2db0fbfd67145a42cab1a763e2e14c64b7902c50814b09a4b4763aaa504536f289b485cd41a6b SHA512 88c2907e47ad3009c9ce9089d3fb91da68c6c80d9d50fbf714332f2f637ad69adc122a88042cac020ae9c637b07e6569ffab7998ca08aa57a67254748cce5d30 -DIST puppet-agent_7.8.0-1focal_amd64.deb 20931500 BLAKE2B 3c521631fb96440e51ad82c3665f07a5ee9cba1d978fccbe9388684ad0c211138f022017ff49b92818cfc8f50ebed0a996c9321918413e4a1c7ca0f5a2f68f8a SHA512 f0cd9951b54bc9aacce987ea10e9257db9432620f50657ca220ea8b7b4aad1c5ddebd6f5e89c5bdee837b0f928bbebe375afdb72652eb33ee22e3778498aafa1 -DIST puppet-agent_7.9.0-1focal_amd64.deb 20934808 BLAKE2B 4b5c529e1a5cb5877a753b09a477fc08e7ca7a93c3b1dae5062864d2887adea584075f4ca6b963e01cb5121ce06008182cfc39124b9e22559899beb03855240f SHA512 b6c94b65febd6b76f1ab7af5f4f5238fb314b2abb226dd5828f09ca46fdf4cd22641f765ea338b3aeb7ccf6e0fe37d5682586fbef7dc27b51a654ded6f774495 +DIST puppet-agent_7.11.0-1focal_amd64.deb 20968988 BLAKE2B 41c1464290fc38b9bb2a79384c6c427ec8cd1332b3ccba155cb26d43a87b36931415d3a54a10ae8f6a1322f02eeaef27147d4af7304f541ce38e668b072cc03c SHA512 38024f80af5ef69a1db22f9ed90b7b00af5183988b2029fa63a8b2fa1de1c189ba164d8cd450156c4d822a3e6404e5933ca09efdd4eeee7188c99791991a9921 EBUILD puppet-agent-6.19.1-r1.ebuild 2112 BLAKE2B cb5c39b4053e2e7f9476d36571ef2d7ffb232dc61c01517d1cd1fd0dee6d093b9b07e95962d8bd3c7c8db47bd9fe70fadf49446dc0f0702271b01d7c40e59d80 SHA512 552fa439fcdac6b76218401a2a60c042261e27fafa2cda93e5b2bb52b7708488292f167e5102e1dcff42913abe779f5202d69fc241e38ecb140a11d8f2ba9901 -EBUILD puppet-agent-7.10.0.ebuild 1965 BLAKE2B bc57deeb3288dbc8fb4d33037ef62b12a0cf2369046b82f8479c6b221feeef52e892e31ffbd5a1c54aa25325952eeb186c6976e3dc73e8cf79f2ae3b4c28c0d4 SHA512 e33f11ad7c5db62c045e754bba406e4409b149527f9b1de4d1247cb6675fcb2059362aef912be490657aede0c270f466b6a3d3ebe7ada328d993bd9a3e988520 -EBUILD puppet-agent-7.8.0.ebuild 1965 BLAKE2B 9524398bc6ddab603236762a151940c3a0c0ea55cdc686516904c0a1282248f6f9d1546ac1b792b22a4d3ad2d0998056c3c2485c6801fe5bf0e2be93b62c5967 SHA512 1f77777cee4cb41c8f53ba79784631f4549c1233aeb4896d870787fc4b3c7f5d98702d3bf5186b18f8b58b1c9c4f13dfc2f00826b3d57e2e11876f3c6aed8b02 -EBUILD puppet-agent-7.9.0-r3.ebuild 1964 BLAKE2B f5e86b40715313179474474ede2a92fd8d13cd548a23796094ebaec2e43ba60712b9a5fcfa496903a1cbd21595e89762ee427dc68def1f980c59a1fd1b9d1dba SHA512 3155da6f7e138a462e07cabb7ac78c14028bbfd801db1bbe747c5b3f42acdc5bf0c985590ca315950abafc23c85b5f1412e26f1c78146d5b3ab03904e2262bcf +EBUILD puppet-agent-7.10.0.ebuild 1964 BLAKE2B f5e86b40715313179474474ede2a92fd8d13cd548a23796094ebaec2e43ba60712b9a5fcfa496903a1cbd21595e89762ee427dc68def1f980c59a1fd1b9d1dba SHA512 3155da6f7e138a462e07cabb7ac78c14028bbfd801db1bbe747c5b3f42acdc5bf0c985590ca315950abafc23c85b5f1412e26f1c78146d5b3ab03904e2262bcf +EBUILD puppet-agent-7.11.0.ebuild 1965 BLAKE2B bc57deeb3288dbc8fb4d33037ef62b12a0cf2369046b82f8479c6b221feeef52e892e31ffbd5a1c54aa25325952eeb186c6976e3dc73e8cf79f2ae3b4c28c0d4 SHA512 e33f11ad7c5db62c045e754bba406e4409b149527f9b1de4d1247cb6675fcb2059362aef912be490657aede0c270f466b6a3d3ebe7ada328d993bd9a3e988520 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1 diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild index c24ff0f353a2..1af71eb6f52c 100644 --- a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild +++ b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="puppetdb selinux" RESTRICT="strip" diff --git a/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild index 1af71eb6f52c..c24ff0f353a2 100644 --- a/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild +++ b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="~amd64" IUSE="puppetdb selinux" RESTRICT="strip" diff --git a/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild deleted file mode 100644 index fc2beb5766ff..000000000000 --- a/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd unpacker tmpfiles - -DESCRIPTION="general puppet client utils along with hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - app-emulation/virt-what - acct-user/puppet - acct-group/puppet" - -DEPEND=" - ${CDEPEND} - app-admin/augeas" -RDEPEND="${CDEPEND} - app-portage/eix - sys-apps/dmidecode - sys-libs/libselinux - sys-libs/glibc - sys-libs/readline:0/8 - sys-libs/libxcrypt - sys-libs/ncurses:0[tinfo] - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" - -S=${WORKDIR} - -QA_PREBUILT="*" - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/pxp-agent - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/pxp-agent - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - keepdir var/log/puppetlabs/puppet/ - chmod 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd2" puppet - systemd_dounit lib/systemd/system/puppet.service - systemd_dounit lib/systemd/system/pxp-agent.service - newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter - dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1 -} - -pkg_postinst() { - tmpfiles_process puppet-agent.conf -} diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index e09b076dbd7e..a67f79ff7629 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -5,10 +5,8 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58 DIST puppet-7.10.0.tar.gz 2856888 BLAKE2B 9322d59f0a8af26343f474e7b4295dfa3bfc105137498d7333776abf366c35fe66af137595ca26ea0d8cf0474151e290825240b4ee87679f25a817fa0ffdeb9d SHA512 686a9023549fb137d49c381f9c21402451503531d3edc4381a0c80dda584eac1621b1a33013e63c07158c8cec08c6e864ba70d0be4cd0c2cfeaf4f9fce9ed36a -DIST puppet-7.8.0.tar.gz 2893281 BLAKE2B cef1d56048a72ffa18c9fe2917e4f616dd4d778eddc91c88becf06a418471af1e2cf1688aa05ad3e71f24d5bb1923eaf35b8a1419ed05a72b299af970d1427e6 SHA512 189fabe199afefc77951ee3f2bf20c749f6efe290cc3a76f5ba58892c80cc76082b1ce77c23bca87f57f62816410bc5536e4206806fe31517915c72046ace08d -DIST puppet-7.9.0.tar.gz 2899891 BLAKE2B 06f675fc9eaac4ddfa7957847abe33928f0779f3c18dbf339067525ec69b6b87d274294a1133ec8332fbbed6111b568c63478493f3de467c63e2948bcf446b71 SHA512 6329d89530d2cb008e28116de655024e9bf944b3f41d086e0e47c41c74af3da51c283a912ac966cf7bac52f86e54304df6cf31477a5663cae09fb4d18f958cf2 +DIST puppet-7.11.0.tar.gz 2860556 BLAKE2B 4db6e9ba7da3c3fa8af845a9afa4a1029ae9f6e33b1a3977ab06058bdd1c230ec2cb7a7bbe54bfd6a193093f3020136f9dcfcb035f5031c06885d1df51b0f467 SHA512 dca5359c4caa07296c1ae79840d56b96b506521a9b7f32ff5aa4fbecb6277b579dff2f4d0df0c939d5f466f55b56ac8c7e2bd0ad83c024bf403f2652ecac3988 EBUILD puppet-5.5.22-r1.ebuild 3751 BLAKE2B f651b0c7d9196a83b00533a2cf6cb3b28e8b5de366cd792ed7194e84b93d971042c3e17a50abefe56e18f67bb0cd3d694604f19dc02c3ed7d72e11f1e0b71d22 SHA512 5d50d74214db6abac3fa66a5249b8b5dbfbc6340c6815e99611e2c62ff6347f2e9c96c53ad79221865e78eeed3e2796941cc50b5a979bdc8a589f57e6681ce06 -EBUILD puppet-7.10.0.ebuild 3540 BLAKE2B 74d2e019ac3823979cb19d845d1acc1556003bd7c9fa4eb6083a34d3352d93f9e94315d50708c585acd72aa9756a416245b14d3f4e71e29e8c948fa0e6708cae SHA512 9e98044702d8b596c3acb31adbab0738977fdf1accedcd7e74a962f74d606d6d5453c322a5389434f494fa46403f362c089e88389b6eec2fd59e1a8d1ba6af6c -EBUILD puppet-7.8.0-r1.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e -EBUILD puppet-7.9.0-r1.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e +EBUILD puppet-7.10.0.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e +EBUILD puppet-7.11.0.ebuild 3540 BLAKE2B a18427a2c3565af9faf11865b3a7f2aff763ecfd30bc92ab7ef92bf750eb6df69a5168564a617b5abcfab123a82a6741da3337c1a12a76a45bba2c7a4a7b252e SHA512 b30d8ef04c45e6c89b505524bc8b7414b212cfbb281fd53ed212e08ac64c85351bdde0924d50513ef99f24504265a47500c759fd08971947124c4c3484c28bcd MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1 diff --git a/app-admin/puppet/puppet-7.10.0.ebuild b/app-admin/puppet/puppet-7.10.0.ebuild index c1c0ce4f6d0c..f2b79f3d4dc9 100644 --- a/app-admin/puppet/puppet-7.10.0.ebuild +++ b/app-admin/puppet/puppet-7.10.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" RESTRICT="test" diff --git a/app-admin/puppet/puppet-7.9.0-r1.ebuild b/app-admin/puppet/puppet-7.11.0.ebuild index f2b79f3d4dc9..e4dadb18fe5f 100644 --- a/app-admin/puppet/puppet-7.9.0-r1.ebuild +++ b/app-admin/puppet/puppet-7.11.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" USE_RUBY="ruby24 ruby25 ruby26 ruby27" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" RESTRICT="test" diff --git a/app-admin/puppet/puppet-7.8.0-r1.ebuild b/app-admin/puppet/puppet-7.8.0-r1.ebuild deleted file mode 100644 index f2b79f3d4dc9..000000000000 --- a/app-admin/puppet/puppet-7.8.0-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -USE_RUBY="ruby24 ruby25 ruby26 ruby27" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_TASK_DOC="doc:all" -RUBY_FAKEGEM_EXTRAINSTALL="locales" - -inherit ruby-fakegem systemd tmpfiles - -DESCRIPTION="A system automation and configuration management software." -HOMEPAGE="https://puppet.com/" -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" -RESTRICT="test" - -ruby_add_rdepend " - dev-ruby/hiera - dev-ruby/json:= - dev-ruby/semantic_puppet - >=dev-ruby/facter-3.0.0 - dev-ruby/concurrent-ruby - augeas? ( dev-ruby/ruby-augeas ) - diff? ( dev-ruby/diff-lcs ) - doc? ( dev-ruby/rdoc ) - ldap? ( dev-ruby/ruby-ldap ) - shadow? ( dev-ruby/ruby-shadow ) - sqlite? ( dev-ruby/sqlite3 ) - virtual/ruby-ssl - dev-ruby/hocon" - -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/mocha - dev-ruby/rack - dev-ruby/rspec-its - )" -# this should go in the above lists, but isn't because of test deps not being keyworded -# dev-ruby/rspec-collection_matchers - -RDEPEND+=" ${RDEPEND} - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) - >=app-portage/eix-0.18.0 - acct-user/puppet - acct-group/puppet" -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" - -all_ruby_prepare() { - # Avoid spec that require unpackaged json-schema. - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die - - # fix systemd path - eapply -p0 "${FILESDIR}/puppet-systemd.patch" - - # Avoid specs that can only run in the puppet.git repository. This - # should be narrowed down to the specific specs. - rm spec/integration/parser/compiler_spec.rb || die - - # Avoid failing spec that need further investigation. - rm spec/unit/module_tool/metadata_spec.rb || die -} - -each_ruby_install() { - each_fakegem_install -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" -} - -all_ruby_install() { - all_fakegem_install - - # systemd stuffs - systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" - - # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" - - # openrc init stuff - newinitd "${FILESDIR}"/puppet.init-4.x puppet - - keepdir /etc/puppetlabs/puppet/ssl - - keepdir /var/lib/puppet/facts - keepdir /var/lib/puppet/files - fowners -R puppet:puppet /var/lib/puppet - - fperms 0750 /var/lib/puppet - - fperms 0750 /etc/puppetlabs - fperms 0750 /etc/puppetlabs/puppet - fperms 0750 /etc/puppetlabs/puppet/ssl - fowners -R :puppet /etc/puppetlabs - fowners -R :puppet /var/lib/puppet - - if use ldap ; then - insinto /etc/openldap/schema - doins ext/ldap/puppet.schema - fi - - # ext and examples files - for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})" - dodoc "${f}" - done -} - -pkg_postinst() { - tmpfiles_process puppet.conf - - elog - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" - elog "cause puppet to hang while installing packages." - elog - elog "Portage Puppet module with Gentoo-specific resources:" - elog "http://forge.puppetlabs.com/gentoo/portage" - elog - elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" - elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" - elog "not already done so." - elog -} diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 66923c6756de..4a9e4982ea80 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,7 +1,7 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675 -DIST puppetdb-7.4.1.tar.gz 47409868 BLAKE2B 0ac4234547b27e9ad12c9c008d76be8fff7f724d93acc2ca26700d18ac2e30bf9689c46550a8976b90e662d7af97994d7e299b94e2d68e5b5f7d1166a54d4ff8 SHA512 64c42477554039991b35dfd2d29f4fa507226cc3256b07ff3524cd287c1dbf09bdf60116dd12288d1340ca74ced2872ac886f4eadde8bd83965976579e99738d DIST puppetdb-7.5.0.tar.gz 47469411 BLAKE2B 98bf574e8b4edba47f58b899bdc3b6037a3ae79a2a8d8b3f69a108c416648fdc35f804d71fc412bcc257f7609be9b4d706af7e28d2fd05d3768a02e9efd95841 SHA512 94bf5bc9a95cacb1a3a7f0fb5b04a05eab5ded7d18c2fb396e616b44e429a4a6299e6802fc0fd72aa832a6d8181a7ecf6ef6aff4696d4c9bc16a1954aee6f77c -EBUILD puppetdb-7.4.1.ebuild 2680 BLAKE2B cb171464987e15cb5c4ec154ce8e1fa99437236a824968a3961abe3ca67eb34ccd0db9c781923c3e2a5d4bd5f7e85a1eba5de8138af9fe8ef892bec463a937d3 SHA512 255fadfe0392069b4b79e25769b9823fda49bbb7885a265d3305a35983d3bc8568f4c79c961943308a82bfc573028209829f68c7df979179a980893626a2fe42 +DIST puppetdb-7.6.0.tar.gz 48023530 BLAKE2B 9805b9d58b35475f744b262845e9f257666d5df8a8e97d024c4e128600285de871a758dd8650b4e28338792707e9baa23429547ef67ad3b8c5d7756d22fe49a0 SHA512 38c15ed990440bfdf575e624b24d35c6f5bdab943f6be4d86a2c9cfb24e09478fab15f1ce7886b7d3d4c2c368b35181a9203ac171246eda8c072973912210b38 EBUILD puppetdb-7.5.0-r1.ebuild 2715 BLAKE2B 68d24327f5a873b964636dac583abd03997f7464901ed367c430417b637aea1bda2f6d22a68c39e4f331b12769d290e5d5a43a3d564f7d22ea47332fa68753ef SHA512 fea2907f21a276ce273c0d6c459a7df944aca133dd8f7ed2f9497016e97a112b5b820ac67423621167e06e63b766d23d55bbae31caa94d7a4c19f8c4a90b97d1 +EBUILD puppetdb-7.6.0.ebuild 2717 BLAKE2B d7d8b3e406e92a9d0ff73273a51559f67cf1cfcb398a9fa4c01bce018a1dfc836e2eac96424fe035f2f17d3d0e89616c3954b697b17f3789d5519a02099d3b04 SHA512 f7babb676043275f384343419bba2f60e250704ba1a05ae5c8aa10dd17358837afd9fbed5e48abf50b72328915807157067b4fba325f609f9238fc7d14b6b75d MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6 diff --git a/app-admin/puppetdb/puppetdb-7.4.1.ebuild b/app-admin/puppetdb/puppetdb-7.6.0.ebuild index d1028bca1724..5ccee6e5acad 100644 --- a/app-admin/puppetdb/puppetdb-7.4.1.ebuild +++ b/app-admin/puppetdb/puppetdb-7.6.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" IUSE="" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" RDEPEND+=">=virtual/jdk-1.8.0" DEPEND+="acct-user/puppetdb @@ -48,6 +48,7 @@ src_install() { doins ext/config/conf.d/repl.ini doins ext/config/conf.d/database.ini doins ext/config/conf.d/config.ini + doins ext/config/conf.d/auth.conf insopts -m0755 insinto /opt/puppetlabs/server/apps/puppetdb/scripts doins install.sh diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 5d1e35ea7285..28191bc54865 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,9 +1,7 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58 -DIST puppetserver-7.2.0.tar.gz 62897576 BLAKE2B 63a8a7ea001757e15224ec819d9a23e23d3e568832421009118c1c4c3880564f614afcfa593e7c0c580cd2890ab653f5692cfc7fb23992ca7674cd5a56fa3f50 SHA512 ec90220abf4901ad98e1e07f65cdc25f09b62fda22f915260519d6fc599d36ea3a5ec2bfd5787cc9459d3c25753ff5eded2c09a67a614da1d6dda0881262b3b9 -DIST puppetserver-7.2.1.tar.gz 62917686 BLAKE2B 2a77423a932d7c75a164818d011feee1b789759046551be0d0275436295c47af6398222a223409a28b83c8186caf0d9f6e2d9ab4fc606214119bf0b56dc4d4d0 SHA512 ac960b756e6cbf32e70d1d209c6202973ffec17b553a68eaf9c0580ff4925656ae1a7616e45bee11f2a06544157d61e58b94bf700d39affd5d0116840c3fc10f DIST puppetserver-7.3.0.tar.gz 63289430 BLAKE2B d434c63dd189bfcb0ddcb9e286f0e46e5ac3d0f3612bcbeb52b582b57035d9edad2bc38856c9936cb35fccee34f93d7a22f4ea2b088b1e3bef619e69f014bbe2 SHA512 db38fb040e559eff8e219ab56c01bbb0ac1092c193095b79c5edb4206cd11f4ce211b5a4217f4027f31f46060937ca31a99bd77f3352813d1a5b56af35a36927 -EBUILD puppetserver-7.2.0-r1.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376 -EBUILD puppetserver-7.2.1-r1.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376 -EBUILD puppetserver-7.3.0.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09 +DIST puppetserver-7.4.0.tar.gz 63333332 BLAKE2B 43e1301f62d49868baf10fffe74e103633547bc66d845c01be851fa78ba0a361600913e11cbe340bae881d0c85c2bf74e290cfdff1bd9f1012562537389230ce SHA512 54b9be31b38662a4d02efc1f00a24bba269f7c69e2bb3af2402b2cb61aa8a6be5a9ef82ce883a7ca805068f45e895ab3b2026179fe298a3a451dc30ed7404a5b +EBUILD puppetserver-7.3.0.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376 +EBUILD puppetserver-7.4.0.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac diff --git a/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild b/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild deleted file mode 100644 index c2df215b358d..000000000000 --- a/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib systemd tmpfiles - -DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." -HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="puppetdb" -# will need the same keywords as puppet -KEYWORDS="amd64" - -RDEPEND+=" - >=virtual/jdk-1.8.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="acct-user/puppet - acct-group/puppet" - -src_prepare() { - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die - sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die - sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die - sed -i 's/var\/run/run/g' install.sh || die - default -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - insinto /opt/puppetlabs/server/apps/puppetserver - insopts -m0774 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppet-server-release.jar - insinto /etc/puppetlabs/puppetserver - doins ext/config/logback.xml - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetserver/services.d - doins ext/system-config/services.d/bootstrap.cfg - doins ext/config/services.d/ca.cfg - insinto /etc/puppetlabs/puppetserver/conf.d - doins ext/config/conf.d/puppetserver.conf - doins ext/config/conf.d/auth.conf - doins ext/config/conf.d/global.conf - doins ext/config/conf.d/web-routes.conf - doins ext/config/conf.d/metrics.conf - doins ext/config/conf.d/webserver.conf - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetserver/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps - doins ext/cli/ca - doins ext/cli/irb - doins ext/cli/foreground - doins ext/cli/gem - doins ext/cli/ruby - doins ext/cli/reload - doins ext/cli/start - doins ext/cli/stop - insinto /opt/puppetlabs/server/apps/puppetserver/cli - doins ext/cli_defaults/cli-defaults.sh - insinto /opt/puppetlabs/server/apps/puppetserver/bin - doins ext/bin/puppetserver - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver - dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver - dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d - # other sys stuff - dodir /etc/puppetlabs/code - # needed for systemd - keepdir /var/log/puppetlabs/puppetserver - dodir /etc/puppetlabs/puppet/ssl - fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl - fperms -R 771 /etc/puppetlabs/puppet/ssl - # systemd type things - insinto /etc/systemd/system/puppetserver.service.d/ - systemd_dounit ext/redhat/puppetserver.service - insinto /etc/default - newins ext/default puppetserver - # normal init type tasks - dosym ../default/puppetserver /etc/conf.d/puppetserver - newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver - # misc - insinto /etc/logrotate.d - newins ext/puppetserver.logrotate.conf puppetserver - # cleanup - dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems - fowners -R puppet:puppet /opt/puppetlabs/server/data - fperms -R 775 /opt/puppetlabs/server/data/puppetserver - fperms -R 700 /var/log/puppetlabs/puppetserver - insinto /opt/puppetlabs/server/data - doins ext/build-scripts/jruby-gem-list.txt - doins ext/build-scripts/mri-gem-list-no-dependencies.txt - newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf -} - -pkg_postinst() { - tmpfiles_process puppetserver.conf - - elog "to install you may want to run the following:" - elog - elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" - elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" - elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" - elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" - elog "puppet config set --section master codedir /etc/puppetlabs/code" - elog - elog "# install puppetserver gems" - elog "cd /opt/puppetlabs/server/apps/puppetserver" - elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" - elog "while read LINE; do" - elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" - elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" - elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" - elog "while read LINE; do" - elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" - elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" -} diff --git a/app-admin/puppetserver/puppetserver-7.3.0.ebuild b/app-admin/puppetserver/puppetserver-7.3.0.ebuild index 15e9859ee758..c2df215b358d 100644 --- a/app-admin/puppetserver/puppetserver-7.3.0.ebuild +++ b/app-admin/puppetserver/puppetserver-7.3.0.ebuild @@ -13,7 +13,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="puppetdb" # will need the same keywords as puppet -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND+=" >=virtual/jdk-1.8.0 diff --git a/app-admin/puppetserver/puppetserver-7.2.0-r1.ebuild b/app-admin/puppetserver/puppetserver-7.4.0.ebuild index c2df215b358d..15e9859ee758 100644 --- a/app-admin/puppetserver/puppetserver-7.2.0-r1.ebuild +++ b/app-admin/puppetserver/puppetserver-7.4.0.ebuild @@ -13,7 +13,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="puppetdb" # will need the same keywords as puppet -KEYWORDS="amd64" +KEYWORDS="~amd64" RDEPEND+=" >=virtual/jdk-1.8.0 diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest index 9da965f82c46..4188c66cdb79 100644 --- a/app-admin/pwgen/Manifest +++ b/app-admin/pwgen/Manifest @@ -1,4 +1,4 @@ AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255 -EBUILD pwgen-2.08.ebuild 591 BLAKE2B c4acd75771f8a8db67aa1d97ecc55ea61252d7e1973a5015675c871f7d2796a4fdf892e8bd5eb10540bfa7e3b590ceb9ee68b2abe5de28a7159251076715ed52 SHA512 061569ac2720c90bae5ea677ccefba18c5073a4993307012382bc4763a1235a4abeed58574696c92c4717af52efc1e9e9055c22084814246ab02eb8aafa8bd9d +EBUILD pwgen-2.08.ebuild 590 BLAKE2B 064fa81665aa2bb7fc48408981b0ea93e1c56172c5f9234510fde65abb25aeffc0a832844e56851f0c892075cdc99da591aca75a66036571d21631ad7f242afc SHA512 0aa19def0bbe431a9d38047dfc7bcbb1633b4d0131c6b8c2bf1f24d2cfbedd5c7cad21b916dba8ea437bd3641803fe8176036d25b1a0319c2197de4f0fab76f5 MISC metadata.xml 801 BLAKE2B dd9ac9712fcbfc2a681587ca84aa40ac7e2c96474dd6b89ba4f16b40be44c7ea441bf44dd4008397aa99ad08ae2ab07a535ce5375940b6f3991dc6e8e9f5f75a SHA512 15ab62126db1bb0211d39963ff8102e31cfb8791a496c660d6a63666c0c440ab1d6f04ad490e0455aa39f9c69bb69035e0c33c02107b9940e45a0a788b2f9ce9 diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild index 4c84b08861c9..f24561202661 100644 --- a/app-admin/pwgen/pwgen-2.08.ebuild +++ b/app-admin/pwgen/pwgen-2.08.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="livecd" src_configure() { diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index f409451fd945..554ccae607be 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1,8 +1,9 @@ +AUX 0001-__init__.py-Make-NetworkX-dep-optional.patch 2242 BLAKE2B 63815b66a6b5051ca084fcb265a6eb573f4738288376dada16c86c04ae3dbf4d58ff33583ff323d1096b321f0d410ae3b956b9e82caf710f78baf82db1a769fb SHA512 eac87e9335643b5e2f0de05b6e03c03d250c799e994edd52368b3a50e201beeebfbf40b7bf016200648fadf9c3d5c3708ac94ff158ea327cf2ea73f773ac8653 AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe64477b7cb26f2a8aae66c6d7ca0ac73c4a6372ce02917ef2ef424bb8faa2175bcad7c2eeca1c84d292005d5426eb3db004 SHA512 de125a4bd4fa8aa1aca98b33449d9b11746b2aa6ccfa202ed9711b253a9da98c1200b075e7b31a27b00fe3277557d29c1be8971a5fc079be572d61c25b64bec6 AUX setools-4.4.0-remove-gui.patch 1015 BLAKE2B f81872b140107337466e1d57bfd3c1935adca838756a0c1a2c4f2d0f42b7ae0ecb60d5c6db0889998bca96d46c08979d03e989a79461bb6ceb3c7bd4ee6fa56f SHA512 6e2b3d0dafbb4b0966f04cd592fc14800755ea4f585ab4d1bf0516cd25f16185b0923045762ce88df47f7264481fb9dd6588efc38d7280e14b5f015192f12924 DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8 DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8 EBUILD setools-4.3.0.ebuild 1261 BLAKE2B 2bab4af1c52f47255c6b54fb533084022005c875c7c7dd73738d60c4a8510d3e37467a11a19e5d3380ec2e677e8e2d65b4ba9c12ed51a8502cb2709be48ff308 SHA512 8ef6976367724748118cd44c4c1c8ee1de6d2f993e78193a45163ec7647c6949bf1226eea600d5a9e4f0fb12ac17ec4e6a33feaf5e10f5bd14662823d22f1d09 -EBUILD setools-4.4.0.ebuild 1340 BLAKE2B 141a159a43a8e665794f8a5eae69553407672740a4f79c02e156d93694a1890af29faed372fec687bd28d7befad94f2fffa2eee48c52ad31cc893729b18c67ee SHA512 0a22277a938f769cfe2b9b0b9b3fceaaf146727e3e511a4a2eef9f518021ee0c6b3962bb95f23f022c9f94e1d4958d39c68c58d6a229ceafb6fc65b2bcd6b26d -EBUILD setools-9999.ebuild 1342 BLAKE2B 8fa289b9c6e405f27cb8eb402a955f89483aa30ef4b3fea57f99bc313067204836a57c017c00736cc0bd9002f2bb6c1275bbe868aa8109c9d68116304cf7b49b SHA512 61a36c4eb0c09ec23aa84728f917e30730d25e0cab7063163e05b3354cf5d61933d571849fe4e256aa0c532cb15c416d958432b46aa660dba8f5a62461c614a1 -MISC metadata.xml 335 BLAKE2B 81a7604472415bdf249d90f69e80a7a7c66f23597cba3005fc1fc825012ffdeb29bcb3f8f8b028ee35e0a076fe4863c25d79077718b28d5f658e68df2a703c5b SHA512 9115e12f13e78b8f63ec90a2ed71c5c731781415a77c2fd06bba358240261bf83183f14f2d38e5e9ffcafaee56de4df224b517afceb536d8e1e6af6f1eaa0938 +EBUILD setools-4.4.0-r2.ebuild 1441 BLAKE2B 8be0a3e114117d067678990094abef9dd22eaac53b2673fa92ac8ecb6189e51e42d6204712ff64d97c78244a7921491adff4598dc5346429d32fda367060ca5a SHA512 a65fd8a947f02b46f7048853cb80fe80b63c23f1b74087888f1f014bf30ae99fd82c143fca7af4795456ee52ce899565dcc7985c0f050475eb895be77f236856 +EBUILD setools-9999.ebuild 1365 BLAKE2B 127420df824469dc42686a5d13915b98e23fa82174b8cab2a98ae66764437acf8f4cc1e074359b5e1b8f747cf58d859bb13a7d7df1c9556178b90d4fcdadb34c SHA512 80d58742b61e04fbc35b87da9259efd27c609d4fadcf44b3aadd2f1dea948fee0672e7f2ee8c9c3ccbb42dc82434f9b1cc3c500083a3e31e12add281e65cc751 +MISC metadata.xml 440 BLAKE2B 5ff05dac3cb6a27d99c7ebb2e4425afaef2275aaff5e109feff6870e2e51c55c27dd8baa3d6ad3a2a9a292a20ece18dfb2f0ad61e30cd1dc7b74afaf20d0104c SHA512 f61bdc193e411a635c35e7244fad44b68061c56fa26a1b995f79fb46784d09f52bd85bcbc8caec5043390a72d8548fb4ac0dd84cd4a613dbbdb5fd49e3efa71f diff --git a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch new file mode 100644 index 000000000000..3137f1a89f9a --- /dev/null +++ b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch @@ -0,0 +1,62 @@ +From 32eed2ae8fcd868179a317d48cfd61d828c834df Mon Sep 17 00:00:00 2001 +From: Jason Zaman <jason@perfinion.com> +Date: Sun, 19 Sep 2021 14:12:44 +0200 +Subject: [PATCH] __init__.py: Make NetworkX dep optional + +selinux commit ba23ba068364ab11ff51f52bd1e20e3c63798a62 +"python: Import specific modules from setools for less deps" +Makes userspace tools only need specific parts of setools so that the +NetworkX dep can be dropped for minimal installations. +Unfortunately the __init__ still imports the parts which require +NetworkX. Wrap them in try except to guard for missing NetworkX. + +$ semanage export +Traceback (most recent call last): + File "/usr/lib/python-exec/python3.9/semanage", line 29, in <module> + import seobject + File "/usr/lib/python3.9/site-packages/seobject.py", line 33, in <module> + import sepolicy + File "/usr/lib/python3.9/site-packages/sepolicy/__init__.py", line 15, in <module> + from setools.boolquery import BoolQuery + File "/usr/lib/python3.9/site-packages/setools/__init__.py", line 94, in <module> + from .infoflow import InfoFlowAnalysis + File "/usr/lib/python3.9/site-packages/setools/infoflow.py", line 24, in <module> + import networkx as nx +ModuleNotFoundError: No module named 'networkx' + +Bug: https://bugs.gentoo.org/809038 +Signed-off-by: Jason Zaman <jason@perfinion.com> +--- + setools/__init__.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/setools/__init__.py b/setools/__init__.py +index d72d343..e583737 100644 +--- a/setools/__init__.py ++++ b/setools/__init__.py +@@ -91,11 +91,20 @@ from .pcideviceconquery import PcideviceconQuery + from .devicetreeconquery import DevicetreeconQuery + + # Information Flow Analysis +-from .infoflow import InfoFlowAnalysis ++try: ++ from .infoflow import InfoFlowAnalysis ++except ImportError: ++ # NetworkX is optional ++ pass ++ + from .permmap import PermissionMap, RuleWeight, Mapping + + # Domain Transition Analysis +-from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition ++try: ++ from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition ++except ImportError: ++ # NetworkX is optional ++ pass + + # Policy difference + from .diff import PolicyDifference +-- +2.32.0 + diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml index 2367a4105f5c..9e77647c601c 100644 --- a/app-admin/setools/metadata.xml +++ b/app-admin/setools/metadata.xml @@ -5,6 +5,9 @@ <email>selinux@gentoo.org</email> <name>SELinux Team</name> </maintainer> + <use> + <flag name="infoflow">Depend on <pkg>dev-python/networkx</pkg> to use seinfoflow</flag> + </use> <upstream> <remote-id type="github">SELinuxProject/setools</remote-id> </upstream> diff --git a/app-admin/setools/setools-4.4.0.ebuild b/app-admin/setools/setools-4.4.0-r2.ebuild index fccf62f23698..54c34d2b8fc1 100644 --- a/app-admin/setools/setools-4.4.0.ebuild +++ b/app-admin/setools/setools-4.4.0-r2.ebuild @@ -20,15 +20,15 @@ fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="X test" +IUSE="test infoflow X" RESTRICT="!test? ( test )" S="${WORKDIR}/${PN}" RDEPEND="${PYTHON_DEPS} - >=dev-python/networkx-2.0[${PYTHON_USEDEP}] dev-python/setuptools >=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= + infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) X? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" @@ -44,7 +44,8 @@ python_prepare_all() { sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - use X || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) distutils-r1_python_prepare_all } diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild index 61a5b78a19c1..affa52ecfc52 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -20,15 +20,15 @@ fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="X test" +IUSE="test infoflow X" RESTRICT="!test? ( test )" S="${WORKDIR}/${PN}" RDEPEND="${PYTHON_DEPS} - >=dev-python/networkx-2.0[${PYTHON_USEDEP}] dev-python/setuptools >=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= + infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] ) X? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 8ad0976b1098..ae3fba9c03da 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.7p2.tar.gz 4200036 BLAKE2B b977c423670e5e34e84f3b009d5fe5f0379a0027e828fb903aa7ff1b11581572e8d5452a3666d963df3edfe1b83ffe16fbf8bddbf07881284f4507c8138859ad SHA512 39184127122014d0d1d194d455644191009835ffdcc0efda3a99028fe346ca3ff6b15341016f85029556e9f1f9deeaf83b52160effc47d1a5713affb36b99386 -DIST sudo-1.9.8.tar.gz 4301188 BLAKE2B 6731f5ad4b7002b2ec0d9f893a18070e220918bb6f4ffefdc6719221a5614912253f9547d83fc5e61c3cdada8b093d5e9c7f4c37ec6e3fc2fb9245bd10797dd2 SHA512 b1ef0464bbf5d7ab65066752769261640a142fa82b7d3d8698a7e098fbc2670c382211bce1ca0c44cb7a1c3b5a375a725a1e05a9fdfb4a31023c868285814fdc +DIST sudo-1.9.8p2.tar.gz 4302256 BLAKE2B ba40df539b3466bebe0d876ef4f1809867125e83983609eae0447f933fbd499b2eda88d2f6c475779654e68af9580a2998eca3c3f7953129ff73c923e1c88ad9 SHA512 899b252e8c219226f658dff3dd34c97b07d42004998b45175b4c0c4de42a6bf9f909598e99b4056fa1171e63378e203854b0f8608b0f5c1b00e9d3677818f6d3 EBUILD sudo-1.9.6_p1-r2.ebuild 6725 BLAKE2B 620c20c144bb7fd723e3e46022dd3e6152084978091e2e3af0a95a961dc027defeb5d20dcee4b0e36959e04124586a2c53d65c8137af9d1f52a6044392c08aea SHA512 fc61898d795187d7ab0876001c725bdb2c5f0c98ab38adc8427f69abc1da8b33be6ef8ebe1353ead193f10f48ed042fe12a13f90c181bc3a0d3cceed352bc262 EBUILD sudo-1.9.7_p2.ebuild 6686 BLAKE2B c088c8a2cad0fcc78dc91ca5ec04b1ed36a7eff66349d4abbc2de78074395c9dfa6dfba2662f180e53f86a84f9118d93a0a7da2f52e10131c94caff2721594fe SHA512 ccc8a5c262cd07b3c456ed3e5100f4787b814308a223a7c3c2a9c60db3dd308e60812607c289381230948ee184f71c3503de4dabb4dee388b174b65c502b447e -EBUILD sudo-1.9.8.ebuild 6669 BLAKE2B 908e75ad8b33fc74a3491c77aa184e6f1de8629b13fb6bc704f7b9980b43fb313591667b58c9583f50392d44e852dcd7f3e65c5265b3eb5d32c8e970370b9d9e SHA512 f415714f5b28550b5f7b3b3f79b28a95db5738f3b2c65720d911c8fcabc4b8099f58e510c17af6194ba76cac53157fbbcb7688d35ae99b2633973bcf50799089 +EBUILD sudo-1.9.8_p2.ebuild 6669 BLAKE2B 908e75ad8b33fc74a3491c77aa184e6f1de8629b13fb6bc704f7b9980b43fb313591667b58c9583f50392d44e852dcd7f3e65c5265b3eb5d32c8e970370b9d9e SHA512 f415714f5b28550b5f7b3b3f79b28a95db5738f3b2c65720d911c8fcabc4b8099f58e510c17af6194ba76cac53157fbbcb7688d35ae99b2633973bcf50799089 EBUILD sudo-9999.ebuild 6669 BLAKE2B 908e75ad8b33fc74a3491c77aa184e6f1de8629b13fb6bc704f7b9980b43fb313591667b58c9583f50392d44e852dcd7f3e65c5265b3eb5d32c8e970370b9d9e SHA512 f415714f5b28550b5f7b3b3f79b28a95db5738f3b2c65720d911c8fcabc4b8099f58e510c17af6194ba76cac53157fbbcb7688d35ae99b2633973bcf50799089 MISC metadata.xml 1050 BLAKE2B 4027c8a5941e8e12bb6c9cd9950187965b01e236ddfc073ba0dd98be8e3e98225ffbca1c05b3153d72e5507484f966e01c7b44e9416bbedecd88ae8f4d52e359 SHA512 8033bd4649190c3c6bf0d07dab2dc99a708b81a74b0d154b1f4d56bdfbc115d4889b3a78e6b2f3eebaa91bf0252e8fd043bf2bc850b8f6b4199b38ea751b7174 diff --git a/app-admin/sudo/sudo-1.9.8.ebuild b/app-admin/sudo/sudo-1.9.8_p2.ebuild index de7fec385553..de7fec385553 100644 --- a/app-admin/sudo/sudo-1.9.8.ebuild +++ b/app-admin/sudo/sudo-1.9.8_p2.ebuild diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 3a329a9db5f0..60de3af59bf0 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -11,9 +11,11 @@ DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a7407 DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385 DIST syslog-ng-3.32.1.tar.gz 5782744 BLAKE2B 43600ac7bf3bcd090353aa5a3d3b3c7701b8794328a111a0ef306dffbf5462880ef3e86f4f8b63580402848b7a4e333112ae1c5514c5e8d41103db4a0d4de159 SHA512 c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280 DIST syslog-ng-3.33.2.tar.gz 5836576 BLAKE2B 5be7f04c3f7298673aea3c65fb0fcf44e2dd22a7f66411a40640bebf6a4f43b16e177f744af6daf12fe9fd7617a57246cc517fc41eb9174bfbc9ed1ea75318c0 SHA512 c20b8ef9dff2682562975b4149484f1abc4249aacbb5aac6a3fc683d102ccd316c048e166d61e51da6848ff0f8f5c6245dc5a307929f1cdef3ba718244e60f71 +DIST syslog-ng-3.34.1.tar.gz 5903489 BLAKE2B ae94dacb324f2db68fdaad6d41d1974e4506527ace432af314566b20a8d82ae91e96e3aa039d035f3baf096bb02e16143a35446ff2e3cbba1880c61c1f708688 SHA512 f4df871f780b2e55e847d3ac108d0647659cac2493180d29436f04a4b75d38b90aba8adcd38f6337dce8f69d6aba9ff33fd3d8dc0f86021a29f60a21747e9a10 EBUILD syslog-ng-3.30.1-r2.ebuild 4889 BLAKE2B a84207505959119191dd2097e7e0c6dce89b1c4ca0a8ef1a6af5dda47d0d4966febe5c4c0ae6417163b32ab7a14be7539bff337fc682434d8127c45eb60f07aa SHA512 a20d19bf12e39237513e8677e03f24bd4d8bc0f5a22cc67bb316f9269200a11dead42e8de51c9af18c168944ad807293203239c076ebb4591a6fbf5d256d4d1d EBUILD syslog-ng-3.30.1.ebuild 4839 BLAKE2B 92c837ecd1d724d06457e586dfc35e483ab233b7cd0ed9fbb461174c2659d9aba967aff62a33cec504f13b85656b8b736f61b0cb57bc70fcee96cda795bd7d91 SHA512 b02e32aa65e0df8ca222d219bf70ccbb0260b40e3db98db7a9ac37998e8059992f35a2bb9d03a5adb2d60756bf065e9a4aa1ddd94dacf40505a701bcf6c373ad EBUILD syslog-ng-3.31.2-r1.ebuild 4940 BLAKE2B d7d0f6fec4570cbe20336b8332d17930ee310d904540fce3cb83434b98227e8fb40e7b7cde5eccaa16fc2142660d626361fca11d42ba386cd9196e7b1faef72c SHA512 af3b35519d289d06b74eaa2be42190c862743b18c85cdf75ab67193d6bff386fef5df546ea9e04290fec8cef41aa909a2d716869ac9cdeec0aa2d4cc7fc184db EBUILD syslog-ng-3.32.1-r1.ebuild 4941 BLAKE2B d06d4fd5bc2104c335d46d626657e800712382b0e8db648d737efe2a7be53e4766fc2795179aa08ae749edb7b152d9d1e3292c248b51dcd3d69216b07743abce SHA512 f1d1449199a773fc8474690ac5d074eec485d4f7f142825d7982c8279c781e0f8427d4be6c256be1a8569560d75e98ea74ae742e3f5cfcd3511da2d73d15c83b EBUILD syslog-ng-3.33.2.ebuild 4891 BLAKE2B c50cf966763fcf8e17de802f5dca755bdb6d47485f6eefbcd5d1e9fbb026793be87e4a49bc58047f07edc275b7cf8e920498199574ce5df9bc6d8a8f4635aff6 SHA512 bb0a0e934b2f40f9d14662241d1d287adbc1c6a074a5bba8f1bef8dbec32307b62a443de096d5e0c8eff6b6b76f8dcbbc5b0f046e121c27c2cf62912a9e688ef +EBUILD syslog-ng-3.34.1.ebuild 4883 BLAKE2B b4b36e9aa1a62149ae9187196b810d4d74cd7b7bf02d222fefffd3c8603bcb35aa47dbc4703c1cfbe1cc811463db0cdb112d279b98a4035aeb843635ebf98134 SHA512 95fcc558278b04d0fe7de1f41f7585f192de4da8071bbdc4f6cb6818c9bafdd9a20e05587e730567fa660a58e1cc5cb58e4025bcffcc1e4f22ce03e78ef2dcf3 MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a diff --git a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild new file mode 100644 index 000000000000..b0450d9ffa48 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) +inherit autotools python-single-r1 systemd + +MY_PV_MM=$(ver_cut 1-2) +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://syslog-ng.com/open-source-log-management" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre-6.1:= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( ${PYTHON_DEPS} ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( net-libs/libesmtp:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1= ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in \ + syslog-ng.conf.gentoo.in; do + sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + default + eautoreconf +} + +src_configure() { + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable http) + $(use_enable ipv6) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest index e31970aaa29b..c8b1f994bc77 100644 --- a/app-admin/vault/Manifest +++ b/app-admin/vault/Manifest @@ -1,4 +1,5 @@ AUX localhost.json.example 130 BLAKE2B c2af154a798286daae8a1804c698a8a8437bb4fbf2c9e928bd8ebd2cc846a7887058695f3715a4e3b9c82232529fe053b40d52fd98fd6b6c4018fbb2009a7da0 SHA512 9f9bc222f3716942b7423fa2ab14afd1d516bf3f3170b7418a75b970a33341426e13f89cf331a5e25bd3159dcbb435e20e75a0c9109e767e67bf777a7dbcd182 +AUX vault-1.8.2-go-limiter.patch 10588 BLAKE2B 597b3edd7e98d36d34123ae5352bc8894df40962afc1721c87b53cd2baa459ae1a9545d5830ea31c46549a38e713157dd920292ede19c4a4e4b4c75e5a605038 SHA512 ae8134f2cd743188e4f7be06ee8f816456613c177cd56b311fd1ad0cae6106180b85c56381da866afd31ccf7e4d5b1c9239f148d2b18dae2dfcea3c08c74d0f7 AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f29ac183bd1473de37107b2e141b74933c1b14502cdaaaebe493ee71ad6c9141a889c6e73b977 SHA512 395d823dee49fed30d99fea1fcd1b0c1c3ae2bfd806fa0c169aa14d83a594d224f8966870799a3740a7e52f039616efe78834e0522e7a2802c7df4c56b3bbdd2 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5 @@ -1125,8 +1126,8 @@ DIST github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.m DIST github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod 30 BLAKE2B 77431281d4cec52a254453afe8c7438154b0ecae0116ba085401536adc1f71f6a7eea8b0e2181893b004d805e3ff8b3a7f212ac82e41877cd08c2cf0fc47af05 SHA512 5101454134688f96467dbbdf475b1d9bd9e446c29eb2cd04b85430ea0130c09dcbd8141d5ca0d63e63b74349c3dbf59d978ef2115a03c920ff2abfad10fe9a62 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a -DIST github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.3.0.mod 48 BLAKE2B 33ddfe8d645092d307c8b8acd8b1c0c8c0c91224a6b0eb3bac20d707be49acc3d437cf00d341d4d37857a9ac4b5303d1df717d2a46ce717941ab7eedbfd133bd SHA512 4266c966fbdba482455fdd13f37891847cff194d1a6d169be35167b729c6e36e9517d72c5a5fda048d8465ada31927b0f3d00fe455e5339c554829e7fb914d2a -DIST github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.3.0.zip 32198 BLAKE2B d779ed09d9e00d6ff18be20b48068a1877d623070d2f74bebb6816d3a139b311276caf8f3f3099a6b6940e8d5ddaaae07719fb86f117f9ec987483b1573561d5 SHA512 35f0ae21b2af7e125e4c18a36a0c6695b024f9f53facf6f025c71237cd12658cd507d05b6d8e8249c53477b56ed7c8e0a960232715e7243da2a3f00d6dcdcd68 +DIST github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.mod 48 BLAKE2B 33ddfe8d645092d307c8b8acd8b1c0c8c0c91224a6b0eb3bac20d707be49acc3d437cf00d341d4d37857a9ac4b5303d1df717d2a46ce717941ab7eedbfd133bd SHA512 4266c966fbdba482455fdd13f37891847cff194d1a6d169be35167b729c6e36e9517d72c5a5fda048d8465ada31927b0f3d00fe455e5339c554829e7fb914d2a +DIST github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.zip 24454 BLAKE2B 4958546c0be405c760d03db84554b582ae770c08893c1dd77445f655d76714a93a5c1f2a9d5cc9590564002df9c6e81eafc2d44082c6da50a0f2ef18152e1d17 SHA512 e303b4042ed3f18743bc0d11700c40e5661a32472802dd1a5f9cd4131d520c774dd98cd62c056b6bf45739600cea5cb6052eb02a113fb091316cf1c11b5c819b DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.zip 257791 BLAKE2B d0c44078120582d20e3c3eb60d0ecfc2c8547323ea68eddaffee5614243b4410518eabaf0c17b24351cd269d85bfc5f32151bcb56680793682a17b61e8881204 SHA512 c2d405ad66b1e3d6860ef21dacb6b7f0a5daef57267c32773cb26ea9983ba75df39e6b3ab5bc97c4c0eb133e17eb587a565da30d89139982fd90102765d27ca9 DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod 37 BLAKE2B 9945435440e0d3be57cdb12cab697382fe91c56329289bbde332bbd1fd15928a5101d7fcadd89064ecbd103130514a1cad383db097d02d596138fad0348c15d0 SHA512 7f46d39bc8f24a5c5c1ff513c0f0018d5341a008526a49bf0b3694008c272b3080b0386a44ba6c27f2894bef19dfbec5095c9189ed222ed5a55797788668315e @@ -1749,13 +1750,7 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282 -DIST vault-1.6.6-webui.tar.xz 1268292 BLAKE2B ea30ecaee5ff58a6b7281a5cedb9e8484c6d19feb2b5f0391002a2022dfc4978ac9c37bdcb69617034f93c44835bd4d88720788affcd45d516c190a011dc3882 SHA512 458cb4093a06142c11376a65a11deecc135915586353eae9511bdbdc49539ed296d3a008a91d8c6c6a43d71a0dfff85727a669428a822246265ffd1e48ce3972 -DIST vault-1.6.6.tar.gz 39139148 BLAKE2B 1b6615fddb649c852d62f8a4d9d97d09be4e966427753ba87add08cf758416c349caae189e6bb6a3b24edf3c708f17655090d713f6e9ab2c02b7db8656c4cd02 SHA512 820ec2f0b71defe6e6920bb4eefec55536d3d06345b676323d4af0c74c837c886871b0951b54f917e27b61bade9b4a8e9f36e3905a82a134b9e5f887ed744534 -DIST vault-1.7.4-webui.tar.xz 1324720 BLAKE2B 822f4afd2dd2ede0741b597b66a89fa04d1e160fa826ce609816786f9393aac24bbe36d27c7c3a11642d93b35606804d52ddd7da51aa9d3346f67caa5a886f21 SHA512 cfc0f8ccdb5ca348286676c3ff512483ed7e5c129bf5a6d7a5cfd60d4c5679688f4aff66221874cf413fad654aa0d71ba72eb58bb5f0165d42b9603e1cec279b -DIST vault-1.7.4.tar.gz 39607823 BLAKE2B 24b1c5473bac6fe0973a95a4c7ce30d5e8b4d3e78ec606cfe64ac3a1dcf84733aac4309496da0fd6b8bec5d98d951df29a4f1e1709f30856cc35e1d0464bdb25 SHA512 ec2f13741a182f1127424cd135ca1d5e9000e5e1cb3410135d805ff5cebb728091ffd67c7fea2134b1488ec13c8e298683adae23cb7ef87d8d35404ffddf9be3 DIST vault-1.8.2-webui.tar.xz 1382592 BLAKE2B e7df79275f65b601de577f1197b89c03bd4e299fb4c5ee67f5e91439a79c15eeb4b58946d4cf2c837ca88883c2d655ae86388f2f194a06f159c6580d4e6b1e59 SHA512 35c738be79fd956f09595045d7616599cfd7948baf2b774d0585c4cc12f9cfbd8bf262eb3c9a3969b96184560f2b2f7eb203271100a4ce452347d1100a5884b8 DIST vault-1.8.2.tar.gz 20974085 BLAKE2B dbef32b3b1881f61053fed410c80caca253af9fd27d525eaf7e8b471af15d62c16423d35905302ccd4c32d7f2bc983a09d4ccbf2f835b7c60e2ac5067b17348c SHA512 fe203f68a8b2f91356a59ee5a5e072aad232bfb9b037c7673297240ddd6270936f144c9a25bcba399053ef0fbc756146cc0e9e9f3642f0fd07008d8ee003d793 -EBUILD vault-1.6.6.ebuild 1815 BLAKE2B 26b1ef44a8f7a7368e43f053589e55dbcf184f67c9d7bfa264f80d8a8de83b13568ee614d357ed75eb0464f53dfa8e58a97755229b283d026212761492264e64 SHA512 bd013a506908c251eeb581602e9f039361b33e3a8b13589c32228845cf830f66cb02960f0375a482fdae237a8c637145ab75bffd5d4f4e96d10046fdf32b6948 -EBUILD vault-1.7.4.ebuild 1816 BLAKE2B 64dfcfd1375b66458538b35647ddf2a373be16ba8ac27619db188dbaec020f54f045977033a33aa365846e2c9aaf13ec491591208bf67811a7ef871afb32cc2c SHA512 7d4c606e6ad9f6b82c8930580fb37de60b1ce5cb1d470f37fec833e8402ed967187f6884264d417c356f1a2f9f1f7389bd968bddaba4d9baa601771e536b86e3 -EBUILD vault-1.8.2.ebuild 95817 BLAKE2B 0db23ac16cc0111102b457863bdea186f7f0531b1bb9b3c18965c8cda7d1b6779b9ae882eaeb339035e91f9262101bb59073acff45cab64d217a138f197cbda3 SHA512 9eca6a162fc601f44ea0e7a3d9150752130deb401344e65c57aab1c9505248bfea4c3a06e7bbedd5cc94b11e77b6d95644c584bc2611f77c5dee6393fa1a0fd4 +EBUILD vault-1.8.2.ebuild 95865 BLAKE2B 6f72e3a4c990600d2f0b2cd189ca4d0502195edd05e7fc1f00d6788243f535705226d5a0faa1f44618e49081c1230b71431d4e949b47e6c1c4f39247255dadbb SHA512 33ad1aca41e2d07adcff741e7eb603f87dded3bb4c794eceb6bbfca694944c0cf28f9b7ce19762a7a8aba1c2c512e4b9a90667ac1ff04069d257f3600d18c103 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02 diff --git a/app-admin/vault/files/vault-1.8.2-go-limiter.patch b/app-admin/vault/files/vault-1.8.2-go-limiter.patch new file mode 100644 index 000000000000..3aef43e5c17b --- /dev/null +++ b/app-admin/vault/files/vault-1.8.2-go-limiter.patch @@ -0,0 +1,264 @@ +This is a combination of upstream commits: +b368a675955707db4e940da29a1043871a3781b6 +21ea03e0f874991086d2f1bcdc285216878bd566 + +Fixes https://bugs.gentoo.org/808791 +Fixes https://bugs.gentoo.org/810317 + +diff --git a/go.mod b/go.mod +index 548c0590f..22a8833e2 100644 +--- a/go.mod ++++ b/go.mod +@@ -150,7 +150,7 @@ require ( + github.com/ryanuber/go-glob v1.0.0 + github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da + github.com/sasha-s/go-deadlock v0.2.0 +- github.com/sethvargo/go-limiter v0.3.0 ++ github.com/sethvargo/go-limiter v0.7.1 + github.com/shirou/gopsutil v3.21.5+incompatible + github.com/stretchr/testify v1.7.0 + github.com/tidwall/pretty v1.0.1 // indirect +diff --git a/go.sum b/go.sum +index c5b3b410d..98a5dd0a8 100644 +--- a/go.sum ++++ b/go.sum +@@ -1120,8 +1120,8 @@ github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod h1:7zjs06q + github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod h1:BeybITEsBEg6qbIiqJ6/Bqeq25bCLbL7YFmpaFfJDuM= + github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= + github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +-github.com/sethvargo/go-limiter v0.3.0 h1:yRMc+Qs2yqw6YJp6UxrO2iUs6DOSq4zcnljbB7/rMns= +-github.com/sethvargo/go-limiter v0.3.0/go.mod h1:C0kbSFbiriE5k2FFOe18M1YZbAR2Fiwf72uGu0CXCcU= ++github.com/sethvargo/go-limiter v0.7.1 h1:wWNhTj0pxjyJ7wuJHpRJpYwJn+bUnjYfw2a85eu5w9U= ++github.com/sethvargo/go-limiter v0.7.1/go.mod h1:C0kbSFbiriE5k2FFOe18M1YZbAR2Fiwf72uGu0CXCcU= + github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc= + github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= + github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE= +diff --git a/http/util.go b/http/util.go +index 0550a93c7..cbb364843 100644 +--- a/http/util.go ++++ b/http/util.go +@@ -48,7 +48,7 @@ func rateLimitQuotaWrapping(handler http.Handler, core *vault.Core) http.Handler + return + } + +- quotaResp, err := core.ApplyRateLimitQuota("as.Request{ ++ quotaResp, err := core.ApplyRateLimitQuota(r.Context(), "as.Request{ + Type: quotas.TypeRateLimit, + Path: path, + MountPath: strings.TrimPrefix(core.MatchingMount(r.Context(), path), ns.Path), +diff --git a/vault/core.go b/vault/core.go +index 3b6e461fd..27741e8c6 100644 +--- a/vault/core.go ++++ b/vault/core.go +@@ -2744,7 +2744,7 @@ func (c *Core) setupQuotas(ctx context.Context, isPerfStandby bool) error { + + // ApplyRateLimitQuota checks the request against all the applicable quota rules. + // If the given request's path is exempt, no rate limiting will be applied. +-func (c *Core) ApplyRateLimitQuota(req *quotas.Request) (quotas.Response, error) { ++func (c *Core) ApplyRateLimitQuota(ctx context.Context, req *quotas.Request) (quotas.Response, error) { + req.Type = quotas.TypeRateLimit + + resp := quotas.Response{ +@@ -2758,7 +2758,7 @@ func (c *Core) ApplyRateLimitQuota(req *quotas.Request) (quotas.Response, error) + return resp, nil + } + +- return c.quotaManager.ApplyQuota(req) ++ return c.quotaManager.ApplyQuota(ctx, req) + } + + return resp, nil +diff --git a/vault/quotas/quotas.go b/vault/quotas/quotas.go +index 68cc72f9f..80ee59521 100644 +--- a/vault/quotas/quotas.go ++++ b/vault/quotas/quotas.go +@@ -168,7 +168,7 @@ type Manager struct { + // Quota represents the common properties of every quota type + type Quota interface { + // allow checks the if the request is allowed by the quota type implementation. +- allow(*Request) (Response, error) ++ allow(context.Context, *Request) (Response, error) + + // quotaID is the identifier of the quota rule + quotaID() string +@@ -181,7 +181,7 @@ type Quota interface { + + // close defines any cleanup behavior that needs to be executed when a quota + // rule is deleted. +- close() error ++ close(context.Context) error + + // handleRemount takes in the new mount path in the quota + handleRemount(string) +@@ -287,7 +287,7 @@ func (m *Manager) setQuotaLocked(ctx context.Context, qType string, quota Quota, + // If there already exists an entry in the db, remove that first. + if raw != nil { + quota := raw.(Quota) +- if err := quota.close(); err != nil { ++ if err := quota.close(ctx); err != nil { + return err + } + err = txn.Delete(qType, raw) +@@ -518,7 +518,7 @@ func (m *Manager) DeleteQuota(ctx context.Context, qType string, name string) er + } + + quota := raw.(Quota) +- if err := quota.close(); err != nil { ++ if err := quota.close(ctx); err != nil { + return err + } + +@@ -541,7 +541,7 @@ func (m *Manager) DeleteQuota(ctx context.Context, qType string, name string) er + // ApplyQuota runs the request against any quota rule that is applicable to it. If + // there are multiple quota rule that matches the request parameters, rule that + // takes precedence will be used to allow/reject the request. +-func (m *Manager) ApplyQuota(req *Request) (Response, error) { ++func (m *Manager) ApplyQuota(ctx context.Context, req *Request) (Response, error) { + var resp Response + + quota, err := m.QueryQuota(req) +@@ -562,7 +562,7 @@ func (m *Manager) ApplyQuota(req *Request) (Response, error) { + return resp, nil + } + +- return quota.allow(req) ++ return quota.allow(ctx, req) + } + + // SetEnableRateLimitAuditLogging updates the operator preference regarding the +diff --git a/vault/quotas/quotas_rate_limit.go b/vault/quotas/quotas_rate_limit.go +index 64117b002..ad58b2af3 100644 +--- a/vault/quotas/quotas_rate_limit.go ++++ b/vault/quotas/quotas_rate_limit.go +@@ -1,6 +1,7 @@ + package quotas + + import ( ++ "context" + "encoding/hex" + "fmt" + "math" +@@ -264,7 +265,7 @@ func (rlq *RateLimitQuota) QuotaName() string { + // returned if the request ID or address is empty. If the path is exempt, the + // quota will not be evaluated. Otherwise, the client rate limiter is retrieved + // by address and the rate limit quota is checked against that limiter. +-func (rlq *RateLimitQuota) allow(req *Request) (Response, error) { ++func (rlq *RateLimitQuota) allow(ctx context.Context, req *Request) (Response, error) { + resp := Response{ + Headers: make(map[string]string), + } +@@ -300,7 +301,11 @@ func (rlq *RateLimitQuota) allow(req *Request) (Response, error) { + } + } + +- limit, remaining, reset, allow := rlq.store.Take(req.ClientAddress) ++ limit, remaining, reset, allow, err := rlq.store.Take(ctx, req.ClientAddress) ++ if err != nil { ++ return resp, err ++ } ++ + resp.Allowed = allow + resp.Headers[httplimit.HeaderRateLimitLimit] = strconv.FormatUint(limit, 10) + resp.Headers[httplimit.HeaderRateLimitRemaining] = strconv.FormatUint(remaining, 10) +@@ -320,13 +325,13 @@ func (rlq *RateLimitQuota) allow(req *Request) (Response, error) { + + // close stops the current running client purge loop. + // It should be called with the write lock held. +-func (rlq *RateLimitQuota) close() error { ++func (rlq *RateLimitQuota) close(ctx context.Context) error { + if rlq.purgeBlocked { + close(rlq.closePurgeBlockedCh) + } + + if rlq.store != nil { +- return rlq.store.Close() ++ return rlq.store.Close(ctx) + } + + return nil +diff --git a/vault/quotas/quotas_rate_limit_test.go b/vault/quotas/quotas_rate_limit_test.go +index 27225e338..21f35dac3 100644 +--- a/vault/quotas/quotas_rate_limit_test.go ++++ b/vault/quotas/quotas_rate_limit_test.go +@@ -37,7 +37,7 @@ func TestNewRateLimitQuota(t *testing.T) { + err := tc.rlq.initialize(logging.NewVaultLogger(log.Trace), metricsutil.BlackholeSink()) + require.Equal(t, tc.expectErr, err != nil, err) + if err == nil { +- require.Nil(t, tc.rlq.close()) ++ require.Nil(t, tc.rlq.close(context.Background())) + } + }) + } +@@ -46,7 +46,7 @@ func TestNewRateLimitQuota(t *testing.T) { + func TestRateLimitQuota_Close(t *testing.T) { + rlq := NewRateLimitQuota("test-rate-limiter", "qa", "/foo/bar", 16.7, time.Second, time.Minute) + require.NoError(t, rlq.initialize(logging.NewVaultLogger(log.Trace), metricsutil.BlackholeSink())) +- require.NoError(t, rlq.close()) ++ require.NoError(t, rlq.close(context.Background())) + + time.Sleep(time.Second) // allow enough time for purgeClientsLoop to receive on closeCh + require.False(t, rlq.getPurgeBlocked(), "expected blocked client purging to be disabled after explicit close") +@@ -66,14 +66,14 @@ func TestRateLimitQuota_Allow(t *testing.T) { + } + + require.NoError(t, rlq.initialize(logging.NewVaultLogger(log.Trace), metricsutil.BlackholeSink())) +- defer rlq.close() ++ defer rlq.close(context.Background()) + + var wg sync.WaitGroup + + reqFunc := func(addr string, atomicNumAllow, atomicNumFail *atomic.Int32) { + defer wg.Done() + +- resp, err := rlq.allow(&Request{ClientAddress: addr}) ++ resp, err := rlq.allow(context.Background(), &Request{ClientAddress: addr}) + if err != nil { + return + } +@@ -141,7 +141,7 @@ func TestRateLimitQuota_Allow_WithBlock(t *testing.T) { + } + + require.NoError(t, rlq.initialize(logging.NewVaultLogger(log.Trace), metricsutil.BlackholeSink())) +- defer rlq.close() ++ defer rlq.close(context.Background()) + require.True(t, rlq.getPurgeBlocked()) + + var wg sync.WaitGroup +@@ -149,7 +149,7 @@ func TestRateLimitQuota_Allow_WithBlock(t *testing.T) { + reqFunc := func(addr string, atomicNumAllow, atomicNumFail *atomic.Int32) { + defer wg.Done() + +- resp, err := rlq.allow(&Request{ClientAddress: addr}) ++ resp, err := rlq.allow(context.Background(), &Request{ClientAddress: addr}) + if err != nil { + return + } +@@ -221,5 +221,5 @@ func TestRateLimitQuota_Update(t *testing.T) { + require.NoError(t, qm.SetQuota(context.Background(), TypeRateLimit.String(), quota, true)) + require.NoError(t, qm.SetQuota(context.Background(), TypeRateLimit.String(), quota, true)) + +- require.Nil(t, quota.close()) ++ require.Nil(t, quota.close(context.Background())) + } +diff --git a/vault/quotas/quotas_util.go b/vault/quotas/quotas_util.go +index dc2fcdfac..7c0732f67 100644 +--- a/vault/quotas/quotas_util.go ++++ b/vault/quotas/quotas_util.go +@@ -40,7 +40,7 @@ func (*entManager) Reset() error { + + type LeaseCountQuota struct{} + +-func (l LeaseCountQuota) allow(request *Request) (Response, error) { ++func (l LeaseCountQuota) allow(_ context.Context, _ *Request) (Response, error) { + panic("implement me") + } + +@@ -56,7 +56,7 @@ func (l LeaseCountQuota) initialize(logger log.Logger, sink *metricsutil.Cluster + panic("implement me") + } + +-func (l LeaseCountQuota) close() error { ++func (l LeaseCountQuota) close(_ context.Context) error { + panic("implement me") + } + diff --git a/app-admin/vault/vault-1.6.6.ebuild b/app-admin/vault/vault-1.6.6.ebuild deleted file mode 100644 index 28654c831960..000000000000 --- a/app-admin/vault/vault-1.6.6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fcaps go-module systemd - -DESCRIPTION="A tool for managing secrets" -HOMEPAGE="https://vaultproject.io/" -VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" -SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz - webui? ( - https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} - )" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="+webui" - -BDEPEND="dev-go/gox - >=dev-lang/go-1.15.3" -COMMON_DEPEND="acct-group/vault - acct-user/vault" - DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - -FILECAPS=( - -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} -) - -RESTRICT+=" test" - -src_prepare() { - default - # Avoid the need to have a git checkout - sed -e 's:^\(GIT_COMMIT=\).*:\1:' \ - -e 's:^\(GIT_DIRTY=\).*:\1:' \ - -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \ - -i scripts/build.sh || die - sed -e "/hooks/d" \ - -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \ - -i Makefile || die - if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then - mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" || - die "mv failed" - fi -} - -src_compile() { - mkdir "${T}"/bin || die - BUILD_TAGS="$(usex webui ui '')" \ - GOFLAGS="-mod=vendor" \ - GOPATH="${T}" \ - XC_ARCH=$(go env GOARCH) \ - XC_OS=$(go env GOOS) \ - XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \ - emake -} - -src_install() { - dobin bin/${PN} - dodoc CHANGELOG.md CONTRIBUTING.md README.md - insinto /etc/${PN}.d - doins "${FILESDIR}/"*.json.example - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-admin/vault/vault-1.7.4.ebuild b/app-admin/vault/vault-1.7.4.ebuild deleted file mode 100644 index 87aa3191263e..000000000000 --- a/app-admin/vault/vault-1.7.4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fcaps go-module systemd - -DESCRIPTION="A tool for managing secrets" -HOMEPAGE="https://vaultproject.io/" -VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" -SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz - webui? ( - https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} - )" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+webui" - -BDEPEND="dev-go/gox - >=dev-lang/go-1.15.3" -COMMON_DEPEND="acct-group/vault - acct-user/vault" - DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - -FILECAPS=( - -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} -) - -RESTRICT+=" test" - -src_prepare() { - default - # Avoid the need to have a git checkout - sed -e 's:^\(GIT_COMMIT=\).*:\1:' \ - -e 's:^\(GIT_DIRTY=\).*:\1:' \ - -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \ - -i scripts/build.sh || die - sed -e "/hooks/d" \ - -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \ - -i Makefile || die - if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then - mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" || - die "mv failed" - fi -} - -src_compile() { - mkdir "${T}"/bin || die - BUILD_TAGS="$(usex webui ui '')" \ - GOFLAGS="-mod=vendor" \ - GOPATH="${T}" \ - XC_ARCH=$(go env GOARCH) \ - XC_OS=$(go env GOOS) \ - XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \ - emake -} - -src_install() { - dobin bin/${PN} - dodoc CHANGELOG.md CONTRIBUTING.md README.md - insinto /etc/${PN}.d - doins "${FILESDIR}/"*.json.example - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-admin/vault/vault-1.8.2.ebuild b/app-admin/vault/vault-1.8.2.ebuild index 57bba092722c..8957da4edc80 100644 --- a/app-admin/vault/vault-1.8.2.ebuild +++ b/app-admin/vault/vault-1.8.2.ebuild @@ -1130,8 +1130,8 @@ EGO_SUM=( "github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod" "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" -"github.com/sethvargo/go-limiter v0.3.0" -"github.com/sethvargo/go-limiter v0.3.0/go.mod" +"github.com/sethvargo/go-limiter v0.7.1" +"github.com/sethvargo/go-limiter v0.7.1/go.mod" "github.com/shirou/gopsutil v3.21.5+incompatible" "github.com/shirou/gopsutil v3.21.5+incompatible/go.mod" "github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24" @@ -1766,7 +1766,7 @@ SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="+webui" BDEPEND="dev-go/gox @@ -1780,6 +1780,8 @@ FILECAPS=( -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} ) +PATCHES=( "${FILESDIR}"/${P}-go-limiter.patch ) + RESTRICT+=" test" src_prepare() { diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest index 5cb0a145150f..8d6a92b35888 100644 --- a/app-admin/webapp-config/Manifest +++ b/app-admin/webapp-config/Manifest @@ -1,4 +1,4 @@ DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438 EBUILD webapp-config-1.55-r2.ebuild 1668 BLAKE2B 19e80e8e0dcfebb72e2507156cb5a5594cd5668e1cc13e54a7a2a6fe88ba0f13d1a01da2b850b5b0bcef3f6b6da66e21d50d15bc9dc881c98ad78e8717272b5a SHA512 d611050b0c187ae9f9058bce03550bb8db23a5ceabe2977ddf61edb77f2f7543cfc8caf6e517513b9eeb9aa30ec91486d1d8bac7a342e6d06001ed7393c23ccc EBUILD webapp-config-9999.ebuild 1777 BLAKE2B e7ad69bc2c4bbcea4ee2de8dbb5af689507b8a42633da9e0b6714deb744b99fe0b4d019d6d92cf9dcc08db0e8cd3c2ba227cc7328a5e1fe97908cf50ca427b09 SHA512 f9b1a38032ec05cfa7e2491aece8cb36d0abd55842b996be1ac2940bbc02ca38725b662c12cd378c571f55dfcaa6eb9d41df8f04fe4ff4b882784a5d35216bfd -MISC metadata.xml 550 BLAKE2B 6343947ab4f689f0c3fbd7610e11e523e52517fd01e9c47ff9354d1ff3798c81c7becc665512c83b1e140c6808a19fe1723783d4de0899e663e45f2d61a1eb42 SHA512 acea14cd44065c7a304e320dd011720ed545b5cbd5285eba9501da1d0db9708b4028e4bf1f672acd83fea7856dbbf0ce145ec022a1f512bbb8ce6890a1aac720 +MISC metadata.xml 437 BLAKE2B 6b4fe82c92da6e29564593a724bdf6a908f35ed0394fc659aad02bd16e6034533912c9d99d5bc37742c2f6e9842d4d6e398d03896a6f791fb2da09c6f522c6db SHA512 0dce006e71329a0609b9b89fab4c57f385782321817e99351417c81c4e403234a7a8fd971b1abecea43a58cb584e41fd87b1a9d697f7c401480a787c2094918f diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml index a644e2509f8c..219d282568bd 100644 --- a/app-admin/webapp-config/metadata.xml +++ b/app-admin/webapp-config/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> <maintainer type="project"> <email>web-apps@gentoo.org</email> <name>Gentoo Webapps</name> |