Skip to content

Commit

Permalink
Merge branch 'master' into translate_cve-2024-43398_zh_cn
Browse files Browse the repository at this point in the history
  • Loading branch information
hlcfan authored Sep 18, 2024
2 parents 20a0ac2 + 5295136 commit e8d9c83
Show file tree
Hide file tree
Showing 54 changed files with 601 additions and 157 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
path: www

- uses: actions/checkout@v4
with:
repository: ruby/ruby
path: ruby

- uses: ruby/setup-ruby@v1
with:
Expand All @@ -25,6 +32,11 @@ jobs:
run: |
ruby lib/draft-release.rb ${{ github.event.client_payload.version || github.event.inputs.version }}
- name: Update data files
run: |
tool/format-release ../www ${{ github.event.client_payload.version || github.event.inputs.version }} .
working-directory: ruby

- name: Create Commit
run: |
git config user.name "GitHub Actions Bot"
Expand All @@ -43,3 +55,5 @@ jobs:
title: "Create release for ${{ github.event.client_payload.version || github.event.inputs.version }}"
body: "This is an automated pull request to create a release"
draft: true

working-directory: www
92 changes: 46 additions & 46 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
afm (0.2.2)
async (2.12.0)
console (~> 1.25, >= 1.25.2)
async (2.15.3)
console (~> 1.26)
fiber-annotation
io-event (~> 1.6)
io-event (~> 1.6, >= 1.6.5)
base64 (0.2.0)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.3.3)
console (1.25.2)
concurrent-ruby (1.3.4)
console (1.27.0)
fiber-annotation
fiber-local (~> 1.1)
json
Expand All @@ -38,24 +38,24 @@ GEM
fiber-annotation (0.2.0)
fiber-local (1.1.0)
fiber-storage
fiber-storage (0.1.2)
fiber-storage (1.0.0)
forwardable-extended (2.6.0)
google-protobuf (4.27.1)
google-protobuf (4.27.3)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-aarch64-linux)
google-protobuf (4.27.3-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-arm64-darwin)
google-protobuf (4.27.3-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-x86-linux)
google-protobuf (4.27.3-x86-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-x86_64-darwin)
google-protobuf (4.27.3-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-x86_64-linux)
google-protobuf (4.27.3-x86_64-linux)
bigdecimal
rake (>= 13)
hashery (2.1.2)
Expand All @@ -71,7 +71,7 @@ GEM
http_parser.rb (0.8.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
io-event (1.6.4)
io-event (1.6.5)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
Expand Down Expand Up @@ -102,18 +102,18 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
minitest (5.23.1)
nokogiri (1.16.6-aarch64-linux)
minitest (5.25.1)
nokogiri (1.16.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm-linux)
nokogiri (1.16.7-arm-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm64-darwin)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86-linux)
nokogiri (1.16.7-x86-linux)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-darwin)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
paint (2.3.0)
pathutil (0.16.2)
Expand All @@ -124,8 +124,8 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
public_suffix (5.1.0)
racc (1.8.0)
public_suffix (6.0.1)
racc (1.8.1)
rainbow (3.1.1)
rake (13.2.1)
rb-fsevent (0.11.2)
Expand All @@ -136,26 +136,26 @@ GEM
rouge (4.3.0)
ruby-rc4 (0.1.5)
safe_yaml (1.0.5)
sass-embedded (1.77.5-aarch64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-aarch64-linux-musl)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-arm-linux-gnueabihf)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-arm-linux-musleabihf)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-arm64-darwin)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-x86-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-x86-linux-musl)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-x86_64-darwin)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-x86_64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-x86_64-linux-musl)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.8-aarch64-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-aarch64-linux-musl)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm-linux-gnueabihf)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm-linux-musleabihf)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-linux-musl)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-linux-musl)
google-protobuf (~> 4.26)
slop (4.10.1)
spidr (0.7.1)
nokogiri (~> 1.3)
Expand Down Expand Up @@ -184,7 +184,7 @@ GEM
rexml (~> 3.2)
webrick (1.8.1)
yell (2.2.2)
zeitwerk (2.6.16)
zeitwerk (2.6.17)

PLATFORMS
aarch64-linux
Expand Down Expand Up @@ -215,4 +215,4 @@ DEPENDENCIES
validate-website (~> 1.6)

BUNDLED WITH
2.5.13
2.5.17
2 changes: 1 addition & 1 deletion _data/downloads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ preview:

stable:

- 3.3.4
- 3.3.5
- 3.2.5

# optional
Expand Down
2 changes: 1 addition & 1 deletion _data/locales/ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ruby: Ruby
slogan: A Programmer's Best Friend

sitelinks:
- text: Home
- text: ホーム
url: /ja
home: true
- text: ダウンロード
Expand Down
24 changes: 24 additions & 0 deletions _data/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,30 @@

# 3.3 series

