update from MirBSD CVS

diff --git a/bash/pbuilder-hooks/D01slashrepo b/bash/pbuilder-hooks/D01slashrepo
index 603b783..118a98e 100644 (file)
--- a/bash/pbuilder-hooks/D01slashrepo
+++ b/bash/pbuilder-hooks/D01slashrepo
@@ -1,7 +1,7 @@
 #!/bin/bash
-# $MirOS: contrib/hosted/tg/deb/hookdir/D01slashrepo,v 1.2 2018/04/11 16:10:27 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/hookdir/D01slashrepo,v 1.3 2019/02/24 03:34:00 tg Exp $
 #-
-# Copyright © 2014, 2018
+# Copyright © 2014, 2018, 2019
 #      mirabilos <m@mirbsd.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
@@ -43,14 +43,19 @@ echo >&2 "I: creating Packages file for local APT cache in $base"
 rm -f "$base/Packages"
 (cd "$base"
 #dpkg-scanpackages -h md5 -m . >Packages 2>/dev/null || \
-    dpkg-scanpackages -m . >Packages)
+    dpkg-scanpackages -m . >Packages 2>/dev/null || \
+    dpkg-scanpackages . /dev/null >Packages)
 paste -d_ <(sed -n '/^Package: /s///p' "$base/Packages") \
     <(sed -n '/^Version: /s///p' "$base/Packages") \
     <(sed -n '/^Architecture: /s///p' "$base/Packages") | \
     sed 's/^/N: /' >&2
 echo >&2 "I: updating APT repository information"
 cp "$base/Packages" "/var/lib/apt/lists/$pstr"
-echo "deb [trusted=yes] file://$base ./" >"/etc/apt/sources.list.d/$this.list"
+if test -d /etc/apt/sources.list.d/.; then
+       echo "deb [trusted=yes] file://$base ./" >"/etc/apt/sources.list.d/$this.list"
+else
+       echo "deb file://$base ./" >>"/etc/apt/sources.list"
+fi
 apt-cache gencaches
 echo >&2 "I: made $(grep -c '^Package: ' "$base/Packages") packages available from $base"
 exit 0

diff --git a/mksh/sysadmin/agus b/mksh/sysadmin/agus
index 9bbf423..259b092 100644 (file)
--- a/mksh/sysadmin/agus
+++ b/mksh/sysadmin/agus
@@ -1,8 +1,11 @@
 #!/bin/mksh
-# $MirOS: contrib/hosted/tg/deb/aguspeed.sh,v 1.3 2012/05/09 08:58:36 tg Exp $
-# $Id: agus 2924 2012-05-09 09:00:04Z tglase $
+# $MirOS: contrib/hosted/tg/deb/aguspeed.sh,v 1.5 2019/05/19 21:48:20 tg Exp $
 #-
 # From Planet Debian. Not complicated enough for copyright.
+#
+# Use example:
+#  agus -o Acquire::Check-Valid-Until=false   # on jessie
+#  agus --allow-releaseinfo-change            # when testing changes
 
 unset LANGUAGE
 export LC_ALL=C
@@ -16,15 +19,11 @@ else
        fflag=0
 fi
 
-if [[ -n $1 && -s /etc/apt/sources.list.$1 ]]; then
-       cat "/etc/apt/sources.list.$1" >/etc/apt/sources.list
-fi
-
 rv=
 set -x
-apt-get update || rv=$?
+apt-get "$@" update || rv=$?
 dpkg --clear-avail || rv=${rv:-$?}
-# this emits a harmless warning on squeeze
+# this emits a harmless warning on squeeze and newer
 dpkg --forget-old-unavail || rv=${rv:-$?}
 (( fflag )) || if sa=$(whence -p sync-available); then
        # call with mksh due to *buntu bug

diff --git a/mksh/sysadmin/agus.1 b/mksh/sysadmin/agus.1
index 9743d5a..8f95352 100644 (file)
--- a/mksh/sysadmin/agus.1
+++ b/mksh/sysadmin/agus.1
@@ -1,5 +1,4 @@
-.\" $Id: agus.1 2923 2012-05-09 08:54:01Z tglase $
-.Dd May 7, 2012
+.Dd May 19, 2019
 .Dt AGUS 1
 .Os
 .Sh NAME
@@ -8,17 +7,11 @@
 .Sh SYNOPSIS
 .Nm agus
 .Op Fl f
-.Op Ar slext
+.Op Ar apt\-get\-options
 .Sh DESCRIPTION
 The
 .Nm
-utility copies
-.Pa /etc/apt/sources.list. Ns Ar slext
-to
-.Pa /etc/apt/sources.list
-if
-.Ar slext
-is given, then calls
+utility calls
 .Nm apt\-get
 .Ar update ,
 then optimises the

diff --git a/posix/pbuilder-hooks/D10wtfrepo b/posix/pbuilder-hooks/D10wtfrepo
index a0d1ec5..3788e52 100644 (file)
--- a/posix/pbuilder-hooks/D10wtfrepo
+++ b/posix/pbuilder-hooks/D10wtfrepo
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $MirOS: contrib/hosted/tg/deb/hookdir/D10wtfrepo,v 1.6 2017/11/17 01:10:07 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/hookdir/D10wtfrepo,v 1.7 2019/03/23 19:48:13 tg Exp $
 #-
 # Not complicated enough for copyright.
 
@@ -9,9 +9,9 @@ LC_ALL=C; export LC_ALL
 d=${DIST%/*}
 d=${d%-backports*}
 case $d in
-(sarge|etch|lenny|squeeze|wheezy|jessie|sid)
+(sarge|etch|lenny|squeeze|wheezy|jessie|stretch|buster|sid)
        ;;
-(stretch|buster|bullseye)
+(bullseye)
        d=sid
        ;;
 (*)
@@ -51,5 +51,11 @@ cat >>/etc/apt/sources.list <<EOF
 deb http://www.mirbsd.org/~tg/Debs/ $d wtf
 EOF
 
+# note: sarge/wtf almost certainly needs sarge-backports
+
+test x"$d" = x"squeeze" && cat >>/etc/apt/sources.list <<EOF
+deb http://www.mirbsd.org/~tg/Debs/ lenny wtf
+EOF
+
 apt-get update
 apt-get -y --purge dist-upgrade

diff --git a/posix/pbuilder-hooks/D25backports b/posix/pbuilder-hooks/D25backports
index 4f2c4b2..a600988 100644 (file)
--- a/posix/pbuilder-hooks/D25backports
+++ b/posix/pbuilder-hooks/D25backports
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $MirOS: contrib/hosted/tg/deb/hookdir/D25backports,v 1.3 2018/03/31 00:49:07 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/hookdir/D25backports,v 1.5 2019/03/23 19:53:45 tg Exp $
 #-
 # Not complicated enough for copyright.
 #
@@ -16,11 +16,11 @@ LC_ALL=C; export LC_ALL
 d=${DIST%/*}
 d=${d%-backports*}
 case $d in
-(sarge|etch|lenny|squeeze)
+(sarge|etch|lenny|squeeze|wheezy|jessie)
        echo deb http://archive.debian.org/debian-backports/ \
            $d-backports main >>/etc/apt/sources.list
        ;;
-(wheezy|jessie|stretch)
+(stretch|buster)
        echo deb http://httpredir.debian.org/debian/ \
            $d-backports main >>/etc/apt/sources.list
        ;;