Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/
Date: Fri, 28 May 2021 21:23:16
Message-Id: 1622236974.90eadb7bb21b4941c9d6297c0725edef87e49837.sping@gentoo
1 commit: 90eadb7bb21b4941c9d6297c0725edef87e49837
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 28 21:21:38 2021 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Fri May 28 21:22:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90eadb7b
7
8 dev-libs/expat: Drop vulnerable
9
10 Bug: https://bugs.gentoo.org/791703
11 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
12 Package-Manager: Portage-3.0.19, Repoman-3.0.3
13
14 dev-libs/expat/Manifest | 2 -
15 dev-libs/expat/expat-2.2.10.ebuild | 99 --------------------------------------
16 dev-libs/expat/expat-2.3.0.ebuild | 99 --------------------------------------
17 3 files changed, 200 deletions(-)
18
19 diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
20 index b17ad0f744c..167b959732d 100644
21 --- a/dev-libs/expat/Manifest
22 +++ b/dev-libs/expat/Manifest
23 @@ -1,3 +1 @@
24 -DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
25 -DIST expat-2.3.0.tar.xz 433508 BLAKE2B b547cbca23f2ca11bef326225b8e2958a3539dbb14789c33fb0f2aede35bfbe12981d151624b0497ab2ad488ec06529ae2a996e514b19b39622ae7fc29f47832 SHA512 dde8a9a094b18d795a0e86ca4aa68488b352dc67019e0d669e8b910ed149628de4c2a49bc3a5b832f624319336a01f9e4debe03433a43e1c420f36356d886820
26 DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
27
28 diff --git a/dev-libs/expat/expat-2.2.10.ebuild b/dev-libs/expat/expat-2.2.10.ebuild
29 deleted file mode 100644
30 index 005072fd32a..00000000000
31 --- a/dev-libs/expat/expat-2.2.10.ebuild
32 +++ /dev/null
33 @@ -1,99 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -AUTOTOOLS_AUTO_DEPEND=no
39 -inherit autotools multilib-minimal usr-ldscript
40 -
41 -DESCRIPTION="Stream-oriented XML parser library"
42 -HOMEPAGE="https://libexpat.github.io/"
43 -SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
44 -
45 -LICENSE="MIT"
46 -SLOT="0"
47 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
48 -IUSE="elibc_FreeBSD examples static-libs unicode"
49 -BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
50 -
51 -DOCS=( README.md )
52 -
53 -src_prepare() {
54 - default
55 -
56 - # fix interpreter to be a recent/good shell
57 - sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
58 - if use unicode; then
59 - cp -R "${S}" "${S}"w || die
60 - pushd "${S}"w >/dev/null
61 - find -name Makefile.am \
62 - -exec sed \
63 - -e 's,libexpat\.la,libexpatw.la,' \
64 - -e 's,libexpat_la,libexpatw_la,' \
65 - -i {} + || die
66 - eautoreconf
67 - popd >/dev/null
68 - fi
69 -}
70 -
71 -multilib_src_configure() {
72 - local myconf="$(use_enable static-libs static) --without-docbook"
73 -
74 - mkdir -p "${BUILD_DIR}"w || die
75 -
76 - if use unicode; then
77 - pushd "${BUILD_DIR}"w >/dev/null
78 - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
79 - popd >/dev/null
80 - fi
81 -
82 - ECONF_SOURCE="${S}" econf ${myconf}
83 -}
84 -
85 -multilib_src_compile() {
86 - emake
87 -
88 - if use unicode; then
89 - pushd "${BUILD_DIR}"w >/dev/null
90 - emake -C lib
91 - popd >/dev/null
92 - fi
93 -}
94 -
95 -multilib_src_install() {
96 - emake install DESTDIR="${D}"
97 -
98 - if use unicode; then
99 - pushd "${BUILD_DIR}"w >/dev/null
100 - emake -C lib install DESTDIR="${D}"
101 - popd >/dev/null
102 -
103 - pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
104 - cp expat.pc expatw.pc
105 - sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
106 - popd >/dev/null
107 - fi
108 -
109 - if multilib_is_native_abi ; then
110 - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
111 - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
112 - use elibc_FreeBSD && gen_usr_ldscript -a expat
113 - fi
114 -}
115 -
116 -multilib_src_install_all() {
117 - einstalldocs
118 -
119 - doman doc/xmlwf.1
120 -
121 - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder
122 - docinto html
123 - dodoc doc/*.{css,html,png}
124 -
125 - if use examples; then
126 - docinto examples
127 - dodoc examples/*.c
128 - docompress -x usr/share/doc/${PF}/examples
129 - fi
130 -
131 - find "${D}" -name '*.la' -type f -delete || die
132 -}
133
134 diff --git a/dev-libs/expat/expat-2.3.0.ebuild b/dev-libs/expat/expat-2.3.0.ebuild
135 deleted file mode 100644
136 index 9a3178cd3f5..00000000000
137 --- a/dev-libs/expat/expat-2.3.0.ebuild
138 +++ /dev/null
139 @@ -1,99 +0,0 @@
140 -# Copyright 1999-2021 Gentoo Authors
141 -# Distributed under the terms of the GNU General Public License v2
142 -
143 -EAPI=7
144 -AUTOTOOLS_AUTO_DEPEND=no
145 -inherit autotools multilib-minimal usr-ldscript
146 -
147 -DESCRIPTION="Stream-oriented XML parser library"
148 -HOMEPAGE="https://libexpat.github.io/"
149 -SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
150 -
151 -LICENSE="MIT"
152 -SLOT="0"
153 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
154 -IUSE="elibc_FreeBSD examples static-libs unicode"
155 -BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
156 -
157 -DOCS=( README.md )
158 -
159 -src_prepare() {
160 - default
161 -
162 - # fix interpreter to be a recent/good shell
163 - sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
164 - if use unicode; then
165 - cp -R "${S}" "${S}"w || die
166 - pushd "${S}"w >/dev/null
167 - find -name Makefile.am \
168 - -exec sed \
169 - -e 's,libexpat\.la,libexpatw.la,' \
170 - -e 's,libexpat_la,libexpatw_la,' \
171 - -i {} + || die
172 - eautoreconf
173 - popd >/dev/null
174 - fi
175 -}
176 -
177 -multilib_src_configure() {
178 - local myconf="$(use_enable static-libs static) --without-docbook"
179 -
180 - mkdir -p "${BUILD_DIR}"w || die
181 -
182 - if use unicode; then
183 - pushd "${BUILD_DIR}"w >/dev/null
184 - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
185 - popd >/dev/null
186 - fi
187 -
188 - ECONF_SOURCE="${S}" econf ${myconf}
189 -}
190 -
191 -multilib_src_compile() {
192 - emake
193 -
194 - if use unicode; then
195 - pushd "${BUILD_DIR}"w >/dev/null
196 - emake -C lib
197 - popd >/dev/null
198 - fi
199 -}
200 -
201 -multilib_src_install() {
202 - emake install DESTDIR="${D}"
203 -
204 - if use unicode; then
205 - pushd "${BUILD_DIR}"w >/dev/null
206 - emake -C lib install DESTDIR="${D}"
207 - popd >/dev/null
208 -
209 - pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
210 - cp expat.pc expatw.pc
211 - sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
212 - popd >/dev/null
213 - fi
214 -
215 - if multilib_is_native_abi ; then
216 - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
217 - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
218 - use elibc_FreeBSD && gen_usr_ldscript -a expat
219 - fi
220 -}
221 -
222 -multilib_src_install_all() {
223 - einstalldocs
224 -
225 - doman doc/xmlwf.1
226 -
227 - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder
228 - docinto html
229 - dodoc doc/*.{css,html,png}
230 -
231 - if use examples; then
232 - docinto examples
233 - dodoc examples/*.c
234 - docompress -x usr/share/doc/${PF}/examples
235 - fi
236 -
237 - find "${D}" -name '*.la' -type f -delete || die
238 -}