- version: 3.3.5
date: 2024-09-03
post: /en/news/2024/09/03/3-3-5-released/
url:
gz: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.gz
zip: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.zip
xz: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz
size:
gz: 22129139
zip: 27020194
xz: 16403660
sha1:
gz: 59444476bbe9e789fc777d8fb4dd456bc057604f
zip: ccb32746aef491ce05be42218301e2c47185e5fc
xz: 692bc3188bdb9ec30b8672543961b011d699590a
sha256:
gz: 3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196
zip: d3c13e124707494935d00ebc5c7983b0252bc13de49223fd31104ba5467a057a
xz: 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359
sha512:
gz: 5c482059628ef9de5d8a6ad4751f8043f2fc2b159b768265be7f3ee0574ad51d9500ee4fc9146c5978fbd51313039c3de39e7b7a4dedc9bcd5d09a41a713f1a7
zip: bf83af835a74283aff21042538ee1f1eb70ff12dac1edd4672d787547cd29cb7b69a9299682f89c8499eb610737b10a7fc03eca038574cb4ba565205d96b0016
xz: dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883

- version: 3.3.4
date: 2024-07-09
post: /en/news/2024/07/09/ruby-3-3-4-released/
Expand Down
6 changes: 3 additions & 3 deletions bg/community/mailing-lists/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ comp.lang.ruby дискусионна група.



[3]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-talk@ml.ruby-lang.org/
[4]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-core@ml.ruby-lang.org/
[5]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-doc@ml.ruby-lang.org/
[3]: https://ml.ruby-lang.org/archives/list/ruby-talk@ml.ruby-lang.org/
[4]: https://ml.ruby-lang.org/archives/list/ruby-core@ml.ruby-lang.org/
[5]: https://ml.ruby-lang.org/archives/list/ruby-doc@ml.ruby-lang.org/
6 changes: 3 additions & 3 deletions de/community/mailing-lists/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ einschließlich der Listen in japanischer Sprache.

[guidelines]: /en/community/mailing-lists/ruby-talk-guidelines/
[clrFAQ]: http://rubyhacker.com/clrFAQ.html
[3]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-talk@ml.ruby-lang.org/
[4]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-core@ml.ruby-lang.org/
[5]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-doc@ml.ruby-lang.org/
[3]: https://ml.ruby-lang.org/archives/list/ruby-talk@ml.ruby-lang.org/
[4]: https://ml.ruby-lang.org/archives/list/ruby-core@ml.ruby-lang.org/
[5]: https://ml.ruby-lang.org/archives/list/ruby-doc@ml.ruby-lang.org/
[6]: http://lists.ruby-lang.org/cgi-bin/mailman/listinfo/ruby-de
[7]: http://lists.ruby-lang.org/pipermail/ruby-de/
[8]: http://planet.ruby-portal.de/ruby-de.html
6 changes: 3 additions & 3 deletions en/community/mailing-lists/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ including the lists in Japanese language.

[guidelines]: ruby-talk-guidelines/
[clrFAQ]: http://rubyhacker.com/clrFAQ.html
[3]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-talk@ml.ruby-lang.org/
[4]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-core@ml.ruby-lang.org
[5]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-doc@ml.ruby-lang.org/
[3]: https://ml.ruby-lang.org/archives/list/ruby-talk@ml.ruby-lang.org/
[4]: https://ml.ruby-lang.org/archives/list/ruby-core@ml.ruby-lang.org
[5]: https://ml.ruby-lang.org/archives/list/ruby-doc@ml.ruby-lang.org/
[rubytalk]: https://rubytalk.org/
2 changes: 1 addition & 1 deletion en/documentation/faq/1/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ There are several mailing lists talking about Ruby. See the
page for more information.

