1 |
tetromino 15/07/30 02:18:34 |
2 |
|
3 |
Modified: ChangeLog expat-2.1.0-r4.ebuild |
4 |
Added: expat-2.1.0-r5.ebuild |
5 |
Removed: expat-2.1.0-r2.ebuild expat-2.1.0-r3.ebuild |
6 |
Log: |
7 |
Fix buffer overflow (bug #555642, CVE-2015-1283, thanks to Agostino Sarubbo and Paweł Hajdan, Jr.). Improve description. Clean out old ebuilds. |
8 |
|
9 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D) |
10 |
|
11 |
Revision Changes Path |
12 |
1.175 dev-libs/expat/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/expat/ChangeLog?rev=1.175&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/expat/ChangeLog?rev=1.175&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/expat/ChangeLog?r1=1.174&r2=1.175 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v |
21 |
retrieving revision 1.174 |
22 |
retrieving revision 1.175 |
23 |
diff -u -r1.174 -r1.175 |
24 |
--- ChangeLog 9 Jun 2015 14:16:10 -0000 1.174 |
25 |
+++ ChangeLog 30 Jul 2015 02:18:34 -0000 1.175 |
26 |
@@ -1,6 +1,14 @@ |
27 |
# ChangeLog for dev-libs/expat |
28 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.174 2015/06/09 14:16:10 jlec Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.175 2015/07/30 02:18:34 tetromino Exp $ |
31 |
+ |
32 |
+*expat-2.1.0-r5 (30 Jul 2015) |
33 |
+ |
34 |
+ 30 Jul 2015; Alexandre Rostovtsev <tetromino@g.o> |
35 |
+ -expat-2.1.0-r2.ebuild, -expat-2.1.0-r3.ebuild, expat-2.1.0-r4.ebuild, |
36 |
+ +expat-2.1.0-r5.ebuild, +files/expat-2.1.0-mozilla-sanity-check-size.patch: |
37 |
+ Fix buffer overflow (bug #555642, CVE-2015-1283, thanks to Agostino Sarubbo |
38 |
+ and Paweł Hajdan, Jr.). Improve description. Clean out old ebuilds. |
39 |
|
40 |
09 Jun 2015; Justin Lecher <jlec@g.o> metadata.xml: |
41 |
Updating remote-id in metadata.xml |
42 |
|
43 |
|
44 |
|
45 |
1.12 dev-libs/expat/expat-2.1.0-r4.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild?rev=1.12&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild?rev=1.12&content-type=text/plain |
49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild?r1=1.11&r2=1.12 |
50 |
|
51 |
Index: expat-2.1.0-r4.ebuild |
52 |
=================================================================== |
53 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild,v |
54 |
retrieving revision 1.11 |
55 |
retrieving revision 1.12 |
56 |
diff -u -r1.11 -r1.12 |
57 |
--- expat-2.1.0-r4.ebuild 27 May 2015 12:55:43 -0000 1.11 |
58 |
+++ expat-2.1.0-r4.ebuild 30 Jul 2015 02:18:34 -0000 1.12 |
59 |
@@ -1,11 +1,11 @@ |
60 |
# Copyright 1999-2015 Gentoo Foundation |
61 |
# Distributed under the terms of the GNU General Public License v2 |
62 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild,v 1.11 2015/05/27 12:55:43 zlogene Exp $ |
63 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild,v 1.12 2015/07/30 02:18:34 tetromino Exp $ |
64 |
|
65 |
EAPI=5 |
66 |
inherit eutils libtool multilib toolchain-funcs multilib-minimal |
67 |
|
68 |
-DESCRIPTION="XML parsing libraries" |
69 |
+DESCRIPTION="Stream-oriented XML parser library" |
70 |
HOMEPAGE="http://expat.sourceforge.net/" |
71 |
SRC_URI="mirror://sourceforge/expat/${P}.tar.gz" |
72 |
|
73 |
|
74 |
|
75 |
|
76 |
1.1 dev-libs/expat/expat-2.1.0-r5.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/expat/expat-2.1.0-r5.ebuild?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/expat/expat-2.1.0-r5.ebuild?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: expat-2.1.0-r5.ebuild |
82 |
=================================================================== |
83 |
# Copyright 1999-2015 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r5.ebuild,v 1.1 2015/07/30 02:18:34 tetromino Exp $ |
86 |
|
87 |
EAPI=5 |
88 |
inherit eutils libtool multilib toolchain-funcs multilib-minimal |
89 |
|
90 |
DESCRIPTION="Stream-oriented XML parser library" |
91 |
HOMEPAGE="http://expat.sourceforge.net/" |
92 |
SRC_URI="mirror://sourceforge/expat/${P}.tar.gz" |
93 |
|
94 |
LICENSE="MIT" |
95 |
SLOT="0" |
96 |
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" |
97 |
IUSE="elibc_FreeBSD examples static-libs unicode" |
98 |
RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 |
99 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" |
100 |
|
101 |
src_prepare() { |
102 |
epatch "${FILESDIR}"/${P}-xmlwfargs.patch |
103 |
epatch "${FILESDIR}"/${P}-mozilla-sanity-check-size.patch #555642 |
104 |
elibtoolize |
105 |
} |
106 |
|
107 |
multilib_src_configure() { |
108 |
local myconf="$(use_enable static-libs static)" |
109 |
|
110 |
mkdir -p "${BUILD_DIR}"{u,w} || die |
111 |
|
112 |
ECONF_SOURCE="${S}" econf ${myconf} |
113 |
|
114 |
if use unicode; then |
115 |
pushd "${BUILD_DIR}"u >/dev/null |
116 |
CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} |
117 |
popd >/dev/null |
118 |
|
119 |
pushd "${BUILD_DIR}"w >/dev/null |
120 |
CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf} |
121 |
popd >/dev/null |
122 |
fi |
123 |
} |
124 |
|
125 |
multilib_src_compile() { |
126 |
emake |
127 |
|
128 |
if use unicode; then |
129 |
pushd "${BUILD_DIR}"u >/dev/null |
130 |
emake buildlib LIBRARY=libexpatu.la |
131 |
popd >/dev/null |
132 |
|
133 |
pushd "${BUILD_DIR}"w >/dev/null |
134 |
emake buildlib LIBRARY=libexpatw.la |
135 |
popd >/dev/null |
136 |
fi |
137 |
} |
138 |
|
139 |
multilib_src_install() { |
140 |
emake install DESTDIR="${D}" |
141 |
|
142 |
if use unicode; then |
143 |
pushd "${BUILD_DIR}"u >/dev/null |
144 |
emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la |
145 |
popd >/dev/null |
146 |
|
147 |
pushd "${BUILD_DIR}"w >/dev/null |
148 |
emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la |
149 |
popd >/dev/null |
150 |
|
151 |
pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null |
152 |
cp expat.pc expatu.pc |
153 |
sed -i -e '/^Libs/s:-lexpat:&u:' expatu.pc || die |
154 |
cp expat.pc expatw.pc |
155 |
sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die |
156 |
popd >/dev/null |
157 |
fi |
158 |
|
159 |
if multilib_is_native_abi ; then |
160 |
# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since |
161 |
# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 |
162 |
use elibc_FreeBSD && gen_usr_ldscript -a expat |
163 |
fi |
164 |
} |
165 |
|
166 |
multilib_src_install_all() { |
167 |
dodoc Changes README |
168 |
dohtml doc/* |
169 |
|
170 |
if use examples; then |
171 |
insinto /usr/share/doc/${PF}/examples |
172 |
doins examples/*.c |
173 |
fi |
174 |
|
175 |
prune_libtool_files |
176 |
} |