Skip to content

Commit

Permalink
(#25322) libxml2: Add version 2.13.4, fixes a few CVE issues
Browse files Browse the repository at this point in the history
* libxml2: Add version 2.13.4, fixes a few CVE issues

* Add missing bcrypt dependency

---------

Co-authored-by: Abril Rincón Blanco <[email protected]>
  • Loading branch information
gsantner and AbrilRBS authored Sep 25, 2024
1 parent d6d5d9f commit e785986
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions recipes/libxml2/all/conandata.yml
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.9":
url: "https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.tar.xz"
sha256: "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"
Expand Down
6 changes: 6 additions & 0 deletions recipes/libxml2/all/conanfile.py
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2.13.4":
folder: all
"2.12.9":
folder: all
"2.12.4":
Expand Down

0 comments on commit e785986

Please sign in to comment.