From ccb48194ee425241b16af382d2d4371f076a75e7 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Nov 20 2016 10:22:40 +0000 Subject: 2016-11-20: Retired because it depends on rubygem-flexmock, which was retired, because it was orphaned for more than six weeks. --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 68cd309..0000000 --- a/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*~ -.build*.log -*.rpm -/clog -/x86_64/ -/i386/ -/noarch/ -/libguestfs-*.tar.gz -/gnulib-4fb7ea20122.tar.gz -/gnulib-4a8c422f.tar.gz diff --git a/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch b/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch deleted file mode 100644 index 08c80f0..0000000 --- a/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 31d54be5c2ca27f65c3580acfbafd46f4c040a33 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sat, 16 Jun 2012 10:19:39 +0100 -Subject: [PATCH 01/35] EPEL 5: Remove checks which fail with ancient qemu. - -Note that g->app.qemu_version and g->app.qemu_devices will both -be empty strings. ---- - configure.ac | 57 ------------------------------------------------ - src/launch-appliance.c | 23 +----------------- - 2 files changed, 2 insertions(+), 78 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7e75cb7..df1ef2e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -697,63 +697,6 @@ This could be a very old version of qemu, or qemu might not be - working. - ]) - fi -- -- AC_MSG_CHECKING([that $QEMU -version works]) -- if $QEMU -version >&AS_MESSAGE_LOG_FD 2>&1; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_FAILURE( --[$QEMU -version: command failed. -- --This could be a very old version of qemu, or qemu might not be --working. --]) -- fi -- -- AC_MSG_CHECKING([for $QEMU version >= 1]) -- if $QEMU -version | grep -sq 'version @<:@1-@:>@'; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_FAILURE([$QEMU version must be >= 1.0.]) -- fi -- -- AC_MSG_CHECKING([that $QEMU -nographic -machine accel=kvm:tcg -device ? works]) -- if $QEMU -nographic -machine accel=kvm:tcg -device \? >&AS_MESSAGE_LOG_FD 2>&1; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_FAILURE([$QEMU -nographic -machine accel=kvm:tcg -device ? doesn't work.]) -- fi -- -- AC_MSG_CHECKING([for virtio-serial support in $QEMU]) -- if $QEMU $QEMU_OPTIONS -nographic -machine accel=kvm:tcg -device \? 2>&1 | grep -sq virtio-serial; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_FAILURE( --[I did not find virtio-serial support in --$QEMU. -- --virtio-serial support in qemu or KVM is essential for libguestfs --to operate. -- --Usually this means that you have to install a newer version of qemu --and/or KVM. Please read the relevant section in the README file for --more information about this. -- --You can override this test by setting the environment variable --vmchannel_test=no -- --However if you don't have the right support in your qemu, then this --just delays the pain. -- --If I am using the wrong qemu or you want to compile qemu from source --and install it in another location, then you should configure with --the --with-qemu option. --]) -- fi - fi - - dnl Enable packet dumps when in verbose mode. This generates lots -diff --git a/src/launch-appliance.c b/src/launch-appliance.c -index bb9c832..c769ae0 100644 ---- a/src/launch-appliance.c -+++ b/src/launch-appliance.c -@@ -805,30 +805,11 @@ test_qemu (guestfs_h *g) - if (r == -1 || !WIFEXITED (r) || WEXITSTATUS (r) != 0) - goto error; - -- guestfs___cmd_add_arg (cmd2, g->qemu); -- guestfs___cmd_add_arg (cmd2, "-nographic"); -- guestfs___cmd_add_arg (cmd2, "-version"); -- guestfs___cmd_set_stdout_callback (cmd2, read_all, &g->app.qemu_version, -- CMD_STDOUT_FLAG_WHOLE_BUFFER); -- r = guestfs___cmd_run (cmd2); -- if (r == -1 || !WIFEXITED (r) || WEXITSTATUS (r) != 0) -- goto error; -+ g->app.qemu_version = safe_strdup (g, ""); - - parse_qemu_version (g); - -- guestfs___cmd_add_arg (cmd3, g->qemu); -- guestfs___cmd_add_arg (cmd3, "-nographic"); -- guestfs___cmd_add_arg (cmd3, "-machine"); -- guestfs___cmd_add_arg (cmd3, "accel=kvm:tcg"); -- guestfs___cmd_add_arg (cmd3, "-device"); -- guestfs___cmd_add_arg (cmd3, "?"); -- guestfs___cmd_clear_capture_errors (cmd3); -- guestfs___cmd_set_stderr_to_stdout (cmd3); -- guestfs___cmd_set_stdout_callback (cmd3, read_all, &g->app.qemu_devices, -- CMD_STDOUT_FLAG_WHOLE_BUFFER); -- r = guestfs___cmd_run (cmd3); -- if (r == -1 || !WIFEXITED (r) || WEXITSTATUS (r) != 0) -- goto error; -+ g->app.qemu_devices = safe_strdup (g, ""); - - return 0; - --- -1.7.4.1 - diff --git a/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch deleted file mode 100644 index 0c2e54e..0000000 --- a/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch +++ /dev/null @@ -1,64 +0,0 @@ -From dc3cbf4232d83cf94b2ca9b47b564d1145bfaa14 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sat, 16 Jun 2012 10:23:19 +0100 -Subject: [PATCH 02/35] EPEL 5: Remove AS_ECHO_N for ancient autoconf. - ---- - configure.ac | 28 ++++++++++++++-------------- - 1 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index df1ef2e..380d2ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1568,33 +1568,33 @@ echo "Appliance ........................... $enable_appliance" - echo "QEMU ................................ $QEMU $QEMU_OPTIONS" - echo "guestfish and C-based virt tools .... yes" - echo "FUSE filesystem ..................... $enable_fuse" --AS_ECHO_N(["GNU gettext for i18n ................ "]) -+echo -n "GNU gettext for i18n ................ " - if test "x$HAVE_GNU_GETTEXT_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["OCaml bindings ...................... "]) -+echo -n "OCaml bindings ...................... " - if test "x$HAVE_OCAML_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["OCaml-based virt tools .............. "]) -+echo -n "OCaml-based virt tools .............. " - if test "x$HAVE_OCAML_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["Perl bindings ....................... "]) -+echo -n "Perl bindings ....................... " - if test "x$HAVE_PERL_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["Perl-based virt tools ............... "]) -+echo -n "Perl-based virt tools ............... " - if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["Python bindings ..................... "]) -+echo -n "Python bindings ..................... " - if test "x$HAVE_PYTHON_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["Ruby bindings ....................... "]) -+echo -n "Ruby bindings ....................... " - if test "x$HAVE_RUBY_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["Java bindings ....................... "]) -+echo -n "Java bindings ....................... " - if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["Haskell bindings .................... "]) -+echo -n "Haskell bindings .................... " - if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["PHP bindings ........................ "]) -+echo -n "PHP bindings ........................ " - if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["Erlang bindings ..................... "]) -+echo -n "Erlang bindings ..................... " - if test "x$HAVE_ERLANG_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["Lua bindings ........................ "]) -+echo -n "Lua bindings ........................ " - if test "x$HAVE_LUA_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["gobject bindings .................... "]) -+echo -n "gobject bindings .................... " - if test "x$HAVE_GOBJECT_TRUE" = "x"; then echo "yes"; else echo "no"; fi --AS_ECHO_N(["gobject introspection ............... "]) -+echo -n "gobject introspection ............... " - if test "x$HAVE_INTROSPECTION_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo - echo "If any optional component is configured 'no' when you expected 'yes'" --- -1.7.4.1 - diff --git a/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch b/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch deleted file mode 100644 index cb02c35..0000000 --- a/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4adfd0f6653ed10e33b38e63f58ec9a51eebf349 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sat, 16 Jun 2012 10:46:20 +0100 -Subject: [PATCH 03/35] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf. - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 380d2ec..7c3dff6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -258,7 +258,7 @@ The code will still compile, but is likely to leak memory and other - resources when it runs.])]) - - dnl Check if dirent (readdir) supports d_type member. --AC_STRUCT_DIRENT_D_TYPE -+AC_DEFINE([HAVE_STRUCT_DIRENT_D_TYPE],[1],[Define to 1 if 'struct dirent' has member 'd_type']) - - dnl Check if stat has the required fields. - AC_STRUCT_ST_BLOCKS --- -1.7.4.1 - diff --git a/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch b/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch deleted file mode 100644 index 67c5e9a..0000000 --- a/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 7ad71f29ce0310526e8622abcf9857a102054025 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sat, 16 Jun 2012 13:55:44 +0100 -Subject: [PATCH 04/35] EPEL 5: Don't use C99-style variable decls in for-loop. - ---- - daemon/btrfs.c | 3 ++- - daemon/md.c | 6 ++++-- - generator/bindtests.ml | 3 ++- - src/inspect-fs-unix.c | 17 +++++++++++------ - src/inspect-fs-windows.c | 9 ++++++--- - 5 files changed, 25 insertions(+), 13 deletions(-) - -diff --git a/daemon/btrfs.c b/daemon/btrfs.c -index 81ce5f5..7053642 100644 ---- a/daemon/btrfs.c -+++ b/daemon/btrfs.c -@@ -388,7 +388,8 @@ do_btrfs_subvolume_list (const char *fs) - goto error; - } - -- for (size_t i = 0; i < nr_subvolumes; ++i) { -+ size_t i; -+ for (i = 0; i < nr_subvolumes; ++i) { - /* To avoid allocations, reuse the 'line' buffer to store the - * path. Thus we don't need to free 'line', since it will be - * freed by the calling (XDR) code. -diff --git a/daemon/md.c b/daemon/md.c -index e9a3f09..93380b1 100644 ---- a/daemon/md.c -+++ b/daemon/md.c -@@ -201,7 +201,8 @@ do_list_md_devices (void) - goto error; - } - -- for (size_t i = 0; i < mds.gl_pathc; i++) { -+ size_t i; -+ for (i = 0; i < mds.gl_pathc; i++) { - size_t len; - char *dev, *n; - -@@ -280,7 +281,8 @@ do_md_detail(const char *md) - * case */ - if (STRPREFIX (line, "MD_")) { - line += 3; -- for (char *j = line; *j != '\0'; j++) { -+ char *j; -+ for (j = line; *j != '\0'; j++) { - *j = c_tolower (*j); - } - } -diff --git a/generator/bindtests.ml b/generator/bindtests.ml -index 55c39cb..6650547 100644 ---- a/generator/bindtests.ml -+++ b/generator/bindtests.ml -@@ -250,7 +250,8 @@ print_strings (guestfs_h *g, char *const *argv) - pr " r = safe_calloc (g, sizeof *r, 1);\n"; - pr " r->len = len;\n"; - pr " r->val = safe_calloc (g, r->len, sizeof *r->val);\n"; -- pr " for (size_t i = 0; i < r->len; i++) {\n"; -+ pr " size_t i;\n"; -+ pr " for (i = 0; i < r->len; i++) {\n"; - pr " r->val[i].pv_size = i;\n"; - pr " }\n"; - pr " return r;\n" -diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c -index c2f8dba..7127162 100644 ---- a/src/inspect-fs-unix.c -+++ b/src/inspect-fs-unix.c -@@ -1000,7 +1000,8 @@ uuid_hash(const void *x, size_t table_size) - const md_uuid *a = x; - - size_t h = a->uuid[0]; -- for (size_t i = 1; i < 4; i++) { -+ size_t i; -+ for (i = 1; i < 4; i++) { - h ^= a->uuid[i]; - } - -@@ -1013,7 +1014,8 @@ uuid_cmp(const void *x, const void *y) - const md_uuid *a = x; - const md_uuid *b = y; - -- for (size_t i = 0; i < 1; i++) { -+ size_t i; -+ for (i = 0; i < 1; i++) { - if (a->uuid[i] != b->uuid[i]) return 0; - } - -@@ -1077,7 +1079,8 @@ map_app_md_devices (guestfs_h *g, Hash_table **map) - mds = guestfs_list_md_devices(g); - if (mds == NULL) goto error; - -- for (char **md = mds; *md != NULL; md++) { -+ char **md; -+ for (md = mds; *md != NULL; md++) { - CLEANUP_FREE_STRING_LIST char **detail = guestfs_md_detail (g, *md); - if (detail == NULL) goto error; - -@@ -1188,7 +1191,8 @@ map_md_devices(guestfs_h *g, Hash_table **map) - mdadm_app_free); - if (!*map) g->abort_cb(); - -- for (char **m = matches; *m != NULL; m++) { -+ char **m; -+ for (m = matches; *m != NULL; m++) { - /* Get device name and uuid for each array */ - CLEANUP_FREE char *dev_path = safe_asprintf (g, "%s/devicename", *m); - char *dev = guestfs_aug_get (g, dev_path); -@@ -1481,7 +1485,8 @@ inspect_with_augeas (guestfs_h *g, struct inspect_fs *fs, - int (*f) (guestfs_h *, struct inspect_fs *)) - { - /* Security: Refuse to do this if a config file is too large. */ -- for (const char **i = configfiles; *i != NULL; i++) { -+ const char **i; -+ for (i = configfiles; *i != NULL; i++) { - if (guestfs_exists(g, *i) == 0) continue; - - int64_t size = guestfs_filesize (g, *i); -@@ -1520,7 +1525,7 @@ inspect_with_augeas (guestfs_h *g, struct inspect_fs *fs, - - #define EXCL " and . != \"" - #define EXCL_LEN (strlen(EXCL)) -- for (const char **i = &configfiles[1]; *i != NULL; i++) { -+ for (i = &configfiles[1]; *i != NULL; i++) { - size_t orig_buflen = buflen; - conflen = strlen(*i); - buflen += EXCL_LEN + conflen + 1 /* Closing " */; -diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c -index ba062eb..3d4ac08 100644 ---- a/src/inspect-fs-windows.c -+++ b/src/inspect-fs-windows.c -@@ -135,7 +135,8 @@ guestfs___get_windows_systemroot (guestfs_h *g) - static const char *systemroots[] = - { "/windows", "/winnt", "/win32", "/win", NULL }; - -- for (size_t i = 0; i < sizeof systemroots / sizeof systemroots[0]; ++i) { -+ size_t i; -+ for (i = 0; i < sizeof systemroots / sizeof systemroots[0]; ++i) { - char *systemroot = - guestfs___case_sensitive_path_silently (g, systemroots[i]); - if (!systemroot) -@@ -163,7 +164,8 @@ guestfs___get_windows_systemroot (guestfs_h *g) - } - - int found_os = 0; -- for (char **i = boot_ini; *i != NULL; i++) { -+ char **i; -+ for (i = boot_ini; *i != NULL; i++) { - CLEANUP_FREE char *controller_type = NULL; - CLEANUP_FREE char *controller = NULL; - CLEANUP_FREE char *disk = NULL; -@@ -214,7 +216,8 @@ guestfs___get_windows_systemroot (guestfs_h *g) - - /* Swap backslashes for forward slashes in the system root - * path */ -- for (char *j = path; *j != '\0'; j++) { -+ char *j; -+ for (j = path; *j != '\0'; j++) { - if (*j == '\\') *j = '/'; - } - --- -1.7.4.1 - diff --git a/0005-EPEL-5-Remove-Erlang-bindings.patch b/0005-EPEL-5-Remove-Erlang-bindings.patch deleted file mode 100644 index b40c66e..0000000 --- a/0005-EPEL-5-Remove-Erlang-bindings.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 68b094e0b06c79d3d7805f115416437396f25498 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sat, 16 Jun 2012 14:34:25 +0100 -Subject: [PATCH 05/35] EPEL 5: Remove Erlang bindings. - ---- - Makefile.am | 3 --- - configure.ac | 23 ----------------------- - po/POTFILES | 2 -- - 3 files changed, 0 insertions(+), 28 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index b3fe403..986a13e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -90,9 +90,6 @@ endif - if HAVE_PHP - SUBDIRS += php - endif --if HAVE_ERLANG --SUBDIRS += erlang erlang/examples --endif - if HAVE_LUA - SUBDIRS += lua lua/examples - endif -diff --git a/configure.ac b/configure.ac -index 7c3dff6..4ce58fc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1320,25 +1320,6 @@ AS_IF([test "x$enable_php" != "xno"],[ - ]) - AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"]) - --dnl Erlang --ERLANG=no --AC_ARG_ENABLE([erlang], -- AS_HELP_STRING([--disable-erlang], [disable Erlang language bindings]), -- [], -- [enable_erlang=yes]) --# NB: Don't use AS_IF here: it doesn't work. --if test "x$enable_erlang" != "xno"; then -- ERLANG= -- AC_ERLANG_PATH_ERLC([no]) -- -- if test "x$ERLC" != "xno"; then -- AC_ERLANG_CHECK_LIB([erl_interface], [], -- [AC_MSG_FAILURE([Erlang erl_interface library not installed. Use --disable-erlang to disable.])]) -- AC_ERLANG_SUBST_LIB_DIR -- fi --fi --AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERLANG" != "xno" && test "x$ERLC" != "xno"]) -- - dnl Lua - AC_ARG_ENABLE([lua], - AS_HELP_STRING([--disable-lua], [disable Lua language bindings]), -@@ -1485,8 +1466,6 @@ AC_CONFIG_FILES([Makefile - daemon/Makefile - df/Makefile - edit/Makefile -- erlang/Makefile -- erlang/examples/Makefile - examples/Makefile - fish/Makefile - format/Makefile -@@ -1588,8 +1567,6 @@ echo -n "Haskell bindings .................... " - if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo -n "PHP bindings ........................ " - if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi --echo -n "Erlang bindings ..................... " --if test "x$HAVE_ERLANG_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo -n "Lua bindings ........................ " - if test "x$HAVE_LUA_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo -n "gobject bindings .................... " -diff --git a/po/POTFILES b/po/POTFILES -index 7b28d38..ab3a279 100644 ---- a/po/POTFILES -+++ b/po/POTFILES -@@ -101,8 +101,6 @@ df/domains.c - df/main.c - df/output.c - edit/virt-edit.c --erlang/erl-guestfs-proto.c --erlang/erl-guestfs.c - fish/alloc.c - fish/cmds-gperf.c - fish/cmds.c --- -1.7.4.1 - diff --git a/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch b/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch deleted file mode 100644 index 86c8bc7..0000000 --- a/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 9a427b97c0bbe7f2c2201418df612f035e181dcb Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sat, 16 Jun 2012 14:35:06 +0100 -Subject: [PATCH 06/35] EPEL 5: Remove GObject / GObject Introspection / GJS bindings. - ---- - Makefile.am | 3 -- - configure.ac | 60 ------------------------------------------------------- - po/POTFILES | 63 ---------------------------------------------------------- - 3 files changed, 0 insertions(+), 126 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 986a13e..6c1b9ce 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -93,9 +93,6 @@ endif - if HAVE_LUA - SUBDIRS += lua lua/examples - endif --if HAVE_GOBJECT --SUBDIRS += gobject --endif - - # Unconditional because nothing is built yet. - SUBDIRS += csharp -diff --git a/configure.ac b/configure.ac -index 4ce58fc..0eda702 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1371,58 +1371,6 @@ AS_IF([test "x$PERL" != "xno"],[ - AM_CONDITIONAL([HAVE_TOOLS], - [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) - --dnl gobject library --AC_ARG_ENABLE([gobject], -- AS_HELP_STRING([--disable-gobject], [disable GObject bindings]), -- [], -- [enable_gobject=yes]) --AS_IF([test "x$enable_gobject" != "xno"],[ -- PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.26.0],[ -- AC_SUBST([GOBJECT_CFLAGS]) -- AC_SUBST([GOBJECT_LIBS]) -- AC_DEFINE([HAVE_GOBJECT],[1], -- [GObject library found at compile time.]) -- ], -- [AC_MSG_WARN([gobject library not found, gobject binding will be disabled])]) -- -- PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.26.0],[ -- AC_SUBST([GIO_CFLAGS]) -- AC_SUBST([GIO_LIBS]) -- AC_DEFINE([HAVE_GIO],[1], -- [gio library found at compile time.]) -- ], -- [AC_MSG_WARN([gio library not found, gobject binding will be disabled])]) --]) --AM_CONDITIONAL([HAVE_GOBJECT], -- [test "x$GOBJECT_LIBS" != "x" -a "x$GIO_LIBS" != "x"]) -- --AC_CHECK_PROG([GJS],[gjs],[gjs]) --AS_IF([test "x$GJS" = "x"], -- [AC_MSG_WARN([gjs not found, gobject bindtests will not run])]) -- --dnl gobject introspection --m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ -- GOBJECT_INTROSPECTION_CHECK([1.30.0]) -- -- dnl The above check automatically sets HAVE_INTROSPECTION, but we -- dnl want this to be conditional on gobject also being -- dnl available. We can't move the above check inside the gobject if -- dnl block above or HAVE_INTROSPECTION ends up undefined, so we -- dnl recheck it here. -- AM_CONDITIONAL([HAVE_INTROSPECTION], -- [test "x$HAVE_INTROSPECTION_TRUE" = "x" && -- test "x$HAVE_GOBJECT_TRUE" = "x"]) --],[ -- AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) --]) -- --# check for gtk-doc --m4_ifdef([GTK_DOC_CHECK], [ -- GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) --],[ -- AM_CONDITIONAL([ENABLE_GTK_DOC], false) --]) -- - dnl Library versioning. - MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR` - AC_SUBST(MAX_PROC_NR) -@@ -1473,10 +1421,6 @@ AC_CONFIG_FILES([Makefile - generator/Makefile - gnulib/lib/Makefile - gnulib/tests/Makefile -- gobject/libguestfs-gobject-1.0.pc -- gobject/Makefile -- gobject/docs/Makefile -- gobject/docs/guestfs-docs.sgml - haskell/Makefile - inspector/Makefile - java/Makefile -@@ -1569,10 +1513,6 @@ echo -n "PHP bindings ........................ " - if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo -n "Lua bindings ........................ " - if test "x$HAVE_LUA_TRUE" = "x"; then echo "yes"; else echo "no"; fi --echo -n "gobject bindings .................... " --if test "x$HAVE_GOBJECT_TRUE" = "x"; then echo "yes"; else echo "no"; fi --echo -n "gobject introspection ............... " --if test "x$HAVE_INTROSPECTION_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo - echo "If any optional component is configured 'no' when you expected 'yes'" - echo "then you should check the preceding messages." -diff --git a/po/POTFILES b/po/POTFILES -index ab3a279..c9ef148 100644 ---- a/po/POTFILES -+++ b/po/POTFILES -@@ -140,69 +140,6 @@ fish/tilde.c - fish/time.c - format/format.c - fuse/guestmount.c --gobject/src/optargs-add_domain.c --gobject/src/optargs-add_drive.c --gobject/src/optargs-btrfs_filesystem_resize.c --gobject/src/optargs-btrfs_fsck.c --gobject/src/optargs-compress_device_out.c --gobject/src/optargs-compress_out.c --gobject/src/optargs-copy_device_to_device.c --gobject/src/optargs-copy_device_to_file.c --gobject/src/optargs-copy_file_to_device.c --gobject/src/optargs-copy_file_to_file.c --gobject/src/optargs-e2fsck.c --gobject/src/optargs-fstrim.c --gobject/src/optargs-grep.c --gobject/src/optargs-hivex_open.c --gobject/src/optargs-inspect_get_icon.c --gobject/src/optargs-internal_test.c --gobject/src/optargs-internal_test_63_optargs.c --gobject/src/optargs-internal_test_only_optargs.c --gobject/src/optargs-md_create.c --gobject/src/optargs-mke2fs.c --gobject/src/optargs-mkfs.c --gobject/src/optargs-mkfs_btrfs.c --gobject/src/optargs-mkswap.c --gobject/src/optargs-mktemp.c --gobject/src/optargs-mount_9p.c --gobject/src/optargs-mount_local.c --gobject/src/optargs-ntfsclone_out.c --gobject/src/optargs-ntfsfix.c --gobject/src/optargs-ntfsresize.c --gobject/src/optargs-rsync.c --gobject/src/optargs-rsync_in.c --gobject/src/optargs-rsync_out.c --gobject/src/optargs-set_e2attrs.c --gobject/src/optargs-tar_in.c --gobject/src/optargs-tar_out.c --gobject/src/optargs-tune2fs.c --gobject/src/optargs-umount.c --gobject/src/optargs-umount_local.c --gobject/src/optargs-xfs_admin.c --gobject/src/optargs-xfs_growfs.c --gobject/src/optargs-xfs_repair.c --gobject/src/session.c --gobject/src/struct-application.c --gobject/src/struct-application2.c --gobject/src/struct-btrfssubvolume.c --gobject/src/struct-dirent.c --gobject/src/struct-hivex_node.c --gobject/src/struct-hivex_value.c --gobject/src/struct-inotify_event.c --gobject/src/struct-int_bool.c --gobject/src/struct-isoinfo.c --gobject/src/struct-lvm_lv.c --gobject/src/struct-lvm_pv.c --gobject/src/struct-lvm_vg.c --gobject/src/struct-mdstat.c --gobject/src/struct-partition.c --gobject/src/struct-stat.c --gobject/src/struct-statvfs.c --gobject/src/struct-utsname.c --gobject/src/struct-version.c --gobject/src/struct-xattr.c --gobject/src/struct-xfsinfo.c --gobject/src/tristate.c - inspector/virt-inspector.c - java/com_redhat_et_libguestfs_GuestFS.c - lua/lua-guestfs.c --- -1.7.4.1 - diff --git a/0007-EPEL-5-Remove-PHP-bindings.patch b/0007-EPEL-5-Remove-PHP-bindings.patch deleted file mode 100644 index e6ce9e4..0000000 --- a/0007-EPEL-5-Remove-PHP-bindings.patch +++ /dev/null @@ -1,81 +0,0 @@ -From c0eceb1bd16b0feb0f657abe86382bd412317f00 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sun, 17 Jun 2012 23:01:43 +0100 -Subject: [PATCH 07/35] EPEL 5: Remove PHP bindings. - ---- - Makefile.am | 3 --- - configure.ac | 16 ---------------- - po/POTFILES | 1 - - 3 files changed, 0 insertions(+), 20 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6c1b9ce..6a17fda 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -87,9 +87,6 @@ endif - if HAVE_HASKELL - SUBDIRS += haskell - endif --if HAVE_PHP --SUBDIRS += php --endif - if HAVE_LUA - SUBDIRS += lua lua/examples - endif -diff --git a/configure.ac b/configure.ac -index 0eda702..a32d38d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1307,19 +1307,6 @@ AS_IF([test "x$enable_haskell" != "xno"],[ - ]) - AM_CONDITIONAL([HAVE_HASKELL],[test "x$GHC" != "xno"]) - --dnl PHP --PHP=no --AC_ARG_ENABLE([php], -- AS_HELP_STRING([--disable-php], [disable PHP language bindings]), -- [], -- [enable_php=yes]) --AS_IF([test "x$enable_php" != "xno"],[ -- PHP= -- AC_CHECK_PROG([PHP],[php],[php],[no]) -- AC_CHECK_PROG([PHPIZE],[phpize],[phpize],[no]) --]) --AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"]) -- - dnl Lua - AC_ARG_ENABLE([lua], - AS_HELP_STRING([--disable-lua], [disable Lua language bindings]), -@@ -1433,7 +1420,6 @@ AC_CONFIG_FILES([Makefile - perl/Makefile - perl/Makefile.PL - perl/examples/Makefile -- php/Makefile - po-docs/Makefile - po-docs/ja/Makefile - po-docs/uk/Makefile -@@ -1509,8 +1495,6 @@ echo -n "Java bindings ....................... " - if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo -n "Haskell bindings .................... " - if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi --echo -n "PHP bindings ........................ " --if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo -n "Lua bindings ........................ " - if test "x$HAVE_LUA_TRUE" = "x"; then echo "yes"; else echo "no"; fi - echo -diff --git a/po/POTFILES b/po/POTFILES -index c9ef148..548e7f7 100644 ---- a/po/POTFILES -+++ b/po/POTFILES -@@ -149,7 +149,6 @@ perl/Guestfs.c - perl/bindtests.pl - perl/lib/Sys/Guestfs.pm - perl/lib/Sys/Guestfs/Lib.pm --php/extension/guestfs_php.c - python/guestfs-py-byhand.c - python/guestfs-py.c - rescue/test-virt-rescue.pl --- -1.7.4.1 - diff --git a/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch b/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch deleted file mode 100644 index 5bfbd6a..0000000 --- a/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8bf06ca604d42f0c568d4bc8b312e1b24792e66c Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sun, 17 Jun 2012 22:17:06 +0100 -Subject: [PATCH 08/35] EPEL 5: Define le64toh, le32toh if not defined. - ---- - src/inspect-fs-windows.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c -index 3d4ac08..42287d0 100644 ---- a/src/inspect-fs-windows.c -+++ b/src/inspect-fs-windows.c -@@ -44,6 +44,22 @@ - #include "guestfs-internal-actions.h" - #include "guestfs_protocol.h" - -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#ifndef le64toh -+#define le64toh(x) (x) -+#endif -+#ifndef le32toh -+#define le32toh(x) (x) -+#endif -+#else /* __BYTE_ORDER == __BIG_ENDIAN */ -+#ifndef le64toh -+#define le64toh(x) bswap_64 (x) -+#endif -+#ifndef le32toh -+#define le32toh(x) bswap_32 (x) -+#endif -+#endif -+ - /* Compile all the regular expressions once when the shared library is - * loaded. PCRE is thread safe so we're supposedly OK here if - * multiple threads call into the libguestfs API functions below --- -1.7.4.1 - diff --git a/0009-EPEL-5-Add-gnulib-utimensat-module.patch b/0009-EPEL-5-Add-gnulib-utimensat-module.patch deleted file mode 100644 index 43a74e7..0000000 --- a/0009-EPEL-5-Add-gnulib-utimensat-module.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a45170e0d7db3c10b0fd0713aa4b89b7bc4ef33c Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sun, 17 Jun 2012 22:58:58 +0100 -Subject: [PATCH 09/35] EPEL 5: Add gnulib utimensat module. - -This function is missing in RHEL 5-era kernels. ---- - bootstrap | 1 + - m4/.gitignore | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/bootstrap b/bootstrap -index 4c35dab..08de293 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -88,6 +88,7 @@ strndup - symlinkat - sys_select - sys_wait -+utimensat - vasprintf - vc-list-files - warnings -diff --git a/m4/.gitignore b/m4/.gitignore -index b827552..a76d36f 100644 ---- a/m4/.gitignore -+++ b/m4/.gitignore -@@ -239,6 +239,7 @@ - /usleep.m4 - /utimbuf.m4 - /utimecmp.m4 -+/utimensat.m4 - /utimens.m4 - /utimes.m4 - /vasnprintf.m4 --- -1.7.4.1 - diff --git a/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch b/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch deleted file mode 100644 index f9c9740..0000000 --- a/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 6f8097c9fb00708bd8ea0c4d30a40455d99cb796 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sun, 17 Jun 2012 23:00:16 +0100 -Subject: [PATCH 10/35] EPEL 5: Old ocamlopt didn't support debugging (-g option). - ---- - ocaml/Makefile.am | 2 +- - resize/Makefile.am | 2 +- - sparsify/Makefile.am | 2 +- - sysprep/Makefile.am | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am -index e8bed4b..171193f 100644 ---- a/ocaml/Makefile.am -+++ b/ocaml/Makefile.am -@@ -38,7 +38,7 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so - if HAVE_OCAML - - OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX --OCAMLOPTFLAGS = $(OCAMLCFLAGS) -+OCAMLOPTFLAGS = -warn-error CDEFLMPSUVYZX - - noinst_DATA = mlguestfs.cma mlguestfs.cmxa META - -diff --git a/resize/Makefile.am b/resize/Makefile.am -index 2431e34..55ecb24 100644 ---- a/resize/Makefile.am -+++ b/resize/Makefile.am -@@ -61,7 +61,7 @@ OCAMLPACKAGES += -package gettext-stub - endif - - OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) --OCAMLOPTFLAGS = $(OCAMLCFLAGS) -+OCAMLOPTFLAGS = -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) - - virt-resize: $(OBJECTS) - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ -diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am -index 3bc1d0e..536c7ef 100644 ---- a/sparsify/Makefile.am -+++ b/sparsify/Makefile.am -@@ -52,7 +52,7 @@ OCAMLPACKAGES += -package gettext-stub - endif - - OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) --OCAMLOPTFLAGS = $(OCAMLCFLAGS) -+OCAMLOPTFLAGS = -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) - - virt-sparsify: $(OBJECTS) - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ -diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am -index 6145264..bd45d9d 100644 ---- a/sysprep/Makefile.am -+++ b/sysprep/Makefile.am -@@ -96,7 +96,7 @@ OCAMLPACKAGES += -package gettext-stub - endif - - OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) --OCAMLOPTFLAGS = $(OCAMLCFLAGS) -+OCAMLOPTFLAGS = -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) - - virt-sysprep: $(OBJECTS) - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ --- -1.7.4.1 - diff --git a/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch b/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch deleted file mode 100644 index 46f3fb3..0000000 --- a/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a26861d9eb040adeddb5090a487389914a425eff Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Mon, 18 Jun 2012 08:35:14 +0100 -Subject: [PATCH 11/35] EPEL 5: Replace format6 with format4 in OCaml gettext routines. - ---- - configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a32d38d..b38acc2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -978,14 +978,14 @@ EOF - cat <>resize/common_gettext.ml - module Gettext = struct - external s_ : string -> string = "%identity" -- external f_ : ('a, 'b, 'c, 'd, 'e, 'f) format6 -- -> ('a, 'b, 'c, 'd, 'e, 'f) format6 -+ external f_ : ('a, 'b, 'c, 'd) format4 -+ -> ('a, 'b, 'c, 'd) format4 - = "%identity" - let sn_ : string -> string -> int -> string - = fun s p n -> if n = 1 then s else p -- let fn_ : ('a, 'b, 'c, 'd, 'e, 'f) format6 -- -> ('a, 'b, 'c, 'd, 'e, 'f) format6 -- -> int -> ('a, 'b, 'c, 'd, 'e, 'f) format6 -+ let fn_ : ('a, 'b, 'c, 'd) format4 -+ -> ('a, 'b, 'c, 'd) format4 -+ -> int -> ('a, 'b, 'c, 'd) format4 - = fun s p n -> if n = 1 then s else p - end - EOF --- -1.7.4.1 - diff --git a/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch b/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch deleted file mode 100644 index 124bfb5..0000000 --- a/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 20674c5467fe29fe702ffd4050c7b46e22a968cd Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Mon, 18 Jun 2012 12:18:35 +0100 -Subject: [PATCH 12/35] EPEL 5: Pass --preserve-dup-deps explicitly to libtool. - -See this thread: -https://lists.gnu.org/archive/html/bug-gnulib/2012-06/msg00162.html ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b38acc2..2680acf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1364,7 +1364,7 @@ AC_SUBST(MAX_PROC_NR) - - dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files - dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html --LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' -+LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool --preserve-dup-deps' - AC_SUBST([LIBTOOL]) - - dnl Produce output files. --- -1.7.4.1 - diff --git a/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch b/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch deleted file mode 100644 index bf0db1e..0000000 --- a/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cb25d3c32fdd7fabffd125960cc5f5c3bb8fb691 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Mon, 18 Jun 2012 17:21:30 +0100 -Subject: [PATCH 13/35] EPEL 5: Remove id= from -drive parameter on qemu command line. - ---- - src/launch-appliance.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/launch-appliance.c b/src/launch-appliance.c -index c769ae0..e32c2e5 100644 ---- a/src/launch-appliance.c -+++ b/src/launch-appliance.c -@@ -390,7 +390,7 @@ launch_appliance (guestfs_h *g, const char *arg) - size_t buf2_len = strlen (appliance) + 64; - char buf2[buf2_len]; - add_cmdline (g, "-drive"); -- snprintf (buf2, buf2_len, "file=%s,snapshot=on,id=appliance,if=%s%s", -+ snprintf (buf2, buf2_len, "file=%s,snapshot=on,if=%s%s", - appliance, virtio_scsi ? "none" : "virtio", cachemode); - add_cmdline (g, buf2); - -@@ -998,14 +998,13 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index) - else - iface = "virtio"; - -- snprintf (&r[i], len-i, "%s%s%s%s%s%s,id=hd%zu,if=%s", -+ snprintf (&r[i], len-i, "%s%s%s%s%s%s,if=%s", - drv->readonly ? ",snapshot=on" : "", - drv->use_cache_none ? ",cache=none" : "", - drv->format ? ",format=" : "", - drv->format ? drv->format : "", - drv->disk_label ? ",serial=" : "", - drv->disk_label ? drv->disk_label : "", -- index, - iface); - - return r; /* caller frees */ --- -1.7.4.1 - diff --git a/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch b/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch deleted file mode 100644 index e916de5..0000000 --- a/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch +++ /dev/null @@ -1,528 +0,0 @@ -From 2d836027a0a273dbcafa4216f8ab554063d71bf3 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Mon, 18 Jun 2012 16:06:34 +0100 -Subject: [PATCH 14/35] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support. - ---- - appliance/init | 4 +- - daemon/guestfsd.c | 98 ++++++++++++++++++++++-- - src/guestfs-internal.h | 2 +- - src/launch-appliance.c | 199 ++++++++++++++++++++++++++++++++++-------------- - src/launch-libvirt.c | 2 +- - src/launch.c | 4 +- - 6 files changed, 238 insertions(+), 71 deletions(-) - -diff --git a/appliance/init b/appliance/init -index cfeb3a9..c12d2f4 100755 ---- a/appliance/init -+++ b/appliance/init -@@ -80,10 +80,10 @@ hwclock -u -s - ip addr add 127.0.0.1/8 brd + dev lo scope host - ip link set dev lo up - --ip addr add 169.254.2.10/16 brd + dev eth0 scope global -+ip addr add 10.0.2.0/24 brd + dev eth0 scope global - ip link set dev eth0 up - --ip route add default via 169.254.2.2 -+ip route add default via 10.0.2.2 - - # Scan for MDs. - mdadm -As --auto=yes --run -diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c -index bba13f8..d17d8bc 100644 ---- a/daemon/guestfsd.c -+++ b/daemon/guestfsd.c -@@ -118,9 +118,6 @@ int autosync_umount = 1; - /* Not used explicitly, but required by the gnulib 'error' module. */ - const char *program_name = "guestfsd"; - --/* Name of the virtio-serial channel. */ --#define VIRTIO_SERIAL_CHANNEL "/dev/virtio-ports/org.libguestfs.channel.0" -- - static void - usage (void) - { -@@ -139,6 +136,8 @@ main (int argc, char *argv[]) - }; - int c; - char *cmdline; -+ char *vmchannel = NULL; -+ int sock = -1; - - ignore_value (chdir ("/")); - -@@ -210,8 +209,6 @@ main (int argc, char *argv[]) - printf ("could not read linux command line\n"); - } - -- free (cmdline); -- - #ifndef WIN32 - /* Make sure SIGPIPE doesn't kill us. */ - struct sigaction sa; -@@ -253,9 +250,92 @@ main (int argc, char *argv[]) - */ - copy_lvm (); - -- /* Connect to virtio-serial channel. */ -- int sock = open (VIRTIO_SERIAL_CHANNEL, O_RDWR|O_CLOEXEC); -+ /* Get the vmchannel string. -+ * -+ * Sources: -+ * --channel/-c option on the command line -+ * guestfs_vmchannel=... from the kernel command line -+ * guestfs=... from the kernel command line -+ * built-in default -+ * -+ * At the moment we expect this to contain "tcp:ip:port" but in -+ * future it might contain a device name, eg. "/dev/vcon4" for -+ * virtio-console vmchannel. -+ */ -+ if (cmdline) { -+ char *p; -+ size_t len; -+ -+ p = strstr (cmdline, "guestfs_vmchannel="); -+ if (p) { -+ len = strcspn (p + 18, " \t\n"); -+ vmchannel = strndup (p + 18, len); -+ if (!vmchannel) { -+ perror ("strndup"); -+ exit (EXIT_FAILURE); -+ } -+ } -+ } -+ -+ /* Default vmchannel. */ -+ if (vmchannel == NULL) -+ goto no_vmchannel; -+ -+ if (verbose) -+ printf ("vmchannel: %s\n", vmchannel); -+ -+ /* Connect to vmchannel. */ -+ if (STREQLEN (vmchannel, "tcp:", 4)) { -+ /* Resolve the hostname. */ -+ struct addrinfo *res, *rr; -+ struct addrinfo hints; -+ int r; -+ char *host, *port; -+ -+ host = vmchannel+4; -+ port = strchr (host, ':'); -+ if (port) { -+ port[0] = '\0'; -+ port++; -+ } else { -+ fprintf (stderr, "vmchannel: expecting \"tcp::\": %s\n", -+ vmchannel); -+ exit (EXIT_FAILURE); -+ } -+ -+ memset (&hints, 0, sizeof hints); -+ hints.ai_socktype = SOCK_STREAM; -+ hints.ai_flags = AI_ADDRCONFIG; -+ r = getaddrinfo (host, port, &hints, &res); -+ if (r != 0) { -+ fprintf (stderr, "%s:%s: %s\n", -+ host, port, gai_strerror (r)); -+ exit (EXIT_FAILURE); -+ } -+ -+ /* Connect to the given TCP socket. */ -+ for (rr = res; rr != NULL; rr = rr->ai_next) { -+ sock = socket (rr->ai_family, rr->ai_socktype, rr->ai_protocol); -+ if (sock != -1) { -+ if (connect (sock, rr->ai_addr, rr->ai_addrlen) == 0) -+ break; -+ perror ("connect"); -+ -+ close (sock); -+ sock = -1; -+ } -+ } -+ freeaddrinfo (res); -+ } else { -+ fprintf (stderr, -+ "unknown vmchannel connection type: %s\n" -+ "expecting \"tcp::\"\n", -+ vmchannel); -+ exit (EXIT_FAILURE); -+ } -+ - if (sock == -1) { -+ no_vmchannel: - fprintf (stderr, - "\n" - "Failed to connect to virtio-serial channel.\n" -@@ -269,7 +349,7 @@ main (int argc, char *argv[]) - "output to the libguestfs developers, either in a bug report\n" - "or on the libguestfs redhat com mailing list.\n" - "\n"); -- perror (VIRTIO_SERIAL_CHANNEL); -+ perror ("last error"); - exit (EXIT_FAILURE); - } - -@@ -300,6 +380,8 @@ main (int argc, char *argv[]) - - xdr_destroy (&xdr); - -+ free (cmdline); -+ - /* Enter the main loop, reading and performing actions. */ - main_loop (sock); - -diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h -index 0675123..c275029 100644 ---- a/src/guestfs-internal.h -+++ b/src/guestfs-internal.h -@@ -542,7 +542,7 @@ extern int64_t guestfs___timeval_diff (const struct timeval *x, const struct tim - extern void guestfs___print_timestamped_message (guestfs_h *g, const char *fs, ...) __attribute__((format (printf,2,3))); - extern void guestfs___launch_send_progress (guestfs_h *g, int perdozen); - extern void guestfs___launch_failed_error (guestfs_h *g); --extern char *guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev, int flags); -+extern char *guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev, int flags, const char *vmchannel); - #define APPLIANCE_COMMAND_LINE_IS_TCG 1 - - /* inspect.c */ -diff --git a/src/launch-appliance.c b/src/launch-appliance.c -index e32c2e5..66c130c 100644 ---- a/src/launch-appliance.c -+++ b/src/launch-appliance.c -@@ -29,6 +29,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include -@@ -74,6 +76,9 @@ free_regexps (void) - pcre_free (re_major_minor); - } - -+#define NETWORK "10.0.2.0/24" -+#define ROUTER "10.0.2.2" -+ - static int is_openable (guestfs_h *g, const char *path, int flags); - static char *make_appliance_dev (guestfs_h *g, int virtio_scsi); - static void print_qemu_command_line (guestfs_h *g, char **argv); -@@ -81,6 +86,7 @@ static int qemu_supports (guestfs_h *g, const char *option); - static int qemu_supports_device (guestfs_h *g, const char *device_name); - static int qemu_supports_virtio_scsi (guestfs_h *g); - static char *qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index); -+static int check_peer_euid (guestfs_h *g, int sock, uid_t *rtn); - - /* Functions to build up the qemu command line. These are only run - * in the child process so no clean-up is required. -@@ -169,8 +175,9 @@ launch_appliance (guestfs_h *g, const char *arg) - { - int r; - int wfd[2], rfd[2]; -- char guestfsd_sock[256]; -- struct sockaddr_un addr; -+ struct sockaddr_in addr; -+ socklen_t addrlen = sizeof addr; -+ int null_vmchannel_port; - CLEANUP_FREE char *kernel = NULL, *initrd = NULL, *appliance = NULL; - int has_appliance_drive; - CLEANUP_FREE char *appliance_dev = NULL; -@@ -205,37 +212,43 @@ launch_appliance (guestfs_h *g, const char *arg) - if (qemu_supports (g, NULL) == -1) - goto cleanup0; - -- /* Using virtio-serial, we need to create a local Unix domain socket -- * for qemu to connect to. -+ /* "Null vmchannel" implementation: We allocate a random port -+ * number on the host, and the daemon connects back to it. To -+ * make this secure, we check that the peer UID is the same as our -+ * UID. This requires SLIRP (user mode networking in qemu). - */ -- snprintf (guestfsd_sock, sizeof guestfsd_sock, "%s/guestfsd.sock", g->tmpdir); -- unlink (guestfsd_sock); -- -- g->sock = socket (AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0); -+ g->sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (g->sock == -1) { - perrorf (g, "socket"); - goto cleanup0; - } - -- if (fcntl (g->sock, F_SETFL, O_NONBLOCK) == -1) { -- perrorf (g, "fcntl"); -+ addr.sin_family = AF_INET; -+ addr.sin_port = htons (0); -+ addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); -+ if (bind (g->sock, (struct sockaddr *) &addr, addrlen) == -1) { -+ perrorf (g, "bind"); - goto cleanup0; - } - -- addr.sun_family = AF_UNIX; -- strncpy (addr.sun_path, guestfsd_sock, UNIX_PATH_MAX); -- addr.sun_path[UNIX_PATH_MAX-1] = '\0'; -+ if (listen (g->sock, 256) == -1) { -+ perrorf (g, "listen"); -+ goto cleanup0; -+ } - -- if (bind (g->sock, &addr, sizeof addr) == -1) { -- perrorf (g, "bind"); -+ if (getsockname (g->sock, (struct sockaddr *) &addr, &addrlen) == -1) { -+ perrorf (g, "getsockname"); - goto cleanup0; - } - -- if (listen (g->sock, 1) == -1) { -- perrorf (g, "listen"); -+ if (fcntl (g->sock, F_SETFL, O_NONBLOCK) == -1) { -+ perrorf (g, "fcntl"); - goto cleanup0; - } - -+ null_vmchannel_port = ntohs (addr.sin_port); -+ debug (g, "null_vmchannel_port = %d", null_vmchannel_port); -+ - if (!g->direct) { - if (pipe (wfd) == -1 || pipe (rfd) == -1) { - perrorf (g, "pipe"); -@@ -402,23 +415,9 @@ launch_appliance (guestfs_h *g, const char *arg) - appliance_dev = make_appliance_dev (g, virtio_scsi); - } - -- /* Create the virtio serial bus. */ -- add_cmdline (g, "-device"); -- add_cmdline (g, "virtio-serial"); -- --#if 0 -- /* Use virtio-console (a variant form of virtio-serial) for the -- * guest's serial console. -- */ -- add_cmdline (g, "-chardev"); -- add_cmdline (g, "stdio,id=console"); -- add_cmdline (g, "-device"); -- add_cmdline (g, "virtconsole,chardev=console,name=org.libguestfs.console.0"); --#else -- /* When the above works ... until then: */ -+ /* Serial console. */ - add_cmdline (g, "-serial"); - add_cmdline (g, "stdio"); --#endif - - if (qemu_supports_device (g, "Serial Graphics Adapter")) { - /* Use sgabios instead of vgabios. This means we'll see BIOS -@@ -431,12 +430,16 @@ launch_appliance (guestfs_h *g, const char *arg) - add_cmdline (g, "sga"); - } - -- /* Set up virtio-serial for the communications channel. */ -- add_cmdline (g, "-chardev"); -- snprintf (buf, sizeof buf, "socket,path=%s,id=channel0", guestfsd_sock); -- add_cmdline (g, buf); -- add_cmdline (g, "-device"); -- add_cmdline (g, "virtserialport,chardev=channel0,name=org.libguestfs.channel.0"); -+ /* Null vmchannel. */ -+ add_cmdline (g, "-net"); -+ add_cmdline (g, "user,vlan=0,net=" NETWORK); -+ add_cmdline (g, "-net"); -+ add_cmdline (g, "nic,model=virtio,vlan=0"); -+ -+ snprintf (buf, sizeof buf, -+ "guestfs_vmchannel=tcp:" ROUTER ":%d", -+ null_vmchannel_port); -+ char *vmchannel = strdup (buf); - - #ifdef VALGRIND_DAEMON - /* Set up virtio-serial channel for valgrind messages. */ -@@ -448,17 +451,9 @@ launch_appliance (guestfs_h *g, const char *arg) - add_cmdline (g, "virtserialport,chardev=valgrind,name=org.libguestfs.valgrind"); - #endif - -- /* Enable user networking. */ -- if (g->enable_network) { -- add_cmdline (g, "-netdev"); -- add_cmdline (g, "user,id=usernet,net=169.254.0.0/16"); -- add_cmdline (g, "-device"); -- add_cmdline (g, "virtio-net-pci,netdev=usernet"); -- } -- - add_cmdline (g, "-append"); - CLEANUP_FREE char *cmdline = -- guestfs___appliance_command_line (g, appliance_dev, 0); -+ guestfs___appliance_command_line (g, appliance_dev, 0, vmchannel); - add_cmdline (g, cmdline); - - /* Note: custom command line parameters must come last so that -@@ -619,19 +614,30 @@ launch_appliance (guestfs_h *g, const char *arg) - - g->state = LAUNCHING; - -- /* Wait for qemu to start and to connect back to us via -- * virtio-serial and send the GUESTFS_LAUNCH_FLAG message. -+ /* Null vmchannel implementation: We listen on g->sock for a -+ * connection. The connection could come from any local process -+ * so we must check it comes from the appliance (or at least -+ * from our UID) for security reasons. - */ -- r = guestfs___accept_from_daemon (g); -- if (r == -1) -- goto cleanup1; -+ r = -1; -+ while (r == -1) { -+ uid_t uid; - -- /* NB: We reach here just because qemu has opened the socket. It -- * does not mean the daemon is up until we read the -- * GUESTFS_LAUNCH_FLAG below. Failures in qemu startup can still -- * happen even if we reach here, even early failures like not being -- * able to open a drive. -- */ -+ r = guestfs___accept_from_daemon (g); -+ if (r == -1) -+ goto cleanup1; -+ -+ if (check_peer_euid (g, r, &uid) == -1) -+ goto cleanup1; -+ if (uid != geteuid ()) { -+ fprintf (stderr, -+ "libguestfs: warning: unexpected connection from UID %d to port %d\n", -+ uid, null_vmchannel_port); -+ close (r); -+ r = -1; -+ continue; -+ } -+ } - - /* Close the listening socket. */ - if (close (g->sock) != 0) { -@@ -1010,6 +1016,83 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index) - return r; /* caller frees */ - } - -+/* Check the peer effective UID for a TCP socket. Ideally we'd like -+ * SO_PEERCRED for a loopback TCP socket. This isn't possible on -+ * Linux (but it is on Solaris!) so we read /proc/net/tcp instead. -+ */ -+static int -+check_peer_euid (guestfs_h *g, int sock, uid_t *rtn) -+{ -+ struct sockaddr_in peer; -+ socklen_t addrlen = sizeof peer; -+ -+ if (getpeername (sock, (struct sockaddr *) &peer, &addrlen) == -1) { -+ perrorf (g, "getpeername"); -+ return -1; -+ } -+ -+ if (peer.sin_family != AF_INET || -+ ntohl (peer.sin_addr.s_addr) != INADDR_LOOPBACK) { -+ error (g, "check_peer_euid: unexpected connection from non-IPv4, non-loopback peer (family = %d, addr = %s)", -+ peer.sin_family, inet_ntoa (peer.sin_addr)); -+ return -1; -+ } -+ -+ struct sockaddr_in our; -+ addrlen = sizeof our; -+ if (getsockname (sock, (struct sockaddr *) &our, &addrlen) == -1) { -+ perrorf (g, "getsockname"); -+ return -1; -+ } -+ -+ FILE *fp = fopen ("/proc/net/tcp", "r"); -+ if (fp == NULL) { -+ perrorf (g, "/proc/net/tcp"); -+ return -1; -+ } -+ -+ char line[256]; -+ if (fgets (line, sizeof line, fp) == NULL) { /* Drop first line. */ -+ error (g, "unexpected end of file in /proc/net/tcp"); -+ fclose (fp); -+ return -1; -+ } -+ -+ while (fgets (line, sizeof line, fp) != NULL) { -+ unsigned line_our_addr, line_our_port, line_peer_addr, line_peer_port; -+ int dummy0, dummy1, dummy2, dummy3, dummy4, dummy5, dummy6; -+ int line_uid; -+ -+ if (sscanf (line, "%d:%08X:%04X %08X:%04X %02X %08X:%08X %02X:%08X %08X %d", -+ &dummy0, -+ &line_our_addr, &line_our_port, -+ &line_peer_addr, &line_peer_port, -+ &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, -+ &line_uid) == 12) { -+ /* Note about /proc/net/tcp: local_address and rem_address are -+ * always in network byte order. However the port part is -+ * always in host byte order. -+ * -+ * The sockname and peername that we got above are in network -+ * byte order. So we have to byte swap the port but not the -+ * address part. -+ */ -+ if (line_our_addr == our.sin_addr.s_addr && -+ line_our_port == ntohs (our.sin_port) && -+ line_peer_addr == peer.sin_addr.s_addr && -+ line_peer_port == ntohs (peer.sin_port)) { -+ *rtn = line_uid; -+ fclose (fp); -+ return 0; -+ } -+ } -+ } -+ -+ error (g, "check_peer_euid: no matching TCP connection found in /proc/net/tcp"); -+ fclose (fp); -+ return -1; -+} -+ - static int - shutdown_appliance (guestfs_h *g, int check_for_errors) - { -diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c -index 6188671..27580a3 100644 ---- a/src/launch-libvirt.c -+++ b/src/launch-libvirt.c -@@ -873,7 +873,7 @@ construct_libvirt_xml_boot (guestfs_h *g, - flags = 0; - if (!params->is_kvm) - flags |= APPLIANCE_COMMAND_LINE_IS_TCG; -- cmdline = guestfs___appliance_command_line (g, params->appliance_dev, flags); -+ cmdline = guestfs___appliance_command_line (g, params->appliance_dev, flags, ""); - - XMLERROR (-1, xmlTextWriterStartElement (xo, BAD_CAST "os")); - -diff --git a/src/launch.c b/src/launch.c -index 1583075..09fa73c 100644 ---- a/src/launch.c -+++ b/src/launch.c -@@ -316,7 +316,7 @@ guestfs__config (guestfs_h *g, - - char * - guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev, -- int flags) -+ int flags, const char *vmchannel) - { - char root[64] = ""; - char *term = getenv ("TERM"); -@@ -348,12 +348,14 @@ guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev, - " cgroup_disable=memory" /* saves us about 5 MB of RAM */ - "%s" /* root=appliance_dev */ - " %s" /* selinux */ -+ " %s" /* vmchannel */ - "%s" /* verbose */ - " TERM=%s" /* TERM environment variable */ - "%s%s", /* append */ - lpj_s, - root, - g->selinux ? "selinux=1 enforcing=0" : "selinux=0", -+ vmchannel, - g->verbose ? " guestfs_verbose=1" : "", - term ? term : "linux", - g->append ? " " : "", g->append ? g->append : ""); --- -1.7.4.1 - diff --git a/0015-EPEL-5-Disable-libvirt-attach-method.patch b/0015-EPEL-5-Disable-libvirt-attach-method.patch deleted file mode 100644 index 53330f3..0000000 --- a/0015-EPEL-5-Disable-libvirt-attach-method.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d35083900f9d5a5edac0291bbb97066a4cec532d Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Thu, 30 Aug 2012 17:57:46 +0100 -Subject: [PATCH 15/35] EPEL 5: Disable libvirt attach method. - ---- - src/launch-libvirt.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c -index 27580a3..fe8d5ca 100644 ---- a/src/launch-libvirt.c -+++ b/src/launch-libvirt.c -@@ -72,7 +72,7 @@ - MIN_LIBVIRT_MINOR * 1000 + \ - MIN_LIBVIRT_MICRO) - --#if defined(HAVE_LIBVIRT) && \ -+#if 0 && defined(HAVE_LIBVIRT) && \ - LIBVIR_VERSION_NUMBER >= MIN_LIBVIRT_VERSION && \ - defined(HAVE_LIBXML2) - --- -1.7.4.1 - diff --git a/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch b/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch deleted file mode 100644 index bc2b13a..0000000 --- a/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 751ea66fc7a16b2d80498e7e74c4abb2ca44d1ca Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Fri, 22 Jun 2012 10:06:47 +0100 -Subject: [PATCH 16/35] EPEL 5: Fix blkid to return "LVM2_member" for PVs. - -Old blkid in RHEL 5 didn't return the right thing for PVs. ---- - daemon/blkid.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -diff --git a/daemon/blkid.c b/daemon/blkid.c -index 64919dd..cbd9b1f 100644 ---- a/daemon/blkid.c -+++ b/daemon/blkid.c -@@ -51,6 +51,24 @@ get_blkid_tag (const char *device, const char *tag) - } - - if (r == 2) { /* means UUID etc not found */ -+ if (STREQ (tag, "TYPE") && STREQ (out, "")) { -+ /* RHEL 5 blkid doesn't return "LVM2_member" for PVs. Instead we -+ * get to this point. Detect if the device is really a PV and return -+ * the right thing instead. -+ */ -+ free (out); -+ if (command (&out, &err, "file", "-bsL", device, NULL) == -1) { -+ reply_with_error ("file: %s", err); -+ free (out); -+ return NULL; -+ } -+ if (STRPREFIX (out, "LVM2 (Linux Logical Volume Manager)")) { -+ strcpy (out, "LVM2_member"); -+ return out; -+ } -+ /*FALLTHROUGH*/ -+ } -+ - free (out); - out = strdup (""); - if (out == NULL) --- -1.7.4.1 - diff --git a/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch b/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch deleted file mode 100644 index 8f868c1..0000000 --- a/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch +++ /dev/null @@ -1,42 +0,0 @@ -From aeeecfdbb0308cacfb61910dbd6fb03b5aac4406 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Fri, 22 Jun 2012 10:24:48 +0100 -Subject: [PATCH 17/35] EPEL 5: sparsify: Fix command line options for old qemu-img. - -This didn't have -o backing_file etc. Use old -b and -F options instead. ---- - sparsify/sparsify.ml | 18 ++++++------------ - 1 files changed, 6 insertions(+), 12 deletions(-) - -diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml -index 6ea34ee..8554bc6 100644 ---- a/sparsify/sparsify.ml -+++ b/sparsify/sparsify.ml -@@ -228,18 +228,12 @@ let overlaydisk = - - (* Create it with the indisk as the backing file. *) - let cmd = -- let options = -- let backing_file_option = -- [sprintf "backing_file=%s" (replace_str indisk "," ",,")] in -- let backing_fmt_option = -- match format with -- | None -> [] -- | Some fmt -> [sprintf "backing_fmt=%s" fmt] in -- let version3 = -- if qemu_img_version >= 1.1 then ["compat=1.1"] else [] in -- backing_file_option @ backing_fmt_option @ version3 in -- sprintf "qemu-img create -f qcow2 -o %s %s > /dev/null" -- (Filename.quote (String.concat "," options)) (Filename.quote tmp) in -+ sprintf "qemu-img create -f qcow2%s -b %s %s > /dev/null" -+ (match format with -+ | None -> "" -+ | Some fmt -> sprintf " -F %s" fmt) -+ (replace_str indisk "," ",,") -+ (Filename.quote tmp) in - if verbose then - printf "%s\n%!" cmd; - if Sys.command cmd <> 0 then --- -1.7.4.1 - diff --git a/0018-EPEL-5-Remove-Fedora-MD-test-images.patch b/0018-EPEL-5-Remove-Fedora-MD-test-images.patch deleted file mode 100644 index 7b95fd9..0000000 --- a/0018-EPEL-5-Remove-Fedora-MD-test-images.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2a5114201501d9b6a7090b113b674c8263f1c82d Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Fri, 22 Jun 2012 13:15:49 +0100 -Subject: [PATCH 18/35] EPEL 5: Remove Fedora MD test images. - -On RHEL 5, mdadm is not able to create md devices with aliases, -eg. '/dev/md/boot'. ---- - tests/guests/Makefile.am | 14 -------------- - 1 files changed, 0 insertions(+), 14 deletions(-) - -diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am -index 765b2c2..1ef7bf2 100644 ---- a/tests/guests/Makefile.am -+++ b/tests/guests/Makefile.am -@@ -43,8 +43,6 @@ disk_images = \ - blank-bootrootlv.img \ - debian.img \ - fedora.img \ -- fedora-md1.img \ -- fedora-md2.img \ - ubuntu.img \ - windows.img - -@@ -82,18 +80,6 @@ fedora.img: guest-aux/make-fedora-img.pl \ - SRCDIR=$(srcdir) LAYOUT=partitions $(top_builddir)/run --test $< - $(call display,$@) - --# Make a (dummy) Fedora image using md devices --fedora-md1.img fedora-md2.img: stamp-fedora-md.img -- --stamp-fedora-md.img: guest-aux/make-fedora-img.pl \ -- guest-aux/fedora-name.db \ -- guest-aux/fedora-packages.db -- rm -f $@ -- SRCDIR=$(srcdir) LAYOUT=partitions-md $(top_builddir)/run --test $< -- $(call display,fedora-md1.img) -- $(call display,fedora-md2.img) -- touch $@ -- - guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt - rm -f $@ $@-t - $(DB_LOAD) $@-t < $< --- -1.7.4.1 - diff --git a/0019-EPEL-5-Add-mkisofs-to-package-list.patch b/0019-EPEL-5-Add-mkisofs-to-package-list.patch deleted file mode 100644 index e1df256..0000000 --- a/0019-EPEL-5-Add-mkisofs-to-package-list.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 19ce5c576af99f330b5c76b185e12176b3a1015f Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Fri, 22 Jun 2012 14:46:43 +0100 -Subject: [PATCH 19/35] EPEL 5: Add mkisofs to package list. - -This package contains the 'isoinfo' program which is required -to implement the corresponding API and for tests to pass. ---- - appliance/packagelist.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/appliance/packagelist.in b/appliance/packagelist.in -index 1ba5bf3..d37b1be 100644 ---- a/appliance/packagelist.in -+++ b/appliance/packagelist.in -@@ -131,6 +131,7 @@ lsscsi - lvm2 - lzop - mdadm -+mkisofs - module-init-tools - /* - Enabling this pulls out 140 extra packages --- -1.7.4.1 - diff --git a/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch b/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch deleted file mode 100644 index 60a6053..0000000 --- a/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 33195f966d0c0a1e46e8e9dbd247d433052e9e48 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Fri, 22 Jun 2012 21:58:32 +0100 -Subject: [PATCH 20/35] EPEL 5: Add 1 second pause after unmounting any filesystem. - -This fixes the test-charset-fidelity test case. A simpler example -which fails without this is: - - guestfish < -Date: Thu, 30 Aug 2012 18:01:00 +0100 -Subject: [PATCH 21/35] EPEL 5: podwrapper: Remove HTML output. - -It requires perl Pod::Simple::XHTML which did not exist in -RHEL 5 era. ---- - podwrapper.pl.in | 93 ------------------------------------------------------ - 1 files changed, 0 insertions(+), 93 deletions(-) - -diff --git a/podwrapper.pl.in b/podwrapper.pl.in -index c14044c..e7e1de2 100755 ---- a/podwrapper.pl.in -+++ b/podwrapper.pl.in -@@ -25,7 +25,6 @@ use Getopt::Long; - use Pod::Man; - use Pod::Simple; - use Pod::Simple::Text; --use Pod::Simple::XHTML; - use File::Basename; - - # https://www.redhat.com/archives/libguestfs/2013-May/thread.html#00088 -@@ -420,98 +419,6 @@ if ($man) { - print "$progname: wrote $man\n"; - } - --# Output HTML. --SUBHTML: { -- # Subclass Pod::Simple::XHTML. See the documentation. -- package Podwrapper::XHTML; -- -- use vars qw(@ISA $VERSION); -- @ISA = qw(Pod::Simple::XHTML); -- $VERSION = $package_version; -- -- # Pod::Simple::XHTML returns uppercase identifiers, whereas the -- # old pod2html returns lowercase ones. -- sub idify -- { -- my $self = shift; -- my $id = $self->SUPER::idify (@_); -- lc ($id); -- } -- -- sub is_a_libguestfs_page -- { -- local $_ = shift; -- -- return 1 if /^Sys::Guestfs/; -- return 1 if /^virt-/; -- return 1 if /^libguestf/; -- return 1 if /^guestf/; -- return 1 if /^guestmount/; -- return 1 if /^guestunmount/; -- return 1 if /^hivex/; -- return 1 if /^febootstrap/; -- return 1 if /^supermin/; -- return 0; -- } -- -- sub resolve_pod_page_link -- { -- my $self = shift; -- my $podname = $_[0]; # eg. "Sys::Guestfs", can be undef -- my $anchor = $_[1]; # eg. "SYNOPSIS", can be undef -- my $r = ""; -- if (defined $podname) { -- return $self->SUPER::resolve_pod_page_link (@_) -- unless is_a_libguestfs_page ($podname); -- $r .= "$podname.3.html" -- } -- $r .= "#" . $self->idify ($anchor, 1) if defined $anchor; -- $r; -- } -- -- sub resolve_man_page_link -- { -- my $self = shift; -- my $name = $_[0]; # eg. "virt-make-fs(1)", can be undef -- my $anchor = $_[1]; # eg. "SYNOPSIS", can be undef -- my $r = ""; -- if (defined $name) { -- return $self->SUPER::resolve_man_page_link (@_) -- unless is_a_libguestfs_page ($name); -- $name =~ s/\((.*)\)$/.$1/; -- $r .= "$name.html"; -- } -- $r .= "#" . $self->idify ($anchor, 1) if defined $anchor; -- $r; -- } -- -- # For some reason Pod::Simple::XHTML usually cannot find a -- # title for the page. This defaults the HTML field -- # to the same as the man page name. -- sub default_title { $name } --} -- --if ($html) { -- mkdir "$abs_top_builddir/html"; -- -- my $parser = Podwrapper::XHTML->new; -- my $output; -- $parser->output_string (\$output); -- # Added in Pod::Simple 3.16, 2011-03-14. -- eval { $parser->html_charset ("UTF-8") }; -- $parser->html_css ("pod.css"); -- $parser->index (1); -- $parser->parse_string_document ($content); -- -- # Hack for Perl 5.16. -- $output =~ s{/>pod.css<}{/>\n<}; -- -- open OUT, ">$html" or die "$progname: $html: $!"; -- print OUT $output or die "$progname: $html: $!"; -- close OUT or die "$progname: $html: $!"; -- print "$progname: wrote $html\n"; --} -- - # Output text. - if ($text) { - my $parser = Pod::Simple::Text->new; --- -1.7.4.1 - diff --git a/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch b/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch deleted file mode 100644 index 3477519..0000000 --- a/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 53bffd9d0f014f7ec341412cf1e7ed5ef6ba77d8 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Thu, 30 Aug 2012 18:16:18 +0100 -Subject: [PATCH 22/35] EPEL 5: podwrapper: Don't use Pod::Man. - -This unfortunately means the man pages are generated as plain text. -However that's necessary as Pod::Man does not have an output_string -method. ---- - podwrapper.pl.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/podwrapper.pl.in b/podwrapper.pl.in -index e7e1de2..1f84b3a 100755 ---- a/podwrapper.pl.in -+++ b/podwrapper.pl.in -@@ -390,7 +390,7 @@ SUBMAN: { - package Podwrapper::Man; - - use vars qw(@ISA $VERSION); -- @ISA = qw(Pod::Man); -+ @ISA = qw(Pod::Simple::Text); - $VERSION = $package_version; - - # Override the L<> method. --- -1.7.4.1 - diff --git a/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch b/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch deleted file mode 100644 index f3056bb..0000000 --- a/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 9a77f3071faa3fd396a8b49d8210f83c1319f1c7 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Thu, 30 Aug 2012 18:19:28 +0100 -Subject: [PATCH 23/35] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH" - -This reverts commit 61c9ea496e0579bb7d1bcf496595d66c3f08cfec. ---- - ocaml/Makefile.am | 24 ++++++++++++++++-------- - 1 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am -index 171193f..67bb7fc 100644 ---- a/ocaml/Makefile.am -+++ b/ocaml/Makefile.am -@@ -107,56 +107,64 @@ noinst_DATA += \ - $(test_progs:%=%.opt) - - bindtests.bc: bindtests.cmo mlguestfs.cma -- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ -+ mkdir -p t -+ LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ - - bindtests.opt: bindtests.cmx mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ - - t/guestfs_005_load.bc: t/guestfs_005_load.cmo mlguestfs.cma -- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ -+ mkdir -p t -+ LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ - - t/guestfs_005_load.opt: t/guestfs_005_load.cmx mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ - - t/guestfs_010_basic.bc: t/guestfs_010_basic.cmo mlguestfs.cma -- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ -+ mkdir -p t -+ LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ - - t/guestfs_010_basic.opt: t/guestfs_010_basic.cmx mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ - - t/guestfs_070_threads.bc: t/guestfs_070_threads.cmo mlguestfs.cma -- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ -+ mkdir -p t -+ LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix,threads -thread -linkpkg mlguestfs.cma $< -o $@ - - t/guestfs_070_threads.opt: t/guestfs_070_threads.cmx mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa $< -o $@ - - t/guestfs_080_optargs.bc: t/guestfs_080_optargs.cmo mlguestfs.cma -- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ -+ mkdir -p t -+ LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ - - t/guestfs_080_optargs.opt: t/guestfs_080_optargs.cmx mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ - - t/guestfs_400_events.bc: t/guestfs_400_events.cmo mlguestfs.cma -- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ -+ mkdir -p t -+ LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ - - t/guestfs_400_events.opt: t/guestfs_400_events.cmx mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ - - t/guestfs_400_progress.bc: t/guestfs_400_progress.cmo mlguestfs.cma -- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ -+ mkdir -p t -+ LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ - - t/guestfs_400_progress.opt: t/guestfs_400_progress.cmx mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ - - t/guestfs_500_mount_local.bc: t/guestfs_500_mount_local.cmo mlguestfs.cma -- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ -+ mkdir -p t -+ LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc -custom $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ - - t/guestfs_500_mount_local.opt: t/guestfs_500_mount_local.cmx mlguestfs.cmxa --- -1.7.4.1 - diff --git a/0024-EPEL-5-Don-t-use-sgabios.patch b/0024-EPEL-5-Don-t-use-sgabios.patch deleted file mode 100644 index 2986bb1..0000000 --- a/0024-EPEL-5-Don-t-use-sgabios.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 74a3698379bc7d69833670d5185436f8c9918229 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 31 Aug 2012 10:24:06 +0100 -Subject: [PATCH 24/35] EPEL 5: Don't use sgabios. - -Old qemu doesn't support '-device' parameter. ---- - src/launch-appliance.c | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -diff --git a/src/launch-appliance.c b/src/launch-appliance.c -index 66c130c..4395768 100644 ---- a/src/launch-appliance.c -+++ b/src/launch-appliance.c -@@ -419,17 +419,6 @@ launch_appliance (guestfs_h *g, const char *arg) - add_cmdline (g, "-serial"); - add_cmdline (g, "stdio"); - -- if (qemu_supports_device (g, "Serial Graphics Adapter")) { -- /* Use sgabios instead of vgabios. This means we'll see BIOS -- * messages on the serial port, and also works around this bug -- * in qemu 1.1.0: -- * https://bugs.launchpad.net/qemu/+bug/1021649 -- * QEmu has included sgabios upstream since just before 1.0. -- */ -- add_cmdline (g, "-device"); -- add_cmdline (g, "sga"); -- } -- - /* Null vmchannel. */ - add_cmdline (g, "-net"); - add_cmdline (g, "user,vlan=0,net=" NETWORK); --- -1.7.4.1 - diff --git a/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch b/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch deleted file mode 100644 index 179abaa..0000000 --- a/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch +++ /dev/null @@ -1,392 +0,0 @@ -From 628cc664e51b048106b0d74e1f08472c10f389db Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 31 Aug 2012 13:48:18 +0100 -Subject: [PATCH 25/35] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)." - -This reverts commit 163e030ee13644ad9efe1e078aff47b879657333. ---- - daemon/daemon.h | 2 + - daemon/ext2.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++------- - daemon/labels.c | 6 ++- - daemon/mkfs.c | 8 +++- - 4 files changed, 114 insertions(+), 19 deletions(-) - -diff --git a/daemon/daemon.h b/daemon/daemon.h -index 544feb2..69e1620 100644 ---- a/daemon/daemon.h -+++ b/daemon/daemon.h -@@ -187,6 +187,8 @@ extern int filesystem_available (const char *filesystem); - extern int sync_disks (void); - - /*-- in ext2.c --*/ -+extern int e2prog (char *name); /* Massive hack for RHEL 5. */ -+ - /* Confirmed this is true up to ext4 from the Linux sources. */ - #define EXT2_LABEL_MAX 16 - extern int fstype_is_extfs (const char *fstype); -diff --git a/daemon/ext2.c b/daemon/ext2.c -index a618e66..1a62387 100644 ---- a/daemon/ext2.c -+++ b/daemon/ext2.c -@@ -46,6 +46,32 @@ fstype_is_extfs (const char *fstype) - || STREQ (fstype, "ext4"); - } - -+/* Choose which tools like mke2fs to use. For RHEL 5 (only) there -+ * is a special set of tools which support ext2/3/4. eg. On RHEL 5, -+ * mke2fs only supports ext2/3, but mke4fs supports ext2/3/4. -+ * -+ * We specify e4fsprogs in the package list to ensure it is loaded -+ * if it exists. -+ */ -+int -+e2prog (char *name) -+{ -+ char *p = strstr (name, "e2"); -+ if (!p) return 0; -+ p++; -+ -+ *p = '4'; -+ if (prog_exists (name)) -+ return 0; -+ -+ *p = '2'; -+ if (prog_exists (name)) -+ return 0; -+ -+ reply_with_error ("cannot find required program %s", name); -+ return -1; -+} -+ - char ** - do_tune2fs_l (const char *device) - { -@@ -54,7 +80,11 @@ do_tune2fs_l (const char *device) - char *p, *pend, *colon; - DECLARE_STRINGSBUF (ret); - -- r = command (&out, &err, str_tune2fs, "-l", device, NULL); -+ char prog[] = "tune2fs"; -+ if (e2prog (prog) == -1) -+ return NULL; -+ -+ r = command (&out, &err, prog, "-l", device, NULL); - if (r == -1) { - reply_with_error ("%s", err); - return NULL; -@@ -139,7 +169,11 @@ do_set_e2uuid (const char *device, const char *uuid) - int r; - CLEANUP_FREE char *err = NULL; - -- r = command (NULL, &err, str_tune2fs, "-U", uuid, device, NULL); -+ char prog[] = "tune2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ -+ r = command (NULL, &err, prog, "-U", uuid, device, NULL); - if (r == -1) { - reply_with_error ("%s", err); - return -1; -@@ -160,6 +194,10 @@ if_not_mounted_run_e2fsck (const char *device) - { - CLEANUP_FREE char *err = NULL; - int r, mounted; -+ char prog[] = "e2fsck"; -+ -+ if (e2prog (prog) == -1) -+ return -1; - - mounted = is_device_mounted (device); - if (mounted == -1) -@@ -168,7 +206,7 @@ if_not_mounted_run_e2fsck (const char *device) - if (!mounted) { - r = commandf (NULL, &err, - COMMAND_FLAG_FOLD_STDOUT_ON_STDERR, -- str_e2fsck, "-fy", device, NULL); -+ prog, "-fy", device, NULL); - if (r == -1) { - reply_with_error ("%s", err); - return -1; -@@ -184,10 +222,14 @@ do_resize2fs (const char *device) - CLEANUP_FREE char *err = NULL; - int r; - -+ char prog[] = "resize2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - if (if_not_mounted_run_e2fsck (device) == -1) - return -1; - -- r = command (NULL, &err, str_resize2fs, device, NULL); -+ r = command (NULL, &err, prog, device, NULL); - if (r == -1) { - reply_with_error ("%s", err); - return -1; -@@ -202,6 +244,10 @@ do_resize2fs_size (const char *device, int64_t size) - CLEANUP_FREE char *err = NULL; - int r; - -+ char prog[] = "resize2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - /* resize2fs itself may impose additional limits. Since we are - * going to use the 'K' suffix however we can only work with whole - * kilobytes. -@@ -219,7 +265,7 @@ do_resize2fs_size (const char *device, int64_t size) - char buf[32]; - snprintf (buf, sizeof buf, "%" PRIi64 "K", size); - -- r = command (NULL, &err, str_resize2fs, device, buf, NULL); -+ r = command (NULL, &err, prog, device, buf, NULL); - if (r == -1) { - reply_with_error ("%s", err); - return -1; -@@ -234,10 +280,14 @@ do_resize2fs_M (const char *device) - CLEANUP_FREE char *err = NULL; - int r; - -+ char prog[] = "resize2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - if (if_not_mounted_run_e2fsck (device) == -1) - return -1; - -- r = command (NULL, &err, str_resize2fs, "-M", device, NULL); -+ r = command (NULL, &err, prog, "-M", device, NULL); - if (r == -1) { - reply_with_error ("%s", err); - return -1; -@@ -256,6 +306,10 @@ do_e2fsck (const char *device, - CLEANUP_FREE char *err = NULL; - size_t i = 0; - int r; -+ char prog[] = "e2fsck"; -+ -+ if (e2prog (prog) == -1) -+ return -1; - - /* Default if not selected. */ - if (!(optargs_bitmask & GUESTFS_E2FSCK_CORRECT_BITMASK)) -@@ -268,7 +322,7 @@ do_e2fsck (const char *device, - return -1; - } - -- ADD_ARG (argv, i, str_e2fsck); -+ ADD_ARG (argv, i, prog); - ADD_ARG (argv, i, "-f"); - - if (correct) -@@ -311,13 +365,17 @@ do_mke2journal (int blocksize, const char *device) - CLEANUP_FREE char *err = NULL; - int r; - -+ char prog[] = "mke2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - char blocksize_s[32]; - snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize); - - wipe_device_before_mkfs (device); - - r = command (NULL, &err, -- str_mke2fs, "-F", "-O", "journal_dev", "-b", blocksize_s, -+ prog, "-F", "-O", "journal_dev", "-b", blocksize_s, - device, NULL); - if (r == -1) { - reply_with_error ("%s", err); -@@ -333,6 +391,10 @@ do_mke2journal_L (int blocksize, const char *label, const char *device) - CLEANUP_FREE char *err = NULL; - int r; - -+ char prog[] = "mke2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - if (strlen (label) > EXT2_LABEL_MAX) { - reply_with_error ("%s: ext2 labels are limited to %d bytes", - label, EXT2_LABEL_MAX); -@@ -345,7 +407,7 @@ do_mke2journal_L (int blocksize, const char *label, const char *device) - wipe_device_before_mkfs (device); - - r = command (NULL, &err, -- str_mke2fs, "-F", "-O", "journal_dev", "-b", blocksize_s, -+ prog, "-F", "-O", "journal_dev", "-b", blocksize_s, - "-L", label, - device, NULL); - if (r == -1) { -@@ -362,13 +424,17 @@ do_mke2journal_U (int blocksize, const char *uuid, const char *device) - CLEANUP_FREE char *err = NULL; - int r; - -+ char prog[] = "mke2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - char blocksize_s[32]; - snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize); - - wipe_device_before_mkfs (device); - - r = command (NULL, &err, -- str_mke2fs, "-F", "-O", "journal_dev", "-b", blocksize_s, -+ prog, "-F", "-O", "journal_dev", "-b", blocksize_s, - "-U", uuid, - device, NULL); - if (r == -1) { -@@ -391,6 +457,10 @@ do_mke2fs_J (const char *fstype, int blocksize, const char *device, - return -1; - } - -+ char prog[] = "mke2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - char blocksize_s[32]; - snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize); - -@@ -401,7 +471,7 @@ do_mke2fs_J (const char *fstype, int blocksize, const char *device, - wipe_device_before_mkfs (device); - - r = command (NULL, &err, -- str_mke2fs, "-F", "-t", fstype, "-J", jdev, "-b", blocksize_s, -+ prog, "-F", "-t", fstype, "-J", jdev, "-b", blocksize_s, - device, NULL); - if (r == -1) { - reply_with_error ("%s", err); -@@ -423,6 +493,10 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device, - return -1; - } - -+ char prog[] = "mke2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - if (strlen (label) > EXT2_LABEL_MAX) { - reply_with_error ("%s: ext2 labels are limited to %d bytes", - label, EXT2_LABEL_MAX); -@@ -439,7 +513,7 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device, - wipe_device_before_mkfs (device); - - r = command (NULL, &err, -- str_mke2fs, "-F", "-t", fstype, "-J", jdev, "-b", blocksize_s, -+ prog, "-F", "-t", fstype, "-J", jdev, "-b", blocksize_s, - device, NULL); - if (r == -1) { - reply_with_error ("%s", err); -@@ -461,6 +535,10 @@ do_mke2fs_JU (const char *fstype, int blocksize, const char *device, - return -1; - } - -+ char prog[] = "mke2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - char blocksize_s[32]; - snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize); - -@@ -471,7 +549,7 @@ do_mke2fs_JU (const char *fstype, int blocksize, const char *device, - wipe_device_before_mkfs (device); - - r = command (NULL, &err, -- str_mke2fs, "-F", "-t", fstype, "-J", jdev, "-b", blocksize_s, -+ prog, "-F", "-t", fstype, "-J", jdev, "-b", blocksize_s, - device, NULL); - if (r == -1) { - reply_with_error ("%s", err); -@@ -499,6 +577,7 @@ do_tune2fs (const char *device, /* only required parameter */ - size_t i = 0; - int r; - CLEANUP_FREE char *err = NULL; -+ char prog[] = "tune2fs"; - char maxmountcount_s[64]; - char mountcount_s[64]; - char group_s[64]; -@@ -507,7 +586,10 @@ do_tune2fs (const char *device, /* only required parameter */ - char reservedblockscount_s[64]; - char user_s[64]; - -- ADD_ARG (argv, i, str_tune2fs); -+ if (e2prog (prog) == -1) -+ return -1; -+ -+ ADD_ARG (argv, i, prog); - - if (optargs_bitmask & GUESTFS_TUNE2FS_FORCE_BITMASK) { - if (force) -@@ -615,7 +697,7 @@ do_tune2fs (const char *device, /* only required parameter */ - - r = commandv (NULL, &err, argv); - if (r == -1) { -- reply_with_error ("%s: %s", device, err); -+ reply_with_error ("%s: %s: %s", prog, device, err); - return -1; - } - -@@ -859,7 +941,10 @@ do_mke2fs (const char *device, /* 0 */ - char maxonlineresize_s[74]; - size_t i = 0; - -- ADD_ARG (argv, i, str_mke2fs); -+ char prog[] = "mke2fs"; -+ if (e2prog (prog) == -1) -+ return -1; -+ ADD_ARG (argv, i, prog); - - if (optargs_bitmask & GUESTFS_MKE2FS_BLOCKSIZE_BITMASK) { - if (blocksize < 0) { -diff --git a/daemon/labels.c b/daemon/labels.c -index d1ce6a4..6732047 100644 ---- a/daemon/labels.c -+++ b/daemon/labels.c -@@ -38,13 +38,17 @@ e2label (const char *device, const char *label) - int r; - CLEANUP_FREE char *err = NULL; - -+ char prog[] = "e2label"; -+ if (e2prog (prog) == -1) -+ return -1; -+ - if (strlen (label) > EXT2_LABEL_MAX) { - reply_with_error ("%s: ext2 labels are limited to %d bytes", - label, EXT2_LABEL_MAX); - return -1; - } - -- r = command (NULL, &err, str_e2label, device, label, NULL); -+ r = command (NULL, &err, prog, device, label, NULL); - if (r == -1) { - reply_with_error ("%s", err); - return -1; -diff --git a/daemon/mkfs.c b/daemon/mkfs.c -index e753d9a..dddb388 100644 ---- a/daemon/mkfs.c -+++ b/daemon/mkfs.c -@@ -45,6 +45,7 @@ do_mkfs (const char *fstype, const char *device, int blocksize, - char sectorsize_str[32]; - int r; - CLEANUP_FREE char *err = NULL; -+ char mke2fs[] = "mke2fs"; - int extfs = 0; - - if (fstype_is_extfs (fstype)) -@@ -54,8 +55,11 @@ do_mkfs (const char *fstype, const char *device, int blocksize, - * the mkfs program "eats" some options, in particular the -F - * option. - */ -- if (extfs) -- ADD_ARG (argv, i, str_mke2fs); -+ if (extfs) { -+ if (e2prog (mke2fs) == -1) -+ return -1; -+ ADD_ARG (argv, i, mke2fs); -+ } - else - ADD_ARG (argv, i, str_mkfs); - --- -1.7.4.1 - diff --git a/0026-EPEL-5-Disable-tar-xz-test.patch b/0026-EPEL-5-Disable-tar-xz-test.patch deleted file mode 100644 index 826b56c..0000000 --- a/0026-EPEL-5-Disable-tar-xz-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0e29c1ea90cf42421a945592c0c0847d13dfdef2 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 31 Aug 2012 14:59:25 +0100 -Subject: [PATCH 26/35] EPEL 5: Disable tar --xz test. - -Although xz is available, ancient tar didn't have the --xz option. ---- - generator/actions.ml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/generator/actions.ml b/generator/actions.ml -index b0f93d2..cabf2f0 100644 ---- a/generator/actions.ml -+++ b/generator/actions.ml -@@ -4129,7 +4129,7 @@ To get the checksums for many files, use C<guestfs_checksums_out>." }; - [["mkdir"; "/tar_in_gz"]; - ["tar_in"; "../data/helloworld.tar.gz"; "/tar_in_gz"; "gzip"]; - ["cat"; "/tar_in_gz/hello"]], "hello\n"); -- InitScratchFS, IfAvailable "xz", TestOutput ( -+ InitScratchFS, Disabled, TestOutput ( - [["mkdir"; "/tar_in_xz"]; - ["tar_in"; "../data/helloworld.tar.xz"; "/tar_in_xz"; "xz"]; - ["cat"; "/tar_in_xz/hello"]], "hello\n") --- -1.7.4.1 - diff --git a/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch b/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch deleted file mode 100644 index 11b4dd6..0000000 --- a/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0533583754bfef4a329a0277042c55d7197d85f1 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 31 Aug 2012 22:12:59 +0100 -Subject: [PATCH 27/35] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal. - ---- - sparsify/sparsify.ml | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml -index 8554bc6..6226330 100644 ---- a/sparsify/sparsify.ml -+++ b/sparsify/sparsify.ml -@@ -168,8 +168,7 @@ let qemu_img_version = - let stat = close_process_in chan in - (match stat with - | WEXITED _ -> () -- | WSIGNALED i -> -- error (f_"external command '%s' killed by signal %d") cmd i -+ | WSIGNALED i -> () - | WSTOPPED i -> - error (f_"external command '%s' stopped by signal %d") cmd i - ); --- -1.7.4.1 - diff --git a/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch b/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch deleted file mode 100644 index 737f692..0000000 --- a/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d0136bc8aaabdf91051fcc2f0b839f8b927e0469 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Mon, 3 Sep 2012 11:04:39 +0100 -Subject: [PATCH 28/35] EPEL 5: Revert "daemon: remove call to obsolete udevsettle" - -This reverts commit b6413f8dbef92c46c4baf9499366716a166f2163. ---- - daemon/guestfsd.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c -index d17d8bc..4916c73 100644 ---- a/daemon/guestfsd.c -+++ b/daemon/guestfsd.c -@@ -54,6 +54,7 @@ - #include "daemon.h" - - GUESTFSD_EXT_CMD(str_udevadm, udevadm); -+GUESTFSD_EXT_CMD(str_udevsettle, udevsettle); - - static char *read_cmdline (void); - -@@ -1401,11 +1402,18 @@ random_name (char *template) - * - * Use 'udevadm settle' after certain commands, but don't be too - * fussed if it fails. -+ * -+ * 'udevsettle' was the old name for this command (RHEL 5). This was -+ * deprecated in favour of 'udevadm settle'. The old 'udevsettle' -+ * command was left as a symlink. Then in Fedora 13 the old symlink -+ * remained but it stopped working (RHBZ#548121), so we have to be -+ * careful not to assume that we can use 'udevsettle' if it exists. - */ - void - udev_settle (void) - { - (void) command (NULL, NULL, str_udevadm, "settle", NULL); -+ (void) command (NULL, NULL, str_udevsettle, NULL); - } - - /* Use by the CLEANUP_* macros. Do not call these directly. */ --- -1.7.4.1 - diff --git a/0029-EPEL-5-No-libtoolize-install-option.patch b/0029-EPEL-5-No-libtoolize-install-option.patch deleted file mode 100644 index 7d74c06..0000000 --- a/0029-EPEL-5-No-libtoolize-install-option.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3f6ea65904be8a301bc2824f8b28bd087470f6e0 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 8 Mar 2013 19:09:21 +0000 -Subject: [PATCH 29/35] EPEL 5: No libtoolize --install option. - ---- - bootstrap | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/bootstrap b/bootstrap -index 08de293..441b274 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -29,7 +29,7 @@ GNULIB_SRCDIR=.gnulib - # Autoreconf runs aclocal before libtoolize, which causes spurious - # warnings if the initial aclocal is confused by the libtoolized - # (or worse out-of-date) macro directory. --libtoolize --copy --install -+libtoolize --copy - - gnulib_tool=$GNULIB_SRCDIR/gnulib-tool - <$gnulib_tool || exit --- -1.7.4.1 - diff --git a/0030-EPEL-5-Disable-valgrind.patch b/0030-EPEL-5-Disable-valgrind.patch deleted file mode 100644 index 37ad8a1..0000000 --- a/0030-EPEL-5-Disable-valgrind.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 49ba9324f86322814a29d1addc3b1f011508ab29 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 8 Mar 2013 19:19:43 +0000 -Subject: [PATCH 30/35] EPEL 5: Disable valgrind. - -Ancient automake didn't have AM_SUBST_NOTMAKE. ---- - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2680acf..900c23b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -868,8 +868,8 @@ AS_IF([test "x$VALGRIND" != "xno"],[ - # No valgrind, so substitute VG with something that will break. - VG=VALGRIND_IS_NOT_INSTALLED - ]) --AC_SUBST([VG]) --AM_SUBST_NOTMAKE([VG]) -+dnl AC_SUBST([VG]) -+dnl AM_SUBST_NOTMAKE([VG]) - - dnl Enable profiling? - AC_ARG_ENABLE([code-profiling], --- -1.7.4.1 - diff --git a/0031-EPEL-5-Remove-Linux-capabilities.patch b/0031-EPEL-5-Remove-Linux-capabilities.patch deleted file mode 100644 index 6597dbc..0000000 --- a/0031-EPEL-5-Remove-Linux-capabilities.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 13a9733fb853d4aa607c6e6ad7873d58164d1da0 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 8 Mar 2013 20:20:23 +0000 -Subject: [PATCH 31/35] EPEL 5: Remove Linux capabilities. - -Linux file capabilities are not supported in RHEL 5, and the -cap_*_file functions don't exist in the libcap library (although -confusingly they are in the header file). ---- - configure.ac | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 900c23b..3ea263f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -751,14 +751,6 @@ AC_CHECK_LIB([acl],[acl_from_text],[ - ], []) - ],[AC_MSG_WARN([POSIX acl library not found])]) - --dnl Linux capabilities library (libcap) (highly recommended) --AC_CHECK_LIB([cap],[cap_from_text],[ -- AC_CHECK_HEADER([sys/capability.h],[ -- AC_SUBST([CAP_LIBS], [-lcap]) -- AC_DEFINE([HAVE_CAP], [1], [Define to 1 if the Linux capabilities library (libcap) is available.]) -- ], []) --],[AC_MSG_WARN([Linux capabilities library (libcap) not found])]) -- - dnl libvirt (highly recommended) - AC_ARG_WITH([libvirt],[ - AS_HELP_STRING([--without-libvirt], --- -1.7.4.1 - diff --git a/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch b/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch deleted file mode 100644 index beca317..0000000 --- a/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch +++ /dev/null @@ -1,44 +0,0 @@ -From dbd34c694764f4ca75224ad3739e7c8a1da5ee23 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Sat, 9 Mar 2013 19:24:29 +0000 -Subject: [PATCH 32/35] EPEL 5: ruby: Use old rake/rdoctask and rake/gempackagetask. - -The 'begin ... rescue' code is supposed to ensure these old packages -are required, but for reasons not understood this doesn't work on -ancient Ruby 1.8.5 in RHEL 5. ---- - ruby/Rakefile.in | 15 +++------------ - 1 files changed, 3 insertions(+), 12 deletions(-) - -diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in -index a74e191..fbf8ccc 100644 ---- a/ruby/Rakefile.in -+++ b/ruby/Rakefile.in -@@ -20,21 +20,12 @@ require 'rake/clean' - require 'rake/testtask' - - # Used to be rake/rdoctask. Now it's rdoc/task. --begin -- require 'rdoc/task' --rescue -- require 'rake/rdoctask' --end -+require 'rake/rdoctask' - - # Used to be rake/gempackagetask. Now it's rubygems/package_task. Also - # we need to use the appropriate class name below. --begin -- require 'rubygems/package_task' -- gempackagetask='Gem::PackageTask' --rescue -- require 'rake/gempackagetask' -- gempackagetask='Rake::GemPackageTask' --end -+require 'rake/gempackagetask' -+gempackagetask='Rake::GemPackageTask' - - PKG_NAME='@PACKAGE_NAME@' - PKG_VERSION='@PACKAGE_VERSION@' --- -1.7.4.1 - diff --git a/0033-EPEL-5-Revert-Use-pkg-config-for-Python.patch b/0033-EPEL-5-Revert-Use-pkg-config-for-Python.patch deleted file mode 100644 index c61285c..0000000 --- a/0033-EPEL-5-Revert-Use-pkg-config-for-Python.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 8c8f83353748852f9b5af0695f06615e36719029 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Wed, 29 May 2013 17:27:06 +0100 -Subject: [PATCH 33/35] EPEL 5: Revert "Use pkg-config for Python" - -In RHEL 5, python doesn't have pkg-config configuration. - -This reverts commit ba2e4f1794dabdb251823c86ee843a0fe3186a74. ---- - configure.ac | 35 +++++++++++++++-------------------- - python/Makefile.am | 2 +- - 2 files changed, 16 insertions(+), 21 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3ea263f..b7d158b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1020,6 +1020,7 @@ AM_CONDITIONAL([HAVE_PERL], - dnl Check for Python (optional, for Python bindings). - PYTHON_PREFIX= - PYTHON_VERSION= -+PYTHON_INCLUDEDIR= - PYTHON_INSTALLDIR= - - AC_ARG_ENABLE([python], -@@ -1030,30 +1031,23 @@ AS_IF([test "x$enable_python" != "xno"],[ - AC_CHECK_PROG([PYTHON],[python],[python],[no]) - - if test "x$PYTHON" != "xno"; then -+ AC_MSG_CHECKING([Python prefix]) -+ PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"` -+ AC_MSG_RESULT([$PYTHON_PREFIX]) -+ - AC_MSG_CHECKING([Python version]) - PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"` - PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"` - PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR" - AC_MSG_RESULT([$PYTHON_VERSION]) -- # Debian: python-2.7.pc, python-3.2.pc -- PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[ -- AC_SUBST([PYTHON_CFLAGS]) -- AC_SUBST([PYTHON_LIBS]) -- AC_SUBST([PYTHON_VERSION]) -- AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time]) -- ],[ -- PKG_CHECK_MODULES([PYTHON], [python],[ -- AC_SUBST([PYTHON_CFLAGS]) -- AC_SUBST([PYTHON_LIBS]) -- AC_SUBST([PYTHON_VERSION]) -- AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time]) -- ],[ -- AC_MSG_WARN([python $PYTHON_VERSION not found]) -- ]) -- ]) -- AC_MSG_CHECKING([Python prefix]) -- PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"` -- AC_MSG_RESULT([$PYTHON_PREFIX]) -+ -+ AC_MSG_CHECKING([for Python include path]) -+ if test -z "$PYTHON_INCLUDEDIR"; then -+ python_path=`$PYTHON -c "import distutils.sysconfig; \ -+ print (distutils.sysconfig.get_python_inc ());"` -+ PYTHON_INCLUDEDIR=$python_path -+ fi -+ AC_MSG_RESULT([$PYTHON_INCLUDEDIR]) - - AC_ARG_WITH([python-installdir], - [AS_HELP_STRING([--with-python-installdir], -@@ -1099,11 +1093,12 @@ AS_IF([test "x$enable_python" != "xno"],[ - - AC_SUBST(PYTHON_PREFIX) - AC_SUBST(PYTHON_VERSION) -+ AC_SUBST(PYTHON_INCLUDEDIR) - AC_SUBST(PYTHON_INSTALLDIR) - AC_SUBST(PYTHON_EXT_SUFFIX) - ]) - AM_CONDITIONAL([HAVE_PYTHON], -- [test "x$PYTHON" != "xno" && test "x$PYTHON_LIBS" != "x" ]) -+ [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"]) - - dnl Check for Ruby and rake (optional, for Ruby bindings). - AC_ARG_ENABLE([ruby], -diff --git a/python/Makefile.am b/python/Makefile.am -index e9a9b85..2caa07f 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -40,7 +40,7 @@ libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c - - libguestfsmod_la_CPPFLAGS = \ - -DGUESTFS_PRIVATE=1 \ -- $(PYTHON_CFLAGS) \ -+ -I$(PYTHON_INCLUDEDIR) \ - -I$(top_srcdir)/src -I$(top_builddir)/src - - libguestfsmod_la_CFLAGS = \ --- -1.7.4.1 - diff --git a/0034-RHEL-5-Don-t-use-truncate-command-in-tests.patch b/0034-RHEL-5-Don-t-use-truncate-command-in-tests.patch deleted file mode 100644 index 7ec84d1..0000000 --- a/0034-RHEL-5-Don-t-use-truncate-command-in-tests.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d35729d68445dd8f5183cc9e6fb438ce61e037a2 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 18 Oct 2013 09:12:40 +0100 -Subject: [PATCH 34/35] RHEL 5: Don't use 'truncate' command in tests. - -Use 'guestfish sparse' instead, which is roughly equivalent. - -See commit ef1514aa1e0a099d71cbb7d2c5f24f9f32e1939d -and commit 39df80dcc0e485e69048bddbf33c259ce532e50d. -(cherry picked from commit 18c93ac61f8f5a0059d8ceda37f963ad4c06d19d) ---- - tests/data/Makefile.am | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index b8f76b2..586e7ec 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -135,21 +135,21 @@ $(builddir)/abssymlink: - # Blank disk images in various sizes and formats. - $(builddir)/blank-disk-1s.raw: - rm -f $@ -- truncate -s 512 $@ -+ ../../fish/guestfish sparse $@ 512 - - $(builddir)/blank-disk-1s.qcow2: - qemu-img create -f qcow2 $@ 512 - - $(builddir)/blank-disk-1K.raw: - rm -f $@ -- truncate -s 1K $@ -+ ../../fish/guestfish sparse $@ 1K - - $(builddir)/blank-disk-1K.qcow2: - qemu-img create -f qcow2 $@ 1K - - $(builddir)/blank-disk-1M.raw: - rm -f $@ -- truncate -s 1M $@ -+ ../../fish/guestfish sparse $@ 1M - - $(builddir)/blank-disk-1M.qcow2: - qemu-img create -f qcow2 $@ 1M --- -1.7.4.1 - diff --git a/0035-EPEL-5-qemu-img-in-RHEL-5-doesn-t-let-you-create-512.patch b/0035-EPEL-5-qemu-img-in-RHEL-5-doesn-t-let-you-create-512.patch deleted file mode 100644 index f7f44e1..0000000 --- a/0035-EPEL-5-qemu-img-in-RHEL-5-doesn-t-let-you-create-512.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 9e582f9cf4818cc67c46b5408e36cb313c9c58f1 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones <rjones@redhat.com> -Date: Fri, 18 Oct 2013 19:43:53 +0100 -Subject: [PATCH 35/35] EPEL 5: qemu-img in RHEL 5 doesn't let you create 512 byte qcow2 image. - -I checked the source of qemu-img and this is not possible to create. ---- - generator/actions.ml | 6 ------ - tests/data/Makefile.am | 4 ---- - 2 files changed, 0 insertions(+), 10 deletions(-) - -diff --git a/generator/actions.ml b/generator/actions.ml -index cabf2f0..cd0d49b 100644 ---- a/generator/actions.ml -+++ b/generator/actions.ml -@@ -2428,8 +2428,6 @@ data." }; - InitEmpty, Always, TestOutput ( - [["disk_format"; "../data/blank-disk-1s.raw"]], "raw"); - InitEmpty, Always, TestOutput ( -- [["disk_format"; "../data/blank-disk-1s.qcow2"]], "qcow2"); -- InitEmpty, Always, TestOutput ( - [["disk_format"; "../data/blank-disk-1K.raw"]], "raw"); - InitEmpty, Always, TestOutput ( - [["disk_format"; "../data/blank-disk-1K.qcow2"]], "qcow2"); -@@ -2458,8 +2456,6 @@ See also: L<guestfs(3)/DISK IMAGE FORMATS>" }; - InitEmpty, Always, TestOutputInt ( - [["disk_virtual_size"; "../data/blank-disk-1s.raw"]], 512); - InitEmpty, Always, TestOutputInt ( -- [["disk_virtual_size"; "../data/blank-disk-1s.qcow2"]], 512); -- InitEmpty, Always, TestOutputInt ( - [["disk_virtual_size"; "../data/blank-disk-1K.raw"]], 1024); - InitEmpty, Always, TestOutputInt ( - [["disk_virtual_size"; "../data/blank-disk-1K.qcow2"]], 1024); -@@ -2485,8 +2481,6 @@ circumstances. See L<guestfs(3)/CVE-2010-3851>." }; - InitEmpty, Always, TestOutputFalse ( - [["disk_has_backing_file"; "../data/blank-disk-1s.raw"]]); - InitEmpty, Always, TestOutputFalse ( -- [["disk_has_backing_file"; "../data/blank-disk-1s.qcow2"]]); -- InitEmpty, Always, TestOutputFalse ( - [["disk_has_backing_file"; "../data/blank-disk-1K.raw"]]); - InitEmpty, Always, TestOutputFalse ( - [["disk_has_backing_file"; "../data/blank-disk-1K.qcow2"]]); -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index 586e7ec..9c78881 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -75,7 +75,6 @@ images_files_build = \ - $(builddir)/10klines \ - $(builddir)/abssymlink \ - $(builddir)/blank-disk-1s.raw \ -- $(builddir)/blank-disk-1s.qcow2 \ - $(builddir)/blank-disk-1K.raw \ - $(builddir)/blank-disk-1K.qcow2 \ - $(builddir)/blank-disk-1M.raw \ -@@ -137,9 +136,6 @@ $(builddir)/blank-disk-1s.raw: - rm -f $@ - ../../fish/guestfish sparse $@ 512 - --$(builddir)/blank-disk-1s.qcow2: -- qemu-img create -f qcow2 $@ 512 -- - $(builddir)/blank-disk-1K.raw: - rm -f $@ - ../../fish/guestfish sparse $@ 1K --- -1.7.4.1 - diff --git a/README.EPEL-5 b/README.EPEL-5 deleted file mode 100644 index d948217..0000000 --- a/README.EPEL-5 +++ /dev/null @@ -1,151 +0,0 @@ -libguestfs for EPEL 5 -===================== -by Richard W.M. Jones <rjones@redhat.com> - - -This package contains modern libguestfs for EPEL 5. Although -libguestfs is supplied in RHEL 5, the version supplied is very old and -is only intended to be used with virt-v2v from RHEL 5. It is only -available in the RHEL-5-V2V channel. - -Therefore there exists a need for a modern libguestfs for RHEL 5 -users. This package supplies this through the community-supported -EPEL repository. - - -(1) Installation ----------------- - -After enabling the EPEL repository, install libguestfs in the normal -way using yum. It appears that yum from RHEL 5 cannot resolve the -complicated upgrade from old libguestfs to this version, so you may -need to do: - - yum remove libguestfs # remove old packages - yum install libguestfs [etc] - -Note that only x86-64 packages are available. 32 bit packages cannot -be supplied because there is no 32 bit KVM on RHEL 5. - -No post-installation configuration should be needed. - -You must have a non-Xen kernel installed on the host. Note that the -non-Xen kernel just needs to be installed, it does *not* need to be -running (you can run libguestfs under Xen if you want). The non-Xen -kernel is used to boot the libguestfs appliance. - -You must use this package together with the version of qemu-kvm from -RHEL 5 (usually called 'kvm-83-NNN.el5'). Alternate versions of qemu, -KVM, using $LIBGUESTFS_QEMU or QEMU wrappers, will probably not work. - -Hardware virtualization will greatly improve the performance of -libguestfs, but it is not required. libguestfs cannot use hardware -virtualization when run in a Xen domain (not even dom0). For more -performance tips, read guestfs-performance(1). - - -(2) Getting help ----------------- - -This package is supported voluntarily by the EPEL community and by the -upstream libguestfs maintainers. - -It is *not* supported by Red Hat. - -It *cannot* be used with the virt-v2v package from RHEL 5. If you -need to use virt-v2v on RHEL 5, use the libguestfs package from the -same RHN channel. However we would advise you to use RHEL 6 or later -because that version of virt-v2v is substantially more powerful. - -To get help with this package, contact the libguestfs maintainers. -See http://libguestfs.org for links to the mailing list, IRC, and how -to file bugs. - - -(3) Features not available --------------------------- - -The following features are not compatible with RHEL 5 and have been -either removed completely or disabled: - - - PHP bindings - - - GObject, GObject introspection, anything that uses GObject - Introspection such as the Javascript bindings - - - Erlang bindings - - - The btrfs filesystem. - - - guestfs_fstrim - - - guestfs_wipefs - - - Various APIs that take UUIDs (eg. guestfs_mkswap_U) - - - virtio-scsi - - - Internationalization of any non-C programs. - - - Japanese and Ukrainian man pages. - - - guestfs_vfs_label cannot read labels from NTFS filesystems. - - - guestfs_blkid may return fewer fields than expected on a more modern - Linux system. - - - guestfs_txz_in and guestfs_txz_out are not implemented. - - - guestfs_utimens doesn't let you set the time on a symbolic link (this - is a limitation of the RHEL 5 kernel). - - - guestfs_mkswap_label followed by guestfs_swapon_label does not work. - The reasons are not well understood. - - - Adding drives using non-virtio-blk interfaces. - - - The 'ntfsclone_*' APIs only partially work. In particular, - the 'metadataonly' flag is not working, and maybe other parts - of this API won't work. - - -(4) Features that may not work ------------------------------- - -The following features may not work fully in this version of libguestfs: - - - LUKS (encrypted filesystems within guests) - - - MD (RAID devices within guests) - - - FUSE, guestmount, the mount-local API. These appear to have some - problems because of the older version of FUSE in RHEL 5. - - - virt-sysprep '--script' option (because it requires FUSE). - - -(5) Other notes ---------------- - -An artificial pause of 1 second has been added after unmounting any -filesystem. - -*Without* the 1 second pause, the following test case will fail -sometimes: - - guestfish <<EOF - sparse test1.img 1G - run - part-disk /dev/sda mbr - mkfs msdos /dev/sda1 - mount /dev/sda1 / - touch /foo - umount / - mkfs ntfs /dev/sda1 - # Next command would fail: - mount /dev/sda1 / - vfs-type /dev/sda1 -x - EOF - -With the 1 second pause, this case passes. The reason is not -understood. diff --git a/bootstrap b/bootstrap deleted file mode 100755 index 931646b..0000000 --- a/bootstrap +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -usage() { - echo >&2 "\ -Usage: $0 [OPTION]... -Bootstrap this package from the checked-out sources. -" -} - -for option -do - case $option in - --help) - usage - exit;; - *) - echo >&2 "$0: $option: unknown option" - exit 1;; - esac -done - -# Get gnulib files. - -echo "$0: getting gnulib files..." -git submodule init || exit $? -git submodule update || exit $? -GNULIB_SRCDIR=.gnulib - -# Autoreconf runs aclocal before libtoolize, which causes spurious -# warnings if the initial aclocal is confused by the libtoolized -# (or worse out-of-date) macro directory. -libtoolize --copy --install - -gnulib_tool=$GNULIB_SRCDIR/gnulib-tool -<$gnulib_tool || exit - -(cd daemon && mkdir -p tests lib && ../$gnulib_tool --update) - -modules=' -accept4 -arpa_inet -byteswap -c-ctype -cloexec -closeout -connect -dup3 -error -filevercmp -fstatat -fsusage -fts -full-read -full-write -futimens -getaddrinfo -getline -gitlog-to-changelog -glob -gnu-make -gnumakefile -hash -hash-pjw -human -ignore-value -lock -maintainer-makefile -manywarnings -memmem -mkdtemp -mkstemps -netdb -netinet_in -openat -perror -pipe2 -pread -progname -read-file -readlink -select -setenv -sleep -socket -stat-time -strchrnul -strerror -strndup -symlinkat -sys_select -sys_wait -vasprintf -vc-list-files -warnings -xalloc -xalloc-die -xstrtol -xstrtoll -xvasprintf -' - -# If any tests fail, avoid including them by adding them to -# this list. -avoid="--avoid=dummy --avoid=getlogin_r-tests" - -$gnulib_tool \ - $avoid \ - --with-tests \ - --m4-base=m4 \ - --source-base=gnulib/lib \ - --tests-base=gnulib/tests \ - --libtool \ - --import $modules - -# Disable autopoint and libtoolize, since they were already done above. -AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install diff --git a/bump-and-build.sh b/bump-and-build.sh deleted file mode 100755 index 975db37..0000000 --- a/bump-and-build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - - -set -e - -rpmdev-bumpspec -c "- Bump and rebuild." libguestfs.spec -git diff ||: -echo "Press ENTER to commit, push and rebuild." -read line -fedpkg commit -m "Bump and rebuild." -p -fedpkg build diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..7250b48 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-11-20: Retired because it depends on rubygem-flexmock, which was +retired, because it was orphaned for more than six weeks. + diff --git a/dot-gitmodules b/dot-gitmodules deleted file mode 100644 index 7acb1ea..0000000 --- a/dot-gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "gnulib"] - path = .gnulib - url = git://git.sv.gnu.org/gnulib.git diff --git a/libguestfs-find-requires.sh b/libguestfs-find-requires.sh deleted file mode 100755 index 3b34cf9..0000000 --- a/libguestfs-find-requires.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# Additional custom requires for libguestfs package. - -original_find_requires="$1" -shift - -# Get the list of files. -files=`sed "s/['\"]/\\\&/g"` - -# Use ordinary find-requires first. -echo $files | tr [:blank:] '\n' | $original_find_requires - -# Is supermin.d/hostfiles included in the list of files? -hostfiles=`echo $files | tr [:blank:] '\n' | grep 'supermin\.d/hostfiles$'` - -if [ -z "$hostfiles" ]; then - exit 0 -fi - -# Generate extra requires for libraries listed in hostfiles. -sofiles=`grep 'lib.*\.so\.' $hostfiles | fgrep -v '*' | sed 's|^\.||'` -for f in $sofiles; do - if [ -f "$f" ]; then - echo "$f" - fi -done diff --git a/libguestfs.spec b/libguestfs.spec deleted file mode 100644 index c9a5373..0000000 --- a/libguestfs.spec +++ /dev/null @@ -1,2625 +0,0 @@ -# If you have trouble building locally ('make local') try adding -# %libguestfs_buildnet 1 -# to your ~/.rpmmacros file. - -# Enable to build using a network repo -# Default is disabled -%if %{defined libguestfs_buildnet} -%global buildnet %{libguestfs_buildnet} -%else -%global buildnet 0 -%endif - -# Enable to run tests during check -# Default is enabled -%if %{defined libguestfs_runtests} -%global runtests %{libguestfs_runtests} -%else -%global runtests 1 -%endif - -Summary: Access and modify virtual machine disk images -Name: libguestfs -Epoch: 1 -Version: 1.20.12 -Release: 1%{?dist} -License: LGPLv2+ -Group: Development/Libraries -URL: http://libguestfs.org/ -Source0: http://libguestfs.org/download/1.19-development/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -# KVM is only available on x86-64. -ExclusiveArch: x86_64 - -# We have to add a gnulib module (in a patch below), so this means we -# need to bundle the whole gnulib sources. In theory the gnulib -# utimensat module could go upstream, but the license is incompatible -# (GPL, not LGPLv2+). -Source10: bootstrap -Source11: dot-gitmodules -Source12: gnulib-4a8c422f.tar.gz - -BuildRequires: autoconf, automake, libtool - -# These patches come from the "oldlinux" branch upstream. -# https://github.com/libguestfs/libguestfs/commits/oldlinux -Patch0001: 0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch -Patch0002: 0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch -Patch0003: 0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch -Patch0004: 0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch -Patch0005: 0005-EPEL-5-Remove-Erlang-bindings.patch -Patch0006: 0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch -Patch0007: 0007-EPEL-5-Remove-PHP-bindings.patch -Patch0008: 0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch -Patch0009: 0009-EPEL-5-Add-gnulib-utimensat-module.patch -Patch0010: 0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch -Patch0011: 0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch -Patch0012: 0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch -Patch0013: 0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch -Patch0014: 0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch -Patch0015: 0015-EPEL-5-Disable-libvirt-attach-method.patch -Patch0016: 0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch -Patch0017: 0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch -Patch0018: 0018-EPEL-5-Remove-Fedora-MD-test-images.patch -Patch0019: 0019-EPEL-5-Add-mkisofs-to-package-list.patch -Patch0020: 0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch -Patch0021: 0021-EPEL-5-podwrapper-Remove-HTML-output.patch -Patch0022: 0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch -Patch0023: 0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch -Patch0024: 0024-EPEL-5-Don-t-use-sgabios.patch -Patch0025: 0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch -Patch0026: 0026-EPEL-5-Disable-tar-xz-test.patch -Patch0027: 0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch -Patch0028: 0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch -Patch0029: 0029-EPEL-5-No-libtoolize-install-option.patch -Patch0030: 0030-EPEL-5-Disable-valgrind.patch -Patch0031: 0031-EPEL-5-Remove-Linux-capabilities.patch -Patch0032: 0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch -Patch0033: 0033-EPEL-5-Revert-Use-pkg-config-for-Python.patch -Patch0034: 0034-RHEL-5-Don-t-use-truncate-command-in-tests.patch -Patch0035: 0035-EPEL-5-qemu-img-in-RHEL-5-doesn-t-let-you-create-512.patch - -# Basic build requirements: -BuildRequires: /usr/bin/pod2man -BuildRequires: /usr/bin/pod2text -BuildRequires: febootstrap >= 3.20 -BuildRequires: hivex-devel >= 1.2.7-7 -BuildRequires: perl-hivex -BuildRequires: augeas-devel >= 0.5.0 -BuildRequires: readline-devel -BuildRequires: mkisofs -BuildRequires: libxml2-devel -BuildRequires: kvm -BuildRequires: createrepo -BuildRequires: libselinux-devel -BuildRequires: fuse-devel -BuildRequires: pcre-devel -BuildRequires: libvirt-devel -BuildRequires: gperf -BuildRequires: db4-utils -BuildRequires: cpio -BuildRequires: ocaml -BuildRequires: ocaml-findlib-devel -BuildRequires: netpbm-progs -BuildRequires: perl-XML-XPath -BuildRequires: gettext-devel - -# This is only needed for RHEL 5 because readline-devel doesn't -# properly depend on it, but doesn't do any harm on other platforms: -BuildRequires: ncurses-devel - -# Build requirements for the appliance. -# sed 's/^ *//' < appliance/packagelist | sort -BuildRequires: acl -BuildRequires: attr -BuildRequires: augeas-libs -BuildRequires: bash -BuildRequires: binutils -BuildRequires: coreutils -BuildRequires: cpio -BuildRequires: cryptsetup -BuildRequires: diffutils -BuildRequires: dosfstools -BuildRequires: e2fsprogs -BuildRequires: e4fsprogs -BuildRequires: file -BuildRequires: findutils -BuildRequires: gawk -BuildRequires: gfs2-utils -#BuildRequires: gfs-utils -BuildRequires: grep -#%ifarch %{ix86} x86_64 -#BuildRequires: grub -#%endif -BuildRequires: gzip -BuildRequires: iproute -BuildRequires: iputils -BuildRequires: kernel -BuildRequires: libselinux -BuildRequires: libxml2 -BuildRequires: lsof -BuildRequires: lvm2 -BuildRequires: lzop -BuildRequires: mdadm -BuildRequires: module-init-tools -BuildRequires: ntfs-3g -%ifarch %{ix86} x86_64 -BuildRequires: ntfsprogs -%endif -BuildRequires: parted -BuildRequires: procps -BuildRequires: psmisc -BuildRequires: scrub -BuildRequires: strace -BuildRequires: tar -BuildRequires: udev -BuildRequires: util-linux -BuildRequires: vim-minimal -BuildRequires: xz -BuildRequires: zerofree -# Not supported on ARM http://zfs-fuse.net/issues/94 -%ifnarch %{arm} -BuildRequires: zfs-fuse -%endif - -# Must match the above set of BuildRequires exactly! -Requires: acl -Requires: attr -Requires: augeas-libs -Requires: bash -Requires: binutils -Requires: coreutils -Requires: cpio -Requires: cryptsetup -Requires: diffutils -Requires: dosfstools -Requires: e2fsprogs -Requires: e4fsprogs -Requires: file -Requires: findutils -Requires: gawk -Requires: gfs2-utils -#Requires: gfs-utils -Requires: grep -#%ifarch %{ix86} x86_64 -#Requires: grub -#%endif -Requires: gzip -Requires: iproute -Requires: iputils -Requires: kernel -Requires: libselinux -Requires: libxml2 -Requires: lsof -Requires: lvm2 -Requires: lzop -Requires: mdadm -Requires: module-init-tools -Requires: ntfs-3g -%ifarch %{ix86} x86_64 -Requires: ntfsprogs -%endif -Requires: parted -Requires: procps -Requires: psmisc -Requires: scrub -Requires: strace -Requires: tar -Requires: udev -Requires: util-linux -Requires: vim-minimal -Requires: xz -Requires: zerofree -# Not supported on ARM http://zfs-fuse.net/issues/94 -%ifnarch %{arm} -Requires: zfs-fuse -%endif - -# These are only required if you want to build the bindings for -# different languages: -BuildRequires: perl-Test-Pod -BuildRequires: perl-Test-Pod-Coverage -BuildRequires: perl-String-ShellQuote -BuildRequires: perl-XML-Writer -BuildRequires: perl-libintl -BuildRequires: python-devel -BuildRequires: ruby-devel -BuildRequires: rubygem-rake -BuildRequires: rubygem(minitest) -BuildRequires: ruby-irb -BuildRequires: java >= 1.5.0 -BuildRequires: jpackage-utils -BuildRequires: java-devel - -# For libguestfs-tools: -BuildRequires: perl-Sys-Virt -BuildRequires: qemu-img - -# For patch management. -BuildRequires: git - -# Runtime requires: -Requires: kvm -Requires: febootstrap-supermin-helper >= 3.20 - -# For libguestfs-test-tool. -Requires: mkisofs - -# For core inspection API. -Requires: db4-utils -Requires: netpbm-progs - -# For core mount-local (FUSE) API. -Requires: fuse - -# Provide our own custom requires for the supermin appliance. -Source1: libguestfs-find-requires.sh -%global _use_internal_dependency_generator 0 -%global __find_provides /usr/lib/rpm/find-provides -%global __find_requires %{SOURCE1} /usr/lib/rpm/find-requires - -# Replacement README file for EL5 users. -Source4: README.EPEL-5 - -# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions -Provides: bundled(gnulib) - - -%description -Libguestfs is a library for accessing and modifying guest disk images. -Amongst the things this is good for: making batch configuration -changes to guests, getting disk used/free statistics (see also: -virt-df), migrating between virtualization systems (see also: -virt-p2v), performing partial backups, performing partial guest -clones, cloning guests and changing registry/UUID/hostname info, and -much else besides. - -Libguestfs uses Linux kernel and qemu code, and can access any type of -guest filesystem that Linux and qemu can, including but not limited -to: ext2/3/4, FAT and NTFS, LVM, many different disk partition -schemes, qcow, qcow2, vmdk. - -Libguestfs provides ways to enumerate guest storage (eg. partitions, -LVs, what filesystem is in each LV, etc.). It can also run commands -in the context of the guest. - -Libguestfs is a library that can be linked with C and C++ management -programs. - -For high level virt tools, guestfish (shell scripting and command line -access), and guestmount (mount guest filesystems using FUSE), install -'%{name}-tools'. - -For shell scripting and command line access, install 'guestfish'. - -To mount guest filesystems on the host using FUSE, install -'%{name}-mount'. - -For Java bindings, install 'libguestfs-java-devel'. - -For OCaml bindings, install 'ocaml-libguestfs-devel'. - -For Perl bindings, install 'perl-Sys-Guestfs'. - -For Python bindings, install 'python-libguestfs'. - -For Ruby bindings, install 'ruby-libguestfs'. - - -%package devel -Summary: Development tools and libraries for %{name} -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: pkgconfig - -# For libguestfs-make-fixed-appliance. -Requires: xz -Requires: libguestfs-tools-c - - -%description devel -%{name}-devel contains development tools and libraries -for %{name}. - - -%package tools-c -Summary: System administration tools for virtual machines -Group: Development/Tools -License: GPLv2+ -Requires: %{name} = %{epoch}:%{version}-%{release} - -# for guestfish: -#Requires: /usr/bin/emacs #theoretically, but too large -Requires: /usr/bin/hexedit -Requires: /usr/bin/less -Requires: /usr/bin/man -Requires: /bin/vi - -# for virt-sparsify: -Requires: qemu-img - -# Obsolete and replace earlier packages. -Provides: guestfish = %{epoch}:%{version}-%{release} -Obsoletes: guestfish < %{epoch}:%{version}-%{release} -Provides: libguestfs-mount = %{epoch}:%{version}-%{release} -Obsoletes: libguestfs-mount < %{epoch}:%{version}-%{release} - - -%description tools-c -This package contains miscellaneous system administrator command line -tools for virtual machines. - -Note that you should install %{name}-tools (which pulls in -this package). This package is only used directly when you want -to avoid dependencies on Perl. - - -%package tools -Summary: System administration tools for virtual machines -Group: Development/Tools -License: GPLv2+ -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-tools-c = %{epoch}:%{version}-%{release} - -# NB: Only list deps here which are not picked up automatically. -Requires: perl(Sys::Virt) -Requires: perl(String::ShellQuote) -Requires: perl(XML::Writer) -Requires: perl(Win::Hivex) >= 1.2.7 - -# for virt-make-fs: -Requires: qemu-img - - -%description tools -This package contains miscellaneous system administrator command line -tools for virtual machines. - -Guestfish is the Filesystem Interactive SHell, for accessing and -modifying virtual machine disk images from the command line and shell -scripts. - -The guestmount command lets you mount guest filesystems on the host -using FUSE and %{name}. - -Virt-alignment-scan scans virtual machines looking for partition -alignment problems. - -Virt-cat is a command line tool to display the contents of a file in a -virtual machine. - -Virt-copy-in and virt-copy-out are command line tools for uploading -and downloading files and directories to and from virtual machines. - -Virt-df is a command line tool to display free space on virtual -machine filesystems. Unlike other tools, it doesn’t just display the -amount of space allocated to a virtual machine, but can look inside -the virtual machine to see how much space is really being used. It is -like the df(1) command, but for virtual machines, except that it also -works for Windows virtual machines. - -Virt-edit is a command line tool to edit the contents of a file in a -virtual machine. - -Virt-filesystems is a command line tool to display the filesystems, -partitions, block devices, LVs, VGs and PVs found in a disk image -or virtual machine. It replaces the deprecated programs -virt-list-filesystems and virt-list-partitions with a much more -capable tool. - -Virt-format is a command line tool to erase and make blank disks. - -Virt-inspector examines a virtual machine and tries to determine the -version of the OS, the kernel version, what drivers are installed, -whether the virtual machine is fully virtualized (FV) or -para-virtualized (PV), what applications are installed and more. - -Virt-ls is a command line tool to list out files in a virtual machine. - -Virt-make-fs is a command line tool to build a filesystem out of -a collection of files or a tarball. - -Virt-rescue provides a rescue shell for making interactive, -unstructured fixes to virtual machines. - -Virt-resize can resize existing virtual machine disk images. - -Virt-sparsify makes virtual machine disk images sparse (thin-provisioned). - -Virt-sysprep lets you reset or unconfigure virtual machines in -preparation for cloning them. - -Virt-tar-in and virt-tar-out are archive, backup and upload tools -for virtual machines. These replace the deprecated program virt-tar. - -Virt-win-reg lets you look at and modify the Windows Registry of -Windows virtual machines. - - -%package -n ocaml-%{name} -Summary: OCaml bindings for %{name} -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} - - -%description -n ocaml-%{name} -ocaml-%{name} contains OCaml bindings for %{name}. - -This is for toplevel and scripting access only. To compile OCaml -programs which use %{name} you will also need ocaml-%{name}-devel. - - -%package -n ocaml-%{name}-devel -Summary: OCaml bindings for %{name} -Group: Development/Libraries -Requires: ocaml-%{name} = %{epoch}:%{version}-%{release} - - -%description -n ocaml-%{name}-devel -ocaml-%{name}-devel contains development libraries -required to use the OCaml bindings for %{name}. - - -%package -n perl-Sys-Guestfs -Summary: Perl bindings for %{name} (Sys::Guestfs) -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# RHBZ#523547 -Requires: perl(XML::XPath) -# RHBZ#652587 - for backwards compat with the old name -Provides: perl-%{name} = %{epoch}:%{version}-%{release} -Obsoletes: perl-%{name} < %{epoch}:%{version}-%{release} - - -%description -n perl-Sys-Guestfs -perl-Sys-Guestfs contains Perl bindings for %{name} (Sys::Guestfs). - - -%package -n python-%{name} -Summary: Python bindings for %{name} -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} - -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%description -n python-%{name} -python-%{name} contains Python bindings for %{name}. - - -%package -n ruby-%{name} -Summary: Ruby bindings for %{name} -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: ruby -Provides: ruby(guestfs) = %{version} - -%description -n ruby-%{name} -ruby-%{name} contains Ruby bindings for %{name}. - - -%package java -Summary: Java bindings for %{name} -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: java >= 1.5.0 -Requires: jpackage-utils - -%description java -%{name}-java contains Java bindings for %{name}. - -If you want to develop software in Java which uses %{name}, then -you will also need %{name}-java-devel. - - -%package java-devel -Summary: Java development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-java = %{epoch}:%{version}-%{release} - -%description java-devel -%{name}-java-devel contains the tools for developing Java software -using %{name}. - -See also %{name}-javadoc. - - -%package javadoc -Summary: Java documentation for %{name} -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-java = %{epoch}:%{version}-%{release} -Requires: jpackage-utils - -%description javadoc -%{name}-javadoc contains the Java documentation for %{name}. - - -%prep -%setup -q - -cp %{SOURCE10} bootstrap -cp %{SOURCE11} .gitmodules -zcat %{SOURCE12} | tar xf - - -git init -git config user.email "libguestfs@example.com" -git config user.name "Libguestfs Developers" -git add . -git commit -a -q -m "%{version} baseline." -# RHEL 5 RPM doesn't have %{patches} macro. -#git am %{patches} -git am %{_sourcedir}/00*.patch - -./bootstrap - -mkdir -p daemon/m4 - -# Replace developer-specific README that ships with libguestfs, with -# our replacement file. -mv README README.orig -sed 's/@VERSION@/%{version}/g' < %{SOURCE4} > README - -# Remove RPM database files from the tarball which have a newer -# version than RHEL 5's db_dump can handle. These files will be -# rebuilt during the build. -rm tests/guests/guest-aux/fedora-name.db -rm tests/guests/guest-aux/fedora-packages.db - - -%build -%if %{buildnet} -%define extra %{nil} -%else -mkdir repo -find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 cp -t repo -createrepo repo -cat > yum.conf <<EOF -[main] -cachedir=/var/cache/yum -debuglevel=1 -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -reposdir=/dev/null -# The installroot line is required for EPEL 5. Long story. On the -# Koji builders, the host rpm is used to create the mock chroot in -# which we run. Unfortunately host rpm database is incompatible with -# the old rpm used by the guest (RHEL 5). When yum (via rpmlib) tries -# to read /var/lib/rpm/Packages, it fails because of this -# incompatibility. However we don't really care about this (it's just -# needed so that yum can decide this is "5Server" which we never even -# use). By using an installroot directory we force guest rpm to -# rebuild the rpm database in /tmp/var/lib/rpm, and everything then -# works. -installroot=/tmp - -[local] -name=local -baseurl=file://$(pwd)/repo -failovermethod=priority -enabled=1 -gpgcheck=0 -EOF -%define extra --with-febootstrap-yum-config=$(pwd)/yum.conf -echo "==== /etc/yum.conf ====" -cat /etc/yum.conf -echo "==== our yum.conf ====" -cat yum.conf -%endif - -./configure \ - --prefix=%{_prefix} --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --sysconfdir=%{_sysconfdir} \ - --with-qemu="qemu-kvm" \ - %{extra} || { - echo "==== config.log ====" - cat config.log - exit 1 -} - -echo "==== config.log ====" -cat config.log - -# 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir -# not the site dir. -make V=1 INSTALLDIRS=vendor %{?_smp_mflags} - -# Useful for debugging appliance problems. -for f in appliance/supermin.d/*.img; do - b=`basename $f` - echo "==== $b ====" - ls -l $f - cpio -itv < $f -done -echo "==== hostfiles ====" -ls -l appliance/supermin.d/hostfiles -cat appliance/supermin.d/hostfiles -echo "======================================================================" - - -%check -# Enable debugging - very useful if a test does fail, although -# it produces masses of output in the build.log. -export LIBGUESTFS_DEBUG=1 - -# Enable trace. Since libguestfs 1.9.7 this produces 'greppable' -# output even when combined with trace (see RHBZ#673477). -export LIBGUESTFS_TRACE=1 - -# This test fails because we build the ISO after encoding the checksum -# of the ISO in the test itself. Need to fix the test to work out the -# checksum at runtime. -export SKIP_TEST_CHECKSUM_DEVICE=1 - -export SKIP_TEST_LAUNCH_RACE_PL=1 - -# LUKS, MD not supported. -export SKIP_TEST_LUKS_SH=1 -export SKIP_TEST_INSPECT_FSTAB_MD_SH=1 -export SKIP_TEST_LIST_MD_DEVICES_SH=1 -export SKIP_TEST_MDADM_SH=1 -export SKIP_TEST_LIST_FILESYSTEMS_SH=1 - -# ntfsclone --metadata not supported. -export SKIP_TEST_NTFSCLONE_SH=1 - -# IDE interface not supported. -export SKIP_TEST_RHBZ690819_SH=1 - -# FUSE is only partially working, and in any case we cannot do any -# tests in RHEL 5 because it requires the current user to be added -# to the 'fuse' group, which we can't do in Koji. -export SKIP_TEST_FUSE_SH=1 -export SKIP_TEST_MOUNT_LOCAL_SH=1 -export SKIP_TEST_SELINUX_XATTRS_FUSE=1 -export SKIP_TEST_SELINUX_SELINUX_FUSE=1 -export SKIP_TEST_VIRT_SYSPREP_SCRIPT_SH=1 -export SKIP_TEST_GUESTFS_500_MOUNT_LOCAL_ML=1 -export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1 - -# blkid can't read NTFS labels. -export SKIP_TEST_SET_LABEL_1=1 - -# blkid fields are different from Fedora. -export SKIP_TEST_BLKID_0=1 - -# tar doesn't support -J option, breaking this. -export SKIP_TEST_TXZ_IN=1 - -# Cannot set utimens on symbolic link. -export SKIP_TEST_UTIMENS_3=1 - -# Timing problem in this test. -export SKIP_TEST_SWAPON_LABEL=1 - -# 9p is not supported in this qemu. -export SKIP_TEST_9P_SH=1 - -# rsync doesn't work because of different IP addresses. -export SKIP_TEST_RSYNC_SH=1 - -# Disk labels not supported. -export SKIP_TEST_DISK_LABELS_PL=1 - -# acl_* operations not supported by RHEL 5 filesystems. -export SKIP_TEST_ACL_SET_FILE=1 -export SKIP_TEST_ACL_DELETE_DEF_FILE=1 - -# grub-install doesn't work. -export SKIP_TEST_GRUB_INSTALL=1 - -%if %{runtests} -make check -%endif - - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install - -# Delete static libraries, libtool files. -rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a -rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la - -find $RPM_BUILD_ROOT -name perllocal.pod -delete -find $RPM_BUILD_ROOT -name .packlist -delete -find $RPM_BUILD_ROOT -name '*.bs' -delete -find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete - -rm $RPM_BUILD_ROOT%{python_sitearch}/libguestfsmod.la - -if [ "$RPM_BUILD_ROOT%{python_sitearch}" != "$RPM_BUILD_ROOT%{python_sitelib}" ]; then - mkdir -p $RPM_BUILD_ROOT%{python_sitelib} - mv $RPM_BUILD_ROOT%{python_sitearch}/guestfs.py* \ - $RPM_BUILD_ROOT%{python_sitelib}/ -fi - -# Remove static-linked Java bindings. -rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.la - -# Move installed documentation back to the source directory so -# we can install it using a %%doc rule. -mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs - -# Find locale files. -%find_lang %{name} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc COPYING README -%{_bindir}/libguestfs-test-tool -%{_libdir}/guestfs/ -%{_libdir}/libguestfs.so.* -%{_mandir}/man1/guestfs-faq.1* -%{_mandir}/man1/guestfs-performance.1* -%{_mandir}/man1/guestfs-recipes.1* -%{_mandir}/man1/guestfs-release-notes.1* -%{_mandir}/man1/guestfs-testing.1* -%{_mandir}/man1/libguestfs-test-tool.1* - - -%files devel -%defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog HACKING TODO README ROADMAP -%doc examples/*.c -%doc installed-docs/* -%{_libdir}/libguestfs.so -%{_sbindir}/libguestfs-make-fixed-appliance -%{_mandir}/man1/libguestfs-make-fixed-appliance.1* -%{_mandir}/man3/guestfs.3* -%{_mandir}/man3/guestfs-examples.3* -%{_mandir}/man3/libguestfs.3* -%{_includedir}/guestfs.h -%{_libdir}/pkgconfig/libguestfs.pc - - -%files tools-c -%defattr(-,root,root,-) -%doc README -%config(noreplace) %{_sysconfdir}/libguestfs-tools.conf -%dir %{_sysconfdir}/bash_completion.d -%{_sysconfdir}/bash_completion.d/guestfish-bash-completion.sh -%{_bindir}/guestfish -%{_mandir}/man1/guestfish.1* -%{_bindir}/guestmount -%{_mandir}/man1/guestmount.1* -%{_bindir}/virt-alignment-scan -%{_mandir}/man1/virt-alignment-scan.1* -%{_bindir}/virt-cat -%{_mandir}/man1/virt-cat.1* -%{_bindir}/virt-copy-in -%{_mandir}/man1/virt-copy-in.1* -%{_bindir}/virt-copy-out -%{_mandir}/man1/virt-copy-out.1* -%{_bindir}/virt-df -%{_mandir}/man1/virt-df.1* -%{_bindir}/virt-edit -%{_mandir}/man1/virt-edit.1* -%{_bindir}/virt-filesystems -%{_mandir}/man1/virt-filesystems.1* -%{_bindir}/virt-format -%{_mandir}/man1/virt-format.1* -%{_bindir}/virt-inspector -%{_mandir}/man1/virt-inspector.1* -%{_bindir}/virt-ls -%{_mandir}/man1/virt-ls.1* -%{_bindir}/virt-rescue -%{_mandir}/man1/virt-rescue.1* -%{_bindir}/virt-resize -%{_mandir}/man1/virt-resize.1* -%{_bindir}/virt-sparsify -%{_mandir}/man1/virt-sparsify.1* -%{_bindir}/virt-tar-in -%{_mandir}/man1/virt-tar-in.1* -%{_bindir}/virt-tar-out -%{_mandir}/man1/virt-tar-out.1* - - -%files tools -%defattr(-,root,root,-) -%doc README -%{_bindir}/virt-list-filesystems -%{_mandir}/man1/virt-list-filesystems.1* -%{_bindir}/virt-list-partitions -%{_mandir}/man1/virt-list-partitions.1* -%{_bindir}/virt-make-fs -%{_mandir}/man1/virt-make-fs.1* -%{_bindir}/virt-sysprep -%{_mandir}/man1/virt-sysprep.1* -%{_bindir}/virt-tar -%{_mandir}/man1/virt-tar.1* -%{_bindir}/virt-win-reg -%{_mandir}/man1/virt-win-reg.1* - - -%files -n ocaml-%{name} -%defattr(-,root,root,-) -%{_libdir}/ocaml/guestfs -%exclude %{_libdir}/ocaml/guestfs/*.a -%exclude %{_libdir}/ocaml/guestfs/*.cmxa -%exclude %{_libdir}/ocaml/guestfs/*.cmx -%exclude %{_libdir}/ocaml/guestfs/*.mli -%{_libdir}/ocaml/stublibs/*.so -%{_libdir}/ocaml/stublibs/*.so.owner - - -%files -n ocaml-%{name}-devel -%defattr(-,root,root,-) -%doc ocaml/examples/*.ml -%{_libdir}/ocaml/guestfs/*.a -%{_libdir}/ocaml/guestfs/*.cmxa -%{_libdir}/ocaml/guestfs/*.cmx -%{_libdir}/ocaml/guestfs/*.mli -%{_mandir}/man3/guestfs-ocaml.3* - - -%files -n perl-Sys-Guestfs -%defattr(-,root,root,-) -%doc perl/examples -%{perl_vendorarch}/* -%{_mandir}/man3/Sys::Guestfs.3pm* -%{_mandir}/man3/Sys::Guestfs::Lib.3pm* -%{_mandir}/man3/guestfs-perl.3* - - -%files -n python-%{name} -%defattr(-,root,root,-) -%doc python/examples/*.py -%{python_sitearch}/* -%{python_sitelib}/*.py -%{python_sitelib}/*.pyc -%{python_sitelib}/*.pyo -%{_mandir}/man3/guestfs-python.3* - - -%files -n ruby-%{name} -%defattr(-,root,root,-) -%doc ruby/examples/*.rb -%doc ruby/doc/site/* -/usr/lib/ruby/site_ruby/1.8/guestfs.rb -/usr/lib64/ruby/site_ruby/1.8/x86_64-linux/_guestfs.so -%{_mandir}/man3/guestfs-ruby.3* - - -%files java -%defattr(-,root,root,-) -%{_libdir}/libguestfs_jni*.so.* -%{_datadir}/java/*.jar - - -%files java-devel -%defattr(-,root,root,-) -%{_libdir}/libguestfs_jni*.so -%{_mandir}/man3/guestfs-java.3* - - -%files javadoc -%defattr(-,root,root,-) -%{_datadir}/javadoc/%{name}-java-%{version} - - -%changelog -* Fri Oct 18 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.12-1 -- Rebase to upstream stable branch version 1.20.12. -- This contains a complete fix for CVE-2013-4419 (RHBZ#1020950). - -* Mon Jun 3 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.8-1 -- Rebase to upstream stable branch version 1.20.8. - This contains a complete fix for CVE-2013-2124. - -* Wed May 29 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.7-3 -- Rebase to upstream stable branch version 1.20.7. -- Includes fix for inspection vulnerability (RHBZ#968315). - -* Wed Mar 13 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.4-2 -- Rebase to upstream stable branch version 1.20.4. - -* Mon Mar 11 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.3-6 -- Fix various small bugs and tests. -- Remove Fedora RPM database files from the tarball. - -* Sun Mar 10 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.3-3 -- Add patch to define O_CLOEXEC in tests. -- Fix double-free bug in EPEL5-specific patch. - -* Sat Mar 9 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.3-1 -- Rebase to upstream stable branch version 1.20.3. - -* Thu Jan 31 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.37-5 -- Bump and rebuild. - -* Sat Sep 1 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.37-4 -- Upstream to 1.19.37. -- Update patches from 'oldlinux' branch. -- Skip more tests that would fail in RHEL 5. -- Require febootstrap >= 3.20. -- Add guestfs-release-notes(1). - -* Wed Jun 27 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.13-4 -- New upstream version 1.19.13. -- Update patches. -- _rpmconfigdir doesn't exist in RHEL 5, so replace with absolute path. -- ruby_* doesn't exist in RHEL 5, so replace with absolute paths. -- Remove ja and uk man pages. -- Don't install the daemon. - -* Tue Jun 26 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.12-3 -- New upstream version 1.19.12. -- Update patches. - -* Mon Jun 25 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.11-2 -- New upstream version 1.19.11. - -* Fri Jun 22 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.10-1 -- New upstream version 1.19.10. -- Rebase libguestfs in EPEL 5 to Rawhide (RHBZ#808193). - -* Mon Jun 18 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.9-1 -- New upstream version 1.19.9. - -* Thu Jun 14 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.8-1 -- New upstream version 1.19.8. - -* Thu Jun 14 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.7-2 -- New upstream version 1.19.7. -- Require febotstrap >= 3.17. - -* Wed Jun 12 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.6-2 -- Require febootstrap >= 3.16. - -* Tue Jun 12 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.6-1 -- New upstream version 1.19.6. - -* Tue Jun 12 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.6-1 -- New upstream version 1.19.6. -- This version defaults to using virtio-scsi. -- Requires qemu >= 1.0. -- Requires febootstrap >= 3.15. - -* Mon Jun 11 2012 Petr Pisar <ppisar@redhat.com> - 1:1.19.5-2 -- Perl 5.16 rebuild - -* Sat Jun 09 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.5-1 -- New upstream version 1.19.5. - -* Thu Jun 07 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.4-1 -- New upstream version 1.19.4. - -* Fri Jun 01 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.3-2 -- New upstream version 1.19.3. -- Remove patches which are now upstream. - -* Tue May 29 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.2-3 -- Remove obsolete list of bugs in make check rule. -- Remove some obsolete test workarounds. -- Disable i386 tests (because of RHBZ#825944). - -* Mon May 28 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.2-2 -- Include patches to fix udev. - -* Mon May 28 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.2-1 -- New upstream version 1.19.2. - -* Sat May 26 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.1-1 -- New upstream version 1.19.1. - -* Mon May 21 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.0-1 -- New upstream version 1.19.0. - -* Thu May 17 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.43-1 -- New upstream version 1.17.43. - -* Thu May 17 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.42-4 -- On RHEL 7 only, remove reiserfs-utils, zerofree. - -* Thu May 17 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.42-3 -- On RHEL 7 only, remove nilfs-utils. - -* Tue May 15 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.42-2 -- Bundled gnulib (RHBZ#821767). - -* Mon May 14 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.42-1 -- New upstream version 1.17.42. - -* Fri May 11 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.41-1 -- New upstream version 1.17.41. - -* Tue May 08 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.40-1 -- New upstream version 1.17.40. - -* Tue May 8 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.39-3 -- Disable hfsplus-tools on RHEL 7. - -* Thu May 03 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.39-2 -- BR perl-XML-XPath to run the new XML test. - -* Thu May 03 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.39-1 -- New upstream version 1.17.39. - -* Wed May 02 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.38-3 -- Remove explicit runtime deps for old virt-sysprep. -- Add explicit runtime dep on fuse (RHBZ#767852, thanks Pádraig Brady). -- Remove explicit versioned dep on glibc. - -* Tue May 1 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1:1.17.38-2 -- Update supported filesystems for ARM - -* Tue May 01 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.38-1 -- New upstream version 1.17.38. - -* Tue May 01 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.37-2 -- Add guestfs-faq(1) (FAQ is now a man page). - -* Tue May 01 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.37-1 -- New upstream version 1.17.37. - -* Fri Apr 27 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.36-2 -- Add upstream patch to fix installation of gobject headers. - -* Thu Apr 26 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.36-1 -- New upstream version 1.17.36. - -* Thu Apr 26 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.35-1 -- New upstream version 1.17.35. - -* Tue Apr 24 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.34-1 -- New upstream version 1.17.34. - -* Mon Apr 23 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.33-1 -- New upstream version 1.17.33. - -* Tue Apr 17 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.32-1 -- New upstream version 1.17.32. - -* Mon Apr 16 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.31-1 -- New upstream version 1.17.31. - -* Fri Apr 13 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.30-1 -- New upstream version 1.17.30. - -* Thu Apr 12 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.29-1 -- New upstream version 1.17.29. - -* Thu Apr 12 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.28-2 -- Enable ruby 1.9 patch in RHEL 7 (RHBZ#812139). - -* Thu Apr 12 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.28-1 -- New upstream version 1.17.28. - -* Wed Apr 11 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.27-2 -- Add guestfs-performance(1) manual page. - -* Tue Apr 10 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.27-1 -- New upstream version 1.17.27. - -* Tue Apr 03 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.26-1 -- New upstream version 1.17.26. - -* Mon Apr 02 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.25-1 -- New upstream version 1.17.25. - -* Sun Apr 01 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.24-1 -- New upstream version 1.17.24. - -* Sun Apr 01 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.23-1 -- New upstream version 1.17.23. - -* Fri Mar 29 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.22-2 -- Include all gobject header files. -- Include gtk-doc, and depend on the gtk-doc package at runtime. - -* Thu Mar 29 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.22-1 -- New upstream version 1.17.22. - -* Thu Mar 29 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.21-2 -- Bump and rebuild. - -* Wed Mar 21 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.21-1 -- New upstream version 1.17.21. - -* Mon Mar 19 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.20-3 -- Reenable LUKS, since RHBZ#804345 is reported to be fixed. - -* Sun Mar 18 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.20-2 -- Disable LUKS tests because LUKS is broken in Rawhide (RHBZ#804345). - -* Sat Mar 17 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.20-1 -- New upstream version 1.17.20. - -* Sat Mar 17 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.19-2 -- Add libguestfs-make-fixed-appliance (with man page). - -* Fri Mar 16 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.19-1 -- New upstream version 1.17.19. - -* Thu Mar 15 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.18-1 -- New upstream version 1.17.18. - -* Wed Mar 14 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.17-1 -- New upstream version 1.17.17. - -* Wed Mar 14 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.16-2 -- Bump and rebuild. - -* Tue Mar 13 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.16-1 -- New upstream version 1.17.16. - -* Mon Mar 12 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.15-1 -- New upstream version 1.17.15. - -* Fri Mar 09 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.14-1 -- New upstream version 1.17.14. - -* Thu Mar 08 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.13-1 -- New upstream version 1.17.13. - -* Thu Mar 08 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.12-2 -- Enable Japanese man pages, since these are in a better state upstream. - -* Wed Mar 07 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.12-1 -- New upstream version 1.17.12. - -* Wed Mar 07 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.11-2 -- Require netpbm-progs, icoutils. These are needed for icon generation - during inspection, but were not being pulled in before. - -* Mon Mar 05 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.11-1 -- New upstream version 1.17.11. - -* Sat Mar 03 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.10-2 -- New upstream version 1.17.10. -- Rebase Ruby patch against new libguestfs. - -* Wed Feb 29 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.9-1 -- New upstream version 1.17.9. - -* Wed Feb 15 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.8-1 -- New upstream version 1.17.8. - -* Mon Feb 13 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.7-1 -- New upstream version 1.17.7. - -* Fri Feb 10 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.6-1 -- +BR ruby-irb. -- Make virtio unconditional. It's been a very long time since disabling - virtio was a good idea. -- Disable some packages not available in RHEL 7. -- New upstream version 1.17.6. - -* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 1:1.17.5-3 -- Rebuild against PCRE 8.30 - -* Thu Feb 9 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.5-2 -- Rebuild with ruby(abi) = 1.9.1. - -* Wed Feb 8 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.5-1 -- New upstream version 1.17.5. -- Remove usrmove workaround patch, now upstream. - -* Wed Feb 8 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.4-8 -- Further Ruby 1.9 changes. - -* Tue Feb 07 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.4-7 -- Bump and rebuild for Ruby update. - -* Mon Feb 6 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.4-6 -- Add workaround for usrmove in Fedora. - -* Wed Feb 1 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.4-1 -- New upstream version 1.17.4. -- Remove patch now upstream. - -* Sat Jan 28 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.3-2 -- New upstream version 1.17.3. -- Remove patch now upstream. -- Add upstream patch to fix OCaml bytecode compilation. - -* Fri Jan 27 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.2-3 -- Upstream patch to work with udev >= 176. - -* Thu Jan 26 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.2-2 -- New upstream version 1.17.2. -- Use libdb-utils instead of old db4-utils. -- net-tools is no longer used; replaced by iproute (RHBZ#784647). -- Try re-enabling tests on i686. - -* Tue Jan 24 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.1-1 -- New upstream version 1.17.1. - -* Mon Jan 23 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.16.0-1 -- New upstream version 1.16.0. -- Remove patches which are now upstream. -- GObject: Move *.typelib file to base gobject package. - -* Sun Jan 22 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.19-1 -- New upstream version 1.15.19. -- +BR psmisc for the appliance. -- Includes GObject bindings in libguestfs-gobject and - libguestfs-gobject-devel subpackages. -- Include upstream patches for PHP 5.4. - -* Thu Jan 19 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.18-1 -- New upstream version 1.15.18. - -* Wed Jan 18 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.17-1 -- New upstream version 1.15.17. -- New tool: virt-format. - -* Tue Jan 10 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.16-1 -- New upstream version 1.15.16. - -* Sun Jan 8 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.15-2 -- New upstream version 1.15.15. -- Updated gnulib fixes builds with gcc 4.7. -- Rebuild for OCaml 3.12.1. -- Add explicit BR perl-hivex, required for various Perl virt tools. - -* Fri Dec 23 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.14-1 -- New upstream version 1.15.14. -- Remove three patches, now upstream. - -* Thu Dec 22 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.13-4 -- New upstream version 1.15.13. -- Fixes Security: Mitigate possible privilege escalation via SG_IO ioctl - (CVE-2011-4127, RHBZ#757071). -- Add three upstream patches to fix 'make check'. - -* Thu Dec 22 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.12-1 -- New upstream version 1.15.12. - -* Fri Dec 9 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.11-1 -- New upstream version 1.15.11. - -* Tue Dec 6 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.10-1 -- New upstream version 1.15.10. -- Remove patch, now upstream. - -* Sat Dec 3 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.9-2 -- New upstream version 1.15.9. -- Add upstream patch to fix Augeas library detection. -- Appliance explicitly requires libxml2 (because Augeas >= 0.10 requires it), - although it was implicitly included already. - -* Tue Nov 29 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.8-1 -- New upstream version 1.15.8. - -* Tue Nov 29 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.7-1 -- New upstream version 1.15.7. - -* Thu Nov 24 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.6-1 -- New upstream version 1.15.6. - -* Mon Nov 21 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.5-1 -- New upstream version 1.15.5. -- Add guestfs-testing(1) man page. - -* Thu Nov 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.4-2 -- New upstream version 1.15.4. -- Remove patch which is now upstream. -- libguestfs_jni.a is no longer built. - -* Fri Nov 11 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.3-3 -- Add upstream patch to disable part of virt-df test. - -* Thu Nov 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.3-1 -- New upstream version 1.15.3. -- Fix list of BuildRequires so they precisely match the appliance. - -* Thu Nov 3 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.2-1 -- New upstream version 1.15.2. -- ocaml-pcre is no longer required for virt-resize. -- xmlstarlet is no longer required for virt-sysprep. - -* Tue Nov 1 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.1-1 -- New upstream version 1.15.1. - -* Thu Oct 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.0-1 -- Stable branch 1.14.0 was released. This is the new development - branch version 1.15.0. - -* Wed Oct 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.26-1 -- New upstream version 1.13.26. - -* Wed Oct 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.25-1 -- New upstream version 1.13.25. - -* Mon Oct 24 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.24-1 -- New upstream version 1.13.24. -- This version includes upstream workarounds for broken qemu, so both - non-upstream patches have now been removed from Fedora. - -* Fri Oct 21 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:1.13.23-1.1 -- rebuild with new gmp without compat lib - -* Thu Oct 20 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.23-1 -- New upstream version 1.13.23. - -* Wed Oct 19 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.22-2 -- New upstream version 1.13.22. -- Remove 3x upstream patches. -- Renumber the two remaining non-upstream patches as patch0, patch1. -- Rebase patch1. - -* Mon Oct 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.21-4 -- Add upstream patch to skip FUSE tests if there is no /dev/fuse. - This allows us also to remove the Fedora-specific patch which - disabled these tests before. - -* Sat Oct 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.21-3 -- Add upstream patch to fix virt-sysprep test. - -* Fri Oct 14 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.21-2 -- New upstream version 1.13.21. -- Move virt-sysprep to libguestfs-tools, to avoid pulling in extra - dependencies for RHEV-H. This tool is not likely to be useful - for RHEV-H in its current form anyway. -- Change BR cryptsetup-luks -> cryptsetup since that package changed. - -* Wed Oct 12 2011 Peter Schiffer <pschiffe@redhat.com> - 1:1.13.20-1.1 -- rebuild with new gmp - -* Tue Oct 11 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.20-1 -- New upstream version 1.13.20. - -* Sat Oct 8 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.19-1 -- New upstream version 1.13.19. -- New tool: virt-sysprep. -- Remove the old guestfish and libguestfs-mount packages, and put these - tools into libguestfs-tools. This change is long overdue, but is also - necessitated by the new virt-sysprep tool. This new tool would pull - in guestfish anyway, so having separate packages makes no sense. -- Remove old obsoletes for virt-cat, virt-df, virt-df2 and virt-inspector, - since those packages existed only in much older Fedora. - -* Wed Oct 5 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.18-1 -- New upstream version 1.13.18. -- New tool: virt-alignment-scan. - -* Tue Oct 4 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.17-1 -- New upstream version 1.13.17. -- New tool: virt-sparsify. - -* Sat Oct 1 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.16-1 -- New upstream version 1.13.16. - -* Thu Sep 29 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.15-2 -- Rearrange description to make it clearer. -- virt-resize was written in OCaml. Move it to libguestfs-tools-c - subpackage since it doesn't require Perl. - -* Wed Sep 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.15-1 -- New upstream version 1.13.15. -- Add lzop program to the appliance (for compress-out API). -- Remove upstream patch. - -* Mon Sep 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.14-2 -- Upstream patch to fix timer check failures during boot (RHBZ#502058). - -* Sat Sep 24 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.14-1 -- New upstream version 1.13.14. - -* Wed Sep 21 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.13-1 -- Add Erlang bindings in erlang-libguestfs subpackage. -- Remove upstream patch. - -* Fri Sep 16 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.12-4 -- Don't require grub. See RHBZ#737261. -- Note this (hopefully temporarily) breaks guestfs_grub_install API. -- Include upstream patch to add guestfs_grub_install into an optional group. - -* Wed Sep 14 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.12-1 -- New upstream version 1.13.12. - -* Thu Sep 1 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.11-1 -- New upstream version 1.13.11. - -* Tue Aug 30 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.10-2 -- Remove MAKEDEV dependency (RHBZ#727247). - -* Sun Aug 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.10-1 -- New upstream version 1.13.10. - -* Fri Aug 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.9-1 -- New upstream version 1.13.9. - -* Fri Aug 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.8-1 -- New upstream version 1.13.8. -- Static python library is no longer built, so don't rm it. - -* Tue Aug 23 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.7-1 -- New upstream version 1.13.7. -- configure --with-extra version string contains Fedora release. -- Build with make V=1 to display full compile commands. -- Remove /usr/sbin PATH setting, not used for a very long time. - -* Fri Aug 19 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.6-2 -- New upstream version 1.13.6. -- Rebase non-upstream patch to fix qemu -machine option. - -* Wed Aug 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.5-1 -- New upstream version 1.13.5. - -* Thu Aug 11 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.4-1 -- New upstream version 1.13.4. - -* Mon Aug 8 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.3-4 -- New upstream version 1.13.3. -- 'test-getlogin_r.c:55: assertion failed' test must now be fixed in - gnulib/tests directory instead of daemon/tests (the latter directory - no longer exists). -- Only run testsuite on x86_64 because of qemu bug. - -* Tue Aug 2 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.2-3 -- Switch Rawhide to use the new development branch (1.13). -- New upstream version 1.13.2. -- Remove upstream patch. -- Ensure config.log is printed, even in the error case. - -* Tue Jul 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.1-4 -- New upstream stable branch version 1.12.1. -- Remove 5 x upstream patches. -- Add non-upstream patch to deal with broken qemu -machine option. -- Add upstream patch to fix segfault in OCaml bindings. - -* Tue Jul 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-11 -- Bump and rebuild. - -* Fri Jul 22 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-10 -- Rebuild against fixed hivex 1.2.7-7 in dist-f16-perl. - -* Thu Jul 21 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-9 -- Attempt rebuild in dist-f16-perl. - -* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1:1.12.0-8 -- Perl mass rebuild - -* Thu Jul 21 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-4 -- Disable tests, use quickcheck, because of RHBZ#723555, RHBZ#723822. - -* Wed Jul 20 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-2 -- Readd patch to fix virtio-serial test for qemu 0.15. - -* Wed Jul 20 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-1 -- New stable version 1.12.0 for Fedora 16. -- Remove upstream patch. -- Disable tests on i686 (because of RHBZ#723555). - -* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1:1.11.20-3 -- Perl mass rebuild - -* Tue Jul 19 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.20-2 -- Add upstream patch to fix virtio-serial test for qemu 0.15. - -* Tue Jul 19 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.20-1 -- New upstream version 1.11.20. -- Replace standard README file with one suited for Fedora. -- Add guestfs-java(3) manpage to libguestfs-java-devel package. - -* Mon Jul 18 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.19-1 -- New upstream version 1.11.19. -- Remove upstream patch. -- Add Ukrainian (uk) man pages subpackage. - -* Fri Jul 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.18-2 -- Add upstream patch to fix regression test. - -* Fri Jul 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.18-1 -- New upstream version 1.11.18. -- Force febootstrap >= 3.7 which contains a fix for latest Rawhide. -- Use --enable-install-daemon to install guestfsd. - -* Thu Jul 14 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.17-1 -- New upstream version 1.11.17. - -* Wed Jul 13 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.16-1 -- New upstream version 1.11.16. - -* Tue Jul 12 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.15-1 -- New upstream version 1.11.15. - -* Wed Jul 6 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.14-1 -- New upstream version 1.11.14. - -* Wed Jul 6 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.13-3 -- Further updates to libguestfs-live-service after feedback from - Dan Berrange and Lennart Poettering. - -* Tue Jul 5 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.13-2 -- Add libguestfs-live-service subpackage. This can be installed in - virtual machines in order to enable safe editing of files in running - guests (eg. guestfish --live). - -* Thu Jun 30 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.13-1 -- New upstream version 1.11.13. - -* Wed Jun 29 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.12-3 -- Bump and rebuild for parted 3.0. -- Depend on fixed parted >= 3.0-2. - -* Tue Jun 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.12-1 -- New upstream version 1.11.12. - -* Tue Jun 21 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.11-1 -- New upstream version 1.11.11. - -* Mon Jun 20 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.10-3 -- Temporarily stop setting CCFLAGS in perl subdirectory. - See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522 - -* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:1.11.10-2 -- Perl mass rebuild - -* Fri Jun 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.10-1 -- New upstream version 1.11.10. -- Enable tests since fix for RHBZ#710921 is in Rawhide kernel package. - -* Fri Jun 10 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:1.11.9-8 -- Perl 5.14 mass rebuild - -* Sun Jun 5 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.9-7 -- Build against new parted. -- Disable tests on i686 because of RHBZ#710921. -- Remove recipes/ doc directory. This is no longer present because it - was replaced by a guestfs-recipes(1) man page. - -* Sat Jun 4 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.9-1 -- New upstream version 1.11.9. - -* Wed May 18 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.8-1 -- New upstream version 1.11.8. -- "zero" command test is fixed now, so we don't need to skip it. - -* Tue May 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.7-3 -- New upstream version 1.11.7. -- Depends on hivex >= 1.2.7. -- Remove upstream patch. -- Skip test of "zero" command (RHBZ#705499). - -* Mon May 9 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.5-2 -- configure: Use Python platform-dependent site-packages. - -* Mon May 9 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.5-1 -- New upstream version 1.11.5. -- virt-edit has been rewritten in C, therefore this tool has been moved - into the libguestfs-tools-c package. - -* Sun May 8 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.4-1 -- New upstream version 1.11.4. - -* Fri Apr 22 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.3-1 -- New upstream version 1.11.3. - -* Mon Apr 18 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.2-1 -- New upstream version 1.11.2. -- Fixes Python bindings when used in Python threads. -- Remove upstream patch. - -* Sat Apr 16 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.1-2 -- New upstream version 1.11.1. -- Add upstream patch so we don't depend on libtool. - -* Fri Apr 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.0-2 -- Bump and rebuild. - -* Tue Apr 12 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.0-1 -- New upstream development branch 1.11.0. -- New Source URL. -- Remove patches which are now upstream. - -* Sun Apr 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.18-4 -- Include further fixes to virt-resize from upstream. - -* Sat Apr 9 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.18-2 -- New upstream version 1.9.18. -- Requires ocaml-pcre for new virt-resize. -- Remove libguestfs-test-tool-helper program which is no longer used. -- Include upstream fix for virt-resize build. - -* Wed Apr 6 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.17-2 -- Remove partially translated Ukrainian manpages. - -* Tue Apr 5 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.17-1 -- New upstream version 1.9.17. - -* Fri Apr 1 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.16-1 -- New upstream version 1.9.16. - -* Fri Apr 1 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.15-1 -- New upstream version 1.9.15. -- Add BR libconfig-devel. -- Add /etc/libguestfs-tools.conf (config file for guestfish, guestmount, - virt-rescue; in future for other tools as well). - -* Mon Mar 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.14-1 -- New upstream version 1.9.14. -- Include 'acl' as BR so virt-rescue gets getfacl and setfacl programs. - -* Mon Mar 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.13-2 -- Include 'attr' as BR (required for getfattr, setfattr programs in - virt-rescue). - -* Thu Mar 24 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.13-1 -- New upstream version 1.9.13. - -* Thu Mar 18 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.12-1 -- New upstream version 1.9.12. - -* Wed Mar 16 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.11-2 -- Add runtime requires on minimum glibc because of newly readable binaries. - -* Tue Mar 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.11-1 -- New upstream version 1.9.11. -- Add generated Ruby documentation (rdoc). - -* Tue Mar 8 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.10-1 -- New upstream version 1.9.10. -- Remove patches (now upstream). - -* Fri Mar 4 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.9-2 -- Include upstream patches to fix virt-make-fs with qemu-img 0.14. - -* Fri Mar 4 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.9-1 -- New upstream version 1.9.9. - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.9.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Feb 6 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.8-1 -- New upstream version 1.9.8. - -* Sun Feb 6 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-7 -- Rebuild against rpm-4.9.0-0.beta1.6.fc15 to fix OCaml deps. See discussion: - http://lists.fedoraproject.org/pipermail/devel/2011-February/148398.html - -* Wed Feb 2 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-6 -- Add temporary non-upstream patch to fix /etc/mtab. - See: https://www.redhat.com/archives/libguestfs/2011-February/msg00006.html -- Add fix for regressions/rhbz557655.sh so it works when tracing is enabled. -- Add guestfs-perl(3) man page. - -* Tue Feb 1 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-3 -- Enable trace in 'make check' section. - -* Sun Jan 30 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-1 -- New upstream version 1.9.7. - -* Wed Jan 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.6-2 -- Bump and rebuild. - -* Sat Jan 22 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.6-1 -- New upstream version 1.9.6. - -* Tue Jan 18 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.5-1 -- New upstream version 1.9.5. - -* Sat Jan 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.4-1 -- New upstream version 1.9.4. - -* Fri Jan 14 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.3-2 -- Only runtime require febootstrap-supermin-helper (not whole of - febootstrap). - -* Tue Jan 11 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.3-1 -- New upstream version 1.9.3. - -* Wed Jan 05 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.2-2 -- Bump and rebuild. - -* Mon Jan 3 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.2-1 -- New upstream version 1.9.2. -- New tools: virt-copy-in, virt-copy-out, virt-tar-in, virt-tar-out. - These are just shell script wrappers around guestfish so they are - included in the guestfish package. - -* Fri Dec 31 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.1-1 -- New upstream version 1.9.1. - -* Tue Dec 21 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.0-2 -- Bump and rebuild. - -* Sun Dec 19 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.0-1 -- New upstream development branch 1.9.0. -- Include ROADMAP in devel package. - -* Thu Dec 16 2010 Richard Jones <rjones@redhat.com> - 1:1.7.24-1 -- New upstream version 1.7.24. -- Adds getxattr/lgetxattr APIs to support guestfs-browser. - -* Sun Dec 11 2010 Richard Jones <rjones@redhat.com> - 1:1.7.23-1 -- New upstream version 1.7.23. - -* Sat Dec 11 2010 Richard Jones <rjones@redhat.com> - 1:1.7.22-1 -- New upstream version 1.7.22. -- Depend on febootstrap 3.3 which fixes the checksum stability problem. - -* Fri Dec 10 2010 Richard Jones <rjones@redhat.com> - 1:1.7.21-1 -- New upstream version 1.7.21. - -* Tue Dec 7 2010 Richard Jones <rjones@redhat.com> - 1:1.7.20-1 -- New upstream version 1.7.20. -- Remove patches which are upstream. - -* Tue Dec 7 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-15 -- Rebuild appliance with febootstrap 3.1-5 because we accidentally - reopened RHBZ#654638. - -* Mon Dec 6 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-14 -- Rebuild appliance properly using febootstrap 3.1 and alternate yum repo. - -* Sun Dec 5 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-1 -- New upstream development version 1.7.19. -- Appliance building in this version has been substantially rewritten - and this requires febootstrap >= 3.0 to build. -- createrepo no longer required. -- Supermin appliance is the default. - -* Wed Dec 1 2010 Richard Jones <rjones@redhat.com> - 1:1.7.18-1 -- New upstream development version 1.7.18. - -* Tue Nov 30 2010 Richard Jones <rjones@redhat.com> - 1:1.7.17-1 -- New upstream development version 1.7.17. - -* Fri Nov 26 2010 Richard Jones <rjones@redhat.com> - 1:1.7.16-1 -- New upstream development version 1.7.16. -- guestfish no longer requires pod2text, hence no longer requires perl. -- Require febootstrap >= 2.11. - -* Fri Nov 26 2010 Richard Jones <rjones@redhat.com> - 1:1.7.15-2 -- New upstream development version 1.7.15. -- Split out new libguestfs-tools-c package from libguestfs-tools. - . This is so that the -tools-c package can be pulled in by people - wanting to avoid a dependency on Perl, while -tools pulls in everything - as before. - . The C tools currently are: cat, df, filesystems, fish, inspector, ls, - mount, rescue. - . guestfish still requires pod2text which requires perl. This will be - rectified in the next release. - . libguestfs-tools no longer pulls in guestfish. -- guestfish also depends on: less, man, vi -- Add BR db4-utils (although since RPM needs it, it not really necessary). -- Runtime requires on db4-utils should be on core lib, not tools package. -- Change all "Requires: perl-Foo" to "Requires: perl(Foo)". - -* Thu Nov 25 2010 Richard Jones <rjones@redhat.com> - 1:1.7.14-1 -- New upstream development version 1.7.14. - -* Wed Nov 24 2010 Richard Jones <rjones@redhat.com> - 1:1.7.13-3 -- New upstream development version 1.7.13. -- New manual pages containing example code. -- Ship examples for C, OCaml, Ruby, Python. -- Don't ship HTML versions of man pages. -- Rebase no-fuse-test patch to latest version. - -* Tue Nov 23 2010 Richard Jones <rjones@redhat.com> - 1:1.7.12-1 -- New upstream development version 1.7.12. -- New tool: virt-filesystems. virt-list-filesystems and virt-list-partitions - are deprecated, but still included in the package. - -* Wed Nov 17 2010 Richard Jones <rjones@redhat.com> - 1:1.7.11-1 -- New upstream development version 1.7.11. -- Fix Source0 URL which had pointed to the 1.5 directory. -- virt-inspector is not a dependency of guestmount. - -* Wed Nov 17 2010 Richard Jones <rjones@redhat.com> - 1:1.7.10-1 -- New upstream development version 1.7.10. - -* Tue Nov 16 2010 Richard Jones <rjones@redhat.com> - 1:1.7.9-1 -- New upstream development version 1.7.9. - -* Mon Nov 15 2010 Richard Jones <rjones@redhat.com> - 1:1.7.8-1 -- New upstream development version 1.7.8. -- Add Obsoletes so perl-Sys-Guestfs overrides perl-libguestfs (RHBZ#652587). - -* Mon Nov 15 2010 Richard Jones <rjones@redhat.com> - 1:1.7.7-1 -- New upstream development version 1.7.7. -- Rename perl-libguestfs as perl-Sys-Guestfs (RHBZ#652587). - -* Sat Nov 13 2010 Richard Jones <rjones@redhat.com> - 1:1.7.6-1 -- New upstream development version 1.7.6. - -* Sat Nov 13 2010 Richard Jones <rjones@redhat.com> - 1:1.7.5-2 -- New upstream development version 1.7.5. -- Remove hand-installation of Ruby bindings. -- Remove upstream patch. - -* Thu Nov 11 2010 Richard Jones <rjones@redhat.com> - 1:1.7.4-2 -- New upstream development version 1.7.4. -- ocaml-xml-light is no longer required. -- Remove guestfs-actions.h and guestfs-structs.h. Libguestfs now - only exports a single <guestfs.h> header file. -- Add patch to fix broken Perl test. -- Remove workaround for RHBZ#563103. - -* Mon Nov 8 2010 Richard Jones <rjones@redhat.com> - 1:1.7.3-1 -- New upstream development version 1.7.3. -- Add AUTHORS file from tarball. - -* Fri Nov 5 2010 Richard Jones <rjones@redhat.com> - 1:1.7.2-1 -- New upstream development version 1.7.2. -- Add requires ruby to ruby-libguestfs package. - -* Wed Nov 3 2010 Richard Jones <rjones@redhat.com> - 1:1.7.1-1 -- New upstream development version 1.7.1. -- Add BR gperf. - -* Tue Nov 2 2010 Richard Jones <rjones@redhat.com> - 1:1.7.0-1 -- New upstream development branch and version 1.7.0. - -* Fri Oct 29 2010 Richard Jones <rjones@redhat.com> - 1:1.5.26-1 -- New upstream development version 1.5.26. - -* Thu Oct 28 2010 Richard Jones <rjones@redhat.com> - 1:1.5.25-1 -- New upstream development version 1.5.25. -- Rewritten virt-inspector. -- Requires febootstrap >= 2.10. -- New virt-inspector requires db_dump program. - -* Wed Oct 27 2010 Richard Jones <rjones@redhat.com> - 1:1.5.24-2 -- Attempt to run tests. - -* Wed Oct 27 2010 Richard Jones <rjones@redhat.com> - 1:1.5.24-1 -- New upstream development version 1.5.24. - -* Sat Oct 23 2010 Richard Jones <rjones@redhat.com> - 1:1.5.23-1 -- Fix for libguestfs: missing disk format specifier when adding a disk - (RHBZ#642934, CVE-2010-3851). - -* Tue Oct 19 2010 Richard Jones <rjones@redhat.com> - 1:1.5.22-1 -- New upstream development version 1.5.22. - -* Sat Oct 9 2010 Richard Jones <rjones@redhat.com> - 1:1.5.21-2 -- guestfish no longer requires virt-inspector. - -* Fri Oct 1 2010 Richard Jones <rjones@redhat.com> - 1:1.5.21-1 -- New upstream development version 1.5.21. - -* Sun Sep 26 2010 Richard Jones <rjones@redhat.com> - 1:1.5.20-1 -- New upstream development version 1.5.20. - -* Wed Sep 22 2010 Richard Jones <rjones@redhat.com> - 1:1.5.18-1 -- New upstream development version 1.5.18. -- Note that guestfish '-a' and '-d' options were broken in 1.5.17, so - upgrading to this version is highly recommended. - -* Tue Sep 21 2010 Richard Jones <rjones@redhat.com> - 1:1.5.17-1 -- New upstream development version 1.5.17. - -* Wed Sep 15 2010 Richard Jones <rjones@redhat.com> - 1:1.5.16-1 -- New upstream development version 1.5.16. - -* Wed Sep 15 2010 Richard Jones <rjones@redhat.com> - 1:1.5.15-1 -- New upstream development version 1.5.15. - -* Tue Sep 14 2010 Richard Jones <rjones@redhat.com> - 1:1.5.14-1 -- New upstream development version 1.5.14. - -* Mon Sep 13 2010 Richard Jones <rjones@redhat.com> - 1:1.5.13-1 -- New upstream version 1.5.13. -- Removed the patch workaround for RHBZ#630583. The same workaround - is now upstream (the bug is not fixed). - -* Sat Sep 11 2010 Richard Jones <rjones@redhat.com> - 1:1.5.12-1 -- New upstream version 1.5.12. - -* Fri Sep 10 2010 Richard Jones <rjones@redhat.com> - 1:1.5.11-1 -- New upstream version 1.5.11. -- Note: fixes a serious bug in guestfish 'copy-out' command. - -* Thu Sep 9 2010 Richard Jones <rjones@redhat.com> - 1:1.5.10-1 -- New upstream version 1.5.10. - -* Wed Sep 8 2010 Richard Jones <rjones@redhat.com> - 1:1.5.9-2 -- Disable tests, still failing because of RHBZ#630777. - -* Wed Sep 8 2010 Richard Jones <rjones@redhat.com> - 1:1.5.9-1 -- New upstream version 1.5.9. - -* Mon Sep 6 2010 Richard Jones <rjones@redhat.com> - 1:1.5.8-2 -- Add patch to work around RHBZ#630583 and reenable tests. - -* Sat Sep 4 2010 Richard Jones <rjones@redhat.com> - 1:1.5.8-1 -- New upstream version 1.5.8. -- Add BR po4a for translations of man pages. -- Add PHP bindings. -- Remove partially-translated Japanese webpages. - -* Wed Sep 1 2010 Richard Jones <rjones@redhat.com> - 1:1.5.7-1 -- New upstream version 1.5.7. -- 'debug' command is enabled by default now. - -* Fri Aug 27 2010 Richard Jones <rjones@redhat.com> - 1:1.5.6-1 -- New upstream version 1.5.6. - -* Fri Aug 27 2010 Richard Jones <rjones@redhat.com> - 1:1.5.5-2 -- Use bug-fixed febootstrap 2.9. - -* Thu Aug 26 2010 Richard Jones <rjones@redhat.com> - 1:1.5.5-1 -- New upstream version 1.5.5. - -* Tue Aug 24 2010 Richard Jones <rjones@redhat.com> - 1:1.5.4-2 -- Disable tests again, because the Rawhide kernel still won't boot. - -* Tue Aug 24 2010 Richard Jones <rjones@redhat.com> - 1:1.5.4-1 -- New upstream development version 1.5.4. -- Now requires febootstrap >= 2.8 and qemu >= 0.12. -- Re-enable tests because RHBZ#624854 is supposed to be fixed. -- Upstream Source URL has changed. - -* Wed Aug 18 2010 Richard Jones <rjones@redhat.com> - 1:1.5.3-2 -- Disable tests because of RHBZ#624854. - -* Tue Aug 17 2010 Richard Jones <rjones@redhat.com> - 1:1.5.3-1 -- New upstream development version 1.5.3. - -* Wed Aug 11 2010 Richard Jones <rjones@redhat.com> - 1:1.5.2-6 -- Bump and rebuild. - -* Thu Aug 05 2010 Richard Jones - 1:1.5.2-5 -- Bump and rebuild. - -* Fri Jul 23 2010 David Malcolm <dmalcolm@redhat.com> - 1:1.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Fri Jul 23 2010 David Malcolm <dmalcolm@redhat.com> - 1:1.5.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Thu Jul 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.5.2-2 -- New upstream development version 1.5.2. -- +BuildRequires: cryptsetup-luks. - -* Wed Jul 21 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.5.1-1 -- New upstream development version 1.5.1. - -* Tue Jul 20 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.5.0-7 -- Requires binutils (RHBZ#616437). - -* Mon Jul 19 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.5.0-6 -- Fix libguestfs-find-requires.sh for new location of hostfiles (RHBZ#615946). - -* Thu Jul 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.5.0-5 -- Include RELEASE-NOTES in devel package. - -* Thu Jul 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.5.0-4 -- New development branch 1.5.0. -- Remove two upstream patches. -- Work around permanently broken test-getlogin_r Gnulib test. - -* Mon Jun 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.21-4 -- Explicitly depend on e2fsprogs. -- Add patch to add e2fsprogs to the appliance. -- Add patch to fix GFS kernel module problem. - -* Fri Jun 25 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:1.3.21-2 -- Rebuild - -* Wed Jun 16 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.21-1 -- New upstream version 1.3.21. - -* Tue Jun 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.20-1 -- New upstream version 1.3.20. -- Since upstream commit a043b6854a0c4 we don't need to run make install - twice. - -* Fri Jun 4 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.19-1 -- New upstream version 1.3.19. - -* Wed Jun 2 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.18-1 -- New upstream version 1.3.18. - -* Thu May 27 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.17-1 -- New upstream version 1.3.17. -- Change repo name to 'fedora-14'. - -* Wed May 26 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.16-6 -- Co-own bash_completion.d directory. - -* Tue May 25 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.16-4 -- New upstream version 1.3.16. -- Add guestfish bash tab completion script. - -* Mon May 24 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.14-1 -- New upstream version 1.3.14. - -* Sun May 16 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.13-1 -- New upstream version 1.3.13. -- Add BUGS to documentation. -- Force update of hivex dependency to 1.2.2 since it contains - important registry import fixes. -- Remove patch1, now upstream. - -* Fri May 14 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.12-3 -- Backport supermin build fix from upstream. -- Further changes required for new layout of supermin appliance. - -* Fri May 14 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.12-1 -- New upstream version 1.3.12. -- febootstrap >= 2.7 is required at compile time and at runtime (at runtime - because of the new febootstrap-supermin-helper). -- Bugs fixed: 591155 591250 576879 591142 588651 507810 521674 559963 516096. - -* Sat May 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.11-1 -- New upstream version 1.3.11. - -* Fri May 7 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.10-2 -- New upstream version 1.3.10. - -* Thu May 06 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.9-2 -- Bump and rebuild against updated libconfig - -* Fri Apr 30 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.9-1 -- New upstream version 1.3.9. - -* Thu Apr 29 2010 Marcela Maslanova <mmaslano@redhat.com> - 1:1.3.8-2 -- Mass rebuild with perl-5.12.0 - -* Tue Apr 27 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.8-1 -- New upstream version 1.3.8. - -* Fri Apr 23 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.7-1 -- New upstream version 1.3.7. -- NOTE: fixes a segfault in guestfish 1.3.6 when using the -a option. - -* Thu Apr 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.6-1 -- New upstream version 1.3.6. - -* Mon Apr 19 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.5-1 -- New upstream version 1.3.5. - -* Sat Apr 17 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.4-1 -- New upstream version 1.3.4. - -* Sun Apr 11 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.3-1 -- New upstream version 1.3.3. -- New virt-resize option --LV-expand. -- New API: lvresize-free. -- Fixes RHBZ#581501. - -* Sun Apr 11 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.2-3 -- Disable checksum-device test. - -* Sat Apr 10 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.2-2 -- Bump and rebuild. - -* Sat Apr 10 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.2-1 -- New upstream version 1.3.2. -- New APIs: checksum-device, part-del, part-get-bootable, part-get-mbr-id, - part-set-mbr-id, vgscan, ntfsresize, txz-in, txz-out. -- Enhanced/fixed virt-resize tool. -- Enhanced virt-list-partitions tool. -- Fixes: 580016, 580650, 579155, 580556. - -* Sat Apr 10 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.1-4 -- Bump and rebuild. - -* Thu Apr 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.1-3 -- Runtime requires should only be on libguestfs-tools subpackage. - -* Thu Apr 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.1-2 -- Missing BR on qemu-img package. - -* Thu Apr 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.1-1 -- New upstream version 1.3.1. -- For explanation of apparently large version jump, see: - https://www.redhat.com/archives/libguestfs/2010-April/msg00057.html -- New tool: virt-make-fs. -- New API: guestfs_zero_device. -- Fixes RHBZ#580246 (tar-in command hangs if uploading more than - available space) -- Fixes RHBZ#579664 (guestfish doesn't report error when there is not - enough space for image allocation) -- +BR perl-String-ShellQuote (for virt-make-fs). - -* Tue Mar 30 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.89-1 -- New upstream version 1.0.89. -- Improved version of virt-win-reg. -- Many smaller bugfixes. -- Requires hivex >= 1.2.1. -- Remove TERM=dumb patch which is now upstream. - -* Tue Mar 30 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.88-7 -- Backport of TERM=dumb patch from upstream. -- Workaround failure caused by RHBZ#575734. -- Workaround unknown failure of test_swapon_label_0. - -* Tue Mar 30 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.88-5 -- Attempted workaround for RHBZ#563103, so we can reenable tests. - -* Fri Mar 26 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.88-2 -- Remember to check in the new sources. - -* Fri Mar 26 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.88-1 -- New upstream version 1.0.88. -- Mainly small bugfixes. -- Update Spanish translation of libguestfs (RHBZ#576876). -- Use ext4 dev tools on RHEL 5 (RHBZ#576688). -- Add support for minix filesystem (RHBZ#576689). - -* Fri Mar 26 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.87-2 -- Add vim-minimal to BR, it is now required by the appliance. - -* Tue Mar 23 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.87-1 -- New upstream version 1.0.87. -- New tools: virt-resize and virt-list-partitions. -- New APIs: guestfs_copy_size; APIs for querying the relationship between - LVM objects. -- Add vim to the virt-rescue appliance. - -* Fri Mar 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.86-1 -- New upstream version 1.0.86. -- libguestfs-supermin-helper rewritten in C (from shell), reduces - appliance boot time by 2-3 seconds. -- Fix parsing of integers in guestfish on 32 bit platforms (RHBZ#569757 - and RHBZ#567567). -- Enhance virt-inspector output for Windows guests. -- Add product_name field to virt-inspector output for all guests. -- Weaken dependencies on libntfs-3g.so, don't include SONAME in dep. -- Remove false dependency on libply (plymouth libraries). -- Spanish translation (RHBZ#570181). -- Fix bash regexp quoting bug. - -* Fri Mar 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-4 -- Bump and rebuild. - -* Thu Mar 11 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-3 -- Bump and rebuild. - -* Sat Mar 06 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-2 -- Bump and rebuild. - -* Mon Mar 1 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1 -- New upstream version 1.0.85. -- Remove hivex, now a separate upstream project and package. -- Remove supermin quoting patch, now upstream. - -* Mon Mar 1 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-6 -- Fix quoting in supermin-split script (RHBZ#566511). -- Don't include bogus './builddir' entries in supermin hostfiles - (RHBZ#566512). - -* Mon Feb 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-4 -- Don't include generator.ml in rpm. It's 400K and almost no one will need it. -- Add comments to spec file about how repo building works. -- Whitespace changes in the spec file. - -* Mon Feb 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-3 -- Bump and rebuild. - -* Tue Feb 16 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-2 -- Bump and rebuild. - -* Fri Feb 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-1 -- New upstream version 1.0.84. - -* Fri Feb 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.83-8 -- Bump and rebuild. - -* Thu Feb 11 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.83-7 -- Disable tests. These fail in Koji (on RHEL 5 kernel) because of a - bug in preadv/pwritev emulation in glibc (RHBZ#563103). - -* Tue Feb 9 2010 Matthew Booth <mbooth@redhat.com> - 1.0.83-6 -- Change buildnonet to buildnet -- Allow buildnet, mirror, updates, virtio and runtests to be configured by user - macros. - -* Mon Feb 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.83-5 -- libguestfs-tools should require perl-XML-Writer (RHBZ#562858). - -* Mon Feb 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.83-4 -- Use virtio for block device access (RHBZ#509383 is fixed). - -* Fri Feb 5 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.83-3 -- Rebuild: possible timing-related build problem in Koji. - -* Fri Feb 5 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.83-2 -- New upstream release 1.0.83. -- This release fixes: - Add Marathi translations (RHBZ#561671). - Polish translations (RHBZ#502533). - Add Gujarti translations (Sweta Kothari) (RHBZ#560918). - Update Oriya translations (thanks Manoj Kumar Giri) (RHBZ#559498). - Set locale in C programs so l10n works (RHBZ#559962). - Add Tamil translation (RHBZ#559877) (thanks to I.Felix) - Update Punjabi translation (RHBZ#559480) (thanks Jaswinder Singh) -- There are significant fixes to hive file handling. -- Add hivexsh and manual page. -- Remove two patches, now upstream. - -* Sun Jan 31 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.82-7 -- Bump and rebuild. - -* Fri Jan 29 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-6 -- Backport a better fix for RHBZ557655 test from upstream. -- Backport fix for unreadable yum.log from upstream. - -* Thu Jan 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-3 -- Backport RHBZ557655 test fix from upstream. - -* Thu Jan 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-1 -- New upstream version 1.0.82. This includes the two patches - we were carrying, so those are now removed. -- This release fixes: - RHBZ#559498 (Oriya translation). - RHBZ#559480 (Punjabi translation). - RHBZ#558593 (Should prevent corruption by multilib). - RHBZ#559237 (Telugu translation). - RHBZ#557655 (Use xstrtol/xstrtoll to parse integers in guestfish). - RHBZ#557195 (Missing crc kernel modules for recent Linux). -- In addition this contains numerous fixes to the hivex library - for parsing Windows Registry files, making hivex* and virt-win-reg - more robust. -- New API call 'filesize'. - -* Thu Jan 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-8 -- Backport special handling of libgcc_s.so. -- Backport unreadable files patch from RHEL 6 / upstream. - -* Fri Jan 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-5 -- Require febootstrap >= 2.6 (RHBZ#557262). - -* Thu Jan 21 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-4 -- Rebuild for unannounced soname bump (libntfs-3g.so). - -* Fri Jan 15 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-3 -- Rebuild for unannounced soname bump (libplybootsplash.so). - -* Thu Jan 14 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-2 -- Rebuild for broken dependency (iptables soname bump). - -* Wed Jan 13 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-1 -- New upstream version 1.0.81. -- Remove two upstream patches. -- virt-inspector: Make RPM application data more specific (RHBZ#552718). - -* Tue Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-14 -- Reenable tests because RHBZ#553689 is fixed. - -* Tue Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-13 -- Rebuild because of libparted soname bump (1.9 -> 2.1). - -* Fri Jan 8 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-12 -- qemu in Rawhide is totally broken (RHBZ#553689). Disable tests. - -* Thu Jan 7 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-11 -- Remove gfs-utils (deprecated and removed from Fedora 13 by the - upstream Cluster Suite developers). -- Include patch to fix regression in qemu -serial stdio option. - -* Tue Dec 29 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-10 -- Remove some debugging statements which were left in the requires - script by accident. - -* Mon Dec 21 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-9 -- Generate additional requires for supermin (RHBZ#547496). - -* Fri Dec 18 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-3 -- Work around udevsettle command problem (RHBZ#548121). -- Enable tests. - -* Wed Dec 16 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-2 -- Disable tests because of RHBZ#548121. - -* Wed Dec 16 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.80-1 -- New upstream release 1.0.80. -- New Polish translations (RHBZ#502533). -- Give a meaningful error if no usable kernels are found (RHBZ#539746). -- New tool: virt-list-filesystems - -* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1:1.0.79-3 -- rebuild against perl 5.10.1 - -* Wed Nov 18 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.79-2 -- New upstream release 1.0.79. -- Adds FUSE test script and multiple fixes for FUSE (RHBZ#538069). -- Fix virt-df in Xen (RHBZ#538041). -- Improve speed of supermin appliance. -- Disable FUSE-related tests because Koji doesn't currently allow them. - fuse: device not found, try 'modprobe fuse' first - -* Tue Nov 10 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.78-2 -- New upstream release 1.0.78. -- Many more filesystem types supported by this release - add them - as dependencies. - -* Tue Nov 3 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.77-1 -- New upstream release 1.0.77. -- Support for mounting guest in host using FUSE (guestmount command). -- hivex*(1) man pages should be in main package, not -devel, since - they are user commands. -- libguestfs-tools: Fix "self-obsoletion" issue raised by rpmlint. -- perl: Remove bogus script Sys/bindtests.pl. - -* Thu Oct 29 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.75-2 -- New upstream release 1.0.75. -- New library: libhivex. -- New tools: virt-win-reg, hivexml, hivexget. -- Don't require chntpw. -- Add BR libxml2-devel, accidentally omitted before. - -* Tue Oct 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.74-1 -- New upstream release 1.0.74. -- New API call: guestfs_find0. -- New tools: virt-ls, virt-tar. - -* Wed Oct 14 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.73-1 -- New upstream release 1.0.73. -- OCaml library now depends on xml-light. -- Deal with installed documentation. - -* Tue Sep 29 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.72-2 -- Force rebuild. - -* Wed Sep 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.72-1 -- New upstream release 1.0.72. -- New tools: virt-edit, virt-rescue. -- Combine virt-cat, virt-df, virt-edit, virt-inspector and virt-rescue - into a single package called libguestfs-tools. - -* Tue Sep 22 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.71-2 -- New upstream release 1.0.71. - -* Fri Sep 18 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.70-2 -- Perl bindings require perl-XML-XPath (fixed RHBZ#523547). - -* Tue Sep 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.70-1 -- New upstream release 1.0.70. -- Fixes build problem related to old version of GNU gettext. - -* Tue Sep 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.69-1 -- New upstream release 1.0.69. -- Reenable the tests (because RHBZ#516543 is supposed to be fixed). -- New main loop code should fix RHBZ#501888, RHBZ#504418. -- Add waitpid along guestfs_close path (fixes RHBZ#518747). - -* Wed Aug 19 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.68-2 -- New upstream release 1.0.68. -- BR genisoimage. - -* Thu Aug 13 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.67-2 -- New upstream release 1.0.67. - -* Fri Aug 7 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.66-5 -- Set network interface to ne2k_pci (workaround for RHBZ#516022). -- Rerun autoconf because patch touches configure script. - -* Thu Aug 6 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.66-1 -- New upstream release 1.0.66. - -* Wed Jul 29 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.65-1 -- New upstream release 1.0.65. -- Add Obsoletes for virt-df2 (RHBZ#514309). -- Disable tests because of ongoing TCG problems with newest qemu in Rawhide. - -* Thu Jul 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.64-3 -- RHBZ#513249 bug in qemu is now fixed, so try to rebuild and run tests. -- However RHBZ#503236 still prevents us from testing on i386. - -* Thu Jul 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.64-1 -- New upstream release 1.0.64. -- New tool 'libguestfs-test-tool'. - -* Wed Jul 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.61-1 -- New upstream release 1.0.61. -- New tool / subpackage 'virt-cat'. -- New BR perl-libintl. - -* Wed Jul 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.60-2 -- Fix runtime Requires so they use epoch correctly. - -* Tue Jul 14 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.60-1 -- New upstream release 1.0.60. - -* Fri Jul 10 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.58-2 -- New upstream release 1.0.58. - -* Fri Jul 10 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.57-1 -- New upstream release 1.0.57. -- New tool virt-df (obsoletes existing package with this name). -- RHBZ#507066 may be fixed, so reenable tests. - -* Tue Jul 7 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.56-2 -- New upstream release 1.0.56. -- Don't rerun generator. - -* Thu Jul 2 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.55-1 -- New upstream release 1.0.55. -- New manual page libguestfs(3). - -* Mon Jun 29 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.54-2 -- New upstream release 1.0.54. -- +BR perl-XML-Writer. - -* Wed Jun 24 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.53-1 -- New upstream release 1.0.53. -- Disable all tests (because of RHBZ#507066). - -* Wed Jun 24 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.52-1 -- New upstream release 1.0.52. - -* Mon Jun 22 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.51-1 -- New upstream release 1.0.51. -- Removed patches which are now upstream. - -* Sat Jun 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-5 -- Remove workaround for RHBZ#507007, since bug is now fixed. -- Pull in upstream patch to fix pclose checking - (testing as possible fix for RHBZ#507066). -- Pull in upstream patch to check waitpid return values - (testing as possible fix for RHBZ#507066). - -* Fri Jun 19 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-2 -- New upstream release 1.0.49. -- Add workaround for RHBZ#507007. - -* Tue Jun 16 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.48-2 -- Accidentally omitted the supermin image from previous version. - -* Tue Jun 16 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.48-1 -- New upstream release 1.0.48. -- Should fix all the brokenness from 1.0.47. -- Requires febootstrap >= 2.3. - -* Mon Jun 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.47-2 -- New upstream release 1.0.47. -- Enable experimental supermin appliance build. -- Fix path to appliance. - -* Fri Jun 12 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.45-2 -- New upstream release 1.0.45. - -* Wed Jun 10 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.44-2 -- Disable ppc/ppc64 tests again because of RHBZ#505109. - -* Wed Jun 10 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.44-1 -- New upstream version 1.0.44. -- Try enabling tests on ppc & ppc64 since it looks like the bug(s?) - in qemu which might have caused them to fail have been fixed. - -* Tue Jun 9 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.43-1 -- New upstream version 1.0.43. -- New upstream URL. -- Requires chntpw program. - -* Sat Jun 6 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.42-1 -- New upstream version 1.0.42. - -* Thu Jun 4 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.41-1 -- New upstream version 1.0.41. -- Fixes a number of regressions in RHBZ#503169. - -* Thu Jun 4 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.40-1 -- New upstream version 1.0.40. - -* Thu Jun 4 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.39-1 -- New upstream version 1.0.39. -- Fixes: - . libguestfs /dev is too sparse for kernel installation/upgrade (RHBZ#503169) - . OCaml bindings build failure (RHBZ#502309) - -* Tue Jun 2 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.38-2 -- Disable tests on ix86 because of RHBZ#503236. - -* Tue Jun 2 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.38-1 -- New upstream version 1.0.38. - -* Fri May 29 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.37-1 -- New upstream version 1.0.37. -- Fixes: - . "mkdir-p" should not throw errors on preexisting directories (RHBZ#503133) - . cramfs and squashfs modules should be available in libguestfs appliances - (RHBZ#503135) - -* Thu May 28 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.36-2 -- New upstream version 1.0.36. -- Rerun the generator in prep section. - -* Thu May 28 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.35-1 -- New upstream version 1.0.35. -- Fixes multiple bugs in bindings parameters (RHBZ#501892). - -* Wed May 27 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.34-1 -- New upstream version 1.0.34. - -* Wed May 27 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.33-1 -- New upstream version 1.0.33. -- --with-java-home option is no longer required. -- Upstream contains potential fixes for: - 501878 built-in commands like 'alloc' and 'help' don't autocomplete - 501883 javadoc messed up in libguestfs java documentation - 501885 Doesn't detect missing Java, --with-java-home=no should not be needed - 502533 Polish translation of libguestfs - n/a Allow more ext filesystem kmods (Charles Duffy) - -* Tue May 26 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.32-2 -- New upstream version 1.0.32. -- Use %%find_lang macro. - -* Sat May 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.31-1 -- Rebuild for OCaml 3.11.1. -- New upstream version 1.0.31. - -* Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.30-1 -- New upstream version 1.0.30. Now includes test-bootbootboot.sh script. - -* Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.29-3 -- New upstream version 1.0.29 (fixes RHBZ#502007 RHBZ#502018). -- This should allow us to enable tests for i386 and x86-64. -- Added test-bootbootboot.sh script which was missed from 1.0.29 tarball. -- Pass kernel noapic flag to workaround RHBZ#502058. - -* Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.28-1 -- New upstream version 1.0.28. Nothing has visibly changed, but - the source has been gettextized and we want to check that doesn't - break anything. - -* Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.27-3 -- Change requirement from qemu -> qemu-kvm (RHBZ#501761). - -* Tue May 19 2009 Richard Jones <rjones@redhat.com> - 1.0.27-2 -- New upstream version 1.0.27. - -* Mon May 18 2009 Richard Jones <rjones@redhat.com> - 1.0.26-6 -- Experimentally try to reenable ppc and ppc64 builds. -- Note BZ numbers which are causing tests to fail. - -* Mon May 18 2009 Richard Jones <rjones@redhat.com> - 1.0.26-1 -- New upstream version 1.0.26. - -* Tue May 12 2009 Richard Jones <rjones@redhat.com> - 1.0.25-4 -- New upstream version 1.0.25. -- Enable debugging when running the tests. -- Disable tests - don't work correctly in Koji. - -* Tue May 12 2009 Richard Jones <rjones@redhat.com> - 1.0.24-1 -- New upstream version 1.0.24. -- BRs glibc-static for the new command tests. -- Enable tests. - -* Mon May 11 2009 Richard Jones <rjones@redhat.com> - 1.0.23-2 -- New upstream version 1.0.23. -- Don't try to use updates during build. - -* Fri May 8 2009 Richard Jones <rjones@redhat.com> - 1.0.21-3 -- New upstream version 1.0.21. - -* Thu May 7 2009 Richard Jones <rjones@redhat.com> - 1.0.20-2 -- New upstream version 1.0.20. - -* Thu May 7 2009 Richard Jones <rjones@redhat.com> - 1.0.19-1 -- New upstream version 1.0.19. - -* Tue Apr 28 2009 Richard Jones <rjones@redhat.com> - 1.0.15-1 -- New upstream version 1.0.15. - -* Fri Apr 24 2009 Richard Jones <rjones@redhat.com> - 1.0.12-1 -- New upstream version 1.0.12. - -* Wed Apr 22 2009 Richard Jones <rjones@redhat.com> - 1.0.6-1 -- New upstream version 1.0.6. - -* Mon Apr 20 2009 Richard Jones <rjones@redhat.com> - 1.0.2-1 -- New upstream version 1.0.2. - -* Thu Apr 16 2009 Richard Jones <rjones@redhat.com> - 0.9.9-12 -- Multiple fixes to get it to scratch build in Koji. - -* Sat Apr 4 2009 Richard Jones <rjones@redhat.com> - 0.9.9-1 -- Initial build. diff --git a/sources b/sources deleted file mode 100644 index 86db38b..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -da5f7fcd0f48f4e17dca4ce33a52cc7a gnulib-4a8c422f.tar.gz -c497115cfd3323061dd100ec876f9191 libguestfs-1.20.12.tar.gz