community/osinfo-db: add alpine 3.9 and 3.10 releases

4 files changed, 293 insertions, 79 deletions

diff --git a/community/osinfo-db/0001-Add-alpine-linux-3.5-and-3.6.patch b/community/osinfo-db/0001-Add-alpine-linux-3.5-and-3.6.patch
deleted file mode 100644
index df71edd67f..0000000000
--- a/community/osinfo-db/0001-Add-alpine-linux-3.5-and-3.6.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 823ec57aa1865b1e021f75ab685066ae726d826d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 13 Jun 2017 12:14:46 +0200
-Subject: [PATCH] Add alpine linux 3.5 and 3.6
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- data/os/alpinelinux.org/alpinelinux-3.5.xml.in | 23 +++++++++++++++++++++++
- data/os/alpinelinux.org/alpinelinux-3.6.xml.in | 25 +++++++++++++++++++++++++
- 2 files changed, 48 insertions(+)
- create mode 100644 data/os/alpinelinux.org/alpinelinux-3.5.xml.in
- create mode 100644 data/os/alpinelinux.org/alpinelinux-3.6.xml.in
-
-diff --git a/data/os/alpinelinux.org/alpinelinux-3.5.xml.in b/data/os/alpinelinux.org/alpinelinux-3.5.xml.in
-new file mode 100644
-index 0000000..5775396
---- /dev/null
-+++ b/data/os/alpinelinux.org/alpinelinux-3.5.xml.in
-@@ -0,0 +1,23 @@
-+<libosinfo version="0.0.1">
-+<!-- Licensed under the GNU General Public License version 2 or later.
-+     See http://www.gnu.org/licenses/ for a copy of the license text -->
-+  <os id="http://alpinelinux.org/alpinelinux/3.5">
-+    <short-id>alpinelinux3.5</short-id>
-+    <_name>Alpine Linux 3.5</_name>
-+    <version>3.5</version>
-+    <_vendor>Alpine Linux Project</_vendor>
-+    <family>linux</family>
-+    <distro>alpinelinux</distro>
-+
-+    <media arch="i686">
-+      <iso>
-+        <volume-id>alpine-.* 3.5.\d x86.*</volume-id>
-+      </iso>
-+    </media>
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>alpine-.* 3.5.\d x86_64.*</volume-id>
-+      </iso>
-+    </media>
-+  </os>
-+</libosinfo>
-diff --git a/data/os/alpinelinux.org/alpinelinux-3.6.xml.in b/data/os/alpinelinux.org/alpinelinux-3.6.xml.in
-new file mode 100644
-index 0000000..fb1856f
---- /dev/null
-+++ b/data/os/alpinelinux.org/alpinelinux-3.6.xml.in
-@@ -0,0 +1,25 @@
-+<libosinfo version="0.0.1">
-+<!-- Licensed under the GNU General Public License version 2 or later.
-+     See http://www.gnu.org/licenses/ for a copy of the license text -->
-+  <os id="http://alpinelinux.org/alpinelinux/3.6">
-+    <short-id>alpinelinux3.6</short-id>
-+    <_name>Alpine Linux 3.6</_name>
-+    <version>3.6</version>
-+    <_vendor>Alpine Linux Project</_vendor>
-+    <family>linux</family>
-+    <distro>alpinelinux</distro>
-+    <upgrades id="http://alpinelinux.org/alpinelinux/3.5"/>
-+    <derives-from id="http://alpinelinux.org/alpinelinux/3.5"/>
-+
-+    <media arch="i686">
-+      <iso>
-+        <volume-id>alpine-.* 3.6.\d x86.*</volume-id>
-+      </iso>
-+    </media>
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>alpine-.* 3.6.\d x86_64.*</volume-id>
-+      </iso>
-+    </media>
-+  </os>
-+</libosinfo>
--- 
-2.13.0
-
diff --git a/community/osinfo-db/0001-alpine-add-3.9.patch b/community/osinfo-db/0001-alpine-add-3.9.patch
new file mode 100644
index 0000000000..44819231a8
--- /dev/null
+++ b/community/osinfo-db/0001-alpine-add-3.9.patch
@@ -0,0 +1,142 @@
+From 5da11e099004bc6680b8e038f152a79a4979d49c Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 3 Jun 2019 17:57:18 +0200
+Subject: [PATCH 1/2] alpine: add 3.9
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ .../os/alpinelinux.org/alpinelinux-3.9.xml.in | 122 ++++++++++++++++++
+ 1 file changed, 122 insertions(+)
+ create mode 100644 data/os/alpinelinux.org/alpinelinux-3.9.xml.in
+
+diff --git a/data/os/alpinelinux.org/alpinelinux-3.9.xml.in b/data/os/alpinelinux.org/alpinelinux-3.9.xml.in
+new file mode 100644
+index 0000000..c08591e
+--- /dev/null
++++ b/data/os/alpinelinux.org/alpinelinux-3.9.xml.in
+@@ -0,0 +1,122 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++<!-- Licensed under the GNU General Public License version 2 or later.
++     See http://www.gnu.org/licenses/ for a copy of the license text -->
++  <os id="http://alpinelinux.org/alpinelinux/3.9">
++    <short-id>alpinelinux3.9</short-id>
++    <_name>Alpine Linux 3.9</_name>
++    <version>3.9</version>
++    <_vendor>Alpine Linux Project</_vendor>
++    <family>linux</family>
++    <distro>alpinelinux</distro>
++    <upgrades id="http://alpinelinux.org/alpinelinux/3.8"/>
++    <derives-from id="http://alpinelinux.org/alpinelinux/3.8"/>
++
++    <release-date>2019-01-29</release-date>
++    <eol-date>2020-05-01</eol-date>
++
++    <devices>
++      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
++      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
++      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
++      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
++      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
++      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
++      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
++      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
++      <device id="http://qemu.org/chipset/x86/q35"/> <!-- qemu-x86-q35 -->
++      <device id="http://pcisig.com/pci/8086/10d3"/> <!-- e1000e -->
++      <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda -->
++    </devices>
++
++    <resources arch="all">
++      <minimum>
++        <cpu>1000000000</cpu>
++        <n-cpus>1</n-cpus>
++        <ram>134217728</ram>
++        <storage>1073741824</storage>
++      </minimum>
++      <recommended>
++        <cpu>1000000000</cpu>
++        <n-cpus>1</n-cpus>
++        <ram>805306368</ram>
++        <storage>4294967296</storage>
++      </recommended>
++    </resources>
++
++    <variant id="standard">
++      <_name>Alpinelinux 3.9 Standard</_name>
++    </variant>
++    <variant id="extended">
++      <_name>Alpinelinux 3.9 Extended</_name>
++    </variant>
++    <variant id="virtual">
++      <_name>Alpinelinux 3.9 Virtual</_name>
++    </variant>
++    <variant id="xen">
++      <_name>Alpinelinux 3.9 Xen</_name>
++    </variant>
++
++    <!-- Standard Installer !-->
++    <media arch="i686">
++      <variant id="standard"/>
++      <iso>
++        <volume-id>alpine-std 3.9.\d x86$</volume-id>
++      </iso>
++    </media>
++    <media arch="x86_64">
++      <variant id="standard"/>
++      <iso>
++        <volume-id>alpine-std 3.9.\d x86_64$</volume-id>
++      </iso>
++    </media>
++    <media arch="ppc64le">
++      <variant id="standard"/>
++      <iso>
++        <volume-id>alpine-std 3.9.\d ppc64le$</volume-id>
++      </iso>
++    </media>
++    <media arch="s390x">
++      <variant id="standard"/>
++      <iso>
++        <volume-id>alpine-std 3.9.\d s390x$</volume-id>
++      </iso>
++    </media>
++
++    <!-- Extended Installer !-->
++    <media arch="i686">
++      <variant id="extended"/>
++      <iso>
++        <volume-id>alpine-ext 3.9.\d x86$</volume-id>
++      </iso>
++    </media>
++    <media arch="x86_64">
++      <variant id="extended"/>
++      <iso>
++        <volume-id>alpine-ext 3.9.\d x86_64$</volume-id>
++      </iso>
++    </media>
++
++    <!-- Virtual Installer !-->
++    <media arch="i686">
++      <variant id="virtual"/>
++      <iso>
++        <volume-id>alpine-virt 3.9.\d x86$</volume-id>
++      </iso>
++    </media>
++    <media arch="x86_64">
++      <variant id="virtual"/>
++      <iso>
++        <volume-id>alpine-virt 3.9.\d x86_64$</volume-id>
++      </iso>
++    </media>
++
++    <!-- Xen Installer !-->
++    <media arch="x86_64">
++      <variant id="xen"/>
++      <iso>
++        <volume-id>alpine-xen 3.9.\d x86_64$</volume-id>
++      </iso>
++    </media>
++   </os>
++ </libosinfo>
+-- 
+2.21.0
+
diff --git a/community/osinfo-db/0002-alpine-add-3.10.patch b/community/osinfo-db/0002-alpine-add-3.10.patch
new file mode 100644
index 0000000000..0f6b2404e4
--- /dev/null
+++ b/community/osinfo-db/0002-alpine-add-3.10.patch
@@ -0,0 +1,142 @@
+From 0fccb4ef0412bdf7975b1f7839eb12dafd8f17a2 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 3 Jun 2019 17:59:01 +0200
+Subject: [PATCH 2/2] alpine: add 3.10
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ .../alpinelinux.org/alpinelinux-3.10.xml.in   | 122 ++++++++++++++++++
+ 1 file changed, 122 insertions(+)
+ create mode 100644 data/os/alpinelinux.org/alpinelinux-3.10.xml.in
+
+diff --git a/data/os/alpinelinux.org/alpinelinux-3.10.xml.in b/data/os/alpinelinux.org/alpinelinux-3.10.xml.in
+new file mode 100644
+index 0000000..bc35c91
+--- /dev/null
++++ b/data/os/alpinelinux.org/alpinelinux-3.10.xml.in
+@@ -0,0 +1,122 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++<!-- Licensed under the GNU General Public License version 2 or later.
++     See http://www.gnu.org/licenses/ for a copy of the license text -->
++  <os id="http://alpinelinux.org/alpinelinux/3.10">
++    <short-id>alpinelinux3.10</short-id>
++    <_name>Alpine Linux 3.10</_name>
++    <version>3.10</version>
++    <_vendor>Alpine Linux Project</_vendor>
++    <family>linux</family>
++    <distro>alpinelinux</distro>
++    <upgrades id="http://alpinelinux.org/alpinelinux/3.9"/>
++    <derives-from id="http://alpinelinux.org/alpinelinux/3.9"/>
++
++    <release-date>2019-05-31</release-date>
++    <eol-date>2021-05-01</eol-date>
++
++    <devices>
++      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
++      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
++      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
++      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
++      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
++      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
++      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
++      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
++      <device id="http://qemu.org/chipset/x86/q35"/> <!-- qemu-x86-q35 -->
++      <device id="http://pcisig.com/pci/8086/10d3"/> <!-- e1000e -->
++      <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda -->
++    </devices>
++
++    <resources arch="all">
++      <minimum>
++        <cpu>1000000000</cpu>
++        <n-cpus>1</n-cpus>
++        <ram>134217728</ram>
++        <storage>1073741824</storage>
++      </minimum>
++      <recommended>
++        <cpu>1000000000</cpu>
++        <n-cpus>1</n-cpus>
++        <ram>805306368</ram>
++        <storage>4294967296</storage>
++      </recommended>
++    </resources>
++
++    <variant id="standard">
++      <_name>Alpinelinux 3.10 Standard</_name>
++    </variant>
++    <variant id="extended">
++      <_name>Alpinelinux 3.10 Extended</_name>
++    </variant>
++    <variant id="virtual">
++      <_name>Alpinelinux 3.10 Virtual</_name>
++    </variant>
++    <variant id="xen">
++      <_name>Alpinelinux 3.10 Xen</_name>
++    </variant>
++
++    <!-- Standard Installer !-->
++    <media arch="i686">
++      <variant id="standard"/>
++      <iso>
++        <volume-id>alpine-std 3.10.\d x86$</volume-id>
++      </iso>
++    </media>
++    <media arch="x86_64">
++      <variant id="standard"/>
++      <iso>
++        <volume-id>alpine-std 3.10.\d x86_64$</volume-id>
++      </iso>
++    </media>
++    <media arch="ppc64le">
++      <variant id="standard"/>
++      <iso>
++        <volume-id>alpine-std 3.10.\d ppc64le$</volume-id>
++      </iso>
++    </media>
++    <media arch="s390x">
++      <variant id="standard"/>
++      <iso>
++        <volume-id>alpine-std 3.10.\d s390x$</volume-id>
++      </iso>
++    </media>
++
++    <!-- Extended Installer !-->
++    <media arch="i686">
++      <variant id="extended"/>
++      <iso>
++        <volume-id>alpine-ext 3.10.\d x86$</volume-id>
++      </iso>
++    </media>
++    <media arch="x86_64">
++      <variant id="extended"/>
++      <iso>
++        <volume-id>alpine-ext 3.10.\d x86_64$</volume-id>
++      </iso>
++    </media>
++
++    <!-- Virtual Installer !-->
++    <media arch="i686">
++      <variant id="virtual"/>
++      <iso>
++        <volume-id>alpine-virt 3.10.\d x86$</volume-id>
++      </iso>
++    </media>
++    <media arch="x86_64">
++      <variant id="virtual"/>
++      <iso>
++        <volume-id>alpine-virt 3.10.\d x86_64$</volume-id>
++      </iso>
++    </media>
++
++    <!-- Xen Installer !-->
++    <media arch="x86_64">
++      <variant id="xen"/>
++      <iso>
++        <volume-id>alpine-xen 3.10.\d x86_64$</volume-id>
++      </iso>
++    </media>
++   </os>
++ </libosinfo>
+-- 
+2.21.0
+
diff --git a/community/osinfo-db/APKBUILD b/community/osinfo-db/APKBUILD
index 899e7e11ce..23b58e3fb5 100644
--- a/community/osinfo-db/APKBUILD
+++ b/community/osinfo-db/APKBUILD
@@ -1,13 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=osinfo-db
 pkgver=20190504
