Skip to content

Commit f8156b4

Browse files
authored
dep: update libxml to 2.11.7 (branch 1.15.x) (#3154)
**What problem is this PR intended to solve?** In #3146, @jamiemccarthy requested a security release on the v1.15.x branch to address CVE-2024-25062 which was fixed in v1.16.2 with an upgrade to libxml 2.12.5. This PR attempts to upgrade the v1.15.x branch to [libxml 2.11.7](https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.11.7) (from 2.11.6) which also addresses that vulnerability. Also see related GHSA-xc9x-jj77-9p9j
2 parents 5745d4b + 9827619 commit f8156b4

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ Nokogiri follows [Semantic Versioning](https://semver.org/), please see the [REA
44

55
---
66

7+
## 1.15.next / unreleased
8+
9+
### Security
10+
11+
* [CRuby] Vendored libxml2 is updated to address CVE-2024-25062. See [GHSA-xc9x-jj77-9p9j](https://github.com/sparklemotion/nokogiri/security/advisories/GHSA-xc9x-jj77-9p9j) for more information.
12+
13+
14+
### Dependencies
15+
16+
* [CRuby] Vendored libxml2 is updated to v2.11.7 from v2.11.6. For details please see https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.11.7
17+
18+
19+
720
## 1.15.5 / 2023-11-17
821

922
### Dependencies

dependencies.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
21
libxml2:
3-
version: "2.11.6"
4-
sha256: "c90eee7506764abbe07bb616b82da452529609815aefef423d66ef080eb0c300"
5-
# sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.6.sha256sum
2+
version: "2.11.7"
3+
sha256: "fb27720e25eaf457f94fd3d7189bcf2626c6dccf4201553bc8874d50e3560162"
4+
# sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.7.sha256sum
65

76
libxslt:
87
version: "1.1.39"

scripts/test-gem-install

+1-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ if [ -n "${BUNDLE_APP_CONFIG:-}" ] ; then
2929
export BUNDLE_CACHE_PATH="${BUNDLE_APP_CONFIG}/cache"
3030
fi
3131

32-
# 2.3.21 because https://github.com/rubygems/rubygems/issues/5914
33-
# 2.3.22 because https://github.com/rubygems/rubygems/issues/5940
34-
gem install bundler -v "~> 2.2, != 2.3.21, != 2.3.22"
32+
gem install bundler -v "2.4.22" # should work fine on ruby 2.7 and above
3533
bundle install --local || bundle install
3634

3735
rm -rf lib ext # ensure we don't use the local files

0 commit comments

Comments
 (0)