gentoo auto-resync : 21:07:2023 - 20:47:34

9 files changed, 108 insertions, 3 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1efecdeafb98..97560391ade2 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 6fc73ce8d7b5..6ec83581d8be 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -8,5 +8,5 @@ EBUILD actiontext-6.1.7.3.ebuild 1810 BLAKE2B 10d8fa4f3590e03b3d7147cf1162c5fdc1
 EBUILD actiontext-6.1.7.4-r1.ebuild 1892 BLAKE2B 4b869605010fe56d0bf2dede29f343fdee273c879a9c12fac54994f7524aa55bbec1cf3c43671a2273031c1fe358769611ee652f09d747150a2ca78d26f012e2 SHA512 cd3a2523dff91089aa86ae135b3de98ce46c71101cfc307634991bc67cdcaf115bde9722224828b84b2b5d2de9bd93d82e633351b91fc691fc2b9f31943aac01
 EBUILD actiontext-6.1.7.4.ebuild 1846 BLAKE2B 47f611de02468fd857248a77777878c154236523d684febefe557823335142986f80adec0cc05448d498b6d5f2acf63e6297f9d5e49bf48bdf77eb73e7171cca SHA512 92f9052aab58679fbb42166e9939941ac35ddd87b189fdcb7620085e6b3953fac50c6f035ebccf50b710db876e471789015dd23506e3036f656843d7f6772527
 EBUILD actiontext-7.0.5.1.ebuild 1946 BLAKE2B 245bc604ac5a5abe92f57a40b60551f6f67b5bb1c3a60163337fdc6fe52a9f64a5f9c469ec700f0a378f28d1581e36f947baa8bbc166b74d1936e24cf595af0c SHA512 a81edab5ef1d61949ad659f1800f4ccee6b70a386e751a18cd0b8106d9276d87944b9d8fc9931499be0fca20c1c190c7689b9065b223884b1e52541b9e49a865
-EBUILD actiontext-7.0.6.ebuild 1970 BLAKE2B afaef3f3909af4e3ccd22418514421974246a7f83ae8817fab036e709716a7b28bd9e1104b994fb3195df7ff6bd8dd513173a75a498de92459d6eaefa97fadab SHA512 1ad87f4e20b576916f9a0fc518f5979b237035ee8863f5b50a1f6de7eaa7934562aa22d3571131e101182030e002dfb41e7da7749a407b0bd270a21a65b5b943
+EBUILD actiontext-7.0.6.ebuild 1996 BLAKE2B 7b4e3c13a48122c09b3c1c0de9df912b561c6932102b7726b7daa3e7df6b32cd097793b10d14120c70506526aea5e9c81af001e0f400dc660012c5acc7fb8f73 SHA512 c20f1a70f5b8c964870a314adff61e1221c155ba247903cedfdea3f8ce7cce7257ccb7b4731837c74f8106dbd5eb13590680c2a058e2809e258543ee97598100
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actiontext/actiontext-7.0.6.ebuild b/dev-ruby/actiontext/actiontext-7.0.6.ebuild
index 5ed5525d70fa..41390bd620b6 100644
--- a/dev-ruby/actiontext/actiontext-7.0.6.ebuild
+++ b/dev-ruby/actiontext/actiontext-7.0.6.ebuild
@@ -39,6 +39,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/minitest:5.15
 	dev-ruby/mocha
 	dev-ruby/propshaft
+	>=dev-ruby/sqlite3-1.4.0
 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/leto/Manifest b/dev-ruby/leto/Manifest
index 7ffbbe1b38ec..ef5b5ad41088 100644
--- a/dev-ruby/leto/Manifest
+++ b/dev-ruby/leto/Manifest
@@ -1,3 +1,3 @@
 DIST leto-2.1.0.tar.gz 8874 BLAKE2B d7d39a13ad6ceed2d14d7e9c9a39c037115797ce00629a114bad832bc70397a90c3ba86bdc73789b0c0f852df059d15d026338324cd3de9f38a40bf4885d6a9a SHA512 c0bda72b32a96c83ad01281fd2a6e224f504aa45b030e4a203c2df0810bb6dd52dcb9c2633f2514d239a39b14b5c0428f912799eae756373dc0b15051be5e260
