Accepting request 258128 from Virtualization

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/258128
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=31

0000-hotfix.patch

@@ -16,3 +16,15 @@ index 0000000..8b13789
 +++ b/pkg-hotfix.txt
 @@ -0,0 +1 @@
 +
+diff --git a/daemon/btrfs.c b/daemon/btrfs.c
+index 7a4d43d..ceea593 100644
+--- a/daemon/btrfs.c
++++ b/daemon/btrfs.c
+@@ -356,6 +356,7 @@ do_btrfs_subvolume_list (const mountable_t *fs)
+     ADD_ARG (argv, i, str_btrfs);
+     ADD_ARG (argv, i, "subvolume");
+     ADD_ARG (argv, i, "list");
++    ADD_ARG (argv, i, "-o");
+     ADD_ARG (argv, i, fs_buf);
+     ADD_ARG (argv, i, NULL);
+ 

libguestfs.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Oct 16 13:26:13 CEST 2014 - ohering@suse.de
+
+- Handle btrfs subvolume name '@' as used in SLE12 (bnc#900346)
+
+-------------------------------------------------------------------
+Tue Oct 14 10:34:12 CEST 2014 - ohering@suse.de
+
+- Include gconv modules for hivex (bnc#900530)
+
 -------------------------------------------------------------------
 Fri Sep  5 09:53:22 CEST 2014 - ohering@suse.de
 

libguestfs.mkinitrd.setup.sh

@@ -2,6 +2,26 @@
 #%stage: block
 #
 
+fdupes_s() {
+	local _target=""
+	local _file=
+	fdupes --quiet --noempty --recurse "$@" |
+		while read _file
+		do
+			if test -z "$_target"
+			then
+				_target="$_file"
+			else
+				if test -z "$_file"
+				then
+					_target=""
+					continue
+				fi
+				echo ln -fv "${_target##*/}" "$_file"
+			fi
+		done
+}
+
 # copy daemon manually because it is located in RPM_BUILD_ROOT
 mkdir -vp $tmp_mnt/usr/sbin
 cp_bin $(type -p guestfsd) $tmp_mnt/usr/sbin
@@ -37,6 +57,15 @@ do
 	fi
 done
 
+for d in /usr/lib*/gconv
+do
+	if test -e $d
+	then
+		cp -avL --parents $d $tmp_mnt/
+		fdupes_s $tmp_mnt$d
+	fi
+done
+
 for t in \
 	screen \
 	vt100 \

libguestfs.spec

@@ -166,6 +166,7 @@ BuildRequires:  fuse-devel
 %endif
 #
 %if %{with hivex}
+BuildRequires:  glibc-locale
 BuildRequires:  hivex-devel
 %endif
 #
@@ -403,6 +404,7 @@ BuildRequires:  e2fsprogs
 %if %{with ext4_writeable}
 BuildRequires:  ext4-writeable-kmp-default
 %endif
+BuildRequires:  fdupes
 BuildRequires:  file
 BuildRequires:  findutils
 BuildRequires:  gawk