Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
I'd like to update osinfo-db in stretch. This would allow us to have up
to date information for operating system installs with e.g. gnome-boxes
and virt-manager by adding new data for recent debian, ubuntu and
freebsd releases as well as updating existing ones.
Since it's a new upstream version I've attached the full diff (exluding
po/ to keep the size down). Note that osinfo-db was split out from
libosinfo to facilitate this kind of upgrades.
O.k. to upload to stretch-p-u?
Cheers,
-- Guido
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable-debug'), (500,
'testing-debug'), (500, 'stable-updates'), (500, 'oldoldstable'), (500,
'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 4.14.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8),
LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff --git a/Makefile b/Makefile
index 1846f7a..329f409 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ SCHEMA_FILES = data/schema/osinfo.rng
ARCHIVE = osinfo-db-$(TODAY).tar.xz
-ZANATA = zanata-cli
+ZANATA = zanata
XMLLINT = xmllint
@@ -91,10 +91,10 @@ po/osinfo-db.pot: po/POTFILES.in $(DATA_FILES_IN)
$(V_GEN) cd po && $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
po-push: po/osinfo-db.pot
- $(ZANATA) push
+ (cd po && $(ZANATA) push --push-type source)
po-pull: po/osinfo-db.pot
- $(ZANATA) pull
+ (cd po && $(ZANATA) pull)
update-po:
cd po && \
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index 8ad189b..7b1a690 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -33,7 +33,7 @@
</resources>
<media arch="i686">
- <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/i386/iso-dvd/debian-8.8.0-i386-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/i386/iso-dvd/debian-8.10.0-i386-DVD-1.iso</url>
<iso>
<volume-id>Debian 8.\d.\d i386 1</volume-id>
</iso>
@@ -41,7 +41,7 @@
<initrd>install.386/initrd.gz</initrd>
</media>
<media arch="x86_64">
- <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/amd64/iso-dvd/debian-8.8.0-amd64-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/amd64/iso-dvd/debian-8.10.0-amd64-DVD-1.iso</url>
<iso>
<volume-id>Debian 8.\d.\d amd64 1</volume-id>
</iso>
diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index 759422b..54bdde3 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -49,7 +49,7 @@
<!-- Network installer -->
<media arch="i686">
<variant id="universal-netinst"/>
- <url>http://cdimage.debian.org/cdimage/archive/9.0.0/i386/iso-cd/debian-9.0.0-i386-netinst.iso</url>
+ <url>http://cdimage.debian.org/cdimage/archive/9.2.1/i386/iso-cd/debian-9.2.1-i386-netinst.iso</url>
<iso>
<volume-id>Debian 9.(\d)+.(\d)+ i386 n</volume-id>
</iso>
@@ -58,7 +58,7 @@
</media>
<media arch="x86_64">
<variant id="universal-netinst"/>
- <url>http://cdimage.debian.org/cdimage/archive/9.0.0/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso</url>
+ <url>http://cdimage.debian.org/cdimage/archive/9.2.1/amd64/iso-cd/debian-9.2.1-amd64-netinst.iso</url>
<iso>
<volume-id>Debian 9.(\d)+.(\d)+ amd64 n</volume-id>
</iso>
@@ -67,7 +67,7 @@
</media>
<media arch="aarch64">
<variant id="universal-netinst"/>
- <url>http://cdimage.debian.org/cdimage/archive/9.0.0/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso</url>
+ <url>http://cdimage.debian.org/cdimage/archive/9.2.1/arm64/iso-cd/debian-9.2.1-arm64-netinst.iso</url>
<iso>
<volume-id>Debian 9.(\d)+.(\d)+ arm64 n</volume-id>
</iso>
@@ -76,7 +76,7 @@
</media>
<media arch="armv7l">
<variant id="universal-netinst"/>
- <url>http://cdimage.debian.org/cdimage/archive/9.0.0/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso</url>
+ <url>http://cdimage.debian.org/cdimage/archive/9.2.1/armhf/iso-cd/debian-9.2.1-armhf-netinst.iso</url>
<iso>
<volume-id>Debian 9.(\d)+.(\d)+ armhf n</volume-id>
</iso>
@@ -87,7 +87,7 @@
<!-- DVD -->
<media arch="i686">
<variant id="universal"/>
- <url>http://cdimage.debian.org/cdimage/archive/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/cdimage/archive/9.2.1/i386/iso-dvd/debian-9.2.1-i386-DVD-1.iso</url>
<iso>
<volume-id>Debian 9.(\d)+.(\d)+ i386 1</volume-id>
</iso>
@@ -96,7 +96,7 @@
</media>
<media arch="x86_64">
<variant id="universal"/>
- <url>http://cdimage.debian.org/cdimage/archive/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/cdimage/archive/9.2.1/amd64/iso-dvd/debian-9.2.1-amd64-DVD-1.iso</url>
<iso>
<volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id>
</iso>
@@ -105,7 +105,7 @@
</media>
<media arch="aarch64">
<variant id="universal"/>
- <url>http://cdimage.debian.org/cdimage/archive/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/cdimage/archive/9.2.1/arm64/iso-dvd/debian-9.2.1-arm64-DVD-1.iso</url>
<iso>
<volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id>
</iso>
@@ -114,7 +114,7 @@
</media>
<media arch="armv7l">
<variant id="universal"/>
- <url>http://cdimage.debian.org/cdimage/archive/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/cdimage/archive/9.2.1/armhf/iso-dvd/debian-9.2.1-armhf-DVD-1.iso</url>
<iso>
<volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id>
</iso>
diff --git a/data/os/fedoraproject.org/fedora-22.xml.in b/data/os/fedoraproject.org/fedora-22.xml.in
index 57fd234..6b980a4 100644
--- a/data/os/fedoraproject.org/fedora-22.xml.in
+++ b/data/os/fedoraproject.org/fedora-22.xml.in
@@ -32,7 +32,7 @@
<!-- Live -->
<media arch="i686" live="true">
<variant id="workstation"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Live-Workstation-i686-22-3.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Live-Workstation-i686-22-3.iso</url>
<iso>
<volume-id>Fedora-Live-WS-i686-22.*</volume-id>
<system-id>LINUX</system-id>
@@ -43,7 +43,7 @@
</media>
<media arch="x86_64" live="true">
<variant id="workstation"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-22-3.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-22-3.iso</url>
<iso>
<volume-id>Fedora-Live-WS-x86_64-22.*</volume-id>
<system-id>LINUX</system-id>
@@ -56,7 +56,7 @@
<!-- Network Installer !-->
<media arch="i686">
<variant id="workstation-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Workstation-netinst-i386-22.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Workstation-netinst-i386-22.iso</url>
<iso>
<volume-id>Fedora-22-i386</volume-id>
<system-id>LINUX</system-id>
@@ -67,7 +67,7 @@
</media>
<media arch="x86_64">
<variant id="workstation-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-22.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-22.iso</url>
<iso>
<volume-id>Fedora-22-x86_64</volume-id>
<system-id>LINUX</system-id>
@@ -82,7 +82,7 @@
<!-- DVD -->
<media arch="i686">
<variant id="server"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso</url>
<iso>
<volume-id>Fedora-22-i386</volume-id>
<system-id>LINUX</system-id>
@@ -93,7 +93,7 @@
</media>
<media arch="x86_64">
<variant id="server"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso</url>
<iso>
<volume-id>Fedora-22-x86_64</volume-id>
<system-id>LINUX</system-id>
@@ -106,7 +106,7 @@
<!-- Network Installer !-->
<media arch="i686">
<variant id="server-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-netinst-i386-22.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-netinst-i386-22.iso</url>
<iso>
<volume-id>Fedora-22-i386</volume-id>
<system-id>LINUX</system-id>
@@ -117,7 +117,7 @@
</media>
<media arch="x86_64">
<variant id="server-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-netinst-x86_64-22.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-netinst-x86_64-22.iso</url>
<iso>
<volume-id>Fedora-22-x86_64</volume-id>
<system-id>LINUX</system-id>
@@ -129,7 +129,7 @@
<tree arch="i686">
<variant id="server"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Server/i386/os/</url>
<treeinfo>
<family>Fedora</family>
<version>22</version>
@@ -137,7 +137,7 @@
</treeinfo>
</tree>
<tree arch="x86_64">
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/22/Server/x86_64/os/</url>
<variant id="server"/>
<treeinfo>
<family>Fedora</family>
diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
index 61d4116..2711620 100644
--- a/data/os/fedoraproject.org/fedora-23.xml.in
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -45,7 +45,7 @@
<!-- Live -->
<media arch="i686" live="true">
<variant id="workstation"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Live-Workstation-i686-23-10.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Live-Workstation-i686-23-10.iso</url>
<iso>
<volume-id>Fedora-Live-WS-i686-23.*</volume-id>
<system-id>LINUX</system-id>
@@ -55,7 +55,7 @@
</media>
<media arch="x86_64" live="true">
<variant id="workstation"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-23-10.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-23-10.iso</url>
<iso>
<volume-id>Fedora-Live-WS-x86_64-23.*</volume-id>
<system-id>LINUX</system-id>
@@ -67,7 +67,7 @@
<!-- Network Installer !-->
<media arch="i686">
<variant id="workstation-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Workstation-netinst-i386-23.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Workstation-netinst-i386-23.iso</url>
<iso>
<volume-id>Fedora-WS-23(_[[:alpha:]]*)*-i386</volume-id>
<system-id>LINUX</system-id>
@@ -77,7 +77,7 @@
</media>
<media arch="x86_64">
<variant id="workstation-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-23.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-23.iso</url>
<iso>
<volume-id>Fedora-WS-23(_[[:alpha:]]*)*-x86_64</volume-id>
<system-id>LINUX</system-id>
@@ -91,7 +91,7 @@
<!-- DVD -->
<media arch="i686">
<variant id="server"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-DVD-i386-23.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-DVD-i386-23.iso</url>
<iso>
<volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id>
<system-id>LINUX</system-id>
@@ -106,7 +106,7 @@
</media>
<media arch="x86_64">
<variant id="server"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-DVD-x86_64-23.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-DVD-x86_64-23.iso</url>
<iso>
<volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id>
<system-id>LINUX</system-id>
@@ -119,7 +119,7 @@
<!-- Network Installer !-->
<media arch="i686">
<variant id="server-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-netinst-i386-23.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-netinst-i386-23.iso</url>
<iso>
<volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id>
<system-id>LINUX</system-id>
@@ -130,7 +130,7 @@
</media>
<media arch="x86_64">
<variant id="server-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-netinst-x86_64-23.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-netinst-x86_64-23.iso</url>
<iso>
<volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id>
<system-id>LINUX</system-id>
@@ -142,7 +142,7 @@
<tree arch="i686">
<variant id="server"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Server/i386/os/</url>
<treeinfo>
<family>Fedora</family>
<version>23</version>
@@ -150,7 +150,7 @@
</treeinfo>
</tree>
<tree arch="x86_64">
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Server/x86_64/os/</url>
<variant id="server"/>
<treeinfo>
<family>Fedora</family>
diff --git a/data/os/fedoraproject.org/fedora-24.xml.in b/data/os/fedoraproject.org/fedora-24.xml.in
index 495b068..a405b6d 100644
--- a/data/os/fedoraproject.org/fedora-24.xml.in
+++ b/data/os/fedoraproject.org/fedora-24.xml.in
@@ -36,7 +36,7 @@
<!-- Live -->
<media arch="i686" live="true">
<variant id="workstation"/>
- <url>https://download.fedoraproject.org/pub/fedora/linux/releases/24/Workstation/i386/iso/Fedora-Workstation-Live-i386-24-1.2.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Workstation/i386/iso/Fedora-Workstation-Live-i386-24-1.2.iso</url>
<iso>
<volume-id>Fedora-WS-Live-24.*</volume-id>
<system-id>LINUX</system-id>
@@ -46,7 +46,7 @@
</media>
<media arch="x86_64" live="true">
<variant id="workstation"/>
- <url>https://download.fedoraproject.org/pub/fedora/linux/releases/24/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-24-1.2.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-24-1.2.iso</url>
<iso>
<volume-id>Fedora-WS-Live-24.*</volume-id>
<system-id>LINUX</system-id>
@@ -58,7 +58,7 @@
<!-- Network Installer !-->
<media arch="i686">
<variant id="workstation-netinst"/>
- <url>https://download.fedoraproject.org/pub/fedora/linux/releases/24/Workstation/i386/iso/Fedora-Workstation-netinst-i386-24-1.2.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Workstation/i386/iso/Fedora-Workstation-netinst-i386-24-1.2.iso</url>
<iso>
<volume-id>Fedora-WS-dvd-i386-24</volume-id>
<system-id>LINUX</system-id>
@@ -68,7 +68,7 @@
</media>
<media arch="x86_64">
<variant id="workstation-netinst"/>
- <url>https://download.fedoraproject.org/pub/fedora/linux/releases/24/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-24-1.2.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-24-1.2.iso</url>
<iso>
<volume-id>Fedora-WS-dvd-x86_64-24</volume-id>
<system-id>LINUX</system-id>
@@ -82,7 +82,7 @@
<!-- DVD -->
<media arch="i686">
<variant id="server"/>
- <url>https://download.fedoraproject.org/pub/fedora/linux/releases/24/Server/i386/iso/Fedora-Server-dvd-i386-24-1.2.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Server/i386/iso/Fedora-Server-dvd-i386-24-1.2.iso</url>
<iso>
<volume-id>Fedora-S-dvd-i386-24</volume-id>
<system-id>LINUX</system-id>
@@ -97,7 +97,7 @@
</media>
<media arch="x86_64">
<variant id="server"/>
- <url>https://download.fedoraproject.org/pub/fedora/linux/releases/24/Server/x86_64/iso/Fedora-Server-dvd-x86_64-24-1.2.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Server/x86_64/iso/Fedora-Server-dvd-x86_64-24-1.2.iso</url>
<iso>
<volume-id>Fedora-S-dvd-x86_64-24</volume-id>
<system-id>LINUX</system-id>
@@ -110,7 +110,7 @@
<!-- Network Installer !-->
<media arch="i686">
<variant id="server-netinst"/>
- <url>https://download.fedoraproject.org/pub/fedora/linux/releases/24/Server/i386/iso/Fedora-Server-netinst-i386-24-1.2.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Server/i386/iso/Fedora-Server-netinst-i386-24-1.2.iso</url>
<iso>
<volume-id>Fedora-S-dvd-i386-24</volume-id>
<system-id>LINUX</system-id>
@@ -121,7 +121,7 @@
</media>
<media arch="x86_64">
<variant id="server-netinst"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/24/Server/x86_64/iso/Fedora-Server-netinst-x86_64-24-1.2.iso</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Server/x86_64/iso/Fedora-Server-netinst-x86_64-24-1.2.iso</url>
<iso>
<volume-id>Fedora-S-dvd-x86_64-24</volume-id>
<system-id>LINUX</system-id>
@@ -133,7 +133,7 @@
<tree arch="i686">
<variant id="server"/>
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/24/Server/i386/os/</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Server/i386/os/</url>
<treeinfo>
<family>Fedora</family>
<version>24</version>
@@ -141,7 +141,7 @@
</treeinfo>
</tree>
<tree arch="x86_64">
- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/24/Server/x86_64/os/</url>
+ <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/24/Server/x86_64/os/</url>
<variant id="server"/>
<treeinfo>
<family>Fedora</family>
diff --git a/data/os/freebsd.org/freebsd-10.4.xml.in b/data/os/freebsd.org/freebsd-10.4.xml.in
new file mode 100644
index 0000000..5697b69
--- /dev/null
+++ b/data/os/freebsd.org/freebsd-10.4.xml.in
@@ -0,0 +1,51 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://freebsd.org/freebsd/10.4";>
+ <short-id>freebsd10.4</short-id>
+ <_name>FreeBSD 10.4</_name>
+ <version>10.4</version>
+ <_vendor>FreeBSD Project</_vendor>
+ <family>freebsd</family>
+ <distro>freebsd</distro>
+ <upgrades id="http://freebsd.org/freebsd/10.3"/>
+ <derives-from id="http://freebsd.org/freebsd/10.3"/>
+
+ <release-date>2017-10-04</release-date>
+ <eol-date>2018-10-31</eol-date>
+
+ <devices>
+ <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+ <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+ </devices>
+
+ <media arch="x86_64">
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/10.4/FreeBSD-10.4-RELEASE-amd64-dvd1.iso</url>
+ <iso>
+ <system-id>FreeBSD</system-id>
+ <volume-id>10_4_RELEASE_AMD64_DVD</volume-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/10.4/FreeBSD-10.4-RELEASE-amd64-disc1.iso</url>
+ <iso>
+ <system-id>FreeBSD</system-id>
+ <volume-id>10_4_RELEASE_AMD64_CD</volume-id>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/10.4/FreeBSD-10.4-RELEASE-i386-dvd1.iso</url>
+ <iso>
+ <system-id>FreeBSD</system-id>
+ <volume-id>10_4_RELEASE_I386_DVD</volume-id>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/10.4/FreeBSD-10.4-RELEASE-i386-disc1.iso</url>
+ <iso>
+ <system-id>FreeBSD</system-id>
+ <volume-id>10_4_RELEASE_I386_CD</volume-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/freebsd.org/freebsd-11.0.xml.in b/data/os/freebsd.org/freebsd-11.0.xml.in
index 9af534f..337e033 100644
--- a/data/os/freebsd.org/freebsd-11.0.xml.in
+++ b/data/os/freebsd.org/freebsd-11.0.xml.in
@@ -19,28 +19,28 @@
</devices>
<media arch="x86_64">
- <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-amd64-dvd1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-amd64-dvd1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>11_0_RELEASE_P1_AMD64_DVD</volume-id>
</iso>
</media>
<media arch="x86_64">
- <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-amd64-disc1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-amd64-disc1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>11_0_RELEASE_P1_AMD64_CD</volume-id>
</iso>
</media>
<media arch="i686">
- <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-i386-dvd1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-i386-dvd1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>11_0_RELEASE_P1_I386_DVD</volume-id>
</iso>
</media>
<media arch="i686">
- <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-i386-disc1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-i386-disc1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>11_0_RELEASE_P1_I386_CD</volume-id>
diff --git a/data/os/freebsd.org/freebsd-11.1.xml.in b/data/os/freebsd.org/freebsd-11.1.xml.in
index 4635c17..837a285 100644
--- a/data/os/freebsd.org/freebsd-11.1.xml.in
+++ b/data/os/freebsd.org/freebsd-11.1.xml.in
@@ -19,28 +19,28 @@
</devices>
<media arch="x86_64">
- <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.1/FreeBSD-11.1-RELEASE-amd64-dvd1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.1/FreeBSD-11.1-RELEASE-amd64-dvd1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>11_1_RELEASE_AMD64_DVD</volume-id>
</iso>
</media>
<media arch="x86_64">
- <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.1/FreeBSD-11.1-RELEASE-amd64-disc1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.1/FreeBSD-11.1-RELEASE-amd64-disc1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>11_1_RELEASE_AMD64_CD</volume-id>
</iso>
</media>
<media arch="i686">
- <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.0/FreeBSD-11.0-RELEASE-i386-dvd1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.1/FreeBSD-11.1-RELEASE-i386-dvd1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>11_1_RELEASE_I386_DVD</volume-id>
</iso>
</media>
<media arch="i686">
- <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.1/FreeBSD-11.1-RELEASE-i386-disc1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.1/FreeBSD-11.1-RELEASE-i386-disc1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>11_1_RELEASE_I386_CD</volume-id>
diff --git a/data/os/freedos.org/freedos-1.2.xml.in b/data/os/freedos.org/freedos-1.2.xml.in
new file mode 100644
index 0000000..c4dee6a
--- /dev/null
+++ b/data/os/freedos.org/freedos-1.2.xml.in
@@ -0,0 +1,53 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://freedos.org/freedos/1.2";>
+ <short-id>freedos1.2</short-id>
+ <_name>FreeDOS 1.2</_name>
+ <version>1.2</version>
+ <_vendor>FreeDOS</_vendor>
+ <family>linux</family>
+ <distro>freedos</distro>
+
+ <release-date>2016-12-25</release-date>
+
+ <variant id="standard">
+ <_name>FreeDOS 1.2 "Standard" Installer</_name>
+ </variant>
+ <variant id="legacy">
+ <_name>FreeDOS 1.2 "Legacy" Installer</_name>
+ </variant>
+
+ <media arch="x86_64">
+ <variant id="standard"/>
+ <url>http://www.freedos.org/download/download/FD12CD.iso</url>
+ <iso>
+ <volume-id>FD-SETUP</volume-id>
+ <system-id>LINUX</system-id>
+ </iso>
+ </media>
+
+ <media arch="x86_64">
+ <variant id="legacy"/>
+ <url>http://www.freedos.org/download/download/FD12LGCY.iso</url>
+ <iso>
+ <volume-id>FDI-CD</volume-id>
+ <system-id>LINUX</system-id>
+ </iso>
+ </media>
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>33554432</ram>
+ <storage>209715200</storage>
+ </minimum>
+
+ <recommended>
+ <ram>67108864</ram>
+ <storage>419430400</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>
diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index e443276..b44a38c 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -87,7 +87,7 @@
</media>
<media arch="x86_64">
<iso>
- <volume-id>(J_)?CCSN?A_X64FRE_</volume-id>
+ <volume-id>(J_)?(CCSN?A|CCOMA)_X64FRE_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
</iso>
diff --git a/data/os/netbsd.org/netbsd-6.0.xml.in b/data/os/netbsd.org/netbsd-6.0.xml.in
new file mode 100644
index 0000000..4c12e99
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-6.0.xml.in
@@ -0,0 +1,64 @@
+<libosinfo version="0.0.1">
+
+ <os id="http://netbsd.org/netbsd/6.0";>
+ <short-id>netbsd6.0</short-id>
+ <_name>NetBSD 6.0</_name>
+ <version>6.0</version>
+ <_vendor>NetBSD Project</_vendor>
+ <family>netbsd</family>
+ <distro>netbsd</distro>
+ <upgrades id="http://netbsd.org/netbsd/5.0"/>
+ <derives-from id="http://netbsd.org/netbsd/5.0"/>
+
+ <release-date>2012-10-13</release-date>
+
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_60</volume-id>
+ <volume-size>345745408</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_60</volume-id>
+ <volume-size>48611328</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_60</volume-id>
+ <volume-size>48611328</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-i386.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_60</volume-id>
+ <volume-size>327729152</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_60</volume-id>
+ <volume-size>44697600</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_60</volume-id>
+ <volume-size>44697600</volume-size>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/netbsd.org/netbsd-6.1.xml.in b/data/os/netbsd.org/netbsd-6.1.xml.in
new file mode 100644
index 0000000..1598f98
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-6.1.xml.in
@@ -0,0 +1,64 @@
+<libosinfo version="0.0.1">
+
+ <os id="http://netbsd.org/netbsd/6.1";>
+ <short-id>netbsd6.1</short-id>
+ <_name>NetBSD 6.1</_name>
+ <version>6.1</version>
+ <_vendor>NetBSD Project</_vendor>
+ <family>netbsd</family>
+ <distro>netbsd</distro>
+ <upgrades id="http://netbsd.org/netbsd/6.0"/>
+ <derives-from id="http://netbsd.org/netbsd/6.0"/>
+
+ <release-date>2013-05-13</release-date>
+
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-amd64.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_61</volume-id>
+ <volume-size>346626048</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_61</volume-id>
+ <volume-size>48799744</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_61</volume-id>
+ <volume-size>48799744</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-i386.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_61</volume-id>
+ <volume-size>328699904</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_61</volume-id>
+ <volume-size>44843008</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_61</volume-id>
+ <volume-size>44843008</volume-size>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/netbsd.org/netbsd-7.0.xml.in b/data/os/netbsd.org/netbsd-7.0.xml.in
new file mode 100644
index 0000000..f03b360
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.0.xml.in
@@ -0,0 +1,64 @@
+<libosinfo version="0.0.1">
+
+ <os id="http://netbsd.org/netbsd/7.0";>
+ <short-id>netbsd7.0</short-id>
+ <_name>NetBSD 7.0</_name>
+ <version>7.0</version>
+ <_vendor>NetBSD Project</_vendor>
+ <family>netbsd</family>
+ <distro>netbsd</distro>
+ <upgrades id="http://netbsd.org/netbsd/6.0"/>
+ <derives-from id="http://netbsd.org/netbsd/6.0"/>
+
+ <release-date>2015-09-25</release-date>
+
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-amd64.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_70</volume-id>
+ <volume-size>389470208</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_70</volume-id>
+ <volume-size>84928512</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_70</volume-id>
+ <volume-size>84928512</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-i386.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_70</volume-id>
+ <volume-size>424046592</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_70</volume-id>
+ <volume-size>89761792</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_70</volume-id>
+ <volume-size>89761792</volume-size>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/netbsd.org/netbsd-7.1.1.xml.in b/data/os/netbsd.org/netbsd-7.1.1.xml.in
new file mode 100644
index 0000000..0206357
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.1.1.xml.in
@@ -0,0 +1,64 @@
+<libosinfo version="0.0.1">
+
+ <os id="http://netbsd.org/netbsd/7.1.1";>
+ <short-id>netbsd7.1.1</short-id>
+ <_name>NetBSD 7.1.1</_name>
+ <version>7.1.1</version>
+ <_vendor>NetBSD Project</_vendor>
+ <family>netbsd</family>
+ <distro>netbsd</distro>
+ <upgrades id="http://netbsd.org/netbsd/7.1"/>
+ <derives-from id="http://netbsd.org/netbsd/7.1"/>
+
+ <release-date>2017-12-22</release-date>
+
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/images/NetBSD-7.1.1-amd64.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_711</volume-id>
+ <volume-size>393512960</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/amd64/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_711</volume-id>
+ <volume-size>85925888</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/amd64/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_711</volume-id>
+ <volume-size>85925888</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/images/NetBSD-7.1.1-i386.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_711</volume-id>
+ <volume-size>427722752</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/i386/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_711</volume-id>
+ <volume-size>90769408</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/i386/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_711</volume-id>
+ <volume-size>90769408</volume-size>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/netbsd.org/netbsd-7.1.xml.in b/data/os/netbsd.org/netbsd-7.1.xml.in
new file mode 100644
index 0000000..5cd4833
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.1.xml.in
@@ -0,0 +1,64 @@
+<libosinfo version="0.0.1">
+
+ <os id="http://netbsd.org/netbsd/7.1";>
+ <short-id>netbsd7.1</short-id>
+ <_name>NetBSD 7.1</_name>
+ <version>7.1</version>
+ <_vendor>NetBSD Project</_vendor>
+ <family>netbsd</family>
+ <distro>netbsd</distro>
+ <upgrades id="http://netbsd.org/netbsd/7.0"/>
+ <derives-from id="http://netbsd.org/netbsd/7.0"/>
+
+ <release-date>2017-03-11</release-date>
+
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-amd64.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_71</volume-id>
+ <volume-size>390959104</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_71</volume-id>
+ <volume-size>85082112</volume-size>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_71</volume-id>
+ <volume-size>85082112</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-i386.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_71</volume-id>
+ <volume-size>425703424</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_71</volume-id>
+ <volume-size>89937920</volume-size>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot-com.iso</url>
+ <iso>
+ <system-id>NetBSD</system-id>
+ <volume-id>NETBSD_71</volume-id>
+ <volume-size>89937920</volume-size>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/openbsd.org/openbsd-5.9.xml.in b/data/os/openbsd.org/openbsd-5.9.xml.in
new file mode 100644
index 0000000..8a66aed
--- /dev/null
+++ b/data/os/openbsd.org/openbsd-5.9.xml.in
@@ -0,0 +1,35 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://openbsd.org/openbsd/5.9";>
+ <short-id>openbsd5.9</short-id>
+ <_name>OpenBSD 5.9</_name>
+ <version>5.9</version>
+ <family>openbsd</family>
+ <distro>openbsd</distro>
+ <_vendor>OpenBSD Project</_vendor>
+ <upgrades id='http://openbsd.org/openbsd/5.8'/>
+
+ <release-date>2016-03-29</release-date>
+
+ <media arch='i686'>
+ <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/5.9/i386/install59.iso</url>
+ <iso>
+ <publisher-id>The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.9 Install CD</volume-id>
+ <application-id>OpenBSD 5.9 i386 Install CD</application-id>
+ </iso>
+ </media>
+
+ <media arch='x86_64'>
+ <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/5.9/amd64/install59.iso</url>
+ <iso>
+ <publisher-id>The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.9 Install CD</volume-id>
+ <application-id>OpenBSD 5.9 amd64 Install CD</application-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/openbsd.org/openbsd-6.0.xml.in b/data/os/openbsd.org/openbsd-6.0.xml.in
new file mode 100644
index 0000000..244be03
--- /dev/null
+++ b/data/os/openbsd.org/openbsd-6.0.xml.in
@@ -0,0 +1,35 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://openbsd.org/openbsd/6.0";>
+ <short-id>openbsd6.0</short-id>
+ <_name>OpenBSD 6.0</_name>
+ <version>6.0</version>
+ <family>openbsd</family>
+ <distro>openbsd</distro>
+ <_vendor>OpenBSD Project</_vendor>
+ <upgrades id='http://openbsd.org/openbsd/5.9'/>
+
+ <release-date>2016-09-01</release-date>
+
+ <media arch='i686'>
+ <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.0/i386/install60.iso</url>
+ <iso>
+ <publisher-id>The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 6.0 Install CD</volume-id>
+ <application-id>OpenBSD 6.0 i386 Install CD</application-id>
+ </iso>
+ </media>
+
+ <media arch='x86_64'>
+ <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.0/amd64/install60.iso</url>
+ <iso>
+ <publisher-id>The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 6.0 Install CD</volume-id>
+ <application-id>OpenBSD 6.0 amd64 Install CD</application-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/openbsd.org/openbsd-6.1.xml.in b/data/os/openbsd.org/openbsd-6.1.xml.in
new file mode 100644
index 0000000..0add743
--- /dev/null
+++ b/data/os/openbsd.org/openbsd-6.1.xml.in
@@ -0,0 +1,35 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://openbsd.org/openbsd/6.1";>
+ <short-id>openbsd6.1</short-id>
+ <_name>OpenBSD 6.1</_name>
+ <version>6.1</version>
+ <family>openbsd</family>
+ <distro>openbsd</distro>
+ <_vendor>OpenBSD Project</_vendor>
+ <upgrades id='http://openbsd.org/openbsd/6.0'/>
+
+ <release-date>2017-04-11</release-date>
+
+ <media arch='i686'>
+ <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.1/i386/install61.iso</url>
+ <iso>
+ <publisher-id>The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 6.1 Install CD</volume-id>
+ <application-id>OpenBSD 6.1 i386 Install CD</application-id>
+ </iso>
+ </media>
+
+ <media arch='x86_64'>
+ <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.1/amd64/install61.iso</url>
+ <iso>
+ <publisher-id>The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 6.1 Install CD</volume-id>
+ <application-id>OpenBSD 6.1 amd64 Install CD</application-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/openbsd.org/openbsd-6.2.xml.in b/data/os/openbsd.org/openbsd-6.2.xml.in
new file mode 100644
index 0000000..08e5789
--- /dev/null
+++ b/data/os/openbsd.org/openbsd-6.2.xml.in
@@ -0,0 +1,35 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://openbsd.org/openbsd/6.2";>
+ <short-id>openbsd6.2</short-id>
+ <_name>OpenBSD 6.2</_name>
+ <version>6.2</version>
+ <family>openbsd</family>
+ <distro>openbsd</distro>
+ <_vendor>OpenBSD Project</_vendor>
+ <upgrades id='http://openbsd.org/openbsd/6.1'/>
+
+ <release-date>2017-10-09</release-date>
+
+ <media arch='i686'>
+ <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.2/i386/install62.iso</url>
+ <iso>
+ <publisher-id>The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 6.2 Install CD</volume-id>
+ <application-id>OpenBSD 6.2 i386 Install CD</application-id>
+ </iso>
+ </media>
+
+ <media arch='x86_64'>
+ <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.2/amd64/install62.iso</url>
+ <iso>
+ <publisher-id>The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 6.2 Install CD</volume-id>
+ <application-id>OpenBSD 6.2 amd64 Install CD</application-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/opensuse.org/opensuse-42.3.xml.in b/data/os/opensuse.org/opensuse-42.3.xml.in
new file mode 100644
index 0000000..e906eb2
--- /dev/null
+++ b/data/os/opensuse.org/opensuse-42.3.xml.in
@@ -0,0 +1,59 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://opensuse.org/opensuse/42.3";>
+ <short-id>opensuse42.3</short-id>
+ <_name>openSUSE Leap 42.3</_name>
+ <version>42.3</version>
+ <_vendor>openSUSE</_vendor>
+ <family>linux</family>
+ <distro>opensuse</distro>
+ <upgrades id="http://opensuse.org/opensuse/42.2"; />
+ <derives-from id="http://opensuse.org/opensuse/42.2"; />
+
+ <release-date>2017-07-26</release-date>
+ <eol-date>2019-01-31</eol-date>
+
+ <devices>
+ <device id="http://pcisig.com/pci/1af4/1041"/>
+ <device id="http://pcisig.com/pci/1af4/1042"/>
+ <device id="http://pcisig.com/pci/1af4/1043"/>
+ <device id="http://pcisig.com/pci/1af4/1044"/>
+ <device id="http://pcisig.com/pci/1af4/1045"/>
+ <device id="http://pcisig.com/pci/1af4/1048"/>
+ <device id="http://pcisig.com/pci/1af4/1049"/>
+ <device id="http://pcisig.com/pci/1af4/1052"/>
+ <device id="http://pcisig.com/pci/1af4/1050"/>
+ </devices>
+
+ <media arch="x86_64">
+ <url>http://download.opensuse.org/distribution/leap/42.3/iso/openSUSE-Leap-42.3-DVD-x86_64.iso</url>
+ <iso>
+ <volume-id>openSUSE-Leap-42.3-DVD-x86_64*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX GmbH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+ <installer>
+ <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
+ <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
+ </installer>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1600000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>1073741824</ram>
+ <storage>3221225472</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>2147483648</ram>
+ <storage>17179869184</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>
diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
index e11e0b8..14ad86d 100644
--- a/data/os/ubuntu.com/ubuntu-16.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
@@ -31,7 +31,7 @@
</resources>
<media arch="i686">
- <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.2-server-i386.iso</url>
+ <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.3-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 16.04(.\d)? LTS i386</volume-id>
</iso>
@@ -39,7 +39,7 @@
<initrd>install/initrd.gz</initrd>
</media>
<media arch="x86_64">
- <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.2-server-amd64.iso</url>
+ <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.3-server-amd64.iso</url>
<iso>
<volume-id>Ubuntu-Server 16.04(.\d)? LTS amd64</volume-id>
</iso>
@@ -47,7 +47,7 @@
<initrd>install/initrd.gz</initrd>
</media>
<media arch="i686" live="true">
- <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.2-desktop-i386.iso</url>
+ <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.3-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 16.04(.\d)? LTS i386</volume-id>
</iso>
@@ -55,7 +55,7 @@
<initrd>casper/initrd.lz</initrd>
</media>
<media arch="x86_64" live="true">
- <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.2-desktop-amd64.iso</url>
+ <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.3-desktop-amd64.iso</url>
<iso>
<volume-id>Ubuntu 16.04(.\d)? LTS amd64</volume-id>
</iso>
@@ -63,19 +63,19 @@
<initrd>casper/initrd.lz</initrd>
</media>
<media arch="ppc">
- <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.2-server-powerpc.iso</url>
+ <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.3-server-powerpc.iso</url>
<iso>
<volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc</volume-id>
</iso>
</media>
<media arch="ppc64le">
- <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.2-server-ppc64el.iso</url>
+ <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.3-server-ppc64el.iso</url>
<iso>
<volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc64</volume-id>
</iso>
</media>
<media arch="s390x">
- <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.2-server-s390x.iso</url>
+ <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.3-server-s390x.iso</url>
<iso>
<volume-id>Ubuntu-Server 16.04(.\d)? LTS s390x</volume-id>
</iso>
diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in
index 271d7ea..69e5a27 100644
--- a/data/os/ubuntu.com/ubuntu-17.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in
@@ -30,7 +30,7 @@
</resources>
<media arch="i686">
- <url>http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-i386.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 17.04(.\d)? i386</volume-id>
</iso>
@@ -38,7 +38,7 @@
<initrd>install/initrd.gz</initrd>
</media>
<media arch="x86_64">
- <url>http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso</url>
<iso>
<volume-id>Ubuntu-Server 17.04(.\d)? amd64</volume-id>
</iso>
@@ -46,7 +46,7 @@
<initrd>install/initrd.gz</initrd>
</media>
<media arch="i686" live="true">
- <url>http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 17.04(.\d)? i386</volume-id>
</iso>
@@ -54,7 +54,7 @@
<initrd>casper/initrd.lz</initrd>
</media>
<media arch="x86_64" live="true">
- <url>http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-amd64.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-amd64.iso</url>
<iso>
<volume-id>Ubuntu 17.04(.\d)? amd64</volume-id>
</iso>
@@ -62,19 +62,19 @@
<initrd>casper/initrd.lz</initrd>
</media>
<media arch="aarch64">
- <url>http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-arm64.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-arm64.iso</url>
<iso>
<volume-id>Ubuntu-Server 17.04(.\d)? arm64</volume-id>
</iso>
</media>
<media arch="ppc64le">
- <url>http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-ppc64el.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-ppc64el.iso</url>
<iso>
<volume-id>Ubuntu-Server 17.04(.\d)? ppc64</volume-id>
</iso>
</media>
<media arch="s390x">
- <url>http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-s390x.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-s390x.iso</url>
<iso>
<volume-id>Ubuntu-Server 17.04(.\d)? s390x</volume-id>
</iso>
diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in
new file mode 100644
index 0000000..b396197
--- /dev/null
+++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in
@@ -0,0 +1,79 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://ubuntu.com/ubuntu/17.10";>
+ <short-id>ubuntu17.10</short-id>
+ <short-id>ubuntuartful</short-id>
+ <_name>Ubuntu 17.10</_name>
+ <version>17.10</version>
+ <_vendor>Canonical Ltd</_vendor>
+ <family>linux</family>
+ <distro>ubuntu</distro>
+ <codename>Artful Aardvark</codename>
+ <upgrades id="http://ubuntu.com/ubuntu/17.04"/>
+ <derives-from id="http://ubuntu.com/ubuntu/17.04"/>
+
+ <release-date>2017-10-19</release-date>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>1073741824</ram>
+ <storage>5368709120</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1073741824</ram>
+ <storage>16106127360</storage>
+ </recommended>
+ </resources>
+
+ <media arch="i686">
+ <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-i386.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 17.10(.\d)? i386</volume-id>
+ </iso>
+ <kernel>install/vmlinuz</kernel>
+ <initrd>install/initrd.gz</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 17.10(.\d)? amd64</volume-id>
+ </iso>
+ <kernel>install/vmlinuz</kernel>
+ <initrd>install/initrd.gz</initrd>
+ </media>
+ <media arch="x86_64" live="true">
+ <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-desktop-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu 17.10(.\d)? amd64</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd.lz</initrd>
+ </media>
+ <media arch="aarch64">
+ <url>http://cdimage.ubuntu.com/releases/artful/release/ubuntu-17.10-server-arm64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 17.10(.\d)? arm64</volume-id>
+ </iso>
+ </media>
+ <media arch="ppc64le">
+ <url>http://cdimage.ubuntu.com/releases/artful/release/ubuntu-17.10-server-ppc64el.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 17.10(.\d)? ppc64</volume-id>
+ </iso>
+ </media>
+ <media arch="s390x">
+ <url>http://cdimage.ubuntu.com/releases/artful/release/ubuntu-17.10-server-s390x.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 17.10(.\d)? s390x</volume-id>
+ </iso>
+ </media>
+
+ <installer>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/debian/changelog b/debian/changelog
index 69bca11..eedb453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+osinfo-db (0.20180226-1~deb9u1) stretch; urgency=medium
+
+ * Rebuild for stretch.
+
+ -- Guido Günther <a...@sigxcpu.org> Mon, 26 Feb 2018 10:46:53 +0100
+
+sinfo-db (0.20180226-1) unstable; urgency=medium
+
+ * Test that we can generate install scripts
+ * New upstream git snapshot (Closes: #884521)
+ * Update debian/watch URL. We're using git snapshots anyway but it's better
+ to have this correct. (Closes: #884520)
+
+ -- Guido Günther <a...@sigxcpu.org> Mon, 26 Feb 2018 10:21:37 +0100
+
osinfo-db (0.20170811-1~deb9u1) stretch; urgency=medium
* Rebuild for stretch
diff --git a/debian/tests/control b/debian/tests/control
index 8101519..80929cc 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,6 @@
Test-Command: cd debian/tests && nosetests3 -vv
Depends: @, gir1.2-libosinfo-1.0 (>= 1.0.0), python3, python3-nose, python3-gi
Restrictions: allow-stderr
+
+Tests: test-installscript
+Depends: @, libosinfo-bin
diff --git a/debian/tests/test-installscript b/debian/tests/test-installscript
new file mode 100755
index 0000000..40913a1
--- /dev/null
+++ b/debian/tests/test-installscript
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+for r in $(seq 6 9); do
+ DEB="debian${r}"
+ osinfo-install-script "${DEB}"
+ if [ -f preseed.cfg ]; then
+ echo "Found install script for ${DEB}"
+ rm preseed.cfg
+ else
+ echo "No install script for ${DEB} found"
+ exit 1
+ fi
+done
diff --git a/debian/watch b/debian/watch
index 418fd8d..b354df7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
opts="pgpsigurlmangle=s/$/.asc/" \
- https://fedorahosted.org/releases/l/i/libosinfo/osinfo-db(\d.*).tar.gz
+ https://releases.pagure.org/libosinfo/osinfo-db-(\d.*).tar.xz
