From cfergeau at redhat.com  Mon Nov  2 10:56:59 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 2 Nov 2015 11:56:59 +0100
Subject: [Libosinfo] [PATCH 3/5] fedora, script: Install qemu-guest-agent
In-Reply-To: <1445889399-6380-3-git-send-email-zeeshanak@gnome.org>
References: <1445889399-6380-1-git-send-email-zeeshanak@gnome.org>
	<1445889399-6380-3-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151102105659.GV15093@edamame.cdg.redhat.com>

It's present by default on the f22 live CD at least, so maybe it's not
needed to explicitly list it?

Christophe

On Mon, Oct 26, 2015 at 07:56:37PM +0000, Zeeshan Ali (Khattak) wrote:
> For desktop profile.
> ---
>  data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 3 +++
>  1 file changed, 3 insertions(+)
> 
> 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 be7a965..24a4d6b 100644
> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> @@ -156,6 +156,9 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
>  xorg-x11-drv-qxl
>  spice-vdagent
>  
> +# Also Qemu agent
> +qemu-guest-agent
> +
>  %end
>  
>  %post --erroronfail
> -- 
> 2.5.0
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151102/240bb05a/attachment.sig>

From cfergeau at redhat.com  Mon Nov  2 10:57:09 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 2 Nov 2015 11:57:09 +0100
Subject: [Libosinfo] [PATCH 2/5] debian, script: Install qemu-guest-agent
In-Reply-To: <1445889399-6380-2-git-send-email-zeeshanak@gnome.org>
References: <1445889399-6380-1-git-send-email-zeeshanak@gnome.org>
	<1445889399-6380-2-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151102105709.GW15093@edamame.cdg.redhat.com>

ACK.

On Mon, Oct 26, 2015 at 07:56:36PM +0000, Zeeshan Ali (Khattak) wrote:
> For desktop profile.
> ---
>  data/install-script/debian.org/debian-preseed-desktop.xml.in | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/data/install-script/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in
> index d9ac99d..f7f1759 100644
> --- a/data/install-script/debian.org/debian-preseed-desktop.xml.in
> +++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in
> @@ -170,6 +170,8 @@ d-i apt-setup/security_host string
>  ### Software selection
>  tasksel tasksel/first multiselect desktop
>  
> +### Install Qemu guest agent
> +d-i pkgsel/include string qemu-guest-agent
>  
>  ### Bootloader
>  
> -- 
> 2.5.0
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151102/256d7db7/attachment.sig>

From cfergeau at redhat.com  Mon Nov  2 11:02:22 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 2 Nov 2015 12:02:22 +0100
Subject: [Libosinfo] [PATCH 4/5] rhel,script: Install qemu-guest-agent
In-Reply-To: <1445889399-6380-4-git-send-email-zeeshanak@gnome.org>
References: <1445889399-6380-1-git-send-email-zeeshanak@gnome.org>
	<1445889399-6380-4-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151102110222.GX15093@edamame.cdg.redhat.com>

ACK (this has been available in RHEL6 for several years now, so should
be good).

Christophe

On Mon, Oct 26, 2015 at 07:56:38PM +0000, Zeeshan Ali (Khattak) wrote:
> for desktop profile.
> ---
>  data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 3 +++
>  1 file changed, 3 insertions(+)
> 
> 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 a643113..1aeb3a2 100644
> --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
> +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
> @@ -107,6 +107,9 @@ reboot
>  @internet-browser
>  @input-methods
>  
> +# Qemu agent
> +qemu-guest-agent
> +
>  %end
>  
>  %post --erroronfail
> -- 
> 2.5.0
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151102/7cbc8b5c/attachment.sig>

From cfergeau at redhat.com  Mon Nov  2 11:06:00 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 2 Nov 2015 12:06:00 +0100
Subject: [Libosinfo] [PATCH 5/5] fedora,script: Use more generic URL
In-Reply-To: <1445889399-6380-5-git-send-email-zeeshanak@gnome.org>
References: <1445889399-6380-1-git-send-email-zeeshanak@gnome.org>
	<1445889399-6380-5-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151102110600.GY15093@edamame.cdg.redhat.com>

ACK.

On Mon, Oct 26, 2015 at 07:56:39PM +0000, Zeeshan Ali (Khattak) wrote:
> The URL we have been pointing Anaconda to, seems to only work for
> released versions and not for Alpha and Beta. Let's use a URL that works
> for both released and development snapshots.
> ---
>  data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 2 +-
>  data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in    | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> 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 24a4d6b..e7c2d62 100644
> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> @@ -130,7 +130,7 @@ reboot
>  <xsl:if test="contains(media/variant, 'netinst')">
>  repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
>  repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
> -url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
> +url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
>  </xsl:if>
>  
>  %packages
> diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
> index 55cd52f..8786d8a 100644
> --- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
> @@ -131,7 +131,7 @@ reboot
>  <xsl:if test="contains(media/variant, 'netinst')">
>  repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
>  repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
> -url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
> +url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
>  </xsl:if>
>  
>  %packages
> -- 
> 2.5.0
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151102/8900275e/attachment.sig>

From cfergeau at redhat.com  Mon Nov  2 11:13:49 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 2 Nov 2015 12:13:49 +0100
Subject: [Libosinfo] [PATCH 1/5] fedora: Add F23 info & testcases
In-Reply-To: <1445889399-6380-1-git-send-email-zeeshanak@gnome.org>
References: <1445889399-6380-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151102111349.GZ15093@edamame.cdg.redhat.com>

Hey,

With f23 release due yesterday according to
https://fedoraproject.org/wiki/Releases/23/Schedule , it might be worth
to wait a bit and push a patch with the final URLs / release dates / ...
?

Looks good otherwise,

Christophe

On Mon, Oct 26, 2015 at 07:56:35PM +0000, Zeeshan Ali (Khattak) wrote:
> ---
>  data/os/fedoraproject.org/fedora-23.xml.in         | 166 +++++++++++++++++++++
>  po/POTFILES.in                                     |   1 +
>  .../Fedora-Live-Workstation-i686-23_Beta-1.iso.txt |  29 ++++
>  ...edora-Live-Workstation-x86_64-23_Beta-1.iso.txt |  29 ++++
>  .../Fedora-Server-DVD-i386-23_Beta.iso.txt         |  29 ++++
>  .../Fedora-Server-DVD-x86_64-23_Beta.iso.txt       |  29 ++++
>  .../Fedora-Server-netinst-i386-23_Beta.iso.txt     |  29 ++++
>  .../Fedora-Server-netinst-x86_64-23_Beta.iso.txt   |  29 ++++
>  ...Fedora-Workstation-netinst-i386-23_Beta.iso.txt |  29 ++++
>  ...dora-Workstation-netinst-x86_64-23_Beta.iso.txt |  29 ++++
>  10 files changed, 399 insertions(+)
>  create mode 100644 data/os/fedoraproject.org/fedora-23.xml.in
>  create mode 100644 test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
>  create mode 100644 test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
>  create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23_Beta.iso.txt
>  create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23_Beta.iso.txt
>  create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23_Beta.iso.txt
>  create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23_Beta.iso.txt
>  create mode 100644 test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
>  create mode 100644 test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt
> 
> diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
> new file mode 100644
> index 0000000..8c382a2
> --- /dev/null
> +++ b/data/os/fedoraproject.org/fedora-23.xml.in
> @@ -0,0 +1,166 @@
> +<libosinfo version="0.0.1">
> +  <os id="http://fedoraproject.org/fedora/23">
> +    <short-id>fedora23</short-id>
> +    <_name>Fedora 23</_name>
> +    <version>23</version>
> +    <_vendor>Fedora Project</_vendor>
> +    <family>linux</family>
> +    <distro>fedora</distro>
> +    <upgrades id="http://fedoraproject.org/fedora/22"/>
> +    <derives-from id="http://fedoraproject.org/fedora/22"/>
> +
> +    <variant id="workstation">
> +      <_name>Fedora 23 Workstation</_name>
> +    </variant>
> +    <variant id="workstation-netinst">
> +      <_name>Fedora 23 Workstation</_name>
> +    </variant>
> +    <variant id="server">
> +      <_name>Fedora 23 Server</_name>
> +    </variant>
> +    <variant id="server-netinst">
> +      <_name>Fedora 23 Server</_name>
> +    </variant>
> +
> +    <!-- Workstation -->
> +
> +    <!-- Live -->
> +    <media arch="i686" live="true">
> +      <variant id="workstation"/>
> +      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Live-Workstation-i686-23-3.iso</url> -->
> +      <iso>
> +        <volume-id>Fedora-Live-WS-i686-23.*</volume-id>
> +        <system-id>LINUX</system-id>
> +      </iso>
> +      <kernel>isolinux/vmlinuz0</kernel>
> +      <initrd>isolinux/initrd0.img</initrd>
> +    </media>
> +    <media arch="x86_64" live="true">
> +      <variant id="workstation"/>
> +      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-23-3.iso</url> -->
> +      <iso>
> +        <volume-id>Fedora-Live-WS-x86_64-23.*</volume-id>
> +        <system-id>LINUX</system-id>
> +      </iso>
> +      <kernel>isolinux/vmlinuz0</kernel>
> +      <initrd>isolinux/initrd0.img</initrd>
> +    </media>
> +
> +    <!-- Network Installer !-->
> +    <media arch="i686">
> +      <variant id="workstation-netinst"/>
> +      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Workstation-netinst-i386-23.iso</url> -->
> +      <iso>
> +        <volume-id>Fedora-WS-23(_[[:alpha:]]*)*-i386</volume-id>
> +        <system-id>LINUX</system-id>
> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +    <media arch="x86_64">
> +      <variant id="workstation-netinst"/>
> +      <!--<url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-23.iso</url>-->
> +      <iso>
> +        <volume-id>Fedora-WS-23(_[[:alpha:]]*)*-x86_64</volume-id>
> +        <system-id>LINUX</system-id>
> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +
> +    <!-- Server -->
> +
> +    <!-- DVD -->
> +    <media arch="i686">
> +      <variant id="server"/>
> +      <!--<url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-DVD-i386-23.iso</url>-->
> +      <iso>
> +        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id>
> +        <system-id>LINUX</system-id>
> +        <!-- We need volume-size to distinguish DVD from netiso here but we
> +             can't know the final size before release. For details:
> +
> +             https://fedorahosted.org/rel-eng/ticket/6173
> +        -->
> +        <!-- <volume-size>2355410944</volume-size> -->
> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +    <media arch="x86_64">
> +      <variant id="server"/>
> +      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-DVD-x86_64-23.iso</url> -->
> +      <iso>
> +        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id>
> +        <system-id>LINUX</system-id>
> +        <!-- <volume-size>2355410944</volume-size> -->
> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +
> +    <!-- Network Installer !-->
> +    <media arch="i686">
> +      <variant id="server-netinst"/>
> +      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-netinst-i386-23.iso</url> -->
> +      <iso>
> +        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id>
> +        <system-id>LINUX</system-id>
> +        <!-- <volume-size>2355410944</volume-size> -->
> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +    <media arch="x86_64">
> +      <variant id="server-netinst"/>
> +      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-netinst-x86_64-23.iso</url> -->
> +      <iso>
> +        <volume-id>Fedora-23-x86_64</volume-id>
> +        <system-id>LINUX</system-id>
> +        <!-- <volume-size>2355410944</volume-size> -->
> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +
> +    <tree arch="i686">
> +      <variant id="server"/>
> +      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/</url> -->
> +      <treeinfo>
> +        <family>Fedora</family>
> +        <version>23</version>
> +        <arch>i386</arch>
> +      </treeinfo>
> +    </tree>
> +    <tree arch="x86_64">
> +      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/</url> -->
> +      <variant id="server"/>
> +      <treeinfo>
> +        <family>Fedora</family>
> +        <version>23</version>
> +        <arch>x86_64</arch>
> +      </treeinfo>
> +    </tree>
> +
> +    <!-- No install media or tree is provided for Fedora 23 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/po/POTFILES.in b/po/POTFILES.in
> index f5d40c8..56ff0b7 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -58,6 +58,7 @@ data/os/fedoraproject.org/fedora-19.xml.in
>  data/os/fedoraproject.org/fedora-20.xml.in
>  data/os/fedoraproject.org/fedora-21.xml.in
>  data/os/fedoraproject.org/fedora-22.xml.in
> +data/os/fedoraproject.org/fedora-23.xml.in
>  data/os/fedoraproject.org/fedora-unknown.xml.in
>  data/os/freebsd.org/freebsd-1.0.xml.in
>  data/os/freebsd.org/freebsd-2.0.5.xml.in
> diff --git a/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
> new file mode 100644
> index 0000000..00240d9
> --- /dev/null
> +++ b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-Live-WS-i686-23_B-1
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: 
> +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
> +Copyright File id: 
> +Abstract File id: 
> +Bibliographic File id: 
> +Volume set size is: 1
> +Volume set sequence number is: 1
> +Logical block size is: 2048
> +Volume size is: 709990
> +El Torito VD version 1 found, boot catalog is in sector 36
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +    Hid 1
> +    Arch 0 (x86)
> +    ID ''
> +    Key 55 AA
> +    Eltorito defaultboot header:
> +        Bootid 88 (bootable)
> +        Boot media 0 (No Emulation Boot)
> +        Load segment 0
> +        Sys type 0
> +        Nsect 4
> +        Bootoff 25 37
> diff --git a/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
> new file mode 100644
> index 0000000..5880a32
> --- /dev/null
> +++ b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-Live-WS-x86_64-23_B-1
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: 
> +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
> +Copyright File id: 
> +Abstract File id: 
> +Bibliographic File id: 
> +Volume set size is: 1
> +Volume set sequence number is: 1
> +Logical block size is: 2048
> +Volume size is: 716965
> +El Torito VD version 1 found, boot catalog is in sector 42
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +    Hid 1
> +    Arch 0 (x86)
> +    ID ''
> +    Key 55 AA
> +    Eltorito defaultboot header:
> +        Bootid 88 (bootable)
> +        Boot media 0 (No Emulation Boot)
> +        Load segment 0
> +        Sys type 0
> +        Nsect 4
> +        Bootoff 842 2114
> diff --git a/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23_Beta.iso.txt
> new file mode 100644
> index 0000000..738f9bf
> --- /dev/null
> +++ b/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23_Beta.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-S-23_B-i386
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: 
> +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
> +Copyright File id: 
> +Abstract File id: 
> +Bibliographic File id: 
> +Volume set size is: 1
> +Volume set sequence number is: 1
> +Logical block size is: 2048
> +Volume size is: 1150103
> +El Torito VD version 1 found, boot catalog is in sector 407
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +    Hid 1
> +    Arch 0 (x86)
> +    ID ''
> +    Key 55 AA
> +    Eltorito defaultboot header:
> +        Bootid 88 (bootable)
> +        Boot media 0 (No Emulation Boot)
> +        Load segment 0
> +        Sys type 0
> +        Nsect 4
> +        Bootoff 198 408
> diff --git a/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23_Beta.iso.txt
> new file mode 100644
> index 0000000..4491a4a
> --- /dev/null
> +++ b/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23_Beta.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-S-23_B-x86_64
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: 
> +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
> +Copyright File id: 
> +Abstract File id: 
> +Bibliographic File id: 
> +Volume set size is: 1
> +Volume set sequence number is: 1
> +Logical block size is: 2048
> +Volume size is: 1078275
> +El Torito VD version 1 found, boot catalog is in sector 419
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +    Hid 1
> +    Arch 0 (x86)
> +    ID ''
> +    Key 55 AA
> +    Eltorito defaultboot header:
> +        Bootid 88 (bootable)
> +        Boot media 0 (No Emulation Boot)
> +        Load segment 0
> +        Sys type 0
> +        Nsect 4
> +        Bootoff 3653 13907
> diff --git a/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23_Beta.iso.txt
> new file mode 100644
> index 0000000..4d0d59f
> --- /dev/null
> +++ b/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23_Beta.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-S-23_B-i386
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: 
> +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
> +Copyright File id: 
> +Abstract File id: 
> +Bibliographic File id: 
> +Volume set size is: 1
> +Volume set sequence number is: 1
> +Logical block size is: 2048
> +Volume size is: 282391
> +El Torito VD version 1 found, boot catalog is in sector 39
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +    Hid 1
> +    Arch 0 (x86)
> +    ID ''
> +    Key 55 AA
> +    Eltorito defaultboot header:
> +        Bootid 88 (bootable)
> +        Boot media 0 (No Emulation Boot)
> +        Load segment 0
> +        Sys type 0
> +        Nsect 4
> +        Bootoff 44D61 281953
> diff --git a/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23_Beta.iso.txt
> new file mode 100644
> index 0000000..3b184d1
> --- /dev/null
> +++ b/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23_Beta.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-S-23_B-x86_64
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: 
> +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
> +Copyright File id: 
> +Abstract File id: 
> +Bibliographic File id: 
> +Volume set size is: 1
> +Volume set sequence number is: 1
> +Logical block size is: 2048
> +Volume size is: 240076
> +El Torito VD version 1 found, boot catalog is in sector 45
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +    Hid 1
> +    Arch 0 (x86)
> +    ID ''
> +    Key 55 AA
> +    Eltorito defaultboot header:
> +        Bootid 88 (bootable)
> +        Boot media 0 (No Emulation Boot)
> +        Load segment 0
> +        Sys type 0
> +        Nsect 4
> +        Bootoff 39E8F 237199
> diff --git a/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
> new file mode 100644
> index 0000000..3767783
> --- /dev/null
> +++ b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-WS-23_B-i386
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: 
> +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
> +Copyright File id: 
> +Abstract File id: 
> +Bibliographic File id: 
> +Volume set size is: 1
> +Volume set sequence number is: 1
> +Logical block size is: 2048
> +Volume size is: 281215
> +El Torito VD version 1 found, boot catalog is in sector 39
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +    Hid 1
> +    Arch 0 (x86)
> +    ID ''
> +    Key 55 AA
> +    Eltorito defaultboot header:
> +        Bootid 88 (bootable)
> +        Boot media 0 (No Emulation Boot)
> +        Load segment 0
> +        Sys type 0
> +        Nsect 4
> +        Bootoff 448C9 280777
> diff --git a/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt
> new file mode 100644
> index 0000000..bf6053e
> --- /dev/null
> +++ b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-WS-23_B-x86_64
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: 
> +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
> +Copyright File id: 
> +Abstract File id: 
> +Bibliographic File id: 
> +Volume set size is: 1
> +Volume set sequence number is: 1
> +Logical block size is: 2048
> +Volume size is: 238732
> +El Torito VD version 1 found, boot catalog is in sector 45
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +    Hid 1
> +    Arch 0 (x86)
> +    ID ''
> +    Key 55 AA
> +    Eltorito defaultboot header:
> +        Bootid 88 (bootable)
> +        Boot media 0 (No Emulation Boot)
> +        Load segment 0
> +        Sys type 0
> +        Nsect 4
> +        Bootoff 3994F 235855
> -- 
> 2.5.0
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151102/2a5e3f64/attachment.sig>

From cfergeau at redhat.com  Thu Nov  5 09:27:50 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 5 Nov 2015 10:27:50 +0100
Subject: [Libosinfo] [PATCH 1/5] fedora: Add F23 info & testcases
In-Reply-To: <20151102111349.GZ15093@edamame.cdg.redhat.com>
References: <1445889399-6380-1-git-send-email-zeeshanak@gnome.org>
	<20151102111349.GZ15093@edamame.cdg.redhat.com>
Message-ID: <20151105092750.GA26584@edamame.cdg.redhat.com>

On Mon, Nov 02, 2015 at 12:13:49PM +0100, Christophe Fergeau wrote:
> Hey,
> 
> With f23 release due yesterday according to
> https://fedoraproject.org/wiki/Releases/23/Schedule , it might be worth
> to wait a bit and push a patch with the final URLs / release dates / ...
> ?
> 
> Looks good otherwise,

Actually, you also need to update the fedora-unknown regexp as in
https://git.fedorahosted.org/cgit/libosinfo.git/commit/?id=a563ad22b34963a1c0a5364efea9e17c62d16909

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151105/1417b5de/attachment.sig>

From cfergeau at redhat.com  Thu Nov  5 16:20:38 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:38 +0100
Subject: [Libosinfo] [PATCH 0/8] Valgrind fixes
Message-ID: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>

This patch series fixes several leaks/memory issues found by running valgrind
on the test suite. Some of them fix actual crashes when having a 'dirty' DB
tree (old DB layout mixed with new one).

Christophe



From cfergeau at redhat.com  Thu Nov  5 16:20:39 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:39 +0100
Subject: [Libosinfo] [PATCH 1/8] db: Fix leak of 'variants' GList
In-Reply-To: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1446740446-7798-2-git-send-email-cfergeau@redhat.com>

The GList returned by osinfo_entity_get_param_value_list() must be freed
when no longer needed.

