diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/expat | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/expat')
-rw-r--r-- | dev-libs/expat/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/expat/expat-2.1.0-r4.ebuild | 93 | ||||
-rw-r--r-- | dev-libs/expat/expat-2.1.0-r5.ebuild | 94 | ||||
-rw-r--r-- | dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch | 81 | ||||
-rw-r--r-- | dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch | 15 | ||||
-rw-r--r-- | dev-libs/expat/metadata.xml | 9 |
6 files changed, 293 insertions, 0 deletions
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest new file mode 100644 index 000000000000..7a4c52ffd942 --- /dev/null +++ b/dev-libs/expat/Manifest @@ -0,0 +1 @@ +DIST expat-2.1.0.tar.gz 562616 SHA256 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 SHA512 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d WHIRLPOOL 147eb383fdb79116e2215982e9741939f80249a0bb690e93b00218fa335d483d88f82d9256632b458b13592252aeb100ec4ef830c72bb8eb5df7675cd15f41e1 diff --git a/dev-libs/expat/expat-2.1.0-r4.ebuild b/dev-libs/expat/expat-2.1.0-r4.ebuild new file mode 100644 index 000000000000..aab4f14cc667 --- /dev/null +++ b/dev-libs/expat/expat-2.1.0-r4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils libtool multilib toolchain-funcs multilib-minimal + +DESCRIPTION="Stream-oriented XML parser library" +HOMEPAGE="http://expat.sourceforge.net/" +SRC_URI="mirror://sourceforge/expat/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +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}"/${P}-xmlwfargs.patch + elibtoolize +} + +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.1.0-r5.ebuild b/dev-libs/expat/expat-2.1.0-r5.ebuild new file mode 100644 index 000000000000..894980b0c903 --- /dev/null +++ b/dev-libs/expat/expat-2.1.0-r5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils libtool multilib toolchain-funcs multilib-minimal + +DESCRIPTION="Stream-oriented XML parser library" +HOMEPAGE="http://expat.sourceforge.net/" +SRC_URI="mirror://sourceforge/expat/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +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}"/${P}-xmlwfargs.patch + epatch "${FILESDIR}"/${P}-mozilla-sanity-check-size.patch #555642 + elibtoolize +} + +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/files/expat-2.1.0-mozilla-sanity-check-size.patch b/dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch new file mode 100644 index 000000000000..366bd4f32b54 --- /dev/null +++ b/dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch @@ -0,0 +1,81 @@ + +# HG changeset patch +# User Eric Rahm <erahm@mozilla.com> +# Date 1428706223 25200 +# Node ID 438d9e2a991ab82381a1a1442a470b2565c80c13 +# Parent 1c0861d7a6457f461cccccb2e0895a9f9d34c8d4 +Bug 1140537 - Sanity check size calculations. r=peterv + +diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c +--- a/parser/expat/lib/xmlparse.c ++++ b/parser/expat/lib/xmlparse.c +@@ -1648,29 +1648,40 @@ XML_ParseBuffer(XML_Parser parser, int l + XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position); + positionPtr = bufferPtr; + return result; + } + + void * XMLCALL + XML_GetBuffer(XML_Parser parser, int len) + { ++/* BEGIN MOZILLA CHANGE (sanity check len) */ ++ if (len < 0) { ++ errorCode = XML_ERROR_NO_MEMORY; ++ return NULL; ++ } ++/* END MOZILLA CHANGE */ + switch (ps_parsing) { + case XML_SUSPENDED: + errorCode = XML_ERROR_SUSPENDED; + return NULL; + case XML_FINISHED: + errorCode = XML_ERROR_FINISHED; + return NULL; + default: ; + } + + if (len > bufferLim - bufferEnd) { +- /* FIXME avoid integer overflow */ + int neededSize = len + (int)(bufferEnd - bufferPtr); ++/* BEGIN MOZILLA CHANGE (sanity check neededSize) */ ++ if (neededSize < 0) { ++ errorCode = XML_ERROR_NO_MEMORY; ++ return NULL; ++ } ++/* END MOZILLA CHANGE */ + #ifdef XML_CONTEXT_BYTES + int keep = (int)(bufferPtr - buffer); + + if (keep > XML_CONTEXT_BYTES) + keep = XML_CONTEXT_BYTES; + neededSize += keep; + #endif /* defined XML_CONTEXT_BYTES */ + if (neededSize <= bufferLim - buffer) { +@@ -1689,17 +1700,25 @@ XML_GetBuffer(XML_Parser parser, int len + } + else { + char *newBuf; + int bufferSize = (int)(bufferLim - bufferPtr); + if (bufferSize == 0) + bufferSize = INIT_BUFFER_SIZE; + do { + bufferSize *= 2; +- } while (bufferSize < neededSize); ++/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */ ++ } while (bufferSize < neededSize && bufferSize > 0); ++/* END MOZILLA CHANGE */ ++/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */ ++ if (bufferSize <= 0) { ++ errorCode = XML_ERROR_NO_MEMORY; ++ return NULL; ++ } ++/* END MOZILLA CHANGE */ + newBuf = (char *)MALLOC(bufferSize); + if (newBuf == 0) { + errorCode = XML_ERROR_NO_MEMORY; + return NULL; + } + bufferLim = newBuf + bufferSize; + #ifdef XML_CONTEXT_BYTES + if (bufferPtr) { + diff --git a/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch b/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch new file mode 100644 index 000000000000..5ac5d54eba18 --- /dev/null +++ b/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch @@ -0,0 +1,15 @@ +Fix "xmlwf -h" output + +Patch is from: http://pkgs.fedoraproject.org/cgit/expat.git/plain/expat-2.1.0-xmlwfargs.patch + +--- xmlwf/xmlwf.c ++++ xmlwf/xmlwf.c +@@ -634,7 +634,7 @@ static void + usage(const XML_Char *prog, int rc) + { + ftprintf(stderr, +- T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] " ++ T("usage: %s [-s] [-n] [-p] [-x] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [-v] " + "[-e encoding] file ...\n"), prog); + exit(rc); + } diff --git a/dev-libs/expat/metadata.xml b/dev-libs/expat/metadata.xml new file mode 100644 index 000000000000..38f9001688cf --- /dev/null +++ b/dev-libs/expat/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>freedesktop</herd> + <upstream> + <remote-id type="cpe">cpe:/a:libexpat:expat</remote-id> + <remote-id type="sourceforge">expat</remote-id> + </upstream> +</pkgmetadata> |