Skip to content

Commit 6ccbcfa

Browse files
mirabilosmirabilos
committed
update from MirBSD CVS
1 parent dcbe815 commit 6ccbcfa

File tree

6 files changed

+40
-25
lines changed

6 files changed

+40
-25
lines changed

‎.updchk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ for df in "${asso_y[@]}"; do
7373
continue ;;
7474
(mksh/hex*src/bin/mksh/check.t*)
7575
continue ;;
76+
(mksh/sysadmin/gencert.sh*1.135)
77+
continue ;;
7678
(mksh/@(sysadmin/@(mvndebri.sh|vcs2deb)|teckids/mk/common|website.shar)*)
7779
continue ;;
7880
(mksh/uhr-preR41contrib/hosted/tg/uhr1.5*)

‎mksh/debian-dev/mkdebidx.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/mksh
2-
rcsid='$MirOS: contrib/hosted/tg/deb/mkdebidx.sh,v 1.77 2019/05/18 18:39:07 tg Exp $'
2+
rcsid='$MirOS: contrib/hosted/tg/deb/mkdebidx.sh,v 1.81 2021/02/13 08:31:03 tg Exp $'
33
#-
44
# Copyright © 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
5-
# 2016, 2017, 2019
5+
# 2016, 2017, 2019, 2021
66
# mirabilos <[email protected]>
77
#
88
# Provided that these terms and disclaimer and all copyright notices
@@ -21,6 +21,7 @@ rcsid='$MirOS: contrib/hosted/tg/deb/mkdebidx.sh,v 1.77 2019/05/18 18:39:07 tg E
2121
# of said person's immediate fault when using the work as intended.
2222

2323
unset normarchs repo_keyid gpg_remote gpg_bin repo_origin repo_label repo_title
24+
unset hide_components
2425
unset -f repo_intro repo_description
2526
me=$(dirname "$0"); [[ -s $me/mkdebidx.inc ]] && . "$me/mkdebidx.inc"
2627
unset me
@@ -60,7 +61,7 @@ typeset -f repo_description >/dev/null || function repo_description {
6061
}
6162
set -A dpkgarchs -- alpha amd64 arm arm64 armel armhf hppa hurd-i386 i386 \
6263
ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc \
63-
powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32
64+
powerpcspe ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32
6465
[[ -n "${normarchs[*]}" ]] || set -A normarchs -- "${dpkgarchs[@]}"
6566

6667
set +U
@@ -145,6 +146,7 @@ IFS=$' \t\n'; set +o noglob
145146

146147
suites=:
147148
for suite in "$@"; do
149+
[[ -d dists/$suite || $suite = - ]] || die "suite $suite not found"
148150
suites=:dists/$suite$suites
149151
done
150152

