build-debian-toolbox: Fix for Ubuntu containers

toolbox trips over the existing ubuntu home dir and its uid 1000.

diff --git a/backup b/backup
index f1bef09ac625c834ffd3e2ba3417fdbbd47fd000..79dc369ed05699cbfd160abf0fac455d5fd3210a 100755 (executable)
--- a/backup
+++ b/backup
@@ -33,6 +33,7 @@ fi
 
 notify-send "Backup started"
 mkdir -p $(dirname $LOG)
+date >> $LOG
 
 $RESTIC backup --exclude-file=$HOME/.config/backup-ignore $HOME >> $LOG 2>&1 || fail
 # TODO: forget --prune policy: https://restic.readthedocs.io/en/stable/060_forget.html
@@ -42,8 +43,8 @@ scp .config/backup-passphrase piware.de:.cache/
 ssh piware.de chmod u+w .cache/backup-passphrase
 trap "ssh piware.de shred -u .cache/backup-passphrase" EXIT INT QUIT PIPE
 
-ssh piware.de restic --password-file .cache/backup-passphrase --repo backup/restic forget --prune --keep-within-hourly 24h --keep-within-daily 7d --keep-within-weekly 30d --keep-within-monthly 12m
+ssh piware.de restic --password-file backup/backup-passphrase --repo backup/restic forget --prune --keep-within-hourly 24h --keep-within-daily 7d --keep-within-weekly 30d --keep-within-monthly 12m
 notify-send "Backup pruned successfully"
 
-ssh piware.de restic --password-file .cache/backup-passphrase --repo backup/restic check || fail "BACKUP CHECK FAILED!"
+ssh piware.de restic --password-file backup/backup-passphrase --repo backup/restic check || fail "BACKUP CHECK FAILED!"
 notify-send "Backup checked successfully"

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index 222d4b501a1630420fce19aa0e5ade5c6dc65977..868a9d2ff122d7163971514d9bbb1bbe50b664d0 100755 (executable)
--- a/build-cockpit-toolbox
+++ b/build-cockpit-toolbox
@@ -4,8 +4,8 @@ NAME=${NAME:-cockpit}
 TAG=${TAG:-latest}
 
 toolbox rm --force $NAME || true
-podman pull quay.io/cockpit/tasks:${TAG}
-yes | toolbox create --image quay.io/cockpit/tasks:${TAG} -c $NAME
+podman pull ghcr.io/cockpit-project/tasks:${TAG}
+yes | toolbox create --image ghcr.io/cockpit-project/tasks:${TAG} -c $NAME
 
 # install some extra development and desktop tools
 toolbox run -c "$NAME" sh -exc '
@@ -17,16 +17,15 @@ sudo hostname -F /etc/hostname
 sudo sed -i s/nodocs// /etc/dnf/dnf.conf
 
 sudo dnf install -y ansible bash-completion man-db man-pages moreutils fd-find ripgrep gh git-delta neovim \
-    python3-boto python3-boto3 python3-openstacksdk python3-pytest-asyncio libnotify \
-    python3-mypy \
+    python3-boto python3-boto3 python3-openstacksdk libnotify \
     simple-scan /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert pdfmerge \
     cargo rustfmt clippy \
     calibre qt5-qtwayland \
-    dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn \
+    tmt python3-testcloud flatpak-builder flatpak-spawn qemu-ui-sdl \
     fedpkg centpkg
 
 # commands to forward to the host
-for cmd in podman toolbox nmcli eog evince; do
+for cmd in podman buildah toolbox nmcli eog evince flatpak; do
     printf "#!/bin/sh\nexec flatpak-spawn --host $cmd \42\$@\42\n" | sudo tee /usr/local/bin/$cmd >/dev/null
     sudo chmod a+x /usr/local/bin/$cmd
 done

