--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: stretch-pu: package osinfo-db/0.20170225-3~deb9u1
- From: Guido Günther <agx@sigxcpu.org>
- Date: Mon, 25 Sep 2017 12:43:13 +0200
- Message-id: <20170925104313.tmd7n3b7rhi3cmv4@bogon.m.sigxcpu.org>
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@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
by adding new data for recent centos, ubuntu and freebsd releases as
well as updating existing ones.
This version also included all our debian/patches/.
Since it's a new upstream version I've attached the full diff. 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
Kernel: Linux 4.13.0-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/Makefile b/Makefile
index 6ff9b5c..1846f7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
VPATH = .
-TODAY = $(shell date +"%Y%m%d")
+ifdef SOURCE_DATE_EPOCH
+ TODAY = $(shell date --utc --date="@$(SOURCE_DATE_EPOCH)" +"%Y%m%d")
+else
+ TODAY = $(shell date +"%Y%m%d")
+endif
OSINFO_DB_EXPORT = osinfo-db-export
OSINFO_DB_IMPORT = osinfo-db-import
@@ -27,6 +31,8 @@ ARCHIVE = osinfo-db-$(TODAY).tar.xz
ZANATA = zanata-cli
+XMLLINT = xmllint
+
V = 0
V_I18N = $(V_I18N_$(V))
@@ -79,7 +85,7 @@ clean:
rm -f $(DATA_FILES) $(SCHEMA_FILES) po/POTFILES.in po/osinfo-db.pot
po/POTFILES.in:
- $(V_GEN) find data -name *.xml.in > $@
+ $(V_GEN) find data -name *.xml.in | LC_ALL=C sort > $@
po/osinfo-db.pot: po/POTFILES.in $(DATA_FILES_IN)
$(V_GEN) cd po && $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
@@ -114,3 +120,10 @@ update-po:
fi; \
done
+check: $(DATA_FILES) $(SCHEMA_FILES)
+ for xml in `find data -name '*.xml' | sort`; do \
+ if ! $(XMLLINT) --relaxng data/schema/osinfo.rng --noout $$xml; then \
+ exit 1; \
+ fi; \
+ done
+
diff --git a/README b/README
index b2822cb..9f2f3af 100644
--- a/README
+++ b/README
@@ -17,6 +17,21 @@ Dependencies
- Required:
- osinfo-db-tools
- intltool
+- Optional:
+ - xmllint (from libxml2) -- for testing
+
+Build reproducibility
+=====================
+
+To build libosinfo reproduciblity, you should export the SOURCE_DATE_EPOCH[0]
+environment variable to the build system. For example:
+
+ $ export SOURCE_DATE_EPOCH="$(date +%s)"
+ $ ./configure [...]
+ $ make
+ [...]
+
+[0] https://reproducible-builds.org/specs/source-date-epoch/
Patch submissions
=================
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index 6f53299..bdc9f5d 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -176,13 +176,13 @@ useradd -G wheel <xsl:value-of select="config/user-login"/> # Add user
if test -z '<xsl:value-of select="config/user-password"/>'; then
passwd -d <xsl:value-of select="config/user-login"/> # Make user account passwordless
else
- echo <xsl:value-of select="config/user-password"/> |passwd --stdin <xsl:value-of select="config/user-login"/>
+ echo '<xsl:value-of select="config/user-password"/>' |passwd --stdin <xsl:value-of select="config/user-login"/>
fi
if test -z '<xsl:value-of select="config/admin-password"/>'; then
passwd -d root # Make root account passwordless
else
- echo <xsl:value-of select="config/admin-password"/> |passwd --stdin root
+ echo '<xsl:value-of select="config/admin-password"/>' |passwd --stdin root
fi
# Set user avatar
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
index 04399b5..6554eb6 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
@@ -31,7 +31,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
- <xsl:output method="xml" indent="yes"/>
+ <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
<xsl:template name="l10n-language">
<xsl:choose>
@@ -119,7 +119,7 @@
</device_map>
<global>
<activate>true</activate>
- <append> resume=/dev/vda1 splash=silent quiet showopts</append>
+ <append>resume=/dev/vda1 splash=silent quiet showopts</append>
<boot_boot>false</boot_boot>
<boot_extended>false</boot_extended>
<boot_mbr>false</boot_mbr>
@@ -215,18 +215,16 @@
<script>
<chrooted config:type="boolean">true</chrooted>
<source>
+
+if test -z '<xsl:value-of select="config/user-password"/>'; then
pam-config -a --unix-nullok
pam-config -a --nullok
-<xsl:choose>
- <xsl:when test="config/user-password != ''">
-useradd <xsl:value-of select='config/user-login'/>
-passwd -d <xsl:value-of select='config/user-login'/>
- </xsl:when>
-</xsl:choose>
+#Enable passwordless login for users that are part of the nopasswdlogin group
+sed -i '3 i auth sufficient pam_succeed_if.so user ingroup nopasswdlogin' /etc/pam.d/gdm-password
+fi
-<xsl:choose>
- <xsl:when test="config/avatar-location != ''">
+if test -n '<xsl:value-of select="config/avatar-location"/>'; then
# Set user avatar
mkdir /mnt/unattended-media
mount <xsl:value-of select='config/avatar-disk'/> /mnt/unattended-media
@@ -239,8 +237,7 @@ Language=<xsl:value-of select="config/l10n-language"/>.UTF-8
XSession=gnome
Icon=/var/lib/AccountsService/icons/<xsl:value-of select="config/user-login"/>
" >> /var/lib/AccountsService/users/<xsl:value-of select="config/user-login"/>
- </xsl:when>
-</xsl:choose>
+fi
# Enable default OpenSUSE repos
zypper ar -f <xsl:call-template name="repo-oss"/> repo-oss
@@ -255,11 +252,6 @@ zypper ar -f <xsl:call-template name="repo-update-oss"/> repo-update-oss
</scripts>
<services-manager>
<default_target>graphical</default_target>
- <services>
- <enable config:type="list">
- <service>NetworkManager</service>
- </enable>
- </services>
</services-manager>
<software>
<packages config:type="list">
@@ -309,6 +301,15 @@ zypper ar -f <xsl:call-template name="repo-update-oss"/> repo-update-oss
<skel>/etc/skel</skel>
<umask>022</umask>
</user_defaults>
+ <xsl:if test="config/user-password = ''">
+ <groups config:type="list">
+ <group>
+ <group_password>x</group_password>
+ <groupname>nopasswdlogin</groupname>
+ <userlist><xsl:value-of select="config/user-login"/></userlist>
+ </group>
+ </groups>
+ </xsl:if>
<users config:type="list">
<user>
<encrypted config:type="boolean">false</encrypted>
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
index f21024f..0079cc5 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
@@ -22,7 +22,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
- <xsl:output method="xml" indent="yes"/>
+ <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
<xsl:template name="l10n-language">
<xsl:choose>
@@ -99,11 +99,6 @@
<xsl:value-of select="script/expected-filename"/>
</xsl:template>
- <xsl:template match="/command-line">
- <xsl:text>autoyast=device://sda/</xsl:text>
- <xsl:value-of select="script/expected-filename"/>
- </xsl:template>
-
<xsl:template match="/install-script-config">
<profile xmlns="http://www.suse.com/1.0/yast2ns"; xmlns:config="http://www.suse.com/1.0/configns";>
<bootloader>
@@ -115,7 +110,7 @@
</device_map>
<global>
<activate>true</activate>
- <append> resume=/dev/vda1 splash=silent quiet showopts</append>
+ <append>resume=/dev/vda1 splash=silent quiet showopts</append>
<boot_boot>false</boot_boot>
<boot_extended>false</boot_extended>
<boot_mbr>false</boot_mbr>
@@ -223,12 +218,6 @@ zypper ar -f <xsl:call-template name="repo-update-oss"/> repo-update-oss
</scripts>
<services-manager>
<default_target>multi-user</default_target>
- <services>
- <disable config:type="list">
- <service>sshd</service>
- </disable>
- <enable config:type="list"/>
- </services>
</services-manager>
<software>
<packages config:type="list">
diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index d4a9005..388d6d7 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -119,13 +119,13 @@ useradd -G wheel <xsl:value-of select="config/user-login"/> # Add user
if test -z '<xsl:value-of select="config/user-password"/>'; then
passwd -d <xsl:value-of select="config/user-login"/> # Make user account passwordless
else
- echo <xsl:value-of select="config/user-password"/> |passwd --stdin <xsl:value-of select="config/user-login"/>
+ echo '<xsl:value-of select="config/user-password"/>' |passwd --stdin <xsl:value-of select="config/user-login"/>
fi
if test -z '<xsl:value-of select="config/admin-password"/>'; then
passwd -d root # Make root account passwordless
else
- echo <xsl:value-of select="config/admin-password"/> |passwd --stdin root
+ echo '<xsl:value-of select="config/admin-password"/>' |passwd --stdin root
fi
# Set user avatar
diff --git a/data/os/centos.org/centos-6.0.xml.in b/data/os/centos.org/centos-6.0.xml.in
index 07f6a92..dd7cc39 100644
--- a/data/os/centos.org/centos-6.0.xml.in
+++ b/data/os/centos.org/centos-6.0.xml.in
@@ -10,6 +10,9 @@
<distro>centos</distro>
<clones id="http://redhat.com/rhel/6.0"/>
+ <release-date>2011-07-10</release-date>
+ <eol-date>2020-11-30</eol-date>
+
<!-- there is no obvious difference between x86 and x86_64 isos,
maybe we can lookup files on the iso to decide which arch it is? -->
<media arch="i686">
diff --git a/data/os/centos.org/centos-6.1.xml.in b/data/os/centos.org/centos-6.1.xml.in
index da115ca..8e60f62 100644
--- a/data/os/centos.org/centos-6.1.xml.in
+++ b/data/os/centos.org/centos-6.1.xml.in
@@ -11,6 +11,9 @@
<upgrades id="http://centos.org/centos/6.0"/>
<clones id="http://redhat.com/rhel/6.1"/>
+ <release-date>2011-12-09</release-date>
+ <eol-date>2020-11-30</eol-date>
+
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
diff --git a/data/os/centos.org/centos-6.2.xml.in b/data/os/centos.org/centos-6.2.xml.in
index fdd6df4..b1f557c 100644
--- a/data/os/centos.org/centos-6.2.xml.in
+++ b/data/os/centos.org/centos-6.2.xml.in
@@ -11,6 +11,9 @@
<upgrades id="http://centos.org/centos/6.1"/>
<clones id="http://redhat.com/rhel/6.2"/>
+ <release-date>2011-12-20</release-date>
+ <eol-date>2020-11-30</eol-date>
+
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
diff --git a/data/os/centos.org/centos-6.3.xml.in b/data/os/centos.org/centos-6.3.xml.in
index c2b5c33..756b5d3 100644
--- a/data/os/centos.org/centos-6.3.xml.in
+++ b/data/os/centos.org/centos-6.3.xml.in
@@ -11,6 +11,9 @@
<upgrades id="http://centos.org/centos/6.2"/>
<clones id="http://redhat.com/rhel/6.3"/>
+ <release-date>2012-07-09</release-date>
+ <eol-date>2020-11-30</eol-date>
+
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
diff --git a/data/os/centos.org/centos-6.4.xml.in b/data/os/centos.org/centos-6.4.xml.in
index a523442..5357a23 100644
--- a/data/os/centos.org/centos-6.4.xml.in
+++ b/data/os/centos.org/centos-6.4.xml.in
@@ -11,6 +11,9 @@
<upgrades id="http://centos.org/centos/6.3"/>
<clones id="http://redhat.com/rhel/6.4"/>
+ <release-date>2013-03-09</release-date>
+ <eol-date>2020-11-30</eol-date>
+
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
diff --git a/data/os/centos.org/centos-6.5.xml.in b/data/os/centos.org/centos-6.5.xml.in
index 3503255..9153cb0 100644
--- a/data/os/centos.org/centos-6.5.xml.in
+++ b/data/os/centos.org/centos-6.5.xml.in
@@ -11,6 +11,9 @@
<upgrades id="http://centos.org/centos/6.4"/>
<clones id="http://redhat.com/rhel/6.5"/>
+ <release-date>2013-12-01</release-date>
+ <eol-date>2020-11-30</eol-date>
+
<media arch="i686">
<iso>
<system-id>LINUX</system-id>
diff --git a/data/os/centos.org/centos-6.6.xml.in b/data/os/centos.org/centos-6.6.xml.in
index 17951e4..546ff5e 100644
--- a/data/os/centos.org/centos-6.6.xml.in
+++ b/data/os/centos.org/centos-6.6.xml.in
@@ -11,6 +11,9 @@
<upgrades id="http://centos.org/centos/6.5"/>
<clones id="http://redhat.com/rhel/6.6"/>
+ <release-date>2014-10-28</release-date>
+ <eol-date>2020-11-30</eol-date>
+
<!-- DVD -->
<media arch="i686">
<url>http://vault.centos.org/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso</url>
diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
index 2b102d6..cd0e1dc 100644
--- a/data/os/centos.org/centos-6.7.xml.in
+++ b/data/os/centos.org/centos-6.7.xml.in
@@ -11,6 +11,9 @@
<upgrades id="http://centos.org/centos/6.6"/>
<clones id="http://redhat.com/rhel/6.7"/>
+ <release-date>2015-08-07</release-date>
+ <eol-date>2020-11-30</eol-date>
+
<!-- DVD -->
<media arch="i686">
<url>http://vault.centos.org/6.7/isos/i386/CentOS-6.7-i386-bin-DVD1.iso</url>
diff --git a/data/os/centos.org/centos-6.8.xml.in b/data/os/centos.org/centos-6.8.xml.in
new file mode 100644
index 0000000..b41c48e
--- /dev/null
+++ b/data/os/centos.org/centos-6.8.xml.in
@@ -0,0 +1,160 @@
+<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://centos.org/centos/6.8";>
+ <short-id>centos6.8</short-id>
+ <_name>CentOS 6.8</_name>
+ <version>6.8</version>
+ <_vendor>CentOS</_vendor>
+ <family>linux</family>
+ <distro>centos</distro>
+ <upgrades id="http://centos.org/centos/6.7"/>
+ <clones id="http://redhat.com/rhel/6.8"/>
+
+ <release-date>2016-05-25</release-date>
+ <eol-date>2020-11-30</eol-date>
+
+ <!-- DVD -->
+ <media arch="i686">
+ <url>http://vault.centos.org/6.8/isos/i386/CentOS-6.8-i386-bin-DVD1.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS_6.8_Final</volume-id>
+ <volume-size>3844679680</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://vault.centos.org/6.8/isos/x86_64/CentOS-6.8-x86_64-bin-DVD1.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS_6.8_Final</volume-id>
+ <volume-size>3916271616</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Live CD -->
+ <media arch="i686" live="true">
+ <url>http://vault.centos.org/6.8/isos/i386/CentOS-6.8-i386-LiveCD.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS-6.8-i386-LiveCD</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64" live="true">
+ <url>http://vault.centos.org/6.8/isos/x86_64/CentOS-6.8-x86_64-LiveCD.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS-6.8-x86_64-LiveCD</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Live DVD -->
+ <media arch="i686" live="true">
+ <url>http://vault.centos.org/6.8/isos/i386/CentOS-6.8-i386-LiveDVD.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS-6.8-i386-LiveDVD</volume-id>
+ <volume-size>1990477824</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64" live="true">
+ <url>http://vault.centos.org/6.8/isos/x86_64/CentOS-6.8-x86_64-LiveDVD.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS-6.8-x86_64-LiveDVD</volume-id>
+ <volume-size>2011746304</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Minimal Installer -->
+ <media arch="i686">
+ <url>http://vault.centos.org/6.8/isos/i386/CentOS-6.8-i386-minimal.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS_6.8_Final</volume-id>
+ <volume-size>370984960</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://vault.centos.org/6.8/isos/x86_64/CentOS-6.8-x86_64-minimal.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS_6.8_Final</volume-id>
+ <volume-size>467867648</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Network Installer -->
+ <media arch="i686">
+ <url>http://vault.centos.org/6.8/isos/i386/CentOS-6.8-i386-netinstall.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS</volume-id>
+ <volume-size>227659776</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://vault.centos.org/6.8/isos/x86_64/CentOS-6.8-x86_64-netinstall.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS</volume-id>
+ <volume-size>238219264</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <tree arch="i686">
+ <url>http://vault.centos.org/6.8/os/i386</url>
+ <treeinfo>
+ <family>CentOS</family>
+ <version>6.8</version>
+ <arch>i386</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <url>http://vault.centos.org/6.8/os/x86_64</url>
+ <treeinfo>
+ <family>CentOS</family>
+ <version>6.8</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <ram>536870912</ram>
+ </minimum>
+
+ <recommended>
+ <cpu>400000000</cpu>
+ <ram>1073741824</ram>
+ <storage>9663676416</storage>
+ </recommended>
+ </resources>
+
+ <installer>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/os/centos.org/centos-6.9.xml.in b/data/os/centos.org/centos-6.9.xml.in
new file mode 100644
index 0000000..535a57b
--- /dev/null
+++ b/data/os/centos.org/centos-6.9.xml.in
@@ -0,0 +1,140 @@
+<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://centos.org/centos/6.9";>
+ <short-id>centos6.9</short-id>
+ <_name>CentOS 6.9</_name>
+ <version>6.9</version>
+ <_vendor>CentOS</_vendor>
+ <family>linux</family>
+ <distro>centos</distro>
+ <upgrades id="http://centos.org/centos/6.8"/>
+ <clones id="http://redhat.com/rhel/6.9"/>
+
+ <release-date>2017-04-05</release-date>
+ <eol-date>2020-11-30</eol-date>
+
+ <!-- DVD -->
+ <media arch="i686">
+ <url>http://mirror.centos.org/centos/6.9/isos/i386/CentOS-6.9-i386-bin-DVD1.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS_6.9_Final</volume-id>
+ <volume-size>3850491904</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://mirror.centos.org/centos/6.9/isos/x86_64/CentOS-6.9-x86_64-bin-DVD1.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS_6.9_Final</volume-id>
+ <volume-size>3971962880</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Live DVD -->
+ <media arch="i686" live="true">
+ <url>http://mirror.centos.org/centos/6.9/isos/i386/CentOS-6.9-i386-LiveDVD.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS-6.9-i386-LiveDVD</volume-id>
+ <volume-size>2001133568</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64" live="true">
+ <url>http://mirror.centos.org/centos/6.9/isos/x86_64/CentOS-6.9-x86_64-LiveDVD.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS-6.9-x86_64-LiveDVD</volume-id>
+ <volume-size>2023274496</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Minimal Installer -->
+ <media arch="i686">
+ <url>http://mirror.centos.org/centos/6.9/isos/i386/CentOS-6.9-i386-minimal.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS_6.9_Final</volume-id>
+ <volume-size>375089152</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://mirror.centos.org/centos/6.9/isos/x86_64/CentOS-6.9-x86_64-minimal.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS_6.9_Final</volume-id>
+ <volume-size>427110400</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Network Installer -->
+ <media arch="i686">
+ <url>http://mirror.centos.org/centos/6.9/isos/i386/CentOS-6.9-i386-netinstall.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS</volume-id>
+ <volume-size>190959616</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://mirror.centos.org/centos/6.9/isos/x86_64/CentOS-6.9-x86_64-netinstall.iso</url>
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>CentOS</volume-id>
+ <volume-size>240283648</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <tree arch="i686">
+ <url>http://mirror.centos.org/centos/6.9/os/i386</url>
+ <treeinfo>
+ <family>CentOS</family>
+ <version>6.9</version>
+ <arch>i386</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <url>http://mirror.centos.org/centos/6.9/os/x86_64</url>
+ <treeinfo>
+ <family>CentOS</family>
+ <version>6.9</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <ram>536870912</ram>
+ </minimum>
+
+ <recommended>
+ <cpu>400000000</cpu>
+ <ram>1073741824</ram>
+ <storage>9663676416</storage>
+ </recommended>
+ </resources>
+
+ <installer>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index 135faf7..a58c642 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -11,6 +11,8 @@
<upgrades id="http://centos.org/centos/6.5"/>
<clones id="http://redhat.com/rhel/7.0"/>
+ <release-date>2014-07-07</release-date>
+
<media arch="x86_64">
<iso>
<system-id>LINUX</system-id>
diff --git a/data/os/debian.org/debian-1.1.xml.in b/data/os/debian.org/debian-1.1.xml.in
index 98cb80b..4024fa8 100644
--- a/data/os/debian.org/debian-1.1.xml.in
+++ b/data/os/debian.org/debian-1.1.xml.in
@@ -9,5 +9,7 @@
<_vendor>Debian Project</_vendor>
<family>linux</family>
<distro>debian</distro>
+
+ <release-date>1996-07-17</release-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-1.2.xml.in b/data/os/debian.org/debian-1.2.xml.in
index 633aa9c..c606026 100644
--- a/data/os/debian.org/debian-1.2.xml.in
+++ b/data/os/debian.org/debian-1.2.xml.in
@@ -11,5 +11,7 @@
<distro>debian</distro>
<upgrades id="http://debian.org/debian/1.1"/>
<derives-from id="http://debian.org/debian/1.1"/>
+
+ <release-date>1996-12-12</release-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-1.3.xml.in b/data/os/debian.org/debian-1.3.xml.in
index 90cf4bc..6a5b909 100644
--- a/data/os/debian.org/debian-1.3.xml.in
+++ b/data/os/debian.org/debian-1.3.xml.in
@@ -11,5 +11,7 @@
<distro>debian</distro>
<upgrades id="http://debian.org/debian/1.2"/>
<derives-from id="http://debian.org/debian/1.2"/>
+
+ <release-date>1997-06-05</release-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-2.0.xml.in b/data/os/debian.org/debian-2.0.xml.in
index 6325aa9..5c954c5 100644
--- a/data/os/debian.org/debian-2.0.xml.in
+++ b/data/os/debian.org/debian-2.0.xml.in
@@ -11,5 +11,7 @@
<distro>debian</distro>
<upgrades id="http://debian.org/debian/1.3"/>
<derives-from id="http://debian.org/debian/1.3"/>
+
+ <release-date>1998-07-24</release-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-2.1.xml.in b/data/os/debian.org/debian-2.1.xml.in
index 3454180..ce4d2e5 100644
--- a/data/os/debian.org/debian-2.1.xml.in
+++ b/data/os/debian.org/debian-2.1.xml.in
@@ -11,5 +11,8 @@
<distro>debian</distro>
<upgrades id="http://debian.org/debian/2.0"/>
<derives-from id="http://debian.org/debian/2.0"/>
+
+ <release-date>1999-03-09</release-date>
+ <eol-date>2000-10-30</eol-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-2.2.xml.in b/data/os/debian.org/debian-2.2.xml.in
index c9c0466..47fd0f9 100644
--- a/data/os/debian.org/debian-2.2.xml.in
+++ b/data/os/debian.org/debian-2.2.xml.in
@@ -11,5 +11,8 @@
<distro>debian</distro>
<upgrades id="http://debian.org/debian/2.1"/>
<derives-from id="http://debian.org/debian/2.1"/>
+
+ <release-date>2000-08-15</release-date>
+ <eol-date>2003-06-30</eol-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-3.1.xml.in b/data/os/debian.org/debian-3.1.xml.in
index a3d4441..1129898 100644
--- a/data/os/debian.org/debian-3.1.xml.in
+++ b/data/os/debian.org/debian-3.1.xml.in
@@ -11,5 +11,8 @@
<distro>debian</distro>
<upgrades id="http://debian.org/debian/3"/>
<derives-from id="http://debian.org/debian/3"/>
+
+ <release-date>2005-06-06</release-date>
+ <eol-date>2008-03-31</eol-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-3.xml.in b/data/os/debian.org/debian-3.xml.in
index a29cbdb..8414e41 100644
--- a/data/os/debian.org/debian-3.xml.in
+++ b/data/os/debian.org/debian-3.xml.in
@@ -11,5 +11,8 @@
<distro>debian</distro>
<upgrades id="http://debian.org/debian/2.2"/>
<derives-from id="http://debian.org/debian/2.2"/>
+
+ <release-date>2002-07-19</release-date>
+ <eol-date>2006-06-30</eol-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-4.xml.in b/data/os/debian.org/debian-4.xml.in
index d5148f0..0a21a86 100644
--- a/data/os/debian.org/debian-4.xml.in
+++ b/data/os/debian.org/debian-4.xml.in
@@ -11,5 +11,8 @@
<distro>debian</distro>
<upgrades id="http://debian.org/debian/3.1"/>
<derives-from id="http://debian.org/debian/3.1"/>
+
+ <release-date>2007-04-08</release-date>
+ <eol-date>2010-02-15</eol-date>
</os>
</libosinfo>
diff --git a/data/os/debian.org/debian-5.xml.in b/data/os/debian.org/debian-5.xml.in
index c4b727a..efd8085 100644
--- a/data/os/debian.org/debian-5.xml.in
+++ b/data/os/debian.org/debian-5.xml.in
@@ -12,6 +12,9 @@
<upgrades id="http://debian.org/debian/4"/>
<derives-from id="http://debian.org/debian/4"/>
+ <release-date>2009-02-14</release-date>
+ <eol-date>2012-02-06</eol-date>
+
<devices>
<device id="http://pcisig.com/pci/1af4/1000"/>
<device id="http://pcisig.com/pci/1af4/1001"/>
diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in
index 0afe388..8c2d4ca 100644
--- a/data/os/debian.org/debian-7.xml.in
+++ b/data/os/debian.org/debian-7.xml.in
@@ -39,7 +39,7 @@
</resources>
<media arch="i686">
- <url>http://cdimage.debian.org/mirror/cdimage/archive/7.9.0/i386/iso-dvd/debian-7.9.0-i386-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/i386/iso-dvd/debian-7.11.0-i386-DVD-1.iso</url>
<iso>
<volume-id>Debian 7.\d.\d i386 1</volume-id>
</iso>
@@ -47,7 +47,7 @@
<initrd>install.386/initrd.gz</initrd>
</media>
<media arch="x86_64">
- <url>http://cdimage.debian.org/mirror/cdimage/archive/7.9.0/amd64/iso-dvd/debian-7.9.0-amd64-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/amd64/iso-dvd/debian-7.11.0-amd64-DVD-1.iso</url>
<iso>
<volume-id>Debian 7.\d.\d amd64 1</volume-id>
</iso>
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index 19bb8a5..8ad189b 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/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/i386/iso-dvd/debian-8.8.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/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso</url>
+ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/amd64/iso-dvd/debian-8.8.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
new file mode 100644
index 0000000..759422b
--- /dev/null
+++ b/data/os/debian.org/debian-9.xml.in
@@ -0,0 +1,130 @@
+<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://debian.org/debian/9";>
+ <short-id>debian9</short-id>
+ <short-id>debianstretch</short-id>
+ <_name>Debian Stretch</_name>
+ <version>9</version>
+ <_vendor>Debian Project</_vendor>
+ <family>linux</family>
+ <distro>debian</distro>
+ <upgrades id="http://debian.org/debian/8"/>
+ <derives-from id="http://debian.org/debian/8"/>
+
+ <release-date>2017-06-17</release-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"/>
+ </devices>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1073741824</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+
+ <variant id="universal">
+ <_name>Debian 9</_name>
+ </variant>
+ <variant id="universal-netinst">
+ <_name>Debian 9</_name>
+ </variant>
+
+ <!-- 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>
+ <iso>
+ <volume-id>Debian 9.(\d)+.(\d)+ i386 n</volume-id>
+ </iso>
+ <kernel>install.386/vmlinuz</kernel>
+ <initrd>install.386/initrd.gz</initrd>
+ </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>
+ <iso>
+ <volume-id>Debian 9.(\d)+.(\d)+ amd64 n</volume-id>
+ </iso>
+ <kernel>install.amd/vmlinuz</kernel>
+ <initrd>install.amd/initrd.gz</initrd>
+ </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>
+ <iso>
+ <volume-id>Debian 9.(\d)+.(\d)+ arm64 n</volume-id>
+ </iso>
+ <kernel>install.arm64/vmlinuz</kernel>
+ <initrd>install.arm64/initrd.gz</initrd>
+ </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>
+ <iso>
+ <volume-id>Debian 9.(\d)+.(\d)+ armhf n</volume-id>
+ </iso>
+ <kernel>install.armhf/vmlinuz</kernel>
+ <initrd>install.armhf/initrd.gz</initrd>
+ </media>
+
+ <!-- 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>
+ <iso>
+ <volume-id>Debian 9.(\d)+.(\d)+ i386 1</volume-id>
+ </iso>
+ <kernel>install.386/vmlinuz</kernel>
+ <initrd>install.386/initrd.gz</initrd>
+ </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>
+ <iso>
+ <volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id>
+ </iso>
+ <kernel>install.amd/vmlinuz</kernel>
+ <initrd>install.amd/initrd.gz</initrd>
+ </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>
+ <iso>
+ <volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id>
+ </iso>
+ <kernel>install.arm64/vmlinuz</kernel>
+ <initrd>install.arm64/initrd.gz</initrd>
+ </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>
+ <iso>
+ <volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id>
+ </iso>
+ <kernel>install.armhf/vmlinuz</kernel>
+ <initrd>install.armhf/initrd.gz</initrd>
+ </media>
+
+ <installer>
+ <script id='http://debian.org/debian/preseed/jeos'/>
+ <script id='http://debian.org/debian/preseed/desktop'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/os/fedoraproject.org/fedora-10.xml.in b/data/os/fedoraproject.org/fedora-10.xml.in
index 7415769..72e6387 100644
--- a/data/os/fedoraproject.org/fedora-10.xml.in
+++ b/data/os/fedoraproject.org/fedora-10.xml.in
@@ -13,7 +13,7 @@
<derives-from id="http://fedoraproject.org/fedora/9"/>
<release-date>2008-11-25</release-date>
- <eol-date>2009-12-18</eol-date>
+ <eol-date>2009-12-17</eol-date>
<devices>
<device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
diff --git a/data/os/fedoraproject.org/fedora-14.xml.in b/data/os/fedoraproject.org/fedora-14.xml.in
index bec5eac..6cd0099 100644
--- a/data/os/fedoraproject.org/fedora-14.xml.in
+++ b/data/os/fedoraproject.org/fedora-14.xml.in
@@ -13,7 +13,7 @@
<derives-from id="http://fedoraproject.org/fedora/13"/>
<release-date>2010-11-02</release-date>
- <eol-date>2011-12-08</eol-date>
+ <eol-date>2011-12-09</eol-date>
<!-- DVD -->
<media arch="i686">
diff --git a/data/os/fedoraproject.org/fedora-15.xml.in b/data/os/fedoraproject.org/fedora-15.xml.in
index a00ce9e..d3ee3c1 100644
--- a/data/os/fedoraproject.org/fedora-15.xml.in
+++ b/data/os/fedoraproject.org/fedora-15.xml.in
@@ -13,6 +13,7 @@
<derives-from id="http://fedoraproject.org/fedora/14"/>
<release-date>2011-05-24</release-date>
+ <eol-date>2012-06-26</eol-date>
<media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/i386/iso/Fedora-15-i386-DVD.iso</url>
diff --git a/data/os/fedoraproject.org/fedora-16.xml.in b/data/os/fedoraproject.org/fedora-16.xml.in
index b184705..c915a25 100644
--- a/data/os/fedoraproject.org/fedora-16.xml.in
+++ b/data/os/fedoraproject.org/fedora-16.xml.in
@@ -13,6 +13,7 @@
<derives-from id="http://fedoraproject.org/fedora/15"/>
<release-date>2011-11-08</release-date>
+ <eol-date>2013-02-12</eol-date>
<media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/i386/iso/Fedora-16-i386-DVD.iso</url>
diff --git a/data/os/fedoraproject.org/fedora-17.xml.in b/data/os/fedoraproject.org/fedora-17.xml.in
index 50076f5..9450a08 100644
--- a/data/os/fedoraproject.org/fedora-17.xml.in
+++ b/data/os/fedoraproject.org/fedora-17.xml.in
@@ -12,6 +12,9 @@
<upgrades id="http://fedoraproject.org/fedora/16"/>
<derives-from id="http://fedoraproject.org/fedora/16"/>
+ <release-date>2012-05-29</release-date>
+ <eol-date>2013-07-30</eol-date>
+
<devices>
<device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi -->
</devices>
diff --git a/data/os/fedoraproject.org/fedora-18.xml.in b/data/os/fedoraproject.org/fedora-18.xml.in
index c302018..b31573c 100644
--- a/data/os/fedoraproject.org/fedora-18.xml.in
+++ b/data/os/fedoraproject.org/fedora-18.xml.in
@@ -12,6 +12,9 @@
<upgrades id="http://fedoraproject.org/fedora/17"/>
<derives-from id="http://fedoraproject.org/fedora/17"/>
+ <release-date>2013-01-15</release-date>
+ <eol-date>2014-01-14</eol-date>
+
<media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso</url>
<iso>
diff --git a/data/os/fedoraproject.org/fedora-19.xml.in b/data/os/fedoraproject.org/fedora-19.xml.in
index 73e66f1..0bbe2d0 100644
--- a/data/os/fedoraproject.org/fedora-19.xml.in
+++ b/data/os/fedoraproject.org/fedora-19.xml.in
@@ -12,6 +12,9 @@
<upgrades id="http://fedoraproject.org/fedora/18"/>
<derives-from id="http://fedoraproject.org/fedora/18"/>
+ <release-date>2013-07-02</release-date>
+ <eol-date>2015-01-06</eol-date>
+
<!-- Full installer DVD -->
<media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso</url>
diff --git a/data/os/fedoraproject.org/fedora-20.xml.in b/data/os/fedoraproject.org/fedora-20.xml.in
index 346345b..0852468 100644
--- a/data/os/fedoraproject.org/fedora-20.xml.in
+++ b/data/os/fedoraproject.org/fedora-20.xml.in
@@ -12,6 +12,9 @@
<upgrades id="http://fedoraproject.org/fedora/19"/>
<derives-from id="http://fedoraproject.org/fedora/19"/>
+ <release-date>2013-12-17</release-date>
+ <eol-date>2015-06-23</eol-date>
+
<!-- Installer DVD -->
<media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso</url>
diff --git a/data/os/fedoraproject.org/fedora-21.xml.in b/data/os/fedoraproject.org/fedora-21.xml.in
index d7c2870..f80a676 100644
--- a/data/os/fedoraproject.org/fedora-21.xml.in
+++ b/data/os/fedoraproject.org/fedora-21.xml.in
@@ -11,7 +11,8 @@
<upgrades id="http://fedoraproject.org/fedora/20"/>
<derives-from id="http://fedoraproject.org/fedora/20"/>
- <release-date>2014-12-03</release-date>
+ <release-date>2014-12-09</release-date>
+ <eol-date>2015-12-01</eol-date>
<variant id="workstation">
<_name>Fedora 21 Workstation</_name>
diff --git a/data/os/fedoraproject.org/fedora-22.xml.in b/data/os/fedoraproject.org/fedora-22.xml.in
index df1718f..57fd234 100644
--- a/data/os/fedoraproject.org/fedora-22.xml.in
+++ b/data/os/fedoraproject.org/fedora-22.xml.in
@@ -12,6 +12,7 @@
<derives-from id="http://fedoraproject.org/fedora/21"/>
<release-date>2015-05-26</release-date>
+ <eol-date>2016-07-19</eol-date>
<variant id="workstation">
<_name>Fedora 22 Workstation</_name>
diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
index b884722..61d4116 100644
--- a/data/os/fedoraproject.org/fedora-23.xml.in
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -12,6 +12,7 @@
<derives-from id="http://fedoraproject.org/fedora/22"/>
<release-date>2015-11-03</release-date>
+ <eol-date>2016-12-20</eol-date>
<variant id="workstation">
<_name>Fedora 23 Workstation</_name>
diff --git a/data/os/fedoraproject.org/fedora-24.xml.in b/data/os/fedoraproject.org/fedora-24.xml.in
index e69cccc..495b068 100644
--- a/data/os/fedoraproject.org/fedora-24.xml.in
+++ b/data/os/fedoraproject.org/fedora-24.xml.in
@@ -12,6 +12,7 @@
<derives-from id="http://fedoraproject.org/fedora/23"/>
<release-date>2016-06-21</release-date>
+ <eol-date>2017-08-08</eol-date>
<devices>
<device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio-gpu -->
@@ -120,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.iso</url>
+ <url>http://download.fedoraproject.org/pub/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>
diff --git a/data/os/fedoraproject.org/fedora-26.xml.in b/data/os/fedoraproject.org/fedora-26.xml.in
new file mode 100644
index 0000000..d1816ec
--- /dev/null
+++ b/data/os/fedoraproject.org/fedora-26.xml.in
@@ -0,0 +1,114 @@
+<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://fedoraproject.org/fedora/26";>
+ <short-id>fedora26</short-id>
+ <_name>Fedora 26</_name>
+ <version>26</version>
+ <_vendor>Fedora Project</_vendor>
+ <family>linux</family>
+ <distro>fedora</distro>
+ <upgrades id="http://fedoraproject.org/fedora/25"/>
+ <derives-from id="http://fedoraproject.org/fedora/25"/>
+
+ <release-date>2017-07-11</release-date>
+
+ <variant id="workstation">
+ <_name>Fedora 26 Workstation</_name>
+ </variant>
+ <variant id="workstation-netinst">
+ <_name>Fedora 26 Workstation</_name>
+ </variant>
+ <variant id="server">
+ <_name>Fedora 26 Server</_name>
+ </variant>
+ <variant id="server-netinst">
+ <_name>Fedora 26 Server</_name>
+ </variant>
+
+ <!-- Workstation -->
+
+ <!-- Live -->
+ <media arch="x86_64" live="true">
+ <variant id="workstation"/>
+ <url>https://download.fedoraproject.org/pub/fedora/linux/releases/26/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-26-1.5.iso</url>
+ <iso>
+ <volume-id>Fedora-WS-Live-26.*</volume-id>
+ <system-id>LINUX</system-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Network Installer !-->
+ <media arch="x86_64">
+ <variant id="workstation-netinst"/>
+ <url>https://download.fedoraproject.org/pub/fedora/linux/releases/26/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-26-1.5.iso</url>
+ <iso>
+ <volume-id>Fedora-WS-dvd-x86_64-26</volume-id>
+ <system-id>LINUX</system-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Server -->
+
+ <!-- DVD -->
+ <media arch="x86_64">
+ <variant id="server"/>
+ <url>https://download.fedoraproject.org/pub/fedora/linux/releases/26/Server/x86_64/iso/Fedora-Server-dvd-x86_64-26-1.5.iso</url>
+ <iso>
+ <volume-id>Fedora-S-dvd-x86_64-26</volume-id>
+ <system-id>LINUX</system-id>
+ <volume-size>2400741376</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Network Installer !-->
+ <media arch="x86_64">
+ <variant id="server-netinst"/>
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/26/Server/x86_64/iso/Fedora-Server-netinst-x86_64-26-1.5.iso</url>
+ <iso>
+ <volume-id>Fedora-S-dvd-x86_64-26</volume-id>
+ <system-id>LINUX</system-id>
+ <volume-size>507422720</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <tree arch="x86_64">
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/26/Server/x86_64/os/</url>
+ <variant id="server"/>
+ <treeinfo>
+ <family>Fedora</family>
+ <version>26</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+
+ <!-- No install media or tree is provided for Fedora 26 Cloud variant -->
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+
+ <recommended>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+
+ <installer>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/os/freebsd.org/freebsd-1.0.xml.in b/data/os/freebsd.org/freebsd-1.0.xml.in
index 9927b7c..579cd3f 100644
--- a/data/os/freebsd.org/freebsd-1.0.xml.in
+++ b/data/os/freebsd.org/freebsd-1.0.xml.in
@@ -9,7 +9,7 @@
<family>freebsd</family>
<distro>freebsd</distro>
- <release-date>1993-11-00</release-date>
+ <release-date>1993-11-01</release-date>
</os>
</libosinfo>
diff --git a/data/os/freebsd.org/freebsd-10.0.xml.in b/data/os/freebsd.org/freebsd-10.0.xml.in
index 0bb1f22..7f56db8 100644
--- a/data/os/freebsd.org/freebsd-10.0.xml.in
+++ b/data/os/freebsd.org/freebsd-10.0.xml.in
@@ -11,8 +11,8 @@
<upgrades id="http://freebsd.org/freebsd/9.2"/>
<derives-from id="http://freebsd.org/freebsd/9.2"/>
- <release-date>2014-01-20</release-date>
- <eol-date>2015-01-31</eol-date>
+ <release-date>2014-01-14</release-date>
+ <eol-date>2015-02-28</eol-date>
<devices>
<device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
diff --git a/data/os/freebsd.org/freebsd-11.1.xml.in b/data/os/freebsd.org/freebsd-11.1.xml.in
new file mode 100644
index 0000000..4635c17
--- /dev/null
+++ b/data/os/freebsd.org/freebsd-11.1.xml.in
@@ -0,0 +1,50 @@
+<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/11.1";>
+ <short-id>freebsd11.1</short-id>
+ <_name>FreeBSD 11.1</_name>
+ <version>11.1</version>
+ <_vendor>FreeBSD Project</_vendor>
+ <family>freebsd</family>
+ <distro>freebsd</distro>
+ <upgrades id="http://freebsd.org/freebsd/11.0"/>
+ <derives-from id="http://freebsd.org/freebsd/11.0"/>
+
+ <release-date>2017-07-26</release-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>ftp://ftp.freebsd.org/pub/FreeBSD/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>
+ <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>
+ <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>
+ <iso>
+ <system-id>FreeBSD</system-id>
+ <volume-id>11_1_RELEASE_I386_CD</volume-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/freebsd.org/freebsd-2.0.5.xml.in b/data/os/freebsd.org/freebsd-2.0.5.xml.in
index 744dcec..7904a80 100644
--- a/data/os/freebsd.org/freebsd-2.0.5.xml.in
+++ b/data/os/freebsd.org/freebsd-2.0.5.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>1995-06-10</release-date>
+
<upgrades id="http://freebsd.org/freebsd/2.0"/>
<derives-from id="http://freebsd.org/freebsd/2.0"/>
diff --git a/data/os/freebsd.org/freebsd-2.2.8.xml.in b/data/os/freebsd.org/freebsd-2.2.8.xml.in
index 47eec96..35ecfd2 100644
--- a/data/os/freebsd.org/freebsd-2.2.8.xml.in
+++ b/data/os/freebsd.org/freebsd-2.2.8.xml.in
@@ -8,6 +8,9 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>1998-11-22</release-date>
+
<upgrades id="http://freebsd.org/freebsd/2.0.5"/>
<derives-from id="http://freebsd.org/freebsd/2.0.5"/>
diff --git a/data/os/freebsd.org/freebsd-3.2.xml.in b/data/os/freebsd.org/freebsd-3.2.xml.in
index df1e843..68e1956 100644
--- a/data/os/freebsd.org/freebsd-3.2.xml.in
+++ b/data/os/freebsd.org/freebsd-3.2.xml.in
@@ -8,6 +8,9 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>1999-05-17</release-date>
+
<upgrades id="http://freebsd.org/freebsd/3.0"/>
<derives-from id="http://freebsd.org/freebsd/3.0"/>
diff --git a/data/os/freebsd.org/freebsd-4.0.xml.in b/data/os/freebsd.org/freebsd-4.0.xml.in
index 1bf5a59..dd16a49 100644
--- a/data/os/freebsd.org/freebsd-4.0.xml.in
+++ b/data/os/freebsd.org/freebsd-4.0.xml.in
@@ -9,7 +9,7 @@
<family>freebsd</family>
<distro>freebsd</distro>
- <release-date>2000-03-00</release-date>
+ <release-date>2000-03-14</release-date>
<upgrades id="http://freebsd.org/freebsd/3.2"/>
<derives-from id="http://freebsd.org/freebsd/3.2"/>
diff --git a/data/os/freebsd.org/freebsd-4.1.xml.in b/data/os/freebsd.org/freebsd-4.1.xml.in
index fb28ae9..f7efd93 100644
--- a/data/os/freebsd.org/freebsd-4.1.xml.in
+++ b/data/os/freebsd.org/freebsd-4.1.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2000-06-27</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.0"/>
<derives-from id="http://freebsd.org/freebsd/4.0"/>
diff --git a/data/os/freebsd.org/freebsd-4.10.xml.in b/data/os/freebsd.org/freebsd-4.10.xml.in
index 52628fb..92b0223 100644
--- a/data/os/freebsd.org/freebsd-4.10.xml.in
+++ b/data/os/freebsd.org/freebsd-4.10.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2004-05-27</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.9"/>
<derives-from id="http://freebsd.org/freebsd/4.9"/>
diff --git a/data/os/freebsd.org/freebsd-4.11.xml.in b/data/os/freebsd.org/freebsd-4.11.xml.in
index 5cd50c0..4fcae19 100644
--- a/data/os/freebsd.org/freebsd-4.11.xml.in
+++ b/data/os/freebsd.org/freebsd-4.11.xml.in
@@ -9,7 +9,7 @@
<family>freebsd</family>
<distro>freebsd</distro>
- <release-date>2000-06-24</release-date>
+ <release-date>2005-01-25</release-date>
<eol-date>2007-01-31</eol-date>
<upgrades id="http://freebsd.org/freebsd/4.10"/>
diff --git a/data/os/freebsd.org/freebsd-4.2.xml.in b/data/os/freebsd.org/freebsd-4.2.xml.in
index d30d957..7871c45 100644
--- a/data/os/freebsd.org/freebsd-4.2.xml.in
+++ b/data/os/freebsd.org/freebsd-4.2.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2000-11-21</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.1"/>
<derives-from id="http://freebsd.org/freebsd/4.1"/>
diff --git a/data/os/freebsd.org/freebsd-4.3.xml.in b/data/os/freebsd.org/freebsd-4.3.xml.in
index 6e5c534..8fdbe1c 100644
--- a/data/os/freebsd.org/freebsd-4.3.xml.in
+++ b/data/os/freebsd.org/freebsd-4.3.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2001-04-20</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.2"/>
<derives-from id="http://freebsd.org/freebsd/4.2"/>
diff --git a/data/os/freebsd.org/freebsd-4.4.xml.in b/data/os/freebsd.org/freebsd-4.4.xml.in
index 52764be..5264f53 100644
--- a/data/os/freebsd.org/freebsd-4.4.xml.in
+++ b/data/os/freebsd.org/freebsd-4.4.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2001-09-20</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.3"/>
<derives-from id="http://freebsd.org/freebsd/4.3"/>
diff --git a/data/os/freebsd.org/freebsd-4.5.xml.in b/data/os/freebsd.org/freebsd-4.5.xml.in
index 2d24f2d..d61a3b2 100644
--- a/data/os/freebsd.org/freebsd-4.5.xml.in
+++ b/data/os/freebsd.org/freebsd-4.5.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2002-01-29</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.4"/>
<derives-from id="http://freebsd.org/freebsd/4.4"/>
diff --git a/data/os/freebsd.org/freebsd-4.6.xml.in b/data/os/freebsd.org/freebsd-4.6.xml.in
index 5edf707..2fdc37a 100644
--- a/data/os/freebsd.org/freebsd-4.6.xml.in
+++ b/data/os/freebsd.org/freebsd-4.6.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2002-06-15</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.5"/>
<derives-from id="http://freebsd.org/freebsd/4.5"/>
diff --git a/data/os/freebsd.org/freebsd-4.7.xml.in b/data/os/freebsd.org/freebsd-4.7.xml.in
index 6f85b8e..8e0b6cd 100644
--- a/data/os/freebsd.org/freebsd-4.7.xml.in
+++ b/data/os/freebsd.org/freebsd-4.7.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2002-10-10</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.6"/>
<derives-from id="http://freebsd.org/freebsd/4.6"/>
diff --git a/data/os/freebsd.org/freebsd-4.8.xml.in b/data/os/freebsd.org/freebsd-4.8.xml.in
index 9fc6bb6..e4975c3 100644
--- a/data/os/freebsd.org/freebsd-4.8.xml.in
+++ b/data/os/freebsd.org/freebsd-4.8.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2003-04-03</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.7"/>
<derives-from id="http://freebsd.org/freebsd/4.7"/>
diff --git a/data/os/freebsd.org/freebsd-4.9.xml.in b/data/os/freebsd.org/freebsd-4.9.xml.in
index aaa4863..1846f5e 100644
--- a/data/os/freebsd.org/freebsd-4.9.xml.in
+++ b/data/os/freebsd.org/freebsd-4.9.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2003-10-28</release-date>
+
<upgrades id="http://freebsd.org/freebsd/4.8"/>
<derives-from id="http://freebsd.org/freebsd/4.8"/>
diff --git a/data/os/freebsd.org/freebsd-5.0.xml.in b/data/os/freebsd.org/freebsd-5.0.xml.in
index 9195256..891d1dd 100644
--- a/data/os/freebsd.org/freebsd-5.0.xml.in
+++ b/data/os/freebsd.org/freebsd-5.0.xml.in
@@ -9,7 +9,7 @@
<family>freebsd</family>
<distro>freebsd</distro>
- <release-date>2003-01-00</release-date>
+ <release-date>2003-01-19</release-date>
<upgrades id="http://freebsd.org/freebsd/4.11"/>
<derives-from id="http://freebsd.org/freebsd/4.11"/>
diff --git a/data/os/freebsd.org/freebsd-5.1.xml.in b/data/os/freebsd.org/freebsd-5.1.xml.in
index c9ef921..565841b 100644
--- a/data/os/freebsd.org/freebsd-5.1.xml.in
+++ b/data/os/freebsd.org/freebsd-5.1.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2003-06-09</release-date>
+
<upgrades id="http://freebsd.org/freebsd/5.0"/>
<derives-from id="http://freebsd.org/freebsd/5.0"/>
diff --git a/data/os/freebsd.org/freebsd-5.2.1.xml.in b/data/os/freebsd.org/freebsd-5.2.1.xml.in
index fd5cf63..bf1ca94 100644
--- a/data/os/freebsd.org/freebsd-5.2.1.xml.in
+++ b/data/os/freebsd.org/freebsd-5.2.1.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2005-02-25</release-date>
+
<upgrades id="http://freebsd.org/freebsd/5.2"/>
<derives-from id="http://freebsd.org/freebsd/5.2"/>
diff --git a/data/os/freebsd.org/freebsd-5.2.xml.in b/data/os/freebsd.org/freebsd-5.2.xml.in
index f9828cd..46342cd 100644
--- a/data/os/freebsd.org/freebsd-5.2.xml.in
+++ b/data/os/freebsd.org/freebsd-5.2.xml.in
@@ -9,6 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2004-01-12</release-date>
+
<upgrades id="http://freebsd.org/freebsd/5.1"/>
<derives-from id="http://freebsd.org/freebsd/5.1"/>
diff --git a/data/os/freebsd.org/freebsd-5.3.xml.in b/data/os/freebsd.org/freebsd-5.3.xml.in
index 6354d84..9ede49e 100644
--- a/data/os/freebsd.org/freebsd-5.3.xml.in
+++ b/data/os/freebsd.org/freebsd-5.3.xml.in
@@ -9,6 +9,9 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2004-11-06</release-date>
+ <eol-date>2006-10-31</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/5.2.1"/>
<derives-from id="http://freebsd.org/freebsd/5.2.1"/>
diff --git a/data/os/freebsd.org/freebsd-5.4.xml.in b/data/os/freebsd.org/freebsd-5.4.xml.in
index 09c4653..9e89f84 100644
--- a/data/os/freebsd.org/freebsd-5.4.xml.in
+++ b/data/os/freebsd.org/freebsd-5.4.xml.in
@@ -9,6 +9,9 @@
<family>freebsd</family>
<distro>freebsd</distro>
+ <release-date>2005-05-09</release-date>
+ <eol-date>2006-10-31</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/5.3"/>
<derives-from id="http://freebsd.org/freebsd/5.3"/>
diff --git a/data/os/freebsd.org/freebsd-5.5.xml.in b/data/os/freebsd.org/freebsd-5.5.xml.in
index 3d53d3a..35ed863 100644
--- a/data/os/freebsd.org/freebsd-5.5.xml.in
+++ b/data/os/freebsd.org/freebsd-5.5.xml.in
@@ -9,7 +9,8 @@
<family>freebsd</family>
<distro>freebsd</distro>
- <release-date>2006-05-00</release-date>
+ <release-date>2006-05-25</release-date>
+ <eol-date>2008-05-31</eol-date>
<upgrades id="http://freebsd.org/freebsd/5.4"/>
<derives-from id="http://freebsd.org/freebsd/5.4"/>
diff --git a/data/os/freebsd.org/freebsd-6.0.xml.in b/data/os/freebsd.org/freebsd-6.0.xml.in
index fb61a2e..53e7bb5 100644
--- a/data/os/freebsd.org/freebsd-6.0.xml.in
+++ b/data/os/freebsd.org/freebsd-6.0.xml.in
@@ -12,6 +12,7 @@
<derives-from id="http://freebsd.org/freebsd/5.5"/>
<release-date>2005-11-04</release-date>
+ <eol-date>2007-01-31</eol-date>
<devices>
<device id="http://pcisig.com/pci/10ec/8029"/>
diff --git a/data/os/freebsd.org/freebsd-6.1.xml.in b/data/os/freebsd.org/freebsd-6.1.xml.in
index f10e72c..dfc6d09 100644
--- a/data/os/freebsd.org/freebsd-6.1.xml.in
+++ b/data/os/freebsd.org/freebsd-6.1.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2006-05-09</release-date>
+ <eol-date>2008-05-31</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/6.0"/>
<derives-from id="http://freebsd.org/freebsd/6.0"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-6.2.xml.in b/data/os/freebsd.org/freebsd-6.2.xml.in
index 25c8ebb..e3a334a 100644
--- a/data/os/freebsd.org/freebsd-6.2.xml.in
+++ b/data/os/freebsd.org/freebsd-6.2.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2007-01-15</release-date>
+ <eol-date>2008-05-31</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/6.1"/>
<derives-from id="http://freebsd.org/freebsd/6.1"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-6.3.xml.in b/data/os/freebsd.org/freebsd-6.3.xml.in
index 8abdbbe..838392c 100644
--- a/data/os/freebsd.org/freebsd-6.3.xml.in
+++ b/data/os/freebsd.org/freebsd-6.3.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2008-01-18</release-date>
+ <eol-date>2010-01-31</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/6.2"/>
<derives-from id="http://freebsd.org/freebsd/6.2"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-6.4.xml.in b/data/os/freebsd.org/freebsd-6.4.xml.in
index 5f6b7ea..ceb2d53 100644
--- a/data/os/freebsd.org/freebsd-6.4.xml.in
+++ b/data/os/freebsd.org/freebsd-6.4.xml.in
@@ -8,9 +8,11 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2008-11-28</release-date>
+ <eol-date>2010-11-30</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/6.3"/>
<derives-from id="http://freebsd.org/freebsd/6.3"/>
-
- <release-date>2008-11-11</release-date>
</os>
</libosinfo>
diff --git a/data/os/freebsd.org/freebsd-7.0.xml.in b/data/os/freebsd.org/freebsd-7.0.xml.in
index 74e74c4..9c01ca5 100644
--- a/data/os/freebsd.org/freebsd-7.0.xml.in
+++ b/data/os/freebsd.org/freebsd-7.0.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2008-02-27</release-date>
+ <eol-date>2009-04-30</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/6.4"/>
<derives-from id="http://freebsd.org/freebsd/6.4"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-7.1.xml.in b/data/os/freebsd.org/freebsd-7.1.xml.in
index 692c180..153eb28 100644
--- a/data/os/freebsd.org/freebsd-7.1.xml.in
+++ b/data/os/freebsd.org/freebsd-7.1.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2009-01-04</release-date>
+ <eol-date>2011-02-28</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/7.0"/>
<derives-from id="http://freebsd.org/freebsd/7.0"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-7.2.xml.in b/data/os/freebsd.org/freebsd-7.2.xml.in
index 4bc9cc3..4307cdf 100644
--- a/data/os/freebsd.org/freebsd-7.2.xml.in
+++ b/data/os/freebsd.org/freebsd-7.2.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2009-05-04</release-date>
+ <eol-date>2010-06-30</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/7.1"/>
<derives-from id="http://freebsd.org/freebsd/7.1"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-7.3.xml.in b/data/os/freebsd.org/freebsd-7.3.xml.in
index 5ce263c..c7c4c26 100644
--- a/data/os/freebsd.org/freebsd-7.3.xml.in
+++ b/data/os/freebsd.org/freebsd-7.3.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2010-03-23</release-date>
+ <eol-date>2012-03-31</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/7.2"/>
<derives-from id="http://freebsd.org/freebsd/7.2"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-7.4.xml.in b/data/os/freebsd.org/freebsd-7.4.xml.in
index 40556c1..0230be7 100644
--- a/data/os/freebsd.org/freebsd-7.4.xml.in
+++ b/data/os/freebsd.org/freebsd-7.4.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2011-02-24</release-date>
+ <eol-date>2013-02-28</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/7.3"/>
<derives-from id="http://freebsd.org/freebsd/7.3"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-8.0.xml.in b/data/os/freebsd.org/freebsd-8.0.xml.in
index bdafed5..80ae9b4 100644
--- a/data/os/freebsd.org/freebsd-8.0.xml.in
+++ b/data/os/freebsd.org/freebsd-8.0.xml.in
@@ -12,6 +12,7 @@
<derives-from id="http://freebsd.org/freebsd/7.4"/>
<release-date>2009-11-25</release-date>
+ <eol-date>2010-11-30</eol-date>
<devices>
<device id="http://pcisig.com/pci/8086/100e"/> <!--- Intel e1000 NIC -->
diff --git a/data/os/freebsd.org/freebsd-8.1.xml.in b/data/os/freebsd.org/freebsd-8.1.xml.in
index 81c0157..27fe059 100644
--- a/data/os/freebsd.org/freebsd-8.1.xml.in
+++ b/data/os/freebsd.org/freebsd-8.1.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2010-07-23</release-date>
+ <eol-date>2012-07-31</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/8.0"/>
<derives-from id="http://freebsd.org/freebsd/8.0"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-8.2.xml.in b/data/os/freebsd.org/freebsd-8.2.xml.in
index 53351bc..09d23d5 100644
--- a/data/os/freebsd.org/freebsd-8.2.xml.in
+++ b/data/os/freebsd.org/freebsd-8.2.xml.in
@@ -8,6 +8,10 @@
<_vendor>FreeBSD Project</_vendor>
<family>freebsd</family>
<distro>freebsd</distro>
+
+ <release-date>2011-02-24</release-date>
+ <eol-date>2012-07-31</eol-date>
+
<upgrades id="http://freebsd.org/freebsd/8.1"/>
<derives-from id="http://freebsd.org/freebsd/8.1"/>
</os>
diff --git a/data/os/freebsd.org/freebsd-8.4.xml.in b/data/os/freebsd.org/freebsd-8.4.xml.in
index b900d1c..9d442fc 100644
--- a/data/os/freebsd.org/freebsd-8.4.xml.in
+++ b/data/os/freebsd.org/freebsd-8.4.xml.in
@@ -11,7 +11,7 @@
<upgrades id="http://freebsd.org/freebsd/8.3"/>
<derives-from id="http://freebsd.org/freebsd/8.3"/>
- <release-date>2013-06-07</release-date>
- <eol-date>2015-06-30</eol-date>
+ <release-date>2013-06-09</release-date>
+ <eol-date>2015-08-01</eol-date>
</os>
</libosinfo>
diff --git a/data/os/freebsd.org/freebsd-9.0.xml.in b/data/os/freebsd.org/freebsd-9.0.xml.in
index 30bf61b..6202175 100644
--- a/data/os/freebsd.org/freebsd-9.0.xml.in
+++ b/data/os/freebsd.org/freebsd-9.0.xml.in
@@ -12,5 +12,6 @@
<derives-from id="http://freebsd.org/freebsd/8.2"/>
<release-date>2012-01-12</release-date>
+ <eol-date>2013-03-31</eol-date>
</os>
</libosinfo>
diff --git a/data/os/freebsd.org/freebsd-9.2.xml.in b/data/os/freebsd.org/freebsd-9.2.xml.in
index c483d36..81d8e8a 100644
--- a/data/os/freebsd.org/freebsd-9.2.xml.in
+++ b/data/os/freebsd.org/freebsd-9.2.xml.in
@@ -12,6 +12,6 @@
<derives-from id="http://freebsd.org/freebsd/9.1"/>
<release-date>2013-09-30</release-date>
- <eol-date>2014-09-30</eol-date>
+ <eol-date>2014-12-31</eol-date>
</os>
</libosinfo>
diff --git a/data/os/freebsd.org/freebsd-9.3.xml.in b/data/os/freebsd.org/freebsd-9.3.xml.in
index cdb8c5d..4dd8480 100644
--- a/data/os/freebsd.org/freebsd-9.3.xml.in
+++ b/data/os/freebsd.org/freebsd-9.3.xml.in
@@ -11,7 +11,7 @@
<upgrades id="http://freebsd.org/freebsd/9.2"/>
<derives-from id="http://freebsd.org/freebsd/9.2"/>
- <release-date>2014-07-15</release-date>
+ <release-date>2014-07-16</release-date>
<eol-date>2016-12-31</eol-date>
</os>
</libosinfo>
diff --git a/data/os/mageia.org/mageia-3.xml.in b/data/os/mageia.org/mageia-3.xml.in
index 0a3e1bc..8647730 100644
--- a/data/os/mageia.org/mageia-3.xml.in
+++ b/data/os/mageia.org/mageia-3.xml.in
@@ -10,7 +10,7 @@
<version>3</version>
<derives-from id="http://mageia.org/mageia/2"/>
<release-date>2013-05-19</release-date>
- <eol-date>2014-11-19</eol-date>
+ <eol-date>2014-11-26</eol-date>
<media arch="i686">
<iso>
diff --git a/data/os/mageia.org/mageia-4.xml.in b/data/os/mageia.org/mageia-4.xml.in
new file mode 100644
index 0000000..e4db996
--- /dev/null
+++ b/data/os/mageia.org/mageia-4.xml.in
@@ -0,0 +1,31 @@
+<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://mageia.org/mageia/4";>
+ <short-id>mageia4</short-id>
+ <_name>Mageia 4</_name>
+ <_vendor>Mageia</_vendor>
+ <family>linux</family>
+ <distro>mageia</distro>
+ <version>4</version>
+ <derives-from id="http://mageia.org/mageia/3"/>
+ <release-date>2014-02-01</release-date>
+ <eol-date>2015-09-19</eol-date>
+
+ <media arch="i686">
+ <iso>
+ <volume-id>Mageia-4(.1)?(-i586)?</volume-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <iso>
+ <volume-id>Mageia-4(.1)?(-x86_64)?</volume-id>
+ </iso>
+ </media>
+ <media live="true" arch="i686">
+ <iso>
+ <volume-id>Mageia-4(.1)?-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/mageia.org/mageia-5.xml.in b/data/os/mageia.org/mageia-5.xml.in
new file mode 100644
index 0000000..5fdeaec
--- /dev/null
+++ b/data/os/mageia.org/mageia-5.xml.in
@@ -0,0 +1,36 @@
+<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://mageia.org/mageia/5";>
+ <short-id>mageia5</short-id>
+ <_name>Mageia 5</_name>
+ <_vendor>Mageia</_vendor>
+ <family>linux</family>
+ <distro>mageia</distro>
+ <version>5</version>
+ <derives-from id="http://mageia.org/mageia/4"/>
+ <release-date>2015-06-19</release-date>
+ <eol-date>2017-10-31</eol-date>
+
+ <media arch="i686">
+ <iso>
+ <volume-id>Mageia-5(.1)?(-i586)?</volume-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <iso>
+ <volume-id>Mageia-5(.1)?(-x86_64)?</volume-id>
+ </iso>
+ </media>
+ <media live="true" arch="i686">
+ <iso>
+ <volume-id>Mageia-5(.1)?-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
+ </iso>
+ </media>
+ <media live="true" arch="x86_64">
+ <iso>
+ <volume-id>Mageia-5(.1)?-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/mageia.org/mageia-6.xml.in b/data/os/mageia.org/mageia-6.xml.in
new file mode 100644
index 0000000..65eb2f6
--- /dev/null
+++ b/data/os/mageia.org/mageia-6.xml.in
@@ -0,0 +1,36 @@
+<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://mageia.org/mageia/6";>
+ <short-id>mageia6</short-id>
+ <_name>Mageia 6</_name>
+ <_vendor>Mageia</_vendor>
+ <family>linux</family>
+ <distro>mageia</distro>
+ <version>6</version>
+ <derives-from id="http://mageia.org/mageia/5"/>
+ <release-date>2017-07-16</release-date>
+ <eol-date>2019-01-16</eol-date>
+
+ <media arch="i686">
+ <iso>
+ <volume-id>Mageia-6(.1)?(-i586)?</volume-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <iso>
+ <volume-id>Mageia-6(.1)?(-x86_64)?</volume-id>
+ </iso>
+ </media>
+ <media live="true" arch="i686">
+ <iso>
+ <volume-id>Mageia-6(.1)?-(GNOME|Plasma|Xfce)-LiveDVD</volume-id>
+ </iso>
+ </media>
+ <media live="true" arch="x86_64">
+ <iso>
+ <volume-id>Mageia-6(.1)?-(GNOME|Plasma|Xfce)-LiveDVD</volume-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/opensuse.org/opensuse-12.2.xml.in b/data/os/opensuse.org/opensuse-12.2.xml.in
index fa56065..98476da 100644
--- a/data/os/opensuse.org/opensuse-12.2.xml.in
+++ b/data/os/opensuse.org/opensuse-12.2.xml.in
@@ -66,7 +66,6 @@
<recommended>
<cpu>2400000000</cpu>
<ram>2147483648</ram>
- <storage>5368709120</storage>
<storage>10737418240</storage>
</recommended>
</resources>
diff --git a/data/os/opensuse.org/opensuse-factory.xml.in b/data/os/opensuse.org/opensuse-factory.xml.in
index cd872d3..56992cf 100644
--- a/data/os/opensuse.org/opensuse-factory.xml.in
+++ b/data/os/opensuse.org/opensuse-factory.xml.in
@@ -34,7 +34,6 @@
<resources arch="all">
<!-- http://en.opensuse.org/Hardware_requirements -->
<minimum>
- <cpu>500000000</cpu>
<cpu>1600000000</cpu>
<n-cpus>1</n-cpus>
<ram>1073741824</ram>
diff --git a/data/os/redhat.com/rhel-6.7.xml.in b/data/os/redhat.com/rhel-6.7.xml.in
index fd39da5..a3b2e38 100644
--- a/data/os/redhat.com/rhel-6.7.xml.in
+++ b/data/os/redhat.com/rhel-6.7.xml.in
@@ -13,6 +13,7 @@
<derives-from id="http://redhat.com/rhel/6.6"/>
<release-date>2015-07-22</release-date>
+ <eol-date>2023-11-30</eol-date>
<media arch="i686">
<iso>
diff --git a/data/os/redhat.com/rhel-6.8.xml.in b/data/os/redhat.com/rhel-6.8.xml.in
index 3679cf0..b3bc6fa 100644
--- a/data/os/redhat.com/rhel-6.8.xml.in
+++ b/data/os/redhat.com/rhel-6.8.xml.in
@@ -13,6 +13,7 @@
<derives-from id="http://redhat.com/rhel/6.7"/>
<release-date>2016-05-10</release-date>
+ <eol-date>2023-11-30</eol-date>
<media arch="i686">
<iso>
diff --git a/data/os/redhat.com/rhel-6.9.xml.in b/data/os/redhat.com/rhel-6.9.xml.in
new file mode 100644
index 0000000..ef769f9
--- /dev/null
+++ b/data/os/redhat.com/rhel-6.9.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://redhat.com/rhel/6.9";>
+ <short-id>rhel6.9</short-id>
+ <_name>Red Hat Enterprise Linux 6.9</_name>
+ <version>6.9</version>
+ <_vendor>Red Hat, Inc</_vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+ <codename>Santiago</codename>
+ <upgrades id="http://redhat.com/rhel/6.8"/>
+ <derives-from id="http://redhat.com/rhel/6.8"/>
+
+ <release-date>2017-03-21</release-date>
+ <eol-date>2023-11-30</eol-date>
+
+ <media arch="i686">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-6.9 .*.i386.*</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>.*RHEL-6.9 .*.x86_64.*</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <ram>536870912</ram>
+ </minimum>
+
+ <recommended>
+ <cpu>400000000</cpu>
+ <ram>1073741824</ram>
+ <storage>9663676416</storage>
+ </recommended>
+ </resources>
+
+ <installer>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/os/redhat.com/rhel-7.3.xml.in b/data/os/redhat.com/rhel-7.3.xml.in
new file mode 100644
index 0000000..894f511
--- /dev/null
+++ b/data/os/redhat.com/rhel-7.3.xml.in
@@ -0,0 +1,89 @@
+<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://redhat.com/rhel/7.3";>
+ <short-id>rhel7.3</short-id>
+ <_name>Red Hat Enterprise Linux 7.3</_name>
+ <version>7.3</version>
+ <_vendor>Red Hat, Inc</_vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+ <codename>Maipo</codename>
+ <upgrades id="http://redhat.com/rhel/7.2"/>
+ <derives-from id="http://redhat.com/rhel/7.2"/>
+
+ <release-date>2016-11-03</release-date>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>.*RHEL-7.3.*x86_64.*</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-7.3.*aarch64$</volume-id>
+ </iso>
+ </media>
+
+ <media arch="ppc64">
+ <iso>
+ <system-id>PPC</system-id>
+ <volume-id>RHEL-7.3.*ppc64$</volume-id>
+ </iso>
+ </media>
+
+ <media arch="ppc64le">
+ <iso>
+ <system-id>PPC</system-id>
+ <volume-id>RHEL-7.3.*ppc64le$</volume-id>
+ </iso>
+ </media>
+
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-7.3.*s390x$</volume-id>
+ </iso>
+ </media>
+
+ <resources arch="ppc64">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+
+ <recommended>
+ <cpu>400000000</cpu>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+
+ <recommended>
+ <cpu>400000000</cpu>
+ <ram>1073741824</ram>
+ <storage>9663676416</storage>
+ </recommended>
+ </resources>
+
+ <installer>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/os/redhat.com/rhel-7.4.xml.in b/data/os/redhat.com/rhel-7.4.xml.in
new file mode 100644
index 0000000..a230d68
--- /dev/null
+++ b/data/os/redhat.com/rhel-7.4.xml.in
@@ -0,0 +1,89 @@
+<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://redhat.com/rhel/7.4";>
+ <short-id>rhel7.4</short-id>
+ <_name>Red Hat Enterprise Linux 7.4</_name>
+ <version>7.4</version>
+ <_vendor>Red Hat, Inc</_vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+ <codename>Maipo</codename>
+ <upgrades id="http://redhat.com/rhel/7.3"/>
+ <derives-from id="http://redhat.com/rhel/7.3"/>
+
+ <release-date>2017-08-01</release-date>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>.*RHEL-7.4.*x86_64.*</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-7.4.*aarch64$</volume-id>
+ </iso>
+ </media>
+
+ <media arch="ppc64">
+ <iso>
+ <system-id>PPC</system-id>
+ <volume-id>RHEL-7.4.*ppc64$</volume-id>
+ </iso>
+ </media>
+
+ <media arch="ppc64le">
+ <iso>
+ <system-id>PPC</system-id>
+ <volume-id>RHEL-7.4.*ppc64le$</volume-id>
+ </iso>
+ </media>
+
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-7.4.*s390x$</volume-id>
+ </iso>
+ </media>
+
+ <resources arch="ppc64">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+
+ <recommended>
+ <cpu>400000000</cpu>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+
+ <recommended>
+ <cpu>400000000</cpu>
+ <ram>1073741824</ram>
+ <storage>9663676416</storage>
+ </recommended>
+ </resources>
+
+ <installer>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
index c394761..f99b523 100644
--- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
@@ -31,7 +31,7 @@
</resources>
<media arch="i686">
- <url>http://releases.ubuntu.com/releases/wily/ubuntu-15.10-server-i386.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id>
</iso>
@@ -39,7 +39,7 @@
<initrd>install/initrd.gz</initrd>
</media>
<media arch="x86_64">
- <url>http://releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso</url>
<iso>
<volume-id>Ubuntu-Server 15.10(.\d)? 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/wily/ubuntu-15.10-desktop-i386.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 15.10(.\d)? 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/wily/ubuntu-15.10-desktop-amd64.iso</url>
+ <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso</url>
<iso>
<volume-id>Ubuntu 15.10(.\d)? amd64</volume-id>
</iso>
diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
index 5300c0c..e11e0b8 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-server-i386.iso</url>
+ <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.2-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-server-amd64.iso</url>
+ <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.2-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-desktop-i386.iso</url>
+ <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.2-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-desktop-amd64.iso</url>
+ <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04.2-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-server-powerpc.iso</url>
+ <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.2-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-server-ppc64el.iso</url>
+ <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.2-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-server-s390x.iso</url>
+ <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04.2-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-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in
new file mode 100644
index 0000000..9557340
--- /dev/null
+++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in
@@ -0,0 +1,94 @@
+<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/16.10";>
+ <short-id>ubuntu16.10</short-id>
+ <short-id>ubuntutyakkety</short-id>
+ <_name>Ubuntu 16.10</_name>
+ <version>16.10</version>
+ <_vendor>Canonical Ltd</_vendor>
+ <family>linux</family>
+ <distro>ubuntu</distro>
+ <codename>Yakkety Yak</codename>
+ <upgrades id="http://ubuntu.com/ubuntu/16.04"/>
+ <derives-from id="http://ubuntu.com/ubuntu/16.04"/>
+
+ <release-date>2016-10-13</release-date>
+ <eol-date>2017-07-20</eol-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://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-i386.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 16.10(.\d)? i386</volume-id>
+ </iso>
+ <kernel>install/vmlinuz</kernel>
+ <initrd>install/initrd.gz</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 16.10(.\d)? amd64</volume-id>
+ </iso>
+ <kernel>install/vmlinuz</kernel>
+ <initrd>install/initrd.gz</initrd>
+ </media>
+ <media arch="i686" live="true">
+ <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-i386.iso</url>
+ <iso>
+ <volume-id>Ubuntu 16.10(.\d)? i386</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd.lz</initrd>
+ </media>
+ <media arch="x86_64" live="true">
+ <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu 16.10(.\d)? amd64</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd.lz</initrd>
+ </media>
+ <media arch="aarch64">
+ <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-arm64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 16.10(.\d)? arm64</volume-id>
+ </iso>
+ </media>
+ <media arch="ppc">
+ <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-powerpc.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 16.10(.\d)? ppc</volume-id>
+ </iso>
+ </media>
+ <media arch="ppc64le">
+ <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-ppc64el.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 16.10(.\d)? ppc64</volume-id>
+ </iso>
+ </media>
+ <media arch="s390x">
+ <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-s390x.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 16.10(.\d)? s390x</volume-id>
+ </iso>
+ </media>
+
+ <installer>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in
new file mode 100644
index 0000000..271d7ea
--- /dev/null
+++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in
@@ -0,0 +1,87 @@
+<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.04";>
+ <short-id>ubuntu17.04</short-id>
+ <short-id>ubuntutzesty</short-id>
+ <_name>Ubuntu 17.04</_name>
+ <version>17.04</version>
+ <_vendor>Canonical Ltd</_vendor>
+ <family>linux</family>
+ <distro>ubuntu</distro>
+ <codename>Zesty Zapus</codename>
+ <upgrades id="http://ubuntu.com/ubuntu/16.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/16.10"/>
+
+ <release-date>2017-04-13</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/zesty/ubuntu-17.04-server-i386.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 17.04(.\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/zesty/ubuntu-17.04-server-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 17.04(.\d)? amd64</volume-id>
+ </iso>
+ <kernel>install/vmlinuz</kernel>
+ <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>
+ <iso>
+ <volume-id>Ubuntu 17.04(.\d)? i386</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <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>
+ <iso>
+ <volume-id>Ubuntu 17.04(.\d)? amd64</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd.lz</initrd>
+ </media>
+ <media arch="aarch64">
+ <url>http://cdimage.ubuntu.com/releases/zesty/release/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>
+ <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>
+ <iso>
+ <volume-id>Ubuntu-Server 17.04(.\d)? s390x</volume-id>
+ </iso>
+ </media>
+
+ <installer>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/data/schema/osinfo.rng.in b/data/schema/osinfo.rng.in
index 1349d91..843519d 100644
--- a/data/schema/osinfo.rng.in
+++ b/data/schema/osinfo.rng.in
@@ -355,6 +355,11 @@
<ref name='num'/>
</attribute>
</optional>
+ <optional>
+ <attribute name='eject-after-install'>
+ <ref name='bool'/>
+ </attribute>
+ </optional>
<interleave>
<optional>
<element name='variant'>
diff --git a/debian/changelog b/debian/changelog
index d5134fe..69bca11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+osinfo-db (0.20170811-1~deb9u1) stretch; urgency=medium
+
+ * Rebuild for stretch
+
+ -- Guido Günther <agx@sigxcpu.org> Mon, 25 Sep 2017 12:21:16 +0200
+
+osinfo-db (0.20170811-1) unstable; urgency=medium
+
+ * [596e960] Fix vcs git url
+ * [226d475] New upstream version 0.20170811
+ * [1cfe3ae] Drop debian-switch-to-archive-URLs-for-stretch.patch applied
+ upstream
+
+ -- Guido Günther <agx@sigxcpu.org> Fri, 11 Aug 2017 16:48:31 -0300
+
+osinfo-db (0.20170707-2) unstable; urgency=medium
+
+ * [c821b78] debian: switch to archive URLs for stretch
+
+ -- Guido Günther <agx@sigxcpu.org> Sun, 23 Jul 2017 14:02:34 +0200
+
+osinfo-db (0.20170707-1) unstable; urgency=medium
+
+ * [1428d41] New upstream version 0.20170707
+ * [1f875ee] Run make check during
+ * [a906220] Drop all patches - all appplied upstream
+
+ -- Guido Günther <agx@sigxcpu.org> Fri, 07 Jul 2017 18:09:19 +0200
+
osinfo-db (0.20170225-3~deb9u1) stretch; urgency=medium
* [17d85a0] Adjust gbp.conf for stretch
diff --git a/debian/control b/debian/control
index ded5f98..2f07a72 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,11 @@ Maintainer: Guido Günther <agx@sigxcpu.org>
Build-Depends:
debhelper (>= 10),
intltool,
+ libxml2-utils,
osinfo-db-tools,
Standards-Version: 3.9.8
Homepage: https://libosinfo.org/
-Vcs-Git: https://anonscm.debian.org/pkg-libvirt/osinfo-db.git
+Vcs-Git: https://anonscm.debian.org/cgit/pkg-libvirt/osinfo-db.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-libvirt/osinfo-db.git
Package: osinfo-db
diff --git a/debian/patches/Add-Debian-Stretch.patch b/debian/patches/Add-Debian-Stretch.patch
deleted file mode 100644
index f03bd32..0000000
--- a/debian/patches/Add-Debian-Stretch.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Mon, 13 Mar 2017 19:20:33 +0100
-Subject: Add Debian Stretch
-
----
- data/os/debian.org/debian-9.xml.in | 130 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 130 insertions(+)
- create mode 100644 data/os/debian.org/debian-9.xml.in
-
-diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
-new file mode 100644
-index 0000000..e0b9085
---- /dev/null
-+++ b/data/os/debian.org/debian-9.xml.in
-@@ -0,0 +1,130 @@
-+<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://debian.org/debian/9";>
-+ <short-id>debian9</short-id>
-+ <short-id>debianstretch</short-id>
-+ <_name>Debian Stretch</_name>
-+ <version>9</version>
-+ <_vendor>Debian Project</_vendor>
-+ <family>linux</family>
-+ <distro>debian</distro>
-+ <upgrades id="http://debian.org/debian/8"/>
-+ <derives-from id="http://debian.org/debian/8"/>
-+
-+ <release-date>2017-06-17</release-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"/>
-+ </devices>
-+
-+ <resources arch="all">
-+ <minimum>
-+ <cpu>1000000000</cpu>
-+ <n-cpus>1</n-cpus>
-+ <ram>1073741824</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+ <recommended>
-+ <cpu>1000000000</cpu>
-+ <ram>1073741824</ram>
-+ <storage>21474836480</storage>
-+ </recommended>
-+ </resources>
-+
-+ <variant id="universal">
-+ <_name>Debian 9</_name>
-+ </variant>
-+ <variant id="universal-netinst">
-+ <_name>Debian 9</_name>
-+ </variant>
-+
-+ <!-- Network installer -->
-+ <media arch="i686">
-+ <variant id="universal-netinst"/>
-+ <url>http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-9.0.0-i386-netinst.iso</url>
-+ <iso>
-+ <volume-id>Debian 9.(\d)+.(\d)+ i386 n</volume-id>
-+ </iso>
-+ <kernel>install.386/vmlinuz</kernel>
-+ <initrd>install.386/initrd.gz</initrd>
-+ </media>
-+ <media arch="x86_64">
-+ <variant id="universal-netinst"/>
-+ <url>http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso</url>
-+ <iso>
-+ <volume-id>Debian 9.(\d)+.(\d)+ amd64 n</volume-id>
-+ </iso>
-+ <kernel>install.amd/vmlinuz</kernel>
-+ <initrd>install.amd/initrd.gz</initrd>
-+ </media>
-+ <media arch="arm64">
-+ <variant id="universal-netinst"/>
-+ <url>http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso</url>
-+ <iso>
-+ <volume-id>Debian 9.(\d)+.(\d)+ arm64 n</volume-id>
-+ </iso>
-+ <kernel>install.arm64/vmlinuz</kernel>
-+ <initrd>install.arm64/initrd.gz</initrd>
-+ </media>
-+ <media arch="armhf">
-+ <variant id="universal-netinst"/>
-+ <url>http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso</url>
-+ <iso>
-+ <volume-id>Debian 9.(\d)+.(\d)+ armhf n</volume-id>
-+ </iso>
-+ <kernel>install.armhf/vmlinuz</kernel>
-+ <initrd>install.armhf/initrd.gz</initrd>
-+ </media>
-+
-+ <!-- DVD -->
-+ <media arch="i686">
-+ <variant id="universal"/>
-+ <url>http://cdimage.debian.org/cdimage/release/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso</url>
-+ <iso>
-+ <volume-id>Debian 9.(\d)+.(\d)+ i386 1</volume-id>
-+ </iso>
-+ <kernel>install.386/vmlinuz</kernel>
-+ <initrd>install.386/initrd.gz</initrd>
-+ </media>
-+ <media arch="x86_64">
-+ <variant id="universal"/>
-+ <url>http://cdimage.debian.org/cdimage/release/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso</url>
-+ <iso>
-+ <volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id>
-+ </iso>
-+ <kernel>install.amd/vmlinuz</kernel>
-+ <initrd>install.amd/initrd.gz</initrd>
-+ </media>
-+ <media arch="arm64">
-+ <variant id="universal"/>
-+ <url>http://cdimage.debian.org/cdimage/release/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso</url>
-+ <iso>
-+ <volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id>
-+ </iso>
-+ <kernel>install.arm64/vmlinuz</kernel>
-+ <initrd>install.arm64/initrd.gz</initrd>
-+ </media>
-+ <media arch="armhf">
-+ <variant id="universal"/>
-+ <url>http://cdimage.debian.org/cdimage/release/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso</url>
-+ <iso>
-+ <volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id>
-+ </iso>
-+ <kernel>install.armhf/vmlinuz</kernel>
-+ <initrd>install.armhf/initrd.gz</initrd>
-+ </media>
-+
-+ <installer>
-+ <script id='http://debian.org/debian/preseed/jeos'/>
-+ <script id='http://debian.org/debian/preseed/desktop'/>
-+ </installer>
-+ </os>
-+</libosinfo>
diff --git a/debian/patches/Debian-Jessie-Update-DVD-links.patch b/debian/patches/Debian-Jessie-Update-DVD-links.patch
deleted file mode 100644
index 070e48a..0000000
--- a/debian/patches/Debian-Jessie-Update-DVD-links.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Tue, 14 Mar 2017 08:43:43 +0100
-Subject: Debian Jessie: Update DVD links
-
----
- data/os/debian.org/debian-8.xml.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
-index 19bb8a5..8ad189b 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/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso</url>
-+ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/i386/iso-dvd/debian-8.8.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/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso</url>
-+ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/amd64/iso-dvd/debian-8.8.0-amd64-DVD-1.iso</url>
- <iso>
- <volume-id>Debian 8.\d.\d amd64 1</volume-id>
- </iso>
diff --git a/debian/patches/Reproducible-Build.patch b/debian/patches/Reproducible-Build.patch
deleted file mode 100644
index 6cdf86f..0000000
--- a/debian/patches/Reproducible-Build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Chris Lamb <lamby@debian.org>
-Date: Sat, 22 Apr 2017 11:34:31 +0200
-Subject: Use SOURCE_DATE_EPOCH to make build reproducible
-
-using a fixed timestamp when the variable is set
----
- Makefile | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 6ff9b5c..d6864af 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,11 @@
-
- VPATH = .
-
--TODAY = $(shell date +"%Y%m%d")
-+ifdef SOURCE_DATE_EPOCH
-+ TODAY = $(shell date --utc --date="@$(SOURCE_DATE_EPOCH)" +"%Y%m%d")
-+else
-+ TODAY = $(shell date +"%Y%m%d")
-+endif
-
- OSINFO_DB_EXPORT = osinfo-db-export
- OSINFO_DB_IMPORT = osinfo-db-import
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 98907f9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-Debian-Jessie-Update-DVD-links.patch
-Add-Debian-Stretch.patch
-Reproducible-Build.patch
diff --git a/debian/rules b/debian/rules
index 4d2fbb8..64f5260 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,9 @@ override_dh_auto_clean:
rm -rf build
dh_auto_clean
+override_dh_auto_test:
+ make -C build check
+
override_dh_auto_install:
osinfo-db-import \
--root debian/tmp/ \
--- End Message ---