[gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/, dev-libs/expat/files/
commit: 3987dd53792f13f21ea045df19ec0f3240e08467
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Feb 16 08:52:25 2019 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Feb 16 08:55:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3987dd53
dev-libs/expat: Drop old
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos gentoo.org>
dev-libs/expat/Manifest| 3 -
dev-libs/expat/expat-2.2.1.ebuild | 88
dev-libs/expat/expat-2.2.4.ebuild | 96 --
dev-libs/expat/expat-2.2.5.ebuild | 96 --
dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 31 ---
.../files/expat-2.2.1-getrandom-detection.patch| 24 --
dev-libs/expat/files/expat-2.2.1-posix-shell.patch | 26 --
7 files changed, 364 deletions(-)
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 733b50e8365..438f8571d79 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,4 +1 @@
-DIST expat-2.2.1.tar.bz2 405441 BLAKE2B
273960016692f3b9a1121eb07b67c28e5b3066fa324df0d7249329b2dc346c2601e4548def5e14b7f76d58f89f3cd12edad72fbd32da9f4c04ac61dfce23e15a
SHA512
74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea
-DIST expat-2.2.4.tar.bz2 505038 BLAKE2B
4d40629621bde41b44cdef4fa37937ce064cdbd621cc0d466b50a1a4626aff8bc8c8f6e9fbd94a36b709d449384da76ade683f31cf0aec0470006b750fc0a6ea
SHA512
788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592
-DIST expat-2.2.5.tar.bz2 510868 BLAKE2B
9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d
SHA512
8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637
DIST expat-2.2.6.tar.bz2 513322 BLAKE2B
386736da1f2204fa8f15ee4d1b3d11f01ed691efe6951b9f24f2bd30ab5494e75da6a97ceb1ffe4a0a8ecdc80f96f51d21c54f35a2cbc352a9fe9425545bf15b
SHA512
dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
diff --git a/dev-libs/expat/expat-2.2.1.ebuild
b/dev-libs/expat/expat-2.2.1.ebuild
deleted file mode 100644
index 84e0ee7bea0..000
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools 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 ~x86-fbsd ~amd64-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=""
-
-DOCS=( AUTHORS Changes README )
-
-PATCHES=(
- "${FILESDIR}"/${P}-getrandom-detection.patch
- "${FILESDIR}"/${P}-posix-shell.patch
- "${FILESDIR}"/${P}-gentoo-dash.patch # bug 622360
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-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::' 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"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/, dev-libs/expat/files/
commit: ab15b7fa1819dfce3e4b55138922f25a5b8d3eee
Author: Marty E. Plummer startmail com>
AuthorDate: Fri Apr 20 13:42:27 2018 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Sat Apr 21 20:56:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab15b7fa
dev-libs/expat: epatch->PATCHES=()
Also reformatted the patches to be -p1 applicable, and switched
eapply_user to default.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
dev-libs/expat/expat-2.2.1.ebuild | 11 +++
dev-libs/expat/expat-2.2.4.ebuild | 2 +-
dev-libs/expat/expat-2.2.5.ebuild | 2 +-
dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 4 ++--
dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch | 4 ++--
dev-libs/expat/files/expat-2.2.1-posix-shell.patch | 4 ++--
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/dev-libs/expat/expat-2.2.1.ebuild
b/dev-libs/expat/expat-2.2.1.ebuild
index 9a4ba03a1ee..ac06d60513e 100644
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ b/dev-libs/expat/expat-2.2.1.ebuild
@@ -16,11 +16,14 @@ RDEPEND=""
DOCS=( AUTHORS Changes README )
+PATCHES=(
+ "${FILESDIR}"/${P}-getrandom-detection.patch
+ "${FILESDIR}"/${P}-posix-shell.patch
+ "${FILESDIR}"/${P}-gentoo-dash.patch # bug 622360
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-getrandom-detection.patch
- epatch "${FILESDIR}"/${P}-posix-shell.patch
- epatch "${FILESDIR}"/${P}-gentoo-dash.patch # bug 622360
- eapply_user
+ default
eautoreconf
}
diff --git a/dev-libs/expat/expat-2.2.4.ebuild
b/dev-libs/expat/expat-2.2.4.ebuild
index 5ff41c1f875..fc3869969b4 100644
--- a/dev-libs/expat/expat-2.2.4.ebuild
+++ b/dev-libs/expat/expat-2.2.4.ebuild
@@ -18,7 +18,7 @@ RDEPEND=""
DOCS=( README.md )
src_prepare() {
- eapply_user
+ default
# fix interpreter to be a recent/good shell
sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
diff --git a/dev-libs/expat/expat-2.2.5.ebuild
b/dev-libs/expat/expat-2.2.5.ebuild
index e4888fba94b..62fe398a428 100644
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ b/dev-libs/expat/expat-2.2.5.ebuild
@@ -18,7 +18,7 @@ RDEPEND=""
DOCS=( README.md )
src_prepare() {
- eapply_user
+ default
# fix interpreter to be a recent/good shell
sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
diff --git a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
index a0eb60ce6cc..9bf9bfe4492 100644
--- a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
+++ b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
@@ -10,8 +10,8 @@ Subject: [PATCH] conftools/get-version.sh: Use printf rather
than try to infer
diff --git a/expat/conftools/get-version.sh b/expat/conftools/get-version.sh
index a70e0fb..91e5c64 100755
a/expat/conftools/get-version.sh
-+++ b/expat/conftools/get-version.sh
+--- a/conftools/get-version.sh
b/conftools/get-version.sh
@@ -32,15 +32,4 @@ MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp'
$hdr`"
MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`"
MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`"
diff --git a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
index eba004843db..6ceb7d9993f 100644
--- a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
+++ b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
@@ -11,8 +11,8 @@ There is no such thing but we need to link (not just compile)
to realize.
diff --git a/expat/configure.ac b/expat/configure.ac
index 1357c9a..444c002 100644
a/expat/configure.ac
-+++ b/expat/configure.ac
+--- a/configure.ac
b/configure.ac
@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
diff --git a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
index 3f34d0d9853..ab680451d8e 100644
--- a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
+++ b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
@@ -11,8 +11,8 @@ It doesn't matter in bash, but some other sh don't like it,
so it's a portabilit
diff --git a/expat/configure.ac b/expat/configure.ac
index e48c32e..1357c9a 100644
a/expat/configure.ac
-+++ b/expat/configure.ac
+--- a/configure.ac
b/configure.ac
@@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context],
[Do not retain context around the current parse point]),
[enable_xml_context=${enableval}])
[gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/, dev-libs/expat/files/
commit: 2f110fc7f69c366f738bbe03b74157d503fde59b
Author: Sebastian Pipping gentoo org>
AuthorDate: Tue Sep 12 13:10:54 2017 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Tue Sep 12 13:14:45 2017 +
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..000
--- 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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/, dev-libs/expat/files/
commit: ed776d4e8f2e1da38a6a058e615943b636a52176
Author: Sebastian Pipping gentoo org>
AuthorDate: Sat Jul 1 11:22:06 2017 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Sat Jul 1 11:22:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed776d4e
dev-libs/expat: Fix compilation (bug #622360)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-libs/expat/expat-2.2.1.ebuild | 1 +
dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 31 ++
2 files changed, 32 insertions(+)
diff --git a/dev-libs/expat/expat-2.2.1.ebuild
b/dev-libs/expat/expat-2.2.1.ebuild
index 97d901fc111..7ada43d0dc1 100644
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ b/dev-libs/expat/expat-2.2.1.ebuild
@@ -20,6 +20,7 @@ DOCS=( AUTHORS Changes README )
src_prepare() {
epatch "${FILESDIR}"/${P}-getrandom-detection.patch
epatch "${FILESDIR}"/${P}-posix-shell.patch
+ epatch "${FILESDIR}"/${P}-gentoo-dash.patch # bug 622360
eapply_user
eautoreconf
}
diff --git a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
new file mode 100644
index 000..a0eb60ce6cc
--- /dev/null
+++ b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
@@ -0,0 +1,31 @@
+From 9502963fd2e84ac529950f3a6f4173d86b93b5d2 Mon Sep 17 00:00:00 2001
+From: Kerin Millar
+Date: Thu, 29 Jun 2017 16:51:18 +0100
+Subject: [PATCH] conftools/get-version.sh: Use printf rather than try to infer
+ non-portable echo options
+
+---
+ expat/conftools/get-version.sh | 13 +
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/expat/conftools/get-version.sh b/expat/conftools/get-version.sh
+index a70e0fb..91e5c64 100755
+--- a/expat/conftools/get-version.sh
b/expat/conftools/get-version.sh
+@@ -32,15 +32,4 @@ MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp'
$hdr`"
+ MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`"
+ MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`"
+
+-# Determine how to tell echo not to print the trailing \n. This is
+-# similar to Autoconf's @ECHO_C@ and @ECHO_N@; however, we don't
+-# generate this file via autoconf (in fact, get-version.sh is used
+-# to *create* ./configure), so we just do something similar inline.
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+- *c*,-n*) ECHO_N= ECHO_C='
+-' ;;
+- *c*,* ) ECHO_N=-n ECHO_C= ;;
+- *) ECHO_N= ECHO_C='\c' ;;
+-esac
+-
+-echo $ECHO_N "$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$ECHO_C"
++printf '%s.%s.%s' "$MAJOR_VERSION" "$MINOR_VERSION" "$MICRO_VERSION"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/, dev-libs/expat/files/
commit: ffd57237856bda7b744782f495cd685360165f28
Author: Pacho Ramos gentoo org>
AuthorDate: Tue Jan 10 20:15:43 2017 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue Jan 10 20:15:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd57237
dev-libs/expat: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-libs/expat/Manifest| 1 -
dev-libs/expat/expat-2.1.1-r2.ebuild | 97 ---
dev-libs/expat/expat-2.1.1-r3.ebuild | 98 ---
...2.1.1-CVE-2012-6702-plus-CVE-2016-5300-v1.patch | 134
.../files/expat-2.1.1-CVE-2015-1283-refix.patch| 37 -
.../files/expat-2.1.1-CVE-2016-0718-v2-2-1.patch | 755 -
6 files changed, 1122 deletions(-)
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index b039f87..d47118d 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,2 +1 @@
-DIST expat-2.1.1.tar.bz2 405103 SHA256
aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67 SHA512
088e2ef3434f2affd4fc79fe46f0e9826b9b4c3931ddc780cd18892f1cd1e11365169c6807f45916a56bb6abcc627dcd17a23f970be0bf464f048f5be2713628
WHIRLPOOL
d003f427e3e80cd335994190495594d35696205196b1755ff90dcc07fd7cc1c4933f37592e54cdae5420cd91ae326c3b928ef8d5f5cfd84224e1069c51b6a9bb
DIST expat-2.2.0.tar.bz2 414352 SHA256
d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff SHA512
2be1a6eea87b439374bfacb1fbb8e814fd8a085d5dfd3ca3be69d1af29b5dc93d36cbdec5f6843ca6d5910843c7ffbc498adc2a561b9dcece488edf3c6f8c7c8
WHIRLPOOL
b1914e2c23170dabab6fce4fb0eb2511dc8dcde8db986a7cdf6b236d262fb756fb0955cb4c1fc7475a1ad3d9c005b632e42850dcf3af66f4cc87fe4ecfc3cb47
diff --git a/dev-libs/expat/expat-2.1.1-r2.ebuild
b/dev-libs/expat/expat-2.1.1-r2.ebuild
deleted file mode 100644
index a71db2d..
--- a/dev-libs/expat/expat-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 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.bz2"
-
-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() {
- # https://bugs.gentoo.org/show_bug.cgi?id=583268
- epatch "${FILESDIR}"/${P}-CVE-2015-1283-refix.patch
- epatch "${FILESDIR}"/${P}-CVE-2016-0718-v2-2-1.patch
-
- # https://bugs.gentoo.org/show_bug.cgi?id=577928
- epatch "${FILESDIR}"/${P}-CVE-2012-6702-plus-CVE-2016-5300-v1.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::' expatu.pc || die
- cp expat.pc expatw.pc
- sed -i -e '/^Libs/s:-lexpat::' 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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/, dev-libs/expat/files/
commit: 04f12ff7fde845e4fc896786719fbd6a2e727666
Author: Sebastian Pipping gentoo org>
AuthorDate: Mon Jun 13 14:32:09 2016 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Mon Jun 13 14:34:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f12ff7
dev-libs/expat: CVE-2012-6702 + CVE-2016-5300 (bug #577928)
Package-Manager: portage-2.2.28
dev-libs/expat/expat-2.1.1-r2.ebuild | 97 +++
...2.1.1-CVE-2012-6702-plus-CVE-2016-5300-v1.patch | 134 +
2 files changed, 231 insertions(+)
diff --git a/dev-libs/expat/expat-2.1.1-r2.ebuild
b/dev-libs/expat/expat-2.1.1-r2.ebuild
new file mode 100644
index 000..93c6fa5
--- /dev/null
+++ b/dev-libs/expat/expat-2.1.1-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 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.bz2"
+
+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() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=583268
+ epatch "${FILESDIR}"/${P}-CVE-2015-1283-refix.patch
+ epatch "${FILESDIR}"/${P}-CVE-2016-0718-v2-2-1.patch
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=577928
+ epatch "${FILESDIR}"/${P}-CVE-2012-6702-plus-CVE-2016-5300-v1.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::' expatu.pc || die
+ cp expat.pc expatw.pc
+ sed -i -e '/^Libs/s:-lexpat::' 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.1-CVE-2012-6702-plus-CVE-2016-5300-v1.patch
b/dev-libs/expat/files/expat-2.1.1-CVE-2012-6702-plus-CVE-2016-5300-v1.patch
new file mode 100644
index 000..19966f4
--- /dev/null
+++ b/dev-libs/expat/files/expat-2.1.1-CVE-2012-6702-plus-CVE-2016-5300-v1.patch
@@ -0,0 +1,134 @@
+From cb31522769d11a375078a073cba94e7176cb48a4 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Wed, 16 Mar 2016 15:30:12 +0100
+Subject: [PATCH] Resolve call to srand, use more entropy (patch version 1.0)
+
+Squashed backport against vanilla Expat 2.1.1, addressing:
+* CVE-2012-6702 -- unanticipated internal calls to srand
+* CVE-2016-5300 -- use of too little entropy
+
+Since commit e3e81a6d9f0885ea02d3979151c358f314bf3d6d
+(released with Expat 2.1.0) Expat called srand by itself
+from inside generate_hash_secret_salt for an instance
+of XML_Parser if XML_SetHashSalt was either (a) not called