diff --git a/build-debian-toolbox b/build-debian-toolbox
index c1d139a16568c43822de73cd9cf3a268209fc71a..df36cd0cfb7b30b42fa5d96d7ad1b3eed8e1cbbe 100755 (executable)
--- a/build-debian-toolbox
+++ b/build-debian-toolbox
@@ -8,6 +8,11 @@ toolbox rm -f $RELEASE || true
 podman pull docker.io/$DISTRO:$RELEASE
 toolbox -y create -c $RELEASE --image docker.io/$DISTRO:$RELEASE
 
+# hack for ubuntu: need to remove existing home dir
+if [ "$DISTRO" = "ubuntu" ]; then
+    podman unshare sh -exc "H=\$(podman mount $RELEASE); rm -r \$H/home/ubuntu; sed -i '/^ubuntu/d' \$H/etc/passwd \$H/etc/shadow"
+fi
+
 # can't do that with toolbox run yet, as we need to install sudo first
 podman start $RELEASE
 podman exec -it $RELEASE sh -exc '
@@ -44,10 +49,10 @@ sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get -y dist-upgrade
 sudo eatmydata apt-get install -y --no-install-recommends build-essential git-buildpackage libwww-perl less vim lintian debhelper manpages-dev git dput pristine-tar bash-completion wget gnupg ubuntu-dev-tools python3-debian fakeroot libdistro-info-perl openssh-client flatpak-xdg-utils
 
 # autopkgtest
-sudo eatmydata apt-get install -y --no-install-recommends autopkgtest qemu-system-x86 qemu-utils genisoimage
+sudo eatmydata apt-get install -y --no-install-recommends autopkgtest qemu-system-x86 qemu-utils genisoimage uidmap
 
 # commands to forward to the host
-for cmd in podman toolbox; do
+for cmd in podman buildah toolbox; do
     printf "#!/bin/sh\n/usr/libexec/flatpak-xdg-utils/flatpak-spawn --host $cmd \42\$@\42\n" | sudo tee /usr/local/bin/$cmd >/dev/null
     sudo chmod a+x /usr/local/bin/$cmd
 done

diff --git a/consors-report.py b/consors-report.py
index f76deb3ea6211cc68e5b117548f8ea5e028fb1a8..1241dbc6d03b464b65a8b087e61971dec60444b4 100755 (executable)
--- a/consors-report.py
+++ b/consors-report.py
@@ -16,17 +16,20 @@ CATEGORIES = {
     'Wohnung': re.compile('Telekom|hands4home|Goetzfried|Green Planet Energy|Beitragsservice.*Rundfunk', re.I),
     'Medizin': re.compile(r'Apotheke|MVZ|\bmed\b|ZAB Abrechnung|Caika|HNOeins|PVS|Dr\..*Sellier|'
                           r'BFS Health|Streifeneder|Labor|Physio|(Drescher.*Lung)|Osteopath|'
-                          '(Dr.*Borchers)|(Debeka.*Überweisung)|(DKV.*Überweisung)|Beihilfe|Klinik', re.I),
+                          '(Dr.*Borchers)|(Debeka.*Überweisung)|(DKV.*Überweisung)|Beihilfe|Klinik|'
+                          'Niklas Hermann|Alena Hauser|Strizrep|Aerzte|Hallesche.*Ausz|Physico|'
+                          'Orthop|Pathologie', re.I),
     'Versicherung': re.compile('((debeka|DKV|Hallesche|Versicherung|Alte Leipziger|ConceptIF|'
                                'Baloise).*Lastschrift)|Hallesche.*Bonu', re.I),
-    'Transport': re.compile('DB Vertrieb|Deutsche Bahn|Nextbike|Carsharing', re.I),
-    'Lebensmittel': re.compile('BIOS|Bäcker|Baecker|Ruta|Rewe', re.I),
-    'Eigentumswohnungen': re.compile('Rechnung Darl.-Leistung|Semmelweis', re.I),
+    'Transport': re.compile(r'DB Vertr\s*ieb|DB Fernverkehr|Deutsche Bahn|Nextbike|Carsharing|Radstation', re.I),
+    'Lebensmittel': re.compile('BIOS|Bäcker|Baecker|Baker|Schubert Bio|Ruta|Rewe|Edeka', re.I),
+    'Eigentumswohnungen': re.compile('Rechnung Darl.-Leistung|Semmelweis|BHP Buerkner|Dr. Schmitz', re.I),
     'Hobby/Sport': re.compile('Holstein|Mrs. Sporty|Kieser|DJK|Dimaso', re.I),
