dev-libs/libxml2: upgraded package to 2.9.13-r1
BUG=b/223552672,b/223552824,b/223552601,b/223552669,b/223552657
TEST=presubmit
RELEASE_NOTE=Upgraded dev-libs/libxml2 to 2.9.13-r1. This resolves
CVE-2022-23308.
Change-Id: I1e10f5d5d54cdbc152353e3fd65426fbd3bfc706
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/31455
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 8aa7d9f..09beb39 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,9 +1,5 @@
-DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
-DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
-DIST libxml2-2.9.12-r1-patchset.tar.bz2 5497 BLAKE2B fda8ad166c89209abaf8f94a5dfbff84e5a6c89cca36350a2f0b9b8db42c6f348b6cb8c7738a35aed8421ca994cc6ad76c3aa02a8a9899fa969b493ca1761b01 SHA512 469befb393430d2532e27f9ed834e0ab5473fc371c89582c3b1434ab1c370140f132d4acf315f7c2b9d1841ab3e78ef04069cca78d66917269b5112ab42127df
-DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
-DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
-DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
+DIST libxml2-2.9.12-r5-patchset.tar.bz2 7231 BLAKE2B d9d0d56ebccbfe234a8af04cc5343c1a02d84fbd998c2373fd48be59cf92807a9417db650a6bb6ba309e101994c4ae2b28edda7bf635c7728eb8b8047d0d3391 SHA512 b2db0fe4595c1559d9f8dc836ee6eee469191f6c490fc95d25d9fa99a544e80858894cc35b6e4a6624a38d0309800540badc929e86ef29950c1107caa4656a14
+DIST libxml2-2.9.13.tar.xz 3243336 BLAKE2B 845a8283cf1ff9fd9f7926cfe0042c042a9de5ed184520d8057f7b33312687d5ff28abdf30dd2674795d78dc80326203a907f9e22cd261805309403ecdd585f5 SHA512 fc51980cb9222bd3b5242f73d28b55fa15a80e68e52e1c45274f1eda11500ed385853209edb3b2a1f06b9de0be304c159a9bd898c7d84b0899eacb00723d98b5
DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
diff --git a/dev-libs/libxml2/libxml2-2.9.12.ebuild b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
similarity index 81%
rename from dev-libs/libxml2/libxml2-2.9.12.ebuild
rename to dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
index 31120e8..36bb17b 100644
--- a/dev-libs/libxml2/libxml2-2.9.12.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# Note: Please bump in sync with dev-libs/libxslt
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PATCHSET_VERSION="2.9.12-r5-patchset"
+
+PYTHON_COMPAT=( python3_{6..9} )
PYTHON_REQ_USE="xml"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
-inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
XSTS_NAME_1="xmlschema2002-01-16"
@@ -18,28 +19,31 @@
XMLCONF_TARBALL="xmlts20130923.tar.gz"
DESCRIPTION="XML C parser and toolkit"
HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-SRC_URI="
- ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+ inherit git-r3
+else
+ inherit gnome.org
+ KEYWORDS="*"
+fi
+SRC_URI+="
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
test? (
${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
- )
- verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
-"
+ )"
S="${WORKDIR}/${PN}-${PV%_rc*}"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="*"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+IUSE="debug examples icu lzma +python readline static-libs test"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="
dev-util/gtk-doc-am
virtual/pkgconfig
- verify-sig? ( app-crypt/openpgp-keys-danielveillard )
"
RDEPEND="
>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
@@ -54,36 +58,38 @@
/usr/bin/xml2-config
)
-DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
+DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
PATCHES=(
+ ## Gentoo
# Patches needed for prefix support
- "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+ "${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
# Fix python detection, bug #567066
# https://bugzilla.gnome.org/show_bug.cgi?id=760458
- "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+ "${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
# Fix python tests when building out of tree #565576
- "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+ "${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
# bug #745162
- "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+ "${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
- # Avoid failure on missing fuzz.h when running tests
- "${FILESDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
+ # Don't bother copying Python's libraries (bug #798942)
+ "${WORKDIR}"/${PN}-2.9.12-dont-copy-python-ldflags.patch
)
src_unpack() {
- local tarname=${P/_rc/-rc}.tar.gz
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ else
+ local tarname=${P/_rc/-rc}.tar.xz
- if use verify-sig ; then
- verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
+ # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+ # as they are needed as tarballs in ${S}/xstc instead and not unpacked
+ unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
fi
- # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked
- unpack ${tarname}
cd "${S}" || die
if use test ; then
@@ -111,6 +117,7 @@
# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
# We now need to run eautoreconf at the end to prevent maintainer mode.
#elibtoolize
+ # Needed for https://gitlab.gnome.org/GNOME/libxml2/-/issues/338 too in 2.9.13
eautoreconf
}
@@ -130,11 +137,11 @@
libxml2_configure() {
ECONF_SOURCE="${S}" econf \
+ --enable-ipv6 \
--with-html-subdir=${PF}/html \
$(use_with debug run-debug) \
$(use_with icu) \
$(use_with lzma) \
- $(use_enable ipv6) \
$(use_enable static-libs static) \
$(multilib_native_use_with readline) \
$(multilib_native_use_with readline history) \
