diff options
Diffstat (limited to 'dev-libs')
27 files changed, 690 insertions, 29 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex d500cd33b2ec..8e6af80ef948 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 91de864ba32e..1a91e6e0ef8e 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -3,6 +3,6 @@ DIST gjs-1.76.0.tar.xz 645364 BLAKE2B 9987033883e466c983af007c870cba4f2ef70ee08e DIST gjs-1.76.2.tar.xz 646232 BLAKE2B 66466eeb5f956d5041f4e63ba977dc9a688455770c39bcedd63576f56fde9821ed3c827c470f7e3befbbf7828fbd197706637da458876ec129d6c16323e414e8 SHA512 26b024874ce69a6f58b5fabe006b8d5417971db9de00e21ecd352715b4535f405d162bb81c0cf6b20313f0f78833962080ac1cb9bd42cfff9cf6a74340458540 DIST gjs-1.77.1.tar.xz 650292 BLAKE2B dde0f9073ef6f87e4f76002d69e6397ac94ae6a9c711b4a35378a8e56191c1a06ae1ee14db5a3078d3f1ec443c6eeb245bdcec7c8702c8e4a581e08530c81ce5 SHA512 2a94406725a59e05485ebfcc6ba6b2a0c26f40833a46d6520caff576dd8495a14eb733cf0788af1ea4b5c9c11edd692637db41f6350fb4a3bf2e1c01267130cc EBUILD gjs-1.76.0.ebuild 2039 BLAKE2B 08c1a70563f99022397c2bcf8c8a89fceba5390041c8c470389120411b7a7e5f6d94141e7c5667082e272eee952957c7bbaed4d3af77285f18d5933ccb475c0d SHA512 99a876eb920e1dfff03241ca5afee9a46c0f24880b97fa8d7fe85a361994c35e17fc47d047ad5bd018884792dfd187bc99cb2b73488dd4231ff2146d8d3b4962 -EBUILD gjs-1.76.2.ebuild 2049 BLAKE2B 85d956bbdfee7a6ff03229b8207557c955926cf9dd9ef7d00d3d9881d3621a83dda77a0f644d8339d2ac89850468978f29d82aa1648a81061b7811b473c5b672 SHA512 09dc0fffc83a9a1e75e20296b3787ba8a9fb31e5186a34c835e0a9ef5567231536ba191395489013778456a8be6dd08e13b4e7f4b5fbf6c443305877d50b4ae5 +EBUILD gjs-1.76.2.ebuild 2048 BLAKE2B 50a4118e8142466076ea219161febdeaa53c481c44a7cabc936282194358c89dba31f012dcf025b701be89f93e78ab3491fbb32b26b8ca940b0e036e7bfff0f8 SHA512 8dd6271b0f90ea8d5957ef7d4c79f091db2f5f86d6cefdb9404100dd2eeed60cffe719d54bcba8807065f6eecd8dc7c13590cced9f3cabf64c64f51fa91405aa EBUILD gjs-1.77.1.ebuild 1966 BLAKE2B 1783a96ee082e74ca58cb4f7292969a4c0374c8da4af3020d96163eff29585b0bc470ab275304928ed361c66a2554ec0f046e536eeecdf25940582ca510fcecc SHA512 2e3a9f5c5d42e76a96dfe533a9142ec1b332486bd16007d42b66d52bf8635a289b493122f92195b3a614cde78a084bb20be5a72b72e6965e98dd4c86c1326ea6 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2 diff --git a/dev-libs/gjs/gjs-1.76.2.ebuild b/dev-libs/gjs/gjs-1.76.2.ebuild index a755622b9f24..e750a930e1f2 100644 --- a/dev-libs/gjs/gjs-1.76.2.ebuild +++ b/dev-libs/gjs/gjs-1.76.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" IUSE="+cairo examples readline sysprof test" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest index 5f08a9d757f4..e53ea142db52 100644 --- a/dev-libs/gobject-introspection-common/Manifest +++ b/dev-libs/gobject-introspection-common/Manifest @@ -1,3 +1,3 @@ DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916 EBUILD gobject-introspection-common-1.76.1.ebuild 901 BLAKE2B efa7e6830895288f3c933c037577dc13212fe3a6547e9794689cdbd8b52eecf4eedb461af85db71539a16b92cefcf9487a892cdbdb70dc46158295b92fd5e0b5 SHA512 89018fc4b94c67be73471d2571f8f421131d3455b92337fcd732f64df9fd6fe194f5148d8cdaccf1fe592d308389887ec63ed1d8ad3d01740003af7dbf7b99a4 -MISC metadata.xml 362 BLAKE2B 18f3d214e624758a552818e8c02cebcaf9340d5201cb23c6999c36247f969b65c912de4515101acdc0862338d697a510b15182b904dca7f4a7ae12e3c1b188b9 SHA512 f08d8077b802b7c95433d8e4e31d89183b072306ebf16570977f65339641c29a1917dc3c869d5268bd3a9ebba5537ed15623183a7dada64f811943a16bab676b +MISC metadata.xml 387 BLAKE2B 53c8885e0d64951fab2ea24063b41dd75c1c2f1e2a8038ff760175126c3597dcfc8ed8e7ca98bcfd47c6e303b68cc7473f283193cdce010292e4a4c9d0f60bb8 SHA512 57c817a11ca62240745f69a12685d0ab11ceaa960acf2e6cdf7b47361239a3b29c23b696a24f4314eae80fc7dd9974860d5c422e9f6fd31ea54476fe74f0ebd4 diff --git a/dev-libs/gobject-introspection-common/metadata.xml b/dev-libs/gobject-introspection-common/metadata.xml index 819a2b39b6f5..77da9c6e7c5f 100644 --- a/dev-libs/gobject-introspection-common/metadata.xml +++ b/dev-libs/gobject-introspection-common/metadata.xml @@ -5,6 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="gnome-gitlab">GNOME/gobject-introspection</remote-id> </upstream> diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest index b36a82508bc0..ac16a08f5136 100644 --- a/dev-libs/gumbo/Manifest +++ b/dev-libs/gumbo/Manifest @@ -1,3 +1,5 @@ DIST gumbo-0.10.1.tar.gz 2119285 BLAKE2B 21a8dd479bcc568842ce85782d4de903c1b79d842dd5381c01fd7b7ee802872484bf8b647edde9c2a4939404a4d042e920633f4d337870cd9f4197a90b158ffd SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1 +DIST gumbo-0.11.0.tar.gz 2119456 BLAKE2B 9da25c08e94af6f33b7e6e66017da9b7780a5f58aef7eac7d03bdf98c415e13252377dadd4f6fe3b8ddcf7d2aea8d4aff6edac181ea8cf8a4fa152f7c711e107 SHA512 7fdfee66db32dfda70bb1f2069b9bf59f2293fd30e1360d7adcced68e894a42e42e2e5de05204ea4ee30cb8d680fd48b66400a68710fe5f00fb3c84004c85928 EBUILD gumbo-0.10.1.ebuild 961 BLAKE2B 189c0f06a72445ea6e76871a781863d3f7f14ff348678b8a03a961ee64b157898b0ff72bae45c8d90c8d2a862bd8945c679f461031874c5f3e22fcd6dd1815a6 SHA512 e86f7a5e66eaccca562a3b636e8df4f4f76a3fa7bad18426a809068db79fc4c6241238471f0f0a3fa678220ae1925d1712b0872f0a4eeef572070d8335f5a849 -MISC metadata.xml 264 BLAKE2B 2ee9176584f634b611d85166a67455f919c415f9fbe17b68f158db25e633c85af5eaf5a0709ae19b39beacfea095d003ebe8c7a1f531a0788a52a3c3efddfc35 SHA512 3cd02a448599f0aee8aeced1594ab52b919afa5b430e1ed79812c70646b195b50edbb2700c1501eaa72487d93a22385cad56f00b37a678212ebe3aa08ea92906 +EBUILD gumbo-0.11.0.ebuild 911 BLAKE2B e6bbb490c935fe495dfcb4fc55604c1d805f468f5d563987a4e4e785713ffadb4e7848acaf2e90bd0075431c49b8e7a52a95e0655de50fda4848fbd20deda5da SHA512 a346022a61c3a9d9af79125690d6bedbf79510e2137ad4cf2bb16fd1c7d53aa3e6fa10729f580e963c2a8fa9abc66b3c191f76485ac844fc33cd4d588ae43f40 +MISC metadata.xml 410 BLAKE2B 75c853b9665a82c30c29f3aa0e9171fe2665ed2f7e4c1a7ccdd04258a07e4ef753ad01066934adccc3434aa52332b7007148c818b568335a2429bd8afc61d974 SHA512 b26adba8415ba084c079fabf29b966886bda8736165fbd9f0db13fe4da80e9be373ea7ed2d59e3b8c2b9a04eb84d8327f432c091c3ee936a82650a7983a7a483 diff --git a/dev-libs/gumbo/gumbo-0.11.0.ebuild b/dev-libs/gumbo/gumbo-0.11.0.ebuild new file mode 100644 index 000000000000..d9530b04ba6e --- /dev/null +++ b/dev-libs/gumbo/gumbo-0.11.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="The HTML5 parsing algorithm implemented as a pure C99 library" +HOMEPAGE="https://codeberg.org/grisha/gumbo-parser" +SRC_URI="https://codeberg.org/grisha/gumbo-parser/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/gumbo-parser" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/gtest )" +BDEPEND="doc? ( app-doc/doxygen )" + +src_prepare() { + default + eautoreconf +} + +src_compile() { + default + + if use doc; then + doxygen || die "doxygen failed" + HTML_DOCS=( docs/html/. ) + fi +} + +src_install() { + default + use doc && doman docs/man/man3/* + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/gumbo/metadata.xml b/dev-libs/gumbo/metadata.xml index 96b44155dcb9..bf5592871976 100644 --- a/dev-libs/gumbo/metadata.xml +++ b/dev-libs/gumbo/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">google/gumbo-parser#readme</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>contact@hacktivis.me</email> + <name>Haelwenn (lanodan) Monnier</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest index 7b385381ea4f..8cf802ead384 100644 --- a/dev-libs/libclc/Manifest +++ b/dev-libs/libclc/Manifest @@ -4,10 +4,12 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447 +DIST llvm-project-3cd3f11c174baa001b337b88c7a6507eb5705cf2.tar.gz 194446197 BLAKE2B ba2ac8334f90fddfd9b8f97abd2f77bd1f1ad00c97f2b7daf6b799fe49755a9bd07e017e93cc634163ad7499e70d886556715e26e9d7ed9017018861c3522735 SHA512 b12d02a7b4df08e8decf99ac86875bef72ff2fa546699e7a94bfd2b2ad1e1256aec66185f9e2f7c2f5d06b1eeb3faae44a2c457b33e5c7416d3bd9921759b39d DIST llvm-project-5ae7fde004cbc640c2f60207791ac36574e5f5c6.tar.gz 193410766 BLAKE2B 50287f1ad41a895040934f8f19fd8aa2e91065b930ab14125dbbc3977273655d11482b6229577c11a8ad2bdd854ca109449b603bbc2e30cee20e95e4fe11e8b7 SHA512 f24f7a3b0661d2d4533b24c295c114817aff22c8f1d473ffa639cee547d31502719f8e1be4f25b970d450ecb9dcaa809c0e12b1bb380774f52cda82a4769d7bc EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80 EBUILD libclc-17.0.0.9999.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a EBUILD libclc-17.0.0_pre20230705.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a +EBUILD libclc-17.0.0_pre20230717.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5 diff --git a/dev-libs/libclc/libclc-17.0.0_pre20230717.ebuild b/dev-libs/libclc/libclc-17.0.0_pre20230717.ebuild new file mode 100644 index 000000000000..117d489acdec --- /dev/null +++ b/dev-libs/libclc/libclc-17.0.0_pre20230717.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake llvm llvm.org python-any-r1 + +DESCRIPTION="OpenCL C library" +HOMEPAGE="https://libclc.llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" +SLOT="0" +KEYWORDS="" +IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi" + +LLVM_MAX_SLOT=17 +BDEPEND=" + ${PYTHON_DEPS} + || ( + ( + sys-devel/clang:17 + spirv? ( dev-util/spirv-llvm-translator:17 ) + ) + ( + sys-devel/clang:16 + spirv? ( dev-util/spirv-llvm-translator:16 ) + ) + ( + sys-devel/clang:15 + spirv? ( dev-util/spirv-llvm-translator:15 ) + ) + ( + sys-devel/clang:14 + spirv? ( dev-util/spirv-llvm-translator:14 ) + ) + ( + sys-devel/clang:13 + spirv? ( dev-util/spirv-llvm-translator:13 ) + ) + ) +" + +LLVM_COMPONENTS=( libclc ) +llvm.org_set_globals + +llvm_check_deps() { + if use spirv; then + has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || + return 1 + fi + has_version -b "sys-devel/clang:${LLVM_SLOT}" +} + +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + local libclc_targets=() + + use spirv && libclc_targets+=( + "spirv-mesa3d-" + "spirv64-mesa3d-" + ) + use video_cards_nvidia && libclc_targets+=( + "nvptx--" + "nvptx64--" + "nvptx--nvidiacl" + "nvptx64--nvidiacl" + ) + use video_cards_r600 && libclc_targets+=( + "r600--" + ) + use video_cards_radeonsi && libclc_targets+=( + "amdgcn--" + "amdgcn-mesa-mesa3d" + "amdgcn--amdhsa" + ) + [[ ${#libclc_targets[@]} ]] || die "libclc target missing!" + + libclc_targets=${libclc_targets[*]} + local mycmakeargs=( + -DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}" + ) + cmake_src_configure +} diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest index e1eff0ce85e0..cdcfa94975e0 100644 --- a/dev-libs/libfilezilla/Manifest +++ b/dev-libs/libfilezilla/Manifest @@ -9,5 +9,5 @@ EBUILD libfilezilla-0.39.1-r1.ebuild 1279 BLAKE2B fdea7f03452e4dd301e1e44c355611 EBUILD libfilezilla-0.39.2.ebuild 1283 BLAKE2B a035da3ed2331f22470d989d9b582087ec7f1dbcc73a69fec37bfd94d94f5b6804c499e6867fded465b564c319b2f462d030eae16513a4c45bb95ef86afed522 SHA512 24484380ffb8ca6e59417a5825e4e9970c8a92a823ba72c6eec7a168d84c7789cfc223ddc06fcaf4a53386324439c5e23b6f9c68f1a840354a7af706774cf47c EBUILD libfilezilla-0.41.0.ebuild 1324 BLAKE2B 29fc9eb33e9403ba6ff9e623edbc4d4dc174ac6ff231c647114fe24b6c71347cb8c1eeb678f9ec52a946440d1aa9c08eadc5045e0af8d94edcc6f29ddb74142b SHA512 c4773e3026b49c24390719d3604dd0280080812b9ebdb5786620870cf611554a26ba19a30238617a26e30b4ee409ec25480237e3645de7bda9275470b4e4ad77 EBUILD libfilezilla-0.41.1.ebuild 1324 BLAKE2B 4656bd666e81deccba4992a4ad9d315aee1bdb3cb726852d01e5c200d1d06dbedfb7a2462b4898c9d71520acca8de746f95a60dfa7167742ef73f8fde72abf09 SHA512 5ad6171dc18c1a7ded6377d63fe013287a2e4b93e90b84653c3ff13901b2bd9bbaf9e3679c87c39ddebdf9d8dfc7012680e2450982cc25eb88f38b7d1426483d -EBUILD libfilezilla-0.42.2-r1.ebuild 1322 BLAKE2B 5f6278392fa86cfe3c8f90cd9108dc7099e78323bf3ec9fd7fa3399e0ac3892effb6848b76a03929383e8323990f54cdaa02377937b777b01df4a390127567e5 SHA512 f9a714843d02edaebcb77fc416ac93fe68fee899cf89c545079297438ada6621813d970ade5b5e13ea1e2cd5e090d8f240b084142dcad08b17a49c81d5fada0a +EBUILD libfilezilla-0.42.2-r1.ebuild 1321 BLAKE2B 7df838e99cf371e5717acc5c8f569a69be42f986efe99fe881811f39ebb89b997c24a4b5fc629779aaf74be025015773084cb9eee121fc88c41c41d09e6c9645 SHA512 97e63723e44cbd1c020a234d256e75a96ea58fe1bbde2b9c95672cb418ae789b8d592e88103626535bde4ac38c5d3c68f09dbd39ec69454cca6ee9559f14ffe2 MISC metadata.xml 1125 BLAKE2B eddf5dd9e7af700c9cdfd68918acef8a6064a8f26e4531f047315df70a4c2d1e2d2a4b3257062e5af1973fef5490606f08a0c6460e220d25b3d615c7d4626e57 SHA512 6038a9eb07bf8c4adaf9bd3abaa3abc283ba8d8c432aa193fcc1932071afdbd6a6bb50a16e5e7f4f0cce4afbc341bb26b1b265b8f0da12728f8db06103d73ba5 diff --git a/dev-libs/libfilezilla/libfilezilla-0.42.2-r1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.42.2-r1.ebuild index 4259fa6e99e2..51e41c4a68a2 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.42.2-r1.ebuild +++ b/dev-libs/libfilezilla/libfilezilla-0.42.2-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0/36" # libfilezilla.so version -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest index e2d368b218b4..7cde55ddae20 100644 --- a/dev-libs/libp11/Manifest +++ b/dev-libs/libp11/Manifest @@ -1,5 +1,5 @@ AUX libp11-0.4.12-openssl-3.1.patch 1969 BLAKE2B 94f516348da3e76a07923dcfff46e0c0ffd8bcea4e58eda75a7d753dd09a1d14d6357ec369630afec7007ccc2638c44cd714d769c3eccb4aef398ebd88cd01b3 SHA512 90f426ff7b817f335c0eac38f167ded3be1c0033ffd38ce87dbe5843d2ad2e43327ea613760fec5c86c9a7a39860787c9997506fd4a8d464cdabfe7388520342 DIST libp11-0.4.12.tar.gz 516414 BLAKE2B a816749984753a1916dd58860c51b49d316946b59eb3bc839f6a21dcff14de48d7a4937f55fc7ad96a26b914591854d5cf11a1fbac2d5f2f5e04c833973c0e42 SHA512 674cfca2c9eaf162262204c94f9d59d3095dabbc348c1842e758b897e1a5bd4ba08b2d589ec3b2a2d1343a8760eab253e7008dc09ef5b499e2f16385efe5c8cc EBUILD libp11-0.4.12-r1.ebuild 735 BLAKE2B 345d0b033c53d9842e47be807ecf22b382da1b96b2a258ec7163f5924489abad6ccdd6499b1831868ab8fb7b3201056ec2483c90e5d82795953148a00c44bd34 SHA512 247b4fcd656d60866ec9a3d6d361cb0a16b35b70b4aef696937cef4c5133aa69cac626b1ec10cca1396e5d1214933b53ab81d27c672f226430f3ac554b605c7f -EBUILD libp11-0.4.12-r3.ebuild 932 BLAKE2B 9d9d3a6cac738ff4d46d949c906d365a5a54c1bd319258e84eafeccf6300c0fc74460af916cb7986dbd8e492cb8b9f104112ea66efd0f3ce219013f762066f13 SHA512 ca823dadd68bcbf859c807ac538edc629cd8b1acc2075b1037cf9537fd728847ddf87211f2be6113b5286c11461ced8a656b0e4e3872075c092ec49e384b4f6c +EBUILD libp11-0.4.12-r3.ebuild 944 BLAKE2B dfd1e10a3687cb8c759563471a5ae731a422514af9b2f4f2be58e1166258f9b31bbdd47b35d1598a61699add81bd173ed897cfd168ff02a6500d2df0f46a83dd SHA512 89fe041d1013b141f7a0f0985a0162b99651c8fd6f4abd4a3088eafc4dc5a4b385448bf271c5b427fd78682c842fa275d6849dbfedf99f74f45f372be36cbca6 MISC metadata.xml 605 BLAKE2B 69d65e5f468abb8e4ac74afe597d7f1129e3dd1ecb249aa794a75c628268e5250cc0385c8119c0752155967d22a07fdfac2d31af458c0811a47bd32663627d1d SHA512 a2bd8e47b0d86aa7f3009bc724cc22adfbab5ddc041b2ec87f6f96faa4f2bfb442e501668c27627723727058b4c615cd6c80ef40f1bbdd580fdf6b7fe7326229 diff --git a/dev-libs/libp11/libp11-0.4.12-r3.ebuild b/dev-libs/libp11/libp11-0.4.12-r3.ebuild index 83c149c404b1..afe92920bde7 100644 --- a/dev-libs/libp11/libp11-0.4.12-r3.ebuild +++ b/dev-libs/libp11/libp11-0.4.12-r3.ebuild @@ -20,7 +20,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/softhsm )" BDEPEND="virtual/pkgconfig doc? ( app-doc/doxygen ) - test? ( dev-libs/opensc )" + test? ( >=dev-libs/opensc-0.23.0-r2 )" src_prepare() { local PATCHES=( diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest index 1e434d2f27e8..e74c0c885306 100644 --- a/dev-libs/nettle/Manifest +++ b/dev-libs/nettle/Manifest @@ -5,6 +5,6 @@ DIST nettle-3.9.1.tar.gz.sig 374 BLAKE2B 41c37cc0ea649445c7e4bbe2d0e9ab1c6f7bb50 DIST nettle-3.9.tar.gz 2393838 BLAKE2B 80885fa380de58765155a5d4b209e524f4bd0336156ba6f5189702007438998094df0e4e801370fd0a74251b8cf91f46638b0c0139388c2c2098b1207ed3415c SHA512 5e44f59b37ec1e92345fce0b963151d1f2aabf01b3a197b8d931067c51af4ba025059c6a07f2bcd19b17eb49d6ede98f5c200e58d340959826cda473459d2fba DIST nettle-3.9.tar.gz.sig 374 BLAKE2B 4fb9fbdafd01712db2506e070a64b6821dcc0c3ff3cea83011662ee4cdd5120ed10c6fa7b41d556069fe2d8827a312e94bb3586be845284fa7a7ac75f000a750 SHA512 8cf060e9f8e0dc0a70a7d324cf2366e0fc990fca2d8a1c677e66382f6853f96146fe30ea9b8629030991f4799430c7660ae7867c94167760bb945abb526b5bda EBUILD nettle-3.8.1.ebuild 2591 BLAKE2B 7cfe7bf9d70efc42e30ceb926eba73063bfd90fef314dc895d82c359e430e0370878600487d0db9e5983edb76225e327ff8e3c3ebe9256a43b9c4bf39eb71910 SHA512 59701f1a4b9ed85748494b0090b3aff4cc1e61083c3db20697c80bc63cfdec1cf1d9ad62a958abd912b73fa466ee00700f74c03aa44359f9f39fef009f29fe9e -EBUILD nettle-3.9.1.ebuild 2741 BLAKE2B 8e180f8e9de828cf540888d51c4f6d9c29f4eabe6f42dc9b8b4f198c0e3befd3ea329bf0b665a705f59b4505c1d57de77ecebbad15450d7da9c4a3ef10e54cc6 SHA512 116ff3eb288a3828728ebc3d9dfaeca3bf33e6bc4c168d9d1281ef172b653ad8021afe96ecd3144754cd107a0b85f35a63281aad19cdd2a17863bb1b3bc6bed1 +EBUILD nettle-3.9.1.ebuild 2740 BLAKE2B 6f82da96e62a430773f666f5a187b72377157bc4448aeb875c1c9bcda28dcd358fc004b8a31693ed4016b4c86d9d778dfce456efa044de5bf02dea15db85d379 SHA512 6ae4896bb37e9a4a2c001c05cc54e4227558e39a8794a9d18f378d711bb13e18bc14c2a54dd1eb96b1e37dbd41c0e078b1fc71d48923b1bc33d2f7950a82b737 EBUILD nettle-3.9.ebuild 2743 BLAKE2B ab687d2781a5038d60fbd30c776836da085bf7e66d6f249a0c438e5dc131716ea5d1a19552535fa415b8a328485523f3506bb57d1abd54ade46030152a02623b SHA512 13175b1fba67e67396284339b83974f6b255c972b78c8589f8c286a580d568ecd91b839fa1f800a7adf8bbec21d54f5a459fe6b3d1295122bb836f0fe9bca4ac MISC metadata.xml 514 BLAKE2B 4834f1c438d59a8af0e1c158e09a6d200746575f19ebb03a6ca6c2df5bf6f515ab4fda9efad9db27d7dece6a0cb760119a134a82a313f636a884d976e959c9eb SHA512 5ca3957b9fdc44dae6bb03596ba5aebe92464e5839dcbe5e3fabc83f1b8e76e9572c5bf9dfb16b465248f11007cf1e6b9d8956ea1b817d33aabcf5766ff860fb diff --git a/dev-libs/nettle/nettle-3.9.1.ebuild b/dev-libs/nettle/nettle-3.9.1.ebuild index 5ba161341399..54282f07d075 100644 --- a/dev-libs/nettle/nettle-3.9.1.ebuild +++ b/dev-libs/nettle/nettle-3.9.1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" LICENSE="|| ( LGPL-3 LGPL-2.1 )" # Subslot = libnettle - libhogweed soname version SLOT="0/8-6" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" # The arm64 crypto option controls AES, SHA1, and SHA2 usage. REQUIRED_USE=" diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest index 65abbd494f5e..e57c3b9809c9 100644 --- a/dev-libs/opensc/Manifest +++ b/dev-libs/opensc/Manifest @@ -1,7 +1,9 @@ AUX opensc-0.23.0-CVE-2023-2977.patch 1936 BLAKE2B 6352f5b1e596973a0049e38ce454df6932f72669acab8ab4d117ead9f0b5a88a69ad99c8d38eaff032300fe291d863182262fec0a36bbcabd7f7dad2c5c077e6 SHA512 08924312d7a29ce9692a26379d22651fb6b38a75ad0868f1a95dadce34c2163a8f0e72718642488018233f44dc5539b102f0879f6bc838cc178440283fccb5f7 +AUX opensc-0.23.0-backport-pr2656.patch 8562 BLAKE2B ebcfa06920d83fbc72dc2d5af76f2982956d192e4573b13e001f2b6ffd05c3b5768bc7e64626b75649ba0ecb121c1d5085564f6b71f7cf1e320a854db59c058c SHA512 e188a368eb50536e59e5eab5740b5df1254789f6200eb8ccb31139291012bb3cdf281f9d4dd1a0d2b5ff13d974534a84e054506a763f8bd74bb1ca25a1f38d12 AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f922f8a03602f15e3b1a98570be0a1f3f2db922c9083976eeb164d011b981c8709a9b1459e959634f SHA512 52a0a47963d0938a3a644dedcd913bb22ea6d5e3d539b759872c4175085491cc11a3958bb308029eb4942ea20e0f7890865c21cb063e335e38a154957a64ed58 DIST opensc-0.23.0.tar.gz 2366469 BLAKE2B c0f74379a70347a58be27684ae2cf833e6f35328b566af2c6daa8276174864406fa176acf7ba84931970fe07e3dd8d6eccf7884f079cb0110c4d6ff9a76792dc SHA512 cd102cd64e719c59153960a4921b7525055045f16e6f6ffa8c9def6ce999a9c5098267b41f8753b41107f626bea20c34561002f5d38eddb4ce6b371913a17a1b EBUILD opensc-0.23.0-r1.ebuild 1944 BLAKE2B 8423e68e981023da5738ee795d8ff5b066eb29acece7127a2a1558d32d28068477cd99cf595d869b1b210284a319e3e23fb3c75645edc71d366b3ee99fa63cc4 SHA512 13d84c497ed3fe40e2d83252b236a0475104d5d9cc1d1f6954401dff15975fe1614cac30a08a1a59f805161dccf8a05b0227c9936a876724809efdbc7b737498 +EBUILD opensc-0.23.0-r2.ebuild 1925 BLAKE2B 26530b6d503dea329abd7f0e5941f48740ab473e4f09fbb0e836d581806cb19d1c706fb7ff5ca4df88730c4dbc15085807f3cd488b032439dff1ca760d8974c2 SHA512 6e6597638236987720030d6d7eab2b2dbb3301c334edd92de514f76f0aa00638453700b5e5ecade126c94c357d85b8860a8dcd703c1571f3206ae192211687d2 EBUILD opensc-0.23.0.ebuild 1878 BLAKE2B fc0859070a61c2a07d8358525918e3775ba9b1e6b6917389e23e95ba7aafb8ddb24a6a89fded06f5c210623de6e8d843cbdb72b8501fd6c4986cbbbd7ecba7a6 SHA512 9496512a1b9565196de7202aa2294e0ff24ccea983c4d35622586c6e77ab0fd5a7c7c5e8eae0672ba0f872a90045007a7a7f88f624702a15f082bc1918f04fcf EBUILD opensc-9999.ebuild 1881 BLAKE2B ae0acc8bcc7081ceea38b6a59ed04dd6acf37bf4e86f3979ac317e5bd8dffba6cfdb0480cfc574ca23d5ab5f491ea2b301ce4b2ae86835e8210af391cdfe11c6 SHA512 8ce8e223359c15a15159a006ecfa2b1c4f10063902450c4fa120902cc1193a0478e87cd0678241b0f4e96aa7cb870267d4d80e44e1e13c952a322412801dba26 MISC metadata.xml 1305 BLAKE2B 8560829a2784e38e10b41f5e083568a7fafd19e9fe185b1675c787b2514ea01a18b3fa6c7d0018b6e45638512d02e9bec12fbc5df4e50bf49db6558ef89a9af8 SHA512 8b477d96f6acb7a808e24af1d4b29e16e06b83eaf29799dbc6b74181ded74de47d7527712e21412bfb92a26e1d03974368a2c1790208785230280a18d21aff06 diff --git a/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch b/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch new file mode 100644 index 000000000000..f9ce72d31776 --- /dev/null +++ b/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch @@ -0,0 +1,215 @@ +https://bugs.gentoo.org/909781 +https://github.com/OpenSC/libp11/issues/478 +https://github.com/OpenSC/OpenSC/pull/2656 + +From 99f7b82f187ca3512ceae6270c391243d018fdac Mon Sep 17 00:00:00 2001 +From: Jakub Jelen <jjelen@redhat.com> +Date: Thu, 1 Dec 2022 20:08:53 +0100 +Subject: [PATCH 1/4] pkcs11-tool: Fix private key import + +--- + src/tools/pkcs11-tool.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c +index aae205fe2c..cfee8526d5 100644 +--- a/src/tools/pkcs11-tool.c ++++ b/src/tools/pkcs11-tool.c +@@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) + RSA_get0_factors(r, &r_p, &r_q); + RSA_get0_crt_params(r, &r_dmp1, &r_dmq1, &r_iqmp); + #else +- if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_d) != 1 || ++ if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, &r_d) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_p) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || +- EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3, &r_iqmp) != 1) { + util_fatal("OpenSSL error during RSA private key parsing"); ++ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { + } + #endif + RSA_GET_BN(rsa, private_exponent, r_d); + +From 4a6e1d1dcd18757502027b1c5d2fb2cbaca28407 Mon Sep 17 00:00:00 2001 +From: Jakub Jelen <jjelen@redhat.com> +Date: Thu, 1 Dec 2022 20:11:41 +0100 +Subject: [PATCH 2/4] pkcs11-tool: Log more information on OpenSSL errors + +--- + src/tools/pkcs11-tool.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c +index cfee8526d5..f2e6b1dd91 100644 +--- a/src/tools/pkcs11-tool.c ++++ b/src/tools/pkcs11-tool.c +@@ -3641,10 +3641,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) + const BIGNUM *r_dmp1, *r_dmq1, *r_iqmp; + r = EVP_PKEY_get1_RSA(pkey); + if (!r) { +- if (private) +- util_fatal("OpenSSL error during RSA private key parsing"); +- else +- util_fatal("OpenSSL error during RSA public key parsing"); ++ util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", ++ ERR_error_string(ERR_peek_last_error(), NULL)); + } + + RSA_get0_key(r, &r_n, &r_e, NULL); +@@ -3654,10 +3652,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) + BIGNUM *r_dmp1 = NULL, *r_dmq1 = NULL, *r_iqmp = NULL; + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &r_n) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &r_e) != 1) { +- if (private) +- util_fatal("OpenSSL error during RSA private key parsing"); +- else +- util_fatal("OpenSSL error during RSA public key parsing"); ++ util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", ++ ERR_error_string(ERR_peek_last_error(), NULL)); + } + #endif + RSA_GET_BN(rsa, modulus, r_n); +@@ -3674,8 +3670,9 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || +- util_fatal("OpenSSL error during RSA private key parsing"); + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { ++ util_fatal("OpenSSL error during RSA private key parsing: %s", ++ ERR_error_string(ERR_peek_last_error(), NULL)); + } + #endif + RSA_GET_BN(rsa, private_exponent, r_d); + +From 267da3e81f1fc23a9ccce1462ab5deb1a4d4aec5 Mon Sep 17 00:00:00 2001 +From: Jakub Jelen <jjelen@redhat.com> +Date: Thu, 1 Dec 2022 20:38:31 +0100 +Subject: [PATCH 3/4] Reproducer for broken pkcs11-tool key import + +--- + tests/Makefile.am | 10 ++++--- + tests/test-pkcs11-tool-import.sh | 48 ++++++++++++++++++++++++++++++++ + 2 files changed, 54 insertions(+), 4 deletions(-) + create mode 100755 tests/test-pkcs11-tool-import.sh + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index d378e2ee00..9d8a24c321 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -14,8 +14,9 @@ dist_noinst_SCRIPTS = common.sh \ + test-pkcs11-tool-test-threads.sh \ + test-pkcs11-tool-sign-verify.sh \ + test-pkcs11-tool-allowed-mechanisms.sh \ +- test-pkcs11-tool-sym-crypt-test.sh\ +- test-pkcs11-tool-unwrap-wrap-test.sh ++ test-pkcs11-tool-sym-crypt-test.sh \ ++ test-pkcs11-tool-unwrap-wrap-test.sh \ ++ test-pkcs11-tool-import.sh + + .NOTPARALLEL: + TESTS = \ +@@ -25,8 +26,9 @@ TESTS = \ + test-pkcs11-tool-test.sh \ + test-pkcs11-tool-test-threads.sh \ + test-pkcs11-tool-allowed-mechanisms.sh \ +- test-pkcs11-tool-sym-crypt-test.sh\ +- test-pkcs11-tool-unwrap-wrap-test.sh ++ test-pkcs11-tool-sym-crypt-test.sh \ ++ test-pkcs11-tool-unwrap-wrap-test.sh \ ++ test-pkcs11-tool-import.sh + XFAIL_TESTS = \ + test-pkcs11-tool-test-threads.sh \ + test-pkcs11-tool-test.sh +diff --git a/tests/test-pkcs11-tool-import.sh b/tests/test-pkcs11-tool-import.sh +new file mode 100755 +index 0000000000..76ff8e51be +--- /dev/null ++++ b/tests/test-pkcs11-tool-import.sh +@@ -0,0 +1,48 @@ ++#!/bin/bash ++SOURCE_PATH=${SOURCE_PATH:-..} ++ ++source $SOURCE_PATH/tests/common.sh ++ ++echo "=======================================================" ++echo "Setup SoftHSM" ++echo "=======================================================" ++if [[ ! -f $P11LIB ]]; then ++ echo "WARNING: The SoftHSM is not installed. Can not run this test" ++ exit 77; ++fi ++card_setup ++ ++ID="0100" ++OPTS="" ++for KEYTYPE in "RSA" "EC"; do ++ echo "=======================================================" ++ echo "Generate and import $KEYTYPE keys" ++ echo "=======================================================" ++ if [ "$KEYTYPE" == "RSA" ]; then ++ ID="0100" ++ elif [ "$KEYTYPE" == "EC" ]; then ++ ID="0200" ++ OPTS="-pkeyopt ec_paramgen_curve:P-521" ++ fi ++ openssl genpkey -out "${KEYTYPE}_private.der" -outform DER -algorithm $KEYTYPE $OPTS ++ assert $? "Failed to generate private $KEYTYPE key" ++ $PKCS11_TOOL --write-object "${KEYTYPE}_private.der" --id "$ID" --type privkey \ ++ --label "$KEYTYPE" -p "$PIN" --module "$P11LIB" ++ assert $? "Failed to write private $KEYTYPE key" ++ ++ openssl pkey -in "${KEYTYPE}_private.der" -out "${KEYTYPE}_public.der" -pubout -inform DER -outform DER ++ assert $? "Failed to convert private $KEYTYPE key to public" ++ $PKCS11_TOOL --write-object "${KEYTYPE}_public.der" --id "$ID" --type pubkey --label "$KEYTYPE" \ ++ -p $PIN --module $P11LIB ++ assert $? "Failed to write public $KEYTYPE key" ++ # certificate import already tested in all other tests ++ ++ rm "${KEYTYPE}_private.der" "${KEYTYPE}_public.der" ++done ++ ++echo "=======================================================" ++echo "Cleanup" ++echo "=======================================================" ++card_cleanup ++ ++exit $ERRORS + +From 63a7bceeca43ece1eee201ef7a974b20b294ba4e Mon Sep 17 00:00:00 2001 +From: Jakub Jelen <jakuje@gmail.com> +Date: Fri, 2 Dec 2022 18:07:43 +0100 +Subject: [PATCH 4/4] Simplify the new test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Co-authored-by: Veronika HanulĂková <61348757+xhanulik@users.noreply.github.com> +--- + tests/test-pkcs11-tool-import.sh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/tests/test-pkcs11-tool-import.sh b/tests/test-pkcs11-tool-import.sh +index 76ff8e51be..c90b3b4926 100755 +--- a/tests/test-pkcs11-tool-import.sh ++++ b/tests/test-pkcs11-tool-import.sh +@@ -12,15 +12,13 @@ if [[ ! -f $P11LIB ]]; then + fi + card_setup + +-ID="0100" +-OPTS="" + for KEYTYPE in "RSA" "EC"; do + echo "=======================================================" + echo "Generate and import $KEYTYPE keys" + echo "=======================================================" +- if [ "$KEYTYPE" == "RSA" ]; then +- ID="0100" +- elif [ "$KEYTYPE" == "EC" ]; then ++ ID="0100" ++ OPTS="" ++ if [ "$KEYTYPE" == "EC" ]; then + ID="0200" + OPTS="-pkeyopt ec_paramgen_curve:P-521" + fi diff --git a/dev-libs/opensc/opensc-0.23.0-r2.ebuild b/dev-libs/opensc/opensc-0.23.0-r2.ebuild new file mode 100644 index 000000000000..60f0ce62ca27 --- /dev/null +++ b/dev-libs/opensc/opensc-0.23.0-r2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 + +DESCRIPTION="Libraries and applications to access smartcards" +HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git" +else + SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib" +RESTRICT="!test? ( test )" + +RDEPEND="zlib? ( sys-libs/zlib ) + readline? ( sys-libs/readline:0= ) + ssl? ( dev-libs/openssl:0= ) + openct? ( >=dev-libs/openct-0.5.0 ) + pace? ( dev-libs/openpace:= ) + pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) + notify? ( dev-libs/glib:2 )" +DEPEND="${RDEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + test? ( dev-util/cmocka )" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE=" + pcsc-lite? ( !openct !ctapi ) + openct? ( !pcsc-lite !ctapi ) + ctapi? ( !pcsc-lite !openct ) + || ( pcsc-lite openct ctapi )" + +PATCHES=( + "${FILESDIR}"/${P}-CVE-2023-2977.patch + "${FILESDIR}"/${P}-backport-pr2656.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # don't want to run upstream's clang-tidy checks + export ac_cv_path_CLANGTIDY="" + + econf \ + --with-completiondir="$(get_bashcompdir)" \ + --disable-strict \ + --enable-man \ + $(use_enable ctapi) \ + $(use_enable doc) \ + $(use_enable notify) \ + $(use_enable openct) \ + $(use_enable pace openpace) \ + $(use_enable pcsc-lite pcsc) \ + $(use_enable readline) \ + $(use_enable secure-messaging sm) \ + $(use_enable ssl openssl) \ + $(use_enable test cmocka) \ + $(use_enable zlib) +} + +src_install() { + default + + insinto /etc/pkcs11/modules/ + doins "${FILESDIR}"/opensc.module + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/paho-mqtt-c/Manifest b/dev-libs/paho-mqtt-c/Manifest index 882699c49aae..d906fff8b6af 100644 --- a/dev-libs/paho-mqtt-c/Manifest +++ b/dev-libs/paho-mqtt-c/Manifest @@ -1,4 +1,5 @@ +DIST paho-mqtt-c-1.3.12-live.tar.gz 3642676 BLAKE2B c20e3bb1b4eae30b268639d30c1e4d72f6759850bef2dc13de424debb7a0785a5ba083af094e28cb80814df519831ac0e1da27d8aa4958361724aabea92c03e5 SHA512 af0f52944c46fe7874203b3b359d8fb8935d5bd6b394045138624b96130c6b756045fb3b486e224b7e55b3cb478197b8a049bbeb01ff7e3d16d0d3f12c521110 DIST paho-mqtt-c-1.3.12.tar.gz 3622938 BLAKE2B 9eb7bca0367a3001f00122f2056b60ddf3633e0304661a424821c3e2b3370d65e09c51c62f90bb89f0e4ce291640e71ae0d3b093fe600efb87aa3744e431cafe SHA512 3152b557a8ab7c9b9c80277283e0f5e9965ce4c2ebbdaef0f238908d49e6fa1281aa72932ea112a836144b79656e4abe6e0cbd93840429a52e501a2c6b12d313 DIST paho.mqtt.testing.tar.gz 175845 BLAKE2B 02c284c4e1cfe91bb87735e8fc61f206c3e93adf18c567ff330ae8d1c2bd04b7aa079ba3961610b7c9cc7e22340be000bf56772d5c39d1bc4d1b406bf564da66 SHA512 8328c6a010d76cf62ee2007a849acb61b84cf2dc058525bc967661984fdf26407dd52da83a3f2acda56e3c5d309301ea2a8ed264466d0fb933994dd248dbbe8d -EBUILD paho-mqtt-c-1.3.12.ebuild 1882 BLAKE2B ff25a193d77bcc77a8bf817e1dc9d5a2a90cf40e48190d9f9fbc3d24bddbd10bd17d9de951c07f0d57b8f55668553c569a815f83756cc1811fd1402fcaac06c9 SHA512 5b21516edd52ae621079b409990f12dacf9ff8ee70a162ff4c5f0a485527be62fb1fc0e141c65437252a0ca51a0fddcde852d8240ed686b8f8ecf26fd714b9b1 +EBUILD paho-mqtt-c-1.3.12.ebuild 2673 BLAKE2B d75127d22d0757b9afc50527c166ae3262fb6dd4eaf7b1e21538ca9a0c177c6f6185b326111fca186321f6d59a57cda56b66e7258b265291ea650b9d678bdd28 SHA512 7e2ce0fe8e3734bc5ab0512776c81b60a1d70213b99389be90ffe7c230f3d186bf8e342e670b0f92dc25ddd4be7bebb673482fb6299d56419f638da7eacb4d4c MISC metadata.xml 812 BLAKE2B acf5c65842b641cbc813df4786c3cb65b6e7155b5082b5bee50bf7abb6531fab53bb4a4fad9452a062d7612cc663eb4e3327a4e9c9c9a9349f1b139289c7943c SHA512 f1aa7056cde248fb0976bf8b635017311aa6a53961fdf5c02eb601c1ffdc0079693d430ef143410a8873a07cf4809443fde98436c0ff640a0625361ffe488789 diff --git a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild index f1713fe8f0c1..e417fe9118a4 100644 --- a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild +++ b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild @@ -9,18 +9,20 @@ inherit cmake python-any-r1 toolchain-funcs MY_TEST_UTILS="paho.mqtt.testing" MY_TEST_COMMIT="577f955352e41205c554d44966c2908e90026345" +MY_LIVE_COMMIT="7db21329301b1f527c925dff789442db3ca3c1e7" DESCRIPTION="An Eclipse Paho C client library for MQTT for Windows, Linux and MacOS." HOMEPAGE="https://eclipse.org/paho" SRC_URI=" https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/eclipse/paho.mqtt.c/archive/${MY_LIVE_COMMIT}.tar.gz -> ${P}-live.tar.gz https://github.com/eclipse/${MY_TEST_UTILS}/archive/${MY_TEST_COMMIT}.tar.gz -> ${MY_TEST_UTILS}.tar.gz " LICENSE="EPL-2.0" SLOT="1.3" KEYWORDS="~amd64 ~x86" -IUSE="+high-performance +ssl doc test" +IUSE="doc examples +high-performance +ssl test" BDEPEND=" doc? ( app-doc/doxygen @@ -36,21 +38,27 @@ S="${WORKDIR}/paho.mqtt.c-${PV}" BUILD_DIR="${S}_build" +src_prepare(){ + cmake_src_prepare + if use test; then + # removing old certs + rm -r "${S}"/test/ssl || die + mv "${WORKDIR}"/paho.mqtt.c-"${MY_LIVE_COMMIT}"/test/ssl "${S}"/test/ssl || die + + mv "${WORKDIR}/${MY_TEST_UTILS}-${MY_TEST_COMMIT}" "${WORKDIR}/${MY_TEST_UTILS}" || die + fi +} + src_configure(){ local mycmakeargs=( -DPAHO_BUILD_SHARED=TRUE -DPAHO_HIGH_PERFORMANCE="$(usex high-performance "TRUE" "FALSE")" -DPAHO_WITH_SSL="$(usex ssl "TRUE" "FALSE")" -DPAHO_BUILD_DOCUMENTATION="$(usex doc "TRUE" "FALSE")" + -DPAHO_BUILD_SAMPLES="$(usex examples "TRUE" "FALSE")" -DPAHO_ENABLE_TESTING="$(usex test "TRUE" "FALSE")" ) cmake_src_configure - if use test; then - mv "${WORKDIR}"/"${MY_TEST_UTILS}"-"${MY_TEST_COMMIT}" "${WORKDIR}"/"${MY_TEST_UTILS}" || die - # a subdir in test - mv "${WORKDIR}"/"${MY_TEST_UTILS}" "${BUILD_DIR}"/test/ || die - cp "${S}"/test/*.py "${BUILD_DIR}"/test/ || die - fi } src_test() { @@ -59,9 +67,36 @@ src_test() { return fi - ${EPYTHON} "${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/startbroker.py -c \ - "${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/localhost_testing.conf & + cd "${WORKDIR}/${MY_TEST_UTILS}/interoperability" || die - ${EPYTHON} "${BUILD_DIR}"/test/mqttsas.py & + ${EPYTHON} startbroker.py -c localhost_testing.conf \ + > "${T}/testbroker.log" & + local -r startbroker_pid=$! + + ${EPYTHON} "${S}"/test/mqttsas.py \ + > "${T}/testmqttsas.log" & + local -r mqttsas_pid=$! + + local port ports + ports=(1883 1888{3..8}) + + for port in ${ports[@]}; do + einfo "Waiting for TCP port ${port} to become available" + if timeout 30 bash -c \ + 'until printf "" >/dev/tcp/${0}/${1} 2>> "${T}/portlog"; do sleep 1; done' \ + localhost "${port}"; then + continue + fi + + kill ${startbroker_pid} ${mqttsas_pid} + die "Timeout waiting for port ${port} to become available" + done + + local myctestargs=( + -j 1 + --timeout 600 + ) cmake_src_test + + kill ${startbroker_pid} ${mqttsas_pid} || die } diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest index 25a1917040af..4fce786beb01 100644 --- a/dev-libs/vala-common/Manifest +++ b/dev-libs/vala-common/Manifest @@ -2,6 +2,6 @@ DIST vala-0.56.7.tar.xz 3992100 BLAKE2B 09804dba1dcaaef2af2621f7ee6c5c69d0bb06c1 DIST vala-0.56.8.tar.xz 3994328 BLAKE2B 4d68b102838a854b870865c6223dfb6cf56741db2cf918d393a4c279cc63a5e7af3464d256ef9a7c90eb5a8773812613315815c64a1b11e5b3fce86ac52278b6 SHA512 152a7378c42602296c5797d0425e51c2f9d2c65449f035158ef7f8dbf48f3a6a09e7c9028d196c967d8a9dfcdbd5f5deaa09ffcde5e2a335872e9740cd79ba41 DIST vala-0.56.9.tar.xz 3996196 BLAKE2B 17b6df6c11c1f3a253ffd3650203b8dae8a1cf45ef708defe857ad642035ad05336deeb1b27a70e7bc620cba8d56d6c958b2016a4db5afdb3cc5108e014f9cc2 SHA512 933bd568477f7fd9465cd041f0b1959ccb55f4533196a272abb4bde811fda8c1e994c1035ad55bcdf7c066f97adcdc7a4f6dcb3270bfdd63b7d2ff1b214fc356 EBUILD vala-common-0.56.7.ebuild 688 BLAKE2B 43035d0285a4fc8cc360969b0cea254660cc6d1645499258c1ff9171797a522a0d8f3ae4736a3c33ed39c3788a5bdd750b6063958b60cc21b21a20823b55f27b SHA512 b030fde9c0945ac51e18acae0504fe7d7c2188a1972ac72c30227e38956f5abc106b07cc1dff66a1cd02d819d40426dfcd3e11bd42656c01a687519eec6dfb9b -EBUILD vala-common-0.56.8.ebuild 689 BLAKE2B 9b6b02085594f8e6c4c6578ab0676ca3c2eac235340fae9fc02fe37ae9b68a5b72574e6143711f426aa0af5a40fa2f2ecddffc8b34936a77fb762b86345ee6c8 SHA512 676c8c8b0553abd63e44bc1494c310acd0e849c12ca41073a19877f54728c93e6941e0b9ea4fd50cdbb555671143fcb3a15f91c4d68b705f3d12a8eb0c6c33ae +EBUILD vala-common-0.56.8.ebuild 688 BLAKE2B 43035d0285a4fc8cc360969b0cea254660cc6d1645499258c1ff9171797a522a0d8f3ae4736a3c33ed39c3788a5bdd750b6063958b60cc21b21a20823b55f27b SHA512 b030fde9c0945ac51e18acae0504fe7d7c2188a1972ac72c30227e38956f5abc106b07cc1dff66a1cd02d819d40426dfcd3e11bd42656c01a687519eec6dfb9b EBUILD vala-common-0.56.9.ebuild 696 BLAKE2B 6f2e9998804c827aa65daa006a6f69bf9e78e5f11b882926fba70bdf1167b2244d668045b98a4ae1b695569b025cda2234e9729611b804b8adab79b0344cb4d4 SHA512 b2dba932b10631795c727a31e7cf03d924b5f738bc9ca17cccdc702970bac339474469b0f490d0a425f9fe777e9d6d455c8f9ac5876ef8fe0fa4acf17887784d -MISC metadata.xml 401 BLAKE2B 4fdcf38a56aa788f69584bac474de0c8e7130cb2b0a296c987e103bd0d9b879916c488fef9cf4cf40651c739bc168b5977395d7489402005dd0cf0fb45b3e431 SHA512 1944bbcc38712dc31ab26f4bfe52d848cd16fd844be3f2533b87dc13f26d5040e1118e8e928891f3e9bac844abe1b8264788bbdb548513ac7d2c3c393591067b +MISC metadata.xml 426 BLAKE2B 5d4ef5f9505178faae0cd5ea94378517ca8fbf2304e3fa77880dceb4194f520bb62ac4c61e5c9b0f2125194fc9470cbe97ecf9708494031ef4d0f222de58c6b1 SHA512 f3fe4cdff9d1ac255e1c4f565edab3b01d569c93b77179bc1efe8de2843bb5e031bc442e76fd1bfe775fbaaadab87b0fec8f1839ade2bdc6c1d2eac08565834e diff --git a/dev-libs/vala-common/metadata.xml b/dev-libs/vala-common/metadata.xml index 4b1e36254bfb..a4f4d8934edf 100644 --- a/dev-libs/vala-common/metadata.xml +++ b/dev-libs/vala-common/metadata.xml @@ -5,6 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="cpe">cpe:/a:gnome:vala</remote-id> <remote-id type="gnome-gitlab">GNOME/vala</remote-id> diff --git a/dev-libs/vala-common/vala-common-0.56.8.ebuild b/dev-libs/vala-common/vala-common-0.56.8.ebuild index 77824b8a923b..2bba314753d4 100644 --- a/dev-libs/vala-common/vala-common-0.56.8.ebuild +++ b/dev-libs/vala-common/vala-common-0.56.8.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" RDEPEND="" DEPEND="" diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index 661d6989af53..ff8fa3d9c47e 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,7 +1,8 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 +AUX weston-12.0.1-issue757.patch 6852 BLAKE2B d3f330772bd80dadbf815f947054c3366ea074707237cb4e777f888dfd08dcc85d0e6a4c760a7f39796a30da9589521aa2a9208abe641649f6dd66c14667a1d2 SHA512 cfaf59ecbb66d11bb694e90848ecccf4141977ee3021888935826af294c3d60d7e73220e1099325d29b0912530ff7302b25298cd4cbc9d3455296bf33f85fbe3 DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c DIST weston-12.0.1.tar.xz 1969772 BLAKE2B d7a76ad6e11b76b73b91aeb9b3b49e823ecc8170bd1306f9a8ed90fa49d9bc7734e4c0595ca67f11421ecf5b4dbf04289cf803726c508e8c979a9850c0e94ccb SHA512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 EBUILD weston-11.0.1.ebuild 3647 BLAKE2B 4ea2290da03417622e5b11c2c066bed9c0012fd573dd2a3e09e465ee78d1cdb6e4db82bba05033cc14cd6fe2123b6cf797fd96d092e47bbba6e91c7914082de6 SHA512 df50728e3cefe2439ecfc3bbeb44a33b66125d679ea126c6e985730485fc3c4f2bd8b09cae393ce2bfa0dc0be0dd4e5befbed6e33bf910b43cf7a68867dfe0bf -EBUILD weston-12.0.1.ebuild 3686 BLAKE2B e84ee5c700efe156412620f048e47b54bb015b4a107c71f9c85ae7d9eefce40bdeae59b6b8837fb7be20666c12f89ef5269c1c0c08e068f0d3ee381f22e00d64 SHA512 1c7478c575d616e544451ea20fd6d92f0eb933731c8365ac19c389bf9d346db2c6a9eae1c3f5755e79e793e7b2e190992d8d2d30ebba1834a9a32ab577528e0c +EBUILD weston-12.0.1-r1.ebuild 3743 BLAKE2B bfb73ff935849b7ab104ca1f82f3155e24bea6473bc4c2b8cff901866f0ce14a68614f576d940d941be1849bd1e666456d322ed89de5c16880bc9d50336ed524 SHA512 5c7b0301d741270411e3821005fca930bb0f0a8c7a1304d7d1f26118c14c768c1a5790755c89af6d196cd613cec45720193b38d538d7f5c2ce552cd2f207641a EBUILD weston-9999.ebuild 3705 BLAKE2B 80f5d38e267ea8e422b2bd6b9b935dac285573c761be1a4319c3c7e26687bf52d598f24a6aeab96dd5c6c7f8b6ed5b5467b60fc44232bcd2653e5476f76972fa SHA512 c1077cd94be525ee6c09c3871567eb4f1bd33e99c6aa8f33424ff779874839847efbb564eb3d698ea0a17e3ea6bbb1b5b9411ca521cd54d5e7636a812e6db708 MISC metadata.xml 1549 BLAKE2B adfc4def87465ca322d87a45c8790244d9f05808608ac7d055356124f6cdd9602d97535e9751c04858825249fc17f2e6a43d52923b37b03d237df997d10386cd SHA512 7aafd337baa7b82533519a7082a6efe2cb88f67ad81f396f06268f1ff6512d4557016faddae49523aaafe83c6975bd798723a4a51b344abe3d77b2bc9b0326bc diff --git a/dev-libs/weston/files/weston-12.0.1-issue757.patch b/dev-libs/weston/files/weston-12.0.1-issue757.patch new file mode 100644 index 000000000000..c36647e22446 --- /dev/null +++ b/dev-libs/weston/files/weston-12.0.1-issue757.patch @@ -0,0 +1,183 @@ +https://gitlab.freedesktop.org/wayland/weston/-/issues/757 +https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1257 + +From 6d8e3c569cf7e9ad80569768871e1ed30bf4d2a8 Mon Sep 17 00:00:00 2001 +From: Leandro Ribeiro <leandro.ribeiro@collabora.com> +Date: Thu, 1 Jun 2023 18:51:34 -0300 +Subject: [PATCH 1/3] drm: drop disable_planes being false as a condition to + support writeback + +In 2d70bdfdcdb236ee3e466b1a24df494da43c8a68 "drm-backend: add support to +output capture writeback source" we've ensured that disable_planes +should be false in order to support writeback capture tasks. + +But this was wrong; disable_planes is transient (it is true when +there's some sort of content recording happening), and we enable/disable +that during compositor's lifetime. + +This is dangerous and may result in a crash. Imagine the following +sequence: + + 1. screen recording starts, disable_planes is set to true. + + 2. for whatever reason the output size changes, and we end up + not updating capture info because we think that writeback is not + supported by the device. + + 3. screen recording stops, disable_planes is set to false. + + 4. user tries to take a writeback screenshot, and the + DRM-backend will pull a writeback capture task with + weston_output_pull_capture_task(). + + 5. this function has an assert to ensure that the DRM-backend + did not forget to update the capture info, and we hit that + assert. + +With this patch we drop disable_planes being false as a condition to +support writeback. So now we keep the capture info up-to-date even when +screen recording is happening, and we gracefully fail writeback tasks. + +Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com> +--- + libweston/backend-drm/drm.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c +index 1078b89bf..a1e61df8c 100644 +--- a/libweston/backend-drm/drm.c ++++ b/libweston/backend-drm/drm.c +@@ -561,6 +561,12 @@ drm_output_pick_writeback_capture_task(struct drm_output *output) + + assert(output->device->atomic_modeset); + ++ if (output->base.disable_planes > 0) { ++ msg = "drm: KMS planes usage is disabled for now, so " \ ++ "writeback capture tasks are rejected"; ++ goto err; ++ } ++ + wb = drm_output_find_compatible_writeback(output); + if (!wb) { + msg = "drm: could not find writeback connector for output"; +@@ -948,7 +954,7 @@ drm_output_apply_mode(struct drm_output *output) + } + } + +- if (device->atomic_modeset && !output->base.disable_planes) ++ if (device->atomic_modeset) + weston_output_update_capture_info(&output->base, + WESTON_OUTPUT_CAPTURE_SOURCE_WRITEBACK, + output->base.current_mode->width, +@@ -2138,7 +2144,7 @@ drm_output_enable(struct weston_output *base) + output->base.switch_mode = drm_output_switch_mode; + output->base.set_gamma = drm_output_set_gamma; + +- if (device->atomic_modeset && !base->disable_planes) ++ if (device->atomic_modeset) + weston_output_update_capture_info(base, WESTON_OUTPUT_CAPTURE_SOURCE_WRITEBACK, + base->current_mode->width, + base->current_mode->height, +-- +GitLab + + +From 3226417573ac12e7d41823335bcb3036bf442cbc Mon Sep 17 00:00:00 2001 +From: Leandro Ribeiro <leandro.ribeiro@collabora.com> +Date: Fri, 2 Jun 2023 14:44:44 -0300 +Subject: [PATCH 2/3] drm: do not pull writeback task if KMS atomic API is not + supported + +Since 2d70bdfdcdb236ee3e466b1a24df494da43c8a68 "drm-backend: add support +to output capture writeback source", the DRM-backend was broken for KMS +devices that do not support the atomic API. This fixes that. + +We don't support writeback screenshots without atomic modeset support. +So for such devices, we never update the output capture info +(weston_output_update_capture_info()) for the writeback source. + +The function that we use to pull writeback tasks +(weston_output_pull_capture_task()) asserts that the capture providers +(renderers, DRM-backend) did not forget to update the capture info +(size/format) if something changed. But as we've never updated the +capture info for such devices, it is zeroed, leading to an assert hit. + +With this patch we only pull the capture task for KMS devices that +support the atomic API. + +Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com> +--- + libweston/backend-drm/drm.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c +index a1e61df8c..b43791db5 100644 +--- a/libweston/backend-drm/drm.c ++++ b/libweston/backend-drm/drm.c +@@ -553,14 +553,14 @@ drm_output_pick_writeback_capture_task(struct drm_output *output) + int32_t height = output->base.current_mode->height; + uint32_t format = output->format->format; + ++ assert(output->device->atomic_modeset); ++ + ct = weston_output_pull_capture_task(&output->base, + WESTON_OUTPUT_CAPTURE_SOURCE_WRITEBACK, + width, height, pixel_format_get_info(format)); + if (!ct) + return; + +- assert(output->device->atomic_modeset); +- + if (output->base.disable_planes > 0) { + msg = "drm: KMS planes usage is disabled for now, so " \ + "writeback capture tasks are rejected"; +@@ -642,7 +642,8 @@ drm_output_repaint(struct weston_output *output_base, pixman_region32_t *damage) + if (drm_output_ensure_hdr_output_metadata_blob(output) < 0) + goto err; + +- drm_output_pick_writeback_capture_task(output); ++ if (device->atomic_modeset) ++ drm_output_pick_writeback_capture_task(output); + + drm_output_render(state, damage); + scanout_state = drm_output_state_get_plane(state, +-- +GitLab + + +From cf64fbe7847859ca11d4722f056d2ebfa8d10177 Mon Sep 17 00:00:00 2001 +From: Leandro Ribeiro <leandro.ribeiro@collabora.com> +Date: Thu, 1 Jun 2023 17:04:56 -0300 +Subject: [PATCH 3/3] tests: assert that capture info was received before + trying screenshot + +If the source is not supported, we won't receive the capture +information. So the capture info (size/format) will be zeroed, and we +fail while trying to create a buffer for the screenshot with size/format +zeroed. + +With this patch we fail if we don't receive the capture info, what makes +the failure reason more explicit. + +Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com> +--- + tests/weston-test-client-helper.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c +index 3e24a0310..2a7f938d3 100644 +--- a/tests/weston-test-client-helper.c ++++ b/tests/weston-test-client-helper.c +@@ -1705,6 +1705,9 @@ client_capture_output(struct client *client, + + client_roundtrip(client); + ++ assert(capt.width != 0 && capt.height != 0 && capt.drm_format != 0 && ++ "capture source not available"); ++ + buf = create_shm_buffer(client, + capt.width, capt.height, capt.drm_format); + +-- +GitLab + diff --git a/dev-libs/weston/weston-12.0.1.ebuild b/dev-libs/weston/weston-12.0.1-r1.ebuild index 684694b47195..35a02ce6cc88 100644 --- a/dev-libs/weston/weston-12.0.1.ebuild +++ b/dev-libs/weston/weston-12.0.1-r1.ebuild @@ -92,6 +92,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/weston-12.0.1-issue757.patch" +) + src_configure() { local emesonargs=( $(meson_use drm backend-drm) |