Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/xterm/
Date: Sun, 25 Apr 2021 20:07:58
Message-Id: 1619381257.26c410b52baebe770ba3074977ffa01b4047a319.sam@gentoo
1 commit: 26c410b52baebe770ba3074977ffa01b4047a319
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 25 19:49:06 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 25 20:07:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c410b5
7
8 x11-terms/xterm: drop 351, 363, 365 (security cleanup)
9
10 Bug: https://bugs.gentoo.org/769839
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 x11-terms/xterm/Manifest | 3 --
14 x11-terms/xterm/xterm-351.ebuild | 99 ----------------------------------------
15 x11-terms/xterm/xterm-363.ebuild | 99 ----------------------------------------
16 x11-terms/xterm/xterm-365.ebuild | 99 ----------------------------------------
17 4 files changed, 300 deletions(-)
18
19 diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
20 index 164eb585017..990bc717790 100644
21 --- a/x11-terms/xterm/Manifest
22 +++ b/x11-terms/xterm/Manifest
23 @@ -1,5 +1,2 @@
24 -DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf92ff1ad5e976ac18f280cf7d72362d82c0ff9f9530d8da3ba133e345ff9de7f0ac0a2134200c9cc87e6 SHA512 941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00
25 -DIST xterm-363.tgz 1442520 BLAKE2B f63efde533f9d495c3d6b744544e592608d2731f04af58a9d799f8ca7d705c81c507d9012fc4a1bd04b3e4c0a76fc00557d1a61cd9954f5fb2bf7b5ec624764f SHA512 e9148f144e5e38597c84ccd82033f4fb83a9dd222c4cecf7498e31065e7d0148c89631290e5f804fcd9d2d55f59f4fd271aaf220eb636fbe38ae245ea6537871
26 -DIST xterm-365.tgz 1444367 BLAKE2B efb4ce024b7a196955c160e10aadc54d97da1df6e53b9ca79184382a1db939583e52f66ed4df1f586a33b9febda6ac51dc66a9f2cd69bb04296c934aae7e7571 SHA512 3f6571d09cd3fa94e9133494a2893e804ea0f0c76289d4a7e46e3ea267278042f0e78231ff4b06ee6d7ba5936dc3e2e6c81a8f52c36d79a8ddf3cfaa59376970
27 DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a5b1c76e740666e14436a0095d8a1be4f6ad54eb1e5d841ef766b0bf4d840ebddcaea0889285f1377900 SHA512 ffab7e0970b92a25488bd57da2dfe2856279208c489a632e0e92788deec2a4f99510f76e1c88e55f389dfe984c323add0fab31b04d2a1d774ce6d3b2c9c642ef
28 DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4
29
30 diff --git a/x11-terms/xterm/xterm-351.ebuild b/x11-terms/xterm/xterm-351.ebuild
31 deleted file mode 100644
32 index f20d7b47463..00000000000
33 --- a/x11-terms/xterm/xterm-351.ebuild
34 +++ /dev/null
35 @@ -1,99 +0,0 @@
36 -# Copyright 1999-2021 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -inherit desktop flag-o-matic multilib toolchain-funcs
42 -
43 -DESCRIPTION="Terminal Emulator for X Windows"
44 -HOMEPAGE="https://invisible-island.net/xterm/"
45 -SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
46 -
47 -LICENSE="MIT"
48 -SLOT="0"
49 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
50 -IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
51 -
52 -BDEPEND="virtual/pkgconfig
53 - x11-base/xorg-proto"
54 -DEPEND="kernel_linux? ( sys-libs/libutempter )
55 - kernel_FreeBSD? ( sys-libs/libutempter )
56 - media-libs/fontconfig:1.0
57 - >=sys-libs/ncurses-5.7-r7:0=
58 - x11-apps/xmessage
59 - x11-libs/libICE
60 - x11-libs/libX11
61 - x11-libs/libXaw
62 - x11-libs/libXft
63 - x11-libs/libxkbfile
64 - x11-libs/libXmu
65 - x11-libs/libXrender
66 - x11-libs/libXt
67 - unicode? ( x11-apps/luit )
68 - Xaw3d? ( x11-libs/libXaw3d )
69 - xinerama? ( x11-libs/libXinerama )"
70 -RDEPEND="${DEPEND}
71 - media-fonts/font-misc-misc
72 - x11-apps/rgb"
73 -
74 -DOCS=( README{,.i18n} ctlseqs.txt )
75 -
76 -pkg_setup() {
77 - DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
78 -}
79 -
80 -src_configure() {
81 - # 454736
82 - # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
83 - # something sane like pkg-config or ncurses5-config and stops guessing libs
84 - # Everything gets linked against ncurses anyways, so don't shout
85 - append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
86 -
87 - local myeconfargs=(
88 - --disable-full-tgetent
89 - --disable-imake
90 - --disable-setgid
91 - --disable-setuid
92 - --enable-256-color
93 - --enable-broken-osc
94 - --enable-broken-st
95 - --enable-dabbrev
96 - --enable-exec-xterm
97 - --enable-i18n
98 - --enable-load-vt-fonts
99 - --enable-logging
100 - --enable-screen-dumps
101 - --enable-warnings
102 - --enable-wide-chars
103 - --libdir="${EPREFIX}"/etc
104 - --with-app-defaults="${DEFAULTS_DIR}"
105 - --with-utempter
106 - --with-x
107 - $(use_enable openpty)
108 - $(use_enable sixel sixel-graphics)
109 - $(use_enable toolbar)
110 - $(use_enable truetype freetype)
111 - $(use_enable unicode luit)
112 - $(use_enable unicode mini-luit)
113 - $(use_with Xaw3d)
114 - $(use_with xinerama)
115 - )
116 - econf "${myeconfargs[@]}"
117 -}
118 -
119 -src_install() {
120 - default
121 -
122 - docinto html
123 - dodoc xterm.log.html
124 - domenu *.desktop
125 -
126 - # Fix permissions -- it grabs them from live system, and they can
127 - # be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
128 - # respectively (#69510).
129 - # (info from Thomas Dickey) - Donnie Berkholz <spyderous@g.o>
130 - fperms 0755 /usr/bin/xterm
131 -
132 - # restore the navy blue
133 - sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
134 -}
135
136 diff --git a/x11-terms/xterm/xterm-363.ebuild b/x11-terms/xterm/xterm-363.ebuild
137 deleted file mode 100644
138 index adcd2ef1972..00000000000
139 --- a/x11-terms/xterm/xterm-363.ebuild
140 +++ /dev/null
141 @@ -1,99 +0,0 @@
142 -# Copyright 1999-2021 Gentoo Authors
143 -# Distributed under the terms of the GNU General Public License v2
144 -
145 -EAPI=7
146 -
147 -inherit desktop flag-o-matic toolchain-funcs
148 -
149 -DESCRIPTION="Terminal Emulator for X Windows"
150 -HOMEPAGE="https://invisible-island.net/xterm/"
151 -SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
152 -
153 -LICENSE="MIT"
154 -SLOT="0"
155 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
156 -IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
157 -
158 -BDEPEND="virtual/pkgconfig
159 - x11-base/xorg-proto"
160 -DEPEND="kernel_linux? ( sys-libs/libutempter )
161 - kernel_FreeBSD? ( sys-libs/libutempter )
162 - media-libs/fontconfig:1.0
163 - >=sys-libs/ncurses-5.7-r7:0=
164 - x11-apps/xmessage
165 - x11-libs/libICE
166 - x11-libs/libX11
167 - x11-libs/libXaw
168 - x11-libs/libXft
169 - x11-libs/libxkbfile
170 - x11-libs/libXmu
171 - x11-libs/libXrender
172 - x11-libs/libXt
173 - unicode? ( x11-apps/luit )
174 - Xaw3d? ( x11-libs/libXaw3d )
175 - xinerama? ( x11-libs/libXinerama )"
176 -RDEPEND="${DEPEND}
177 - media-fonts/font-misc-misc
178 - x11-apps/rgb"
179 -
180 -DOCS=( README{,.i18n} ctlseqs.txt )
181 -
182 -pkg_setup() {
183 - DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
184 -}
185 -
186 -src_configure() {
187 - # 454736
188 - # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
189 - # something sane like pkg-config or ncurses5-config and stops guessing libs
190 - # Everything gets linked against ncurses anyways, so don't shout
191 - append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
192 -
193 - local myeconfargs=(
194 - --disable-full-tgetent
195 - --disable-imake
196 - --disable-setgid
197 - --disable-setuid
198 - --enable-256-color
199 - --enable-broken-osc
200 - --enable-broken-st
201 - --enable-dabbrev
202 - --enable-exec-xterm
203 - --enable-i18n
204 - --enable-load-vt-fonts
205 - --enable-logging
206 - --enable-screen-dumps
207 - --enable-warnings
208 - --enable-wide-chars
209 - --libdir="${EPREFIX}"/etc
210 - --with-app-defaults="${DEFAULTS_DIR}"
211 - --with-utempter
212 - --with-x
213 - $(use_enable openpty)
214 - $(use_enable sixel sixel-graphics)
215 - $(use_enable toolbar)
216 - $(use_enable truetype freetype)
217 - $(use_enable unicode luit)
218 - $(use_enable unicode mini-luit)
219 - $(use_with Xaw3d)
220 - $(use_with xinerama)
221 - )
222 - econf "${myeconfargs[@]}"
223 -}
224 -
225 -src_install() {
226 - default
227 -
228 - docinto html
229 - dodoc xterm.log.html
230 - domenu *.desktop
231 -
232 - # Fix permissions -- it grabs them from live system, and they can
233 - # be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
234 - # respectively (#69510).
235 - # (info from Thomas Dickey) - Donnie Berkholz <spyderous@g.o>
236 - fperms 0755 /usr/bin/xterm
237 -
238 - # restore the navy blue
239 - sed -i -e 's:blue2$:blue:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
240 -}
241
242 diff --git a/x11-terms/xterm/xterm-365.ebuild b/x11-terms/xterm/xterm-365.ebuild
243 deleted file mode 100644
244 index adcd2ef1972..00000000000
245 --- a/x11-terms/xterm/xterm-365.ebuild
246 +++ /dev/null
247 @@ -1,99 +0,0 @@
248 -# Copyright 1999-2021 Gentoo Authors
249 -# Distributed under the terms of the GNU General Public License v2
250 -
251 -EAPI=7
252 -
253 -inherit desktop flag-o-matic toolchain-funcs
254 -
255 -DESCRIPTION="Terminal Emulator for X Windows"
256 -HOMEPAGE="https://invisible-island.net/xterm/"
257 -SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
258 -
259 -LICENSE="MIT"
260 -SLOT="0"
261 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
262 -IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
263 -
264 -BDEPEND="virtual/pkgconfig
265 - x11-base/xorg-proto"
266 -DEPEND="kernel_linux? ( sys-libs/libutempter )
267 - kernel_FreeBSD? ( sys-libs/libutempter )
268 - media-libs/fontconfig:1.0
269 - >=sys-libs/ncurses-5.7-r7:0=
270 - x11-apps/xmessage
271 - x11-libs/libICE
272 - x11-libs/libX11
273 - x11-libs/libXaw
274 - x11-libs/libXft
275 - x11-libs/libxkbfile
276 - x11-libs/libXmu
277 - x11-libs/libXrender
278 - x11-libs/libXt
279 - unicode? ( x11-apps/luit )
280 - Xaw3d? ( x11-libs/libXaw3d )
281 - xinerama? ( x11-libs/libXinerama )"
282 -RDEPEND="${DEPEND}
283 - media-fonts/font-misc-misc
284 - x11-apps/rgb"
285 -
286 -DOCS=( README{,.i18n} ctlseqs.txt )
287 -
288 -pkg_setup() {
289 - DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
290 -}
291 -
292 -src_configure() {
293 - # 454736
294 - # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
295 - # something sane like pkg-config or ncurses5-config and stops guessing libs
296 - # Everything gets linked against ncurses anyways, so don't shout
297 - append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
298 -
299 - local myeconfargs=(
300 - --disable-full-tgetent
301 - --disable-imake
302 - --disable-setgid
303 - --disable-setuid
304 - --enable-256-color
305 - --enable-broken-osc
306 - --enable-broken-st
307 - --enable-dabbrev
308 - --enable-exec-xterm
309 - --enable-i18n
310 - --enable-load-vt-fonts
311 - --enable-logging
312 - --enable-screen-dumps
313 - --enable-warnings
314 - --enable-wide-chars
315 - --libdir="${EPREFIX}"/etc
316 - --with-app-defaults="${DEFAULTS_DIR}"
317 - --with-utempter
318 - --with-x
319 - $(use_enable openpty)
320 - $(use_enable sixel sixel-graphics)
321 - $(use_enable toolbar)
322 - $(use_enable truetype freetype)
323 - $(use_enable unicode luit)
324 - $(use_enable unicode mini-luit)
325 - $(use_with Xaw3d)
326 - $(use_with xinerama)
327 - )
328 - econf "${myeconfargs[@]}"
329 -}
330 -
331 -src_install() {
332 - default
333 -
334 - docinto html
335 - dodoc xterm.log.html
336 - domenu *.desktop
337 -
338 - # Fix permissions -- it grabs them from live system, and they can
339 - # be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
340 - # respectively (#69510).
341 - # (info from Thomas Dickey) - Donnie Berkholz <spyderous@g.o>
342 - fperms 0755 /usr/bin/xterm
343 -
344 - # restore the navy blue
345 - sed -i -e 's:blue2$:blue:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
346 -}