From 4a4dd959cecda9e70fa97d1e28aa69e19030f3b80555b098ddf2f307f45de58d Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 14 Oct 2013 17:33:15 +0000 Subject: [PATCH 1/4] - Keep setup-dm.sh, required to copy dm rules (bnc#837595) OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=241 --- libguestfs.changes | 5 +++++ libguestfs.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 1e7b39b..a11818e 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 14 19:32:05 CEST 2013 - ohering@suse.de + +- Keep setup-dm.sh, required to copy dm rules (bnc#837595) + ------------------------------------------------------------------- Mon Sep 23 15:35:28 CEST 2013 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 3e4df53..759ae33 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -588,7 +588,6 @@ head -n 1234 ext_cmds.txt missing_cmds.txt rm -rf mkinitrd cp -av /lib/mkinitrd . for bad in \ - setup-dm.sh \ setup-storage.sh \ boot-storage.sh \ ; From 6081a81c5101433f69d2a945a0e939294ba9f787395a12fd77d948fda0393b99 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 18 Oct 2013 08:33:16 +0000 Subject: [PATCH 2/4] - Update to version 1.22.7 * fish: CVE-2013-4419: Fix insecure temporary directory handling for remote guestfish (bnc#845720). * sysprep: firstboot: Don't set `Created_files flag unless files are created. * firstboot: Add some debugging to the control script. * firstboot: Fix test for installing sysvinit scripts. * firstboot: Install both systemd and SysV init scripts. * firstboot: Start service after network only. * firstboot: Fix firstboot scripts so they work on Ubuntu. * edit: Add virt-edit --edit as an alias for virt-edit -e. * btrfs: Fix improper memmove usage in do_btrfs_subvolume_list (RHBZ#1018149). * daemon: xattr: Fix scope of cleanup buf to avoid memory leaks. * daemon: parted: Fix memory leak of list of strings. * daemon: Fix scope of cleanup functions to avoid memory leaks. * df: parallel: Add a debug message when work function returns an error. * daemon: 'exists' API should not follow broken symlinks. * sysprep: Don't remove /var/cache/apt/archives/partial directory. * firstboot: Invoke firstboot.sh script with 'start' parameter. * daemon: Don't set LD_PRELOAD for guestfsd children. * daemon: Fix xfs_info parser because of new format. * sysprep: Fix option quoting in manual page. * virt-df: parallel: Send debugging messages to stderr. * inspection: Don't print a warning if \Windows\explorer.exe does not exist. * launch: direct: Set QEMU_AUDIO_DRV=none to stop qemu opening audio devices. * virt-df: parallel: Compile debugging messages in always. * daemon: augeas: Don't test if AUG_NO_ERR_CLOSE is defined. * daemon: augeas: Enhance error reporting for aug_init failures. * drives: Don't need to call free_drive_servers since preceding code checks servers == NULL. * sparsify: Fix signal handling. * daemon: tar: Use a temporary file to pass excludes to tar command (RHBZ#1001875). * format: Set MBR partition type byte appropriately (RHBZ#1000428). OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=242 --- libguestfs-1.22.6.tar.xz | 3 --- libguestfs-1.22.7.tar.xz | 3 +++ libguestfs.changes | 34 ++++++++++++++++++++++++++++++++++ libguestfs.spec | 2 +- 4 files changed, 38 insertions(+), 4 deletions(-) delete mode 100644 libguestfs-1.22.6.tar.xz create mode 100644 libguestfs-1.22.7.tar.xz diff --git a/libguestfs-1.22.6.tar.xz b/libguestfs-1.22.6.tar.xz deleted file mode 100644 index 1aa20d7..0000000 --- a/libguestfs-1.22.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f538cd2fbead971fe82044d013303aee285a518fbe20183a9f85ca9132183fbd -size 4159296 diff --git a/libguestfs-1.22.7.tar.xz b/libguestfs-1.22.7.tar.xz new file mode 100644 index 0000000..a3d912e --- /dev/null +++ b/libguestfs-1.22.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:456e2aad406914fbfa5122f119d6b448c2fb581002e4b93813ef4819bc587437 +size 4167580 diff --git a/libguestfs.changes b/libguestfs.changes index a11818e..39cef91 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Fri Oct 18 10:26:12 CEST 2013 - ohering@suse.de + +- Update to version 1.22.7 + * fish: CVE-2013-4419: Fix insecure temporary directory handling for remote guestfish (bnc#845720). + * sysprep: firstboot: Don't set `Created_files flag unless files are created. + * firstboot: Add some debugging to the control script. + * firstboot: Fix test for installing sysvinit scripts. + * firstboot: Install both systemd and SysV init scripts. + * firstboot: Start service after network only. + * firstboot: Fix firstboot scripts so they work on Ubuntu. + * edit: Add virt-edit --edit as an alias for virt-edit -e. + * btrfs: Fix improper memmove usage in do_btrfs_subvolume_list (RHBZ#1018149). + * daemon: xattr: Fix scope of cleanup buf to avoid memory leaks. + * daemon: parted: Fix memory leak of list of strings. + * daemon: Fix scope of cleanup functions to avoid memory leaks. + * df: parallel: Add a debug message when work function returns an error. + * daemon: 'exists' API should not follow broken symlinks. + * sysprep: Don't remove /var/cache/apt/archives/partial directory. + * firstboot: Invoke firstboot.sh script with 'start' parameter. + * daemon: Don't set LD_PRELOAD for guestfsd children. + * daemon: Fix xfs_info parser because of new format. + * sysprep: Fix option quoting in manual page. + * virt-df: parallel: Send debugging messages to stderr. + * inspection: Don't print a warning if \Windows\explorer.exe does not exist. + * launch: direct: Set QEMU_AUDIO_DRV=none to stop qemu opening audio devices. + * virt-df: parallel: Compile debugging messages in always. + * daemon: augeas: Don't test if AUG_NO_ERR_CLOSE is defined. + * daemon: augeas: Enhance error reporting for aug_init failures. + * drives: Don't need to call free_drive_servers since preceding code checks servers == NULL. + * sparsify: Fix signal handling. + * daemon: tar: Use a temporary file to pass excludes to tar command (RHBZ#1001875). + * format: Set MBR partition type byte appropriately (RHBZ#1000428). + ------------------------------------------------------------------- Mon Oct 14 19:32:05 CEST 2013 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 759ae33..0bd6755 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -17,7 +17,7 @@ # -Version: 1.22.6 +Version: 1.22.7 Release: 0 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) From c11c64b00d3df3b4e2e29fe6e8c6fe89713871029991dc5841788aa9e831f46b Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 18 Oct 2013 14:15:26 +0000 Subject: [PATCH 3/4] revert AUG_NO_ERR_CLOSE changes OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=243 --- ...geas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch | 44 ++++++++++++++++++ ...geas-Enhance-error-reporting-for-aug.patch | 46 +++++++++++++++++++ libguestfs.spec | 4 ++ 3 files changed, 94 insertions(+) create mode 100644 0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch create mode 100644 0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch diff --git a/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch b/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch new file mode 100644 index 0000000..bdfe985 --- /dev/null +++ b/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch @@ -0,0 +1,44 @@ +From 3a50219454e12b9bc3524b282cb11cfc207d63b0 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 18 Oct 2013 14:57:34 +0100 +Subject: Revert "daemon: augeas: Don't test if AUG_NO_ERR_CLOSE is defined." + +This reverts commit f59b87f7f18d9df89ff9940a317ff1fb452cbd28. + +See: +https://www.redhat.com/archives/libguestfs/2013-October/msg00035.html +--- + daemon/augeas.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/daemon/augeas.c b/daemon/augeas.c +index 45338da..9d6a553 100644 +--- a/daemon/augeas.c ++++ b/daemon/augeas.c +@@ -98,20 +98,26 @@ do_aug_init (const char *root, int flags) + return -1; + } + ++#ifdef AUG_NO_ERR_CLOSE + /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */ + aug = aug_init (buf, NULL, flags | AUG_NO_ERR_CLOSE); ++#else ++ aug = aug_init (buf, NULL, flags); ++#endif + + if (!aug) { + reply_with_error ("augeas initialization failed"); + return -1; + } + ++#ifdef AUG_NO_ERR_CLOSE + if (aug_error (aug) != AUG_NOERROR) { + AUGEAS_ERROR ("aug_init: %s (flags %d)", root, flags); + aug_close (aug); + aug = NULL; + return -1; + } ++#endif + + return 0; + } diff --git a/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch b/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch new file mode 100644 index 0000000..6154cab --- /dev/null +++ b/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch @@ -0,0 +1,46 @@ +From 5ad4d2c2ecc3d7d74e34eedfe00a61bc7bebc8f0 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 18 Oct 2013 14:58:20 +0100 +Subject: Revert "daemon: augeas: Enhance error reporting for aug_init + failures." + +This reverts commit 272cc56876b9a3449da2fdfff546c598497d846d. + +See: +https://www.redhat.com/archives/libguestfs/2013-October/msg00035.html +--- + daemon/augeas.c | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/daemon/augeas.c b/daemon/augeas.c +index 9d6a553..83e2739 100644 +--- a/daemon/augeas.c ++++ b/daemon/augeas.c +@@ -98,26 +98,12 @@ do_aug_init (const char *root, int flags) + return -1; + } + +-#ifdef AUG_NO_ERR_CLOSE +- /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */ +- aug = aug_init (buf, NULL, flags | AUG_NO_ERR_CLOSE); +-#else + aug = aug_init (buf, NULL, flags); +-#endif + + if (!aug) { +- reply_with_error ("augeas initialization failed"); +- return -1; +- } +- +-#ifdef AUG_NO_ERR_CLOSE +- if (aug_error (aug) != AUG_NOERROR) { +- AUGEAS_ERROR ("aug_init: %s (flags %d)", root, flags); +- aug_close (aug); +- aug = NULL; ++ reply_with_error ("Augeas initialization failed"); + return -1; + } +-#endif + + return 0; + } diff --git a/libguestfs.spec b/libguestfs.spec index 0bd6755..d2fed6c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -146,6 +146,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools License: GPL-2.0 Group: System/Filesystems +Patch0001: 0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch +Patch0002: 0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch Source0: %{name}-%{version}.tar.xz Source789653: Pod-Simple-3.23.tar.xz @@ -429,6 +431,8 @@ virtual machines. %prep : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' %setup -q -a 789653 +%patch0001 -p1 +%patch0002 -p1 %patch1000 -p1 %build From 1c10e4f73d74cc837ce77f73a45d75922c6b14d73da1b1f3b13fe283e34597bd Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 22 Oct 2013 09:09:06 +0000 Subject: [PATCH 4/4] Accepting request 204260 from Virtualization after being unable to submit a specific revision to Factory, revert to the desired revision 242 before submitting to Factory. OBS-URL: https://build.opensuse.org/request/show/204260 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=244 --- ...geas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch | 44 ------------------ ...geas-Enhance-error-reporting-for-aug.patch | 46 ------------------- libguestfs.spec | 4 -- 3 files changed, 94 deletions(-) delete mode 100644 0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch delete mode 100644 0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch diff --git a/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch b/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch deleted file mode 100644 index bdfe985..0000000 --- a/0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3a50219454e12b9bc3524b282cb11cfc207d63b0 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 18 Oct 2013 14:57:34 +0100 -Subject: Revert "daemon: augeas: Don't test if AUG_NO_ERR_CLOSE is defined." - -This reverts commit f59b87f7f18d9df89ff9940a317ff1fb452cbd28. - -See: -https://www.redhat.com/archives/libguestfs/2013-October/msg00035.html ---- - daemon/augeas.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/daemon/augeas.c b/daemon/augeas.c -index 45338da..9d6a553 100644 ---- a/daemon/augeas.c -+++ b/daemon/augeas.c -@@ -98,20 +98,26 @@ do_aug_init (const char *root, int flags) - return -1; - } - -+#ifdef AUG_NO_ERR_CLOSE - /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */ - aug = aug_init (buf, NULL, flags | AUG_NO_ERR_CLOSE); -+#else -+ aug = aug_init (buf, NULL, flags); -+#endif - - if (!aug) { - reply_with_error ("augeas initialization failed"); - return -1; - } - -+#ifdef AUG_NO_ERR_CLOSE - if (aug_error (aug) != AUG_NOERROR) { - AUGEAS_ERROR ("aug_init: %s (flags %d)", root, flags); - aug_close (aug); - aug = NULL; - return -1; - } -+#endif - - return 0; - } diff --git a/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch b/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch deleted file mode 100644 index 6154cab..0000000 --- a/0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5ad4d2c2ecc3d7d74e34eedfe00a61bc7bebc8f0 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 18 Oct 2013 14:58:20 +0100 -Subject: Revert "daemon: augeas: Enhance error reporting for aug_init - failures." - -This reverts commit 272cc56876b9a3449da2fdfff546c598497d846d. - -See: -https://www.redhat.com/archives/libguestfs/2013-October/msg00035.html ---- - daemon/augeas.c | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/daemon/augeas.c b/daemon/augeas.c -index 9d6a553..83e2739 100644 ---- a/daemon/augeas.c -+++ b/daemon/augeas.c -@@ -98,26 +98,12 @@ do_aug_init (const char *root, int flags) - return -1; - } - --#ifdef AUG_NO_ERR_CLOSE -- /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */ -- aug = aug_init (buf, NULL, flags | AUG_NO_ERR_CLOSE); --#else - aug = aug_init (buf, NULL, flags); --#endif - - if (!aug) { -- reply_with_error ("augeas initialization failed"); -- return -1; -- } -- --#ifdef AUG_NO_ERR_CLOSE -- if (aug_error (aug) != AUG_NOERROR) { -- AUGEAS_ERROR ("aug_init: %s (flags %d)", root, flags); -- aug_close (aug); -- aug = NULL; -+ reply_with_error ("Augeas initialization failed"); - return -1; - } --#endif - - return 0; - } diff --git a/libguestfs.spec b/libguestfs.spec index d2fed6c..0bd6755 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -146,8 +146,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools License: GPL-2.0 Group: System/Filesystems -Patch0001: 0001-Revert-daemon-augeas-Don-t-test-if-AUG_NO_ERR_CLOSE-.patch -Patch0002: 0002-Revert-daemon-augeas-Enhance-error-reporting-for-aug.patch Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch Source0: %{name}-%{version}.tar.xz Source789653: Pod-Simple-3.23.tar.xz @@ -431,8 +429,6 @@ virtual machines. %prep : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' %setup -q -a 789653 -%patch0001 -p1 -%patch0002 -p1 %patch1000 -p1 %build