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: Tue, 22 Feb 2022 17:06:08
Message-Id: 1645549496.04937f9ebb7cadfad287c09b327d95803d9fcd35.sping@gentoo
1 commit: 04937f9ebb7cadfad287c09b327d95803d9fcd35
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 22 17:04:56 2022 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 22 17:04:56 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04937f9e
7
8 dev-libs/expat: Drop vulnerable
9
10 Bug: https://bugs.gentoo.org/833431
11 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13
14 dev-libs/expat/Manifest | 2 -
15 dev-libs/expat/expat-2.4.4.ebuild | 94 ---------------------------------------
16 dev-libs/expat/expat-2.4.5.ebuild | 94 ---------------------------------------
17 3 files changed, 190 deletions(-)
18
19 diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
20 index 4178503ef8c9..0c4a96d5fd08 100644
21 --- a/dev-libs/expat/Manifest
22 +++ b/dev-libs/expat/Manifest
23 @@ -1,3 +1 @@
24 -DIST expat-2.4.4.tar.xz 449448 BLAKE2B 20b2cfb27746c24e56580478c933b3ca9e9ff19aed13561bc07e8ad879daff575882b8940fdca00f8c99b146067438a4a680238728098b10e4d08303ffa00119 SHA512 c88a82f4732e27340eb9480c082bcc909b0284e16b368ee9feeb4e2dd058e8f7c42fd48feacd5272cc76cb78bd183df33eb5d0b135fdd1d3c493cb156572ab76
25 -DIST expat-2.4.5.tar.xz 451976 BLAKE2B d4ef7dda9da0f0f0be112b1aab551b10414e27692a5d83de67ba53298f60ea2a08872de4a9baee3596eff56f275866dbe18cb93a927bbf43952ceff633d9e28f SHA512 9e010e8959b9182db0fdcd3453c06d5b892db85da0d9f2db19384cc9a05d70066dc927c40fc98ada430e0548a47fa863866985193062af9bd243de9bdac417f5
26 DIST expat-2.4.6.tar.xz 452468 BLAKE2B 8b30acc2628e3ce67ee57a4c9bee232f89f49ee70901588f7f5a34844e459cbc447fd225a734078100e52c96a73aa1f016e4f2d51d9a079128d661d97b2213c0 SHA512 830b00dbdfb92ef5cab69d783762a78443cd7d834bccda072d103c6178327cf480bde579089b1c3be884e67ddb862178fa734bd7e1f992f6f0ca29d83e21d737
27
28 diff --git a/dev-libs/expat/expat-2.4.4.ebuild b/dev-libs/expat/expat-2.4.4.ebuild
29 deleted file mode 100644
30 index 8db61e9898d3..000000000000
31 --- a/dev-libs/expat/expat-2.4.4.ebuild
32 +++ /dev/null
33 @@ -1,94 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -AUTOTOOLS_AUTO_DEPEND=no
39 -AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing
40 -inherit autotools multilib-minimal
41 -
42 -DESCRIPTION="Stream-oriented XML parser library"
43 -HOMEPAGE="https://libexpat.github.io/"
44 -SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
45 -
46 -LICENSE="MIT"
47 -SLOT="0"
48 -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"
49 -IUSE="examples static-libs unicode"
50 -BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
51 -
52 -DOCS=( README.md )
53 -
54 -src_prepare() {
55 - default
56 -
57 - # fix interpreter to be a recent/good shell
58 - sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
59 - if use unicode; then
60 - cp -R "${S}" "${S}"w || die
61 - pushd "${S}"w >/dev/null
62 - find -name Makefile.am \
63 - -exec sed \
64 - -e 's,libexpat\.la,libexpatw.la,' \
65 - -e 's,libexpat_la,libexpatw_la,' \
66 - -i {} + || die
67 - eautoreconf
68 - popd >/dev/null
69 - fi
70 -}
71 -
72 -multilib_src_configure() {
73 - local myconf="$(use_enable static-libs static) --without-docbook"
74 -
75 - mkdir -p "${BUILD_DIR}"w || die
76 -
77 - if use unicode; then
78 - pushd "${BUILD_DIR}"w >/dev/null
79 - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
80 - popd >/dev/null
81 - fi
82 -
83 - ECONF_SOURCE="${S}" econf ${myconf}
84 -}
85 -
86 -multilib_src_compile() {
87 - emake
88 -
89 - if use unicode; then
90 - pushd "${BUILD_DIR}"w >/dev/null
91 - emake -C lib
92 - popd >/dev/null
93 - fi
94 -}
95 -
96 -multilib_src_install() {
97 - emake install DESTDIR="${D}"
98 -
99 - if use unicode; then
100 - pushd "${BUILD_DIR}"w >/dev/null
101 - emake -C lib install DESTDIR="${D}"
102 - popd >/dev/null
103 -
104 - pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
105 - cp expat.pc expatw.pc
106 - sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
107 - popd >/dev/null
108 - fi
109 -}
110 -
111 -multilib_src_install_all() {
112 - einstalldocs
113 -
114 - doman doc/xmlwf.1
115 -
116 - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder
117 - docinto html
118 - dodoc doc/*.{css,html}
119 -
120 - if use examples; then
121 - docinto examples
122 - dodoc examples/*.c
123 - docompress -x usr/share/doc/${PF}/examples
124 - fi
125 -
126 - find "${D}" -name '*.la' -type f -delete || die
127 -}
128
129 diff --git a/dev-libs/expat/expat-2.4.5.ebuild b/dev-libs/expat/expat-2.4.5.ebuild
130 deleted file mode 100644
131 index 15afc9578393..000000000000
132 --- a/dev-libs/expat/expat-2.4.5.ebuild
133 +++ /dev/null
134 @@ -1,94 +0,0 @@
135 -# Copyright 1999-2022 Gentoo Authors
136 -# Distributed under the terms of the GNU General Public License v2
137 -
138 -EAPI=7
139 -AUTOTOOLS_AUTO_DEPEND=no
140 -AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing
141 -inherit autotools multilib-minimal
142 -
143 -DESCRIPTION="Stream-oriented XML parser library"
144 -HOMEPAGE="https://libexpat.github.io/"
145 -SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
146 -
147 -LICENSE="MIT"
148 -SLOT="0"
149 -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"
150 -IUSE="examples static-libs unicode"
151 -BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
152 -
153 -DOCS=( README.md )
154 -
155 -src_prepare() {
156 - default
157 -
158 - # fix interpreter to be a recent/good shell
159 - sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
160 - if use unicode; then
161 - cp -R "${S}" "${S}"w || die
162 - pushd "${S}"w >/dev/null
163 - find -name Makefile.am \
164 - -exec sed \
165 - -e 's,libexpat\.la,libexpatw.la,' \
166 - -e 's,libexpat_la,libexpatw_la,' \
167 - -i {} + || die
168 - eautoreconf
169 - popd >/dev/null
170 - fi
171 -}
172 -
173 -multilib_src_configure() {
174 - local myconf="$(use_enable static-libs static) --without-docbook"
175 -
176 - mkdir -p "${BUILD_DIR}"w || die
177 -
178 - if use unicode; then
179 - pushd "${BUILD_DIR}"w >/dev/null
180 - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
181 - popd >/dev/null
182 - fi
183 -
184 - ECONF_SOURCE="${S}" econf ${myconf}
185 -}
186 -
187 -multilib_src_compile() {
188 - emake
189 -
190 - if use unicode; then
191 - pushd "${BUILD_DIR}"w >/dev/null
192 - emake -C lib
193 - popd >/dev/null
194 - fi
195 -}
196 -
197 -multilib_src_install() {
198 - emake install DESTDIR="${D}"
199 -
200 - if use unicode; then
201 - pushd "${BUILD_DIR}"w >/dev/null
202 - emake -C lib install DESTDIR="${D}"
203 - popd >/dev/null
204 -
205 - pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
206 - cp expat.pc expatw.pc
207 - sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
208 - popd >/dev/null
209 - fi
210 -}
211 -
212 -multilib_src_install_all() {
213 - einstalldocs
214 -
215 - doman doc/xmlwf.1
216 -
217 - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder
218 - docinto html
219 - dodoc doc/*.{css,html}
220 -
221 - if use examples; then
222 - docinto examples
223 - dodoc examples/*.c
224 - docompress -x usr/share/doc/${PF}/examples
225 - fi
226 -
227 - find "${D}" -name '*.la' -type f -delete || die
228 -}