update from MirBSD CVS
authormirabilos <m@mirbsd.org>
Sat, 23 Nov 2019 23:11:25 +0000 (23:11 +0000)
committermirabilos <m@mirbsd.org>
Sat, 23 Nov 2019 23:11:25 +0000 (23:11 +0000)
mksh/bdfctool.1
mksh/bdfctool.sh
mksh/roff2htm
mksh/uri-grabber
mksh/wtf
posix/pbuilder-hooks/D10wtfrepo

index fdbac4d..37a16b2 100644 (file)
@@ -1,6 +1,6 @@
-.\" $MirOS: X11/extras/bdfctool/bdfctool.1,v 1.15 2018/12/25 19:38:05 tg Exp $
+.\" $MirOS: X11/extras/bdfctool/bdfctool.1,v 1.17 2019/06/09 23:19:58 tg Exp $
 .\"-
-.\" Copyright (c) 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2018
+.\" Copyright (c) 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2018, 2019
 .\"    mirabilos <m@mirbsd.org>
 .\"-
 .\" Try to make GNU groff and AT&T nroff more compatible
@@ -59,7 +59,7 @@
 .\" with -mandoc, it might implement .Mx itself, but we want to
 .\" use our own definition. And .Dd must come *first*, always.
 .\"
-.Dd $Mdocdate: December 25 2018 $
+.Dd $Mdocdate: June 9 2019 $
 .\"
 .\" Check which macro package we use, and do other -mdoc setup.
 .\"
@@ -380,6 +380,9 @@ error occurred, e.g. invalid input.
 An error in an external program, such as
 .Xr mktemp 1 ,
 occurred.
+.It Li 5
+The input lines are not comprised solely of printable
+.Tn ASCII .
 .El
 .Sh EXAMPLES
 The following example should be a minimal valid font demonstrating
@@ -430,6 +433,7 @@ has its own ideas of how a
 font file should look like, and if you deviate from that,
 you might get an error; although, support for more features
 can surely be added.
+More input validation would be nice.
 .Pp
 .Dq Li ENCODING \-1
 support is missing.
index e66be7d..3dbe9c5 100644 (file)
@@ -1,8 +1,8 @@
 #!/bin/mksh
-# $MirOS: X11/extras/bdfctool/bdfctool.sh,v 1.17 2015/02/26 03:05:33 tg Exp $
+# $MirOS: X11/extras/bdfctool/bdfctool.sh,v 1.21 2019/06/10 00:44:25 tg Exp $
 #-
-# Copyright © 2007, 2008, 2009, 2010, 2012, 2013, 2015
-#      Thorsten “mirabilos” Glaser <tg@mirbsd.org>
+# Copyright © 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2019
+#      mirabilos <m@mirbsd.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
 # are retained or reproduced in an accompanying document, permission
@@ -51,6 +51,53 @@ fi
 # disable -F if -g
 (( ufast = (oform == 3 || oform == 4) ? 0 : ufast ))
 
