Skip to content

Commit 84c2646

Browse files
mirabilosmirabilos
mirabilos
authored and
mirabilos
committed
update from MirBSD CVS
1 parent b7cbc91 commit 84c2646

File tree

12 files changed

+57
-40
lines changed

12 files changed

+57
-40
lines changed

‎bash/pbuilder-hooks/D01slashrepo

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
2-
# $MirOS: contrib/hosted/tg/deb/hookdir/D01slashrepo,v 1.5 2023/01/28 04:04:03 tg Exp $
2+
# -*- mode: sh -*-
3+
# $MirOS: contrib/hosted/tg/deb/hookdir/D01slashrepo,v 1.7 2025/04/25 20:17:31 tg Exp $
34
#-
45
# Copyright © 2014, 2018, 2019, 2023
5-
# mirabilos <m@mirbsd.org>
6+
# mirabilos <m$(date +%Y)@mirbsd.de>
67
#
78
# Provided that these terms and disclaimer and all copyright notices
89
# are retained or reproduced in an accompanying document, permission

‎bash/pbuilder-hooks/D02varcacheapt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
2-
# $MirOS: contrib/hosted/tg/deb/hookdir/D02varcacheapt,v 1.1 2023/01/28 04:04:03 tg Exp $
2+
# -*- mode: sh -*-
3+
# $MirOS: contrib/hosted/tg/deb/hookdir/D02varcacheapt,v 1.3 2025/04/25 20:17:31 tg Exp $
34
#-
45
# Copyright © 2014, 2018, 2019, 2023
5-
# mirabilos <m@mirbsd.org>
6+
# mirabilos <m$(date +%Y)@mirbsd.de>
67
#
78
# Provided that these terms and disclaimer and all copyright notices
89
# are retained or reproduced in an accompanying document, permission

