- Update to version 1.19.36

Add patch to collect a list of all called binaries from guestfsd

  patch mkinitrd to copy links (bnc#778149)

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=34

libguestfs.spec

@@ -129,14 +129,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Tools for accessing and modifying virtual machine disk images
 License:        LGPL-2.1
 Group:          System/Filesystems
-Version:        1.19.35
+Version:        1.19.36
 Release:        0
+Patch1:         0001-daemon-Remove-e2prog-hack-only-needed-for-RHEL-5.patch
+Patch2:         0002-daemon-collect-list-of-called-external-commands.patch
 Patch5:         libguestfs-1.13.14-ruby.patch
 Patch100:       libguestfs.perl.install_vendor.patch
 Patch101:       libguestfs.perl.no-rpath.patch
 Source0:        %{name}-%{version}.tar.gz
 Source10:       libguestfs.mkinitrd.boot.sh
 Source11:       libguestfs.mkinitrd.setup.sh
+Source42:       mkinitrd.patch
 Recommends:     %{name}-data
 
 %description
@@ -281,6 +284,8 @@ virtual machines.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 %patch100 -p1
 %patch101 -p1
 
@@ -321,8 +326,27 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{l,}a
 touch %{name}.lang
 %find_lang %{name}
 #
+cmds="`
+objcopy -j .guestfs_ext_cmds -O binary $RPM_BUILD_ROOT/usr/sbin/guestfsd /dev/stdout |
+strings |
+sort -u
+`"
+> cmds.txt
+for cmd in ls $cmds
+do
+	if test -n "` PATH=$PATH:/sbin:/usr/sbin type -p $cmd `"
+	then
+		echo "#%%programs: $cmd" >> cmds.txt
+	else
+		echo "# missing: $cmd" >> cmds.txt
+	fi
+done
 rm -rf mkinitrd
 cp -av /lib/mkinitrd .
+if patch -p0 --dry-run < %{S:42}
+then
+	patch -p0 < %{S:42}
+fi
 for bad in \
 	setup-dm.sh \
 	setup-storage.sh
@@ -332,6 +356,13 @@ done
 cp -avL %{S:10} mkinitrd/scripts/boot-guestfs.sh
 cp -avL %{S:11} mkinitrd/scripts/setup-guestfs.sh
 chmod 755 mkinitrd/scripts/*guestfs.sh
+sed -i~ '
+/^#@GUESTFS_EXT_CMDS@/ {
+s@^.*@@
+r cmds.txt
+}
+' mkinitrd/scripts/boot-guestfs.sh
+diff -u mkinitrd/scripts/boot-guestfs.sh~ mkinitrd/scripts/boot-guestfs.sh || :
 /sbin/mkinitrd_setup  \
 	-s $PWD/mkinitrd/scripts \
 	-i $PWD/mkinitrd
@@ -344,6 +375,8 @@ arch=i686 #?
 cp -avL /boot/vmlinuz mkinitrd/boot_tmp/vmlinuz.${arch}
 cp -avL /boot/System.map-${kver} mkinitrd/boot_tmp
 env PATH=${RPM_BUILD_ROOT}/usr/bin:${RPM_BUILD_ROOT}/usr/sbin:${PATH} \
+#bash -x \
+
 /sbin/mkinitrd \
 	-l $PWD/mkinitrd \
 	-k vmlinuz.${arch} \