Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libxml2: Add version 2.13.4, fixes a few CVE issues #25322

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −0
Open

libxml2: Add version 2.13.4, fixes a few CVE issues #25322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d46a335
libxml2: Add version 2.13.4, fixes a few CVE issues
gsantner Sep 20, 2024
44033ee
Add missing bcrypt dependency
AbrilRBS Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/libxml2/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"2.13.4":
url: "https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.4.tar.xz"
sha256: "65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650"
"2.12.7":
url: "https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.tar.xz"
sha256: "24ae78ff1363a973e6d8beba941a7945da2ac056e19b53956aeb6927fd6cfb56"
Expand Down
6 changes: 6 additions & 0 deletions recipes/libxml2/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ def config_options(self):
del self.options.docbook
if Version(self.version) >= "2.11.0":
self.options.rm_safe("run-debug")
if Version(self.version) >= "2.13.0":
self.options.rm_safe("mem-debug")

def configure(self):
if self.options.shared:
Expand Down Expand Up @@ -398,6 +400,10 @@ def package_info(self):
elif self.settings.os == "Windows":
if self.options.ftp or self.options.http:
self.cpp_info.system_libs.extend(["ws2_32", "wsock32"])
if Version(self.version) >= "2.13.4":
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/791
# https://gitlab.gnome.org/GNOME/libxml2/-/blob/2.13/win32/Makefile.msvc?ref_type=heads#L84
self.cpp_info.system_libs.append("bcrypt")

# TODO: to remove in conan v2 once cmake_find_package* & pkg_config generators removed
self.cpp_info.filenames["cmake_find_package"] = "LibXml2"
Expand Down
2 changes: 2 additions & 0 deletions recipes/libxml2/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2.13.4":
folder: all
"2.12.7":
folder: all
"2.12.6":
Expand Down
Loading