From 0407693ce6e159af066198150f20d6e46a1d23d0 Mon Sep 17 00:00:00 2001
From: Daniel Berger <djberg96@gmail.com>
Date: Fri, 5 Jun 2020 13:49:34 -0400
Subject: [PATCH] Replace miq-uuid with uuidtools.

---
 lib/VolumeManager/MiqLdm.rb     | 2 +-
 lib/fs/ext3/superblock.rb       | 2 +-
 lib/fs/ext4/superblock.rb       | 4 ++--
 lib/fs/ntfs/attrib_object_id.rb | 2 +-
 lib/fs/xfs/allocation_group.rb  | 2 +-
 lib/fs/xfs/bmap_btree_block.rb  | 2 +-
 lib/fs/xfs/superblock.rb        | 2 +-
 manageiq-smartstate.gemspec     | 1 +
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/VolumeManager/MiqLdm.rb b/lib/VolumeManager/MiqLdm.rb
index 86c2db94..2da80d2b 100644
--- a/lib/VolumeManager/MiqLdm.rb
+++ b/lib/VolumeManager/MiqLdm.rb
@@ -5,7 +5,7 @@
 
 require 'ostruct'
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 
 class BinaryStruct
   def self.stepDecode(data, format)
diff --git a/lib/fs/ext3/superblock.rb b/lib/fs/ext3/superblock.rb
index 48d892fc..61be1d35 100644
--- a/lib/fs/ext3/superblock.rb
+++ b/lib/fs/ext3/superblock.rb
@@ -4,7 +4,7 @@
 require 'fs/ext3/inode'
 
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 
diff --git a/lib/fs/ext4/superblock.rb b/lib/fs/ext4/superblock.rb
index e1c56d4e..1edcd592 100644
--- a/lib/fs/ext4/superblock.rb
+++ b/lib/fs/ext4/superblock.rb
@@ -4,7 +4,7 @@
 require 'fs/ext4/inode'
 
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 
@@ -225,7 +225,7 @@ def is_enabled_64_bit?
     end
 
     def groupDescriptorSize
-      @groupDescriptorSize ||= is_enabled_64_bit? ? @sb['group_desc_size'] : GDE_SIZE 
+      @groupDescriptorSize ||= is_enabled_64_bit? ? @sb['group_desc_size'] : GDE_SIZE
     end
 
     def freeBytes
diff --git a/lib/fs/ntfs/attrib_object_id.rb b/lib/fs/ntfs/attrib_object_id.rb
index b3b4d45a..14555e5d 100644
--- a/lib/fs/ntfs/attrib_object_id.rb
+++ b/lib/fs/ntfs/attrib_object_id.rb
@@ -1,4 +1,4 @@
-require 'util/miq-uuid'
+require 'uuidtools'
 
 module NTFS
   # There is no real data definition for this class - it consists entirely of GUIDs.
diff --git a/lib/fs/xfs/allocation_group.rb b/lib/fs/xfs/allocation_group.rb
index 5a73a01d..3c874df0 100644
--- a/lib/fs/xfs/allocation_group.rb
+++ b/lib/fs/xfs/allocation_group.rb
@@ -1,5 +1,5 @@
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 require 'fs/xfs/superblock'
diff --git a/lib/fs/xfs/bmap_btree_block.rb b/lib/fs/xfs/bmap_btree_block.rb
index 75199934..3ce2ee54 100644
--- a/lib/fs/xfs/bmap_btree_block.rb
+++ b/lib/fs/xfs/bmap_btree_block.rb
@@ -1,5 +1,5 @@
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 
 require 'rufus/lru'
diff --git a/lib/fs/xfs/superblock.rb b/lib/fs/xfs/superblock.rb
index 7e09a9c8..d289ce6b 100644
--- a/lib/fs/xfs/superblock.rb
+++ b/lib/fs/xfs/superblock.rb
@@ -1,7 +1,7 @@
 # encoding: US-ASCII
 
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 require 'fs/xfs/allocation_group'
diff --git a/manageiq-smartstate.gemspec b/manageiq-smartstate.gemspec
index 5f5d5ce9..244d72ed 100644
--- a/manageiq-smartstate.gemspec
+++ b/manageiq-smartstate.gemspec
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "memory_buffer",      ">=0.1.0"
   spec.add_dependency "rufus-lru",          "~>1.0.3"
   spec.add_dependency "sys-uname",          "~>1.2.1"
+  spec.add_dependency "uuidtools",          "~>2.1"
   spec.add_dependency "vmware_web_service", "~>1.0"
 
   spec.add_development_dependency "bundler"