-pkgrel=0
+pkgrel=1
 pkgdesc="osinfo database files"
 url="https://libosinfo.org/"
 arch="noarch"
 license="LGPL-2.0-or-later"
 makedepends="osinfo-db-tools"
-source="https://releases.pagure.org/libosinfo/osinfo-db-$pkgver.tar.xz"
+source="https://releases.pagure.org/libosinfo/osinfo-db-$pkgver.tar.xz
+	0001-alpine-add-3.9.patch
+	0002-alpine-add-3.10.patch
+	"
+
 
 check() {
 	osinfo-db-validate --dir "$builddir"
@@ -18,4 +22,6 @@ package() {
 		--dir /usr/share/osinfo "$srcdir"/osinfo-db-$pkgver.tar.xz
 }
 
-sha512sums="ec0be84de376e35239e074c696494981b26107881f544091b4064f6e215f77a97102db8adea632a2aa586aef0c7475892ac3b141f07ebb1bb94eb9e5059a5ca6  osinfo-db-20190504.tar.xz"
+sha512sums="ec0be84de376e35239e074c696494981b26107881f544091b4064f6e215f77a97102db8adea632a2aa586aef0c7475892ac3b141f07ebb1bb94eb9e5059a5ca6  osinfo-db-20190504.tar.xz
+6e44f4dc1ea83041cf38a2732e717a868ee356cc6a6349dfe34523c5e07d4eca60a50c91513dedc7c08ed06f92a29a85b568fa5142e189c10f8453ef251babf4  0001-alpine-add-3.9.patch
+f7a896fef70fe9eb1790629815d03f717daf4146813fd13b947067faeaa56e9953649ef00dcdba2cfc5303321b9a93842a93b11cd404a1842790e2df8d973338  0002-alpine-add-3.10.patch"