diff options
46 files changed, 1232 insertions, 125 deletions
@@ -1,23 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -MANIFEST Manifest.files.gz 29282 BLAKE2B 470bc9f4af12cf73885a82bb415ea703d48458790f29d035d8eacf6a413ee20a8d3178332da38cf447ad895fa14990ffe8b18c7c84057840022896b070c7f4ef SHA512 32ee16e3199a3b36cedd0f17dccf0f2e2436e6aa91f6f1641a95d8298146077f2f15fece647e0e818e74981c9ffeb55a77a121b44360376837fcf8e4675c1e71 -TIMESTAMP 2023-08-31T20:40:01Z +MANIFEST Manifest.files.gz 29281 BLAKE2B cf7609251b4a4a6cc43fb634101780651d08ed8700cc51597eed6a95c809e1d71d73951a2f8bb705ee960cfd4177e6189d02d587bcdb07edd934eb6d727538d0 SHA512 238446b69e6311a5326e474e3f1aefa367bb8506974c2f1bf33e6c8801e3c4f8aed29b5d2c718a93effe5690ce345f2ee08783d20eb2c60abefdef45248db454 +TIMESTAMP 2023-09-01T02:40:01Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTw+qFfFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTxTwFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klANWA/5AQ++vyphGpR7PzgUrJNNwCh5fQU6rEbywpFXTaP1QGdqMtsOLioHQK9S -sPqJF6mF7FQEADxZsHLdNvDAhGgWLdzcKPjCzkQ/x4EeNsdtQzbPkgX30CcvmWq2 -ROtNbdm9I+qQTZ0nr5L0RmvryP6SMbc8+ppVZMMrehryjXAawYrHL/SZzrF+tVAL -/MMJ3qpWL689mtQHcarGfyeTzVYaXuz+hjh4QJjSmxArx0+HyyABcpf7fgPoNhRz -USM/CQqh4zPWqx2WCNRakmtaZFTv9bkvX0+yGneYbUqW8isoF8AEZiMEQ12CXhuv -mnVcO9P9uEejSfsUvd+Z3gnkGoI1excfMhxD3eSNh7HOcSFSaQXcnkOBf5jGbt3+ -tQSXbjSjcjS1ADTBF/gWMH7y48Xiz3nUUSwhTMyd9uUTbZm9meVrFm0rbh60xMuP -EmOAyTSz/OFt4Kwxsep/WD9N7K6pYe2+i3RTj+NzIPVh5LVZ8wtJNz5aQESVNbWH -OwBFaK6eAdQ/MR9X//0zp/SgzJ8BdGuZciCuDMmhPxjDmYoV7fBLfk6vn3vi2a1B -nE4LuzzFQ0D17KuskcYtPoSxqqnvY/B1vWqeBUdj6sRgO/h9abOLnB9kcWTPkc9M -it24z2gcf7jj+hf0x2GOhAclhQ5SvkGVXq9vSjDnn0aNvv6zXT8= -=1IYB +klBboRAAhLaeuAj2/xRUAHXufHRVtLQSuJTcx5R9AknJMNBX8JHMuWwEa+PNldXv +jPHJwFC9ckAmeD4TkBmREm//CCwMhY31aC1aB2jYo36zKUgMPXG9OCJs/zmTkpT6 +mw3qg+JgHhgHSVCrhFR960xLJOOlzoUl+p4yqsj3iQQQGX+Mw5gZJHfjcAL1dVm0 +tNwugXGiCeXOn3ewa5SU6GxIgLXcc6DTx4ksDJW7GWK/kK/zmjbKbKrXsfUh83xx +vgllkDnXXUuVmWYmy7PJGeub2aRAYV6GPM9qeql+5aExzIERYrtbifdmURdfdVqk +2UxtBWeurYBH0GdQNcdZeEBZRMQe1nVO5Qgjk7yfb3LzzVGqDZAKIDWVo3z/l0gN +rMmxM9ABXAIK4BdQjo3D34HqdG/n8izoWVH00jnTF0b4iGQ6Ee8XeHdpFqNePLzd +47LSD71md5B97O01JYORYcDiYPzPEZfjYwHFWsOr25qpXVBVYPqjd40VgupOce6C +mxFvjfj/05ZdBeXkXmRDt0GvXGCbv2iqdy43E4ar8/zJvvUxTGWB2fSBjJFycaLE +kQCsbqo0nZc+XpItP8p6TBXX3IYiSoLMJeRV9NgPmFK3D+SrCkVNsyXSyzx3DxVe +IicDKADidr7qhBTqNzVOfSOrUzJrVQey7IT3XlPSftf3FJimcPE= +=KG4i -----END PGP SIGNATURE----- diff --git a/Manifest.files.gz b/Manifest.files.gz Binary files differindex b4aec2637ebd..fc3714496e7c 100644 --- a/Manifest.files.gz +++ b/Manifest.files.gz diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz Binary files differindex c8473cddc8a8..2da27763c498 100644 --- a/app-emacs/Manifest.gz +++ b/app-emacs/Manifest.gz diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest index a8b085dd3b30..575f30a3609d 100644 --- a/app-emacs/markdown-mode/Manifest +++ b/app-emacs/markdown-mode/Manifest @@ -1,9 +1,9 @@ AUX 50markdown-mode-gentoo.el 252 BLAKE2B 1b718b5fb40ac043f74647d1bbf344bf07a63e530bd4ab3a52231c148b3bf824815a5e15482481ef4a9a183acc8894b9edcf3726af270dcbcfd9b42d502105b2 SHA512 403f80133fddcd2647d1e0c077628bb984e33b89dd68fdee05f87a13aa6b89e344c76944d3885789789884e7298dc9c1ced716fe721b1b2ed6dcf9bbb0f24f91 -AUX markdown-mode-2.4-markdown-command.patch 728 BLAKE2B 4ad9e86528da9cda91871fe2fb4f94d753ef348c35384bc30305cb369197d4c038d0e76c904da6da38887562fbfbda2c78ba1869d9e34f12f7bac77ff0468304 SHA512 a99f6e91e58570e8141c7ca2f90fa4e5009cf57a2fc3e6c7e5b4a916932e1838e1a46ecca40e36de87f0c33115f024ae1fb2d50eca6031374bd18bfce7c7ee33 AUX markdown-mode-2.5-markdown-command.patch 680 BLAKE2B 16e8c8f8225ee197aee2d112b4a6c26a22435d5f167140234afc78b5ba4a1f581270da293b6602a22c90f01f08ac710739b7d0df4632b71976129d0548c8c95c SHA512 25a9e93eee6692f7ad55dc494c2a8b3400062ae6ffebafa21b091e32dfc877c2d39974282f4f3b64dd5e1e5376e449cec1fe204ce3948316457736d8a546c032 AUX markdown-mode-2.5-test.patch 1314 BLAKE2B f238a3bf1426845c83d7882fd745350166cd5cf3721a4f7611619b73c720ae2e4435e7c14b379d3399d3fe21f258ec0368be44ccee87d0da0391d3401496b14f SHA512 87c7a633d9f0fea730d29f240824224a8569fbc4dd9337e40838000b4aad7a056fc0779965b5c2b6b436d6b7fafdf221dac1374df9fccfb807fdc53a453e2f38 -DIST markdown-mode-2.4.tar.gz 211229 BLAKE2B 49a369d1b418634449cdac3103e1b107b5dd839edba6a3329539b80cf21bfb0f01aa436ec6deb256bfb5f03ef73b716943730adc4a87b52262dfccbd7923556e SHA512 8bf2acd7f402c036c57521340d26cea150935964f04f1343c2e17147d63226c815150be62c0b79a2ba48e55b3155d94f38caf1ec43c21d4f32dee6e73cc261a0 +AUX markdown-mode-2.6-remove-failing-tests.patch 3583 BLAKE2B 124dd5cef93dd507e3c90718c1c03d8834c5012dabd75d9391be8b918cb7b230ce5f9797236b91f79dbcb09d8cb1bc7d049fd5778d81590d792b24be0c1b5344 SHA512 5edefbd4109e485a0e91fdbd10287ec6bc8c0353aec427b22feae84fc6a1475b60a53226e30d1529ed2ecf9353ad26af5e8cda532943e08d1d3332b00e5236ac DIST markdown-mode-2.5.tar.gz 218329 BLAKE2B ea4f3e316383951c00e6a68e388db228567b7a06ac87bb268f28c026a8518e9a8516f27d137c79c24727bd71c785a6e9f1217d160e472abc7bdba2c5bda17f16 SHA512 6bb4d79a5a4c3d3891fc8be4d357fa6dccae9f3eeb8f6c04f840da6cfe6875090ebcc0b1a74961e2a4ac1a59389781fa37ef2420383019983705c2cc66db5b8e -EBUILD markdown-mode-2.4-r1.ebuild 694 BLAKE2B 51fad8b8a0aff638419404ec87303cd9d1d1feae82a15d4112e1133a61d747bb64c59302491010a8d20370471f6d69deb14d729f056cd81d4fce45a9ca330e05 SHA512 bf1669c8608c707f3e4ccce9ef8ab67469b012b2375919513df011e067b6aaec3fdf23c4a4b85ca27fdc4fb1a276474022f186aa8f1da1e16435c91d1c111206 +DIST markdown-mode-2.6.tar.gz 222181 BLAKE2B 173ba3e152bc4fa45548833bbf87e4e00a56fa2150874b8c3ef395e8364cabeebbe7ab1e582dd55bd531b2a130191b3e79db410b126b6edc8f0573f742b47a33 SHA512 fbfb7a98bb0c562d501d6b1c40987751233ccf386864db43296e02bcaf7d2b8c8d634f1411b91662947e90f33466728101ec0018d2abf46df936f7b19a79b371 EBUILD markdown-mode-2.5-r1.ebuild 938 BLAKE2B 14e002ddccd8e50ebd69a8ff0dd624ce9c4f3b624c483d844eb26318199085907f056c384e7990d37cfca27160cd2896f31ac3bc637dcca72905a6cb7bd17eb3 SHA512 c80a615a239651364f825648dd3158da7da9c5e572620ab5edeff0765b1d1a46d973bb1723681a52507ee44a014a7d759852dd789679e300d5d13f4290f4f651 -MISC metadata.xml 477 BLAKE2B 4bb74aa04027605e0346a684271091a4d5f11929eab118dd7f5ed0f4292de563903cfae69242a459c8ba51f99135ffa09e021238478e9c6b38bee2e6cf52f882 SHA512 b3be952d7a6e47c5957ee6c7342eef5cfd8ad39d0d9dd0920797fccca36525b4f60dd621bcb4587e0ab63e64c067c7a8e97f498d84b3b8370595ec817fc07903 +EBUILD markdown-mode-2.6.ebuild 1106 BLAKE2B 1b3da6022d821ee389e8ef873349a86d98c321cbd16cfedb8f969e02e4b4d4b0cd5c890c25d008d846329c64a5d8085bcf1e407aa898c7f2ae475032e28723bf SHA512 8ad57f16088b440a84cc97e6ec9da37a522603c95e2811b4e0b2a3cd7bdaac9dbaf2a351a2a89629ecfc9818f518a9a6ce2e1e30a156f4b37127655e52de484a +MISC metadata.xml 570 BLAKE2B 75359fd9f3254df7c71f76bd6c83b469eb57488c0b0aa9ea4fe582699354f75e05b3499d9ea977ba7438caa234358a564c22a060945aac7a6a1c05ae119e7720 SHA512 18954ffedc2e688bd7eb61e407c685220a002564c4376e24a390ed7eddd8385f285e3b8b49edac7702b8fde5d884ea1c92da4275ec8ff091423c7ae691f86327 diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch b/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch deleted file mode 100644 index 1ae481d6c094..000000000000 --- a/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch +++ /dev/null @@ -1,14 +0,0 @@ -dev-python/markdown2 and dev-python/markdown install their commands -as markdown2 and markdown_py, respectively. - ---- markdown-mode-2.4-orig/markdown-mode.el -+++ markdown-mode-2.4/markdown-mode.el -@@ -90,7 +90,7 @@ - :group 'text - :link '(url-link "https://jblevins.org/projects/markdown-mode/")) - --(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc") -+(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc" "markdown2" "markdown_py") - when (executable-find cmd) - return (file-name-nondirectory it)))) - (or command "markdown")) diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch b/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch new file mode 100644 index 000000000000..4d1396dcb12e --- /dev/null +++ b/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch @@ -0,0 +1,91 @@ +--- a/tests/markdown-test.el ++++ b/tests/markdown-test.el +@@ -6756,46 +6756,6 @@ x|" + (markdown-indent-region (line-beginning-position) (line-end-position) nil) + (should (string-equal (buffer-string) " #. abc\n def\n")))) + +-(ert-deftest test-markdown-ext/wiki-link-rules () +- "Test wiki link search rules and font lock for missing pages." +- (let ((markdown-enable-wiki-links t) +- (markdown-wiki-link-fontify-missing t) +- (markdown-wiki-link-search-type '(project))) +- (progn +- (find-file (expand-file-name "wiki/root" markdown-test-dir)) +- (unwind-protect +- (progn +- (markdown-mode) +- ;; search rules +- (should (string-match-p +- "/sub/foo$" +- (markdown-convert-wiki-link-to-filename "foo"))) +- (should (string-equal +- (markdown-convert-wiki-link-to-filename "doesnotexist") +- "doesnotexist")) +- ;; font lock +- (markdown-test-range-has-property 1 11 'font-lock-face 'markdown-link-face) +- (markdown-test-range-has-property 14 33 'font-lock-face 'markdown-missing-link-face) +- (markdown-test-range-has-property 36 42 'font-lock-face 'markdown-link-face) +- (markdown-test-range-has-property 45 60 'font-lock-face 'markdown-missing-link-face)) +- (kill-buffer))) +- (progn +- (find-file (expand-file-name "wiki/sub/foo" markdown-test-dir)) +- (unwind-protect +- (progn +- (markdown-mode) +- ;; search rules +- (should (string-match-p +- "/wiki/root$" +- (markdown-convert-wiki-link-to-filename "root"))) +- (should (string-equal +- (markdown-convert-wiki-link-to-filename "doesnotexist") +- "doesnotexist")) +- ;; font lock +- (markdown-test-range-has-property 1 16 'font-lock-face 'markdown-missing-link-face) +- (markdown-test-range-has-property 19 26 'font-lock-face 'markdown-link-face)) +- (kill-buffer))))) +- + (ert-deftest test-markdown-ext/wiki-link-keep-match-data () + "Test that markdown-wiki-link-p keeps expected match data. + Detail: https://github.com/jrblevin/markdown-mode/pull/590" +@@ -7185,41 +7145,6 @@ foo(bar=None) + (cl-loop for ov in (overlays-in (car bounds) (cdr bounds)) + thereis (overlay-get ov 'flyspell-overlay)))) + +-(ert-deftest test-markdown-flyspell/check-word-p () +- "Test for `flyspell'." +- (skip-unless (executable-find ispell-program-name)) +- (markdown-test-string "aaa +- +-``` +-bbb +-``` +- +-ccc +- +-`ddd` +- +-eee +- +-<!-- fff --> +- +-@ref9999 +-" +- (flyspell-buffer) +- (search-forward "aaa") +- (should (markdown-test-flyspell-incorrect-word-p)) +- (search-forward "bbb") ;; in code block +- (should-not (markdown-test-flyspell-incorrect-word-p)) +- (search-forward "ccc") +- (should (markdown-test-flyspell-incorrect-word-p)) +- (search-forward "ddd") ;; in inline code +- (should-not (markdown-test-flyspell-incorrect-word-p)) +- (search-forward "eee") +- (should (markdown-test-flyspell-incorrect-word-p)) +- (search-forward "fff") ;; in comment +- (should-not (markdown-test-flyspell-incorrect-word-p)) +- (search-forward "@ref") ;; pandoc reference +- (should-not (markdown-test-flyspell-incorrect-word-p)))) +- + (ert-deftest test-markdown-flyspell/remove-overlay () + "Test non-dictionary word in code block with `flyspell-mode'. + Details: https://github.com/jrblevin/markdown-mode/issues/311" diff --git a/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild b/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild deleted file mode 100644 index 7a01a0643196..000000000000 --- a/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit elisp - -DESCRIPTION="Major mode for editing Markdown-formatted text files" -HOMEPAGE="https://jblevins.org/projects/markdown-mode/" -SRC_URI="https://github.com/jrblevin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="|| ( - dev-python/markdown2 - dev-python/markdown - virtual/pandoc - )" -BDEPEND="test? ( virtual/pandoc )" - -PATCHES=( "${FILESDIR}"/${PN}-2.4-markdown-command.patch ) -SITEFILE="50${PN}-gentoo.el" -DOCS="CHANGES.md CONTRIBUTING.md README.md" diff --git a/app-emacs/markdown-mode/markdown-mode-2.6.ebuild b/app-emacs/markdown-mode/markdown-mode-2.6.ebuild new file mode 100644 index 000000000000..62b49e2f34bc --- /dev/null +++ b/app-emacs/markdown-mode/markdown-mode-2.6.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp optfeature + +DESCRIPTION="Major mode for editing Markdown-formatted text files" +HOMEPAGE="https://jblevins.org/projects/markdown-mode/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jrblevin/${PN}.git" +else + SRC_URI="https://github.com/jrblevin/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + || ( + dev-python/markdown2 + dev-python/markdown + virtual/pandoc + ) +" +BDEPEND=" + test? ( + virtual/pandoc + || ( + app-text/aspell[l10n_en] + app-text/hunspell[l10n_en] + ) + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5-markdown-command.patch + "${FILESDIR}"/${PN}-2.5-test.patch + "${FILESDIR}"/${PN}-2.6-remove-failing-tests.patch +) + +DOCS=( CHANGES.md CONTRIBUTING.md README.md ) +SITEFILE="50${PN}-gentoo.el" + +pkg_postinst() { + elisp_pkg_postinst + + optfeature "editing Markdown source code blocks" app-emacs/edit-indirect +} diff --git a/app-emacs/markdown-mode/metadata.xml b/app-emacs/markdown-mode/metadata.xml index 32cca32a7253..b2e9a0fad2fd 100644 --- a/app-emacs/markdown-mode/metadata.xml +++ b/app-emacs/markdown-mode/metadata.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="person"> - <email>naota@gentoo.org</email> - <name>Naohiro Aota</name> - </maintainer> - <maintainer type="project"> - <email>gnu-emacs@gentoo.org</email> - <name>Gentoo GNU Emacs project</name> - </maintainer> - <stabilize-allarches/> - <upstream> - <remote-id type="github">rblevin/markdown-mode</remote-id> - </upstream> + <maintainer type="person"> + <email>naota@gentoo.org</email> + <name>Naohiro Aota</name> + </maintainer> + <maintainer type="project"> + <email>gnu-emacs@gentoo.org</email> + <name>Gentoo GNU Emacs project</name> + </maintainer> + <stabilize-allarches /> + <upstream> + <bugs-to>https://github.com/jrblevin/markdown-mode/issues/</bugs-to> + <remote-id type="github">jrblevin/markdown-mode</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz Binary files differindex 77ec609cf16f..86f30ad8e2e3 100644 --- a/app-text/Manifest.gz +++ b/app-text/Manifest.gz diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest index 94cdf66a8136..39472fef3ce5 100644 --- a/app-text/pandoc-bin/Manifest +++ b/app-text/pandoc-bin/Manifest @@ -1,13 +1,13 @@ -DIST pandoc-3.1.3-linux-amd64.tar.gz 28685814 BLAKE2B ecbc685d45ced12f69223ceff4914a876fa631866eb304ea58ab1623a9569de708cc8b85c403881e1f53dfc559885409329dd13cbadc88afb52c490d9c61fb0e SHA512 f97e62154ceeaf47c6bc2b8c28008ff4a30392b9162b387e4181097c359d0244b8c6435c88fcd587eb210612fb274d639bb2058bc565a8400c2fb6cdeda45b8a -DIST pandoc-3.1.3-linux-arm64.tar.gz 30811766 BLAKE2B 5d5807ea6de49fe87b31f51754d70f781fbd27111980bb14eaafd985a53f7e4fa1c7c0dd66d041184194d5b6a74a429e78b8a0913532645d29b47dbc82e154fb SHA512 6bb8b658e2ea3c96e5781754618104086268dbad45bd95ed7474842993c57cbd18ef1bb909556a1aef118589624d431b17454cd76e8b44dbe441e463e6332a1b DIST pandoc-3.1.6-linux-amd64.tar.gz 19664028 BLAKE2B be9dc7651001bd4f59639cd6a8a809f57b0a58e52259c568a1044808269002bb930fc76661b7da4ac5a8617181ad57818b04ebecce49da6626b6eb579822199f SHA512 202ba9dee38c0c074584513064dbb4f44165342751fa4295b3a19dcba5e37c77f3eec89bc77bbecb0b9797103af2ca1fd22a60ae9b4115657e24258a05bad2fa DIST pandoc-3.1.6-linux-arm64.tar.gz 21780669 BLAKE2B a3715890a8139f8631f8c7c7170d10e262f044e70b1383317fab063cf9dba2455090c30913617d93710e0054f0133afbec5980abd36b6c729c6b99bd7375521e SHA512 615a403070aae7722e2b939a940602ce01f37cd00f6621925b59939fe7ceae73031ac23ee94bcb1e6f6ab12a2b570b81cf5baa55808d503677511f238e30f880 DIST pandoc-3.1.6.1-linux-amd64.tar.gz 31085424 BLAKE2B 35cdd4e9671720d9f77133791a197ba85dfcdb137ab7d3d9247eb5dabdc287729059633f43f1f42f6636799f3d7379e6bb8b81b4b2a9773520fff819c363bb88 SHA512 cbfeb7444aaac22fcc75e31c09888da4e67cc20acb1a75e4d24c07ddbcd9ea516cdcf19088c9e4f308e2325a76591e20322a9264ca641a2f80dd7a385d5c8c06 DIST pandoc-3.1.6.1-linux-arm64.tar.gz 33743040 BLAKE2B d6e70616ce8e61e31d2da6aeb6097e464d1b410f9caae8550846ee238a39c3f1fee93d4c18501cdebfc7b3142be9a691fdf2bf15b38b6184ad491df6cee17d22 SHA512 552bfb504d2e03ffbb3e46c67fef8056d073821b141e97b32248d77b569c752a13f69cba4c0e3a4fdf340a14ff3a1b1e2337e8545ac41fcf4f8a76c6e2e10bb7 DIST pandoc-3.1.6.2-linux-amd64.tar.gz 31164360 BLAKE2B cdd787a2c6b2bac3a9a1a3d6a216e5279d83385a61fd0c61d643744214564f81274dd380402c46ab2938f7bb0a11aabb9a6c99b31b63962c8a2fe043fba41e5c SHA512 b81c708d60cb46a98377af374de0f9b7b5eef38f9cdd8e5490d1072627f34c226e8e2f03f172c4c87e5f2164794cef1b3e39598f86de3e45cb0396ae9416359d DIST pandoc-3.1.6.2-linux-arm64.tar.gz 33827200 BLAKE2B 710829bbef6764a3a373a75d29dc39b843de225bf71d25da2875cb4e85dc4baa30be5879e0af5d3d8810efb92bad95f2595d04c6cb0135fb96c600bf7031f352 SHA512 d4bf649d8a055ed3df52e19caf2424dc7e57d48182e9784bba2f9c7d6ebdd08b329c36fb26a28e6362bb5b24a39ea71f2604a64af471ce6245f464cafb6657cd -EBUILD pandoc-bin-3.1.3.ebuild 1399 BLAKE2B a6716e82b27390fb9a81b0116aa39330c11812ba180679e38bd1ff34003b2332f79a888f9828c610a2e29e95e67ca6f3592fab9cc743ae8f7e43294d4adc135d SHA512 ec789ef8addcbbb01777b2e49b4ada887ca614dc437e173e165fe1dbc7542c215597b784aa10687dd6c088441c990c264e9be189e3b479aecb642bd5e190a631 +DIST pandoc-3.1.7-linux-amd64.tar.gz 31182797 BLAKE2B 5d474dd9dadd37b561c70deb8a944a51bf30917dbbdd5778c8b0d543af08ff2621b033825b7128021020fd0c6b5c35163a42c301e75fdf4c68621deb900dc90f SHA512 72a84ee2ad5e3052d46150ac67b7fa7fc5e9ccb11ee86b9a819707dd319ac38b2a31fe069df4b2f548d239b7989bae660250e1666c7f90d83d8027587d8b5e08 +DIST pandoc-3.1.7-linux-arm64.tar.gz 33851504 BLAKE2B 3ef6121e1c51b0ce1cdca4b8665085072d1143f6ceb985ce2baff9e2bd9bcd2d797c231154a4960d8ddd578bc13311b20e505a2513e90a69b7dd37c0d298cafe SHA512 cbfff5666be1dcc62046d108754daaaef93c91f1d3e3eb28ee1e5f564e6b200919582448e0eca5cafa7db092bda82091b0a152c331b8b642e27191f393816835 EBUILD pandoc-bin-3.1.6.1.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf EBUILD pandoc-bin-3.1.6.2.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf EBUILD pandoc-bin-3.1.6.ebuild 1399 BLAKE2B a6716e82b27390fb9a81b0116aa39330c11812ba180679e38bd1ff34003b2332f79a888f9828c610a2e29e95e67ca6f3592fab9cc743ae8f7e43294d4adc135d SHA512 ec789ef8addcbbb01777b2e49b4ada887ca614dc437e173e165fe1dbc7542c215597b784aa10687dd6c088441c990c264e9be189e3b479aecb642bd5e190a631 +EBUILD pandoc-bin-3.1.7.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375 diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.3.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.7.ebuild index 254155b50637..f5289c741e6a 100644 --- a/app-text/pandoc-bin/pandoc-bin-3.1.3.ebuild +++ b/app-text/pandoc-bin/pandoc-bin-3.1.7.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="-* amd64 arm64" +KEYWORDS="-* ~amd64 ~arm64" IUSE="+pandoc-symlink" RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )" diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz Binary files differindex cf557e3e3a73..91df8cc87703 100644 --- a/dev-python/Manifest.gz +++ b/dev-python/Manifest.gz diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 73f60f04ba1d..8123cb673d89 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,6 +1,6 @@ AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e DIST setuptools-68.0.0.tar.gz 2194111 BLAKE2B 614a1c69f640ce8d0e510c444e058fecd3810421983a03cd345e43e1148799bed7e5d53ac689a4fe3ce3174d16f2bb719236bd5442b5f06ffc7659d0f4c7d15f SHA512 da6d535a0db6eaf477c8c2148efbc2100fd88a14f3adad44d20e22bf52bee3f00fe86547ea650fe653519bd6ff5f9ef033a55bb3a05fed041e88e78cdfb81d7e DIST setuptools-68.1.2.tar.gz 2198001 BLAKE2B bd21de32246eb7bd17289536a65e87636c39d8d7712dffa61b07b052fa7e9020fc06fe2de294a4e4782738c4385ff31e6552a6d3f403c3b1da98ea07405d57e8 SHA512 a5a84102ce72f38162b190b91286013cb8660b45f383df04fba65e38c658a5c5b93cdf05f789436618fa596b3ca6688a7c54d31d6d10b729124d3b135660c328 -EBUILD setuptools-68.0.0-r1.ebuild 4325 BLAKE2B 07f42a47d632ae96d454e8b76758d9e17d11e3dc61040d1167b623e8ec67b533b1264b1d1519a7d302e799f98ced90844670a1082c1bf360fc2159204bf1c99d SHA512 a18d93000cc65606c33047cf8931dc8a852b6aa8b026f289e496398ed778074276fc32add0a753499ed0297bf25d9acf98af9f6a3d9319cfe700a1f085059dda -EBUILD setuptools-68.1.2.ebuild 4412 BLAKE2B 4c91d5971e3e5e40ccd2dd4436a2d6cc87fcedd840e9bba9637d59d3b33a0b95b3ee55949760e4b715fff8a233aefcbfea7665aca808e15fc0687e9a75a66fee SHA512 d46bda6128e9441658710a0cefd00fe6c433026e6e172573ccee2a0eba3e9cfc68be4db4f2ab62504e18a9bc3ce1285aee856683ba035ea52387119a2d19a4f2 +EBUILD setuptools-68.0.0-r1.ebuild 4456 BLAKE2B 249c8d27968e451b7b6482e002446aaddbfb37201c7e0d9796046f967eeec65e347e758a810fb8c9799bb1361b51041ff1b50135666238be31b50577022bf8e1 SHA512 2d4ec9f8e57fd7d0a703b20c30b6945ace080fa4b39b7f8051261e01a4cce4168db9e6616bf3f142bb9b082a7c56971558329e4125f1b9df184c19cc3de810fc +EBUILD setuptools-68.1.2.ebuild 4543 BLAKE2B e0325d40f4219cd6a8f4704ebc7128d29e15df7c8ede7b338aecfaae489d53f6fe4c83ea711f5fb11f19e3e09c5d708e47f72d4596301fb57dc5d073f2a4c16c SHA512 e13937d2000294a29bebd6ca1202d7eeff7fc4e6b0b70ba0768ddf69f1ddba35c59e7281227907827343856df3a0002aac6b5904142ba17277bc3aa9b93bade8 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319 diff --git a/dev-python/setuptools/setuptools-68.0.0-r1.ebuild b/dev-python/setuptools/setuptools-68.0.0-r1.ebuild index 6490d47fbadd..3f796e7f5584 100644 --- a/dev-python/setuptools/setuptools-68.0.0-r1.ebuild +++ b/dev-python/setuptools/setuptools-68.0.0-r1.ebuild @@ -56,6 +56,8 @@ BDEPEND=" ' "${PYTHON_TESTED[@]}") ) " +# setuptools-scm is here because installing plugins apparently breaks stuff at +# runtime, so let's pull it early. See bug #663324. PDEPEND=" >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] dev-python/setuptools-scm[${PYTHON_USEDEP}] diff --git a/dev-python/setuptools/setuptools-68.1.2.ebuild b/dev-python/setuptools/setuptools-68.1.2.ebuild index 472b35c2a51b..dff9ddb41cae 100644 --- a/dev-python/setuptools/setuptools-68.1.2.ebuild +++ b/dev-python/setuptools/setuptools-68.1.2.ebuild @@ -56,6 +56,8 @@ BDEPEND=" ' "${PYTHON_TESTED[@]}") ) " +# setuptools-scm is here because installing plugins apparently breaks stuff at +# runtime, so let's pull it early. See bug #663324. PDEPEND=" >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] dev-python/setuptools-scm[${PYTHON_USEDEP}] diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz Binary files differindex 40c127b18b3e..17bdf4edab5e 100644 --- a/metadata/Manifest.gz +++ b/metadata/Manifest.gz diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index dc1155ab6a4d..f55d1f0f9996 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Thu, 31 Aug 2023 20:39:57 +0000 +Fri, 01 Sep 2023 02:39:57 +0000 diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest index 02cc96f6d010..ae4c5f47e8c2 100644 --- a/metadata/glsa/Manifest +++ b/metadata/glsa/Manifest @@ -2,22 +2,22 @@ Hash: SHA512 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a -TIMESTAMP 2023-08-31T20:40:00Z +TIMESTAMP 2023-09-01T02:40:00Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTw+qBfFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTxTwBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klBtRxAAnTS3iYWMW9tlWD78EEg8B53PWha43b483B205V1SGdrJsgGDcqYzf2vZ -iDuyNQa54eut1BMxAIBOu3LRyXPjDvxu8F8lJQ3IyTkx1VasvhjfNA3ZPXvVNxIJ -bjZvsWxKMChb4KBFwz7IMUBZgjYgiXQSm81j/4C1KEKgcwT3vTkfP0TTF90DMKDV -/A2DEQzXLjyq0unHpJo/H6rsG6lZf0Z2DB3RxwS9XaX8GsN3Q2nEi6zIXpmwsHKO -L3joJ4kB5Z+w0xcnHzPdJmDdmMLcd8VTrwrveWFBgcE4FzHpgrECMNzF9yiA1EgH -oCA97EIEpDxAI+RXxss5fxoNUyz3VOU+z5SllnzI+8SuE+2v6sHWergCsxekYBhL -JEnRtuhkF/XL6a8M4Wdk5b3SLc7iVrKqPBIHX5Jd5Bz8Fza1bqX+0P1EepXxVEpz -VTD4arIZXB2PIDgChw4K1M5200jlvWvu5UfTl25eqVzuLQyj+sGrstgY3FVTR8EQ -04Mp6LhhK9bdx/oLD5G+fMt9cTseWBGLUKJeF9Dd4ZO5EfwlrmXxKJYUFYrYSKuA -7rApxUVRwCNWV9DMwaTbgGBeMBRdjayviHrwDvB3+8ucc8DvTJDkdAU2v3Ag1xaC -a22ufIRFiflCie+F3zmTLGlUFvVirMvLHEHWdR8Lqa3MDV5WudE= -=rKA8 +klD3RA//TvJhP739NViD4r4YelbUEc6mkRxr8rosHXyNqaRwTDlXsZQhi7jidyQd +g7LF47CV3GBPTkPgUZKdg734f0ICl1X3pRwr7UK3U7Qf0ryCDctr7KUHSrLJ/h6W ++MQzSfR1xEcDsilWEbBrWN7YZLYWx77Ou6x1ysXv1fcpiSKmKkrP4+l3nUsD5ljy +q+Lvw/muW8CMrVuPoR9Zl0VFdPY4CvTBzFrCY4l+6JeBhm8mPPcnket2LQw8dX/n +4n3uwvbnthZT8VaLpse3bonwX2AJ0RrwS3EIMs0qQTD2yWDfcvl2cHdEJ0LGb53h +5sBHbZGmR5YtOffxCThsVznyOR2wvLX2Dm4wTX4h26B8vwA6AHFefTQQEzKNAcOK +jA8P5IUyTDXFZKI4bFSXrHWG/C61DXaAkz+C6dOTz1k480bq2kTPWGr3ozLa2dwH +p4tM5Vb3JAEy8MlawALLi6gP0mx2vtWsGRaUuajZcxmjvvW0PFWZ1Pu+5flsM+6A +qvPim4NLPFJ2W34H/NOlHc837Fz+2aQQoSUJL92eH1tlzcQd4rCKMma4hskaKOmB +eurt6sTzGA8zr5ksisIC6ZX2o73Tn3PC5n57ISsBSi3HwK7ZOrm3SEKvfKAWz3bz ++1n9ZoesASIClcGI30lmdq+MkRKqqefqk844eMGfaDLgz8hBkWA= +=l80u -----END PGP SIGNATURE----- diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index dc1155ab6a4d..f55d1f0f9996 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Thu, 31 Aug 2023 20:39:57 +0000 +Fri, 01 Sep 2023 02:39:57 +0000 diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz Binary files differindex 31b6ebdb87b9..539f0de0e67a 100644 --- a/metadata/md5-cache/Manifest.gz +++ b/metadata/md5-cache/Manifest.gz diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz Binary files differindex 355bc46c51ef..dec341e62471 100644 --- a/metadata/md5-cache/app-emacs/Manifest.gz +++ b/metadata/md5-cache/app-emacs/Manifest.gz diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.4-r1 b/metadata/md5-cache/app-emacs/markdown-mode-2.6 index 3d6a38483285..98698036583a 100644 --- a/metadata/md5-cache/app-emacs/markdown-mode-2.4-r1 +++ b/metadata/md5-cache/app-emacs/markdown-mode-2.6 @@ -1,15 +1,15 @@ -BDEPEND=test? ( virtual/pandoc ) >=app-editors/emacs-25.3:* +BDEPEND=test? ( virtual/pandoc || ( app-text/aspell[l10n_en] app-text/hunspell[l10n_en] ) ) >=app-editors/emacs-25.3:* DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack DESCRIPTION=Major mode for editing Markdown-formatted text files -EAPI=7 +EAPI=8 HOMEPAGE=https://jblevins.org/projects/markdown-mode/ -INHERIT=elisp +INHERIT=elisp optfeature IUSE=test KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=GPL-3+ RDEPEND=|| ( dev-python/markdown2 dev-python/markdown virtual/pandoc ) >=app-editors/emacs-25.3:* RESTRICT=!test? ( test ) SLOT=0 -SRC_URI=https://github.com/jrblevin/markdown-mode/archive/v2.4.tar.gz -> markdown-mode-2.4.tar.gz -_eclasses_=elisp fbefa95f5e9ab880a34bc69832b7c0d7 elisp-common dc179f98b2b4d9a4473fd3bdc154bbb6 -_md5_=7e006871cde6f727b9d2ca5404b8f229 +SRC_URI=https://github.com/jrblevin/markdown-mode/archive/v2.6.tar.gz -> markdown-mode-2.6.tar.gz +_eclasses_=elisp fbefa95f5e9ab880a34bc69832b7c0d7 elisp-common dc179f98b2b4d9a4473fd3bdc154bbb6 optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 +_md5_=1dfe09a830439e07e657d5cab2953b30 diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz Binary files differindex a814e7d3ed4e..5e3d9de844fc 100644 --- a/metadata/md5-cache/app-text/Manifest.gz +++ b/metadata/md5-cache/app-text/Manifest.gz diff --git a/metadata/md5-cache/app-text/pandoc-bin-3.1.3 b/metadata/md5-cache/app-text/pandoc-bin-3.1.7 index 24070555a8a2..2833157a09fd 100644 --- a/metadata/md5-cache/app-text/pandoc-bin-3.1.3 +++ b/metadata/md5-cache/app-text/pandoc-bin-3.1.7 @@ -3,9 +3,9 @@ DESCRIPTION=Conversion between markup formats (binary package) EAPI=8 HOMEPAGE=https://pandoc.org/ https://github.com/jgm/pandoc/ IUSE=+pandoc-symlink -KEYWORDS=-* amd64 arm64 +KEYWORDS=-* ~amd64 ~arm64 LICENSE=GPL-2+ RDEPEND=pandoc-symlink? ( !app-text/pandoc ) SLOT=0 -SRC_URI=amd64? ( https://github.com/jgm/pandoc/releases/download/3.1.3/pandoc-3.1.3-linux-amd64.tar.gz ) arm64? ( https://github.com/jgm/pandoc/releases/download/3.1.3/pandoc-3.1.3-linux-arm64.tar.gz ) -_md5_=e442be8235bc1d246765ad2eea234986 +SRC_URI=amd64? ( https://github.com/jgm/pandoc/releases/download/3.1.7/pandoc-3.1.7-linux-amd64.tar.gz ) arm64? ( https://github.com/jgm/pandoc/releases/download/3.1.7/pandoc-3.1.7-linux-arm64.tar.gz ) +_md5_=9de2481ca42246e96194be468def2f3c diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz Binary files differindex cb449487f9cf..b14ed8780d94 100644 --- a/metadata/md5-cache/dev-python/Manifest.gz +++ b/metadata/md5-cache/dev-python/Manifest.gz diff --git a/metadata/md5-cache/dev-python/setuptools-68.0.0-r1 b/metadata/md5-cache/dev-python/setuptools-68.0.0-r1 index 1f81cf5a3e6f..d34cad2a1e99 100644 --- a/metadata/md5-cache/dev-python/setuptools-68.0.0-r1 +++ b/metadata/md5-cache/dev-python/setuptools-68.0.0-r1 @@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-68.0.0.tar.gz _eclasses_=distutils-r1 a93df67775ff86e107e56c6a6e68cf4e flag-o-matic be27a904c614cb93ae037762dc69bcc2 multibuild 30dbf3c5a31db09a19f31ad0a68f2405 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils f3010c780f65d1bb5aea15a9af1adc9c out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pypi 2eecb475512bc76e5ea9192a681b9e6b python-r1 8a28fa6d3e3bc96ff8a7eff2badbe71f python-utils-r1 59e60e9c5cbd3f214d7f1002e798b387 toolchain-funcs 862d337d98edb576796827be2c6b11ca -_md5_=f9ccd0ff2d88f96fcebbc419bacc786b +_md5_=311a548296cef41ebc1dbbcb9736cf78 diff --git a/metadata/md5-cache/dev-python/setuptools-68.1.2 b/metadata/md5-cache/dev-python/setuptools-68.1.2 index dc62b0aa66da..022d2c48c14f 100644 --- a/metadata/md5-cache/dev-python/setuptools-68.1.2 +++ b/metadata/md5-cache/dev-python/setuptools-68.1.2 @@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-68.1.2.tar.gz _eclasses_=distutils-r1 a93df67775ff86e107e56c6a6e68cf4e flag-o-matic be27a904c614cb93ae037762dc69bcc2 multibuild 30dbf3c5a31db09a19f31ad0a68f2405 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils f3010c780f65d1bb5aea15a9af1adc9c out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pypi 2eecb475512bc76e5ea9192a681b9e6b python-r1 8a28fa6d3e3bc96ff8a7eff2badbe71f python-utils-r1 59e60e9c5cbd3f214d7f1002e798b387 toolchain-funcs 862d337d98edb576796827be2c6b11ca -_md5_=38f606c60dcb654ac0371be3efd8879c +_md5_=098cdf3c7a655f59a7654d7f1b1c6333 diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz Binary files differindex e96cadf6b008..3b6b16076bba 100644 --- a/metadata/md5-cache/sec-keys/Manifest.gz +++ b/metadata/md5-cache/sec-keys/Manifest.gz diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230807 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230807 new file mode 100644 index 000000000000..6dec3d7cf1f7 --- /dev/null +++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230807 @@ -0,0 +1,14 @@ +BDEPEND=|| ( ( dev-lang/python:3.12 dev-python/python-gnupg[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/python-gnupg[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/python-gnupg[python_targets_python3_10(-)] ) ) sec-keys/openpgp-keys-gentoo-auth test? ( app-crypt/gnupg sys-apps/grep[pcre] ) +DEFINED_PHASES=compile install setup test unpack +DESCRIPTION=Gentoo Authority Keys (GLEP 79) +EAPI=8 +HOMEPAGE=https://www.gentoo.org/downloads/signatures/ +INHERIT=edo python-any-r1 +IUSE=test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 +LICENSE=public-domain +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230807.gpg -> openpgp-keys-gentoo-developers-20230807-active-devs.gpg +_eclasses_=edo c0eb9cbe6b0bd01fcb4918f12598a4d3 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-any-r1 f5169813d1619761b459800587005fd2 python-utils-r1 59e60e9c5cbd3f214d7f1002e798b387 toolchain-funcs 862d337d98edb576796827be2c6b11ca +_md5_=cd42d8f4e2a53531b78881e3508460ca diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230814 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230814 new file mode 100644 index 000000000000..5010d10c50a8 --- /dev/null +++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230814 @@ -0,0 +1,14 @@ +BDEPEND=|| ( ( dev-lang/python:3.12 dev-python/python-gnupg[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/python-gnupg[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/python-gnupg[python_targets_python3_10(-)] ) ) sec-keys/openpgp-keys-gentoo-auth test? ( app-crypt/gnupg sys-apps/grep[pcre] ) +DEFINED_PHASES=compile install setup test unpack +DESCRIPTION=Gentoo Authority Keys (GLEP 79) +EAPI=8 +HOMEPAGE=https://www.gentoo.org/downloads/signatures/ +INHERIT=edo python-any-r1 +IUSE=test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 +LICENSE=public-domain +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230814.gpg -> openpgp-keys-gentoo-developers-20230814-active-devs.gpg +_eclasses_=edo c0eb9cbe6b0bd01fcb4918f12598a4d3 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-any-r1 f5169813d1619761b459800587005fd2 python-utils-r1 59e60e9c5cbd3f214d7f1002e798b387 toolchain-funcs 862d337d98edb576796827be2c6b11ca +_md5_=cd42d8f4e2a53531b78881e3508460ca diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230821 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230821 new file mode 100644 index 000000000000..6495bb1cc81c --- /dev/null +++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230821 @@ -0,0 +1,14 @@ +BDEPEND=|| ( ( dev-lang/python:3.12 dev-python/python-gnupg[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/python-gnupg[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/python-gnupg[python_targets_python3_10(-)] ) ) sec-keys/openpgp-keys-gentoo-auth test? ( app-crypt/gnupg sys-apps/grep[pcre] ) +DEFINED_PHASES=compile install setup test unpack +DESCRIPTION=Gentoo Authority Keys (GLEP 79) +EAPI=8 +HOMEPAGE=https://www.gentoo.org/downloads/signatures/ +INHERIT=edo python-any-r1 +IUSE=test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 +LICENSE=public-domain +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230821.gpg -> openpgp-keys-gentoo-developers-20230821-active-devs.gpg +_eclasses_=edo c0eb9cbe6b0bd01fcb4918f12598a4d3 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-any-r1 f5169813d1619761b459800587005fd2 python-utils-r1 59e60e9c5cbd3f214d7f1002e798b387 toolchain-funcs 862d337d98edb576796827be2c6b11ca +_md5_=cd42d8f4e2a53531b78881e3508460ca diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230828 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230828 new file mode 100644 index 000000000000..4637b71d84e0 --- /dev/null +++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230828 @@ -0,0 +1,14 @@ +BDEPEND=|| ( ( dev-lang/python:3.12 dev-python/python-gnupg[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/python-gnupg[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/python-gnupg[python_targets_python3_10(-)] ) ) sec-keys/openpgp-keys-gentoo-auth test? ( app-crypt/gnupg sys-apps/grep[pcre] ) +DEFINED_PHASES=compile install setup test unpack +DESCRIPTION=Gentoo Authority Keys (GLEP 79) +EAPI=8 +HOMEPAGE=https://www.gentoo.org/downloads/signatures/ +INHERIT=edo python-any-r1 +IUSE=test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 +LICENSE=public-domain +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230828.gpg -> openpgp-keys-gentoo-developers-20230828-active-devs.gpg +_eclasses_=edo c0eb9cbe6b0bd01fcb4918f12598a4d3 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-any-r1 f5169813d1619761b459800587005fd2 python-utils-r1 59e60e9c5cbd3f214d7f1002e798b387 toolchain-funcs 862d337d98edb576796827be2c6b11ca +_md5_=cd42d8f4e2a53531b78881e3508460ca diff --git a/metadata/news/Manifest b/metadata/news/Manifest index 343374dc680f..93f0086b6bed 100644 --- a/metadata/news/Manifest +++ b/metadata/news/Manifest @@ -2,22 +2,22 @@ Hash: SHA512 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1 -TIMESTAMP 2023-08-31T20:40:00Z +TIMESTAMP 2023-09-01T02:40:00Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTw+qBfFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTxTwBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klBnORAAm0Xrg3t9cTL78LArJ72odHvbnnzr03UAKWo6HgEimzAOq7t79GTNJqkT -kFvOa3dun86MPjmQtkwTRjM9+b1tY97CRQbWVbNTPcjl2NWzjdk64nmL1o8cFcFV -cHGJrVcPA8rfBFDTZ/PwOEArsAVMCCKmCtS8X8OGQK3u4TiH1QK9CQpJYNsZaTFF -+1g+aLEvSMJaeKPB19mRRSa307OFrORxYXvt5gIiTEvdkN7vnKIUHJioMD09ETSv -VYi0SSJvpdCOQVMbsYCCLl2e7pvl6YBETjD14fLakpcp4kqHkhllnkEdhe5+O0w8 -ywFEtIOkFazMpDYdDSD5dPmqzRJLFix1ESHDUTry7MUGZ4wP4TXzgShTuQEVrVhE -UX5EIgDgdh76c+bI9XmJ/QXiT1fEJfGRE2QxdNnk95dpyAdgApPpBsZqdUvEihwy -B0NCpZNzR5XnRdXfTFE8SPXS+jEOhBIJ7xb97q1ig206XYWwFY+FhEY2tSHYQbVB -ASA2u1Ajj1lzkw3Ux8t/xiBDmBW9uUjvB+ZiY8UzrHe7enydtqMhOy7jneCS0++V -wVamsm6dfS8tJ/+1HRX5lRPWoK38Ekx5hcAIj5/NKeTALl1RBCvbKypRMkZW6q7b -Z0UZA0HC8nQkYa4ZA4fc/K68as8NsdJ9dJ3SJXi7sXYmtttQd2A= -=GA2q +klAuxw//XCPfAcme8ERn4jkVRlqo95wKeJqunzZdrqhMqhByer/x37YUNaxG3H+n +aEnSB0jZ1KDdQ6hQpVSbSHvxuCDMRlN8XYVG2A8I/7tZVK/ZFyGOi8O5Cc+iXYK4 +rDYJcMLHi2D4cCHKpOs1X832fjEutM+Euo/oRGwVSh9j/JpEYeB8LrsjlhtbE6ib +1706n4K2MZZjUALuEheoXJhykKp6uOTeXsjdeTWfbzimR7BzokmPh8fKrBgWS/3t +UnnQn+7kHxmWiR13+kEJMtKsMQoNJRB1WIRqOxxIaUA9AxR9w31Guyr9AOlYvETJ +DEYE0SYV7vMmgAAfc3LrakdWSX0yBV5u+2/06Xj+vR6oQH9qmaKWyxtxUpoU/vAC +Py9HsshILNQGbO60p9ZMIJCwggiw+1T7Zoe/qKh73YFEojVYlaVF7d22IqtEcjBi +bgD1foDXaIfubS8+8L/sdvAcS509vS37ys07IvCZDCsUiYIrHHCuy7YxaYe9HeRE +PqC4mName4ODLnBzZNJ+XNtOgfE9EzEC1OrdeAO5a5mgeH6DE4pj2t8XjeM6zE8r +vBBO5WZGLZovYx1/I464b5UvxbtKiR1F3urwgTQwEWPCNgcmBu1i9rKWXXdrNiNm +X2QYjVfm6/cQQ2IPMpvFsw1YcLU8EWZrJOPFz6XIJg8cxvqBGUs= +=kS4m -----END PGP SIGNATURE----- diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index dc1155ab6a4d..f55d1f0f9996 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Thu, 31 Aug 2023 20:39:57 +0000 +Fri, 01 Sep 2023 02:39:57 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 6e6b7be9063e..8e481eb53abf 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Thu Aug 31 08:39:57 PM UTC 2023 +Fri Sep 1 02:39:57 AM UTC 2023 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 0a9502b94da2..a03939907aee 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Thu, 31 Aug 2023 20:45:02 +0000 +Fri, 01 Sep 2023 02:45:01 +0000 diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit index 528041139e1e..5f4170d538c4 100644 --- a/metadata/timestamp.commit +++ b/metadata/timestamp.commit @@ -1 +1 @@ -5bbaf661cb9f4ea915197376e204f29fab736684 1693513298 2023-08-31T20:21:38+00:00 +251b7e7e165bad3e9e6363dab328ef693351ac3a 1693535382 2023-09-01T02:29:42+00:00 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index ed7151c68f5e..65826832684a 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1693514401 Thu 31 Aug 2023 08:40:01 PM UTC +1693536001 Fri 01 Sep 2023 02:40:01 AM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index dc1155ab6a4d..f55d1f0f9996 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Thu, 31 Aug 2023 20:39:57 +0000 +Fri, 01 Sep 2023 02:39:57 +0000 diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz Binary files differindex d8572aae6847..7395bb19a7f1 100644 --- a/sec-keys/Manifest.gz +++ b/sec-keys/Manifest.gz diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest index cdab5ad11df3..f293ac62604e 100644 --- a/sec-keys/openpgp-keys-gentoo-developers/Manifest +++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest @@ -2,8 +2,16 @@ AUX keyring-mangler.py 3061 BLAKE2B a5acb20346c8eb4b036773562625ac39469d378a343c DIST openpgp-keys-gentoo-developers-20230717-active-devs.gpg 3104679 BLAKE2B 81777f536f342de356bdc9e5bc6b8b3319bec058c5fff663c80db6b9acbfc625703bf66bbc271c9dbb53de714dc581637ae01bfcd750174579410813c64717c4 SHA512 6f6f5d50d24acaec7774497fb8dc01e240e9b8f93578b5b08ef097b02299c2116deb87264fa3ce3144dc6fbb28d9e2d7363ed2505f5e264d783901b581262105 DIST openpgp-keys-gentoo-developers-20230724-active-devs.gpg 3104679 BLAKE2B 81777f536f342de356bdc9e5bc6b8b3319bec058c5fff663c80db6b9acbfc625703bf66bbc271c9dbb53de714dc581637ae01bfcd750174579410813c64717c4 SHA512 6f6f5d50d24acaec7774497fb8dc01e240e9b8f93578b5b08ef097b02299c2116deb87264fa3ce3144dc6fbb28d9e2d7363ed2505f5e264d783901b581262105 DIST openpgp-keys-gentoo-developers-20230731-active-devs.gpg 3108002 BLAKE2B c21a16fe51f5d98f994299969a231fd77ba4904afe13acb40a8238f64f93efdfe824867897d607327d8208c7c59b4aad839453d88ff92b24b52e093c38d6e594 SHA512 4065ea276b0a911841faf8bec4f5b5c0a763fef0243d1538bae0c29e89cd0e1278d95143e0b9f24efdfd0bef5fd4f945a8666bb0b59f58fc0ede117228e6f45d +DIST openpgp-keys-gentoo-developers-20230807-active-devs.gpg 3110732 BLAKE2B 10a5ee919a8c53a847b04a1c4b57e5934112d21daffd9a91cbd27d6813b687870f11632d908f10a435e6ea82b3228838d9486040dff900e2fabfda0019224521 SHA512 c6e40d79091821d5c4286e9e65a1611b3c974202c2cd1e2f2d751fa10eba761b4ca4db9009bc8b77dead4d3627038ea208e9fc0fe93ac3098076f9a7721f2f75 +DIST openpgp-keys-gentoo-developers-20230814-active-devs.gpg 3099095 BLAKE2B 5519cecf793f214f4860109796872850c5f1aece0b5efc9b79554db75e512033b96baa9630e2456e45484fcc8903c19e2789859d316bbfc2fb6547eb857e38a0 SHA512 82daf2251d61d179fcd00f9e9e0dbea005e90bd541e2edc209abe3be91637a1a39d64860b29705f35685ff911d946129c6c869ec291a328253b92c1dd7bee529 +DIST openpgp-keys-gentoo-developers-20230821-active-devs.gpg 3099455 BLAKE2B c3a090a12639d73597cf74f8e8ee392cf0416f7b0411add1b1af0db20461b1b78ed6c14d028b6ed8d82218a158409bc483ce17bb86acae037350adcfd5f83e31 SHA512 78eae46850dfffec063651309526010ead55a3f0d6914d87e4c9fe15d6679ef45f3dc7b8587a7d6a172c0cb5545c1fd86b6756164132c957a1d442482eec214e +DIST openpgp-keys-gentoo-developers-20230828-active-devs.gpg 3102805 BLAKE2B efd321e8ebb76d32e47df8085c9bb0d393c59d747b54cb5cf6febcc301a92a7c2a2b8bebd95b8f1b8fa9a6683aefc673809d8418408434bc41a1cf2bf8076938 SHA512 9e2e7408c2371edbe037243971fe6d45931cf526dff1d6014e472c056f8ed6881632d86497e9d6cd6b535574fb99c2af43fb63074911f4af476b5f590cc272dd EBUILD openpgp-keys-gentoo-developers-20230717.ebuild 7523 BLAKE2B 2b3f5c5c1694b782ac318bdfd0dc7941ce47ed8f60fc2d715b88bf1404cd59639797e65e45891fad1aba9b456c3d356d7cadc1b79a9919cce0a8b1587364f7e5 SHA512 a013e480059fb7b0de2da5581f8d6c01b9eecb0593751fda7b57b4d4e98db2ab6b21a2aaefce7aec0c0981e6dc22fd9fc202bea6dedaf170816bd05c1031311e EBUILD openpgp-keys-gentoo-developers-20230724.ebuild 7531 BLAKE2B 6047cb6478855d2603cb60e76524742994e06b71c0dbe29d69bff1866ae66a712422d95e8a8495c35b66f3c40fdaf74ea53d34338650b9428e5caa45d7fe5a0c SHA512 e271c6b583c1f2a1c61bc034e24696ae93dbce52f1a541901df12eb64496bf07fced1c99f4d83eb7d20131f666507ba24a460608076f75fbddb58126cd6a6840 EBUILD openpgp-keys-gentoo-developers-20230731.ebuild 7531 BLAKE2B 6047cb6478855d2603cb60e76524742994e06b71c0dbe29d69bff1866ae66a712422d95e8a8495c35b66f3c40fdaf74ea53d34338650b9428e5caa45d7fe5a0c SHA512 e271c6b583c1f2a1c61bc034e24696ae93dbce52f1a541901df12eb64496bf07fced1c99f4d83eb7d20131f666507ba24a460608076f75fbddb58126cd6a6840 +EBUILD openpgp-keys-gentoo-developers-20230807.ebuild 7531 BLAKE2B 6047cb6478855d2603cb60e76524742994e06b71c0dbe29d69bff1866ae66a712422d95e8a8495c35b66f3c40fdaf74ea53d34338650b9428e5caa45d7fe5a0c SHA512 e271c6b583c1f2a1c61bc034e24696ae93dbce52f1a541901df12eb64496bf07fced1c99f4d83eb7d20131f666507ba24a460608076f75fbddb58126cd6a6840 +EBUILD openpgp-keys-gentoo-developers-20230814.ebuild 7531 BLAKE2B 6047cb6478855d2603cb60e76524742994e06b71c0dbe29d69bff1866ae66a712422d95e8a8495c35b66f3c40fdaf74ea53d34338650b9428e5caa45d7fe5a0c SHA512 e271c6b583c1f2a1c61bc034e24696ae93dbce52f1a541901df12eb64496bf07fced1c99f4d83eb7d20131f666507ba24a460608076f75fbddb58126cd6a6840 +EBUILD openpgp-keys-gentoo-developers-20230821.ebuild 7531 BLAKE2B 6047cb6478855d2603cb60e76524742994e06b71c0dbe29d69bff1866ae66a712422d95e8a8495c35b66f3c40fdaf74ea53d34338650b9428e5caa45d7fe5a0c SHA512 e271c6b583c1f2a1c61bc034e24696ae93dbce52f1a541901df12eb64496bf07fced1c99f4d83eb7d20131f666507ba24a460608076f75fbddb58126cd6a6840 +EBUILD openpgp-keys-gentoo-developers-20230828.ebuild 7531 BLAKE2B 6047cb6478855d2603cb60e76524742994e06b71c0dbe29d69bff1866ae66a712422d95e8a8495c35b66f3c40fdaf74ea53d34338650b9428e5caa45d7fe5a0c SHA512 e271c6b583c1f2a1c61bc034e24696ae93dbce52f1a541901df12eb64496bf07fced1c99f4d83eb7d20131f666507ba24a460608076f75fbddb58126cd6a6840 EBUILD openpgp-keys-gentoo-developers-99999999.ebuild 7531 BLAKE2B 6047cb6478855d2603cb60e76524742994e06b71c0dbe29d69bff1866ae66a712422d95e8a8495c35b66f3c40fdaf74ea53d34338650b9428e5caa45d7fe5a0c SHA512 e271c6b583c1f2a1c61bc034e24696ae93dbce52f1a541901df12eb64496bf07fced1c99f4d83eb7d20131f666507ba24a460608076f75fbddb58126cd6a6840 MISC metadata.xml 264 BLAKE2B 630ac0044f623dc63de725aae23da036b649a2d65331c06fbe9eb66d18ad1a4d3fd804cdffc4703500662b01272063af346680d2550f2fb6a262d6acee8c6789 SHA512 3cf1981080b4a7634537d20a3e837fa802c52ae5ee750531cc4aa3f8478cda78579375602bc058abbd75f9393f9681b79603c3ddd9af809a1e72f7336a708056 diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230807.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230807.ebuild new file mode 100644 index 000000000000..fda85a259ff6 --- /dev/null +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230807.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit edo python-any-r1 + +DESCRIPTION="Gentoo Authority Keys (GLEP 79)" +HOMEPAGE="https://www.gentoo.org/downloads/signatures/" +if [[ ${PV} == 9999* ]] ; then + PROPERTIES="live" + + BDEPEND="net-misc/curl" +else + SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND+=" + $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') + sec-keys/openpgp-keys-gentoo-auth + test? ( + app-crypt/gnupg + sys-apps/grep[pcre] + ) +" + +python_check_deps() { + python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]" +} + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die + else + default + fi +} + +src_compile() { + export GNUPGHOME="${T}"/.gnupg + + get_gpg_keyring_dir() { + if [[ ${PV} == 9999* ]] ; then + echo "${WORKDIR}" + else + echo "${DISTDIR}" + fi + } + + local mygpgargs=( + --no-autostart + --no-default-keyring + --homedir "${GNUPGHOME}" + ) + + # From verify-sig.eclass: + # "GPG upstream knows better than to follow the spec, so we can't + # override this directory. However, there is a clean fallback + # to GNUPGHOME." + addpredict /run/user + + mkdir "${GNUPGHOME}" || die + chmod 700 "${GNUPGHOME}" || die + + # Convert the binary keyring into an armored one so we can process it + edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg + edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc + + # Now strip out the keys which are expired and/or missing a signature + # from our L2 developer authority key + edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \ + "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \ + "${WORKDIR}"/gentoo-developers.asc \ + "${WORKDIR}"/gentoo-developers-sanitised.asc +} + +src_test() { + export GNUPGHOME="${T}"/tests/.gnupg + + local mygpgargs=( + # We don't have --no-autostart here because we need + # to let it spawn an agent for the key generation. + --no-default-keyring + --homedir "${GNUPGHOME}" + ) + + # From verify-sig.eclass: + # "GPG upstream knows better than to follow the spec, so we can't + # override this directory. However, there is a clean fallback + # to GNUPGHOME." + addpredict /run/user + + # Check each of the keys to verify they're trusted by + # the L2 developer key. + mkdir -p "${GNUPGHOME}" || die + chmod 700 "${GNUPGHOME}" || die + cd "${T}"/tests || die + + # First, grab the L1 key, and mark it as ultimately trusted. + edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc + edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt + + # Generate a temporary key which isn't signed by anything to check + # whether we're detecting unexpected keys. + # + # The test is whether this appears in the sanitised keyring we + # produce in src_compile (it should not be in there). + # + # https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html + edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF + %echo Generating temporary key for testing... + + %no-protection + %transient-key + %pubring ${P}-ebuild-test-key.asc + + Key-Type: 1 + Key-Length: 2048 + Subkey-Type: 1 + Subkey-Length: 2048 + Name-Real: Larry The Cow + Name-Email: larry@example.com + Expire-Date: 0 + Handle: ${P}-ebuild-test-key + + %commit + %echo Temporary key generated! + EOF + + # Import the new injected key that shouldn't be signed by anything into a temporary testing keyring + edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc + + # Sign a tiny file with the to-be-injected key for testing rejection below + echo "Hello world!" > "${T}"/tests/signme || die + edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die + + edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc + + # keyring-mangler.py should now produce a keyring *without* it + edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \ + "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \ + "${T}"/tests/tainted-keyring.asc \ + "${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log + assert "Key mangling in tests failed?" + + # Check the log to verify the injected key got detected + grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!" + + # gnupg doesn't have an easy way for us to actually just.. ask + # if a key is known via WoT. So, sign a file using the key + # we just made, and then try to gpg --verify it, and check exit code. + # + # Let's now double check by seeing if a file signed by the injected key + # is rejected. + if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then + die "'gpg --verify' using injected test key succeeded! This shouldn't happen!" + fi + + # Bonus lame sanity check + edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log + assert "trustdb call failed!" + + check_trust_levels() { + local mode=${1} + + while IFS= read -r line; do + # gpg: depth: 0 valid: 1 signed: 2 trust: 0-, 0q, 0n, 0m, 0f, 1u + # gpg: depth: 1 valid: 2 signed: 0 trust: 0-, 0q, 0n, 0m, 2f, 0u + if [[ ${line} == *depth* ]] ; then + depth=$(echo ${line} | grep -Po "depth: [0-9]") + trust=$(echo ${line} | grep -Po "trust:.*") + + trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-") + [[ ${trust_uncalculated} == 0 ]] || ${mode} + + trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q") + [[ ${trust_insufficient} == 0 ]] || ${mode} + + trust_never=$(echo ${trust} | grep -Po "[0-9]n") + [[ ${trust_never} == 0 ]] || ${mode} + + trust_marginal=$(echo ${trust} | grep -Po "[0-9]m") + [[ ${trust_marginal} == 0 ]] || ${mode} + + trust_full=$(echo ${trust} | grep -Po "[0-9]f") + [[ ${trust_full} != 0 ]] || ${mode} + + trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u") + [[ ${trust_ultimate} == 1 ]] || ${mode} + + echo "${trust_uncalculated}, ${trust_insufficient}" + fi + done < "${T}"/tests/trustdb.log + } + + # First, check with the bad key still in the test keyring. + # This is supposed to fail, so we want it to return 1 + check_trust_levels "return 1" && die "Trustdb passed when it should have failed!" + + # Now check without the bad key in the test keyring. + # This one should pass. + # + # Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint) + keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \ + | grep "^fpr" \ + | sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p') + + local key + for key in ${keys[@]} ; do + nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key} + done + + edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>" + check_trust_levels "return 0" || die "Trustdb failed when it should have passed!" + + gpgconf --kill gpg-agent || die +} + +src_install() { + insinto /usr/share/openpgp-keys + newins gentoo-developers-sanitised.asc gentoo-developers.asc + + # TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth? +} diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230814.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230814.ebuild new file mode 100644 index 000000000000..fda85a259ff6 --- /dev/null +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230814.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit edo python-any-r1 + +DESCRIPTION="Gentoo Authority Keys (GLEP 79)" +HOMEPAGE="https://www.gentoo.org/downloads/signatures/" +if [[ ${PV} == 9999* ]] ; then + PROPERTIES="live" + + BDEPEND="net-misc/curl" +else + SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND+=" + $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') + sec-keys/openpgp-keys-gentoo-auth + test? ( + app-crypt/gnupg + sys-apps/grep[pcre] + ) +" + +python_check_deps() { + python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]" +} + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die + else + default + fi +} + +src_compile() { + export GNUPGHOME="${T}"/.gnupg + + get_gpg_keyring_dir() { + if [[ ${PV} == 9999* ]] ; then + echo "${WORKDIR}" + else + echo "${DISTDIR}" + fi + } + + local mygpgargs=( + --no-autostart + --no-default-keyring + --homedir "${GNUPGHOME}" + ) + + # From verify-sig.eclass: + # "GPG upstream knows better than to follow the spec, so we can't + # override this directory. However, there is a clean fallback + # to GNUPGHOME." + addpredict /run/user + + mkdir "${GNUPGHOME}" || die + chmod 700 "${GNUPGHOME}" || die + + # Convert the binary keyring into an armored one so we can process it + edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg + edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc + + # Now strip out the keys which are expired and/or missing a signature + # from our L2 developer authority key + edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \ + "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \ + "${WORKDIR}"/gentoo-developers.asc \ + "${WORKDIR}"/gentoo-developers-sanitised.asc +} + +src_test() { + export GNUPGHOME="${T}"/tests/.gnupg + + local mygpgargs=( + # We don't have --no-autostart here because we need + # to let it spawn an agent for the key generation. + --no-default-keyring + --homedir "${GNUPGHOME}" + ) + + # From verify-sig.eclass: + # "GPG upstream knows better than to follow the spec, so we can't + # override this directory. However, there is a clean fallback + # to GNUPGHOME." + addpredict /run/user + + # Check each of the keys to verify they're trusted by + # the L2 developer key. + mkdir -p "${GNUPGHOME}" || die + chmod 700 "${GNUPGHOME}" || die + cd "${T}"/tests || die + + # First, grab the L1 key, and mark it as ultimately trusted. + edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc + edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt + + # Generate a temporary key which isn't signed by anything to check + # whether we're detecting unexpected keys. + # + # The test is whether this appears in the sanitised keyring we + # produce in src_compile (it should not be in there). + # + # https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html + edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF + %echo Generating temporary key for testing... + + %no-protection + %transient-key + %pubring ${P}-ebuild-test-key.asc + + Key-Type: 1 + Key-Length: 2048 + Subkey-Type: 1 + Subkey-Length: 2048 + Name-Real: Larry The Cow + Name-Email: larry@example.com + Expire-Date: 0 + Handle: ${P}-ebuild-test-key + + %commit + %echo Temporary key generated! + EOF + + # Import the new injected key that shouldn't be signed by anything into a temporary testing keyring + edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc + + # Sign a tiny file with the to-be-injected key for testing rejection below + echo "Hello world!" > "${T}"/tests/signme || die + edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die + + edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc + + # keyring-mangler.py should now produce a keyring *without* it + edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \ + "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \ + "${T}"/tests/tainted-keyring.asc \ + "${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log + assert "Key mangling in tests failed?" + + # Check the log to verify the injected key got detected + grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!" + + # gnupg doesn't have an easy way for us to actually just.. ask + # if a key is known via WoT. So, sign a file using the key + # we just made, and then try to gpg --verify it, and check exit code. + # + # Let's now double check by seeing if a file signed by the injected key + # is rejected. + if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then + die "'gpg --verify' using injected test key succeeded! This shouldn't happen!" + fi + + # Bonus lame sanity check + edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log + assert "trustdb call failed!" + + check_trust_levels() { + local mode=${1} + + while IFS= read -r line; do + # gpg: depth: 0 valid: 1 signed: 2 trust: 0-, 0q, 0n, 0m, 0f, 1u + # gpg: depth: 1 valid: 2 signed: 0 trust: 0-, 0q, 0n, 0m, 2f, 0u + if [[ ${line} == *depth* ]] ; then + depth=$(echo ${line} | grep -Po "depth: [0-9]") + trust=$(echo ${line} | grep -Po "trust:.*") + + trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-") + [[ ${trust_uncalculated} == 0 ]] || ${mode} + + trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q") + [[ ${trust_insufficient} == 0 ]] || ${mode} + + trust_never=$(echo ${trust} | grep -Po "[0-9]n") + [[ ${trust_never} == 0 ]] || ${mode} + + trust_marginal=$(echo ${trust} | grep -Po "[0-9]m") + [[ ${trust_marginal} == 0 ]] || ${mode} + + trust_full=$(echo ${trust} | grep -Po "[0-9]f") + [[ ${trust_full} != 0 ]] || ${mode} + + trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u") + [[ ${trust_ultimate} == 1 ]] || ${mode} + + echo "${trust_uncalculated}, ${trust_insufficient}" + fi + done < "${T}"/tests/trustdb.log + } + + # First, check with the bad key still in the test keyring. + # This is supposed to fail, so we want it to return 1 + check_trust_levels "return 1" && die "Trustdb passed when it should have failed!" + + # Now check without the bad key in the test keyring. + # This one should pass. + # + # Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint) + keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \ + | grep "^fpr" \ + | sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p') + + local key + for key in ${keys[@]} ; do + nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key} + done + + edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>" + check_trust_levels "return 0" || die "Trustdb failed when it should have passed!" + + gpgconf --kill gpg-agent || die +} + +src_install() { + insinto /usr/share/openpgp-keys + newins gentoo-developers-sanitised.asc gentoo-developers.asc + + # TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth? +} diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230821.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230821.ebuild new file mode 100644 index 000000000000..fda85a259ff6 --- /dev/null +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230821.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit edo python-any-r1 + +DESCRIPTION="Gentoo Authority Keys (GLEP 79)" +HOMEPAGE="https://www.gentoo.org/downloads/signatures/" +if [[ ${PV} == 9999* ]] ; then + PROPERTIES="live" + + BDEPEND="net-misc/curl" +else + SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND+=" + $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') + sec-keys/openpgp-keys-gentoo-auth + test? ( + app-crypt/gnupg + sys-apps/grep[pcre] + ) +" + +python_check_deps() { + python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]" +} + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die + else + default + fi +} + +src_compile() { + export GNUPGHOME="${T}"/.gnupg + + get_gpg_keyring_dir() { + if [[ ${PV} == 9999* ]] ; then + echo "${WORKDIR}" + else + echo "${DISTDIR}" + fi + } + + local mygpgargs=( + --no-autostart + --no-default-keyring + --homedir "${GNUPGHOME}" + ) + + # From verify-sig.eclass: + # "GPG upstream knows better than to follow the spec, so we can't + # override this directory. However, there is a clean fallback + # to GNUPGHOME." + addpredict /run/user + + mkdir "${GNUPGHOME}" || die + chmod 700 "${GNUPGHOME}" || die + + # Convert the binary keyring into an armored one so we can process it + edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg + edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc + + # Now strip out the keys which are expired and/or missing a signature + # from our L2 developer authority key + edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \ + "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \ + "${WORKDIR}"/gentoo-developers.asc \ + "${WORKDIR}"/gentoo-developers-sanitised.asc +} + +src_test() { + export GNUPGHOME="${T}"/tests/.gnupg + + local mygpgargs=( + # We don't have --no-autostart here because we need + # to let it spawn an agent for the key generation. + --no-default-keyring + --homedir "${GNUPGHOME}" + ) + + # From verify-sig.eclass: + # "GPG upstream knows better than to follow the spec, so we can't + # override this directory. However, there is a clean fallback + # to GNUPGHOME." + addpredict /run/user + + # Check each of the keys to verify they're trusted by + # the L2 developer key. + mkdir -p "${GNUPGHOME}" || die + chmod 700 "${GNUPGHOME}" || die + cd "${T}"/tests || die + + # First, grab the L1 key, and mark it as ultimately trusted. + edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc + edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt + + # Generate a temporary key which isn't signed by anything to check + # whether we're detecting unexpected keys. + # + # The test is whether this appears in the sanitised keyring we + # produce in src_compile (it should not be in there). + # + # https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html + edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF + %echo Generating temporary key for testing... + + %no-protection + %transient-key + %pubring ${P}-ebuild-test-key.asc + + Key-Type: 1 + Key-Length: 2048 + Subkey-Type: 1 + Subkey-Length: 2048 + Name-Real: Larry The Cow + Name-Email: larry@example.com + Expire-Date: 0 + Handle: ${P}-ebuild-test-key + + %commit + %echo Temporary key generated! + EOF + + # Import the new injected key that shouldn't be signed by anything into a temporary testing keyring + edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc + + # Sign a tiny file with the to-be-injected key for testing rejection below + echo "Hello world!" > "${T}"/tests/signme || die + edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die + + edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc + + # keyring-mangler.py should now produce a keyring *without* it + edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \ + "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \ + "${T}"/tests/tainted-keyring.asc \ + "${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log + assert "Key mangling in tests failed?" + + # Check the log to verify the injected key got detected + grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!" + + # gnupg doesn't have an easy way for us to actually just.. ask + # if a key is known via WoT. So, sign a file using the key + # we just made, and then try to gpg --verify it, and check exit code. + # + # Let's now double check by seeing if a file signed by the injected key + # is rejected. + if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then + die "'gpg --verify' using injected test key succeeded! This shouldn't happen!" + fi + + # Bonus lame sanity check + edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log + assert "trustdb call failed!" + + check_trust_levels() { + local mode=${1} + + while IFS= read -r line; do + # gpg: depth: 0 valid: 1 signed: 2 trust: 0-, 0q, 0n, 0m, 0f, 1u + # gpg: depth: 1 valid: 2 signed: 0 trust: 0-, 0q, 0n, 0m, 2f, 0u + if [[ ${line} == *depth* ]] ; then + depth=$(echo ${line} | grep -Po "depth: [0-9]") + trust=$(echo ${line} | grep -Po "trust:.*") + + trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-") + [[ ${trust_uncalculated} == 0 ]] || ${mode} + + trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q") + [[ ${trust_insufficient} == 0 ]] || ${mode} + + trust_never=$(echo ${trust} | grep -Po "[0-9]n") + [[ ${trust_never} == 0 ]] || ${mode} + + trust_marginal=$(echo ${trust} | grep -Po "[0-9]m") + [[ ${trust_marginal} == 0 ]] || ${mode} + + trust_full=$(echo ${trust} | grep -Po "[0-9]f") + [[ ${trust_full} != 0 ]] || ${mode} + + trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u") + [[ ${trust_ultimate} == 1 ]] || ${mode} + + echo "${trust_uncalculated}, ${trust_insufficient}" + fi + done < "${T}"/tests/trustdb.log + } + + # First, check with the bad key still in the test keyring. + # This is supposed to fail, so we want it to return 1 + check_trust_levels "return 1" && die "Trustdb passed when it should have failed!" + + # Now check without the bad key in the test keyring. + # This one should pass. + # + # Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint) + keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \ + | grep "^fpr" \ + | sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p') + + local key + for key in ${keys[@]} ; do + nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key} + done + + edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>" + check_trust_levels "return 0" || die "Trustdb failed when it should have passed!" + + gpgconf --kill gpg-agent || die +} + +src_install() { + insinto /usr/share/openpgp-keys + newins gentoo-developers-sanitised.asc gentoo-developers.asc + + # TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth? +} diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230828.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230828.ebuild new file mode 100644 index 000000000000..fda85a259ff6 --- /dev/null +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230828.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit edo python-any-r1 + +DESCRIPTION="Gentoo Authority Keys (GLEP 79)" +HOMEPAGE="https://www.gentoo.org/downloads/signatures/" +if [[ ${PV} == 9999* ]] ; then + PROPERTIES="live" + + BDEPEND="net-misc/curl" +else + SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND+=" + $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') + sec-keys/openpgp-keys-gentoo-auth + test? ( + app-crypt/gnupg + sys-apps/grep[pcre] + ) +" + +python_check_deps() { + python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]" +} + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die + else + default + fi +} + +src_compile() { + export GNUPGHOME="${T}"/.gnupg + + get_gpg_keyring_dir() { + if [[ ${PV} == 9999* ]] ; then + echo "${WORKDIR}" + else + echo "${DISTDIR}" + fi + } + + local mygpgargs=( + --no-autostart + --no-default-keyring + --homedir "${GNUPGHOME}" + ) + + # From verify-sig.eclass: + # "GPG upstream knows better than to follow the spec, so we can't + # override this directory. However, there is a clean fallback + # to GNUPGHOME." + addpredict /run/user + + mkdir "${GNUPGHOME}" || die + chmod 700 "${GNUPGHOME}" || die + + # Convert the binary keyring into an armored one so we can process it + edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg + edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc + + # Now strip out the keys which are expired and/or missing a signature + # from our L2 developer authority key + edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \ + "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \ + "${WORKDIR}"/gentoo-developers.asc \ + "${WORKDIR}"/gentoo-developers-sanitised.asc +} + +src_test() { + export GNUPGHOME="${T}"/tests/.gnupg + + local mygpgargs=( + # We don't have --no-autostart here because we need + # to let it spawn an agent for the key generation. + --no-default-keyring + --homedir "${GNUPGHOME}" + ) + + # From verify-sig.eclass: + # "GPG upstream knows better than to follow the spec, so we can't + # override this directory. However, there is a clean fallback + # to GNUPGHOME." + addpredict /run/user + + # Check each of the keys to verify they're trusted by + # the L2 developer key. + mkdir -p "${GNUPGHOME}" || die + chmod 700 "${GNUPGHOME}" || die + cd "${T}"/tests || die + + # First, grab the L1 key, and mark it as ultimately trusted. + edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc + edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt + + # Generate a temporary key which isn't signed by anything to check + # whether we're detecting unexpected keys. + # + # The test is whether this appears in the sanitised keyring we + # produce in src_compile (it should not be in there). + # + # https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html + edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF + %echo Generating temporary key for testing... + + %no-protection + %transient-key + %pubring ${P}-ebuild-test-key.asc + + Key-Type: 1 + Key-Length: 2048 + Subkey-Type: 1 + Subkey-Length: 2048 + Name-Real: Larry The Cow + Name-Email: larry@example.com + Expire-Date: 0 + Handle: ${P}-ebuild-test-key + + %commit + %echo Temporary key generated! + EOF + + # Import the new injected key that shouldn't be signed by anything into a temporary testing keyring + edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc + + # Sign a tiny file with the to-be-injected key for testing rejection below + echo "Hello world!" > "${T}"/tests/signme || die + edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die + + edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc + + # keyring-mangler.py should now produce a keyring *without* it + edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \ + "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \ + "${T}"/tests/tainted-keyring.asc \ + "${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log + assert "Key mangling in tests failed?" + + # Check the log to verify the injected key got detected + grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!" + + # gnupg doesn't have an easy way for us to actually just.. ask + # if a key is known via WoT. So, sign a file using the key + # we just made, and then try to gpg --verify it, and check exit code. + # + # Let's now double check by seeing if a file signed by the injected key + # is rejected. + if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then + die "'gpg --verify' using injected test key succeeded! This shouldn't happen!" + fi + + # Bonus lame sanity check + edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log + assert "trustdb call failed!" + + check_trust_levels() { + local mode=${1} + + while IFS= read -r line; do + # gpg: depth: 0 valid: 1 signed: 2 trust: 0-, 0q, 0n, 0m, 0f, 1u + # gpg: depth: 1 valid: 2 signed: 0 trust: 0-, 0q, 0n, 0m, 2f, 0u + if [[ ${line} == *depth* ]] ; then + depth=$(echo ${line} | grep -Po "depth: [0-9]") + trust=$(echo ${line} | grep -Po "trust:.*") + + trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-") + [[ ${trust_uncalculated} == 0 ]] || ${mode} + + trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q") + [[ ${trust_insufficient} == 0 ]] || ${mode} + + trust_never=$(echo ${trust} | grep -Po "[0-9]n") + [[ ${trust_never} == 0 ]] || ${mode} + + trust_marginal=$(echo ${trust} | grep -Po "[0-9]m") + [[ ${trust_marginal} == 0 ]] || ${mode} + + trust_full=$(echo ${trust} | grep -Po "[0-9]f") + [[ ${trust_full} != 0 ]] || ${mode} + + trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u") + [[ ${trust_ultimate} == 1 ]] || ${mode} + + echo "${trust_uncalculated}, ${trust_insufficient}" + fi + done < "${T}"/tests/trustdb.log + } + + # First, check with the bad key still in the test keyring. + # This is supposed to fail, so we want it to return 1 + check_trust_levels "return 1" && die "Trustdb passed when it should have failed!" + + # Now check without the bad key in the test keyring. + # This one should pass. + # + # Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint) + keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \ + | grep "^fpr" \ + | sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p') + + local key + for key in ${keys[@]} ; do + nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key} + done + + edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>" + check_trust_levels "return 0" || die "Trustdb failed when it should have passed!" + + gpgconf --kill gpg-agent || die +} + +src_install() { + insinto /usr/share/openpgp-keys + newins gentoo-developers-sanitised.asc gentoo-developers.asc + + # TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth? +} |