‎mksh/bdfctool.1

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
.\" $MirOS: X11/extras/bdfctool/bdfctool.1,v 1.24 2024/01/05 02:08:42 tg Exp $
1+
.\" $MirOS: X11/extras/bdfctool/bdfctool.1,v 1.25 2025/04/25 22:06:10 tg Exp $
22
.\"-
33
.\" Copyright © 2012, 2013, 2015, 2019, 2020
4-
.\" mirabilos <m@mirbsd.org>
4+
.\" mirabilos <m$(date +%Y)@mirbsd.de>
55
.\"-
66
.\" Provided that these terms and disclaimer and all copyright notices
77
.\" are retained or reproduced in an accompanying document, permission
@@ -18,10 +18,13 @@
1818
.\" damage or existence of a defect, except proven that it results out
1919
.\" of said person’s immediate fault when using the work as intended.
2020
.\"-
21-
.\" $miros: contrib/samples/portmdoc,v 1.23 2024/01/04 22:52:50 tg Exp $
21+
.\" $miros: contrib/samples/portmdoc,v 1.24 2025/04/25 20:48:03 tg Exp $
2222
.\"-
2323
.\" Copyright © 2008, 2009, 2010, 2016, 2018, 2020, 2023
24-
.\" mirabilos <[email protected]>
24+
.\" mirabilos <m$(date +%Y)@mirbsd.de>
25+
.\" Copyright © 1991, 1993
26+
.\" The Regents of the University of California. (Ⓕ 3-clause BSD)
27+
.\" All rights reserved.
2528
.\"
2629
.\" Glue GNU groff (BSD and GNU mdoc both) to AT&T nroff (UCB mdoc).
2730
.\" * ` generates ‘ in gnroff, so use \`
@@ -51,7 +54,7 @@
5154
.\" .Dd must come before most everything, because when called
5255
.\" with -mandoc it loads -mdoc via .so in .Dd (first macro).
5356
.\"
54-
.Dd $Mdocdate: January 5 2024 $
57+
.Dd $Mdocdate: April 25 2025 $
5558
.\"
5659
.\" Check which macro package we use, and do other -mdoc setup.
5760
.\"
@@ -91,7 +94,7 @@
9194
. ds EM \ \(em\ \&
9295
.\}
9396
.el \{\
94-
. ds EM \f(TR\|\(em\|\fP
97+
. ds EM \f(TR\^\(em\^\fP
9598
.\}
9699
.\"
97100
.\" Add UCB mdoc compatibility to GNU mdoc
@@ -475,7 +478,7 @@ version 2.1, specification
475478
.Pp
476479
.Pa http://php.net/manual/en/function.imageloadfont.php
477480
.Sh AUTHORS
478-
.An mirabilos Aq m@mirbsd.org
481+
.An mirabilos Aq m$(date$IFS+%Y)@mirbsd.de
479482
wrote this tool because
480483
.Xr cvs 1
481484
does not scale for multi-thousand-line files,

‎mksh/debian-dev/BuildDSC.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/mksh
2-
# $MirOS: contrib/hosted/tg/deb/BuildDSC.sh,v 1.24 2020/10/30 03:41:55 tg Exp $
2+
# -*- mode: sh -*-
3+
# $MirOS: contrib/hosted/tg/deb/BuildDSC.sh,v 1.25 2025/04/25 20:17:29 tg Exp $
34
#-
45
# Copyright © 2015, 2016, 2017, 2020
5-
# mirabilos <m@mirbsd.org>
6+
# mirabilos <m$(date +%Y)@mirbsd.de>
67
# Copyright © 2010, 2011, 2018
78
# mirabilos <[email protected]>
89
#

‎mksh/debian-dev/dscls

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/mksh
2-
# $MirOS: contrib/hosted/tg/deb/dscls,v 1.1 2014/04/07 20:31:31 tg Exp $
2+
# -*- mode: sh -*-
3+
# $MirOS: contrib/hosted/tg/deb/dscls,v 1.2 2025/04/25 20:17:29 tg Exp $
34
#-
45
# Copyright © 2012
5-
# Thorsten Glaser <tg@mirbsd.org>
6+
# mirabilos <m$(date +%Y)@mirbsd.de>
67
#
78
# Provided that these terms and disclaimer and all copyright notices
89
# are retained or reproduced in an accompanying document, permission
@@ -18,6 +19,8 @@
1819
# of dealing in the work, even if advised of the possibility of such
1920
# damage or existence of a defect, except proven that it results out
2021
# of said person’s immediate fault when using the work as intended.
22+
#-
23+
# Show infos for *.dsc passed.
2124

2225
for x in "$@"; do
2326
dscname=$x

‎mksh/debian-dev/mkdebidx.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
#!/bin/mksh
2-
rcsid='$MirOS: contrib/hosted/tg/deb/mkdebidx.sh,v 1.90 2025/02/27 02:30:12 tg Exp $'
2+
# -*- mode: sh -*-
3+
rcsid='$MirOS: contrib/hosted/tg/deb/mkdebidx.sh,v 1.91 2025/04/25 20:17:30 tg Exp $'
34
#-
45
# Copyright © 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
56
# 2016, 2017, 2019, 2021, 2022, 2023, 2024
6-
# mirabilos <m@mirbsd.org>
7+
# mirabilos <m$(date +%Y)@mirbsd.de>
78
#
89
# Provided that these terms and disclaimer and all copyright notices
910
# are retained or reproduced in an accompanying document, permission
10-
# is granted to deal in this work without restriction, including un-
11+
# is granted to deal in this work without restriction, including un‐
1112
# limited rights to use, publicly perform, distribute, sell, modify,
1213
# merge, give away, or sublicence.
1314
#
14-
# This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
15+
# This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to
1516
# the utmost extent permitted by applicable law, neither express nor
1617
# implied; without malicious intent or gross negligence. In no event
1718
# may a licensor, author or contributor be held liable for indirect,
1819
# direct, other damage, loss, or other issues arising in any way out
1920
# of dealing in the work, even if advised of the possibility of such
2021
# damage or existence of a defect, except proven that it results out
21-
# of said person's immediate fault when using the work as intended.
22+
# of said person’s immediate fault when using the work as intended.
23+
#-
24+
# Generate repository metadata on repositories for Debian’s apt.
2225

2326
unset normarchs repo_keyid gpg_remote gpg_bin repo_origin repo_label repo_title
2427
unset hide_components

‎mksh/debian-dev/quinn-ls.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/mksh
2-
rcsid='$MirOS: contrib/hosted/tg/deb/quinn-ls.sh,v 1.17 2024/04/25 14:47:36 tg Exp $'
2+
# -*- mode: sh -*-
3+
rcsid='$MirOS: contrib/hosted/tg/deb/quinn-ls.sh,v 1.18 2025/04/25 20:17:30 tg Exp $'
34
#-
45
# Copyright © 2011, 2012, 2013, 2016, 2017
5-
# Thorsten Glaser <[email protected]>
6+
# mirabilos <m$(date +%Y)@mirbsd.de>
67
#
78
# Provided that these terms and disclaimer and all copyright notices
89
# are retained or reproduced in an accompanying document, permission

‎mksh/progress-bar

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
# -*- mode: sh -*-
2-
# $MirOS: contrib/hosted/tg/progress-bar,v 1.6 2020/05/11 14:28:31 tg Exp $
2+
# $MirOS: contrib/hosted/tg/progress-bar,v 1.7 2025/04/26 23:51:41 tg Exp $
33
#-
4-
# Copyright © 2018, 2020
5-
# mirabilos <[email protected]>
6-
# Copyright © 2017
7-
# mirabilos <[email protected]>
8-
# Copyright © 2015, 2017
9-
# mirabilos
4+
# Copyright © 2015, 2017, 2018, 2020
5+
# mirabilos <m$(date +%Y)@mirbsd.de>
106
#
117
# Provided that these terms and disclaimer and all copyright notices
128
# are retained or reproduced in an accompanying document, permission

‎mksh/ps2pdfmir

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#!/bin/mksh
22
# -*- mode: sh -*-
3-
# $MirOS: contrib/hosted/tg/ps2pdfmir,v 1.9 2021/08/18 18:28:15 tg Exp $
3+
# $MirOS: contrib/hosted/tg/ps2pdfmir,v 1.10 2025/04/26 23:51:41 tg Exp $
44
#-
5-
# Copyright © 2009, 2010, 2015, 2021
6-
# Thorsten “mirabilos” Glaser <[email protected]>
7-
# Copyright © 2014, 2015
8-
# mirabilos
5+
# Copyright © 2009, 2010, 2014, 2015, 2021
6+
# mirabilos <m$(date +%Y)@mirbsd.de>
97
#
108
# Provided that these terms and disclaimer and all copyright notices
119
# are retained or reproduced in an accompanying document, permission

‎mksh/uhr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/mksh
22
# -*- mode: sh -*-
3-
# $MirOS: contrib/hosted/tg/uhr,v 1.23 2020/05/19 22:21:45 tg Exp $
3+
# $MirOS: contrib/hosted/tg/uhr,v 1.24 2025/04/25 20:48:12 tg Exp $
44
#-
55
# Copyright © 2012, 2013, 2015, 2017, 2018, 2020
6-
# mirabilos <m@mirbsd.org>
6+
# mirabilos <m$(date +%Y)@mirbsd.de>
77
#
88
# Provided that these terms and disclaimer and all copyright notices
99
# are retained or reproduced in an accompanying document, permission

‎posix/pbuilder-hooks/D25backports

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# $MirOS: contrib/hosted/tg/deb/hookdir/D25backports,v 1.12 2024/08/24 18:21:16 tg Exp $
2+
# $MirOS: contrib/hosted/tg/deb/hookdir/D25backports,v 1.13 2025/04/25 19:55:32 tg Exp $
33
#-
44
# © 2012, 2014, 2016, 2017, 2018, 2019, 2022, 2023 mirabilos Ⓕ CC0 or MirBSD
55
#
@@ -30,7 +30,12 @@ fi
3030
d=${DIST%/*}
3131
d=${d%-backports*}
3232
case $d in
33-
(sarge|etch|lenny|squeeze)
33+
(sarge|squeeze)
34+
echo deb http://archive.debian.org/debian-backports/ \
35+
$d-backports main >>"$slist"
36+
;;
37+
(etch|lenny)
38+
apt-get -y --purge install debian-backports-keyring
3439
echo deb http://archive.debian.org/debian-backports/ \
3540
$d-backports main >>"$slist"
3641
;;

‎posix/pbuilder-hooks/D26backportsloppy

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# $MirOS: contrib/hosted/tg/deb/hookdir/D26backportsloppy,v 1.4 2024/08/24 18:21:16 tg Exp $
2+
# $MirOS: contrib/hosted/tg/deb/hookdir/D26backportsloppy,v 1.5 2025/04/25 19:55:32 tg Exp $
33
#-
44
# © 2012, 2014, 2016, 2017, 2019, 2023 mirabilos Ⓕ CC0 or MirBSD
55

@@ -23,7 +23,12 @@ fi
2323
d=${DIST%/*}
2424
d=${d%-backports*}
2525
case $d in
26-
(lenny|squeeze)
26+
(lenny)
27+
apt-get -y --purge install debian-backports-keyring
28+
echo deb http://archive.debian.org/debian-backports/ \
29+
$d-backports-sloppy main >>"$slist"
30+
;;
31+
(squeeze)
2732
echo deb http://archive.debian.org/debian-backports/ \
2833
$d-backports-sloppy main >>"$slist"
2934
;;

0 commit comments

Comments
 (0)