From f6a8d5c1340edea8924c71550dd2911b0f9c6582 Mon Sep 17 00:00:00 2001
From: Yorhel <git@yorhel.nl>
Date: Sun, 17 Oct 2021 09:56:28 +0200
Subject: [PATCH] Add Ubuntu 21.10

---
 lib/ManUtils/ManUtils.pm | 3 ++-
 sql/schema.sql           | 3 ++-
 util/ubuntu.sh           | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/ManUtils/ManUtils.pm b/lib/ManUtils/ManUtils.pm
index a325d17..251a20b 100644
--- a/lib/ManUtils/ManUtils.pm
+++ b/lib/ManUtils/ManUtils.pm
@@ -54,7 +54,7 @@ sub fmt {
   $input = encode_utf8($input);
 
   # grog has a tendency to recognize pod2man generated pages as -ms, let's just work around that by enforcing -man
-  return _groff $input, $output, $errors, $cv, 'groff', '-man' if $input =~ /^.\\" Automatically generated by Pod::Man/;
+  #return _groff $input, $output, $errors, $cv, 'groff', '-man' if $input =~ /^.\\" Automatically generated by Pod::Man/;
 
   # Call grog to figure out which preprocessors to use.
   my $grog = run_cmd [qw|grog -Tutf8 -DUTF-8 -|],
@@ -88,6 +88,7 @@ sub fmt {
       @cmd = (@cmd[0..$#cmd-1], $macros, $cmd[$#cmd]);
       push @$errors, "grog detected several macro packages: $double. Using $macros. (@cmd)";
     }
+    @cmd = map $_ eq '-ms' ? '-man' : $_, @cmd; # -ms is almost(?) always wrong.
 
     _groff $input, $output, $errors, $cv, @cmd;
   });
diff --git a/sql/schema.sql b/sql/schema.sql
index 08fc571..13fd88c 100644
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -264,7 +264,8 @@ INSERT INTO systems (id, name, release, short, relorder) VALUES
   (211,'Fedora',     '34',    'fedora-34',       33),
   (212,'Debian',     '11 (stable)','debian-bullseye',15),
   (213,'Debian',     '12 (testing)','debian-bookworm',16),
-  (214,'CentOS',     '8.4',   'centos-8.4',      64);
+  (214,'CentOS',     '8.4',   'centos-8.4',      64),
+  (215,'Ubuntu',     '21.10', 'ubuntu-impish',  34);
 
 
 -- Removes any path components and compression extensions from the filename.
diff --git a/util/ubuntu.sh b/util/ubuntu.sh
index 8aafcb8..17dd292 100755
--- a/util/ubuntu.sh
+++ b/util/ubuntu.sh
@@ -128,6 +128,9 @@ case $1 in
     hirsute)
         stdrepo hirsute $CMIRROR amd64
         ;;
+    impish)
+        stdrepo impish $CMIRROR amd64
+        ;;
     old)
         $0 warty
         $0 hoary
@@ -152,6 +155,7 @@ case $1 in
         $0 utopic
         $0 vivid
         $0 wily
+        $0 xenial
         $0 yakkety
         $0 zesty
         $0 artful
@@ -160,11 +164,11 @@ case $1 in
         $0 eoan
         ;;
     current)
-        $0 xenial   # until 2021-04
         $0 bionic   # until 2023-04
         $0 focal    # until 2030-04
         $0 groovy   # until 2021-07
         $0 hirsute  # until 2022-01
+        $0 impish   # until 2022-07
         ;;
     all)
         $0 old