From 0d2e107c89320fddd63711a6cc1449b7a76c4a7186020ee5f621ba231b982542 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 29 Sep 2015 14:29:54 +0000 Subject: [PATCH 1/4] Accepting request 334812 from home:cbosdonnat:branches:Virtualization - Add --gpg-auto-import-keys and -l to zypper for install and update. OBS-URL: https://build.opensuse.org/request/show/334812 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=349 --- 0000-hotfix.patch | 11 ++++++++++- libguestfs.changes | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/0000-hotfix.patch b/0000-hotfix.patch index c41441c..fc80655 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -42,10 +42,19 @@ Index: libguestfs-1.26.10/customize/customize_run.ml | "zypper" -> - (* XXX Should we use -n option? *) - sprintf "zypper in %s" quoted_args -+ sprintf "zypper -n in %s" quoted_args ++ sprintf "zypper -n --gpg-auto-import-keys in -l %s" quoted_args | "unknown" -> eprintf (f_"%s: --install is not supported for this guest operating system\n") prog; +@@ -135,7 +136,7 @@ exec >>%s 2>&1 + | "yum" -> + sprintf "yum -y update" + | "zypper" -> +- sprintf "zypper update" ++ sprintf "zypper -n --gpg-auto-import-keys update -l" + | "unknown" -> + eprintf (f_"%s: --update 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 diff --git a/libguestfs.changes b/libguestfs.changes index a66702c..8cb3c78 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 29 14:21:52 UTC 2015 - cbosdonnat@suse.com + +- Add --gpg-auto-import-keys and -l to zypper for install and + update. + ------------------------------------------------------------------- Mon Sep 14 11:27:19 UTC 2015 - cbosdonnat@suse.com From c252001a3e4a96cedaae33394587f0cff69e82ad0587caadd360ecb82e00bf6c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 1 Oct 2015 15:34:46 +0000 Subject: [PATCH 2/4] Accepting request 335426 from home:cbosdonnat:branches:Virtualization - Add password default encryption method for sles Diff to v1: * Adapted the patch to what upstream actually pushed * Added a changelog entry OBS-URL: https://build.opensuse.org/request/show/335426 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=350 --- 0000-hotfix.patch | 4 ++-- libguestfs.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/0000-hotfix.patch b/0000-hotfix.patch index fc80655..20c118b 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -157,8 +157,8 @@ Index: libguestfs-1.26.10/customize/password.ml | "ubuntu", v when v >= 10 -> `SHA512 | "ubuntu", _ -> `MD5 -+ | "opensuse", v when v >= 11 -> `SHA512 -+ | "opensuse", _ -> `MD5 ++ | ("opensuse"|"sles"), v when v >= 11 -> `SHA512 ++ | ("opensuse"|"sles"), _ -> `MD5 + | _, _ -> warning ~prog (f_"password: using insecure md5 password encryption for diff --git a/libguestfs.changes b/libguestfs.changes index 8cb3c78..39838a0 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 1 12:09:22 UTC 2015 - cbosdonnat@suse.com + +- Add password default encryption method for sles + ------------------------------------------------------------------- Tue Sep 29 14:21:52 UTC 2015 - cbosdonnat@suse.com From c77b65524dd4c15130942dfe6cc31cd7760a1f93075d07966ad13f00896fbda2 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 1 Oct 2015 15:42:02 +0000 Subject: [PATCH 3/4] Accepting request 335505 from home:cbosdonnat:branches:Virtualization - Add password default encryption method for sles. fate#318952 Added fate reference OBS-URL: https://build.opensuse.org/request/show/335505 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=351 --- libguestfs.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 39838a0..a397d3e 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 1 12:09:22 UTC 2015 - cbosdonnat@suse.com -- Add password default encryption method for sles +- Add password default encryption method for sles. fate#318952 ------------------------------------------------------------------- Tue Sep 29 14:21:52 UTC 2015 - cbosdonnat@suse.com From 5a672661e5e1832d5fb0448a212ee555729813d94e3ab76a4dfc34e1980b6bb1 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 2 Oct 2015 16:01:28 +0000 Subject: [PATCH 4/4] Accepting request 335947 from home:cbosdonnat:branches:Virtualization Cleaned up the gpg-keys auto import OBS-URL: https://build.opensuse.org/request/show/335947 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=352 --- 0000-hotfix.patch | 4 ++-- libguestfs.changes | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/0000-hotfix.patch b/0000-hotfix.patch index 20c118b..839636c 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -42,7 +42,7 @@ Index: libguestfs-1.26.10/customize/customize_run.ml | "zypper" -> - (* XXX Should we use -n option? *) - sprintf "zypper in %s" quoted_args -+ sprintf "zypper -n --gpg-auto-import-keys in -l %s" quoted_args ++ sprintf "zypper -n in -l %s" quoted_args | "unknown" -> eprintf (f_"%s: --install is not supported for this guest operating system\n") prog; @@ -51,7 +51,7 @@ Index: libguestfs-1.26.10/customize/customize_run.ml sprintf "yum -y update" | "zypper" -> - sprintf "zypper update" -+ sprintf "zypper -n --gpg-auto-import-keys update -l" ++ sprintf "zypper -n update -l" | "unknown" -> eprintf (f_"%s: --update is not supported for this guest operating system\n") prog; diff --git a/libguestfs.changes b/libguestfs.changes index a397d3e..8ea0b8e 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -6,8 +6,7 @@ Thu Oct 1 12:09:22 UTC 2015 - cbosdonnat@suse.com ------------------------------------------------------------------- Tue Sep 29 14:21:52 UTC 2015 - cbosdonnat@suse.com -- Add --gpg-auto-import-keys and -l to zypper for install and - update. +- Add -l to zypper for install and update. ------------------------------------------------------------------- Mon Sep 14 11:27:19 UTC 2015 - cbosdonnat@suse.com