-    'Sparen': re.compile('Bausparkasse Mainz AG|FIL Fondsbank|MIG (Fonds|GmbH)|Netfonds AG', re.I),
+    'Sparen': re.compile('Bausparkasse Mainz AG|FIL Fondsbank|MIG (Fonds|GmbH)|Netfonds AG|Festgeld|'
+                         'MORGAN STANLEY', re.I),
     'Spenden': re.compile('Spende|Signal Foundation|nebenan.de|(paypal.*Sabine.Hossenf)|'
                           'Patreon|Umwelthilfe|Foerderer|Malteser|(Aktion Tier.*Mensch)|'
-                          'campact|Amnesty', re.I),
+                          'campact|Amnesty|BN Landesverband', re.I),
 }
 
 
@@ -47,6 +50,8 @@ def get_category(item: str) -> str:
 
 def parse_entry(raw_fields: Iterable[str]) -> Entry:
     fields = [f.strip() for f in raw_fields]
+    # format change in May 2024, adds a 9th field "Währung"; ignore
+    fields = fields[:8]
     # last field is the value, parse as float
     value = float(fields.pop().replace('.', '').replace(',', '.'))
     # match on who, IBAN, type, or desc
@@ -64,7 +69,7 @@ def parse_csv(path: Path, date_filter: str) -> Iterable[Entry]:
         return filter_re.search(entry.date)
 
     with path.open() as f:
-        reader = csv.reader(f)
+        reader = csv.reader(f, delimiter=';')
         next(reader)  # skip header
         # first line is the column headers, chop it off
         entries = map(parse_entry, reader)

diff --git a/daytime-term b/daytime-term
index 102e417c8ced4479a89f62eb3152a86e7ed5437b..51f9b827bc2d5fe84546bbf0146070b1a5e0dc02 100755 (executable)
--- a/daytime-term
+++ b/daytime-term
@@ -1,4 +1,5 @@
 #!/bin/sh
+DATA=$HOME/.cache/sunrise.json
 set -eu
 
 if [ "${1:-}" = "night" ]; then
@@ -6,8 +7,17 @@ if [ "${1:-}" = "night" ]; then
     night=1
 elif [ "${1:-}" = "day" ]; then
     night=
-elif [ `date +%k` -ge 20 ] || [ `date +%k` -lt 5 ]; then
-    night=1
+else
+    # get daylight times at most once a day
+    if [ ! -e "$DATA" ] || [ $(( `date +%s` - `stat -c %Y $DATA` )) -gt 86400 ]; then
+        curl --silent --show-error -o "$DATA" 'https://api.sunrise-sunset.org/json?lat=48.22&lng=10.54&formatted=0'
+    fi
+    sunrise=$(jq -r .results.sunrise < ~/.cache/sunrise.json)
+    sunset=$(jq -r .results.sunset < ~/.cache/sunrise.json)
+    now=$(date '+%H%M')
+    if [ $now -le $(date -d "$sunrise" '+%H%M') ] || [ $now -ge $(date -d "$sunset" '+%H%M') ]; then
+        night=1
+    fi
 fi
 
 if [ -n "${night:-}" ]; then

diff --git a/install-rhel-tools b/install-rhel-tools
index 741e0cf1c0a88b885b11b1248aebde96c10bce3f..4fc6d7b7e0a0df2bbf70c72e123b20731b2b3875 100755 (executable)
--- a/install-rhel-tools
+++ b/install-rhel-tools
@@ -9,7 +9,3 @@ sudo update-ca-trust
 
 (cd /etc/yum.repos.d; sudo curl -O --location https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-fedora.repo)
 sudo dnf install -y rhel-packager
