From e321de044e491d352ae841b774a04f1ed88adb32 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sat, 27 May 2023 01:45:11 -0600
Subject: [PATCH] osinfo-db: patch db to prevent virt-manager breaking.

---
 helpers/DATA/osinfo-db/recommended-distros |  3 +++
 helpers/make-osinfo-db                     | 22 +++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/helpers/DATA/osinfo-db/recommended-distros b/helpers/DATA/osinfo-db/recommended-distros
index a45299b..6429288 100644
--- a/helpers/DATA/osinfo-db/recommended-distros
+++ b/helpers/DATA/osinfo-db/recommended-distros
@@ -7,3 +7,6 @@ Parabola - parabola.nu - parabola
 PureOS - pureos.net - pureos
 Trisquel - trisquel.info - trisquel
 Ututo - ututo.org - ututo
+
+# FIXME: Required on the array by virt-manager
+Debian - debian.org - debian
diff --git a/helpers/make-osinfo-db b/helpers/make-osinfo-db
index 5bcc3c8..29a59c2 100644
--- a/helpers/make-osinfo-db
+++ b/helpers/make-osinfo-db
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main'
 REPOKEY=04EE7237B7D453EC
@@ -43,13 +43,14 @@ do
 done
 for a in $(ls data/os/)
 do
-    # Remove os references
-    for b in $(grep -rl $a debian/patches/|sed 's|debian/patches/||')
+    # Remove patches for non-free references.
+    for b in $(grep -rl b/data/.*/$a debian/patches/|rev|awk -F '/' '{print$1}'|rev)
     do
         echo "Check for $b ..."
         sed -i "/$b/d" debian/patches/series
-        rm debian/patches/$b
+        rm -f debian/patches/$b
     done
+    rm -f $(grep -rl "\"os\", \"$a\"" scripts/updates/)
 done
 rm -rf data/os
 mv $TMPDIR data/os
@@ -64,8 +65,12 @@ do
     # Remove references to non-free containers
     for a in $(ls tests/isodata/)
     do
-        rm $(grep -rl $a ci/containers/) || true
-        rm $(grep -rl $a ci/buildenv/) || true
+        for b in $(grep -rl "ci/containers/$a" debian/patches/|rev|awk -F '/' '{print$1}'|rev)
+        do
+            rm -f debian/patches/$b
+            sed -i "/$b/d" debian/patches/series || true
+        done
+        rm -f $(ls ci/containers/$a*)
     done
 done
 rm -rf tests/isodata
@@ -83,14 +88,13 @@ rm -rf data/install-script
 mv $TMPDIR4 data/install-script
 
 # Avoid test error out.
-rm tests/test_treeinfo.py \
-   tests/test_related.py
+[ $(ls -A tests/treeinfodata)] || rm tests/test_treeinfo.py tests/test_related.py
 
 #Apply changes for new fully free distros availbale at libosinfo.
 # trisquel.info
 sed -i '/derives-from/d' data/os/trisquel.info/trisquel-9.xml.in
 sed -i '/release-date/a \ \ \ \ <codename>Etiona</codename>' data/os/trisquel.info/trisquel-9.xml.in
 
-changelog "Remove non-free suggestions from db osinfo."
+changelog "Remove non-free suggestions from osinfo-db."
 
 compile