mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-07 21:26:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

expat: update to latest upstream stable

Browse Source 
Upgraded dev-libs/expat to version 2.1.0 on amd64, arm, x86.

BUG=chromium-os:32397
TEST=`emerge expat` worked
TEST=`emerge-amd64-generic expat` worked
TEST=`emerge-arm-generic expat` worked
TEST=`emerge-x86-generic expat` worked
TEST=`cbuildbot {arm,amd64,x86}-generic-full` worked

Change-Id: I1d866042c048d6a77d30f09a83c938ec8ccd4ac2
Reviewed-on: https://gerrit.chromium.org/gerrit/27507
Reviewed-by: Kees Cook <keescook@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-07-16 13:09:15 -04:00 committed by Gerrit
parent 173de28eee
commit c81fe355d5
7 changed files with 91 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest vendored
View File

@ -1 +1 @@
DIST expat-2.0.1.tar.gz 446456 RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f SHA1 663548c37b996082db1f2f2c32af060d7aa15c2d SHA256 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
DIST expat-2.1.0.tar.gz 562616 RMD160 bffca083d29fe7688f106a902ef9b909c3321c5d SHA1 b08197d146930a5543a7b99e871cba3da614f6f0 SHA256 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86

72
sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.0.1-r5.ebuild vendored
View File

@ -1,72 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.1-r5.ebuild,v 1.6 2011/10/05 05:55:18 maekke Exp $
EAPI=4
inherit eutils libtool toolchain-funcs
DESCRIPTION="XML parsing libraries"
HOMEPAGE="http://expat.sourceforge.net/"
SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="elibc_FreeBSD examples static-libs"
src_prepare() {
epatch \
"${FILESDIR}"/${P}-check_stopped_parser.patch \
"${FILESDIR}"/${P}-fix_bug_1990430.patch \
"${FILESDIR}"/${P}-CVE-2009-3560-revised.patch
elibtoolize
epunt_cxx
mkdir "${S}"-build{,u,w} || die
}
src_configure() {
local myconf="$(use_enable static-libs static)"
local d
for d in build buildu buildw; do
pushd "${S}"-${d}
[[ ${d} == buildu ]] && export GENTOO_CPPFLAGS="-UXML_UNICODE"
[[ ${d} == buildw ]] && export GENTOO_CPPFLAGS="-UXML_UNICODE -DXML_UNICODE_WCHAR_T"
CPPFLAGS="${CPPFLAGS} ${GENTOO_CPPFLAGS}" ECONF_SOURCE="${S}" econf ${myconf}
popd
done
}
src_compile() {
cd "${S}"-build
emake
cd "${S}"-buildu
emake buildlib LIBRARY=libexpatu.la
cd "${S}"-buildw
emake buildlib LIBRARY=libexpatw.la
}
src_install() {
dodoc Changes README
dohtml doc/*
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins examples/*.c
fi
cd "${S}"-build
emake install DESTDIR="${D}"
cd "${S}"-buildu
emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
cd "${S}"-buildw
emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
use static-libs || rm -f "${D}"usr/lib*/libexpat{,u,w}.la
# libgeom in /lib and ifconfig in /sbin require it on FreeBSD since we
# stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
use elibc_FreeBSD && gen_usr_ldscript -a expat{,u,w}
}

86
sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.1.0.ebuild vendored Normal file
View File

@ -0,0 +1,86 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0.ebuild,v 1.7 2012/05/28 15:49:06 armin76 Exp $
EAPI=4
inherit eutils libtool toolchain-funcs
DESCRIPTION="XML parsing libraries"
HOMEPAGE="http://expat.sourceforge.net/"
SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="elibc_FreeBSD examples static-libs unicode"
src_prepare() {
elibtoolize
epunt_cxx
mkdir "${S}"-build{,u,w} || die
}
src_configure() {
local myconf="$(use_enable static-libs static)"
pushd "${S}"-build >/dev/null
ECONF_SOURCE="${S}" econf ${myconf}
popd >/dev/null
if use unicode; then
pushd "${S}"-buildu >/dev/null
CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
popd >/dev/null
pushd "${S}"-buildw >/dev/null
CFLAGS="${CFLAGS} -fshort-wchar" CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
popd >/dev/null
fi
}
src_compile() {
pushd "${S}"-build >/dev/null
emake
popd >/dev/null
if use unicode; then
pushd "${S}"-buildu >/dev/null
emake buildlib LIBRARY=libexpatu.la
popd >/dev/null
pushd "${S}"-buildw >/dev/null
emake buildlib LIBRARY=libexpatw.la
popd >/dev/null
fi
}
src_install() {
dodoc Changes README
dohtml doc/*
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins examples/*.c
fi
pushd "${S}"-build >/dev/null
emake install DESTDIR="${D}"
popd >/dev/null
if use unicode; then
pushd "${S}"-buildu >/dev/null
emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
popd >/dev/null
pushd "${S}"-buildw >/dev/null
emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
popd >/dev/null
fi
rm -f "${ED}"usr/lib*/libexpat{,u,w}.la
# 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
}

16
sdk_container/src/third_party/portage-stable/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch vendored
View File

@ -1,16 +0,0 @@
http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
http://bugs.gentoo.org/show_bug.cgi?id=303727
http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/
--- lib/xmlparse.c
+++ lib/xmlparse.c
@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
return XML_ERROR_UNCLOSED_TOKEN;
case XML_TOK_PARTIAL_CHAR:
return XML_ERROR_PARTIAL_CHAR;
+ case -XML_TOK_PROLOG_S:
+ tok = -tok;
+ break;
case XML_TOK_NONE:
#ifdef XML_DTD
/* for internal PE NOT referenced between declarations */

14
sdk_container/src/third_party/portage-stable/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch vendored
View File

@ -1,14 +0,0 @@
Fix segmentation fault in python tests
http://bugs.gentoo.org/197043
--- lib/xmlparse.c
+++ lib/xmlparse.c
@@ -2563,6 +2563,8 @@
(int)(dataPtr - (ICHAR *)dataBuf));
if (s == next)
break;
+ if (ps_parsing == XML_FINISHED || ps_parsing == XML_SUSPENDED)
+ break;
*eventPP = s;
}
}

14
sdk_container/src/third_party/portage-stable/dev-libs/expat/files/expat-2.0.1-fix_bug_1990430.patch vendored
View File

@ -1,14 +0,0 @@
http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmltok_impl.c?view=log (1.13 -> 1.15)
http://svn.python.org/view?view=rev&revision=74429
--- lib/xmltok_impl.c
+++ lib/xmltok_impl.c
@@ -1744,7 +1744,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr < end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \

8
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/expat-2.0.1-r5 → sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/expat-2.1.0 vendored
View File

@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=XML parsing libraries
EAPI=4
HOMEPAGE=http://expat.sourceforge.net/
IUSE=elibc_FreeBSD examples static-libs
KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
IUSE=elibc_FreeBSD examples static-libs unicode
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=MIT
SLOT=0
SRC_URI=mirror://sourceforge/expat/expat-2.0.1.tar.gz
SRC_URI=mirror://sourceforge/expat/expat-2.1.0.tar.gz
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
_md5_=555aa883e6701cf911c6119bb49f042b
_md5_=f04ec6cf9af520d2d2be201ce05a2633