@@ -418,6 +420,10 @@ for suite in dists/*; do
418420
print -u2 "W: Invalid dist name '$distname'"
419421
continue
420422
fi
423+
if [[ " $hide_components " = *" $distname "* ]]; then
424+
print -u2 "I: Not indexing dist $suitename/$distname"
425+
continue
426+
fi
421427

422428
gzip -dc $dist/source/Sources.gz |&
423429
pn=; pv=; pd=; pp=; Lf=

‎mksh/roff2htm

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
roff2htm_rcsid='$MirOS: src/scripts/roff2htm,v 1.101 2020/05/03 18:46:23 tg Exp $'
1+
roff2htm_rcsid='$MirOS: src/scripts/roff2htm,v 1.103 2021/01/23 20:24:35 tg Exp $'
22
# $ekkoBSD: catman2html.sh,v 1.2 2004/03/07 03:02:53 stephen Exp $
33
#-
44
# Copyright (c) 2004, 2005, 2006, 2007, 2011, 2012, 2014, 2015,
5-
# 2016, 2017, 2018, 2020
5+
# 2016, 2017, 2018, 2020, 2021
66
# mirabilos <[email protected]>
77
# Original version for ekkoBSD by:
88
# Copyright (c) 2004
@@ -92,13 +92,16 @@ s/\([0-9A-z][-.,0-9A-z:]*\)-\n\( *\)\([0-9A-z][-.,0-9A-z:]*([1-9][A-z]*)\)\([^
9292
-e 's#</\([biG]\)>\([- -*./:;?@^_~]*\)<\1>#\2#g' \
9393
-e 's#\([- 0-9A-z]\)\([$/_-]*\)\(<[biG]>\)#\1\3\2#g' \
9494
-e 's#\(</[biG]>\)\([$/_-]*\)\([- 0-9A-z]\)#\2\1\3#g' \
95-
-e 's#\(</[biG]>\))\([- ,.0-9A-z]\)#)\1\2#g' \
9695
\
97-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(\(3p\))#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
98-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(\([1-9]\)\(/[/0-9A-Za-z]*\)*)#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
99-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(\([PSU][MS][DM]\))#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
100-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(\(PAPERS\))#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
101-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(GNU)#<a href="'$roff2htm_rel'manINFO/\1.html">&</a>#g' \
96+
-e 's#(\(3p\)#(<|\1|>#g' \
97+
-e 's#(\([1-9]\)#(<|\1|>#g' \
98+
-e 's#(\([PSUG][MSN][DMU]\)#(<|\1|>#g' \
99+
-e 's#(\(PAPERS\)#(<|\1|>#g' \
100+
-e 's#\(|>\)\(</[biG]>\))\([- ,.0-9A-z]\)#\1)\2\3#g' \
101+
\
102+
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(<|\([^|]*\)|>)#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
103+
-e 's#\("\.\./man\)GNU\(/[^"]*\.htm\)"#\1INFO\2l"#g' \
104+
-e 's#<|\([^|]*\)|>#\1#g' \
102105
-e 's#)\(</[biG]>\)\([- 0-9A-z]\)#\1)\2#g' \
103106
\
104107
-e 's/�/\&#38;/g' \
@@ -142,13 +145,16 @@ s/\([0-9A-z][-.,0-9A-z:]*\)-\n\( *\)\([0-9A-z][-.,0-9A-z:]*([1-9][A-z]*)\)\([^
142145
-e 's#</\([biG]\)>\([- -*./:;?@^_~]*\)<\1>#\2#g' \
143146
-e 's#\([- 0-9A-z]\)\([$/_-]*\)\(<[biG]>\)#\1\3\2#g' \
144147
-e 's#\(</[biG]>\)\([$/_-]*\)\([- 0-9A-z]\)#\2\1\3#g' \
145-
-e 's#\(</[biG]>\))\([- ,.0-9A-z]\)#)\1\2#g' \
146148
\
147-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(\(3p\))#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
148-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(\([1-9]\)\(/[/0-9A-Za-z]*\)*)#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
149-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(\([PSU][MS][DM]\))#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
150-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(\(PAPERS\))#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
151-
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(GNU)#<a href="'$roff2htm_rel'manINFO/\1.html">&</a>#g' \
149+
-e 's#(\(3p\)#(<|\1|>#g' \
150+
-e 's#(\([1-9]\)#(<|\1|>#g' \
151+
-e 's#(\([PSUG][MSN][DMU]\)#(<|\1|>#g' \
152+
-e 's#(\(PAPERS\)#(<|\1|>#g' \
153+
-e 's#\(|>\)\(</[biG]>\))\([- ,.0-9A-z]\)#\1)\2\3#g' \
154+
\
155+
-e '/^ /s#\([0-9A-z][-.,0-9A-z:]*\)(<|\([^|]*\)|>)#<a href="'$roff2htm_rel'man\2/\1.htm">&</a>#g' \
156+
-e 's#\("\.\./man\)GNU\(/[^"]*\.htm\)"#\1INFO\2l"#g' \
157+
-e 's#<|\([^|]*\)|>#\1#g' \
152158
-e 's#)\(</[biG]>\)\([- 0-9A-z]\)#\1)\2#g' \
153159
\
154160
-e 's/�/\&#38;/g' \
@@ -284,7 +290,7 @@ function output_footer {
284290
href="'$roff2htm_rel'man7/BSD-Licence.htm">copyrighted</a> by their
285291
respective writers; their sources are available at the project’s <a
286292
href="http://cvs.mirbsd.de/">CVSweb</a>, AnonCVS and other mirrors. The rest
287-
is Copyright © 2002–2020 <a href="http://www.mirbsd.org/">MirBSD</a>.</p>
293+
is Copyright © 2002–2021 <a href="http://www.mirbsd.org/">MirBSD</a>.</p>
288294
<p class="footer3">This manual page’s HTML representation is supposed to be <a
289295
href="http://validator.w3.org/check/referer">valid XHTML/1.1</a>; if not,
290296
please send a bug report — diffs preferred.</p>

‎posix/cleanenv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# $MirOS: src/scripts/cleanenv,v 1.5 2014/09/28 19:49:56 tg Exp $
2+
# $MirOS: src/scripts/cleanenv,v 1.6 2021/02/07 02:07:58 tg Exp $
33

44
p=/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin
55

@@ -13,7 +13,7 @@ fi
1313
if test x"$a1" = x"-"; then
1414
shift
1515
exec /usr/bin/env -i \
16-
PATH=$p HOME=/ \
16+
PATH=$p HOME=/ LC_ALL=C.UTF-8 \
1717
"$@"
1818
fi
1919

‎posix/cleanenv.1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.ds p. /bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin
2-
.Dd October 3, 2014
2+
.Dd February 7, 2021
33
.Dt CLEANENV 1
44
.Os
55
.Sh NAME
@@ -28,7 +28,8 @@ were passed.
2828
With
2929
.Fl
3030
set, it cleans even more, i.e. anonymises: only
31-
.Ev HOME Ns = Ns Pa /
31+
.Ev HOME Ns = Ns Pa / ,
32+
.Ev LC_ALL Ns = Ns Ic C.UTF-8
3233
and
3334
.Ev PATH Ns = Ns Pa \*(p.
3435
are set then, whereas normal operation keeps the user's

‎posix/pbuilder-hooks/D10wtfrepo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# $MirOS: contrib/hosted/tg/deb/hookdir/D10wtfrepo,v 1.8 2019/11/23 21:38:01 tg Exp $
2+
# $MirOS: contrib/hosted/tg/deb/hookdir/D10wtfrepo,v 1.9 2021/02/13 23:21:21 tg Exp $
33
#-
44
# Not complicated enough for copyright.
55

@@ -9,9 +9,9 @@ LC_ALL=C; export LC_ALL
99
d=${DIST%/*}
1010
d=${d%-backports*}
1111
case $d in
12-
(sarge|etch|lenny|squeeze|wheezy|jessie|stretch|buster|sid)
12+
(sarge|etch|lenny|squeeze|wheezy|jessie|stretch|buster|bullseye|sid)
1313
;;
14-
(bullseye)
14+
(bookworm)
1515
d=sid
1616
;;
1717
(*)

0 commit comments

Comments
 (0)