From 3b6e8716155f4eff6407f0e5581f3140b35976d5 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Tue, 10 Jan 2017 11:42:36 +0100 Subject: libraries/libosinfo: Updated for version 1.0.0. From this release it's splitted in three packages so osinfo-db-tools and osinfo-db become deps of this Signed-off-by: Matteo Bernardini --- libraries/libosinfo/Add-Slackware-metadata.patch | 647 ----------------------- libraries/libosinfo/add_slackware_data.patch | 468 ++++++++++++++++ libraries/libosinfo/libosinfo.SlackBuild | 7 +- libraries/libosinfo/libosinfo.info | 8 +- 4 files changed, 475 insertions(+), 655 deletions(-) delete mode 100644 libraries/libosinfo/Add-Slackware-metadata.patch create mode 100644 libraries/libosinfo/add_slackware_data.patch (limited to 'libraries/libosinfo') diff --git a/libraries/libosinfo/Add-Slackware-metadata.patch b/libraries/libosinfo/Add-Slackware-metadata.patch deleted file mode 100644 index 700c9166dc..0000000000 --- a/libraries/libosinfo/Add-Slackware-metadata.patch +++ /dev/null @@ -1,647 +0,0 @@ -From 58d5752ad609773136939b1a3d6b547d81c1ba65 Mon Sep 17 00:00:00 2001 -From: ponce -Date: Tue, 9 Sep 2014 11:54:49 +0200 -Subject: [PATCH] Add Slackware metadata - ---- - data/oses/Makefile.am | 1 + - data/oses/slackware.xml.in | 166 +++++++++++++++++++++ - po/POTFILES.in | 1 + - .../slackware-13.0-install-dvd.iso.txt | 33 ++++ - .../slackware64-13.0-install-dvd.iso.txt | 33 ++++ - .../slackware-13.1-install-dvd.iso.txt | 33 ++++ - .../slackware64-13.1-install-dvd.iso.txt | 33 ++++ - .../slackware-13.37-install-dvd.iso.txt | 33 ++++ - .../slackware64-13.37-install-dvd.iso.txt | 33 ++++ - .../slackware-14.0-install-dvd.iso.txt | 33 ++++ - .../slackware64-14.0-install-dvd.iso.txt | 33 ++++ - .../slackware-14.1-install-dvd.iso.txt | 33 ++++ - .../slackware64-14.1-install-dvd.iso.txt | 33 ++++ - test/test-isodetect.c | 7 + - 14 files changed, 505 insertions(+) - create mode 100644 data/oses/slackware.xml.in - create mode 100644 test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt - create mode 100644 test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt - -diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am -index e1fb6fb..35769e2 100644 ---- a/data/oses/Makefile.am -+++ b/data/oses/Makefile.am -@@ -18,6 +18,7 @@ database_in_files = \ - opensuse.xml.in \ - rhl.xml.in \ - rhel.xml.in \ -+ slackware.xml.in \ - solaris.xml.in \ - suse.xml.in \ - ubuntu.xml.in \ -diff --git a/data/oses/slackware.xml.in b/data/oses/slackware.xml.in -new file mode 100644 -index 0000000..645d390 ---- /dev/null -+++ b/data/oses/slackware.xml.in -@@ -0,0 +1,166 @@ -+ -+ -+ -+ slackware13.0 -+ <_name>Slackware 13.0 -+ 13.0 -+ <_vendor>Slackware -+ linux -+ slackware -+ 2009-08-26 -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.0-iso/slackware-13.0-install-dvd.iso -+ -+ SlackDVD -+ Slackware 13.0 DVD -+ -+ -+ kernels/hugesmp.s/bzImage -+ isolinux/initrd.img -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.0-iso/slackware64-13.0-install-dvd.iso -+ -+ SlackDVD -+ Slackware 13.0 DVD -+ -+ -+ kernels/huge.s/bzImage -+ isolinux/initrd.img -+ -+ -+ -+ -+ slackware13.1 -+ <_name>Slackware 13.1 -+ 13.1 -+ <_vendor>Slackware -+ linux -+ slackware -+ -+ -+ 2010-05-19 -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.1-iso/slackware-13.1-install-dvd.iso -+ -+ SlackDVD -+ Slackware 13.1 DVD -+ -+ -+ kernels/hugesmp.s/bzImage -+ isolinux/initrd.img -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.1-iso/slackware64-13.1-install-dvd.iso -+ -+ SlackDVD -+ Slackware 13.1 DVD -+ -+ -+ kernels/huge.s/bzImage -+ isolinux/initrd.img -+ -+ -+ -+ -+ slackware13.37 -+ <_name>Slackware 13.37 -+ 13.37 -+ <_vendor>Slackware -+ linux -+ slackware -+ -+ -+ 2011-04-25 -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.37-iso/slackware-13.37-install-dvd.iso -+ -+ SlackDVD -+ Slackware 13.37 DVD -+ -+ -+ kernels/hugesmp.s/bzImage -+ isolinux/initrd.img -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.37-iso/slackware64-13.37-install-dvd.iso -+ -+ SlackDVD -+ Slackware 13.37 DVD -+ -+ -+ kernels/huge.s/bzImage -+ isolinux/initrd.img -+ -+ -+ -+ -+ slackware14.0 -+ <_name>Slackware 14.0 -+ 14.0 -+ <_vendor>Slackware -+ linux -+ slackware -+ -+ -+ 2012-09-26 -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.0-iso/slackware-14.0-install-dvd.iso -+ -+ SlackDVD -+ Slackware 14.0 DVD -+ -+ -+ kernels/hugesmp.s/bzImage -+ isolinux/initrd.img -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.0-iso/slackware64-14.0-install-dvd.iso -+ -+ SlackDVD -+ Slackware 14.0 DVD -+ -+ -+ kernels/huge.s/bzImage -+ isolinux/initrd.img -+ -+ -+ -+ -+ slackware14.1 -+ <_name>Slackware 14.1 -+ 14.1 -+ <_vendor>Slackware -+ linux -+ slackware -+ -+ -+ 2013-11-04 -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.1-iso/slackware-14.1-install-dvd.iso -+ -+ SlackDVD -+ Slackware 14.1 DVD -+ -+ -+ kernels/hugesmp.s/bzImage -+ isolinux/initrd.img -+ -+ -+ http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.1-iso/slackware64-14.1-install-dvd.iso -+ -+ SlackDVD -+ Slackware 14.1 DVD -+ -+ -+ kernels/huge.s/bzImage -+ isolinux/initrd.img -+ -+ -+ -+ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index a1a551f..7fb4aa2 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1,6 +1,7 @@ - data/oses/netware.xml.in - data/oses/solaris.xml.in - data/oses/dos.xml.in -+data/oses/slackware.xml.in - data/oses/mageia.xml.in - data/oses/mandrake.xml.in - data/oses/mandriva.xml.in -diff --git a/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt b/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt -new file mode 100644 -index 0000000..0402219 ---- /dev/null -+++ b/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware 13.0 DVD -+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: 1914167 -+El Torito VD version 1 found, boot catalog is in sector 2351 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 930 2352 -diff --git a/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt b/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt -new file mode 100644 -index 0000000..ad1a4ec ---- /dev/null -+++ b/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware 13.0 DVD -+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: 1926212 -+El Torito VD version 1 found, boot catalog is in sector 2251 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 8CC 2252 -diff --git a/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt b/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt -new file mode 100644 -index 0000000..ca1eca9 ---- /dev/null -+++ b/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware 13.1 DVD -+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: 2108672 -+El Torito VD version 1 found, boot catalog is in sector 2380 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 94D 2381 -diff --git a/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt b/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt -new file mode 100644 -index 0000000..9126fdd ---- /dev/null -+++ b/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware64 13.1 DVD -+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: 2134723 -+El Torito VD version 1 found, boot catalog is in sector 2333 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 91E 2334 -diff --git a/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt b/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt -new file mode 100644 -index 0000000..316b1c3 ---- /dev/null -+++ b/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware 13.37 DVD -+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: 2218788 -+El Torito VD version 1 found, boot catalog is in sector 2471 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 9A8 2472 -diff --git a/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt b/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt -new file mode 100644 -index 0000000..e1fbdd6 ---- /dev/null -+++ b/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware64 13.37 DVD -+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: 2254040 -+El Torito VD version 1 found, boot catalog is in sector 2424 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 979 2425 -diff --git a/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt b/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt -new file mode 100644 -index 0000000..249b665 ---- /dev/null -+++ b/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware 14.0 DVD -+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: 1200676 -+El Torito VD version 1 found, boot catalog is in sector 681 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 2AA 682 -diff --git a/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt b/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt -new file mode 100644 -index 0000000..6fd67cf ---- /dev/null -+++ b/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware64 14.0 DVD -+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: 1177016 -+El Torito VD version 1 found, boot catalog is in sector 664 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 299 665 -diff --git a/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt b/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt -new file mode 100644 -index 0000000..0636efc ---- /dev/null -+++ b/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware 14.1 DVD -+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: 1213132 -+El Torito VD version 1 found, boot catalog is in sector 709 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 2C6 710 -diff --git a/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt b/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt -new file mode 100644 -index 0000000..3b8df93 ---- /dev/null -+++ b/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt -@@ -0,0 +1,33 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SlackDVD -+Volume set id: -+Publisher id: -+Data preparer id: -+Application id: Slackware64 14.1 DVD -+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: 1190715 -+El Torito VD version 1 found, boot catalog is in sector 698 -+ -+Joliet with UCS level 3 found. -+SUSP signatures version 1 found -+Rock Ridge signatures version 1 found -+Rock Ridge id 'RRIP_1991A' -+Eltorito validation header: -+ Hid 1 -+ Arch 0 (x86) -+ ID '' -+ Cksum AA 55 OK -+ Key 55 AA -+ Eltorito defaultboot header: -+ Bootid 88 (bootable) -+ Boot media 0 (No Emulation Boot) -+ Load segment 0 -+ Sys type 0 -+ Nsect 4 -+ Bootoff 58B 1419 -diff --git a/test/test-isodetect.c b/test/test-isodetect.c -index 5bd211a..4288cf0 100644 ---- a/test/test-isodetect.c -+++ b/test/test-isodetect.c -@@ -408,6 +408,12 @@ START_TEST(test_mageia) - } - END_TEST - -+START_TEST(test_slackware) -+{ -+ test_one("slackware"); -+} -+END_TEST -+ - static Suite * - list_suite(void) - { -@@ -424,6 +430,7 @@ list_suite(void) - tcase_add_test(tc, test_opensuse); - tcase_add_test(tc, test_centos); - tcase_add_test(tc, test_gnome); -+ tcase_add_test(tc, test_slackware); - tcase_add_test(tc, test_altlinux); - tcase_add_test(tc, test_mageia); - suite_add_tcase(s, tc); --- -2.1.0 - diff --git a/libraries/libosinfo/add_slackware_data.patch b/libraries/libosinfo/add_slackware_data.patch new file mode 100644 index 0000000000..98163966f4 --- /dev/null +++ b/libraries/libosinfo/add_slackware_data.patch @@ -0,0 +1,468 @@ +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt 2016-12-27 09:56:28.709944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware 13.0 DVD ++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: 1914167 ++El Torito VD version 1 found, boot catalog is in sector 2351 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 930 2352 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt 2016-12-27 09:56:28.709944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware 13.0 DVD ++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: 1926212 ++El Torito VD version 1 found, boot catalog is in sector 2251 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 8CC 2252 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt 2016-12-27 09:56:28.709944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware 13.1 DVD ++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: 2108672 ++El Torito VD version 1 found, boot catalog is in sector 2380 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 94D 2381 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt 2016-12-27 09:56:28.709944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware64 13.1 DVD ++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: 2134723 ++El Torito VD version 1 found, boot catalog is in sector 2333 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 91E 2334 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt 2016-12-27 09:56:28.709944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware 13.37 DVD ++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: 2218788 ++El Torito VD version 1 found, boot catalog is in sector 2471 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 9A8 2472 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt 2016-12-27 09:56:28.710944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware64 13.37 DVD ++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: 2254040 ++El Torito VD version 1 found, boot catalog is in sector 2424 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 979 2425 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt 2016-12-27 09:56:28.710944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware 14.0 DVD ++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: 1200676 ++El Torito VD version 1 found, boot catalog is in sector 681 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 2AA 682 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt 2016-12-27 09:56:28.710944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware64 14.0 DVD ++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: 1177016 ++El Torito VD version 1 found, boot catalog is in sector 664 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 299 665 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt 2016-12-27 09:56:28.710944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware 14.1 DVD ++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: 1213132 ++El Torito VD version 1 found, boot catalog is in sector 709 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 2C6 710 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt 2016-12-27 09:56:28.710944162 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware64 14.1 DVD ++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: 1190715 ++El Torito VD version 1 found, boot catalog is in sector 698 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 58B 1419 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.2/slackware-14.2-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.2/slackware-14.2-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.2/slackware-14.2-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.2/slackware-14.2-install-dvd.iso.txt 2016-12-27 10:16:02.015968444 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware 14.2 DVD ++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: 1373842 ++El Torito VD version 1 found, boot catalog is in sector 745 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 2EA 746 +diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.2/slackware64-14.2-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.2/slackware64-14.2-install-dvd.iso.txt +--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.2/slackware64-14.2-install-dvd.iso.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.2/slackware64-14.2-install-dvd.iso.txt 2016-12-27 10:16:02.017968444 +0100 +@@ -0,0 +1,33 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: SlackDVD ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: Slackware64 14.2 DVD ++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: 1354097 ++El Torito VD version 1 found, boot catalog is in sector 736 ++ ++Joliet with UCS level 3 found. ++SUSP signatures version 1 found ++Rock Ridge signatures version 1 found ++Rock Ridge id 'RRIP_1991A' ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Cksum AA 55 OK ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 5B1 1457 +diff -Naur libosinfo-1.0.0.orig/test/test-isodetect.c libosinfo-1.0.0/test/test-isodetect.c +--- libosinfo-1.0.0.orig/test/test-isodetect.c 2016-08-10 11:13:10.000000000 +0200 ++++ libosinfo-1.0.0/test/test-isodetect.c 2016-12-27 10:21:24.928975127 +0100 +@@ -450,6 +450,12 @@ + } + END_TEST + ++START_TEST(test_slackware) ++{ ++ test_one("slackware"); ++} ++END_TEST ++ + static Suite * + list_suite(void) + { +@@ -471,6 +477,7 @@ + tcase_add_test(tc, test_mageia); + tcase_add_test(tc, test_sles); + tcase_add_test(tc, test_sled); ++ tcase_add_test(tc, test_slackware); + suite_add_tcase(s, tc); + return s; + } diff --git a/libraries/libosinfo/libosinfo.SlackBuild b/libraries/libosinfo/libosinfo.SlackBuild index f30f02dfd2..aa6a12d957 100644 --- a/libraries/libosinfo/libosinfo.SlackBuild +++ b/libraries/libosinfo/libosinfo.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libosinfo -# Copyright 2014 Matteo Bernardini , Pisa, Italy +# Copyright 2014-2017 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libosinfo -VERSION=${VERSION:-0.2.11} +VERSION=${VERSION:-1.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,8 +72,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # add slackware metadata -patch -p1 < $CWD/Add-Slackware-metadata.patch -autoreconf -fi +patch -p1 < $CWD/add_slackware_data.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libosinfo/libosinfo.info b/libraries/libosinfo/libosinfo.info index 4f5f334f5d..d737b90bd2 100644 --- a/libraries/libosinfo/libosinfo.info +++ b/libraries/libosinfo/libosinfo.info @@ -1,10 +1,10 @@ PRGNAM="libosinfo" -VERSION="0.2.11" +VERSION="1.0.0." HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.11.tar.gz" -MD5SUM="acfcddc6a3f577524fd705947fb5abbc" +DOWNLOAD="https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-1.0.0.tar.gz" +MD5SUM="22a09db53246e4a54be14d82a59b15db" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="vala" +REQUIRES="osinfo-db vala" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" -- cgit v1.2.3-65-gdbad