commit: 3c89772e764f988c990d87a3fd3428894317512e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Mar 11 17:30:06 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 11 17:47:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c89772e
dev-libs/libxml2: split CVE patch into new revbump (2.9.10-r5), restore old Bug: https://bugs.gentoo.org/749849 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch | 2 ++ .../libxml2/{libxml2-2.9.10-r5.ebuild => libxml2-2.9.10-r4.ebuild} | 3 --- dev-libs/libxml2/libxml2-2.9.10-r5.ebuild | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch index 7807b32cce5..179f3a8c384 100644 --- a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch +++ b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch @@ -1,3 +1,5 @@ +https://bugs.gentoo.org/749849 + From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer <[email protected]> Date: Fri, 7 Aug 2020 21:54:27 +0200 diff --git a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild similarity index 98% copy from dev-libs/libxml2/libxml2-2.9.10-r5.ebuild copy to dev-libs/libxml2/libxml2-2.9.10-r4.ebuild index 1e48320e3fd..9db3902e430 100644 --- a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild @@ -92,9 +92,6 @@ src_prepare() { # bug #745162 eapply "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch - # https://gitlab.gnome.org/GNOME/libxml2/-/issues/178 - eapply "${FILESDIR}"/${PN}-2.9.10-xmllint-utf8.patch - if [[ ${CHOST} == *-darwin* ]] ; then # Avoid final linking arguments for python modules sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die diff --git a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild index 1e48320e3fd..cc5323b91d7 100644 --- a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"; LICENSE="MIT" SLOT="2" -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" +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" IUSE="debug examples icu ipv6 lzma +python readline static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )"
