diff --git a/.gitignore b/.gitignore index a58e73c..5b52868 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ libguestfs-1.5.3.tar.gz /libguestfs-1.14.6.tar.gz /libguestfs-1.14.7.tar.gz /libguestfs-1.14.8.tar.gz +/libguestfs-1.14.9.tar.gz diff --git a/0001-New-API-mdadm-create-for-creating-MD-devices.patch b/0001-New-API-mdadm-create-for-creating-MD-devices.patch index d2cdb6b..70161bf 100644 --- a/0001-New-API-mdadm-create-for-creating-MD-devices.patch +++ b/0001-New-API-mdadm-create-for-creating-MD-devices.patch @@ -1,4 +1,4 @@ -From e71b821fef96cb1a37e049d25cefc3cc95b06584 Mon Sep 17 00:00:00 2001 +From 5a1c7252e284fcb8d7d055408169ad005659651e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 11 Nov 2011 11:01:46 +0000 Subject: [PATCH 01/10] New API: mdadm-create for creating MD devices. (cherry @@ -206,14 +206,14 @@ index 0000000..1adb4ac + return 0; +} diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml -index ece471f..ccb1611 100644 +index 28f20ad..4726093 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -6353,6 +6353,64 @@ is for copying blocks within existing files. See C, C and C for general file copying and moving functions."); -+ ("mdadm_create", (RErr, [String "name"; DeviceList "devices"], [Int64 "missingbitmap"; Int "nrdevices"; Int "spare"; Int64 "chunk"; String "level"]), 299, [Optional "mdadm"], ++ ("mdadm_create", (RErr, [String "name"; DeviceList "devices"], [OInt64 "missingbitmap"; OInt "nrdevices"; OInt "spare"; OInt64 "chunk"; OString "level"]), 299, [Optional "mdadm"], + [], + "create a Linux md (RAID) device", + "\ diff --git a/0002-New-API-list-md-devices.patch b/0002-New-API-list-md-devices.patch index 9d7822e..d810a1b 100644 --- a/0002-New-API-list-md-devices.patch +++ b/0002-New-API-list-md-devices.patch @@ -1,4 +1,4 @@ -From 7db7473ff5891fbba0f87c79eeb25ed8998d9494 Mon Sep 17 00:00:00 2001 +From 351a1c544e4f2826619093afba34c5412a52c544 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Thu, 10 Nov 2011 17:56:10 +0000 Subject: [PATCH 02/10] New API: list-md-devices. @@ -175,7 +175,7 @@ index 1adb4ac..257bd0f 100644 + return NULL; +} diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml -index ccb1611..8a83c7a 100644 +index 4726093..2d02526 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -6411,6 +6411,12 @@ If not set, this defaults to C. diff --git a/0003-Update-list-filesystems-to-check-md-devices.patch b/0003-Update-list-filesystems-to-check-md-devices.patch index c1a8f01..dfee0c3 100644 --- a/0003-Update-list-filesystems-to-check-md-devices.patch +++ b/0003-Update-list-filesystems-to-check-md-devices.patch @@ -1,4 +1,4 @@ -From 05f10346c9c5d4dcf3ea872d8139f56da81cf38a Mon Sep 17 00:00:00 2001 +From 469a83e4338ff5fae04f9d6b10d6988ba275c88b Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Thu, 10 Nov 2011 17:57:16 +0000 Subject: [PATCH 03/10] Update list-filesystems to check md devices. (cherry diff --git a/0004-New-API-mdadm-detail.patch b/0004-New-API-mdadm-detail.patch index 97059f1..f600daa 100644 --- a/0004-New-API-mdadm-detail.patch +++ b/0004-New-API-mdadm-detail.patch @@ -1,4 +1,4 @@ -From 3157947e82372047c148cb8c6e81799390457318 Mon Sep 17 00:00:00 2001 +From a30dc60fc7551451a764348cc769228b94cc15e9 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Thu, 17 Nov 2011 12:43:49 +0000 Subject: [PATCH 04/10] New API: mdadm-detail. (cherry picked from commit @@ -107,7 +107,7 @@ index 257bd0f..82ddb82 100644 + return NULL; +} diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml -index 8a83c7a..39c45a2 100644 +index 2d02526..98ff43b 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -6417,6 +6417,37 @@ If not set, this defaults to C. diff --git a/0005-fish-Add-MD-devices-to-guestfish-device-autocompleti.patch b/0005-fish-Add-MD-devices-to-guestfish-device-autocompleti.patch index 2c89026..83c8572 100644 --- a/0005-fish-Add-MD-devices-to-guestfish-device-autocompleti.patch +++ b/0005-fish-Add-MD-devices-to-guestfish-device-autocompleti.patch @@ -1,4 +1,4 @@ -From 2bb62516857b807de39f131c18468155c30a19e3 Mon Sep 17 00:00:00 2001 +From d4022544595a048975eb5cb210238ea6f0068afc Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Mon, 21 Nov 2011 15:23:18 +0000 Subject: [PATCH 05/10] fish: Add MD devices to guestfish device diff --git a/0006-build-Create-an-MD-variant-of-the-dummy-Fedora-image.patch b/0006-build-Create-an-MD-variant-of-the-dummy-Fedora-image.patch index 42b6673..be30b54 100644 --- a/0006-build-Create-an-MD-variant-of-the-dummy-Fedora-image.patch +++ b/0006-build-Create-an-MD-variant-of-the-dummy-Fedora-image.patch @@ -1,4 +1,4 @@ -From 1d47aa9403c480b8477dc76f75fce6ec195b8bef Mon Sep 17 00:00:00 2001 +From 6d2b9d1c6e552780c80e6074f7c2d88162991122 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Wed, 23 Nov 2011 14:00:50 +0000 Subject: [PATCH 06/10] build: Create an MD variant of the dummy Fedora image diff --git a/0007-md-Inspect-MD-devices.patch b/0007-md-Inspect-MD-devices.patch index 98574e5..7368ef8 100644 --- a/0007-md-Inspect-MD-devices.patch +++ b/0007-md-Inspect-MD-devices.patch @@ -1,4 +1,4 @@ -From 6215620b53c8ff3dc8a659b8ab6e0b63653010e7 Mon Sep 17 00:00:00 2001 +From f914ac5b4ff8b11646bdd83b70512c0c8abeda08 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Wed, 23 Nov 2011 14:00:53 +0000 Subject: [PATCH 07/10] md: Inspect MD devices (cherry picked from commit diff --git a/0008-Rename-mdadm_-apis-to-md_.patch b/0008-Rename-mdadm_-apis-to-md_.patch index 77926b4..54fbaef 100644 --- a/0008-Rename-mdadm_-apis-to-md_.patch +++ b/0008-Rename-mdadm_-apis-to-md_.patch @@ -1,4 +1,4 @@ -From b8088b9e59aeadc764c0918827ecf7a184ed8e21 Mon Sep 17 00:00:00 2001 +From 3cb84e14a77ef8f19509ffb14687069e0920555d Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Thu, 24 Nov 2011 12:09:03 +0000 Subject: [PATCH 08/10] Rename mdadm_ apis to md_ @@ -110,15 +110,15 @@ index 82ddb82..8e4ff88 100644 } diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml -index 39c45a2..dbcbab2 100644 +index 98ff43b..33d7844 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -6353,7 +6353,7 @@ is for copying blocks within existing files. See C, C and C for general file copying and moving functions."); -- ("mdadm_create", (RErr, [String "name"; DeviceList "devices"], [Int64 "missingbitmap"; Int "nrdevices"; Int "spare"; Int64 "chunk"; String "level"]), 299, [Optional "mdadm"], -+ ("md_create", (RErr, [String "name"; DeviceList "devices"], [Int64 "missingbitmap"; Int "nrdevices"; Int "spare"; Int64 "chunk"; String "level"]), 299, [Optional "mdadm"], +- ("mdadm_create", (RErr, [String "name"; DeviceList "devices"], [OInt64 "missingbitmap"; OInt "nrdevices"; OInt "spare"; OInt64 "chunk"; OString "level"]), 299, [Optional "mdadm"], ++ ("md_create", (RErr, [String "name"; DeviceList "devices"], [OInt64 "missingbitmap"; OInt "nrdevices"; OInt "spare"; OInt64 "chunk"; OString "level"]), 299, [Optional "mdadm"], [], "create a Linux md (RAID) device", "\ diff --git a/0009-inspection-Cleanup-iteration-over-fstab-entries-in-i.patch b/0009-inspection-Cleanup-iteration-over-fstab-entries-in-i.patch index 49d3529..59f04af 100644 --- a/0009-inspection-Cleanup-iteration-over-fstab-entries-in-i.patch +++ b/0009-inspection-Cleanup-iteration-over-fstab-entries-in-i.patch @@ -1,4 +1,4 @@ -From 4b41f279f986faa41a61bfdda4733e9ee9351fa8 Mon Sep 17 00:00:00 2001 +From 5220c9d556fd25ab7533dbe7269e7e7a3763b749 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Fri, 25 Nov 2011 13:16:54 +0000 Subject: [PATCH 09/10] inspection: Cleanup iteration over fstab entries in diff --git a/0010-inspection-Handle-MD-devices-in-fstab.patch b/0010-inspection-Handle-MD-devices-in-fstab.patch index df722f0..823d99c 100644 --- a/0010-inspection-Handle-MD-devices-in-fstab.patch +++ b/0010-inspection-Handle-MD-devices-in-fstab.patch @@ -1,4 +1,4 @@ -From dbd10e191b272102d94a523f80f8691fb386f27c Mon Sep 17 00:00:00 2001 +From 777c7e94dad33c52c614bcdb29b91c512e797c47 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Fri, 2 Dec 2011 14:04:19 +0000 Subject: [PATCH 10/10] inspection: Handle MD devices in fstab diff --git a/libguestfs.spec b/libguestfs.spec index cadc9a9..1aad86c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -29,7 +29,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.14.8 +Version: 1.14.9 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -988,6 +988,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 10 2012 Richard W.M. Jones - 1:1.14.9-1 +- New upstream version 1.14.9. +- Rebase patches. + * Thu Dec 22 2011 Richard W.M. Jones - 1:1.14.8-1 - New upstream version 1.14.8. - Fixes Security: Mitigate possible privilege escalation via SG_IO ioctl diff --git a/sources b/sources index 38f4dba..b0e632d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63e26090a3933dfcd492b4c9713c336b libguestfs-1.14.8.tar.gz +fc57561fe3acae13ad179a47db897064 libguestfs-1.14.9.tar.gz