From 2be230a2a252e8e744f11a8b38e9a0097ddc9b25 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Sep 2022 09:09:50 +0100 Subject: gentoo auto-resync : 27:09:2022 - 09:09:50 --- app-admin/Manifest.gz | Bin 32880 -> 32876 bytes app-admin/awscli/Manifest | 2 + app-admin/awscli/awscli-1.25.82.ebuild | 72 ++++++++++++++++++ app-admin/drush/Manifest | 3 + app-admin/drush/drush-6.7.0-r4.ebuild | 68 +++++++++++++++++ app-admin/drush/files/drush-6.7.0-gzip-mime.patch | 25 +++++++ app-admin/drush/files/drush-6.7.0-php8.0.patch | 87 ++++++++++++++++++++++ 7 files changed, 257 insertions(+) create mode 100644 app-admin/awscli/awscli-1.25.82.ebuild create mode 100644 app-admin/drush/drush-6.7.0-r4.ebuild create mode 100644 app-admin/drush/files/drush-6.7.0-gzip-mime.patch create mode 100644 app-admin/drush/files/drush-6.7.0-php8.0.patch (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 55c0e2669383..b51022ff1669 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index ef5f2c392b2c..c8253ee7b347 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -11,6 +11,7 @@ DIST aws-cli-1.25.76.gh.tar.gz 2270850 BLAKE2B 5c642f9cff01884a7a54c619ff8a174b8 DIST aws-cli-1.25.79.gh.tar.gz 2272740 BLAKE2B f7b411a17d13ab9e2f19c46827d63d47079b6563dd11fd0ecc200256974e1fb45787bd6f92b90248b406622eca163c5a0ed027a7f20de695699b074178316cbd SHA512 3b7986cb43e0c1124e11a70d6d4bfc932919aef4a40f41bbeed27d19659e0de0c69ef8426078d3b3193bbfe43de07fc7df460898426822ca885d6c3497f7c2d1 DIST aws-cli-1.25.80.gh.tar.gz 2272910 BLAKE2B c7735b405a00a32d67b86bc56cdbbebceaf195ea00ab4250bb6ff091778b67d678a8529bbe8e6ef51a7f0f740a575d2a201dd2cd930c6046247eca469a2b4821 SHA512 10cba4c1e7c562b70d685c185af5dc727128882f5e3ed72dc5ed172b9e201f9b3431bf642f0d556855d5db336e5f7c2ddc0517d414a25e96f6bbfa98cae36f49 DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c2626010d60cc11ff66250753f62609eba80053c1d8696cc3184ba9f947f995a8bb95489b01f60a3fa7e1a8cbb4961652c SHA512 4f10de492a56b158d88671c149d4ed4171fbbde8fe84de15a446e31a7d8003a4562439eabd369cb80dcf91987caab6aef05e5b3f5684aeea47ba0d323883c53c +DIST aws-cli-1.25.82.gh.tar.gz 2273453 BLAKE2B 11c307a78df654634a7ae75cc8a7ce7d37697aa9ce792a3ad2b1a250291f2ff3574bea13219c072f223e4f27b7e5df757b49971374a5962f19b57ae00f77cd44 SHA512 90737a8cc9aac60970e705c5637672b74e89278926196c1363252038401e12bcb31672c878d2a3b6f213f5a5aac308e5b170e90342f6d270793aead3c8485eaf EBUILD awscli-1.25.56.ebuild 1841 BLAKE2B 8e87e521eb4464071ec89abd904be4b8056e6be8ed6a4b9aee005c952d5ef4da7e0468e0827e99cf1e460068fa9cff9b974cce96c0e0b87798e5a15f602ec600 SHA512 244149f5d56a3d1f5b4e8fdc3c2a15a4c6357998237cb5a8dc39e66af7aac968d61ba7a5873a10548af57bd08058b18ef3a97b335b42270fa896ecf7bc502f79 EBUILD awscli-1.25.61.ebuild 1843 BLAKE2B 66c1d54d4e61960ab8a897b3b33818dd6266aa1b0bdd52126942546e1eff2a234bbb2f884a21643fac176af1bd26bf068211f788079dcce78177a5dddc6d05f6 SHA512 fac1bd2328e655695a83ea34d19371c2f632386e4a1a12b0ccb05ab3521b932e28bf4deac0aec9c83bbbec17338d2077e841bd0f93315a0c97286ebe21b3d020 EBUILD awscli-1.25.64.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272 @@ -24,4 +25,5 @@ EBUILD awscli-1.25.76.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352b EBUILD awscli-1.25.79.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6 EBUILD awscli-1.25.80.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6 EBUILD awscli-1.25.81.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6 +EBUILD awscli-1.25.82.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160 diff --git a/app-admin/awscli/awscli-1.25.82.ebuild b/app-admin/awscli/awscli-1.25.82.ebuild new file mode 100644 index 000000000000..511be374181c --- /dev/null +++ b/app-admin/awscli/awscli-1.25.82.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +inherit bash-completion-r1 distutils-r1 multiprocessing + +MY_P=aws-cli-${PV} +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE=" + https://github.com/aws/aws-cli/ + https://pypi.org/project/awscli/ +" +SRC_URI=" + https://github.com/aws/aws-cli/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + +# botocore is x.(y+2).(z-1) +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))" +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/pytest-forked[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + # strip overzealous upper bounds on requirements + sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die + distutils-r1_src_prepare +} + +python_test() { + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked +} + +python_install_all() { + newbashcomp bin/aws_bash_completer aws + + insinto /usr/share/zsh/site-functions + newins bin/aws_zsh_completer.sh _aws + + distutils-r1_python_install_all + + rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die +} diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest index 4a204ac4b134..0bc4b51b6282 100644 --- a/app-admin/drush/Manifest +++ b/app-admin/drush/Manifest @@ -1,5 +1,8 @@ AUX array-syntax.patch 2166 BLAKE2B 40c40456ea5f2deacb4f83f74abdb58300a1fd03f93544e05d0e4e58ec266422d5b2cffa0652b49022a6096801d8506779e2da5f11cabfbc2e15fb36f1a78fe1 SHA512 8fb8e243b885a40490b0e55a12e65639879e6adae60f2784e6c960338c9e842bb480d9d18d83c1dd834b8114c37c59a4709881936895faf0c3262878de62414a +AUX drush-6.7.0-gzip-mime.patch 775 BLAKE2B 6ed1f540ecff96f798c6dedb97da136b8f43e46bc5696f8aeedaab2419641880d161562ea04b44cc565bb76a693bf1ac9183d1efefbe1d744977381b45be8a3d SHA512 67002c5653301823b9b8efee4c0c00ef0dda9ca05f516eb13d5a9b82dc5837c28c59fea038f881c90e0313bbcd30ff434d58a1736b00c6be73b8da3c46a9291d +AUX drush-6.7.0-php8.0.patch 3341 BLAKE2B 681c7bef6f7007e52767c4429015791a8ceb1bbc3ca80c7a8a924e880b811433e67485e5211368dbf89f2f03400f960e06395d64fb67d6fbcb8d85a1c0ce08d1 SHA512 73d74911945a1e74c2ef361e0f1cf89656356062fdcb4c1f36ac9a07d7f62bd29488283fcbffbb2f41700a9a89f6273d8203052fbcadada48bb2002a098a64d4 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5 EBUILD drush-6.7.0-r3.ebuild 1662 BLAKE2B 0751cb188decdb40fdadb7262e76f64dd4714969280d6c86fffa244da69548a231f80410db736fe02d9642d6e3af2f865c708d2c6a7d8596e6d11688a4897546 SHA512 9d679410746ed141b629e4aea2af3ef847062740dc8a7825bc0803f42f117f362309e8741f0dea904ae0d115ac6adc8e5cd0488dd71b90ebc6650f04fbf78820 +EBUILD drush-6.7.0-r4.ebuild 1733 BLAKE2B 97f38bdd2d65cef49d74f05fda5d3aa235cd0caf75665c0fbd1b6b759a10413c4e2a2dc40b710007e1b257d692c7791fe67a596e9837e28315cfc7811e22260a SHA512 a3fe8e7f3eeaae6d8e93d9851b5343d06ba4452e5e2f1e8c79fce8240315b8638101e6c80cd72edc05989a7caf53b1387431804c26314b39c5d145b43c7a0605 MISC metadata.xml 532 BLAKE2B c6ca539149d500608519aa982f4a3ef7f8e15b472d5140b8569371df6585c9f80ea57d7802fee00267bfe76290f2b9836be20250472bd261500fd5de84b974f7 SHA512 ec95e30855e93d1d04eac73b3dcf538c2ab38fbeb44acb7f3f7f3c3c04af9a5adba7dc96181cc02f136ffd901e22aab362dadef70aa9f84b0dde78a70bd36716 diff --git a/app-admin/drush/drush-6.7.0-r4.ebuild b/app-admin/drush/drush-6.7.0-r4.ebuild new file mode 100644 index 000000000000..06b318dd0663 --- /dev/null +++ b/app-admin/drush/drush-6.7.0-r4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +DESCRIPTION="Command line shell and scripting interface for Drupal" +HOMEPAGE="https://github.com/drush-ops/drush" +SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml] + dev-php/PEAR-Console_Table" + +PATCHES=( + "${FILESDIR}/update-bash-completion-script-for-2.1.patch" + "${FILESDIR}/array-syntax.patch" + "${FILESDIR}/${P}-php8.0.patch" + "${FILESDIR}/${P}-gzip-mime.patch" +) + +src_prepare() { + default + + # dodoc compresses all of the documentation, so we fix the filenames + # in a few places. + # + # First, the README location in bootstrap.inc. + sed -i -e \ + "s!/share/doc/drush!/share/doc/${PF}!" \ + -e "s!README\.md!\0.bz2!g" \ + includes/bootstrap.inc || die + + # Next, the list of documentation in docs.drush.inc. Note that + # html files don't get compressed. + sed -i \ + -e "s!\.bashrc'!.bashrc.bz2'!" \ + -e "s!\.inc'!.inc.bz2'!" \ + -e "s!\.ini'!.ini.bz2'!" \ + -e "s!\.md'!.md.bz2'!" \ + -e "s!\.php'!.php.bz2'!" \ + -e "s!\.script'!.script.bz2'!" \ + -e "s!\.txt'!.txt.bz2'!" \ + commands/core/docs.drush.inc || die +} + +src_install() { + # Always install the examples; they're referenced within the source + # code and too difficult to exorcise. + dodoc -r README.md docs examples + + insinto /usr/share/drush + doins -r classes commands includes lib misc + doins drush_logo-black.png drush.info drush.php + + exeinto /usr/share/drush + doexe drush + dosym ../share/drush/drush /usr/bin/drush + + keepdir /etc/drush + newbashcomp drush.complete.sh drush +} diff --git a/app-admin/drush/files/drush-6.7.0-gzip-mime.patch b/app-admin/drush/files/drush-6.7.0-gzip-mime.patch new file mode 100644 index 000000000000..53601c80fbda --- /dev/null +++ b/app-admin/drush/files/drush-6.7.0-gzip-mime.patch @@ -0,0 +1,25 @@ +From 48a16a67ec072428339cc165743fedab6264edfe Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Mon, 26 Sep 2022 20:01:41 -0400 +Subject: [PATCH 1/4] includes/drush.inc: support application/gzip MIME type. + +This type is actually registered, as opposed to application/x-gzip. +--- + includes/drush.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/includes/drush.inc b/includes/drush.inc +index f869b37..a748a0c 100644 +--- a/includes/drush.inc ++++ b/includes/drush.inc +@@ -930,6 +930,7 @@ function drush_file_is_tarball($path) { + $content_type = drush_mime_content_type($path); + $supported = array( + 'application/x-bzip2', ++ 'application/gzip', + 'application/x-gzip', + 'application/x-tar', + 'application/x-zip', +-- +2.35.1 + diff --git a/app-admin/drush/files/drush-6.7.0-php8.0.patch b/app-admin/drush/files/drush-6.7.0-php8.0.patch new file mode 100644 index 000000000000..33a4ee7ba98b --- /dev/null +++ b/app-admin/drush/files/drush-6.7.0-php8.0.patch @@ -0,0 +1,87 @@ +From 7be49f4d78111372fc58d91132daf6c4230b08ba Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Mon, 26 Sep 2022 19:08:09 -0400 +Subject: [PATCH 1/3] includes/drush.inc: replace create_function() with + function(){...} + +--- + includes/drush.inc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/includes/drush.inc b/includes/drush.inc +index a748a0c..7b8dda3 100644 +--- a/includes/drush.inc ++++ b/includes/drush.inc +@@ -987,9 +987,9 @@ function drush_tarball_extract($path, $destination = FALSE, $listing = FALSE, $t + // Remove the header line. + array_shift($output); + // Remove the prefix verb from each line. +- $output = array_map(create_function('$str', 'return substr($str, strpos($str, ":") + 3 + ' . strlen($destination) . ');'), $output); ++ $output = array_map(function($str){ return substr($str, strpos($str, ":") + 3 + strlen($destination)) ; }, $output); + // Remove any remaining blank lines. +- $return = array_filter($output, create_function('$str', 'return $str != "";')); ++ $return = array_filter($output, function($str){return $str != "";}); + } + } + // Otherwise we have a possibly-compressed Tar file. +-- +2.35.1 + +From f118117814ef690ec71f484dc3c4906f82d9c726 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Mon, 26 Sep 2022 19:32:13 -0400 +Subject: [PATCH 2/3] includes/backend.inc: replace usage of each(). + +--- + includes/backend.inc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/includes/backend.inc b/includes/backend.inc +index d004850..0ca010d 100644 +--- a/includes/backend.inc ++++ b/includes/backend.inc +@@ -355,8 +355,8 @@ function _drush_backend_proc_open($cmds, $process_limit, $context = NULL) { + if (count($cmds) && (count($open_processes) < $process_limit)) { + // Pop the site and command (key / value) from the cmds array + end($cmds); +- list($site, $cmd) = each($cmds); +- unset($cmds[$site]); ++ $site = key($cmds); ++ $cmd = array_pop($cmds); + + if (is_array($cmd)) { + $c = $cmd['cmd']; +-- +2.35.1 + +From 7d718639b68bd09c262005cff133d24ffdf800f1 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Mon, 26 Sep 2022 19:36:29 -0400 +Subject: [PATCH 3/3] includes/environment.inc: default fifth parameter in + error handler. + +The fifth parameter was removed in php-8.0: + + https://www.php.net/manual/en/function.set-error-handler.php + +We now default it to the empty array in drush_error_handler(). +--- + includes/environment.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/includes/environment.inc b/includes/environment.inc +index 7837104..8f2f414 100644 +--- a/includes/environment.inc ++++ b/includes/environment.inc +@@ -24,7 +24,7 @@ define('CONSOLE_TABLE_BASE_URL', 'https://github.com/RobLoach/Console_Table/arch + * Log PHP errors to the Drush log. This is in effect until Drupal's error + * handler takes over. + */ +-function drush_error_handler($errno, $message, $filename, $line, $context) { ++function drush_error_handler($errno, $message, $filename, $line, $context=[]) { + // E_DEPRECATED was added in PHP 5.3. Drupal 6 will not fix all the + // deprecated errors, but suppresses them. So we suppress them as well. + if (defined('E_DEPRECATED')) { +-- +2.35.1 + -- cgit v1.2.3