-EBUILD leto-2.1.0.ebuild 783 BLAKE2B 82abab5297e69b64603b441286bd97d0ffd7f33f474e7b71e450dafdbabe136e7a687bff67d08427bfe1d8cbe2e5ade25866213505ffd038e6ec1ac3a41f4105 SHA512 7c3dee7a6bf4bc3fff9c1c46d2d9f824daf442cae2c4742a082d226f1d54e2effa48b2741ab524c82bf4a2b408370c604f9b046d1f76915d1c9321025cd6211c
+EBUILD leto-2.1.0.ebuild 795 BLAKE2B 49b7010edbc4262d00e85c53c62330d310dac50d29af161df190b89788213bd47215fbf25bb2987e80cd3e2ec39132f87bef62c8f64cc95c880290aedce60570 SHA512 a3a8ac5107f763e2e8a52119d998e9085d97fa05e17f5b5e8fee62f7779dbf5218c4c46c5de4270e859a7a6166a31d5ecea4a01ee775e7f7411bd072a2d24da7
 MISC metadata.xml 389 BLAKE2B aadeffc1c73e5288ee6b19b8fb51a29f2ea81605fd815aaebe86d01d459a0f67df41fc92c7b0e798b51f0a3800bce7db6c5b28adc18e8c2ae48fdcb29330c64e SHA512 c54f0344c9d96a51d2ba185ff778a206cb5ca07edd9b236fc271b7cc2ca4b6597ee29fcbe6f57020253c375d1593ff363cf4791348d25398cb8e4b4f2f8b8bf4
diff --git a/dev-ruby/leto/leto-2.1.0.ebuild b/dev-ruby/leto/leto-2.1.0.ebuild
index 0042aaebad3b..5d3f520eeb2e 100644
--- a/dev-ruby/leto/leto-2.1.0.ebuild
+++ b/dev-ruby/leto/leto-2.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jaynetics/leto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 9cf4671248bf..1d0254ad4620 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,4 +1,7 @@
+AUX redcloth-4.3.2-cve-2023-31606-1.patch 869 BLAKE2B ca648a75300628168a2672efd622084362e2ee9f62062051610ec3641275cc17c17cbd41b862347b11dfd897d37896528c07d89f00acd0f75ce44f873749be85 SHA512 b040b0acba0fa3a2fc7a853b2fed483cc1a56e6ef32c0c076b642d0639749adb075f8ce8c871669b2d0b64247906960512c83610aa980af6cc3b3a5617503ce5
+AUX redcloth-4.3.2-cve-2023-31606-2.patch 844 BLAKE2B 070c76abc03d1b66f35b82079b1a7703a34fec6315d9a4026c472d145ee26ad3287046dc0e32a9c3ac9e4cb30763deab2be328d3cedbaa7f10bcd32fdd3de9e9 SHA512 85de784726bbc05992411fc1c89475d146fa774127e4e6f5a659c217b53c47d60c055e81632fafe61750777a519403dd7f548678dc092a0e4066dab47a8ed757
 AUX redcloth-4.3.2-load-documents.patch 988 BLAKE2B 75e2a385abaf14caef523ae418e87b000900c93d3afe4491300335dd9d5a26fef28a34b3318fada0625e91cafba42a82fb05a2d8acfd6c5afcff4e8ac491890f SHA512 cce18ba0c30d6820020d71dd032d1b193976eaa103ca7bb294a7b1cfb0e61b82aa31e0d8bd8b8d9305e8c087a4109563897a7cd77ec9c020b453c8dc97d48003
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
 EBUILD redcloth-4.3.2-r4.ebuild 1339 BLAKE2B 094f1ab7b4d674f09be9bca0acc5f6fef8b41a05ced6edafc70b9b66319d4c5f8db2c7f2cf7336f33b1e87ad83d834a71642189948bfc35cea373e94e9409417 SHA512 1ca59108bb58d8104c88af54eb9fea8e99fff328a5c752946e52df64940fb993845bbe16c38878757e712ee11218fc9667ac5bd83b469739f332eb46ab3176ff
