Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
Date: Mon, 30 Mar 2020 08:35:34
Message-Id: 1585557323.592e938b9fc207bb0e4cc44a9ef4e1c451dc316d.monsieurp@gentoo
1 commit: 592e938b9fc207bb0e4cc44a9ef4e1c451dc316d
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 30 08:34:54 2020 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 30 08:35:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592e938b
7
8 app-misc/screen: remove vulnerable versions.
9
10 Bug: https://bugs.gentoo.org/708460
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 app-misc/screen/Manifest | 3 -
15 app-misc/screen/screen-4.6.1.ebuild | 161 ---------------------------------
16 app-misc/screen/screen-4.6.2-r1.ebuild | 160 --------------------------------
17 app-misc/screen/screen-4.7.0.ebuild | 160 --------------------------------
18 4 files changed, 484 deletions(-)
19
20 diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
21 index 0d1264dcf42..f27c8479163 100644
22 --- a/app-misc/screen/Manifest
23 +++ b/app-misc/screen/Manifest
24 @@ -1,4 +1 @@
25 -DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
26 -DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
27 -DIST screen-4.7.0.tar.gz 854192 BLAKE2B f22ee3f3ad7591ee2641ba9667b131298f3cb9b7712b0f0db28516c60d0a0768893eda2f4ce35d9c641871247a638a03c2550328f1af1f85ab5ce8ffa9b77d54 SHA512 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
28 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
29
30 diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
31 deleted file mode 100644
32 index 00e1892a798..00000000000
33 --- a/app-misc/screen/screen-4.6.1.ebuild
34 +++ /dev/null
35 @@ -1,161 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -SCM=""
42 -[[ "${PV}" = 9999 ]] && SCM="git-r3"
43 -inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
44 -unset SCM
45 -
46 -DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
47 -HOMEPAGE="https://www.gnu.org/software/screen/"
48 -
49 -if [[ "${PV}" != 9999 ]] ; then
50 - SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
51 - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
52 -else
53 - EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
54 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
55 - S="${WORKDIR}"/${P}/src
56 -fi
57 -
58 -LICENSE="GPL-2"
59 -SLOT="0"
60 -IUSE="debug nethack pam selinux multiuser"
61 -
62 -CDEPEND="
63 - >=sys-libs/ncurses-5.2:0=
64 - pam? ( sys-libs/pam )"
65 -RDEPEND="${CDEPEND}
66 - selinux? ( sec-policy/selinux-screen )"
67 -DEPEND="${CDEPEND}
68 - sys-apps/texinfo"
69 -
70 -PATCHES=(
71 - # Don't use utempter even if it is found on the system.
72 - "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
73 -)
74 -
75 -pkg_setup() {
76 - # Make sure utmp group exists, as it's used later on.
77 - enewgroup utmp 406
78 -}
79 -
80 -src_prepare() {
81 - default
82 -
83 - # sched.h is a system header and causes problems with some C libraries
84 - mv sched.h _sched.h || die
85 - sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
86 -
87 - # Fix manpage.
88 - sed -i \
89 - -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
90 - -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
91 - -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
92 - -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
93 - -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
94 - doc/screen.1 \
95 - || die
96 -
97 - if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
98 - sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
99 - fi
100 -
101 - # disable musl dummy headers for utmp[x]
102 - use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
103 -
104 - # reconfigure
105 - eautoreconf
106 -}
107 -
108 -src_configure() {
109 - append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
110 -
111 - if [[ ${CHOST} == *-solaris* ]] ; then
112 - # enable msg_header by upping the feature standard compatible
113 - # with c99 mode
114 - append-cppflags -D_XOPEN_SOURCE=600
115 - fi
116 -
117 - use nethack || append-cppflags "-DNONETHACK"
118 - use debug && append-cppflags "-DDEBUG"
119 -
120 - econf \
121 - --with-socket-dir="${EPREFIX}/tmp/screen" \
122 - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
123 - --with-pty-mode=0620 \
124 - --with-pty-group=5 \
125 - --enable-rxvt_osc \
126 - --enable-telnet \
127 - --enable-colors256 \
128 - $(use_enable pam)
129 -}
130 -
131 -src_compile() {
132 - LC_ALL=POSIX emake comm.h term.h
133 - emake osdef.h
134 -
135 - emake -C doc screen.info
136 - default
137 -}
138 -
139 -src_install() {
140 - local DOCS=(
141 - README ChangeLog INSTALL TODO NEWS* patchlevel.h
142 - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
143 - )
144 -
145 - default
146 -
147 - local tmpfiles_perms tmpfiles_group
148 -
149 - if use multiuser || use prefix
150 - then
151 - fperms 4755 /usr/bin/screen-${PV}
152 - tmpfiles_perms="0755"
153 - tmpfiles_group="root"
154 - else
155 - fowners root:utmp /usr/bin/screen-${PV}
156 - fperms 2755 /usr/bin/screen-${PV}
157 - tmpfiles_perms="0775"
158 - tmpfiles_group="utmp"
159 - fi
160 -
161 - dodir /etc/tmpfiles.d
162 - echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
163 - > "${ED}"/etc/tmpfiles.d/screen.conf
164 -
165 - insinto /usr/share/screen
166 - doins terminfo/{screencap,screeninfo.src}
167 -
168 - insinto /etc
169 - doins "${FILESDIR}"/screenrc
170 -
171 - pamd_mimic_system screen auth
172 -}
173 -
174 -pkg_postinst() {
175 - if [[ -z ${REPLACING_VERSIONS} ]]
176 - then
177 - elog "Some dangerous key bindings have been removed or changed to more safe values."
178 - elog "We enable some xterm hacks in our default screenrc, which might break some"
179 - elog "applications. Please check /etc/screenrc for information on these changes."
180 - fi
181 -
182 - # Add /tmp/screen in case it doesn't exist yet. This should solve
183 - # problems like bug #508634 where tmpfiles.d isn't in effect.
184 - local rundir="${EROOT%/}/tmp/screen"
185 - if [[ ! -d ${rundir} ]] ; then
186 - if use multiuser || use prefix ; then
187 - tmpfiles_group="root"
188 - else
189 - tmpfiles_group="utmp"
190 - fi
191 - mkdir -m 0775 "${rundir}"
192 - chgrp ${tmpfiles_group} "${rundir}"
193 - fi
194 -
195 - ewarn "This revision changes the screen socket location to ${rundir}"
196 -}
197
198 diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild
199 deleted file mode 100644
200 index 78ad3a3ee13..00000000000
201 --- a/app-misc/screen/screen-4.6.2-r1.ebuild
202 +++ /dev/null
203 @@ -1,160 +0,0 @@
204 -# Copyright 1999-2020 Gentoo Authors
205 -# Distributed under the terms of the GNU General Public License v2
206 -
207 -EAPI=6
208 -
209 -inherit autotools eutils flag-o-matic pam tmpfiles toolchain-funcs user
210 -
211 -DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
212 -HOMEPAGE="https://www.gnu.org/software/screen/"
213 -
214 -if [[ "${PV}" != 9999 ]] ; then
215 - SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
216 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
217 -else
218 - inherit git-r3
219 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
220 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
221 - S="${WORKDIR}"/${P}/src
222 -fi
223 -
224 -LICENSE="GPL-2"
225 -SLOT="0"
226 -IUSE="debug nethack pam selinux multiuser"
227 -
228 -CDEPEND="
229 - >=sys-libs/ncurses-5.2:0=
230 - pam? ( sys-libs/pam )"
231 -RDEPEND="${CDEPEND}
232 - selinux? ( sec-policy/selinux-screen )"
233 -DEPEND="${CDEPEND}
234 - sys-apps/texinfo"
235 -
236 -PATCHES=(
237 - # Don't use utempter even if it is found on the system.
238 - "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
239 - "${FILESDIR}"/${P}-utmp-exit.patch
240 -)
241 -
242 -pkg_setup() {
243 - # Make sure utmp group exists, as it's used later on.
244 - enewgroup utmp 406
245 -}
246 -
247 -src_prepare() {
248 - default
249 -
250 - # sched.h is a system header and causes problems with some C libraries
251 - mv sched.h _sched.h || die
252 - sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
253 -
254 - # Fix manpage.
255 - sed -i \
256 - -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
257 - -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
258 - -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
259 - -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
260 - -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
261 - doc/screen.1 \
262 - || die
263 -
264 - if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
265 - sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
266 - fi
267 -
268 - # disable musl dummy headers for utmp[x]
269 - use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
270 -
271 - # reconfigure
272 - eautoreconf
273 -}
274 -
275 -src_configure() {
276 - append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
277 -
278 - if [[ ${CHOST} == *-solaris* ]] ; then
279 - # enable msg_header by upping the feature standard compatible
280 - # with c99 mode
281 - append-cppflags -D_XOPEN_SOURCE=600
282 - fi
283 -
284 - use nethack || append-cppflags "-DNONETHACK"
285 - use debug && append-cppflags "-DDEBUG"
286 -
287 - econf \
288 - --with-socket-dir="${EPREFIX}/tmp/screen" \
289 - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
290 - --with-pty-mode=0620 \
291 - --with-pty-group=5 \
292 - --enable-rxvt_osc \
293 - --enable-telnet \
294 - --enable-colors256 \
295 - $(use_enable pam)
296 -}
297 -
298 -src_compile() {
299 - LC_ALL=POSIX emake comm.h term.h
300 - emake osdef.h
301 -
302 - emake -C doc screen.info
303 - default
304 -}
305 -
306 -src_install() {
307 - local DOCS=(
308 - README ChangeLog INSTALL TODO NEWS* patchlevel.h
309 - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
310 - )
311 -
312 - emake DESTDIR="${D}" SCREEN=screen-${PV} install
313 -
314 - local tmpfiles_perms tmpfiles_group
315 -
316 - if use multiuser || use prefix
317 - then
318 - fperms 4755 /usr/bin/screen-${PV}
319 - tmpfiles_perms="0755"
320 - tmpfiles_group="root"
321 - else
322 - fowners root:utmp /usr/bin/screen-${PV}
323 - fperms 2755 /usr/bin/screen-${PV}
324 - tmpfiles_perms="0775"
325 - tmpfiles_group="utmp"
326 - fi
327 -
328 - newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
329 -
330 - insinto /usr/share/screen
331 - doins terminfo/{screencap,screeninfo.src}
332 -
333 - insinto /etc
334 - doins "${FILESDIR}"/screenrc
335 -
336 - pamd_mimic_system screen auth
337 -
338 - dodoc "${DOCS[@]}"
339 -}
340 -
341 -pkg_postinst() {
342 - if [[ -z ${REPLACING_VERSIONS} ]]
343 - then
344 - elog "Some dangerous key bindings have been removed or changed to more safe values."
345 - elog "We enable some xterm hacks in our default screenrc, which might break some"
346 - elog "applications. Please check /etc/screenrc for information on these changes."
347 - fi
348 -
349 - # Add /tmp/screen in case it doesn't exist yet. This should solve
350 - # problems like bug #508634 where tmpfiles.d isn't in effect.
351 - local rundir="${EROOT%/}/tmp/screen"
352 - if [[ ! -d ${rundir} ]] ; then
353 - if use multiuser || use prefix ; then
354 - tmpfiles_group="root"
355 - else
356 - tmpfiles_group="utmp"
357 - fi
358 - mkdir -m 0775 "${rundir}"
359 - chgrp ${tmpfiles_group} "${rundir}"
360 - fi
361 -
362 - ewarn "This revision changes the screen socket location to ${rundir}"
363 -}
364
365 diff --git a/app-misc/screen/screen-4.7.0.ebuild b/app-misc/screen/screen-4.7.0.ebuild
366 deleted file mode 100644
367 index 1733c678f32..00000000000
368 --- a/app-misc/screen/screen-4.7.0.ebuild
369 +++ /dev/null
370 @@ -1,160 +0,0 @@
371 -# Copyright 1999-2020 Gentoo Authors
372 -# Distributed under the terms of the GNU General Public License v2
373 -
374 -EAPI=7
375 -
376 -inherit autotools flag-o-matic pam tmpfiles toolchain-funcs user
377 -
378 -DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
379 -HOMEPAGE="https://www.gnu.org/software/screen/"
380 -
381 -if [[ "${PV}" != 9999 ]] ; then
382 - SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
383 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
384 -else
385 - inherit git-r3
386 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
387 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
388 - S="${WORKDIR}"/${P}/src
389 -fi
390 -
391 -LICENSE="GPL-2"
392 -SLOT="0"
393 -IUSE="debug nethack pam selinux multiuser"
394 -
395 -CDEPEND="
396 - >=sys-libs/ncurses-5.2:0=
397 - pam? ( sys-libs/pam )"
398 -RDEPEND="${CDEPEND}
399 - selinux? ( sec-policy/selinux-screen )"
400 -DEPEND="${CDEPEND}
401 - sys-apps/texinfo"
402 -
403 -PATCHES=(
404 - # Don't use utempter even if it is found on the system.
405 - "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
406 - "${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
407 -)
408 -
409 -pkg_setup() {
410 - # Make sure utmp group exists, as it's used later on.
411 - enewgroup utmp 406
412 -}
413 -
414 -src_prepare() {
415 - default
416 -
417 - # sched.h is a system header and causes problems with some C libraries
418 - mv sched.h _sched.h || die
419 - sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
420 -
421 - # Fix manpage.
422 - sed -i \
423 - -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
424 - -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
425 - -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
426 - -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
427 - -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
428 - doc/screen.1 \
429 - || die
430 -
431 - if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
432 - sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
433 - fi
434 -
435 - # disable musl dummy headers for utmp[x]
436 - use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
437 -
438 - # reconfigure
439 - eautoreconf
440 -}
441 -
442 -src_configure() {
443 - append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
444 -
445 - if [[ ${CHOST} == *-solaris* ]] ; then
446 - # enable msg_header by upping the feature standard compatible
447 - # with c99 mode
448 - append-cppflags -D_XOPEN_SOURCE=600
449 - fi
450 -
451 - use nethack || append-cppflags "-DNONETHACK"
452 - use debug && append-cppflags "-DDEBUG"
453 -
454 - econf \
455 - --with-socket-dir="${EPREFIX}/tmp/screen" \
456 - --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
457 - --with-pty-mode=0620 \
458 - --with-pty-group=5 \
459 - --enable-rxvt_osc \
460 - --enable-telnet \
461 - --enable-colors256 \
462 - $(use_enable pam)
463 -}
464 -
465 -src_compile() {
466 - LC_ALL=POSIX emake comm.h term.h
467 - emake osdef.h
468 -
469 - emake -C doc screen.info
470 - default
471 -}
472 -
473 -src_install() {
474 - local DOCS=(
475 - README ChangeLog INSTALL TODO NEWS* patchlevel.h
476 - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
477 - )
478 -
479 - emake DESTDIR="${D}" SCREEN=screen-${PV} install
480 -
481 - local tmpfiles_perms tmpfiles_group
482 -
483 - if use multiuser || use prefix
484 - then
485 - fperms 4755 /usr/bin/screen-${PV}
486 - tmpfiles_perms="0755"
487 - tmpfiles_group="root"
488 - else
489 - fowners root:utmp /usr/bin/screen-${PV}
490 - fperms 2755 /usr/bin/screen-${PV}
491 - tmpfiles_perms="0775"
492 - tmpfiles_group="utmp"
493 - fi
494 -
495 - newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
496 -
497 - insinto /usr/share/screen
498 - doins terminfo/{screencap,screeninfo.src}
499 -
500 - insinto /etc
501 - doins "${FILESDIR}"/screenrc
502 -
503 - pamd_mimic_system screen auth
504 -
505 - dodoc "${DOCS[@]}"
506 -}
507 -
508 -pkg_postinst() {
509 - if [[ -z ${REPLACING_VERSIONS} ]]
510 - then
511 - elog "Some dangerous key bindings have been removed or changed to more safe values."
512 - elog "We enable some xterm hacks in our default screenrc, which might break some"
513 - elog "applications. Please check /etc/screenrc for information on these changes."
514 - fi
515 -
516 - # Add /tmp/screen in case it doesn't exist yet. This should solve
517 - # problems like bug #508634 where tmpfiles.d isn't in effect.
518 - local rundir="${EROOT}/tmp/screen"
519 - if [[ ! -d ${rundir} ]] ; then
520 - if use multiuser || use prefix ; then
521 - tmpfiles_group="root"
522 - else
523 - tmpfiles_group="utmp"
524 - fi
525 - mkdir -m 0775 "${rundir}"
526 - chgrp ${tmpfiles_group} "${rundir}"
527 - fi
528 -
529 - ewarn "This revision changes the screen socket location to ${rundir}"
530 -}