-
-# coverity
-sudo dnf copr enable -y copr.devel.redhat.com/kdudka/covscan
-sudo dnf install -y covscan-client

diff --git a/recipekeeper-split b/recipekeeper-split
new file mode 100755 (executable)
index 0000000..a56f52e
--- /dev/null
+++ b/recipekeeper-split
@@ -0,0 +1,86 @@
+#!/usr/bin/python3
+import html
+import os
+import re
+import shutil
+import sys
+import xml.etree.ElementTree as ET
+import zipfile
+
+(recipe_zip, destdir) = sys.argv[1:]
+
+# init destdir
+if os.path.exists(destdir):
+    shutil.rmtree(destdir)
+os.makedirs(destdir)
+
+with zipfile.ZipFile(recipe_zip, 'r') as archive:
+    archive.extractall(path=destdir)
+
+
+def safe_filename(name):
+    name = re.sub(r"[^\w\s-]", '', name).strip().replace(' ', '_')
+    return name[:40]
+
+
+with open(os.path.join(destdir, "recipes.html"), "r") as f:
+    content = f.read()
+
+# 1. Fix <meta ...> tags: make them self-closing
+content_fixed = re.sub(r'(<meta\b[^>]*)(?<!/)>', r'\1 />', content)
+
+# 2. Fix unquoted itemprop attribute values (itemprop=foo -> itemprop="foo")
+# Only match when the value is not already quoted
+content_fixed = re.sub(r'itemprop=([^\s">]+)', r'itemprop="\1"', content_fixed)
+
+# Parse as XML
+tree = ET.ElementTree(ET.fromstring(content_fixed))
+root = tree.getroot()
+
+head = root.find('head')
+body = root.find('body')
+assert head is not None
+assert body is not None
+recipes = [div for div in body.findall('div') if div.get('class') == 'recipe-details']
+
+# Prepare the <meta http-equiv="content-type"...> tag string
+meta_tag = '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'
+
+for recipe in recipes:
+    h2 = recipe.find('.//h2[@itemprop="name"]')
+    meta_id = recipe.find('.//meta[@itemprop="recipeId"]')
+    if h2 is not None and h2.text and h2.text.strip():
+        base = safe_filename(html.unescape(h2.text))
+    elif meta_id is not None:
+        base = meta_id.attrib['content']
+    else:
+        base = "recipe"
+
+    filename = f"{base}.html"
+
+    # Convert head to string and insert the meta tag after <head>
+    head_str = ET.tostring(head, encoding="unicode")
+    head_str = re.sub(
+        r'(<head.*?>)',  # Match opening <head> tag (with possible attributes)
+        r'\1\n' + meta_tag,  # Insert meta tag right after opening tag
+        head_str,
+        count=1,
+        flags=re.IGNORECASE | re.DOTALL
+    )
+    # fix too small font sizes
+    head_str = re.sub(r'14px', '18pt', head_str)
+    head_str = re.sub(r'24px', '24pt', head_str)
+
+    out_html = (
+        '<!DOCTYPE html>\n<html>\n' +
+        head_str + '\n' +
+        '<body>\n' +
+        ET.tostring(recipe, encoding="unicode") + '\n' +
+        '</body>\n</html>'
+    )
+    with open(os.path.join(destdir, filename), "w", encoding="utf-8") as out:
+        out.write(out_html)
+
+    print(f"Wrote: {filename}")
+
+os.remove(os.path.join(destdir, "recipes.html"))

diff --git a/scandoc b/scandoc
index ebbce60c9a2c796f91f5dbd2251ae7fc34528369..3844e5c90939b36640960a159cf06bcc1659e95b 100755 (executable)
--- a/scandoc
+++ b/scandoc
@@ -13,10 +13,10 @@ echo "Output file directory: $D"
 PAGE=0
 while true; do
     PAGE=$((PAGE+1))