+rln=0
+function rdln {
+       local e
+       nameref rdln_ln=$1
+
+       IFS= read -r rdln_ln
+       e=$?
+       (( e )) && return $e
+       let ++rln
+       rdln_ln=${rdln_ln%%*( )?(\r)}
+       [[ $rdln_ln = *([ -~]) ]] && return 0
+       print -ru2 "E: non-ASCII line $rln: ${rdln_ln@Q}"
+       exit 5
+}
+
+function chknameline {
+       local uc=$1 nf=${#f[*]}
+
+       if (( nf < 4 || nf > 5 )); then
+               local cp=U+$uc ln=$2 es
+               [[ -n $uc ]] || cp="U<${f[1]@Q}>"
+               [[ -n $ln ]] || ln="${f[*]}"
+
+               if (( nf < 4 )); then
+                       es='not enough'
+               else
+                       es='too many'
+               fi
+               print -ru2 "E: $es fields $nf in name line $lno at $cp: ${ln@Q}"
+               exit 2
+       fi
+
+       if [[ -z ${f[4]} || ( -n $uc && ${f[4]} = "uni$uc" ) ]]; then
+               unset f[4]
+       else
+               [[ ${f[4]} = "${f[4]::14}" ]] || print -ru2 \
+                   "W: overlong glyph name ${f[4]@Q} at line $lno"
+               #f[4]=${f[4]::14}
+       fi
+
+       if [[ ${f[2]} != [1-9]*([0-9]) ]] || \
+           (( (w = f[2]) > 32 || w < 1 )); then
+               print -ru2 "E: width ${f[2]@Q} not in 1‥32 at line $lno"
+               exit 2
+       fi
+}
+
 lno=0
 if [[ $mode = e ]]; then
        if (( uascii == 1 )); then
@@ -58,14 +105,15 @@ if [[ $mode = e ]]; then
        else
                set -A BITv -- ' ' '䷀' '▌'
        fi
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                if [[ $line = 'e '* ]]; then
                        set -A f -- $line
+                       chknameline
+                       print -r -- "${f[*]}"
                        i=${f[3]}
-                       print -r -- "$line"
                        while (( i-- )); do
-                               if IFS= read -r line; then
+                               if rdln line; then
                                        print -r -- "$line"
                                        continue
                                fi
@@ -81,10 +129,7 @@ if [[ $mode = e ]]; then
                        continue
                fi
                set -A f -- $line
-               if (( (w = f[2]) > 32 || w < 1 )); then
-                       print -ru2 "E: width ${f[2]} not in 1‥32 at line $lno"
-                       exit 2
-               fi
+               chknameline
                if (( w <= 8 )); then
                        adds=000000
                elif (( w <= 16 )); then
@@ -139,7 +184,7 @@ function parse_bdfc_file {
        local last
 
        set -A last
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                if [[ $line = C ]]; then
                        Fprop+=("${last[@]}")
@@ -180,9 +225,9 @@ function parse_bdfc_file {
 }
 
 function parse_bdfc_edit {
-       local shiftbits uw line r i
+       local shiftbits uw line r i
 
-       if (( (w = f[2]) <= 8 )); then
+       if (( w <= 8 )); then
                (( shiftbits = 8 - w ))
                (( uw = 5 ))
        elif (( w <= 16 )); then
@@ -196,14 +241,15 @@ function parse_bdfc_edit {
                (( uw = 11 ))
        fi
 
-       if (( (i = f[3]) < 1 || i > 999 )); then
-               print -ru2 "E: nonsensical number of lines '${f[3]}' in" \
+       if [[ ${f[3]} != [1-9]*([0-9]) ]] || \
+           (( (i = f[3]) < 1 || i > 999 )); then
+               print -ru2 "E: nonsensical number of lines ${f[3]@Q} in" \
                    "line $lno, U+${ch#16#}"
                exit 2
        fi
 
        while (( i-- )); do
-               if ! IFS= read -r line; then
+               if ! rdln line; then
                        print -ru2 "E: Unexpected end of 'e' command" \
                            "at line $lno, U+${ch#16#}"
                        exit 2
@@ -232,7 +278,7 @@ function parse_bdfc_glyph {
        local last
 
        set -A last
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                if [[ $line = . ]]; then
                        Fcomm+=("${last[@]}")
@@ -265,28 +311,19 @@ function parse_bdfc_glyph {
                        exit 2
                fi
                typeset -Uui16 -Z7 ch=16#${f[1]}
-               if (( ${#f[*]} < 4 || ${#f[*]} > 5 )); then
-                       print -ru2 "E: invalid number of fields on line $lno" \
-                           "at U+${ch#16#}: ${#f[*]}: '$line'"
-                       exit 2
-               fi
-               if (( f[2] < 1 || f[2] > 32 )); then
-                       print -ru2 "E: width ${f[2]} not in 1‥32 at line $lno"
-                       exit 2
-               fi
-               (( chkpad )) && if [[ ${f[2]} != ${hFBB[1]} ]]; then
-                       print -ru2 "E: c line $lno width ${f[2]} does not match FONTBOUNDINGBOX ${hFBB[1]}"
+               chknameline "${ch#16#}" "$line"
+               (( chkpad )) && if [[ $w != "${hFBB[1]}" ]]; then
+                       print -ru2 "E: c line $lno width $w does not match FONTBOUNDINGBOX ${hFBB[1]}"
                        exit 2
                fi
-               [[ ${f[4]} = "uni${ch#16#}" ]] && unset f[4]
                if [[ ${f[0]} = e ]]; then
                        parse_bdfc_edit
                else
-                       if (( f[2] <= 8 )); then
+                       if (( w <= 8 )); then
                                x='+([0-9A-F][0-9A-F]:)'
-                       elif (( f[2] <= 16 )); then
+                       elif (( w <= 16 )); then
                                x='+([0-9A-F][0-9A-F][0-9A-F][0-9A-F]:)'
-                       elif (( f[2] <= 24 )); then
+                       elif (( w <= 24 )); then
                                x='+([0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]:)'
                        else
                                x='+([0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]:)'
@@ -329,7 +366,7 @@ function parse_bdfc {
 
 function parse_bdf {
        set -A hFBB
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                case $line {
                (COMMENT)
@@ -356,7 +393,7 @@ function parse_bdf {
        fi
        set -A f -- $line
        numprop=${f[1]}
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                case $line {
                (COMMENT)
@@ -379,7 +416,7 @@ function parse_bdf {
                    "$((f[1] - numprop)) in line $lno"
                exit 2
        fi
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                case $line {
                (COMMENT)
@@ -405,7 +442,7 @@ function parse_bdf {
        set -A cs
        set -A cd
        set -A cb
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                case $line {
                (COMMENT)
@@ -462,12 +499,12 @@ function parse_bdf {
                        fi
                        Gprop[ch]="d ${cs[1]} ${cs[2]} ${cd[1]} ${cd[2]} ${cb[3]} ${cb[4]}"
                        set -A f c ${ch#16#} ${cb[1]} - ${cn[1]}
-                       [[ ${f[4]} = "uni${ch#16#}" ]] && unset f[4]
-                       if (( f[2] <= 8 )); then
+                       chknameline "${ch#16#}"
+                       if (( w <= 8 )); then
                                ck='[0-9A-F][0-9A-F]'
-                       elif (( f[2] <= 16 )); then
+                       elif (( w <= 16 )); then
                                ck='[0-9A-F][0-9A-F][0-9A-F][0-9A-F]'
-                       elif (( f[2] <= 24 )); then
+                       elif (( w <= 24 )); then
                                ck='[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]'
                        else
                                ck='[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]'
@@ -475,7 +512,7 @@ function parse_bdf {
                        if (( (numlines = cb[2]) )); then
                                bmps=
                                typeset -u linu
-                               while IFS= read -r linx; do
+                               while rdln linx; do
                                        (( ++lno ))
                                        linu=$linx
                                        while eval [[ '$linu' != "$ck" ]]; do
@@ -496,7 +533,7 @@ function parse_bdf {
                                f[2]=1
                                f[3]=00
                        fi
-                       if ! IFS= read -r line || [[ $line != ENDCHAR ]]; then
+                       if ! rdln line || [[ $line != ENDCHAR ]]; then
                                print -ru2 "E: expected ENDCHAR after line $lno"
                                exit 2
                        fi
@@ -531,7 +568,7 @@ function parse_bdf {
                print -ru2 "E: expected $numchar glyphs, got ${#Gdata[*]}"
                exit 2
        fi
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                case $line {
                (COMMENT)
@@ -550,7 +587,7 @@ function parse_bdf {
 }
 
 if [[ $mode = c ]]; then
-       if ! IFS= read -r line; then
+       if ! rdln line; then
                print -ru2 "E: read error at BOF"
                exit 2
        fi
@@ -586,7 +623,7 @@ if [[ $mode = c ]]; then
 fi
 
 if [[ $mode = +e ]]; then
-       while IFS= read -r line; do
+       while rdln line; do
                (( ++lno ))
                if [[ $line = \' || $line = "' "* ]]; then
                        print -r -- "$line"
@@ -602,24 +639,15 @@ if [[ $mode = +e ]]; then
                        exit 2
                fi
                typeset -Uui16 -Z7 ch=16#${f[1]}
-               if (( ${#f[*]} < 4 || ${#f[*]} > 5 )); then
-                       print -ru2 "E: invalid number of fields on line $lno" \
-                           "at U+${ch#16#}: ${#f[*]}: '$line'"
-                       exit 2
-               fi
-               if (( f[2] < 1 || f[2] > 32 )); then
-                       print -ru2 "E: width ${f[2]} not in 1‥32 at line $lno"
-                       exit 2
-               fi
-               [[ ${f[4]} = "uni${ch#16#}" ]] && unset f[4]
+               chknameline "${ch#16#}" "$line"
                if [[ ${f[0]} = e ]]; then
                        parse_bdfc_edit
                else
-                       if (( f[2] <= 8 )); then
+                       if (( w <= 8 )); then
                                x='+([0-9A-F][0-9A-F]:)'
-                       elif (( f[2] <= 16 )); then
+                       elif (( w <= 16 )); then
                                x='+([0-9A-F][0-9A-F][0-9A-F][0-9A-F]:)'
-                       elif (( f[2] <= 24 )); then
+                       elif (( w <= 24 )); then
                                x='+([0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]:)'
                        else
                                x='+([0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]:)'
@@ -640,7 +668,7 @@ if [[ $mode != d ]]; then
        exit 255
 fi
 
-if ! IFS= read -r line; then
+if ! rdln line; then
        print -ru2 "E: read error at BOF"
        exit 2
 fi
@@ -657,7 +685,7 @@ if (( ufast )); then
        fi
        # quickly parse bdfc header
        set -A last
-       while IFS= read -r line; do
+       while rdln line; do
                [[ $line = C ]] && break
                last+=("$line")
                [[ $line = \' || $line = "' "* ]] && continue
@@ -799,7 +827,7 @@ if (( ufast )); then
        numchar=0
        # directly transform font data
        set -A last
-       while IFS= read -r line; do
+       while rdln line; do
                [[ $line = . ]] && break
                if [[ $line = \' || $line = "' "* ]]; then
                        last+=("$line")
index 5549b2c..074ac8a 100644 (file)
@@ -1,8 +1,8 @@
-roff2htm_rcsid='$MirOS: src/scripts/roff2htm,v 1.90 2018/01/07 23:27:30 tg Exp $'
+roff2htm_rcsid='$MirOS: src/scripts/roff2htm,v 1.93 2019/11/22 21:43:24 tg Exp $'
 # $ekkoBSD: catman2html.sh,v 1.2 2004/03/07 03:02:53 stephen Exp $
 #-
 # Copyright (c) 2004, 2005, 2006, 2007, 2011, 2012, 2014, 2015,
-#              2016, 2017
+#              2016, 2017, 2018
 #      mirabilos <m@mirbsd.org>
 # Original version for ekkoBSD by:
 # Copyright (c) 2004
@@ -234,7 +234,7 @@ function output_header {
        }
        pre {
                line-height:1.12;
-               color:#FFBF00;
+               color:#FFB000;
        }
        b {
                color:#FFEF00;
@@ -242,16 +242,16 @@ function output_header {
        }
        i {
                font-style:normal;
-               border-bottom:1px solid #FFBF00;
+               border-bottom:1px solid #FFB000;
        }
        b i,i b {
                color:#FFEF00;
                font-weight:normal;
                font-style:normal;
-               border-bottom:1px solid #FFEF00;
+               border-bottom:1px solid #FFCC00;
        }
        h1 {
-               color:#FFEF00;
+               color:#FFCC00;
                font-size:xx-large;
                font-family:serif;
        }
@@ -267,7 +267,7 @@ function output_header {
        }
  /*]]>*/--></style>
 </head><body>
-<h1>MirOS Manual: <a href="'$roff2htm_rel'man'$2/$1'.htm">'$1\($2')</a></h1>'
+<h1>MirBSD manpage: <a href="'$roff2htm_rel'man'$2/$1'.htm">'$1\($2')</a></h1>'
 }
 
 function output_footer {
@@ -277,7 +277,7 @@ function output_footer {
 <p>These manual pages and other documentation are <a
  href="'$roff2htm_rel'man7/BSD-Licence.htm">copyrighted</a> by their respective writers;
  their source is available at our <a href="http://cvs.mirbsd.de/">CVSweb</a>,
- AnonCVS, and other mirrors. The rest is Copyright © 2002–2018 <a
+ AnonCVS, and other mirrors. The rest is Copyright © 2002–2019 <a
  href="http://www.mirbsd.org/">MirBSD</a>.<br /><span
  style="font-size:3pt; font-style:italic;">This product includes material
  provided by <b>mirabilos</b>.</span></p>
index 8020b93..afe4d93 100644 (file)
@@ -1,7 +1,7 @@
 #!/usr/bin/env mksh
-# $MirOS: contrib/code/Snippets/uri-grabber.sh,v 1.3 2011/06/09 22:04:37 tg Exp $
+# $MirOS: contrib/code/Snippets/uri-grabber.sh,v 1.4 2019/05/14 18:07:39 tg Exp $
 #-
-# Copyright (c) 2007, 2011
+# Copyright (c) 2007, 2011, 2019
 #      Thorsten Glaser <tg@mirbsd.de>
 #
 # Provided that these terms and disclaimer and all copyright notices
@@ -33,7 +33,7 @@ while read line; do
                (*)      continue ;;
                }
                line=${line#*://}
-               p2=${line%%@([!#0-9a-zA-Z;/?:@&=+$,_.!~*\'()%-])*}
+               p2=${line%%@([!#0-9a-zA-Z;/?:@&=+$,_.!~*\'\(\)%-])*}
                line=${line#${p2}?}
                print "$beg://$p2"
        done
index 04f2312..0cf830d 100644 (file)
--- a/mksh/wtf
+++ b/mksh/wtf
@@ -1,9 +1,9 @@
 #!/bin/mksh
-myver='$MirOS: src/usr.bin/wtf/wtf,v 1.36 2017/06/15 21:00:45 tg Exp $'
+myver='$MirOS: src/usr.bin/wtf/wtf,v 1.38 2019/04/22 02:46:33 tg Exp $'
 # $NetBSD: wtf,v 1.7 2000/11/21 00:18:52 soren Exp $
 #-
 # Copyright © 2002, 2003, 2004, 2006, 2007, 2008, 2010, 2011,
-#            2012, 2014, 2015, 2017
+#            2012, 2014, 2015, 2017, 2019
 #      mirabilos <m@mirbsd.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
@@ -21,6 +21,9 @@ myver='$MirOS: src/usr.bin/wtf/wtf,v 1.36 2017/06/15 21:00:45 tg Exp $'
 # damage or existence of a defect, except proven that it results out
 # of said person’s immediate fault when using the work as intended.
 
+export LC_ALL=C.UTF-8 POSIXLY_CORRECT=1
+unset LANGUAGE GREP_OPTIONS GREP_COLOR GREP_COLORS
+
 acronyms=${ACRONYMDB:-/usr/share/misc/acronyms}
 
 usage() {
@@ -167,11 +170,8 @@ if (( use_ports )); then
 fi
 
 if (( use_acronyms )); then
-       # read input file only once
-       exec <"$acronyms"
-
        # read case-folding code
-       if ! IFS= read -r line || [[ $line != '  '* ]]; then
+       if ! IFS= read -r line <"$acronyms" || [[ $line != '  '* ]]; then
                print -ru2 "E: acronyms database ${acronyms@Q} too old"
                exit 1
        fi
@@ -211,6 +211,16 @@ if (( use_acronyms )); then
        set -A stsrch -- "${stsrch[@]}"
        # now: stsrch=(BAR BAZ FOO) omsrch[1]=2 omsrch[2]=0 omsrch[3]=1
 
+       # shorten search time
+       set -A grepcmd
+       i=-1
+       for s in "${stsrch[@]}"; do
+               grepcmd[++i]=-e
+               grepcmd[++i]=${s@/[\\.\[\^\$\*]/\\$KSH_MATCH}$'\t'
+       done
+       grep "${grepcmd[@]}" <"$acronyms" |&
+       unset grepcmd
+
        # look up acronyms
        set -A acrout
        i=-1
@@ -222,11 +232,16 @@ if (( use_acronyms )); then
                        elif [[ $line > "$s     " ]]; then
                                continue 2
                        fi
-                       IFS= read -r line || break 2
+                       if ! IFS= read -pr line; then
+                               i=-1
+                               break 2
+                       fi
                done
        done
+       # avoid SIGPIPE
+       (( i == -1 )) || read -prN-1 line
+       line=
 
-       exec <&-
        i=0
 fi
 
index 3788e52..394f9ff 100644 (file)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $MirOS: contrib/hosted/tg/deb/hookdir/D10wtfrepo,v 1.7 2019/03/23 19:48:13 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/hookdir/D10wtfrepo,v 1.8 2019/11/23 21:38:01 tg Exp $
 #-
 # Not complicated enough for copyright.
 
@@ -33,17 +33,17 @@ btCstesRFYS9nOoKwyxg80iZYpV4+q6POeS43Xfi2APXB+3tXAQJ5+dCYam/jlzu
 oyPAEZxai5R8m1q9SD+c16nx8F5GSuEoAcvfyAc7EqhCfnjh3o2/QokOPPboMRWW
 s46FaIWZiuNf8p1hfgj6cjH1ny124AbvvClddCDPuFwwXVxRji3ApeOwPUkqoFDn
 zebsA4OA2+ggEGEAEQEAAbQxU2lnbmluZyBrZXkgMjAxOCBmb3Ig4oCcV1RG4oCd
-IHBhY2thZ2UgcmVwb3NpdG9yeYkBuwQTAQkAJQUCWU/jUwIbAwUJBqIMAAULCAQJ
-BwUVCQoDCAMWAgACHgECF4AACgkQAgir6mZzodkl2AwAlAi4FT+HBrER5ZxtFNdX
-nuSLUxMnzqp9k+lO1Kd3i5qGclosdLcrVMCDadzf3ZI1NOQvnzQ9TPlyWD0jBk1E
-E0Vg68B7lySoBvJFOoSwZaZs7HCc7EcEFKPK58ITBx4UVXYoW1CLZ4Q51oXT7iSx
-RRPby+vMFaeYA1foRffAUFe1pmY3RBuMBxT8NKZIxlC72k10b4y68jMuBBR2UjVV
-6YebyHtxMKiGNuJIrhl5hS3p0G1l+KQ6CnBVvqHiECRSE2hsUetg3SO+HbxH2E88
-iuPzblqdfsypmIoyia46dAqq97JY6tW9U+CSql4w9Gx4xVj+ai4PNdRv3HImtbEV
-L95v4UeZparZmFgJtnUcGe71i8OdqseoRB9+lDLMPShbs06c6eg9RVjMqpbPRXdf
-U52L8r+zYDN9mAXKsA1n5mBIZSIG5MVynGkmk0IZFWMZZ5UiTswGJGAAjNyC1eWy
-dLtQUGt1ST6gH+fenw0EZ3erzXih9roLsJWip8UweJer
-=t3xZ
+IHBhY2thZ2UgcmVwb3NpdG9yeYkBuwQTAQkAJQIbAwULCAQJBwUVCQoDCAMWAgAC
+HgECF4AFAl3YB/oFCQwM8qIACgkQAgir6mZzodk/Xwv9Hw3T+DVlTYDgUtrkj3hy
+U/r75ng4RX0w8de/q3KuCWW9J8gx+CrZ3sy4xjJYZPpy4y7SilDNudzJcS3Qe88T
+LdeO4x68MruAERZQNHfw1uKdg05LGV1a8ISrc5mB0lsL82eRewde/47DeZhln7R6
+x2/fOZQNVtdRM0g+Auwlsd+LvTvLe1mGIjXOIA6vJYvbKYNalO0PQtz3WWbKkUYG
+JqIu1RwEtnGraKQOqulCO775fQdG1SCK3BmqAmTcb3UmkJBwsQGCIU6EYspexnq7
+BHbWrVpA2Q+1k6xR5cYctJCw0PDNYQrSNR7T4ZkW+pu65IOHq33+h+GTIMIwiZ51
+u96fgu6za40eVr7cVyaj6BrNEBiJ2q7qL2DNi8rM4kuZzIrvUWEnjnZJC4w22ABW
+ePRDsE2zp3D/toKEL8DruIg7D1iwde8m7Ut4vDhl0RDLd6xRAy0Vaw9h4rWtW8OZ
+4vcfr/+2s0fcsj6hcQqjPyvlbEoBmgK1TJHm/+aytozg
+=pYYz
 -----END PGP PUBLIC KEY BLOCK-----
 EOF
 
@@ -53,6 +53,7 @@ EOF
 
 # note: sarge/wtf almost certainly needs sarge-backports
 
+# note: squeeze needs lenny (incomplete suite)
 test x"$d" = x"squeeze" && cat >>/etc/apt/sources.list <<EOF
 deb http://www.mirbsd.org/~tg/Debs/ lenny wtf
 EOF