+EBUILD redcloth-4.3.2-r5.ebuild 1412 BLAKE2B eedf183a3135dd8ee6cb8eee90fb88758be6304333ba567a17215c5a0f52462c1094053102638664f1f0192dd5e90fa9f8ed5bd7a6adf3222c55f3f1ef947e9a SHA512 6906dc38ea3c6b2a38e53e074568eaa2e996e7473c0171298a3cbc2175367cee0f3fb9ad3ab5d9cf07334bb275d4c42bd9498e1e1f35e98151cf3e4bb1d504f2
 MISC metadata.xml 343 BLAKE2B bc8d08f10a63e9472843d4dacf05c70f08fdf9587b6811e062360185ad66f9d144f0f871369f6a4f049a51a292965b902a3ba346e649671a4a283cf93fbbaa7e SHA512 89848472f2bf75c4286766d4aa62799db98fc22aa2be9cd2c05453e0e6c1868fe61c46b7bc0e83ab97ec85f959826699eef36215c4fcd6186e70ee975ec878ac
diff --git a/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch
new file mode 100644
index 000000000000..f5de833dafb3
--- /dev/null
+++ b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch
@@ -0,0 +1,22 @@
+From 8d3b5c730596d254d0bbcfbab52f4158f03397b3 Mon Sep 17 00:00:00 2001
+From: Kornelius Kalnbach <murphy@rubychan.de>
+Date: Wed, 28 Jun 2023 17:24:55 +0200
+Subject: [PATCH] make regex faster with Atomic Grouping
+
+---
+ lib/redcloth/formatters/html.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/redcloth/formatters/html.rb b/lib/redcloth/formatters/html.rb
+index b241c99..aaeae34 100644
+--- a/lib/redcloth/formatters/html.rb
++++ b/lib/redcloth/formatters/html.rb
+@@ -324,7 +324,7 @@ def before_transform(text)
+   # Clean unauthorized tags.
+   def clean_html( text, allowed_tags = BASIC_TAGS )
+     text.gsub!( /<!\[CDATA\[/, '' )
+-    text.gsub!( /<(\/*)([A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m|
++    text.gsub!( /<(\/*)(?>[A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m|
+       raw = $~
+       tag = raw[2].downcase
+       if allowed_tags.has_key? tag
diff --git a/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch
new file mode 100644
index 000000000000..fd8de28f0e71
--- /dev/null
+++ b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch
@@ -0,0 +1,22 @@
+From 7429f32bdac4fccf9f5ab702afc9c47092a7b3df Mon Sep 17 00:00:00 2001
+From: Kornelius Kalnbach <murphy@rubychan.de>
+Date: Thu, 29 Jun 2023 00:31:50 +0200
+Subject: [PATCH] simplify fix
+
+---
+ lib/redcloth/formatters/html.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/redcloth/formatters/html.rb b/lib/redcloth/formatters/html.rb
+index aaeae34..396c2d0 100644
+--- a/lib/redcloth/formatters/html.rb
++++ b/lib/redcloth/formatters/html.rb
+@@ -324,7 +324,7 @@ def before_transform(text)
+   # Clean unauthorized tags.
+   def clean_html( text, allowed_tags = BASIC_TAGS )
+     text.gsub!( /<!\[CDATA\[/, '' )
+-    text.gsub!( /<(\/*)(?>[A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m|
++    text.gsub!( /<(\/*)([A-Za-z]\w*+)([^>]*?)(\s?\/?)>/ ) do |m|
+       raw = $~
+       tag = raw[2].downcase
+       if allowed_tags.has_key? tag
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild
new file mode 100644
index 000000000000..b43a51c4804f
--- /dev/null
+++ b/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="RedCloth"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
+
+RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
+
+RUBY_FAKEGEM_GEMSPEC=redcloth.gemspec
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/redcloth_scan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module for using Textile in Ruby"
+HOMEPAGE="https://github.com/jgarber/redcloth"
+SRC_URI="https://github.com/jgarber/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+PATCHES=(
+	"${FILESDIR}/${P}-load-documents.patch"
+	"${FILESDIR}/${P}-cve-2023-31606-1.patch"
+	"${FILESDIR}/${P}-cve-2023-31606-2.patch"
+)
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-0.8.7
+	>=dev-ruby/rake-compiler-0.7.1
+	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
+	rm -f tasks/{release,rspec,rvm}.rake || die
+
+	# Fix version
+	sed -i -e '/TINY/ s/1/2/' lib/redcloth/version.rb || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake ext/redcloth_scan/extconf.rb || die
+}