This fixes:
==12890== 2,112 bytes in 88 blocks are definitely lost in loss record 2,139 of 2,169
==12890==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==12890==    by 0x6A514D8: g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x6A68622: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x6A47EA9: g_list_copy_deep (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x55400A8: osinfo_entity_get_param_value_list (osinfo_entity.c:424)
==12890==    by 0x555A58F: fill_media (osinfo_db.c:654)
==12890==    by 0x555A8C4: osinfo_db_identify_media (osinfo_db.c:709)
==12890==    by 0x4030C5: test_one (test-isodetect.c:338)
==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
==12890==    by 0x4037B9: main (test-isodetect.c:496)
=
---
 osinfo/osinfo_db.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 9542d6e..4eeb440 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -656,6 +656,7 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media,
         osinfo_entity_add_param(OSINFO_ENTITY(media),
                                 "variant",
                                 (gchar *) node->data);
+    g_list_free (variants);
     kernel_path = osinfo_media_get_kernel_path(matched_media);
     if (kernel_path != NULL)
         g_object_set(G_OBJECT(media), "kernel_path", kernel_path, NULL);
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov  5 16:20:41 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:41 +0100
Subject: [Libosinfo] [PATCH 3/8] test-isodetect: Fix GFileInfo leak
In-Reply-To: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1446740446-7798-4-git-send-email-cfergeau@redhat.com>

This fixes:
==12890== 10,438 (520 direct, 9,918 indirect) bytes in 13 blocks are definitely lost in loss record 2,151
==12890==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==12890==    by 0x6A514D8: g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x6A68622: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x6A68CBD: g_slice_alloc0 (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x67E2B63: g_type_create_instance (in /usr/lib64/libgobject-2.0.so.0.4600.1)
==12890==    by 0x67C4B7A: ??? (in /usr/lib64/libgobject-2.0.so.0.4600.1)
==12890==    by 0x67C6460: g_object_newv (in /usr/lib64/libgobject-2.0.so.0.4600.1)
==12890==    by 0x67C6D93: g_object_new (in /usr/lib64/libgobject-2.0.so.0.4600.1)
==12890==    by 0x652836D: ??? (in /usr/lib64/libgio-2.0.so.0.4600.1)
==12890==    by 0x652587B: ??? (in /usr/lib64/libgio-2.0.so.0.4600.1)
==12890==    by 0x6481253: g_file_enumerator_next_file (in /usr/lib64/libgio-2.0.so.0.4600.1)
==12890==    by 0x402B7A: load_distros (test-isodetect.c:246)
==12890==    by 0x402C51: load_isos (test-isodetect.c:283)
==12890==    by 0x403058: test_one (test-isodetect.c:331)
==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
==12890==    by 0x4037B9: main (test-isodetect.c:496)
---
 test/test-isodetect.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 666357a..912f79b 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -194,12 +194,15 @@ static GList *load_distro(GFile *dir, const gchar *shortid, GError **error) {
         return NULL;
 
     while ((childinfo = g_file_enumerator_next_file(children, NULL, error)) != NULL) {
-        if (g_file_info_get_file_type(childinfo) !=
-            G_FILE_TYPE_REGULAR)
+        if (g_file_info_get_file_type(childinfo) != G_FILE_TYPE_REGULAR) {
+            g_object_unref(childinfo);
             continue;
+        }
 
-        if (!g_str_has_suffix(g_file_info_get_name(childinfo), ".txt"))
+        if (!g_str_has_suffix(g_file_info_get_name(childinfo), ".txt")) {
+            g_object_unref(childinfo);
             continue;
+        }
 
         GFile *child = g_file_get_child(dir, g_file_info_get_name(childinfo));
         struct ISOInfo *iso = load_iso(child,
@@ -207,6 +210,7 @@ static GList *load_distro(GFile *dir, const gchar *shortid, GError **error) {
                                        g_file_info_get_name(childinfo),
                                        error);
         g_object_unref(child);
+        g_object_unref(childinfo);
 
         if (!iso)
             goto error;
@@ -244,14 +248,16 @@ static GList *load_distros(GFile *dir, GError **error)
         return NULL;
 
     while ((childinfo = g_file_enumerator_next_file(children, NULL, error)) != NULL) {
-        if (g_file_info_get_file_type(childinfo) !=
-            G_FILE_TYPE_DIRECTORY)
+        if (g_file_info_get_file_type(childinfo) != G_FILE_TYPE_DIRECTORY) {
+            g_object_unref(childinfo);
             continue;
+        }
 
         GFile *child = g_file_get_child(dir, g_file_info_get_name(childinfo));
         GList *isos = load_distro(child, g_file_info_get_name(childinfo), error);
 
         g_object_unref(child);
+        g_object_unref(childinfo);
 
         if (!isos && *error)
             goto error;
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov  5 16:20:40 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:40 +0100
Subject: [Libosinfo] [PATCH 2/8] test-isodetect: Fix leak of 'langs' GList
In-Reply-To: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1446740446-7798-3-git-send-email-cfergeau@redhat.com>

This fixes:
==12890== 1,032 bytes in 43 blocks are definitely lost in loss record 2,129 of 2,169
==12890==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==12890==    by 0x6A514D8: g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x6A68622: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x6A47EA9: g_list_copy_deep (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x55400A8: osinfo_entity_get_param_value_list (osinfo_entity.c:424)
==12890==    by 0x555476E: osinfo_media_get_languages (osinfo_media.c:1238)
==12890==    by 0x402CCA: test_langs (test-isodetect.c:300)
==12890==    by 0x4031E8: test_one (test-isodetect.c:350)
==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
==12890==    by 0x4037B9: main (test-isodetect.c:496)
---
 test/test-isodetect.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 9684052..666357a 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -305,6 +305,7 @@ static void test_langs(struct ISOInfo *info)
                     it->data, info->filename);
         g_hash_table_remove(info->langs, it->data);
     }
+    g_list_free(langs);
     fail_unless(g_hash_table_size(info->langs) == 0,
                 "some languages were not identified on ISO %s",
                 info->filename);
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov  5 16:20:42 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:42 +0100
Subject: [Libosinfo] [PATCH 4/8] test-isodetect: Fix leak when loading ISO
	data
In-Reply-To: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1446740446-7798-5-git-send-email-cfergeau@redhat.com>

The string returned by g_data_input_stream_read_line() must be freed
when no longer needed.

This fixes:
==12890== 199,410 bytes in 6,710 blocks are definitely lost in loss record 2,166 of 2,169
==12890==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==12890==    by 0x6A514D8: g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
==12890==    by 0x646F9AE: g_data_input_stream_read_line (in /usr/lib64/libgio-2.0.so.0.4600.1)
==12890==    by 0x402806: load_iso (test-isodetect.c:135)
==12890==    by 0x4029B1: load_distro (test-isodetect.c:205)
==12890==    by 0x402B28: load_distros (test-isodetect.c:252)
==12890==    by 0x402C51: load_isos (test-isodetect.c:283)
==12890==    by 0x403058: test_one (test-isodetect.c:331)
==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
==12890==    by 0x4037B9: main (test-isodetect.c:496)
---
 test/test-isodetect.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 912f79b..67b3b2e 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -156,6 +156,8 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
 
         if (key != NULL && value != NULL && value[0] != '\0')
             osinfo_entity_set_param(OSINFO_ENTITY(info->media), key, value);
+
+        g_free(line);
     }
 
     if (vol_size > 0 && blk_size > 0)
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov  5 16:20:43 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:43 +0100
Subject: [Libosinfo] [PATCH 5/8] test-isodetect: Fix GDataInputStream leak
	in load_iso()
In-Reply-To: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1446740446-7798-6-git-send-email-cfergeau@redhat.com>

This fixes:
==12890== 1,024,600 (15,040 direct, 1,009,560 indirect) bytes in 235 blocks are definitely lost in loss r
==12890==    at 0x67E2C88: g_type_create_instance (in /usr/lib64/libgobject-2.0.so.0.4600.1)
==12890==    by 0x67C4B7A: ??? (in /usr/lib64/libgobject-2.0.so.0.4600.1)
==12890==    by 0x67C6A14: g_object_new_valist (in /usr/lib64/libgobject-2.0.so.0.4600.1)
==12890==    by 0x67C6D80: g_object_new (in /usr/lib64/libgobject-2.0.so.0.4600.1)
==12890==    by 0x40244F: load_iso (test-isodetect.c:101)
==12890==    by 0x4029B1: load_distro (test-isodetect.c:205)
==12890==    by 0x402B28: load_distros (test-isodetect.c:252)
==12890==    by 0x402C51: load_isos (test-isodetect.c:283)
==12890==    by 0x403058: test_one (test-isodetect.c:331)
==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
==12890==    by 0x4037B9: main (test-isodetect.c:496)
---
 test/test-isodetect.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 67b3b2e..3590205 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -174,6 +174,9 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
     if (fis)
         g_object_unref(fis);
 
+    if (dis)
+        g_object_unref(dis);
+
     return info;
 
  error:
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov  5 16:20:45 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:45 +0100
Subject: [Libosinfo] [PATCH 7/8] tests: Add testcases for ID collision in
	OsinfoList
In-Reply-To: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1446740446-7798-8-git-send-email-cfergeau@redhat.com>

This will detect issues fixed by the commit fixing osinfo_list_add.
---
 test/test-list.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/test/test-list.c b/test/test-list.c
index d9076b8..fac27b5 100644
--- a/test/test-list.c
+++ b/test/test-list.c
@@ -96,7 +96,7 @@ START_TEST(test_lookup)
 
     osinfo_list_add(list, ent);
 
-    fail_unless(osinfo_list_get_length(list) == 1, "List was empty");
+    fail_unless(osinfo_list_get_length(list) == 1, "List does not contain a single element");
     fail_unless(osinfo_list_get_nth(list, 0) == ent, "Lookup wrong element");
     fail_unless(osinfo_list_find_by_id(list, "wibble") != NULL, "Could not find element");
     fail_unless(osinfo_list_find_by_id(list, "fish") == NULL, "Found wrong element");
@@ -107,12 +107,36 @@ START_TEST(test_lookup)
 END_TEST
 
 
+
+START_TEST(test_duplicate)
+{
+    OsinfoList *list = g_object_new(osinfo_dummy_list_get_type(), NULL);
+    OsinfoEntity *ent = g_object_new(osinfo_dummy_get_type(), "id", "wibble", NULL);
+    OsinfoEntity *ent_dup = g_object_new(osinfo_dummy_get_type(), "id", "wibble", NULL);
+
+    osinfo_list_add(list, ent);
+    osinfo_list_add(list, ent_dup);
+
+    fail_unless(osinfo_list_get_length(list) == 1, "List does not contain a single element");
+    fail_unless(osinfo_list_get_nth(list, 0) == ent_dup, "Lookup wrong element");
+    fail_unless(osinfo_list_find_by_id(list, "wibble") != NULL, "Could not find element");
+    fail_unless(osinfo_list_find_by_id(list, "fish") == NULL, "Found wrong element");
+
+    g_object_unref(ent);
+    g_object_unref(ent_dup);
+    g_object_unref(list);
+}
+END_TEST
+
+
+
 START_TEST(test_union)
 {
     OsinfoList *list1 = g_object_new(osinfo_dummy_list_get_type(), NULL);
     OsinfoList *list2 = g_object_new(osinfo_dummy_list_get_type(), NULL);
     OsinfoList *list3 = g_object_new(osinfo_dummy_list_get_type(), NULL);
     OsinfoEntity *ent1 = g_object_new(osinfo_dummy_get_type(), "id", "wibble1", NULL);
+    OsinfoEntity *ent1_dup = g_object_new(osinfo_dummy_get_type(), "id", "wibble1", NULL);
     OsinfoEntity *ent2 = g_object_new(osinfo_dummy_get_type(), "id", "wibble2", NULL);
     OsinfoEntity *ent3 = g_object_new(osinfo_dummy_get_type(), "id", "wibble3", NULL);
     OsinfoEntity *ent4 = g_object_new(osinfo_dummy_get_type(), "id", "wibble4", NULL);
@@ -122,6 +146,7 @@ START_TEST(test_union)
     osinfo_list_add(list1, ent3);
 
     osinfo_list_add(list2, ent1);
+    osinfo_list_add(list2, ent1_dup);
     osinfo_list_add(list2, ent4);
 
     osinfo_list_add_union(list3, list1, list2);
@@ -154,6 +179,7 @@ START_TEST(test_union)
     fail_unless(!hasBad, "List had unexpected entity");
 
     g_object_unref(ent1);
+    g_object_unref(ent1_dup);
     g_object_unref(ent2);
     g_object_unref(ent3);
     g_object_unref(ent4);
@@ -170,6 +196,7 @@ START_TEST(test_intersect)
     OsinfoList *list2 = g_object_new(osinfo_dummy_list_get_type(), NULL);
     OsinfoList *list3 = g_object_new(osinfo_dummy_list_get_type(), NULL);
     OsinfoEntity *ent1 = g_object_new(osinfo_dummy_get_type(), "id", "wibble1", NULL);
+    OsinfoEntity *ent1_dup = g_object_new(osinfo_dummy_get_type(), "id", "wibble1", NULL);
     OsinfoEntity *ent2 = g_object_new(osinfo_dummy_get_type(), "id", "wibble2", NULL);
     OsinfoEntity *ent3 = g_object_new(osinfo_dummy_get_type(), "id", "wibble3", NULL);
     OsinfoEntity *ent4 = g_object_new(osinfo_dummy_get_type(), "id", "wibble4", NULL);
@@ -179,6 +206,7 @@ START_TEST(test_intersect)
     osinfo_list_add(list1, ent3);
 
     osinfo_list_add(list2, ent1);
+    osinfo_list_add(list2, ent1_dup);
     osinfo_list_add(list2, ent3);
     osinfo_list_add(list2, ent4);
 
@@ -212,6 +240,7 @@ START_TEST(test_intersect)
     fail_unless(!hasBad, "List had unexpected entity");
 
     g_object_unref(ent1);
+    g_object_unref(ent1_dup);
     g_object_unref(ent2);
     g_object_unref(ent3);
     g_object_unref(ent4);
@@ -370,6 +399,7 @@ list_suite(void)
     TCase *tc = tcase_create("Core");
     tcase_add_test(tc, test_basic);
     tcase_add_test(tc, test_lookup);
+    tcase_add_test(tc, test_duplicate);
     tcase_add_test(tc, test_union);
     tcase_add_test(tc, test_intersect);
     tcase_add_test(tc, test_filter);
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov  5 16:20:44 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:44 +0100
Subject: [Libosinfo] [PATCH 6/8] list: Fix replacement in osinfo_list_add
In-Reply-To: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1446740446-7798-7-git-send-email-cfergeau@redhat.com>

OsinfoList maintains a mapping between a const char *entity_id and an
OsinfoEntity object. It does so by using both a GPtrArray and a
GHashTable.

When an entity is added to an OsinfoList, a pointer from the
OsinfoEntity is used as the key (through osinfo_entity_get_id()) and
the OsinfoEntity is g_object_ref'ed and used as a value.
The OsinfoEntity is also appended to the array mentioned previously.
The use of g_hash_table_new_full() ensures that the OsinfoEntity will be
unref'ed when it's removed from the hash table.

However, when trying to add an entity with the same id as one already
present in the OsinfoList, several issues occur:
- g_hash_table_insert() is used, which means the preexisting entity with
  the same id is going to get removed, and thus g_object_unref'ed.
  However, the _old_ key will still be used by the hash table, which
  means that if the OsinfoList was holding the last reference to the
  old OsinfoEntity, the key stored in the hash table is going to
  point to freed memory
- similarly, we make no attempt at removing the preexisting entity from
  the GPtrArray, so this will also contain stale data

This commit makes sure we remove entities with the same id from the
GPtrArray when this situation occurs. It uses g_hash_table_replace()
rather than g_hash_table_insert() which replaces both the key and the
value if the hash table already contains the same key.

This fixes some valgrind issues or crashes that occurred when running
make check in a libosinfo tree with 2 databases, one in the old layout
and one using the new layout.
---
 osinfo/osinfo_list.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osinfo/osinfo_list.c b/osinfo/osinfo_list.c
index 6e32387..c829a62 100644
--- a/osinfo/osinfo_list.c
+++ b/osinfo/osinfo_list.c
@@ -237,12 +237,17 @@ OsinfoEntity *osinfo_list_find_by_id(OsinfoList *list, const gchar *id)
  */
 void osinfo_list_add(OsinfoList *list, OsinfoEntity *entity)
 {
+    OsinfoEntity *preexisting;
     g_return_if_fail(G_TYPE_CHECK_INSTANCE_TYPE(entity, list->priv->elementType));
 
     g_object_ref(entity);
+    preexisting = osinfo_list_find_by_id(list, osinfo_entity_get_id(entity));
+    if (preexisting != NULL) {
+        g_ptr_array_remove(list->priv->array, preexisting);
+    }
     g_ptr_array_add(list->priv->array, entity);
-    g_hash_table_insert(list->priv->entities,
-                        (gchar *)osinfo_entity_get_id(entity), entity);
+    g_hash_table_replace(list->priv->entities,
+                         (gchar *)osinfo_entity_get_id(entity), entity);
 }
 
 
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov  5 16:20:46 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu,  5 Nov 2015 17:20:46 +0100
Subject: [Libosinfo] [PATCH 8/8] db: Fix valgrind issues with language
	detection
In-Reply-To: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1446740446-7798-9-git-send-email-cfergeau@redhat.com>

match_languages() returns a list containing a single string, but given
the way language_code_from_raw() works, this string may actually point
to already freed memory by the time match_languages() ends.
Subsequent uses of this list will cause accesses to free'd memory.

This commit changes match_languages() so that it uses the string itself
(before it's freed) rather than letting the caller do this.

This fixes:
==28623== Invalid read of size 1
==28623==    at 0x4C2BC22: strlen (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==28623==    by 0x6A6B1F2: g_strdup (gstrfuncs.c:362)
==28623==    by 0x553FCA2: osinfo_entity_add_param (osinfo_entity.c:253)
==28623==    by 0x5554BD8: osinfo_media_set_languages (osinfo_media.c:1256)
==28623==    by 0x555A78A: fill_media (osinfo_db.c:641)
==28623==    by 0x555ABED: osinfo_db_identify_media (osinfo_db.c:709)
==28623==    by 0x4030AA: test_one (test-isodetect.c:346)
==28623==    by 0x40339D: test_windows (test-isodetect.c:395)
==28623==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==28623==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
==28623==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
==28623==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
==28623==    by 0x532BB7C: srunner_run (check_run.c:782)
==28623==    by 0x403A1B: main (test-isodetect.c:500)
==28623==  Address 0x89914b0 is 0 bytes inside a block of size 4 free'd
==28623==    at 0x4C29D6A: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==28623==    by 0x6A525ED: g_free (gmem.c:189)
==28623==    by 0x55586A6: match_languages (osinfo_db.c:117)
==28623==    by 0x555A76C: fill_media (osinfo_db.c:639)
==28623==    by 0x555ABED: osinfo_db_identify_media (osinfo_db.c:709)
==28623==    by 0x4030AA: test_one (test-isodetect.c:346)
==28623==    by 0x40339D: test_windows (test-isodetect.c:395)
==28623==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==28623==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
==28623==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
==28623==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
==28623==    by 0x532BB7C: srunner_run (check_run.c:782)
==28623==    by 0x403A1B: main (test-isodetect.c:500)
==28623==  Block was alloc'd at
==28623==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==28623==    by 0x6A524D8: g_malloc (gmem.c:94)
==28623==    by 0x6A6B277: g_strndup (gstrfuncs.c:425)
==28623==    by 0x6A5EC90: g_match_info_fetch (gregex.c:1005)
==28623==    by 0x55583DF: get_raw_lang (osinfo_db.c:57)
==28623==    by 0x5558672: match_languages (osinfo_db.c:113)
==28623==    by 0x555A76C: fill_media (osinfo_db.c:639)
==28623==    by 0x555ABED: osinfo_db_identify_media (osinfo_db.c:709)
==28623==    by 0x4030AA: test_one (test-isodetect.c:346)
==28623==    by 0x40339D: test_windows (test-isodetect.c:395)
==28623==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==28623==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
==28623==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
==28623==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
==28623==    by 0x532BB7C: srunner_run (check_run.c:782)
==28623==    by 0x403A1B: main (test-isodetect.c:500)
---
 osinfo/osinfo_db.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 4eeb440..82751a6 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -80,8 +80,8 @@ static const char *language_code_from_raw(OsinfoDatamap *lang_map,
     return lang;
 }
 
-static GList *match_languages(OsinfoDb *db, OsinfoMedia *media,
-                              OsinfoMedia *db_media)
+static void set_languages_for_media(OsinfoDb *db, OsinfoMedia *media,
+                                    OsinfoMedia *db_media)
 {
     const gchar *volume_id;
     const gchar *regex;
@@ -89,18 +89,19 @@ static GList *match_languages(OsinfoDb *db, OsinfoMedia *media,
     OsinfoDatamap *lang_map;
     gchar *raw_lang;
     GList *languages;
+    const char *lang;
 
-    g_return_val_if_fail(OSINFO_IS_MEDIA(media), NULL);
-    g_return_val_if_fail(OSINFO_IS_MEDIA(db_media), NULL);
+    g_return_if_fail(OSINFO_IS_MEDIA(media));
+    g_return_if_fail(OSINFO_IS_MEDIA(db_media));
 
     regex = osinfo_entity_get_param_value(OSINFO_ENTITY(db_media),
                                           OSINFO_MEDIA_PROP_LANG_REGEX);
     if (regex == NULL)
-        return NULL;
+        return;
 
     volume_id = osinfo_media_get_volume_id(media);
     if (volume_id == NULL)
-        return NULL;
+        return;
 
     lang_map_id = osinfo_entity_get_param_value(OSINFO_ENTITY(db_media),
                                                 OSINFO_MEDIA_PROP_LANG_MAP);
@@ -111,14 +112,14 @@ static GList *match_languages(OsinfoDb *db, OsinfoMedia *media,
     }
 
     raw_lang = get_raw_lang(volume_id, regex);
-
-    languages = g_list_append(NULL,
-                              (gpointer)language_code_from_raw(lang_map, raw_lang));
+    lang = language_code_from_raw(lang_map, raw_lang);
+    languages = g_list_append(NULL, (gpointer)lang);
+    osinfo_media_set_languages(media, languages);
+    g_list_free(languages);
     g_free(raw_lang);
-
-    return languages;
 }
 
+
 /**
  * SECTION:osinfo_db
  * @short_description: Database of all entities
@@ -625,7 +626,6 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media,
                         OsinfoMedia *matched_media,
                         OsinfoOs *os)
 {
-    GList *languages;
     gboolean is_installer;
     gboolean is_live;
     gint reboots;
@@ -636,10 +636,7 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media,
     const gchar *url;
     GList *variants, *node;
 
-    languages = match_languages(db, media, matched_media);
-    if (languages != NULL)
-        osinfo_media_set_languages(media, languages);
-    g_list_free(languages);
+    set_languages_for_media(db, media, matched_media);
 
     id = osinfo_entity_get_id(OSINFO_ENTITY(matched_media));
     g_object_set(G_OBJECT(media), "id", id, NULL);
-- 
2.5.0



From berrange at redhat.com  Thu Nov  5 16:55:04 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 5 Nov 2015 16:55:04 +0000
Subject: [Libosinfo] [PATCH 1/8] db: Fix leak of 'variants' GList
In-Reply-To: <1446740446-7798-2-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-2-git-send-email-cfergeau@redhat.com>
Message-ID: <20151105165504.GH15525@redhat.com>

On Thu, Nov 05, 2015 at 05:20:39PM +0100, Christophe Fergeau wrote:
> The GList returned by osinfo_entity_get_param_value_list() must be freed
> when no longer needed.
> 
> This fixes:
> ==12890== 2,112 bytes in 88 blocks are definitely lost in loss record 2,139 of 2,169
> ==12890==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==12890==    by 0x6A514D8: g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x6A68622: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x6A47EA9: g_list_copy_deep (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x55400A8: osinfo_entity_get_param_value_list (osinfo_entity.c:424)
> ==12890==    by 0x555A58F: fill_media (osinfo_db.c:654)
> ==12890==    by 0x555A8C4: osinfo_db_identify_media (osinfo_db.c:709)
> ==12890==    by 0x4030C5: test_one (test-isodetect.c:338)
> ==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
> ==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
> ==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
> ==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
> ==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
> ==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
> ==12890==    by 0x4037B9: main (test-isodetect.c:496)
> =
> ---
>  osinfo/osinfo_db.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> index 9542d6e..4eeb440 100644
> --- a/osinfo/osinfo_db.c
> +++ b/osinfo/osinfo_db.c
> @@ -656,6 +656,7 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media,
>          osinfo_entity_add_param(OSINFO_ENTITY(media),
>                                  "variant",
>                                  (gchar *) node->data);
> +    g_list_free (variants);
>      kernel_path = osinfo_media_get_kernel_path(matched_media);
>      if (kernel_path != NULL)
>          g_object_set(G_OBJECT(media), "kernel_path", kernel_path, NULL);

ACK


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Nov  5 16:55:19 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 5 Nov 2015 16:55:19 +0000
Subject: [Libosinfo] [PATCH 2/8] test-isodetect: Fix leak of 'langs'
	GList
In-Reply-To: <1446740446-7798-3-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-3-git-send-email-cfergeau@redhat.com>
Message-ID: <20151105165519.GI15525@redhat.com>

On Thu, Nov 05, 2015 at 05:20:40PM +0100, Christophe Fergeau wrote:
> This fixes:
> ==12890== 1,032 bytes in 43 blocks are definitely lost in loss record 2,129 of 2,169
> ==12890==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==12890==    by 0x6A514D8: g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x6A68622: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x6A47EA9: g_list_copy_deep (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x55400A8: osinfo_entity_get_param_value_list (osinfo_entity.c:424)
> ==12890==    by 0x555476E: osinfo_media_get_languages (osinfo_media.c:1238)
> ==12890==    by 0x402CCA: test_langs (test-isodetect.c:300)
> ==12890==    by 0x4031E8: test_one (test-isodetect.c:350)
> ==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
> ==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
> ==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
> ==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
> ==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
> ==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
> ==12890==    by 0x4037B9: main (test-isodetect.c:496)
> ---
>  test/test-isodetect.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/test/test-isodetect.c b/test/test-isodetect.c
> index 9684052..666357a 100644
> --- a/test/test-isodetect.c
> +++ b/test/test-isodetect.c
> @@ -305,6 +305,7 @@ static void test_langs(struct ISOInfo *info)
>                      it->data, info->filename);
>          g_hash_table_remove(info->langs, it->data);
>      }
> +    g_list_free(langs);
>      fail_unless(g_hash_table_size(info->langs) == 0,
>                  "some languages were not identified on ISO %s",
>                  info->filename);

ACK


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Nov  5 16:55:46 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 5 Nov 2015 16:55:46 +0000
Subject: [Libosinfo] [PATCH 3/8] test-isodetect: Fix GFileInfo leak
In-Reply-To: <1446740446-7798-4-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-4-git-send-email-cfergeau@redhat.com>
Message-ID: <20151105165546.GJ15525@redhat.com>

On Thu, Nov 05, 2015 at 05:20:41PM +0100, Christophe Fergeau wrote:
> This fixes:
> ==12890== 10,438 (520 direct, 9,918 indirect) bytes in 13 blocks are definitely lost in loss record 2,151
> ==12890==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==12890==    by 0x6A514D8: g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x6A68622: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x6A68CBD: g_slice_alloc0 (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x67E2B63: g_type_create_instance (in /usr/lib64/libgobject-2.0.so.0.4600.1)
> ==12890==    by 0x67C4B7A: ??? (in /usr/lib64/libgobject-2.0.so.0.4600.1)
> ==12890==    by 0x67C6460: g_object_newv (in /usr/lib64/libgobject-2.0.so.0.4600.1)
> ==12890==    by 0x67C6D93: g_object_new (in /usr/lib64/libgobject-2.0.so.0.4600.1)
> ==12890==    by 0x652836D: ??? (in /usr/lib64/libgio-2.0.so.0.4600.1)
> ==12890==    by 0x652587B: ??? (in /usr/lib64/libgio-2.0.so.0.4600.1)
> ==12890==    by 0x6481253: g_file_enumerator_next_file (in /usr/lib64/libgio-2.0.so.0.4600.1)
> ==12890==    by 0x402B7A: load_distros (test-isodetect.c:246)
> ==12890==    by 0x402C51: load_isos (test-isodetect.c:283)
> ==12890==    by 0x403058: test_one (test-isodetect.c:331)
> ==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
> ==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
> ==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
> ==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
> ==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
> ==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
> ==12890==    by 0x4037B9: main (test-isodetect.c:496)
> ---
>  test/test-isodetect.c | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/test/test-isodetect.c b/test/test-isodetect.c
> index 666357a..912f79b 100644
> --- a/test/test-isodetect.c
> +++ b/test/test-isodetect.c
> @@ -194,12 +194,15 @@ static GList *load_distro(GFile *dir, const gchar *shortid, GError **error) {
>          return NULL;
>  
>      while ((childinfo = g_file_enumerator_next_file(children, NULL, error)) != NULL) {
> -        if (g_file_info_get_file_type(childinfo) !=
> -            G_FILE_TYPE_REGULAR)
> +        if (g_file_info_get_file_type(childinfo) != G_FILE_TYPE_REGULAR) {
> +            g_object_unref(childinfo);
>              continue;
> +        }
>  
> -        if (!g_str_has_suffix(g_file_info_get_name(childinfo), ".txt"))
> +        if (!g_str_has_suffix(g_file_info_get_name(childinfo), ".txt")) {
> +            g_object_unref(childinfo);
>              continue;
> +        }
>  
>          GFile *child = g_file_get_child(dir, g_file_info_get_name(childinfo));
>          struct ISOInfo *iso = load_iso(child,
> @@ -207,6 +210,7 @@ static GList *load_distro(GFile *dir, const gchar *shortid, GError **error) {
>                                         g_file_info_get_name(childinfo),
>                                         error);
>          g_object_unref(child);
> +        g_object_unref(childinfo);
>  
>          if (!iso)
>              goto error;
> @@ -244,14 +248,16 @@ static GList *load_distros(GFile *dir, GError **error)
>          return NULL;
>  
>      while ((childinfo = g_file_enumerator_next_file(children, NULL, error)) != NULL) {
> -        if (g_file_info_get_file_type(childinfo) !=
> -            G_FILE_TYPE_DIRECTORY)
> +        if (g_file_info_get_file_type(childinfo) != G_FILE_TYPE_DIRECTORY) {
> +            g_object_unref(childinfo);
>              continue;
> +        }
>  
>          GFile *child = g_file_get_child(dir, g_file_info_get_name(childinfo));
>          GList *isos = load_distro(child, g_file_info_get_name(childinfo), error);
>  
>          g_object_unref(child);
> +        g_object_unref(childinfo);
>  
>          if (!isos && *error)
>              goto error;

ACK

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Nov  5 16:56:05 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 5 Nov 2015 16:56:05 +0000
Subject: [Libosinfo] [PATCH 4/8] test-isodetect: Fix leak when loading
 ISO data
In-Reply-To: <1446740446-7798-5-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-5-git-send-email-cfergeau@redhat.com>
Message-ID: <20151105165605.GK15525@redhat.com>

On Thu, Nov 05, 2015 at 05:20:42PM +0100, Christophe Fergeau wrote:
> The string returned by g_data_input_stream_read_line() must be freed
> when no longer needed.
> 
> This fixes:
> ==12890== 199,410 bytes in 6,710 blocks are definitely lost in loss record 2,166 of 2,169
> ==12890==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==12890==    by 0x6A514D8: g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.1)
> ==12890==    by 0x646F9AE: g_data_input_stream_read_line (in /usr/lib64/libgio-2.0.so.0.4600.1)
> ==12890==    by 0x402806: load_iso (test-isodetect.c:135)
> ==12890==    by 0x4029B1: load_distro (test-isodetect.c:205)
> ==12890==    by 0x402B28: load_distros (test-isodetect.c:252)
> ==12890==    by 0x402C51: load_isos (test-isodetect.c:283)
> ==12890==    by 0x403058: test_one (test-isodetect.c:331)
> ==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
> ==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
> ==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
> ==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
> ==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
> ==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
> ==12890==    by 0x4037B9: main (test-isodetect.c:496)
> ---
>  test/test-isodetect.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/test/test-isodetect.c b/test/test-isodetect.c
> index 912f79b..67b3b2e 100644
> --- a/test/test-isodetect.c
> +++ b/test/test-isodetect.c
> @@ -156,6 +156,8 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
>  
>          if (key != NULL && value != NULL && value[0] != '\0')
>              osinfo_entity_set_param(OSINFO_ENTITY(info->media), key, value);
> +
> +        g_free(line);
>      }
>  
>      if (vol_size > 0 && blk_size > 0)

ACK

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Nov  5 16:56:44 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 5 Nov 2015 16:56:44 +0000
Subject: [Libosinfo] [PATCH 5/8] test-isodetect: Fix GDataInputStream
 leak in load_iso()
In-Reply-To: <1446740446-7798-6-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-6-git-send-email-cfergeau@redhat.com>
Message-ID: <20151105165644.GL15525@redhat.com>

On Thu, Nov 05, 2015 at 05:20:43PM +0100, Christophe Fergeau wrote:
> This fixes:
> ==12890== 1,024,600 (15,040 direct, 1,009,560 indirect) bytes in 235 blocks are definitely lost in loss r
> ==12890==    at 0x67E2C88: g_type_create_instance (in /usr/lib64/libgobject-2.0.so.0.4600.1)
> ==12890==    by 0x67C4B7A: ??? (in /usr/lib64/libgobject-2.0.so.0.4600.1)
> ==12890==    by 0x67C6A14: g_object_new_valist (in /usr/lib64/libgobject-2.0.so.0.4600.1)
> ==12890==    by 0x67C6D80: g_object_new (in /usr/lib64/libgobject-2.0.so.0.4600.1)
> ==12890==    by 0x40244F: load_iso (test-iso1detect.c:101)
> ==12890==    by 0x4029B1: load_distro (test-isodetect.c:205)
> ==12890==    by 0x402B28: load_distros (test-isodetect.c:252)
> ==12890==    by 0x402C51: load_isos (test-isodetect.c:283)
> ==12890==    by 0x403058: test_one (test-isodetect.c:331)
> ==12890==    by 0x4033B8: test_windows (test-isodetect.c:387)
> ==12890==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
> ==12890==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
> ==12890==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
> ==12890==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
> ==12890==    by 0x532BB7C: srunner_run (check_run.c:782)
> ==12890==    by 0x4037B9: main (test-isodetect.c:496)
> ---
>  test/test-isodetect.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/test/test-isodetect.c b/test/test-isodetect.c
> index 67b3b2e..3590205 100644
> --- a/test/test-isodetect.c
> +++ b/test/test-isodetect.c
> @@ -174,6 +174,9 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
>      if (fis)
>          g_object_unref(fis);
>  
> +    if (dis)
> +        g_object_unref(dis);
> +
>      return info;
>  
>   error:

ACK


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Nov  5 16:59:20 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 5 Nov 2015 16:59:20 +0000
Subject: [Libosinfo] [PATCH 6/8] list: Fix replacement in osinfo_list_add
In-Reply-To: <1446740446-7798-7-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-7-git-send-email-cfergeau@redhat.com>
Message-ID: <20151105165920.GM15525@redhat.com>

On Thu, Nov 05, 2015 at 05:20:44PM +0100, Christophe Fergeau wrote:
> OsinfoList maintains a mapping between a const char *entity_id and an
> OsinfoEntity object. It does so by using both a GPtrArray and a
> GHashTable.
> 
> When an entity is added to an OsinfoList, a pointer from the
> OsinfoEntity is used as the key (through osinfo_entity_get_id()) and
> the OsinfoEntity is g_object_ref'ed and used as a value.
> The OsinfoEntity is also appended to the array mentioned previously.
> The use of g_hash_table_new_full() ensures that the OsinfoEntity will be
> unref'ed when it's removed from the hash table.
> 
> However, when trying to add an entity with the same id as one already
> present in the OsinfoList, several issues occur:
> - g_hash_table_insert() is used, which means the preexisting entity with
>   the same id is going to get removed, and thus g_object_unref'ed.
>   However, the _old_ key will still be used by the hash table, which
>   means that if the OsinfoList was holding the last reference to the
>   old OsinfoEntity, the key stored in the hash table is going to
>   point to freed memory
> - similarly, we make no attempt at removing the preexisting entity from
>   the GPtrArray, so this will also contain stale data
> 
> This commit makes sure we remove entities with the same id from the
> GPtrArray when this situation occurs. It uses g_hash_table_replace()
> rather than g_hash_table_insert() which replaces both the key and the
> value if the hash table already contains the same key.
> 
> This fixes some valgrind issues or crashes that occurred when running
> make check in a libosinfo tree with 2 databases, one in the old layout
> and one using the new layout.
> ---
>  osinfo/osinfo_list.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/osinfo/osinfo_list.c b/osinfo/osinfo_list.c
> index 6e32387..c829a62 100644
> --- a/osinfo/osinfo_list.c
> +++ b/osinfo/osinfo_list.c
> @@ -237,12 +237,17 @@ OsinfoEntity *osinfo_list_find_by_id(OsinfoList *list, const gchar *id)
>   */
>  void osinfo_list_add(OsinfoList *list, OsinfoEntity *entity)
>  {
> +    OsinfoEntity *preexisting;
>      g_return_if_fail(G_TYPE_CHECK_INSTANCE_TYPE(entity, list->priv->elementType));
>  
>      g_object_ref(entity);
> +    preexisting = osinfo_list_find_by_id(list, osinfo_entity_get_id(entity));
> +    if (preexisting != NULL) {
> +        g_ptr_array_remove(list->priv->array, preexisting);
> +    }
>      g_ptr_array_add(list->priv->array, entity);
> -    g_hash_table_insert(list->priv->entities,
> -                        (gchar *)osinfo_entity_get_id(entity), entity);
> +    g_hash_table_replace(list->priv->entities,
> +                         (gchar *)osinfo_entity_get_id(entity), entity);
>  }

This makes sense purely from the POV of correctness of the API, but
I think there is another bug hiding here somewhere, because we AFAIR
we should never get in a situation where we are replacing an existing
entity in the list. When loading entities from the XML, we always
check to see if the entity already exists, and if so re-use it rather
than creating a new one. IOW, while this fix is valid, fixing it is
masking what I think might be a more serious flaw elsewhere, that I
would see to identify.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Nov  5 17:00:19 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 5 Nov 2015 17:00:19 +0000
Subject: [Libosinfo] [PATCH 8/8] db: Fix valgrind issues with language
 detection
In-Reply-To: <1446740446-7798-9-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-9-git-send-email-cfergeau@redhat.com>
Message-ID: <20151105170019.GN15525@redhat.com>

On Thu, Nov 05, 2015 at 05:20:46PM +0100, Christophe Fergeau wrote:
> match_languages() returns a list containing a single string, but given
> the way language_code_from_raw() works, this string may actually point
> to already freed memory by the time match_languages() ends.
> Subsequent uses of this list will cause accesses to free'd memory.
> 
> This commit changes match_languages() so that it uses the string itself
> (before it's freed) rather than letting the caller do this.
> 
> This fixes:
> ==28623== Invalid read of size 1
> ==28623==    at 0x4C2BC22: strlen (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==28623==    by 0x6A6B1F2: g_strdup (gstrfuncs.c:362)
> ==28623==    by 0x553FCA2: osinfo_entity_add_param (osinfo_entity.c:253)
> ==28623==    by 0x5554BD8: osinfo_media_set_languages (osinfo_media.c:1256)
> ==28623==    by 0x555A78A: fill_media (osinfo_db.c:641)
> ==28623==    by 0x555ABED: osinfo_db_identify_media (osinfo_db.c:709)
> ==28623==    by 0x4030AA: test_one (test-isodetect.c:346)
> ==28623==    by 0x40339D: test_windows (test-isodetect.c:395)
> ==28623==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
> ==28623==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
> ==28623==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
> ==28623==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
> ==28623==    by 0x532BB7C: srunner_run (check_run.c:782)
> ==28623==    by 0x403A1B: main (test-isodetect.c:500)
> ==28623==  Address 0x89914b0 is 0 bytes inside a block of size 4 free'd
> ==28623==    at 0x4C29D6A: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==28623==    by 0x6A525ED: g_free (gmem.c:189)
> ==28623==    by 0x55586A6: match_languages (osinfo_db.c:117)
> ==28623==    by 0x555A76C: fill_media (osinfo_db.c:639)
> ==28623==    by 0x555ABED: osinfo_db_identify_media (osinfo_db.c:709)
> ==28623==    by 0x4030AA: test_one (test-isodetect.c:346)
> ==28623==    by 0x40339D: test_windows (test-isodetect.c:395)
> ==28623==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
> ==28623==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
> ==28623==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
> ==28623==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
> ==28623==    by 0x532BB7C: srunner_run (check_run.c:782)
> ==28623==    by 0x403A1B: main (test-isodetect.c:500)
> ==28623==  Block was alloc'd at
> ==28623==    at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==28623==    by 0x6A524D8: g_malloc (gmem.c:94)
> ==28623==    by 0x6A6B277: g_strndup (gstrfuncs.c:425)
> ==28623==    by 0x6A5EC90: g_match_info_fetch (gregex.c:1005)
> ==28623==    by 0x55583DF: get_raw_lang (osinfo_db.c:57)
> ==28623==    by 0x5558672: match_languages (osinfo_db.c:113)
> ==28623==    by 0x555A76C: fill_media (osinfo_db.c:639)
> ==28623==    by 0x555ABED: osinfo_db_identify_media (osinfo_db.c:709)
> ==28623==    by 0x4030AA: test_one (test-isodetect.c:346)
> ==28623==    by 0x40339D: test_windows (test-isodetect.c:395)
> ==28623==    by 0x532B78A: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
> ==28623==    by 0x532BB7C: srunner_iterate_tcase_tfuns (check_run.c:231)
> ==28623==    by 0x532BB7C: srunner_run_tcase (check_run.c:373)
> ==28623==    by 0x532BB7C: srunner_iterate_suites (check_run.c:195)
> ==28623==    by 0x532BB7C: srunner_run (check_run.c:782)
> ==28623==    by 0x403A1B: main (test-isodetect.c:500)
> ---
>  osinfo/osinfo_db.c | 29 +++++++++++++----------------
>  1 file changed, 13 insertions(+), 16 deletions(-)
> 
> diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> index 4eeb440..82751a6 100644
> --- a/osinfo/osinfo_db.c
> +++ b/osinfo/osinfo_db.c
> @@ -80,8 +80,8 @@ static const char *language_code_from_raw(OsinfoDatamap *lang_map,
>      return lang;
>  }
>  
> -static GList *match_languages(OsinfoDb *db, OsinfoMedia *media,
> -                              OsinfoMedia *db_media)
> +static void set_languages_for_media(OsinfoDb *db, OsinfoMedia *media,
> +                                    OsinfoMedia *db_media)
>  {
>      const gchar *volume_id;
>      const gchar *regex;
> @@ -89,18 +89,19 @@ static GList *match_languages(OsinfoDb *db, OsinfoMedia *media,
>      OsinfoDatamap *lang_map;
>      gchar *raw_lang;
>      GList *languages;
> +    const char *lang;
>  
> -    g_return_val_if_fail(OSINFO_IS_MEDIA(media), NULL);
> -    g_return_val_if_fail(OSINFO_IS_MEDIA(db_media), NULL);
> +    g_return_if_fail(OSINFO_IS_MEDIA(media));
> +    g_return_if_fail(OSINFO_IS_MEDIA(db_media));
>  
>      regex = osinfo_entity_get_param_value(OSINFO_ENTITY(db_media),
>                                            OSINFO_MEDIA_PROP_LANG_REGEX);
>      if (regex == NULL)
> -        return NULL;
> +        return;
>  
>      volume_id = osinfo_media_get_volume_id(media);
>      if (volume_id == NULL)
> -        return NULL;
> +        return;
>  
>      lang_map_id = osinfo_entity_get_param_value(OSINFO_ENTITY(db_media),
>                                                  OSINFO_MEDIA_PROP_LANG_MAP);
> @@ -111,14 +112,14 @@ static GList *match_languages(OsinfoDb *db, OsinfoMedia *media,
>      }
>  
>      raw_lang = get_raw_lang(volume_id, regex);
> -
> -    languages = g_list_append(NULL,
> -                              (gpointer)language_code_from_raw(lang_map, raw_lang));
> +    lang = language_code_from_raw(lang_map, raw_lang);
> +    languages = g_list_append(NULL, (gpointer)lang);
> +    osinfo_media_set_languages(media, languages);
> +    g_list_free(languages);
>      g_free(raw_lang);
> -
> -    return languages;
>  }
>  
> +
>  /**
>   * SECTION:osinfo_db
>   * @short_description: Database of all entities
> @@ -625,7 +626,6 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media,
>                          OsinfoMedia *matched_media,
>                          OsinfoOs *os)
>  {
> -    GList *languages;
>      gboolean is_installer;
>      gboolean is_live;
>      gint reboots;
> @@ -636,10 +636,7 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media,
>      const gchar *url;
>      GList *variants, *node;
>  
> -    languages = match_languages(db, media, matched_media);
> -    if (languages != NULL)
> -        osinfo_media_set_languages(media, languages);
> -    g_list_free(languages);
> +    set_languages_for_media(db, media, matched_media);
>  
>      id = osinfo_entity_get_id(OSINFO_ENTITY(matched_media));
>      g_object_set(G_OBJECT(media), "id", id, NULL);

ACK


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Nov  5 17:00:37 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 5 Nov 2015 17:00:37 +0000
Subject: [Libosinfo] [PATCH 7/8] tests: Add testcases for ID collision
 in OsinfoList
In-Reply-To: <1446740446-7798-8-git-send-email-cfergeau@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-8-git-send-email-cfergeau@redhat.com>
Message-ID: <20151105170037.GO15525@redhat.com>

On Thu, Nov 05, 2015 at 05:20:45PM +0100, Christophe Fergeau wrote:
> This will detect issues fixed by the commit fixing osinfo_list_add.
> ---
>  test/test-list.c | 32 +++++++++++++++++++++++++++++++-
>  1 file changed, 31 insertions(+), 1 deletion(-)
> 
> diff --git a/test/test-list.c b/test/test-list.c
> index d9076b8..fac27b5 100644
> --- a/test/test-list.c
> +++ b/test/test-list.c
> @@ -96,7 +96,7 @@ START_TEST(test_lookup)
>  
>      osinfo_list_add(list, ent);
>  
> -    fail_unless(osinfo_list_get_length(list) == 1, "List was empty");
> +    fail_unless(osinfo_list_get_length(list) == 1, "List does not contain a single element");
>      fail_unless(osinfo_list_get_nth(list, 0) == ent, "Lookup wrong element");
>      fail_unless(osinfo_list_find_by_id(list, "wibble") != NULL, "Could not find element");
>      fail_unless(osinfo_list_find_by_id(list, "fish") == NULL, "Found wrong element");
> @@ -107,12 +107,36 @@ START_TEST(test_lookup)
>  END_TEST
>  
>  
> +
> +START_TEST(test_duplicate)
> +{
> +    OsinfoList *list = g_object_new(osinfo_dummy_list_get_type(), NULL);
> +    OsinfoEntity *ent = g_object_new(osinfo_dummy_get_type(), "id", "wibble", NULL);
> +    OsinfoEntity *ent_dup = g_object_new(osinfo_dummy_get_type(), "id", "wibble", NULL);
> +
> +    osinfo_list_add(list, ent);
> +    osinfo_list_add(list, ent_dup);
> +
> +    fail_unless(osinfo_list_get_length(list) == 1, "List does not contain a single element");
> +    fail_unless(osinfo_list_get_nth(list, 0) == ent_dup, "Lookup wrong element");
> +    fail_unless(osinfo_list_find_by_id(list, "wibble") != NULL, "Could not find element");
> +    fail_unless(osinfo_list_find_by_id(list, "fish") == NULL, "Found wrong element");
> +
> +    g_object_unref(ent);
> +    g_object_unref(ent_dup);
> +    g_object_unref(list);
> +}
> +END_TEST
> +
> +
> +
>  START_TEST(test_union)
>  {
>      OsinfoList *list1 = g_object_new(osinfo_dummy_list_get_type(), NULL);
>      OsinfoList *list2 = g_object_new(osinfo_dummy_list_get_type(), NULL);
>      OsinfoList *list3 = g_object_new(osinfo_dummy_list_get_type(), NULL);
>      OsinfoEntity *ent1 = g_object_new(osinfo_dummy_get_type(), "id", "wibble1", NULL);
> +    OsinfoEntity *ent1_dup = g_object_new(osinfo_dummy_get_type(), "id", "wibble1", NULL);
>      OsinfoEntity *ent2 = g_object_new(osinfo_dummy_get_type(), "id", "wibble2", NULL);
>      OsinfoEntity *ent3 = g_object_new(osinfo_dummy_get_type(), "id", "wibble3", NULL);
>      OsinfoEntity *ent4 = g_object_new(osinfo_dummy_get_type(), "id", "wibble4", NULL);
> @@ -122,6 +146,7 @@ START_TEST(test_union)
>      osinfo_list_add(list1, ent3);
>  
>      osinfo_list_add(list2, ent1);
> +    osinfo_list_add(list2, ent1_dup);
>      osinfo_list_add(list2, ent4);
>  
>      osinfo_list_add_union(list3, list1, list2);
> @@ -154,6 +179,7 @@ START_TEST(test_union)
>      fail_unless(!hasBad, "List had unexpected entity");
>  
>      g_object_unref(ent1);
> +    g_object_unref(ent1_dup);
>      g_object_unref(ent2);
>      g_object_unref(ent3);
>      g_object_unref(ent4);
> @@ -170,6 +196,7 @@ START_TEST(test_intersect)
>      OsinfoList *list2 = g_object_new(osinfo_dummy_list_get_type(), NULL);
>      OsinfoList *list3 = g_object_new(osinfo_dummy_list_get_type(), NULL);
>      OsinfoEntity *ent1 = g_object_new(osinfo_dummy_get_type(), "id", "wibble1", NULL);
> +    OsinfoEntity *ent1_dup = g_object_new(osinfo_dummy_get_type(), "id", "wibble1", NULL);
>      OsinfoEntity *ent2 = g_object_new(osinfo_dummy_get_type(), "id", "wibble2", NULL);
>      OsinfoEntity *ent3 = g_object_new(osinfo_dummy_get_type(), "id", "wibble3", NULL);
>      OsinfoEntity *ent4 = g_object_new(osinfo_dummy_get_type(), "id", "wibble4", NULL);
> @@ -179,6 +206,7 @@ START_TEST(test_intersect)
>      osinfo_list_add(list1, ent3);
>  
>      osinfo_list_add(list2, ent1);
> +    osinfo_list_add(list2, ent1_dup);
>      osinfo_list_add(list2, ent3);
>      osinfo_list_add(list2, ent4);
>  
> @@ -212,6 +240,7 @@ START_TEST(test_intersect)
>      fail_unless(!hasBad, "List had unexpected entity");
>  
>      g_object_unref(ent1);
> +    g_object_unref(ent1_dup);
>      g_object_unref(ent2);
>      g_object_unref(ent3);
>      g_object_unref(ent4);
> @@ -370,6 +399,7 @@ list_suite(void)
>      TCase *tc = tcase_create("Core");
>      tcase_add_test(tc, test_basic);
>      tcase_add_test(tc, test_lookup);
> +    tcase_add_test(tc, test_duplicate);
>      tcase_add_test(tc, test_union);
>      tcase_add_test(tc, test_intersect);
>      tcase_add_test(tc, test_filter);

ACK

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From cfergeau at redhat.com  Fri Nov  6 13:23:17 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 6 Nov 2015 14:23:17 +0100
Subject: [Libosinfo] [PATCH 6/8] list: Fix replacement in osinfo_list_add
In-Reply-To: <20151105165920.GM15525@redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-7-git-send-email-cfergeau@redhat.com>
	<20151105165920.GM15525@redhat.com>
Message-ID: <20151106132317.GJ20601@edamame.cdg.redhat.com>

Hi,

On Thu, Nov 05, 2015 at 04:59:20PM +0000, Daniel P. Berrange wrote:
> 
> This makes sense purely from the POV of correctness of the API, but
> I think there is another bug hiding here somewhere, because we AFAIR
> we should never get in a situation where we are replacing an existing
> entity in the list. When loading entities from the XML, we always
> check to see if the entity already exists, and if so re-use it rather
> than creating a new one. IOW, while this fix is valid, fixing it is
> masking what I think might be a more serious flaw elsewhere, that I
> would see to identify.

I ran a few more tests (added an assert in osinfo_list_add() if the
entity is already present in the list), and it turns out this happens
precisely because we reuse OS entities from the XML. We reuse what I'd
call 'top-level' entities, but we do not attempt to reuse entities used
to represent <media> nodes, or <tree> nodes, ... when we are parsing an
OS entity. So when we encounter a duplicate OS entity, we try to reuse
the existing one, and this entity has duplicates for the media/tree/...
we are trying to add, which triggers this misbehaviour.
The full list of entities which were duplicate are:
- OsinfoMedia
- OsinfoDeviceDriver
- OsinfoTree
- OsinfoOsVariant
- OsinfoInstallScript

Looking at the loading code for install scripts, there might be a bug
there as it may not be trying to reuse pre-existing entities.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151106/589497c5/attachment.sig>

From berrange at redhat.com  Fri Nov  6 13:35:05 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 6 Nov 2015 13:35:05 +0000
Subject: [Libosinfo] [PATCH 6/8] list: Fix replacement in osinfo_list_add
In-Reply-To: <20151106132317.GJ20601@edamame.cdg.redhat.com>
References: <1446740446-7798-1-git-send-email-cfergeau@redhat.com>
	<1446740446-7798-7-git-send-email-cfergeau@redhat.com>
	<20151105165920.GM15525@redhat.com>
	<20151106132317.GJ20601@edamame.cdg.redhat.com>
Message-ID: <20151106133505.GQ30803@redhat.com>

On Fri, Nov 06, 2015 at 02:23:17PM +0100, Christophe Fergeau wrote:
> Hi,
> 
> On Thu, Nov 05, 2015 at 04:59:20PM +0000, Daniel P. Berrange wrote:
> > 
> > This makes sense purely from the POV of correctness of the API, but
> > I think there is another bug hiding here somewhere, because we AFAIR
> > we should never get in a situation where we are replacing an existing
> > entity in the list. When loading entities from the XML, we always
> > check to see if the entity already exists, and if so re-use it rather
> > than creating a new one. IOW, while this fix is valid, fixing it is
> > masking what I think might be a more serious flaw elsewhere, that I
> > would see to identify.
> 
> I ran a few more tests (added an assert in osinfo_list_add() if the
> entity is already present in the list), and it turns out this happens
> precisely because we reuse OS entities from the XML. We reuse what I'd
> call 'top-level' entities, but we do not attempt to reuse entities used
> to represent <media> nodes, or <tree> nodes, ... when we are parsing an
> OS entity. So when we encounter a duplicate OS entity, we try to reuse
> the existing one, and this entity has duplicates for the media/tree/...
> we are trying to add, which triggers this misbehaviour.
> The full list of entities which were duplicate are:
> - OsinfoMedia
> - OsinfoDeviceDriver
> - OsinfoTree
> - OsinfoOsVariant
> - OsinfoInstallScript

Ahhh, ok, so it is non-top level entities that are the problem only.

> Looking at the loading code for install scripts, there might be a bug
> there as it may not be trying to reuse pre-existing entities.

The loader calls osinfo_loader_get_install_script() so it is not
creating duplicate OsinfoInstallSCript objects.

However, we setup a relationship between OsinfoOs and the install
script, and that's where the duplication comes. This is OK I think.


ACK to your original patch, all these non-top level cases are harmless

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From cfergeau at redhat.com  Fri Nov  6 15:27:06 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri,  6 Nov 2015 16:27:06 +0100
Subject: [Libosinfo] [PATCH] relaxng: Fix rule for /os/variant/name
Message-ID: <1446823626-2493-1-git-send-email-cfergeau@redhat.com>

Since the variant name can be translated, the <name> node needs to be
enclosed in <oneOrMore>. A recent update to the French translation broke
test-xml-validate since win-7.xml (for example) now has 2 <name> nodes
for some variants.
---
 data/schemas/libosinfo.rng | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index b97e1cb..6149f14 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -222,9 +222,16 @@
     <element name='variant'>
       <attribute name='id'>
       </attribute>
-      <element name='name'>
-        <text/>
-      </element>
+      <oneOrMore>
+        <element name='name'>
+          <optional>
+            <attribute name='xml:lang'>
+              <text/>
+            </attribute>
+          </optional>
+          <text/>
+        </element>
+      </oneOrMore>
     </element>
   </define>
 
-- 
2.5.0



From berrange at redhat.com  Mon Nov  9 13:03:11 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon,  9 Nov 2015 13:03:11 +0000
Subject: [Libosinfo] [PATCH] schema: allow multiple <name> elements under OS
	variant
Message-ID: <1447074191-27156-1-git-send-email-berrange@redhat.com>

The OS <variant> tag must allow multiple <name> elements
because there can be translations present.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---

Pushed to master as a build-fix

 data/schemas/libosinfo.rng | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index b97e1cb..6149f14 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -222,9 +222,16 @@
     <element name='variant'>
       <attribute name='id'>
       </attribute>
-      <element name='name'>
-        <text/>
-      </element>
+      <oneOrMore>
+        <element name='name'>
+          <optional>
+            <attribute name='xml:lang'>
+              <text/>
+            </attribute>
+          </optional>
+          <text/>
+        </element>
+      </oneOrMore>
     </element>
   </define>
 
-- 
2.5.0



From zeeshanak at gnome.org  Thu Nov 12 19:29:30 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 12 Nov 2015 14:29:30 -0500
Subject: [Libosinfo] [PATCH 3/5] fedora, script: Install qemu-guest-agent
In-Reply-To: <20151102105659.GV15093@edamame.cdg.redhat.com>
References: <1445889399-6380-1-git-send-email-zeeshanak@gnome.org>
	<1445889399-6380-3-git-send-email-zeeshanak@gnome.org>
	<20151102105659.GV15093@edamame.cdg.redhat.com>
Message-ID: <CAAa3hFOSxd+OPqig6Jv4vCx66gjgXt00cfGuh8_XjiaskeE0bg@mail.gmail.com>

On Mon, Nov 2, 2015 at 5:56 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> It's present by default on the f22 live CD at least, so maybe it's not
> needed to explicitly list it?

Yeah but might not be a bad idea to make it explicit. If the name
changes or it's dropped from a future Fedora release, the installer
will break and we'll get notified by angry users. Otherwise, we'll
likely miss such a change.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Fri Nov 13 16:08:04 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:08:04 -0500
Subject: [Libosinfo] [v2 2/5] debian,script: Install qemu-guest-agent
Message-ID: <1447430887-3568-2-git-send-email-zeeshanak@gnome.org>

For desktop profile.
---
 data/install-script/debian.org/debian-preseed-desktop.xml.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/install-script/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in
index d9ac99d..f7f1759 100644
--- a/data/install-script/debian.org/debian-preseed-desktop.xml.in
+++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in
@@ -170,6 +170,8 @@ d-i apt-setup/security_host string
 ### Software selection
 tasksel tasksel/first multiselect desktop
 
+### Install Qemu guest agent
+d-i pkgsel/include string qemu-guest-agent
 
 ### Bootloader
 
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 16:08:05 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:08:05 -0500
Subject: [Libosinfo] [v2 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <1447430887-3568-2-git-send-email-zeeshanak@gnome.org>
References: <1447430887-3568-2-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447430887-3568-3-git-send-email-zeeshanak@gnome.org>

For desktop profile.
---
 data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 3 +++
 1 file changed, 3 insertions(+)

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 be7a965..24a4d6b 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -156,6 +156,9 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
 xorg-x11-drv-qxl
 spice-vdagent
 
+# Also Qemu agent
+qemu-guest-agent
+
 %end
 
 %post --erroronfail
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 16:08:06 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:08:06 -0500
Subject: [Libosinfo] [v2 4/5] rhel,script: Install qemu-guest-agent
In-Reply-To: <1447430887-3568-2-git-send-email-zeeshanak@gnome.org>
References: <1447430887-3568-2-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447430887-3568-4-git-send-email-zeeshanak@gnome.org>

for desktop profile.
---
 data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 3 +++
 1 file changed, 3 insertions(+)

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 a643113..1aeb3a2 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -107,6 +107,9 @@ reboot
 @internet-browser
 @input-methods
 
+# Qemu agent
+qemu-guest-agent
+
 %end
 
 %post --erroronfail
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 16:08:07 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:08:07 -0500
Subject: [Libosinfo] [v2 5/5] fedora,script: Use more generic URL
In-Reply-To: <1447430887-3568-2-git-send-email-zeeshanak@gnome.org>
References: <1447430887-3568-2-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447430887-3568-5-git-send-email-zeeshanak@gnome.org>

The URL we have been pointing Anaconda to, seems to only work for
released versions and not for Alpha and Beta. Let's use a URL that works
for both released and development snapshots.
---
 data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 2 +-
 data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 24a4d6b..e7c2d62 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -130,7 +130,7 @@ reboot
 <xsl:if test="contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 </xsl:if>
 
 %packages
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 55cd52f..8786d8a 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -131,7 +131,7 @@ reboot
 <xsl:if test="contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 </xsl:if>
 
 %packages
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 16:16:12 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:16:12 -0500
Subject: [Libosinfo] F23 info & qemu-guest-agent
Message-ID: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>

These patches are v2 of the patch series that adds F23 info & modifies Linux install scripts to also install guest agents.



From zeeshanak at gnome.org  Fri Nov 13 16:16:13 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:16:13 -0500
Subject: [Libosinfo] [v2 1/5] fedora: Add F23 info & testcases
In-Reply-To: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447431377-3636-2-git-send-email-zeeshanak@gnome.org>

---
 data/os/fedoraproject.org/fedora-23.xml.in         | 165 +++++++++++++++++++++
 data/os/fedoraproject.org/fedora-unknown.xml.in    |   8 +-
 po/POTFILES.in                                     |   1 +
 .../Fedora-Live-Workstation-i686-23_Beta-1.iso.txt |  29 ++++
 ...edora-Live-Workstation-x86_64-23_Beta-1.iso.txt |  29 ++++
 .../fedora23/Fedora-Server-DVD-i386-23.iso.txt     |  29 ++++
 .../fedora23/Fedora-Server-DVD-x86_64-23.iso.txt   |  29 ++++
 .../fedora23/Fedora-Server-netinst-i386-23.iso.txt |  29 ++++
 .../Fedora-Server-netinst-x86_64-23.iso.txt        |  29 ++++
 ...Fedora-Workstation-netinst-i386-23_Beta.iso.txt |  29 ++++
 ...dora-Workstation-netinst-x86_64-23_Beta.iso.txt |  29 ++++
 11 files changed, 402 insertions(+), 4 deletions(-)
 create mode 100644 data/os/fedoraproject.org/fedora-23.xml.in
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt

diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
new file mode 100644
index 0000000..c9652aa
--- /dev/null
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -0,0 +1,165 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/23">
+    <short-id>fedora23</short-id>
+    <_name>Fedora 23</_name>
+    <version>23</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <upgrades id="http://fedoraproject.org/fedora/22"/>
+    <derives-from id="http://fedoraproject.org/fedora/22"/>
+
+    <variant id="workstation">
+      <_name>Fedora 23 Workstation</_name>
+    </variant>
+    <variant id="workstation-netinst">
+      <_name>Fedora 23 Workstation</_name>
+    </variant>
+    <variant id="server">
+      <_name>Fedora 23 Server</_name>
+    </variant>
+    <variant id="server-netinst">
+      <_name>Fedora 23 Server</_name>
+    </variant>
+
+    <!-- Workstation -->
+
+    <!-- Live -->
+    <media arch="i686" live="true">
+      <variant id="workstation"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Live-Workstation-i686-23-10.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-WS-i686-23.*</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <variant id="workstation"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-23-10.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-WS-x86_64-23.*</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- Network Installer !-->
+    <media arch="i686">
+      <variant id="workstation-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Workstation-netinst-i386-23.iso</url>
+      <iso>
+        <volume-id>Fedora-WS-23(_[[:alpha:]]*)*-i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="workstation-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-23.iso</url>
+      <iso>
+        <volume-id>Fedora-WS-23(_[[:alpha:]]*)*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Server -->
+
+    <!-- DVD -->
+    <media arch="i686">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-DVD-i386-23.iso</url>
+      <iso>
+        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <!-- We need volume-size to distinguish DVD from netiso here:
+
+             https://fedorahosted.org/rel-eng/ticket/6173
+        -->
+        <volume-size>2254878720</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-DVD-x86_64-23.iso</url>
+      <iso>
+        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2149087232</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Network Installer !-->
+    <media arch="i686">
+      <variant id="server-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-netinst-i386-23.iso</url>
+      <iso>
+        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>479557632</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="server-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-netinst-x86_64-23.iso</url>
+      <iso>
+        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>435079168</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/</url>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>23</version>
+        <arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/</url>
+      <variant id="server"/>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>23</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <!-- No install media or tree is provided for Fedora 23 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/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index 3d2b9c5..f4b74b9 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -12,13 +12,13 @@
 
     <media arch="i686">
       <iso>
-        <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386</volume-id>
+        <volume-id>Fedora.*-([2-9][4-9]|[0-9]{3,}).*-i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64</volume-id>
+        <volume-id>Fedora.*-([2-9][4-9]|[0-9]{3,}).*-x86_64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
@@ -27,13 +27,13 @@
 
     <media arch="i686" live="true">
       <iso>
-        <volume-id>Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,})</volume-id>
+        <volume-id>Fedora-Live-.*-i686-([2-9][4-9]|[0-9]{3,})</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
     <media arch="x86_64" live="true">
       <iso>
-        <volume-id>Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,})</volume-id>
+        <volume-id>Fedora-Live-.*-x86_64-([2-9][4-9]|[0-9]{3,})</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f5d40c8..56ff0b7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,6 +58,7 @@ data/os/fedoraproject.org/fedora-19.xml.in
 data/os/fedoraproject.org/fedora-20.xml.in
 data/os/fedoraproject.org/fedora-21.xml.in
 data/os/fedoraproject.org/fedora-22.xml.in
+data/os/fedoraproject.org/fedora-23.xml.in
 data/os/fedoraproject.org/fedora-unknown.xml.in
 data/os/freebsd.org/freebsd-1.0.xml.in
 data/os/freebsd.org/freebsd-2.0.5.xml.in
diff --git a/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
new file mode 100644
index 0000000..00240d9
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-Live-WS-i686-23_B-1
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 709990
+El Torito VD version 1 found, boot catalog is in sector 36
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 25 37
diff --git a/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
new file mode 100644
index 0000000..5880a32
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-Live-WS-x86_64-23_B-1
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 716965
+El Torito VD version 1 found, boot catalog is in sector 42
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 842 2114
diff --git a/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt
new file mode 100644
index 0000000..27eabb4
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-S-23-i386
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1101015
+El Torito VD version 1 found, boot catalog is in sector 404
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 195 405
diff --git a/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt
new file mode 100644
index 0000000..136c323
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-S-23-x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1049359
+El Torito VD version 1 found, boot catalog is in sector 417
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 3651 13905
diff --git a/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt
new file mode 100644
index 0000000..f7a14cd
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-S-23-i386
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 234159
+El Torito VD version 1 found, boot catalog is in sector 38
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 390FA 233722
diff --git a/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt
new file mode 100644
index 0000000..22e13fd
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-S-23-x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 212441
+El Torito VD version 1 found, boot catalog is in sector 44
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 3329D 209565
diff --git a/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
new file mode 100644
index 0000000..3767783
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-WS-23_B-i386
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 281215
+El Torito VD version 1 found, boot catalog is in sector 39
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 448C9 280777
diff --git a/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt
new file mode 100644
index 0000000..bf6053e
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-WS-23_B-x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 238732
+El Torito VD version 1 found, boot catalog is in sector 45
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 3994F 235855
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 16:16:15 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:16:15 -0500
Subject: [Libosinfo] [v2 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447431377-3636-4-git-send-email-zeeshanak@gnome.org>

For desktop profile.
---
 data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 3 +++
 1 file changed, 3 insertions(+)

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 be7a965..24a4d6b 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -156,6 +156,9 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
 xorg-x11-drv-qxl
 spice-vdagent
 
+# Also Qemu agent
+qemu-guest-agent
+
 %end
 
 %post --erroronfail
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 16:16:14 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:16:14 -0500
Subject: [Libosinfo] [v2 2/5] debian,script: Install qemu-guest-agent
In-Reply-To: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447431377-3636-3-git-send-email-zeeshanak@gnome.org>

For desktop profile.
---
 data/install-script/debian.org/debian-preseed-desktop.xml.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/install-script/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in
index d9ac99d..f7f1759 100644
--- a/data/install-script/debian.org/debian-preseed-desktop.xml.in
+++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in
@@ -170,6 +170,8 @@ d-i apt-setup/security_host string
 ### Software selection
 tasksel tasksel/first multiselect desktop
 
+### Install Qemu guest agent
+d-i pkgsel/include string qemu-guest-agent
 
 ### Bootloader
 
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 16:16:16 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:16:16 -0500
Subject: [Libosinfo] [v2 4/5] rhel,script: Install qemu-guest-agent
In-Reply-To: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447431377-3636-5-git-send-email-zeeshanak@gnome.org>

for desktop profile.
---
 data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 3 +++
 1 file changed, 3 insertions(+)

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 a643113..1aeb3a2 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -107,6 +107,9 @@ reboot
 @internet-browser
 @input-methods
 
+# Qemu agent
+qemu-guest-agent
+
 %end
 
 %post --erroronfail
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 16:16:17 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:16:17 -0500
Subject: [Libosinfo] [v2 5/5] fedora,script: Use more generic URL
In-Reply-To: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447431377-3636-6-git-send-email-zeeshanak@gnome.org>

The URL we have been pointing Anaconda to, seems to only work for
released versions and not for Alpha and Beta. Let's use a URL that works
for both released and development snapshots.
---
 data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 2 +-
 data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 24a4d6b..e7c2d62 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -130,7 +130,7 @@ reboot
 <xsl:if test="contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 </xsl:if>
 
 %packages
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 55cd52f..8786d8a 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -131,7 +131,7 @@ reboot
 <xsl:if test="contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 </xsl:if>
 
 %packages
-- 
2.5.0



From berrange at redhat.com  Fri Nov 13 16:19:58 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 13 Nov 2015 16:19:58 +0000
Subject: [Libosinfo] [v2 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <1447431377-3636-4-git-send-email-zeeshanak@gnome.org>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
	<1447431377-3636-4-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151113161958.GB13102@redhat.com>

On Fri, Nov 13, 2015 at 11:16:15AM -0500, Zeeshan Ali (Khattak) wrote:
> For desktop profile.
> ---
>  data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 3 +++
>  1 file changed, 3 insertions(+)
> 
> 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 be7a965..24a4d6b 100644
> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> @@ -156,6 +156,9 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
>  xorg-x11-drv-qxl
>  spice-vdagent
>  
> +# Also Qemu agent
> +qemu-guest-agent

This surely needs to be made conditional based on some version
of Fedora, likewise for the other changes in this series, as the
one kicksart file is shared across many versions of the OS at
least some of which I expect pre-date qemu-guest-agent.


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From zeeshanak at gnome.org  Fri Nov 13 16:39:49 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 11:39:49 -0500
Subject: [Libosinfo] [v2 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <20151113161958.GB13102@redhat.com>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
	<1447431377-3636-4-git-send-email-zeeshanak@gnome.org>
	<20151113161958.GB13102@redhat.com>
Message-ID: <CAAa3hFMmWCSoortKKpxDrUXMc5Va1iUVab-ChTULz+pinWMJ5Q@mail.gmail.com>

On Fri, Nov 13, 2015 at 11:19 AM, Daniel P. Berrange
<berrange at redhat.com> wrote:
> On Fri, Nov 13, 2015 at 11:16:15AM -0500, Zeeshan Ali (Khattak) wrote:
>> For desktop profile.
>> ---
>>  data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> 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 be7a965..24a4d6b 100644
>> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
>> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
>> @@ -156,6 +156,9 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
>>  xorg-x11-drv-qxl
>>  spice-vdagent
>>
>> +# Also Qemu agent
>> +qemu-guest-agent
>
> This surely needs to be made conditional based on some version
> of Fedora, likewise for the other changes in this series, as the
> one kicksart file is shared across many versions of the OS at
> least some of which I expect pre-date qemu-guest-agent.

It actually seems to predate Fedora itself. :)

-----------------
$ rpm -q --changelog qemu-guest-agent | tail

* Sun May 02 2004 David Woodhouse <dwmw2 at redhat.com> 0.5.4-1
- Update to 0.5.4.

* Thu Apr 22 2004 David Woodhouse <dwmw2 at redhat.com> 0.5.3-1
- Update to 0.5.3. Add init script.

* Thu Jul 17 2003 Jeff Johnson <jbj at redhat.com> 0.4.3-1
- Create.
-----------------

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From berrange at redhat.com  Fri Nov 13 16:41:52 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 13 Nov 2015 16:41:52 +0000
Subject: [Libosinfo] [v2 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <CAAa3hFMmWCSoortKKpxDrUXMc5Va1iUVab-ChTULz+pinWMJ5Q@mail.gmail.com>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
	<1447431377-3636-4-git-send-email-zeeshanak@gnome.org>
	<20151113161958.GB13102@redhat.com>
	<CAAa3hFMmWCSoortKKpxDrUXMc5Va1iUVab-ChTULz+pinWMJ5Q@mail.gmail.com>
Message-ID: <20151113164152.GC13102@redhat.com>

On Fri, Nov 13, 2015 at 11:39:49AM -0500, Zeeshan Ali (Khattak) wrote:
> On Fri, Nov 13, 2015 at 11:19 AM, Daniel P. Berrange
> <berrange at redhat.com> wrote:
> > On Fri, Nov 13, 2015 at 11:16:15AM -0500, Zeeshan Ali (Khattak) wrote:
> >> For desktop profile.
> >> ---
> >>  data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 3 +++
> >>  1 file changed, 3 insertions(+)
> >>
> >> 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 be7a965..24a4d6b 100644
> >> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> >> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> >> @@ -156,6 +156,9 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
> >>  xorg-x11-drv-qxl
> >>  spice-vdagent
> >>
> >> +# Also Qemu agent
> >> +qemu-guest-agent
> >
> > This surely needs to be made conditional based on some version
> > of Fedora, likewise for the other changes in this series, as the
> > one kicksart file is shared across many versions of the OS at
> > least some of which I expect pre-date qemu-guest-agent.
> 
> It actually seems to predate Fedora itself. :)

Unfortunately not - qemu-guest-agent is a sub-RPM of 'qemu' so
the changelog you're seeing is the changelog for qemu as a whole.

I added it to Fedora in this dist-git commit

  commit f057293300c43e749ee543178ab95f0e285949cd
  Author: Daniel P. Berrange <berrange at redhat.com>
  Date:   Wed Oct 5 16:00:36 2011 +0100

    Fix packaging of the QEMU guest agent


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From zeeshanak at gnome.org  Fri Nov 13 18:03:30 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 13:03:30 -0500
Subject: [Libosinfo] [v2 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <20151113164152.GC13102@redhat.com>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
	<1447431377-3636-4-git-send-email-zeeshanak@gnome.org>
	<20151113161958.GB13102@redhat.com>
	<CAAa3hFMmWCSoortKKpxDrUXMc5Va1iUVab-ChTULz+pinWMJ5Q@mail.gmail.com>
	<20151113164152.GC13102@redhat.com>
Message-ID: <CAAa3hFPdpx9dgXfqbDoX77ApUHRtYh=nH-nxhc2ovss=7UpCxg@mail.gmail.com>

On Fri, Nov 13, 2015 at 11:41 AM, Daniel P. Berrange
<berrange at redhat.com> wrote:
> On Fri, Nov 13, 2015 at 11:39:49AM -0500, Zeeshan Ali (Khattak) wrote:
>> On Fri, Nov 13, 2015 at 11:19 AM, Daniel P. Berrange
>> <berrange at redhat.com> wrote:
>> > On Fri, Nov 13, 2015 at 11:16:15AM -0500, Zeeshan Ali (Khattak) wrote:
>> >> For desktop profile.
>> >> ---
>> >>  data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 3 +++
>> >>  1 file changed, 3 insertions(+)
>> >>
>> >> 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 be7a965..24a4d6b 100644
>> >> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
>> >> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
>> >> @@ -156,6 +156,9 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
>> >>  xorg-x11-drv-qxl
>> >>  spice-vdagent
>> >>
>> >> +# Also Qemu agent
>> >> +qemu-guest-agent
>> >
>> > This surely needs to be made conditional based on some version
>> > of Fedora, likewise for the other changes in this series, as the
>> > one kicksart file is shared across many versions of the OS at
>> > least some of which I expect pre-date qemu-guest-agent.
>>
>> It actually seems to predate Fedora itself. :)
>
> Unfortunately not - qemu-guest-agent is a sub-RPM of 'qemu' so
> the changelog you're seeing is the changelog for qemu as a whole.
>
> I added it to Fedora in this dist-git commit
>
>   commit f057293300c43e749ee543178ab95f0e285949cd
>   Author: Daniel P. Berrange <berrange at redhat.com>
>   Date:   Wed Oct 5 16:00:36 2011 +0100
>
>     Fix packaging of the QEMU guest agent

Ah ok, so I'll modify this patch. As for others:

* RHEL 6.* had this package and this is the first RHEL release for
which we list installer scripts for, so no issue there AFAIK.

* Debian seems to have added the package in debian squeeze (6) and
desktop installer script is only listed from wheezy (7) and onwards,
so no need for conditionals there either.


-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Fri Nov 13 18:18:50 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 13:18:50 -0500
Subject: [Libosinfo] F23 info & qemu-guest-agent (v3)
Message-ID: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>

v3: Fedora installer now only installs qemu-guest-agent if version is greater than 15 (i-e >= 16).



From zeeshanak at gnome.org  Fri Nov 13 18:18:51 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 13:18:51 -0500
Subject: [Libosinfo] [v3 1/5] fedora: Add F23 info & testcases
In-Reply-To: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447438735-14648-2-git-send-email-zeeshanak@gnome.org>

---
 data/os/fedoraproject.org/fedora-23.xml.in         | 167 +++++++++++++++++++++
 data/os/fedoraproject.org/fedora-unknown.xml.in    |   8 +-
 po/POTFILES.in                                     |   1 +
 .../Fedora-Live-Workstation-i686-23_Beta-1.iso.txt |  29 ++++
 ...edora-Live-Workstation-x86_64-23_Beta-1.iso.txt |  29 ++++
 .../fedora23/Fedora-Server-DVD-i386-23.iso.txt     |  29 ++++
 .../fedora23/Fedora-Server-DVD-x86_64-23.iso.txt   |  29 ++++
 .../fedora23/Fedora-Server-netinst-i386-23.iso.txt |  29 ++++
 .../Fedora-Server-netinst-x86_64-23.iso.txt        |  29 ++++
 ...Fedora-Workstation-netinst-i386-23_Beta.iso.txt |  29 ++++
 ...dora-Workstation-netinst-x86_64-23_Beta.iso.txt |  29 ++++
 11 files changed, 404 insertions(+), 4 deletions(-)
 create mode 100644 data/os/fedoraproject.org/fedora-23.xml.in
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
 create mode 100644 test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt

diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
new file mode 100644
index 0000000..a898275
--- /dev/null
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -0,0 +1,167 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/23">
+    <short-id>fedora23</short-id>
+    <_name>Fedora 23</_name>
+    <version>23</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <upgrades id="http://fedoraproject.org/fedora/22"/>
+    <derives-from id="http://fedoraproject.org/fedora/22"/>
+
+    <release-date>2015-11-03</release-date>
+
+    <variant id="workstation">
+      <_name>Fedora 23 Workstation</_name>
+    </variant>
+    <variant id="workstation-netinst">
+      <_name>Fedora 23 Workstation</_name>
+    </variant>
+    <variant id="server">
+      <_name>Fedora 23 Server</_name>
+    </variant>
+    <variant id="server-netinst">
+      <_name>Fedora 23 Server</_name>
+    </variant>
+
+    <!-- Workstation -->
+
+    <!-- Live -->
+    <media arch="i686" live="true">
+      <variant id="workstation"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Live-Workstation-i686-23-10.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-WS-i686-23.*</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <variant id="workstation"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-23-10.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-WS-x86_64-23.*</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- Network Installer !-->
+    <media arch="i686">
+      <variant id="workstation-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Workstation-netinst-i386-23.iso</url>
+      <iso>
+        <volume-id>Fedora-WS-23(_[[:alpha:]]*)*-i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="workstation-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-23.iso</url>
+      <iso>
+        <volume-id>Fedora-WS-23(_[[:alpha:]]*)*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Server -->
+
+    <!-- DVD -->
+    <media arch="i686">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-DVD-i386-23.iso</url>
+      <iso>
+        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <!-- We need volume-size to distinguish DVD from netiso here:
+
+             https://fedorahosted.org/rel-eng/ticket/6173
+        -->
+        <volume-size>2254878720</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-DVD-x86_64-23.iso</url>
+      <iso>
+        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2149087232</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Network Installer !-->
+    <media arch="i686">
+      <variant id="server-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-netinst-i386-23.iso</url>
+      <iso>
+        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>479557632</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="server-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-netinst-x86_64-23.iso</url>
+      <iso>
+        <volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>435079168</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/</url>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>23</version>
+        <arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/</url>
+      <variant id="server"/>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>23</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <!-- No install media or tree is provided for Fedora 23 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/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index 3d2b9c5..f4b74b9 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -12,13 +12,13 @@
 
     <media arch="i686">
       <iso>
-        <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386</volume-id>
+        <volume-id>Fedora.*-([2-9][4-9]|[0-9]{3,}).*-i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64</volume-id>
+        <volume-id>Fedora.*-([2-9][4-9]|[0-9]{3,}).*-x86_64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
@@ -27,13 +27,13 @@
 
     <media arch="i686" live="true">
       <iso>
-        <volume-id>Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,})</volume-id>
+        <volume-id>Fedora-Live-.*-i686-([2-9][4-9]|[0-9]{3,})</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
     <media arch="x86_64" live="true">
       <iso>
-        <volume-id>Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,})</volume-id>
+        <volume-id>Fedora-Live-.*-x86_64-([2-9][4-9]|[0-9]{3,})</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f5d40c8..56ff0b7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,6 +58,7 @@ data/os/fedoraproject.org/fedora-19.xml.in
 data/os/fedoraproject.org/fedora-20.xml.in
 data/os/fedoraproject.org/fedora-21.xml.in
 data/os/fedoraproject.org/fedora-22.xml.in
+data/os/fedoraproject.org/fedora-23.xml.in
 data/os/fedoraproject.org/fedora-unknown.xml.in
 data/os/freebsd.org/freebsd-1.0.xml.in
 data/os/freebsd.org/freebsd-2.0.5.xml.in
diff --git a/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
new file mode 100644
index 0000000..00240d9
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-Live-WS-i686-23_B-1
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 709990
+El Torito VD version 1 found, boot catalog is in sector 36
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 25 37
diff --git a/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
new file mode 100644
index 0000000..5880a32
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-Live-WS-x86_64-23_B-1
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 716965
+El Torito VD version 1 found, boot catalog is in sector 42
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 842 2114
diff --git a/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt
new file mode 100644
index 0000000..27eabb4
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-S-23-i386
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1101015
+El Torito VD version 1 found, boot catalog is in sector 404
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 195 405
diff --git a/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt
new file mode 100644
index 0000000..136c323
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-S-23-x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1049359
+El Torito VD version 1 found, boot catalog is in sector 417
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 3651 13905
diff --git a/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt
new file mode 100644
index 0000000..f7a14cd
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-S-23-i386
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 234159
+El Torito VD version 1 found, boot catalog is in sector 38
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 390FA 233722
diff --git a/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt
new file mode 100644
index 0000000..22e13fd
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-S-23-x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 212441
+El Torito VD version 1 found, boot catalog is in sector 44
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 3329D 209565
diff --git a/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
new file mode 100644
index 0000000..3767783
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-WS-23_B-i386
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 281215
+El Torito VD version 1 found, boot catalog is in sector 39
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 448C9 280777
diff --git a/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt
new file mode 100644
index 0000000..bf6053e
--- /dev/null
+++ b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-WS-23_B-x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 238732
+El Torito VD version 1 found, boot catalog is in sector 45
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 3994F 235855
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 18:18:52 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 13:18:52 -0500
Subject: [Libosinfo] [v3 2/5] debian,script: Install qemu-guest-agent
In-Reply-To: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447438735-14648-3-git-send-email-zeeshanak@gnome.org>

For desktop profile.
---
 data/install-script/debian.org/debian-preseed-desktop.xml.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/install-script/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in
index d9ac99d..f7f1759 100644
--- a/data/install-script/debian.org/debian-preseed-desktop.xml.in
+++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in
@@ -170,6 +170,8 @@ d-i apt-setup/security_host string
 ### Software selection
 tasksel tasksel/first multiselect desktop
 
+### Install Qemu guest agent
+d-i pkgsel/include string qemu-guest-agent
 
 ### Bootloader
 
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 18:18:53 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 13:18:53 -0500
Subject: [Libosinfo] [v3 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447438735-14648-4-git-send-email-zeeshanak@gnome.org>

For desktop profile.
---
 .../fedoraproject.org/fedora-kickstart-desktop.xml.in              | 7 +++++++
 1 file changed, 7 insertions(+)

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 be7a965..8ad2f05 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -156,6 +156,13 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
 xorg-x11-drv-qxl
 spice-vdagent
 
+<xsl:choose>
+  <xsl:when test="os/version &gt; 15">
+# Also Qemu agent
+qemu-guest-agent
+  </xsl:when>
+</xsl:choose>
+
 %end
 
 %post --erroronfail
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 18:18:54 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 13:18:54 -0500
Subject: [Libosinfo] [v3 4/5] rhel,script: Install qemu-guest-agent
In-Reply-To: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447438735-14648-5-git-send-email-zeeshanak@gnome.org>

for desktop profile.
---
 data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 3 +++
 1 file changed, 3 insertions(+)

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 a643113..1aeb3a2 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -107,6 +107,9 @@ reboot
 @internet-browser
 @input-methods
 
+# Qemu agent
+qemu-guest-agent
+
 %end
 
 %post --erroronfail
-- 
2.5.0



From zeeshanak at gnome.org  Fri Nov 13 18:18:55 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Fri, 13 Nov 2015 13:18:55 -0500
Subject: [Libosinfo] [v3 5/5] fedora,script: Use more generic URL
In-Reply-To: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <1447438735-14648-6-git-send-email-zeeshanak@gnome.org>

The URL we have been pointing Anaconda to, seems to only work for
released versions and not for Alpha and Beta. Let's use a URL that works
for both released and development snapshots.
---
 data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 2 +-
 data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 8ad2f05..8f2372c 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -130,7 +130,7 @@ reboot
 <xsl:if test="contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 </xsl:if>
 
 %packages
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 55cd52f..8786d8a 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -131,7 +131,7 @@ reboot
 <xsl:if test="contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 </xsl:if>
 
 %packages
-- 
2.5.0



From yang.yu.list at gmail.com  Sun Nov 15 08:22:47 2015
From: yang.yu.list at gmail.com (Yang Yu)
Date: Sun, 15 Nov 2015 02:22:47 -0600
Subject: [Libosinfo] RFC: Splitting off database into separate package
Message-ID: <CAFwKRnSor0tYsxsBuiTOAR92DBXuf5MjWUKQryGiHniV-Pp9gA@mail.gmail.com>

I am kinda late to the party.

This is indeed a much needed feature. Many distros have libosinfo
package 6 mon+ old (missing recent OS releases).

- Is XML the format we want to use long term ?
I agree with switching to json if the performance gain is significant.
Not a high priority if performance isn't going to be a concern in
short term.
If xml support does not get discontinued, some well defined precedence
to handle conflicts (in case a copy of xml database and a copy of json
database are present at the same time) seems necessary.

- Do we need to mark a database schema version in some manner ?
adding a hash associated with the version number to remind people if
the database has been modified since released?
adding a flag to prevent the database from getting overwritten by
updates if the user wants to keep the modified version?

- Should we restructure the database ?
1 entity per file instead of a huge file with everything makes sense.
Easier to maintain. I agree with your approach in [PATCH 00/39] Split
up database XML files
https://www.redhat.com/archives/libosinfo/2015-September/msg00043.html

- How do we provide notifications when updates are available
Using DNS TXT record for update check is a brilliant idea. While
having a separate package for database updates, I would like to see a
method to update the database on demand outside the distro's package
management (too much admin work and taking too long to publish).  It
can be as easy as a script to operate in diff/overwrite mode. The
files can be hosted on github or with cloudflare cdn so libosinfo.org
won't get hammered too much.


I tried to replace everything in /usr/share/libosinfo/db with the
/data (except /data/schemas) from git and /usr/share/libosinfo/schemas
with data/schemas. It did not work. Is there any change that prevents
the current database from working on 0.2.11?

libosinfo.x86_64                 0.2.11-4.el7            @anaconda/7.1

$ osinfo-query os
 Short ID             | Name
    | Version  | ID
----------------------+----------------------------------------------------+----------+-----------------------------------------


Yang



From yang.yu.list at gmail.com  Sun Nov 15 07:45:01 2015
From: yang.yu.list at gmail.com (Yang Yu)
Date: Sun, 15 Nov 2015 01:45:01 -0600
Subject: [Libosinfo] RFC: Splitting off database into separate package
Message-ID: <CAFwKRnSp+MpMcEzb=Q4s43PkTsJbUM97eLxVPYBHU_=ar-fr8w@mail.gmail.com>

I am kinda late to the party.

This is indeed a much needed feature. Many distros have libosinfo
package 6 mon+ old (missing recent OS releases).

- Is XML the format we want to use long term ?
I agree with switching to json if the performance gain is significant.
Not a high priority if performance isn't going to be a concern in
short term.
If xml support does not get discontinued, some well defined precedence
to handle conflicts (in case a copy of xml database and a copy of json
database are present at the same time) seems necessary.

- Do we need to mark a database schema version in some manner ?
adding a hash associated with the version number to remind people if
the database has been modified since released?
adding a flag to prevent the database from getting overwritten by
updates if the user wants to keep the modified version?

- Should we restructure the database ?
1 entity per file instead of a huge file with everything makes sense.
Easier to maintain. I agree with your approach in [PATCH 00/39] Split
up database XML files
https://www.redhat.com/archives/libosinfo/2015-September/msg00043.html

- How do we provide notifications when updates are available
Using DNS TXT record for update check is a brilliant idea. While
having a separate package for database updates, I would like to see a
method to update the database on demand outside the distro's package
management (too much admin work and taking too long to publish).  It
can be as easy as a script to operate in diff/overwrite mode. The
files can be hosted on github or with cloudflare cdn so libosinfo.org
won't get hammered too much.


Yang



From cfergeau at redhat.com  Mon Nov 16 08:57:49 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 16 Nov 2015 09:57:49 +0100
Subject: [Libosinfo] [v3 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <1447438735-14648-4-git-send-email-zeeshanak@gnome.org>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
	<1447438735-14648-4-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151116085749.GB1871@edamame.cdg.redhat.com>

On Fri, Nov 13, 2015 at 01:18:53PM -0500, Zeeshan Ali (Khattak) wrote:
> For desktop profile.
> ---
>  .../fedoraproject.org/fedora-kickstart-desktop.xml.in              | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> 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 be7a965..8ad2f05 100644
> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> @@ -156,6 +156,13 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
>  xorg-x11-drv-qxl
>  spice-vdagent
>  
> +<xsl:choose>
> +  <xsl:when test="os/version &gt; 15">
> +# Also Qemu agent
> +qemu-guest-agent

I don't think the comment is needed.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151116/dcf06038/attachment.sig>

From cfergeau at redhat.com  Mon Nov 16 09:00:24 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 16 Nov 2015 10:00:24 +0100
Subject: [Libosinfo] [v3 4/5] rhel,script: Install qemu-guest-agent
In-Reply-To: <1447438735-14648-5-git-send-email-zeeshanak@gnome.org>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
	<1447438735-14648-5-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151116090024.GC1871@edamame.cdg.redhat.com>

On Fri, Nov 13, 2015 at 01:18:54PM -0500, Zeeshan Ali (Khattak) wrote:
> for desktop profile.

Maybe mention that RHEL7 always had agent builds, and that recent RHEL6
point releases also have it ?

Christophe

> ---
>  data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 3 +++
>  1 file changed, 3 insertions(+)
> 
> 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 a643113..1aeb3a2 100644
> --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
> +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
> @@ -107,6 +107,9 @@ reboot
>  @internet-browser
>  @input-methods
>  
> +# Qemu agent
> +qemu-guest-agent
> +
>  %end
>  
>  %post --erroronfail
> -- 
> 2.5.0
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151116/3fbff6f6/attachment.sig>

From cfergeau at redhat.com  Mon Nov 16 09:00:34 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 16 Nov 2015 10:00:34 +0100
Subject: [Libosinfo] F23 info & qemu-guest-agent (v3)
In-Reply-To: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
Message-ID: <20151116090034.GD1871@edamame.cdg.redhat.com>

Series looks good to me, ACK.

Christophe

On Fri, Nov 13, 2015 at 01:18:50PM -0500, Zeeshan Ali (Khattak) wrote:
> v3: Fedora installer now only installs qemu-guest-agent if version is greater than 15 (i-e >= 16).
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151116/121445ad/attachment.sig>

From berrange at redhat.com  Mon Nov 16 09:48:42 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 16 Nov 2015 09:48:42 +0000
Subject: [Libosinfo] [v2 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <CAAa3hFPdpx9dgXfqbDoX77ApUHRtYh=nH-nxhc2ovss=7UpCxg@mail.gmail.com>
References: <1447431377-3636-1-git-send-email-zeeshanak@gnome.org>
	<1447431377-3636-4-git-send-email-zeeshanak@gnome.org>
	<20151113161958.GB13102@redhat.com>
	<CAAa3hFMmWCSoortKKpxDrUXMc5Va1iUVab-ChTULz+pinWMJ5Q@mail.gmail.com>
	<20151113164152.GC13102@redhat.com>
	<CAAa3hFPdpx9dgXfqbDoX77ApUHRtYh=nH-nxhc2ovss=7UpCxg@mail.gmail.com>
Message-ID: <20151116094842.GA20157@redhat.com>

On Fri, Nov 13, 2015 at 01:03:30PM -0500, Zeeshan Ali (Khattak) wrote:
> On Fri, Nov 13, 2015 at 11:41 AM, Daniel P. Berrange
> <berrange at redhat.com> wrote:
> > On Fri, Nov 13, 2015 at 11:39:49AM -0500, Zeeshan Ali (Khattak) wrote:
> >> On Fri, Nov 13, 2015 at 11:19 AM, Daniel P. Berrange
> >> <berrange at redhat.com> wrote:
> >> > On Fri, Nov 13, 2015 at 11:16:15AM -0500, Zeeshan Ali (Khattak) wrote:
> >> >> For desktop profile.
> >> >> ---
> >> >>  data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 3 +++
> >> >>  1 file changed, 3 insertions(+)
> >> >>
> >> >> 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 be7a965..24a4d6b 100644
> >> >> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> >> >> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> >> >> @@ -156,6 +156,9 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
> >> >>  xorg-x11-drv-qxl
> >> >>  spice-vdagent
> >> >>
> >> >> +# Also Qemu agent
> >> >> +qemu-guest-agent
> >> >
> >> > This surely needs to be made conditional based on some version
> >> > of Fedora, likewise for the other changes in this series, as the
> >> > one kicksart file is shared across many versions of the OS at
> >> > least some of which I expect pre-date qemu-guest-agent.
> >>
> >> It actually seems to predate Fedora itself. :)
> >
> > Unfortunately not - qemu-guest-agent is a sub-RPM of 'qemu' so
> > the changelog you're seeing is the changelog for qemu as a whole.
> >
> > I added it to Fedora in this dist-git commit
> >
> >   commit f057293300c43e749ee543178ab95f0e285949cd
> >   Author: Daniel P. Berrange <berrange at redhat.com>
> >   Date:   Wed Oct 5 16:00:36 2011 +0100
> >
> >     Fix packaging of the QEMU guest agent
> 
> Ah ok, so I'll modify this patch. As for others:
> 
> * RHEL 6.* had this package and this is the first RHEL release for
> which we list installer scripts for, so no issue there AFAIK.
> 
> * Debian seems to have added the package in debian squeeze (6) and
> desktop installer script is only listed from wheezy (7) and onwards,
> so no need for conditionals there either.

Ok, sounds good.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Mon Nov 16 09:55:49 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 16 Nov 2015 09:55:49 +0000
Subject: [Libosinfo] RFC: Splitting off database into separate package
In-Reply-To: <CAFwKRnSor0tYsxsBuiTOAR92DBXuf5MjWUKQryGiHniV-Pp9gA@mail.gmail.com>
References: <CAFwKRnSor0tYsxsBuiTOAR92DBXuf5MjWUKQryGiHniV-Pp9gA@mail.gmail.com>
Message-ID: <20151116095549.GB20157@redhat.com>

On Sun, Nov 15, 2015 at 02:22:47AM -0600, Yang Yu wrote:
> I am kinda late to the party.
> 
> This is indeed a much needed feature. Many distros have libosinfo
> package 6 mon+ old (missing recent OS releases).
> 
> - Is XML the format we want to use long term ?
> I agree with switching to json if the performance gain is significant.
> Not a high priority if performance isn't going to be a concern in
> short term.
> If xml support does not get discontinued, some well defined precedence
> to handle conflicts (in case a copy of xml database and a copy of json
> database are present at the same time) seems necessary.
> 
> - Do we need to mark a database schema version in some manner ?
> adding a hash associated with the version number to remind people if
> the database has been modified since released?
> adding a flag to prevent the database from getting overwritten by
> updates if the user wants to keep the modified version?
> 
> - Should we restructure the database ?
> 1 entity per file instead of a huge file with everything makes sense.
> Easier to maintain. I agree with your approach in [PATCH 00/39] Split
> up database XML files
> https://www.redhat.com/archives/libosinfo/2015-September/msg00043.html
> 
> - How do we provide notifications when updates are available
> Using DNS TXT record for update check is a brilliant idea. While
> having a separate package for database updates, I would like to see a
> method to update the database on demand outside the distro's package
> management (too much admin work and taking too long to publish).  It
> can be as easy as a script to operate in diff/overwrite mode. The
> files can be hosted on github or with cloudflare cdn so libosinfo.org
> won't get hammered too much.
> 
> 
> I tried to replace everything in /usr/share/libosinfo/db with the
> /data (except /data/schemas) from git and /usr/share/libosinfo/schemas
> with data/schemas. It did not work. Is there any change that prevents
> the current database from working on 0.2.11?

You can't directly use the files from git that end in '.xml.in' as they
are post-processed to add in translations to create the final '.xml'
files. If you run a build of git to generate the .xml files those
should then work


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From cfergeau at redhat.com  Tue Nov 17 10:20:19 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:19 +0100
Subject: [Libosinfo] [PATCH 0/8] Remove use of deprecated libsoup
	methods/#define
Message-ID: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>

Hey,

I originally wanted to revisit
https://www.redhat.com/archives/libosinfo/2013-March/msg00091.html
as 18 months have passed since that thread. I rebased/reworked the initial
patch, and while testing it (export IBOSINFO_NETWORK_TESTS=1; make check),
I fixed some issues with debian/ubuntu/fedora/altlinux data.

Christophe



From cfergeau at redhat.com  Tue Nov 17 10:20:20 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:20 +0100
Subject: [Libosinfo] [PATCH 1/8] configure: bump libsoup version to 2.42
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447755627-29857-2-git-send-email-cfergeau@redhat.com>

Bumping libsoup version we are fixing a few deprecated warnings in our tests
(use SoupSession directly rather than SoupSessionAsync) and as a
side effect we don't need libsoup-gnome anymore.

Based on a patch from Fabiano Fid?ncio <fidencio at redhat.com>
---
 configure.ac          | 3 +--
 test/Makefile.am      | 2 --
 test/test-mediauris.c | 9 ++-------
 test/test-treeuris.c  | 9 ++-------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 494372c..81fcc0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0])
 PKG_CHECK_MODULES([GIO], [gio-2.0])
-PKG_CHECK_MODULES([SOUP], [libsoup-2.4])
-PKG_CHECK_MODULES([SOUP_GNOME], [libsoup-gnome-2.4])
+PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.42])
 PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0])
 PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0])
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 5c05162..ef63154 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,7 +25,6 @@ COMMON_LDADD = \
 	$(COVERAGE_LDFLAGS) \
 	$(GOBJECT_LIBS) \
 	$(SOUP_LIBS) \
-	$(SOUP_GNOME_LIBS) \
 	$(CHECK_LIBS) \
 	../osinfo/libosinfo-1.0.la
 COMMON_CFLAGS = \
@@ -33,7 +32,6 @@ COMMON_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
 	$(SOUP_CFLAGS) \
-	$(SOUP_GNOME_CFLAGS) \
 	-I$(top_srcdir) \
 	-DSRCDIR="\"$(abs_top_srcdir)\"" \
 	-DBUILDDIR="\"$(abs_top_builddir)\"" \
diff --git a/test/test-mediauris.c b/test/test-mediauris.c
index d66f4a3..b2fede2 100644
--- a/test/test-mediauris.c
+++ b/test/test-mediauris.c
@@ -26,8 +26,6 @@
 #include <osinfo/osinfo.h>
 #include <check.h>
 #include <libsoup/soup.h>
-#define HAVE_LIBSOUP_GNOME
-#include <libsoup/soup-gnome.h>
 
 static void test_media(OsinfoMediaList *medialist, GError **error, SoupSession *session)
 {
@@ -68,11 +66,8 @@ START_TEST(test_uris)
     GList *osel = NULL, *tmp;
     const gchar *debugstr;
 
-    session = soup_session_async_new_with_options(
-#ifdef HAVE_LIBSOUP_GNOME
-                                                  SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-#endif
-                                                  NULL);
+    session = soup_session_new();
+
     if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) {
         SoupLogger *logger;
         int debug_level = atoi(debugstr);
diff --git a/test/test-treeuris.c b/test/test-treeuris.c
index da0dee4..9176919 100644
--- a/test/test-treeuris.c
+++ b/test/test-treeuris.c
@@ -26,8 +26,6 @@
 #include <osinfo/osinfo.h>
 #include <check.h>
 #include <libsoup/soup.h>
-#define HAVE_LIBSOUP_GNOME
-#include <libsoup/soup-gnome.h>
 
 static void test_tree(OsinfoTreeList *treelist, GError **error, SoupSession *session)
 {
@@ -68,11 +66,8 @@ START_TEST(test_uris)
     GList *osel = NULL, *tmp;
     const gchar *debugstr;
 
-    session = soup_session_async_new_with_options(
-#ifdef HAVE_LIBSOUP_GNOME
-                                                  SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-#endif
-                                                  NULL);
+    session = soup_session_new();
+
     if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) {
         SoupLogger *logger;
         int debug_level = atoi(debugstr);
-- 
2.5.0



From cfergeau at redhat.com  Tue Nov 17 10:20:21 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:21 +0100
Subject: [Libosinfo] [PATCH 2/8] debian: Fix Debian 6.0.10 detection
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447755627-29857-3-git-send-email-cfergeau@redhat.com>

The current regex for Debian only expects a single digit as the micro
version number, but Debian 6 goes up to 10.
---
 data/os/debian.org/debian-6.xml.in                      |  4 ++--
 .../debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt     | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 test/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt

diff --git a/data/os/debian.org/debian-6.xml.in b/data/os/debian.org/debian-6.xml.in
index 0ca1e72..287f451 100644
--- a/data/os/debian.org/debian-6.xml.in
+++ b/data/os/debian.org/debian-6.xml.in
@@ -31,7 +31,7 @@
     <media arch="i686">
       <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/i386/iso-dvd/debian-6.0.8-i386-DVD-1.iso</url>
       <iso>
-        <volume-id>Debian 6.0.\d i386 1</volume-id>
+        <volume-id>Debian 6.0.1?\d i386 1</volume-id>
       </iso>
       <kernel>install.386/vmlinuz</kernel>
       <initrd>install.386/initrd.gz</initrd>
@@ -39,7 +39,7 @@
     <media arch="x86_64">
       <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/amd64/iso-dvd/debian-6.0.8-amd64-DVD-1.iso</url>
       <iso>
-        <volume-id>Debian 6.0.\d amd64 1</volume-id>
+        <volume-id>Debian 6.0.1?\d amd64 1</volume-id>
       </iso>
       <kernel>install.amd/vmlinuz</kernel>
       <initrd>install.amd/initrd.gz</initrd>
diff --git a/test/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt b/test/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt
new file mode 100644
index 0000000..dabb2b8
--- /dev/null
+++ b/test/isodata/debian/debian6/debian-6.0.10-i386-DVD-1.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Debian 6.0.10 i386 1
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.3.6 2014.04.08.180000, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 2292948
+El Torito VD version 1 found, boot catalog is in sector 9702
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
-- 
2.5.0



From cfergeau at redhat.com  Tue Nov 17 10:20:22 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:22 +0100
Subject: [Libosinfo] [PATCH 3/8] debian: Update URLs to latest minor releases
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447755627-29857-4-git-send-email-cfergeau@redhat.com>

During the lifetime of a major release, there are regular minor releases
of updated isos. Availability of ISOs for older minor releases seem not
to be guaranteed, leading to failures in test-mediauris (with
LIBOSINFO_NETWORK_TESTS set in the environment). This commit updates
debian 6/7/8 URLs to the latest minor update.
---
 data/os/debian.org/debian-6.xml.in | 8 ++++----
 data/os/debian.org/debian-7.xml.in | 4 ++--
 data/os/debian.org/debian-8.xml.in | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/os/debian.org/debian-6.xml.in b/data/os/debian.org/debian-6.xml.in
index 287f451..fbb6306 100644
--- a/data/os/debian.org/debian-6.xml.in
+++ b/data/os/debian.org/debian-6.xml.in
@@ -29,7 +29,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/i386/iso-dvd/debian-6.0.8-i386-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.10/i386/iso-dvd/debian-6.0.10-i386-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 6.0.1?\d i386 1</volume-id>
       </iso>
@@ -37,7 +37,7 @@
       <initrd>install.386/initrd.gz</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/amd64/iso-dvd/debian-6.0.8-amd64-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.10/amd64/iso-dvd/debian-6.0.10-amd64-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 6.0.1?\d amd64 1</volume-id>
       </iso>
@@ -46,7 +46,7 @@
     </media>
 
     <media arch="i686" live="true">
-      <url>http://live.debian.net/cdimage/release/6.0.8/i386/iso-hybrid/debian-live-6.0.8-i386-gnome-desktop.iso</url>
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.10-live/i386/iso-hybrid/debian-live-6.0.10-i386-gnome-desktop.iso</url>
       <iso>
         <volume-id>Debian squeeze.*</volume-id>
         <system-id>LINUX</system-id>
@@ -55,7 +55,7 @@
       <initrd>install/initrd.gz</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://live.debian.net/cdimage/release/6.0.8/amd64/iso-hybrid/debian-live-6.0.8-amd64-gnome-desktop.iso</url>
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.10-live/amd64/iso-hybrid/debian-live-6.0.10-amd64-gnome-desktop.iso</url>
       <iso>
         <volume-id>Debian squeeze.*</volume-id>
         <system-id>LINUX</system-id>
diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in
index 68f28d9..0c89bc7 100644
--- a/data/os/debian.org/debian-7.xml.in
+++ b/data/os/debian.org/debian-7.xml.in
@@ -29,7 +29,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://cdimage.debian.org/debian-cd/7.3.0/i386/iso-dvd/debian-7.3.0-i386-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/7.9.0/i386/iso-dvd/debian-7.9.0-i386-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 7.\d.\d i386 1</volume-id>
       </iso>
@@ -37,7 +37,7 @@
       <initrd>install.386/initrd.gz</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-dvd/debian-7.3.0-amd64-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/7.9.0/amd64/iso-dvd/debian-7.9.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 74eb10e..146089a 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -29,7 +29,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://cdimage.debian.org/debian-cd/8.0.0/i386/iso-dvd/debian-8.0.0-i386-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/debian-cd/8.2.0/i386/iso-dvd/debian-8.2.0-i386-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 8.\d.\d i386 1</volume-id>
       </iso>
@@ -37,7 +37,7 @@
       <initrd>install.386/initrd.gz</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-dvd/debian-8.0.0-amd64-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/debian-cd/8.2.0/amd64/iso-dvd/debian-8.2.0-amd64-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 8.\d.\d amd64 1</volume-id>
       </iso>
-- 
2.5.0



From cfergeau at redhat.com  Tue Nov 17 10:20:23 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:23 +0100
Subject: [Libosinfo] [PATCH 4/8] fedora: Fix URLs to old fedora versions
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447755627-29857-5-git-send-email-cfergeau@redhat.com>

Once a fedora version becomes unsupported, its ISOs are moved from
download.fedoraproject.org to archive.fedoraproject.org
---
 data/os/fedoraproject.org/fedora-13.xml.in |  4 ++--
 data/os/fedoraproject.org/fedora-14.xml.in |  4 ++--
 data/os/fedoraproject.org/fedora-15.xml.in |  4 ++--
 data/os/fedoraproject.org/fedora-16.xml.in |  4 ++--
 data/os/fedoraproject.org/fedora-17.xml.in |  4 ++--
 data/os/fedoraproject.org/fedora-18.xml.in |  8 ++++----
 data/os/fedoraproject.org/fedora-19.xml.in |  4 ++--
 data/os/fedoraproject.org/fedora-20.xml.in | 20 ++++++++++----------
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/data/os/fedoraproject.org/fedora-13.xml.in b/data/os/fedoraproject.org/fedora-13.xml.in
index 1f2855e..a53b2d0 100644
--- a/data/os/fedoraproject.org/fedora-13.xml.in
+++ b/data/os/fedoraproject.org/fedora-13.xml.in
@@ -206,7 +206,7 @@
     </media>
 
     <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>13</version>
@@ -214,7 +214,7 @@
       </treeinfo>
     </tree>
     <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>13</version>
diff --git a/data/os/fedoraproject.org/fedora-14.xml.in b/data/os/fedoraproject.org/fedora-14.xml.in
index 0be7145..616e114 100644
--- a/data/os/fedoraproject.org/fedora-14.xml.in
+++ b/data/os/fedoraproject.org/fedora-14.xml.in
@@ -206,7 +206,7 @@
     </media>
 
     <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>14</version>
@@ -214,7 +214,7 @@
       </treeinfo>
     </tree>
     <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>14</version>
diff --git a/data/os/fedoraproject.org/fedora-15.xml.in b/data/os/fedoraproject.org/fedora-15.xml.in
index 75d8b35..b61de6c 100644
--- a/data/os/fedoraproject.org/fedora-15.xml.in
+++ b/data/os/fedoraproject.org/fedora-15.xml.in
@@ -83,7 +83,7 @@
     </media>
 
     <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/i386/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>15</version>
@@ -91,7 +91,7 @@
       </treeinfo>
     </tree>
     <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/x86_64/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>15</version>
diff --git a/data/os/fedoraproject.org/fedora-16.xml.in b/data/os/fedoraproject.org/fedora-16.xml.in
index ee4bc33..b289069 100644
--- a/data/os/fedoraproject.org/fedora-16.xml.in
+++ b/data/os/fedoraproject.org/fedora-16.xml.in
@@ -83,7 +83,7 @@
     </media>
 
     <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/i386/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>16</version>
@@ -91,7 +91,7 @@
       </treeinfo>
     </tree>
     <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/x86_64/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>16</version>
diff --git a/data/os/fedoraproject.org/fedora-17.xml.in b/data/os/fedoraproject.org/fedora-17.xml.in
index fbf762f..b025b1c 100644
--- a/data/os/fedoraproject.org/fedora-17.xml.in
+++ b/data/os/fedoraproject.org/fedora-17.xml.in
@@ -81,7 +81,7 @@
     </media>
 
     <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/i386/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>17</version>
@@ -89,7 +89,7 @@
       </treeinfo>
     </tree>
     <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>17</version>
diff --git a/data/os/fedoraproject.org/fedora-18.xml.in b/data/os/fedoraproject.org/fedora-18.xml.in
index 00791fb..47cd66c 100644
--- a/data/os/fedoraproject.org/fedora-18.xml.in
+++ b/data/os/fedoraproject.org/fedora-18.xml.in
@@ -34,7 +34,7 @@
 
     <!-- GNOME -->
     <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/i686/Fedora-18-i686-Live-Desktop.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/i386/Fedora-18-i686-Live-Desktop.iso</url>
       <iso>
         <volume-id>Fedora-18-i686-Live-Desktop</volume-id>
         <system-id>LINUX</system-id>
@@ -46,7 +46,7 @@
 
     <!-- KDE-->
     <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/i686/Fedora-18-i686-Live-KDE.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/i386/Fedora-18-i686-Live-KDE.iso</url>
       <iso>
         <volume-id>Fedora-18-i686-Live-KDE</volume-id>
         <system-id>LINUX</system-id>
@@ -81,7 +81,7 @@
     </media>
 
     <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/i386/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>18</version>
@@ -89,7 +89,7 @@
       </treeinfo>
     </tree>
     <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/x86_64/os/</url>
       <treeinfo>
 	<family>Fedora</family>
 	<version>18</version>
diff --git a/data/os/fedoraproject.org/fedora-19.xml.in b/data/os/fedoraproject.org/fedora-19.xml.in
index dd91179..bf56264 100644
--- a/data/os/fedoraproject.org/fedora-19.xml.in
+++ b/data/os/fedoraproject.org/fedora-19.xml.in
@@ -118,7 +118,7 @@
     </media>
 
     <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/19/Fedora/i386/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/i386/os/</url>
       <treeinfo>
         <family>Fedora</family>
         <version>19</version>
@@ -126,7 +126,7 @@
       </treeinfo>
     </tree>
     <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/19/Fedora/x86_64/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/x86_64/os/</url>
       <treeinfo>
         <family>Fedora</family>
         <version>19</version>
diff --git a/data/os/fedoraproject.org/fedora-20.xml.in b/data/os/fedoraproject.org/fedora-20.xml.in
index 380c9eb..4e931f4 100644
--- a/data/os/fedoraproject.org/fedora-20.xml.in
+++ b/data/os/fedoraproject.org/fedora-20.xml.in
@@ -12,7 +12,7 @@
 
     <!-- Installer DVD -->
     <media arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso</url>
       <iso>
         <volume-id>Fedora 20 i386</volume-id>
         <system-id>LINUX</system-id>
@@ -22,7 +22,7 @@
       <initrd>isolinux/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso</url>
       <iso>
         <volume-id>Fedora 20 x86_64</volume-id>
         <system-id>LINUX</system-id>
@@ -34,7 +34,7 @@
 
     <!-- Network Installer -->
     <media arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-netinst.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-netinst.iso</url>
       <iso>
         <volume-id>Fedora 20 i386</volume-id>
         <system-id>LINUX</system-id>
@@ -44,7 +44,7 @@
       <initrd>isolinux/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-netinst.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-netinst.iso</url>
       <iso>
         <volume-id>Fedora 20 x86_64</volume-id>
         <system-id>LINUX</system-id>
@@ -65,7 +65,7 @@
 
     <!-- GNOME -->
     <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-Live-Desktop-i686-20-1.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/i386/Fedora-Live-Desktop-i686-20-1.iso</url>
       <iso>
         <volume-id>Fedora-Live-Desktop-i686-20</volume-id>
         <system-id>LINUX</system-id>
@@ -75,7 +75,7 @@
       <initrd>isolinux/initrd0.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso</url>
       <iso>
         <volume-id>Fedora-Live-Desktop-x86_64-20</volume-id>
         <system-id>LINUX</system-id>
@@ -87,7 +87,7 @@
 
     <!-- KDE -->
     <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-Live-KDE-i686-20-1.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/i386/Fedora-Live-KDE-i686-20-1.iso</url>
       <iso>
         <volume-id>Fedora-Live-KDE-i686-20</volume-id>
         <system-id>LINUX</system-id>
@@ -97,7 +97,7 @@
       <initrd>isolinux/initrd0.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-KDE-x86_64-20-1.iso</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-Live-KDE-x86_64-20-1.iso</url>
       <iso>
         <volume-id>Fedora-Live-KDE-x86_64-20</volume-id>
         <system-id>LINUX</system-id>
@@ -108,7 +108,7 @@
     </media>
 
     <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Fedora/i386/os/</url>
       <treeinfo>
         <family>Fedora</family>
         <version>20</version>
@@ -116,7 +116,7 @@
       </treeinfo>
     </tree>
     <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/os/</url>
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/20/Fedora/x86_64/os/</url>
       <treeinfo>
         <family>Fedora</family>
         <version>20</version>
-- 
2.5.0



From cfergeau at redhat.com  Tue Nov 17 10:20:26 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:26 +0100
Subject: [Libosinfo] [PATCH 7/8] altlinux: Fix URLs to ALTLinux 7.0
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447755627-29857-8-git-send-email-cfergeau@redhat.com>

The ones currently used return a 404 error.
---
 data/os/altlinux.org/altlinux-7.0.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/os/altlinux.org/altlinux-7.0.xml.in b/data/os/altlinux.org/altlinux-7.0.xml.in
index 66fe1f4..37a75a2 100644
--- a/data/os/altlinux.org/altlinux-7.0.xml.in
+++ b/data/os/altlinux.org/altlinux-7.0.xml.in
@@ -12,7 +12,7 @@
     <release-date>2012-10-01</release-date>
 
     <media arch="i686">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-i586-ru-install-dvd5.iso</url>
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/images/centaurus/altlinux-7.0.5-centaurus-i586-ru-install-dvd5.iso</url>
       <iso>
         <volume-id>(ALT|Simply) Linux (6.9|7.0).\d</volume-id>
         <publisher-id>ALT Linux Team</publisher-id>
@@ -21,7 +21,7 @@
       <initrd>isolinux/alt0/full.cz</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-x86_64-ru-install-dvd5.iso</url>
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/images/centaurus/altlinux-7.0.5-centaurus-x86_64-ru-install-dvd5.iso</url>
       <iso>
         <volume-id>(ALT|Simply) Linux (6.9|7.0).\d</volume-id>
         <publisher-id>ALT Linux Team</publisher-id>
-- 
2.5.0



From cfergeau at redhat.com  Tue Nov 17 10:20:25 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:25 +0100
Subject: [Libosinfo] [PATCH 6/8] ubuntu: Fix URLs to ubuntu 15.10
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447755627-29857-7-git-send-email-cfergeau@redhat.com>

'vivid' was mistakenly used in the URL path leading to a 404 error.
15.10 is wily, vivid was 15.04.
---
 data/os/ubuntu.com/ubuntu-15.10.xml.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
index d6ec1b6..32dee03 100644
--- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
@@ -29,7 +29,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-i386.iso</url>
+      <url>http://releases.ubuntu.com/releases/wily/ubuntu-15.10-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id>
       </iso>
@@ -37,7 +37,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-amd64.iso</url>
+      <url>http://releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 15.10(.\d)? amd64</volume-id>
       </iso>
@@ -45,7 +45,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-i386.iso</url>
+      <url>http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 15.10(.\d)? i386</volume-id>
       </iso>
@@ -53,7 +53,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-amd64.iso</url>
+      <url>http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id>
       </iso>
-- 
2.5.0



From cfergeau at redhat.com  Tue Nov 17 10:20:24 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:24 +0100
Subject: [Libosinfo] [PATCH 5/8] ubuntu: Fix URLs to old ubuntu versions
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447755627-29857-6-git-send-email-cfergeau@redhat.com>

Once they are no longer supported, they move to old-releases.ubuntu.com.
---
 data/os/ubuntu.com/ubuntu-12.04.xml.in | 8 ++++----
 data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 ++++----
 data/os/ubuntu.com/ubuntu-14.10.xml.in | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in
index 78f688f..83a4501 100644
--- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
@@ -28,7 +28,7 @@
       </recommended>
     </resources>
     <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 12.04(.\d)? LTS i386</volume-id>
       </iso>
@@ -36,7 +36,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id>
       </iso>
@@ -44,7 +44,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 12.04(.\d)? LTS i386</volume-id>
       </iso>
@@ -52,7 +52,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id>
       </iso>
diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
index e49193a..d1fa114 100644
--- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
@@ -29,7 +29,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-i386.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 14.04(.\d)? LTS i386</volume-id>
       </iso>
@@ -37,7 +37,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 14.04(.\d)? LTS amd64</volume-id>
       </iso>
@@ -45,7 +45,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 14.04(.\d)? LTS i386</volume-id>
       </iso>
@@ -53,7 +53,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 14.04(.\d)? LTS amd64</volume-id>
       </iso>
diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in
index 833e192..8a72618 100644
--- a/data/os/ubuntu.com/ubuntu-14.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in
@@ -29,7 +29,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-i386.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 14.10(.\d)? i386</volume-id>
       </iso>
@@ -37,7 +37,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 14.10(.\d)? amd64</volume-id>
       </iso>
@@ -45,7 +45,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 14.10(.\d)? i386</volume-id>
       </iso>
@@ -53,7 +53,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 14.10(.\d)? amd64</volume-id>
       </iso>
-- 
2.5.0



From cfergeau at redhat.com  Tue Nov 17 10:20:27 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Tue, 17 Nov 2015 11:20:27 +0100
Subject: [Libosinfo] [PATCH 8/8] altlinux: Fix ALT Linux 7.0 detection
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447755627-29857-9-git-send-email-cfergeau@redhat.com>

Publisher ID should be all upper-case.
---
 data/os/altlinux.org/altlinux-7.0.xml.in           |  4 +--
 ...ux-7.0.2-centaurus-i586-ru-install-dvd5.iso.txt | 29 ++++++++++++++++++++++
 ...-7.0.5-centaurus-x86_64-ru-install-dvd5.iso.txt | 29 ++++++++++++++++++++++
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 test/isodata/altlinux/altlinux7.0/altlinux-7.0.2-centaurus-i586-ru-install-dvd5.iso.txt
 create mode 100644 test/isodata/altlinux/altlinux7.0/altlinux-7.0.5-centaurus-x86_64-ru-install-dvd5.iso.txt

diff --git a/data/os/altlinux.org/altlinux-7.0.xml.in b/data/os/altlinux.org/altlinux-7.0.xml.in
index 37a75a2..6bf3fd4 100644
--- a/data/os/altlinux.org/altlinux-7.0.xml.in
+++ b/data/os/altlinux.org/altlinux-7.0.xml.in
@@ -15,7 +15,7 @@
       <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/images/centaurus/altlinux-7.0.5-centaurus-i586-ru-install-dvd5.iso</url>
       <iso>
         <volume-id>(ALT|Simply) Linux (6.9|7.0).\d</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
+        <publisher-id>ALT LINUX TEAM</publisher-id>
       </iso>
       <kernel>isolinux/alt0/vmlinuz</kernel>
       <initrd>isolinux/alt0/full.cz</initrd>
@@ -24,7 +24,7 @@
       <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/images/centaurus/altlinux-7.0.5-centaurus-x86_64-ru-install-dvd5.iso</url>
       <iso>
         <volume-id>(ALT|Simply) Linux (6.9|7.0).\d</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
+        <publisher-id>ALT LINUX TEAM</publisher-id>
       </iso>
       <kernel>isolinux/alt0/vmlinuz</kernel>
       <initrd>isolinux/alt0/full.cz</initrd>
diff --git a/test/isodata/altlinux/altlinux7.0/altlinux-7.0.2-centaurus-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux7.0/altlinux-7.0.2-centaurus-i586-ru-install-dvd5.iso.txt
new file mode 100644
index 0000000..76ed7a1
--- /dev/null
+++ b/test/isodata/altlinux/altlinux7.0/altlinux-7.0.2-centaurus-i586-ru-install-dvd5.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: ALT Linux 7.0.2 Centaurus  (Ph
+Volume set id: 
+Publisher id: ALT LINUX TEAM
+Data preparer id: XORRISO-1.3.4 2013.12.12.103001, LIBISOBURN-1.3.4, LIBISOFS-1.3.4, LIBBURN-1.3.4
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1792296
+El Torito VD version 1 found, boot catalog is in sector 822
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 337 823
diff --git a/test/isodata/altlinux/altlinux7.0/altlinux-7.0.5-centaurus-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux7.0/altlinux-7.0.5-centaurus-x86_64-ru-install-dvd5.iso.txt
new file mode 100644
index 0000000..6d9b5ee
--- /dev/null
+++ b/test/isodata/altlinux/altlinux7.0/altlinux-7.0.5-centaurus-x86_64-ru-install-dvd5.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: ALT Linux 7.0.5 Centaurus  (Ph
+Volume set id: 
+Publisher id: ALT LINUX TEAM
+Data preparer id: XORRISO-1.3.4 2013.12.12.103001, LIBISOBURN-1.3.4, LIBISOFS-1.3.4, LIBBURN-1.3.4
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1592760
+El Torito VD version 1 found, boot catalog is in sector 938
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 526B 21099
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov 19 13:23:19 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 14:23:19 +0100
Subject: [Libosinfo] [PATCH 3/5] rhel: Add RHEL7 release dates
In-Reply-To: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447939401-24178-4-git-send-email-cfergeau@redhat.com>

---
 data/os/redhat.com/rhel-7.0.xml.in | 2 ++
 data/os/redhat.com/rhel-7.1.xml.in | 2 ++
 data/os/redhat.com/rhel-7.2.xml.in | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index beed8f4..0ed42f5 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -8,6 +8,8 @@
     <distro>rhel</distro>
     <upgrades id="http://redhat.com/rhel/6.5"/>
 
+    <release-date>2014-06-10</release-date>
+
     <devices>
       <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
       <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
diff --git a/data/os/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in
index 84d48d6..fd4c25d 100644
--- a/data/os/redhat.com/rhel-7.1.xml.in
+++ b/data/os/redhat.com/rhel-7.1.xml.in
@@ -9,6 +9,8 @@
     <upgrades id="http://redhat.com/rhel/7.0"/>
     <derives-from id="http://redhat.com/rhel/7.0"/>
 
+    <release-date>2015-03-05</release-date>
+
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index 2f8e95b..2a6fd12 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -9,6 +9,8 @@
     <upgrades id="http://redhat.com/rhel/7.1"/>
     <derives-from id="http://redhat.com/rhel/7.1"/>
 
+    <release-date>2015-11-19</release-date>
+
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov 19 13:23:16 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 14:23:16 +0100
Subject: [Libosinfo] [PATCH 0/5] rhel: Add RHEL 7.2/RHEL 6.7 data
Message-ID: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>

This series adds missing data for RHEL 6.7 and RHEL 7.2, and fixes/improves
some minor details in RHEL7 data.

Christophe



From cfergeau at redhat.com  Thu Nov 19 13:23:20 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 14:23:20 +0100
Subject: [Libosinfo] [PATCH 4/5] rhel: Add RHEL7 codename
In-Reply-To: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447939401-24178-5-git-send-email-cfergeau@redhat.com>

As documented on https://access.redhat.com/articles/3078?tour=7#RHEL7
---
 data/os/redhat.com/rhel-7.0.xml.in | 1 +
 data/os/redhat.com/rhel-7.1.xml.in | 1 +
 data/os/redhat.com/rhel-7.2.xml.in | 1 +
 3 files changed, 3 insertions(+)

diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index 0ed42f5..21045cd 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -6,6 +6,7 @@
     <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
+    <codename>Maipo</codename>
     <upgrades id="http://redhat.com/rhel/6.5"/>
 
     <release-date>2014-06-10</release-date>
diff --git a/data/os/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in
index fd4c25d..c5183ce 100644
--- a/data/os/redhat.com/rhel-7.1.xml.in
+++ b/data/os/redhat.com/rhel-7.1.xml.in
@@ -6,6 +6,7 @@
     <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
+    <codename>Maipo</codename>
     <upgrades id="http://redhat.com/rhel/7.0"/>
     <derives-from id="http://redhat.com/rhel/7.0"/>
 
diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index 2a6fd12..c7e8ea6 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -6,6 +6,7 @@
     <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
+    <codename>Maipo</codename>
     <upgrades id="http://redhat.com/rhel/7.1"/>
     <derives-from id="http://redhat.com/rhel/7.1"/>
 
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov 19 13:23:18 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 14:23:18 +0100
Subject: [Libosinfo] [PATCH 2/5] rhel: Remove i686 medias for RHEL7
In-Reply-To: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447939401-24178-3-git-send-email-cfergeau@redhat.com>

RHEL7 never had i686 ISOs released.
---
 data/os/redhat.com/rhel-7.0.xml.in | 8 --------
 data/os/redhat.com/rhel-7.1.xml.in | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index 78dd381..beed8f4 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -16,14 +16,6 @@
       <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
     </devices>
 
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL-7.0.*i386.*</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
diff --git a/data/os/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in
index 832fbd9..84d48d6 100644
--- a/data/os/redhat.com/rhel-7.1.xml.in
+++ b/data/os/redhat.com/rhel-7.1.xml.in
@@ -9,14 +9,6 @@
     <upgrades id="http://redhat.com/rhel/7.0"/>
     <derives-from id="http://redhat.com/rhel/7.0"/>
 
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL-7.1.*i386.*</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov 19 13:23:17 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 14:23:17 +0100
Subject: [Libosinfo] [PATCH 1/5] rhel: Add RHEL 7.2 data
In-Reply-To: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447939401-24178-2-git-send-email-cfergeau@redhat.com>

---
 data/os/redhat.com/rhel-7.2.xml.in                 | 84 ++++++++++++++++++++++
 po/POTFILES.in                                     |  1 +
 .../rhel-computenode-7.2-x86_64-dvd.iso.txt        | 29 ++++++++
 .../rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt    | 29 ++++++++
 .../rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt | 16 +++++
 .../rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt    | 16 +++++
 .../rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt | 16 +++++
 .../rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt     | 29 ++++++++
 8 files changed, 220 insertions(+)
 create mode 100644 data/os/redhat.com/rhel-7.2.xml.in
 create mode 100644 test/isodata/rhel/rhel7.2/rhel-computenode-7.2-x86_64-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt

diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
new file mode 100644
index 0000000..2f8e95b
--- /dev/null
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -0,0 +1,84 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/7.2">
+    <short-id>rhel7.2</short-id>
+    <_name>Red Hat Enterprise Linux 7.2</_name>
+    <version>7.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <upgrades id="http://redhat.com/rhel/7.1"/>
+    <derives-from id="http://redhat.com/rhel/7.1"/>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL-7.2.*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.2.*aarch64$</volume-id>
+       </iso>
+     </media>
+
+    <media arch="ppc64">
+       <iso>
+         <system-id>PPC</system-id>
+         <volume-id>RHEL-7.2.*ppc64$</volume-id>
+       </iso>
+     </media>
+
+    <media arch="ppc64">
+       <iso>
+         <system-id>PPC</system-id>
+         <volume-id>RHEL-7.2.*ppc64le$</volume-id>
+       </iso>
+     </media>
+
+    <media arch="s390x">
+       <iso>
+         <system-id>LINUX</system-id>
+         <volume-id>RHEL-7.2.*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/po/POTFILES.in b/po/POTFILES.in
index f5d40c8..8e170b0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -266,6 +266,7 @@ data/os/redhat.com/rhel-6.5.xml.in
 data/os/redhat.com/rhel-6.6.xml.in
 data/os/redhat.com/rhel-7.0.xml.in
 data/os/redhat.com/rhel-7.1.xml.in
+data/os/redhat.com/rhel-7.2.xml.in
 data/os/redhat.com/rhel-atomic-7.0.xml.in
 data/os/redhat.com/rhel-atomic-7.1.xml.in
 data/os/redhat.com/rhl-1.0.xml.in
diff --git a/test/isodata/rhel/rhel7.2/rhel-computenode-7.2-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel7.2/rhel-computenode-7.2-x86_64-dvd.iso.txt
new file mode 100644
index 0000000..7f0264f
--- /dev/null
+++ b/test/isodata/rhel/rhel7.2/rhel-computenode-7.2-x86_64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL-7.2 ComputeNode.x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1121326
+El Torito VD version 1 found, boot catalog is in sector 811
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 2D1D0 184784
diff --git a/test/isodata/rhel/rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt b/test/isodata/rhel/rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt
new file mode 100644
index 0000000..6edc805
--- /dev/null
+++ b/test/isodata/rhel/rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL-7.2 Server.aarch64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1520686
+El Torito VD version 1 found, boot catalog is in sector 942
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 239 (Unknown Arch)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 2A08
+        Bootoff 1F31D 127773
diff --git a/test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt b/test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt
new file mode 100644
index 0000000..116166e
--- /dev/null
+++ b/test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: PPC
+Volume id: RHEL-7.2 Server.ppc64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1658196
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt b/test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt
new file mode 100644
index 0000000..25f3b59
--- /dev/null
+++ b/test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: PPC
+Volume id: RHEL-7.2 Server.ppc64le
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1732389
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt b/test/isodata/rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt
new file mode 100644
index 0000000..df04143
--- /dev/null
+++ b/test/isodata/rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL-7.2 Server.s390x
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1378047
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/rhel/rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt
new file mode 100644
index 0000000..5fb3a67
--- /dev/null
+++ b/test/isodata/rhel/rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL-7.2 Server.x86_64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1973912
+El Torito VD version 1 found, boot catalog is in sector 1139
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 2D319 185113
-- 
2.5.0



From cfergeau at redhat.com  Thu Nov 19 13:23:21 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 14:23:21 +0100
Subject: [Libosinfo] [PATCH 5/5] rhel: Add RHEL 6.7 data
In-Reply-To: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1447939401-24178-6-git-send-email-cfergeau@redhat.com>

---
 data/os/redhat.com/rhel-6.7.xml.in                 | 50 ++++++++++++++++++++++
 po/POTFILES.in                                     |  1 +
 .../rhel/rhel6.7/rhel-server-6.7-i386-dvd.iso.txt  | 29 +++++++++++++
 .../rhel6.7/rhel-server-6.7-x86_64-dvd.iso.txt     | 29 +++++++++++++
 4 files changed, 109 insertions(+)
 create mode 100644 data/os/redhat.com/rhel-6.7.xml.in
 create mode 100644 test/isodata/rhel/rhel6.7/rhel-server-6.7-i386-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel6.7/rhel-server-6.7-x86_64-dvd.iso.txt

diff --git a/data/os/redhat.com/rhel-6.7.xml.in b/data/os/redhat.com/rhel-6.7.xml.in
new file mode 100644
index 0000000..6788d52
--- /dev/null
+++ b/data/os/redhat.com/rhel-6.7.xml.in
@@ -0,0 +1,50 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/6.7">
+    <short-id>rhel6.7</short-id>
+    <_name>Red Hat Enterprise Linux 6.7</_name>
+    <version>6.7</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.6"/>
+    <derives-from id="http://redhat.com/rhel/6.6"/>
+
+    <release-date>2015-07-22</release-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>RHEL-6.7 .*.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.7 .*.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/po/POTFILES.in b/po/POTFILES.in
index 8e170b0..3aa73ce 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -264,6 +264,7 @@ data/os/redhat.com/rhel-6.3.xml.in
 data/os/redhat.com/rhel-6.4.xml.in
 data/os/redhat.com/rhel-6.5.xml.in
 data/os/redhat.com/rhel-6.6.xml.in
+data/os/redhat.com/rhel-6.7.xml.in
 data/os/redhat.com/rhel-7.0.xml.in
 data/os/redhat.com/rhel-7.1.xml.in
 data/os/redhat.com/rhel-7.2.xml.in
diff --git a/test/isodata/rhel/rhel6.7/rhel-server-6.7-i386-dvd.iso.txt b/test/isodata/rhel/rhel6.7/rhel-server-6.7-i386-dvd.iso.txt
new file mode 100644
index 0000000..02fd300
--- /dev/null
+++ b/test/isodata/rhel/rhel6.7/rhel-server-6.7-i386-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL-6.7 Server.i386
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1579938
+El Torito VD version 1 found, boot catalog is in sector 852
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 18723 100131
diff --git a/test/isodata/rhel/rhel6.7/rhel-server-6.7-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel6.7/rhel-server-6.7-x86_64-dvd.iso.txt
new file mode 100644
index 0000000..88ff992
--- /dev/null
+++ b/test/isodata/rhel/rhel6.7/rhel-server-6.7-x86_64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL-6.7 Server.x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1875511
+El Torito VD version 1 found, boot catalog is in sector 995
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 1DBD0 121808
-- 
2.5.0



From zeeshanak at gnome.org  Thu Nov 19 14:12:33 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 09:12:33 -0500
Subject: [Libosinfo] [v3 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <20151116085749.GB1871@edamame.cdg.redhat.com>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
	<1447438735-14648-4-git-send-email-zeeshanak@gnome.org>
	<20151116085749.GB1871@edamame.cdg.redhat.com>
Message-ID: <CAAa3hFMpCrSYFXhSMR1nCVtFua5z4LEkFAGdx1JyMUbbRL65ng@mail.gmail.com>

On Mon, Nov 16, 2015 at 3:57 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> On Fri, Nov 13, 2015 at 01:18:53PM -0500, Zeeshan Ali (Khattak) wrote:
>> For desktop profile.
>> ---
>>  .../fedoraproject.org/fedora-kickstart-desktop.xml.in              | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> 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 be7a965..8ad2f05 100644
>> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
>> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
>> @@ -156,6 +156,13 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
>>  xorg-x11-drv-qxl
>>  spice-vdagent
>>
>> +<xsl:choose>
>> +  <xsl:when test="os/version &gt; 15">
>> +# Also Qemu agent
>> +qemu-guest-agent
>
> I don't think the comment is needed.

IMO it's as much needed as the comment above:

"# QXL driver and SPICE vdagent"


-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From cfergeau at redhat.com  Thu Nov 19 14:16:01 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 15:16:01 +0100
Subject: [Libosinfo] [v3 3/5] fedora,script: Install qemu-guest-agent
In-Reply-To: <CAAa3hFMpCrSYFXhSMR1nCVtFua5z4LEkFAGdx1JyMUbbRL65ng@mail.gmail.com>
References: <1447438735-14648-1-git-send-email-zeeshanak@gnome.org>
	<1447438735-14648-4-git-send-email-zeeshanak@gnome.org>
	<20151116085749.GB1871@edamame.cdg.redhat.com>
	<CAAa3hFMpCrSYFXhSMR1nCVtFua5z4LEkFAGdx1JyMUbbRL65ng@mail.gmail.com>
Message-ID: <20151119141601.GG14199@edamame.cdg.redhat.com>

On Thu, Nov 19, 2015 at 09:12:33AM -0500, Zeeshan Ali (Khattak) wrote:
> On Mon, Nov 16, 2015 at 3:57 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> > On Fri, Nov 13, 2015 at 01:18:53PM -0500, Zeeshan Ali (Khattak) wrote:
> >> For desktop profile.
> >> ---
> >>  .../fedoraproject.org/fedora-kickstart-desktop.xml.in              | 7 +++++++
> >>  1 file changed, 7 insertions(+)
> >>
> >> 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 be7a965..8ad2f05 100644
> >> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> >> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> >> @@ -156,6 +156,13 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
> >>  xorg-x11-drv-qxl
> >>  spice-vdagent
> >>
> >> +<xsl:choose>
> >> +  <xsl:when test="os/version &gt; 15">
> >> +# Also Qemu agent
> >> +qemu-guest-agent
> >
> > I don't think the comment is needed.
> 
> IMO it's as much needed as the comment above:
> 
> "# QXL driver and SPICE vdagent"

I know there is a not really useful comment above it, but I don't think
that's a good reason for the addition of a new one.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151119/032b9f68/attachment.sig>

From zeeshanak at gnome.org  Thu Nov 19 14:34:40 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 09:34:40 -0500
Subject: [Libosinfo] [PATCH 2/8] debian: Fix Debian 6.0.10 detection
In-Reply-To: <1447755627-29857-3-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-3-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFNqQtJr_Do3ar1QjOKaT4RTvw=KLZ=W1ZXEYN0thP78bA@mail.gmail.com>

On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> The current regex for Debian only expects a single digit as the micro
> version number, but Debian 6 goes up to 10.

The new regex will fail on 20. Can we be reasonably certain there
won't be a .20 release?


-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From cfergeau at redhat.com  Thu Nov 19 14:52:14 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 15:52:14 +0100
Subject: [Libosinfo] [PATCH 2/8] debian: Fix Debian 6.0.10 detection
In-Reply-To: <CAAa3hFNqQtJr_Do3ar1QjOKaT4RTvw=KLZ=W1ZXEYN0thP78bA@mail.gmail.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-3-git-send-email-cfergeau@redhat.com>
	<CAAa3hFNqQtJr_Do3ar1QjOKaT4RTvw=KLZ=W1ZXEYN0thP78bA@mail.gmail.com>
Message-ID: <20151119145214.GH14199@edamame.cdg.redhat.com>

On Thu, Nov 19, 2015 at 09:34:40AM -0500, Zeeshan Ali (Khattak) wrote:
> On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> > The current regex for Debian only expects a single digit as the micro
> > version number, but Debian 6 goes up to 10.
> 
> The new regex will fail on 20. Can we be reasonably certain there
> won't be a .20 release?

Yes we can. Debian 6 will be fully EOL'ed early next year, and
https://www.debian.org/News/2014/20140719.en.html
? The Debian project is pleased to announce the tenth and final update
of its oldstable distribution Debian 6.0 (codename "squeeze"). ?

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151119/dd6b0236/attachment.sig>

From zeeshanak at gnome.org  Thu Nov 19 16:00:40 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 11:00:40 -0500
Subject: [Libosinfo] [PATCH 2/8] debian: Fix Debian 6.0.10 detection
In-Reply-To: <20151119145214.GH14199@edamame.cdg.redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-3-git-send-email-cfergeau@redhat.com>
	<CAAa3hFNqQtJr_Do3ar1QjOKaT4RTvw=KLZ=W1ZXEYN0thP78bA@mail.gmail.com>
	<20151119145214.GH14199@edamame.cdg.redhat.com>
Message-ID: <CAAa3hFNFq+PaKfjpCRnNg++bxBDWZcUUywA0=3dEiasH9RV=_A@mail.gmail.com>

On Thu, Nov 19, 2015 at 9:52 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> On Thu, Nov 19, 2015 at 09:34:40AM -0500, Zeeshan Ali (Khattak) wrote:
>> On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
>> > The current regex for Debian only expects a single digit as the micro
>> > version number, but Debian 6 goes up to 10.
>>
>> The new regex will fail on 20. Can we be reasonably certain there
>> won't be a .20 release?
>
> Yes we can. Debian 6 will be fully EOL'ed early next year, and
> https://www.debian.org/News/2014/20140719.en.html
> ? The Debian project is pleased to announce the tenth and final update
> of its oldstable distribution Debian 6.0 (codename "squeeze"). ?

Ok. thanks. ACK then.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From fabiano at fidencio.org  Thu Nov 19 16:08:05 2015
From: fabiano at fidencio.org (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 19 Nov 2015 17:08:05 +0100
Subject: [Libosinfo] [PATCH 0/5] rhel: Add RHEL 7.2/RHEL 6.7 data
In-Reply-To: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
Message-ID: <CAK9pz9+5nUNdv32pbPBn13v-E2Ti6P92=YUzatWzX5rdYiaG1Q@mail.gmail.com>

On Thu, Nov 19, 2015 at 2:23 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> This series adds missing data for RHEL 6.7 and RHEL 7.2, and fixes/improves
> some minor details in RHEL7 data.
>
> Christophe
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo

Series look good, ACK!

-- 
Fabiano Fid?ncio



From zeeshanak at gnome.org  Thu Nov 19 16:31:20 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 11:31:20 -0500
Subject: [Libosinfo] [PATCH 6/8] ubuntu: Fix URLs to ubuntu 15.10
In-Reply-To: <1447755627-29857-7-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-7-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFP8KJM9N0+ngMqxCXMQf2Fm68K5+_qHnKXBu1oczVcG-Q@mail.gmail.com>

On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> 'vivid' was mistakenly used in the URL path leading to a 404 error.
> 15.10 is wily, vivid was 15.04.

ack


-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 16:34:38 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 11:34:38 -0500
Subject: [Libosinfo] [PATCH 1/8] configure: bump libsoup version to 2.42
In-Reply-To: <1447755627-29857-2-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-2-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFMnc+7OYk_fJjTWrv0L3Ryj8vELbstovOhqmiueHrSp3Q@mail.gmail.com>

On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> Bumping libsoup version we are fixing a few deprecated warnings in our tests

"By bumping required libsoup version,"

ACK otherwise.


-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 16:37:02 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 11:37:02 -0500
Subject: [Libosinfo] [PATCH 4/8] fedora: Fix URLs to old fedora versions
In-Reply-To: <1447755627-29857-5-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-5-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFMwGuXjE+UxEpe6qkE9-pYyfJBaMoe6oKG9Fqv9psfRLQ@mail.gmail.com>

On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> Once a fedora version becomes unsupported, its ISOs are moved from
> download.fedoraproject.org to archive.fedoraproject.org

I noticed that too recently. Would be nice if they still kept old
links on download.fedoraproject as redirections.

ACK.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 16:41:15 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 11:41:15 -0500
Subject: [Libosinfo] [PATCH 8/8] altlinux: Fix ALT Linux 7.0 detection
In-Reply-To: <1447755627-29857-9-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-9-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFN=8rMNZ2oSij-fej77_TRmC8kuEEFh2Vp5Ge7qPRSpyg@mail.gmail.com>

On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> Publisher ID should be all upper-case.
> ---

ACK.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 17:02:20 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 12:02:20 -0500
Subject: [Libosinfo] [PATCH 3/8] debian: Update URLs to latest minor
	releases
In-Reply-To: <1447755627-29857-4-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-4-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFNXheMcF1dHc46aMURr93VRr1O3JFCb4mrtWXtyZD9OCA@mail.gmail.com>

On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> During the lifetime of a major release, there are regular minor releases
> of updated isos. Availability of ISOs for older minor releases seem not
> to be guaranteed, leading to failures in test-mediauris (with
> LIBOSINFO_NETWORK_TESTS set in the environment). This commit updates
> debian 6/7/8 URLs to the latest minor update.
> ---

ack


-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 17:06:21 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 12:06:21 -0500
Subject: [Libosinfo] [PATCH 5/8] ubuntu: Fix URLs to old ubuntu versions
In-Reply-To: <1447755627-29857-6-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-6-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFPMNf93sD4uJPW5FWxRvm+ccV9hi5FMCEzEyfrzbptpoQ@mail.gmail.com>

On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> Once they are no longer supported, they move to old-releases.ubuntu.com.
> ---

ACK. AFAIK Ubuntu releases are supported a lot longer than Fedora so
this is not to bad.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 17:09:21 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 12:09:21 -0500
Subject: [Libosinfo] [PATCH 7/8] altlinux: Fix URLs to ALTLinux 7.0
In-Reply-To: <1447755627-29857-8-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
	<1447755627-29857-8-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFO24-rFm_HJxo2G06+U6Z_N3YCyxxiepfmfqRe++6C19Q@mail.gmail.com>

On Tue, Nov 17, 2015 at 5:20 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> The ones currently used return a 404 error.
> ---

ack


-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 17:10:38 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 12:10:38 -0500
Subject: [Libosinfo] [PATCH 3/5] rhel: Add RHEL7 release dates
In-Reply-To: <1447939401-24178-4-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
	<1447939401-24178-4-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFOGO1yO5nO8Z7BVrY39WhehfDXUZmFR4XpcDpjU_AXzVA@mail.gmail.com>

On Thu, Nov 19, 2015 at 8:23 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> ---

ACK

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 17:11:16 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 12:11:16 -0500
Subject: [Libosinfo] [PATCH 2/5] rhel: Remove i686 medias for RHEL7
In-Reply-To: <1447939401-24178-3-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
	<1447939401-24178-3-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFNL4SLOVYbtAMuoeG6jxJyrgqM1o_QuU3B04rqiA2Nq8A@mail.gmail.com>

On Thu, Nov 19, 2015 at 8:23 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> RHEL7 never had i686 ISOs released.
> ---

Good catch! ACK.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 17:12:19 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 12:12:19 -0500
Subject: [Libosinfo] [PATCH 4/5] rhel: Add RHEL7 codename
In-Reply-To: <1447939401-24178-5-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
	<1447939401-24178-5-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFMupUshr9Hf0R==bBtU9cjFkC1cfU+PvKxXWaahF86rrQ@mail.gmail.com>

On Thu, Nov 19, 2015 at 8:23 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> As documented on https://access.redhat.com/articles/3078?tour=7#RHEL7
> ---

ACK.


-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 17:17:49 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 12:17:49 -0500
Subject: [Libosinfo] [PATCH 1/5] rhel: Add RHEL 7.2 data
In-Reply-To: <1447939401-24178-2-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
	<1447939401-24178-2-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFP-1Msh-eTMiMgiFYCb19UpU6ZtGk3cPB_6phmku_GC8Q@mail.gmail.com>

On Thu, Nov 19, 2015 at 8:23 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> ---
>  data/os/redhat.com/rhel-7.2.xml.in                 | 84 ++++++++++++++++++++++
>  po/POTFILES.in                                     |  1 +
>  .../rhel-computenode-7.2-x86_64-dvd.iso.txt        | 29 ++++++++
>  .../rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt    | 29 ++++++++
>  .../rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt | 16 +++++
>  .../rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt    | 16 +++++
>  .../rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt | 16 +++++
>  .../rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt     | 29 ++++++++
>  8 files changed, 220 insertions(+)
>  create mode 100644 data/os/redhat.com/rhel-7.2.xml.in
>  create mode 100644 test/isodata/rhel/rhel7.2/rhel-computenode-7.2-x86_64-dvd.iso.txt
>  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt
>  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt
>  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt
>  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt
>  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt
>
> diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
> new file mode 100644
> index 0000000..2f8e95b
> --- /dev/null
> +++ b/data/os/redhat.com/rhel-7.2.xml.in
> @@ -0,0 +1,84 @@
> +<libosinfo version="0.0.1">
> +  <os id="http://redhat.com/rhel/7.2">
> +    <short-id>rhel7.2</short-id>
> +    <_name>Red Hat Enterprise Linux 7.2</_name>
> +    <version>7.2</version>
> +    <_vendor>Red Hat, Inc</_vendor>
> +    <family>linux</family>
> +    <distro>rhel</distro>
> +    <upgrades id="http://redhat.com/rhel/7.1"/>
> +    <derives-from id="http://redhat.com/rhel/7.1"/>
> +
> +    <media arch="x86_64">
> +      <iso>
> +        <system-id>LINUX</system-id>
> +        <volume-id>.*RHEL-7.2.*x86_64$</volume-id>

The '.*' at the beginning and '$' is redundant since we don't expect
an exact match. The '$' also make is a bit too specific than needed.

Looks good otherwise.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Thu Nov 19 17:20:03 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 12:20:03 -0500
Subject: [Libosinfo] [PATCH 5/5] rhel: Add RHEL 6.7 data
In-Reply-To: <1447939401-24178-6-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
	<1447939401-24178-6-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFNXc+ceursb3n7D9FF96Nqg27NOhygN+qdkg2w5yWuKfQ@mail.gmail.com>

On Thu, Nov 19, 2015 at 8:23 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> ---

ACK.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From cfergeau at redhat.com  Thu Nov 19 18:48:12 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 19 Nov 2015 19:48:12 +0100
Subject: [Libosinfo] [PATCH 1/5] rhel: Add RHEL 7.2 data
In-Reply-To: <CAAa3hFP-1Msh-eTMiMgiFYCb19UpU6ZtGk3cPB_6phmku_GC8Q@mail.gmail.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
	<1447939401-24178-2-git-send-email-cfergeau@redhat.com>
	<CAAa3hFP-1Msh-eTMiMgiFYCb19UpU6ZtGk3cPB_6phmku_GC8Q@mail.gmail.com>
Message-ID: <20151119184812.GS14199@edamame.cdg.redhat.com>

On Thu, Nov 19, 2015 at 12:17:49PM -0500, Zeeshan Ali (Khattak) wrote:
> On Thu, Nov 19, 2015 at 8:23 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> > ---
> >  data/os/redhat.com/rhel-7.2.xml.in                 | 84 ++++++++++++++++++++++
> >  po/POTFILES.in                                     |  1 +
> >  .../rhel-computenode-7.2-x86_64-dvd.iso.txt        | 29 ++++++++
> >  .../rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt    | 29 ++++++++
> >  .../rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt | 16 +++++
> >  .../rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt    | 16 +++++
> >  .../rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt | 16 +++++
> >  .../rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt     | 29 ++++++++
> >  8 files changed, 220 insertions(+)
> >  create mode 100644 data/os/redhat.com/rhel-7.2.xml.in
> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-computenode-7.2-x86_64-dvd.iso.txt
> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt
> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt
> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt
> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt
> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt
> >
> > diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
> > new file mode 100644
> > index 0000000..2f8e95b
> > --- /dev/null
> > +++ b/data/os/redhat.com/rhel-7.2.xml.in
> > @@ -0,0 +1,84 @@
> > +<libosinfo version="0.0.1">
> > +  <os id="http://redhat.com/rhel/7.2">
> > +    <short-id>rhel7.2</short-id>
> > +    <_name>Red Hat Enterprise Linux 7.2</_name>
> > +    <version>7.2</version>
> > +    <_vendor>Red Hat, Inc</_vendor>
> > +    <family>linux</family>
> > +    <distro>rhel</distro>
> > +    <upgrades id="http://redhat.com/rhel/7.1"/>
> > +    <derives-from id="http://redhat.com/rhel/7.1"/>
> > +
> > +    <media arch="x86_64">
> > +      <iso>
> > +        <system-id>LINUX</system-id>
> > +        <volume-id>.*RHEL-7.2.*x86_64$</volume-id>
> 
> The '.*' at the beginning and '$' is redundant since we don't expect
> an exact match. The '$' also make is a bit too specific than needed.

The .* is present in all volume-ids in data/os/redhat.com/rhel* (at
least the ones I checked), better to send a patch to remove that from
everywhere if needed imo.
The $ is needed to differentiate between ppc64 and ppc64le (otherwise
the ppc64 volume-id would match the ppc64le one). I added it to all
volume-ids in this file for consistency (and imo clearly marking the
expected end of the volume-id is not being too specific).

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151119/5e50add9/attachment.sig>

From zeeshanak at gnome.org  Thu Nov 19 19:11:42 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 19 Nov 2015 14:11:42 -0500
Subject: [Libosinfo] [PATCH 1/5] rhel: Add RHEL 7.2 data
In-Reply-To: <20151119184812.GS14199@edamame.cdg.redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
	<1447939401-24178-2-git-send-email-cfergeau@redhat.com>
	<CAAa3hFP-1Msh-eTMiMgiFYCb19UpU6ZtGk3cPB_6phmku_GC8Q@mail.gmail.com>
	<20151119184812.GS14199@edamame.cdg.redhat.com>
Message-ID: <CAAa3hFMjwpf=ks2a+zMbsDPWDQ9YWz8Rz6SJCoosSNtYd4c14w@mail.gmail.com>

On Thu, Nov 19, 2015 at 1:48 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> On Thu, Nov 19, 2015 at 12:17:49PM -0500, Zeeshan Ali (Khattak) wrote:
>> On Thu, Nov 19, 2015 at 8:23 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
>> > ---
>> >  data/os/redhat.com/rhel-7.2.xml.in                 | 84 ++++++++++++++++++++++
>> >  po/POTFILES.in                                     |  1 +
>> >  .../rhel-computenode-7.2-x86_64-dvd.iso.txt        | 29 ++++++++
>> >  .../rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt    | 29 ++++++++
>> >  .../rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt | 16 +++++
>> >  .../rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt    | 16 +++++
>> >  .../rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt | 16 +++++
>> >  .../rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt     | 29 ++++++++
>> >  8 files changed, 220 insertions(+)
>> >  create mode 100644 data/os/redhat.com/rhel-7.2.xml.in
>> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-computenode-7.2-x86_64-dvd.iso.txt
>> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-aarch64-dvd.iso.txt
>> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64-dvd.iso.txt
>> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-ppc64le-dvd.iso.txt
>> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-s390x-dvd.iso.txt
>> >  create mode 100644 test/isodata/rhel/rhel7.2/rhel-server-7.2-x86_64-dvd.iso.txt
>> >
>> > diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
>> > new file mode 100644
>> > index 0000000..2f8e95b
>> > --- /dev/null
>> > +++ b/data/os/redhat.com/rhel-7.2.xml.in
>> > @@ -0,0 +1,84 @@
>> > +<libosinfo version="0.0.1">
>> > +  <os id="http://redhat.com/rhel/7.2">
>> > +    <short-id>rhel7.2</short-id>
>> > +    <_name>Red Hat Enterprise Linux 7.2</_name>
>> > +    <version>7.2</version>
>> > +    <_vendor>Red Hat, Inc</_vendor>
>> > +    <family>linux</family>
>> > +    <distro>rhel</distro>
>> > +    <upgrades id="http://redhat.com/rhel/7.1"/>
>> > +    <derives-from id="http://redhat.com/rhel/7.1"/>
>> > +
>> > +    <media arch="x86_64">
>> > +      <iso>
>> > +        <system-id>LINUX</system-id>
>> > +        <volume-id>.*RHEL-7.2.*x86_64$</volume-id>
>>
>> The '.*' at the beginning and '$' is redundant since we don't expect
>> an exact match. The '$' also make is a bit too specific than needed.
>
> The .* is present in all volume-ids in data/os/redhat.com/rhel* (at
> least the ones I checked), better to send a patch to remove that from
> everywhere if needed imo.
> The $ is needed to differentiate between ppc64 and ppc64le (otherwise
> the ppc64 volume-id would match the ppc64le one). I added it to all
> volume-ids in this file for consistency (and imo clearly marking the
> expected end of the volume-id is not being too specific).

Ah ok. Thanks for explaining. ACK then.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From cfergeau at redhat.com  Fri Nov 20 09:14:50 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 20 Nov 2015 10:14:50 +0100
Subject: [Libosinfo] [PATCH 0/5] rhel: Add RHEL 7.2/RHEL 6.7 data
In-Reply-To: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
References: <1447939401-24178-1-git-send-email-cfergeau@redhat.com>
Message-ID: <20151120091450.GT14199@edamame.cdg.redhat.com>

On Thu, Nov 19, 2015 at 02:23:16PM +0100, Christophe Fergeau wrote:
> This series adds missing data for RHEL 6.7 and RHEL 7.2, and fixes/improves
> some minor details in RHEL7 data.

I pushed this series.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151120/f76f0977/attachment.sig>

From cfergeau at redhat.com  Fri Nov 20 09:15:24 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 20 Nov 2015 10:15:24 +0100
Subject: [Libosinfo] [PATCH 0/8] Remove use of deprecated libsoup
 methods/#define
In-Reply-To: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
References: <1447755627-29857-1-git-send-email-cfergeau@redhat.com>
Message-ID: <20151120091524.GU14199@edamame.cdg.redhat.com>

On Tue, Nov 17, 2015 at 11:20:19AM +0100, Christophe Fergeau wrote:
> I originally wanted to revisit
> https://www.redhat.com/archives/libosinfo/2013-March/msg00091.html
> as 18 months have passed since that thread. I rebased/reworked the initial
> patch, and while testing it (export IBOSINFO_NETWORK_TESTS=1; make check),
> I fixed some issues with debian/ubuntu/fedora/altlinux data.

I pushed this with the small commit log change Zeeshan suggested

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20151120/406c8522/attachment.sig>