-    scanimage --device-name=genesys --format=png --progress --resolution 150 --mode Gray -x 210 -y 297 | convert -rotate 180 -modulate 120 -level 30,60% - cur.png
+    scanimage --device-name=genesys --format=png --progress --resolution 150 --mode Gray -x 210 -y 297 | magick - -rotate 180 -modulate 120 -level 30,60% cur.png
     FNAME=page`printf '%02i' $PAGE`
     pngquant 4 < cur.png > $FNAME.png
-    convert $FNAME.png $FNAME.pdf
+    magick $FNAME.png $FNAME.pdf
     echo "Insert next page and press Enter; q to stop"
     read x
     [ "$x" = q ] && break || true

diff --git a/system-maintenance b/system-maintenance
index 8db4659d343a2d3a3b06fa12f232485d27febd43..4b3557c9d923d620ef828ed3050831898342daf8 100755 (executable)
--- a/system-maintenance
+++ b/system-maintenance
@@ -11,6 +11,6 @@ rpm-ostree upgrade
 # fix fonts between Fedora releases
 rm -rf ~martin/.cache/fontconfig
 
-su -c 'flatpak -y update' martin
-
 fstrim -av
+
+echo 'Run this now: flatpak -y update'

diff --git a/ubuntu-backport-cockpit b/ubuntu-backport-cockpit
index c9e90e77430d4b39ffd607227aab2c5691aa8ea6..b1d182893b82113be8cf665adc8fb21217f5bd72 100755 (executable)
--- a/ubuntu-backport-cockpit
+++ b/ubuntu-backport-cockpit
@@ -1,9 +1,11 @@
 #!/bin/sh
 set -eu
 PACKAGE=${1:-cockpit}
-TARGET=${2:-jammy}
+TARGET=${2:-noble}
 POCKET="${TARGET}-backports"
 
+[ -z "${3:-}" ] || DSC=$(realpath "$3")
+
 series_ver() {
     ver=$(wget -q -O- http://de.archive.ubuntu.com/ubuntu/dists/$1/universe/source/Sources.xz | xz -d | grep-dctrl -n -sVersion -XP $PACKAGE | sort -u | tail -n1)
     ver=${ver%~bpo*}
@@ -28,14 +30,16 @@ upload() {
 rm -rf /tmp/backport
 mkdir /tmp/backport
 cd  /tmp/backport
-apt-get source $PACKAGE
+if [ -n "${DSC:-}" ]; then
+    dpkg-source -x "$DSC"
+else
+    apt-get source $PACKAGE
+fi
 cd ${PACKAGE}-*
 
 case "$TARGET" in
+    oracular) VER=24.10 ;;
     noble) VER=24.04 ;;
-    mantic) VER=23.10 ;;
-    lunar) VER=23.04 ;;
-    kinetic) VER=22.10 ;;
     jammy) VER=22.04 ;;
     *) echo "Unknown target $TARGET" >&2; exit 1 ;;
 esac

diff --git a/vm b/vm
index 174aedf385883e769757df714fe576db0c6bdbef..f403cb2860f5f9251da9bf3cc1c302e92fc5092b 100755 (executable)
--- a/vm
+++ b/vm
@@ -9,7 +9,7 @@ until echo '' | nc localhost $ssh_port 2>&1 >/dev/null | grep -q 'Connection ref
     ssh_port=$((ssh_port+1))
 done
 echo "Host ssh port: $ssh_port"
-qemu-system-x86_64 -enable-kvm -display sdl -m 2048 -device virtio-rng-pci \
+qemu-system-x86_64 -enable-kvm -cpu host -display sdl -m 2048 -device virtio-rng-pci \
     -drive file="$image",if=virtio \
     -virtfs local,id=src,path=$HOME,security_model=none,mount_tag=home,readonly=on \
     -net nic,model=virtio -net user,hostfwd=tcp::${ssh_port}-:22 "$@"