commit: 2f110fc7f69c366f738bbe03b74157d503fde59b Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Tue Sep 12 13:10:54 2017 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Tue Sep 12 13:14:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f110fc7
dev-libs/expat: Remove old (bug 622046) Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-libs/expat/Manifest | 3 - dev-libs/expat/expat-2.2.0-r1.ebuild | 91 ---------------------- dev-libs/expat/expat-2.2.0-r2.ebuild | 83 -------------------- dev-libs/expat/expat-2.2.2.ebuild | 78 ------------------- dev-libs/expat/expat-2.2.3.ebuild | 78 ------------------- .../expat-2.1.1-CVE-2016-0718-regression.patch | 27 ------- 6 files changed, 360 deletions(-) diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest index d522e6e3258..11e68d3e180 100644 --- a/dev-libs/expat/Manifest +++ b/dev-libs/expat/Manifest @@ -1,5 +1,2 @@ -DIST expat-2.2.0.tar.bz2 414352 SHA256 d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff SHA512 2be1a6eea87b439374bfacb1fbb8e814fd8a085d5dfd3ca3be69d1af29b5dc93d36cbdec5f6843ca6d5910843c7ffbc498adc2a561b9dcece488edf3c6f8c7c8 WHIRLPOOL b1914e2c23170dabab6fce4fb0eb2511dc8dcde8db986a7cdf6b236d262fb756fb0955cb4c1fc7475a1ad3d9c005b632e42850dcf3af66f4cc87fe4ecfc3cb47 DIST expat-2.2.1.tar.bz2 405441 SHA256 1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885 SHA512 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea WHIRLPOOL f571ee00d43813c20d81d02d5d25f3fd4fdec3ec5a6aa331a965b4373ca681053e4e66d22fed4523f9a207333b80eb5e63c78d2e36e0c2b5a64ad1c38b0fe38a -DIST expat-2.2.2.tar.bz2 405561 SHA256 4376911fcf81a23ebd821bbabc26fd933f3ac74833f74924342c29aad2c86046 SHA512 05383244f345b1c6a7290f3bb58bfab4da9546bfe880de644e784bcc48bd4317f2beb3fdb6120a5f396e06bb269f7e80713db211346d2d17bc7de3353d556575 WHIRLPOOL d4d42ebf6ca1544a5496461bf1abec030ca6f71c72bf24bc2d32b78a4d976b5334f49d8244cf041e09cb64354d90885adab4d96d3811041d6ef6d0a7289284af -DIST expat-2.2.3.tar.bz2 435593 SHA256 b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f SHA512 d42ca209da7f50eb4ac108ea0ef85dc6626d63fe48144a4e6f2d8b44b1f9276f711cbac85f6813c4725a3c4933b7054b74dde2c43a0f2febaed4afa0a6f5ac88 WHIRLPOOL b9a8f62cf44db68adfa64dd3c8d89ddb2867cb0b354a43fb15453d5fc2d137671dc215e3e4cc1555a39ec2248307f89916dcaa81e3e78941d2fe3ea7039b7a0c DIST expat-2.2.4.tar.bz2 505038 SHA256 03ad85db965f8ab2d27328abcf0bc5571af6ec0a414874b2066ee3fdd372019e SHA512 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592 WHIRLPOOL 77e62bca8da807e3175b05d121fd59b22b0018e57a3a82863794a220db49dfd2ff08f9463c2d319633e3aa4bb183347d1d43ed0d8baf0a65c97e893147123984 diff --git a/dev-libs/expat/expat-2.2.0-r1.ebuild b/dev-libs/expat/expat-2.2.0-r1.ebuild deleted file mode 100644 index 280648032a4..00000000000 --- a/dev-libs/expat/expat-2.2.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils libtool multilib toolchain-funcs multilib-minimal - -DESCRIPTION="Stream-oriented XML parser library" -HOMEPAGE="https://libexpat.github.io/"; -SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_FreeBSD examples static-libs unicode" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1.1-CVE-2016-0718-regression.patch -} - -multilib_src_configure() { - local myconf="$(use_enable static-libs static)" - - mkdir -p "${BUILD_DIR}"{u,w} || die - - ECONF_SOURCE="${S}" econf ${myconf} - - if use unicode; then - pushd "${BUILD_DIR}"u >/dev/null - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} - popd >/dev/null - - pushd "${BUILD_DIR}"w >/dev/null - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf} - popd >/dev/null - fi -} - -multilib_src_compile() { - emake - - if use unicode; then - pushd "${BUILD_DIR}"u >/dev/null - emake buildlib LIBRARY=libexpatu.la - popd >/dev/null - - pushd "${BUILD_DIR}"w >/dev/null - emake buildlib LIBRARY=libexpatw.la - popd >/dev/null - fi -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use unicode; then - pushd "${BUILD_DIR}"u >/dev/null - emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la - popd >/dev/null - - pushd "${BUILD_DIR}"w >/dev/null - emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la - popd >/dev/null - - pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null - cp expat.pc expatu.pc - sed -i -e '/^Libs/s:-lexpat:&u:' expatu.pc || die - cp expat.pc expatw.pc - sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die - popd >/dev/null - fi - - if multilib_is_native_abi ; then - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - use elibc_FreeBSD && gen_usr_ldscript -a expat - fi -} - -multilib_src_install_all() { - dodoc Changes README - dohtml doc/* - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c - fi - - prune_libtool_files -} diff --git a/dev-libs/expat/expat-2.2.0-r2.ebuild b/dev-libs/expat/expat-2.2.0-r2.ebuild deleted file mode 100644 index 1ae07e1f482..00000000000 --- a/dev-libs/expat/expat-2.2.0-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils libtool multilib toolchain-funcs multilib-minimal - -DESCRIPTION="Stream-oriented XML parser library" -HOMEPAGE="https://libexpat.github.io/"; -SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_FreeBSD examples static-libs unicode" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -DOCS=( Changes README ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1.1-CVE-2016-0718-regression.patch - eapply_user -} - -multilib_src_configure() { - local myconf="$(use_enable static-libs static)" - - mkdir -p "${BUILD_DIR}"{u,w} || die - - ECONF_SOURCE="${S}" econf ${myconf} - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} - popd >/dev/null - fi -} - -multilib_src_compile() { - emake - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake buildlib LIBRARY=libexpatw.la - popd >/dev/null - fi -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la - 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 - - if multilib_is_native_abi ; then - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - use elibc_FreeBSD && gen_usr_ldscript -a expat - fi -} - -multilib_src_install_all() { - einstalldocs - - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder - docinto html - dodoc doc/*.{css,html,png} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c - fi - - prune_libtool_files -} diff --git a/dev-libs/expat/expat-2.2.2.ebuild b/dev-libs/expat/expat-2.2.2.ebuild deleted file mode 100644 index 7ebf4caefb6..00000000000 --- a/dev-libs/expat/expat-2.2.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils libtool multilib toolchain-funcs multilib-minimal - -DESCRIPTION="Stream-oriented XML parser library" -HOMEPAGE="https://libexpat.github.io/"; -SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_FreeBSD examples static-libs unicode" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -DOCS=( AUTHORS Changes README ) - -multilib_src_configure() { - local myconf="$(use_enable static-libs static)" - - mkdir -p "${BUILD_DIR}"{u,w} || die - - ECONF_SOURCE="${S}" econf ${myconf} - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} - popd >/dev/null - fi -} - -multilib_src_compile() { - emake - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake buildlib LIBRARY=libexpatw.la - popd >/dev/null - fi -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la - 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 - - if multilib_is_native_abi ; then - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - use elibc_FreeBSD && gen_usr_ldscript -a expat - fi -} - -multilib_src_install_all() { - einstalldocs - - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder - docinto html - dodoc doc/*.{css,html,png} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c - fi - - prune_libtool_files -} diff --git a/dev-libs/expat/expat-2.2.3.ebuild b/dev-libs/expat/expat-2.2.3.ebuild deleted file mode 100644 index 070bb44e1a1..00000000000 --- a/dev-libs/expat/expat-2.2.3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils libtool multilib toolchain-funcs multilib-minimal - -DESCRIPTION="Stream-oriented XML parser library" -HOMEPAGE="https://libexpat.github.io/"; -SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_FreeBSD examples static-libs unicode" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -DOCS=( AUTHORS Changes README.md ) - -multilib_src_configure() { - local myconf="$(use_enable static-libs static)" - - mkdir -p "${BUILD_DIR}"{u,w} || die - - ECONF_SOURCE="${S}" econf ${myconf} - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} - popd >/dev/null - fi -} - -multilib_src_compile() { - emake - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake buildlib LIBRARY=libexpatw.la - popd >/dev/null - fi -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la - 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 - - if multilib_is_native_abi ; then - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - use elibc_FreeBSD && gen_usr_ldscript -a expat - fi -} - -multilib_src_install_all() { - einstalldocs - - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder - docinto html - dodoc doc/*.{css,html,png} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c - fi - - prune_libtool_files -} diff --git a/dev-libs/expat/files/expat-2.1.1-CVE-2016-0718-regression.patch b/dev-libs/expat/files/expat-2.1.1-CVE-2016-0718-regression.patch deleted file mode 100644 index 03ea42def99..00000000000 --- a/dev-libs/expat/files/expat-2.1.1-CVE-2016-0718-regression.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3e6190e433479e56f8c1e5adc1198b3c86b15577 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Sun, 17 Jul 2016 20:22:29 +0200 -Subject: [PATCH] Fix regression introduced by patch to CVE-2016-0718 (bug - #539) - -Tag names were cut off in some cases; reported by Andy Wang ---- - expat/lib/xmlparse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index 13e080d..2630310 100644 ---- a/expat/lib/xmlparse.c -+++ b/expat/lib/xmlparse.c -@@ -2430,7 +2430,7 @@ doContent(XML_Parser parser, - &fromPtr, rawNameEnd, - (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); - convLen = (int)(toPtr - (XML_Char *)tag->buf); -- if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) { -+ if ((fromPtr >= rawNameEnd) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) { - tag->name.strLen = convLen; - break; - } --- -2.9.2 -
