From 71c811a0b88e24a9ea591b5d45b56575b0817305 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 17 Jan 2022 16:07:08 +0100 Subject: [PATCH] dev-libs/expat: update to 2.4.3 Update dev-libs/expat to 2.4.3, mainly to address the following security issues: CVE-2021-45960, CVE-2021-46143, CVE-2022-22822, CVE-2022-22823, CVE-2022-22824, CVE-2022-22825, CVE-2022-22826, CVE-2022-22827 --- .../portage-stable/dev-libs/expat/Manifest | 2 + .../dev-libs/expat/expat-2.4.1.ebuild | 4 +- .../dev-libs/expat/expat-2.4.2.ebuild | 94 +++++++++++++++++++ .../dev-libs/expat/expat-2.4.3.ebuild | 94 +++++++++++++++++++ .../dev-libs/expat/metadata.xml | 2 +- 5 files changed, 193 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest index 167b959732..945502be38 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest @@ -1 +1,3 @@ DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191 +DIST expat-2.4.2.tar.xz 449664 BLAKE2B 627ee86bd878b8f0edc50bdbeb26d347ec8bdd06fc369a3ee378ad133d38eb7cfe9018a5839843ba6757d727e84229c84c51d618b5de7e92197bdc7203e09b73 SHA512 c27f2b54e9babc6bd24283b62cc65546f37fa40481ac55b84d9e3ecad1b58d3c52055c71d56600b43aaf20ad142c70899a8dc424dba804b1699077c38dfe34a3 +DIST expat-2.4.3.tar.xz 451012 BLAKE2B 4c0200837ea0054a88d2a2606486482f234e4b4f6b5f16134bf2a4b7b61457b12d534c6be3f16d28f6926f896d00177ef53a947a0a6c3ad11ff024a8e76edf84 SHA512 62a7fe751f6846deec4b04fd2c2ca8ed9e139fa27cda0e3fe7f8f05107caaed70597aed17b45c49d30a60c8a0c6beae1317dd5f24240640310951aabb16dbcb7 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.1.ebuild index 040f1e52d5..8db61e9898 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 AUTOTOOLS_AUTO_DEPEND=no AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing -inherit autotools multilib-minimal usr-ldscript +inherit autotools multilib-minimal DESCRIPTION="Stream-oriented XML parser library" HOMEPAGE="https://libexpat.github.io/" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.2.ebuild new file mode 100644 index 0000000000..f397e99485 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +AUTOTOOLS_AUTO_DEPEND=no +AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing +inherit autotools multilib-minimal + +DESCRIPTION="Stream-oriented XML parser library" +HOMEPAGE="https://libexpat.github.io/" +SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="examples static-libs unicode" +BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" + +DOCS=( README.md ) + +src_prepare() { + default + + # fix interpreter to be a recent/good shell + sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die + if use unicode; then + cp -R "${S}" "${S}"w || die + pushd "${S}"w >/dev/null + find -name Makefile.am \ + -exec sed \ + -e 's,libexpat\.la,libexpatw.la,' \ + -e 's,libexpat_la,libexpatw_la,' \ + -i {} + || die + eautoreconf + popd >/dev/null + fi +} + +multilib_src_configure() { + local myconf="$(use_enable static-libs static) --without-docbook" + + mkdir -p "${BUILD_DIR}"w || die + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf} + popd >/dev/null + fi + + ECONF_SOURCE="${S}" econf ${myconf} +} + +multilib_src_compile() { + emake + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + emake -C lib + popd >/dev/null + fi +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + emake -C lib install DESTDIR="${D}" + popd >/dev/null + + pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null + cp expat.pc expatw.pc + sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die + popd >/dev/null + fi +} + +multilib_src_install_all() { + einstalldocs + + doman doc/xmlwf.1 + + # Note: Use of HTML_DOCS would add unwanted "doc" subfolder + docinto html + dodoc doc/*.{css,html} + + if use examples; then + docinto examples + dodoc examples/*.c + docompress -x usr/share/doc/${PF}/examples + fi + + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.3.ebuild new file mode 100644 index 0000000000..ac3a1e4197 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.4.3.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +AUTOTOOLS_AUTO_DEPEND=no +AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing +inherit autotools multilib-minimal + +DESCRIPTION="Stream-oriented XML parser library" +HOMEPAGE="https://libexpat.github.io/" +SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="examples static-libs unicode" +BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" + +DOCS=( README.md ) + +src_prepare() { + default + + # fix interpreter to be a recent/good shell + sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die + if use unicode; then + cp -R "${S}" "${S}"w || die + pushd "${S}"w >/dev/null + find -name Makefile.am \ + -exec sed \ + -e 's,libexpat\.la,libexpatw.la,' \ + -e 's,libexpat_la,libexpatw_la,' \ + -i {} + || die + eautoreconf + popd >/dev/null + fi +} + +multilib_src_configure() { + local myconf="$(use_enable static-libs static) --without-docbook" + + mkdir -p "${BUILD_DIR}"w || die + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf} + popd >/dev/null + fi + + ECONF_SOURCE="${S}" econf ${myconf} +} + +multilib_src_compile() { + emake + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + emake -C lib + popd >/dev/null + fi +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + emake -C lib install DESTDIR="${D}" + popd >/dev/null + + pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null + cp expat.pc expatw.pc + sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die + popd >/dev/null + fi +} + +multilib_src_install_all() { + einstalldocs + + doman doc/xmlwf.1 + + # Note: Use of HTML_DOCS would add unwanted "doc" subfolder + docinto html + dodoc doc/*.{css,html} + + if use examples; then + docinto examples + dodoc examples/*.c + docompress -x usr/share/doc/${PF}/examples + fi + + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/expat/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/expat/metadata.xml index 173bc1d111..efb0331871 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/expat/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/expat/metadata.xml @@ -1,5 +1,5 @@ - + freedesktop-bugs@gentoo.org