Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2015-09-09 20:21:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libguestfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2015-08-10 09:16:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2015-09-09 20:21:36.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 9 12:50:11 UTC 2015 - [email protected] + +- Define SHA512 as the default password encryption method for + opensuse 11+. + +------------------------------------------------------------------- +Mon Sep 7 13:39:57 UTC 2015 - [email protected] + +- Add opensuse images source for virt-builder. + fate#318952. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.48FD9P/_old 2015-09-09 20:21:37.000000000 +0200 +++ /var/tmp/diff_new_pack.48FD9P/_new 2015-09-09 20:21:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Michal Hrusecky <[email protected]> # # All modifications and additions to the file contributed by third parties ++++++ 0000-hotfix.patch ++++++ --- /var/tmp/diff_new_pack.48FD9P/_old 2015-09-09 20:21:37.000000000 +0200 +++ /var/tmp/diff_new_pack.48FD9P/_new 2015-09-09 20:21:37.000000000 +0200 @@ -9,18 +9,17 @@ 1 file changed, 1 insertion(+) create mode 100644 pkg-hotfix.txt -diff --git a/pkg-hotfix.txt b/pkg-hotfix.txt -new file mode 100644 -index 0000000..8b13789 +Index: libguestfs-1.26.10/pkg-hotfix.txt +=================================================================== --- /dev/null -+++ b/pkg-hotfix.txt ++++ libguestfs-1.26.10/pkg-hotfix.txt @@ -0,0 +1 @@ + -diff --git a/daemon/btrfs.c b/daemon/btrfs.c -index 7a4d43d..ceea593 100644 ---- a/daemon/btrfs.c -+++ b/daemon/btrfs.c -@@ -356,6 +356,7 @@ do_btrfs_subvolume_list (const mountable_t *fs) +Index: libguestfs-1.26.10/daemon/btrfs.c +=================================================================== +--- libguestfs-1.26.10.orig/daemon/btrfs.c ++++ libguestfs-1.26.10/daemon/btrfs.c +@@ -356,6 +356,7 @@ do_btrfs_subvolume_list (const mountable ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, "subvolume"); ADD_ARG (argv, i, "list"); @@ -47,3 +46,111 @@ | "unknown" -> eprintf (f_"%s: --install is not supported for this guest operating system\n") prog; +Index: libguestfs-1.26.10/builder/downloader.ml +=================================================================== +--- libguestfs-1.26.10.orig/builder/downloader.ml ++++ libguestfs-1.26.10/builder/downloader.ml +@@ -97,7 +97,7 @@ and download_to ~prog t ?(progress_bar = + ) + | _ -> (* Any other protocol. *) + (* Get the status code first to ensure the file exists. *) +- let cmd = sprintf "%s%s -g -o /dev/null -I -w '%%{http_code}' %s" ++ let cmd = sprintf "%s%s -L --max-redirs 5 -g -o /dev/null -I -w '%%{http_code}' %s" + t.curl + (if t.verbose then "" else " -s -S") + (quote uri) in +@@ -122,7 +122,7 @@ and download_to ~prog t ?(progress_bar = + ); + + (* Now download the file. *) +- let cmd = sprintf "%s%s -g -o %s %s" ++ let cmd = sprintf "%s%s -L --max-redirs 5 -g -o %s %s" + t.curl + (if t.verbose then "" else if progress_bar then " -#" else " -s -S") + (quote filename_new) (quote uri) in +Index: libguestfs-1.26.10/builder/Makefile.am +=================================================================== +--- libguestfs-1.26.10.orig/builder/Makefile.am ++++ libguestfs-1.26.10/builder/Makefile.am +@@ -261,7 +261,7 @@ DISTCLEANFILES = .depend + # virt-builder's default repository + + repoconfdir = $(sysconfdir)/xdg/virt-builder/repos.d +-repoconf_DATA = libguestfs.conf libguestfs.gpg ++repoconf_DATA = libguestfs.conf libguestfs.gpg opensuse.conf opensuse.gpg + + install-exec-hook: + $(LN_S) xdg/virt-builder $(DESTDIR)$(sysconfdir)/virt-builder +Index: libguestfs-1.26.10/builder/Makefile.in +=================================================================== +--- libguestfs-1.26.10.orig/builder/Makefile.in ++++ libguestfs-1.26.10/builder/Makefile.in +@@ -1649,7 +1649,7 @@ DISTCLEANFILES = .depend + + # virt-builder's default repository + repoconfdir = $(sysconfdir)/xdg/virt-builder/repos.d +-repoconf_DATA = libguestfs.conf libguestfs.gpg ++repoconf_DATA = libguestfs.conf libguestfs.gpg opensuse.conf opensuse.gpg + virt_index_validate_SOURCES = \ + index-parse.y \ + index-scan.l \ +Index: libguestfs-1.26.10/builder/opensuse.conf.in +=================================================================== +--- /dev/null ++++ libguestfs-1.26.10/builder/opensuse.conf.in +@@ -0,0 +1,3 @@ ++[opensuse.org] ++uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index ++gpgkey=file://@SYSCONFDIR@/xdg/virt-builder/repos.d/opensuse.gpg +Index: libguestfs-1.26.10/builder/opensuse.gpg +=================================================================== +--- /dev/null ++++ libguestfs-1.26.10/builder/opensuse.gpg +@@ -0,0 +1,21 @@ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++Version: GnuPG v1.4.5 (GNU/Linux) ++ ++mQENBFImAl0BCACkjaXGvVLHBGTVXVP0khtpUVHqFvCRtaIIMHaX/5oTr3nyehDQ ++Ex9VLsSRcNa0QxtnCHFRQzjWWqe+i6pBginnSjucgmjnIKyJsF4l6R+rwAiinHQX ++C4s6Lqg/wH9xDPRBrMYFqlc/7MVf0Glhk1+lAxgQjolMt+5AbbrWlBbwc/i+++zl ++ES3MaeH8aiwup/ogjhmk0SbCQQ/ib21p3XWBwx2oz/KM6Voq9tKDvMczjzNRY3ZT ++6Di3FsUSKI7kgljiNiuN+675YwqEqxWEJgdE5a7Zb67giH1Ik08b5wQiF5jSAICD ++DxW7/ibWBvZJnqhqQT2xJpLC5VaJqwkN8o83ABEBAAG0PlZpcnR1YWxpemF0aW9u ++IE9CUyBQcm9qZWN0IDxWaXJ0dWFsaXphdGlvbkBidWlsZC5vcGVuc3VzZS5vcmc+ ++iQE7BBMBAgAmBQJSJgJdAhsDBQkEHrAABgsJCAcDAgQVAggDBBYCAwECHgECF4AA ++CgkQoZP7tXIXT8ITnwf3SVUUoVjVLFCjhIxdet8BL011cJDwr9TwKEQfq4Ybsq5L ++5Y1/Zk86rTzrVOZrODLwNRIC3fMuegZV5f85KMggXu37Di+UvX+dQW9v1hte+hAT +++gsqb60kOnE/Yacgkb6D3xIzRudAB2q/xfvHl/hgfn416yGI8NvntT7n4Hk9wT28 ++9JSFkun0uaessg77aXlAdsqHwdugm9hELeva89OoYoiZ4d9r4ScTMSj0UkNgnh7g ++CyIScZHYqiiOeosUtAX9u1PyUFfFsg9s5snfud7aF48EfXU0RTtZAGKtG4GPDv3q ++bYc5TJ2pQzs9y5Bk/jAMR/QQw8CKglBsn1cjYkKViEYEExECAAYFAlImAl0ACgkQ ++OzARt2udZSO5yACgr6Ei7QZ+PAmg4Mr5db+4M3aepAEAniU33RaTKBCGkwQi6kHr ++4VaII2/E ++=l8DH ++-----END PGP PUBLIC KEY BLOCK----- +Index: libguestfs-1.26.10/configure.ac +=================================================================== +--- libguestfs-1.26.10.orig/configure.ac ++++ libguestfs-1.26.10/configure.ac +@@ -1635,6 +1635,7 @@ AC_CONFIG_FILES([Makefile + bash/Makefile + builder/Makefile + builder/libguestfs.conf ++ builder/opensuse.conf + builder/test-config/virt-builder/repos.d/test-index.conf + builder/test-website/virt-builder/repos.d/libguestfs.conf + builder/website/Makefile +Index: libguestfs-1.26.10/customize/password.ml +=================================================================== +--- libguestfs-1.26.10.orig/customize/password.ml ++++ libguestfs-1.26.10/customize/password.ml +@@ -166,6 +166,9 @@ and default_crypto ~prog g root = + | "ubuntu", v when v >= 10 -> `SHA512 + | "ubuntu", _ -> `MD5 + ++ | "opensuse", v when v >= 11 -> `SHA512 ++ | "opensuse", _ -> `MD5 ++ + | _, _ -> + warning ~prog (f_"password: using insecure md5 password encryption for + guest of type %s version %d.\nIf this is incorrect, use --password-crypto option and file a bug.") distro major;
