From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0F7711382C5 for ; Thu, 11 Mar 2021 17:48:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3504FE0896; Thu, 11 Mar 2021 17:48:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CC37E0878 for ; Thu, 11 Mar 2021 17:48:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E509335CC1 for ; Thu, 11 Mar 2021 17:47:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AAF958F for ; Thu, 11 Mar 2021 17:47:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615484865.3c89772e764f988c990d87a3fd3428894317512e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxml2/files/, dev-libs/libxml2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch dev-libs/libxml2/libxml2-2.9.10-r4.ebuild dev-libs/libxml2/libxml2-2.9.10-r5.ebuild X-VCS-Directories: dev-libs/libxml2/files/ dev-libs/libxml2/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3c89772e764f988c990d87a3fd3428894317512e X-VCS-Branch: master Date: Thu, 11 Mar 2021 17:47:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 944bfd8d-2489-4437-a973-0d841400fec7 X-Archives-Hash: f0020925f62671c9c014637ee4a4c983 commit: 3c89772e764f988c990d87a3fd3428894317512e Author: Sam James gentoo org> AuthorDate: Thu Mar 11 17:30:06 2021 +0000 Commit: Sam James gentoo 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 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 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 )"