You can search the mailing list archives using
[https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-talk@ml.ruby-lang.org/](https://ml.ruby-lang.org/mailman3/hyperkitty/list/ruby-talk@ml.ruby-lang.org/).
[https://ml.ruby-lang.org/archives/list/ruby-talk@ml.ruby-lang.org/](https://ml.ruby-lang.org/archives/list/ruby-talk@ml.ruby-lang.org/).
(This is the URL for the ruby-talk list, munge as required for the others).

### How can I thread the mailing list in mutt?
Expand Down
24 changes: 1 addition & 23 deletions en/documentation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@ the [installation guide](installation/) for help on installing Ruby.
: The official Ruby API documentation for different versions including
the currently unreleased (trunk) version.

[Ruby Core Reference][13]
: Pulled straight from the source code using [RDoc][14], this reference
work documents all of the core classes and modules (like String,
Array, Symbol, etc…).

[Ruby Standard Library Reference][15]
: Also pulled from the source code using RDoc, this reference work
documents the standard library.

[Ruby C API Reference][extensions]
: The official introduction to Ruby's C API.
Great if you want to write C extensions
Expand All @@ -73,12 +64,6 @@ the [installation guide](installation/) for help on installing Ruby.
: The one-stop web site for reference documentation about Ruby gems and
GitHub-hosted Ruby projects.

[Ruby & Rails Searchable API Docs][17]
: Rails and Ruby documentation with smart searching.

[APIdock][18]
: Ruby, Rails and RSpec documentation with users’ notes.

[RubyAPI.org][rubyapi-org]
: Easily find and browse Ruby classes, modules, and methods.

Expand Down Expand Up @@ -125,8 +110,6 @@ documentation sources.
If you have questions about Ruby the
[mailing list](/en/community/mailing-lists/) is a great place to start.



[1]: https://try.ruby-lang.org/
[2]: https://rubykoans.com/
[5]: https://poignant.guide
Expand All @@ -135,13 +118,8 @@ If you have questions about Ruby the
[9]: http://www.ruby-doc.org/docs/ProgrammingRuby/
[10]: http://pragmaticprogrammer.com/titles/ruby/index.html
[12]: http://en.wikibooks.org/wiki/Ruby_programming_language
[13]: http://www.ruby-doc.org/core
[14]: https://ruby.github.io/rdoc/
[15]: http://www.ruby-doc.org/stdlib
[extensions]: https://docs.ruby-lang.org/en/master/extension_rdoc.html
[16]: http://www.rubydoc.info/
[17]: http://rubydocs.org/
[18]: http://apidock.com/
[rubyapi-org]: https://rubyapi.org/
[19]: http://www.aptana.com/
[20]: http://www.gnu.org/software/emacs/
Expand All @@ -165,7 +143,7 @@ If you have questions about Ruby the
[39]: http://kapeli.com/dash
[docs-rlo-en]: https://docs.ruby-lang.org/en/
[atom]: https://atom.io/
[vscode]: https://code.visualstudio.com/
[vscode]: https://code.visualstudio.com/docs/languages/ruby
[eric]: https://eric-ide.python-projects.org/
[kdevelop]: https://www.kdevelop.org/
[kate]: https://kate-editor.org/
3 changes: 2 additions & 1 deletion en/documentation/installation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Here are available installation methods:
* [asdf-vm](#asdf-vm)
* [chruby](#chruby)
* [rbenv](#rbenv)
* [rbenv for Windows](#rbenv-for-windows)
* [RVM](#rvm)
* [uru](#uru)
* [Building from source](#building-from-source)
Expand Down Expand Up @@ -391,7 +392,7 @@ though, because the installed Ruby won't be managed by any tools.

[rvm]: http://rvm.io/
[rbenv]: https://github.com/rbenv/rbenv#readme
[rbenv-for-windows]: https://github.com/ccmywish/rbenv-for-windows#readme
[rbenv-for-windows]: https://github.com/RubyMetric/rbenv-for-windows#readme
[ruby-build]: https://github.com/rbenv/ruby-build#readme
[ruby-install]: https://github.com/postmodern/ruby-install#readme
[chruby]: https://github.com/postmodern/chruby#readme
Expand Down
1 change: 0 additions & 1 deletion en/news/_posts/2024-04-23-ruby-3-2-4-released.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Please check the topics below for details.

* [CVE-2024-27282: Arbitrary memory address read vulnerability with Regex search]({%link en/news/_posts/2024-04-23-arbitrary-memory-address-read-regexp-cve-2024-27282.md %})
* [CVE-2024-27281: RCE vulnerability with .rdoc_options in RDoc]({%link en/news/_posts/2024-03-21-rce-rdoc-cve-2024-27281.md %})
* [CVE-2024-27280: Buffer overread vulnerability in StringIO]({%link en/news/_posts/2024-03-21-buffer-overread-cve-2024-27280.md %})

See the [GitHub releases](https://github.com/ruby/ruby/releases/tag/v3_2_4) for further details.

Expand Down
1 change: 0 additions & 1 deletion en/news/_posts/2024-04-23-ruby-3-3-1-released.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Please check the topics below for details.

* [CVE-2024-27282: Arbitrary memory address read vulnerability with Regex search]({%link en/news/_posts/2024-04-23-arbitrary-memory-address-read-regexp-cve-2024-27282.md %})
* [CVE-2024-27281: RCE vulnerability with .rdoc_options in RDoc]({%link en/news/_posts/2024-03-21-rce-rdoc-cve-2024-27281.md %})
* [CVE-2024-27280: Buffer overread vulnerability in StringIO]({%link en/news/_posts/2024-03-21-buffer-overread-cve-2024-27280.md %})

See the [GitHub releases](https://github.com/ruby/ruby/releases/tag/v3_3_1) for further details.

Expand Down
2 changes: 1 addition & 1 deletion en/news/_posts/2024-08-22-dos-rexml-cve-2024-43398.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ There is a DoS vulnerability in REXML gem. This vulnerability has been assigned

## Details

When parsing an XML that has many deep elements that have same local name attributes.
When parsing an XML that has many deep elements that have same local name attributes, REXML gem may take long time.

It's only affected with the tree parser API. If you're using `REXML::Document.new` to parse an XML, you may be affected.

Expand Down
Loading

0 comments on commit e8d9c83

Please sign in to comment.