May 2019 - openSUSE Commits - openSUSE Mailing Lists

commit kmod for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2019-05-06 13:19:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmod" Mon May 6 13:19:09 2019 rev:53 rq:699853 version:26 Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod-testsuite.changes 2018-12-28 12:32:11.152094353 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new.5148/kmod-testsuite.changes 2019-05-06 13:19:32.104285865 +0200 @@ -1,0 +2,29 @@ +Tue Feb 12 19:41:20 UTC 2019 - Michal Suchanek <msuchanek(a)suse.com> + +- Enable PKCS#7 signature parsing again - requires openssl +- Fix testsuite build - requires kernel-default-devel + +------------------------------------------------------------------- +Fri Feb 8 00:31:29 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to new upstream release 26 + * depmod now handles parallel invocations better by protecting + the temporary files being used. + * modprobe has a new --show-exports option. Under the hood, + this reads the .symtab and .strtab sections rather than + __versions so it shows useful data even if kernel is + configured without modversions (CONFIG_MODVERSIONS). + * modinfo supports PKCS#7 parsing by using openssl. +- Replaced the asn1c-based parser by an openssl-based PKCS + parser. +- Remove libkmod-signature-Fix-crash-when-module-signature-is.patch, + libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch, + libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch + (not accepted upstream) +- Remove enum.patch, + depmod-Prevent-module-dependency-files-corruption-du.patch, + depmod-Prevent-module-dependency-files-missing-durin.patch, + depmod-shut-up-gcc-insufficinet-buffer-warning.patch + (accepted upstream) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2018-12-28 12:32:11.252094284 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new.5148/kmod.changes 2019-05-06 13:19:32.352286429 +0200 @@ -1,0 +2,28 @@ +Tue Feb 12 19:41:20 UTC 2019 - Michal Suchanek <msuchanek(a)suse.com> + +- Enable PKCS#7 signature parsing again - requires openssl + +------------------------------------------------------------------- +Fri Feb 8 00:31:29 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to new upstream release 26 + * depmod now handles parallel invocations better by protecting + the temporary files being used. + * modprobe has a new --show-exports option. Under the hood, + this reads the .symtab and .strtab sections rather than + __versions so it shows useful data even if kernel is + configured without modversions (CONFIG_MODVERSIONS). + * modinfo supports PKCS#7 parsing by using openssl. +- Replaced the asn1c-based parser by an openssl-based PKCS + parser. +- Remove libkmod-signature-Fix-crash-when-module-signature-is.patch, + libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch, + libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch + (not accepted upstream) +- Remove enum.patch, + depmod-Prevent-module-dependency-files-corruption-du.patch, + depmod-Prevent-module-dependency-files-missing-durin.patch, + depmod-shut-up-gcc-insufficinet-buffer-warning.patch + (accepted upstream) + +------------------------------------------------------------------- @@ -12 +40 @@ -- Remove enum padding constants, add enum.patch. +- Remove enum padding constants, add enum.patch (boo#1097869). Old: ---- depmod-Prevent-module-dependency-files-corruption-du.patch depmod-Prevent-module-dependency-files-missing-durin.patch depmod-shut-up-gcc-insufficinet-buffer-warning.patch enum.patch kmod-25.tar.sign kmod-25.tar.xz libkmod-signature-Fix-crash-when-module-signature-is.patch libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch New: ---- kmod-26.tar.sign kmod-26.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:35.452293492 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:35.472293538 +0200 @@ -1,7 +1,7 @@ # # spec file for package kmod-testsuite # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,37 +18,28 @@ Name: kmod-testsuite %define lname libkmod2 -Version: 25 +Version: 26 Release: 0 Summary: Testsuite of the kmod package License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/Kernel -Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tool… -#Announce: https://lwn.net/Articles/664801/ +URL: https://www.kernel.org/pub/linux/utils/kernel/kmod/ #Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary #Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod Source: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz Source2: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign -Patch0: libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch -Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch -Patch7: libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch -Patch8: 0012-modprobe-print-unsupported-status.patch -Patch9: enum.patch -Patch10: depmod-Prevent-module-dependency-files-missing-durin.patch -Patch11: depmod-Prevent-module-dependency-files-corruption-du.patch -Patch12: depmod-shut-up-gcc-insufficinet-buffer-warning.patch +Patch6: 0012-modprobe-print-unsupported-status.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: asn1c BuildRequires: autoconf BuildRequires: automake -BuildRequires: git-core BuildRequires: kernel-default-devel +BuildRequires: libopenssl-devel >= 1.1.0 BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 BuildRequires: xz @@ -77,10 +68,10 @@ %configure \ --with-xz \ --with-zlib \ + --with-openssl \ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" -make -C libkmod/pkcs7/asn1c-gen regen make %{?_smp_mflags} V=1 KDIR="%kdir" %install ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:35.720294103 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:35.760294194 +0200 @@ -1,7 +1,7 @@ # # spec file for package kmod # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,42 +18,34 @@ Name: kmod %define lname libkmod2 -Version: 25 +Version: 26 Release: 0 Summary: Utilities to load modules into the kernel License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/Kernel -Url: https://www.kernel.org/pub/linux/utils/kernel/kmod/ +URL: https://www.kernel.org/pub/linux/utils/kernel/kmod/ #Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary #Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod Source: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz Source2: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign -Patch0: libkmod-signature-implement-pkcs7-parsing-with-asn1c.patch Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch -Patch6: libkmod-signature-Fix-crash-when-module-signature-is.patch -Patch7: libkmod-signature-pkcs-7-fix-crash-when-signer-info-.patch -Patch8: 0012-modprobe-print-unsupported-status.patch -Patch9: enum.patch -Patch10: depmod-Prevent-module-dependency-files-missing-durin.patch -Patch11: depmod-Prevent-module-dependency-files-corruption-du.patch -Patch12: depmod-shut-up-gcc-insufficinet-buffer-warning.patch +Patch6: 0012-modprobe-print-unsupported-status.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: asn1c BuildRequires: autoconf BuildRequires: automake +BuildRequires: libopenssl-devel >= 1.1.0 BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 -BuildRequires: suse-module-tools BuildRequires: xz BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) Requires(post): coreutils -Conflicts: kmod-compat < %version +Conflicts: kmod-compat < 25 %description kmod is a set of tools to handle common tasks with Linux kernel @@ -123,10 +115,10 @@ %configure \ --with-xz \ --with-zlib \ + --with-openssl \ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" -make -C libkmod/pkcs7/asn1c-gen regen make %{?_smp_mflags} V=1 %install ++++++ 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch ++++++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:35.988294713 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:36.004294750 +0200 @@ -1,7 +1,7 @@ -From ae166d55534d92e12e4892431075539474c59918 Mon Sep 17 00:00:00 2001 +From bbeef7f559bd9c6b1aad11bcd65e56428f290bd8 Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Wed, 26 Feb 2014 13:48:55 +0100 -Subject: [PATCH 1/5] modprobe: Recognize --allow-unsupported-modules on +Subject: [PATCH 1/6] modprobe: Recognize --allow-unsupported-modules on commandline The option does not do anything yet, but it does not return error @@ -14,10 +14,10 @@ 1 file changed, 5 insertions(+) diff --git a/tools/modprobe.c b/tools/modprobe.c -index 6b34658..589cc07 100644 +index a9e2331..3be2989 100644 --- a/tools/modprobe.c +++ b/tools/modprobe.c -@@ -83,6 +83,8 @@ static const struct option cmdopts[] = { +@@ -85,6 +85,8 @@ static const struct option cmdopts[] = { {"dirname", required_argument, 0, 'd'}, {"set-version", required_argument, 0, 'S'}, @@ -26,7 +26,7 @@ {"syslog", no_argument, 0, 's'}, {"quiet", no_argument, 0, 'q'}, {"verbose", no_argument, 0, 'v'}, -@@ -835,6 +837,9 @@ static int do_modprobe(int argc, char **orig_argv) +@@ -843,6 +845,9 @@ static int do_modprobe(int argc, char **orig_argv) case 'S': kversion = optarg; break; @@ -37,5 +37,5 @@ env_modprobe_options_append("-s"); use_syslog = 1; -- -1.8.4.5 +2.20.1 ++++++ 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch ++++++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:36.132295041 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:36.156295096 +0200 @@ -1,7 +1,7 @@ -From d607994c7b086afae09a8cded8bf6c5e8682541e Mon Sep 17 00:00:00 2001 +From ede3e6010e5a132286c3a1ee815ec88bdef847b8 Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Wed, 26 Feb 2014 13:53:38 +0100 -Subject: [PATCH 2/5] libkmod-config: Recognize allow_unsupported_modules in +Subject: [PATCH 2/6] libkmod-config: Recognize allow_unsupported_modules in the configuration References: fate#316971 @@ -11,10 +11,10 @@ 1 file changed, 3 insertions(+) diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c -index 0953924..79bfb9b 100644 +index aaac0a1..1b24536 100644 --- a/libkmod/libkmod-config.c +++ b/libkmod/libkmod-config.c -@@ -667,6 +667,9 @@ static int kmod_config_parse(struct kmod_config *config, int fd, +@@ -650,6 +650,9 @@ static int kmod_config_parse(struct kmod_config *config, int fd, || streq(cmd, "config")) { ERR(ctx, "%s: command %s is deprecated and not parsed anymore\n", filename, cmd); @@ -25,5 +25,5 @@ syntax_error: ERR(ctx, "%s line %u: ignoring bad line starting with '%s'\n", -- -1.8.4.5 +2.20.1 ++++++ 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch ++++++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:36.308295442 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:36.328295488 +0200 @@ -1,22 +1,22 @@ -From 153da67042852b7667ce4479d14835450c908417 Mon Sep 17 00:00:00 2001 +From 4a36f4a8b16c7fd345f6aec973d926d4e429328a Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Wed, 5 Mar 2014 14:40:14 +0100 -Subject: [PATCH 3/5] libkmod: Implement filtering of unsupported modules (off +Subject: [PATCH 3/6] libkmod: Implement filtering of unsupported modules (off by default) References: fate#316971 Patch-mainline: never --- - libkmod/libkmod-config.c | 12 ++++++++++-- - libkmod/libkmod-internal.h | 1 + - libkmod/libkmod-module.c | 31 +++++++++++++++++++++++++++++++ + libkmod/libkmod-config.c | 12 ++++++++++-- + libkmod/libkmod-internal.h | 1 + + libkmod/libkmod-module.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) -Index: kmod-24/libkmod/libkmod-config.c -=================================================================== ---- kmod-24.orig/libkmod/libkmod-config.c -+++ kmod-24/libkmod/libkmod-config.c -@@ -651,8 +651,16 @@ static int kmod_config_parse(struct kmod +diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c +index 1b24536..07d6a9e 100644 +--- a/libkmod/libkmod-config.c ++++ b/libkmod/libkmod-config.c +@@ -651,8 +651,16 @@ static int kmod_config_parse(struct kmod_config *config, int fd, ERR(ctx, "%s: command %s is deprecated and not parsed anymore\n", filename, cmd); } else if (streq(cmd, "allow_unsupported_modules")) { @@ -35,10 +35,10 @@ } else { syntax_error: ERR(ctx, "%s line %u: ignoring bad line starting with '%s'\n", -Index: kmod-24/libkmod/libkmod-internal.h -=================================================================== ---- kmod-24.orig/libkmod/libkmod-internal.h -+++ kmod-24/libkmod/libkmod-internal.h +diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h +index a65ddd1..2ad74c7 100644 +--- a/libkmod/libkmod-internal.h ++++ b/libkmod/libkmod-internal.h @@ -119,6 +119,7 @@ struct kmod_config { struct kmod_list *softdeps; @@ -47,11 +47,11 @@ }; int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **config, const char * const *config_paths) __attribute__((nonnull(1, 2,3))); -Index: kmod-24/libkmod/libkmod-module.c -=================================================================== ---- kmod-24.orig/libkmod/libkmod-module.c -+++ kmod-24/libkmod/libkmod-module.c -@@ -798,6 +798,24 @@ KMOD_EXPORT int kmod_module_remove_modul +diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c +index bffe715..9a3a35a 100644 +--- a/libkmod/libkmod-module.c ++++ b/libkmod/libkmod-module.c +@@ -798,6 +798,24 @@ KMOD_EXPORT int kmod_module_remove_module(struct kmod_module *mod, extern long init_module(const void *mem, unsigned long len, const char *args); @@ -76,7 +76,7 @@ /** * kmod_module_insert_module: * @mod: kmod module -@@ -823,6 +841,7 @@ KMOD_EXPORT int kmod_module_insert_modul +@@ -823,6 +841,7 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod, struct kmod_elf *elf; const char *path; const char *args = options ? options : ""; @@ -84,7 +84,7 @@ if (mod == NULL) return -ENOENT; -@@ -841,6 +860,18 @@ KMOD_EXPORT int kmod_module_insert_modul +@@ -841,6 +860,18 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod, } } @@ -103,3 +103,6 @@ if (kmod_file_get_direct(mod->file)) { unsigned int kernel_flags = 0; +-- +2.20.1 + ++++++ 0010-modprobe-Implement-allow-unsupported-modules.patch ++++++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:36.504295889 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:36.528295943 +0200 @@ -1,7 +1,7 @@ -From 5ed5ab09ff7d4fb581aec3a35f2eff24eaa838f9 Mon Sep 17 00:00:00 2001 +From 6cf25e17064cb213ef8c3a9c84ab787dd2852f2a Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Wed, 5 Mar 2014 15:02:44 +0100 -Subject: [PATCH] modprobe: Implement --allow-unsupported-modules +Subject: [PATCH 4/6] modprobe: Implement --allow-unsupported-modules References: fate#316971 Patch-mainline: never @@ -15,11 +15,11 @@ create mode 100644 libkmod/libkmod-unsupported.h diff --git a/Makefile.am b/Makefile.am -index 26384ccd6de1..d9856f77f8f6 100644 +index ddb25f0..e332977 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -106,7 +106,9 @@ libkmod_libkmod_la_LIBADD = \ - ${libpkcs7asn1c_LIBS} +@@ -92,7 +92,9 @@ libkmod_libkmod_la_LIBADD = \ + ${liblzma_LIBS} ${zlib_LIBS} ${openssl_LIBS} noinst_LTLIBRARIES += libkmod/libkmod-internal.la -libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) @@ -31,7 +31,7 @@ libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES) diff --git a/libkmod/libkmod-unsupported.c b/libkmod/libkmod-unsupported.c new file mode 100644 -index 000000000000..7ef9fc875b46 +index 0000000..7ef9fc8 --- /dev/null +++ b/libkmod/libkmod-unsupported.c @@ -0,0 +1,9 @@ @@ -46,7 +46,7 @@ +} diff --git a/libkmod/libkmod-unsupported.h b/libkmod/libkmod-unsupported.h new file mode 100644 -index 000000000000..a95b4a22fd14 +index 0000000..a95b4a2 --- /dev/null +++ b/libkmod/libkmod-unsupported.h @@ -0,0 +1,8 @@ @@ -59,7 +59,7 @@ + */ +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx); diff --git a/tools/modprobe.c b/tools/modprobe.c -index c0b7c6854375..1f6f28666183 100644 +index 3be2989..aa4033d 100644 --- a/tools/modprobe.c +++ b/tools/modprobe.c @@ -38,6 +38,8 @@ @@ -71,15 +71,15 @@ static int log_priority = LOG_CRIT; static int use_syslog = 0; #define LOG(...) log_printf(log_priority, __VA_ARGS__) -@@ -729,6 +731,7 @@ static int do_modprobe(int argc, char **orig_argv) +@@ -755,6 +757,7 @@ static int do_modprobe(int argc, char **orig_argv) + const char *dirname = NULL; + const char *root = NULL; + const char *kversion = NULL; ++ int allow_unsupported = 0; + int use_all = 0; int do_remove = 0; int do_show_config = 0; - int do_show_modversions = 0; -+ int allow_unsupported = 0; - int err; - - argv = prepend_options_from_env(&argc, orig_argv); -@@ -812,7 +815,7 @@ static int do_modprobe(int argc, char **orig_argv) +@@ -846,7 +849,7 @@ static int do_modprobe(int argc, char **orig_argv) kversion = optarg; break; case 128: @@ -88,7 +88,7 @@ break; case 's': env_modprobe_options_append("-s"); -@@ -885,6 +888,9 @@ static int do_modprobe(int argc, char **orig_argv) +@@ -919,6 +922,9 @@ static int do_modprobe(int argc, char **orig_argv) log_setup_kmod_log(ctx, verbose); @@ -99,5 +99,5 @@ if (do_show_config) -- -2.13.6 +2.20.1 ++++++ 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch ++++++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:36.696296326 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:36.712296363 +0200 @@ -1,7 +1,7 @@ -From be9bfe0f3724624d4b0240dbe6d580b7ae8b5256 Mon Sep 17 00:00:00 2001 +From 9d2f7d1e372d79dfe732992effb33daf4ee56235 Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Fri, 4 Apr 2014 10:08:01 +0200 -Subject: [PATCH 5/5] Do not filter unsupported modules when running a vanilla +Subject: [PATCH 5/6] Do not filter unsupported modules when running a vanilla kernel References: bnc#871066 @@ -11,13 +11,14 @@ 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c -index 9f47cfd..9a486c4 100644 +index 07d6a9e..550a612 100644 --- a/libkmod/libkmod-config.c +++ b/libkmod/libkmod-config.c -@@ -573,6 +573,18 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config) +@@ -566,6 +566,18 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config) + return 0; } - /* ++/* + * Check if kernel is built with the SUSE "suppported-flag" patch + */ +static int is_suse_kernel(void) @@ -29,11 +30,10 @@ + return 1; +} + -+/* + /* * Take an fd and own it. It will be closed on return. filename is used only * for debug messages - */ -@@ -674,9 +686,10 @@ static int kmod_config_parse(struct kmod_config *config, int fd, +@@ -657,9 +669,10 @@ static int kmod_config_parse(struct kmod_config *config, int fd, goto syntax_error; if (streq(param, "yes") || streq(param, "1")) config->block_unsupported = 0; @@ -48,5 +48,5 @@ } else { syntax_error: -- -1.8.4.5 +2.20.1 ++++++ 0012-modprobe-print-unsupported-status.patch ++++++ --- /var/tmp/diff_new_pack.ptaEOX/_old 2019-05-06 13:19:36.856296691 +0200 +++ /var/tmp/diff_new_pack.ptaEOX/_new 2019-05-06 13:19:36.880296745 +0200 @@ -1,7 +1,7 @@ -From 7e04a4a70e514aec5ed2328cb0a2d48bf6408197 Mon Sep 17 00:00:00 2001 +From e48d1ee5980643f56165a9ee1687ff64f864aeb6 Mon Sep 17 00:00:00 2001 From: Vlad Bespalov <vlad.bespalov(a)jetstreamsoft.com> Date: Fri, 8 Jun 2018 21:13:00 +0000 -Subject: [PATCH] modprobe: print status of "allow_unsupported_modules" +Subject: [PATCH 6/6] modprobe: print status of "allow_unsupported_modules" variable In SLES11 modprobe printed everything referenced in /etc/modprobe.d @@ -43,7 +43,7 @@ * kmod_config_get_blacklists: * @ctx: kmod library context diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h -index f9e33c6..0ae8ab3 100644 +index 352627e..c2b9657 100644 --- a/libkmod/libkmod.h +++ b/libkmod/libkmod.h @@ -115,6 +115,7 @@ const char *kmod_config_iter_get_key(const struct kmod_config_iter *iter); @@ -55,10 +55,10 @@ /* * kmod_module diff --git a/tools/modprobe.c b/tools/modprobe.c -index 1f6f286..8064e37 100644 +index aa4033d..4f1c54a 100644 --- a/tools/modprobe.c +++ b/tools/modprobe.c -@@ -199,6 +199,11 @@ static int show_config(struct kmod_ctx *ctx) +@@ -201,6 +201,11 @@ static int show_config(struct kmod_ctx *ctx) kmod_config_iter_free_iter(iter); } @@ -71,5 +71,5 @@ fflush(stdout); -- -2.12.3 +2.20.1 ++++++ kmod-25.tar.xz -> kmod-26.tar.xz ++++++ ++++ 11762 lines of diff (skipped)

1 0

commit pcp for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2019-05-06 13:18:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcp" Mon May 6 13:18:35 2019 rev:50 rq:699832 version:4.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2019-03-14 14:52:53.755783333 +0100 +++ /work/SRC/openSUSE:Factory/.pcp.new.5148/pcp.changes 2019-05-06 13:18:46.432179333 +0200 @@ -1,0 +2,5 @@ +Wed Apr 24 17:29:39 UTC 2019 - Martin Liška <mliska(a)suse.cz> + +- Disable LTO (boo#1133273). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ --- /var/tmp/diff_new_pack.yyBA9D/_old 2019-05-06 13:18:49.236186902 +0200 +++ /var/tmp/diff_new_pack.yyBA9D/_new 2019-05-06 13:18:49.240186914 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -2322,6 +2322,7 @@ rm -Rf $RPM_BUILD_ROOT %build +%define _lto_cflags %{nil} %if 0%{?suse_version} # in case we're building without os-release (bsc#1123311)... export PACKAGE_DISTRIBUTION="suse"

1 0

commit nvme-cli for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package nvme-cli for openSUSE:Factory checked in at 2019-05-06 13:18:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nvme-cli (Old) and /work/SRC/openSUSE:Factory/.nvme-cli.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nvme-cli" Mon May 6 13:18:09 2019 rev:32 rq:699825 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/nvme-cli/nvme-cli.changes 2019-04-02 09:18:13.700525434 +0200 +++ /work/SRC/openSUSE:Factory/.nvme-cli.new.5148/nvme-cli.changes 2019-05-06 13:18:25.924123970 +0200 @@ -1,0 +2,12 @@ +Fri Apr 12 08:45:04 UTC 2019 - Simon Schricker <sschricker(a)suse.com> + +- Add new 'ontapdevices' command and corresponding documentation. + Requested in (bsc#1131930). + + 0011-nvme-cli-add-netapp-ontapdevices-command.patch + + 0012-nvme-cli-add-netapp-ontapdevices-man-page.patch + + 0104-nvme-cli-Fix-documentation-syntax-and-typo.patch +- Revert stop-on-failure patch for connect-all, which caused + unintended behaviour (bsc#1132124) + + 0013-nvme-cli-Revert-stop-on-failure-with-connect-all.patch + +------------------------------------------------------------------- New: ---- 0011-nvme-cli-add-netapp-ontapdevices-command.patch 0012-nvme-cli-add-netapp-ontapdevices-man-page.patch 0013-nvme-cli-Revert-stop-on-failure-with-connect-all.patch 0104-nvme-cli-Fix-documentation-syntax-and-typo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvme-cli.spec ++++++ --- /var/tmp/diff_new_pack.2DVP9V/_old 2019-05-06 13:18:29.972134898 +0200 +++ /var/tmp/diff_new_pack.2DVP9V/_new 2019-05-06 13:18:29.976134909 +0200 @@ -35,10 +35,14 @@ Patch8: 0008-nvme-cli-minor-cleanup-for-submit_io.patch Patch9: 0009-Regen-documentation.patch Patch10: 0010-nvme-cli-fix-fc-trtype-string.patch +Patch11: 0011-nvme-cli-add-netapp-ontapdevices-command.patch +Patch12: 0012-nvme-cli-add-netapp-ontapdevices-man-page.patch +Patch13: 0013-nvme-cli-Revert-stop-on-failure-with-connect-all.patch Patch100: 0100-nvme_fc-auto-connect-scripts.patch Patch101: 0101-71-nvme-iopolicy-netapp.rules-add-default-rules-for-.patch Patch102: 0102-Add-nvmefc-connect.target.patch Patch103: 0103-Change-service-to-type-simple.patch +Patch104: 0104-nvme-cli-Fix-documentation-syntax-and-typo.patch BuildRequires: libuuid-devel BuildRequires: pkgconfig BuildRequires: xmlto @@ -62,10 +66,14 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 %build echo %{version} > version ++++++ 0011-nvme-cli-add-netapp-ontapdevices-command.patch ++++++ >From 70bfe077af40aeace6c9e2b628b20cf8a34c1def Mon Sep 17 00:00:00 2001 From: Martin George <marting(a)netapp.com> Date: Mon, 1 Apr 2019 09:39:56 -0700 Subject: [PATCH] nvme-cli: add netapp ontapdevices command Add a new ontapdevices command to the NetApp plugin for NetApp ONTAP devices. Signed-off-by: Martin George <marting(a)netapp.com> Reviewed-by: Steve Schremmer <sschremm(a)netapp.com> --- plugins/netapp/netapp-nvme.c | 342 +++++++++++++++++++++++++++++++++++++++++++ plugins/netapp/netapp-nvme.h | 1 + 2 files changed, 343 insertions(+) diff --git a/plugins/netapp/netapp-nvme.c b/plugins/netapp/netapp-nvme.c index 416e74e..2951311 100644 --- a/plugins/netapp/netapp-nvme.c +++ b/plugins/netapp/netapp-nvme.c @@ -21,6 +21,7 @@ #include <unistd.h> #include <errno.h> #include <string.h> +#include <sys/ioctl.h> #include "nvme.h" #include "nvme-ioctl.h" @@ -31,12 +32,28 @@ #define CREATE_CMD #include "netapp-nvme.h" +#define ONTAP_C2_LOG_ID 0xC2 +#define ONTAP_C2_LOG_SIZE 4096 +#define ONTAP_LABEL_LEN 260 +#define ONTAP_NS_PATHLEN 520 + enum { NNORMAL, NJSON, NCOLUMN, }; +enum { + ONTAP_C2_LOG_SUPPORTED_LSP = 0x0, + ONTAP_C2_LOG_NSINFO_LSP = 0x1, +}; + +enum { + ONTAP_VSERVER_TLV = 0x11, + ONTAP_VOLUME_TLV = 0x12, + ONTAP_NS_TLV = 0x13, +}; + static const char *dev_path = "/dev/"; struct smdevice_info { @@ -46,6 +63,15 @@ struct smdevice_info { char dev[265]; }; +struct ontapdevice_info { + int nsid; + struct nvme_id_ctrl ctrl; + struct nvme_id_ns ns; + char nsdesc[4096]; + unsigned char log_data[ONTAP_C2_LOG_SIZE]; + char dev[265]; +}; + #define ARRAY_LABEL_LEN 60 #define VOLUME_LABEL_LEN 60 @@ -77,6 +103,100 @@ static void netapp_nguid_to_str(char *str, __u8 *nguid) str += sprintf(str, "%02x", nguid[i]); } +static void netapp_get_ns_size(char *size, long long *lba, + struct nvme_id_ns *ns) +{ + *lba = 1 << ns->lbaf[(ns->flbas & 0x0F)].ds; + double nsze = le64_to_cpu(ns->nsze) * (*lba); + const char *s_suffix = suffix_si_get(&nsze); + + sprintf(size, "%.2f%sB", nsze, s_suffix); +} + +static void netapp_uuid_to_str(char *str, void *data) +{ +#ifdef LIBUUID + uuid_t uuid; + struct nvme_ns_id_desc *desc = data; + + memcpy(uuid, data + sizeof(*desc), 16); + uuid_unparse_lower(uuid, str); +#endif +} + +static void ontap_labels_to_str(char *dst, char *src, int count) +{ + int i; + + memset(dst, 0, ONTAP_LABEL_LEN); + for (i = 0; i < count; i++) { + if (src[i] >= '!' && src[i] <= '~') + dst[i] = src[i]; + else + break; + } + dst[i] = '\0'; +} + +static void netapp_get_ontap_labels(char *vsname, char *nspath, + unsigned char *log_data) +{ + int lsp, tlv, label_len; + char *vserver_name, *volume_name, *namespace_name; + char vol_name[ONTAP_LABEL_LEN], ns_name[ONTAP_LABEL_LEN]; + const char *ontap_vol = "/vol/"; + int i, j; + + /* get the lsp */ + lsp = (*(__u8 *)&log_data[16]) & 0x0F; + if (lsp != ONTAP_C2_LOG_NSINFO_LSP) + /* lsp not related to nsinfo */ + return; + + /* get the vserver tlv and name */ + tlv = *(__u8 *)&log_data[32]; + if (tlv == ONTAP_VSERVER_TLV) { + label_len = (*(__u16 *)&log_data[34]) * 4; + vserver_name = (char *)&log_data[36]; + ontap_labels_to_str(vsname, vserver_name, label_len); + } else { + /* not the expected vserver tlv */ + fprintf(stderr, "Unable to fetch ONTAP vserver name\n"); + return; + } + + i = 36 + label_len; + j = i + 2; + /* get the volume tlv and name */ + tlv = *(__u8 *)&log_data[i]; + if (tlv == ONTAP_VOLUME_TLV) { + label_len = (*(__u16 *)&log_data[j]) * 4; + volume_name = (char *)&log_data[j + 2]; + ontap_labels_to_str(vol_name, volume_name, label_len); + } else { + /* not the expected volume tlv */ + fprintf(stderr, "Unable to fetch ONTAP volume name\n"); + return; + } + + i += 4 + label_len; + j += 4 + label_len; + /* get the namespace tlv and name */ + tlv = *(__u8 *)&log_data[i]; + if (tlv == ONTAP_NS_TLV) { + label_len = (*(__u16 *)&log_data[j]) * 4; + namespace_name = (char *)&log_data[j + 2]; + ontap_labels_to_str(ns_name, namespace_name, label_len); + } else { + /* not the expected namespace tlv */ + fprintf(stderr, "Unable to fetch ONTAP namespace name\n"); + return; + } + + snprintf(nspath, ONTAP_NS_PATHLEN, "%s%s%s%s", ontap_vol, + vol_name, "/", ns_name); +} + static void netapp_smdevice_json(struct json_array *devices, char *devname, char *arrayname, char *volname, int nsid, char *nguid, char *ctrl, char *astate, char *size, long long lba, @@ -99,6 +219,25 @@ static void netapp_smdevice_json(struct json_array *devices, char *devname, json_array_add_value_object(devices, device_attrs); } +static void netapp_ontapdevice_json(struct json_array *devices, char *devname, + char *vsname, char *nspath, int nsid, char *uuid, + char *size, long long lba, long long nsze) +{ + struct json_object *device_attrs; + + device_attrs = json_create_object(); + json_object_add_value_string(device_attrs, "Device", devname); + json_object_add_value_string(device_attrs, "Vserver", vsname); + json_object_add_value_string(device_attrs, "Namespace_Path", nspath); + json_object_add_value_int(device_attrs, "NSID", nsid); + json_object_add_value_string(device_attrs, "UUID", uuid); + json_object_add_value_string(device_attrs, "Size", size); + json_object_add_value_int(device_attrs, "LBA_Data_Size", lba); + json_object_add_value_int(device_attrs, "Namespace_Size", nsze); + + json_array_add_value_object(devices, device_attrs); +} + static void netapp_smdevices_print(struct smdevice_info *devices, int count, int format) { struct json_object *root = NULL; @@ -161,6 +300,94 @@ static void netapp_smdevices_print(struct smdevice_info *devices, int count, int } } +static void netapp_ontapdevices_print(struct ontapdevice_info *devices, + int count, int format) +{ + struct json_object *root = NULL; + struct json_array *json_devices = NULL; + char vsname[ONTAP_LABEL_LEN] = " "; + char nspath[ONTAP_NS_PATHLEN] = " "; + long long lba; + char size[128]; + char uuid_str[37] = " "; + int i; + + char basestr[] = "%s, Vserver %s, Namespace Path %s, NSID %d, UUID %s, %s\n"; + char columnstr[] = "%-16s %-25s %-50s %-4d %-38s %-9s\n"; + + /* default to 'normal' output format */ + char *formatstr = basestr; + + if (format == NCOLUMN) { + /* change output string and print column headers */ + formatstr = columnstr; + printf("%-16s %-25s %-50s %-4s %-38s %-9s\n", + "Device", "Vserver", "Namespace Path", + "NSID", "UUID", "Size"); + printf("%-16s %-25s %-50s %-4s %-38s %-9s\n", + "----------------", "-------------------------", + "--------------------------------------------------", + "----", "--------------------------------------", + "---------"); + } else if (format == NJSON) { + /* prepare for json output */ + root = json_create_object(); + json_devices = json_create_array(); + } + + for (i = 0; i < count; i++) { + + netapp_get_ns_size(size, &lba, &devices[i].ns); + netapp_uuid_to_str(uuid_str, devices[i].nsdesc); + netapp_get_ontap_labels(vsname, nspath, devices[i].log_data); + + if (format == NJSON) { + netapp_ontapdevice_json(json_devices, devices[i].dev, + vsname, nspath, devices[i].nsid, + uuid_str, size, lba, + le64_to_cpu(devices[i].ns.nsze)); + } else + printf(formatstr, devices[i].dev, vsname, nspath, + devices[i].nsid, uuid_str, size); + } + + if (format == NJSON) { + /* complete the json output */ + json_object_add_value_array(root, "ONTAPdevices", json_devices); + json_print_object(root, NULL); + } +} + +static int nvme_get_ontap_c2_log(int fd, __u32 nsid, void *buf, __u32 buflen) +{ + struct nvme_admin_cmd get_log; + int err; + + memset(buf, 0, buflen); + memset(&get_log, 0, sizeof(struct nvme_admin_cmd)); + + get_log.opcode = nvme_admin_get_log_page; + get_log.nsid = nsid; + get_log.addr = (__u64)(uintptr_t)buf; + get_log.data_len = buflen; + + __u32 numd = (get_log.data_len >> 2) - 1; + __u32 numdu = numd >> 16; + __u32 numdl = numd & 0xFFFF; + + get_log.cdw10 = ONTAP_C2_LOG_ID | (numdl << 16); + get_log.cdw10 |= ONTAP_C2_LOG_NSINFO_LSP << 8; + get_log.cdw11 = numdu; + + err = nvme_submit_passthru(fd, NVME_IOCTL_ADMIN_CMD, &get_log); + if (err) { + fprintf(stderr, "ioctl error %0x\n", err); + return 1; + } + + return 0; +} + static int netapp_smdevices_get_info(int fd, struct smdevice_info *item, const char *dev) { @@ -188,6 +415,50 @@ static int netapp_smdevices_get_info(int fd, struct smdevice_info *item, return 1; } +static int netapp_ontapdevices_get_info(int fd, struct ontapdevice_info *item, + const char *dev) +{ + int err; + + err = nvme_identify_ctrl(fd, &item->ctrl); + if (err) { + fprintf(stderr, "Identify Controller failed to %s (%s)\n", + dev, strerror(err)); + return 0; + } + + if (strncmp("NetApp ONTAP Controller", item->ctrl.mn, 23) != 0) + /* not the right controller model */ + return 0; + + item->nsid = nvme_get_nsid(fd); + + err = nvme_identify_ns(fd, item->nsid, 0, &item->ns); + if (err) { + fprintf(stderr, "Unable to identify namespace for %s (%s)\n", + dev, strerror(err)); + return 0; + } + + err = nvme_identify_ns_descs(fd, item->nsid, item->nsdesc); + if (err) { + fprintf(stderr, "Unable to identify namespace descriptor for %s (%s)\n", + dev, strerror(err)); + return 0; + } + + err = nvme_get_ontap_c2_log(fd, item->nsid, item->log_data, ONTAP_C2_LOG_SIZE); + if (err) { + fprintf(stderr, "Unable to get log page data for %s (%s)\n", + dev, strerror(err)); + return 0; + } + + strncpy(item->dev, dev, sizeof(item->dev)); + + return 1; +} + static int netapp_nvme_filter(const struct dirent *d) { char path[264]; @@ -294,3 +565,74 @@ static int netapp_smdevices(int argc, char **argv, struct command *command, free(smdevices); return 0; } + +/* handler for 'nvme netapp ontapdevices' */ +static int netapp_ontapdevices(int argc, char **argv, struct command *command, + struct plugin *plugin) +{ + const char *desc = "Display information about ONTAP devices."; + struct config { + char *output_format; + }; + struct config cfg = { + .output_format = "normal", + }; + struct dirent **devices; + int num, i, fd, ret, fmt; + struct ontapdevice_info *ontapdevices; + char path[264]; + int num_ontapdevices = 0; + + const struct argconfig_commandline_options opts[] = { + {"output-format", 'o', "FMT", CFG_STRING, &cfg.output_format, + required_argument, "Output Format: normal|json|column"}, + {NULL} + }; + + ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg)); + if (ret < 0) + return ret; + + fmt = netapp_output_format(cfg.output_format); + if (fmt != NNORMAL && fmt != NCOLUMN && fmt != NJSON) { + fprintf(stderr, "Unrecognized output format: %s\n", cfg.output_format); + return -EINVAL; + } + + num = scandir(dev_path, &devices, netapp_nvme_filter, alphasort); + if (num <= 0) { + fprintf(stderr, "No NVMe devices detected.\n"); + return num; + } + + ontapdevices = calloc(num, sizeof(*ontapdevices)); + if (!ontapdevices) { + fprintf(stderr, "Unable to allocate memory for devices.\n"); + return -ENOMEM; + } + + for (i = 0; i < num; i++) { + snprintf(path, sizeof(path), "%s%s", dev_path, + devices[i]->d_name); + fd = open(path, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "Unable to open %s: %s\n", path, + strerror(errno)); + continue; + } + + num_ontapdevices += netapp_ontapdevices_get_info(fd, + &ontapdevices[num_ontapdevices], path); + + close(fd); + } + + if (num_ontapdevices) + netapp_ontapdevices_print(ontapdevices, num_ontapdevices, fmt); + + for (i = 0; i < num; i++) + free(devices[i]); + free(devices); + free(ontapdevices); + return 0; +} diff --git a/plugins/netapp/netapp-nvme.h b/plugins/netapp/netapp-nvme.h index 3dd019e..d4eebd6 100644 --- a/plugins/netapp/netapp-nvme.h +++ b/plugins/netapp/netapp-nvme.h @@ -9,6 +9,7 @@ PLUGIN(NAME("netapp", "NetApp vendor specific extensions"), COMMAND_LIST( ENTRY("smdevices", "NetApp SMdevices", netapp_smdevices) + ENTRY("ontapdevices", "NetApp ONTAPdevices", netapp_ontapdevices) ) ); -- 2.16.4 ++++++ 0012-nvme-cli-add-netapp-ontapdevices-man-page.patch ++++++ ++++ 960 lines (skipped) ++++++ 0013-nvme-cli-Revert-stop-on-failure-with-connect-all.patch ++++++ >From 4a6c247971ce8e7a4af7f976be8906c907ef13cf Mon Sep 17 00:00:00 2001 From: James Smart <jsmart2021(a)gmail.com> Date: Tue, 9 Apr 2019 13:51:54 -0700 Subject: [PATCH] nvme-cli: Revert stop-on-failure with connect-all The patch that added special treatment for EALREADY connect failures also changed the behavior on what happens if a discovery log contains an entry that is not connectable by the system or host port. If it encounters a log entry that can't be connected to, it will not attempt to connect to any log entries beyond it. This can leave lots of devices unconnected to. Revert the stop-on-failure introduced by the previous patch. Specifically, this failed for me on an FC array that had a discovery log entry for a port that was not visible via zoning for the initiator port being used. Fixes: 1a922e0e121d7 ("connect-all: special treatment to EALREADY afetr write to /dev/nvme-fabrics" Signed-off-by: James Smart <jsmart2021(a)gmail.com> CC: Eyal Ben David <eyalbe(a)il.ibm.com> CC: Martin George <Martin.George(a)netapp.com> --- fabrics.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fabrics.c b/fabrics.c index 2b08be5..aad399d 100644 --- a/fabrics.c +++ b/fabrics.c @@ -817,9 +817,12 @@ static int connect_ctrls(struct nvmf_disc_rsp_page_hdr *log, int numrec) continue; } - /* otherwise error */ - ret = -instance; - break; + /* + * don't error out. The Discovery Log may contain + * devices that aren't necessarily connectable via + * the system/host transport port. Let those items + * fail and continue on to the next log element. + */ } return ret; -- 2.16.4 ++++++ 0104-nvme-cli-Fix-documentation-syntax-and-typo.patch ++++++ >From 711762f31494772a0e7f08499e1b2992836e66e5 Mon Sep 17 00:00:00 2001 From: Simon Schricker <sschricker(a)suse.de> Date: Thu, 11 Apr 2019 10:52:14 +0200 Subject: [PATCH] nvme-cli: Fix documentation syntax and typo Both changes are already upstream or sent upstream. Commit of Keith Busch: 5a7ccf9d Co-authored-by: Keith Busch <keith.busch(a)intel.com> Signed-off-by: Simon Schricker <sschricker(a)suse.de> --- Documentation/nvme-netapp-ontapdevices.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/nvme-netapp-ontapdevices.txt b/Documentation/nvme-netapp-ontapdevices.txt index 09369f1..c292758 100644 --- a/Documentation/nvme-netapp-ontapdevices.txt +++ b/Documentation/nvme-netapp-ontapdevices.txt @@ -1,5 +1,5 @@ nvme-netapp-ontapdevices(1) -======================== +=========================== NAME ---- @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- Display information about ONTAP devices on the host. The ONTAP devices are -are identified using the Identify Controller data. +identified using the Identify Controller data. OPTIONS ------- -- 2.16.4

1 0

commit systemd-presets-common-SUSE for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package systemd-presets-common-SUSE for openSUSE:Factory checked in at 2019-05-06 13:17:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd-presets-common-SUSE (Old) and /work/SRC/openSUSE:Factory/.systemd-presets-common-SUSE.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd-presets-common-SUSE" Mon May 6 13:17:52 2019 rev:8 rq:699823 version:15 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd-presets-common-SUSE/systemd-presets-common-SUSE.changes 2019-01-29 14:45:34.571029441 +0100 +++ /work/SRC/openSUSE:Factory/.systemd-presets-common-SUSE.new.5148/systemd-presets-common-SUSE.changes 2019-05-06 13:18:02.288060164 +0200 @@ -1,0 +2,5 @@ +Mon Apr 1 22:29:16 UTC 2019 - Andrew Daugherity <adaugherity(a)tamu.edu> + +- Enable logwatch.timer (bsc#1112500). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-presets-common-SUSE.spec ++++++ --- /var/tmp/diff_new_pack.1v0gpJ/_old 2019-05-06 13:18:03.100062356 +0200 +++ /var/tmp/diff_new_pack.1v0gpJ/_new 2019-05-06 13:18:03.104062367 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # ++++++ default-SUSE.preset ++++++ --- /var/tmp/diff_new_pack.1v0gpJ/_old 2019-05-06 13:18:03.140062463 +0200 +++ /var/tmp/diff_new_pack.1v0gpJ/_new 2019-05-06 13:18:03.140062463 +0200 @@ -27,6 +27,7 @@ enable kbdsettings.service enable klog.service enable logrotate.timer +enable logwatch.timer enable lvm2-lvmetad.socket enable lvm2-monitor.service enable lvm2-lvmpolld.socket

1 0

commit sg3_utils for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package sg3_utils for openSUSE:Factory checked in at 2019-05-06 13:17:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sg3_utils (Old) and /work/SRC/openSUSE:Factory/.sg3_utils.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sg3_utils" Mon May 6 13:17:32 2019 rev:54 rq:699766 version:1.45~815+5.6aa67ed Changes: -------- --- /work/SRC/openSUSE:Factory/sg3_utils/sg3_utils.changes 2019-04-30 12:56:46.142196780 +0200 +++ /work/SRC/openSUSE:Factory/.sg3_utils.new.5148/sg3_utils.changes 2019-05-06 13:17:43.292010442 +0200 @@ -22,0 +23,5 @@ +Thu Apr 18 18:33:13 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Replace old $RPM_* shell vars. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sg3_utils.spec ++++++ --- /var/tmp/diff_new_pack.Aum9CI/_old 2019-05-06 13:17:44.960014416 +0200 +++ /var/tmp/diff_new_pack.Aum9CI/_new 2019-05-06 13:17:44.960014416 +0200 @@ -93,20 +93,20 @@ %install %make_install -install -m 644 doc/rescan-scsi-bus.sh.8 $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir} -install -m 644 scripts/54-before-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdir} -install -m 644 scripts/55-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdir} -install -m 644 scripts/58-scsi-sg3_symlink.rules $RPM_BUILD_ROOT%{_udevrulesdir} -install -m 644 scripts/40-usb-blacklist.rules $RPM_BUILD_ROOT%{_udevrulesdir} -install -m 644 scripts/59-fc-wwpn-id.rules $RPM_BUILD_ROOT%{_udevrulesdir} -install -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT%{_udevrulesdir}/.. -mkdir -p $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d/50-sg3_utils.conf -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -m 644 scripts/lunmask.service $RPM_BUILD_ROOT%{_unitdir} -mkdir -p $RPM_BUILD_ROOT%{_unitdir}/../scripts -install -m 755 scripts/scsi-enable-target-scan.sh $RPM_BUILD_ROOT%{_unitdir}/../scripts +install -m 644 doc/rescan-scsi-bus.sh.8 %{buildroot}/%{_mandir}/man8 +mkdir -p %{buildroot}/%{_udevrulesdir} +install -m 644 scripts/54-before-scsi-sg3_id.rules %{buildroot}/%{_udevrulesdir} +install -m 644 scripts/55-scsi-sg3_id.rules %{buildroot}/%{_udevrulesdir} +install -m 644 scripts/58-scsi-sg3_symlink.rules %{buildroot}/%{_udevrulesdir} +install -m 644 scripts/40-usb-blacklist.rules %{buildroot}/%{_udevrulesdir} +install -m 644 scripts/59-fc-wwpn-id.rules %{buildroot}/%{_udevrulesdir} +install -m 755 scripts/fc_wwpn_id %{buildroot}/%{_udevrulesdir}/.. +mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d +install -m 644 %{SOURCE1} %{buildroot}/usr/lib/dracut/dracut.conf.d/50-sg3_utils.conf +mkdir -p %{buildroot}/%{_unitdir} +install -m 644 scripts/lunmask.service %{buildroot}/%{_unitdir} +mkdir -p %{buildroot}/%{_unitdir}/../scripts +install -m 755 scripts/scsi-enable-target-scan.sh %{buildroot}/%{_unitdir}/../scripts rm -f %{buildroot}%{_libdir}/*.la %post -n %lname -p /sbin/ldconfig

1 0

commit multipath-tools for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2019-05-06 13:17:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old) and /work/SRC/openSUSE:Factory/.multipath-tools.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "multipath-tools" Mon May 6 13:17:19 2019 rev:113 rq:699729 version:0.8.1+8+suse.8c11498 Changes: -------- --- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes 2019-04-21 09:02:11.818466807 +0200 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new.5148/multipath-tools.changes 2019-05-06 13:17:25.135967185 +0200 @@ -1,0 +2,21 @@ +Tue Apr 30 14:48:40 UTC 2019 - mwilck(a)suse.com + +- Disable kmod() style dependencies again (bsc#1119414) + * For TW, dependencies will be autogenerated + (gh#openSUSE/rpm-config-SUSE#3) + * For SLE, feature is currently rejected (jsc#SLE-3853) +- Update to version 0.8.1+8+suse.8c11498: + * Avoid deadlock situation during udev settle + (bsc#1131789, bsc#1125145) + - multipath -u: test socket connection in non-blocking mode + * Fix priority handling for offline paths + (bsc#1118495) +- Update to upstream 0.8.1 + * Avoid device IO in "multipath -u" (bsc#1125145) + * multipathd: protect all access to running_state + (bsc##1110060, bsc#1110439) + * Improve handling of changed WWIDs and temporary failure + to obtain WWID. Option "disable_changed_wwids" is now ignored. + * Fixes for PATH_PENDING state handling (bsc#1125043) + +------------------------------------------------------------------- Old: ---- multipath-tools-0.8.0+17+suse.a28893f.tar.xz New: ---- multipath-tools-0.8.1+8+suse.8c11498.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.Jd9hIc/_old 2019-05-06 13:17:26.511970463 +0200 +++ /var/tmp/diff_new_pack.Jd9hIc/_new 2019-05-06 13:17:26.511970463 +0200 @@ -49,7 +49,7 @@ %define _sysdir usr/lib Name: multipath-tools -Version: 0.8.0+17+suse.a28893f +Version: 0.8.1+8+suse.8c11498 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only @@ -82,14 +82,6 @@ Requires: device-mapper >= 1.2.78 Requires: kpartx Requires: sg3_utils -# Generate kmod(xyz)-style dependencies for modules that we put -# in modules-load.d. Use the modules.d file (Source1) as input to avoid -# maintaining these dependencies in several places. -# This feature is to be enabled for SLE15-SP1, and some time in the -# near future, for Factory. -%if 0%{?sle_version} >= 150100 -%(sed 's/^\s*//;s/\s*$//;/^#/d;/^$/d;s/^/Requires: kmod(/;s/$/)/;' %{S:1}) -%endif Obsoletes: multipath-tools-rbd <= %{version} PreReq: coreutils grep @@ -107,11 +99,11 @@ # and it loads prioritizers (to be fixed) and checkers. %package -n libmpath0 Summary: Libraries for multipath-tools +License: GPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later +Group: System/Libraries # This is for libmpathcmd, which is useless without multipathd. # No hard dependency here - we don't want to pull in all dependencies # of multipath-tools. -License: GPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later -Group: System/Libraries Recommends: multipath-tools Conflicts: multipath-tools < 0.8.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Jd9hIc/_old 2019-05-06 13:17:26.531970511 +0200 +++ /var/tmp/diff_new_pack.Jd9hIc/_new 2019-05-06 13:17:26.531970511 +0200 @@ -8,7 +8,7 @@ are have been added to factory before upstream will be counted. Determine patch offset manually! It should be the number of patches which are _really_ not upstream (yet). --> - <param name="versionformat">@PARENT_TAG@+17+suse.%h</param> + <param name="versionformat">@PARENT_TAG@+8+suse.%h</param> <param name="revision">factory</param> <param name="match-tag">0.[0-9].[0-9]</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Jd9hIc/_old 2019-05-06 13:17:26.543970540 +0200 +++ /var/tmp/diff_new_pack.Jd9hIc/_new 2019-05-06 13:17:26.543970540 +0200 @@ -1,6 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/multipath-tools.git</param> - <param name="changesrevision">a28893f67c7ca0009b9ef8b85732348b3c3092f1</param></service><service name="tar_scm"> - <param name="url">https://github.com/mwilck/multipath-tools.git</param> - <param name="changesrevision">08a969b7fce0db769b63bdbfead2a452dc417d58</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">8c114985f9fd7eb142ddec9737870f99ff28d5ba</param></service></servicedata> \ No newline at end of file ++++++ multipath-tools-0.8.0+17+suse.a28893f.tar.xz -> multipath-tools-0.8.1+8+suse.8c11498.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmpathcmd/mpath_cmd.c new/multipath-tools-0.8.1+8+suse.8c11498/libmpathcmd/mpath_cmd.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmpathcmd/mpath_cmd.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmpathcmd/mpath_cmd.c 2019-04-24 11:43:52.000000000 +0200 @@ -26,6 +26,7 @@ #include <poll.h> #include <string.h> #include <errno.h> +#include <fcntl.h> #include "mpath_cmd.h" @@ -93,10 +94,11 @@ /* * connect to a unix domain socket */ -int mpath_connect(void) +int __mpath_connect(int nonblocking) { int fd, len; struct sockaddr_un addr; + int flags = 0; memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_LOCAL; @@ -108,14 +110,34 @@ if (fd == -1) return -1; + if (nonblocking) { + flags = fcntl(fd, F_GETFL, 0); + if (flags != -1) + (void)fcntl(fd, F_SETFL, flags|O_NONBLOCK); + } + if (connect(fd, (struct sockaddr *)&addr, len) == -1) { + int err = errno; + close(fd); + errno = err; return -1; } + if (nonblocking && flags != -1) + (void)fcntl(fd, F_SETFL, flags); + return fd; } +/* + * connect to a unix domain socket + */ +int mpath_connect(void) +{ + return __mpath_connect(0); +} + int mpath_disconnect(int fd) { return close(fd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmpathcmd/mpath_cmd.h new/multipath-tools-0.8.1+8+suse.8c11498/libmpathcmd/mpath_cmd.h --- old/multipath-tools-0.8.0+17+suse.a28893f/libmpathcmd/mpath_cmd.h 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmpathcmd/mpath_cmd.h 2019-04-24 11:43:52.000000000 +0200 @@ -36,6 +36,21 @@ /* * DESCRIPTION: + * Same as mpath_connect() (see below) except for the "nonblocking" + * parameter. + * If "nonblocking" is set, connects in non-blocking mode. This is + * useful to avoid blocking if the listening socket's backlog is + * exceeded. In this case, errno will be set to EAGAIN. + * In case of success, the returned file descriptor is in in blocking + * mode, even if "nonblocking" was true. + * + * RETURNS: + * A file descriptor on success. -1 on failure (with errno set). + */ +int __mpath_connect(int nonblocking); + +/* + * DESCRIPTION: * Connect to the running multipathd daemon. On systems with the * multipathd.socket systemd unit file installed, this command will * start multipathd if it is not already running. This function diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/config.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/config.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/config.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/config.c 2019-04-24 11:43:52.000000000 +0200 @@ -716,7 +716,6 @@ conf->retrigger_tries = DEFAULT_RETRIGGER_TRIES; conf->retrigger_delay = DEFAULT_RETRIGGER_DELAY; conf->uev_wait_timeout = DEFAULT_UEV_WAIT_TIMEOUT; - conf->disable_changed_wwids = DEFAULT_DISABLE_CHANGED_WWIDS; conf->remove_retries = 0; conf->ghost_delay = DEFAULT_GHOST_DELAY; conf->all_tg_pt = DEFAULT_ALL_TG_PT; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/config.h new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/config.h --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/config.h 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/config.h 2019-04-24 11:43:52.000000000 +0200 @@ -182,7 +182,6 @@ int delayed_reconfig; int uev_wait_timeout; int skip_kpartx; - int disable_changed_wwids; int remove_retries; int max_sectors_kb; int ghost_delay; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/devmapper.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/devmapper.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/devmapper.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/devmapper.c 2019-04-24 11:43:52.000000000 +0200 @@ -746,7 +746,7 @@ dm_task_destroy(dmt); out: if (r < 0) - condlog(2, "%s: dm command failed in %s", name, __FUNCTION__); + condlog(3, "%s: dm command failed in %s: %s", name, __FUNCTION__, strerror(errno)); return r; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/dict.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/dict.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/dict.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/dict.c 2019-04-24 11:43:52.000000000 +0200 @@ -157,6 +157,12 @@ } static int +print_ignored (char *buff, int len) +{ + return snprintf(buff, len, "ignored"); +} + +static int print_yes_no (char *buff, int len, long v) { return snprintf(buff, len, "\"%s\"", @@ -548,9 +554,15 @@ declare_hw_snprint(skip_kpartx, print_yes_no_undef) declare_mp_handler(skip_kpartx, set_yes_no_undef) declare_mp_snprint(skip_kpartx, print_yes_no_undef) - -declare_def_handler(disable_changed_wwids, set_yes_no) -declare_def_snprint(disable_changed_wwids, print_yes_no) +static int def_disable_changed_wwids_handler(struct config *conf, vector strvec) +{ + return 0; +} +static int snprint_def_disable_changed_wwids(struct config *conf, char *buff, + int len, const void *data) +{ + return print_ignored(buff, len); +} declare_def_handler(remove_retries, set_int) declare_def_snprint(remove_retries, print_int) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/discovery.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/discovery.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/discovery.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/discovery.c 2019-04-24 11:43:52.000000000 +0200 @@ -218,12 +218,11 @@ declare_sysfs_get_str(model); declare_sysfs_get_str(rev); -ssize_t -sysfs_get_vpd (struct udev_device * udev, int pg, - unsigned char * buff, size_t len) +static ssize_t +sysfs_get_binary (struct udev_device * udev, const char *attrname, + unsigned char *buff, size_t len) { ssize_t attr_len; - char attrname[9]; const char * devname; if (!udev) { @@ -232,7 +231,6 @@ } devname = udev_device_get_sysname(udev); - sprintf(attrname, "vpd_pg%02x", pg); attr_len = sysfs_bin_attr_get_value(udev, attrname, buff, len); if (attr_len < 0) { condlog(3, "%s: attribute %s not found in sysfs", @@ -242,8 +240,23 @@ return attr_len; } +ssize_t sysfs_get_vpd(struct udev_device * udev, unsigned char pg, + unsigned char *buff, size_t len) +{ + char attrname[9]; + + snprintf(attrname, sizeof(attrname), "vpd_pg%02x", pg); + return sysfs_get_binary(udev, attrname, buff, len); +} + +ssize_t sysfs_get_inquiry(struct udev_device * udev, + unsigned char *buff, size_t len) +{ + return sysfs_get_binary(udev, "inquiry", buff, len); +} + int -sysfs_get_timeout(struct path *pp, unsigned int *timeout) +sysfs_get_timeout(const struct path *pp, unsigned int *timeout) { const char *attr = NULL; const char *subsys; @@ -820,24 +833,34 @@ } static void -detect_alua(struct path * pp, struct config *conf) +detect_alua(struct path * pp) { int ret; int tpgs; - unsigned int timeout = conf->checker_timeout; + unsigned int timeout; - if ((tpgs = get_target_port_group_support(pp->fd, timeout)) <= 0) { + if (sysfs_get_timeout(pp, &timeout) <= 0) + timeout = DEF_TIMEOUT; + + if ((tpgs = get_target_port_group_support(pp, timeout)) <= 0) { pp->tpgs = TPGS_NONE; return; } ret = get_target_port_group(pp, timeout); - if (ret < 0 || get_asymmetric_access_state(pp->fd, ret, timeout) < 0) { + if (ret < 0 || get_asymmetric_access_state(pp, ret, timeout) < 0) { pp->tpgs = TPGS_NONE; return; } pp->tpgs = tpgs; } +int path_get_tpgs(struct path *pp) +{ + if (pp->tpgs == TPGS_UNDEF) + detect_alua(pp); + return pp->tpgs; +} + #define DEFAULT_SGIO_LEN 254 /* Query VPD page @pg. Returns number of INQUIRY bytes @@ -1505,9 +1528,6 @@ struct udev_device *parent; const char *attr_path = NULL; - if (pp->tpgs == TPGS_UNDEF) - detect_alua(pp, conf); - if (!(mask & DI_SERIAL)) return; @@ -1625,8 +1645,17 @@ old_prio = pp->priority; pp->priority = prio_getprio(p, pp, checker_timeout); if (pp->priority < 0) { - condlog(3, "%s: %s prio error", pp->dev, prio_name(p)); - pp->priority = PRIO_UNDEF; + /* this changes pp->offline, but why not */ + int state = path_offline(pp); + + if (state == PATH_DOWN || state == PATH_PENDING) + condlog(3, "%s: %s prio error in state %d, keeping prio = %d", + pp->dev, prio_name(p), state, pp->priority); + else { + condlog(3, "%s: %s prio error in state %d", + pp->dev, prio_name(p), state); + pp->priority = PRIO_UNDEF; + } return 1; } condlog((old_prio == pp->priority ? 4 : 3), "%s: %s prio = %u", @@ -1754,21 +1783,15 @@ return get_vpd_sysfs(parent, 0x83, pp->wwid, WWID_SIZE); } -static ssize_t scsi_uid_fallback(struct path *pp, int path_state, - const char **origin) +static ssize_t uid_fallback(struct path *pp, int path_state, + const char **origin) { - ssize_t len = 0; - int retrigger; - struct config *conf; + ssize_t len = -1; - conf = get_multipath_config(); - retrigger = conf->retrigger_tries; - put_multipath_config(conf); - if (pp->retriggers >= retrigger && + if (pp->bus == SYSFS_BUS_SCSI && !strcmp(pp->uid_attribute, DEFAULT_UID_ATTRIBUTE)) { len = get_vpd_uid(pp); *origin = "sysfs"; - pp->uid_attribute = NULL; if (len < 0 && path_state == PATH_UP) { condlog(1, "%s: failed to get sysfs uid: %s", pp->dev, strerror(-len)); @@ -1776,17 +1799,42 @@ WWID_SIZE); *origin = "sgio"; } + } else if (pp->bus == SYSFS_BUS_NVME) { + char value[256]; + len = sysfs_attr_get_value(pp->udev, "wwid", value, + sizeof(value)); + if (len <= 0) + return -1; + len = strlcpy(pp->wwid, value, WWID_SIZE); + if (len >= WWID_SIZE) { + len = fix_broken_nvme_wwid(pp, value, + WWID_SIZE); + if (len > 0) + return len; + condlog(0, "%s: wwid overflow", pp->dev); + len = WWID_SIZE; + } + *origin = "sysfs"; } return len; } +static int has_uid_fallback(struct path *pp) +{ + return ((pp->bus == SYSFS_BUS_SCSI && + !strcmp(pp->uid_attribute, DEFAULT_UID_ATTRIBUTE)) || + pp->bus == SYSFS_BUS_NVME); +} + int -get_uid (struct path * pp, int path_state, struct udev_device *udev) +get_uid (struct path * pp, int path_state, struct udev_device *udev, + int allow_fallback) { char *c; const char *origin = "unknown"; ssize_t len = 0; struct config *conf; + int used_fallback = 0; if (!pp->uid_attribute && !pp->getuid) { conf = get_multipath_config(); @@ -1827,8 +1875,10 @@ len = get_vpd_uid(pp); origin = "sysfs"; } - if (len <= 0 && pp->bus == SYSFS_BUS_SCSI) - len = scsi_uid_fallback(pp, path_state, &origin); + if (len <= 0 && allow_fallback && has_uid_fallback(pp)) { + used_fallback = 1; + len = uid_fallback(pp, path_state, &origin); + } } if ( len < 0 ) { condlog(1, "%s: failed to get %s uid: %s", @@ -1844,7 +1894,7 @@ c--; } } - condlog(3, "%s: uid = %s (%s)", pp->dev, + condlog((used_fallback)? 1 : 3, "%s: uid = %s (%s)", pp->dev, *pp->wwid == '\0' ? "<empty>" : pp->wwid, origin); return 0; } @@ -1961,14 +2011,12 @@ } else { condlog(3, "%s: path inaccessible", pp->dev); pp->chkrstate = pp->state = path_state; - if (path_state == PATH_PENDING || - path_state == PATH_DOWN) - pp->priority = 0; } } if ((mask & DI_WWID) && !strlen(pp->wwid)) { - get_uid(pp, path_state, pp->udev); + get_uid(pp, path_state, pp->udev, + (pp->retriggers >= conf->retrigger_tries)); if (!strlen(pp->wwid)) { if (pp->bus == SYSFS_BUS_UNDEF) return PATHINFO_SKIPPED; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/discovery.h new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/discovery.h --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/discovery.h 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/discovery.h 2019-04-24 11:43:52.000000000 +0200 @@ -31,7 +31,7 @@ struct config; int path_discovery (vector pathvec, int flag); - +int path_get_tpgs(struct path *pp); /* This function never returns TPGS_UNDEF */ int do_tur (char *); int path_offline (struct path *); int get_state (struct path * pp, struct config * conf, int daemon, int state); @@ -43,16 +43,19 @@ struct udev_device *udevice, int flag, struct path **pp_ptr); int sysfs_set_scsi_tmo (struct multipath *mpp, int checkint); -int sysfs_get_timeout(struct path *pp, unsigned int *timeout); +int sysfs_get_timeout(const struct path *pp, unsigned int *timeout); int sysfs_get_host_pci_name(const struct path *pp, char *pci_name); int sysfs_get_iscsi_ip_address(const struct path *pp, char *ip_address); int sysfs_get_host_adapter_name(const struct path *pp, char *adapter_name); -ssize_t sysfs_get_vpd (struct udev_device * udev, int pg, unsigned char * buff, - size_t len); +ssize_t sysfs_get_vpd (struct udev_device *udev, unsigned char pg, + unsigned char *buff, size_t len); +ssize_t sysfs_get_inquiry(struct udev_device *udev, + unsigned char *buff, size_t len); int sysfs_get_asymmetric_access_state(struct path *pp, char *buff, int buflen); -int get_uid(struct path * pp, int path_state, struct udev_device *udev); +int get_uid(struct path * pp, int path_state, struct udev_device *udev, + int allow_fallback); /* * discovery bitmask diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/hwtable.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/hwtable.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/hwtable.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/hwtable.c 2019-04-24 11:43:52.000000000 +0200 @@ -604,7 +604,7 @@ .pgpolicy = MULTIBUS, }, { - /* Storwize family / SAN Volume Controller / Flex System V7000 / FlashSystem V840/V9000 */ + /* Storwize family / SAN Volume Controller / Flex System V7000 / FlashSystem V840/V9000/9100 */ .vendor = "IBM", .product = "^2145", .no_path_retry = NO_PATH_RETRY_QUEUE, @@ -701,6 +701,26 @@ .no_path_retry = (300 / DEFAULT_CHECKINT), .prio_name = PRIO_ALUA, }, + /* + * Lenovo + */ + { + /* + * DE Series + * + * Maintainer: ng-eseries-upstream-maintainers(a)netapp.com + */ + .vendor = "LENOVO", + .product = "DE_Series", + .bl_product = "Universal Xport", + .pgpolicy = GROUP_BY_PRIO, + .checker_name = RDAC, + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", + .prio_name = PRIO_RDAC, + .pgfailback = -FAILBACK_IMMEDIATE, + .no_path_retry = 30, + }, /* * NetApp */ @@ -1100,31 +1120,7 @@ .no_path_retry = 30, }, /* - * Xiotech - */ - { - /* Intelligent Storage Elements family */ - .vendor = "(XIOTECH|XIOtech)", - .product = "ISE", - .pgpolicy = MULTIBUS, - .no_path_retry = 12, - }, - { - /* iglu blaze family */ - .vendor = "(XIOTECH|XIOtech)", - .product = "IGLU DISK", - .pgpolicy = MULTIBUS, - .no_path_retry = 30, - }, - { - /* Magnitude family */ - .vendor = "(XIOTECH|XIOtech)", - .product = "Magnitude", - .pgpolicy = MULTIBUS, - .no_path_retry = 30, - }, - /* - * Violin Memory + * Violin Systems */ { /* 3000 / 6000 Series */ @@ -1150,6 +1146,28 @@ .pgpolicy = MULTIBUS, .no_path_retry = 30, }, + /* Xiotech */ + { + /* Intelligent Storage Elements family */ + .vendor = "(XIOTECH|XIOtech)", + .product = "ISE", + .pgpolicy = MULTIBUS, + .no_path_retry = 12, + }, + { + /* iglu blaze family */ + .vendor = "(XIOTECH|XIOtech)", + .product = "IGLU DISK", + .pgpolicy = MULTIBUS, + .no_path_retry = 30, + }, + { + /* Magnitude family */ + .vendor = "(XIOTECH|XIOtech)", + .product = "Magnitude", + .pgpolicy = MULTIBUS, + .no_path_retry = 30, + }, /* * Promise Technology */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/pgpolicies.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/pgpolicies.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/pgpolicies.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/pgpolicies.c 2019-04-24 11:43:52.000000000 +0200 @@ -312,7 +312,7 @@ int group_by_prio(struct multipath *mp) { int i; - unsigned int prio; + int prio; struct path * pp; struct pathgroup * pgp; vector pathvec = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/Makefile new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/Makefile --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/Makefile 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/Makefile 2019-04-24 11:43:52.000000000 +0200 @@ -28,9 +28,6 @@ all: $(LIBS) -libprioalua.so: alua.o alua_rtpg.o - $(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^ - libpriopath_latency.so: path_latency.o ../checkers/libsg.o $(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^ -lm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/alua.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/alua.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/alua.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/alua.c 2019-04-24 11:43:52.000000000 +0200 @@ -58,7 +58,7 @@ tpg = get_target_port_group(pp, timeout); if (tpg < 0) { - rc = get_target_port_group_support(pp->fd, timeout); + rc = get_target_port_group_support(pp, timeout); if (rc < 0) return -ALUA_PRIO_TPGS_FAILED; if (rc == TPGS_NONE) @@ -66,7 +66,7 @@ return -ALUA_PRIO_RTPG_FAILED; } condlog(3, "%s: reported target port group is %i", pp->dev, tpg); - rc = get_asymmetric_access_state(pp->fd, tpg, timeout); + rc = get_asymmetric_access_state(pp, tpg, timeout); if (rc < 0) { condlog(2, "%s: get_asymmetric_access_state returned %d", __func__, rc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/alua_rtpg.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/alua_rtpg.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/alua_rtpg.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/alua_rtpg.c 2019-04-24 11:43:52.000000000 +0200 @@ -135,9 +135,9 @@ /* * Helper function to setup and run a SCSI inquiry command. */ -int -do_inquiry(int fd, int evpd, unsigned int codepage, - void *resp, int resplen, unsigned int timeout) +static int +do_inquiry_sg(int fd, int evpd, unsigned int codepage, + void *resp, int resplen, unsigned int timeout) { struct inquiry_command cmd; struct sg_io_hdr hdr; @@ -185,18 +185,41 @@ return 0; } +int do_inquiry(const struct path *pp, int evpd, unsigned int codepage, + void *resp, int resplen, unsigned int timeout) +{ + struct udev_device *ud; + + ud = udev_device_get_parent_with_subsystem_devtype(pp->udev, "scsi", + "scsi_device"); + if (ud != NULL) { + int rc; + + if (!evpd) + rc = sysfs_get_inquiry(ud, resp, resplen); + else + rc = sysfs_get_vpd(ud, codepage, resp, resplen); + + if (rc >= 0) { + PRINT_HEX((unsigned char *) resp, resplen); + return 0; + } + } + return do_inquiry_sg(pp->fd, evpd, codepage, resp, resplen, timeout); +} + /* * This function returns the support for target port groups by evaluating the * data returned by the standard inquiry command. */ int -get_target_port_group_support(int fd, unsigned int timeout) +get_target_port_group_support(const struct path *pp, unsigned int timeout) { struct inquiry_data inq; int rc; memset((unsigned char *)&inq, 0, sizeof(inq)); - rc = do_inquiry(fd, 0, 0x00, &inq, sizeof(inq), timeout); + rc = do_inquiry(pp, 0, 0x00, &inq, sizeof(inq), timeout); if (!rc) { rc = inquiry_data_get_tpgs(&inq); } @@ -205,7 +228,7 @@ } static int -get_sysfs_pg83(struct path *pp, unsigned char *buff, int buflen) +get_sysfs_pg83(const struct path *pp, unsigned char *buff, int buflen) { struct udev_device *parent = pp->udev; @@ -224,7 +247,7 @@ } int -get_target_port_group(struct path * pp, unsigned int timeout) +get_target_port_group(const struct path * pp, unsigned int timeout) { unsigned char *buf; struct vpd83_data * vpd83; @@ -245,7 +268,7 @@ rc = get_sysfs_pg83(pp, buf, buflen); if (rc < 0) { - rc = do_inquiry(pp->fd, 1, 0x83, buf, buflen, timeout); + rc = do_inquiry(pp, 1, 0x83, buf, buflen, timeout); if (rc < 0) goto out; @@ -263,7 +286,7 @@ } buflen = scsi_buflen; memset(buf, 0, buflen); - rc = do_inquiry(pp->fd, 1, 0x83, buf, buflen, timeout); + rc = do_inquiry(pp, 1, 0x83, buf, buflen, timeout); if (rc < 0) goto out; } @@ -341,7 +364,8 @@ } int -get_asymmetric_access_state(int fd, unsigned int tpg, unsigned int timeout) +get_asymmetric_access_state(const struct path *pp, unsigned int tpg, + unsigned int timeout) { unsigned char *buf; struct rtpg_data * tpgd; @@ -349,6 +373,7 @@ int rc; int buflen; uint64_t scsi_buflen; + int fd = pp->fd; buflen = 4096; buf = (unsigned char *)malloc(buflen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/alua_rtpg.h new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/alua_rtpg.h --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/alua_rtpg.h 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/alua_rtpg.h 2019-04-24 11:43:52.000000000 +0200 @@ -22,8 +22,9 @@ #define RTPG_RTPG_FAILED 3 #define RTPG_TPG_NOT_FOUND 4 -int get_target_port_group_support(int fd, unsigned int timeout); -int get_target_port_group(struct path * pp, unsigned int timeout); -int get_asymmetric_access_state(int fd, unsigned int tpg, unsigned int timeout); +int get_target_port_group_support(const struct path *pp, unsigned int timeout); +int get_target_port_group(const struct path *pp, unsigned int timeout); +int get_asymmetric_access_state(const struct path *pp, + unsigned int tpg, unsigned int timeout); #endif /* __RTPG_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/ana.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/ana.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/prioritizers/ana.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/prioritizers/ana.c 2019-04-24 11:43:52.000000000 +0200 @@ -164,7 +164,7 @@ ana_log, ana_log_len); pthread_cleanup_pop(1); if (rc >= 0) - condlog(3, "%s: ana state = %02x [%s]", pp->dev, rc, + condlog(4, "%s: ana state = %02x [%s]", pp->dev, rc, aas_print_string(rc)); return rc; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/propsel.c new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/propsel.c --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/propsel.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/propsel.c 2019-04-24 11:43:52.000000000 +0200 @@ -45,22 +45,30 @@ } \ } while(0) -#define do_set_from_vec(type, var, src, dest, msg) \ -do { \ +#define __do_set_from_vec(type, var, src, dest) \ +({ \ type *_p; \ + bool _found = false; \ int i; \ \ vector_foreach_slot(src, _p, i) { \ if (_p->var) { \ dest = _p->var; \ - origin = msg; \ - goto out; \ + _found = true; \ + break; \ } \ } \ -} while (0) + _found; \ +}) -#define do_set_from_hwe(var, src, dest, msg) \ - do_set_from_vec(struct hwentry, var, src->hwe, dest, msg) +#define __do_set_from_hwe(var, src, dest) \ + __do_set_from_vec(struct hwentry, var, (src)->hwe, dest) + +#define do_set_from_hwe(var, src, dest, msg) \ + if (__do_set_from_hwe(var, src, dest)) { \ + origin = msg; \ + goto out; \ + } static const char default_origin[] = "(setting: multipath internal)"; static const char hwe_origin[] = @@ -440,7 +448,7 @@ dh_state = &handler[2]; vector_foreach_slot(mp->paths, pp, i) - all_tpgs = all_tpgs && (pp->tpgs > 0); + all_tpgs = all_tpgs && (path_get_tpgs(pp) > 0); if (mp->retain_hwhandler != RETAIN_HWHANDLER_OFF) { vector_foreach_slot(mp->paths, pp, i) { if (get_dh_state(pp, dh_state, sizeof(handler) - 2) > 0 @@ -485,9 +493,14 @@ { int len; char buff[44]; + const char *checker_name; if (pp->bus != SYSFS_BUS_SCSI) return 0; + /* Avoid ioctl if this is likely not an RDAC array */ + if (__do_set_from_hwe(checker_name, pp, checker_name) && + strcmp(checker_name, RDAC)) + return 0; len = get_vpd_sgio(pp->fd, 0xC9, buff, 44); if (len <= 0) return 0; @@ -505,7 +518,7 @@ if (check_rdac(pp)) { ckr_name = RDAC; goto out; - } else if (pp->tpgs > 0) { + } else if (path_get_tpgs(pp) != TPGS_NONE) { ckr_name = TUR; goto out; } @@ -567,6 +580,7 @@ struct prio *p = &pp->prio; char buff[512]; char *default_prio; + int tpgs; switch(pp->bus) { case SYSFS_BUS_NVME: @@ -575,9 +589,10 @@ default_prio = PRIO_ANA; break; case SYSFS_BUS_SCSI: - if (pp->tpgs <= 0) + tpgs = path_get_tpgs(pp); + if (tpgs == TPGS_NONE) return; - if ((pp->tpgs == 2 || !check_rdac(pp)) && + if ((tpgs == TPGS_EXPLICIT || !check_rdac(pp)) && sysfs_get_asymmetric_access_state(pp, buff, 512) >= 0) default_prio = PRIO_SYSFS; else @@ -622,6 +637,7 @@ const char *origin; struct mpentry * mpe; struct prio * p = &pp->prio; + int log_prio = 3; if (pp->detect_prio == DETECT_PRIO_ON) { detect_prio(conf, pp); @@ -643,14 +659,16 @@ * fetch tpgs mode for alua, if its not already obtained */ if (!strncmp(prio_name(p), PRIO_ALUA, PRIO_NAME_LEN)) { - int tpgs = 0; - unsigned int timeout = conf->checker_timeout; + int tpgs = path_get_tpgs(pp); - if(!pp->tpgs && - (tpgs = get_target_port_group_support(pp->fd, timeout)) >= 0) - pp->tpgs = tpgs; + if (tpgs == TPGS_NONE) { + prio_get(conf->multipath_dir, + p, DEFAULT_PRIO, DEFAULT_PRIO_ARGS); + origin = "(setting: emergency fallback - alua failed)"; + log_prio = 1; + } } - condlog(3, "%s: prio = %s %s", pp->dev, prio_name(p), origin); + condlog(log_prio, "%s: prio = %s %s", pp->dev, prio_name(p), origin); condlog(3, "%s: prio args = \"%s\" %s", pp->dev, prio_args(p), origin); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/structs.h new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/structs.h --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/structs.h 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/structs.h 2019-04-24 11:43:52.000000000 +0200 @@ -280,7 +280,6 @@ int fd; int initialized; int retriggers; - int wwid_changed; unsigned int path_failures; time_t dis_reinstate_time; int disable_reinstate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/version.h new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/version.h --- old/multipath-tools-0.8.0+17+suse.a28893f/libmultipath/version.h 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/libmultipath/version.h 2019-04-24 11:43:52.000000000 +0200 @@ -20,8 +20,8 @@ #ifndef _VERSION_H #define _VERSION_H -#define VERSION_CODE 0x000800 -#define DATE_CODE 0x020e13 +#define VERSION_CODE 0x000801 +#define DATE_CODE 0x041213 #define PROG "multipath-tools" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/multipath/main.c new/multipath-tools-0.8.1+8+suse.8c11498/multipath/main.c --- old/multipath-tools-0.8.0+17+suse.a28893f/multipath/main.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/multipath/main.c 2019-04-24 11:43:52.000000000 +0200 @@ -850,6 +850,32 @@ return r; } +static int test_multipathd_socket(void) +{ + int fd; + /* + * "multipath -u" may be run before the daemon is started. In this + * case, systemd might own the socket but might delay multipathd + * startup until some other unit (udev settle!) has finished + * starting. With many LUNs, the listen backlog may be exceeded, which + * would cause connect() to block. This causes udev workers calling + * "multipath -u" to hang, and thus creates a deadlock, until "udev + * settle" times out. To avoid this, call connect() in non-blocking + * mode here, and take EAGAIN as indication for a filled-up systemd + * backlog. + */ + + fd = __mpath_connect(1); + if (fd == -1) { + if (errno == EAGAIN) + condlog(3, "daemon backlog exceeded"); + else + return 0; + } else + close(fd); + return 1; +} + int main (int argc, char *argv[]) { @@ -1028,17 +1054,13 @@ } if (cmd == CMD_VALID_PATH && dev_type == DEV_UEVENT) { - int fd; - - fd = mpath_connect(); - if (fd == -1) { + if (!test_multipathd_socket()) { condlog(3, "%s: daemon is not running", dev); if (!systemd_service_enabled(dev)) { r = print_cmd_valid(RTVL_NO, NULL, conf); goto out; } - } else - mpath_disconnect(fd); + } } if (cmd == CMD_REMOVE_WWID && !dev) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/multipath/multipath.conf.5 new/multipath-tools-0.8.1+8+suse.8c11498/multipath/multipath.conf.5 --- old/multipath-tools-0.8.0+17+suse.a28893f/multipath/multipath.conf.5 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/multipath/multipath.conf.5 2019-04-24 11:43:52.000000000 +0200 @@ -260,11 +260,11 @@ The udev attribute providing a unique path identifier. .RS .TP -The default is: for SCSI devices \fBID_SERIAL\fR +The default is: \fBID_SERIAL\fR, for SCSI devices .TP -The default is: for DASD devices \fBID_UID\fR +The default is: \fBID_UID\fR, for DASD devices .TP -The default is: for NVME devices \fBID_WWN\fR +The default is: \fBID_WWN\fR, for NVMe devices .RE . . @@ -677,7 +677,7 @@ will disable the timeout. .RS .TP -The default is: in \fB5\fR +The default is: \fB5\fR .RE . . @@ -725,7 +725,7 @@ \fIreservation_key\fR is set to \fBfile\fR. .RS .TP -The default is \fB/etc/multipath/prkeys\fR +The default is: \fB/etc/multipath/prkeys\fR .RE . . @@ -1155,12 +1155,8 @@ . .TP .B disable_changed_wwids -If set to \fIyes\fR, multipathd will check the path wwid on change events, and -if it has changed from the wwid of the multipath device, multipathd will -disable access to the path until the wwid changes back. -.RS -.TP -The default is: \fBno\fR +This option is deprecated and ignored. If the WWID of a path suddenly changes, +multipathd handles it as if it was removed and then added again. .RE . . @@ -1193,7 +1189,7 @@ makes multipath immediately mark a device with only ghost paths as ready. .RS .TP -The default is \fBno\fR +The default is: \fBno\fR .RE . . @@ -1475,6 +1471,8 @@ .TP .B uid_attribute .TP +.B getuid_callout +.TP .B path_selector .TP .B path_checker @@ -1501,6 +1499,8 @@ .TP .B flush_on_last_del .TP +.B user_friendly_names +.TP .B retain_attached_hw_handler .TP .B detect_prio @@ -1532,6 +1532,8 @@ .B max_sectors_kb .TP .B ghost_delay +.TP +.B all_tg_pt .RE .PD .LP @@ -1611,7 +1613,11 @@ .TP .B skip_kpartx .TP +.B max_sectors_kb +.TP .B ghost_delay +.TP +.B all_tg_pt .RE .PD .LP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.8.0+17+suse.a28893f/multipathd/main.c new/multipath-tools-0.8.1+8+suse.8c11498/multipathd/main.c --- old/multipath-tools-0.8.0+17+suse.a28893f/multipathd/main.c 2019-03-15 13:27:19.000000000 +0100 +++ new/multipath-tools-0.8.1+8+suse.8c11498/multipathd/main.c 2019-04-24 11:43:52.000000000 +0200 @@ -127,11 +127,22 @@ #else int poll_dmevents = 1; #endif +/* Don't access this variable without holding config_lock */ enum daemon_status running_state = DAEMON_INIT; pid_t daemon_pid; pthread_mutex_t config_lock = PTHREAD_MUTEX_INITIALIZER; pthread_cond_t config_cond; +static inline enum daemon_status get_running_state(void) +{ + enum daemon_status st; + + pthread_mutex_lock(&config_lock); + st = running_state; + pthread_mutex_unlock(&config_lock); + return st; +} + /* * global copy of vecs for use in sig handlers */ @@ -149,7 +160,7 @@ const char * daemon_status(void) { - switch (running_state) { + switch (get_running_state()) { case DAEMON_INIT: return "init"; case DAEMON_START: @@ -169,10 +180,10 @@ /* * I love you too, systemd ... */ -const char * -sd_notify_status(void) +static const char * +sd_notify_status(enum daemon_status state) { - switch (running_state) { + switch (state) { case DAEMON_INIT: return "STATUS=init"; case DAEMON_START: @@ -189,17 +200,18 @@ } #ifdef USE_SYSTEMD -static void do_sd_notify(enum daemon_status old_state) +static void do_sd_notify(enum daemon_status old_state, + enum daemon_status new_state) { /* * Checkerloop switches back and forth between idle and running state. * No need to tell systemd each time. * These notifications cause a lot of overhead on dbus. */ - if ((running_state == DAEMON_IDLE || running_state == DAEMON_RUNNING) && + if ((new_state == DAEMON_IDLE || new_state == DAEMON_RUNNING) && (old_state == DAEMON_IDLE || old_state == DAEMON_RUNNING)) return; - sd_notify(0, sd_notify_status()); + sd_notify(0, sd_notify_status(new_state)); } #endif @@ -208,6 +220,7 @@ pthread_mutex_unlock(&config_lock); } +/* must be called with config_lock held */ static void __post_config_state(enum daemon_status state) { if (state != running_state && running_state != DAEMON_SHUTDOWN) { @@ -216,7 +229,7 @@ running_state = state; pthread_cond_broadcast(&config_cond); #ifdef USE_SYSTEMD - do_sd_notify(old_state); + do_sd_notify(old_state, state); #endif } } @@ -253,7 +266,7 @@ running_state = state; pthread_cond_broadcast(&config_cond); #ifdef USE_SYSTEMD - do_sd_notify(old_state); + do_sd_notify(old_state, state); #endif } } @@ -937,7 +950,8 @@ } if (mpp && mpp->wait_for_udev && (pathcount(mpp, PATH_UP) > 0 || - (pathcount(mpp, PATH_GHOST) > 0 && pp->tpgs != TPGS_IMPLICIT && + (pathcount(mpp, PATH_GHOST) > 0 && + path_get_tpgs(pp) != TPGS_IMPLICIT && mpp->ghost_delay_tick <= 0))) { /* if wait_for_udev is set and valid paths exist */ condlog(3, "%s: delaying path addition until %s is fully initialized", @@ -1191,7 +1205,6 @@ int ro, retval = 0, rc; struct path * pp; struct config *conf; - int disable_changed_wwids; int needs_reinit = 0; switch ((rc = change_foreign(uev->udev))) { @@ -1209,12 +1222,6 @@ break; } - conf = get_multipath_config(); - disable_changed_wwids = conf->disable_changed_wwids; - put_multipath_config(conf); - - ro = uevent_get_disk_ro(uev); - pthread_cleanup_push(cleanup_lock, &vecs->lock); lock(&vecs->lock); pthread_testcancel(); @@ -1234,25 +1241,17 @@ goto out; strcpy(wwid, pp->wwid); - get_uid(pp, pp->state, uev->udev); + rc = get_uid(pp, pp->state, uev->udev, 0); - if (strncmp(wwid, pp->wwid, WWID_SIZE) != 0) { - condlog(0, "%s: path wwid changed from '%s' to '%s'. %s", - uev->kernel, wwid, pp->wwid, - (disable_changed_wwids ? "disallowing" : - "continuing")); + if (rc != 0) strcpy(pp->wwid, wwid); - if (disable_changed_wwids) { - if (!pp->wwid_changed) { - pp->wwid_changed = 1; - pp->tick = 1; - if (pp->mpp) - dm_fail_path(pp->mpp->alias, pp->dev_t); - } - goto out; - } + else if (strncmp(wwid, pp->wwid, WWID_SIZE) != 0) { + condlog(0, "%s: path wwid changed from '%s' to '%s'", + uev->kernel, wwid, pp->wwid); + ev_remove_path(pp, vecs, 1); + needs_reinit = 1; + goto out; } else { - pp->wwid_changed = 0; udev_device_unref(pp->udev); pp->udev = udev_device_ref(uev->udev); conf = get_multipath_config(); @@ -1263,6 +1262,7 @@ pthread_cleanup_pop(1); } + ro = uevent_get_disk_ro(uev); if (mpp && ro >= 0) { condlog(2, "%s: update path write_protect to '%d' (uevent)", uev->kernel, ro); @@ -1411,17 +1411,20 @@ int r = 0; struct vectors * vecs; struct uevent *merge_uev, *tmp; + enum daemon_status state; vecs = (struct vectors *)trigger_data; pthread_cleanup_push(config_cleanup, NULL); pthread_mutex_lock(&config_lock); - if (running_state != DAEMON_IDLE && - running_state != DAEMON_RUNNING) + while (running_state != DAEMON_IDLE && + running_state != DAEMON_RUNNING && + running_state != DAEMON_SHUTDOWN) pthread_cond_wait(&config_cond, &config_lock); + state = running_state; pthread_cleanup_pop(1); - if (running_state == DAEMON_SHUTDOWN) + if (state == DAEMON_SHUTDOWN) return 0; /* @@ -2015,12 +2018,6 @@ if (newstate == PATH_REMOVED) newstate = PATH_DOWN; - if (pp->wwid_changed) { - condlog(2, "%s: path wwid has changed. Refusing to use", - pp->dev); - newstate = PATH_DOWN; - } - if (newstate == PATH_WILD || newstate == PATH_UNCHECKED) { condlog(2, "%s: unusable path (%s) - checker failed", pp->dev, checker_state_name(newstate)); @@ -2112,8 +2109,8 @@ * paths if there are no other active paths in map. */ disable_reinstate = (newstate == PATH_GHOST && - pp->mpp->nr_active == 0 && - pp->tpgs == TPGS_IMPLICIT) ? 1 : 0; + pp->mpp->nr_active == 0 && + path_get_tpgs(pp) == TPGS_IMPLICIT) ? 1 : 0; pp->chkrstate = newstate; if (newstate != pp->state) { @@ -2775,6 +2772,7 @@ struct config *conf; char *envp; int queue_without_daemon; + enum daemon_status state; mlockall(MCL_CURRENT | MCL_FUTURE); signal_init(); @@ -2872,6 +2870,7 @@ /* Wait for uxlsnr startup */ while (running_state == DAEMON_IDLE) pthread_cond_wait(&config_cond, &config_lock); + state = running_state; } pthread_cleanup_pop(1); @@ -2879,7 +2878,7 @@ condlog(0, "failed to create cli listener: %d", rc); goto failed; } - else if (running_state != DAEMON_CONFIGURE) { + else if (state != DAEMON_CONFIGURE) { condlog(0, "cli listener failed to start"); goto failed; } @@ -2919,15 +2918,17 @@ } pthread_attr_destroy(&misc_attr); - while (running_state != DAEMON_SHUTDOWN) { + while (1) { pthread_cleanup_push(config_cleanup, NULL); pthread_mutex_lock(&config_lock); - if (running_state != DAEMON_CONFIGURE && - running_state != DAEMON_SHUTDOWN) { + while (running_state != DAEMON_CONFIGURE && + running_state != DAEMON_SHUTDOWN) pthread_cond_wait(&config_cond, &config_lock); - } + state = running_state; pthread_cleanup_pop(1); - if (running_state == DAEMON_CONFIGURE) { + if (state == DAEMON_SHUTDOWN) + break; + if (state == DAEMON_CONFIGURE) { pthread_cleanup_push(cleanup_lock, &vecs->lock); lock(&vecs->lock); pthread_testcancel(); @@ -3097,8 +3098,6 @@ ANNOTATE_BENIGN_RACE_SIZED(&multipath_conf, sizeof(multipath_conf), "Manipulated through RCU"); - ANNOTATE_BENIGN_RACE_SIZED(&running_state, sizeof(running_state), - "Suppress complaints about unprotected running_state reads"); ANNOTATE_BENIGN_RACE_SIZED(&uxsock_timeout, sizeof(uxsock_timeout), "Suppress complaints about this scalar variable");

1 0

commit ltrace for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package ltrace for openSUSE:Factory checked in at 2019-05-06 13:17:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ltrace (Old) and /work/SRC/openSUSE:Factory/.ltrace.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ltrace" Mon May 6 13:17:12 2019 rev:41 rq:699688 version:0.7.91 Changes: -------- --- /work/SRC/openSUSE:Factory/ltrace/ltrace.changes 2019-04-02 09:18:23.652534565 +0200 +++ /work/SRC/openSUSE:Factory/.ltrace.new.5148/ltrace.changes 2019-05-06 13:17:13.251938871 +0200 @@ -1,0 +2,6 @@ +Tue Apr 30 10:35:37 UTC 2019 - Martin Liška <mliska(a)suse.cz> + +- Add gcc9-Wlto-type-mismatch.patch in order to address LTO warnings + (boo#1133256). + +------------------------------------------------------------------- New: ---- gcc9-Wlto-type-mismatch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ltrace.spec ++++++ --- /var/tmp/diff_new_pack.WvvcIA/_old 2019-05-06 13:17:14.211941158 +0200 +++ /var/tmp/diff_new_pack.WvvcIA/_new 2019-05-06 13:17:14.255941263 +0200 @@ -48,6 +48,7 @@ Patch4: arm-trace.patch Patch5: gcc9-printf-s-null-argument.patch Patch6: lens-double-free.patch +Patch7: gcc9-Wlto-type-mismatch.patch %description Ltrace is a program that runs the specified command until it exits. It @@ -69,6 +70,7 @@ %patch4 -p1 %patch5 %patch6 -p1 +%patch7 -p1 %build ./autogen.sh ++++++ gcc9-Wlto-type-mismatch.patch ++++++ diff --git a/filter.c b/filter.c index ba50c40..b529c61 100644 --- a/filter.c +++ b/filter.c @@ -18,6 +18,8 @@ * 02110-1301 USA */ +#include "config.h" + #include <stdlib.h> #include <assert.h> #include <stdio.h> diff --git a/options.h b/options.h index 38f4ecd..dff401d 100644 --- a/options.h +++ b/options.h @@ -25,6 +25,8 @@ #ifndef OPTIONS_H #define OPTIONS_H +#include "config.h" + #include <stdio.h> #include <sys/types.h> #include <sys/time.h>

1 0

commit man for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package man for openSUSE:Factory checked in at 2019-05-06 13:17:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man (Old) and /work/SRC/openSUSE:Factory/.man.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "man" Mon May 6 13:17:04 2019 rev:74 rq:699626 version:2.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/man/man.changes 2019-03-12 09:48:20.591598719 +0100 +++ /work/SRC/openSUSE:Factory/.man.new.5148/man.changes 2019-05-06 13:17:06.231922145 +0200 @@ -1,0 +2,13 @@ +Tue Apr 30 10:57:35 UTC 2019 - Dr. Werner Fink <werner(a)suse.de> + +- Make systemd timers and services optional but hold them enabled + as maybe in future all packages providing manual pages might use + a posttrans scriplet to trigger a refresh of the man db (boo#1133762). + +------------------------------------------------------------------- +Tue Apr 30 09:09:19 UTC 2019 - lnussel(a)suse.de + +- remove %verify(not group) from /var/cache/man, the inconsistent + permissions are fixed in the permissions package (boo#1133678) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man.spec ++++++ --- /var/tmp/diff_new_pack.wG83pn/_old 2019-05-06 13:17:07.019924023 +0200 +++ /var/tmp/diff_new_pack.wG83pn/_new 2019-05-06 13:17:07.019924023 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,6 +21,8 @@ %define _fillupdir /var/adm/fillup-templates %endif +%bcond_without sdtimer + Name: man BuildRequires: automake BuildRequires: flex @@ -35,6 +37,7 @@ BuildRequires: man-pages BuildRequires: pkg-config BuildRequires: po4a +BuildRequires: systemd BuildRequires: update-alternatives BuildRequires: xz-devel BuildRequires: zlib-devel @@ -59,6 +62,7 @@ Requires(pre): group(man) Requires(post): update-alternatives Requires(preun): update-alternatives +Requires(posttrans): systemd Source: http://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz Source1: sysconfig.cron-man Source2: cron.daily.do_mandb @@ -261,30 +265,35 @@ %else install -m 0744 %{SOURCE2} %{buildroot}/%{_libexecdir}/man-db/do_mandb %endif +%if %{with sdtimer} install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/ %if 0%{suse_version} >= 1500 install -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/ install -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/ %endif +%endif %find_lang man-db --all-name --with-man %pre test -d var/catman/ && rm -rf var/catman/ || true +%if %{with sdtimer} %if 0%{suse_version} >= 1500 %service_add_pre man-db-create.service mandb.service mandb.timer %else %service_add_pre man-db-create.service %endif +%endif %post -%{?tmpfiles_create:%tmpfiles_create %{_libexecdir}/tmpfiles.d/man-db.conf} %{fillup_only -an cron} /sbin/ldconfig +%if %{with sdtimer} %service_add_post man-db-create.service %if 0%{suse_version} >= 1500 %service_add_post mandb.service mandb.timer %endif +%endif # Remark: soelim(1) is part of package groff or mandoc and # makewhatis(8) is part of package makewaht or mandoc %{_sbindir}/update-alternatives --quiet --force \ @@ -296,10 +305,12 @@ --slave %{_mandir}/man1/whatis.1%{?ext_man} whatis.1%{?ext_man} %{_mandir}/man1/whatis-db.1%{?ext_man} %preun +%if %{with sdtimer} %service_del_preun man-db-create.service %if 0%{suse_version} >= 1500 %service_del_preun mandb.service mandb.timer %endif +%endif if test $1 -eq 0 then %{_sbindir}/update-alternatives --quiet --remove man %{_bindir}/man @@ -307,13 +318,19 @@ %postun /sbin/ldconfig +%if %{with sdtimer} %service_del_postun man-db-create.service %if 0%{suse_version} >= 1500 %service_del_postun mandb.service mandb.timer %endif +%endif %posttrans -test -d /var/cache/man && mandb --quiet --create ||: +%{?tmpfiles_create:%tmpfiles_create %{_libexecdir}/tmpfiles.d/man-db.conf} +if test -d %{_localstatedir}/cache/man +then + mandb --quiet --create || : +fi %files -f man-db.lang %defattr(-,root,root) @@ -354,11 +371,13 @@ %dir %{_libexecdir}/tmpfiles.d %endif %{_libexecdir}/tmpfiles.d/man-db.conf +%if %{with sdtimer} %{_unitdir}/man-db-create.service %if 0%{suse_version} >= 1500 %{_unitdir}/mandb.service %{_unitdir}/mandb.timer %endif +%endif %dir %{_datadir}/groff/site-tmac %{_datadir}/groff/site-tmac/tmac.andb %{_datadir}/groff/site-tmac/tmac.andocdb @@ -370,6 +389,6 @@ %dir %{_mandir}/tr %{_fillupdir}/sysconfig.cron-man %defattr(-,man,man) -%ghost %verify(not group) %{_localstatedir}/cache/man +%ghost %{_localstatedir}/cache/man %changelog

1 0

commit netcfg for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package netcfg for openSUSE:Factory checked in at 2019-05-06 13:16:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcfg (Old) and /work/SRC/openSUSE:Factory/.netcfg.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netcfg" Mon May 6 13:16:55 2019 rev:44 rq:699609 version:11.6 Changes: -------- --- /work/SRC/openSUSE:Factory/netcfg/netcfg.changes 2018-09-18 11:41:37.412024378 +0200 +++ /work/SRC/openSUSE:Factory/.netcfg.new.5148/netcfg.changes 2019-05-06 13:16:58.055902666 +0200 @@ -1,0 +2,8 @@ +Wed Apr 17 09:25:24 CEST 2019 - kukuk(a)suse.de + +- Remove pre/post install to get rid of coreutils dependency. + We don't support upgrading of this old code anymore and coreutils + is not wanted in busybox containers. +- Update services.bz2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcfg.spec ++++++ --- /var/tmp/diff_new_pack.xjs0W0/_old 2019-05-06 13:16:58.855904572 +0200 +++ /var/tmp/diff_new_pack.xjs0W0/_new 2019-05-06 13:16:58.859904582 +0200 @@ -1,7 +1,7 @@ # # spec file for package netcfg # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,8 +45,6 @@ Source102: services-create.pl Source103: services_UPDATING Patch0: services-suse.diff -Requires(post): coreutils -Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -71,33 +69,6 @@ patch -p0 %{buildroot}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff rm -f %{buildroot}%{_sysconfdir}/services.orig -%pre -# HOSTNAME migration supported scenarios [bnc#858908]: -# /etc/HOSTNAME -> /etc/hostname content preservation. -# If hostname and HOSTNAME both exist HOSTNAME wins. -# Nothing apart from content of the document is preserved -# REMOVE after SLE11/openSUSE-13.1 out of MIGRATION support -if [ $1 -gt 1 ]; then - if [ -f %{_sysconfdir}/HOSTNAME -a ! -L %{_sysconfdir}/HOSTNAME ]; then - cat %{_sysconfdir}/HOSTNAME > %{_sysconfdir}/hostname.rpmsave - rm -rf %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname - touch %{_sysconfdir}/hostname - fi -fi -exit 0 - -%post -# If the defaultdomain changed just prune it, user is not interested in -# 0 size file anyway -if [ -f %{_sysconfdir}/defaultdomain.rpmnew ]; then - rm -f %{_sysconfdir}/defaultdomain.rpmnew -fi -if [ -f %{_sysconfdir}/hostname.rpmsave ]; then - cat %{_sysconfdir}/hostname.rpmsave > %{_sysconfdir}/hostname - rm -rf %{_sysconfdir}/HOSTNAME.rpmsave %{_sysconfdir}/hostname.rpmsave -fi -exit 0 - %files %defattr(644,root,root,755) %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname ++++++ services-suse.diff ++++++ --- /var/tmp/diff_new_pack.xjs0W0/_old 2019-05-06 13:16:59.067905077 +0200 +++ /var/tmp/diff_new_pack.xjs0W0/_new 2019-05-06 13:16:59.067905077 +0200 @@ -1,5 +1,5 @@ ---- services.old 2016-01-05 10:57:51.955599939 +0100 -+++ services 2016-01-05 11:03:07.600728374 +0100 +--- ./services 2019/04/26 12:53:51 1.1 ++++ ./services 2019/04/26 13:01:49 @@ -1,4 +1,16 @@ # +# Network services, Internet style @@ -16,7 +16,7 @@ +# # SERVICE NAME AND TRANSPORT PROTOCOL PORT NUMBER REGISTRY # - # (last updated on 2015-12-28) + # (last updated on 2019-04-15) @@ -133,8 +145,8 @@ name 42/udp # Host Name Server nameserver 42/tcp # Host Name Server @@ -39,7 +39,7 @@ mcidas 112/tcp # McIDAS Data Transmission Protocol [Glenn_Davis] mcidas 112/udp # McIDAS Data Transmission Protocol [Glenn_Davis] ident 113/tcp -@@ -1475,6 +1487,7 @@ +@@ -1479,6 +1491,7 @@ cddbp 888/tcp # CD Database Protocol [Steve_Scherf] omginitialrefs 900/tcp # OMG Initial Refs [Christian_Callsen] omginitialrefs 900/udp # OMG Initial Refs [Christian_Callsen] @@ -47,7 +47,7 @@ smpnameres 901/tcp # SMPNAMERES [Leif_Ekblad] smpnameres 901/udp # SMPNAMERES [Leif_Ekblad] ideafarm-door 902/tcp # self documenting Telnet Door -@@ -3505,6 +3518,9 @@ +@@ -3515,6 +3528,9 @@ x25-svc-port 1998/udp # cisco X.25 service (XOT) tcp-id-port 1999/tcp # cisco identification port tcp-id-port 1999/udp # cisco identification port @@ -57,7 +57,7 @@ cisco-sccp 2000/tcp # Cisco SCCP [Dan_Wing] cisco-sccp 2000/udp # Cisco SCCp [Dan_Wing] dc 2001/tcp -@@ -3604,8 +3620,8 @@ +@@ -3614,8 +3630,8 @@ dls 2047/udp dls-monitor 2048/tcp dls-monitor 2048/udp @@ -68,7 +68,7 @@ nfs 2049/tcp # Network File System - Sun Microsystems [Brent_Callaghan] nfs 2049/udp # Network File System - Sun Microsystems [Brent_Callaghan] nfs 2049/sctp # Network File System [RFC5665] -@@ -6104,8 +6120,8 @@ +@@ -6114,8 +6130,8 @@ sysopt 3281/udp # SYSOPT [Tony_Hoffman] datusorb 3282/tcp # Datusorb [Thomas_Martin] datusorb 3282/udp # Datusorb [Thomas_Martin] @@ -79,7 +79,7 @@ 4talk 3284/tcp # 4Talk [Tony_Bushnell] 4talk 3284/udp # 4Talk [Tony_Bushnell] plato 3285/tcp # Plato [Jim_Battin] -@@ -6877,8 +6893,8 @@ +@@ -6887,8 +6903,8 @@ roverlog 3677/udp # RoverLog IPC [Tom_Mayo] ipr-dglt 3678/tcp # DataGuardianLT [Bruce_Carlson] ipr-dglt 3678/udp # DataGuardianLT [Bruce_Carlson] @@ -90,7 +90,7 @@ npds-tracker 3680/tcp # NPDS Tracker [Paul_Guyot] npds-tracker 3680/udp # NPDS Tracker [Paul_Guyot] bts-x73 3681/tcp # BTS X73 Port [Todd_Cooper] -@@ -9097,6 +9113,7 @@ +@@ -9154,6 +9170,7 @@ # 5474/tcp Reserved apsolab-data 5475/tcp # The Apsolab company's data retrieval protocol [Apsolab_Inc] [Jean-Francois_Gauthier] # 5475/udp Reserved @@ -98,7 +98,7 @@ fcp-addr-srvr1 5500/tcp # fcp-addr-srvr1 [Ken_Wittmer] fcp-addr-srvr1 5500/udp # fcp-addr-srvr1 [Ken_Wittmer] fcp-addr-srvr2 5501/tcp # fcp-addr-srvr2 [Ken_Wittmer] -@@ -9117,6 +9134,7 @@ +@@ -9176,6 +9193,7 @@ sgi-eventmond 5553/udp # SGI Eventmond Port [Andrei_Vilkotski] sgi-esphttp 5554/tcp # SGI ESP HTTP [Vladimir_Legalov] sgi-esphttp 5554/udp # SGI ESP HTTP [Vladimir_Legalov] @@ -106,15 +106,7 @@ personal-agent 5555/tcp # Personal Agent [Jackie_Wu] personal-agent 5555/udp # Personal Agent [Jackie_Wu] freeciv 5556/tcp # Freeciv gameplay [Reinier_Post_and_Pau] -@@ -9201,6 +9219,7 @@ - # 5639/udp Reserved - vfmobile 5646/tcp # Ventureforth Mobile [Ventureforth_Inc] [Blakely_Snyder] - # 5646/udp Reserved -+nrpe 5666/tcp # nagios nrpe - filemq 5670/tcp # ZeroMQ file publish-subscribe protocol (updated 2013-02-25) [Pieter_Hintjens2] - zre-disc 5670/udp # Local area discovery and messaging over ZeroMQ [Pieter_Hintjens_3] - amqps 5671/tcp # amqp protocol over TLS/SSL [Ted_Ross_2] -@@ -9351,8 +9370,8 @@ +@@ -9418,8 +9436,8 @@ # 5868/udp Reserved diameters 5868/sctp # Diameter over DTLS/SCTP [IESG] [IETF_Chair] [RFC6733] jute 5883/tcp # Javascript Unit Test Environment [Mark_Ethan_Trostler] @@ -125,7 +117,7 @@ cm 5910/tcp # Context Management [Eivan_Cerasi] cm 5910/udp # Context Management [Eivan_Cerasi] cm 5910/sctp # Context Management [Justin_Yu] -@@ -11519,7 +11538,12 @@ +@@ -11691,7 +11709,12 @@ hde-lcesrvr-2 14937/udp # hde-lcesrvr-2 [Horizon_Digital_Ente] hydap 15000/tcp # Hypack Data Aquisition (updated 2011-10-27) [HYPACK_Inc] [Mircea_Neacsu] hydap 15000/udp # Hypack Data Aquisition (updated 2011-10-27) [HYPACK_Inc] [Mircea_Neacsu] @@ -139,7 +131,7 @@ # 15002/udp Reserved # 15118/tcp Reserved v2g-secc 15118/udp # v2g Supply Equipment Communication Controller Discovery Protocol [Holger_Lochner] -@@ -11784,6 +11808,13 @@ +@@ -11966,6 +11989,13 @@ # 22128/udp Reserved easyengine 22222/tcp # EasyEngine is CLI tool to manage WordPress Sites on Nginx server [rtCamp_Solutions_Private_Limited] [Rahul_Bansal] # 22222/udp Reserved @@ -153,10 +145,10 @@ wnn6 22273/tcp # wnn6 [Yasunari_Gon_Yamasit] wnn6 22273/udp # wnn6 [Yasunari_Gon_Yamasit] cis 22305/tcp # CompactIS Tunnel [Justin_Paupore] -@@ -12305,3 +12336,13 @@ - robotraconteur 48653/udp # Robot Raconteur transport [Wason_Technology_LLC] [John_Wason] - matahari 49000/tcp # Matahari Broker [Matahari_Project] [Zane_Bitter] - # 49000/udp Reserved +@@ -12531,3 +12561,13 @@ + nusdp-disc 49001/udp # Nuance Unity Service Discovery Protocol [Nuance_Communications_Inc3] [Andrew_Andrews] + inspider 49150/tcp # InSpider System [AnRobot] [Zhang_Xinnan] + # 49150/udp Reserved +# The mrt entry is temporary until a official number is registerd +mrt 50000/tcp # telnet interface of mrt programs +mrt 50000/udp # telnet interface of mrt programs ++++++ services.bz2 ++++++ ++++ 922 lines (skipped) ++++ between services.bz2 ++++ and /work/SRC/openSUSE:Factory/.netcfg.new.5148/services.bz2

1 0

commit 000product for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-05-06 03:59:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Mon May 6 03:59:58 2019 rev:1171 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.A0AnFv/_old 2019-05-06 04:00:03.012587268 +0200 +++ /var/tmp/diff_new_pack.A0AnFv/_new 2019-05-06 04:00:03.020587292 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Addon-NonOss___20190503" schemaversion="4.1"> +<image name="OBS__openSUSE-Addon-NonOss___20190505" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -36,11 +36,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190503</productvar> + <productvar name="VERSION">20190505</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190503,openSUSE NonOSS Addon</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190505,openSUSE NonOSS Addon</productinfo> <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019…</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.A0AnFv/_old 2019-05-06 04:00:03.032587327 +0200 +++ /var/tmp/diff_new_pack.A0AnFv/_new 2019-05-06 04:00:03.032587327 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-MicroOS___20190503" schemaversion="4.1"> +<image name="OBS__openSUSE-MicroOS___20190505" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190503</productvar> + <productvar name="VERSION">20190505</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190503,openSUSE MicroOS</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190505,openSUSE MicroOS</productinfo> <productinfo name="LINGUAS">en_US </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190503/…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190505/…</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change ++++++ openSUSE-cd-mini-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.A0AnFv/_old 2019-05-06 04:00:03.060587410 +0200 +++ /var/tmp/diff_new_pack.A0AnFv/_new 2019-05-06 04:00:03.064587422 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190503" schemaversion="4.1"> +<image name="OBS__openSUSE___20190505" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,11 +32,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190503</productvar> + <productvar name="VERSION">20190505</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190505,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/i586</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190505/i586</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ openSUSE-cd-mini-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.A0AnFv/_old 2019-05-06 04:00:03.072587446 +0200 +++ /var/tmp/diff_new_pack.A0AnFv/_new 2019-05-06 04:00:03.072587446 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190503" schemaversion="4.1"> +<image name="OBS__openSUSE___20190505" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190503</productvar> + <productvar name="VERSION">20190505</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190505,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190505/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.A0AnFv/_old 2019-05-06 04:00:03.084587482 +0200 +++ /var/tmp/diff_new_pack.A0AnFv/_new 2019-05-06 04:00:03.084587482 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190503" schemaversion="4.1"> +<image name="OBS__openSUSE___20190505" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,11 +32,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190503</productvar> + <productvar name="VERSION">20190505</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190505,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/i586</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190505/i586</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.A0AnFv/_old 2019-05-06 04:00:03.096587518 +0200 +++ /var/tmp/diff_new_pack.A0AnFv/_new 2019-05-06 04:00:03.096587518 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190503" schemaversion="4.1"> +<image name="OBS__openSUSE___20190505" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190503</productvar> + <productvar name="VERSION">20190505</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190505,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190505/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.A0AnFv/_old 2019-05-06 04:00:03.104587541 +0200 +++ /var/tmp/diff_new_pack.A0AnFv/_new 2019-05-06 04:00:03.108587553 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190503" schemaversion="4.1"> +<image name="OBS__openSUSE___20190505" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -24,7 +24,7 @@ <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> <productvar name="MAKE_LISTINGS">true</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20190503-i586-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20190505-i586-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -36,11 +36,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190503</productvar> + <productvar name="VERSION">20190505</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190505,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190505/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190505/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ unsorted.yml ++++++ --- /var/tmp/diff_new_pack.A0AnFv/_old 2019-05-06 04:00:03.320588185 +0200 +++ /var/tmp/diff_new_pack.A0AnFv/_new 2019-05-06 04:00:03.320588185 +0200 @@ -5483,6 +5483,7 @@ - jsch - jsch-demo - jsch-javadoc + - jshon - jsmn-devel - json-glib-devel - jsoncpp-devel @@ -12253,6 +12254,8 @@ - maven-jmod-plugin-javadoc - maven-lib - maven-local + - maven-mapping + - maven-mapping-javadoc - maven-model - maven-monitor - maven-parent @@ -12282,8 +12285,12 @@ - maven-plugins-pom - maven-profile - maven-project + - maven-remote-resources-plugin + - maven-remote-resources-plugin-javadoc - maven-reporting-api - maven-reporting-api-javadoc + - maven-reporting-exec + - maven-reporting-exec-javadoc - maven-reporting-impl - maven-reporting-impl-javadoc - maven-resolver @@ -13654,9 +13661,7 @@ - nudoku - nulloy - nulloy-gstreamer - - nulloy-phonon - nulloy-taglib - - nulloy-vlc - numactl: [i586] - numad: [i586] - numatop: [x86_64] @@ -17252,7 +17257,6 @@ - python2-crumbs - python2-css-parser - python2-csscompressor - - python2-cssselect2 - python2-cssutils - python2-csvkit - python2-ctypesgen @@ -18558,7 +18562,6 @@ - python2-thLib - python2-thrift - python2-thriftpy - - python2-tinycss2 - python2-tinyrpc - python2-titlecase - python2-tld

1 0

commit 000release-packages for openSUSE:Factory
by root 06 May '19

06 May '19

Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2019-05-06 03:59:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Mon May 6 03:59:52 2019 rev:125 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.WTYX6f/_old 2019-05-06 03:59:56.488567827 +0200 +++ /var/tmp/diff_new_pack.WTYX6f/_new 2019-05-06 03:59:56.488567827 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20190503) +# spec file for package openSUSE-Addon-NonOss-release (Version 20190505) # # Copyright (c) 2019 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon -Version: 20190503 +Version: 20190505 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20190503-0 +Provides: product(openSUSE-Addon-NonOss) = 20190505-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190503 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190505 AutoReqProv: on @@ -49,10 +49,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20190503</version> + <version>20190505</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190503</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190505</cpeid> <register> <pool> </pool> ++++++ openSUSE-MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.WTYX6f/_old 2019-05-06 03:59:56.504567875 +0200 +++ /var/tmp/diff_new_pack.WTYX6f/_new 2019-05-06 03:59:56.504567875 +0200 @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20190503 +Version: 20190505 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -40,9 +40,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 Provides: %name-%version Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20190503-0 +Provides: product(openSUSE-MicroOS) = 20190505-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190503 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190505 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(openSUSE-MicroOS) @@ -58,7 +58,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20190503-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190505-0 Summary: openSUSE MicroOS %description dvd @@ -74,7 +74,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20190503-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190505-0 Summary: openSUSE MicroOS %description kubic-dvd @@ -90,7 +90,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE-MicroOS) = 20190503-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190505-0 Summary: openSUSE MicroOS %description appliance @@ -106,7 +106,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(openSUSE-MicroOS) = 20190503-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190505-0 Summary: openSUSE MicroOS %description appliance-kubic @@ -164,11 +164,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-MicroOS</name> - <version>20190503</version> + <version>20190505</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-microos:20190503</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-microos:20190505</cpeid> <productline>openSUSE-MicroOS</productline> <register> <pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.WTYX6f/_old 2019-05-06 03:59:56.516567911 +0200 +++ /var/tmp/diff_new_pack.WTYX6f/_new 2019-05-06 03:59:56.516567911 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20190503 +Version: 20190505 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -55,7 +55,7 @@ Obsoletes: aaa_version Obsoletes: openSUSE-Promo-release <= 11.1 Obsoletes: openSUSE-release-live <= 11.0 -Obsoletes: product_flavor(%{product}) < 20190503 +Obsoletes: product_flavor(%{product}) < 20190505 # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -183,7 +183,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20190503-0 +Provides: product(openSUSE) = 20190505-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -197,7 +197,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190503 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190505 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -211,7 +211,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description ftp @@ -226,7 +226,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description mini @@ -241,7 +241,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description dvd @@ -256,7 +256,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description livecd-kde @@ -271,7 +271,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description livecd-x11 @@ -286,7 +286,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description livecd-gnome @@ -301,7 +301,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description livecd-xfce @@ -316,7 +316,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description usb-kde @@ -331,7 +331,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description usb-gnome @@ -346,7 +346,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description usb-x11 @@ -361,7 +361,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20190503-0 +Provides: product_flavor(openSUSE) = 20190505-0 Summary: openSUSE Tumbleweed %description appliance @@ -435,10 +435,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20190503</version> + <version>20190505</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20190503</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20190505</cpeid> <productline>openSUSE</productline> <register> <pool> ++++++ weakremovers.inc ++++++ --- /var/tmp/diff_new_pack.WTYX6f/_old 2019-05-06 03:59:56.580568101 +0200 +++ /var/tmp/diff_new_pack.WTYX6f/_new 2019-05-06 03:59:56.584568113 +0200 @@ -14887,6 +14887,8 @@ Provides: weakremover(nsca) Provides: weakremover(nsca-client) Provides: weakremover(nsis) +Provides: weakremover(nulloy-phonon) +Provides: weakremover(nulloy-vlc) Provides: weakremover(ocfs2console) Provides: weakremover(octave-forge-fl-core) Provides: weakremover(octave-forge-ocs) @@ -15714,6 +15716,7 @@ Provides: weakremover(python2-cliff-tablib) Provides: weakremover(python2-configshell) Provides: weakremover(python2-configshell-fb-doc) +Provides: weakremover(python2-cssselect2) Provides: weakremover(python2-dfVFS) Provides: weakremover(python2-discover) Provides: weakremover(python2-django-celery) @@ -15790,6 +15793,7 @@ Provides: weakremover(python2-sphinxcontrib) Provides: weakremover(python2-subunit) Provides: weakremover(python2-sunpy) +Provides: weakremover(python2-tinycss2) Provides: weakremover(python2-toro) Provides: weakremover(python2-trello) Provides: weakremover(python2-usb)

1 0

commit 000product for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-05-05 21:22:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sun May 5 21:22:44 2019 rev:1170 rq: version:unknown Sun May 5 21:22:42 2019 rev:1169 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi: same change openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change openSUSE-cd-mini-i586.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change openSUSE-dvd5-dvd-i586.kiwi: same change openSUSE-dvd5-dvd-x86_64.kiwi: same change openSUSE-ftp-ftp-i586_x86_64.kiwi: same change stub.kiwi: same change ++++++ openSUSE-MicroOS.product ++++++ --- /var/tmp/diff_new_pack.Yltng9/_old 2019-05-05 21:22:45.813496899 +0200 +++ /var/tmp/diff_new_pack.Yltng9/_new 2019-05-05 21:22:45.817496910 +0200 @@ -6,7 +6,7 @@ <name>openSUSE-MicroOS</name> <releasepkgname>openSUSE-MicroOS-release</releasepkgname> <endoflife/> - <version>20190503</version> + <version>20190505</version>  <release>0</release> <productline>openSUSE-MicroOS</productline> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.Yltng9/_old 2019-05-05 21:22:45.829496942 +0200 +++ /var/tmp/diff_new_pack.Yltng9/_new 2019-05-05 21:22:45.829496942 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20190503</version> + <version>20190505</version> <release>0</release> <productline>openSUSE</productline>

1 0

commit 000product for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-05-05 21:22:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sun May 5 21:22:41 2019 rev:1168 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi: same change openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change openSUSE-cd-mini-i586.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change openSUSE-dvd5-dvd-i586.kiwi: same change openSUSE-dvd5-dvd-x86_64.kiwi: same change openSUSE-ftp-ftp-i586_x86_64.kiwi: same change stub.kiwi: same change ++++++ openSUSE-Addon-NonOss.product ++++++ --- /var/tmp/diff_new_pack.b5O8RW/_old 2019-05-05 21:22:43.837491516 +0200 +++ /var/tmp/diff_new_pack.b5O8RW/_new 2019-05-05 21:22:43.837491516 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20190503</version> + <version>20190505</version> <release>0</release> <summary>openSUSE NonOSS Addon</summary> <shortsummary>non oss addon</shortsummary>

1 0

commit perl-Devel-PPPort for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package perl-Devel-PPPort for openSUSE:Factory checked in at 2019-05-05 21:22:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Devel-PPPort (Old) and /work/SRC/openSUSE:Factory/.perl-Devel-PPPort.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Devel-PPPort" Sun May 5 21:22:39 2019 rev:11 rq:700874 version:3.51 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Devel-PPPort/perl-Devel-PPPort.changes 2019-04-01 12:39:38.477951789 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Devel-PPPort.new.5148/perl-Devel-PPPort.changes 2019-05-05 21:22:40.653482842 +0200 @@ -1,0 +2,56 @@ +Wed May 1 05:07:15 UTC 2019 - Stephan Kulow <coolo(a)suse.com> + +- updated to 3.51 + see /usr/share/doc/packages/perl-Devel-PPPort/Changes + + Revision history for Devel-PPPort + + 3.51 - 2019-05-01 + + * include the module version in metadata for proper PAUSE indexing + + 3.50 - 2019-04-30 + + * Order warn before uv for packWARN (shown in 5.6.1) + + 3.49 - 2019-04-29 + + * Fix tests for 64bit int, 32bit ptr platforms + + 3.48 - 2019-04-28 + + * Order misc before uv for UNLIKELY (<=5.8.8) + + 3.47 - 2019-04-27 + + * re-fix leaky code (used only in tests) + + 3.46 - 2019-04-26 + + * Fix the isFOO character type classification macros to work properly on + all versions, as follows: + * Fixed isALNUM, isALPHA, isDIGIT, isIDFIRST, isLOWER, and isUPPER on + very early perls to not be locale-dependent + * Fixed isASCII on early perls to work with signed char arguments + * Fixed isCNTRL on early perls to know that DEL is a control + * Fixed isSPACE on perls before 5.20 to know that VERTICAL TAB is a + space + * Added isALPHANUMERIC, synonym for isALNUMC + * Added isIDCONT, to match legal non-initial characters in an + identifier + * Added isOCTAL, to match [0-7] + * Added isWORDCHAR, synonym for isALNUM + * Make all the character classification isFOO macros work on EBCDIC + platforms on all versions + * Added isFOO_A synonyms for all character classification isFOO + macros + * Provide LIKELY/UNLIKELY branch prediction + * Provide av_tindex/av_top_index + * Provide __ASSERT_ for assertions inside macros + * Provide UTF8_SAFE_SKIP + * Provide my_strnlen() + * Provide utf8_to_uvchr_buf() + * Replace utf8_to_uvchr() with a safer version + * Provide UNICODE_REPLACEMENT + +------------------------------------------------------------------- Old: ---- Devel-PPPort-3.45.tar.gz New: ---- Devel-PPPort-3.51.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Devel-PPPort.spec ++++++ --- /var/tmp/diff_new_pack.NeL4hW/_old 2019-05-05 21:22:41.069483975 +0200 +++ /var/tmp/diff_new_pack.NeL4hW/_new 2019-05-05 21:22:41.073483987 +0200 @@ -17,14 +17,14 @@ Name: perl-Devel-PPPort -Version: 3.45 +Version: 3.51 Release: 0 %define cpan_name Devel-PPPort Summary: Perl/Pollution/Portability License: Artistic-1.0 OR GPL-1.0-or-later Group: Development/Libraries/Perl Url: https://metacpan.org/release/%{cpan_name} -Source0: https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/%{cpan_name}-%{version}.t… +Source0: https://cpan.metacpan.org/authors/id/E/ET/ETHER/%{cpan_name}-%{version}.tar… Source1: cpanspec.yml BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl ++++++ Devel-PPPort-3.45.tar.gz -> Devel-PPPort-3.51.tar.gz ++++++ ++++ 14854 lines of diff (skipped) ++++++ cpanspec.yml ++++++ --- /var/tmp/diff_new_pack.NeL4hW/_old 2019-05-05 21:22:41.185484292 +0200 +++ /var/tmp/diff_new_pack.NeL4hW/_new 2019-05-05 21:22:41.185484292 +0200 @@ -1,5 +1,22 @@ --- -#description_paragraphs: 3 +description: |- + Perl's API has changed over time, gaining new features, new functions, + increasing its flexibility, and reducing the impact on the C namespace + environment (reduced pollution). The header file written by this module, + typically _ppport.h_, attempts to bring some of the newer Perl API features + to older versions of Perl, so that you can worry less about keeping track + of old releases, but users can still reap the benefit. + + 'Devel::PPPort' contains two functions, 'WriteFile' and 'GetFileContents'. + 'WriteFile''s only purpose is to write the _ppport.h_ C header file. This + file contains a series of macros and, if explicitly requested, functions + that allow XS modules to be built using older versions of Perl. Currently, + Perl versions from 5.003 to 5.20 are supported. + + 'GetFileContents' can be used to retrieve the file contents rather than + writing it out. + + This module is used by 'h2xs' to write the file _ppport.h_. #no_testing: broken upstream #sources: # - source1

1 0

commit chessx for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package chessx for openSUSE:Factory checked in at 2019-05-05 21:22:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chessx (Old) and /work/SRC/openSUSE:Factory/.chessx.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chessx" Sun May 5 21:22:36 2019 rev:6 rq:700872 version:1.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/chessx/chessx.changes 2018-06-19 11:55:16.580716249 +0200 +++ /work/SRC/openSUSE:Factory/.chessx.new.5148/chessx.changes 2019-05-05 21:22:39.457479584 +0200 @@ -1,0 +2,61 @@ +Sun May 5 15:53:05 UTC 2019 - Luigi Baldoni <aloisio(a)gmx.com> + +- Update to version 1.5.0 + New Features: + * Provide multi-selection for the database list view + * Load favorite databases at startup + * Read Chessbase Books (ctg) + * Read Arena Books (.abk) + * Drag databases into list of games + * Dark Theme + * FICS console with commandline + * Syzygy 7 men online tablebase + * Change font size via mouse wheel + * Search depth for analysis + * Filter operation from gamelist + * Allow user-provided ECO files + * Save dialog allows to store extra tags + * Restrict search to start of word / end of word + * Edit shortcuts by pressing key + * Annotations beneath board view + * Turn board for given player + * Send database to Mail-Client + * Show analysis of position with one piece moved + * Merge internal and external themes, new option to scale + board images + Bug Fixes: + * Reduced Memory Footprint + * Removing a sub-variation kept some invisble moves + * Internal engine produced silly suggestions in case of a check + * Parse more than one tag in a line + * Changing book in analysis should update moves immediately + * Do not list read-only databases as copy targets + * Update game list columns after leaving preferences + * Console output and event info lacks termination of bold text + * Avoid empty annotation when merging a game + * "New Game" disabled after loading game + * Invalid notation when inserting line from analysis + * Puzzle mode not terminated properly + * Performance reading Polyglot positions + * Disconnecting a FICS session leaked some memory + * Progress bar missing occasionally + Changes: + * Draw arrows with right mouse + * Index file format updated + * Support engines with state issues + * time representation to ISO format + * Do not ask to save deleted games + * Copy current game instead of first selected game + * Kick out hotkeys for database changes + * Analysis and Endgametables display localised piece strings + * Books support localized piece representation + * Accept PGN with obscure RAVs + * Index file format stores data size + * If loading modifies db, mark db as changed + * Always use DefaultDataPath (instead of last used folder) for + Save Dialogs + * Index file version + +- Dropped chessx-Qt511.patch (no longer necessary) + +------------------------------------------------------------------- Old: ---- chessx-1.4.6.tgz chessx-Qt511.patch New: ---- chessx-1.5.0.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chessx.spec ++++++ --- /var/tmp/diff_new_pack.sApBwd/_old 2019-05-05 21:22:39.933480881 +0200 +++ /var/tmp/diff_new_pack.sApBwd/_new 2019-05-05 21:22:39.937480892 +0200 @@ -1,7 +1,7 @@ # # spec file for package chessx # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: chessx -Version: 1.4.6 +Version: 1.5.0 Release: 0 Summary: Chess database License: GPL-2.0-only Group: Amusements/Games/Board/Chess -Url: http://chessx.sourceforge.net -Source0: http://sourceforge.net/projects/chessx/files/chessx/%{version}/chessx-%{ver… -# PATCH-FIX-UPSTREAM chessx-Qt511.patch -Patch0: %{name}-Qt511.patch +URL: http://chessx.sourceforge.net +Source0: https://sourceforge.net/projects/chessx/files/chessx/%{version}/chessx-%{ve… BuildRequires: fdupes BuildRequires: libqt5-linguist -BuildRequires: libqt5-qtbase-common-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) >= 5.10 BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Svg) @@ -38,7 +36,6 @@ BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ChessX is a chess database. With ChessX, you can browse, edit and @@ -56,7 +53,6 @@ %prep %setup -q -%patch0 -p1 %build lrelease-qt5 i18n/* @@ -78,8 +74,8 @@ %fdupes -s %{buildroot} %files -%defattr(-,root,root,-) -%doc COPYING ChangeLog README.developers TODO +%license COPYING +%doc ChangeLog README.developers TODO %dir %{_datadir}/%{name} %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop ++++++ chessx-1.4.6.tgz -> chessx-1.5.0.tgz ++++++ ++++ 61144 lines of diff (skipped)

1 0

commit tea for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package tea for openSUSE:Factory checked in at 2019-05-05 21:22:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tea (Old) and /work/SRC/openSUSE:Factory/.tea.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tea" Sun May 5 21:22:34 2019 rev:7 rq:700867 version:47.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tea/tea.changes 2018-12-04 20:54:31.364839971 +0100 +++ /work/SRC/openSUSE:Factory/.tea.new.5148/tea.changes 2019-05-05 21:22:36.393471237 +0200 @@ -1,0 +2,7 @@ +Sun May 5 12:39:56 UTC 2019 - Alexei Sorokin <sor.alexei(a)meowr.ru> + +- Update to version 47.1.0: + * Bug fixes. +- Install the AppStream file to metainfo/ unconditionally. + +------------------------------------------------------------------- Old: ---- tea-47.0.1.tar.bz2 New: ---- tea-47.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tea.spec ++++++ --- /var/tmp/diff_new_pack.0ZAJcQ/_old 2019-05-05 21:22:37.237473536 +0200 +++ /var/tmp/diff_new_pack.0ZAJcQ/_new 2019-05-05 21:22:37.241473547 +0200 @@ -1,7 +1,7 @@ # # spec file for package tea # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: tea -Version: 47.0.1 +Version: 47.1.0 Release: 0 Summary: Qt-based text editor with image viewer License: GPL-3.0-or-later @@ -62,11 +62,7 @@ install -Dpm 0644 org.semiletov.tea.desktop %{buildroot}%{_datadir}/applications/org.semiletov.tea.desktop install -Dpm 0644 icons/%{name}-icon-v3-01.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png -%if 0%{?suse_version} >= 1500 install -Dpm 0644 org.semiletov.tea.appdata.xml %{buildroot}%{_datadir}/metainfo/org.semiletov.tea.appdata.xml -%else -install -Dpm 0644 org.semiletov.tea.appdata.xml %{buildroot}%{_datadir}/appdata/org.semiletov.tea.appdata.xml -%endif %if 0%{?suse_version} < 1500 %post @@ -84,12 +80,7 @@ %{_bindir}/%{name} %{_datadir}/applications/org.semiletov.tea.desktop %{_datadir}/icons/hicolor/*/apps/%{name}*.* -%if 0%{?suse_version} >= 1500 %dir %{_datadir}/metainfo/ %{_datadir}/metainfo/org.semiletov.tea.appdata.xml -%else -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/org.semiletov.tea.appdata.xml -%endif %changelog ++++++ tea-47.0.1.tar.bz2 -> tea-47.1.0.tar.bz2 ++++++ ++++ 10890 lines of diff (skipped)

1 0

commit twemoji-color-font for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package twemoji-color-font for openSUSE:Factory checked in at 2019-05-05 21:22:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/twemoji-color-font (Old) and /work/SRC/openSUSE:Factory/.twemoji-color-font.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "twemoji-color-font" Sun May 5 21:22:31 2019 rev:5 rq:700866 version:12.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/twemoji-color-font/twemoji-color-font.changes 2018-10-08 17:46:40.094388782 +0200 +++ /work/SRC/openSUSE:Factory/.twemoji-color-font.new.5148/twemoji-color-font.changes 2019-05-05 21:22:35.101467717 +0200 @@ -1,0 +2,15 @@ +Sun May 5 14:40:03 UTC 2019 - Markus S <kamikazow(a)opensuse.org> + +- Update to twemoji 12.0.1 - 230 new Emoji + +------------------------------------------------------------------- +Sun Nov 4 09:14:29 UTC 2018 - Markus S <kamikazow(a)opensuse.org> + +- Switch source archive back to original upstream as the fork’s + changes have been incorporated and a new release (also called + 11.2) has been made. The font intself is identical to the fork. +- Replaced license placeholder with MIT license text (CC-BY 4.0 + does not fall under the OSI’s Open Source Definition, therefore + the spec file is MIT-licensed as the placeholder says). + +------------------------------------------------------------------- Old: ---- twemoji-color-font-11.2.tar.xz New: ---- TwitterColorEmoji-SVGinOT-Linux-12.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ twemoji-color-font.spec ++++++ --- /var/tmp/diff_new_pack.PsgMHl/_old 2019-05-05 21:22:35.829469700 +0200 +++ /var/tmp/diff_new_pack.PsgMHl/_new 2019-05-05 21:22:35.833469711 +0200 @@ -1,7 +1,9 @@ # # spec file for package twemoji-color-font # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright © 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright © 2016 Yunhe Guo <guoyunhebrave(a)gmail.com> +# Copyright © 2018–2019 Markus S. <kamikazow(a)opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,30 +13,35 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. - +# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: twemoji-color-font -Version: 11.2 +Version: 12.0.1 Release: 0 -Summary: Colored Emoji Font From Twitter +Summary: Font using Twitter’s color emoji License: CC-BY-4.0 Group: System/X11/Fonts -Url: https://github.com/youdly/twemoji-color-font -Source: %{name}-%{version}.tar.xz +Url: https://github.com/eosrei/twemoji-color-font +Source: TwitterColorEmoji-SVGinOT-Linux-%{version}.tar.gz BuildRequires: fontpackages-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -A color and black&white emoji SVGinOT font built from the Twitter Emoji for Everyone artwork with support for ZWJ, skin tone diversity and country flags. - -The font works in all operating systems, but will currently only show color emoji in Firefox, Thunderbird and other Mozilla Gecko-based applications. This is not a limitation of the font, but of the operating systems and applications. Regular black&white outline emoji are included for backwards/fallback compatibility. +A color and monochrome emoji SVG-in-OpenType font built from the +Twitter Emoji for Everyone artwork with support for ZWJ, +skin tone diversity and country flags. + +The font works in all operating systems, but will currently only +show color emoji in Firefox, Thunderbird and other Mozilla Gecko-based +applications. This is not a limitation of the font but of the +operating systems and applications. Regular monochrome outline +emoji are included for backwards/fallback compatibility. %prep -%setup -q +%setup -n TwitterColorEmoji-SVGinOT-Linux-%{version} %build # Nothing to do

1 0

commit nulloy for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package nulloy for openSUSE:Factory checked in at 2019-05-05 21:22:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nulloy (Old) and /work/SRC/openSUSE:Factory/.nulloy.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nulloy" Sun May 5 21:22:26 2019 rev:4 rq:700859 version:0.8.2.pre61qt5 Changes: -------- --- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes 2016-04-28 16:57:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nulloy.new.5148/nulloy.changes 2019-05-05 21:22:30.549455316 +0200 @@ -1,0 +2,6 @@ +Thu May 2 16:03:44 UTC 2019 - plater <davejplater(a)gmail.com> + +- Update to 0.8.2.pre61qt5 git snapshot to build with qt5 +- Rebased fix-library-directory.patch + +------------------------------------------------------------------- Old: ---- nulloy-0.8.2.tar.gz New: ---- nulloy-0.8.2.pre61qt5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nulloy.spec ++++++ --- /var/tmp/diff_new_pack.UKH36j/_old 2019-05-05 21:22:30.973456471 +0200 +++ /var/tmp/diff_new_pack.UKH36j/_new 2019-05-05 21:22:30.977456482 +0200 @@ -1,7 +1,7 @@ # # spec file for package nulloy # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,40 @@ # +%define rev d15e0f3aee22ef1cdd84729cf75f505adcc0ffda + +%bcond_with libvlc +%bcond_with phonon + Name: nulloy -Version: 0.8.2 +Version: 0.8.2.pre61qt5 Release: 0 Summary: Music player with a Waveform Progress Bar -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Multimedia/Sound/Players Url: http://nulloy.com -Source: https://github.com/nulloy/nulloy/releases/download/%{version}/%{name}-%{ver… +Source: https://github.com/nulloy/nulloy/archive/%{rev}.tar.gz#/%{name}-%{version}.… Patch0: fix-library-directory.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: libqt4-devel +BuildRequires: libQt5Gui-private-headers-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: zip +BuildRequires: pkgconfig(Qt5Core) >= 5.6 +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0) +%if %{with libvlc} BuildRequires: pkgconfig(libvlc) +%endif +%if %{with phonon} BuildRequires: pkgconfig(phonon) +%endif BuildRequires: pkgconfig(taglib) Recommends: %{name}-gstreamer Recommends: %{name}-taglib @@ -63,6 +78,7 @@ This package contains the gstreamer playback plugin for %{name} - a lightweight music player with a Waveform Progressbar. +%if %{with phonon} %package phonon Summary: Phonon plugin for %{name} Group: Productivity/Multimedia/Sound/Players @@ -71,7 +87,9 @@ %description phonon This package contains the phonon playback plugin for %{name} - a lightweight music player with a Waveform Progressbar. +%endif +%if %{with libvlc} %package vlc Summary: VLC plugin for %{name} Group: Productivity/Multimedia/Sound/Players @@ -80,9 +98,10 @@ %description vlc This package contains the vlc playback plugin for %{name} - a lightweight music player with a Waveform Progressbar. +%endif %prep -%setup -q +%setup -qn %{name}-%{rev} %patch0 -p1 %build @@ -91,16 +110,35 @@ CXXFLAGS="%{optflags}" \ ./configure \ --no-update-check \ - --taglib \ - --phonon \ + --prefix %{_prefix} \ +%if %{with libvlc} --vlc \ - --prefix %{buildroot}%{_prefix} \ - --libdir "%{_lib}" +%endif +%if %{with phonon} + --phonon \ +%endif + --libdir "%{_lib}" \ + --gstreamer-tagreader +# make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +./configure \ + --no-update-check \ + --prefix %{buildroot}%{_prefix} \ +%if %{with libvlc} + --vlc \ +%endif +%if %{with phonon} + --phonon \ +%endif + --libdir "%{_lib}" \ + --gstreamer-tagreader + +%makeinstall +mkdir -p %{buildroot}%{_libdir} +mv %{buildroot}%{_prefix}/%{name} %{buildroot}%{_libdir} %suse_update_desktop_file %{name} %post @@ -113,7 +151,8 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog LICENSE.GPL3 THANKS +%doc AUTHORS ChangeLog THANKS +%license LICENSE.GPL3 %{_bindir}/nulloy %{_datadir}/applications/nulloy.desktop %{_datadir}/icons/hicolor/*/apps/nulloy.png @@ -129,12 +168,16 @@ %defattr(-,root,root) %{_libdir}/nulloy/plugins/libplugin_gstreamer.so +%if %{with phonon} %files phonon %defattr(-,root,root) %{_libdir}/nulloy/plugins/libplugin_phonon.so +%endif +%if %{with libvlc} %files vlc %defattr(-,root,root) %{_libdir}/nulloy/plugins/libplugin_vlc.so +%endif %changelog ++++++ fix-library-directory.patch ++++++ --- /var/tmp/diff_new_pack.UKH36j/_old 2019-05-05 21:22:30.989456515 +0200 +++ /var/tmp/diff_new_pack.UKH36j/_new 2019-05-05 21:22:30.989456515 +0200 @@ -1,55 +1,67 @@ -diff -Nur nulloy-0.8.2/configure new/configure ---- nulloy-0.8.2/configure 2016-02-03 23:19:41.000000000 +0100 -+++ new/configure 2016-04-15 16:32:35.746385532 +0200 -@@ -33,6 +33,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/configure +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/configure 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/configure 2019-05-05 12:22:27.155741057 +0200 +@@ -5,7 +5,7 @@ CWD=$(dirname $0) + PREFIX=/usr + DEBUG=no + APP_NAME=nulloy +- ++LIBDIR=lib + FORCE_VERSION=no + BUILD_GSTREAMER=yes + BUILD_GSTREAMER_TAGREADER=no +@@ -30,6 +30,7 @@ echo_help() { + echo ' --no-skins disable skins support' echo ' --force-version VERSION overrides version.pri' echo ' --no-update-check disable online check functionality' - echo ' --prefix PREFIX installation prefix' + echo ' --libdir LIBDIR library installation path {prefix}/{libdir}' - echo ' --no-app-bundle do not make .app (Mac only)' - echo ' --universal build for both i386 and x86_64 (Mac only)' + echo ' --prefix PREFIX installation prefix (ignored on Mac)' echo ' --debug build in debug mode' -@@ -52,7 +53,7 @@ - exit 1 - fi - --args=`getopt -n$BASENAME -o h --longoptions="force-version: no-update-check no-gstreamer no-gstreamer-tagreader vlc phonon taglib no-skins debug prefix: no-app-bundle universal help" -- "$@"` -+args=`getopt -n$BASENAME -o h --longoptions="force-version: no-update-check no-gstreamer no-gstreamer-tagreader vlc phonon taglib no-skins debug prefix: libdir: no-app-bundle universal help" -- "$@"` + echo ' --tests build unit tests' +@@ -44,7 +45,7 @@ while test $# -gt 0; do + case "$1" in + --prefix) + shift +- if command -v realpath &> /dev/null && -d $(dirname "$1"); then ++ if command -v realpath &> /dev/null && [ -d $(dirname "$1") ]; then + PREFIX=$(realpath "$1") + else + PREFIX=$(readlink -m "$1") +@@ -68,6 +69,8 @@ while test $# -gt 0; do + BUILD_TESTS=yes ;; + --no-skins) + SUPPORT_SKINS=no ;; ++ --libdir) ++ shift; LIBDIR=$1; echo $LIBDIR ;; + --no-update-check) + UPDATE_CHECK=no ;; + --help|-h) +@@ -106,8 +109,8 @@ check_executable() { - if test $? != 0; then - echo_try; exit 1 -@@ -67,6 +68,9 @@ - else - PREFIX=`readlink -m "$1"` - fi -+ elif [ $1 == "--libdir" ]; then -+ shift -+ LIBDIR="$1" - elif [ $1 == "--debug" ]; then - DEBUG=yes - elif [ $1 == "--force-version" ]; then -@@ -172,6 +176,8 @@ - echo "N_CONFIG_FORCE_VERSION = $FORCE_VERSION" > $QMAKE_CACHE + echo "$FNAME" + } +-check_executable QMAKE qmake +-check_executable LRELEASE lrelease ++check_executable QMAKE qmake-qt5 ++check_executable LRELEASE lrelease-qt5 + echo "LRELEASE = $LRELEASE" >> $QMAKE_CACHE + check_executable PKG_CONFIG pkg-config + echo "PKG_CONFIG = $PKG_CONFIG" >> $QMAKE_CACHE +@@ -164,6 +167,8 @@ else fi + echo "PREFIX = $PREFIX" >> $QMAKE_CACHE +echo "N_LIBDIR = $LIBDIR" >> $QMAKE_CACHE + echo "N_CONFIG_SUCCESS = yes" >> $QMAKE_CACHE - [ -z "$NULLOY_BUILD_TMP_DIR" ] && NULLOY_BUILD_TMP_DIR=`pwd`/.tmp -@@ -190,7 +196,7 @@ echo - echo "Running qmake..." - --$QMAKE "CONFIG+=$QMAKE_CONFIG" PREFIX="$PREFIX" APP_NAME="$APP_NAME" $QMAKE_EXTRA_OPTIONS -+$QMAKE "CONFIG+=$QMAKE_CONFIG" PREFIX="$PREFIX" LIBDIR="$LIBDIR" APP_NAME="$APP_NAME" $QMAKE_EXTRA_OPTIONS - if [ $? -ne 0 ]; then - echo "$BASENAME: qmake failed" - exit 1 -diff -Nur nulloy-0.8.2/nulloy.desktop new/nulloy.desktop ---- nulloy-0.8.2/nulloy.desktop 2016-02-03 23:19:41.000000000 +0100 -+++ new/nulloy.desktop 2016-04-15 16:33:28.302767421 +0200 -@@ -10,7 +10,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/nulloy.desktop +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/nulloy.desktop 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/nulloy.desktop 2019-05-05 10:14:49.156767355 +0200 +@@ -10,7 +10,7 @@ MimeType=x-content/audio-player;audio/ba Icon=nulloy Exec=nulloy %F @@ -58,10 +70,11 @@ [Desktop Action PlayPause] Name=Play / Pause -diff -Nur nulloy-0.8.2/src/pluginLoader.cpp new/src/pluginLoader.cpp ---- nulloy-0.8.2/src/pluginLoader.cpp 2016-02-03 23:19:41.000000000 +0100 -+++ new/src/pluginLoader.cpp 2016-04-15 16:34:40.643295115 +0200 -@@ -107,7 +107,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/pluginLoader.cpp +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/src/pluginLoader.cpp 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/pluginLoader.cpp 2019-05-05 10:14:49.164767652 +0200 +@@ -113,7 +113,7 @@ void NPluginLoader::init() pluginsDirList << NCore::rcDir() + "/" + _pluginsDirName; if (QDir(QCoreApplication::applicationDirPath()).dirName() == "bin") { QDir dir(QCoreApplication::applicationDirPath()); @@ -70,10 +83,11 @@ pluginsDirList << dir.absolutePath(); } #endif -diff -Nur nulloy-0.8.2/src/plugins/plugin.pri new/src/plugins/plugin.pri ---- nulloy-0.8.2/src/plugins/plugin.pri 2016-02-03 23:19:41.000000000 +0100 -+++ new/src/plugins/plugin.pri 2016-04-15 16:35:19.579580106 +0200 -@@ -17,7 +17,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/plugins/plugin.pri +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/src/plugins/plugin.pri 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/plugins/plugin.pri 2019-05-05 10:14:49.164767652 +0200 +@@ -17,7 +17,7 @@ unix { mac { target.path = ../../../$${APP_NAME}.app/Contents/MacOS/plugins } else { @@ -82,14 +96,13 @@ } INSTALLS += target } -diff -Nur nulloy-0.8.2/src/src.pro new/src/src.pro ---- nulloy-0.8.2/src/src.pro 2016-02-03 23:19:41.000000000 +0100 -+++ new/src/src.pro 2016-04-15 16:35:55.279841984 +0200 -@@ -79,6 +79,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/src.pro +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/src/src.pro 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/src.pro 2019-05-05 10:14:49.164767652 +0200 +@@ -4,4 +4,5 @@ DESTDIR = .. - include(version.pri) - DEFINES += _N_VERSION_=\""\\\"$${N_VERSION}\\\""\" + SRC_DIR = $$PWD + include($$SRC_DIR/src.pri) +DEFINES += N_LIBDIR=\""\\\"$${N_LIBDIR}\\\""\" - build_pass:CONFIG(static, static|shared) { - DEFINES += _N_STATIC_BUILD_ - } else { + SOURCES += $$SRC_DIR/main.cpp

1 0

commit rubygem-autoprefixer-rails for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package rubygem-autoprefixer-rails for openSUSE:Factory checked in at 2019-05-05 21:22:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-autoprefixer-rails (Old) and /work/SRC/openSUSE:Factory/.rubygem-autoprefixer-rails.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-autoprefixer-rails" Sun May 5 21:22:23 2019 rev:27 rq:700786 version:9.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-autoprefixer-rails/rubygem-autoprefixer-rails.changes 2019-03-27 16:18:58.867560051 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-autoprefixer-rails.new.5148/rubygem-autoprefixer-rails.changes 2019-05-05 21:22:26.449444147 +0200 @@ -1,0 +2,10 @@ +Sun May 5 09:18:41 UTC 2019 - Stephan Kulow <coolo(a)suse.com> + +- updated to version 9.5.1 + see installed CHANGELOG.md + + ## 9.5.1 + * Fix `backdrop-filter` for Edge (by Oleh Aloshkin). + * Fix `min-resolution` media query support in Firefox < 16. + +------------------------------------------------------------------- Old: ---- autoprefixer-rails-9.5.0.gem New: ---- autoprefixer-rails-9.5.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-autoprefixer-rails.spec ++++++ --- /var/tmp/diff_new_pack.O4goQm/_old 2019-05-05 21:22:27.613447318 +0200 +++ /var/tmp/diff_new_pack.O4goQm/_new 2019-05-05 21:22:27.649447416 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ # Name: rubygem-autoprefixer-rails -Version: 9.5.0 +Version: 9.5.1 Release: 0 %define mod_name autoprefixer-rails %define mod_full_name %{mod_name}-%{version} ++++++ autoprefixer-rails-9.5.0.gem -> autoprefixer-rails-9.5.1.gem ++++++ ++++ 48411 lines of diff (skipped)

1 0

commit peazip for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package peazip for openSUSE:Factory checked in at 2019-05-05 21:22:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/peazip (Old) and /work/SRC/openSUSE:Factory/.peazip.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "peazip" Sun May 5 21:22:20 2019 rev:10 rq:700706 version:6.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/peazip/peazip.changes 2019-04-15 11:52:41.442563124 +0200 +++ /work/SRC/openSUSE:Factory/.peazip.new.5148/peazip.changes 2019-05-05 21:22:24.217438067 +0200 @@ -1,0 +2,6 @@ +Sun May 5 08:56:37 UTC 2019 - Luigi Baldoni <aloisio(a)gmx.com> + +- Update to version 6.8.0 + * Various fixes and improvements + +------------------------------------------------------------------- Old: ---- peazip-6.7.2.src.zip peazip_help.pdf New: ---- peazip-6.8.0.src.zip peazip_help-6.8.0.pdf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ peazip.spec ++++++ --- /var/tmp/diff_new_pack.JX0HAu/_old 2019-05-05 21:22:26.125443264 +0200 +++ /var/tmp/diff_new_pack.JX0HAu/_new 2019-05-05 21:22:26.129443275 +0200 @@ -18,7 +18,7 @@ %define _peazipinstalldir %{_libdir}/peazip Name: peazip -Version: 6.7.2 +Version: 6.8.0 Release: 0 Summary: Graphical file archiver License: LGPL-3.0-only @@ -26,7 +26,7 @@ URL: http://www.peazip.org Source0: https://sourceforge.net/projects/peazip/files/%{version}/peazip-%{version}.… Source1: altconf.txt -Source2: https://sourceforge.net/projects/peazip/files/%{version}/peazip_help.pdf +Source2: https://sourceforge.net/projects/peazip/files/%{version}/peazip_help.pdf#/p… Patch0: peazip-desktop.patch # PATCH-FIX-UPSTREAM: https://sourceforge.net/p/peazip/tickets/492/ Patch1: peazip-fix_aarch64.patch @@ -91,7 +91,7 @@ %patch4 -p1 chmod +w res/lang dos2unix readme -cp %{SOURCE2} . +cp %{SOURCE2} peazip_help.pdf %build lazbuild \

1 0

commit qmmp for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2019-05-05 21:22:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp (Old) and /work/SRC/openSUSE:Factory/.qmmp.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qmmp" Sun May 5 21:22:17 2019 rev:67 rq:700680 version:1.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2019-03-12 09:52:00.995554783 +0100 +++ /work/SRC/openSUSE:Factory/.qmmp.new.5148/qmmp.changes 2019-05-05 21:22:19.177424337 +0200 @@ -1,0 +2,19 @@ +Sun May 5 06:48:16 UTC 2019 - Luigi Baldoni <aloisio(a)gmx.com> + +- Update to version 1.3.2 + * added feature to play track on double click in the history + plugin + * using album cover from file by default + * fixed lyrics plugin + * fixed API documentation + * fixed issue with read-only mode for FLAC files + * fixed issue with missing properties for some CUE tracks + * fixed shortcuts displaying in context menus under Qt 5.10 or + higher + * fixed Qt 5.13 support + * fixed crash under Wayland session + * fixed freezing on some corrupted files in the ffmpeg plugin + * fixed crash on some streams in the ffmpeg plugin + * fixed file type determination by content in the mpeg plugin + +------------------------------------------------------------------- Old: ---- qmmp-1.3.1.tar.bz2 New: ---- qmmp-1.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp.spec ++++++ --- /var/tmp/diff_new_pack.JmnOjB/_old 2019-05-05 21:22:20.853428903 +0200 +++ /var/tmp/diff_new_pack.JmnOjB/_new 2019-05-05 21:22:20.877428968 +0200 @@ -21,7 +21,7 @@ %bcond_with faad %bcond_with restricted Name: qmmp -Version: 1.3.1 +Version: 1.3.2 Release: 0 Summary: Qt-based Multimedia Player License: GPL-2.0-or-later ++++++ qmmp-1.3.1.tar.bz2 -> qmmp-1.3.2.tar.bz2 ++++++ ++++ 1924 lines of diff (skipped)

1 0

commit python-django-reversion for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-django-reversion for openSUSE:Factory checked in at 2019-05-05 21:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-reversion (Old) and /work/SRC/openSUSE:Factory/.python-django-reversion.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-reversion" Sun May 5 21:22:11 2019 rev:9 rq:700613 version:3.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-reversion/python-django-reversion.changes 2019-04-30 13:01:19.814157133 +0200 +++ /work/SRC/openSUSE:Factory/.python-django-reversion.new.5148/python-django-reversion.changes 2019-05-05 21:22:12.581406368 +0200 @@ -1,0 +2,6 @@ +Sat May 4 15:55:42 UTC 2019 - Martin Herkt <9+suse(a)cirno.systems> + +- Add 0000-Remove-django.contrib.admin-dependency.patch + https://github.com/etianen/django-reversion/issues/744 + +------------------------------------------------------------------- New: ---- 0000-Remove-django.contrib.admin-dependency.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-reversion.spec ++++++ --- /var/tmp/diff_new_pack.Q7rE1I/_old 2019-05-05 21:22:13.025407577 +0200 +++ /var/tmp/diff_new_pack.Q7rE1I/_new 2019-05-05 21:22:13.025407577 +0200 @@ -25,6 +25,8 @@ Group: Development/Languages/Python URL: http://github.com/etianen/django-reversion Source: https://files.pythonhosted.org/packages/source/d/django-reversion/django-re… +# PATCH-FIX-UPSTREAM - 0000-Remove-django.contrib.admin-dependency.patch -- https://github.com/etianen/django-reversion/issues/744 +Patch0: 0000-Remove-django.contrib.admin-dependency.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -44,6 +46,7 @@ %prep %setup -q -n django-reversion-%{version} +%autopatch -p1 %build %python_build ++++++ 0000-Remove-django.contrib.admin-dependency.patch ++++++ >From be5b03e937eef547f80be1cf84a125df1655f53b Mon Sep 17 00:00:00 2001 From: Aitor Ruano <codearm(a)pm.me> Date: Tue, 2 Apr 2019 13:08:28 +0200 Subject: [PATCH] Remove django.contrib.admin dependency from django-reversion --- reversion/models.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/reversion/models.py b/reversion/models.py index de91e3cc..93c3a9f7 100644 --- a/reversion/models.py +++ b/reversion/models.py @@ -1,21 +1,26 @@ from __future__ import unicode_literals + from collections import defaultdict from itertools import chain, groupby + +from django.apps import apps +from django.conf import settings from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType -from django.conf import settings -from django.contrib.admin.models import LogEntry from django.core import serializers -from django.core.serializers.base import DeserializationError from django.core.exceptions import ObjectDoesNotExist -from django.db import models, IntegrityError, transaction, router, connections +from django.core.serializers.base import DeserializationError +from django.db import IntegrityError, connections, models, router, transaction from django.db.models.deletion import Collector from django.db.models.expressions import RawSQL -from django.utils.functional import cached_property -from django.utils.translation import ugettext_lazy as _, ugettext from django.utils.encoding import force_text, python_2_unicode_compatible +from django.utils.functional import cached_property +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ + from reversion.errors import RevertError -from reversion.revisions import _get_options, _get_content_type, _follow_relations_recursive +from reversion.revisions import (_follow_relations_recursive, + _get_content_type, _get_options) def _safe_revert(versions): @@ -61,7 +66,11 @@ class Revision(models.Model): ) def get_comment(self): - return LogEntry(change_message=self.comment).get_change_message() + try: + LogEntry = apps.get_model('admin.LogEntry') + return LogEntry(change_message=self.comment).get_change_message() + except LookupError: + return self.comment def revert(self, delete=False): # Group the models by the database of the serialized model.

1 0

commit lollypop for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2019-05-05 21:22:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lollypop" Sun May 5 21:22:08 2019 rev:79 rq:700604 version:1.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2019-04-23 14:36:31.677491772 +0200 +++ /work/SRC/openSUSE:Factory/.lollypop.new.5148/lollypop.changes 2019-05-05 21:22:09.561398141 +0200 @@ -1,0 +2,9 @@ +Sat May 04 13:19:07 UTC 2019 - antoine.belvire(a)opensuse.org + +- Update to version 1.0.8: + * Update icon. + * Fix short high CPU usage bursts (glgo#World/lollypop#1776). + * Use a fixed art size for miniplayer (glgo#World/lollypop#1790). + * Add remixers to artist lists (glgo#World/lollypop#1781). + +------------------------------------------------------------------- Old: ---- lollypop-1.0.7.tar.xz New: ---- lollypop-1.0.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.oJW17e/_old 2019-05-05 21:22:10.269400070 +0200 +++ /var/tmp/diff_new_pack.oJW17e/_new 2019-05-05 21:22:10.269400070 +0200 @@ -17,7 +17,7 @@ Name: lollypop -Version: 1.0.7 +Version: 1.0.8 Release: 0 Summary: GNOME music playing application License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.oJW17e/_old 2019-05-05 21:22:10.289400124 +0200 +++ /var/tmp/diff_new_pack.oJW17e/_new 2019-05-05 21:22:10.293400135 +0200 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> - <param name="revision">1.0.7</param> + <param name="revision">1.0.8</param> <param name="scm">git</param> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> <param name="versionformat">@PARENT_TAG@</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.oJW17e/_old 2019-05-05 21:22:10.305400167 +0200 +++ /var/tmp/diff_new_pack.oJW17e/_new 2019-05-05 21:22:10.305400167 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> - <param name="changesrevision">0852d8ae7e001d11a40b4e40d4818eb40fd8afc8</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">c0ae16d8540af387e946af9c7ce68ebc7f2d2cba</param></service></servicedata> \ No newline at end of file ++++++ lollypop-1.0.7.tar.xz -> lollypop-1.0.8.tar.xz ++++++ ++++ 2249 lines of diff (skipped)

1 0

commit epiphany for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package epiphany for openSUSE:Factory checked in at 2019-05-05 21:22:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epiphany (Old) and /work/SRC/openSUSE:Factory/.epiphany.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "epiphany" Sun May 5 21:22:05 2019 rev:163 rq:700576 version:3.32.2 Changes: -------- --- /work/SRC/openSUSE:Factory/epiphany/epiphany.changes 2019-04-05 12:02:31.750567405 +0200 +++ /work/SRC/openSUSE:Factory/.epiphany.new.5148/epiphany.changes 2019-05-05 21:22:07.201391712 +0200 @@ -1,0 +2,24 @@ +Fri May 3 17:38:08 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.2: + + Fix remembering printer settings. + + Fix fuzzy incognito mode icon in hidpi. + + Add search button and allow type to search on history dialog. + + Fix critical deleting URLs from history dialog. + + Fix crash changing reader mode preferences. + + Fix many actions being disabled by mistake in incognito mode. + + Fix password manager asking to remember passwords when + disabled. + + Close history dialog on Escape. + + Fix crash during Safe Browsing update. + + Unfullscreen automatically when web process crashes. + + Fix markup appearing in search provider results. + + Fix a search provider crash. + + Fix password manager crash on certain websites. + + Fix password manager autofill when form has no username. + + Fix tab bar context menu reopen closed tab action crash and + sensitivity. + + Fix websites opening file choosers under flatpak. + + Fix searching for bookmarks in top bar. + +------------------------------------------------------------------- Old: ---- epiphany-3.32.1.2.tar.xz New: ---- epiphany-3.32.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany.spec ++++++ --- /var/tmp/diff_new_pack.wCUVuu/_old 2019-05-05 21:22:07.669392987 +0200 +++ /var/tmp/diff_new_pack.wCUVuu/_new 2019-05-05 21:22:07.673392997 +0200 @@ -17,7 +17,7 @@ Name: epiphany -Version: 3.32.1.2 +Version: 3.32.2 Release: 0 Summary: GNOME Web Browser License: GPL-3.0-or-later ++++++ epiphany-3.32.1.2.tar.xz -> epiphany-3.32.2.tar.xz ++++++ ++++ 5595 lines of diff (skipped)

1 0

commit oxygen-gtk2 for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2019-05-05 21:22:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk2" Sun May 5 21:22:01 2019 rev:29 rq:700492 version:1.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2017-04-11 12:44:09.879059167 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new.5148/oxygen-gtk2.changes 2019-05-05 21:22:03.681382122 +0200 @@ -1,0 +2,11 @@ +Fri May 3 19:37:08 UTC 2019 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Run spec-cleaner +- Trim the packages description + +------------------------------------------------------------------- +Fri May 3 18:55:10 UTC 2019 - Alexei Podvalsky <avvissu(a)yandex.by> + +- Add oxygen-gtk2-1.4.6-xul.patch to fix crashes in newmoon/palemoon + +------------------------------------------------------------------- New: ---- oxygen-gtk2-1.4.6-xul.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.pMQqjN/_old 2019-05-05 21:22:04.309383834 +0200 +++ /var/tmp/diff_new_pack.pMQqjN/_new 2019-05-05 21:22:04.309383834 +0200 @@ -1,7 +1,7 @@ # # spec file for package oxygen-gtk2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,10 +20,10 @@ Version: 1.4.6 Release: 0 Summary: A Port of the KDE Oxygen Widget Theme, to GTK 2.x -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE -Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk -Source: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… +URL: https://www.kde.org +Source: https://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.t… Source100: baselibs.conf # PATCH-FIX-OPENSUSE fix-menu-items-look.patch fisiu(a)opensuse.org -- Vertical center text in menuitems. Patch0: fix-menu-items-look.patch @@ -31,8 +31,11 @@ Patch1: qt-config-path.patch # PATCH-FIX-UPSTREAM fix-crash-about-invalid-columns.patch kde#338012 -- Fix crash in eclipse Patch2: fix-crash-about-invalid-columns.patch +# PATCH-FIX-UPSTREAM oxygen-gtk2-1.4.6-xul.patch -- Add a number of xul applications to prevent crash for these CCBUG: 341181 +Patch3: oxygen-gtk2-1.4.6-xul.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: pkgconfig BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gtk+-2.0) @@ -40,16 +43,10 @@ Oxygen-Gtk2 is a port of the KDE Oxygen widget theme to Gtk 2.x. It's primary goal is to ensure visual consistency between Gtk-based -and Qt-based applications running under KDE. A secondary objective +and Qt-based applications. A secondary objective is to also have a stand-alone nice looking gtk theme that would behave well on other Desktop Environments. -Unlike other attempts made to port the KDE oxygen theme to gtk, -this attempt does not depend on Qt (via some Qt to Gtk conversion -engine), nor does render the widget appearance via hard coded -pixmaps, which otherwise breaks everytime some setting is changed -in KDE. - %package -n gtk2-engine-oxygen Summary: Oxygen GTK 2.x Theme Engine Group: System/GUI/Other @@ -58,16 +55,10 @@ Oxygen-Gtk2 is a port of the KDE Oxygen widget theme to Gtk 2.x. It's primary goal is to ensure visual consistency between Gtk-based -and Qt-based applications running under KDE. A secondary objective +and Qt-based applications. A secondary objective is to also have a stand-alone nice looking gtk theme that would behave well on other Desktop Environments. -Unlike other attempts made to port the KDE oxygen theme to gtk, -this attempt does not depend on Qt (via some Qt to Gtk conversion -engine), nor does render the widget appearance via hard coded -pixmaps, which otherwise breaks everytime some setting is changed -in KDE. - This package contains the Oxygen Gtk 2.x theme engine. %package -n gtk2-theme-oxygen @@ -82,16 +73,10 @@ Oxygen-Gtk2 is a port of the KDE Oxygen widget theme to Gtk 2.x. It's primary goal is to ensure visual consistency between Gtk-based -and Qt-based applications running under KDE. A secondary objective +and Qt-based applications. A secondary objective is to also have a stand-alone nice looking gtk theme that would behave well on other Desktop Environments. -Unlike other attempts made to port the KDE oxygen theme to gtk, -this attempt does not depend on Qt (via some Qt to Gtk conversion -engine), nor does render the widget appearance via hard coded -pixmaps, which otherwise breaks everytime some setting is changed -in KDE. - This package contains the Oxygen Gtk 2.x theme. %prep @@ -99,26 +84,27 @@ %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Switch to the oxygen-qt5 default. sed -i 's/^$TabStyle=$.*$/\1TS_PLAIN/' rc/oxygenrc %build %cmake -make %{?_smp_mflags} +%cmake_build %install %cmake_install %files -n gtk2-engine-oxygen -%defattr(-,root,root) -%doc AUTHORS COPYING README TODO +%license COPYING +%doc AUTHORS README TODO %{_libdir}/gtk-2.0/*/engines/liboxygen-gtk.so %files -n gtk2-theme-oxygen -%defattr(-,root,root) -%doc AUTHORS COPYING README TODO -%{_bindir}/oxygen-gtk-demo +%license COPYING +%doc AUTHORS README TODO %dir %{_datadir}/themes/oxygen-gtk/ +%{_bindir}/oxygen-gtk-demo %{_datadir}/themes/oxygen-gtk/gtk-2.0/ %changelog ++++++ oxygen-gtk2-1.4.6-xul.patch ++++++ >From b1ee5fb80c44c6c8a625333af1cfdc997d408805 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa <hugo.pereira(a)free.fr> Date: Sat, 18 Jul 2015 20:09:28 +0200 Subject: moved xul application names to dedicated header file, added a number of xul applications to prevent crash for these CCBUG: 341181 --- src/oxygenapplicationname.cpp | 18 ++----------- src/oxygenxulapplicationnames.h | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 src/oxygenxulapplicationnames.h diff --git a/src/oxygenapplicationname.cpp b/src/oxygenapplicationname.cpp index feb5a23..17c8a1a 100644 --- a/src/oxygenapplicationname.cpp +++ b/src/oxygenapplicationname.cpp @@ -25,6 +25,7 @@ #include "oxygenapplicationname.h" #include "oxygengtkutils.h" +#include "oxygenxulapplicationnames.h" #include "config.h" #include <cstdlib> @@ -79,23 +80,8 @@ namespace Oxygen gtkAppName == "chromium" || gtkAppName == "chromium-browser" || gtkAppName == "google-chrome" ) _name = GoogleChrome; - else { - // tag all mozilla-like applications (XUL) - static const std::string XulAppNames[] = - { - "firefox", - "thunderbird", - "seamonkey", - "iceweasel", - "icecat", - "icedove", - "xulrunner", - "komodo", - "aurora", - "zotero", - "" - }; + else { for( unsigned int index = 0; !XulAppNames[index].empty(); ++index ) { diff --git a/src/oxygenxulapplicationnames.h b/src/oxygenxulapplicationnames.h new file mode 100644 index 0000000..252a1fc --- /dev/null +++ b/src/oxygenxulapplicationnames.h @@ -0,0 +1,56 @@ +#ifndef oxygenxulapplicationname_h +#define oxygenxulapplicationname_h +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2010 Hugo Pereira Da Costa <hugo.pereira(a)free.fr> +* +* inspired notably from kdelibs/kdeui/color/kcolorutils.h +* Copyright (C) 2007 Matthew Woehlke <mw_triad(a)users.sourceforge.net> +* Copyright (C) 2007 Thomas Zander <zander(a)kde.org> +* Copyright (C) 2007 Zack Rusin <zack(a)kde.org> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or( at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include <string> + +namespace Oxygen +{ + + // tag all mozilla-like applications (XUL) + static const std::string XulAppNames[] = + { + "aurora", + "earlybird", + "icecat", + "icedove", + "iceweasel", + "instantbird", + "firefox", + "fossamail", + "komodo", + "newmoon", + "palemoon", + "seamonkey", + "thunderbird", + "xulrunner", + "zotero", + "" + }; + +} + +#endif -- cgit v0.11.2

1 0

commit qxmledit for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package qxmledit for openSUSE:Factory checked in at 2019-05-05 21:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qxmledit (Old) and /work/SRC/openSUSE:Factory/.qxmledit.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qxmledit" Sun May 5 21:21:55 2019 rev:18 rq:700491 version:0.9.13 Changes: -------- --- /work/SRC/openSUSE:Factory/qxmledit/qxmledit.changes 2019-01-08 12:30:53.368114485 +0100 +++ /work/SRC/openSUSE:Factory/.qxmledit.new.5148/qxmledit.changes 2019-05-05 21:21:59.309370212 +0200 @@ -1,0 +2,10 @@ +Fri May 3 18:41:35 UTC 2019 - Kyrill Detinov <lazy.kent(a)opensuse.org> + +- Update to 0.9.13. + * Added Snapcraft file. + * Updated template for headers. + * Cleaned up code as suggested by cppcheck reports. + * Qt SCXML module made optional. + * Added link to About Box to start panel. + +------------------------------------------------------------------- Old: ---- qxmledit-0.9.12.tar.gz New: ---- qxmledit-0.9.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qxmledit.spec ++++++ --- /var/tmp/diff_new_pack.fY1w7v/_old 2019-05-05 21:22:00.253372784 +0200 +++ /var/tmp/diff_new_pack.fY1w7v/_new 2019-05-05 21:22:00.257372795 +0200 @@ -17,9 +17,9 @@ %define major 0 -%define _version 0.9.12 +%define _version 0.9.13 Name: qxmledit -Version: 0.9.12 +Version: 0.9.13 Release: 0 Summary: XML Editor and XSD Viewer License: LGPL-2.0-or-later AND LGPL-3.0-or-later ++++++ qxmledit-0.9.12.tar.gz -> qxmledit-0.9.13.tar.gz ++++++ /work/SRC/openSUSE:Factory/qxmledit/qxmledit-0.9.12.tar.gz /work/SRC/openSUSE:Factory/.qxmledit.new.5148/qxmledit-0.9.13.tar.gz differ: char 13, line 1

1 0

commit jshon for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package jshon for openSUSE:Factory checked in at 2019-05-05 21:21:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jshon (Old) and /work/SRC/openSUSE:Factory/.jshon.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jshon" Sun May 5 21:21:52 2019 rev:1 rq:700489 version:20131105 Changes: -------- New Changes file: --- /dev/null 2019-05-02 15:18:01.516169518 +0200 +++ /work/SRC/openSUSE:Factory/.jshon.new.5148/jshon.changes 2019-05-05 21:21:52.917352799 +0200 @@ -0,0 +1,17 @@ +------------------------------------------------------------------- +Fri May 3 19:31:18 UTC 2019 - Martin Hauke <mardnh(a)gmx.de> + +- Remove not used patch: + * 0002-fix-documentation-for-creating-JSON.patch + +------------------------------------------------------------------- +Fri May 3 18:11:57 UTC 2019 - Martin Hauke <mardnh(a)gmx.de> + +- Update to upstream release 20131105 +- Specfile cleanup + +------------------------------------------------------------------- +Sun Feb 15 21:44:03 UTC 2015 - mardnh(a)gmx.de + +- initial package, version 0.0.0.git1405173528.a61d7f2 + New: ---- 0001-Fix-Makefile-typo.patch 0001-Fix-null-termination-in-read_stream.patch 0001-check-for-a-error-on-file-open-with-F-option.patch jshon-20131105.tar.gz jshon-fix-install-permissions.diff jshon.changes jshon.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jshon.spec ++++++ # # spec file for package jshon # # Copyright (c) 2015, Martin Hauke <mardnh(a)gmx.de> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: jshon Version: 20131105 Release: 0 Summary: A JSON parser for the shell License: MIT Group: Productivity/Text/Utilities URL: http://kmkeen.com/jshon #Git-Clone: https://github.com/keenerd/jshon.git Source: https://github.com/keenerd/%{name}/archive/%{version}.tar.gz#/%{name}-%{ver… Patch0: jshon-fix-install-permissions.diff Patch1: 0001-check-for-a-error-on-file-open-with-F-option.patch Patch2: 0001-Fix-Makefile-typo.patch Patch3: 0001-Fix-null-termination-in-read_stream.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(jansson) %description Jshon parses, reads and creates JSON. It is designed to be as usable as possible from within the shell and replaces fragile adhoc parsers made from grep/sed/awk as well as heavyweight one-line parsers made from perl/python. %prep %autosetup %build export CFLAGS="%{optflags}" make %{?_smp_mflags} %install %make_install %files %license LICENSE %{_bindir}/jshon %{_mandir}/man1/jshon.1%{?ext_man} %changelog ++++++ 0001-Fix-Makefile-typo.patch ++++++ >From 830e2df6c7938b6ddd515ef4c88d72d4de81bf3e Mon Sep 17 00:00:00 2001 From: Rowan Thorpe <rowan(a)rowanthorpe.com> Date: Mon, 9 Dec 2013 11:38:11 +0200 Subject: [PATCH] Fix Makefile typo --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eca5ccf..60dbd47 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ all: $(DISTFILES) $(DISTFILES): jshon.o -strip: $(DISFILES) +strip: $(DISTFILES) strip --strip-all $(DISTFILES) clean: -- 2.16.4 ++++++ 0001-Fix-null-termination-in-read_stream.patch ++++++ >From d919aeaece37962251dbe6c1ee50f0028a5c90e4 Mon Sep 17 00:00:00 2001 From: Mikael Brockman <mikael(a)brockman.se> Date: Thu, 2 Mar 2017 10:15:24 +0200 Subject: [PATCH] Fix null termination in read_stream This came up in issue #53. --- jshon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jshon.c b/jshon.c index 6e2f96a..ffefee6 100644 --- a/jshon.c +++ b/jshon.c @@ -368,6 +368,8 @@ char* read_stream(FILE* fp) (ssize_t)st.st_size, (ssize_t)bytes_r); } + buffer[bytes_r] = 0; + return buffer; } -- 2.16.4 ++++++ 0001-check-for-a-error-on-file-open-with-F-option.patch ++++++ >From 7579558b8018d4abcd0a4ee0a16d9be467a5744a Mon Sep 17 00:00:00 2001 From: Jordan Metzmeier <jmetzmeier01(a)gmail.com> Date: Tue, 19 Nov 2013 22:38:49 -0600 Subject: [PATCH 1/2] check for a error on file open with -F option --- jshon.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jshon.c b/jshon.c index f42b6da..ad0fb7c 100644 --- a/jshon.c +++ b/jshon.c @@ -375,6 +375,10 @@ char* read_file(char* path) FILE* fp; char* content; fp = fopen(path, "r"); + if ( !fp ) { + fprintf(stderr, "unable to read file %s: %s\n", path, strerror(errno)); + return NULL; + } content = read_stream(fp); fclose(fp); return content; @@ -927,6 +931,11 @@ int main (int argc, char *argv[]) {content = read_file(file_path);} else {content = read_stdin();} + if (!content) { + fprintf(stderr, "error: failed to read input\n"); + exit(1); + } + if (!content[0] && !quiet) {fprintf(stderr, "warning: nothing to read\n");} -- 2.16.4 ++++++ jshon-fix-install-permissions.diff ++++++ diff --git a/Makefile b/Makefile index 60dbd47..fb99bc2 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,8 @@ clean: rm -f *.o $(DISTFILES) install: - $(INSTALL) -D $(DISTFILES) $(TARGET_PATH)/$(DISTFILES) - $(INSTALL) -D $(MANFILE) $(MANDIR)/$(MANFILE) + $(INSTALL) -Dm0755 $(DISTFILES) $(TARGET_PATH)/$(DISTFILES) + $(INSTALL) -Dm0644 $(MANFILE) $(MANDIR)/$(MANFILE) dist: clean sed -i "s/#define JSHONVER .*/#define JSHONVER ${VERSION}/" jshon.c

1 0

commit ghc-turtle for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package ghc-turtle for openSUSE:Factory checked in at 2019-05-05 21:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-turtle (Old) and /work/SRC/openSUSE:Factory/.ghc-turtle.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-turtle" Sun May 5 21:21:49 2019 rev:5 rq:700478 version:1.5.14 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-turtle/ghc-turtle.changes 2019-04-28 20:14:02.106396789 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-turtle.new.5148/ghc-turtle.changes 2019-05-05 21:21:50.573346414 +0200 @@ -1,0 +2,5 @@ +Fri May 3 19:02:57 UTC 2019 - Peter Simons <psimons(a)suse.com> + +- Update Cabal build instructions for more accurate dependencies. + +------------------------------------------------------------------- New: ---- turtle.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-turtle.spec ++++++ --- /var/tmp/diff_new_pack.2nwk8W/_old 2019-05-05 21:21:51.753349628 +0200 +++ /var/tmp/diff_new_pack.2nwk8W/_new 2019-05-05 21:21:51.785349715 +0200 @@ -26,6 +26,7 @@ Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-wl-pprint-devel BuildRequires: ghc-async-devel @@ -98,6 +99,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ turtle.cabal ++++++ Name: turtle Version: 1.5.14 x-revision: 1 Cabal-Version: >=1.10 Build-Type: Simple License: BSD3 License-File: LICENSE Copyright: 2015 Gabriel Gonzalez Author: Gabriel Gonzalez Maintainer: Gabriel439(a)gmail.com Tested-With: GHC == 7.10.2, GHC == 8.0.1 Bug-Reports: https://github.com/Gabriel439/Haskell-Turtle-Library/issues Synopsis: Shell programming, Haskell-style Description: @turtle@ is a reimplementation of the Unix command line environment in Haskell so that you can use Haskell as both a shell and a scripting language. . Features include: . * Batteries included: Command an extended suite of predefined utilities . * Interoperability: You can still run external shell commands . * Portability: Works on Windows, OS X, and Linux . * Exception safety: Safely acquire and release resources . * Streaming: Transform or fold command output in constant space . * Patterns: Use typed regular expressions that can parse structured values . * Formatting: Type-safe @printf@-style text formatting . * Modern: Supports @text@ and @system-filepath@ . Read "Turtle.Tutorial" for a detailed tutorial or "Turtle.Prelude" for a quick-start guide . @turtle@ is designed to be beginner-friendly, but as a result lacks certain features, like tracing commands. If you feel comfortable using @turtle@ then you should also check out the @Shelly@ library which provides similar functionality. Category: System Extra-Source-Files: CHANGELOG.md Source-Repository head Type: git Location: https://github.com/Gabriel439/Haskell-Turtle-Library Library HS-Source-Dirs: src Build-Depends: base >= 4.6 && < 5 , ansi-wl-pprint >= 0.6 && < 0.7 , async >= 2.0.0.0 && < 2.3 , bytestring >= 0.9.1.8 && < 0.11, clock >= 0.4.1.2 && < 0.9 , containers >= 0.5.0.0 && < 0.7 , directory >= 1.0.7 && < 1.4 , exceptions >= 0.4 && < 0.11, foldl >= 1.1 && < 1.5 , hostname < 1.1 , managed >= 1.0.3 && < 1.1 , process >= 1.0.1.1 && < 1.7 , semigroups >= 0.5.0 && < 0.19, system-filepath >= 0.3.1 && < 0.5 , system-fileio >= 0.2.1 && < 0.4 , stm < 2.6 , temporary < 1.4 , text < 1.3 , time < 1.9 , transformers >= 0.2.0.0 && < 0.6 , optparse-applicative >= 0.13 && < 0.15, optional-args >= 1.0 && < 2.0 , unix-compat >= 0.4 && < 0.6 if os(windows) Build-Depends: Win32 >= 2.2.0.1 && < 2.9 else Build-Depends: unix >= 2.5.1.0 && < 2.8 Exposed-Modules: Turtle, Turtle.Bytes, Turtle.Format, Turtle.Pattern, Turtle.Shell, Turtle.Options, Turtle.Line, Turtle.Prelude, Turtle.Tutorial Other-Modules: Turtle.Internal GHC-Options: -Wall Default-Language: Haskell2010 test-suite tests Type: exitcode-stdio-1.0 HS-Source-Dirs: test Main-Is: Main.hs GHC-Options: -Wall Default-Language: Haskell2010 Build-Depends: base >= 4 && < 5 , doctest >= 0.7 && < 0.17 test-suite regression-broken-pipe Type: exitcode-stdio-1.0 HS-Source-Dirs: test Main-Is: RegressionBrokenPipe.hs GHC-Options: -Wall -threaded Default-Language: Haskell2010 Build-Depends: base >= 4 && < 5, turtle test-suite regression-masking-exception Type: exitcode-stdio-1.0 HS-Source-Dirs: test Main-Is: RegressionMaskingException.hs GHC-Options: -Wall -threaded Default-Language: Haskell2010 Build-Depends: base >= 4 && < 5, turtle test-suite cptree Type: exitcode-stdio-1.0 HS-Source-Dirs: test Main-Is: cptree.hs GHC-Options: -Wall -threaded Default-Language: Haskell2010 Build-Depends: base >= 4 && < 5, temporary, system-filepath >= 0.4, turtle benchmark bench Type: exitcode-stdio-1.0 HS-Source-Dirs: bench Main-Is: Main.hs GHC-Options: -O2 -Wall -threaded Default-Language: Haskell2010 Build-Depends: base >= 4 && < 5 , text < 1.3, turtle if impl(ghc < 7.8) Build-Depends: criterion >= 0.4 && < 1.1.4.0 else Build-Depends: criterion >= 0.4 && < 1.6

1 0

commit ghc-microlens-th for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package ghc-microlens-th for openSUSE:Factory checked in at 2019-05-05 21:21:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-microlens-th (Old) and /work/SRC/openSUSE:Factory/.ghc-microlens-th.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-microlens-th" Sun May 5 21:21:45 2019 rev:9 rq:700477 version:0.4.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-microlens-th/ghc-microlens-th.changes 2018-10-25 08:17:55.872029035 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-microlens-th.new.5148/ghc-microlens-th.changes 2019-05-05 21:21:48.073339603 +0200 @@ -1,0 +2,5 @@ +Fri May 3 19:00:05 UTC 2019 - Peter Simons <psimons(a)suse.com> + +- Update Cabal build instructions for more accurate dependencies. + +------------------------------------------------------------------- New: ---- microlens-th.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-microlens-th.spec ++++++ --- /var/tmp/diff_new_pack.Ywy89B/_old 2019-05-05 21:21:49.429343297 +0200 +++ /var/tmp/diff_new_pack.Ywy89B/_new 2019-05-05 21:21:49.461343384 +0200 @@ -26,6 +26,7 @@ Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-microlens-devel @@ -57,6 +58,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ microlens-th.cabal ++++++ name: microlens-th version: 0.4.2.3 x-revision: 1 synopsis: Automatic generation of record lenses for microlens description: This package lets you automatically generate lenses for data types; code was extracted from the lens package, and therefore generated lenses are fully compatible with ones generated by lens (and can be used both from lens and microlens). . This package is a part of the <http://hackage.haskell.org/package/microlens microlens> family; see the readme <https://github.com/aelve/microlens#readme on Github>. license: BSD3 license-file: LICENSE author: Eric Mertens, Edward Kmett, Artyom maintainer: Artyom <yom(a)artyom.me> homepage: http://github.com/aelve/microlens bug-reports: http://github.com/aelve/microlens/issues category: Data, Lenses build-type: Simple extra-source-files: CHANGELOG.md cabal-version: >=1.10 source-repository head type: git location: git://github.com/aelve/microlens.git flag inlining description: Generate inline pragmas manual: True default: True library exposed-modules: Lens.Micro.TH -- other-modules: -- other-extensions: build-depends: base >=4.5 && <5 , microlens >=0.4.0 && <0.5 , containers >=0.4.0 && <0.7 , transformers -- lens has >=2.4, but GHC 7.4 shipped with 2.7 , template-haskell >=2.7 && <2.15 , th-abstraction >=0.2.1 && <0.4 if flag(inlining) cpp-options: -DINLINING ghc-options: -Wall -fwarn-tabs -O2 -fdicts-cheap -funbox-strict-fields -fmax-simplifier-iterations=10 hs-source-dirs: src default-language: Haskell2010 test-suite templates type: exitcode-stdio-1.0 main-is: templates.hs other-modules: T799 ghc-options: -Wall -threaded hs-source-dirs: test build-depends: base, microlens, microlens-th default-language: Haskell2010

1 0

commit rabbitmq-server for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package rabbitmq-server for openSUSE:Factory checked in at 2019-05-05 21:21:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rabbitmq-server (Old) and /work/SRC/openSUSE:Factory/.rabbitmq-server.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rabbitmq-server" Sun May 5 21:21:42 2019 rev:45 rq:700431 version:3.7.14 Changes: -------- --- /work/SRC/openSUSE:Factory/rabbitmq-server/rabbitmq-server.changes 2019-04-05 12:02:39.146570038 +0200 +++ /work/SRC/openSUSE:Factory/.rabbitmq-server.new.5148/rabbitmq-server.changes 2019-05-05 21:21:43.573327344 +0200 @@ -1,0 +2,5 @@ +Fri Apr 26 10:51:36 UTC 2019 - mvetter(a)suse.com + +- bsc#1130588: Require shadow instead of old pwdutils + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rabbitmq-server.spec ++++++ --- /var/tmp/diff_new_pack.zdweSA/_old 2019-05-05 21:21:45.541332705 +0200 +++ /var/tmp/diff_new_pack.zdweSA/_new 2019-05-05 21:21:45.573332792 +0200 @@ -73,7 +73,7 @@ Requires: logrotate Provides: AMQP-server BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(pre): pwdutils +Requires(pre): shadow Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq %if 0%{?suse_version} > 1140

1 0

commit opi for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package opi for openSUSE:Factory checked in at 2019-05-05 21:21:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opi (Old) and /work/SRC/openSUSE:Factory/.opi.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opi" Sun May 5 21:21:22 2019 rev:2 rq:700365 version:0.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/opi/opi.changes 2019-04-30 13:06:43.741553098 +0200 +++ /work/SRC/openSUSE:Factory/.opi.new.5148/opi.changes 2019-05-05 21:21:27.637283931 +0200 @@ -1,0 +2,9 @@ +Fri May 3 11:10:35 UTC 2019 - Yunhe Guo <i(a)guoyunhe.me> + +- Version 0.2.0 + * Added + - Install Packman Codecs with `opi packman` or `opi codecs` + - Install Skype with `opi skype` + - Install VS Code with `opi vs code` + +------------------------------------------------------------------- Old: ---- opi-0.1.2.tar.gz New: ---- opi-0.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opi.spec ++++++ --- /var/tmp/diff_new_pack.B3hqk9/_old 2019-05-05 21:21:28.205285478 +0200 +++ /var/tmp/diff_new_pack.B3hqk9/_new 2019-05-05 21:21:28.205285478 +0200 @@ -17,7 +17,7 @@ Name: opi -Version: 0.1.2 +Version: 0.2.0 Release: 0 Summary: OBS Package Installer (CLI) License: GPL-3.0 ++++++ opi-0.1.2.tar.gz -> opi-0.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.1.2/CHANGELOG.md new/opi-0.2.0/CHANGELOG.md --- old/opi-0.1.2/CHANGELOG.md 2019-04-29 20:35:48.000000000 +0200 +++ new/opi-0.2.0/CHANGELOG.md 2019-05-03 13:08:23.000000000 +0200 @@ -7,6 +7,14 @@ ## [Unreleased] +## [0.2.0] + +### Added + +- Install Packman Codecs with `opi packman` or `opi codecs` [#6](https://github.com/openSUSE-zh/opi/issues/6) +- Install Skype with `opi skype` [#6](https://github.com/openSUSE-zh/opi/issues/6) +- Install VS Code with `opi vs code` [#6](https://github.com/openSUSE-zh/opi/issues/6) + ## [0.1.2] ### Fixed @@ -30,7 +38,8 @@ - Choose package and install - Keep or remove repository after installation -[Unreleased]: https://github.com/openSUSE-zh/opi/compare/v0.1.2...HEAD +[Unreleased]: https://github.com/openSUSE-zh/opi/compare/v0.2.0...HEAD +[0.1.2]: https://github.com/openSUSE-zh/opi/compare/v0.1.2...v0.2.0 [0.1.2]: https://github.com/openSUSE-zh/opi/compare/v0.1.1...v0.1.2 [0.1.1]: https://github.com/openSUSE-zh/opi/compare/v0.1.0...v0.1.1 [0.1.0]: https://github.com/openSUSE-zh/opi/releases/tag/v0.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.1.2/README.md new/opi-0.2.0/README.md --- old/opi-0.1.2/README.md 2019-04-29 20:35:48.000000000 +0200 +++ new/opi-0.2.0/README.md 2019-05-03 13:08:23.000000000 +0200 @@ -30,3 +30,27 @@ Output: ![Screenshot](screenshot.png) + +### Packages from Other Repositories + +**Packman Codecs** (enable you to play MP4 videos and YouTube) + +``` +opi packman + +# or + +opi codecs +``` + +**Skype** + +``` +opi skype +``` + +**Visual Studio Code** + +``` +opi vs code +``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.1.2/opi new/opi-0.2.0/opi --- old/opi-0.1.2/opi 2019-04-29 20:35:48.000000000 +0200 +++ new/opi-0.2.0/opi 2019-05-03 13:08:23.000000000 +0200 @@ -6,9 +6,6 @@ # Author: Guo Yunhe # Website: https://github.com/openSUSE-zh/opi # License: GPL-3.0 -# -# Created at: 2019-04-25 -# Updated at: 2019-04-29 use strict; use warnings; @@ -17,6 +14,7 @@ use URI::Escape; use Config; use Config::Tiny; +use File::Temp qw/ tempfile tempdir /; use Term::ANSIColor; @@ -29,6 +27,29 @@ exit 1; } +# +# Check for packages not from OBS +# +my $serialized_query = lc(join('', @ARGV)); + +# Check Packman Codecs +if ( $serialized_query =~ m/(packman|codec)/ ) { + install_packman_codecs(); + exit; +} + +# Check VS Code +if ( $serialized_query =~ m/(visualstudiocode|vscode|vsc)/ ) { + install_vs_code(); + exit; +} + +# Check Skype +if ($serialized_query =~ m/skype/ ) { + install_skype(); + exit; +} + # # API configuration @@ -242,7 +263,7 @@ } else { if ($resp->code == 413) { - print "Please use different search keywords. Some short keywords cause OBS timeout."; + print "Please use different search keywords. Some short keywords cause OBS timeout.\n"; } else { print "Network error. Please try later. (Error message: ", $resp->message, ")\n"; } @@ -318,6 +339,34 @@ return @filtered_binary_list; } + +sub ask_yes_or_no { + print $_[0]; + + if (lc($_[1]) eq 'y') { + print '(Y/n) '; + } else { + print '(y/N) '; + } + + my $yes_no = <STDIN>; + chomp $yes_no; + $yes_no = lc(substr($yes_no, 0, 1)); + + if (lc($_[1]) eq 'y') { + return $yes_no ne 'n'; + } else { + return $yes_no eq 'y'; + } +} + +sub ask_keep_repo { + my $repo = $_[0]; + unless ( ask_yes_or_no("Do you want to keep these repositories? ", 'y') ) { + system "sudo zypper removerepo $repo"; + } +} + sub install_binary { my $binary = $_[0]; my $name = $binary->{name}; @@ -339,12 +388,80 @@ $project =~ s/:/_/ig; system "sudo zypper install $install_options --repo $project $name.$arch"; - print "Do you want to keep these repositories(Y/n)? "; - my $yes_no = <STDIN>; - chomp $yes_no; - $yes_no = lc(substr($yes_no, 0, 1)); - if ($yes_no eq 'n') { - system "sudo zypper removerepo $project"; - } + ask_keep_repo( $project ); } } + +sub install_packman_codecs { + unless ( ask_yes_or_no("Do you want install codecs from Packman reposiroty? ", 'y') ) { + return; + } + + add_packman_essentials_repo(); + + install_packman_essentials_packages( + 'ffmpeg', + 'gstreamer-plugins-bad', + 'gstreamer-plugins-libav', + 'gstreamer-plugins-ugly', + 'libavcodec58', + 'libavdevice58', + 'libavfilter7', + 'libavformat58', + 'libavresample4', + 'libavutil56', + 'vlc-codecs', + ); + + exit; +} + +sub add_packman_essentials_repo { + + my $prefix = get_distribution(); + $prefix =~ s/:/_/ig; + + if ($prefix eq 'openSUSE_Factory') { + $prefix = 'openSUSE_Tumbleweed'; + } + + system "sudo zypper addrepo --refresh --priority 90 https://ftp.gwdg.de/pub/linux/misc/packman/suse/$prefix/Essentials/packman-…"; + system "sudo zypper refresh"; + system "sudo zypper dist-upgrade --from packman-essentials --allow-downgrade --allow-vendor-change"; +} + +sub install_packman_essentials_packages { + my $packages = join ' ', @_; + system "sudo zypper install --repo packman-essentials $packages"; +} + +sub install_vs_code { + unless ( ask_yes_or_no("Do you want install VS Code from Microsoft reposiroty? ", 'y') ) { + return; + } + + my $tmp_fh = new File::Temp( UNLINK => 1 ); + print $tmp_fh "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\nty…"; + system "sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc"; + system "sudo mv $tmp_fh /etc/zypp/repos.d/vscode.repo"; + system "sudo zypper refresh"; + system "sudo zypper install code"; + + ask_keep_repo( 'code' ); + + exit; +} + +sub install_skype { + unless ( ask_yes_or_no("Do you want install Skype from Microsoft reposiroty? ", 'y') ) { + return; + } + + system "sudo zypper addrepo --refresh https://repo.skype.com/rpm/stable/skype-stable.repo"; + system "sudo zypper refresh"; + system "sudo zypper install skypeforlinux"; + + ask_keep_repo( 'skype-stable' ); + + exit; +}

1 0

commit supertuxkart for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package supertuxkart for openSUSE:Factory checked in at 2019-05-05 21:20:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supertuxkart (Old) and /work/SRC/openSUSE:Factory/.supertuxkart.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "supertuxkart" Sun May 5 21:20:57 2019 rev:18 rq:700192 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/supertuxkart/supertuxkart.changes 2019-01-10 15:23:00.830350772 +0100 +++ /work/SRC/openSUSE:Factory/.supertuxkart.new.5148/supertuxkart.changes 2019-05-05 21:21:19.397261483 +0200 @@ -1,0 +2,17 @@ +Sun Apr 28 18:20:39 UTC 2019 - Andrey Karepin <egdfree(a)opensuse.org> + +- Update to version 1.0: + + Networking support for normal race, time trial, free for all, + capture the flag and soccer. + + Spectating option for players having entered a server while a + race or game is underway. + + New game mode Capture the Flag. + + New game mode Free for All. + + Improved powerup and nitro handling in AI. + + Race UI improvements (new speedometer, nitro gauge, bigger + minimap, minimap display options, more legible text with + outlines and for some bigger font). +- Add wiiuse-devel BuildReqires. +- Drop supertuxkart-mesa-18.3.patch: merged upstream. + +------------------------------------------------------------------- Old: ---- supertuxkart-0.9.3-src.tar.xz supertuxkart-mesa-18.3.patch New: ---- supertuxkart-1.0-src.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supertuxkart.spec ++++++ --- /var/tmp/diff_new_pack.YWitRW/_old 2019-05-05 21:21:27.261282906 +0200 +++ /var/tmp/diff_new_pack.YWitRW/_new 2019-05-05 21:21:27.261282906 +0200 @@ -16,19 +16,18 @@ # +# Name: supertuxkart -Version: 0.9.3 +Version: 1.0 Release: 0 Summary: A 3D kart racing game License: GPL-2.0-or-later AND GPL-3.0-or-later AND CC-BY-SA-3.0 Group: Amusements/Games/3D/Race URL: http://supertuxkart.sourceforge.net/ -Source: http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.3/%{nam… +Source: https://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/1.0/sup… # Geeko kart add-on (CC-BY 3.0) Source1: http://stkaddons.net/dl/14e6ba25b17f0d.zip Source9: supertuxkart.6 -# PATCH-FIX-UPSTREAM supertuxkart-mesa-18.3.patch boo#1120986 dimstar(a)opensuse.org - Fix build against Mesa 18.3 -Patch0: supertuxkart-mesa-18.3.patch BuildRequires: cmake >= 3 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -38,14 +37,18 @@ BuildRequires: pkgconfig BuildRequires: unzip BuildRequires: update-desktop-files +BuildRequires: wiiuse-devel BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fribidi) BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libenet) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(xrandr) Requires: %{name}-data = %{version} @@ -77,9 +80,9 @@ %prep %setup -q -%patch0 -p1 find -name '*~' -delete -print -find -name '.git*' -delete -print +find -name '.git*' -type f -delete -print +rm -rfv ./.github %build mkdir build && cd build @@ -90,6 +93,7 @@ -DCMAKE_CXX_FLAGS="%{optflags} -fno-strict-aliasing" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DBUILD_RECORDER=0 \ + -DUSE_SYSTEM_WIIUSE:BOOL=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo make V=1 %{?_smp_mflags} @@ -120,8 +124,8 @@ %doc README.md CHANGELOG.md %{_bindir}/supertuxkart %{_mandir}/man?/%{name}.?.* -%dir %{_datadir}/appdata -%{_datadir}/appdata/supertuxkart.appdata.xml +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/supertuxkart.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/supertuxkart.png %{_datadir}/icons/hicolor/ ++++++ supertuxkart-0.9.3-src.tar.xz -> supertuxkart-1.0-src.tar.xz ++++++ /work/SRC/openSUSE:Factory/supertuxkart/supertuxkart-0.9.3-src.tar.xz /work/SRC/openSUSE:Factory/.supertuxkart.new.5148/supertuxkart-1.0-src.tar.xz differ: char 25, line 1

1 0

commit python-cffi for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-cffi for openSUSE:Factory checked in at 2019-05-05 21:19:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cffi (Old) and /work/SRC/openSUSE:Factory/.python-cffi.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cffi" Sun May 5 21:19:35 2019 rev:27 rq:700339 version:1.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cffi/python-cffi.changes 2019-03-12 09:44:58.843731465 +0100 +++ /work/SRC/openSUSE:Factory/.python-cffi.new.5148/python-cffi.changes 2019-05-05 21:19:36.492981151 +0200 @@ -1,0 +2,8 @@ +Tue Apr 30 19:42:59 UTC 2019 - Todd R <toddrme2178(a)gmail.com> + +- Update to 1.12.3 + * Fix for nested struct types that end in a var-sized array (#405). + * Add support for using U and L characters at the end of integer constants in ffi.cdef() (thanks Guillaume). + * More 3.8 fixes. + +------------------------------------------------------------------- Old: ---- cffi-1.12.2.tar.gz New: ---- cffi-1.12.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cffi.spec ++++++ --- /var/tmp/diff_new_pack.j95Ey7/_old 2019-05-05 21:19:36.944982382 +0200 +++ /var/tmp/diff_new_pack.j95Ey7/_new 2019-05-05 21:19:36.948982393 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-cffi -Version: 1.12.2 +Version: 1.12.3 Release: 0 Summary: Foreign Function Interface for Python calling C code License: MIT ++++++ cffi-1.12.2.tar.gz -> cffi-1.12.3.tar.gz ++++++ ++++ 2251 lines of diff (skipped)

1 0

commit python-Jinja2 for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-Jinja2 for openSUSE:Factory checked in at 2019-05-05 21:19:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Jinja2 (Old) and /work/SRC/openSUSE:Factory/.python-Jinja2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Jinja2" Sun May 5 21:19:27 2019 rev:35 rq:699516 version:2.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Jinja2/python-Jinja2.changes 2019-04-19 18:36:58.195077021 +0200 +++ /work/SRC/openSUSE:Factory/.python-Jinja2.new.5148/python-Jinja2.changes 2019-05-05 21:19:29.232961373 +0200 @@ -9 +9 @@ -- update to version 2.10.1 (bsc#1132323, CVE-2019-10906): +- update to version 2.10.1 (bsc#1132323, CVE-2019-10906, bsc#1125815, CVE-2019-8341): @@ -103 +103 @@ -- Update to 2.9.5 +- Update to 2.9.5 (bsc#1132174, CVE-2016-10745) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit python-cmd2 for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-cmd2 for openSUSE:Factory checked in at 2019-05-05 21:19:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cmd2 (Old) and /work/SRC/openSUSE:Factory/.python-cmd2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cmd2" Sun May 5 21:19:18 2019 rev:25 rq:699499 version:0.9.12 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cmd2/python-cmd2.changes 2019-04-12 09:10:54.581579513 +0200 +++ /work/SRC/openSUSE:Factory/.python-cmd2.new.5148/python-cmd2.changes 2019-05-05 21:19:21.680940800 +0200 @@ -1,0 +2,52 @@ +Mon Apr 29 21:16:21 CEST 2019 - Matej Cepl <mcepl(a)suse.com> + +- fix previous commit +- Update to 0.9.12: + - Bug Fixes + - Fixed a bug in how redirection and piping worked inside + py or pyscript commands + - Fixed bug in async_alert where it didn't account for + prompts that contained newline characters + - Fixed path completion case when CWD is just a slash. + Relative path matches were incorrectly prepended with + a slash. + - Enhancements + - Added ability to include command name placeholders in + the message printed when trying to run a disabled + command. + - Added instance attributes to customize error messages + without having to override methods. Theses messages can + also be colored. + - The with_argparser decorators now add the Statement + object created when parsing the command line to the + argparse.Namespace object they pass to the do_* + methods. It is stored in an attribute called + __statement__. + - This can be useful if a command function needs to know + the command line for things like logging. + - Added a -t option to the load command for automatically + generating a transcript based on a script file + - When in a pyscript, the stdout and stderr streams of + shell commands and processes being piped to are now + captured and included in the CommandResult structure. + - Potentially breaking changes + - The following commands now write to stderr instead of + stdout when printing an error. This will make catching + errors easier in pyscript. + - Removed *** from beginning of error messages printed by + do_help() and default() + - Significantly refactored cmd.Cmd class so that all + class attributes got converted to instance attributes, + also: self.pipe_proc is now called + self.cur_pipe_proc_reader and is a ProcReader class. + - Shell commands and commands being piped to while in + a pyscript will function as if their output is going to + a pipe and not a tty. This was necessary to be able to + capture their output. + +------------------------------------------------------------------- +Mon Apr 15 06:38:20 UTC 2019 - Dirk Mueller <dmueller(a)suse.com> + +- fix build for SLE12 and older + +------------------------------------------------------------------- Old: ---- cmd2-0.9.11.tar.gz New: ---- cmd2-0.9.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cmd2.spec ++++++ --- /var/tmp/diff_new_pack.ILO27z/_old 2019-05-05 21:19:22.948944254 +0200 +++ /var/tmp/diff_new_pack.ILO27z/_new 2019-05-05 21:19:22.984944352 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-cmd2 -Version: 0.9.11 +Version: 0.9.12 Release: 0 Summary: Extra features for standard library's cmd module License: MIT @@ -50,7 +50,7 @@ BuildRequires: %{python_module wcwidth} # Required by tests. BuildRequires: vim -%if 0%{?sle_version} < 150000 && 0%{?is_opensuse} +%if 0%{?suse_version} <= 1315 BuildRequires: %{python_module contextlib2} BuildRequires: %{python_module typing} %endif @@ -96,6 +96,6 @@ %files %{python_files} %license LICENSE %doc CHANGELOG.md CODEOWNERS README.md -%{python_sitelib}/* +%{python3_sitelib}/* %changelog ++++++ cmd2-0.9.11.tar.gz -> cmd2-0.9.12.tar.gz ++++++ ++++ 5732 lines of diff (skipped)

1 0

commit dav1d for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package dav1d for openSUSE:Factory checked in at 2019-05-05 21:19:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dav1d (Old) and /work/SRC/openSUSE:Factory/.dav1d.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dav1d" Sun May 5 21:19:10 2019 rev:6 rq:699483 version:0.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/dav1d/dav1d.changes 2019-04-21 09:03:02.194526648 +0200 +++ /work/SRC/openSUSE:Factory/.dav1d.new.5148/dav1d.changes 2019-05-05 21:19:11.652913482 +0200 @@ -1,0 +2,7 @@ +Mon Apr 29 18:07:47 UTC 2019 - Luigi Baldoni <aloisio(a)gmx.com> + +- Update to version 0.3.0 + * Fixes an annoying crash on SSSE3 that happened in the itx + functions + +------------------------------------------------------------------- Old: ---- dav1d-0.2.2.tar.gz New: ---- dav1d-0.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dav1d.spec ++++++ --- /var/tmp/diff_new_pack.Fj5mQ8/_old 2019-05-05 21:19:12.140914811 +0200 +++ /var/tmp/diff_new_pack.Fj5mQ8/_new 2019-05-05 21:19:12.140914811 +0200 @@ -18,7 +18,7 @@ %define sover 1 Name: dav1d -Version: 0.2.2 +Version: 0.3.0 Release: 0 Summary: An AV1 decoder License: BSD-2-Clause ++++++ dav1d-0.2.2.tar.gz -> dav1d-0.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dav1d-0.2.2/.gitlab-ci.yml new/dav1d-0.3.0/.gitlab-ci.yml --- old/dav1d-0.2.2/.gitlab-ci.yml 2019-04-19 09:16:39.000000000 +0200 +++ new/dav1d-0.3.0/.gitlab-ci.yml 2019-04-29 19:04:48.000000000 +0200 @@ -270,6 +270,26 @@ - cd build && time meson test -v dependencies: [] +test-debian-unaligned-stack: + image: registry.videolan.org:5000/dav1d-debian-unstable:20190215130514 + stage: test + tags: + - debian + - amd64 + cache: + key: testdata.git-20190215 + paths: + - cache/dav1d-test-data.git/ + script: + - test -d cache || mkdir cache + - test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master + - test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git + - git clone cache/dav1d-test-data.git tests/dav1d-test-data + - meson build --buildtype release -Dtestdata_tests=true -Dlogging=false -Dstack_alignment=16 + - ninja -C build + - cd build && time meson test -v + dependencies: [] + test-debian-asan: image: registry.videolan.org:5000/dav1d-debian-unstable:20190215130514 stage: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dav1d-0.2.2/NEWS new/dav1d-0.3.0/NEWS --- old/dav1d-0.2.2/NEWS 2019-04-19 09:16:39.000000000 +0200 +++ new/dav1d-0.3.0/NEWS 2019-04-29 19:04:48.000000000 +0200 @@ -1,5 +1,13 @@ -Changes for 0.2.2 'Antelope': ----------------------------- +Changes for 0.3.0 'Sailfish': +------------------------------ + +This is the final release for the numerous speed improvements of 0.3.0-rc. +It mostly: + - Fixes an annoying crash on SSSE3 that happened in the itx functions + + +Changes for 0.2.2 (0.3.0-rc) 'Antelope': +----------------------------- - Large improvement on MSAC decoding with SSE, bringing 4-6% speed increase The impact is important on SSSE3, SSE4 and AVX-2 cpus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dav1d-0.2.2/meson.build new/dav1d-0.3.0/meson.build --- old/dav1d-0.2.2/meson.build 2019-04-19 09:16:39.000000000 +0200 +++ new/dav1d-0.3.0/meson.build 2019-04-29 19:04:48.000000000 +0200 @@ -23,7 +23,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. project('dav1d', ['c'], - version: '0.2.2', + version: '0.3.0', default_options: ['c_std=c99', 'warning_level=2', 'buildtype=release', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dav1d-0.2.2/src/x86/itx_ssse3.asm new/dav1d-0.3.0/src/x86/itx_ssse3.asm --- old/dav1d-0.2.2/src/x86/itx_ssse3.asm 2019-04-19 09:16:39.000000000 +0200 +++ new/dav1d-0.3.0/src/x86/itx_ssse3.asm 2019-04-29 19:04:48.000000000 +0200 @@ -5130,7 +5130,7 @@ ret -cglobal inv_txfm_add_identity_identity_32x32, 4, 6, 8, 16*4, dst, stride, coeff, eob, tx2 +cglobal inv_txfm_add_identity_identity_32x32, 4, 6, 8, 16*5, dst, stride, coeff, eob, tx2 %undef cmp mov r4, 2

1 0

commit python-PyICU for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-PyICU for openSUSE:Factory checked in at 2019-05-05 21:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyICU (Old) and /work/SRC/openSUSE:Factory/.python-PyICU.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyICU" Sun May 5 21:19:03 2019 rev:5 rq:699375 version:2.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyICU/python-PyICU.changes 2019-04-04 12:02:06.449347693 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyICU.new.5148/python-PyICU.changes 2019-05-05 21:19:04.852894957 +0200 @@ -1,0 +2,6 @@ +Mon Apr 29 08:05:27 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com> + +- Update to 2.3.1: + * fixed build error with ICU 61, ICU 62 + +------------------------------------------------------------------- Old: ---- PyICU-2.3.tar.gz New: ---- PyICU-2.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyICU.spec ++++++ --- /var/tmp/diff_new_pack.tQpPCz/_old 2019-05-05 21:19:05.288896145 +0200 +++ /var/tmp/diff_new_pack.tQpPCz/_new 2019-05-05 21:19:05.288896145 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global modname PyICU Name: python-%{modname} -Version: 2.3 +Version: 2.3.1 Release: 0 Summary: Python Extension Wrapping the ICU C++ API License: MIT ++++++ PyICU-2.3.tar.gz -> PyICU-2.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyICU-2.3/CHANGES new/PyICU-2.3.1/CHANGES --- old/PyICU-2.3/CHANGES 2019-03-28 10:19:48.000000000 +0100 +++ new/PyICU-2.3.1/CHANGES 2019-04-28 01:05:42.000000000 +0200 @@ -1,3 +1,7 @@ +Version 2.3 -> 2.3.1 +-------------------- + - fixed build error with ICU 61, ICU 62 + Version 2.2 -> 2.3 ------------------ - added support for also trying pkg-config for build configuration (Linux) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyICU-2.3/PKG-INFO new/PyICU-2.3.1/PKG-INFO --- old/PyICU-2.3/PKG-INFO 2019-03-28 20:19:39.000000000 +0100 +++ new/PyICU-2.3.1/PKG-INFO 2019-04-28 01:09:53.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: PyICU -Version: 2.3 +Version: 2.3.1 Summary: Python extension wrapping the ICU C++ API Home-page: https://github.com/ovalhub/pyicu Author: Andi Vajda diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyICU-2.3/PyICU.egg-info/PKG-INFO new/PyICU-2.3.1/PyICU.egg-info/PKG-INFO --- old/PyICU-2.3/PyICU.egg-info/PKG-INFO 2019-03-28 20:19:38.000000000 +0100 +++ new/PyICU-2.3.1/PyICU.egg-info/PKG-INFO 2019-04-28 01:09:52.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: PyICU -Version: 2.3 +Version: 2.3.1 Summary: Python extension wrapping the ICU C++ API Home-page: https://github.com/ovalhub/pyicu Author: Andi Vajda diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyICU-2.3/numberformat.cpp new/PyICU-2.3.1/numberformat.cpp --- old/PyICU-2.3/numberformat.cpp 2019-03-16 10:58:30.000000000 +0100 +++ new/PyICU-2.3.1/numberformat.cpp 2019-04-27 21:31:37.000000000 +0200 @@ -51,6 +51,9 @@ #endif #if U_ICU_VERSION_HEX >= VERSION_HEX(61, 0, 0) +#if U_ICU_VERSION_HEX < VERSION_HEX(63, 0, 0) + using UNumberGroupingStrategy = UGroupingStrategy; +#endif DECLARE_CONSTANTS_TYPE(UNumberGroupingStrategy); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyICU-2.3/setup.py new/PyICU-2.3.1/setup.py --- old/PyICU-2.3/setup.py 2019-03-28 09:57:57.000000000 +0100 +++ new/PyICU-2.3.1/setup.py 2019-04-28 01:07:48.000000000 +0200 @@ -8,7 +8,7 @@ from distutils.spawn import find_executable -VERSION = '2.3' +VERSION = '2.3.1' try: from subprocess import check_output as subprocess_check_output

1 0

commit python-Mako for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-Mako for openSUSE:Factory checked in at 2019-05-05 21:18:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Mako (Old) and /work/SRC/openSUSE:Factory/.python-Mako.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Mako" Sun May 5 21:18:55 2019 rev:33 rq:699371 version:1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Mako/python-Mako.changes 2019-03-29 20:36:34.114588533 +0100 +++ /work/SRC/openSUSE:Factory/.python-Mako.new.5148/python-Mako.changes 2019-05-05 21:18:58.672878121 +0200 @@ -1,0 +2,6 @@ +Mon Apr 29 08:01:43 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com> + +- Update to 1.0.9: + * Fixed an element in the AST Python generator which changed for Python 3.8 + +------------------------------------------------------------------- Old: ---- Mako-1.0.8.tar.gz New: ---- Mako-1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Mako.spec ++++++ --- /var/tmp/diff_new_pack.9DmJGM/_old 2019-05-05 21:18:59.132879374 +0200 +++ /var/tmp/diff_new_pack.9DmJGM/_new 2019-05-05 21:18:59.136879385 +0200 @@ -19,7 +19,7 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Mako -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: A Python templating language License: MIT ++++++ Mako-1.0.8.tar.gz -> Mako-1.0.9.tar.gz ++++++ ++++ 5611 lines of diff (skipped)

1 0

commit python-Genshi for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-Genshi for openSUSE:Factory checked in at 2019-05-05 21:18:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Genshi (Old) and /work/SRC/openSUSE:Factory/.python-Genshi.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Genshi" Sun May 5 21:18:47 2019 rev:16 rq:699370 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Genshi/python-Genshi.changes 2019-03-08 13:28:28.698992983 +0100 +++ /work/SRC/openSUSE:Factory/.python-Genshi.new.5148/python-Genshi.changes 2019-05-05 21:18:48.840851337 +0200 @@ -1,0 +2,6 @@ +Mon Apr 29 07:58:50 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com> + +- Update to 0.7.2: + * Add support for Python 3.8. + +------------------------------------------------------------------- Old: ---- Genshi-0.7.1.tar.gz New: ---- Genshi-0.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Genshi.spec ++++++ --- /var/tmp/diff_new_pack.nllQ7x/_old 2019-05-05 21:18:50.080854715 +0200 +++ /var/tmp/diff_new_pack.nllQ7x/_new 2019-05-05 21:18:50.108854791 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-Genshi -Version: 0.7.1 +Version: 0.7.2 Release: 0 Summary: A toolkit for generation of output for the web License: BSD-3-Clause ++++++ Genshi-0.7.1.tar.gz -> Genshi-0.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/ChangeLog new/Genshi-0.7.2/ChangeLog --- old/Genshi-0.7.1/ChangeLog 2018-09-01 20:55:02.000000000 +0200 +++ new/Genshi-0.7.2/ChangeLog 2019-04-27 22:26:09.000000000 +0200 @@ -1,5 +1,12 @@ +Version 0.7.2 +https://github.com/edgewall/genshi/releases/tag/0.7.2 +(Apr 27 2019, from branches/stable/0.7.x) + + * Add support for Python 3.8. + + Version 0.7.1 -https://github.com/edgewall/genshi/tags/0.7.1/ +https://github.com/edgewall/genshi/releases/tag/0.7.1 (Sep 1 2018, from branches/stable/0.7.x) * Add support for Python 3.5, 3.6 and 3.7. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/Genshi.egg-info/PKG-INFO new/Genshi-0.7.2/Genshi.egg-info/PKG-INFO --- old/Genshi-0.7.1/Genshi.egg-info/PKG-INFO 2018-09-01 21:09:21.000000000 +0200 +++ new/Genshi-0.7.2/Genshi.egg-info/PKG-INFO 2019-04-27 22:26:38.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: Genshi -Version: 0.7.1 +Version: 0.7.2 Summary: A toolkit for generation of output for the web Home-page: http://genshi.edgewall.org/ Author: Edgewall Software @@ -25,5 +25,5 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: Text Processing :: Markup :: HTML Classifier: Topic :: Text Processing :: Markup :: XML -Provides-Extra: i18n Provides-Extra: plugin +Provides-Extra: i18n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/PKG-INFO new/Genshi-0.7.2/PKG-INFO --- old/Genshi-0.7.1/PKG-INFO 2018-09-01 21:09:21.000000000 +0200 +++ new/Genshi-0.7.2/PKG-INFO 2019-04-27 22:26:39.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: Genshi -Version: 0.7.1 +Version: 0.7.2 Summary: A toolkit for generation of output for the web Home-page: http://genshi.edgewall.org/ Author: Edgewall Software @@ -25,5 +25,5 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: Text Processing :: Markup :: HTML Classifier: Topic :: Text Processing :: Markup :: XML -Provides-Extra: i18n Provides-Extra: plugin +Provides-Extra: i18n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/genshi/__init__.py new/Genshi-0.7.2/genshi/__init__.py --- old/Genshi-0.7.1/genshi/__init__.py 2018-09-01 20:55:02.000000000 +0200 +++ new/Genshi-0.7.2/genshi/__init__.py 2019-04-27 22:26:09.000000000 +0200 @@ -20,7 +20,7 @@ """ __docformat__ = 'restructuredtext en' -__version__ = '0.7.1' +__version__ = '0.7.2' from genshi.core import * from genshi.input import ParseError, XML, HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/genshi/compat.py new/Genshi-0.7.2/genshi/compat.py --- old/Genshi-0.7.1/genshi/compat.py 2018-07-03 17:10:34.000000000 +0200 +++ new/Genshi-0.7.2/genshi/compat.py 2019-04-27 22:26:09.000000000 +0200 @@ -13,6 +13,7 @@ """Various Python version compatibility classes and functions.""" +import _ast import sys from types import CodeType @@ -96,6 +97,18 @@ code.co_varnames, filename, name, lineno, code.co_lnotab, (), ()) + +# In Python 3.8, Str and Ellipsis was replaced by Constant + +try: + _ast_Ellipsis = _ast.Ellipsis + _ast_Str = _ast.Str + _ast_Str_value = lambda obj: obj.s +except AttributeError: + _ast_Ellipsis = _ast_Str = _ast.Constant + _ast_Str_value = lambda obj: obj.value + + # Compatibility fallback implementations for Python < 2.6 try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/genshi/filters/i18n.py new/Genshi-0.7.2/genshi/filters/i18n.py --- old/Genshi-0.7.1/genshi/filters/i18n.py 2018-07-05 17:10:22.000000000 +0200 +++ new/Genshi-0.7.2/genshi/filters/i18n.py 2019-04-27 22:26:09.000000000 +0200 @@ -33,7 +33,7 @@ from genshi.template.base import DirectiveFactory, EXPR, SUB, _apply_directives from genshi.template.directives import Directive, StripDirective from genshi.template.markup import MarkupTemplate, EXEC -from genshi.compat import IS_PYTHON2 +from genshi.compat import IS_PYTHON2, _ast_Str, _ast_Str_value __all__ = ['Translator', 'extract'] __docformat__ = 'restructuredtext en' @@ -1187,10 +1187,11 @@ and node.func.id in gettext_functions: strings = [] def _add(arg): - if isinstance(arg, _ast.Str) and isinstance(arg.s, unicode): - strings.append(arg.s) - elif isinstance(arg, _ast.Str): - strings.append(unicode(arg.s, 'utf-8')) + if isinstance(arg, _ast_Str) \ + and isinstance(_ast_Str_value(arg), unicode): + strings.append(_ast_Str_value(arg)) + elif isinstance(arg, _ast_Str): + strings.append(unicode(_ast_Str_value(arg), 'utf-8')) elif arg: strings.append(None) [_add(arg) for arg in node.args] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/genshi/template/astutil.py new/Genshi-0.7.2/genshi/template/astutil.py --- old/Genshi-0.7.1/genshi/template/astutil.py 2018-07-05 17:10:22.000000000 +0200 +++ new/Genshi-0.7.2/genshi/template/astutil.py 2019-04-27 22:26:09.000000000 +0200 @@ -21,7 +21,7 @@ def parse(source, mode): return compile(source, '', mode, _ast.PyCF_ONLY_AST) -from genshi.compat import IS_PYTHON2, isstring +from genshi.compat import IS_PYTHON2, isstring, _ast_Ellipsis __docformat__ = 'restructuredtext en' @@ -705,6 +705,10 @@ def visit_Str(self, node): self._write(repr(node.s)) + # Constant(object value) + def visit_Constant(self, node): + self._write(repr(node.value)) + if not IS_PYTHON2: # Bytes(bytes s) def visit_Bytes(self, node): @@ -721,7 +725,7 @@ self.visit(node.value) self._write('[') def _process_slice(node): - if isinstance(node, _ast.Ellipsis): + if isinstance(node, _ast_Ellipsis): self._write('...') elif isinstance(node, _ast.Slice): if getattr(node, 'lower', 'None'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/genshi/template/eval.py new/Genshi-0.7.2/genshi/template/eval.py --- old/Genshi-0.7.1/genshi/template/eval.py 2018-07-05 17:10:22.000000000 +0200 +++ new/Genshi-0.7.2/genshi/template/eval.py 2019-04-27 22:26:09.000000000 +0200 @@ -25,7 +25,7 @@ from genshi.util import flatten from genshi.compat import get_code_params, build_code_chunk, isstring, \ - IS_PYTHON2 + IS_PYTHON2, _ast_Str __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup', 'Undefined', 'UndefinedError'] @@ -531,7 +531,7 @@ try: # If the string is ASCII, return a `str` object node.s.decode('ascii') except ValueError: # Otherwise return a `unicode` object - return _new(_ast.Str, node.s.decode('utf-8')) + return _new(_ast_Str, node.s.decode('utf-8')) return node def visit_ClassDef(self, node): @@ -556,7 +556,7 @@ node = _new(_ast.Expr, _new(_ast.Call, _new(_ast.Name, '_star_import_patch'), [ _new(_ast.Name, '__data__'), - _new(_ast.Str, node.module) + _new(_ast_Str, node.module) ], (), ())) return node if len(self.locals) > 1: @@ -613,7 +613,7 @@ # Otherwise, translate the name ref into a context lookup name = _new(_ast.Name, '_lookup_name', _ast.Load()) namearg = _new(_ast.Name, '__data__', _ast.Load()) - strarg = _new(_ast.Str, node.id) + strarg = _new(_ast_Str, node.id) node = _new(_ast.Call, name, [namearg, strarg], []) elif isinstance(node.ctx, _ast.Store): if len(self.locals) > 1: @@ -632,7 +632,7 @@ return ASTTransformer.visit_Attribute(self, node) func = _new(_ast.Name, '_lookup_attr', _ast.Load()) - args = [self.visit(node.value), _new(_ast.Str, node.attr)] + args = [self.visit(node.value), _new(_ast_Str, node.attr)] return _new(_ast.Call, func, args, []) def visit_Subscript(self, node): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.1/setup.py new/Genshi-0.7.2/setup.py --- old/Genshi-0.7.1/setup.py 2018-09-01 20:55:02.000000000 +0200 +++ new/Genshi-0.7.2/setup.py 2019-04-27 22:26:09.000000000 +0200 @@ -115,7 +115,7 @@ setup( name = 'Genshi', - version = '0.7.1', + version = '0.7.2', description = 'A toolkit for generation of output for the web', long_description = \ """Genshi is a Python library that provides an integrated set of

1 0

commit python-CairoSVG for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-CairoSVG for openSUSE:Factory checked in at 2019-05-05 21:18:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-CairoSVG (Old) and /work/SRC/openSUSE:Factory/.python-CairoSVG.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-CairoSVG" Sun May 5 21:18:39 2019 rev:4 rq:699369 version:2.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-CairoSVG/python-CairoSVG.changes 2019-02-28 21:39:23.773621449 +0100 +++ /work/SRC/openSUSE:Factory/.python-CairoSVG.new.5148/python-CairoSVG.changes 2019-05-05 21:18:42.116833019 +0200 @@ -1,0 +2,6 @@ +Mon Apr 29 07:57:20 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com> + +- Update to 2.3.1: + * Fix relative paths on Windows + +------------------------------------------------------------------- Old: ---- CairoSVG-2.3.0.tar.gz New: ---- CairoSVG-2.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-CairoSVG.spec ++++++ --- /var/tmp/diff_new_pack.pIUMNv/_old 2019-05-05 21:18:43.680837280 +0200 +++ /var/tmp/diff_new_pack.pIUMNv/_new 2019-05-05 21:18:43.720837389 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-CairoSVG -Version: 2.3.0 +Version: 2.3.1 Release: 0 Summary: A Python SVG converter based on Cairo License: LGPL-3.0-or-later ++++++ CairoSVG-2.3.0.tar.gz -> CairoSVG-2.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CairoSVG-2.3.0/CairoSVG.egg-info/PKG-INFO new/CairoSVG-2.3.1/CairoSVG.egg-info/PKG-INFO --- old/CairoSVG-2.3.0/CairoSVG.egg-info/PKG-INFO 2019-02-08 17:33:01.000000000 +0100 +++ new/CairoSVG-2.3.1/CairoSVG.egg-info/PKG-INFO 2019-04-18 14:27:07.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: CairoSVG -Version: 2.3.0 +Version: 2.3.1 Summary: A Simple SVG Converter based on Cairo Home-page: http://www.cairosvg.org/ Author: Guillaume Ayoub @@ -36,5 +36,5 @@ Classifier: Topic :: Multimedia :: Graphics :: Graphics Conversion Requires-Python: >= 3.5 Description-Content-Type: text/x-rst -Provides-Extra: test Provides-Extra: doc +Provides-Extra: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CairoSVG-2.3.0/PKG-INFO new/CairoSVG-2.3.1/PKG-INFO --- old/CairoSVG-2.3.0/PKG-INFO 2019-02-08 17:33:01.000000000 +0100 +++ new/CairoSVG-2.3.1/PKG-INFO 2019-04-18 14:27:08.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: CairoSVG -Version: 2.3.0 +Version: 2.3.1 Summary: A Simple SVG Converter based on Cairo Home-page: http://www.cairosvg.org/ Author: Guillaume Ayoub @@ -36,5 +36,5 @@ Classifier: Topic :: Multimedia :: Graphics :: Graphics Conversion Requires-Python: >= 3.5 Description-Content-Type: text/x-rst -Provides-Extra: test Provides-Extra: doc +Provides-Extra: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CairoSVG-2.3.0/cairosvg/VERSION new/CairoSVG-2.3.1/cairosvg/VERSION --- old/CairoSVG-2.3.0/cairosvg/VERSION 2019-02-08 17:30:44.000000000 +0100 +++ new/CairoSVG-2.3.1/cairosvg/VERSION 2019-04-18 13:55:49.000000000 +0200 @@ -1 +1 @@ -2.3.0 \ No newline at end of file +2.3.1 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CairoSVG-2.3.0/cairosvg/__init__.py new/CairoSVG-2.3.1/cairosvg/__init__.py --- old/CairoSVG-2.3.0/cairosvg/__init__.py 2019-02-06 18:25:01.000000000 +0100 +++ new/CairoSVG-2.3.1/cairosvg/__init__.py 2019-03-22 17:30:59.000000000 +0100 @@ -39,7 +39,7 @@ # VERSION is used in the "url" module imported by "surface" -from . import surface # noqa +from . import surface # noqa isort:skip SURFACES = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CairoSVG-2.3.0/cairosvg/url.py new/CairoSVG-2.3.1/cairosvg/url.py --- old/CairoSVG-2.3.0/cairosvg/url.py 2018-11-26 10:10:07.000000000 +0100 +++ new/CairoSVG-2.3.1/cairosvg/url.py 2019-04-18 14:19:35.000000000 +0200 @@ -46,13 +46,19 @@ - file:///C:/Directory/zzz.svg """ - if url and os.name == 'nt': + if url and os.name == 'nt' and not url.startswith('data:'): # Match input ``url`` like the following: # - C:\\Directory\\zzz.svg # - Blah.svg - if 'file:' not in url: + if not url.startswith('file:') and os.path.isabs(url): url = os.path.abspath(url) + if '#' in url: + url, part = url.rsplit('#', 1) + else: + part = None url = Path(url).resolve().as_uri() + if part is not None: + url = url + '#' + part # Match input ``url`` like the following: # - file://C:\\Directory\\zzz.svg

1 0

commit python-tinycss2 for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-tinycss2 for openSUSE:Factory checked in at 2019-05-05 21:18:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tinycss2 (Old) and /work/SRC/openSUSE:Factory/.python-tinycss2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tinycss2" Sun May 5 21:18:32 2019 rev:4 rq:699150 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tinycss2/python-tinycss2.changes 2019-04-19 18:37:22.299107635 +0200 +++ /work/SRC/openSUSE:Factory/.python-tinycss2.new.5148/python-tinycss2.changes 2019-05-05 21:18:33.548809678 +0200 @@ -1,0 +2,12 @@ +Fri Apr 26 07:27:51 UTC 2019 - pgajdos(a)suse.com + +- version update to 1.0.2 + * Don't crash when indent tokens have no lowercase equivalent name + * Parse "--" ident tokens correctly + * Drop Python 2.7, 3.3 and 3.4 support. + * Allow leading double dash syntax for ident tokens, allowing CSS variables to + be parsed correctly. + * Force tests to parse JSON files as UTF-8. +- python3 package only + +------------------------------------------------------------------- Old: ---- tinycss2-0.6.1.tar.gz New: ---- tinycss2-1.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tinycss2.spec ++++++ --- /var/tmp/diff_new_pack.fnzUgz/_old 2019-05-05 21:18:34.032810997 +0200 +++ /var/tmp/diff_new_pack.fnzUgz/_new 2019-05-05 21:18:34.036811007 +0200 @@ -17,8 +17,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-tinycss2 -Version: 0.6.1 +Version: 1.0.2 Release: 0 Summary: Low-level CSS parser for Python License: BSD-3-Clause @@ -59,7 +60,7 @@ %python_expand py.test-%{$python_bin_suffix} -v -k 'not FLAKE8-check' %files %{python_files} -%doc CHANGES README.rst +%doc README.rst %license LICENSE %{python_sitelib}/* ++++++ tinycss2-0.6.1.tar.gz -> tinycss2-1.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/.coveragerc new/tinycss2-1.0.2/.coveragerc --- old/tinycss2-0.6.1/.coveragerc 2017-08-16 18:14:17.000000000 +0200 +++ new/tinycss2-1.0.2/.coveragerc 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -[run] -branch = True - -[report] -exclude_lines = - pragma: no cover - def __repr__ - raise NotImplementedError -omit = - .* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/.gitignore new/tinycss2-1.0.2/.gitignore --- old/tinycss2-0.6.1/.gitignore 2017-08-16 18:09:59.000000000 +0200 +++ new/tinycss2-1.0.2/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -*.pyc -*.egg-info -.cache -.coverage -.eggs -/htmlcov -/dist -/build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/.travis.yml new/tinycss2-1.0.2/.travis.yml --- old/tinycss2-0.6.1/.travis.yml 2017-08-16 17:50:48.000000000 +0200 +++ new/tinycss2-1.0.2/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -language: python -sudo: false - -git: - submodules: false - -matrix: - include: - - os: linux - python: 2.7 - - os: linux - python: 3.3 - - os: linux - python: 3.4 - - os: linux - python: 3.5 - - os: linux - python: 3.6 - - os: osx - language: generic - env: PYTHON_VERSION=3 - -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi - -install: - - pip$PYTHON_VERSION install --upgrade -e.[test] - -script: - - python$PYTHON_VERSION setup.py test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/CHANGES new/tinycss2-1.0.2/CHANGES --- old/tinycss2-0.6.1/CHANGES 2017-10-02 11:03:13.000000000 +0200 +++ new/tinycss2-1.0.2/CHANGES 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -tinycss2 changelog -================== - - -Version 0.6.1 -------------- - -Released on 2017-10-02. - -* Update documentation. - - -Version 0.6.0 -------------- - -Released on 2017-08-16. - -* Don't allow identifiers starting with two dashes. -* Don't use Tox for tests. -* Follow semantic versioning. - - -Version 0.5 ------------ - -Released on 2014-08-19. - -* Update for spec changes. -* Add a :attr:`~tinycss2.ast.WhitespaceToken.value` attribute - to :class:`~tinycss2.ast.WhitespaceToken`. -* **Breaking change**: CSS comments are now preserved - as :class:`~tinycss2.ast.Comment` objects by default. - Pass ``skip_comments=True`` to parsing functions to get the old behavior. -* **Breaking change**: Top-level comments and whitespace are now preserved - when parsing a stylesheet, rule list, or declaration list. - Pass ``skip_comments=True`` and ``skip_whitespace=True`` - to get the old behavior. -* Test on Python 3.4 and PyPy3. -* Set up continous integration on Travis-CI. - - -Version 0.4 ------------ - -Released on 2014-01-04. - -* Fix :class:`~tinycss2.ast.HashToken` starting with a non-ASCII character. -* Fix :func:`repr` on AST nodes. - - -Version 0.3 ------------ - -Released on 2013-12-27. - -* Document all the things! -* Add :ref:`serialization` -* Merge :func:`tinycss2.color3.parse_color_string` behavior into - :func:`~tinycss2.color3.parse_color`. -* Fix and test parsing form bytes and tokenization of <unicode-range>. - - -Version 0.2 ------------ - -Released on 2013-09-02. - -Add parsing for <An+B>, -as in ``:nth-child()`` and related Selectors pseudo-classes. - - -Version 0.1 ------------ - -Released on 2013-08-31. - -First PyPI release. Contains: - -* Decoding from bytes (``@charset``, etc.) -* Tokenization -* Parsing for "generic" rules and declarations -* Parsing for CSS Color Level 3 -* Tests for all of the above, except for decoding from bytes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/LICENSE new/tinycss2-1.0.2/LICENSE --- old/tinycss2-0.6.1/LICENSE 2017-08-14 17:24:31.000000000 +0200 +++ new/tinycss2-1.0.2/LICENSE 2019-03-04 13:44:12.000000000 +0100 @@ -1,31 +1,29 @@ -Copyright (c) 2013 by Simon Sapin. - -Some rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * The names of the contributors may not be used to endorse or - promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +BSD 3-Clause License + +Copyright (c) 2013-2019, Simon Sapin and contributors (see AUTHORS). +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/MANIFEST.in new/tinycss2-1.0.2/MANIFEST.in --- old/tinycss2-0.6.1/MANIFEST.in 2017-08-14 17:24:31.000000000 +0200 +++ new/tinycss2-1.0.2/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -include CHANGES -include LICENSE -include docs/* -include tinycss2/css-parsing-tests/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/PKG-INFO new/tinycss2-1.0.2/PKG-INFO --- old/tinycss2-0.6.1/PKG-INFO 2017-10-02 11:11:04.000000000 +0200 +++ new/tinycss2-1.0.2/PKG-INFO 2019-03-21 15:32:24.000000000 +0100 @@ -1,41 +1,48 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: tinycss2 -Version: 0.6.1 +Version: 1.0.2 Summary: Low-level CSS parser for Python -Home-page: UNKNOWN +Home-page: https://tinycss2.readthedocs.io/ Author: Simon Sapin -Author-email: simon.sapin(a)exyr.org +Author-email: community(a)kozea.fr License: BSD -Description-Content-Type: UNKNOWN -Description: tinycss2: Low-level CSS parser for Python - ################################################# +Project-URL: Documentation, https://tinycss2.readthedocs.io/ +Project-URL: Code, https://github.com/Kozea/tinycss2/ +Project-URL: Issue tracker, https://github.com/Kozea/tinycss2/issues +Project-URL: Donation, https://www.patreon.com/kozea +Description: ======== + tinycss2 + ======== - tinycss2 is a rewrite of tinycss_ with a simpler API, - based on the more recent `CSS Syntax Level 3`_ specification. + tinycss2 is a low-level CSS parser and generator: it can parse strings, return + Python objects representing tokens and blocks, and generate CSS strings + corresponding to these objects. - .. _tinycss: http://pythonhosted.org/tinycss/ - .. _CSS Syntax Level 3: http://dev.w3.org/csswg/css-syntax-3/ + Based on the `CSS Syntax Level 3`_ specification, tinycss2 knows the grammar of + CSS but doesn't know specific rules, properties or values supported in various + CSS modules. + + .. _CSS Syntax Level 3: https://drafts.csswg.org/css-syntax-3/ * BSD licensed - * For Python 2.7 or 3.3+ (tested on CPython) + * For Python 3.5+ (tested on CPython and Pypy3) * Latest documentation: http://tinycss2.readthedocs.io/ * Source code and issue tracker: https://github.com/Kozea/tinycss2 * PyPI releases: https://pypi.python.org/pypi/tinycss2/ - * Continuous integration: |travis| - - .. |travis| image:: https://travis-ci.org/Kozea/tinycss2.svg?branch=master - :target: https://travis-ci.org/Kozea/tinycss2 - :alt: https://travis-ci.org/Kozea/tinycss2 -Platform: UNKNOWN +Keywords: css,parser +Platform: Linux +Platform: macOS +Platform: Windows Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: BSD License -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Topic :: Text Processing +Requires-Python: >= 3.5 +Description-Content-Type: text/x-rst +Provides-Extra: doc +Provides-Extra: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/README.rst new/tinycss2-1.0.2/README.rst --- old/tinycss2-0.6.1/README.rst 2017-09-30 22:47:40.000000000 +0200 +++ new/tinycss2-1.0.2/README.rst 2019-03-04 13:52:45.000000000 +0100 @@ -1,19 +1,19 @@ -tinycss2: Low-level CSS parser for Python -################################################# +======== +tinycss2 +======== -tinycss2 is a rewrite of tinycss_ with a simpler API, -based on the more recent `CSS Syntax Level 3`_ specification. +tinycss2 is a low-level CSS parser and generator: it can parse strings, return +Python objects representing tokens and blocks, and generate CSS strings +corresponding to these objects. -.. _tinycss: http://pythonhosted.org/tinycss/ -.. _CSS Syntax Level 3: http://dev.w3.org/csswg/css-syntax-3/ +Based on the `CSS Syntax Level 3`_ specification, tinycss2 knows the grammar of +CSS but doesn't know specific rules, properties or values supported in various +CSS modules. + +.. _CSS Syntax Level 3: https://drafts.csswg.org/css-syntax-3/ * BSD licensed -* For Python 2.7 or 3.3+ (tested on CPython) +* For Python 3.5+ (tested on CPython and Pypy3) * Latest documentation: http://tinycss2.readthedocs.io/ * Source code and issue tracker: https://github.com/Kozea/tinycss2 * PyPI releases: https://pypi.python.org/pypi/tinycss2/ -* Continuous integration: |travis| - -.. |travis| image:: https://travis-ci.org/Kozea/tinycss2.svg?branch=master - :target: https://travis-ci.org/Kozea/tinycss2 - :alt: https://travis-ci.org/Kozea/tinycss2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/TODO new/tinycss2-1.0.2/TODO --- old/tinycss2-0.6.1/TODO 2017-08-14 17:24:31.000000000 +0200 +++ new/tinycss2-1.0.2/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -Test preserve_comments=True - -Test declaration corner cases: top-level ! and ; - … once that is all figured out in the spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/docs/conf.py new/tinycss2-1.0.2/docs/conf.py --- old/tinycss2-0.6.1/docs/conf.py 2017-09-30 22:43:09.000000000 +0200 +++ new/tinycss2-1.0.2/docs/conf.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,84 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# -# tinycss2 documentation build configuration file. - -import codecs -import re -import sys -from os import path - - -sys.path.append(path.dirname(path.abspath(__file__))) - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = [ - 'sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'css_diagram_role'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = 'tinycss2' -copyright = '2013-2017, Simon Sapin' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The full version, including alpha/beta/rc tags. -release = re.search("VERSION = '([^']+)'", codecs.open( - path.join(path.dirname(path.dirname(__file__)), 'tinycss2', '__init__.py'), - encoding='utf-8', -).read().strip()).group(1) - -# The short X.Y version. -version = '.'.join(release.split('.')[:2]) - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build'] - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'sphinx_rtd_theme' - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# Output file base name for HTML help builder. -htmlhelp_basename = 'tinycss2doc' - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'tinycss2', 'tinycss2 Documentation', - ['Simon Sapin'], 1) -] - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'tinycss2', 'tinycss2 Documentation', - 'Simon Sapin', 'tinycss2', 'One line description of project.', - 'Miscellaneous'), -] - -# Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = { - 'py2': ('http://docs.python.org/2', None), - 'py3': ('http://docs.python.org/3', None), - 'webencodings': ('http://pythonhosted.org/webencodings/', None)} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/docs/css_diagram_role.py new/tinycss2-1.0.2/docs/css_diagram_role.py --- old/tinycss2-0.6.1/docs/css_diagram_role.py 2017-09-30 22:28:23.000000000 +0200 +++ new/tinycss2-1.0.2/docs/css_diagram_role.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -# coding: utf8 -""" -A Sphinx extension adding a 'css' role creating links to -the spec’s railroad diagrams. - -""" - -from docutils import nodes - - -def role_fn(_name, rawtext, text, lineno, inliner, options={}, content=()): - ref = 'http://dev.w3.org/csswg/css-syntax-3/#%s-diagram' % text.replace( - ' ', '-') - if text.endswith(('-token', '-block')): - text = '<%s>' % text - ref = nodes.reference(rawtext, text, refuri=ref, **options) - return [ref], [] - - -def setup(app): - app.add_role_to_domain('py', 'diagram', role_fn) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/docs/index.rst new/tinycss2-1.0.2/docs/index.rst --- old/tinycss2-0.6.1/docs/index.rst 2017-09-30 22:23:08.000000000 +0200 +++ new/tinycss2-1.0.2/docs/index.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,157 +0,0 @@ -:tocdepth: 3 - -.. include:: ../README.rst - - -Installation -============ - -Installing tinycss2 with pip_ should Just Work:: - - pip install tinycss2 - -This will also automatically install tinycss2’s only dependency, webencodings_. -tinycss2 and webencodings both only contain Python code and should work on any -Python implementation, although they’re only tested on CPython. - -.. _pip: http://pip-installer.org/ -.. _webencodings: http://pythonhosted.org/webencodings/ - - -.. _parsing: - -Parsing -======= - -tinycss2 is “low-level” in that it doesn’t parse all of CSS: -it doesn’t know about the syntax of any specific properties or at-rules. -Instead, it provides a set of functions that can be composed -to support exactly the parts of CSS you’re interested in, -including new or non-standard rules or properties, -without modifying tinycss or having a complex hook/plugin system. - -In many cases, parts of the parsed values -(such as the :attr:`~tinycss2.ast.AtRule.content` -of a :class:`~tinycss2.ast.AtRule`) -is given as :term:`component values` that can be parsed further -with other functions. - -.. module:: tinycss2 -.. autofunction:: parse_stylesheet_bytes -.. autofunction:: parse_stylesheet -.. autofunction:: parse_rule_list -.. autofunction:: parse_one_rule -.. autofunction:: parse_declaration_list -.. autofunction:: parse_one_declaration -.. autofunction:: parse_component_value_list -.. autofunction:: parse_one_component_value - - -.. _serialization: - -Serialization -============= - -In addition to each node’s a :meth:`~tinycss2.ast.Node.serialize` method, -some serialization-related functions are available: - -.. autofunction:: serialize -.. autofunction:: serialize_identifier - - -.. module:: tinycss2.color3 - -Color -===== - -.. autofunction:: parse_color -.. autoclass:: RGBA - - -.. module:: tinycss2.nth - -<An+B> -====== - -.. autofunction:: parse_nth - - -.. module:: tinycss2.ast - -AST nodes -========= - -Various parsing functions return a **node** or a list of nodes. -Some types of nodes contain nested nodes which may in turn contain more nodes, -forming together an **abstract syntax tree**. - -Although you typically don’t need to import it, -the :mod:`tinycss2.ast` module defines a class for every type of node. - -.. autoclass:: Node() - -.. autoclass:: QualifiedRule() -.. autoclass:: AtRule() -.. autoclass:: Declaration() - - -Component values ----------------- - -.. autoclass:: ParseError() -.. autoclass:: Comment() -.. autoclass:: WhitespaceToken() -.. autoclass:: LiteralToken() -.. autoclass:: IdentToken() -.. autoclass:: AtKeywordToken() -.. autoclass:: HashToken() -.. autoclass:: StringToken() -.. autoclass:: URLToken() -.. autoclass:: UnicodeRangeToken() -.. autoclass:: NumberToken() -.. autoclass:: PercentageToken() -.. autoclass:: DimensionToken() -.. autoclass:: ParenthesesBlock() -.. autoclass:: SquareBracketsBlock() -.. autoclass:: CurlyBracketsBlock() -.. autoclass:: FunctionBlock() - - -Glossary -======== - -.. currentmodule:: tinycss2.ast -.. glossary:: - - String - In this documentation “a string” means an Unicode string: - :func:`unicode <py2:unicode>` on Python 2.x and - :class:`py3:str` on Python 3.x. - On 2.x, - a byte string (:func:`str <py2:str>`) that only contains ASCII bytes - is also accepted and implicitly decoded. - - Component value - Component values - A :class:`ParseError`, - :class:`WhitespaceToken`, - :class:`LiteralToken`, - :class:`IdentToken`, - :class:`AtKeywordToken`, - :class:`HashToken`, - :class:`StringToken`, - :class:`URLToken`, - :class:`NumberToken`, - :class:`PercentageToken`, - :class:`DimensionToken`, - :class:`UnicodeRangeToken`, - :class:`ParenthesesBlock`, - :class:`SquareBracketsBlock`, - :class:`CurlyBracketsBlock`, - :class:`FunctionBlock`, - or :class:`Comment` - object. - - -.. currentmodule:: tinycss2 -.. include:: ../CHANGES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/setup.cfg new/tinycss2-1.0.2/setup.cfg --- old/tinycss2-0.6.1/setup.cfg 2017-10-02 11:11:04.000000000 +0200 +++ new/tinycss2-1.0.2/setup.cfg 2019-03-21 15:32:24.000000000 +0100 @@ -1,12 +1,84 @@ -[aliases] -test = pytest +[metadata] +name = tinycss2 +url = https://tinycss2.readthedocs.io/ +version = file: tinycss2/VERSION +license = BSD +license_file = LICENSE +description = Low-level CSS parser for Python +long_description = file: README.rst +long_description_content_type = text/x-rst +author = Simon Sapin +author_email = community(a)kozea.fr +platforms = + Linux + macOS + Windows +keywords = + css + parser +classifiers = + Development Status :: 5 - Production/Stable + Intended Audience :: Developers + License :: OSI Approved :: BSD License + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Topic :: Text Processing +project_urls = + Documentation = https://tinycss2.readthedocs.io/ + Code = https://github.com/Kozea/tinycss2/ + Issue tracker = https://github.com/Kozea/tinycss2/issues + Donation = https://www.patreon.com/kozea + +[options] +packages = find: +setup_requires = pytest-runner +install_requires = + setuptools >= 39.2.0 + webencodings >= 0.4 +tests_require = + pytest-runner + pytest-cov + pytest-flake8 + pytest-isort +python_requires = >= 3.5 + +[options.package_data] +tinycss2 = + VERSION + css-parsing-tests/* + +[options.extras_require] +doc = + sphinx + sphinx_rtd_theme +test = + pytest-runner + pytest-cov + pytest-flake8 + pytest-isort [bdist_wheel] -universal = 1 +python-tag = py3 + +[build_sphinx] +source-dir = docs +build-dir = docs/_build + +[aliases] +test = pytest [tool:pytest] -addopts = --cov=tinycss2 --flake8 --isort tinycss2/test.py -norecursedirs = dist .cache .git build *.egg-info .eggs venv +addopts = --flake8 --isort +norecursedirs = build dist .cache .eggs .git + +[coverage:run] +branch = True +include = tinycss2/* + +[isort] +default_section = THIRDPARTY [egg_info] tag_build = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/setup.py new/tinycss2-1.0.2/setup.py --- old/tinycss2-0.6.1/setup.py 2017-09-30 21:32:36.000000000 +0200 +++ new/tinycss2-1.0.2/setup.py 2019-03-04 13:43:51.000000000 +0100 @@ -1,55 +1,10 @@ -#!/usr/bin/env python -# coding: utf8 - -import codecs -import os.path -import re import sys from setuptools import setup +if sys.version_info.major < 3: + raise RuntimeError( + 'tinycss2 does not support Python 2.x anymore. ' + 'Please use Python 3 or install an older version of tinycss2.') -VERSION = re.search("VERSION = '([^']+)'", codecs.open( - os.path.join(os.path.dirname(__file__), 'tinycss2', '__init__.py'), - encoding='utf-8', -).read().strip()).group(1) - -README = codecs.open( - os.path.join(os.path.dirname(__file__), 'README.rst'), - encoding='utf-8', -).read() - -needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv) -pytest_runner = ['pytest-runner'] if needs_pytest else [] - -setup( - name='tinycss2', - version=VERSION, - description='Low-level CSS parser for Python', - long_description=README, - license='BSD', - author='Simon Sapin', - author_email='simon.sapin(a)exyr.org', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Topic :: Text Processing', - ], - packages=['tinycss2'], - install_requires=['webencodings>=0.4'], - package_data={'tinycss2': ['css-parsing-tests/*']}, - setup_requires=pytest_runner, - test_suite='tinycss2.test', - tests_require=[ - 'pytest-runner', 'pytest-cov', 'pytest-flake8', 'pytest-isort'], - extras_require={'test': [ - 'pytest-runner', 'pytest-cov', 'pytest-flake8', 'pytest-isort']}, -) +setup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/VERSION new/tinycss2-1.0.2/tinycss2/VERSION --- old/tinycss2-0.6.1/tinycss2/VERSION 1970-01-01 01:00:00.000000000 +0100 +++ new/tinycss2-1.0.2/tinycss2/VERSION 2019-03-21 15:26:58.000000000 +0100 @@ -0,0 +1 @@ +1.0.2 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/__init__.py new/tinycss2-1.0.2/tinycss2/__init__.py --- old/tinycss2-0.6.1/tinycss2/__init__.py 2017-10-02 11:03:25.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/__init__.py 2019-03-04 14:05:09.000000000 +0100 @@ -1,9 +1,10 @@ -VERSION = '0.6.1' +from pathlib import Path - -from .tokenizer import parse_component_value_list # noqa -from .parser import ( # noqa - parse_one_component_value, parse_one_declaration, parse_declaration_list, - parse_one_rule, parse_rule_list, parse_stylesheet) from .bytes import parse_stylesheet_bytes # noqa +from .parser import (parse_declaration_list, parse_one_component_value, # noqa + parse_one_declaration, parse_one_rule, parse_rule_list, + parse_stylesheet) from .serializer import serialize, serialize_identifier # noqa +from .tokenizer import parse_component_value_list # noqa + +VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/_compat.py new/tinycss2-1.0.2/tinycss2/_compat.py --- old/tinycss2-0.6.1/tinycss2/_compat.py 2017-08-16 17:56:39.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/_compat.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -if str is bytes: # pragma: no cover - unichr = unichr # noqa - basestring = basestring # noqa -else: # pragma: no cover - unichr = chr # noqa - basestring = str # noqa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/ast.py new/tinycss2-1.0.2/tinycss2/ast.py --- old/tinycss2-0.6.1/tinycss2/ast.py 2017-08-16 17:57:16.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/ast.py 2019-03-06 16:01:28.000000000 +0100 @@ -1,4 +1,3 @@ -# coding: utf8 """ Data structures for the CSS abstract syntax tree. @@ -248,7 +247,10 @@ def __init__(self, line, column, value): Node.__init__(self, line, column) self.value = value - self.lower_value = ascii_lower(value) + try: + self.lower_value = ascii_lower(value) + except UnicodeEncodeError: + self.lower_value = value def _serialize_to(self, write): write(serialize_identifier(self.value)) @@ -285,7 +287,10 @@ def __init__(self, line, column, value): Node.__init__(self, line, column) self.value = value - self.lower_value = ascii_lower(value) + try: + self.lower_value = ascii_lower(value) + except UnicodeEncodeError: + self.lower_value = value def _serialize_to(self, write): write('@') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/color3.py new/tinycss2-1.0.2/tinycss2/color3.py --- old/tinycss2-0.6.1/tinycss2/color3.py 2017-08-16 18:09:15.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/color3.py 2019-03-04 13:43:51.000000000 +0100 @@ -3,7 +3,6 @@ import collections import re -from ._compat import basestring from .parser import parse_one_component_value @@ -49,7 +48,7 @@ ``(-0.1, 1.2, 0, 1)``.) """ - if isinstance(input, basestring): + if isinstance(input, str): token = parse_one_component_value(input, skip_comments=True) else: token = input @@ -174,8 +173,8 @@ _HASH_REGEXPS = ( - (2, re.compile('^([\da-f])([\da-f])([\da-f])$', re.I).match), - (1, re.compile('^([\da-f]{2})([\da-f]{2})([\da-f]{2})$', re.I).match), + (2, re.compile('^([\\da-f])([\\da-f])([\\da-f])$', re.I).match), + (1, re.compile('^([\\da-f]{2})([\\da-f]{2})([\\da-f]{2})$', re.I).match), ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/css-parsing-tests/component_value_list.json new/tinycss2-1.0.2/tinycss2/css-parsing-tests/component_value_list.json --- old/tinycss2-0.6.1/tinycss2/css-parsing-tests/component_value_list.json 2017-08-16 18:33:53.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/css-parsing-tests/component_value_list.json 2019-03-06 15:47:26.000000000 +0100 @@ -22,11 +22,12 @@ ["ident", "red--"], ">" ], -"\\- red0 -red --red -\\-red\\ blue 0red -0red \u0000red _Red .red rêd r\\êd \u007F\u0080\u0081", [ +"\\- red0 -red --red -- -\\-red\\ blue 0red -0red \u0000red _Red .red rêd r\\êd \u007F\u0080\u0081", [ ["ident", "-"], " ", ["ident", "red0"], " ", ["ident", "-red"], " ", - "-", ["ident", "-red"], " ", + ["ident", "--red"], " ", + ["ident", "--"], " ", ["ident", "--red blue"], " ", ["dimension", "0", 0, "integer", "red"], " ", ["dimension", "-0", 0, "integer", "red"], " ", @@ -55,7 +56,7 @@ "rgba0() -rgba() --rgba() -\\-rgba() 0rgba() -0rgba() _rgba() .rgba() rgbâ() \\30rgba() rgba () @rgba() #rgba()", [ ["function", "rgba0"], " ", ["function", "-rgba"], " ", - "-", ["function", "-rgba"], " ", + ["function", "--rgba"], " ", ["function", "--rgba"], " ", ["dimension", "0", 0, "integer", "rgba"], ["()"], " ", ["dimension", "-0", 0, "integer", "rgba"], ["()"], " ", @@ -71,7 +72,7 @@ "@media0 @-Media @--media @-\\-media @0media @-0media @_media @.media @medİa @\\30 media\\", [ ["at-keyword", "media0"], " ", ["at-keyword", "-Media"], " ", - "@", "-", ["ident", "-media"], " ", + ["at-keyword", "--media"], " ", ["at-keyword", "--media"], " ", "@", ["dimension", "0", 0, "integer", "media"], " ", "@", ["dimension", "-0", 0, "integer", "media"], " ", @@ -84,7 +85,7 @@ "#red0 #-Red #--red #-\\-red #0red #-0red #_Red #.red #rêd #êrd #\\.red\\", [ ["hash", "red0", "id"], " ", ["hash", "-Red", "id"], " ", - ["hash", "--red", "unrestricted"], " ", + ["hash", "--red", "id"], " ", ["hash", "--red", "id"], " ", ["hash", "0red", "unrestricted"], " ", ["hash", "-0red", "unrestricted"], " ", @@ -309,8 +310,8 @@ "12red0 12.0-red 12--red 12-\\-red 120red 12-0red 12\u0000red 12_Red 12.red 12rêd", [ ["dimension", "12", 12.0, "integer", "red0"], " ", ["dimension", "12.0", 12.0, "number", "-red"], " ", - ["number", "12", 12.0, "integer"], "-", ["ident", "-red"], " ", - ["dimension", "12", 12.0, "integer", "--red"], " ", + ["dimension", "12", 12.0, "integer", "--red"], " ", + ["dimension", "12", 12.0, "integer", "--red"], " ", ["dimension", "120", 120.0, "integer", "red"], " ", ["number", "12", 12.0, "integer"], ["dimension", "-0", 0, "integer", "red"], " ", ["dimension", "12", 12.0, "integer", "\uFFFDred"], " ", @@ -393,7 +394,7 @@ ], "~=|=^=$=*=|| |/**/| ~/**/=", [ - "~=", "|=", "^=", "$=", "*=", "||", "", + "~=", "|=", "^=", "$=", "*=", "||", "<!--", ["ident", "----"], ">", " ", "|", "|", " ", "~", "=" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/parser.py new/tinycss2-1.0.2/tinycss2/parser.py --- old/tinycss2-0.6.1/tinycss2/parser.py 2017-08-16 18:08:04.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/parser.py 2019-03-04 13:43:51.000000000 +0100 @@ -1,6 +1,3 @@ -# coding: utf-8 - -from ._compat import basestring from .ast import AtRule, Declaration, ParseError, QualifiedRule from .tokenizer import parse_component_value_list @@ -15,7 +12,7 @@ """ # Accept ASCII-only byte strings on Python 2, with implicit conversion. - if isinstance(input, basestring): + if isinstance(input, str): input = parse_component_value_list(input, skip_comments) return iter(input) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/serializer.py new/tinycss2-1.0.2/tinycss2/serializer.py --- old/tinycss2-0.6.1/tinycss2/serializer.py 2017-08-16 18:07:21.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/serializer.py 2019-03-04 13:43:51.000000000 +0100 @@ -33,6 +33,9 @@ if value == '-': return r'\-' + if value[:2] == '--': + return '--' + serialize_name(value[2:]) + if value[0] == '-': result = '-' value = value[1:] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/test.py new/tinycss2-1.0.2/tinycss2/test.py --- old/tinycss2-0.6.1/tinycss2/test.py 2017-08-16 18:36:49.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/test.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,230 +0,0 @@ -# coding: utf8 - -import functools -import json -import os.path -import pprint - -import pytest -from webencodings import Encoding, lookup - -from . import (parse_component_value_list, parse_declaration_list, - parse_one_component_value, parse_one_declaration, - parse_one_rule, parse_rule_list, parse_stylesheet, - parse_stylesheet_bytes, serialize) -from .ast import (AtKeywordToken, AtRule, Comment, CurlyBracketsBlock, - Declaration, DimensionToken, FunctionBlock, HashToken, - IdentToken, LiteralToken, NumberToken, ParenthesesBlock, - ParseError, PercentageToken, QualifiedRule, - SquareBracketsBlock, StringToken, UnicodeRangeToken, - URLToken, WhitespaceToken) -from .color3 import RGBA, parse_color -from .nth import parse_nth - - -def generic(func): - implementations = func() - - @functools.wraps(func) - def run(value): - repr(value) # Test that this does not raise. - return implementations[type(value)](value) - return run - - -@generic -def to_json(): - def numeric(t): - return [ - t.representation, t.value, - 'integer' if t.int_value is not None else 'number'] - return { - type(None): lambda _: None, - str: lambda s: s, - int: lambda s: s, - list: lambda l: [to_json(el) for el in l], - tuple: lambda l: [to_json(el) for el in l], - Encoding: lambda e: e.name, - ParseError: lambda e: ['error', e.kind], - - Comment: lambda t: '/* … */', - WhitespaceToken: lambda t: ' ', - LiteralToken: lambda t: t.value, - IdentToken: lambda t: ['ident', t.value], - AtKeywordToken: lambda t: ['at-keyword', t.value], - HashToken: lambda t: ['hash', t.value, - 'id' if t.is_identifier else 'unrestricted'], - StringToken: lambda t: ['string', t.value], - URLToken: lambda t: ['url', t.value], - NumberToken: lambda t: ['number'] + numeric(t), - PercentageToken: lambda t: ['percentage'] + numeric(t), - DimensionToken: lambda t: ['dimension'] + numeric(t) + [t.unit], - UnicodeRangeToken: lambda t: ['unicode-range', t.start, t.end], - - CurlyBracketsBlock: lambda t: ['{}'] + to_json(t.content), - SquareBracketsBlock: lambda t: ['[]'] + to_json(t.content), - ParenthesesBlock: lambda t: ['()'] + to_json(t.content), - FunctionBlock: lambda t: ['function', t.name] + to_json(t.arguments), - - Declaration: lambda d: ['declaration', d.name, - to_json(d.value), d.important], - AtRule: lambda r: ['at-rule', r.at_keyword, to_json(r.prelude), - to_json(r.content)], - QualifiedRule: lambda r: ['qualified rule', to_json(r.prelude), - to_json(r.content)], - - RGBA: lambda v: [round(c, 10) for c in v], - } - - -def load_json(filename): - json_data = json.load(open(os.path.join( - os.path.dirname(__file__), 'css-parsing-tests', filename))) - return list(zip(json_data[::2], json_data[1::2])) - - -def json_test(filename=None): - def decorator(function): - filename_ = filename or function.__name__.split('_', 1)[-1] + '.json' - - @pytest.mark.parametrize(('css', 'expected'), load_json(filename_)) - def test(css, expected): - value = to_json(function(css)) - if value != expected: # pragma: no cover - pprint.pprint(value) - assert value == expected - return test - return decorator - - -SKIP = dict(skip_comments=True, skip_whitespace=True) - - -@json_test() -def test_component_value_list(input): - return parse_component_value_list(input, skip_comments=True) - - -@json_test() -def test_one_component_value(input): - return parse_one_component_value(input, skip_comments=True) - - -@json_test() -def test_declaration_list(input): - return parse_declaration_list(input, **SKIP) - - -@json_test() -def test_one_declaration(input): - return parse_one_declaration(input, skip_comments=True) - - -@json_test() -def test_stylesheet(input): - return parse_stylesheet(input, **SKIP) - - -@json_test() -def test_rule_list(input): - return parse_rule_list(input, **SKIP) - - -@json_test() -def test_one_rule(input): - return parse_one_rule(input, skip_comments=True) - - -@json_test() -def test_color3(input): - return parse_color(input) - - -@json_test(filename='An+B.json') -def test_nth(input): - return parse_nth(input) - - -# Do not use @pytest.mark.parametrize because it is slow with that many values. -def test_color3_hsl(): - for css, expected in load_json('color3_hsl.json'): - assert to_json(parse_color(css)) == expected - - -def test_color3_keywords(): - for css, expected in load_json('color3_keywords.json'): - result = parse_color(css) - if result is not None: - r, g, b, a = result - result = [r * 255, g * 255, b * 255, a] - assert result == expected - - -@json_test() -def test_stylesheet_bytes(kwargs): - kwargs['css_bytes'] = kwargs['css_bytes'].encode('latin1') - kwargs.pop('comment', None) - if kwargs.get('environment_encoding'): - kwargs['environment_encoding'] = lookup(kwargs['environment_encoding']) - kwargs.update(SKIP) - return parse_stylesheet_bytes(**kwargs) - - -@json_test(filename='component_value_list.json') -def test_serialization(css): - parsed = parse_component_value_list(css, skip_comments=True) - return parse_component_value_list(serialize(parsed), skip_comments=True) - - -def test_skip(): - source = ''' - /* foo */ - @media print { - #foo { - width: /* bar*/4px; - color: green; - } - } - ''' - no_ws = parse_stylesheet(source, skip_whitespace=True) - no_comment = parse_stylesheet(source, skip_comments=True) - default = parse_component_value_list(source) - assert serialize(no_ws) != source - assert serialize(no_comment) != source - assert serialize(default) == source - - -def test_comment_eof(): - source = '/* foo ' - parsed = parse_component_value_list(source) - assert serialize(parsed) == '/* foo */' - - -def test_parse_declaration_value_color(): - source = 'color:#369' - declaration = parse_one_declaration(source) - (value_token,) = declaration.value - assert parse_color(value_token) == (.2, .4, .6, 1) - assert declaration.serialize() == source - - -def test_serialize_rules(): - source = '@import "a.css"; foo#bar.baz { color: red } /**/ @media print{}' - rules = parse_rule_list(source) - assert serialize(rules) == source - - -def test_serialize_declarations(): - source = 'color: #123; /**/ @top-left {} width:7px !important;' - rules = parse_declaration_list(source) - assert serialize(rules) == source - - -def test_backslash_delim(): - source = '\\\nfoo' - tokens = parse_component_value_list(source) - assert [t.type for t in tokens] == ['literal', 'whitespace', 'ident'] - assert tokens[0].value == '\\' - del tokens[1] - assert [t.type for t in tokens] == ['literal', 'ident'] - assert serialize(tokens) == source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/test_tinycss2.py new/tinycss2-1.0.2/tinycss2/test_tinycss2.py --- old/tinycss2-0.6.1/tinycss2/test_tinycss2.py 1970-01-01 01:00:00.000000000 +0100 +++ new/tinycss2-1.0.2/tinycss2/test_tinycss2.py 2019-03-06 15:12:12.000000000 +0100 @@ -0,0 +1,230 @@ +import functools +import json +import os.path +import pprint +from io import open + +import pytest +from webencodings import Encoding, lookup + +from . import (parse_component_value_list, parse_declaration_list, + parse_one_component_value, parse_one_declaration, + parse_one_rule, parse_rule_list, parse_stylesheet, + parse_stylesheet_bytes, serialize) +from .ast import (AtKeywordToken, AtRule, Comment, CurlyBracketsBlock, + Declaration, DimensionToken, FunctionBlock, HashToken, + IdentToken, LiteralToken, NumberToken, ParenthesesBlock, + ParseError, PercentageToken, QualifiedRule, + SquareBracketsBlock, StringToken, UnicodeRangeToken, + URLToken, WhitespaceToken) +from .color3 import RGBA, parse_color +from .nth import parse_nth + + +def generic(func): + implementations = func() + + @functools.wraps(func) + def run(value): + repr(value) # Test that this does not raise. + return implementations[type(value)](value) + return run + + +@generic +def to_json(): + def numeric(t): + return [ + t.representation, t.value, + 'integer' if t.int_value is not None else 'number'] + return { + type(None): lambda _: None, + str: lambda s: s, + int: lambda s: s, + list: lambda l: [to_json(el) for el in l], + tuple: lambda l: [to_json(el) for el in l], + Encoding: lambda e: e.name, + ParseError: lambda e: ['error', e.kind], + + Comment: lambda t: '/* … */', + WhitespaceToken: lambda t: ' ', + LiteralToken: lambda t: t.value, + IdentToken: lambda t: ['ident', t.value], + AtKeywordToken: lambda t: ['at-keyword', t.value], + HashToken: lambda t: ['hash', t.value, + 'id' if t.is_identifier else 'unrestricted'], + StringToken: lambda t: ['string', t.value], + URLToken: lambda t: ['url', t.value], + NumberToken: lambda t: ['number'] + numeric(t), + PercentageToken: lambda t: ['percentage'] + numeric(t), + DimensionToken: lambda t: ['dimension'] + numeric(t) + [t.unit], + UnicodeRangeToken: lambda t: ['unicode-range', t.start, t.end], + + CurlyBracketsBlock: lambda t: ['{}'] + to_json(t.content), + SquareBracketsBlock: lambda t: ['[]'] + to_json(t.content), + ParenthesesBlock: lambda t: ['()'] + to_json(t.content), + FunctionBlock: lambda t: ['function', t.name] + to_json(t.arguments), + + Declaration: lambda d: ['declaration', d.name, + to_json(d.value), d.important], + AtRule: lambda r: ['at-rule', r.at_keyword, to_json(r.prelude), + to_json(r.content)], + QualifiedRule: lambda r: ['qualified rule', to_json(r.prelude), + to_json(r.content)], + + RGBA: lambda v: [round(c, 10) for c in v], + } + + +def load_json(filename): + json_data = json.load(open(os.path.join( + os.path.dirname(__file__), 'css-parsing-tests', filename), + encoding='utf-8')) + return list(zip(json_data[::2], json_data[1::2])) + + +def json_test(filename=None): + def decorator(function): + filename_ = filename or function.__name__.split('_', 1)[-1] + '.json' + + @pytest.mark.parametrize(('css', 'expected'), load_json(filename_)) + def test(css, expected): + value = to_json(function(css)) + if value != expected: # pragma: no cover + pprint.pprint(value) + assert value == expected + return test + return decorator + + +SKIP = dict(skip_comments=True, skip_whitespace=True) + + +@json_test() +def test_component_value_list(input): + return parse_component_value_list(input, skip_comments=True) + + +@json_test() +def test_one_component_value(input): + return parse_one_component_value(input, skip_comments=True) + + +@json_test() +def test_declaration_list(input): + return parse_declaration_list(input, **SKIP) + + +@json_test() +def test_one_declaration(input): + return parse_one_declaration(input, skip_comments=True) + + +@json_test() +def test_stylesheet(input): + return parse_stylesheet(input, **SKIP) + + +@json_test() +def test_rule_list(input): + return parse_rule_list(input, **SKIP) + + +@json_test() +def test_one_rule(input): + return parse_one_rule(input, skip_comments=True) + + +@json_test() +def test_color3(input): + return parse_color(input) + + +@json_test(filename='An+B.json') +def test_nth(input): + return parse_nth(input) + + +# Do not use @pytest.mark.parametrize because it is slow with that many values. +def test_color3_hsl(): + for css, expected in load_json('color3_hsl.json'): + assert to_json(parse_color(css)) == expected + + +def test_color3_keywords(): + for css, expected in load_json('color3_keywords.json'): + result = parse_color(css) + if result is not None: + r, g, b, a = result + result = [r * 255, g * 255, b * 255, a] + assert result == expected + + +@json_test() +def test_stylesheet_bytes(kwargs): + kwargs['css_bytes'] = kwargs['css_bytes'].encode('latin1') + kwargs.pop('comment', None) + if kwargs.get('environment_encoding'): + kwargs['environment_encoding'] = lookup(kwargs['environment_encoding']) + kwargs.update(SKIP) + return parse_stylesheet_bytes(**kwargs) + + +@json_test(filename='component_value_list.json') +def test_serialization(css): + parsed = parse_component_value_list(css, skip_comments=True) + return parse_component_value_list(serialize(parsed), skip_comments=True) + + +def test_skip(): + source = ''' + /* foo */ + @media print { + #foo { + width: /* bar*/4px; + color: green; + } + } + ''' + no_ws = parse_stylesheet(source, skip_whitespace=True) + no_comment = parse_stylesheet(source, skip_comments=True) + default = parse_component_value_list(source) + assert serialize(no_ws) != source + assert serialize(no_comment) != source + assert serialize(default) == source + + +def test_comment_eof(): + source = '/* foo ' + parsed = parse_component_value_list(source) + assert serialize(parsed) == '/* foo */' + + +def test_parse_declaration_value_color(): + source = 'color:#369' + declaration = parse_one_declaration(source) + (value_token,) = declaration.value + assert parse_color(value_token) == (.2, .4, .6, 1) + assert declaration.serialize() == source + + +def test_serialize_rules(): + source = '@import "a.css"; foo#bar.baz { color: red } /**/ @media print{}' + rules = parse_rule_list(source) + assert serialize(rules) == source + + +def test_serialize_declarations(): + source = 'color: #123; /**/ @top-left {} width:7px !important;' + rules = parse_declaration_list(source) + assert serialize(rules) == source + + +def test_backslash_delim(): + source = '\\\nfoo' + tokens = parse_component_value_list(source) + assert [t.type for t in tokens] == ['literal', 'whitespace', 'ident'] + assert tokens[0].value == '\\' + del tokens[1] + assert [t.type for t in tokens] == ['literal', 'ident'] + assert serialize(tokens) == source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2/tokenizer.py new/tinycss2-1.0.2/tinycss2/tokenizer.py --- old/tinycss2-0.6.1/tinycss2/tokenizer.py 2017-08-16 18:05:06.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2/tokenizer.py 2019-03-06 15:48:56.000000000 +0100 @@ -5,7 +5,6 @@ from webencodings import ascii_lower -from ._compat import unichr from .ast import (AtKeywordToken, Comment, CurlyBracketsBlock, DimensionToken, FunctionBlock, HashToken, IdentToken, LiteralToken, NumberToken, ParenthesesBlock, ParseError, PercentageToken, @@ -196,14 +195,15 @@ def _is_ident_start(css, pos): """Return True if the given position is the start of a CSS identifier.""" - # https://www.w3.org/TR/css-syntax-3/#would-start-an-identifier + # https://drafts.csswg.org/css-syntax/#would-start-an-identifier if _is_name_start(css, pos): return True elif css[pos] == '-': pos += 1 return ( - # Name-start code point: - (pos < len(css) and _is_name_start(css, pos)) or + # Name-start code point or hyphen: + (pos < len(css) and ( + _is_name_start(css, pos) or css[pos] == '-')) or # Valid escape: (css.startswith('\\', pos) and not css.startswith('\\\n', pos))) elif css[pos] == '\\': @@ -284,7 +284,7 @@ if hex_match: codepoint = int(hex_match.group(1), 16) return ( - unichr(codepoint) if 0 < codepoint <= sys.maxunicode else '\uFFFD', + chr(codepoint) if 0 < codepoint <= sys.maxunicode else '\uFFFD', hex_match.end()) elif pos < len(css): return css[pos], pos + 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2.egg-info/PKG-INFO new/tinycss2-1.0.2/tinycss2.egg-info/PKG-INFO --- old/tinycss2-0.6.1/tinycss2.egg-info/PKG-INFO 2017-10-02 11:11:04.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2.egg-info/PKG-INFO 2019-03-21 15:32:23.000000000 +0100 @@ -1,41 +1,48 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: tinycss2 -Version: 0.6.1 +Version: 1.0.2 Summary: Low-level CSS parser for Python -Home-page: UNKNOWN +Home-page: https://tinycss2.readthedocs.io/ Author: Simon Sapin -Author-email: simon.sapin(a)exyr.org +Author-email: community(a)kozea.fr License: BSD -Description-Content-Type: UNKNOWN -Description: tinycss2: Low-level CSS parser for Python - ################################################# +Project-URL: Documentation, https://tinycss2.readthedocs.io/ +Project-URL: Code, https://github.com/Kozea/tinycss2/ +Project-URL: Issue tracker, https://github.com/Kozea/tinycss2/issues +Project-URL: Donation, https://www.patreon.com/kozea +Description: ======== + tinycss2 + ======== - tinycss2 is a rewrite of tinycss_ with a simpler API, - based on the more recent `CSS Syntax Level 3`_ specification. + tinycss2 is a low-level CSS parser and generator: it can parse strings, return + Python objects representing tokens and blocks, and generate CSS strings + corresponding to these objects. - .. _tinycss: http://pythonhosted.org/tinycss/ - .. _CSS Syntax Level 3: http://dev.w3.org/csswg/css-syntax-3/ + Based on the `CSS Syntax Level 3`_ specification, tinycss2 knows the grammar of + CSS but doesn't know specific rules, properties or values supported in various + CSS modules. + + .. _CSS Syntax Level 3: https://drafts.csswg.org/css-syntax-3/ * BSD licensed - * For Python 2.7 or 3.3+ (tested on CPython) + * For Python 3.5+ (tested on CPython and Pypy3) * Latest documentation: http://tinycss2.readthedocs.io/ * Source code and issue tracker: https://github.com/Kozea/tinycss2 * PyPI releases: https://pypi.python.org/pypi/tinycss2/ - * Continuous integration: |travis| - - .. |travis| image:: https://travis-ci.org/Kozea/tinycss2.svg?branch=master - :target: https://travis-ci.org/Kozea/tinycss2 - :alt: https://travis-ci.org/Kozea/tinycss2 -Platform: UNKNOWN +Keywords: css,parser +Platform: Linux +Platform: macOS +Platform: Windows Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: BSD License -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Topic :: Text Processing +Requires-Python: >= 3.5 +Description-Content-Type: text/x-rst +Provides-Extra: doc +Provides-Extra: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2.egg-info/SOURCES.txt new/tinycss2-1.0.2/tinycss2.egg-info/SOURCES.txt --- old/tinycss2-0.6.1/tinycss2.egg-info/SOURCES.txt 2017-10-02 11:11:04.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2.egg-info/SOURCES.txt 2019-03-21 15:32:23.000000000 +0100 @@ -1,25 +1,16 @@ -.coveragerc -.gitignore -.travis.yml -CHANGES LICENSE -MANIFEST.in README.rst -TODO setup.cfg setup.py -docs/conf.py -docs/css_diagram_role.py -docs/index.rst +tinycss2/VERSION tinycss2/__init__.py -tinycss2/_compat.py tinycss2/ast.py tinycss2/bytes.py tinycss2/color3.py tinycss2/nth.py tinycss2/parser.py tinycss2/serializer.py -tinycss2/test.py +tinycss2/test_tinycss2.py tinycss2/tokenizer.py tinycss2.egg-info/PKG-INFO tinycss2.egg-info/SOURCES.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-0.6.1/tinycss2.egg-info/requires.txt new/tinycss2-1.0.2/tinycss2.egg-info/requires.txt --- old/tinycss2-0.6.1/tinycss2.egg-info/requires.txt 2017-10-02 11:11:04.000000000 +0200 +++ new/tinycss2-1.0.2/tinycss2.egg-info/requires.txt 2019-03-21 15:32:23.000000000 +0100 @@ -1,5 +1,10 @@ +setuptools>=39.2.0 webencodings>=0.4 +[doc] +sphinx +sphinx_rtd_theme + [test] pytest-runner pytest-cov

1 0

commit python-cssselect2 for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-cssselect2 for openSUSE:Factory checked in at 2019-05-05 21:18:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cssselect2 (Old) and /work/SRC/openSUSE:Factory/.python-cssselect2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cssselect2" Sun May 5 21:18:23 2019 rev:4 rq:699149 version:0.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cssselect2/python-cssselect2.changes 2019-02-28 21:43:59.265510127 +0100 +++ /work/SRC/openSUSE:Factory/.python-cssselect2.new.5148/python-cssselect2.changes 2019-05-05 21:18:27.804794030 +0200 @@ -1,0 +2,5 @@ +Fri Apr 26 07:31:02 UTC 2019 - pgajdos(a)suse.com + +- python3 package only as python-tinycss2 become too + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cssselect2.spec ++++++ --- /var/tmp/diff_new_pack.9mdNTj/_old 2019-05-05 21:18:28.664796374 +0200 +++ /var/tmp/diff_new_pack.9mdNTj/_new 2019-05-05 21:18:28.668796384 +0200 @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-cssselect2 Version: 0.2.1 Release: 0

1 0

commit python-eventlet for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package python-eventlet for openSUSE:Factory checked in at 2019-05-05 21:18:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-eventlet (Old) and /work/SRC/openSUSE:Factory/.python-eventlet.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-eventlet" Sun May 5 21:18:15 2019 rev:30 rq:699142 version:0.24.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-eventlet/python-eventlet.changes 2018-12-13 19:48:13.832717554 +0100 +++ /work/SRC/openSUSE:Factory/.python-eventlet.new.5148/python-eventlet.changes 2019-05-05 21:18:17.668766418 +0200 @@ -1,0 +2,16 @@ +Mon Apr 29 06:00:44 UTC 2019 - Thomas Bechtold <tbechtold(a)suse.com> + +- add 0001-ssl-connect-used-non-monotonic-time.time-for-timeout.patch +- add 0002-Fix-for-Python-3.7-506.patch and + add 0003-Fix-compatibility-with-Python-3.7-ssl.SSLSocket-531.patch + Both needed for python 3.7 compatibility + +------------------------------------------------------------------- +Mon Apr 29 04:30:11 UTC 2019 - Thomas Bechtold <tbechtold(a)suse.com> + +- add 0001-IMPORTANT-late-import-in-use_hub-thread-race-caused-.patch + Fixes a problem during tests runs with python 2.7: + RuntimeError: no suitable implementation for this system: \ + AttributeError("'module' object has no attribute 'epolls'",) + +------------------------------------------------------------------- New: ---- 0001-IMPORTANT-late-import-in-use_hub-thread-race-caused-.patch 0001-ssl-connect-used-non-monotonic-time.time-for-timeout.patch 0002-Fix-for-Python-3.7-506.patch 0003-Fix-compatibility-with-Python-3.7-ssl.SSLSocket-531.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-eventlet.spec ++++++ --- /var/tmp/diff_new_pack.5adxsO/_old 2019-05-05 21:18:18.576768891 +0200 +++ /var/tmp/diff_new_pack.5adxsO/_new 2019-05-05 21:18:18.588768924 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-eventlet # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,15 @@ Group: Development/Languages/Python URL: http://eventlet.net Source: https://files.pythonhosted.org/packages/source/e/eventlet/eventlet-%{versio… +# PATCH-FIX-UPSTREAM 0001-IMPORTANT-late-import-in-use_hub-thread-race-caused-.patch -- https://github.com/eventlet/eventlet/commit/77bccbe48d4d9a46982b2e0503e7678… +Patch0: 0001-IMPORTANT-late-import-in-use_hub-thread-race-caused-.patch +# PATCH-FIX-UPSTREAM 0001-ssl-connect-used-non-monotonic-time.time-for-timeout.patch -- https://github.com/eventlet/eventlet/commit/a28a275393d3c3ae3c3a5341cc4764f… +Patch1: 0001-ssl-connect-used-non-monotonic-time.time-for-timeout.patch +# PATCH-FIX-UPSTREAM 0002-Fix-for-Python-3.7-506.patch -- https://github.com/eventlet/eventlet/commit/cf47cb518db3e0dbdd48473fb40cf9f… +Patch2: 0002-Fix-for-Python-3.7-506.patch +# PATCH-FIX-UPSTREAM 0003-Fix-compatibility-with-Python-3.7-ssl.SSLSocket-531.patch -- https://github.com/eventlet/eventlet/commit/a915bb642dd6cd4e92c959addff3050… +Patch3: 0003-Fix-compatibility-with-Python-3.7-ssl.SSLSocket-531.patch + BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module greenlet} BuildRequires: %{python_module setuptools} @@ -63,6 +72,10 @@ %prep %setup -q -n eventlet-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 sed -i '/enum.compat/d' setup.py # crude way to drop the strange "enum-compat" requirement sed -i "s|^#!.*||" eventlet/support/greendns.py # Fix non-executable script ++++++ 0001-IMPORTANT-late-import-in-use_hub-thread-race-caused-.patch ++++++ ++++ 717 lines (skipped) ++++++ 0001-ssl-connect-used-non-monotonic-time.time-for-timeout.patch ++++++ >From a28a275393d3c3ae3c3a5341cc4764fad21be3e5 Mon Sep 17 00:00:00 2001 From: Sergey Shepelev <temotor(a)gmail.com> Date: Mon, 27 Aug 2018 00:22:35 +0500 Subject: [PATCH 1/3] ssl: connect used non-monotonic time.time() for timeout (#520) Origin: https://github.com/eventlet/eventlet/pull/517 Related: https://github.com/eventlet/eventlet/pull/388 https://github.com/eventlet/eventlet/pull/303 https://github.com/eventlet/eventlet/issues/270 https://github.com/eventlet/eventlet/issues/132 --- eventlet/green/ssl.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py index 53ee9a3..577afba 100644 --- a/eventlet/green/ssl.py +++ b/eventlet/green/ssl.py @@ -6,9 +6,8 @@ slurp_properties(__ssl, globals(), srckeys=dir(__ssl)) import errno import functools import sys -import time -from eventlet import greenio +from eventlet import greenio, hubs from eventlet.greenio import ( set_nonblocking, GreenSocket, CONNECT_ERR, CONNECT_SUCCESS, ) @@ -264,6 +263,7 @@ class GreenSSLSocket(_original_sslsocket): if self.act_non_blocking: return real_connect(self, addr) else: + clock = hubs.get_hub().clock # *NOTE: gross, copied code from greenio because it's not factored # well enough to reuse if self.gettimeout() is None: @@ -278,7 +278,7 @@ class GreenSSLSocket(_original_sslsocket): else: raise else: - end = time.time() + self.gettimeout() + end = clock() + self.gettimeout() while True: try: real_connect(self, addr) @@ -286,12 +286,12 @@ class GreenSSLSocket(_original_sslsocket): if get_errno(exc) in CONNECT_ERR: trampoline( self, write=True, - timeout=end - time.time(), timeout_exc=timeout_exc('timed out')) + timeout=end - clock(), timeout_exc=timeout_exc('timed out')) elif get_errno(exc) in CONNECT_SUCCESS: return else: raise - if time.time() >= end: + if clock() >= end: raise timeout_exc('timed out') def connect(self, addr): -- 2.21.0 ++++++ 0002-Fix-for-Python-3.7-506.patch ++++++ >From cf47cb518db3e0dbdd48473fb40cf9f6ecd50e07 Mon Sep 17 00:00:00 2001 From: Marcel Plch <mplch(a)redhat.com> Date: Fri, 28 Sep 2018 17:08:59 +0200 Subject: [PATCH 2/3] Fix for Python 3.7 (#506) * Fix for Python 3.7 * Remove redundant piece of code. * Put back do_handshake_on_connect kwarg * Use Python 3.7 instead of 3.7-dev * Fix buildbot failing permissions with 3.7 * tests: env_tpool_zero assert details * setup: Python 3.7 classificator --- eventlet/green/ssl.py | 46 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py index 577afba..53dff70 100644 --- a/eventlet/green/ssl.py +++ b/eventlet/green/ssl.py @@ -23,6 +23,7 @@ __patched__ = [ 'create_default_context', '_create_default_https_context'] _original_sslsocket = __ssl.SSLSocket +_original_wrap_socket = __ssl.wrap_socket class GreenSSLSocket(_original_sslsocket): @@ -56,11 +57,41 @@ class GreenSSLSocket(_original_sslsocket): # this assignment self._timeout = sock.gettimeout() - # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled - # even when it's on - super(GreenSSLSocket, self).__init__( - sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version, - ca_certs, do_handshake_on_connect and six.PY2, *args, **kw) + if sys.version_info >= (3, 7): + # Monkey-patch the sslsocket so our modified self gets + # injected into its _create method. + def fake_new(self, cls, *args, **kwargs): + return self + + orig_new = _original_sslsocket.__new__ + try: + _original_sslsocket.__new__ = fake_new.__get__(self, GreenSSLSocket) + + self = _original_wrap_socket( + sock=sock.fd, + keyfile=keyfile, + certfile=certfile, + server_side=server_side, + cert_reqs=cert_reqs, + ssl_version=ssl_version, + ca_certs=ca_certs, + do_handshake_on_connect=False, + *args, **kw + ) + self.keyfile = keyfile + self.certfile = certfile + self.cert_reqs = cert_reqs + self.ssl_version = ssl_version + self.ca_certs = ca_certs + finally: + # Unpatch + _original_sslsocket.__new__ = orig_new + else: + # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled + # even when it's on + super(GreenSSLSocket, self).__init__( + sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version, + ca_certs, do_handshake_on_connect and six.PY2, *args, **kw) # the superclass initializer trashes the methods so we remove # the local-object versions of them and let the actual class @@ -323,7 +354,10 @@ class GreenSSLSocket(_original_sslsocket): except NameError: self._sslobj = sslobj else: - self._sslobj = SSLObject(sslobj, owner=self) + if sys.version_info < (3, 7): + self._sslobj = SSLObject(sslobj, owner=self) + else: + self._sslobj = sslobj if self.do_handshake_on_connect: self.do_handshake() -- 2.21.0 ++++++ 0003-Fix-compatibility-with-Python-3.7-ssl.SSLSocket-531.patch ++++++ >From a915bb642dd6cd4e92c959addff30509977a637c Mon Sep 17 00:00:00 2001 From: Junyi <xmaswillyou(a)gmail.com> Date: Wed, 30 Jan 2019 00:10:31 -0800 Subject: [PATCH 3/3] Fix compatibility with Python 3.7 ssl.SSLSocket (#531) --- eventlet/green/ssl.py | 86 ++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 37 deletions(-) diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py index 53dff70..9504aef 100644 --- a/eventlet/green/ssl.py +++ b/eventlet/green/ssl.py @@ -3,10 +3,7 @@ __ssl = __import__('ssl') from eventlet.patcher import slurp_properties slurp_properties(__ssl, globals(), srckeys=dir(__ssl)) -import errno -import functools import sys - from eventlet import greenio, hubs from eventlet.greenio import ( set_nonblocking, GreenSocket, CONNECT_ERR, CONNECT_SUCCESS, @@ -14,6 +11,8 @@ from eventlet.greenio import ( from eventlet.hubs import trampoline, IOClosed from eventlet.support import get_errno, PY33 import six +from contextlib import contextmanager + orig_socket = __import__('socket') socket = orig_socket.socket timeout_exc = SSLError @@ -24,6 +23,21 @@ __patched__ = [ _original_sslsocket = __ssl.SSLSocket _original_wrap_socket = __ssl.wrap_socket +_original_sslcontext = getattr(__ssl, 'SSLContext', None) +_is_under_py_3_7 = sys.version_info < (3, 7) + + +@contextmanager +def _original_ssl_context(*args, **kwargs): + tmp_sslcontext = _original_wrap_socket.__globals__.get('SSLContext', None) + tmp_sslsocket = _original_sslsocket._create.__globals__.get('SSLSocket', None) + _original_sslsocket._create.__globals__['SSLSocket'] = _original_sslsocket + _original_wrap_socket.__globals__['SSLContext'] = _original_sslcontext + try: + yield + finally: + _original_wrap_socket.__globals__['SSLContext'] = tmp_sslcontext + _original_sslsocket._create.__globals__['SSLSocket'] = tmp_sslsocket class GreenSSLSocket(_original_sslsocket): @@ -40,16 +54,43 @@ class GreenSSLSocket(_original_sslsocket): settimeout(), and to close/reopen the connection when a timeout occurs at an unexpected juncture in the code. """ + def __new__(cls, sock=None, keyfile=None, certfile=None, + server_side=False, cert_reqs=CERT_NONE, + ssl_version=PROTOCOL_SSLv23, ca_certs=None, + do_handshake_on_connect=True, *args, **kw): + if _is_under_py_3_7: + return super(GreenSSLSocket, cls).__new__(cls) + else: + if not isinstance(sock, GreenSocket): + sock = GreenSocket(sock) + with _original_ssl_context(): + ret = _original_wrap_socket( + sock=sock.fd, + keyfile=keyfile, + certfile=certfile, + server_side=server_side, + cert_reqs=cert_reqs, + ssl_version=ssl_version, + ca_certs=ca_certs, + do_handshake_on_connect=False, + *args, **kw + ) + ret.keyfile = keyfile + ret.certfile = certfile + ret.cert_reqs = cert_reqs + ret.ssl_version = ssl_version + ret.ca_certs = ca_certs + ret.__class__ = GreenSSLSocket + return ret + # we are inheriting from SSLSocket because its constructor calls # do_handshake whose behavior we wish to override - def __init__(self, sock, keyfile=None, certfile=None, server_side=False, cert_reqs=CERT_NONE, ssl_version=PROTOCOL_SSLv23, ca_certs=None, do_handshake_on_connect=True, *args, **kw): if not isinstance(sock, GreenSocket): sock = GreenSocket(sock) - self.act_non_blocking = sock.act_non_blocking if six.PY2: @@ -57,42 +98,12 @@ class GreenSSLSocket(_original_sslsocket): # this assignment self._timeout = sock.gettimeout() - if sys.version_info >= (3, 7): - # Monkey-patch the sslsocket so our modified self gets - # injected into its _create method. - def fake_new(self, cls, *args, **kwargs): - return self - - orig_new = _original_sslsocket.__new__ - try: - _original_sslsocket.__new__ = fake_new.__get__(self, GreenSSLSocket) - - self = _original_wrap_socket( - sock=sock.fd, - keyfile=keyfile, - certfile=certfile, - server_side=server_side, - cert_reqs=cert_reqs, - ssl_version=ssl_version, - ca_certs=ca_certs, - do_handshake_on_connect=False, - *args, **kw - ) - self.keyfile = keyfile - self.certfile = certfile - self.cert_reqs = cert_reqs - self.ssl_version = ssl_version - self.ca_certs = ca_certs - finally: - # Unpatch - _original_sslsocket.__new__ = orig_new - else: + if _is_under_py_3_7: # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled # even when it's on super(GreenSSLSocket, self).__init__( sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version, ca_certs, do_handshake_on_connect and six.PY2, *args, **kw) - # the superclass initializer trashes the methods so we remove # the local-object versions of them and let the actual class # methods shine through @@ -354,7 +365,7 @@ class GreenSSLSocket(_original_sslsocket): except NameError: self._sslobj = sslobj else: - if sys.version_info < (3, 7): + if _is_under_py_3_7: self._sslobj = SSLObject(sslobj, owner=self) else: self._sslobj = sslobj @@ -396,6 +407,7 @@ class GreenSSLSocket(_original_sslsocket): def dup(self): raise NotImplementedError("Can't dup an ssl object") + SSLSocket = GreenSSLSocket -- 2.21.0

1 0

commit kernel-source for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2019-05-05 21:17:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Sun May 5 21:17:52 2019 rev:485 rq:700215 version:5.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2019-05-02 19:15:56.585253617 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.5148/dtb-aarch64.changes 2019-05-05 21:17:55.048704796 +0200 @@ -1,0 +2,182 @@ +Thu May 2 12:46:32 CEST 2019 - jslaby(a)suse.cz + +- Linux 5.0.11 (bnc#1012628). +- netfilter: nf_tables: bogus EBUSY when deleting set after flush + (bnc#1012628). +- netfilter: nf_tables: bogus EBUSY in helper removal from + transaction (bnc#1012628). +- intel_th: gth: Fix an off-by-one in output unassigning + (bnc#1012628). +- powerpc/vdso32: fix CLOCK_MONOTONIC on PPC64 (bnc#1012628). +- ALSA: hda/realtek - Move to ACT_INIT state (bnc#1012628). +- fs/proc/proc_sysctl.c: Fix a NULL pointer dereference + (bnc#1012628). +- block, bfq: fix use after free in bfq_bfqq_expire (bnc#1012628). +- cifs: fix memory leak in SMB2_read (bnc#1012628). +- cifs: fix page reference leak with readv/writev (bnc#1012628). +- cifs: do not attempt cifs operation on smb2+ rename error + (bnc#1012628). +- tracing: Fix a memory leak by early error exit in + trace_pid_write() (bnc#1012628). +- tracing: Fix buffer_ref pipe ops (bnc#1012628). +- crypto: xts - Fix atomic sleep when walking skcipher + (bnc#1012628). +- crypto: lrw - Fix atomic sleep when walking skcipher + (bnc#1012628). +- gpio: eic: sprd: Fix incorrect irq type setting for the sync + EIC (bnc#1012628). +- zram: pass down the bvec we need to read into in the work struct + (bnc#1012628). +- lib/Kconfig.debug: fix build error without CONFIG_BLOCK + (bnc#1012628). +- MIPS: scall64-o32: Fix indirect syscall number load + (bnc#1012628). +- trace: Fix preempt_enable_no_resched() abuse (bnc#1012628). +- mm: do not boost watermarks to avoid fragmentation for the + DISCONTIG memory model (bnc#1012628). +- arm64: mm: Ensure tail of unaligned initrd is reserved + (bnc#1012628). +- IB/rdmavt: Fix frwr memory registration (bnc#1012628). +- RDMA/mlx5: Do not allow the user to write to the clock page + (bnc#1012628). +- RDMA/mlx5: Use rdma_user_map_io for mapping BAR pages + (bnc#1012628). +- RDMA/ucontext: Fix regression with disassociate (bnc#1012628). +- sched/numa: Fix a possible divide-by-zero (bnc#1012628). +- ceph: only use d_name directly when parent is locked + (bnc#1012628). +- ceph: ensure d_name stability in ceph_dentry_hash() + (bnc#1012628). +- ceph: fix ci->i_head_snapc leak (bnc#1012628). +- nfsd: Don't release the callback slot unless it was actually + held (bnc#1012628). +- nfsd: wake waiters blocked on file_lock before deleting it + (bnc#1012628). +- nfsd: wake blocked file lock waiters before sending callback + (bnc#1012628). +- sunrpc: don't mark uninitialised items as VALID (bnc#1012628). +- perf/x86/intel: Update KBL Package C-state events to also + include PC8/PC9/PC10 counters (bnc#1012628). +- Input: synaptics-rmi4 - write config register values to the + right offset (bnc#1012628). +- dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid + (bnc#1012628). +- dmaengine: sh: rcar-dmac: Fix glitch in dmaengine_tx_status + (bnc#1012628). +- dmaengine: mediatek-cqdma: fix wrong register usage in + mtk_cqdma_start (bnc#1012628). +- ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning + the cache (bnc#1012628). +- powerpc/mm/radix: Make Radix require HUGETLB_PAGE (bnc#1012628). +- drm/vc4: Fix memory leak during gpu reset (bnc#1012628). +- drm/ttm: fix re-init of global structures (bnc#1012628). +- drm/vc4: Fix compilation error reported by kbuild test bot + (bnc#1012628). +- USB: Add new USB LPM helpers (bnc#1012628). +- USB: Consolidate LPM checks to avoid enabling LPM twice + (bnc#1012628). +- ext4: fix some error pointer dereferences (bnc#1012628). +- loop: do not print warn message if partition scan is successful + (bnc#1012628). +- tipc: handle the err returned from cmd header function + (bnc#1012628). +- slip: make slhc_free() silently accept an error pointer + (bnc#1012628). +- workqueue: Try to catch flush_work() without INIT_WORK() + (bnc#1012628). +- binder: fix handling of misaligned binder object (bnc#1012628). +- sched/deadline: Correctly handle active 0-lag timers + (bnc#1012628). +- mac80211_hwsim: calculate if_combination.max_interfaces + (bnc#1012628). +- NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family + (bnc#1012628). +- netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON + (bnc#1012628). +- fm10k: Fix a potential NULL pointer dereference (bnc#1012628). +- tipc: check bearer name with right length in + tipc_nl_compat_bearer_enable (bnc#1012628). +- tipc: check link name with right length in + tipc_nl_compat_link_set (bnc#1012628). +- net: netrom: Fix error cleanup path of nr_proto_init + (bnc#1012628). +- net/rds: Check address length before reading address family + (bnc#1012628). +- rxrpc: fix race condition in rxrpc_input_packet() (bnc#1012628). +- pin iocb through aio (bnc#1012628). +- aio: fold lookup_kiocb() into its sole caller (bnc#1012628). +- aio: keep io_event in aio_kiocb (bnc#1012628). +- aio: store event at final iocb_put() (bnc#1012628). +- Fix aio_poll() races (bnc#1012628). +- x86, retpolines: Raise limit for generating indirect calls + from switch-case (bnc#1012628). +- x86/retpolines: Disable switch jump tables when retpolines + are enabled (bnc#1012628). +- rdma: fix build errors on s390 and MIPS due to bad ZERO_PAGE + use (bnc#1012628). +- ipv4: add sanity checks in ipv4_link_failure() (bnc#1012628). +- ipv4: set the tcp_min_rtt_wlen range from 0 to one day + (bnc#1012628). +- mlxsw: spectrum: Fix autoneg status in ethtool (bnc#1012628). +- net/mlx5e: ethtool, Remove unsupported SFP EEPROM high pages + query (bnc#1012628). +- net: rds: exchange of 8K and 1M pool (bnc#1012628). +- net/rose: fix unbound loop in rose_loopback_timer() + (bnc#1012628). +- net: stmmac: move stmmac_check_ether_addr() to driver probe + (bnc#1012628). +- net/tls: fix refcount adjustment in fallback (bnc#1012628). +- stmmac: pci: Adjust IOT2000 matching (bnc#1012628). +- team: fix possible recursive locking when add slaves + (bnc#1012628). +- net: socionext: replace napi_alloc_frag with the netdev variant + on init (bnc#1012628). +- net/ncsi: handle overflow when incrementing mac address + (bnc#1012628). +- mlxsw: pci: Reincrease PCI reset timeout (bnc#1012628). +- mlxsw: spectrum: Put MC TCs into DWRR mode (bnc#1012628). +- net/mlx5e: Fix the max MTU check in case of XDP (bnc#1012628). +- net/mlx5e: Fix use-after-free after xdp_return_frame + (bnc#1012628). +- net/tls: avoid potential deadlock in tls_set_device_offload_rx() + (bnc#1012628). +- net/tls: don't leak IV and record seq when offload fails + (bnc#1012628). +- commit 07c5318 + +------------------------------------------------------------------- +Wed May 1 23:18:08 CEST 2019 - tiwai(a)suse.de + +- Revert "ACPICA: Clear status of GPEs before enabling them" + (bsc#1132943). +- commit 13cf3aa + +------------------------------------------------------------------- +Tue Apr 30 13:57:42 CEST 2019 - tiwai(a)suse.de + +- HID: i2c-hid: Ignore input report if there's no data present + on Elan touchpanels (bsc#1133486). +- commit 5a94296 + +------------------------------------------------------------------- +Tue Apr 30 07:14:58 CEST 2019 - jslaby(a)suse.cz + +- KVM: x86: Whitelist port 0x7e for pre-incrementing %rip + (bnc#1132694). +- Delete patches.suse/kvm-Workaround-OUT-0x7E.patch. + Update per upstream. +- commit 93ba681 + +------------------------------------------------------------------- +Mon Apr 29 13:05:50 CEST 2019 - jslaby(a)suse.cz + +- memcg: make it work on sparse non-0-node systems (bnc#1133616). +- commit c0ba22a + +------------------------------------------------------------------- +Mon Apr 29 08:52:32 CEST 2019 - jslaby(a)suse.cz + +- Workaround Qemu "OUT 0x7E" handling in KVM (bnc#1132694). +- commit e8fc1e9 + +------------------------------------------------------------------- dtb-armv6l.changes: same change dtb-armv7l.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-kvmsmall.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:17:59.868717927 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:17:59.872717938 +0200 @@ -17,7 +17,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) Name: dtb-aarch64 -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:17:59.928718091 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:17:59.932718101 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %define vanilla_only 0 @@ -62,9 +62,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 -Provides: kernel-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: kernel-%build_flavor-base-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c +Provides: kernel-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c # END COMMON DEPS -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:17:59.948718145 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:17:59.948718145 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %define vanilla_only 0 @@ -62,9 +62,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 -Provides: kernel-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: kernel-%build_flavor-base-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c +Provides: kernel-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c # END COMMON DEPS -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:17:59.964718188 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:17:59.968718199 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %define vanilla_only 0 @@ -62,9 +62,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 -Provides: kernel-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: kernel-%build_flavor-base-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c +Provides: kernel-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c # END COMMON DEPS -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:17:59.984718243 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:17:59.984718243 +0200 @@ -17,7 +17,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -63,7 +63,7 @@ %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:00.000718286 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:00.004718297 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %define vanilla_only 0 @@ -62,9 +62,9 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0 Group: System/Kernel -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 -Provides: kernel-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: kernel-%build_flavor-base-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c +Provides: kernel-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c # END COMMON DEPS -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:00.036718385 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:00.040718395 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +BuildRequires: kernel%kernel_flavor-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c %if 0%{?rhel_version} BuildRequires: kernel @@ -64,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:00.060718450 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:00.060718450 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:00.076718493 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:00.080718504 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %define vanilla_only 0 @@ -62,9 +62,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 -Provides: kernel-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: kernel-%build_flavor-base-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c +Provides: kernel-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c # END COMMON DEPS -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:00.096718548 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:00.096718548 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:00.116718602 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:00.120718614 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 5.0.10 +Version: 5.0.11 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -55,7 +55,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:00.136718657 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:00.140718668 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.10 +%define patchversion 5.0.11 %define variant %{nil} %define vanilla_only 0 @@ -62,9 +62,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 5.0.10 +Version: 5.0.11 %if 0%{?is_kotd} -Release: <RELEASE>.g048e1d2 +Release: <RELEASE>.g07c5318 %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 -Provides: kernel-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: kernel-%build_flavor-base-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c +Provides: kernel-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c # END COMMON DEPS -Provides: %name-srchash-048e1d279e4d522573b14fa5405b2800b5f4a191 +Provides: %name-srchash-07c53183bf911e733d5fdb4c59d1527c9697dc5c %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh kernel-zfcpdump.spec: same change ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 7729 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/HID-i2c-hid-Ignore-input-report-if-there-s-no-data-p.patch new/patches.suse/HID-i2c-hid-Ignore-input-report-if-there-s-no-data-p.patch --- old/patches.suse/HID-i2c-hid-Ignore-input-report-if-there-s-no-data-p.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/HID-i2c-hid-Ignore-input-report-if-there-s-no-data-p.patch 2019-05-02 12:46:32.000000000 +0200 @@ -0,0 +1,58 @@ +From 1475af255e18f35dc46f8a7acc18354c73d45149 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng <kai.heng.feng(a)canonical.com> +Date: Mon, 7 Jan 2019 15:24:29 +0800 +Subject: [PATCH] HID: i2c-hid: Ignore input report if there's no data present on Elan touchpanels +Git-commit: 1475af255e18f35dc46f8a7acc18354c73d45149 +Patch-mainline: v5.1-rc1 +References: bsc#1133486 + +While using Elan touchpads, the message floods: +[ 136.138487] i2c_hid i2c-DELL08D6:00: i2c_hid_get_input: incomplete report (14/65535) + +Though the message flood is annoying, the device it self works without +any issue. I suspect that the device in question takes too much time to +pull the IRQ back to high after I2C host has done reading its data. + +Since the host receives all useful data, let's ignore the input report +when there's no data. + +Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> +Signed-off-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> +Acked-by: Takashi Iwai <tiwai(a)suse.de> + +--- + drivers/hid/i2c-hid/i2c-hid-core.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/drivers/hid/i2c-hid/i2c-hid-core.c ++++ b/drivers/hid/i2c-hid/i2c-hid-core.c +@@ -50,6 +50,7 @@ + #define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET BIT(1) + #define I2C_HID_QUIRK_NO_RUNTIME_PM BIT(2) + #define I2C_HID_QUIRK_DELAY_AFTER_SLEEP BIT(3) ++#define I2C_HID_QUIRK_BOGUS_IRQ BIT(4) + + /* flags */ + #define I2C_HID_STARTED 0 +@@ -181,6 +182,8 @@ static const struct i2c_hid_quirks { + I2C_HID_QUIRK_NO_RUNTIME_PM }, + { I2C_VENDOR_ID_GOODIX, I2C_DEVICE_ID_GOODIX_01F0, + I2C_HID_QUIRK_NO_RUNTIME_PM }, ++ { USB_VENDOR_ID_ELAN, HID_ANY_ID, ++ I2C_HID_QUIRK_BOGUS_IRQ }, + { 0, 0 } + }; + +@@ -505,6 +508,12 @@ static void i2c_hid_get_input(struct i2c + return; + } + ++ if (ihid->quirks & I2C_HID_QUIRK_BOGUS_IRQ && ret_size == 0xffff) { ++ dev_warn_once(&ihid->client->dev, "%s: IRQ triggered but " ++ "there's no data\n", __func__); ++ return; ++ } ++ + if ((ret_size > size) || (ret_size < 2)) { + dev_err(&ihid->client->dev, "%s: incomplete report (%d/%d)\n", + __func__, size, ret_size); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/KVM-x86-Whitelist-port-0x7e-for-pre-incrementing-rip.patch new/patches.suse/KVM-x86-Whitelist-port-0x7e-for-pre-incrementing-rip.patch --- old/patches.suse/KVM-x86-Whitelist-port-0x7e-for-pre-incrementing-rip.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/KVM-x86-Whitelist-port-0x7e-for-pre-incrementing-rip.patch 2019-05-02 12:46:32.000000000 +0200 @@ -0,0 +1,96 @@ +From: Sean Christopherson <sean.j.christopherson(a)intel.com> +Date: Mon, 29 Apr 2019 07:04:15 -0700 +Subject: KVM: x86: Whitelist port 0x7e for pre-incrementing %rip +Patch-mainline: submitted on 2019/04/29 +References: bnc#1132694 + +KVM's recent bug fix to update %rip after emulating I/O broke userspace +that relied on the previous behavior of incrementing %rip prior to +exiting to userspace. When running a Windows XP guest on AMD hardware, +Qemu may patch "OUT 0x7E" instructions in reaction to the OUT itself. +Because KVM's old behavior was to increment %rip before exiting to +userspace to handle the I/O, Qemu manually adjusted %rip to account for +the OUT instruction. + +Arguably this is a userspace bug as KVM requires userspace to re-enter +the kernel to complete instruction emulation before taking any other +actions. That being said, this is a bit of a grey area and breaking +userspace that has worked for many years is bad. + +Pre-increment %rip on OUT to port 0x7e before exiting to userspace to +hack around the issue. + +Fixes: 45def77ebf79e ("KVM: x86: update %rip after emulating IO") +Reported-by: Simon Becherer <simon(a)becherer.de> +Reported-and-tested-by: Iakov Karpov <srid(a)rkmail.ru> +Reported-by: Gabriele Balducci <balducci(a)units.it> +Reported-by: Antti Antinoja <reader(a)fennosys.fi> +Cc: stable(a)vger.kernel.org +Cc: Takashi Iwai <tiwai(a)suse.com> +Cc: Jiri Slaby <jslaby(a)suse.com> +Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> +Signed-off-by: Sean Christopherson <sean.j.christopherson(a)intel.com> +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +--- + arch/x86/include/uapi/asm/kvm.h | 1 + + arch/x86/kvm/x86.c | 21 +++++++++++++++++++-- + 2 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h +index dabfcf7c3941..7a0e64ccd6ff 100644 +--- a/arch/x86/include/uapi/asm/kvm.h ++++ b/arch/x86/include/uapi/asm/kvm.h +@@ -381,6 +381,7 @@ struct kvm_sync_regs { + #define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0) + #define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1) + #define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2) ++#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3) + + #define KVM_STATE_NESTED_GUEST_MODE 0x00000001 + #define KVM_STATE_NESTED_RUN_PENDING 0x00000002 +diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c +index c55fcab15a7b..0b38aec15cf3 100644 +--- a/arch/x86/kvm/x86.c ++++ b/arch/x86/kvm/x86.c +@@ -6554,6 +6554,12 @@ int kvm_emulate_instruction_from_buffer(struct kvm_vcpu *vcpu, + } + EXPORT_SYMBOL_GPL(kvm_emulate_instruction_from_buffer); + ++static int complete_fast_pio_out_port_0x7e(struct kvm_vcpu *vcpu) ++{ ++ vcpu->arch.pio.count = 0; ++ return 1; ++} ++ + static int complete_fast_pio_out(struct kvm_vcpu *vcpu) + { + vcpu->arch.pio.count = 0; +@@ -6570,12 +6576,23 @@ static int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, + unsigned long val = kvm_register_read(vcpu, VCPU_REGS_RAX); + int ret = emulator_pio_out_emulated(&vcpu->arch.emulate_ctxt, + size, port, &val, 1); ++ if (ret) ++ return ret; + +- if (!ret) { ++ /* ++ * Workaround userspace that relies on old KVM behavior of %rip being ++ * incremented prior to exiting to userspace to handle "OUT 0x7e". ++ */ ++ if (port == 0x7e && ++ kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_OUT_7E_INC_RIP)) { ++ vcpu->arch.complete_userspace_io = ++ complete_fast_pio_out_port_0x7e; ++ kvm_skip_emulated_instruction(vcpu); ++ } else { + vcpu->arch.pio.linear_rip = kvm_get_linear_rip(vcpu); + vcpu->arch.complete_userspace_io = complete_fast_pio_out; + } +- return ret; ++ return 0; + } + + static int complete_fast_pio_in(struct kvm_vcpu *vcpu) +-- +2.21.0 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-ACPICA-Clear-status-of-GPEs-before-enabling-t.patch new/patches.suse/Revert-ACPICA-Clear-status-of-GPEs-before-enabling-t.patch --- old/patches.suse/Revert-ACPICA-Clear-status-of-GPEs-before-enabling-t.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/Revert-ACPICA-Clear-status-of-GPEs-before-enabling-t.patch 2019-05-02 12:46:32.000000000 +0200 @@ -0,0 +1,52 @@ +From 2c2a2fb1e2a9256714338875bede6b7cbd4b9542 Mon Sep 17 00:00:00 2001 +From: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com> +Date: Tue, 30 Apr 2019 11:18:21 +0200 +Subject: [PATCH] Revert "ACPICA: Clear status of GPEs before enabling them" +Git-commit: 2c2a2fb1e2a9256714338875bede6b7cbd4b9542 +Patch-mainline: v5.1 +References: bsc#1132943 + +Revert commit c8b1917c8987 ("ACPICA: Clear status of GPEs before +enabling them") that causes problems with Thunderbolt controllers +to occur if a dock device is connected at init time (the xhci_hcd +and thunderbolt modules crash which prevents peripherals connected +through them from working). + +Commit c8b1917c8987 effectively causes commit ecc1165b8b74 ("ACPICA: +Dispatch active GPEs at init time") to get undone, so the problem +addressed by commit ecc1165b8b74 appears again as a result of it. + +Fixes: c8b1917c8987 ("ACPICA: Clear status of GPEs before enabling them") +Link: https://lore.kernel.org/lkml/s5hy33siofw.wl-tiwai@suse.de/T/#u +Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1132943 +Reported-by: Michael Hirmke <opensuse(a)mike.franken.de> +Reported-by: Takashi Iwai <tiwai(a)suse.de> +Cc: 4.17+ <stable(a)vger.kernel.org> # 4.17+ +Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> +Acked-by: Takashi Iwai <tiwai(a)suse.de> + +--- + drivers/acpi/acpica/evgpe.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c +index 5e9d7348c16f..62d3aa74277b 100644 +--- a/drivers/acpi/acpica/evgpe.c ++++ b/drivers/acpi/acpica/evgpe.c +@@ -81,12 +81,8 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) + + ACPI_FUNCTION_TRACE(ev_enable_gpe); + +- /* Clear the GPE status */ +- status = acpi_hw_clear_gpe(gpe_event_info); +- if (ACPI_FAILURE(status)) +- return_ACPI_STATUS(status); +- + /* Enable the requested GPE */ ++ + status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE); + return_ACPI_STATUS(status); + } +-- +2.16.4 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch new/patches.suse/Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch --- old/patches.suse/Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch 2019-04-27 20:39:53.000000000 +0200 +++ new/patches.suse/Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -From 09641f5216bc9c4f0cc5b820cc7ec3524262d13e Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai(a)suse.de> -Date: Sun, 31 Mar 2019 09:54:04 +0200 -Subject: [PATCH] Revert "drm/i915/fbdev: Actually configure untiled displays" -Patch-mainline: Never, a tentative fix until X driver gets fixed -References: bsc#1129027, bsc#1131048 - -This reverts commit d179b88deb3bf6fed4991a31fd6f0f2cad21fab5. -It causes a regression on old i915 chipset that leads to a blank -screen when used with X modesetting driver. - -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> - ---- - drivers/gpu/drm/i915/intel_fbdev.c | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c -index e8f694b57b8a..376ffe842e26 100644 ---- a/drivers/gpu/drm/i915/intel_fbdev.c -+++ b/drivers/gpu/drm/i915/intel_fbdev.c -@@ -338,8 +338,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, - bool *enabled, int width, int height) - { - struct drm_i915_private *dev_priv = to_i915(fb_helper->dev); -+ unsigned long conn_configured, conn_seq, mask; - unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG); -- unsigned long conn_configured, conn_seq; - int i, j; - bool *save_enabled; - bool fallback = true, ret = true; -@@ -357,9 +357,10 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, - drm_modeset_backoff(&ctx); - - memcpy(save_enabled, enabled, count); -- conn_seq = GENMASK(count - 1, 0); -+ mask = GENMASK(count - 1, 0); - conn_configured = 0; - retry: -+ conn_seq = conn_configured; - for (i = 0; i < count; i++) { - struct drm_fb_helper_connector *fb_conn; - struct drm_connector *connector; -@@ -372,8 +373,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, - if (conn_configured & BIT(i)) - continue; - -- /* First pass, only consider tiled connectors */ -- if (conn_seq == GENMASK(count - 1, 0) && !connector->has_tile) -+ if (conn_seq == 0 && !connector->has_tile) - continue; - - if (connector->status == connector_status_connected) -@@ -477,10 +477,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, - conn_configured |= BIT(i); - } - -- if (conn_configured != conn_seq) { /* repeat until no more are found */ -- conn_seq = conn_configured; -+ if ((conn_configured & mask) != mask && conn_configured != conn_seq) - goto retry; -- } - - /* - * If the BIOS didn't enable everything it could, fall back to have the --- -2.16.4 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/memcg-make-it-work-on-sparse-non-0-node-systems.patch new/patches.suse/memcg-make-it-work-on-sparse-non-0-node-systems.patch --- old/patches.suse/memcg-make-it-work-on-sparse-non-0-node-systems.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/memcg-make-it-work-on-sparse-non-0-node-systems.patch 2019-05-02 12:46:32.000000000 +0200 @@ -0,0 +1,71 @@ +From: Jiri Slaby <jslaby(a)suse.cz> +Date: Mon, 29 Apr 2019 12:39:10 +0200 +Subject: memcg: make it work on sparse non-0-node systems +Patch-mainline: submitted on 2019/04/29 +References: bnc#1133616 + +We have a single node system with node 0 disabled: + Scanning NUMA topology in Northbridge 24 + Number of physical nodes 2 + Skipping disabled node 0 + Node 1 MemBase 0000000000000000 Limit 00000000fbff0000 + NODE_DATA(1) allocated [mem 0xfbfda000-0xfbfeffff] + +This causes crashes in memcg when system boots: + BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 + #PF error: [normal kernel read fault] +... + RIP: 0010:list_lru_add+0x94/0x170 +... + Call Trace: + d_lru_add+0x44/0x50 + dput.part.34+0xfc/0x110 + __fput+0x108/0x230 + task_work_run+0x9f/0xc0 + exit_to_usermode_loop+0xf5/0x100 + +It is reproducible as far as 4.12. I did not try older kernels. You have +to have a new enough systemd, e.g. 241 (the reason is unknown -- was not +investigated). Cannot be reproduced with systemd 234. + +The system crashes because the size of lru array is never updated in +memcg_update_all_list_lrus and the reads are past the zero-sized array, +causing dereferences of random memory. + +The root cause are list_lru_memcg_aware checks in the list_lru code. +The test in list_lru_memcg_aware is broken: it assumes node 0 is always +present, but it is not true on some systems as can be seen above. + +So fix this by checking the first online node instead of node 0. + +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +Cc: Johannes Weiner <hannes(a)cmpxchg.org> +Cc: Michal Hocko <mhocko(a)kernel.org> +Cc: Vladimir Davydov <vdavydov.dev(a)gmail.com> +Cc: <cgroups(a)vger.kernel.org> +Cc: <linux-mm(a)kvack.org> +Cc: Raghavendra K T <raghavendra.kt(a)linux.vnet.ibm.com> +--- + mm/list_lru.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/mm/list_lru.c b/mm/list_lru.c +index 0730bf8ff39f..7689910f1a91 100644 +--- a/mm/list_lru.c ++++ b/mm/list_lru.c +@@ -37,11 +37,7 @@ static int lru_shrinker_id(struct list_lru *lru) + + static inline bool list_lru_memcg_aware(struct list_lru *lru) + { +- /* +- * This needs node 0 to be always present, even +- * in the systems supporting sparse numa ids. +- */ +- return !!lru->node[0].memcg_lrus; ++ return !!lru->node[first_online_node].memcg_lrus; + } + + static inline struct list_lru_one * +-- +2.21.0 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/vfio-type1-limit-dma-mappings-per-container new/patches.suse/vfio-type1-limit-dma-mappings-per-container --- old/patches.suse/vfio-type1-limit-dma-mappings-per-container 2019-04-27 20:39:53.000000000 +0200 +++ new/patches.suse/vfio-type1-limit-dma-mappings-per-container 1970-01-01 01:00:00.000000000 +0100 @@ -1,94 +0,0 @@ -From: Alex Williamson <alex.williamson(a)redhat.com> -Date: Wed, 3 Apr 2019 12:36:21 -0600 -Subject: vfio/type1: Limit DMA mappings per container -Git-commit: 492855939bdb59c6f947b0b5b44af9ad82b7e38c -Patch-mainline: v5.1-rc4 -References: CVE-2019-3882 bsc#1131427 - -Memory backed DMA mappings are accounted against a user's locked -memory limit, including multiple mappings of the same memory. This -accounting bounds the number of such mappings that a user can create. -However, DMA mappings that are not backed by memory, such as DMA -mappings of device MMIO via mmaps, do not make use of page pinning -and therefore do not count against the user's locked memory limit. -These mappings still consume memory, but the memory is not well -associated to the process for the purpose of oom killing a task. - -To add bounding on this use case, we introduce a limit to the total -number of concurrent DMA mappings that a user is allowed to create. -This limit is exposed as a tunable module option where the default -value of 64K is expected to be well in excess of any reasonable use -case (a large virtual machine configuration would typically only make -use of tens of concurrent mappings). - -This fixes CVE-2019-3882. - -Reviewed-by: Eric Auger <eric.auger(a)redhat.com> -Tested-by: Eric Auger <eric.auger(a)redhat.com> -Reviewed-by: Peter Xu <peterx(a)redhat.com> -Reviewed-by: Cornelia Huck <cohuck(a)redhat.com> -Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> -Acked-by: Joerg Roedel <jroedel(a)suse.de> ---- - drivers/vfio/vfio_iommu_type1.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c -index 73652e21efec..d0f731c9920a 100644 ---- a/drivers/vfio/vfio_iommu_type1.c -+++ b/drivers/vfio/vfio_iommu_type1.c -@@ -58,12 +58,18 @@ module_param_named(disable_hugepages, - MODULE_PARM_DESC(disable_hugepages, - "Disable VFIO IOMMU support for IOMMU hugepages."); - -+static unsigned int dma_entry_limit __read_mostly = U16_MAX; -+module_param_named(dma_entry_limit, dma_entry_limit, uint, 0644); -+MODULE_PARM_DESC(dma_entry_limit, -+ "Maximum number of user DMA mappings per container (65535)."); -+ - struct vfio_iommu { - struct list_head domain_list; - struct vfio_domain *external_domain; /* domain for external user */ - struct mutex lock; - struct rb_root dma_list; - struct blocking_notifier_head notifier; -+ unsigned int dma_avail; - bool v2; - bool nesting; - }; -@@ -836,6 +842,7 @@ static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma) - vfio_unlink_dma(iommu, dma); - put_task_struct(dma->task); - kfree(dma); -+ iommu->dma_avail++; - } - - static unsigned long vfio_pgsize_bitmap(struct vfio_iommu *iommu) -@@ -1081,12 +1088,18 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, - goto out_unlock; - } - -+ if (!iommu->dma_avail) { -+ ret = -ENOSPC; -+ goto out_unlock; -+ } -+ - dma = kzalloc(sizeof(*dma), GFP_KERNEL); - if (!dma) { - ret = -ENOMEM; - goto out_unlock; - } - -+ iommu->dma_avail--; - dma->iova = iova; - dma->vaddr = vaddr; - dma->prot = prot; -@@ -1583,6 +1596,7 @@ static void *vfio_iommu_type1_open(unsigned long arg) - - INIT_LIST_HEAD(&iommu->domain_list); - iommu->dma_list = RB_ROOT; -+ iommu->dma_avail = dma_entry_limit; - mutex_init(&iommu->lock); - BLOCKING_INIT_NOTIFIER_HEAD(&iommu->notifier); - - ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:01.272721751 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:01.272721751 +0200 @@ -1159,6 +1159,96 @@ patches.kernel.org/5.0.10-115-percpu-stop-printing-kernel-addresses.patch patches.kernel.org/5.0.10-116-kernel-sysctl.c-fix-out-of-bounds-access-when… patches.kernel.org/5.0.10-117-Linux-5.0.10.patch + patches.kernel.org/5.0.11-001-netfilter-nf_tables-bogus-EBUSY-when-deleting… + patches.kernel.org/5.0.11-002-netfilter-nf_tables-bogus-EBUSY-in-helper-rem… + patches.kernel.org/5.0.11-003-intel_th-gth-Fix-an-off-by-one-in-output-unas… + patches.kernel.org/5.0.11-004-powerpc-vdso32-fix-CLOCK_MONOTONIC-on-PPC64.p… + patches.kernel.org/5.0.11-005-ALSA-hda-realtek-Move-to-ACT_INIT-state.patch + patches.kernel.org/5.0.11-006-fs-proc-proc_sysctl.c-Fix-a-NULL-pointer-dere… + patches.kernel.org/5.0.11-007-block-bfq-fix-use-after-free-in-bfq_bfqq_expi… + patches.kernel.org/5.0.11-008-cifs-fix-memory-leak-in-SMB2_read.patch + patches.kernel.org/5.0.11-009-cifs-fix-page-reference-leak-with-readv-write… + patches.kernel.org/5.0.11-010-cifs-do-not-attempt-cifs-operation-on-smb2-re… + patches.kernel.org/5.0.11-011-tracing-Fix-a-memory-leak-by-early-error-exit… + patches.kernel.org/5.0.11-012-tracing-Fix-buffer_ref-pipe-ops.patch + patches.kernel.org/5.0.11-013-crypto-xts-Fix-atomic-sleep-when-walking-skci… + patches.kernel.org/5.0.11-014-crypto-lrw-Fix-atomic-sleep-when-walking-skci… + patches.kernel.org/5.0.11-015-gpio-eic-sprd-Fix-incorrect-irq-type-setting-… + patches.kernel.org/5.0.11-016-zram-pass-down-the-bvec-we-need-to-read-into-… + patches.kernel.org/5.0.11-017-lib-Kconfig.debug-fix-build-error-without-CON… + patches.kernel.org/5.0.11-018-MIPS-scall64-o32-Fix-indirect-syscall-number-… + patches.kernel.org/5.0.11-019-trace-Fix-preempt_enable_no_resched-abuse.pat… + patches.kernel.org/5.0.11-020-mm-do-not-boost-watermarks-to-avoid-fragmenta… + patches.kernel.org/5.0.11-021-arm64-mm-Ensure-tail-of-unaligned-initrd-is-r… + patches.kernel.org/5.0.11-022-IB-rdmavt-Fix-frwr-memory-registration.patch + patches.kernel.org/5.0.11-023-RDMA-mlx5-Do-not-allow-the-user-to-write-to-t… + patches.kernel.org/5.0.11-024-RDMA-mlx5-Use-rdma_user_map_io-for-mapping-BA… + patches.kernel.org/5.0.11-025-RDMA-ucontext-Fix-regression-with-disassociat… + patches.kernel.org/5.0.11-026-sched-numa-Fix-a-possible-divide-by-zero.patch + patches.kernel.org/5.0.11-027-ceph-only-use-d_name-directly-when-parent-is-… + patches.kernel.org/5.0.11-028-ceph-ensure-d_name-stability-in-ceph_dentry_h… + patches.kernel.org/5.0.11-029-ceph-fix-ci-i_head_snapc-leak.patch + patches.kernel.org/5.0.11-030-nfsd-Don-t-release-the-callback-slot-unless-i… + patches.kernel.org/5.0.11-031-nfsd-wake-waiters-blocked-on-file_lock-before… + patches.kernel.org/5.0.11-032-nfsd-wake-blocked-file-lock-waiters-before-se… + patches.kernel.org/5.0.11-033-sunrpc-don-t-mark-uninitialised-items-as-VALI… + patches.kernel.org/5.0.11-034-perf-x86-intel-Update-KBL-Package-C-state-eve… + patches.kernel.org/5.0.11-035-Input-synaptics-rmi4-write-config-register-va… + patches.kernel.org/5.0.11-036-vfio-type1-Limit-DMA-mappings-per-container.p… + patches.kernel.org/5.0.11-037-dmaengine-sh-rcar-dmac-With-cyclic-DMA-residu… + patches.kernel.org/5.0.11-038-dmaengine-sh-rcar-dmac-Fix-glitch-in-dmaengin… + patches.kernel.org/5.0.11-039-dmaengine-mediatek-cqdma-fix-wrong-register-u… + patches.kernel.org/5.0.11-040-ARM-8857-1-efi-enable-CP15-DMB-instructions-b… + patches.kernel.org/5.0.11-041-powerpc-mm-radix-Make-Radix-require-HUGETLB_P… + patches.kernel.org/5.0.11-042-drm-vc4-Fix-memory-leak-during-gpu-reset.patch + patches.kernel.org/5.0.11-043-drm-ttm-fix-re-init-of-global-structures.patch + patches.kernel.org/5.0.11-044-Revert-drm-i915-fbdev-Actually-configure-unti… + patches.kernel.org/5.0.11-045-drm-vc4-Fix-compilation-error-reported-by-kbu… + patches.kernel.org/5.0.11-046-USB-Add-new-USB-LPM-helpers.patch + patches.kernel.org/5.0.11-047-USB-Consolidate-LPM-checks-to-avoid-enabling-… + patches.kernel.org/5.0.11-048-ext4-fix-some-error-pointer-dereferences.patch + patches.kernel.org/5.0.11-049-loop-do-not-print-warn-message-if-partition-s… + patches.kernel.org/5.0.11-050-tipc-handle-the-err-returned-from-cmd-header-… + patches.kernel.org/5.0.11-051-slip-make-slhc_free-silently-accept-an-error-… + patches.kernel.org/5.0.11-052-workqueue-Try-to-catch-flush_work-without-INI… + patches.kernel.org/5.0.11-053-binder-fix-handling-of-misaligned-binder-obje… + patches.kernel.org/5.0.11-054-sched-deadline-Correctly-handle-active-0-lag-… + patches.kernel.org/5.0.11-055-mac80211_hwsim-calculate-if_combination.max_i… + patches.kernel.org/5.0.11-056-NFS-Forbid-setting-AF_INET6-to-struct-sockadd… + patches.kernel.org/5.0.11-057-netfilter-ebtables-CONFIG_COMPAT-drop-a-bogus… + patches.kernel.org/5.0.11-058-fm10k-Fix-a-potential-NULL-pointer-dereferenc… + patches.kernel.org/5.0.11-059-tipc-check-bearer-name-with-right-length-in-t… + patches.kernel.org/5.0.11-060-tipc-check-link-name-with-right-length-in-tip… + patches.kernel.org/5.0.11-061-net-netrom-Fix-error-cleanup-path-of-nr_proto… + patches.kernel.org/5.0.11-062-net-rds-Check-address-length-before-reading-a… + patches.kernel.org/5.0.11-063-rxrpc-fix-race-condition-in-rxrpc_input_packe… + patches.kernel.org/5.0.11-064-pin-iocb-through-aio.patch + patches.kernel.org/5.0.11-065-aio-fold-lookup_kiocb-into-its-sole-caller.pa… + patches.kernel.org/5.0.11-066-aio-keep-io_event-in-aio_kiocb.patch + patches.kernel.org/5.0.11-067-aio-store-event-at-final-iocb_put.patch + patches.kernel.org/5.0.11-068-Fix-aio_poll-races.patch + patches.kernel.org/5.0.11-069-x86-retpolines-Raise-limit-for-generating-ind… + patches.kernel.org/5.0.11-070-x86-retpolines-Disable-switch-jump-tables-whe… + patches.kernel.org/5.0.11-071-rdma-fix-build-errors-on-s390-and-MIPS-due-to… + patches.kernel.org/5.0.11-072-ipv4-add-sanity-checks-in-ipv4_link_failure.p… + patches.kernel.org/5.0.11-073-ipv4-set-the-tcp_min_rtt_wlen-range-from-0-to… + patches.kernel.org/5.0.11-074-mlxsw-spectrum-Fix-autoneg-status-in-ethtool.… + patches.kernel.org/5.0.11-075-net-mlx5e-ethtool-Remove-unsupported-SFP-EEPR… + patches.kernel.org/5.0.11-076-net-rds-exchange-of-8K-and-1M-pool.patch + patches.kernel.org/5.0.11-077-net-rose-fix-unbound-loop-in-rose_loopback_ti… + patches.kernel.org/5.0.11-078-net-stmmac-move-stmmac_check_ether_addr-to-dr… + patches.kernel.org/5.0.11-079-net-tls-fix-refcount-adjustment-in-fallback.p… + patches.kernel.org/5.0.11-080-stmmac-pci-Adjust-IOT2000-matching.patch + patches.kernel.org/5.0.11-081-team-fix-possible-recursive-locking-when-add-… + patches.kernel.org/5.0.11-082-net-socionext-replace-napi_alloc_frag-with-th… + patches.kernel.org/5.0.11-083-net-ncsi-handle-overflow-when-incrementing-ma… + patches.kernel.org/5.0.11-084-mlxsw-pci-Reincrease-PCI-reset-timeout.patch + patches.kernel.org/5.0.11-085-mlxsw-spectrum-Put-MC-TCs-into-DWRR-mode.patch + patches.kernel.org/5.0.11-086-net-mlx5e-Fix-the-max-MTU-check-in-case-of-XD… + patches.kernel.org/5.0.11-087-net-mlx5e-Fix-use-after-free-after-xdp_return… + patches.kernel.org/5.0.11-088-net-tls-avoid-potential-deadlock-in-tls_set_d… + patches.kernel.org/5.0.11-089-net-tls-don-t-leak-IV-and-record-seq-when-off… + patches.kernel.org/5.0.11-090-Linux-5.0.11.patch ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -1212,6 +1302,7 @@ # Scheduler / Core ######################################################## patches.suse/setuid-dumpable-wrongdir + patches.suse/memcg-make-it-work-on-sparse-non-0-node-systems.patch ######################################################## # Architecture-specific patches. These used to be all @@ -1309,6 +1400,7 @@ ######################################################## patches.suse/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch patches.suse/acpi_thermal_passive_blacklist.patch + patches.suse/Revert-ACPICA-Clear-status-of-GPEs-before-enabling-t.patch ######################################################## # CPUFREQ @@ -1423,7 +1515,6 @@ ######################################################## # DRM/Video ######################################################## - patches.suse/Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch patches.suse/efifb-Omit-memory-map-check-on-legacy-boot.patch ######################################################## @@ -1472,6 +1563,7 @@ ######################################################## # Input & Console ######################################################## + patches.suse/HID-i2c-hid-Ignore-input-report-if-there-s-no-data-p.patch ########################################################## # Sound @@ -1559,7 +1651,7 @@ # KVM patches ######################################################## - patches.suse/vfio-type1-limit-dma-mappings-per-container + patches.suse/KVM-x86-Whitelist-port-0x7e-for-pre-incrementing-rip.patch ######################################################## # documentation ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.XKQJmY/_old 2019-05-05 21:18:01.296721817 +0200 +++ /var/tmp/diff_new_pack.XKQJmY/_new 2019-05-05 21:18:01.300721828 +0200 @@ -1,3 +1,3 @@ -2019-04-27 18:39:53 +0000 -GIT Revision: 048e1d279e4d522573b14fa5405b2800b5f4a191 +2019-05-02 10:46:32 +0000 +GIT Revision: 07c53183bf911e733d5fdb4c59d1527c9697dc5c GIT Branch: stable

1 0

commit libstorage-ng for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2019-05-05 21:17:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage-ng" Sun May 5 21:17:35 2019 rev:54 rq:700487 version:4.1.119 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2019-04-28 20:00:27.406898622 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.5148/libstorage-ng.changes 2019-05-05 21:17:37.580657210 +0200 @@ -1,0 +2,20 @@ +Thu May 2 06:04:23 UTC 2019 - weblate-noreply(a)opensuse.org + +- Translated using Weblate (Dutch) +- Translated using Weblate (Finnish) +- 4.1.119 + +-------------------------------------------------------------------- +Tue Apr 30 08:54:13 UTC 2019 - aschnell(a)suse.de + +- merge gh#openSUSE/libstorage-ng#644 +- added unit test +- added integration tests +- removed unneeded virtual specifier +- wait for block device +- moved integration tests +- added note +- allow to add devices to existing btrfs (for jsd#SLE-3877) +- 4.1.118 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.1.117.tar.xz New: ---- libstorage-ng-4.1.119.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.yGAp9T/_old 2019-05-05 21:17:38.388659411 +0200 +++ /var/tmp/diff_new_pack.yGAp9T/_new 2019-05-05 21:17:38.388659411 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.1.117 +Version: 4.1.119 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.1.117.tar.xz -> libstorage-ng-4.1.119.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/LIBVERSION new/libstorage-ng-4.1.119/LIBVERSION --- old/libstorage-ng-4.1.117/LIBVERSION 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/LIBVERSION 2019-05-02 08:04:23.000000000 +0200 @@ -1 +1 @@ -1.10.0 +1.10.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/VERSION new/libstorage-ng-4.1.119/VERSION --- old/libstorage-ng-4.1.117/VERSION 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/VERSION 2019-05-02 08:04:23.000000000 +0200 @@ -1 +1 @@ -4.1.117 +4.1.119 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/create-multiple-devices.py new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/create-multiple-devices.py --- old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/create-multiple-devices.py 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/create-multiple-devices.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -#!/usr/bin/python3 - -# requirements: unused partitions /dev/sdc1 and /dev/sdd1 - - -from storage import * -from storageitu import * - - -set_logger(get_logfile_logger()) - -environment = Environment(False) - -storage = Storage(environment) -storage.probe() - -staging = storage.get_staging() - -print(staging) - -sdc1 = Partition.find_by_name(staging, "/dev/sdc1") -sdc1.set_id(ID_LINUX) - -sdd1 = Partition.find_by_name(staging, "/dev/sdd1") -sdd1.set_id(ID_LINUX) - -btrfs = to_btrfs(sdc1.create_blk_filesystem(FsType_BTRFS)) -btrfs.add_device(sdd1) - -btrfs.set_label("TEST") -btrfs.set_metadata_raid_level(BtrfsRaidLevel_RAID1) -btrfs.set_data_raid_level(BtrfsRaidLevel_RAID1) - -mount_point = btrfs.create_mount_point("/test") - -print(staging) - -commit(storage) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/delete-multiple-devices.py new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/delete-multiple-devices.py --- old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/delete-multiple-devices.py 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/delete-multiple-devices.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -#!/usr/bin/python3 - -# requirements: btrfs on /dev/sdc1 and /dev/sdd1 - - -from storage import * -from storageitu import * - - -set_logger(get_logfile_logger()) - -environment = Environment(False) - -storage = Storage(environment) -storage.probe() - -staging = storage.get_staging() - -print(staging) - -sdc1 = Partition.find_by_name(staging, "/dev/sdc1") -sdc1.remove_descendants() - -print(staging) - -commit(storage) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/multiple-devices/create.py new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/multiple-devices/create.py --- old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/multiple-devices/create.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/multiple-devices/create.py 2019-05-02 08:04:23.000000000 +0200 @@ -0,0 +1,39 @@ +#!/usr/bin/python3 + +# requirements: unused partitions /dev/sdc1 and /dev/sdd1 + + +from storage import * +from storageitu import * + + +set_logger(get_logfile_logger()) + +environment = Environment(False) + +storage = Storage(environment) +storage.probe() + +staging = storage.get_staging() + +print(staging) + +sdc1 = Partition.find_by_name(staging, "/dev/sdc1") +sdc1.set_id(ID_LINUX) + +sdd1 = Partition.find_by_name(staging, "/dev/sdd1") +sdd1.set_id(ID_LINUX) + +btrfs = to_btrfs(sdc1.create_blk_filesystem(FsType_BTRFS)) +btrfs.add_device(sdd1) + +btrfs.set_label("TEST") +btrfs.set_metadata_raid_level(BtrfsRaidLevel_RAID1) +btrfs.set_data_raid_level(BtrfsRaidLevel_RAID1) + +mount_point = btrfs.create_mount_point("/test") + +print(staging) + +commit(storage) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/multiple-devices/delete.py new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/multiple-devices/delete.py --- old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/multiple-devices/delete.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/multiple-devices/delete.py 2019-05-02 08:04:23.000000000 +0200 @@ -0,0 +1,27 @@ +#!/usr/bin/python3 + +# requirements: btrfs on /dev/sdc1 and /dev/sdd1 + + +from storage import * +from storageitu import * + + +set_logger(get_logfile_logger()) + +environment = Environment(False) + +storage = Storage(environment) +storage.probe() + +staging = storage.get_staging() + +print(staging) + +sdc1 = Partition.find_by_name(staging, "/dev/sdc1") +sdc1.remove_descendants() + +print(staging) + +commit(storage) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/multiple-devices/extend.py new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/multiple-devices/extend.py --- old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/multiple-devices/extend.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/multiple-devices/extend.py 2019-05-02 08:04:23.000000000 +0200 @@ -0,0 +1,32 @@ +#!/usr/bin/python3 + +# requirements: btrfs on /dev/sdc1 and unused /dev/sdd1 + + +from storage import * +from storageitu import * + + +set_logger(get_logfile_logger()) + +environment = Environment(False) + +storage = Storage(environment) +storage.probe() + +staging = storage.get_staging() + +print(staging) + +sdc1 = Partition.find_by_name(staging, "/dev/sdc1") + +sdd1 = Partition.find_by_name(staging, "/dev/sdd1") +sdd1.set_id(ID_LINUX) + +btrfs = to_btrfs(sdc1.get_blk_filesystem()) +btrfs.add_device(sdd1) + +print(staging) + +commit(storage) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/multiple-devices/reduce.py new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/multiple-devices/reduce.py --- old/libstorage-ng-4.1.117/integration-tests/filesystems/btrfs/multiple-devices/reduce.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.1.119/integration-tests/filesystems/btrfs/multiple-devices/reduce.py 2019-05-02 08:04:23.000000000 +0200 @@ -0,0 +1,34 @@ +#!/usr/bin/python3 + +# requirements: btrfs on /dev/sdc1 and /dev/sdd1 + +# note: removing devices from btrfs is not supported by libstorage-ng +# so do not use it in production code + + +from storage import * +from storageitu import * + + +set_logger(get_logfile_logger()) + +environment = Environment(False) + +storage = Storage(environment) +storage.probe() + +staging = storage.get_staging() + +print(staging) + +sdc1 = Partition.find_by_name(staging, "/dev/sdc1") + +sdd1 = Partition.find_by_name(staging, "/dev/sdd1") + +btrfs = to_btrfs(sdc1.get_blk_filesystem()) +btrfs.remove_device(sdd1) + +print(staging) + +commit(storage) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/po/fi.po new/libstorage-ng-4.1.119/po/fi.po --- old/libstorage-ng-4.1.117/po/fi.po 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/po/fi.po 2019-05-02 08:04:23.000000000 +0200 @@ -12,16 +12,16 @@ "Project-Id-Version: libstorage.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-02-25 15:22+0100\n" -"PO-Revision-Date: 2018-12-02 22:02+0000\n" +"PO-Revision-Date: 2019-05-02 06:04+0000\n" "Last-Translator: Tommi Nieminen <software(a)legisign.org>\n" -"Language-Team: Finnish <https://l10n.opensuse.org/projects/libstorage/ng-" -"master/fi/>\n" +"Language-Team: Finnish <https://l10n.opensuse.org/projects/libstorage/" +"ng-master/fi/>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.18\n" +"X-Generator: Weblate 3.3\n" msgid "" "\n" @@ -35,7 +35,7 @@ #. %1$d is replaced by the number of elements omitted #, c-format msgid "%1$d more" -msgstr "" +msgstr "%1$d lisää" #. TRANSLATORS: #. %1$s is replaced with the device name (e.g. /dev/sdc1), @@ -50,14 +50,14 @@ #. %2$s is replaced by the number of elements omitted #, c-format msgid "%1$s and %2$d more" -msgstr "" +msgstr "%1$s ja %2$d lisää" #. TRANSLATORS: used to construct list of values #. %1$s is replaced by first value #. %2$s is replaced by second value -#, fuzzy, c-format +#, c-format msgid "%1$s and %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s ja %2$s" #. TRANSLATORS: #. %1$s is replaced with the the bcache name (e.g. /dev/bcache0), @@ -70,9 +70,9 @@ #. TRANSLATORS: used to construct list of values #. %1$s is replaced by first value #. %2$s is replaced by second value -#, fuzzy, c-format +#, c-format msgid "%1$s, %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s, %2$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda1) @@ -291,15 +291,16 @@ #. TRANSLATORS: displayed before action, #. %1$s is replaced by subvolume path (e.g. var/log), #. %2$s is replaced by block device name (e.g. /dev/sda1) -#, fuzzy, c-format +#, c-format msgid "Clear option 'no copy on write' for subvolume %1$s on %2$s" -msgstr "Luodaan alitaltio %1$s laitteeseen %2$s" +msgstr "" +"Poista valinta ”kopioi kirjoitettaessa” alitaltiolta %1$s laitteella %2$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda) #, c-format msgid "Clear protective MBR boot flag of GPT on %1$s" -msgstr "" +msgstr "Poista GPT:n MBR-suojakäynnistyslippu laitteelta %1$s" #. TRANSLATORS: displayed during action, #. %1$s is replaced by partition name (e.g. /dev/sda1) @@ -319,12 +320,13 @@ #, c-format msgid "Clearing option 'no copy on write' for subvolume %1$s on %2$s" msgstr "" +"Poistetaan valntaa ”kopioi kirjoittamatta” alitaltiolta %1$s laitteella %2$s" #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda) #, c-format msgid "Clearing protective MBR boot flag of GPT on %1$s" -msgstr "" +msgstr "Poistetaan GPT:n MBR-suojakäynnistyslippua laitteelta %1$s" #. TRANSLATORS: #. %1$s is replaced with the md level (e.g. RAID1), @@ -335,11 +337,13 @@ #. %6$s is replaced with a comma-spearated list of the devices #. the RAID is built from and their sizes: e.g. #. /dev/sda (512 GiB), /dev/sdb (512 GiB), /dev/sdc (512 GiB) -#, fuzzy, c-format +#, c-format msgid "" "Create %1$s %2$s (%3$s) for %4$s with %5$s\n" "from %6$s" -msgstr "Luo osio %1$s (%2$s)" +msgstr "" +"Luo %1$s %2$s (%3$s) liitospisteeseen %4$s tiedostojärjestelmällä %5$s\n" +"laitteista %6$s" #. TRANSLATORS: #. %1$s is replaced with the md level (e.g. RAID1), @@ -348,11 +352,13 @@ #. %4$s is replaced with a comma-spearated list of the devices #. the RAID is built from and their sizes: e.g. #. /dev/sda (512 GiB), /dev/sdb (512 GiB), /dev/sdc (512 GiB) -#, fuzzy, c-format +#, c-format msgid "" "Create %1$s %2$s (%3$s) for swap\n" "from %4$s" -msgstr "Luo %1$s laitteelle %2$s (%3$s)" +msgstr "" +"Luo %1$s %2$s (%3$s) sivutusta varten\n" +"laitteista %4$s" #. TRANSLATORS: #. %1$s is replaced with the md level (e.g. RAID1), @@ -361,9 +367,9 @@ #. %4$s is replaced with a comma-spearated list of the devices #. the RAID is built from and their sizes: e.g. #. /dev/sda (512 GiB), /dev/sdb (512 GiB), /dev/sdc (512 GiB) -#, fuzzy, c-format +#, c-format msgid "Create %1$s %2$s (%3$s) from %4$s" -msgstr "Luo %1$s laitteelle %2$s (%3$s)" +msgstr "Luo %1$s %2$s (%3$s) laitteista %4$s" #. TRANSLATORS: #. %1$s is replaced with the md name (e.g. /dev/md0), @@ -373,11 +379,13 @@ #. %5$s is replaced with a comma-spearated list of the devices #. the RAID is built from and their sizes: e.g. #. /dev/sda (512 GiB), /dev/sdb (512 GiB), /dev/sdc (512 GiB) -#, fuzzy, c-format +#, c-format msgid "" "Create %1$s %2$s (%3$s) with %4$s\n" "from %5$s" -msgstr "Luo osio %1$s (%2$s)" +msgstr "" +"Luo %1$s %2$s (%3$s) tiedostojärjestelmällä %4$s\n" +"laitteista %5$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by file system name (e.g. ext4), @@ -390,16 +398,16 @@ #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/bcache0), #. %2$s is replaced by size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create Bcache %1$s (%2$s)" -msgstr "Luo kiintolevy %1$s (%2$s)" +msgstr "Luo Bcache %1$s (%2$s)" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda1), #. %2$s is replaced by size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create Bcache cache set on %1$s (%2$s)" -msgstr "Luo looginen osio %1$s (%2$s)" +msgstr "Luo Bcache-välimuistijoukko %1$s (%2$s)" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda) @@ -417,9 +425,9 @@ #. %1$s is replaced with the logical volume name (e.g. root), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Create LVM logical volume %1$s (%2$s) on volume group %3$s" -msgstr "Luo looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "Luo looginen LVM-taltio %1$s (%2$s) taltioryhmään %3$s" #. TRANSLATORS: #. %1$s is replaced with the logical volume name (e.g. root), @@ -427,48 +435,52 @@ #. %3$s is replaced with the volume group name (e.g. system), #. %4$s is replaced with the mount point (e.g. /home), #. %5$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "" "Create LVM logical volume %1$s (%2$s) on volume group %3$s for %4$s with %5$s" -msgstr "Luo looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "" +"Luo looginen LVM-taltio %1$s (%2$s) taltioryhmään %3$s, liitospiste %4$s ja " +"tiedostojärjestelmä %5$s" #. TRANSLATORS: #. %1$s is replaced with the logical volume name (e.g. root), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Create LVM logical volume %1$s (%2$s) on volume group %3$s for swap" -msgstr "Luo looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "Luo looginen LVM-taltio %1$s (%2$s) taltioryhmään %3$s sivutusta varten" #. TRANSLATORS: #. %1$s is replaced with the logical volume name (e.g. root), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the volume group name (e.g. system), #. %4$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create LVM logical volume %1$s (%2$s) on volume group %3$s with %4$s" -msgstr "Luo looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "" +"Luo looginen LVM-taltio %1$s (%2$s) taltioryhmään %3$s, tiedostojärjestelmä " +"%4$s" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create LVM physical volume over %1$s (%2$s)" -msgstr "Luo fyysinen taltio laitteelle %1$s" +msgstr "Luo fyysinen LVM-taltio laitteelle %1$s (%2$s)" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create LVM physical volume over encrypted %1$s (%2$s)" -msgstr "Luo fyysinen taltio laitteelle %1$s" +msgstr "Luo fyysinen LVM-taltio salatulle laitteelle %1$s (%2$s)" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create LVM volume device over %1$s (%2$s)" -msgstr "Luo taltioryhmä %1$s (%2$s)" +msgstr "Luo LVM-taltiolaite osiolle %1$s (%2$s)" #. TRANSLATORS: displayed before action, #. %1$s is replaced by RAID level (e.g. RAID0), @@ -476,13 +488,13 @@ #. %3$s is replaced by size (e.g. 2 GiB), #. %4$s is replaced by one or more devices (e.g /dev/sda1 (1 GiB) and #. /dev/sdb2 (1 GiB)) -#, fuzzy, c-format +#, c-format msgid "Create MD %1$s %2$s (%3$s) from %4$s" -msgstr "Luo %1$s laitteelle %2$s (%3$s)" +msgstr "Luo MD %1$s %2$s (%3$s) laitteista %4$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda) -#, fuzzy, c-format +#, c-format msgid "Create MS-DOS partition table on %1$s" msgstr "Luo MS-DOS-osiotaulukko laitteelle %1$s" @@ -490,9 +502,9 @@ #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), #. %2$s is replaced with the device name (e.g. /dev/sda1), #. %3$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create bcache %1$s on %2$s (%3$s)" -msgstr "Luo %1$s laitteelle %2$s (%3$s)" +msgstr "Luo Bcache %1$s laitteelle %2$s (%3$s)" #. TRANSLATORS: #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), @@ -500,26 +512,28 @@ #. %3$s is replaced with the size (e.g. 2 GiB), #. %4$s is replaced with the mount point (e.g. /home), #. %5$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create bcache %1$s on %2$s (%3$s) for %4$s with %5$s" -msgstr "Luo osio %1$s (%2$s)" +msgstr "" +"Luo Bcache %1$s laitteelle %2$s (%3$s), liitospiste %4$s ja " +"tiedostojärjestelmä %5$s" #. TRANSLATORS: #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), #. %2$s is replaced with the device name (e.g. /dev/sda1), #. %3$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create bcache %1$s on %2$s (%3$s) for swap" -msgstr "Luo %1$s laitteelle %2$s (%3$s)" +msgstr "Luo Bcache %1$s laitteelle %2$s (%3$s) sivutusta varten" #. TRANSLATORS: #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), #. %2$s is replaced with the device name (e.g. /dev/sda1), #. %3$s is replaced with the size (e.g. 2 GiB), #. %4$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create bcache %1$s on %2$s (%3$s) with %4$s" -msgstr "Luo %1$s laitteelle %2$s (%3$s)" +msgstr "Luo Bcache %1$s laitteelle %2$s (%3$s) tiedostojärjestelmänä %4$s" #. TRANSLATORS: #. %1$s is replaced with the md name (e.g. /dev/md0), @@ -528,11 +542,13 @@ #. %4$s is replaced with a comma-spearated list of the devices #. the RAID is built from and their sizes: e.g. #. /dev/sda (512 GiB), /dev/sdb (512 GiB), /dev/sdc (512 GiB) -#, fuzzy, c-format +#, c-format msgid "" "Create encrypted %1$s %2$s (%3$s)\n" "from %4$s" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "" +"Luo salattu %1$s %2$s (%3$s)\n" +"laitteista %4$s" #. TRANSLATORS: #. %1$s is replaced with the md name (e.g. /dev/md0), @@ -543,11 +559,13 @@ #. %6$s is replaced with a comma-spearated list of the devices #. the RAID is built from and their sizes: e.g. #. /dev/sda (512 GiB), /dev/sdb (512 GiB), /dev/sdc (512 GiB) -#, fuzzy, c-format +#, c-format msgid "" "Create encrypted %1$s %2$s (%3$s) for %4$s with %5$s\n" "from %6$s" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "" +"Luo salattu %1$s %2$s (%3$s), liitospiste %4$s ja tiedostojärjestelmä %5$s,\n" +"laitteista %6$s" #. TRANSLATORS: #. %1$s is replaced with the md level (e.g. RAID1), @@ -556,11 +574,13 @@ #. %4$s is replaced with a comma-spearated list of the devices #. the RAID is built from and their sizes: e.g. #. /dev/sda (512 GiB), /dev/sdb (512 GiB), /dev/sdc (512 GiB) -#, fuzzy, c-format +#, c-format msgid "" "Create encrypted %1$s %2$s (%3$s) for swap\n" "from %4$s" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "" +"Luo salattu %1$s %2$s (%3$s) sivutusta varten\n" +"laitteista %4$s" #. TRANSLATORS: #. %1$s is replaced with the md name (e.g. /dev/md0), @@ -570,19 +590,21 @@ #. %5$s is replaced with a comma-spearated list of the devices #. the RAID is built from and their sizes: e.g. #. /dev/sda (512 GiB), /dev/sdb (512 GiB), /dev/sdc (512 GiB) -#, fuzzy, c-format +#, c-format msgid "" "Create encrypted %1$s %2$s (%3$s) with %4$s\n" "from %5$s" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "" +"Luo salattu %1$s %2$s (%3$s) tiedostojärjestelmän %4$s\n" +"laitteista %5$s" #. TRANSLATORS: #. %1$s is replaced with the logical volume name (e.g. root), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Create encrypted LVM logical volume %1$s (%2$s) on volume group %3$s" -msgstr "Luo looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "Luo salattu looginen LVM-taltio %1$s (%2$s) taltioryhmään %3$s" #. TRANSLATORS: #. %1$s is replaced with the logical volume name (e.g. root), @@ -590,39 +612,45 @@ #. %3$s is replaced with the volume group name (e.g. system), #. %4$s is replaced with the mount point (e.g. /home), #. %5$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "" "Create encrypted LVM logical volume %1$s (%2$s) on volume group %3$s for " "%4$s with %5$s" -msgstr "Luo looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "" +"Luo salattu looginen LVM-taltio %1$s (%2$s) taltioryhmään %3$s, liitospiste " +"%4$s ja tiedostojärjestelmä %5$s" #. TRANSLATORS: #. %1$s is replaced with the logical volume name (e.g. root), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "" "Create encrypted LVM logical volume %1$s (%2$s) on volume group %3$s for swap" -msgstr "Luo looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "" +"Luo salattu looginen LVM-taltio %1$s (%2$s) taltioryhmään %3$s sivutusta " +"varten" #. TRANSLATORS: #. %1$s is replaced with the logical volume name (e.g. root), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the volume group name (e.g. system), #. %4$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "" "Create encrypted LVM logical volume %1$s (%2$s) on volume group %3$s with " "%4$s" -msgstr "Luo looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "" +"Luo salattu looginen LVM-taltio %1$s (%2$s) taltioryhmään %3$s " +"tiedostojärjestelmänä %4$s" #. TRANSLATORS: #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), #. %2$s is replaced with the device name (e.g. /dev/sda1), #. %3$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create encrypted bcache %1$s on %2$s (%3$s)" -msgstr "Luo %1$s laitteelle %2$s (%3$s)" +msgstr "Luo salattu Bcache %1$s laitteelle %2$s (%3$s)" #. TRANSLATORS: #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), @@ -630,70 +658,74 @@ #. %3$s is replaced with the size (e.g. 2 GiB), #. %4$s is replaced with the mount point (e.g. /home), #. %5$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create encrypted bcache %1$s on %2$s (%3$s) for %4$s with %5$s" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "" +"Luo salattu Bcache %1$s laitteelle %2$s (%3$s), liitospiste %4$s ja " +"tiedostojärjestelmä %5$s" #. TRANSLATORS: #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), #. %2$s is replaced with the device name (e.g. /dev/sda1), #. %3$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create encrypted bcache %1$s on %2$s (%3$s) for swap" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "Luo salattu Bcache %1$s laitteelle %2$s (%3$s) sivutusta varten" #. TRANSLATORS: #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), #. %2$s is replaced with the device name (e.g. /dev/sda1), #. %3$s is replaced with the size (e.g. 2 GiB), #. %4$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create encrypted bcache %1$s on %2$s (%3$s) with %4$s" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "" +"Luo salattu Bcache %1$s laitteelle %2$s (%3$s) tiedostojärjestelmänä %4$s" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create encrypted partition %1$s (%2$s)" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "Luo salattu osio %1$s (%2$s)" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create encrypted partition %1$s (%2$s) as LVM physical volume" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "Luo salattu osio %1$s (%2$s) fyysiseksi LVM-osioksi" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the mount point (e.g. /home), #. %4$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create encrypted partition %1$s (%2$s) for %3$s with %4$s" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "" +"Luo salattu osio %1$s (%2$s), liitospiste %3$s ja tiedostojärjestelmä %4$s" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create encrypted partition %1$s (%2$s) for swap" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "Luo salattu osio %1$s (%2$s) sivutusta varten" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create encrypted partition %1$s (%2$s) with %3$s" -msgstr "Luo laajennettu osio %1$s (%2$s)" +msgstr "Luo salattu osio %1$s (%2$s) tiedostojärjestelmänä %3$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda1) -#, fuzzy, c-format +#, c-format msgid "Create encryption layer device on %1$s" -msgstr "Aseta salattu silmukkalaite %1$s" +msgstr "Luo salattu taso laitteelle %1$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by partition name (e.g. /dev/sda1), @@ -704,16 +736,16 @@ #. TRANSLATORS: #. %1$s is replaced with the names of the devices separated by comma (e.g. /dev/sda1, /dev/sda2) -#, fuzzy, c-format +#, c-format msgid "Create file system btrfs on %1$s" -msgstr "Luo fyysinen taltio laitteelle %1$s" +msgstr "Luo Btrfs-tiedostojärjestelmä laitteille %1$s" #. TRANSLATORS: #. %1$s is replaced with the names of the devices separated by comma (e.g. /dev/sda1, /dev/sda2), #. %2$s is replaced with the mount point (e.g. /home) #, c-format msgid "Create file system btrfs on %1$s and mount at %2$s" -msgstr "" +msgstr "Luo Btrfs-tiedostojärjestelmä laitteelle %1$s ja liitä se kohtaan %2$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by the device name (e.g. /dev/vda), @@ -725,15 +757,15 @@ #. TRANSLATORS: displayed before action, #. %1$s is replaced by partition name (e.g. /dev/dasda1), #. %2$s is replaced by size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create implicit partition %1$s (%2$s)" -msgstr "Luo looginen osio %1$s (%2$s)" +msgstr "Luo implisiittinen osio %1$s (%2$s)" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/dasda) -#, fuzzy, c-format +#, c-format msgid "Create implicit partition table on %1$s" -msgstr "Luo DASD-osiotaulukko laitteelle %1$s" +msgstr "Luo implisiittinen osiotaulukko laitteelle %1$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by partition name (e.g. /dev/sda1), @@ -764,40 +796,40 @@ #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the partition id string (e.g. Linux LVM) -#, fuzzy, c-format +#, c-format msgid "Create partition %1$s (%2$s) as %3$s" -msgstr "Luo osio %1$s (%2$s)" +msgstr "Luo osio %1$s (%2$s) tunnisteenaan %3$s" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create partition %1$s (%2$s) as LVM physical volume" -msgstr "Luo osio %1$s (%2$s)" +msgstr "Luo osio %1$s (%2$s) fyysiseksi LVM-taltioksi" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the mount point (e.g. /home), #. %4$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create partition %1$s (%2$s) for %3$s with %4$s" -msgstr "Luo osio %1$s (%2$s)" +msgstr "Luo osio %1$s (%2$s), liitospiste %3$s ja tiedostojärjestelmä %4$s" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Create partition %1$s (%2$s) for swap" -msgstr "Luo osio %1$s (%2$s)" +msgstr "Luo osio %1$s (%2$s) sivutusta varten" #. TRANSLATORS: #. %1$s is replaced with the partition name (e.g. /dev/sda1), #. %2$s is replaced with the size (e.g. 2 GiB), #. %3$s is replaced with the file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create partition %1$s (%2$s) with %3$s" -msgstr "Luo osio %1$s (%2$s)" +msgstr "Luo osio %1$s (%2$s) tiedostojärjestelmällä %3$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda1) @@ -825,17 +857,17 @@ #. TRANSLATORS: #. %1$s is replaced with the subvolume path (e.g. var/log), #. %2$s is replaced with the block device name (e.g. /dev/sda1) -#, fuzzy, c-format +#, c-format msgid "Create subvolume %1$s on %2$s with option 'no copy on write'" -msgstr "Luo alitaltio %1$s laitteelle %2$s" +msgstr "Luo alitaltio %1$s laitteelle %2$s valinnalla ”kopioi kirjoittamatta”" #. TRANSLATORS: displayed before action, #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Create thin logical volume %1$s (%2$s) on volume group %3$s" -msgstr "Luodaan looginen taltio %1$s (%2$s) taltioryhmään %3$s" +msgstr "Luo ohut looginen taltio %1$s (%2$s) taltioryhmään %3$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by logical volume name (e.g. root), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/po/nl.po new/libstorage-ng-4.1.119/po/nl.po --- old/libstorage-ng-4.1.117/po/nl.po 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/po/nl.po 2019-05-02 08:04:23.000000000 +0200 @@ -15,8 +15,8 @@ "Project-Id-Version: libstorage.nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-02-25 15:22+0100\n" -"PO-Revision-Date: 2019-04-04 15:03+0000\n" -"Last-Translator: Eva van Rein <vistatec(a)globaltextware.nl>\n" +"PO-Revision-Date: 2019-05-02 06:04+0000\n" +"Last-Translator: Freek de Kruijf <freek(a)opensuse.org>\n" "Language-Team: Dutch <https://l10n.opensuse.org/projects/libstorage/" "ng-master/nl/>\n" "Language: nl\n" @@ -31,7 +31,7 @@ "are you serious?!" msgstr "" "\n" -"serieus?!" +"bent u serieus?!" #. TRANSLATORS: appended after list of value to indicate that some #. values have been omitted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/storage/Devices/DeviceImpl.cc new/libstorage-ng-4.1.119/storage/Devices/DeviceImpl.cc --- old/libstorage-ng-4.1.117/storage/Devices/DeviceImpl.cc 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/storage/Devices/DeviceImpl.cc 2019-05-02 08:04:23.000000000 +0200 @@ -525,8 +525,8 @@ Text Reallot::text(const CommitData& commit_data) const { - const Device* device_rhs = get_device(commit_data.actiongraph, RHS); - return device_rhs->get_impl().do_reallot_text(reallot_mode, device, commit_data.tense); + const Device* device_lhs = get_device(commit_data.actiongraph, LHS); + return device_lhs->get_impl().do_reallot_text(reallot_mode, device, commit_data.tense); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/storage/Devices/LvmVgImpl.h new/libstorage-ng-4.1.119/storage/Devices/LvmVgImpl.h --- old/libstorage-ng-4.1.117/storage/Devices/LvmVgImpl.h 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/storage/Devices/LvmVgImpl.h 2019-05-02 08:04:23.000000000 +0200 @@ -145,8 +145,9 @@ Tense tense) const override; virtual void do_reallot(ReallotMode reallot_mode, const Device* device) const override; - virtual void do_reduce(const LvmPv* lvm_pv) const; - virtual void do_extend(const LvmPv* lvm_pv) const; + + void do_reduce(const LvmPv* lvm_pv) const; + void do_extend(const LvmPv* lvm_pv) const; Text do_reduce_missing_text(Tense tense) const; void do_reduce_missing() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/storage/Devices/MdImpl.cc new/libstorage-ng-4.1.119/storage/Devices/MdImpl.cc --- old/libstorage-ng-4.1.117/storage/Devices/MdImpl.cc 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/storage/Devices/MdImpl.cc 2019-05-02 08:04:23.000000000 +0200 @@ -1182,6 +1182,8 @@ cmd_line += !md_user->is_spare() ? " --add" : " --add-spare"; cmd_line += " " + quote(get_name()) + " " + quote(blk_device->get_name()); + storage::wait_for_devices({ blk_device }); + SystemCmd cmd(cmd_line, SystemCmd::DoThrow); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/storage/Devices/MdImpl.h new/libstorage-ng-4.1.119/storage/Devices/MdImpl.h --- old/libstorage-ng-4.1.117/storage/Devices/MdImpl.h 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/storage/Devices/MdImpl.h 2019-05-02 08:04:23.000000000 +0200 @@ -156,8 +156,8 @@ virtual void do_reallot(ReallotMode reallot_mode, const Device* device) const override; - virtual void do_reduce(const BlkDevice* blk_device) const; - virtual void do_extend(const BlkDevice* blk_device) const; + void do_reduce(const BlkDevice* blk_device) const; + void do_extend(const BlkDevice* blk_device) const; virtual Text do_deactivate_text(Tense tense) const override; virtual void do_deactivate() const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/storage/Filesystems/BlkFilesystemImpl.cc new/libstorage-ng-4.1.119/storage/Filesystems/BlkFilesystemImpl.cc --- old/libstorage-ng-4.1.117/storage/Filesystems/BlkFilesystemImpl.cc 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/storage/Filesystems/BlkFilesystemImpl.cc 2019-05-02 08:04:23.000000000 +0200 @@ -566,6 +566,8 @@ void BlkFilesystem::Impl::add_modify_actions(Actiongraph::Impl& actiongraph, const Device* lhs_base) const { + Filesystem::Impl::add_modify_actions(actiongraph, lhs_base); + const Impl& lhs = dynamic_cast<const Impl&>(lhs_base->get_impl()); vector<Action::Base*> actions; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/storage/Filesystems/Btrfs.h new/libstorage-ng-4.1.119/storage/Filesystems/Btrfs.h --- old/libstorage-ng-4.1.117/storage/Filesystems/Btrfs.h 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/storage/Filesystems/Btrfs.h 2019-05-02 08:04:23.000000000 +0200 @@ -37,7 +37,7 @@ /** - * Btrfs RAID levels used for metadata and data. + * Btrfs RAID levels (aka profiles) used for metadata and data. */ enum class BtrfsRaidLevel { @@ -77,6 +77,8 @@ /** * Set the metadata RAID level. + * + * Not supported for btrfs already existing on disk. */ void set_metadata_raid_level(BtrfsRaidLevel metadata_raid_level); @@ -87,6 +89,8 @@ /** * Set the data RAID level. + * + * Not supported for btrfs already existing on disk. */ void set_data_raid_level(BtrfsRaidLevel data_raid_level); @@ -118,6 +122,8 @@ /** * Remove a block device from the btrfs. * + * Not supported for btrfs already existing on disk. + * * @throw Exception */ void remove_device(BlkDevice* blk_device); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/storage/Filesystems/BtrfsImpl.cc new/libstorage-ng-4.1.119/storage/Filesystems/BtrfsImpl.cc --- old/libstorage-ng-4.1.117/storage/Filesystems/BtrfsImpl.cc 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/storage/Filesystems/BtrfsImpl.cc 2019-05-02 08:04:23.000000000 +0200 @@ -665,4 +665,117 @@ SystemCmd cmd(cmd_line, SystemCmd::NoThrow); } + + Text + Btrfs::Impl::do_reallot_text(ReallotMode reallot_mode, const Device* device, Tense tense) const + { + Text text; + + switch (reallot_mode) + { + case ReallotMode::REDUCE: + text = tenser(tense, + // TRANSLATORS: displayed before action, + // %1$s is replaced by the device name (e.g. /dev/sdc1), + // %2$s is replaced by the device size (e.g. 2.00 GiB) + // %3$s is replaced by one or more devices (e.g /dev/sda1 (2.00 GiB) + // and /dev/sdb2 (2.00 GiB)) + _("Remove %1$s (%2$s) from btrfs on %3$s"), + // TRANSLATORS: displayed during action, + // %1$s is replaced by the device name (e.g. /dev/sdc1), + // %2$s is replaced by the device size (e.g. 2.00 GiB) + // %3$s is replaced by one or more devices (e.g /dev/sda1 (2.00 GiB) + // and /dev/sdb2 (2.00 GiB)) + _("Removing %1$s (%2$s) from btrfs on %3$s")); + break; + + case ReallotMode::EXTEND: + text = tenser(tense, + // TRANSLATORS: displayed before action, + // %1$s is replaced by the device name (e.g. /dev/sdc1), + // %2$s is replaced by the device size (e.g. 2.00 GiB) + // %3$s is replaced by one or more devices (e.g /dev/sda1 (2.00 GiB) + // and /dev/sdb2 (2.00 GiB)) + _("Add %1$s (%2$s) to btrfs on %3$s"), + // TRANSLATORS: displayed during action, + // %1$s is replaced by the device name (e.g. /dev/sdc1), + // %2$s is replaced by the device size (e.g. 2.00 GiB) + // %3$s is replaced by one or more devices (e.g /dev/sda1 (2.00 GiB) + // and /dev/sdb2 (2.00 GiB)) + _("Adding %1$s (%2$s) to btrfs on %3$s")); + break; + + default: + ST_THROW(LogicException("invalid value for reallot_mode")); + } + + const BlkDevice* blk_device = to_blk_device(device); + + return sformat(text, blk_device->get_name(), blk_device->get_size_string(), + join(get_blk_devices(), JoinMode::COMMA, 10)); + } + + + void + Btrfs::Impl::do_reallot(ReallotMode reallot_mode, const Device* device) const + { + const BlkDevice* blk_device = to_blk_device(device); + + switch (reallot_mode) + { + case ReallotMode::REDUCE: + do_reduce(blk_device); + return; + + case ReallotMode::EXTEND: + do_extend(blk_device); + return; + } + + ST_THROW(LogicException("invalid value for reallot_mode")); + } + + + void + Btrfs::Impl::do_reduce(const BlkDevice* blk_device) const + { + // TODO EnsureMounted always works on the system devicegraph. This + // could fail if reduce and extend actions are run in sequence + // (but this is so far not supported). + + EnsureMounted ensure_mounted(get_filesystem(), false); + + string cmd_line = BTRFSBIN " device remove " + quote(blk_device->get_name()) + " " + + quote(ensure_mounted.get_any_mount_point()); + + SystemCmd cmd(cmd_line, SystemCmd::DoThrow); + } + + + void + Btrfs::Impl::do_extend(const BlkDevice* blk_device) const + { + // TODO See do_reduce above. + + EnsureMounted ensure_mounted(get_filesystem(), false); + + string cmd_line = BTRFSBIN " device add " + quote(blk_device->get_name()) + " " + + quote(ensure_mounted.get_any_mount_point()); + + storage::wait_for_devices({ blk_device }); + + SystemCmd cmd(cmd_line, SystemCmd::DoThrow); + } + + + void + Btrfs::Impl::add_dependencies(Actiongraph::Impl& actiongraph) const + { + BlkFilesystem::Impl::add_dependencies(actiongraph); + + // So far only actions that increase the overall size of a + // multiple devices btrfs are supported. Thus no actions need + // to be ordered here. + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/storage/Filesystems/BtrfsImpl.h new/libstorage-ng-4.1.119/storage/Filesystems/BtrfsImpl.h --- old/libstorage-ng-4.1.117/storage/Filesystems/BtrfsImpl.h 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/storage/Filesystems/BtrfsImpl.h 2019-05-02 08:04:23.000000000 +0200 @@ -141,8 +141,16 @@ virtual void do_pre_mount() const override; + virtual Text do_reallot_text(ReallotMode reallot_mode, const Device* device, Tense tense) const override; + virtual void do_reallot(ReallotMode reallot_mode, const Device* device) const override; + void parse_mkfs_output(const vector<string>& stdout); + void do_reduce(const BlkDevice* blk_device) const; + void do_extend(const BlkDevice* blk_device) const; + + virtual void add_dependencies(Actiongraph::Impl& actiongraph) const override; + private: bool configure_snapper; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/Makefile.am new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/Makefile.am --- old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/Makefile.am 2019-04-26 16:52:00.000000000 +0200 +++ new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/Makefile.am 2019-05-02 08:04:23.000000000 +0200 @@ -8,7 +8,7 @@ -lboost_unit_test_framework check_PROGRAMS = \ - create1.test delete1.test delete2.test + create1.test delete1.test delete2.test extend1.test AM_DEFAULT_SOURCE_EXT = .cc @@ -17,5 +17,6 @@ EXTRA_DIST = \ create1-probed.xml create1-staging.xml create1-expected.txt \ delete1-probed.xml delete1-staging.xml delete1-expected.txt \ - delete2-probed.xml delete2-staging.xml delete2-expected.txt + delete2-probed.xml delete2-staging.xml delete2-expected.txt \ + extend1-probed.xml extend1-staging.xml extend1-expected.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/extend1-expected.txt new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/extend1-expected.txt --- old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/extend1-expected.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/extend1-expected.txt 2019-05-02 08:04:23.000000000 +0200 @@ -0,0 +1 @@ +1 - Add /dev/sdd1 (27.94 GiB) to btrfs on /dev/sdc1 (27.94 GiB) -> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/extend1-probed.xml new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/extend1-probed.xml --- old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/extend1-probed.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/extend1-probed.xml 2019-05-02 08:04:23.000000000 +0200 @@ -0,0 +1,113 @@ +<?xml version="1.0"?> +<Devicegraph> + <Devices> + <Disk> + <sid>42</sid> + <name>/dev/sdd</name> + <sysfs-name>sdd</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:14.0/usb2/2-8/2-8:1.0/host9/target9:0:0/9:0:0:0/block/sdd</sysfs-path> + <region> + <length>5860466688</length> + <block-size>512</block-size> + </region> + <topology/> + <udev-path>pci-0000:00:14.0-usb-0:8:1.0-scsi-0:0:0:0</udev-path> + <udev-id>usb-WD_My_Passport_25E2_575842314436354C33384445-0:0</udev-id> + <range>256</range> + <rotational>true</rotational> + <transport>USB</transport> + </Disk> + <Disk> + <sid>45</sid> + <name>/dev/sdc</name> + <sysfs-name>sdc</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:14.0/usb2/2-7/2-7:1.0/host8/target8:0:0/8:0:0:0/block/sdc</sysfs-path> + <region> + <length>5860466688</length> + <block-size>512</block-size> + </region> + <topology/> + <udev-path>pci-0000:00:14.0-usb-0:7:1.0-scsi-0:0:0:0</udev-path> + <udev-id>usb-WD_My_Passport_25E2_57584D31454135463654544A-0:0</udev-id> + <range>256</range> + <rotational>true</rotational> + <transport>USB</transport> + </Disk> + <Gpt> + <sid>55</sid> + </Gpt> + <Partition> + <sid>56</sid> + <name>/dev/sdd1</name> + <sysfs-name>sdd1</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:14.0/usb2/2-8/2-8:1.0/host9/target9:0:0/9:0:0:0/block/sdd/sdd1</sysfs-path> + <region> + <start>2048</start> + <length>58603520</length> + <block-size>512</block-size> + </region> + <topology/> + <udev-path>pci-0000:00:14.0-usb-0:8:1.0-scsi-0:0:0:0-part1</udev-path> + <udev-id>usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part1</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Gpt> + <sid>60</sid> + </Gpt> + <Partition> + <sid>61</sid> + <name>/dev/sdc1</name> + <sysfs-name>sdc1</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:14.0/usb2/2-7/2-7:1.0/host8/target8:0:0/8:0:0:0/block/sdc/sdc1</sysfs-path> + <region> + <start>2048</start> + <length>58603520</length> + <block-size>512</block-size> + </region> + <topology/> + <udev-path>pci-0000:00:14.0-usb-0:7:1.0-scsi-0:0:0:0-part1</udev-path> + <udev-id>usb-WD_My_Passport_25E2_57584D31454135463654544A-0:0-part1</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Btrfs> + <sid>77</sid> + <uuid>b681716a-248c-4c8d-9176-7c162391bf33</uuid> + <metadata-raid-level>DUP</metadata-raid-level> + <data-raid-level>SINGLE</data-raid-level> + </Btrfs> + <BtrfsSubvolume> + <sid>78</sid> + <id>5</id> + <path></path> + <default-btrfs-subvolume>true</default-btrfs-subvolume> + </BtrfsSubvolume> + </Devices> + <Holders> + <User> + <source-sid>42</source-sid> + <target-sid>55</target-sid> + </User> + <Subdevice> + <source-sid>55</source-sid> + <target-sid>56</target-sid> + </Subdevice> + <User> + <source-sid>45</source-sid> + <target-sid>60</target-sid> + </User> + <Subdevice> + <source-sid>60</source-sid> + <target-sid>61</target-sid> + </Subdevice> + <Subdevice> + <source-sid>77</source-sid> + <target-sid>78</target-sid> + </Subdevice> + <FilesystemUser> + <source-sid>61</source-sid> + <target-sid>77</target-sid> + </FilesystemUser> + </Holders> +</Devicegraph> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/extend1-staging.xml new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/extend1-staging.xml --- old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/extend1-staging.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/extend1-staging.xml 2019-05-02 08:04:23.000000000 +0200 @@ -0,0 +1,117 @@ +<?xml version="1.0"?> +<Devicegraph> + <Devices> + <Disk> + <sid>42</sid> + <name>/dev/sdd</name> + <sysfs-name>sdd</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:14.0/usb2/2-8/2-8:1.0/host9/target9:0:0/9:0:0:0/block/sdd</sysfs-path> + <region> + <length>5860466688</length> + <block-size>512</block-size> + </region> + <topology/> + <udev-path>pci-0000:00:14.0-usb-0:8:1.0-scsi-0:0:0:0</udev-path> + <udev-id>usb-WD_My_Passport_25E2_575842314436354C33384445-0:0</udev-id> + <range>256</range> + <rotational>true</rotational> + <transport>USB</transport> + </Disk> + <Disk> + <sid>45</sid> + <name>/dev/sdc</name> + <sysfs-name>sdc</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:14.0/usb2/2-7/2-7:1.0/host8/target8:0:0/8:0:0:0/block/sdc</sysfs-path> + <region> + <length>5860466688</length> + <block-size>512</block-size> + </region> + <topology/> + <udev-path>pci-0000:00:14.0-usb-0:7:1.0-scsi-0:0:0:0</udev-path> + <udev-id>usb-WD_My_Passport_25E2_57584D31454135463654544A-0:0</udev-id> + <range>256</range> + <rotational>true</rotational> + <transport>USB</transport> + </Disk> + <Gpt> + <sid>55</sid> + </Gpt> + <Partition> + <sid>56</sid> + <name>/dev/sdd1</name> + <sysfs-name>sdd1</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:14.0/usb2/2-8/2-8:1.0/host9/target9:0:0/9:0:0:0/block/sdd/sdd1</sysfs-path> + <region> + <start>2048</start> + <length>58603520</length> + <block-size>512</block-size> + </region> + <topology/> + <udev-path>pci-0000:00:14.0-usb-0:8:1.0-scsi-0:0:0:0-part1</udev-path> + <udev-id>usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part1</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Gpt> + <sid>60</sid> + </Gpt> + <Partition> + <sid>61</sid> + <name>/dev/sdc1</name> + <sysfs-name>sdc1</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:14.0/usb2/2-7/2-7:1.0/host8/target8:0:0/8:0:0:0/block/sdc/sdc1</sysfs-path> + <region> + <start>2048</start> + <length>58603520</length> + <block-size>512</block-size> + </region> + <topology/> + <udev-path>pci-0000:00:14.0-usb-0:7:1.0-scsi-0:0:0:0-part1</udev-path> + <udev-id>usb-WD_My_Passport_25E2_57584D31454135463654544A-0:0-part1</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Btrfs> + <sid>77</sid> + <uuid>b681716a-248c-4c8d-9176-7c162391bf33</uuid> + <metadata-raid-level>DUP</metadata-raid-level> + <data-raid-level>SINGLE</data-raid-level> + </Btrfs> + <BtrfsSubvolume> + <sid>78</sid> + <id>5</id> + <path></path> + <default-btrfs-subvolume>true</default-btrfs-subvolume> + </BtrfsSubvolume> + </Devices> + <Holders> + <User> + <source-sid>42</source-sid> + <target-sid>55</target-sid> + </User> + <Subdevice> + <source-sid>55</source-sid> + <target-sid>56</target-sid> + </Subdevice> + <User> + <source-sid>45</source-sid> + <target-sid>60</target-sid> + </User> + <Subdevice> + <source-sid>60</source-sid> + <target-sid>61</target-sid> + </Subdevice> + <Subdevice> + <source-sid>77</source-sid> + <target-sid>78</target-sid> + </Subdevice> + <FilesystemUser> + <source-sid>56</source-sid> + <target-sid>77</target-sid> + </FilesystemUser> + <FilesystemUser> + <source-sid>61</source-sid> + <target-sid>77</target-sid> + </FilesystemUser> + </Holders> +</Devicegraph> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/extend1.cc new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/extend1.cc --- old/libstorage-ng-4.1.117/testsuite/dependencies/btrfs/extend1.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.1.119/testsuite/dependencies/btrfs/extend1.cc 2019-05-02 08:04:23.000000000 +0200 @@ -0,0 +1,20 @@ + +#define BOOST_TEST_DYN_LINK +#define BOOST_TEST_MODULE libstorage + +#include <boost/test/unit_test.hpp> + +#include "storage/Utils/Logger.h" +#include "testsuite/helpers/TsCmp.h" + + +using namespace storage; + + +BOOST_AUTO_TEST_CASE(dependencies) +{ + set_logger(get_stdout_logger()); + + TsCmpActiongraph cmp("extend1"); + BOOST_CHECK_MESSAGE(cmp.ok(), cmp); +}

1 0

commit yast2-storage-ng for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package yast2-storage-ng for openSUSE:Factory checked in at 2019-05-05 21:17:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage-ng (Old) and /work/SRC/openSUSE:Factory/.yast2-storage-ng.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage-ng" Sun May 5 21:17:28 2019 rev:50 rq:700341 version:4.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage-ng/yast2-storage-ng.changes 2019-04-28 20:00:15.174906001 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage-ng.new.5148/yast2-storage-ng.changes 2019-05-05 21:17:29.660635634 +0200 @@ -1,0 +2,33 @@ +Thu May 2 09:49:02 UTC 2019 - David Diaz <dgonzalez(a)suse.com> + +- Partitioner: fix the Btrfs filesystem icon used in "Type" column. +- Partitioner: improve the value for the "Type" column when a volume + group does not have name. +- Partitioner: fix the device name for a multidevice filesystem. +- Partitioner: do not show label nor mount point for devices used by + a multidevice filesystem. +- Part of jsc#SLE-3877. +- 4.2.12 + +------------------------------------------------------------------- +Thu May 2 09:21:50 UTC 2019 - ancor(a)suse.com + +- Partitioner: fixes in the navigation tree (bsc#1133686). +- 4.2.11 + +------------------------------------------------------------------- +Tue Apr 30 12:30:12 UTC 2019 - David Diaz <dgonzalez(a)suse.com> + +- Partitioner: unify the "Type" and "FS Type" columns. +- Partitioner: show multidevice filesystems in the system section. +- Part of jsd#SLE-3877. +- 4.2.10 + +------------------------------------------------------------------- +Tue Apr 30 07:46:10 UTC 2019 - José Iván López González <jlopez(a)suse.com> + +- Partitioner: added option for editing Btrfs filesystems. +- Part of jsd#SLE-3877. +- 4.2.9 + +------------------------------------------------------------------- Old: ---- yast2-storage-ng-4.2.8.tar.bz2 New: ---- yast2-storage-ng-4.2.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage-ng.spec ++++++ --- /var/tmp/diff_new_pack.Frz7FQ/_old 2019-05-05 21:17:31.028639360 +0200 +++ /var/tmp/diff_new_pack.Frz7FQ/_new 2019-05-05 21:17:31.076639492 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage-ng -Version: 4.2.8 +Version: 4.2.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-ng-4.2.8.tar.bz2 -> yast2-storage-ng-4.2.12.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/yast2-storage-ng/yast2-storage-ng-4.2.8.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-storage-ng.new.5148/yast2-storage-ng-4.2.12.tar.bz2 differ: char 11, line 1

1 0

commit yast2-update for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2019-05-05 21:17:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-update" Sun May 5 21:17:20 2019 rev:128 rq:699686 version:4.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2019-01-26 22:21:36.810894621 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-update.new.5148/yast2-update.changes 2019-05-05 21:17:21.620613731 +0200 @@ -1,0 +2,19 @@ +Fri Apr 26 11:03:27 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz> + +- Uninstall the "SUSE-Manager-Proxy" product when upgrading from + SLES12 + SUMA Proxy + SUMA Branch Server (bsc#1133215) +- 4.2.2 + +------------------------------------------------------------------- +Fri Apr 5 14:43:25 UTC 2019 - José Iván López González <jlopez(a)suse.com> + +- Remove obsolete code. +- 4.2.1 + +------------------------------------------------------------------- +Tue Mar 26 16:29:07 UTC 2019 - José Iván López González <jlopez(a)suse.com> + +- Remove code related to device name translations. +- 4.2.0 + +------------------------------------------------------------------- Old: ---- yast2-update-4.1.8.tar.bz2 New: ---- yast2-update-4.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.xwyWcx/_old 2019-05-05 21:17:21.984614722 +0200 +++ /var/tmp/diff_new_pack.xwyWcx/_new 2019-05-05 21:17:21.984614722 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.1.8 +Version: 4.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,9 +25,10 @@ Url: http://github.com/yast/yast-update BuildRequires: update-desktop-files -BuildRequires: yast2 >= 3.1.126 BuildRequires: yast2-devtools >= 3.1.15 BuildRequires: yast2-ruby-bindings >= 1.0.0 +# Y2Packager::ProductUpgrade.remove_obsolete_upgrades +BuildRequires: yast2 >= 4.2.1 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 @@ -44,8 +45,8 @@ BuildRequires: yast2-storage-ng >= 4.1.31 # Encryption.save_crypttab_names Requires: yast2-storage-ng >= 4.1.31 -# FSSnapshotStore -Requires: yast2 >= 3.1.126 +# Y2Packager::ProductUpgrade.remove_obsolete_upgrades +Requires: yast2 >= 4.2.1 Requires: yast2-installation # handle bind mount at /mnt/dev ++++++ yast2-update-4.1.8.tar.bz2 -> yast2-update-4.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.8/Dockerfile new/yast2-update-4.2.2/Dockerfile --- old/yast2-update-4.1.8/Dockerfile 2019-01-25 08:26:24.000000000 +0100 +++ new/yast2-update-4.2.2/Dockerfile 2019-04-30 15:40:22.000000000 +0200 @@ -1,3 +1,3 @@ -FROM yastdevel/ruby +FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.8/package/yast2-update.changes new/yast2-update-4.2.2/package/yast2-update.changes --- old/yast2-update-4.1.8/package/yast2-update.changes 2019-01-25 08:26:24.000000000 +0100 +++ new/yast2-update-4.2.2/package/yast2-update.changes 2019-04-30 15:40:22.000000000 +0200 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Fri Apr 26 11:03:27 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz> + +- Uninstall the "SUSE-Manager-Proxy" product when upgrading from + SLES12 + SUMA Proxy + SUMA Branch Server (bsc#1133215) +- 4.2.2 + +------------------------------------------------------------------- +Fri Apr 5 14:43:25 UTC 2019 - José Iván López González <jlopez(a)suse.com> + +- Remove obsolete code. +- 4.2.1 + +------------------------------------------------------------------- +Tue Mar 26 16:29:07 UTC 2019 - José Iván López González <jlopez(a)suse.com> + +- Remove code related to device name translations. +- 4.2.0 + +------------------------------------------------------------------- Thu Jan 24 18:49:24 UTC 2019 - lslezak(a)suse.cz - Added URL tag to the spec file (bsc#1097957) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.8/package/yast2-update.spec new/yast2-update-4.2.2/package/yast2-update.spec --- old/yast2-update-4.1.8/package/yast2-update.spec 2019-01-25 08:26:24.000000000 +0100 +++ new/yast2-update-4.2.2/package/yast2-update.spec 2019-04-30 15:40:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.1.8 +Version: 4.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,8 @@ BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.15 BuildRequires: yast2-ruby-bindings >= 1.0.0 -BuildRequires: yast2 >= 3.1.126 +# Y2Packager::ProductUpgrade.remove_obsolete_upgrades +BuildRequires: yast2 >= 4.2.1 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 @@ -46,8 +47,8 @@ BuildRequires: yast2-storage-ng >= 4.1.31 # Encryption.save_crypttab_names Requires: yast2-storage-ng >= 4.1.31 -# FSSnapshotStore -Requires: yast2 >= 3.1.126 +# Y2Packager::ProductUpgrade.remove_obsolete_upgrades +Requires: yast2 >= 4.2.1 Requires: yast2-installation # handle bind mount at /mnt/dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.8/src/clients/update_proposal.rb new/yast2-update-4.2.2/src/clients/update_proposal.rb --- old/yast2-update-4.1.8/src/clients/update_proposal.rb 2019-01-25 08:26:24.000000000 +0100 +++ new/yast2-update-4.2.2/src/clients/update_proposal.rb 2019-04-30 15:40:22.000000000 +0200 @@ -27,6 +27,7 @@ # require "cgi/util" +require "y2packager/product_upgrade" module Yast class UpdateProposalClient < Client @@ -450,6 +451,10 @@ # Control the upgrade process better update_sum = Pkg.PkgUpdateAll(GetUpdateConf()) Builtins.y2milestone("Update summary: %1", update_sum) + + # deselect the upgraded obsolete products (bsc#1133215) + Y2Packager::ProductUpgrade.remove_obsolete_upgrades + Update.unknown_packages = Ops.get(update_sum, :ProblemListSze, 0) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.8/src/include/update/rootpart.rb new/yast2-update-4.2.2/src/include/update/rootpart.rb --- old/yast2-update-4.1.8/src/include/update/rootpart.rb 2019-01-25 08:26:24.000000000 +0100 +++ new/yast2-update-4.2.2/src/include/update/rootpart.rb 2019-04-30 15:40:22.000000000 +0200 @@ -47,10 +47,6 @@ Yast.import "Report" Yast.import "Update" Yast.import "Installation" -# storage-ng -=begin - Yast.import "FileSystems" -=end Yast.import "Mode" Yast.import "Product" end @@ -180,7 +176,7 @@ # exact match if arch_1 == arch_2 - return true + return true # ppc exception elsif Builtins.contains(ppc_archs, arch_1) && Builtins.contains(ppc_archs, arch_2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.8/src/modules/RootPart.rb new/yast2-update-4.2.2/src/modules/RootPart.rb --- old/yast2-update-4.1.8/src/modules/RootPart.rb 2019-01-25 08:26:24.000000000 +0100 +++ new/yast2-update-4.2.2/src/modules/RootPart.rb 2019-04-30 15:40:22.000000000 +0200 @@ -58,15 +58,6 @@ Yast.import "Stage" Yast.import "Wizard" -# storage-ng -# This include allows to use DlgUpdateCryptFs, which has not equivalent in -# yast-storage-ng. So the whole method invoking DlgUpdateCryptFs should be -# checked (it's hopefully useless now). -=begin - Yast.include self, "partitioning/custom_part_dialogs.rb" -=end - - # Selected root partition for the update or boot. @selectedRootPartition = "" @@ -111,15 +102,6 @@ # include Installation::destdir. @activated = [] - - # Link to SDB article concerning renaming of devices. - @sdb = Builtins.sformat( - _( - "See the SDB article at %1 for details\nabout how to solve this problem." - ), - "http://support.novell.com/techcenter/sdb/en/2003/03/fhassel_update_not_poss…" - ) - # translation from new to old device names # such as /dev/sdc4 -> /dev/hdb4 @backward_translation = {} @@ -626,90 +608,6 @@ options end - # Translates FS or Cryptotab (old devices to new ones). - # Such as /dev/hda5 to /dev/sda5. - # - # @param list <map> of definitions to translate - # @param string key name in map to translate - # @param string key name in map to keep the old value - # @return [Array<Hash>] of translated definitions - # - # @see #https://bugzilla.novell.com/show_bug.cgi?id=258222 - def TranslateFsOrCryptoTab(translate, key_to_translate, key_preserve_as) - translate = deep_copy(translate) - # Check whether there is any hardware information that could be used - check_command = Builtins.sformat( - "/usr/bin/find '%1/var/lib/hardware/'", - String.Quote(Installation.destdir) - ) - cmd = Convert.to_map( - SCR.Execute(path(".target.bash_output"), check_command) - ) - - if Ops.get(cmd, "exit") != nil - files = Builtins.splitstring(Ops.get_string(cmd, "stdout", ""), "\n") - files_count = Builtins.size(files) - if files_count == nil || Ops.less_or_equal(files_count, 2) - Builtins.y2error( - "There are only %1 files in /var/lib/hardware/, translation needn't work!", - files_count - ) - else - Builtins.y2milestone( - "There are %1 files in /var/lib/hardware/", - files_count - ) - end - end - - # first find a list of values for translation - old_names = [] - Builtins.foreach(translate) do |m| - old_names = Builtins.add( - old_names, - Ops.get_string(m, key_to_translate, "") - ) - end - - # translate them - # storage-ng - new_names = old_names -=begin - new_names = Storage.GetTranslatedDevices( - Installation.installedVersion, - Installation.updateVersion, - old_names - ) -=end - - i = 0 - - # replace old values with translated ones - while Ops.less_than(i, Builtins.size(translate)) - default_val = Ops.get_string(translate, [i, key_to_translate], "") - new_val = Ops.get(new_names, i, default_val) - - Ops.set(translate, [i, key_to_translate], new_val) - Ops.set(translate, [i, key_preserve_as], default_val) - Ops.set(@backward_translation, new_val, default_val) - - Ops.set( - translate, - [i, "mntops"], - update_mount_options(Ops.get_string(translate, [i, "mntops"], "")) - ) - - i = Ops.add(i, 1) - end - - Builtins.y2milestone( - "Current backward translations: %1", - @backward_translation - ) - - deep_copy(translate) - end - # Register a new fstab agent and read the configuration # from Installation::destdir def readFsTab(fstab) @@ -766,62 +664,6 @@ nil end - # Register a new cryptotab agent and read the configuration - # from Installation::destdir - def readCryptoTab(crtab) - crtab_file = Ops.add(Installation.destdir, "/etc/cryptotab") - - if FileUtils.Exists(crtab_file) - SCR.RegisterAgent( - path(".target.etc.cryptotab"), - term( - :ag_anyagent, - term( - :Description, - term(:File, crtab_file), - "#\n", # Comment - false, # read-only - term( - :List, - term( - :Tuple, - term(:loop, term(:String, "^\t ")), - term(:Separator, "\t "), - term(:file, term(:String, "^\t ")), - term(:Separator, "\t "), - term(:mount, term(:String, "^\t ")), - term(:Separator, "\t "), - term(:vfstype, term(:String, "^\t ")), - term(:Separator, "\t "), - term(:opt1, term(:String, "^\t ")), - term(:Separator, "\t "), - term(:opt2, term(:String, "^ \t")), - term(:Optional, term(:Whitespace)), - term(:Optional, term(:the_rest, term(:String, "^\n"))) - ), - "\n" - ) - ) - ) - ) - - crtab.value = Convert.convert( - SCR.Read(path(".target.etc.cryptotab")), - :from => "any", - :to => "list <map>" - ) - - SCR.UnregisterAgent(path(".target.etc.cryptotab")) - else - Builtins.y2milestone( - "No such file %1. Not using cryptotab.", - crtab_file - ) - end - - nil - end - def FstabHasSeparateVar(fstab) var_device_fstab = ( fstab_ref = arg_ref(fstab.value); @@ -863,135 +705,21 @@ default_scr = WFM.SCRGetDefault new_scr = nil @backward_translation = {} + # /etc/cryptotab was deprecated in favor of /etc/crypttab + # + # crypttab file is processed by storage-ng, see {#MountPartitions}. + crtab.value = [] if Stage.initial fstab_ref = arg_ref(fstab.value) readFsTab(fstab_ref) fstab.value = fstab_ref.value - crtab_ref = arg_ref(crtab.value) - readCryptoTab(crtab_ref) - crtab.value = crtab_ref.value else fstab.value = Convert.convert( SCR.Read(path(".etc.fstab")), :from => "any", :to => "list <map>" ) - crtab.value = Convert.convert( - SCR.Read(path(".etc.cryptotab")), - :from => "any", - :to => "list <map>" - ) - end - - fstab_has_separate_var = ( - fstab_ref = arg_ref(fstab.value); - _FstabHasSeparateVar_result = FstabHasSeparateVar(fstab_ref); - fstab.value = fstab_ref.value; - _FstabHasSeparateVar_result - ) - # mount /var - if fstab_has_separate_var - Builtins.y2warning("Separate /var partition!") - MountVarIfRequired(fstab.value, root_device_current, false) - else - Builtins.y2milestone("No separate /var partition found") - end - - Builtins.y2milestone("fstab: %1", fstab.value) - fstab.value = TranslateFsOrCryptoTab(fstab.value, "spec", "spec_old") - Builtins.y2milestone("fstab: (translated) %1", fstab.value) - - Builtins.y2milestone("crtab: %1", crtab.value) - crtab.value = TranslateFsOrCryptoTab(crtab.value, "file", "file_old") - Builtins.y2milestone("crtab: (translated) %1", crtab.value) - - # umount /var - if fstab_has_separate_var - SCR.Execute( - path(".target.umount"), - Ops.add(Installation.destdir, "/var") - ) - @activated = Builtins.remove(@activated, 0) - end - - true - end - - - # - def PrepareCryptoTab(crtab, fstab) - crtab = deep_copy(crtab) - crypt_nb = 0 - - Builtins.foreach(crtab) do |mounts| - vfstype = Ops.get_string(mounts, "vfstype", "") - mntops = Ops.get_string(mounts, "opt2", "") - loop = Ops.get_string(mounts, "loop", "") - fspath = Ops.get_string(mounts, "mount", "") - device = Ops.get_string(mounts, "file", "") - Builtins.y2milestone( - "vfstype:%1 mntops:%2 loop:%3 fspath:%4 device:%5", - vfstype, - mntops, - loop, - fspath, - device - ) - if !Builtins.issubstring(mntops, "noauto") - again = true - while again - crypt_ok = true - crypt_passwd = DlgUpdateCryptFs(device, fspath) - - if crypt_passwd == nil || crypt_passwd == "" - crypt_ok = false - again = false - end - - Builtins.y2milestone("crypt pwd ok:%1", crypt_ok) - - if crypt_ok - setloop = { - "encryption" => "twofish", - "passwd" => crypt_passwd, - "loop_dev" => loop, - "partitionName" => device - } - - crypt_ok = ( - setloop_ref = arg_ref(setloop); - _PerformLosetup_result = Storage.PerformLosetup( - setloop_ref, - false - ); - setloop = setloop_ref.value; - _PerformLosetup_result - ) - Builtins.y2milestone("crypt ok: %1", crypt_ok) - if crypt_ok - loop = Ops.get_string(setloop, "loop_dev", "") - else - # yes-no popup - again = Popup.YesNo(_("Incorrect password. Try again?")) - end - end - - if crypt_ok - add_fs = { - "file" => fspath, - "mntops" => mntops, - "spec" => loop, - "freq" => 0, - "passno" => 0, - "vfstype" => vfstype - } - fstab.value = Builtins.prepend(fstab.value, add_fs) - AddMountedPartition({ :type => "crypt", :device => device }) - again = false - end - end - end end true @@ -1254,32 +982,24 @@ end # Mount /var partition - # @param [String] device string device holding the /var subtree - # @return [String] nil on success, error description on fail + # + # @param device [String] name of the device holding /var + # @return [String, nil] nil on success, error description on fail def MountVarPartition(device) mount_err = FsckAndMount("/var", device, "") - err_message = nil - if mount_err != nil - Builtins.y2error(-1, "failed to mount /var") - err_message = Ops.add( - Ops.add( - Ops.add( - Ops.add( - Builtins.sformat( - # error message - _("The /var partition %1 could not be mounted.\n"), - device - ), - "\n" - ), - mount_err - ), - "\n\n" - ), - @sdb - ) - end - err_message + + return nil unless mount_err + + log.error("failed to mount /var") + + # TRANSLATORS: error message when /var partition cannot be mounted. %{device} + # is replaced by a device name (e.g., /dev/sda2) and %{error} is replaced by + # error details. + format( + _("The /var partition %{device} could not be mounted.\n\n%{error}"), + device: device, + error: mount_err + ) end # <-- BNC #448577, Cannot find /var partition automatically @@ -1440,7 +1160,7 @@ manual_mount_successful end - def MountVarIfRequired(fstab, root_device_current, manual_var_mount) + def MountVarIfRequired(fstab, manual_var_mount) fstab = deep_copy(fstab) var_device_fstab = ( fstab_ref = arg_ref(fstab); @@ -1458,40 +1178,26 @@ return nil end - # BNC #494240: all methods except kernel names should be stable enough - if !mounted_by_kernel_name?(var_device_fstab) - log.info "Device #{var_device_fstab} is not mounted by kernel name, mounting..." - return MountVarPartition(var_device_fstab) - end + filesystem = find_filesystem_by_fstab_spec(var_device_fstab) - # Mounting virtual devices by kernel name (e.g. /dev/md0 or /dev/system/swap_lv) - # is also considered to be safe - if virtual_device?(var_device_fstab) - log.info "Device #{var_device_fstab} is not a partition, mounting..." - return MountVarPartition(var_device_fstab) - end - - # At this point, var_device_fstab points either to a device that is not - # longer available or to a plain partition. - # - # In the second case the name may not be reliable since the disk may have - # changed its name (e.g. it used to be recognized as /dev/sda or /dev/hdb in - # the system to update but it became /dev/sdb in the new system). - new_name = update_var_dev_name(var_device_fstab, fstab, root_device_current) - if new_name - if new_name != var_device_fstab - log.info "Partition #{var_device_fstab} seems to have turned into #{new_name}" - end - log.info "Device #{new_name} is a partition, mounting..." - return MountVarPartition(new_name) - end + # Try to mount /var if any filesystem matches the fstab specification + return MountVarPartition(var_device_fstab) if filesystem # BNC #448577: cannot find /var partition automatically, so ask the user return nil if manual_var_mount && MountUserDefinedVarPartition() # Everything else failed, return error message log.error "Unable to mount /var partition" - _("Unable to mount /var partition with this disk configuration.\n") + @sdb + + _("Unable to mount /var partition with this disk configuration.\n") + end + + # Finds a filesystem that matches the given fstab spec + # + # @param spec [String] + # @return [Y2Storage::Filesystem, nil] + def find_filesystem_by_fstab_spec(spec) + probed.blk_filesystems.find { |f| f.match_fstab_spec?(spec) } end def has_pam_mount @@ -1603,7 +1309,7 @@ message = _("No fstab found.") success = false else - tmp_msg = MountVarIfRequired(fstab, root_device_current, true) + tmp_msg = MountVarIfRequired(fstab, true) if tmp_msg != nil Builtins.y2error("failed to mount /var!") message = tmp_msg @@ -1622,29 +1328,18 @@ check_root_device_result ) Builtins.y2error("fstab has wrong root device!") - # message part 1 - message = Ops.add( - Ops.add( - _( - "The root partition in /etc/fstab has an invalid root device.\n" - ), - # message part 2 - Builtins.sformat( - _("It is currently mounted as %1 but listed as %2.\n"), - root_device_current, - tmp - ) - ), - @sdb + + # TRANSLATORS: Error message, where %{root} and %{tmp} are replaced by + # device names (e.g., /dev/sda1 and /dev/sda2). + message = format( + _("The root partition in /etc/fstab has an invalid root device.\n" \ + "It is currently mounted as %{root} but listed as %{tmp}."), + root: root_device_current, + tmp: tmp ) + success = false else - Builtins.y2milestone("cryptotab %1", crtab) - - fstab_ref = arg_ref(fstab) - PrepareCryptoTab(crtab, fstab_ref) - fstab = fstab_ref.value - Builtins.y2milestone("fstab %1", fstab) legacy_filesystems = @@ -1792,8 +1487,7 @@ ret end - # storage-ng - # this is the closest equivalent we have in storage-ng + # This is the closest equivalent we have in storage-ng def device_type(device) if device.is?(:partition) device.id.to_human_string @@ -1846,12 +1540,6 @@ SCR.Execute(path(".target.modprobe"), mount_type, "") end - # storage-ng: not sure if we need to introduce something equivalent -=begin - log.debug("Removing #{p_dev}") - Storage.RemoveDmMapsTo(p_dev) -=end - # mount (read-only) partition to Installation::destdir log.debug("Mounting #{[p_dev, Installation.destdir, Installation.mountlog].inspect}") mount = @@ -2304,81 +1992,6 @@ device.udev_full_uuid end - # Whether the given fstab spec corresponds to a device mounted by its kernel - # device name. - # - # @param spec [String] content of the first column of an /etc/fstab entry - # @return [Boolean] - def mounted_by_kernel_name?(spec) - mount_by = Y2Storage::Filesystems::MountByType.from_fstab_spec(spec) - mount_by.is?(:device) - end - - # Whether the device referenced by the given fstab spec is a virtual device - # (basically anything that is not a partition). - # - # This is somehow the inverse of the old Storage.DeviceRealDisk - # - # @param spec [String] content of the first column of an /etc/fstab entry - # @return [Boolean] true if the device was found and is not a partition - def virtual_device?(spec) - filesystem = fs_by_devicename(probed, spec) - # If 'filesystem' is nil, either the device is not longer there or it's a - # partition that now has a new name (names of virtual devices should be stable). - return false unless filesystem - - # If this is not based on a block device (so far that means this is NFS), - # then it's virtual. - return true unless filesystem.respond_to?(:plain_blk_devices) - - # To be more faithful to the original check on Storage.DeviceRealDisk - # let's consider everything but a partition to be virtual. - filesystem.plain_blk_devices.none? { |dev| dev.is?(:partition) } - end - - # This method tries to infer the /var device name from its partition number - # and the name of the root device. - # - # @param var_name [String] spec of the /var partition in the old /etc/fstab - # @param fstab [Array<Hash>] content of the old /etc/fstab - # @param root_current_name [String] current kernel device name of the root partition - # @return [String, nil] new name of the device (best guess), nil if we know - # the current name is outdated but we cannot infer the new one - def update_var_dev_name(var_name, fstab, root_current_name) - root_entry = fstab.find { |entry| entry["file"] == "/" } - root_spec = root_entry ? root_entry["spec"] : nil - root_device = probed.find_by_name(root_current_name) - - # If /var was mounted by partition kernel name but the root device was - # not, we cannot apply the upcoming logic to make up the new /var device - # name. Let's simply use the one we already know. - if root_spec.nil? || !mounted_by_kernel_name?(root_spec) || !root_device.is?(:partition) - return var_name - end - - # Regular expresion to break a partition name. Second capture gets the - # partition number (as string). First capture gets the rest. - regexp = /(.*[^\d])(\d*)$/ - var_name_no_number, var_name_number = regexp.match(var_name).captures - root_spec_no_number = regexp.match(root_spec)[1] - - # If /var and / were partitions in the same disk... - if var_name_no_number == root_spec_no_number - root_current_no_number = regexp.match(root_current_name)[1] - return root_current_no_number + var_name_number - end - - # If both partitions were not in the same disk, we assume '/' is in one - # disk and '/var' in the other one. Of course that logic only works if - # there are exactly two disks. - return nil if probed.disk_devices.size != 2 - - root_disk = root_device.partitionable - other_disk = probed.disk_devices.find { |dev| dev != root_disk } - partition = other_disk.partitions.find { |part| part.number == var_name_number.to_i } - partition.name - end - # @see #mount_regular_fstab_entry?( ALLOWED_FS = [ "ext", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.8/test/root_part_test.rb new/yast2-update-4.2.2/test/root_part_test.rb --- old/yast2-update-4.1.8/test/root_part_test.rb 2019-01-25 08:26:24.000000000 +0100 +++ new/yast2-update-4.2.2/test/root_part_test.rb 2019-04-30 15:40:22.000000000 +0200 @@ -69,10 +69,10 @@ end it "returns a string including the device and the error " do - result = subject.MountVarIfRequired(fstab, root_device, false) + result = subject.MountVarIfRequired(fstab, false) expect(result).to be_a(String) expect(result).to include("an error") - expect(result).to include(var_device) + expect(result).to include(var_spec) end end @@ -82,7 +82,7 @@ end it "returns nil" do - expect(subject.MountVarIfRequired(fstab, root_device, false)).to be_nil + expect(subject.MountVarIfRequired(fstab, false)).to be_nil end end end @@ -90,33 +90,31 @@ context "if there is no separate partition" do context "and no @/var subvolume" do let(:fstab) { fstab_sda2 } - let(:root_device) { "/dev/sda2" } let(:root_spec) { "UUID=d6e5c710-3067-48de-8363-433e54a9d0b5" } it "does not try to mount /var" do expect(subject).to_not receive(:FsckAndMount) - subject.MountVarIfRequired(fstab, root_device, false) + subject.MountVarIfRequired(fstab, false) end it "returns nil" do - expect(subject.MountVarIfRequired(fstab, root_device, false)).to be_nil + expect(subject.MountVarIfRequired(fstab, false)).to be_nil end end context "and there is a @/var subvolume" do let(:fstab) { fstab_sda1 } - let(:root_device) { "/dev/sda1" } let(:root_spec) { "UUID=0a0ebfa7-e1a8-45f2-ad53-495e192fcc8d" } # The old code did not support Btrfs properly, so it mounted the /var # subvolume as a partition, which produced big breakage. it "does not try to mount /var" do expect(subject).to_not receive(:FsckAndMount) - subject.MountVarIfRequired(fstab, root_device, false) + subject.MountVarIfRequired(fstab, false) end it "returns nil" do - expect(subject.MountVarIfRequired(fstab, root_device, false)).to be_nil + expect(subject.MountVarIfRequired(fstab, false)).to be_nil end end end @@ -131,48 +129,32 @@ ] end - context "that was mounted by UUID" do - let(:root_device) { "/dev/sda2" } + context "and the device is found in the system" do let(:root_spec) { "UUID=d6e5c710-3067-48de-8363-433e54a9d0b5" } let(:var_spec) { "UUID=c9510dc7-fb50-4f7b-bd84-886965c821f6" } - let(:var_device) { var_spec } - it "tries to mount /var by its UUID" do - expect(subject).to receive(:FsckAndMount).with("/var", var_device, "") - subject.MountVarIfRequired(fstab, root_device, false) + it "tries to mount /var" do + expect(subject).to receive(:FsckAndMount).with("/var", var_spec, "") + subject.MountVarIfRequired(fstab, false) end include_examples "mounting result" end - context "that was mounted by kernel device name" do - # Let's simulate the situation in which the disk used to have another name - let(:root_spec) { "/dev/sdb2" } - let(:root_device) { "/dev/sda2" } + context "and the device is not found in the system" do + let(:root_spec) { "/dev/sda2" } - context "and is in the same disk than /" do - let(:var_spec) { "/dev/sdb4" } - let(:var_device) { "/dev/sda4" } + let(:var_spec) { "/dev/sdc1" } - it "tries to mount /var by its adapted device name" do - expect(subject).to receive(:FsckAndMount).with("/var", var_device, "") - subject.MountVarIfRequired(fstab, root_device, false) - end - - include_examples "mounting result" + it "does not try to mount /var" do + expect(subject).to_not receive(:FsckAndMount) + subject.MountVarIfRequired(fstab, false) end - context "and is in a different disk than / (two disks in total)" do - let(:var_spec) { "/dev/sda1" } - let(:var_device) { "/dev/sdb1" } - - it "tries to mount /var by its adapted device name" do - expect(subject).to receive(:FsckAndMount).with("/var", var_device, "") - subject.MountVarIfRequired(fstab, root_device, false) - end - - include_examples "mounting result" + it "returns an error" do + expect(subject.MountVarIfRequired(fstab, false)) + .to match(/Unable to mount/) end end end @@ -189,47 +171,32 @@ ] end - context "that was mounted by UUID" do - let(:root_device) { "/dev/vg0/root" } - let(:root_spec) { "/dev/disk/by-uuid/5a0a-3387" } + context "and the LVM logical volume is found in the system" do + let(:root_spec) { "/dev/vg0/root" } let(:var_spec) { "/dev/disk/by-uuid/4b85-3de0" } - let(:var_device) { var_spec } - it "tries to mount /var by its UUID" do - expect(subject).to receive(:FsckAndMount).with("/var", var_device, "") - subject.MountVarIfRequired(fstab, root_device, false) + it "tries to mount /var" do + expect(subject).to receive(:FsckAndMount).with("/var", var_spec, "") + subject.MountVarIfRequired(fstab, false) end include_examples "mounting result" end - context "that was mounted by kernel device name" do + context "and the LVM logical volume is not found in the system" do let(:root_spec) { "/dev/vg0/root" } - let(:root_device) { "/dev/vg0/root" } - context "and the LV is not longer there" do - let(:var_spec) { "/dev/vg0/none" } - let(:var_device) { "/dev/vg0/none" } + let(:var_spec) { "/dev/disk/by-uuid/not-found" } - it "tries to mount /var by its old device name" do - expect(subject).to receive(:FsckAndMount).with("/var", var_device, "") - subject.MountVarIfRequired(fstab, root_device, false) - end - - include_examples "mounting result" + it "does not try to mount /var" do + expect(subject).to_not receive(:FsckAndMount) + subject.MountVarIfRequired(fstab, false) end - context "and the LV is still there" do - let(:var_spec) { "/dev/vg0/var" } - let(:var_device) { "/dev/vg0/var" } - - it "tries to mount /var by its device name" do - expect(subject).to receive(:FsckAndMount).with("/var", var_device, "") - subject.MountVarIfRequired(fstab, root_device, false) - end - - include_examples "mounting result" + it "returns an error" do + expect(subject.MountVarIfRequired(fstab, false)) + .to match(/Unable to mount/) end end end

1 0

commit autoyast2 for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2019-05-05 21:17:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Sun May 5 21:17:12 2019 rev:258 rq:699685 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2019-04-03 09:25:04.887732331 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new.5148/autoyast2.changes 2019-05-05 21:17:14.140593354 +0200 @@ -1,0 +2,7 @@ +Mon Apr 29 11:34:37 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz> + +- Uninstall the "SUSE-Manager-Proxy" product when upgrading from + SLES12 + SUMA Proxy + SUMA Branch Server (bsc#1133215) +- 4.2.0 + +------------------------------------------------------------------- Old: ---- autoyast2-4.1.5.tar.bz2 New: ---- autoyast2-4.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.SqjCTP/_old 2019-05-05 21:17:14.640594716 +0200 +++ /var/tmp/diff_new_pack.SqjCTP/_new 2019-05-05 21:17:14.644594727 +0200 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.1.5 +Version: 4.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,8 +60,8 @@ Requires: autoyast2-installation = %{version} Requires: libxslt -# Yast::Popup.ErrorAnyQuestion fixed -Requires: yast2 >= 4.0.60 +# Y2Packager::ProductUpgrade.remove_obsolete_upgrades +Requires: yast2 >= 4.2.1 Requires: yast2-core Requires: yast2-country >= 3.1.13 Requires: yast2-ntp-client >= 4.0.1 ++++++ autoyast2-4.1.5.tar.bz2 -> autoyast2-4.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.1.5/package/autoyast2.changes new/autoyast2-4.2.0/package/autoyast2.changes --- old/autoyast2-4.1.5/package/autoyast2.changes 2019-04-02 16:42:13.000000000 +0200 +++ new/autoyast2-4.2.0/package/autoyast2.changes 2019-04-30 15:34:18.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 29 11:34:37 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz> + +- Uninstall the "SUSE-Manager-Proxy" product when upgrading from + SLES12 + SUMA Proxy + SUMA Branch Server (bsc#1133215) +- 4.2.0 + +------------------------------------------------------------------- Tue Apr 2 10:32:53 UTC 2019 - José Iván López González <jlopez(a)suse.com> - Removed check for available devices. When there are no devices, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.1.5/package/autoyast2.spec new/autoyast2-4.2.0/package/autoyast2.spec --- old/autoyast2-4.1.5/package/autoyast2.spec 2019-04-02 16:42:13.000000000 +0200 +++ new/autoyast2-4.2.0/package/autoyast2.spec 2019-04-30 15:34:18.000000000 +0200 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.1.5 +Version: 4.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,8 +60,8 @@ Requires: autoyast2-installation = %{version} Requires: libxslt -# Yast::Popup.ErrorAnyQuestion fixed -Requires: yast2 >= 4.0.60 +# Y2Packager::ProductUpgrade.remove_obsolete_upgrades +Requires: yast2 >= 4.2.1 Requires: yast2-core Requires: yast2-country >= 3.1.13 Requires: yast2-ntp-client >= 4.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.1.5/src/clients/inst_autosetup_upgrade.rb new/autoyast2-4.2.0/src/clients/inst_autosetup_upgrade.rb --- old/autoyast2-4.1.5/src/clients/inst_autosetup_upgrade.rb 2019-04-02 16:42:13.000000000 +0200 +++ new/autoyast2-4.2.0/src/clients/inst_autosetup_upgrade.rb 2019-04-30 15:34:18.000000000 +0200 @@ -9,6 +9,8 @@ # $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $ require "autoinstall/autosetup_helpers" +require "y2packager/product_upgrade" + module Yast class InstAutosetupUpgradeClient < Client include Yast::Logger @@ -359,6 +361,10 @@ Builtins.foreach(@remove_products) do |p| Pkg.ResolvableRemove(p, :product) end + + # deselect the upgraded obsolete products (bsc#1133215) + Y2Packager::ProductUpgrade.remove_obsolete_upgrades + Builtins.foreach(@patterns) { |p| Pkg.ResolvableInstall(p, :pattern) } Builtins.foreach(@packages) { |p| Pkg.ResolvableInstall(p, :package) } Builtins.foreach(@products) { |p| Pkg.ResolvableInstall(p, :product) }

1 0

commit yast2 for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2019-05-05 21:17:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Sun May 5 21:17:03 2019 rev:453 rq:699678 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2019-04-18 09:55:21.317300927 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new.5148/yast2.changes 2019-05-05 21:17:05.784570590 +0200 @@ -1,0 +2,7 @@ +Fri Apr 26 08:38:39 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz> + +- Uninstall the "SUSE-Manager-Proxy" product when upgrading from + SLES12 + SUMA Proxy + SUMA Branch Server (bsc#1133215) +- 4.2.1 + +------------------------------------------------------------------- Old: ---- yast2-4.2.0.tar.bz2 New: ---- yast2-4.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.Ad7HMq/_old 2019-05-05 21:17:06.300571996 +0200 +++ /var/tmp/diff_new_pack.Ad7HMq/_new 2019-05-05 21:17:06.308572018 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only ++++++ yast2-4.2.0.tar.bz2 -> yast2-4.2.1.tar.bz2 ++++++ ++++ 1621 lines of diff (skipped)

1 0

commit skelcd-control-openSUSE for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at 2019-05-05 21:16:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-openSUSE" Sun May 5 21:16:54 2019 rev:207 rq:699625 version:20190430 Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes 2019-04-18 09:55:06.809291790 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.5148/skelcd-control-openSUSE-promo.changes 2019-05-05 21:16:55.624542912 +0200 @@ -1,0 +2,8 @@ +Tue Apr 30 10:01:57 UTC 2019 - Maurizio Galli <maurizio.galli(a)gmail.com> + +- make sure yast gets installed with Xfce system role too + (boo#1130998) +- cleaned white spaces around Xfce system role +- 20190430 + +------------------------------------------------------------------- skelcd-control-openSUSE.changes: same change Old: ---- skelcd-control-openSUSE-20190416.tar.bz2 New: ---- skelcd-control-openSUSE-20190430.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE-promo.spec ++++++ --- /var/tmp/diff_new_pack.m0ZgzK/_old 2019-05-05 21:16:57.412547783 +0200 +++ /var/tmp/diff_new_pack.m0ZgzK/_new 2019-05-05 21:16:57.448547881 +0200 @@ -27,7 +27,7 @@ # ###################################################################### Name: skelcd-control-openSUSE-promo -Version: 20190416 +Version: 20190430 Release: 0 Summary: The openSUSE Installation Control file License: MIT skelcd-control-openSUSE.spec: same change ++++++ skelcd-control-openSUSE-20190416.tar.bz2 -> skelcd-control-openSUSE-20190430.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20190416/control/control.openSUSE.xml new/skelcd-control-openSUSE-20190430/control/control.openSUSE.xml --- old/skelcd-control-openSUSE-20190416/control/control.openSUSE.xml 2019-04-16 10:13:59.000000000 +0200 +++ new/skelcd-control-openSUSE-20190430/control/control.openSUSE.xml 2019-04-30 13:03:39.000000000 +0200 @@ -337,14 +337,14 @@ </software> <order config:type="integer">200</order> </system_role> - + <system_role> <id>xfce</id> <network> <network_manager>always</network_manager> </network> <software> - <default_patterns>xfce x11 base</default_patterns> + <default_patterns>xfce x11 base x11_yast yast2_basis</default_patterns> </software> <order config:type="integer">220</order> </system_role> @@ -576,8 +576,9 @@ <label>Desktop with Xfce</label> </xfce> <xfce_description> - <label>Graphical system with Xfce as desktop environment. Suitable for Workstations, Desktops and Laptops.</label> - </xfce_description> + <label>Graphical system with Xfce as desktop environment. Suitable for Workstations, Desktops and Laptops. + </label> + </xfce_description> <generic_desktop>  <label>Generic Desktop</label> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20190416/package/skelcd-control-openSUSE.changes new/skelcd-control-openSUSE-20190430/package/skelcd-control-openSUSE.changes --- old/skelcd-control-openSUSE-20190416/package/skelcd-control-openSUSE.changes 2019-04-16 10:13:59.000000000 +0200 +++ new/skelcd-control-openSUSE-20190430/package/skelcd-control-openSUSE.changes 2019-04-30 13:03:39.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Apr 30 10:01:57 UTC 2019 - Maurizio Galli <maurizio.galli(a)gmail.com> + +- make sure yast gets installed with Xfce system role too + (boo#1130998) +- cleaned white spaces around Xfce system role +- 20190430 + +------------------------------------------------------------------- Tue Apr 16 07:55:54 UTC 2019 - lnussel(a)suse.de - make sure yast gets installed with all roles except diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20190416/package/skelcd-control-openSUSE.spec new/skelcd-control-openSUSE-20190430/package/skelcd-control-openSUSE.spec --- old/skelcd-control-openSUSE-20190416/package/skelcd-control-openSUSE.spec 2019-04-16 10:13:59.000000000 +0200 +++ new/skelcd-control-openSUSE-20190430/package/skelcd-control-openSUSE.spec 2019-04-30 13:03:39.000000000 +0200 @@ -27,7 +27,7 @@ # ###################################################################### Name: skelcd-control-openSUSE -Version: 20190416 +Version: 20190430 Release: 0 Summary: The openSUSE Installation Control file License: MIT

1 0

commit yast2-installation-control for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package yast2-installation-control for openSUSE:Factory checked in at 2019-05-05 21:16:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old) and /work/SRC/openSUSE:Factory/.yast2-installation-control.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation-control" Sun May 5 21:16:46 2019 rev:25 rq:699465 version:4.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes 2019-04-01 12:34:29.293815354 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation-control.new.5148/yast2-installation-control.changes 2019-05-05 21:16:47.552520922 +0200 @@ -1,0 +2,15 @@ +Thu Apr 25 13:26:09 UTC 2019 - Josef Reidinger <jreidinger(a)suse.com> + +- fix cpu_mitigations to allow selection(bsc#1098559) +- add option to set default cpu mitigations per product + (bsc#1098559) +- 4.2.2 + +------------------------------------------------------------------- +Thu Apr 25 12:02:06 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz> + +- Added a simple test to check that the validation works + (the schema definition is valid) (related to bsc#1098559) +- 4.2.1 + +------------------------------------------------------------------- Old: ---- yast2-installation-control-4.2.0.tar.bz2 New: ---- yast2-installation-control-4.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation-control.spec ++++++ --- /var/tmp/diff_new_pack.0fzKpA/_old 2019-05-05 21:16:47.920521925 +0200 +++ /var/tmp/diff_new_pack.0fzKpA/_new 2019-05-05 21:16:47.924521936 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 4.2.0 +Version: 4.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,6 +29,8 @@ Url: https://github.com/yast/yast-installation-control BuildRequires: yast2-devtools >= 3.1.10 +# smoke test during build +BuildRequires: libxml2-tools BuildArch: noarch ++++++ yast2-installation-control-4.2.0.tar.bz2 -> yast2-installation-control-4.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.2.0/control/control.rnc new/yast2-installation-control-4.2.2/control/control.rnc --- old/yast2-installation-control-4.2.0/control/control.rnc 2019-03-28 18:07:46.000000000 +0100 +++ new/yast2-installation-control-4.2.2/control/control.rnc 2019-04-29 17:15:10.000000000 +0200 @@ -118,6 +118,7 @@ | self_update_url | self_update_id | installation_ui + | cpu_mitigations | full_system_media_name | full_system_download_url @@ -225,6 +226,10 @@ # Installation UI (boo#1088785) ## Enables alternative look of installation with sidebar installation_ui = element installation_ui { "sidebar" } +# Default value for CPU Mitigation settings in bootloader +## possible values are same as for autoyast and in UI - auto, nosmt, off, manual +## see ::Bootloader::CpuMitigations.from_string +cpu_mitigations = element cpu_mitigations { "auto" | "nosmt" | "off" | "manual" } # Media name which contains ALL packages for an useful installation # full_system_download_url has also to be set in order to display it. full_system_media_name = element full_system_media_name { text } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.2.0/control/control.rng new/yast2-installation-control-4.2.2/control/control.rng --- old/yast2-installation-control-4.2.0/control/control.rng 2019-03-28 18:07:46.000000000 +0100 +++ new/yast2-installation-control-4.2.2/control/control.rng 2019-04-29 17:15:10.000000000 +0200 @@ -141,6 +141,7 @@ <ref name="self_update_url"/> <ref name="self_update_id"/> <ref name="installation_ui"/> + <ref name="cpu_mitigations"/> <ref name="full_system_media_name"/> <ref name="full_system_download_url"/> </choice> @@ -439,6 +440,19 @@ <value>sidebar</value> </element> </define> +  + <define name="cpu_mitigations"> + <a:documentation>possible values are same as for autoyast and in UI - auto, nosmt, off, manual +see ::Bootloader::CpuMitigations.from_string</a:documentation> + <element name="cpu_mitigations"> + <choice> + <value>auto</value> + <value>nosmt</value> + <value>off</value> + <value>manual</value> + </choice> + </element> + </define>  +</productDefines>

1 0

commit yast2-firewall for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package yast2-firewall for openSUSE:Factory checked in at 2019-05-05 21:16:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-firewall (Old) and /work/SRC/openSUSE:Factory/.yast2-firewall.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-firewall" Sun May 5 21:16:37 2019 rev:76 rq:699444 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-firewall/yast2-firewall.changes 2019-04-01 12:34:42.981818860 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-firewall.new.5148/yast2-firewall.changes 2019-05-05 21:16:39.744499652 +0200 @@ -1,0 +2,7 @@ +Fri Apr 26 12:30:53 UTC 2019 - jreidinger <jreidinger(a)suse.com> + +- change proposal naming and add option to set cpu mitigations + (bsc#1128707) +- 4.2.0 + +------------------------------------------------------------------- Old: ---- yast2-firewall-4.1.11.tar.bz2 New: ---- yast2-firewall-4.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.l1QCVF/_old 2019-05-05 21:16:40.100500622 +0200 +++ /var/tmp/diff_new_pack.l1QCVF/_new 2019-05-05 21:16:40.104500633 +0200 @@ -17,7 +17,7 @@ Name: yast2-firewall -Version: 4.1.11 +Version: 4.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +38,8 @@ # ButtonBox widget Conflicts: yast2-ycp-ui-bindings < 2.17.3 +# CpiMitigations +Conflicts: yast2-bootloader < 4.2.1 Provides: yast2-config-firewall Obsoletes: yast2-config-firewall ++++++ yast2-firewall-4.1.11.tar.bz2 -> yast2-firewall-4.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.11/Dockerfile new/yast2-firewall-4.2.0/Dockerfile --- old/yast2-firewall-4.1.11/Dockerfile 2019-03-29 12:02:42.000000000 +0100 +++ new/yast2-firewall-4.2.0/Dockerfile 2019-04-29 16:06:25.000000000 +0200 @@ -1,3 +1,3 @@ -FROM yastdevel/ruby +FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.11/package/yast2-firewall.changes new/yast2-firewall-4.2.0/package/yast2-firewall.changes --- old/yast2-firewall-4.1.11/package/yast2-firewall.changes 2019-03-29 12:02:42.000000000 +0100 +++ new/yast2-firewall-4.2.0/package/yast2-firewall.changes 2019-04-29 16:06:25.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 26 12:30:53 UTC 2019 - jreidinger <jreidinger(a)suse.com> + +- change proposal naming and add option to set cpu mitigations + (bsc#1128707) +- 4.2.0 + +------------------------------------------------------------------- Tue Mar 26 23:44:33 UTC 2019 - knut.anderssen(a)suse.com - Autoyast: Export zone name explicitly as it has been removed from diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.11/package/yast2-firewall.spec new/yast2-firewall-4.2.0/package/yast2-firewall.spec --- old/yast2-firewall-4.1.11/package/yast2-firewall.spec 2019-03-29 12:02:42.000000000 +0100 +++ new/yast2-firewall-4.2.0/package/yast2-firewall.spec 2019-04-29 16:06:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-firewall -Version: 4.1.11 +Version: 4.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +38,8 @@ # ButtonBox widget Conflicts: yast2-ycp-ui-bindings < 2.17.3 +# CpiMitigations +Conflicts: yast2-bootloader < 4.2.1 Provides: yast2-config-firewall Obsoletes: yast2-config-firewall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.11/src/lib/y2firewall/clients/proposal.rb new/yast2-firewall-4.2.0/src/lib/y2firewall/clients/proposal.rb --- old/yast2-firewall-4.1.11/src/lib/y2firewall/clients/proposal.rb 2019-03-29 12:02:42.000000000 +0100 +++ new/yast2-firewall-4.2.0/src/lib/y2firewall/clients/proposal.rb 2019-04-29 16:06:25.000000000 +0200 @@ -22,6 +22,7 @@ # find current contact information at www.suse.com. require "yast" +require "erb" require "y2firewall/firewalld/api" require "y2firewall/proposal_settings" require "y2firewall/dialogs/proposal" @@ -45,7 +46,8 @@ LINK_ENABLE_SSHD = "firewall--enable_sshd".freeze, LINK_DISABLE_SSHD = "firewall--disable_sshd".freeze, LINK_OPEN_VNC = "firewall--open_vnc".freeze, - LINK_CLOSE_VNC = "firewall--close_vnc".freeze + LINK_CLOSE_VNC = "firewall--close_vnc".freeze, + LINK_CPU_MITIGATIONS = "firewall--cpu_mitigations".freeze ].freeze LINK_FIREWALL_DIALOG = "firewall".freeze @@ -60,11 +62,12 @@ end def description + # TODO: temporary dgettext only to avoid new translation { # Proposal title - "rich_text_title" => _("Firewall and SSH"), + "rich_text_title" => Yast::Builtins.dgettext("security", "Security"), # Menu entry label - "menu_title" => _("&Firewall and SSH"), + "menu_title" => Yast::Builtins.dgettext("ncurses-pkg", "&Security"), "id" => LINK_FIREWALL_DIALOG } end @@ -106,15 +109,56 @@ # Obtain and call the corresponding method for the clicked link. def call_proposal_action_for(link) action = link.gsub("firewall--", "") - @settings.public_send("#{action}!") + if action == "cpu_mitigations" + bootloader_dialog + else + @settings.public_send("#{action}!") + end end # Array with the available proposal descriptions. # # @return [Array<String>] services and ports descriptions def proposals - # Filter proposals with content and sort them - [firewall_proposal, sshd_proposal, ssh_port_proposal, vnc_fw_proposal].compact + # Filter proposals with content + [cpu_mitigations_proposal, firewall_proposal, sshd_proposal, + ssh_port_proposal, vnc_fw_proposal].compact + end + + # Returns the cpu mitigation part of the bootloader proposal description + # Returns nil if this part should be skipped + # @return [String] proposal html text + def cpu_mitigations_proposal + require "bootloader/bootloader_factory" + bl = ::Bootloader::BootloaderFactory.current + return nil if bl.name == "none" + + mitigations = bl.cpu_mitigations + + res = _("CPU Mitigations: ") + "<a href=\"#{LINK_CPU_MITIGATIONS}\">" + + ERB::Util.html_escape(mitigations.to_human_string) + "</a>" + log.info "mitigations output #{res.inspect}" + res + end + + def bootloader_dialog + require "bootloader/config_dialog" + Yast.import "Bootloader" + + begin + # do it in own dialog window + Yast::Wizard.CreateDialog + dialog = ::Bootloader::ConfigDialog.new(initial_tab: :kernel) + settings = Yast::Bootloader.Export + result = dialog.run + if result != :next + Yast::Bootloader.Import(settings) + else + Yast::Bootloader.proposed_cfg_changed = true + end + ensure + Yast::Wizard.CloseDialog + end end # Returns the VNC-port part of the firewall proposal description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.11/test/lib/y2firewall/clients/proposal_test.rb new/yast2-firewall-4.2.0/test/lib/y2firewall/clients/proposal_test.rb --- old/yast2-firewall-4.1.11/test/lib/y2firewall/clients/proposal_test.rb 2019-03-29 12:02:42.000000000 +0100 +++ new/yast2-firewall-4.2.0/test/lib/y2firewall/clients/proposal_test.rb 2019-04-29 16:06:25.000000000 +0200 @@ -24,14 +24,19 @@ require "y2firewall/clients/proposal" describe Y2Firewall::Clients::Proposal do - let(:client) { described_class.new } + subject(:client) { described_class.new } let(:proposal_settings) { Y2Firewall::ProposalSettings.instance } + before do + # skip bootloader proposal to avoid build dependency on it + allow(subject).to receive(:cpu_mitigations_proposal) + end + describe "#initialize" do it "instantiates a new proposal settings" do expect(Y2Firewall::ProposalSettings).to receive(:instance) - client + described_class.new end end

1 0

commit yast2-bootloader for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2019-05-05 21:16:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Sun May 5 21:16:29 2019 rev:279 rq:699432 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2019-04-08 10:34:13.835207945 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new.5148/yast2-bootloader.changes 2019-05-05 21:16:30.672474938 +0200 @@ -1,0 +2,7 @@ +Fri Apr 26 12:27:34 UTC 2019 - jreidinger <jreidinger(a)suse.com> + +- renamed "smt" to "cpu_mitigations", improved naming and help + (bsc#1098559) +- 4.2.1 + +------------------------------------------------------------------- @@ -5 +12 @@ -- 4.1.24 +- 4.2.0 Old: ---- yast2-bootloader-4.1.24.tar.bz2 New: ---- yast2-bootloader-4.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.nyPi2J/_old 2019-05-05 21:16:31.144476224 +0200 +++ /var/tmp/diff_new_pack.nyPi2J/_new 2019-05-05 21:16:31.144476224 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.1.24 +Version: 4.2.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-4.1.24.tar.bz2 -> yast2-bootloader-4.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/package/yast2-bootloader.changes new/yast2-bootloader-4.2.1/package/yast2-bootloader.changes --- old/yast2-bootloader-4.1.24/package/yast2-bootloader.changes 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/package/yast2-bootloader.changes 2019-04-29 15:35:46.000000000 +0200 @@ -1,8 +1,15 @@ ------------------------------------------------------------------- +Fri Apr 26 12:27:34 UTC 2019 - jreidinger <jreidinger(a)suse.com> + +- renamed "smt" to "cpu_mitigations", improved naming and help + (bsc#1098559) +- 4.2.1 + +------------------------------------------------------------------- Thu Apr 4 11:57:27 UTC 2019 - Stefan Hundhammer <shundhammer(a)suse.com> - Propagate serial console params to XEN kernels (bsc#1080928) -- 4.1.24 +- 4.2.0 ------------------------------------------------------------------- Mon Mar 25 15:45:54 CET 2019 - schubi(a)suse.de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/package/yast2-bootloader.spec new/yast2-bootloader-4.2.1/package/yast2-bootloader.spec --- old/yast2-bootloader-4.1.24/package/yast2-bootloader.spec 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/package/yast2-bootloader.spec 2019-04-29 15:35:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.1.24 +Version: 4.2.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/src/autoyast-rnc/bootloader.rnc new/yast2-bootloader-4.2.1/src/autoyast-rnc/bootloader.rnc --- old/yast2-bootloader-4.1.24/src/autoyast-rnc/bootloader.rnc 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/src/autoyast-rnc/bootloader.rnc 2019-04-29 15:35:46.000000000 +0200 @@ -71,7 +71,7 @@ boot_extended? & boot_mbr? & stage1_dev? & - smt? & + cpu_mitigations? & element vgamode { text }? } @@ -86,7 +86,7 @@ boot_boot = element boot_boot { "true" | "false" } boot_extended = element boot_extended { "true" | "false" } boot_mbr = element boot_mbr { "true" | "false" } -smt = element smt { "true" | "false" } +cpu_mitigations = element cpu_mitigations { "nosmt" | "auto" | "off" | "manual" } sections = element sections { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/src/lib/bootloader/autoyast_converter.rb new/yast2-bootloader-4.2.1/src/lib/bootloader/autoyast_converter.rb --- old/yast2-bootloader-4.1.24/src/lib/bootloader/autoyast_converter.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/src/lib/bootloader/autoyast_converter.rb 2019-04-29 15:35:46.000000000 +0200 @@ -1,6 +1,7 @@ require "yast" require "bootloader/bootloader_factory" +require "bootloader/cpu_mitigations" Yast.import "BootStorage" Yast.import "Arch" @@ -37,7 +38,8 @@ # always nil pmbr as autoyast does not support it yet, # so use nil to always use proposed value (bsc#1081967) bootloader.pmbr_action = nil - bootloader.smt = data["global"]["smt"] == "true" unless data["global"]["smt"].nil? + cpu_mitigations = data["global"]["cpu_mitigations"] + bootloader.cpu_mitigations = CpuMitigations.from_string(cpu_mitigations) if cpu_mitigations # TODO: import Initrd log.warn "autoyast profile contain sections which won't be processed" if data["sections"] @@ -57,7 +59,7 @@ global = res["global"] export_grub2(global, config) if config.name == "grub2" export_default(global, config.grub_default) - res["global"]["smt"] = config.smt ? "true" : "false" + res["global"]["cpu_mitigations"] = config.cpu_mitigations.value.to_s # Do not export device map as device name are very unpredictable and is used only as # work-around when automatic ones do not work for what-ever reasons ( it can really safe # your day in L3 ) @@ -79,7 +81,7 @@ end def import_default(data, default) - # import first kernel params as smt can later modify it + # import first kernel params as cpu_mitigations can later modify it DEFAULT_KERNEL_PARAMS_MAPPING.each do |key, method| val = data["global"][key] next unless val diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/src/lib/bootloader/config_dialog.rb new/yast2-bootloader-4.2.1/src/lib/bootloader/config_dialog.rb --- old/yast2-bootloader-4.1.24/src/lib/bootloader/config_dialog.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/src/lib/bootloader/config_dialog.rb 2019-04-29 15:35:46.000000000 +0200 @@ -17,6 +17,11 @@ include Yast::I18n include Yast::UIShortcuts + # param initial_tab [:boot_code|:kernel|:bootloader] initial tab when dialog open + def initialize(initial_tab: :boot_code) + @initial_tab = initial_tab + end + def run guarded_run rescue ::Bootloader::BrokenConfiguration, ::Bootloader::UnsupportedOption => e @@ -63,13 +68,6 @@ end # F#300779: end - if BootloaderFactory.current.is_a?(NoneBootloader) - contents = VBox(LoaderTypeWidget.new) - else - tabs = CWM::Tabs.new(BootCodeTab.new, KernelTab.new, BootloaderTab.new) - contents = VBox(tabs) - end - Yast::CWM.show( contents, caption: _("Boot Loader Settings"), @@ -79,5 +77,22 @@ skip_store_for: [:redraw] ) end + + def contents + return VBox(LoaderTypeWidget.new) if BootloaderFactory.current.is_a?(NoneBootloader) + + boot_code_tab = BootCodeTab.new + kernel_tab = KernelTab.new + bootloader_tab = BootloaderTab.new + case @initial_tab + when :boot_code then boot_code_tab.initial = true + when :kernel then kernel_tab.initial = true + when :bootloader then bootloader_tab.initial = true + else + raise "unknown initial tab #{(a)initial_tab.inspect}" + end + + VBox(CWM::Tabs.new(boot_code_tab, kernel_tab, bootloader_tab)) + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/src/lib/bootloader/cpu_mitigations.rb new/yast2-bootloader-4.2.1/src/lib/bootloader/cpu_mitigations.rb --- old/yast2-bootloader-4.1.24/src/lib/bootloader/cpu_mitigations.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-4.2.1/src/lib/bootloader/cpu_mitigations.rb 2019-04-29 15:35:46.000000000 +0200 @@ -0,0 +1,79 @@ +require "yast" + +require "cfa/matcher" +require "cfa/placer" + +module Bootloader + # Specialized class to handle CPU mitigation settings. + # @see https://www.suse.com/support/kb/doc/?id=7023836 + class CpuMitigations + include Yast::Logger + include Yast::I18n + extend Yast::I18n + KERNEL_MAPPING = { + nosmt: "auto,nosmt", + auto: "auto", + off: "off", + manual: nil + }.freeze + + HUMAN_MAPPING = { + nosmt: N_("Auto + No SMT"), + auto: N_("Auto"), + off: N_("Off"), + manual: N_("Manually") + }.freeze + + attr_reader :value + + def initialize(value) + textdomain "bootloader" + + @value = value + end + + # Note: order of ALL is used also in UI as order of combobox. + ALL = KERNEL_MAPPING.keys.map { |k| CpuMitigations.new(k) } + DEFAULT = CpuMitigations.new(:auto) + + def self.from_kernel_params(kernel_params) + log.info "kernel params #{kernel_params.inspect}" + param = kernel_params.parameter("mitigations") + log.info "mitigation param #{param.inspect}" + param = nil if param == false + reverse_mapping = KERNEL_MAPPING.invert + + if !reverse_mapping.key?(param) + raise "Unknown mitigations value #{param.inspect} in the kernel command line, " \ + "supported values are: #{KERNEL_MAPPING.values.compact.map(&:inspect).join(", ")}." + end + + new(reverse_mapping[param]) + end + + def self.from_string(string) + raise "Unknown mitigations value #{string.inspect}" unless KERNEL_MAPPING.key?(string.to_sym) + + new(string.to_sym) + end + + def to_human_string + _(HUMAN_MAPPING[value]) + end + + def kernel_value + KERNEL_MAPPING[value] or raise "Invalid value #{value.inspect}" + end + + def modify_kernel_params(kernel_params) + matcher = CFA::Matcher.new(key: "mitigations") + + kernel_params.remove_parameter(matcher) + if value != :manual + # TODO: fix cfa_grub2 with replace placer + kernel_params.add_parameter("mitigations", kernel_value) + log.info "replacing old config with #{kernel_value}: #{kernel_params.inspect}" + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/src/lib/bootloader/grub2_widgets.rb new/yast2-bootloader-4.2.1/src/lib/bootloader/grub2_widgets.rb --- old/yast2-bootloader-4.1.24/src/lib/bootloader/grub2_widgets.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/src/lib/bootloader/grub2_widgets.rb 2019-04-29 15:35:46.000000000 +0200 @@ -3,6 +3,7 @@ require "bootloader/generic_widgets" require "bootloader/device_map_dialog" require "bootloader/serial_console" +require "bootloader/cpu_mitigations" require "cfa/matcher" Yast.import "BootStorage" @@ -113,7 +114,7 @@ end # Represents decision if smt is enabled - class Smt < CWM::CheckBox + class CpuMitigationsWidget < CWM::ComboBox include Grub2Widget def initialize @@ -121,22 +122,46 @@ end def label - _("Disable Simultaneous &Multithreading") + _("CPU Mitigations") + end + + def items + ::Bootloader::CpuMitigations::ALL.map do |m| + [m.value, m.to_human_string] + end end def help _( - "Disable Simultaneous Multithreading \n" \ - "To disable sharing physical cores by more virtual ones." + "CPU Mitigations \n" \ + "The option selects which default settings should be used for CPU \n" \ + "side channels mitigations. A highlevel description is on our Technical Information \n" \ + "Document TID 7023836. Following options are available:<ul>\n" \ + "<li>Auto: This option enables all the mitigations needed for your CPU model. \n" \ + "This setting can impact performance to some degree, depending on CPU model and \n" \ + "workload. It provides all security mitigations, but it does not protect against \n" \ + "cross-CPU thread attacks.</li>\n" \ + "<li>Auto + No SMT: This option enables all the above mitigations in \n" \ + "\"Auto\", and also disables Simultaneous Multithreading to avoid \n" \ + "side channel attacks across multiple CPU threads. This setting can \n" \ + "further impact performance, depending on your \n" \ + "workload. This setting provides the full set of available security mitigations.</li>\n" \ + "<li>Off: All CPU Mitigations are disabled. This setting has no performance \n" \ + "impact, but side channel attacks against your CPU are possible, depending on CPU \n" \ + "model.</li>\n" \ + "<li>Manual: This setting does not specify a mitigation level and leaves \n" \ + "this to be the kernel default. The administrator can add other mitigations options \n" \ + "in the kernel command line widget.\n" \ + "All CPU mitigation specific options can be set manually.</li></ul>" ) end def init - self.value = !grub2.smt + self.value = grub2.cpu_mitigations.value end def store - grub2.smt = !value + grub2.cpu_mitigations = ::Bootloader::CpuMitigations.new(value) end end @@ -240,7 +265,7 @@ end def init - self.value = grub_default.kernel_params.serialize.gsub(/nosmt/, "") + self.value = grub_default.kernel_params.serialize.gsub(/mitigations=\S+/, "") end def store @@ -872,11 +897,10 @@ def contents console_widget = Yast::Arch.s390 ? CWM::Empty.new("console") : ConsoleWidget.new - smt_widget = Yast::Arch.x86_64 ? MarginBox(1, 0.5, Smt.new) : CWM::Empty.new("smt") VBox( VSpacing(1), MarginBox(1, 0.5, KernelAppendWidget.new), - Left(smt_widget), + MarginBox(1, 0.5, Left(CpuMitigationsWidget.new)), MarginBox(1, 0.5, console_widget), VStretch() ) @@ -887,10 +911,6 @@ class BootCodeTab < CWM::Tab include Grub2Widget - def initialize - self.initial = true - end - def label textdomain "bootloader" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/src/lib/bootloader/grub2base.rb new/yast2-bootloader-4.2.1/src/lib/bootloader/grub2base.rb --- old/yast2-bootloader-4.1.24/src/lib/bootloader/grub2base.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/src/lib/bootloader/grub2base.rb 2019-04-29 15:35:46.000000000 +0200 @@ -59,7 +59,7 @@ @grub_default = ::CFA::Grub2::Default.new @sections = ::Bootloader::Sections.new @pmbr_action = :nothing - @smt = nil # nil means not set explicitly, otherwise boolean + @explicit_cpu_mitigations = false end # general functions @@ -80,24 +80,18 @@ end end - def smt - !grub_default.kernel_params.parameter("nosmt") + def cpu_mitigations + CpuMitigations.from_kernel_params(grub_default.kernel_params) end - def explicit_smt - @smt + def explicit_cpu_mitigations + @explicit_cpu_mitigations ? cpu_mitigations : nil end - def smt=(value) - log.info "setting smt to #{value}" - @smt = value - - if value - matcher = CFA::Matcher.new(key: "nosmt") - grub_default.kernel_params.remove_parameter(matcher) - elsif !grub_default.kernel_params.parameter("nosmt") - grub_default.kernel_params.add_parameter("nosmt", true) - end + def cpu_mitigations=(value) + log.info "setting mitigations to #{value}" + @explicit_cpu_mitigations = true + value.modify_kernel_params(grub_default.kernel_params) end def read @@ -229,28 +223,37 @@ log.info "before merge other #{other_default.inspect}" KERNEL_FLAVORS_METHODS.each do |method| - other_params = other_default.public_send(method) - default_params = default.public_send(method) - next if other_params.empty? - - default_serialize = default_params.serialize - # handle specially noresume as it should lead to remove all other resume - default_serialize.gsub!(/resume=\S+/, "") if other_params.parameter("noresume") - - new_kernel_params = default_serialize + " " + other_params.serialize - - default_params.replace(new_kernel_params) + merge_kernel_params(method, other_default) end merge_attributes(default, other_default) - # explicitly set smt - self.smt = other.explicit_smt unless other.explicit_smt.nil? - log.info "smt after merge #{smt}" + # explicitly set mitigations means overwrite of our + if other.explicit_cpu_mitigations + log.info "merging cpu_mitigations" + self.cpu_mitigations = other.cpu_mitigations + end + log.info "mitigations after merge #{cpu_mitigations}" log.info "after merge default #{default.inspect}" end + def merge_kernel_params(method, other_default) + other_params = other_default.public_send(method) + default_params = grub_default.public_send(method) + return if other_params.empty? + + default_serialize = default_params.serialize + # handle specially noresume as it should lead to remove all other resume + default_serialize.gsub!(/resume=\S+/, "") if other_params.parameter("noresume") + # prevent double cpu_mitigations params + default_serialize.gsub!(/mitigations=\S+/, "") if other_params.parameter("mitigations") + + new_kernel_params = default_serialize + " " + other_params.serialize + + default_params.replace(new_kernel_params) + end + def merge_attributes(default, other) # string attributes [:serial_console, :timeout, :hidden_timeout, :distributor, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/src/modules/BootArch.rb new/yast2-bootloader-4.2.1/src/modules/BootArch.rb --- old/yast2-bootloader-4.1.24/src/modules/BootArch.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/src/modules/BootArch.rb 2019-04-29 15:35:46.000000000 +0200 @@ -19,6 +19,8 @@ # require "yast" +require "bootloader/cpu_mitigations" + module Yast class BootArchClass < Module include Yast::Logger @@ -37,7 +39,8 @@ # from installation to running kernel on s390 (bsc#1086665) S390_WHITELIST = [ /net\.ifnames=\S*/, - /fips=\S*/ + /fips=\S*/, + /mitigations=\S*/ ].freeze # Get parameters for the default kernel @@ -54,8 +57,8 @@ if Arch.i386 || Arch.x86_64 || Arch.aarch64 || Arch.ppc ret = kernel_cmdline ret << " resume=#{resume}" unless resume.empty? - ret << propose_smt if Arch.x86_64 ret << " #{features}" unless features.empty? + ret << propose_cpu_mitigations ret << " quiet" return ret elsif Arch.s390 @@ -70,11 +73,12 @@ parameters << " #{Regexp.last_match(0)}" if kernel_cmdline =~ pattern end + parameters << propose_cpu_mitigations parameters << " resume=#{resume}" unless resume.empty? return parameters else log.warn "Default kernel parameters not defined" - return kernel_cmdline + return kernel_cmdline + propose_cpu_mitigations end end @@ -84,28 +88,24 @@ Arch.i386 || Arch.x86_64 || Arch.s390 end - SMT_DEFAULT = true - def smt_settings - linuxrc_value = Yast::Linuxrc.value_for("disablesmt") - product_value = ProductFeatures.GetBooleanFeatureWithFallback("globals", "smt", SMT_DEFAULT) - log.info "smt settings: linuxrc #{linuxrc_value.inspect} product #{product_value.inspect}" - # linuxrc cmdline - return linuxrc_value == "0" if !linuxrc_value.nil? + def propose_cpu_mitigations + linuxrc_value = Yast::Linuxrc.value_for("mitigations") + log.info "linuxrc mitigations #{linuxrc_value.inspect}" + return "" unless linuxrc_value.nil? # linuxrc already has mitigations + product_value = ProductFeatures.GetStringFeature("globals", "cpu_mitigations") + log.info "cpu mitigations in product: #{product_value.inspect}" - # product features - product_value + mitigations = if product_value.empty? + ::Bootloader::CpuMitigations::DEFAULT + else + ::Bootloader::CpuMitigations.from_string(product_value) + end + # no value for manual mitigations + mitigations.kernel_value ? " mitigations=#{mitigations.kernel_value}" : "" end publish :function => :DefaultKernelParams, :type => "string (string)" publish :function => :ResumeAvailable, :type => "boolean ()" - - private - - DISABLE_SMT = " nosmt".freeze - - def propose_smt - smt_settings ? "" : DISABLE_SMT - end end BootArch = BootArchClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/test/autoyast_converter_test.rb new/yast2-bootloader-4.2.1/test/autoyast_converter_test.rb --- old/yast2-bootloader-4.1.24/test/autoyast_converter_test.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/test/autoyast_converter_test.rb 2019-04-29 15:35:46.000000000 +0200 @@ -116,13 +116,13 @@ bootloader.trusted_boot = true expected_export = { - "append" => "verbose nomodeset", - "terminal" => "gfxterm", - "os_prober" => "true", - "hiddenmenu" => "true", - "timeout" => 10, - "trusted_grub" => "true", - "smt" => "true" + "append" => "verbose nomodeset", + "terminal" => "gfxterm", + "os_prober" => "true", + "hiddenmenu" => "true", + "timeout" => 10, + "trusted_grub" => "true", + "cpu_mitigations" => "manual" } expect(subject.export(bootloader)["global"]).to eq expected_export diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/test/boot_arch_test.rb new/yast2-bootloader-4.2.1/test/boot_arch_test.rb --- old/yast2-bootloader-4.1.24/test/boot_arch_test.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/test/boot_arch_test.rb 2019-04-29 15:35:46.000000000 +0200 @@ -5,6 +5,11 @@ describe Yast::BootArch do subject { Yast::BootArch } + before do + allow(Yast::ProductFeatures).to receive(:GetStringFeature) + .and_return("") + end + def stub_arch(arch) Yast.import "Arch" @@ -50,7 +55,8 @@ end it "adds additional parameters from Product file" do - allow(Yast::ProductFeatures).to receive(:GetStringFeature).and_return("console=ttyS0") + allow(Yast::ProductFeatures).to receive(:GetStringFeature) + .with("globals", "additional_kernel_parameters").and_return("console=ttyS0") expect(subject.DefaultKernelParams("/dev/sda2")).to include("console=ttyS0") end @@ -74,7 +80,8 @@ end it "adds additional parameters from Product file" do - allow(Yast::ProductFeatures).to receive(:GetStringFeature).and_return("console=ttyS0") + allow(Yast::ProductFeatures).to receive(:GetStringFeature) + .with("globals", "additional_kernel_parameters").and_return("console=ttyS0") expect(subject.DefaultKernelParams("/dev/sda2")).to include("console=ttyS0") end @@ -122,9 +129,12 @@ it "returns parameters from current command line" do allow(Yast::Kernel).to receive(:GetCmdLine).and_return("console=ttyS0") # just to test that it do not add product features - allow(Yast::ProductFeatures).to receive(:GetStringFeature).and_return("console=ttyS1") + allow(Yast::ProductFeatures).to receive(:GetStringFeature) + .with("globals", "additional_kernel_parameters").and_return("console=ttyS1") - expect(subject.DefaultKernelParams("/dev/sda2")).to eq "console=ttyS0 resume=/dev/sda2 console=ttyS1 quiet" + expect(subject.DefaultKernelParams("/dev/sda2")).to eq( + "console=ttyS0 resume=/dev/sda2 console=ttyS1 mitigations=auto quiet" + ) end it "adds \"quiet\" parameter" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/test/grub2_efi_test.rb new/yast2-bootloader-4.2.1/test/grub2_efi_test.rb --- old/yast2-bootloader-4.1.24/test/grub2_efi_test.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/test/grub2_efi_test.rb 2019-04-29 15:35:46.000000000 +0200 @@ -3,6 +3,12 @@ require "bootloader/grub2efi" describe Bootloader::Grub2EFI do + subject do + sub = described_class.new + allow(sub).to receive(:cpu_mitigations).and_return(::Bootloader::CpuMitigations.new(:manual)) + sub + end + before do allow(::CFA::Grub2::Default).to receive(:new).and_return(double("GrubDefault").as_null_object) allow(::CFA::Grub2::GrubCfg).to receive(:new).and_return(double("GrubCfg").as_null_object) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/test/grub2_test.rb new/yast2-bootloader-4.2.1/test/grub2_test.rb --- old/yast2-bootloader-4.1.24/test/grub2_test.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/test/grub2_test.rb 2019-04-29 15:35:46.000000000 +0200 @@ -3,6 +3,12 @@ require "bootloader/grub2" describe Bootloader::Grub2 do + subject do + sub = described_class.new + allow(sub).to receive(:cpu_mitigations).and_return(::Bootloader::CpuMitigations.new(:manual)) + sub + end + before do allow(::CFA::Grub2::Default).to receive(:new).and_return(double("GrubDefault").as_null_object) allow(::CFA::Grub2::GrubCfg).to receive(:new).and_return(double("GrubCfg").as_null_object) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.24/test/grub2base_test.rb new/yast2-bootloader-4.2.1/test/grub2base_test.rb --- old/yast2-bootloader-4.1.24/test/grub2base_test.rb 2019-04-04 16:28:47.000000000 +0200 +++ new/yast2-bootloader-4.2.1/test/grub2base_test.rb 2019-04-29 15:35:46.000000000 +0200 @@ -3,6 +3,11 @@ require "bootloader/grub2base" describe Bootloader::Grub2Base do + before do + allow(Yast::ProductFeatures).to receive(:GetStringFeature) + .and_return("") + end + describe "#read" do before do allow(::CFA::Grub2::Default).to receive(:new).and_return(double("GrubDefault", loaded?: false, load: nil, save: nil))

1 0

commit 000update-repos for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2019-05-05 21:01:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Sun May 5 21:01:49 2019 rev:216 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- 42.3:update_1557048918.packages.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit 000update-repos for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2019-05-05 21:01:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Sun May 5 21:01:40 2019 rev:215 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- 15.0:update_1557045823.packages.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit 000product for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-05-05 11:58:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sun May 5 11:58:19 2019 rev:1167 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.MdZ3NZ/_old 2019-05-05 11:58:22.103729624 +0200 +++ /var/tmp/diff_new_pack.MdZ3NZ/_new 2019-05-05 11:58:22.107729635 +0200 @@ -350,7 +350,7 @@ <repopackage name="openssl-1_1" arch="x86_64"/> <repopackage name="openSUSE-build-key" arch="x86_64"/> <repopackage name="openSUSE-MicroOS-release"/> - <repopackage name="openSUSE-MicroOS-release-dvd"/> + <repopackage name="openSUSE-MicroOS-release-appliance"/> <repopackage name="p11-kit" arch="x86_64"/> <repopackage name="p11-kit-tools" arch="x86_64"/> <repopackage name="pam"/> openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change ++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.MdZ3NZ/_old 2019-05-05 11:58:22.143729738 +0200 +++ /var/tmp/diff_new_pack.MdZ3NZ/_new 2019-05-05 11:58:22.147729749 +0200 @@ -3448,6 +3448,7 @@ <repopackage name="openssl-1_1"/> <repopackage name="openSUSE-build-key"/> <repopackage name="openSUSE-release"/> + <repopackage name="openSUSE-release-appliance"/> <repopackage name="openSUSE-release-dvd"/> <repopackage name="openSUSE-xfce-icon-theme"/> <repopackage name="openvpn"/> openSUSE-dvd5-dvd-x86_64.kiwi: same change stub.kiwi: same change ++++++ dvd.group ++++++ --- /var/tmp/diff_new_pack.MdZ3NZ/_old 2019-05-05 11:58:22.279730125 +0200 +++ /var/tmp/diff_new_pack.MdZ3NZ/_new 2019-05-05 11:58:22.283730136 +0200 @@ -3383,7 +3383,8 @@ <package name="open-vm-tools-desktop" supportstatus="unsupported"/>  <package name="openSUSE-build-key" supportstatus="unsupported"/>  <package name="openSUSE-release" supportstatus="unsupported"/>  - <package name="openSUSE-release-dvd" supportstatus="unsupported"/>  + <package name="openSUSE-release-appliance" supportstatus="unsupported"/>  + <package name="openSUSE-release-dvd" supportstatus="unsupported"/>  <package name="openSUSE-xfce-icon-theme" supportstatus="unsupported"/>  <package name="openafs" supportstatus="unsupported"/>  <package name="openafs-client" supportstatus="unsupported"/>  ++++++ opensuse_kubic.group ++++++ --- /var/tmp/diff_new_pack.MdZ3NZ/_old 2019-05-05 11:58:22.323730250 +0200 +++ /var/tmp/diff_new_pack.MdZ3NZ/_new 2019-05-05 11:58:22.327730261 +0200 @@ -99,7 +99,7 @@ <package name="ncurses-utils" supportstatus="unsupported"/>  <package name="netcfg" supportstatus="unsupported"/>  <package name="openSUSE-MicroOS-release" supportstatus="unsupported"/>  - <package name="openSUSE-MicroOS-release-dvd" supportstatus="unsupported"/>  + <package name="openSUSE-MicroOS-release-appliance" supportstatus="unsupported"/>  <package name="pam" supportstatus="unsupported"/>  <package name="pam-config" supportstatus="unsupported"/>  <package name="perl-Bootloader" supportstatus="unsupported"/>  ++++++ opensuse_microos.group ++++++ --- /var/tmp/diff_new_pack.MdZ3NZ/_old 2019-05-05 11:58:22.347730318 +0200 +++ /var/tmp/diff_new_pack.MdZ3NZ/_new 2019-05-05 11:58:22.347730318 +0200 @@ -99,7 +99,7 @@ <package name="ncurses-utils" supportstatus="unsupported"/>  <package name="netcfg" supportstatus="unsupported"/>  <package name="openSUSE-MicroOS-release" supportstatus="unsupported"/>  - <package name="openSUSE-MicroOS-release-dvd" supportstatus="unsupported"/>  + <package name="openSUSE-MicroOS-release-appliance" supportstatus="unsupported"/>  <package name="pam" supportstatus="unsupported"/>  <package name="pam-config" supportstatus="unsupported"/>  <package name="perl-Bootloader" supportstatus="unsupported"/>  ++++++ unsorted.yml ++++++ --- /var/tmp/diff_new_pack.MdZ3NZ/_old 2019-05-05 11:58:22.383730421 +0200 +++ /var/tmp/diff_new_pack.MdZ3NZ/_new 2019-05-05 11:58:22.387730432 +0200 @@ -14008,6 +14008,8 @@ - openQA-worker: [x86_64] - openSUSE-Addon-NonOss-release - openSUSE-EULAs + - openSUSE-MicroOS-release-appliance-kubic + - openSUSE-MicroOS-release-dvd - openSUSE-MicroOS-release-kubic-dvd - openSUSE-appdata-extra - openSUSE-appstream-process

1 0

commit 000product for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-05-05 11:12:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sun May 5 11:12:57 2019 rev:1166 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.067914657 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.067914657 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Addon-NonOss___20190502" schemaversion="4.1"> +<image name="OBS__openSUSE-Addon-NonOss___20190503" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -36,11 +36,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190502</productvar> + <productvar name="VERSION">20190503</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190502,openSUSE NonOSS Addon</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190503,openSUSE NonOSS Addon</productinfo> <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019…</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.083914703 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.087914714 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-MicroOS___20190502" schemaversion="4.1"> +<image name="OBS__openSUSE-MicroOS___20190503" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190502</productvar> + <productvar name="VERSION">20190503</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190502,openSUSE MicroOS</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190503,openSUSE MicroOS</productinfo> <productinfo name="LINGUAS">en_US </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190502/…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190503/…</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> @@ -275,7 +275,6 @@ <repopackage name="libpciaccess0" arch="x86_64"/> <repopackage name="libpcre1"/> <repopackage name="libpcre2-8-0"/> - <repopackage name="libpgm-5_2-0" arch="x86_64"/> <repopackage name="libpng16-16" arch="x86_64"/> <repopackage name="libpopt0"/> <repopackage name="libprocps7" arch="x86_64"/> @@ -295,7 +294,6 @@ <repopackage name="libsmartcols1"/> <repopackage name="libsnapper4" arch="x86_64"/> <repopackage name="libsnappy1" arch="x86_64"/> - <repopackage name="libsodium23" arch="x86_64"/> <repopackage name="libsolv-tools" arch="x86_64"/> <repopackage name="libsoup-2_4-1" arch="x86_64"/> <repopackage name="libsqlite3-0" arch="x86_64"/> @@ -314,7 +312,6 @@ <repopackage name="libtirpc3"/> <repopackage name="libudev1"/> <repopackage name="libunistring2"/> - <repopackage name="libunwind" arch="x86_64"/> <repopackage name="libusb-1_0-0" arch="x86_64"/> <repopackage name="libutempter0"/> <repopackage name="libuuid1"/> @@ -333,7 +330,6 @@ <repopackage name="libyaml-0-2" arch="x86_64"/> <repopackage name="libz1"/> <repopackage name="libzio1"/> - <repopackage name="libzmq5" arch="x86_64"/> <repopackage name="libzstd1" arch="x86_64"/> <repopackage name="libzypp" arch="x86_64"/> <repopackage name="logrotate" arch="x86_64"/> @@ -418,35 +414,26 @@ <repopackage name="python3-jsonpointer" arch="x86_64"/> <repopackage name="python3-jsonschema" arch="x86_64"/> <repopackage name="python3-MarkupSafe" arch="x86_64"/> - <repopackage name="python3-msgpack" arch="x86_64"/> <repopackage name="python3-networkx" arch="x86_64"/> <repopackage name="python3-oauthlib" arch="x86_64"/> <repopackage name="python3-packaging" arch="x86_64"/> <repopackage name="python3-ply" arch="x86_64"/> <repopackage name="python3-policycoreutils" arch="x86_64"/> - <repopackage name="python3-psutil" arch="x86_64"/> <repopackage name="python3-py" arch="x86_64"/> <repopackage name="python3-pyasn1" arch="x86_64"/> <repopackage name="python3-pycparser" arch="x86_64"/> - <repopackage name="python3-pycryptodome" arch="x86_64"/> <repopackage name="python3-PyJWT" arch="x86_64"/> <repopackage name="python3-pyparsing" arch="x86_64"/> <repopackage name="python3-pyserial" arch="x86_64"/> <repopackage name="python3-pytz" arch="x86_64"/> <repopackage name="python3-PyYAML" arch="x86_64"/> - <repopackage name="python3-pyzmq" arch="x86_64"/> <repopackage name="python3-requests" arch="x86_64"/> - <repopackage name="python3-rpm" arch="x86_64"/> - <repopackage name="python3-salt" arch="x86_64"/> <repopackage name="python3-selinux" arch="x86_64"/> <repopackage name="python3-semanage" arch="x86_64"/> <repopackage name="python3-setools" arch="x86_64"/> <repopackage name="python3-setuptools" arch="x86_64"/> - <repopackage name="python3-simplejson" arch="x86_64"/> <repopackage name="python3-six" arch="x86_64"/> - <repopackage name="python3-tornado" arch="x86_64"/> <repopackage name="python3-urllib3" arch="x86_64"/> - <repopackage name="python3-zypp-plugin" arch="x86_64"/> <repopackage name="read-only-root-fs" arch="x86_64"/> <repopackage name="rebootmgr" arch="x86_64"/> <repopackage name="restorecond" arch="x86_64"/> @@ -454,9 +441,6 @@ <repopackage name="rpm-config-SUSE"/> <repopackage name="rsync" arch="x86_64"/> <repopackage name="runc" arch="x86_64"/> - <repopackage name="salt" arch="x86_64"/> - <repopackage name="salt-master" arch="x86_64"/> - <repopackage name="salt-minion" arch="x86_64"/> <repopackage name="sed"/> <repopackage name="selinux-tools" arch="x86_64"/> <repopackage name="shadow"/> ++++++ openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.099914748 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.099914748 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-MicroOS___20190502" schemaversion="4.1"> +<image name="OBS__openSUSE-MicroOS___20190503" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190502</productvar> + <productvar name="VERSION">20190503</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190502,openSUSE MicroOS</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190503,openSUSE MicroOS</productinfo> <productinfo name="LINGUAS">en_US </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190502/…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190503/…</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> @@ -305,7 +305,6 @@ <repopackage name="libpciaccess0" arch="x86_64"/> <repopackage name="libpcre1"/> <repopackage name="libpcre2-8-0"/> - <repopackage name="libpgm-5_2-0" arch="x86_64"/> <repopackage name="libpng16-16" arch="x86_64"/> <repopackage name="libpopt0"/> <repopackage name="libprocps7" arch="x86_64"/> @@ -331,7 +330,6 @@ <repopackage name="libsmartcols1"/> <repopackage name="libsnapper4" arch="x86_64"/> <repopackage name="libsnappy1" arch="x86_64"/> - <repopackage name="libsodium23" arch="x86_64"/> <repopackage name="libsoftokn3" arch="x86_64"/> <repopackage name="libsolv-tools" arch="x86_64"/> <repopackage name="libsoup-2_4-1" arch="x86_64"/> @@ -351,7 +349,6 @@ <repopackage name="libtirpc3"/> <repopackage name="libudev1"/> <repopackage name="libunistring2"/> - <repopackage name="libunwind" arch="x86_64"/> <repopackage name="liburcu6" arch="x86_64"/> <repopackage name="libusb-1_0-0" arch="x86_64"/> <repopackage name="libutempter0"/> @@ -371,7 +368,6 @@ <repopackage name="libyaml-0-2" arch="x86_64"/> <repopackage name="libz1"/> <repopackage name="libzio1"/> - <repopackage name="libzmq5" arch="x86_64"/> <repopackage name="libzstd1" arch="x86_64"/> <repopackage name="libzypp" arch="x86_64"/> <repopackage name="logrotate" arch="x86_64"/> @@ -468,39 +464,30 @@ <repopackage name="python3-jsonpointer" arch="x86_64"/> <repopackage name="python3-jsonschema" arch="x86_64"/> <repopackage name="python3-MarkupSafe" arch="x86_64"/> - <repopackage name="python3-msgpack" arch="x86_64"/> <repopackage name="python3-networkx" arch="x86_64"/> <repopackage name="python3-oauthlib" arch="x86_64"/> <repopackage name="python3-packaging" arch="x86_64"/> <repopackage name="python3-ply" arch="x86_64"/> <repopackage name="python3-policycoreutils" arch="x86_64"/> <repopackage name="python3-PrettyTable" arch="x86_64"/> - <repopackage name="python3-psutil" arch="x86_64"/> <repopackage name="python3-py" arch="x86_64"/> <repopackage name="python3-pyasn1" arch="x86_64"/> <repopackage name="python3-pycparser" arch="x86_64"/> - <repopackage name="python3-pycryptodome" arch="x86_64"/> <repopackage name="python3-PyJWT" arch="x86_64"/> <repopackage name="python3-pyparsing" arch="x86_64"/> <repopackage name="python3-pyserial" arch="x86_64"/> <repopackage name="python3-pytz" arch="x86_64"/> <repopackage name="python3-PyYAML" arch="x86_64"/> - <repopackage name="python3-pyzmq" arch="x86_64"/> <repopackage name="python3-rados" arch="x86_64"/> <repopackage name="python3-rbd" arch="x86_64"/> <repopackage name="python3-requests" arch="x86_64"/> <repopackage name="python3-rgw" arch="x86_64"/> - <repopackage name="python3-rpm" arch="x86_64"/> - <repopackage name="python3-salt" arch="x86_64"/> <repopackage name="python3-selinux" arch="x86_64"/> <repopackage name="python3-semanage" arch="x86_64"/> <repopackage name="python3-setools" arch="x86_64"/> <repopackage name="python3-setuptools" arch="x86_64"/> - <repopackage name="python3-simplejson" arch="x86_64"/> <repopackage name="python3-six" arch="x86_64"/> - <repopackage name="python3-tornado" arch="x86_64"/> <repopackage name="python3-urllib3" arch="x86_64"/> - <repopackage name="python3-zypp-plugin" arch="x86_64"/> <repopackage name="rdma-core" arch="x86_64"/> <repopackage name="read-only-root-fs" arch="x86_64"/> <repopackage name="rebootmgr" arch="x86_64"/> @@ -510,9 +497,6 @@ <repopackage name="rpm-config-SUSE"/> <repopackage name="rsync" arch="x86_64"/> <repopackage name="runc" arch="x86_64"/> - <repopackage name="salt" arch="x86_64"/> - <repopackage name="salt-master" arch="x86_64"/> - <repopackage name="salt-minion" arch="x86_64"/> <repopackage name="sed"/> <repopackage name="selinux-tools" arch="x86_64"/> <repopackage name="sg3_utils" arch="x86_64"/> ++++++ openSUSE-cd-mini-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.111914782 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.111914782 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190502" schemaversion="4.1"> +<image name="OBS__openSUSE___20190503" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,11 +32,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190502</productvar> + <productvar name="VERSION">20190503</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190502,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190502/i586</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/i586</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ openSUSE-cd-mini-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.123914816 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.123914816 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190502" schemaversion="4.1"> +<image name="OBS__openSUSE___20190503" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190502</productvar> + <productvar name="VERSION">20190503</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190502,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190502/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.135914850 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.139914861 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190502" schemaversion="4.1"> +<image name="OBS__openSUSE___20190503" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,11 +32,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190502</productvar> + <productvar name="VERSION">20190503</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190502,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190502/i586</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/i586</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> @@ -251,6 +251,7 @@ <repopackage name="bluez-tools"/> <repopackage name="bogofilter-common"/> <repopackage name="bogofilter-db"/> + <repopackage name="bolt"/> <repopackage name="boost-devel"/> <repopackage name="boost-jam"/> <repopackage name="boost-license1_69_0"/> @@ -462,6 +463,9 @@ <repopackage name="edict2"/> <repopackage name="eekboard"/> <repopackage name="efont-unicode-bitmap-fonts"/> + <repopackage name="ekiga"/> + <repopackage name="ekiga-lang"/> + <repopackage name="ekiga-plugins-evolution"/> <repopackage name="elementary-xfce-icon-theme"/> <repopackage name="elfutils"/> <repopackage name="elfutils-lang"/> @@ -789,7 +793,6 @@ <repopackage name="gnome-settings-daemon"/> <repopackage name="gnome-settings-daemon-lang"/> <repopackage name="gnome-shell"/> - <repopackage name="gnome-shell-browser-plugin"/> <repopackage name="gnome-shell-calendar"/> <repopackage name="gnome-shell-classic"/> <repopackage name="gnome-shell-extensions-common"/> @@ -827,6 +830,7 @@ <repopackage name="gnome-video-effects"/> <repopackage name="gnome-weather"/> <repopackage name="gnome-weather-lang"/> + <repopackage name="gnomekbd-tools"/> <repopackage name="gnu-unifont-bitmap-fonts"/> <repopackage name="goffice-lang"/> <repopackage name="google-arimo-fonts"/> @@ -1378,6 +1382,7 @@ <repopackage name="kpkpass"/> <repopackage name="kqtquickcharts"/> <repopackage name="krb5"/> + <repopackage name="krb5-client"/> <repopackage name="krdc"/> <repopackage name="krdc-lang"/> <repopackage name="krename"/> @@ -1702,7 +1707,7 @@ <repopackage name="libecpg6"/> <repopackage name="libedata-book-1_2-25"/> <repopackage name="libedata-cal-1_2-29"/> - <repopackage name="libedataserver-1_2-23"/> + <repopackage name="libedataserver-1_2-24"/> <repopackage name="libedataserverui-1_2-2"/> <repopackage name="libedc_ecc1_0"/> <repopackage name="libedc_ecc_dec1_0"/> @@ -1772,9 +1777,7 @@ <repopackage name="libfm4"/> <repopackage name="libfolks-data"/> <repopackage name="libfolks-eds25"/> - <repopackage name="libfolks-telepathy25"/> <repopackage name="libfolks25"/> - <repopackage name="libfont-specimen0"/> <repopackage name="libfontconfig1"/> <repopackage name="libfontenc-devel"/> <repopackage name="libfontenc1"/> @@ -1875,8 +1878,8 @@ <repopackage name="libgnome-menu-3-0"/> <repopackage name="libgnomecanvas-2-0"/> <repopackage name="libgnomecanvas-lang"/> - <repopackage name="libgnomekbd"/> <repopackage name="libgnomekbd-lang"/> + <repopackage name="libgnomekbd8"/> <repopackage name="libgnomesu"/> <repopackage name="libgnomesu-lang"/> <repopackage name="libgnomesu0"/> @@ -2365,7 +2368,7 @@ <repopackage name="libmtp9"/> <repopackage name="libmusicbrainz4"/> <repopackage name="libmusicbrainz5-1"/> - <repopackage name="libmutter-3-0"/> + <repopackage name="libmutter-4-0"/> <repopackage name="libmwaw-0_3-3"/> <repopackage name="libmxml1"/> <repopackage name="libmygpo-qt1"/> @@ -2423,6 +2426,7 @@ <repopackage name="libomp7-devel"/> <repopackage name="libonig4"/> <repopackage name="libopagent1"/> + <repopackage name="libopal3_10_10"/> <repopackage name="libopenal1"/> <repopackage name="libopenbabel5"/> <repopackage name="libopenblas_pthreads0"/> @@ -2529,6 +2533,7 @@ <repopackage name="libpskc0"/> <repopackage name="libpsl5"/> <repopackage name="libpst4"/> + <repopackage name="libpt2_10_11"/> <repopackage name="libpulse-mainloop-glib0"/> <repopackage name="libpulse0"/> <repopackage name="libpurple"/> @@ -2879,7 +2884,7 @@ <repopackage name="libva-wayland2"/> <repopackage name="libva-x11-2"/> <repopackage name="libva2"/> - <repopackage name="libvala-0_42-0"/> + <repopackage name="libvala-0_44-0"/> <repopackage name="libvamp-hostsdk3"/> <repopackage name="libvcdinfo0"/> <repopackage name="libvdeplug3"/> @@ -3324,7 +3329,6 @@ <repopackage name="nautilus-sendto-lang"/> <repopackage name="nautilus-share"/> <repopackage name="nautilus-share-lang"/> - <repopackage name="nautilus-totem"/> <repopackage name="nbd"/> <repopackage name="ncftp"/> <repopackage name="ncurses-devel"/> @@ -3529,6 +3533,7 @@ <repopackage name="patterns-fonts-fonts_opt"/> <repopackage name="patterns-games-games"/> <repopackage name="patterns-gnome-gnome"/> + <repopackage name="patterns-gnome-gnome_basic"/> <repopackage name="patterns-gnome-gnome_basis"/> <repopackage name="patterns-gnome-gnome_basis_opt"/> <repopackage name="patterns-gnome-gnome_games"/> @@ -5080,6 +5085,7 @@ <repopackage name="typelib-1_0-Goa-1_0"/> <repopackage name="typelib-1_0-Grl-0_3"/> <repopackage name="typelib-1_0-GSound-1_0"/> + <repopackage name="typelib-1_0-Gspell-1"/> <repopackage name="typelib-1_0-Gst-1_0"/> <repopackage name="typelib-1_0-GstAudio-1_0"/> <repopackage name="typelib-1_0-GstPbutils-1_0"/> @@ -5122,7 +5128,6 @@ <repopackage name="typelib-1_0-Vte-2.91"/> <repopackage name="typelib-1_0-WebKit2-4_0"/> <repopackage name="typelib-1_0-Wnck-3_0"/> - <repopackage name="typelib-1_0-Xkl-1_0"/> <repopackage name="typelib-1_0-Zpj-0_0"/> <repopackage name="ucode-amd"/> <repopackage name="ucode-intel"/> @@ -5480,7 +5485,6 @@ <repopackage name="yast2-dns-server"/> <repopackage name="yast2-firewall"/> <repopackage name="yast2-firstboot"/> - <repopackage name="yast2-fonts"/> <repopackage name="yast2-ftp-server"/> <repopackage name="yast2-hardware-detection"/> <repopackage name="yast2-http-server"/> ++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.155914906 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.155914906 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190502" schemaversion="4.1"> +<image name="OBS__openSUSE___20190503" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190502</productvar> + <productvar name="VERSION">20190503</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190502,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190502/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> @@ -259,6 +259,7 @@ <repopackage name="bluez-tools"/> <repopackage name="bogofilter-common"/> <repopackage name="bogofilter-db"/> + <repopackage name="bolt"/> <repopackage name="boost-devel"/> <repopackage name="boost-jam"/> <repopackage name="boost-license1_69_0"/> @@ -479,6 +480,9 @@ <repopackage name="eekboard"/> <repopackage name="efibootmgr" arch="x86_64"/> <repopackage name="efont-unicode-bitmap-fonts"/> + <repopackage name="ekiga"/> + <repopackage name="ekiga-lang"/> + <repopackage name="ekiga-plugins-evolution"/> <repopackage name="elementary-xfce-icon-theme"/> <repopackage name="elfutils"/> <repopackage name="elfutils-lang"/> @@ -810,7 +814,6 @@ <repopackage name="gnome-settings-daemon"/> <repopackage name="gnome-settings-daemon-lang"/> <repopackage name="gnome-shell"/> - <repopackage name="gnome-shell-browser-plugin"/> <repopackage name="gnome-shell-calendar"/> <repopackage name="gnome-shell-classic"/> <repopackage name="gnome-shell-extensions-common"/> @@ -848,6 +851,7 @@ <repopackage name="gnome-video-effects"/> <repopackage name="gnome-weather"/> <repopackage name="gnome-weather-lang"/> + <repopackage name="gnomekbd-tools"/> <repopackage name="gnu-unifont-bitmap-fonts"/> <repopackage name="gnutls" arch="x86_64"/> <repopackage name="goffice-lang"/> @@ -1412,7 +1416,7 @@ <repopackage name="kqtquickcharts"/> <repopackage name="krb5"/> <repopackage name="krb5-32bit" arch="x86_64"/> - <repopackage name="krb5-client" arch="x86_64"/> + <repopackage name="krb5-client"/> <repopackage name="krdc"/> <repopackage name="krdc-lang"/> <repopackage name="krename"/> @@ -1772,7 +1776,7 @@ <repopackage name="libecpg6"/> <repopackage name="libedata-book-1_2-25"/> <repopackage name="libedata-cal-1_2-29"/> - <repopackage name="libedataserver-1_2-23"/> + <repopackage name="libedataserver-1_2-24"/> <repopackage name="libedataserverui-1_2-2"/> <repopackage name="libedc_ecc1_0"/> <repopackage name="libedc_ecc_dec1_0"/> @@ -1846,9 +1850,7 @@ <repopackage name="libfm4"/> <repopackage name="libfolks-data"/> <repopackage name="libfolks-eds25"/> - <repopackage name="libfolks-telepathy25"/> <repopackage name="libfolks25"/> - <repopackage name="libfont-specimen0"/> <repopackage name="libfontconfig1"/> <repopackage name="libfontconfig1-32bit" arch="x86_64"/> <repopackage name="libfontenc-devel"/> @@ -1960,8 +1962,8 @@ <repopackage name="libgnome-menu-3-0"/> <repopackage name="libgnomecanvas-2-0"/> <repopackage name="libgnomecanvas-lang"/> - <repopackage name="libgnomekbd"/> <repopackage name="libgnomekbd-lang"/> + <repopackage name="libgnomekbd8"/> <repopackage name="libgnomesu"/> <repopackage name="libgnomesu-lang"/> <repopackage name="libgnomesu0"/> @@ -2481,7 +2483,7 @@ <repopackage name="libmtp9"/> <repopackage name="libmusicbrainz4"/> <repopackage name="libmusicbrainz5-1"/> - <repopackage name="libmutter-3-0"/> + <repopackage name="libmutter-4-0"/> <repopackage name="libmwaw-0_3-3"/> <repopackage name="libmxml1"/> <repopackage name="libmygpo-qt1"/> @@ -2549,6 +2551,7 @@ <repopackage name="libomp7-devel"/> <repopackage name="libonig4"/> <repopackage name="libopagent1"/> + <repopackage name="libopal3_10_10"/> <repopackage name="libopenal1"/> <repopackage name="libopenbabel5"/> <repopackage name="libopenblas_pthreads0"/> @@ -2665,6 +2668,7 @@ <repopackage name="libpskc0"/> <repopackage name="libpsl5"/> <repopackage name="libpst4"/> + <repopackage name="libpt2_10_11"/> <repopackage name="libpulse-mainloop-glib0"/> <repopackage name="libpulse0"/> <repopackage name="libpurple"/> @@ -3050,7 +3054,7 @@ <repopackage name="libva-wayland2"/> <repopackage name="libva-x11-2"/> <repopackage name="libva2"/> - <repopackage name="libvala-0_42-0"/> + <repopackage name="libvala-0_44-0"/> <repopackage name="libvamp-hostsdk3"/> <repopackage name="libvcdinfo0"/> <repopackage name="libvdeplug3"/> @@ -3532,7 +3536,6 @@ <repopackage name="nautilus-sendto-lang"/> <repopackage name="nautilus-share"/> <repopackage name="nautilus-share-lang"/> - <repopackage name="nautilus-totem"/> <repopackage name="nbd"/> <repopackage name="ncftp"/> <repopackage name="ncurses-devel"/> @@ -3747,6 +3750,7 @@ <repopackage name="patterns-fonts-fonts_opt"/> <repopackage name="patterns-games-games"/> <repopackage name="patterns-gnome-gnome"/> + <repopackage name="patterns-gnome-gnome_basic"/> <repopackage name="patterns-gnome-gnome_basis"/> <repopackage name="patterns-gnome-gnome_basis_opt"/> <repopackage name="patterns-gnome-gnome_games"/> @@ -5335,6 +5339,7 @@ <repopackage name="typelib-1_0-Goa-1_0"/> <repopackage name="typelib-1_0-Grl-0_3"/> <repopackage name="typelib-1_0-GSound-1_0"/> + <repopackage name="typelib-1_0-Gspell-1"/> <repopackage name="typelib-1_0-Gst-1_0"/> <repopackage name="typelib-1_0-GstAudio-1_0"/> <repopackage name="typelib-1_0-GstPbutils-1_0"/> @@ -5377,7 +5382,6 @@ <repopackage name="typelib-1_0-Vte-2.91"/> <repopackage name="typelib-1_0-WebKit2-4_0"/> <repopackage name="typelib-1_0-Wnck-3_0"/> - <repopackage name="typelib-1_0-Xkl-1_0"/> <repopackage name="typelib-1_0-Zpj-0_0"/> <repopackage name="ucode-amd"/> <repopackage name="ucode-intel"/> @@ -5740,7 +5744,6 @@ <repopackage name="yast2-drbd" arch="x86_64"/> <repopackage name="yast2-firewall"/> <repopackage name="yast2-firstboot"/> - <repopackage name="yast2-fonts"/> <repopackage name="yast2-ftp-server"/> <repopackage name="yast2-hardware-detection"/> <repopackage name="yast2-http-server"/> ++++++ openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.171914951 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.175914963 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20190502" schemaversion="4.1"> +<image name="OBS__openSUSE___20190503" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -24,7 +24,7 @@ <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> <productvar name="MAKE_LISTINGS">true</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20190502-i586-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20190503-i586-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -36,11 +36,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20190502</productvar> + <productvar name="VERSION">20190503</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190502,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190503,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190502/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190502/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190503/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ dvd.group ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.267915223 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.267915223 +0200 @@ -70,7 +70,7 @@ <package name="acpid" supportstatus="unsupported"/>  <package name="adaptec-firmware" supportstatus="unsupported"/>  <package name="adjtimex" supportstatus="unsupported"/>  - <package name="adobe-sourcecodepro-fonts" supportstatus="unsupported"/>  + <package name="adobe-sourcecodepro-fonts" supportstatus="unsupported"/>  <package name="adobe-sourcehansans-fonts" supportstatus="unsupported"/>  <package name="adobe-sourcehanserif-fonts" supportstatus="unsupported"/>  <package name="adobe-sourcesanspro-fonts" supportstatus="unsupported"/>  @@ -253,6 +253,7 @@ <package name="bluez-tools" supportstatus="unsupported"/>  <package name="bogofilter-common" supportstatus="unsupported"/>  <package name="bogofilter-db" supportstatus="unsupported"/>  + <package name="bolt" supportstatus="unsupported"/>  <package name="boost-devel" supportstatus="unsupported"/>  <package name="boost-jam" supportstatus="unsupported"/>  <package name="boost-license1_69_0" supportstatus="unsupported"/>  @@ -260,9 +261,9 @@ <package name="bovo" supportstatus="unsupported"/>  <package name="bovo-lang" supportstatus="unsupported"/>  <package name="branding-openSUSE" supportstatus="unsupported"/>  - <package name="brasero" supportstatus="unsupported"/>  - <package name="brasero-lang" supportstatus="unsupported"/>  - <package name="brasero-nautilus" supportstatus="unsupported"/>  + <package name="brasero" supportstatus="unsupported"/>  + <package name="brasero-lang" supportstatus="unsupported"/>  + <package name="brasero-nautilus" supportstatus="unsupported"/>  <package name="breeze" supportstatus="unsupported"/>  <package name="breeze4-style" supportstatus="unsupported"/>  <package name="breeze5-cursors" supportstatus="unsupported"/>  @@ -304,10 +305,10 @@ <package name="catfish-lang" supportstatus="unsupported"/>  <package name="ccache" supportstatus="unsupported"/>  <package name="cd-discid" supportstatus="unsupported"/>  - <package name="cdda2wav" supportstatus="unsupported"/>  + <package name="cdda2wav" supportstatus="unsupported"/>  <package name="cdparanoia" supportstatus="unsupported"/>  - <package name="cdrdao" supportstatus="unsupported"/>  - <package name="cdrecord" supportstatus="unsupported"/>  + <package name="cdrdao" supportstatus="unsupported"/>  + <package name="cdrecord" supportstatus="unsupported"/>  <package name="cellwriter" supportstatus="unsupported"/>  <package name="cervisia" supportstatus="unsupported"/>  <package name="cervisia-lang" supportstatus="unsupported"/>  @@ -464,6 +465,9 @@ <package name="edict2" supportstatus="unsupported"/>  <package name="eekboard" supportstatus="unsupported"/>  <package name="efont-unicode-bitmap-fonts" supportstatus="unsupported"/>  + <package name="ekiga" supportstatus="unsupported"/>  + <package name="ekiga-lang" supportstatus="unsupported"/>  + <package name="ekiga-plugins-evolution" supportstatus="unsupported"/>  <package name="elementary-xfce-icon-theme" supportstatus="unsupported"/>  <package name="elfutils" supportstatus="unsupported"/>  <package name="elfutils-lang" supportstatus="unsupported"/>  @@ -785,7 +789,6 @@ <package name="gnome-settings-daemon" supportstatus="unsupported"/>  <package name="gnome-settings-daemon-lang" supportstatus="unsupported"/>  <package name="gnome-shell" supportstatus="unsupported"/>  - <package name="gnome-shell-browser-plugin" supportstatus="unsupported"/>  <package name="gnome-shell-calendar" supportstatus="unsupported"/>  <package name="gnome-shell-classic" supportstatus="unsupported"/>  <package name="gnome-shell-extensions-common" supportstatus="unsupported"/>  @@ -823,6 +826,7 @@ <package name="gnome-video-effects" supportstatus="unsupported"/>  <package name="gnome-weather" supportstatus="unsupported"/>  <package name="gnome-weather-lang" supportstatus="unsupported"/>  + <package name="gnomekbd-tools" supportstatus="unsupported"/>  <package name="gnu-unifont-bitmap-fonts" supportstatus="unsupported"/>  <package name="goffice-lang" supportstatus="unsupported"/>  <package name="google-arimo-fonts" supportstatus="unsupported"/>  @@ -943,7 +947,7 @@ <package name="gtk4-schema" supportstatus="unsupported"/>  <package name="gtkiterm" supportstatus="unsupported"/>  <package name="gtksourceview-lang" supportstatus="unsupported"/>  - <package name="gtksourceview4-lang" supportstatus="unsupported"/>  + <package name="gtksourceview4-lang" supportstatus="unsupported"/>  <package name="gtkspell-lang" supportstatus="unsupported"/>  <package name="gtkspell3-lang" supportstatus="unsupported"/>  <package name="gucharmap" supportstatus="unsupported"/>  @@ -981,7 +985,7 @@ <package name="hfsutils" supportstatus="unsupported"/>  <package name="hicolor-icon-theme" supportstatus="unsupported"/>  <package name="hicolor-icon-theme-branding-openSUSE" supportstatus="unsupported"/>  - <package name="hostname" supportstatus="unsupported"/>  + <package name="hostname" supportstatus="unsupported"/>  <package name="hp2xx" supportstatus="unsupported"/>  <package name="hplip" supportstatus="unsupported"/>  <package name="hplip-hpijs" supportstatus="unsupported"/>  @@ -1069,12 +1073,12 @@ <package name="ipa-pmincho-fonts" supportstatus="unsupported"/>  <package name="ipa-uigothic-fonts" supportstatus="unsupported"/>  <package name="ipadic" supportstatus="unsupported"/>  - <package name="iproute2" supportstatus="unsupported"/>  + <package name="iproute2" supportstatus="unsupported"/>  <package name="ipsec-tools" supportstatus="unsupported"/>  <package name="ipset" supportstatus="unsupported"/>  <package name="iptables" supportstatus="unsupported"/>  <package name="iptraf-ng" supportstatus="unsupported"/>  - <package name="iputils" supportstatus="unsupported"/>  + <package name="iputils" supportstatus="unsupported"/>  <package name="ipw-firmware" supportstatus="unsupported"/>  <package name="irda" supportstatus="unsupported"/>  <package name="irqbalance" supportstatus="unsupported"/>  @@ -1369,6 +1373,7 @@ <package name="kpkpass" supportstatus="unsupported"/>  <package name="kqtquickcharts" supportstatus="unsupported"/>  <package name="krb5" supportstatus="unsupported"/>  + <package name="krb5-client" supportstatus="unsupported"/>  <package name="krdc" supportstatus="unsupported"/>  <package name="krdc-lang" supportstatus="unsupported"/>  <package name="krename" supportstatus="unsupported"/>  @@ -1833,9 +1838,9 @@ <package name="libboost_python-py2_7-1_69_0" supportstatus="unsupported"/>  <package name="libboost_regex1_69_0" supportstatus="unsupported"/>  <package name="libboost_thread1_69_0" supportstatus="unsupported"/>  - <package name="libbrasero-burn3-1" supportstatus="unsupported"/>  - <package name="libbrasero-media3-1" supportstatus="unsupported"/>  - <package name="libbrasero-utils3-1" supportstatus="unsupported"/>  + <package name="libbrasero-burn3-1" supportstatus="unsupported"/>  + <package name="libbrasero-media3-1" supportstatus="unsupported"/>  + <package name="libbrasero-utils3-1" supportstatus="unsupported"/>  <package name="libbreezecommon4-5" supportstatus="unsupported"/>  <package name="libbreezecommon5-5" supportstatus="unsupported"/>  <package name="libbrlapi0_7" supportstatus="unsupported"/>  @@ -1985,10 +1990,10 @@ <package name="libecpg6" supportstatus="unsupported"/>  <package name="libedata-book-1_2-25" supportstatus="unsupported"/>  <package name="libedata-cal-1_2-29" supportstatus="unsupported"/>  - <package name="libedataserver-1_2-23" supportstatus="unsupported"/>  + <package name="libedataserver-1_2-24" supportstatus="unsupported"/>  <package name="libedataserverui-1_2-2" supportstatus="unsupported"/>  - <package name="libedc_ecc1_0" supportstatus="unsupported"/>  - <package name="libedc_ecc_dec1_0" supportstatus="unsupported"/>  + <package name="libedc_ecc1_0" supportstatus="unsupported"/>  + <package name="libedc_ecc_dec1_0" supportstatus="unsupported"/>  <package name="libedit0" supportstatus="unsupported"/>  <package name="libeditorconfig0" supportstatus="unsupported"/>  <package name="libefivar1" supportstatus="unsupported"/>  @@ -2052,9 +2057,7 @@ <package name="libfm4" supportstatus="unsupported"/>  <package name="libfolks-data" supportstatus="unsupported"/>  <package name="libfolks-eds25" supportstatus="unsupported"/>  - <package name="libfolks-telepathy25" supportstatus="unsupported"/>  <package name="libfolks25" supportstatus="unsupported"/>  - <package name="libfont-specimen0" supportstatus="unsupported"/>  <package name="libfontconfig1" supportstatus="unsupported"/>  <package name="libfontenc-devel" supportstatus="unsupported"/>  <package name="libfontenc1" supportstatus="unsupported"/>  @@ -2149,11 +2152,11 @@ <package name="libgnome-games-support-lang" supportstatus="unsupported"/>  <package name="libgnome-keyring-lang" supportstatus="unsupported"/>  <package name="libgnome-keyring0" supportstatus="unsupported"/>  - <package name="libgnome-menu-3-0" supportstatus="unsupported"/>  + <package name="libgnome-menu-3-0" supportstatus="unsupported"/>  <package name="libgnomecanvas-2-0" supportstatus="unsupported"/>  <package name="libgnomecanvas-lang" supportstatus="unsupported"/>  - <package name="libgnomekbd" supportstatus="unsupported"/>  <package name="libgnomekbd-lang" supportstatus="unsupported"/>  + <package name="libgnomekbd8" supportstatus="unsupported"/>  <package name="libgnomesu" supportstatus="unsupported"/>  <package name="libgnomesu-lang" supportstatus="unsupported"/>  <package name="libgnomesu0" supportstatus="unsupported"/>  @@ -2232,7 +2235,7 @@ <package name="libgtkmm-2_4-1" supportstatus="unsupported"/>  <package name="libgtkmm-3_0-1" supportstatus="unsupported"/>  <package name="libgtksourceview-3_0-1" supportstatus="unsupported"/>  - <package name="libgtksourceview-4-0" supportstatus="unsupported"/>  + <package name="libgtksourceview-4-0" supportstatus="unsupported"/>  <package name="libgtksourceviewmm-3_0-0" supportstatus="unsupported"/>  <package name="libgtkspell0" supportstatus="unsupported"/>  <package name="libgtkspell3-3-0" supportstatus="unsupported"/>  @@ -2254,7 +2257,7 @@ <package name="libgweather-lang" supportstatus="unsupported"/>  <package name="libgxps2" supportstatus="unsupported"/>  <package name="libhandle1" supportstatus="unsupported"/>  - <package name="libhandy-0_0-0" supportstatus="unsupported"/>  + <package name="libhandy-0_0-0" supportstatus="unsupported"/>  <package name="libhangul1" supportstatus="unsupported"/>  <package name="libharfbuzz-icu0" supportstatus="unsupported"/>  <package name="libharfbuzz0" supportstatus="unsupported"/>  @@ -2408,7 +2411,7 @@ <package name="liblzma5" supportstatus="unsupported"/>  <package name="liblzo2-2" supportstatus="unsupported"/>  <package name="libm17n0" supportstatus="unsupported"/>  - <package name="libmad0" supportstatus="unsupported"/>  + <package name="libmad0" supportstatus="unsupported"/>  <package name="libmagic1" supportstatus="unsupported"/>  <package name="libmailutils5" supportstatus="unsupported"/>  <package name="libmanette-0_2-0" supportstatus="unsupported"/>  @@ -2435,7 +2438,7 @@ <package name="libmm-glib0" supportstatus="unsupported"/>  <package name="libmms0" supportstatus="unsupported"/>  <package name="libmng2" supportstatus="unsupported"/>  - <package name="libmnl0" supportstatus="unsupported"/>  + <package name="libmnl0" supportstatus="unsupported"/>  <package name="libmodman1" supportstatus="unsupported"/>  <package name="libmodplug1" supportstatus="unsupported"/>  <package name="libmount1" supportstatus="unsupported"/>  @@ -2460,7 +2463,7 @@ <package name="libmtp9" supportstatus="unsupported"/>  <package name="libmusicbrainz4" supportstatus="unsupported"/>  <package name="libmusicbrainz5-1" supportstatus="unsupported"/>  - <package name="libmutter-3-0" supportstatus="unsupported"/>  + <package name="libmutter-4-0" supportstatus="unsupported"/>  <package name="libmwaw-0_3-3" supportstatus="unsupported"/>  <package name="libmxml1" supportstatus="unsupported"/>  <package name="libmygpo-qt1" supportstatus="unsupported"/>  @@ -2517,6 +2520,7 @@ <package name="libomp7-devel" supportstatus="unsupported"/>  <package name="libonig4" supportstatus="unsupported"/>  <package name="libopagent1" supportstatus="unsupported"/>  + <package name="libopal3_10_10" supportstatus="unsupported"/>  <package name="libopenal1" supportstatus="unsupported"/>  <package name="libopenbabel5" supportstatus="unsupported"/>  <package name="libopenblas_pthreads0" supportstatus="unsupported"/>  @@ -2554,7 +2558,7 @@ <package name="libpagemaker-0_0-0" supportstatus="unsupported"/>  <package name="libpango-1_0-0" supportstatus="unsupported"/>  <package name="libpangomm-1_4-1" supportstatus="unsupported"/>  - <package name="libparanoia1_0" supportstatus="unsupported"/>  + <package name="libparanoia1_0" supportstatus="unsupported"/>  <package name="libparted0" supportstatus="unsupported"/>  <package name="libpath_utils1" supportstatus="unsupported"/>  <package name="libpcap1" supportstatus="unsupported"/>  @@ -2621,6 +2625,7 @@ <package name="libpskc0" supportstatus="unsupported"/>  <package name="libpsl5" supportstatus="unsupported"/>  <package name="libpst4" supportstatus="unsupported"/>  + <package name="libpt2_10_11" supportstatus="unsupported"/>  <package name="libpulse-mainloop-glib0" supportstatus="unsupported"/>  <package name="libpulse0" supportstatus="unsupported"/>  <package name="libpurple" supportstatus="unsupported"/>  @@ -2916,7 +2921,7 @@ <package name="libva-wayland2" supportstatus="unsupported"/>  <package name="libva-x11-2" supportstatus="unsupported"/>  <package name="libva2" supportstatus="unsupported"/>  - <package name="libvala-0_42-0" supportstatus="unsupported"/>  + <package name="libvala-0_44-0" supportstatus="unsupported"/>  <package name="libvamp-hostsdk3" supportstatus="unsupported"/>  <package name="libvcdinfo0" supportstatus="unsupported"/>  <package name="libvdeplug3" supportstatus="unsupported"/>  @@ -3083,7 +3088,7 @@ <package name="libxshmfence1" supportstatus="unsupported"/>  <package name="libxslt-tools" supportstatus="unsupported"/>  <package name="libxslt1" supportstatus="unsupported"/>  - <package name="libxtables12" supportstatus="unsupported"/>  + <package name="libxtables12" supportstatus="unsupported"/>  <package name="libyajl2" supportstatus="unsupported"/>  <package name="libyaml-0-2" supportstatus="unsupported"/>  <package name="libyaml-cpp0_6" supportstatus="unsupported"/>  @@ -3297,9 +3302,8 @@ <package name="nautilus-lang" supportstatus="unsupported"/>  <package name="nautilus-sendto" supportstatus="unsupported"/>  <package name="nautilus-sendto-lang" supportstatus="unsupported"/>  - <package name="nautilus-share" supportstatus="unsupported"/>  - <package name="nautilus-share-lang" supportstatus="unsupported"/>  - <package name="nautilus-totem" supportstatus="unsupported"/>  + <package name="nautilus-share" supportstatus="unsupported"/>  + <package name="nautilus-share-lang" supportstatus="unsupported"/>  <package name="nbd" supportstatus="unsupported"/>  <package name="ncftp" supportstatus="unsupported"/>  <package name="ncurses-devel" supportstatus="unsupported"/>  @@ -3307,8 +3311,8 @@ <package name="nemiver" supportstatus="unsupported"/>  <package name="nemiver-lang" supportstatus="unsupported"/>  <package name="net-snmp" supportstatus="unsupported"/>  - <package name="net-tools" supportstatus="unsupported"/>  - <package name="net-tools-lang" supportstatus="unsupported"/>  + <package name="net-tools" supportstatus="unsupported"/>  + <package name="net-tools-lang" supportstatus="unsupported"/>  <package name="netcat-openbsd" supportstatus="unsupported"/>  <package name="netcfg" supportstatus="unsupported"/>  <package name="netpbm" supportstatus="unsupported"/>  @@ -3447,7 +3451,7 @@ <package name="patterns-base-apparmor" supportstatus="unsupported"/>  <package name="patterns-base-apparmor_opt" supportstatus="unsupported"/>  <package name="patterns-base-base" supportstatus="unsupported"/>  - <package name="patterns-base-basesystem" supportstatus="unsupported"/>  + <package name="patterns-base-basesystem" supportstatus="unsupported"/>  <package name="patterns-base-console" supportstatus="unsupported"/>  <package name="patterns-base-documentation" supportstatus="unsupported"/>  <package name="patterns-base-enhanced_base" supportstatus="unsupported"/>  @@ -3478,6 +3482,7 @@ <package name="patterns-fonts-fonts_opt" supportstatus="unsupported"/>  <package name="patterns-games-games" supportstatus="unsupported"/>  <package name="patterns-gnome-gnome" supportstatus="unsupported"/>  + <package name="patterns-gnome-gnome_basic" supportstatus="unsupported"/>  <package name="patterns-gnome-gnome_basis" supportstatus="unsupported"/>  <package name="patterns-gnome-gnome_basis_opt" supportstatus="unsupported"/>  <package name="patterns-gnome-gnome_games" supportstatus="unsupported"/>  @@ -4251,7 +4256,7 @@ <package name="rdma-core" supportstatus="unsupported"/>  <package name="re2c" supportstatus="unsupported"/>  <package name="read-only-root-fs" supportstatus="unsupported"/>  - <package name="readcd" supportstatus="unsupported"/>  + <package name="readcd" supportstatus="unsupported"/>  <package name="readline-devel" supportstatus="unsupported"/>  <package name="readline-doc" supportstatus="unsupported"/>  <package name="rebootmgr" supportstatus="unsupported"/>  @@ -4960,10 +4965,10 @@ <package name="totem-lang" supportstatus="unsupported"/>  <package name="totem-pl-parser" supportstatus="unsupported"/>  <package name="totem-pl-parser-lang" supportstatus="unsupported"/>  - <package name="totem-plugin-brasero" supportstatus="unsupported"/>  + <package name="totem-plugin-brasero" supportstatus="unsupported"/>  <package name="totem-plugin-gnome-dvb-daemon" supportstatus="unsupported"/>  <package name="totem-plugins" supportstatus="unsupported"/>  - <package name="traceroute" supportstatus="unsupported"/>  + <package name="traceroute" supportstatus="unsupported"/>  <package name="tracker" supportstatus="unsupported"/>  <package name="tracker-lang" supportstatus="unsupported"/>  <package name="tracker-miner-files" supportstatus="unsupported"/>  @@ -5014,7 +5019,7 @@ <package name="typelib-1_0-GData-0_0" supportstatus="unsupported"/>  <package name="typelib-1_0-GES-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-GFBGraph-0_2" supportstatus="unsupported"/>  - <package name="typelib-1_0-GMenu-3_0" supportstatus="unsupported"/>  + <package name="typelib-1_0-GMenu-3_0" supportstatus="unsupported"/>  <package name="typelib-1_0-GSound-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-GWeather-3_0" supportstatus="unsupported"/>  <package name="typelib-1_0-Gck-1" supportstatus="unsupported"/>  @@ -5030,6 +5035,7 @@ <package name="typelib-1_0-GnomeKeyring-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-Goa-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-Grl-0_3" supportstatus="unsupported"/>  + <package name="typelib-1_0-Gspell-1" supportstatus="unsupported"/>  <package name="typelib-1_0-Gst-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-GstAudio-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-GstPbutils-1_0" supportstatus="unsupported"/>  @@ -5040,7 +5046,7 @@ <package name="typelib-1_0-Gtk-3_0" supportstatus="unsupported"/>  <package name="typelib-1_0-GtkClutter-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-GtkSource-3_0" supportstatus="unsupported"/>  - <package name="typelib-1_0-GtkSource-4" supportstatus="unsupported"/>  + <package name="typelib-1_0-GtkSource-4" supportstatus="unsupported"/>  <package name="typelib-1_0-IBus-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-JavaScriptCore-4_0" supportstatus="unsupported"/>  <package name="typelib-1_0-Json-1_0" supportstatus="unsupported"/>  @@ -5070,7 +5076,6 @@ <package name="typelib-1_0-Vte-2.91" supportstatus="unsupported"/>  <package name="typelib-1_0-WebKit2-4_0" supportstatus="unsupported"/>  <package name="typelib-1_0-Wnck-3_0" supportstatus="unsupported"/>  - <package name="typelib-1_0-Xkl-1_0" supportstatus="unsupported"/>  <package name="typelib-1_0-Zpj-0_0" supportstatus="unsupported"/>  <package name="typelib-1_0-libdazzle-1_0" supportstatus="unsupported"/>  <package name="ucode-amd" supportstatus="unsupported"/>  @@ -5426,7 +5431,6 @@ <package name="yast2-dns-server" supportstatus="unsupported"/>  <package name="yast2-firewall" supportstatus="unsupported"/>  <package name="yast2-firstboot" supportstatus="unsupported"/>  - <package name="yast2-fonts" supportstatus="unsupported"/>  <package name="yast2-ftp-server" supportstatus="unsupported"/>  <package name="yast2-hardware-detection" supportstatus="unsupported"/>  <package name="yast2-http-server" supportstatus="unsupported"/>  @@ -5624,7 +5628,6 @@ <package name="kernel-vanilla" supportstatus="unsupported"/>  <package name="kmozillahelper" supportstatus="unsupported"/>  <package name="krb5-32bit" supportstatus="unsupported"/>  - <package name="krb5-client" supportstatus="unsupported"/>  <package name="ldmtool" supportstatus="unsupported"/>  <package name="lib389" supportstatus="unsupported"/>  <package name="libHX28-32bit" supportstatus="unsupported"/>  ++++++ openSUSE-MicroOS.product ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.291915290 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.291915290 +0200 @@ -102,8 +102,23 @@ <use group="opensuse_kubic" create_pattern="false"/> <use group="opensuse_kubic.x86_64" create_pattern="false"/> </media> + + <media type="image" + flavor="appliance" + mediastyle="suse-tumbleweed" + name="openSUSE-MicroOS-appliance" > +  + </media> + + <media type="image" + flavor="appliance-kubic" + mediastyle="suse-tumbleweed" + name="openSUSE-Kubic-appliance" > +  + </media> </mediasets> + <xi:include href="opensuse_microos.group"/> <xi:include href="opensuse_kubic.group"/> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.307915336 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.307915336 +0200 @@ -182,6 +182,13 @@  </media> + <media type="image" + flavor="appliance" + mediastyle="suse-tumbleweed" + name="openSUSE-Tumbleweed-appliance" > +  + </media> + </mediasets> <xi:include href="NON_FTP_PACKAGES.group"/> ++++++ opensuse_kubic.group ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.327915392 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.327915392 +0200 @@ -311,7 +311,6 @@ <package name="libpath_utils1" supportstatus="unsupported"/>  <package name="libpci3" supportstatus="unsupported"/>  <package name="libpciaccess0" supportstatus="unsupported"/>  - <package name="libpgm-5_2-0" supportstatus="unsupported"/>  <package name="libpng16-16" supportstatus="unsupported"/>  <package name="libprocps7" supportstatus="unsupported"/>  <package name="libproxy1" supportstatus="unsupported"/>  @@ -329,7 +328,6 @@ <package name="libsgutils2-1_45-2" supportstatus="unsupported"/>  <package name="libsnapper4" supportstatus="unsupported"/>  <package name="libsnappy1" supportstatus="unsupported"/>  - <package name="libsodium23" supportstatus="unsupported"/>  <package name="libsoftokn3" supportstatus="unsupported"/>  <package name="libsolv-tools" supportstatus="unsupported"/>  <package name="libsoup-2_4-1" supportstatus="unsupported"/>  @@ -341,7 +339,6 @@ <package name="libtalloc2" supportstatus="unsupported"/>  <package name="libtdb1" supportstatus="unsupported"/>  <package name="libtevent0" supportstatus="unsupported"/>  - <package name="libunwind" supportstatus="unsupported"/>  <package name="liburcu6" supportstatus="unsupported"/>  <package name="libusb-1_0-0" supportstatus="unsupported"/>  <package name="libvmtools0" supportstatus="unsupported"/>  @@ -356,7 +353,6 @@ <package name="libxtables12" supportstatus="unsupported"/>  <package name="libyajl2" supportstatus="unsupported"/>  <package name="libyaml-0-2" supportstatus="unsupported"/>  - <package name="libzmq5" supportstatus="unsupported"/>  <package name="libzstd1" supportstatus="unsupported"/>  <package name="libzypp" supportstatus="unsupported"/>  <package name="logrotate" supportstatus="unsupported"/>  @@ -445,36 +441,27 @@ <package name="python3-jsonpatch" supportstatus="unsupported"/>  <package name="python3-jsonpointer" supportstatus="unsupported"/>  <package name="python3-jsonschema" supportstatus="unsupported"/>  - <package name="python3-msgpack" supportstatus="unsupported"/>  <package name="python3-networkx" supportstatus="unsupported"/>  <package name="python3-oauthlib" supportstatus="unsupported"/>  <package name="python3-packaging" supportstatus="unsupported"/>  <package name="python3-ply" supportstatus="unsupported"/>  <package name="python3-policycoreutils" supportstatus="unsupported"/>  - <package name="python3-psutil" supportstatus="unsupported"/>  <package name="python3-py" supportstatus="unsupported"/>  <package name="python3-pyasn1" supportstatus="unsupported"/>  <package name="python3-pycparser" supportstatus="unsupported"/>  - <package name="python3-pycryptodome" supportstatus="unsupported"/>  <package name="python3-pyparsing" supportstatus="unsupported"/>  <package name="python3-pyserial" supportstatus="unsupported"/>  <package name="python3-pytz" supportstatus="unsupported"/>  - <package name="python3-pyzmq" supportstatus="unsupported"/>  <package name="python3-rados" supportstatus="unsupported"/>  <package name="python3-rbd" supportstatus="unsupported"/>  <package name="python3-requests" supportstatus="unsupported"/>  <package name="python3-rgw" supportstatus="unsupported"/>  - <package name="python3-rpm" supportstatus="unsupported"/>  - <package name="python3-salt" supportstatus="unsupported"/>  <package name="python3-selinux" supportstatus="unsupported"/>  <package name="python3-semanage" supportstatus="unsupported"/>  <package name="python3-setools" supportstatus="unsupported"/>  <package name="python3-setuptools" supportstatus="unsupported"/>  - <package name="python3-simplejson" supportstatus="unsupported"/>  <package name="python3-six" supportstatus="unsupported"/>  - <package name="python3-tornado" supportstatus="unsupported"/>  <package name="python3-urllib3" supportstatus="unsupported"/>  - <package name="python3-zypp-plugin" supportstatus="unsupported"/>  <package name="rdma-core" supportstatus="unsupported"/>  <package name="read-only-root-fs" supportstatus="unsupported"/>  <package name="rebootmgr" supportstatus="unsupported"/>  @@ -482,9 +469,6 @@ <package name="rpcbind" supportstatus="unsupported"/>  <package name="rsync" supportstatus="unsupported"/>  <package name="runc" supportstatus="unsupported"/>  - <package name="salt" supportstatus="unsupported"/>  - <package name="salt-master" supportstatus="unsupported"/>  - <package name="salt-minion" supportstatus="unsupported"/>  <package name="selinux-tools" supportstatus="unsupported"/>  <package name="sg3_utils" supportstatus="unsupported"/>  <package name="shared-mime-info" supportstatus="unsupported"/>  ++++++ opensuse_microos.group ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.347915449 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.351915460 +0200 @@ -281,7 +281,6 @@ <package name="libpath_utils1" supportstatus="unsupported"/>  <package name="libpci3" supportstatus="unsupported"/>  <package name="libpciaccess0" supportstatus="unsupported"/>  - <package name="libpgm-5_2-0" supportstatus="unsupported"/>  <package name="libpng16-16" supportstatus="unsupported"/>  <package name="libprocps7" supportstatus="unsupported"/>  <package name="libproxy1" supportstatus="unsupported"/>  @@ -293,7 +292,6 @@ <package name="libsasl2-3" supportstatus="unsupported"/>  <package name="libsnapper4" supportstatus="unsupported"/>  <package name="libsnappy1" supportstatus="unsupported"/>  - <package name="libsodium23" supportstatus="unsupported"/>  <package name="libsolv-tools" supportstatus="unsupported"/>  <package name="libsoup-2_4-1" supportstatus="unsupported"/>  <package name="libsqlite3-0" supportstatus="unsupported"/>  @@ -304,7 +302,6 @@ <package name="libtalloc2" supportstatus="unsupported"/>  <package name="libtdb1" supportstatus="unsupported"/>  <package name="libtevent0" supportstatus="unsupported"/>  - <package name="libunwind" supportstatus="unsupported"/>  <package name="libusb-1_0-0" supportstatus="unsupported"/>  <package name="libvmtools0" supportstatus="unsupported"/>  <package name="libwicked-0-6" supportstatus="unsupported"/>  @@ -318,7 +315,6 @@ <package name="libxtables12" supportstatus="unsupported"/>  <package name="libyajl2" supportstatus="unsupported"/>  <package name="libyaml-0-2" supportstatus="unsupported"/>  - <package name="libzmq5" supportstatus="unsupported"/>  <package name="libzstd1" supportstatus="unsupported"/>  <package name="libzypp" supportstatus="unsupported"/>  <package name="logrotate" supportstatus="unsupported"/>  @@ -394,41 +390,29 @@ <package name="python3-jsonpatch" supportstatus="unsupported"/>  <package name="python3-jsonpointer" supportstatus="unsupported"/>  <package name="python3-jsonschema" supportstatus="unsupported"/>  - <package name="python3-msgpack" supportstatus="unsupported"/>  <package name="python3-networkx" supportstatus="unsupported"/>  <package name="python3-oauthlib" supportstatus="unsupported"/>  <package name="python3-packaging" supportstatus="unsupported"/>  <package name="python3-ply" supportstatus="unsupported"/>  <package name="python3-policycoreutils" supportstatus="unsupported"/>  - <package name="python3-psutil" supportstatus="unsupported"/>  <package name="python3-py" supportstatus="unsupported"/>  <package name="python3-pyasn1" supportstatus="unsupported"/>  <package name="python3-pycparser" supportstatus="unsupported"/>  - <package name="python3-pycryptodome" supportstatus="unsupported"/>  <package name="python3-pyparsing" supportstatus="unsupported"/>  <package name="python3-pyserial" supportstatus="unsupported"/>  <package name="python3-pytz" supportstatus="unsupported"/>  - <package name="python3-pyzmq" supportstatus="unsupported"/>  <package name="python3-requests" supportstatus="unsupported"/>  - <package name="python3-rpm" supportstatus="unsupported"/>  - <package name="python3-salt" supportstatus="unsupported"/>  <package name="python3-selinux" supportstatus="unsupported"/>  <package name="python3-semanage" supportstatus="unsupported"/>  <package name="python3-setools" supportstatus="unsupported"/>  <package name="python3-setuptools" supportstatus="unsupported"/>  - <package name="python3-simplejson" supportstatus="unsupported"/>  <package name="python3-six" supportstatus="unsupported"/>  - <package name="python3-tornado" supportstatus="unsupported"/>  <package name="python3-urllib3" supportstatus="unsupported"/>  - <package name="python3-zypp-plugin" supportstatus="unsupported"/>  <package name="read-only-root-fs" supportstatus="unsupported"/>  <package name="rebootmgr" supportstatus="unsupported"/>  <package name="restorecond" supportstatus="unsupported"/>  <package name="rsync" supportstatus="unsupported"/>  <package name="runc" supportstatus="unsupported"/>  - <package name="salt" supportstatus="unsupported"/>  - <package name="salt-master" supportstatus="unsupported"/>  - <package name="salt-minion" supportstatus="unsupported"/>  <package name="selinux-tools" supportstatus="unsupported"/>  <package name="shared-mime-info" supportstatus="unsupported"/>  <package name="shim" supportstatus="unsupported"/>  ++++++ unsorted.yml ++++++ --- /var/tmp/diff_new_pack.DnhMT2/_old 2019-05-05 11:13:02.387915562 +0200 +++ /var/tmp/diff_new_pack.DnhMT2/_new 2019-05-05 11:13:02.387915562 +0200 @@ -46,7 +46,6 @@ - FreeCAD: [x86_64] - GraphicsMagick - GraphicsMagick-devel - - H2rename - HSAIL-Tools - HepMC-devel - HepMC2-devel @@ -605,7 +604,6 @@ - asclock - asco - asco-doc - - aseprite - aseqview - asio-devel - asl @@ -1048,7 +1046,6 @@ - boinc-client-lang - boinc-manager - boinc-manager-lang - - bolt - bolt-tools - bomber - bomber-lang @@ -2237,8 +2234,6 @@ - dub - duc - duktape-devel - - dumb - - dumb-doc - dummy-release - dump - dump1090 @@ -2310,9 +2305,6 @@ - eiciel-lang - eigen3-devel - eigen3-doc - - ekiga - - ekiga-lang - - ekiga-plugins-evolution - elektra - elektra-qt-gui - elementary @@ -3232,7 +3224,6 @@ - gedit-plugin-colorpicker - gedit-plugin-colorschemer - gedit-plugin-commander - - gedit-plugin-dashboard - gedit-plugin-drawspaces - gedit-plugin-findinfiles - gedit-plugin-git @@ -3935,8 +3926,6 @@ - giflib-devel-32bit: [x86_64] - giflib-progs - gifsicle - - gigaset-frontend - - gigaset-frontend-qt - giggle-devel - gigolo - gigolo-lang @@ -4085,6 +4074,7 @@ - gnome-autoar-devel - gnome-bluetooth-devel - gnome-books + - gnome-books-lang - gnome-boxes - gnome-boxes-lang - gnome-break-timer @@ -4893,8 +4883,6 @@ - hfst-ospell-devel - hg-fast-export - hg-git - - hgview - - hgview-qt4 - hiawatha - hiawatha-letsencrypt - hibiscus @@ -5256,7 +5244,6 @@ - ipxrip - irman-common - irman-utils - - irqd - irrlicht-data - irrlicht-devel - irssi-devel @@ -5984,7 +5971,6 @@ - krandr - krb5-auth-dialog - krb5-auth-dialog-lang - - krb5-client: [i586] - krb5-devel - krb5-devel-32bit: [x86_64] - krb5-mini @@ -5994,7 +5980,6 @@ - krb5-plugin-preauth-pkinit - krb5-plugin-preauth-spake - krb5-server - - krb5-ticket-watcher - krdc-devel - kreport - kreport-devel @@ -6990,8 +6975,6 @@ - libairspyhf0 - libakai0 - libalac0 - - libaldmb-0_9_3 - - libaldmb-devel - libalkimia5-7 - libalkimia5-devel - liballegro-doc @@ -7119,8 +7102,6 @@ - libavahi-glib-devel - libavahi-glib1-32bit: [x86_64] - libavahi-gobject-devel - - libavahi-qt4-1 - - libavahi-qt4-devel - libavahi-ui0 - libavc1394-0-32bit: [x86_64] - libavc1394-devel @@ -7869,8 +7850,6 @@ - libdtkwidget2 - libdtkwm2 - libduktape201 - - libdumb-0_9_3 - - libdumb-devel - libdv - libdv-devel - libdv4-32bit: [x86_64] @@ -7930,7 +7909,7 @@ - libector1 - libedata-book-1_2-25-32bit: [x86_64] - libedata-cal-1_2-29-32bit: [x86_64] - - libedataserver-1_2-23-32bit: [x86_64] + - libedataserver-1_2-24-32bit: [x86_64] - libedataserverui-1_2-2-32bit: [x86_64] - libedit-devel - libedit0-32bit: [x86_64] @@ -8154,9 +8133,11 @@ - libfmt5-32bit: [x86_64] - libfole-devel - libfole1 + - libfolks-telepathy25 - libfolks-tracker25 - libfoma-hfst0 - libfoma0 + - libfont-specimen0 - libfontenc-devel-32bit: [x86_64] - libfontenc1-32bit: [x86_64] - libfonts-javadoc @@ -9109,7 +9090,6 @@ - liblldp_clif1: [i586] - liblldpctl4 - liblmdb-0_9_23-32bit: [x86_64] - - liblmicclogger1 - liblms7002m-devel - liblms7compact0 - liblnk-devel @@ -9630,7 +9610,6 @@ - libopae-c0: [x86_64] - libopagent1-32bit: [x86_64] - libopal-devel - - libopal3_10_10 - libopamgt-devel: [x86_64] - libopamgt0: [x86_64] - libopasadb1_0_0: [x86_64] @@ -10036,7 +10015,6 @@ - libpst - libpst-devel - libpt-devel - - libpt2_10_11 - libpt2_10_11-plugins-avc - libpt2_10_11-plugins-pulse - libptexenc1 @@ -10087,6 +10065,7 @@ - libqca2-plugin-gcrypt - libqca2-plugin-nss - libqca2-plugin-nss-32bit: [x86_64] + - libqca2-plugin-pkcs11 - libqcow-devel - libqcow-tools - libqcow1 @@ -11134,9 +11113,9 @@ - libva-x11-2-32bit: [x86_64] - libva2-32bit: [x86_64] - libvacuumutils37 - - libvala-0_42-devel - - libvaladoc-0_42-0 - - libvaladoc-0_42-devel + - libvala-0_44-devel + - libvaladoc-0_44-0 + - libvaladoc-0_44-devel - libvamp-hostsdk3-32bit: [x86_64] - libvamp-sdk2 - libvamp-sdk2-32bit: [x86_64] @@ -11797,14 +11776,6 @@ - lmarbles - lmdb - lmdb-devel - - lmicc-account - - lmicc-bin - - lmicc-hardware - - lmicc-libs - - lmicc-network - - lmicc-overview - - lmicc-service - - lmicc-software - lmms: [x86_64] - lmms-devel: [x86_64] - lndir @@ -13445,7 +13416,6 @@ - notes-up - notes-up-lang - notify-osd - - notify-osd-config - notify-sharp - notify-sharp-devel - notify-sharp3 @@ -14576,7 +14546,6 @@ - patterns-devel-tcl-devel_tcl - patterns-enlightenment-enlightenment - patterns-gnome-devel_gnome - - patterns-gnome-gnome_basic - patterns-hpc-compute_node: [x86_64] - patterns-hpc-development_node: [x86_64] - patterns-hpc-libraries: [x86_64] @@ -16486,7 +16455,6 @@ - python-jupyter_console-doc - python-jupyter_core-doc - python-jupyter_ipykernel-doc - - python-jupyter_ipyparallel-doc - python-jupyter_ipython-doc - python-jupyter_ipywidgets-doc - python-jupyter_nbconvert-doc @@ -16565,7 +16533,6 @@ - python-openstacksdk-doc - python-opensync - python-optcomplete - - python-os-api-ref - python-os-testr-doc - python-os-win-doc - python-osc-lib-doc @@ -16589,7 +16556,6 @@ - python-oslo.versionedobjects-doc - python-oslo.vmware-doc - python-osprofiler-doc - - python-ovsdbapp - python-ovsdbapp-doc - python-paramiko-doc - python-peppercorn-doc @@ -16660,7 +16626,6 @@ - python-saharaclient - python-saharaclient-doc - python-salt-testing - - python-senlinclient - python-senlinclient-doc - python-shodan-doc - python-singledispatch @@ -16675,7 +16640,6 @@ - python-temps - python-testtools-doc - python-textX-doc - - python-tooz - python-tooz-doc - python-translationstring-doc - python-tre @@ -16697,7 +16661,6 @@ - python-xmms2 - python-yaql - python-yui - - python-zaqarclient - python-zaqarclient-doc - python-zinnia - python-zope.deprecation-doc @@ -17665,32 +17628,18 @@ - python2-jsonschema - python2-junitxml - python2-jupyter - - python2-jupyter_Video_Widget - - python2-jupyter_altair-widgets - - python2-jupyter_bqplot - python2-jupyter_client - - python2-jupyter_cms - python2-jupyter_console - python2-jupyter_console-doc - python2-jupyter_contrib_core - - python2-jupyter_contrib_nbextensions - python2-jupyter_core - - python2-jupyter_dashboards - - python2-jupyter_full_width - - python2-jupyter_hide_code - python2-jupyter_highlight_selected_word - - python2-jupyter_ipdb - - python2-jupyter_ipydatawidgets - python2-jupyter_ipykernel - - python2-jupyter_ipympl - - python2-jupyter_ipyparallel - python2-jupyter_ipyscales - python2-jupyter_ipython - python2-jupyter_ipython-iptest - python2-jupyter_ipywidgets - - python2-jupyter_jgraph - python2-jupyter_latex_envs - - python2-jupyter_matlab_kernel - python2-jupyter_metakernel - python2-jupyter_nbconvert - python2-jupyter_nbconvert-latex @@ -17706,15 +17655,10 @@ - python2-jupyter_notebook-lang - python2-jupyter_notebook-latex - python2-jupyter_octave_kernel - - python2-jupyter_qgrid - python2-jupyter_qtconsole - - python2-jupyter_rise - python2-jupyter_sphinx - - python2-jupyter_themer - python2-jupyter_vega - - python2-jupyter_watermark - python2-jupyter_widgetsnbextension - - python2-jupyter_wysiwyg - python2-jwcrypto - python2-k5test - python2-kafka-python @@ -17943,6 +17887,7 @@ - python2-openstacksdk - python2-ordered-namespace - python2-orderedmultidict + - python2-os-api-ref - python2-os-client-config - python2-os-service-types - python2-os-testr @@ -17972,6 +17917,7 @@ - python2-osmviz - python2-osprofiler - python2-ovs + - python2-ovsdbapp - python2-pa-ringbuffer - python2-paho-mqtt - python2-palettable @@ -18462,6 +18408,7 @@ - python2-semanage - python2-semantic_version - python2-semver + - python2-senlinclient - python2-seqdiag - python2-serpent - python2-serpy @@ -18618,6 +18565,7 @@ - python2-toml - python2-tomlkit - python2-toolz + - python2-tooz - python2-topy - python2-tornado - python2-tox @@ -18767,6 +18715,7 @@ - python2-yq - python2-yubico - python2-zake + - python2-zaqarclient - python2-zc.buildout - python2-zc.lockfile - python2-zdaemon @@ -19538,9 +19487,6 @@ - python3-ec2imgutils - python3-editdistance - python3-editdistance-devel - - python3-efl - - python3-efl-doc - - python3-efl-examples - python3-elasticsearch - python3-eliot - python3-email_validator @@ -19817,45 +19763,22 @@ - python3-jsonschema: [i586] - python3-junitxml - python3-jupyter - - python3-jupyter_Video_Widget - - python3-jupyter_altair-widgets - - python3-jupyter_bqplot - - python3-jupyter_calysto - python3-jupyter_client - - python3-jupyter_cms - python3-jupyter_console - python3-jupyter_contrib_core - - python3-jupyter_contrib_nbextensions - python3-jupyter_core - - python3-jupyter_dashboards - - python3-jupyter_full_width - - python3-jupyter_hide_code - python3-jupyter_highlight_selected_word - - python3-jupyter_imatlab_kernel - - python3-jupyter_ipdb - - python3-jupyter_ipydatawidgets - - python3-jupyter_ipydatawidgets_jupyterlab - python3-jupyter_ipykernel - - python3-jupyter_ipympl - - python3-jupyter_ipympl_jupyterlab - - python3-jupyter_ipyparallel - python3-jupyter_ipyscales - python3-jupyter_ipyscales_jupyterlab - python3-jupyter_ipython - python3-jupyter_ipython-iptest - python3-jupyter_ipywidgets - - python3-jupyter_jgraph - python3-jupyter_jupyterlab - - python3-jupyter_jupyterlab_discovery - - python3-jupyter_jupyterlab_github - - python3-jupyter_jupyterlab_latex - python3-jupyter_jupyterlab_launcher - python3-jupyter_jupyterlab_server - - python3-jupyter_jupyterlab_templates - - python3-jupyter_jupyterlab_widgets - python3-jupyter_kernel_test - python3-jupyter_latex_envs - - python3-jupyter_matlab_kernel - python3-jupyter_metakernel - python3-jupyter_nbconvert - python3-jupyter_nbconvert-latex @@ -19868,21 +19791,15 @@ - python3-jupyter_nbpresent - python3-jupyter_nbsmoke - python3-jupyter_nbsphinx - - python3-jupyter_nbsphinx_link - python3-jupyter_nbval - python3-jupyter_notebook - python3-jupyter_notebook-lang - python3-jupyter_notebook-latex - python3-jupyter_octave_kernel - - python3-jupyter_qgrid - python3-jupyter_qtconsole - - python3-jupyter_rise - python3-jupyter_sphinx - - python3-jupyter_themer - python3-jupyter_vega - - python3-jupyter_watermark - python3-jupyter_widgetsnbextension - - python3-jupyter_wysiwyg - python3-jwcrypto - python3-k5test - python3-kafka-python @@ -20140,6 +20057,7 @@ - python3-openwsman - python3-ordered-namespace - python3-orderedmultidict + - python3-os-api-ref - python3-os-client-config - python3-os-service-types - python3-os-testr @@ -20168,6 +20086,7 @@ - python3-osmviz - python3-osprofiler - python3-ovs + - python3-ovsdbapp - python3-pa-ringbuffer - python3-padaos - python3-padatious @@ -20668,6 +20587,7 @@ - python3-semanage: [i586] - python3-semantic_version - python3-semver + - python3-senlinclient - python3-seqdiag - python3-serpent - python3-serpy @@ -20831,6 +20751,7 @@ - python3-tomlkit - python3-tools - python3-toolz + - python3-tooz - python3-topy - python3-tox - python3-tox-no-internet @@ -20993,6 +20914,7 @@ - python3-yubico - python3-z3 - python3-zake + - python3-zaqarclient - python3-zarafa - python3-zc.buildout - python3-zc.lockfile @@ -21314,8 +21236,6 @@ - rfb - rfbplaymacro - rfbproxy - - rfcat - - rfcat-udev - rfcdiff - rhash - rhash-devel @@ -21406,7 +21326,6 @@ - rsstail - rst2html5 - rstart - - rstudio - rsvg-view - rsvg2-sharp - rsyslog-diag-tools @@ -30360,6 +30279,8 @@ - trello-full-backup - trigger-rally - trigger-rally-data + - trilead-ssh2 + - trilead-ssh2-javadoc - trinity - tripwire - trojita @@ -30528,6 +30449,7 @@ - typelib-1_0-Ggit-1_0 - typelib-1_0-Gitg-1_0 - typelib-1_0-GitgExt-1_0 + - typelib-1_0-Gkbd-3_0 - typelib-1_0-Gladeui-2_0 - typelib-1_0-GnomeAutoar-0_1 - typelib-1_0-GnomeAutoarGtk-0_1 @@ -30541,7 +30463,6 @@ - typelib-1_0-GrlPls-0_3 - typelib-1_0-Grss-0_7 - typelib-1_0-Gsf-1 - - typelib-1_0-Gspell-1 - typelib-1_0-GstAllocators-1_0 - typelib-1_0-GstApp-1_0 - typelib-1_0-GstGL-1_0 @@ -30616,6 +30537,7 @@ - typelib-1_0-Wnck-1_0 - typelib-1_0-Workrave-1_0 - typelib-1_0-XApp-1_0 + - typelib-1_0-Xkl-1_0 - typelib-1_0-Xmlb-1_0 - typelib-1_0-XplayerPlParser-1_0 - typelib-1_0-XreaderDocument-1_5

1 0

commit 000release-packages for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2019-05-05 11:12:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Sun May 5 11:12:46 2019 rev:124 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.2sNZFF/_old 2019-05-05 11:12:56.863899955 +0200 +++ /var/tmp/diff_new_pack.2sNZFF/_new 2019-05-05 11:12:56.863899955 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20190502) +# spec file for package openSUSE-Addon-NonOss-release (Version 20190503) # # Copyright (c) 2019 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon -Version: 20190502 +Version: 20190503 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20190502-0 +Provides: product(openSUSE-Addon-NonOss) = 20190503-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190502 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190503 AutoReqProv: on @@ -49,10 +49,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20190502</version> + <version>20190503</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190502</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190503</cpeid> <register> <pool> </pool> ++++++ openSUSE-MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.2sNZFF/_old 2019-05-05 11:12:56.879900000 +0200 +++ /var/tmp/diff_new_pack.2sNZFF/_new 2019-05-05 11:12:56.879900000 +0200 @@ -17,7 +17,7 @@ Name: openSUSE-MicroOS-release -Version: 20190502 +Version: 20190503 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -40,9 +40,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 Provides: %name-%version Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20190502-0 +Provides: product(openSUSE-MicroOS) = 20190503-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190502 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190503 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(openSUSE-MicroOS) @@ -58,7 +58,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20190502-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190503-0 Summary: openSUSE MicroOS %description dvd @@ -74,7 +74,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20190502-0 +Provides: product_flavor(openSUSE-MicroOS) = 20190503-0 Summary: openSUSE MicroOS %description kubic-dvd @@ -85,6 +85,38 @@ %defattr(-,root,root) %doc %{_defaultdocdir}/openSUSE-MicroOS-release-kubic-dvd +%package appliance +License: BSD-3-Clause +Group: System/Fhs +Provides: product_flavor() +Provides: flavor(appliance) +Provides: product_flavor(openSUSE-MicroOS) = 20190503-0 +Summary: openSUSE MicroOS + +%description appliance +openSUSE MicroOS combines the benefits of a rolling OS with a read-only root filesystem with transactional updates. It is a modern Linux Operating System, designed for single-service installations, such as container hosts. It is optimized for large, clustered deployments. + It inherits the benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution. + +%files appliance +%defattr(-,root,root) +%doc %{_defaultdocdir}/openSUSE-MicroOS-release-appliance + +%package appliance-kubic +License: BSD-3-Clause +Group: System/Fhs +Provides: product_flavor() +Provides: flavor(appliance-kubic) +Provides: product_flavor(openSUSE-MicroOS) = 20190503-0 +Summary: openSUSE MicroOS + +%description appliance-kubic +openSUSE MicroOS combines the benefits of a rolling OS with a read-only root filesystem with transactional updates. It is a modern Linux Operating System, designed for single-service installations, such as container hosts. It is optimized for large, clustered deployments. + It inherits the benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution. + +%files appliance-kubic +%defattr(-,root,root) +%doc %{_defaultdocdir}/openSUSE-MicroOS-release-appliance-kubic + %prep @@ -132,11 +164,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-MicroOS</name> - <version>20190502</version> + <version>20190503</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-microos:20190502</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-microos:20190503</cpeid> <productline>openSUSE-MicroOS</productline> <register> <pool> @@ -184,19 +216,31 @@ EOF +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-appliance +cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-appliance/README << EOF +This package only exists for providing the product flavor 'appliance'. + +EOF + +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-appliance-kubic +cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-appliance-kubic/README << EOF +This package only exists for providing the product flavor 'appliance-kubic'. + +EOF + %post # Update from openSUSE-Tumbleweed-Kubic to openSUSE-MicroOS # Fix the baseproduct symlink and make sure, it exists -if [ -L /etc/products.d/baseproduct ] ; then - PRODLINK=$(basename $(readlink -f /etc/products.d/baseproduct)) +if [ -L %{_sysconfdir}/products.d/baseproduct ] ; then + PRODLINK=$(basename $(readlink -f %{_sysconfdir}/products.d/baseproduct)) if [ "$PRODLINK" == "openSUSE-Tumbleweed-Kubic.prod" ]; then - rm -f /etc/products.d/baseproduct + rm -f %{_sysconfdir}/products.d/baseproduct fi fi -if [ ! -e /etc/products.d/baseproduct ]; then - ln -sf openSUSE-MicroOS.prod /etc/products.d/baseproduct +if [ ! -e %{_sysconfdir}/products.d/baseproduct ]; then + ln -sf openSUSE-MicroOS.prod %{_sysconfdir}/products.d/baseproduct fi %files ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.2sNZFF/_old 2019-05-05 11:12:56.895900045 +0200 +++ /var/tmp/diff_new_pack.2sNZFF/_new 2019-05-05 11:12:56.895900045 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20190502 +Version: 20190503 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -55,7 +55,7 @@ Obsoletes: aaa_version Obsoletes: openSUSE-Promo-release <= 11.1 Obsoletes: openSUSE-release-live <= 11.0 -Obsoletes: product_flavor(%{product}) < 20190502 +Obsoletes: product_flavor(%{product}) < 20190503 # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -183,7 +183,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20190502-0 +Provides: product(openSUSE) = 20190503-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -197,7 +197,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190502 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190503 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -211,7 +211,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description ftp @@ -226,7 +226,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description mini @@ -241,7 +241,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description dvd @@ -256,7 +256,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description livecd-kde @@ -271,7 +271,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description livecd-x11 @@ -286,7 +286,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description livecd-gnome @@ -301,7 +301,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description livecd-xfce @@ -316,7 +316,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description usb-kde @@ -331,7 +331,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description usb-gnome @@ -346,7 +346,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20190502-0 +Provides: product_flavor(openSUSE) = 20190503-0 Summary: openSUSE Tumbleweed %description usb-x11 @@ -356,6 +356,21 @@ %defattr(-,root,root) %doc %{_defaultdocdir}/openSUSE-release-usb-x11 +%package appliance +License: BSD-3-Clause +Group: System/Fhs +Provides: product_flavor() +Provides: flavor(appliance) +Provides: product_flavor(openSUSE) = 20190503-0 +Summary: openSUSE Tumbleweed + +%description appliance +openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. + +%files appliance +%defattr(-,root,root) +%doc %{_defaultdocdir}/openSUSE-release-appliance + %prep @@ -420,10 +435,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20190502</version> + <version>20190503</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20190502</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20190503</cpeid> <productline>openSUSE</productline> <register> <pool> @@ -540,6 +555,12 @@ EOF +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance +cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance/README << EOF +This package only exists for providing the product flavor 'appliance'. + +EOF + # this is a base product, create symlink ln -s openSUSE.prod %{buildroot}%{_sysconfdir}/products.d/baseproduct ++++++ weakremovers.inc ++++++ --- /var/tmp/diff_new_pack.2sNZFF/_old 2019-05-05 11:12:56.971900260 +0200 +++ /var/tmp/diff_new_pack.2sNZFF/_new 2019-05-05 11:12:56.971900260 +0200 @@ -7920,6 +7920,7 @@ Provides: weakremover(FLIF) Provides: weakremover(FLIF-devel) Provides: weakremover(H) +Provides: weakremover(H2rename) Provides: weakremover(HaXml) Provides: weakremover(MultiMarkdown-5) Provides: weakremover(NetworkManager-novellvpn) @@ -7959,6 +7960,7 @@ Provides: weakremover(arts-devel) Provides: weakremover(arts-gmcop) Provides: weakremover(asciidiagram) +Provides: weakremover(aseprite) Provides: weakremover(asm) Provides: weakremover(asm-javadoc) Provides: weakremover(asm2) @@ -8165,6 +8167,8 @@ Provides: weakremover(drac) Provides: weakremover(dssi-linuxsampler) Provides: weakremover(dtksettings) +Provides: weakremover(dumb) +Provides: weakremover(dumb-doc) Provides: weakremover(ecj-bootstrap) Provides: weakremover(elementary-appcenter) Provides: weakremover(elementary-appcenter-lang) @@ -12350,6 +12354,8 @@ Provides: weakremover(ghc-zlib-lens-devel) Provides: weakremover(ghcid) Provides: weakremover(ghostscript-cjk) +Provides: weakremover(gigaset-frontend) +Provides: weakremover(gigaset-frontend-qt) Provides: weakremover(gipeda) Provides: weakremover(girl-lang) Provides: weakremover(git-annex) @@ -12463,7 +12469,6 @@ Provides: weakremover(gtg) Provides: weakremover(gtg-lang) Provides: weakremover(gtk-vnc2-devel) -Provides: weakremover(gtk2-immodules-tigrigna) Provides: weakremover(gtk2-metatheme-geeko) Provides: weakremover(gtk2hs-buildtools) Provides: weakremover(gtk3-engine-unico) @@ -12526,6 +12531,8 @@ Provides: weakremover(hdf5_1_10_1-gnu-openmpi3-hpc-devel) Provides: weakremover(hdf5_1_10_1-gnu-openmpi3-hpc-devel-static) Provides: weakremover(hdf5_1_10_1-gnu-openmpi3-hpc-module) +Provides: weakremover(hgview) +Provides: weakremover(hgview-qt4) Provides: weakremover(higan) Provides: weakremover(higan-icarus) Provides: weakremover(highlighting-kate) @@ -12585,6 +12592,7 @@ Provides: weakremover(iozone-doc) Provides: weakremover(ip6addr) Provides: weakremover(iptables-nft) +Provides: weakremover(irqd) Provides: weakremover(ivtv-firmware) Provides: weakremover(jailbreak-cabal) Provides: weakremover(jakarta-commons-compress-javadoc) @@ -13008,6 +13016,7 @@ Provides: weakremover(kppp) Provides: weakremover(kradio) Provides: weakremover(krb5-doc) +Provides: weakremover(krb5-ticket-watcher) Provides: weakremover(kremotecontrol) Provides: weakremover(kremotecontrol-devel) Provides: weakremover(kscope) @@ -13131,6 +13140,8 @@ Provides: weakremover(libakonadi4) Provides: weakremover(libakonadiprotocolinternals-devel) Provides: weakremover(libakonadiprotocolinternals1) +Provides: weakremover(libaldmb-0_9_3) +Provides: weakremover(libaldmb-devel) Provides: weakremover(libalkimia-devel) Provides: weakremover(libalkimia5) Provides: weakremover(libalkimia7) @@ -13155,6 +13166,8 @@ Provides: weakremover(libaudcore4) Provides: weakremover(libaudgui4) Provides: weakremover(libaudqt1) +Provides: weakremover(libavahi-qt4-1) +Provides: weakremover(libavahi-qt4-devel) Provides: weakremover(libavcodec56) Provides: weakremover(libavcodec57) Provides: weakremover(libavdevice56) @@ -13542,6 +13555,8 @@ Provides: weakremover(libdtkwidget1-devel) Provides: weakremover(libdui-devel) Provides: weakremover(libdui1) +Provides: weakremover(libdumb-0_9_3) +Provides: weakremover(libdumb-devel) Provides: weakremover(libdxflib-3_12_2-1) Provides: weakremover(libeXosip2-11) Provides: weakremover(libechonest-devel) @@ -13549,6 +13564,7 @@ Provides: weakremover(libecm0) Provides: weakremover(libedata-cal-1_2-28) Provides: weakremover(libedataserver-1_2-22) +Provides: weakremover(libedataserver-1_2-23) Provides: weakremover(libedataserverui-1_2-1) Provides: weakremover(libee-devel) Provides: weakremover(libee0) @@ -13653,6 +13669,7 @@ Provides: weakremover(libgnomecups-1_0-1) Provides: weakremover(libgnomecups-devel) Provides: weakremover(libgnomecups-lang) +Provides: weakremover(libgnomekbd) Provides: weakremover(libgnomeprint) Provides: weakremover(libgnomeprint-devel) Provides: weakremover(libgnomeprint-doc) @@ -13916,6 +13933,7 @@ Provides: weakremover(liblinuxsampler4) Provides: weakremover(liblmdb-0_9_17) Provides: weakremover(liblmdb-0_9_22) +Provides: weakremover(liblmicclogger1) Provides: weakremover(libloadpng-devel) Provides: weakremover(libloadpng4_4) Provides: weakremover(liblog4shib1) @@ -13973,6 +13991,7 @@ Provides: weakremover(libmuparser2_2_5) Provides: weakremover(libmutter-0-0) Provides: weakremover(libmutter-2-0) +Provides: weakremover(libmutter-3-0) Provides: weakremover(libmysqlclient18) Provides: weakremover(libmysqlclient_r18) Provides: weakremover(libmysqld18) @@ -14164,7 +14183,6 @@ Provides: weakremover(libqalculate20) Provides: weakremover(libqalculate9) Provides: weakremover(libqb0) -Provides: weakremover(libqca2-plugin-pkcs11) Provides: weakremover(libqoauth1) Provides: weakremover(libqpdf17) Provides: weakremover(libqpdf18) @@ -14368,10 +14386,14 @@ Provides: weakremover(libvala-0_38-devel) Provides: weakremover(libvala-0_40-0) Provides: weakremover(libvala-0_40-devel) +Provides: weakremover(libvala-0_42-0) +Provides: weakremover(libvala-0_42-devel) Provides: weakremover(libvaladoc-0_38-0) Provides: weakremover(libvaladoc-0_38-devel) Provides: weakremover(libvaladoc-0_40-0) Provides: weakremover(libvaladoc-0_40-devel) +Provides: weakremover(libvaladoc-0_42-0) +Provides: weakremover(libvaladoc-0_42-devel) Provides: weakremover(libvapoursynth-40) Provides: weakremover(libvapoursynth-43) Provides: weakremover(libvarnishapi1) @@ -14719,6 +14741,14 @@ Provides: weakremover(llvm5-gold) Provides: weakremover(llvm5-opt-viewer) Provides: weakremover(llvm5-vim-plugins) +Provides: weakremover(lmicc-account) +Provides: weakremover(lmicc-bin) +Provides: weakremover(lmicc-hardware) +Provides: weakremover(lmicc-libs) +Provides: weakremover(lmicc-network) +Provides: weakremover(lmicc-overview) +Provides: weakremover(lmicc-service) +Provides: weakremover(lmicc-software) Provides: weakremover(lollypop-portal) Provides: weakremover(lprof) Provides: weakremover(lrzip) @@ -14845,6 +14875,7 @@ Provides: weakremover(noise) Provides: weakremover(noise-devel) Provides: weakremover(noise-lang) +Provides: weakremover(notify-osd-config) Provides: weakremover(noto-sans-ui-fonts) Provides: weakremover(novell-ipsec-tools) Provides: weakremover(novell-ipsec-tools-devel) @@ -15516,6 +15547,7 @@ Provides: weakremover(python-josepy-doc) Provides: weakremover(python-jsonrpclib) Provides: weakremover(python-junitxml) +Provides: weakremover(python-jupyter_ipyparallel-doc) Provides: weakremover(python-jupyter_ipyparallel-nbextension) Provides: weakremover(python-kde4) Provides: weakremover(python-kde4-devel) @@ -15697,9 +15729,28 @@ Provides: weakremover(python2-ipdb) Provides: weakremover(python2-irc) Provides: weakremover(python2-jellyfish) +Provides: weakremover(python2-jupyter_Video_Widget) +Provides: weakremover(python2-jupyter_altair-widgets) +Provides: weakremover(python2-jupyter_bqplot) +Provides: weakremover(python2-jupyter_cms) +Provides: weakremover(python2-jupyter_contrib_nbextensions) +Provides: weakremover(python2-jupyter_dashboards) +Provides: weakremover(python2-jupyter_full_width) +Provides: weakremover(python2-jupyter_hide_code) +Provides: weakremover(python2-jupyter_ipdb) +Provides: weakremover(python2-jupyter_ipydatawidgets) +Provides: weakremover(python2-jupyter_ipympl) +Provides: weakremover(python2-jupyter_ipyparallel) +Provides: weakremover(python2-jupyter_jgraph) +Provides: weakremover(python2-jupyter_matlab_kernel) Provides: weakremover(python2-jupyter_nbsphinx) Provides: weakremover(python2-jupyter_nbsphinx_link) +Provides: weakremover(python2-jupyter_qgrid) +Provides: weakremover(python2-jupyter_rise) Provides: weakremover(python2-jupyter_sphinx_theme) +Provides: weakremover(python2-jupyter_themer) +Provides: weakremover(python2-jupyter_watermark) +Provides: weakremover(python2-jupyter_wysiwyg) Provides: weakremover(python2-libieee1284) Provides: weakremover(python2-lxml-doc) Provides: weakremover(python2-matplotlib-qt4) @@ -15768,6 +15819,9 @@ Provides: weakremover(python3-discover) Provides: weakremover(python3-django-celery) Provides: weakremover(python3-docker-py-test) +Provides: weakremover(python3-efl) +Provides: weakremover(python3-efl-doc) +Provides: weakremover(python3-efl-examples) Provides: weakremover(python3-execnet-doc) Provides: weakremover(python3-flup-doc) Provides: weakremover(python3-futures) @@ -15779,9 +15833,38 @@ Provides: weakremover(python3-ibus) Provides: weakremover(python3-ipdb) Provides: weakremover(python3-jupyter-doc) +Provides: weakremover(python3-jupyter_Video_Widget) +Provides: weakremover(python3-jupyter_altair-widgets) +Provides: weakremover(python3-jupyter_bqplot) +Provides: weakremover(python3-jupyter_calysto) +Provides: weakremover(python3-jupyter_cms) +Provides: weakremover(python3-jupyter_contrib_nbextensions) +Provides: weakremover(python3-jupyter_dashboards) +Provides: weakremover(python3-jupyter_full_width) +Provides: weakremover(python3-jupyter_hide_code) +Provides: weakremover(python3-jupyter_imatlab_kernel) +Provides: weakremover(python3-jupyter_ipdb) +Provides: weakremover(python3-jupyter_ipydatawidgets) +Provides: weakremover(python3-jupyter_ipydatawidgets_jupyterlab) +Provides: weakremover(python3-jupyter_ipympl) +Provides: weakremover(python3-jupyter_ipympl_jupyterlab) +Provides: weakremover(python3-jupyter_ipyparallel) Provides: weakremover(python3-jupyter_ipython-doc) Provides: weakremover(python3-jupyter_ipywidgets-doc) +Provides: weakremover(python3-jupyter_jgraph) +Provides: weakremover(python3-jupyter_jupyterlab_discovery) +Provides: weakremover(python3-jupyter_jupyterlab_github) +Provides: weakremover(python3-jupyter_jupyterlab_latex) +Provides: weakremover(python3-jupyter_jupyterlab_templates) +Provides: weakremover(python3-jupyter_jupyterlab_widgets) +Provides: weakremover(python3-jupyter_matlab_kernel) +Provides: weakremover(python3-jupyter_nbsphinx_link) +Provides: weakremover(python3-jupyter_qgrid) +Provides: weakremover(python3-jupyter_rise) Provides: weakremover(python3-jupyter_sphinx_theme) +Provides: weakremover(python3-jupyter_themer) +Provides: weakremover(python3-jupyter_watermark) +Provides: weakremover(python3-jupyter_wysiwyg) Provides: weakremover(python3-kde4-devel) Provides: weakremover(python3-kde4-doc) Provides: weakremover(python3-kde4-khtml) @@ -15882,6 +15965,9 @@ Provides: weakremover(rekonq-doc) Provides: weakremover(rekonq-lang) Provides: weakremover(resolve-trivial-conflicts) +Provides: weakremover(rfcat) +Provides: weakremover(rfcat-udev) +Provides: weakremover(rstudio) Provides: weakremover(ruby-camgm) Provides: weakremover(ruby-qt4) Provides: weakremover(ruby-qt4-devel) @@ -20323,6 +20409,7 @@ Provides: weakremover(yast2-ca-management) Provides: weakremover(yast2-crowbar) Provides: weakremover(yast2-dbus-server) +Provides: weakremover(yast2-fonts) Provides: weakremover(yast2-inetd) Provides: weakremover(yast2-inetd-doc) Provides: weakremover(yast2-product-creator) @@ -20688,6 +20775,7 @@ Provides: weakremover(libechonest2_3-32bit) Provides: weakremover(libedata-cal-1_2-28-32bit) Provides: weakremover(libedataserver-1_2-22-32bit) +Provides: weakremover(libedataserver-1_2-23-32bit) Provides: weakremover(libedataserverui-1_2-1-32bit) Provides: weakremover(libesd0-32bit) Provides: weakremover(libexiv2-14-32bit) @@ -20961,12 +21049,9 @@ Provides: weakremover(plasma-framework-private-32bit) Provides: weakremover(python-96BoardsGPIO) Provides: weakremover(python-ceph-compat) -Provides: weakremover(python-cephfs) Provides: weakremover(python-gnome-32bit) Provides: weakremover(python-ldb-32bit) Provides: weakremover(python-lldb) -Provides: weakremover(python-rados) -Provides: weakremover(python-rbd) Provides: weakremover(python-rgw) Provides: weakremover(python-talloc-32bit) Provides: weakremover(python-tdb-32bit)

1 0

commit 000package-groups for openSUSE:Factory
by root 05 May '19

05 May '19

Hello community, here is the log from the commit of package 000package-groups for openSUSE:Factory checked in at 2019-05-05 10:53:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000package-groups (Old) and /work/SRC/openSUSE:Factory/.000package-groups.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000package-groups" Sun May 5 10:53:26 2019 rev:70 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-MicroOS-release.spec.in ++++++ --- /var/tmp/diff_new_pack.vVrCjV/_old 2019-05-05 10:53:29.044708994 +0200 +++ /var/tmp/diff_new_pack.vVrCjV/_new 2019-05-05 10:53:29.044708994 +0200 @@ -90,14 +90,14 @@ %post # Update from openSUSE-Tumbleweed-Kubic to openSUSE-MicroOS # Fix the baseproduct symlink and make sure, it exists -if [ -L /etc/products.d/baseproduct ] ; then - PRODLINK=$(basename $(readlink -f /etc/products.d/baseproduct)) +if [ -L %{_sysconfdir}/products.d/baseproduct ] ; then + PRODLINK=$(basename $(readlink -f %{_sysconfdir}/products.d/baseproduct)) if [ "$PRODLINK" == "openSUSE-Tumbleweed-Kubic.prod" ]; then - rm -f /etc/products.d/baseproduct + rm -f %{_sysconfdir}/products.d/baseproduct fi fi -if [ ! -e /etc/products.d/baseproduct ]; then - ln -sf openSUSE-MicroOS.prod /etc/products.d/baseproduct +if [ ! -e %{_sysconfdir}/products.d/baseproduct ]; then + ln -sf openSUSE-MicroOS.prod %{_sysconfdir}/products.d/baseproduct fi %files ++++++ openSUSE-MicroOS.product.in ++++++ --- /var/tmp/diff_new_pack.vVrCjV/_old 2019-05-05 10:53:29.056709027 +0200 +++ /var/tmp/diff_new_pack.vVrCjV/_new 2019-05-05 10:53:29.056709027 +0200 @@ -102,21 +102,22 @@ <use group="opensuse_kubic" create_pattern="false"/> <use group="opensuse_kubic.x86_64" create_pattern="false"/> </media> - </mediasets> - - <media type="image" + + <media type="image" flavor="appliance" mediastyle="suse-tumbleweed" name="openSUSE-MicroOS-appliance" >  - </media> + </media> - <media type="image" + <media type="image" flavor="appliance-kubic" mediastyle="suse-tumbleweed" name="openSUSE-Kubic-appliance" >  - </media> + </media> + </mediasets> + <xi:include href="opensuse_microos.group"/> <xi:include href="opensuse_kubic.group"/>

1 0

commit 000update-repos for openSUSE:Factory
by root 04 May '19

04 May '19

Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2019-05-04 21:02:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Sat May 4 21:02:06 2019 rev:214 rq: version:unknown Sat May 4 21:01:58 2019 rev:213 rq: version:unknown Sat May 4 21:01:51 2019 rev:212 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- 15.0:update_1556960322.packages.xz 42.3:update_1556961172.packages.xz factory:non-oss_1162.2.packages.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit 000update-repos for openSUSE:Factory
by root 04 May '19

04 May '19

Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2019-05-04 21:01:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Sat May 4 21:01:49 2019 rev:211 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- factory_20190502.packages.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit livecd-openSUSE for openSUSE:Factory
by root 04 May '19

04 May '19

Hello community, here is the log from the commit of package livecd-openSUSE for openSUSE:Factory checked in at 2019-05-04 13:16:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old) and /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "livecd-openSUSE" Sat May 4 13:16:14 2019 rev:49 rq: version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes 2019-04-27 21:56:58.286121312 +0200 +++ /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.5148/livecd-openSUSE.changes 2019-05-04 13:16:16.312814243 +0200 @@ -1,0 +2,5 @@ +Sat May 4 11:15:35 UTC 2019 - Dominique Leuenberger <dleuenberger(a)suse.com> + +- Drop no longer existing gnome-shell-browser-plugin from GNOME Live. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ livecd-leap-gnome.kiwi ++++++ --- /var/tmp/diff_new_pack.mQgRN3/_old 2019-05-04 13:16:17.312823805 +0200 +++ /var/tmp/diff_new_pack.mQgRN3/_new 2019-05-04 13:16:17.312823805 +0200 @@ -509,7 +509,6 @@ <namedCollection name="yast2_basis"/> <namedCollection name="yast2_install_wf"/> <package name="gnome-mines"/> - <package name="gnome-shell-browser-plugin"/> <package name="gnome-sudoku"/> <package name="quadrapassel"/> <package name="cifs-utils"/> livecd-leap-x11.kiwi: same change livecd-openSUSE.kiwi: same change ++++++ livecd-tumbleweed-gnome.kiwi ++++++ --- /var/tmp/diff_new_pack.mQgRN3/_old 2019-05-04 13:16:17.348824149 +0200 +++ /var/tmp/diff_new_pack.mQgRN3/_new 2019-05-04 13:16:17.352824187 +0200 @@ -509,7 +509,6 @@ <namedCollection name="yast2_basis"/> <namedCollection name="yast2_install_wf"/> <package name="gnome-mines"/> - <package name="gnome-shell-browser-plugin"/> <package name="gnome-sudoku"/> <package name="quadrapassel"/> <package name="cifs-utils"/> livecd-tumbleweed-x11.kiwi: same change livecd-tumbleweed-xfce.kiwi: same change ++++++ list-gnome.sh ++++++ --- /var/tmp/diff_new_pack.mQgRN3/_old 2019-05-04 13:16:17.456825181 +0200 +++ /var/tmp/diff_new_pack.mQgRN3/_new 2019-05-04 13:16:17.456825181 +0200 @@ -87,7 +87,6 @@ # Previously recommended by rest_cd_gnome install gnome-mines -install gnome-shell-browser-plugin install gnome-sudoku install quadrapassel install cifs-utils

1 0

commit 000product for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-05-03 22:48:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Fri May 3 22:48:17 2019 rev:1165 rq: version:unknown Fri May 3 22:48:15 2019 rev:1164 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi: same change openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change openSUSE-cd-mini-i586.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change openSUSE-dvd5-dvd-i586.kiwi: same change openSUSE-dvd5-dvd-x86_64.kiwi: same change openSUSE-ftp-ftp-i586_x86_64.kiwi: same change stub.kiwi: same change ++++++ openSUSE-MicroOS.product ++++++ --- /var/tmp/diff_new_pack.US5TLD/_old 2019-05-03 22:48:20.936034007 +0200 +++ /var/tmp/diff_new_pack.US5TLD/_new 2019-05-03 22:48:20.936034007 +0200 @@ -6,7 +6,7 @@ <name>openSUSE-MicroOS</name> <releasepkgname>openSUSE-MicroOS-release</releasepkgname> <endoflife/> - <version>20190502</version> + <version>20190503</version>  <release>0</release> <productline>openSUSE-MicroOS</productline> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.US5TLD/_old 2019-05-03 22:48:20.948034034 +0200 +++ /var/tmp/diff_new_pack.US5TLD/_new 2019-05-03 22:48:20.948034034 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20190502</version> + <version>20190503</version> <release>0</release> <productline>openSUSE</productline>

1 0

commit 000product for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-05-03 22:48:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Fri May 3 22:48:12 2019 rev:1163 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi: same change openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change openSUSE-cd-mini-i586.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change openSUSE-dvd5-dvd-i586.kiwi: same change openSUSE-dvd5-dvd-x86_64.kiwi: same change openSUSE-ftp-ftp-i586_x86_64.kiwi: same change stub.kiwi: same change ++++++ openSUSE-Addon-NonOss.product ++++++ --- /var/tmp/diff_new_pack.jjvuYO/_old 2019-05-03 22:48:19.048029672 +0200 +++ /var/tmp/diff_new_pack.jjvuYO/_new 2019-05-03 22:48:19.064029709 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20190502</version> + <version>20190503</version> <release>0</release> <summary>openSUSE NonOSS Addon</summary> <shortsummary>non oss addon</shortsummary>

1 0

commit nmap for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package nmap for openSUSE:Factory checked in at 2019-05-03 22:48:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nmap (Old) and /work/SRC/openSUSE:Factory/.nmap.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nmap" Fri May 3 22:48:09 2019 rev:60 rq:700476 version:7.70 Changes: -------- --- /work/SRC/openSUSE:Factory/nmap/nmap.changes 2018-05-29 10:41:59.334982875 +0200 +++ /work/SRC/openSUSE:Factory/.nmap.new.5148/nmap.changes 2019-05-03 22:48:10.820010783 +0200 @@ -1,0 +2,9 @@ +Fri May 3 14:53:44 UTC 2019 - Kristýna Streitová <kstreitova(a)suse.com> + +- add nmap-7.70-CVE-2018-15173_pcre_limits.patch to reduce LibPCRE + resource limits so that version detection can't use as much of + the stack. Previously Nmap could crash when run on low-memory + systems against target services which are intentionally or + accidentally difficult to match [bsc#1104139] [CVE-2018-15173]. + +------------------------------------------------------------------- New: ---- nmap-7.70-CVE-2018-15173_pcre_limits.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nmap.spec ++++++ --- /var/tmp/diff_new_pack.5BnMC5/_old 2019-05-03 22:48:11.896013253 +0200 +++ /var/tmp/diff_new_pack.5BnMC5/_new 2019-05-03 22:48:11.896013253 +0200 @@ -1,7 +1,7 @@ # # spec file for package nmap # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,7 @@ Patch2: nmap-4.75-nostrip.patch Patch3: su-to-zenmap.patch Patch4: nmap-ncat-skip-network-tests.patch +Patch5: nmap-7.70-CVE-2018-15173_pcre_limits.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ @@ -121,6 +122,7 @@ %patch3 %endif %patch4 -p1 +%patch5 -p1 # use system provided libraries rm -rf libpcap libpcre macosx mswin32 ++++++ nmap-7.70-CVE-2018-15173_pcre_limits.patch ++++++ >From 6d8bb6df229f7acf768bcebfe14cdc8c3dbbe92b Mon Sep 17 00:00:00 2001 From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419> Date: Wed, 8 Aug 2018 16:36:21 +0000 Subject: [PATCH] Set limits on PCRE matches to avoid issues like #1147 CVE-2018-15173 --- service_scan.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/service_scan.cc b/service_scan.cc index 1fc8056884..79e92b8f21 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -489,6 +489,15 @@ void ServiceProbeMatch::InitMatch(const char *matchtext, int lineno) { if (pcre_errptr != NULL) fatal("%s: failed to pcre_study regexp on line %d of nmap-service-probes: %s\n", __func__, lineno, pcre_errptr); + // Set some limits to avoid evil match cases. + // These are flexible; if they cause problems, increase them. +#ifdef PCRE_ERROR_MATCHLIMIT + regex_extra->match_limit = 100000; // 100K +#endif +#ifdef PCRE_ERROR_RECURSIONLIMIT + regex_extra->match_limit_recursion = 10000; // 10K +#endif + free(modestr); free(flags); @@ -568,6 +577,12 @@ const struct MatchDetails *ServiceProbeMatch::testMatch(const u8 *buf, int bufle if (o.debugging || o.verbose > 1) error("Warning: Hit PCRE_ERROR_MATCHLIMIT when probing for service %s with the regex '%s'", servicename, matchstr); } else +#endif // PCRE_ERROR_MATCHLIMIT +#ifdef PCRE_ERROR_RECURSIONLIMIT + if (rc == PCRE_ERROR_RECURSIONLIMIT) { + if (o.debugging || o.verbose > 1) + error("Warning: Hit PCRE_ERROR_RECURSIONLIMIT when probing for service %s with the regex '%s'", servicename, matchstr); + } else #endif // PCRE_ERROR_MATCHLIMIT if (rc != PCRE_ERROR_NOMATCH) { fatal("Unexpected PCRE error (%d) when probing for service %s with the regex '%s'", rc, servicename, matchstr);

1 0

commit shared-color-targets for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package shared-color-targets for openSUSE:Factory checked in at 2019-05-03 22:48:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shared-color-targets (Old) and /work/SRC/openSUSE:Factory/.shared-color-targets.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shared-color-targets" Fri May 3 22:48:04 2019 rev:17 rq:700430 version:0.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/shared-color-targets/shared-color-targets.changes 2016-01-05 21:56:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shared-color-targets.new.5148/shared-color-targets.changes 2019-05-03 22:48:07.760003758 +0200 @@ -1,0 +2,6 @@ +Fri May 3 15:54:05 CEST 2019 - vuntz(a)opensuse.org + +- Update to version 0.1.7: + + Add the latest it8 reference files + +------------------------------------------------------------------- Old: ---- shared-color-targets-0.1.6.tar.xz New: ---- shared-color-targets-0.1.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shared-color-targets.spec ++++++ --- /var/tmp/diff_new_pack.6danQ4/_old 2019-05-03 22:48:08.364005145 +0200 +++ /var/tmp/diff_new_pack.6danQ4/_new 2019-05-03 22:48:08.384005191 +0200 @@ -1,7 +1,7 @@ # # spec file for package shared-color-targets # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Luis Medinas, Portugal # # All modifications and additions to the file contributed by third parties @@ -13,15 +13,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: shared-color-targets -Version: 0.1.6 +Version: 0.1.7 Release: 0 Summary: Color targets for creating color profiles -License: GPL-2.0+ and SUSE-Public-Domain and CC-BY-SA-3.0 +License: GPL-2.0-or-later AND SUSE-Public-Domain AND CC-BY-SA-3.0 Group: System/GUI/Other Url: http://github.com/hughsie/shared-color-targets Source: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz ++++++ shared-color-targets-0.1.6.tar.xz -> shared-color-targets-0.1.7.tar.xz ++++++ ++++ 3943 lines of diff (skipped)

1 0

commit netdata for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package netdata for openSUSE:Factory checked in at 2019-05-03 22:48:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netdata (Old) and /work/SRC/openSUSE:Factory/.netdata.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netdata" Fri May 3 22:48:01 2019 rev:9 rq:700414 version:1.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/netdata/netdata.changes 2019-03-18 10:41:31.107261293 +0100 +++ /work/SRC/openSUSE:Factory/.netdata.new.5148/netdata.changes 2019-05-03 22:48:03.075993005 +0200 @@ -1,0 +2,82 @@ +Fri May 3 15:08:20 UTC 2019 - Martin Herkt <9+suse(a)cirno.systems> + +- Update to v1.14.0 +The release introduces major additions to Kubernetes monitoring, +with tens of new charts for Kubelet, kube-proxy and coredns +metrics, as well as significant improvements to the netdata +helm chart. + +Two new collectors were added, to monitor Docker hub and Docker +engine metrics. + +Finally, v1.14 adds support for version 2 cgroups, OpenLDAP +over TLS, NVIDIA SMI free and per process memory and configurable +syslog facilities. + + Bug Fixes: + * Fixed problem autodetecting failed jobs in python.d plugin. + It now properly restarts jobs that are being rechecked, + as soon as they are able to run. + * CouchdDB monitoring would stop sometimes with an exception. + Fixed the unhandled exception causing the issue. + * The netdata api deliberately returned http error 400 when + netdata ran in memory mode none. Modified the behavior to + return responses, regardless of the memory mode + * The python.d plugin sometimes does not receive SIGTERM when + netdata exits, resulting in zombie processes. Added a heartbeat + so that the process can exit on SIGPIPE. + * The new SMS Server Tools notifications did not handle errors + well, resulting in cryptic error messages. + Improved error handling. + * Fix segmentation fault in streaming, when two dimensions had + similar names. + * Kubernetes Helm Chart: Fixed incorrect use of namespaces in + ServiceAccount and ClusterRoleBinding RBAC fixes. + * Elastic search: The option to enable HTTPS was not included in + the config file, giving the erroneous impression that HTTPS was + not supported. The option was added. + * RocketChat notifications were not being sent properly. + Added default recipients for roles in the health alarm + notification configuration. + + Improvements: + * go.d.plugin v0.4.0 : Docker Hub and k8s coredns collectors, + springboot2 URI filters support. + * go.d.plugin v0.3.1 : Add default job to run k8s_kubelet.conf, + k8s_kubeproxy, activemq modules + * go.d.plugin v0.3.0 : Docker engine, kubelet and kub-proxy + collectors. x509check module reading certs from file support + * Added unified cgroup support that includes v2 cgroups + * Disk stats: Added preferred disk id pattern, so that users can + see the id they prefer, when multiple ids appear for the same + device + * NVIDIA SMI: Added memory free and per process memory usage + charts to the collector + * OpenLDAP: Added TLS support, to allow monitoring of LDAPS. + * PHP-FPM: Add health check to raise alarms when the phpfm server + is unreachable + * PostgreSQL: Our configuration options to connect to a DB did + not support all possible option. Added option to connect to a + PostreSQL instance by defining a connection string (URI). + * python.d.plugin: There was no way to delete obsolete dimensions + in charts created by the python.d plugin. The plugin can now + delete dimension at runtime. + * netdata supports sending its logs to Syslog, but the facility + was hard-coded. We now support configurable Syslog facilities + in netdata.conf. + * Kubernetes Helm Chart improvements: + + Added serviceName in statefulset spec to align with the k8s + documentation + + Added preStart command to persist slave machine GUIDs, + so that pod deletion/addition during upgrades doesn't lose + the slave history. + + Disabled non-essential master netdata collector plugins to + avoid duplicate data + + Added preStop command to wait for netdata to exit gracefully + before removing the container + + Extended configuration file support to provide more control + from the helm command line + + Added option to disable Role-based access control + + Added liveness and readiness probes. + +------------------------------------------------------------------- Old: ---- netdata-v1.13.0.tar.gz New: ---- netdata-v1.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netdata.spec ++++++ --- /var/tmp/diff_new_pack.kzDsuu/_old 2019-05-03 22:48:03.627994272 +0200 +++ /var/tmp/diff_new_pack.kzDsuu/_new 2019-05-03 22:48:03.627994272 +0200 @@ -24,7 +24,7 @@ %bcond_with systemd %endif Name: netdata -Version: 1.13.0 +Version: 1.14.0 Release: 0 Summary: A system for distributed real-time performance and health monitoring # netdata is GPL-3.0+, other licenses refer to included third-party software (see REDISTRIBUTED.md) ++++++ netdata-v1.13.0.tar.gz -> netdata-v1.14.0.tar.gz ++++++ ++++ 13744 lines of diff (skipped)

1 0

commit osc-plugin-collab for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package osc-plugin-collab for openSUSE:Factory checked in at 2019-05-03 22:47:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc-plugin-collab (Old) and /work/SRC/openSUSE:Factory/.osc-plugin-collab.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc-plugin-collab" Fri May 3 22:47:58 2019 rev:12 rq:700399 version:0.101 Changes: -------- --- /work/SRC/openSUSE:Factory/osc-plugin-collab/osc-plugin-collab.changes 2019-03-22 15:09:22.349390442 +0100 +++ /work/SRC/openSUSE:Factory/.osc-plugin-collab.new.5148/osc-plugin-collab.changes 2019-05-03 22:47:59.907985732 +0200 @@ -1,0 +2,7 @@ +Fri May 3 14:26:17 UTC 2019 - vuntz(a)opensuse.org + +- Update to version 0.101: + + Port to python3 + + Use https on the server + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc-plugin-collab.spec ++++++ --- /var/tmp/diff_new_pack.SxSric/_old 2019-05-03 22:48:00.295986623 +0200 +++ /var/tmp/diff_new_pack.SxSric/_new 2019-05-03 22:48:00.299986632 +0200 @@ -18,7 +18,7 @@ Name: osc-plugin-collab -Version: 0.100 +Version: 0.101 Release: 0 Summary: Plugin to make collaboration easier with osc License: BSD-3-Clause ++++++ osc-collab.py ++++++ ++++ 1559 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/osc-plugin-collab/osc-collab.py ++++ and /work/SRC/openSUSE:Factory/.osc-plugin-collab.new.5148/osc-collab.py

1 0

commit python-coloredlogs for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package python-coloredlogs for openSUSE:Factory checked in at 2019-05-03 22:47:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-coloredlogs (Old) and /work/SRC/openSUSE:Factory/.python-coloredlogs.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-coloredlogs" Fri May 3 22:47:54 2019 rev:5 rq:700395 version:10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-coloredlogs/python-coloredlogs.changes 2019-02-24 17:14:47.680457026 +0100 +++ /work/SRC/openSUSE:Factory/.python-coloredlogs.new.5148/python-coloredlogs.changes 2019-05-03 22:47:57.331979818 +0200 @@ -1,0 +2,6 @@ +Fri May 3 14:04:05 UTC 2019 - Matej Cepl <mcepl(a)suse.com> + +- Add test_cli_conversion_test.patch, because we don't have versionless + coloredlogs in time of %check. + +------------------------------------------------------------------- New: ---- test_cli_conversion_test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-coloredlogs.spec ++++++ --- /var/tmp/diff_new_pack.1gDf0e/_old 2019-05-03 22:47:57.875981067 +0200 +++ /var/tmp/diff_new_pack.1gDf0e/_new 2019-05-03 22:47:57.879981076 +0200 @@ -26,6 +26,9 @@ Group: Development/Languages/Python URL: https://github.com/xolox/python-coloredlogs Source: https://files.pythonhosted.org/packages/source/c/coloredlogs/coloredlogs-%{… +# PATCH-FIX-OPENSUSE test_cli_conversion_test.patch mcepl(a)suse.com +# With using alternatives, we don't have versionless command in time of %check +Patch0: test_cli_conversion_test.patch BuildRequires: %{python_module capturer >= 2.4} BuildRequires: %{python_module humanfriendly >= 3.2} BuildRequires: %{python_module mock >= 1.0.1} @@ -54,6 +57,7 @@ %prep %setup -q -n coloredlogs-%{version} +%autopatch -p1 %build %python_build @@ -70,10 +74,10 @@ %python_uninstall_alternative coloredlogs %check -# test_cli_conversion - requires coloredlogs binary available, we don't have it at this point # test_auto_install - requires the install to the system to be actually complete # test_plain_text_output_format - random hickupy test -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} coloredlogs/tests.py -v -k 'not (test_cli_conversion or test_auto_install or test_plain_text_output_format)' +export PATH=%{buildroot}%{_bindir}:$PATH +%pytest coloredlogs/tests.py -k 'not (test_auto_install or test_plain_text_output_format)' %files %{python_files} %doc README.rst CHANGELOG.rst ++++++ test_cli_conversion_test.patch ++++++ --- a/coloredlogs/tests.py +++ b/coloredlogs/tests.py @@ -82,6 +82,7 @@ PATTERN_INCLUDING_MILLISECONDS = re.comp \s (?P<message> .* ) ''', re.VERBOSE) +pyver = '.'.join(str(x) for x in sys.version_info[:2]) def setUpModule(): """Speed up the tests by disabling the demo's artificial delay.""" @@ -505,7 +506,8 @@ class ColoredLogsTestCase(TestCase): def test_cli_conversion(self): """Test the command line HTML conversion.""" - output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True) + output = main('coloredlogs-{}'.format(pyver), '--convert', + 'coloredlogs-{}'.format(pyver), '--demo', capture=True) # Make sure the output is encoded as HTML. assert '<span' in output @@ -588,3 +590,4 @@ def cleanup_handlers(): handler, logger = find_handler(logging.getLogger(), match_func) if handler and logger: logger.removeHandler(handler) +

1 0

commit clustduct for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package clustduct for openSUSE:Factory checked in at 2019-05-03 22:47:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clustduct (Old) and /work/SRC/openSUSE:Factory/.clustduct.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clustduct" Fri May 3 22:47:50 2019 rev:5 rq:700386 version:0.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/clustduct/clustduct.changes 2019-05-02 19:22:12.121892502 +0200 +++ /work/SRC/openSUSE:Factory/.clustduct.new.5148/clustduct.changes 2019-05-03 22:47:51.707966907 +0200 @@ -1,0 +2,5 @@ +Fri May 3 12:54:24 UTC 2019 - Christian Goll <cgoll(a)suse.com> + +- updated to v0.0.2 to use the right product (bsc#1131150) + +------------------------------------------------------------------- Old: ---- clustduct-0.0.1_alpha8.tar.gz New: ---- clustduct-0.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clustduct.spec ++++++ --- /var/tmp/diff_new_pack.00oBlR/_old 2019-05-03 22:47:52.067967733 +0200 +++ /var/tmp/diff_new_pack.00oBlR/_new 2019-05-03 22:47:52.071967743 +0200 @@ -22,7 +22,7 @@ %bcond_with pdfdoc Name: clustduct -Version: 0.0.1_alpha8 +Version: 0.0.2 Release: 0 Summary: Framework which connects a genders database to dnsmasq License: BSD-3-Clause ++++++ clustduct-0.0.1_alpha8.tar.gz -> clustduct-0.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/Makefile.am new/clustduct-0.0.2/Makefile.am --- old/clustduct-0.0.1_alpha8/Makefile.am 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/Makefile.am 2019-05-03 14:36:40.000000000 +0200 @@ -41,24 +41,24 @@ kiwiopensusesystemdir = $(kiwiopensuserootdir)/usr/lib/systemd/system/ kiwiopensusesystem_DATA = kiwi-descriptions/openSUSE/x86_64/suse-leap-15.0-JeOS/root/usr/lib/systemd/system/grub_config.service -kiwislesbasedir = $(docdir)/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS -kiwislesbase_DATA = kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/Dicefile \ - kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.sh \ - kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.xml - -kiwislesrootdir = $(kiwislesbasedir)/root -kiwislesroot_DATA = kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/.kiwi_grub_config.trigger - -kiwislesetcdir = $(kiwislesrootdir)/etc -kiwislesetc_DATA = kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/motd - -kiwislesnetdir = $(kiwislesetcdir)/sysconfig/network -kiwislesnet_DATA = kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 \ - kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/dhcp - -kiwislesudevdir = $(kiwislesetcdir)/udev/rules.d/ -kiwislesudev_DATA = kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules - -kiwislessystemdir = $(kiwislesrootdir)/usr/lib/systemd/system/ -kiwislessystem_DATA = kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service \ - kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service +kiwislebasedir = $(docdir)/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS +kiwislebase_DATA = kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/Dicefile \ + kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.sh \ + kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.xml + +kiwislerootdir = $(kiwislebasedir)/root +kiwisleroot_DATA = kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/.kiwi_grub_config.trigger + +kiwisleetcdir = $(kiwislerootdir)/etc +kiwisleetc_DATA = kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/motd + +kiwislenetdir = $(kiwisleetcdir)/sysconfig/network +kiwislenet_DATA = kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 \ + kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/dhcp + +kiwisleudevdir = $(kiwisleetcdir)/udev/rules.d/ +kiwisleudev_DATA = kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules + +kiwislesystemdir = $(kiwislerootdir)/usr/lib/systemd/system/ +kiwislesystem_DATA = kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service \ + kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/Usage.md new/clustduct-0.0.2/Usage.md --- old/clustduct-0.0.1_alpha8/Usage.md 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/Usage.md 2019-05-03 14:36:40.000000000 +0200 @@ -58,7 +58,7 @@ ``` systemctl disable apparmor.service ``` - afterwards the machine must be rebooted. +afterwards the machine must be rebooted. WARNING: Disabling the `apparmor` profile introduces security issues which can be ignored as the *cluster network* is assumed to be a protected network. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/doc/genders.example new/clustduct-0.0.2/doc/genders.example --- old/clustduct-0.0.1_alpha8/doc/genders.example 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/doc/genders.example 2019-05-03 14:36:40.000000000 +0200 @@ -15,9 +15,12 @@ # example for kiwi generated install entry # # openSUSE Leap15 example entry -#JeOS15 initrd=/leap15/pxeboot.initrd.xz,append=rd.kiwi.install.pxe\wsrd.kiwi.install.image\eqtftp://192.168.100.254/leap15/LimeJeOS-Leap-15.1.xz,kernel=/leap15/LimeJeOS-Leap-15.1.kernel,nextboot=local,trigger=LimeJeOS-Leap-15.1.xz -# SLES-15-1 example entry -#SLE15 initrd=/sles15.1/pxeboot.initrd.xz,append=rd.kiwi.install.pxe\wsrd.kiwi.install.image\eqtftp://192.168.100.254/sles15.1/LimeJeOS-SLE-15.1.xz,kernel=/sles15.1/LimeJeOS-SLE-15.1.kernel,nextboot=local,trigger=LimeJeOS-SLE-15.1.xz +# +LEAP15 initrd=/leap15/pxeboot.initrd.xz,append=rd.kiwi.install.pxe\wsrd.kiwi.install.image\eqtftp://192.168.100.254/leap15/LimeJeOS-Leap-15.1.xz,kernel=/leap15/LimeJeOS-Leap-15.1.kernel,nextboot=local,trigger=LimeJeOS-Leap-15.1.xz +# +# SLE-HPC-15-1 example entry +# +SLE-HPC-15_1 initrd=/sle-hpc15.1/pxeboot.initrd.xz,append=rd.kiwi.install.pxe\wsrd.kiwi.install.image\eqtftp://192.168.100.254/sle-hpc15.1/LimeJeOS-SLE-HPC-15.1.xz,kernel=/sle-hpc15.1/LimeJeOS-SLE-HPC-15.1.kernel,nextboot=local,trigger=LimeJeOS-SLE-HPC-15.1.xz # # local boot entry # @@ -37,5 +40,12 @@ compute-10 ip=192.168.100.20 # # install the kiwi image on all the nodes +# Uncomment for target system + +# Install Leap 15.0 +# +#compute-[01-10] install=LEAP15 + +# Install SLE-HPC-15-SP1 # -compute-[01-10] install=JeOS15 +#compute-[01-10] install=SLE-HPC-15_1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/Dicefile new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/Dicefile --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/Dicefile 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1,3 @@ +Dice.configure do |config| + config.buildhost = :DOCKER +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.sh new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.sh --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.sh 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1,88 @@ +#!/bin/bash +#================ +# FILE : config.sh +#---------------- +# PROJECT : OpenSuSE KIWI Image System +# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved +# : +# AUTHOR : Marcus Schaefer <ms(a)suse.de> +# : +# BELONGS TO : Operating System images +# : +# DESCRIPTION : configuration script for SUSE based +# : operating systems +# : +# : +# STATUS : BETA +#---------------- +#====================================== +# Functions... +#-------------------------------------- +test -f /.kconfig && . /.kconfig +test -f /.profile && . /.profile + +#====================================== +# Greeting... +#-------------------------------------- +echo "Configure image: [$kiwi_iname]..." + +#====================================== +# Mount system filesystems +#-------------------------------------- +baseMount + +#====================================== +# Setup baseproduct link +#-------------------------------------- +suseSetupProduct + +#====================================== +# Add missing gpg keys to rpm +#-------------------------------------- +suseImportBuildKey + +#====================================== +# Activate services +#-------------------------------------- +suseInsertService sshd +suseInsertService RegisterFirst +if [[ ${kiwi_type} =~ oem|vmx ]];then + suseInsertService grub_config +else + suseRemoveService grub_config +fi + +#====================================== +# Setup default target, multi-user +#-------------------------------------- +baseSetRunlevel 3 + +#========================================== +# remove package docs +#------------------------------------------ +rm -rf /usr/share/doc/packages/* +rm -rf /usr/share/doc/manual/* +rm -rf /opt/kde* + +#====================================== +# only basic version of vim is +# installed; no syntax highlighting +#-------------------------------------- +sed -i -e's/^syntax on/" syntax on/' /etc/vimrc + +#====================================== +# SuSEconfig +#-------------------------------------- +suseConfig + +#====================================== +# Remove yast if not in use +#-------------------------------------- +suseRemoveYaST + +#====================================== +# Umount kernel filesystems +#-------------------------------------- +baseCleanMount + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.xml new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.xml --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/config.xml 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="6.8" name="LimeJeOS-SLE-HPC-15.1"> + <description type="system"> + <author>Christian Goll</author> + <contact>cgoll(a)suse.de</contact> + <specification> + SUSE Linux Enterprise HPC 15 JeOS, small text based image + </specification> + </description> + <preferences> + <version>1.15.0</version> + <packagemanager>zypper</packagemanager> + <locale>en_US</locale> + <keytable>us</keytable> + <timezone>Europe/Berlin</timezone> + <rpm-excludedocs>true</rpm-excludedocs> + <rpm-check-signatures>false</rpm-check-signatures> + <bootsplash-theme>SLE</bootsplash-theme> + <bootloader-theme>SLE</bootloader-theme> + </preferences> + <preferences> + <type image="vmx" filesystem="ext4" bootloader="grub2" kernelcmdline="splash" firmware="efi" format="qcow2"> + <size> + 32768 + </size> + </type> + <type image="oem" filesystem="ext4" initrd_system="dracut" installpxe="true" bootloader="grub2" kernelcmdline="splash" firmware="efi"> + <oemconfig> + <oem-systemsize>2048</oem-systemsize> + <oem-swap>true</oem-swap> + <oem-device-filter>/dev/ram</oem-device-filter> + <oem-multipath-scan>false</oem-multipath-scan> + <oem-unattended>true</oem-unattended> + </oemconfig> + <machine memory="512" guestOS="suse" HWversion="4"> + <vmdisk id="0" controller="ide"/> + <vmnic driver="e1000" interface="0" mode="bridged"/> + </machine> + </type> + </preferences> + <users> +  + <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/> + </users> + <repository type="rpm-md" alias="kiwi" priority="1"> + <source path="obs://Virtualization:Appliances:Builder/SLE_15"/> + </repository> + <repository type="yast2" alias="SLE_installer"> + <source path="iso:// /root/SLE-15-Installer-DVD-x86_64-GA-Media1.iso"/> + </repository> + <repository type="yast2" alias="SLE_packages"> + <source path="iso:// /root/SLE-15-Packages-x86_64-GA-Media1.iso"/> + </repository> + + <packages type="image"> + <package name="checkmedia"/> + <package name="patterns-base-minimal_base"/> + <package name="plymouth-branding-SLE"/> + <package name="plymouth-dracut"/> + <package name="plymouth"/> + <package name="grub2-branding-SLE-15"/> + <package name="iputils"/> + <package name="vim"/> + <package name="grub2"/> + <package name="grub2-x86_64-efi" arch="x86_64"/> + <package name="grub2-i386-pc"/> + <package name="syslinux"/> + <package name="fontconfig"/> + <package name="fonts-config"/> + <package name="tar"/> + <package name="openssh"/> + <package name="iproute2"/> + <package name="less"/> + <package name="lvm2"/> + <package name="psmisc"/> + <package name="parted"/> + <package name="bash-completion"/> + <package name="dhcp-client"/> + <package name="which"/> + <package name="udev"/> + <package name="salt-minion"/> + <package name="shim"/> + <package name="systemd"/> + <package name="systemd-sysvinit"/> + <package name="dracut"/> + <package name="kernel-default"/> + <package name="timezone"/> + <package name="SLE_HPC-release"/> + <package name="SUSEConnect"/> + <package name="suse-build-key"/> + <package name="sle-module-basesystem-release"/> + </packages> + <packages type="oem"> + <package name="dracut-kiwi-oem-repart"/> + <package name="dracut-kiwi-oem-dump"/> + </packages> + <packages type="bootstrap"> + <package name="udev"/> + <package name="filesystem"/> + <package name="glibc-locale"/> + <package name="cracklib-dict-full"/> + <package name="ca-certificates"/> + <package name="SLE_HPC-release"/> + <package name="sle-module-basesystem-release"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/motd new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/motd --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/motd 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1,7 @@ +This is the Leap 15.0 JeOS SuSE Linux System. +To upgrade your system call: + + zypper refresh + zypper up + +Have a lot of fun... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/dhcp new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/dhcp --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/dhcp 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/dhcp 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1,381 @@ +## Type: list(enabled,disabled,default,) +## Default: "" +# +# Default is to use the FQDN option, when the DHCLIENT_HOSTNAME_OPTION +# variable is set to a full hostname, that is, when it contains a dot. +# When DHCLIENT_HOSTNAME_OPTION is set to AUTO, short hostname from +# /etc/hostname is send via hostname option 12 (same as SLES-11). +# +DHCLIENT_FQDN_ENABLED="" + +## Type: list(both,ptr,none,) +## Default: "" +# +# Request to update A and PTR or only the PTR DNS records using the +# hostname specified in DHCLIENT_HOSTNAME_OPTION variable. +# Default is to update 'both' when hostname is set or 'none' when +# the hostname is empty and DHCLIENT_FQDN_ENABLED is set to enabled. +# +DHCLIENT_FQDN_UPDATE="" + +## Type: yesno +## Default: yes +# +# Qualify relative sub-domains/hostname in the DHCLIENT_HOSTNAME_OPTION +# variable adding a final dot ('foo.bar' -> 'foo.bar.'). +# When disabled, the DHCP server may append it's update domain to the +# hostname (e.g. 'foo.bar' -> 'foo.bar.example.net'). +# +DHCLIENT_FQDN_QUALIFY="yes" + +## Type: yesno +## Default: yes +# +# The FQDN option is encoding hostnames using canonical DNS wire format +# by default. This flag permits to enable use of the deprecated ascii +# format limited to a single label (host hostname) for compatibility +# purposes with draft implementation, which may be unsupported and cause +# that a DHCP server ignores the fqdn option request completely. +# +DHCLIENT_FQDN_ENCODE="yes" + +## Type: list(,default,none,all,dns,ntp,nis,tz,boot,smb,nds,slp,sip,log) +## Default: "" +# +# This variable permits to specify a space separated list of build-in +# facility names supported by the dhcp4 client modifying the default +# options used in requests and to update system settings (via netconfig). +# +# When empty, default settings configured in wicked-config(5) or built-in +# defaults are used. The special "default", "all", and "none" sets enable +# to request none, the built-in default set or all supported options, +# respectively. A "no-" or "-" in the front of a facility name permit to +# remove/disable it from the currently applied set, e.g. "default,-nis" +# disables request for nis options. +# More specific variables as DHCLIENT_SET_DEFAULT_ROUTE,_SET_HOSTNAME or +# the MTU option have higher precedence. +# +DHCLIENT_UPDATE="" + +## Type: list(enabled,disabled,default,) +## Default: "" +# +# Default is to use the FQDN option, when the DHCLIENT6_HOSTNAME_OPTION +# variable provides a hostname. +# When DHCLIENT6_HOSTNAME_OPTION is set to AUTO, short hostname from the +# /etc/hostname file is send (same to SLES-11). +# +DHCLIENT6_FQDN_ENABLED="" + +## Type: list(both,ptr,none,) +## Default: "" +# +# Request to update AAAA and PTR or only the PTR DNS records using the +# hostname specified in DHCLIENT6_HOSTNAME_OPTION variable. +# Default is to update \fIboth\fR when hostname is given or \fInone\fR +# when hostname is empty and DHCLIENT6_FQDN_ENABLED is set to enabled. +# +DHCLIENT6_FQDN_UPDATE="" + +## Type: yesno +## Default: yes +# +# Qualify relative sub-domains/hostname in the DHCLIENT6_HOSTNAME_OPTION +# variable adding a final dot ('foo.bar' -> 'foo.bar.'). +# When disabled, the DHCP server may append it's update domain to the +# hostname (e.g. 'foo.bar' -> 'foo.bar.example.net'). +# +DHCLIENT6_FQDN_QUALIFY="yes" + +## Type: list(,default,none,all,dns,ntp,tz,boot,nis,sip) +## Default: "" +# +# This variable permits to specify a space separated list of build-in +# facility names supported by the dhcp6 client modifying the default +# options used in requests and to update system settings (via netconfig). +# +# When empty, default settings configured in wicked-config(5) or built-in +# defaults are used. The special "default", "all", and "none" sets enable +# to request none, the built-in default set or all supported options, +# respectively. A "no-" or "-" in the front of a facility name permit to +# remove/disable it from the currently applied set, e.g. "default,-nis" +# disables request for nis options. +# The more specific variable DHCLIENT6_SET_HOSTNAME has higher precedence. +# +DHCLIENT6_UPDATE="" +## Path: Network/DHCP/DHCP client +## Description: DHCPv4 client configuration variables +# +# Note: +# To configure one or more interfaces for DHCP configuration, you have to +# change the BOOTPROTO variable in /etc/sysconfig/network/ifcfg-<interface> +# to 'dhcp' (and possibly set STARTMODE='onboot'). +# +# Most of the options can and should be overridden by per-interface +# settings in the ifcfg-* files. +# +# Note: NetworkManager is not using any sysconfig settings. +# + +## Type: yesno +## Default: no +# +# Should the DHCPv4 client set the hostname? (yes|no) +# +# When it is likely that this would occur during a running X session, +# your DISPLAY variable could be screwed up and you won't be able to open +# new windows anymore, then this should be "no". +# +# If it happens during booting it won't be a problem and you can +# safely say "yes" here. For a roaming notebook with X kept running, "no" +# makes more sense. +# +DHCLIENT_SET_HOSTNAME="yes" + +## Type: string +## Default: AUTO +# +# Specifies the hostname option field when DHCPv4 client sends messages. +# Some DHCP servers will update nameserver entries (dynamic DNS) to it. +# Also, some DHCP servers, notably those used by @Home Networks, require +# the hostname option field containing a specific string in the DHCP +# messages from clients. +# +# When set to "AUTO", the current hostname from /etc/hostname is sent. +# Use this variable to override it with another hostname, or leave it +# empty to not send any hostname. +# +DHCLIENT_HOSTNAME_OPTION="AUTO" + +## Type: yesno +## Default: yes +# +# Should the DHCP client set a default route (default Gateway) (yes|no) +# +# When multiple copies of dhcp client run, it would make sense that only +# one of them does it. +# +DHCLIENT_SET_DEFAULT_ROUTE="yes" + +## Type: integer +## Default: "0" +# +# This option allows to set a metrics/priority for DHCPv4 routes. +# +DHCLIENT_ROUTE_PRIORITY="0" + +## Type: string +## Default: "" +# +# specify a client ID +# +# Specifies a client identifier string. By default an id derived from the +# hardware address of the network interface is sent as client identifier. +# +DHCLIENT_CLIENT_ID="" + +## Type: string +## Default: "" +# +# Specifies the vendor class identifier string. The default is dhcp client +# specific. +# +DHCLIENT_VENDOR_CLASS_ID="" + +## Type: list<rfc3004,string> +## Default: string +# +# Specifies the format of the DHCLIENT_USER_CLASS_ID variable. +# +# The DHCPv4 option and it's format is specified by RFC3004 as an array +# of class identifiers, but most DHCP clients/servers aren't compliant +# with the specification and send/expect a single string without proper +# RFC3004 length-value tuple format instead. +# +# When set to "rfc3004" DHCLIENT_USER_CLASS_ID[SUFFIX] permit an RFC +# compliant array, otherwise DHCLIENT_USER_CLASS_ID is used as string. +# +DHCLIENT_USER_CLASS_FORMAT="" + +## Type: string +## Default: "" +## Suffix: yes +# +# Specifies the user class identifier (array) to send in dhcp requests. +# The DHCLIENT_USER_CLASS_FORMAT variable specified how to interpret it. +# +DHCLIENT_USER_CLASS_ID="" + +## Type: integer +## Default: "" +# +# Specifies the lease time (in seconds), that is suggested to the +# server. Default is to use the lease time offered by the server. +# +DHCLIENT_LEASE_TIME="" + +## Type: yesno +## Default: yes +# +# This setting controls whether dhcp client should try to use DHCP settings +# provided in its last lease when the dhcp-server is not reachable and +# the lease hasn't expired yet. +# Set this variable to "no" to disable the fallback to the last lease. +# +DHCLIENT_USE_LAST_LEASE="yes" + +## Type: yesno +## Default: no +# +# Send a DHCPRELEASE to the server (sign off the address)? (yes|no) +# This may lead to getting a different address/hostname next time an address +# is requested. But some servers require it. +# +DHCLIENT_RELEASE_BEFORE_QUIT="no" + +## Type: integer +## Default: 0 +# +# Some interfaces need time to initialize and/or do not report correct status. +# Add the latency time in seconds so these can be handled properly. Should +# probably set per interface rather than here. +# This setting causes a sleep time before dhcp clients are started regardless +# of the link status. +# +# Note: RFC 2131 specifies, that the dhcp client should wait a random time +# between one and ten seconds to desynchronize the use of DHCP at startup. +# We do not use this initial delay to not slow down start/boot time. +# +DHCLIENT_SLEEP="0" + +## Type: integer +## Default: 15 +# +# The DHCPv4 client will try to get a lease for DHCLIENT_WAIT_AT_BOOT seconds, +# then inform ifup waiting for it, that it continues in background. +# When you increase this time, increase also the WAIT_FOR_INTERFACES variable +# e.g. to a value twice as high as the time specified here. +# +DHCLIENT_WAIT_AT_BOOT="15" + +## Type: integer +## Default: "0" +# +# The DHCPv4 client will stop processing / fail after this time when it does +# not get a reply from the dhcp server. Before you set this variable, take a +# look at DHCLIENT_WAIT_AT_BOOT allowing to continue in background instead. +# +DHCLIENT_TIMEOUT="0" + +## Path: Network/DHCP/DHCPv6 client +## Description: Global DHCPv6 client configuration + +## Type: list(auto,managed,info) +## Default: auto +# +# This option allows to specify the request mode used by the DHCPv6 +# client when the BOOTPROTO is set to dhcp or dhcp6, and overrides +# the "Managed Address Configuration" and the "Other Configuration" +# flags provided by the IPv6 router its Router Advertisement (RA) +# for the network connected to this interface. +# +# auto: follow RA flags, remain silent when no RA flag is set +# info: request other configuration (dns,ntp) only, no IP address +# managed: request IP address as well as other configuration +# +DHCLIENT6_MODE="auto" + +## Type: yesno +### Default: yes +# +# This option allows the DHCPv6 client to indicate its desire to accept +# rapid commit leases using two-packet exchange (solicitation, lease ack) +# instead of the four packet (solicitation, offer, request, lease ack). +# +DHCLIENT6_RAPID_COMMIT="yes" + +## Type: yesno +## Default: no +# +# Should the DHCPv6 client set the hostname? (yes|no) +# +# When it is likely that this would occur during a running X session, +# your DISPLAY variable could be screwed up and you won't be able to +# open new windows anymore, then this should be "no". +# +# If it happens during booting it won't be a problem and you can +# safely say "yes" here. For a roaming notebook with X kept running, +# "no" makes more sense. +# +DHCLIENT6_SET_HOSTNAME="no" + +## Type: string +### Default: AUTO +# +# Specifies the hostname option field when DHCPv6 client sends messages. +# Some DHCP servers will update nameserver entries (dynamic DNS) to it. +# +# When set to "AUTO", the current hostname from /etc/hostname is sent. +# Use this variable to override it with another hostname, or leave it +# empty to not send any hostname. +# +DHCLIENT6_HOSTNAME_OPTION="AUTO" + +## Type: integer +### Default: "" +# +# Specifies the preferred lifetime (in seconds) used as T1/renewal +# (1/2 of it) and T1/rebind (4/5 of it) in DHCPv6 IA NA requests. +# +# Default is to not propose anything but use the times as offered +# by the DHCPv6 server. +# +DHCLIENT6_LEASE_TIME="" + +## Type: yesno +## Default: yes +# +# This setting controls whether DHCPv6 client should try to use settings +# provided in its last lease when the DHCPv6-server is not reachable and +# the lease hasn't expired yet. +# Set this variable to "no" to disable the fallback to the last lease. +# +DHCLIENT6_USE_LAST_LEASE="yes" + +## Type: yesno +## Default: no +# +# Send a DHCPv6 RELEASE to the server (sign off the address)? (yes|no) +# This may lead to getting a different address/hostname next time an address +# is requested. But some servers require it. +# +DHCLIENT6_RELEASE_BEFORE_QUIT="no" + +## Type: integer +## Default: 0 +# +# Some interfaces need time to initialize and/or do not report correct status. +# By default, DHCPv6 waits until the link-local address (fe80::) is available +# and then ~1 second as specified by RFC3315. +# This setting allows override to use a non-standsrd initial delay. +# +DHCLIENT6_SLEEP="0" + +## Type: integer +## Default: 15 +# +# The DHCPv6 client will try to get a lease for DHCLIENT6_WAIT_AT_BOOT seconds, +# then inform ifup waiting for it, that it continues in background. +# When you increase this time, increase also the WAIT_FOR_INTERFACES variable +# e.g. to a value twice as high as the time specified here. +# +DHCLIENT6_WAIT_AT_BOOT="15" + +## Type: integer +## Default: "0" +# +# The dhcpv6 client will stop processing / fail after this time when it does +# not get a reply from the dhcp server. Before you set this variable, take a +# look at DHCLIENT6_WAIT_AT_BOOT allowing to continue in background instead. +# +DHCLIENT6_TIMEOUT="0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1,4 @@ +BOOTPROTO='dhcp' +MTU='' +REMOTE_IPADDR='' +STARTMODE='onboot' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1,13 @@ +[Unit] +Description=Register System at first boot +After=network.target +Before=getty.target +ConditionFileNotEmpty=!/etc/zypp/repos.d/HPC_Module_15_SP1_x86_64:SLE-Module-HPC15-SP1-Pool.repo + +[Service] +ExecStart=/usr/sbin/SUSEConnect -e EMAIL -r REGCODE +Type=oneshot +RemainAfterExit=true + +[Install] +WantedBy=basic.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1 @@ +SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="?*", NAME="lan0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service 1970-01-01 01:00:00.000000000 +0100 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sle-hpc-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service 2019-05-03 14:36:40.000000000 +0200 @@ -0,0 +1,11 @@ +[Unit] +Description=Rebuild grub config from distro toolkit +ConditionPathExists=/.kiwi_grub_config.trigger + +[Service] +Type=oneshot +ExecStart=/bin/bash -c 'grub2-mkconfig -o /boot/grub2/grub.cfg' +ExecStartPost=/bin/bash -c 'rm -f /.kiwi_grub_config.trigger' + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/Dicefile new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/Dicefile --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/Dicefile 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -Dice.configure do |config| - config.buildhost = :DOCKER -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.sh new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.sh --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.sh 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -#!/bin/bash -#================ -# FILE : config.sh -#---------------- -# PROJECT : OpenSuSE KIWI Image System -# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved -# : -# AUTHOR : Marcus Schaefer <ms(a)suse.de> -# : -# BELONGS TO : Operating System images -# : -# DESCRIPTION : configuration script for SUSE based -# : operating systems -# : -# : -# STATUS : BETA -#---------------- -#====================================== -# Functions... -#-------------------------------------- -test -f /.kconfig && . /.kconfig -test -f /.profile && . /.profile - -#====================================== -# Greeting... -#-------------------------------------- -echo "Configure image: [$kiwi_iname]..." - -#====================================== -# Mount system filesystems -#-------------------------------------- -baseMount - -#====================================== -# Setup baseproduct link -#-------------------------------------- -suseSetupProduct - -#====================================== -# Add missing gpg keys to rpm -#-------------------------------------- -suseImportBuildKey - -#====================================== -# Activate services -#-------------------------------------- -suseInsertService sshd -suseInsertService RegisterFirst -if [[ ${kiwi_type} =~ oem|vmx ]];then - suseInsertService grub_config -else - suseRemoveService grub_config -fi - -#====================================== -# Setup default target, multi-user -#-------------------------------------- -baseSetRunlevel 3 - -#========================================== -# remove package docs -#------------------------------------------ -rm -rf /usr/share/doc/packages/* -rm -rf /usr/share/doc/manual/* -rm -rf /opt/kde* - -#====================================== -# only basic version of vim is -# installed; no syntax highlighting -#-------------------------------------- -sed -i -e's/^syntax on/" syntax on/' /etc/vimrc - -#====================================== -# SuSEconfig -#-------------------------------------- -suseConfig - -#====================================== -# Remove yast if not in use -#-------------------------------------- -suseRemoveYaST - -#====================================== -# Umount kernel filesystems -#-------------------------------------- -baseCleanMount - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.xml new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.xml --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.xml 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/config.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<image schemaversion="6.8" name="LimeJeOS-SLE-15.1"> - <description type="system"> - <author>Christian Goll</author> - <contact>cgoll(a)suse.de</contact> - <specification> - SUSE HPC 15 JeOS, small text based image - </specification> - </description> - <preferences> - <version>1.15.0</version> - <packagemanager>zypper</packagemanager> - <locale>en_US</locale> - <keytable>us</keytable> - <timezone>Europe/Berlin</timezone> - <rpm-excludedocs>true</rpm-excludedocs> - <rpm-check-signatures>false</rpm-check-signatures> - <bootsplash-theme>SLE</bootsplash-theme> - <bootloader-theme>SLE</bootloader-theme> - </preferences> - <preferences> - <type image="vmx" filesystem="ext4" bootloader="grub2" kernelcmdline="splash" firmware="efi" format="qcow2"> - <size> - 32768 - </size> - </type> - <type image="oem" filesystem="ext4" initrd_system="dracut" installpxe="true" bootloader="grub2" kernelcmdline="splash" firmware="efi"> - <oemconfig> - <oem-systemsize>2048</oem-systemsize> - <oem-swap>true</oem-swap> - <oem-device-filter>/dev/ram</oem-device-filter> - <oem-multipath-scan>false</oem-multipath-scan> - <oem-unattended>true</oem-unattended> - </oemconfig> - <machine memory="512" guestOS="suse" HWversion="4"> - <vmdisk id="0" controller="ide"/> - <vmnic driver="e1000" interface="0" mode="bridged"/> - </machine> - </type> - </preferences> - <users> -  - <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/> - </users> - <repository type="rpm-md" alias="kiwi" priority="1"> - <source path="obs://Virtualization:Appliances:Builder/SLE_15"/> - </repository> - <repository type="yast2" alias="SLES_installer"> - <source path="iso:// /root/SLE-15-Installer-DVD-x86_64-GA-Media1.iso"/> - </repository> - <repository type="yast2" alias="SLES_packages"> - <source path="iso:// /root/SLE-15-Packages-x86_64-GA-Media1.iso"/> - </repository> - - <packages type="image"> - <package name="checkmedia"/> - <package name="patterns-base-minimal_base"/> - <package name="plymouth-branding-SLE"/> - <package name="plymouth-dracut"/> - <package name="plymouth"/> - <package name="grub2-branding-SLE-15"/> - <package name="iputils"/> - <package name="vim"/> - <package name="grub2"/> - <package name="grub2-x86_64-efi" arch="x86_64"/> - <package name="grub2-i386-pc"/> - <package name="syslinux"/> - <package name="fontconfig"/> - <package name="fonts-config"/> - <package name="tar"/> - <package name="openssh"/> - <package name="iproute2"/> - <package name="less"/> - <package name="lvm2"/> - <package name="psmisc"/> - <package name="parted"/> - <package name="bash-completion"/> - <package name="dhcp-client"/> - <package name="which"/> - <package name="udev"/> - <package name="salt-minion"/> - <package name="shim"/> - <package name="systemd"/> - <package name="systemd-sysvinit"/> - <package name="dracut"/> - <package name="kernel-default"/> - <package name="timezone"/> - <package name="SLE_HPC-release"/> - <package name="SUSEConnect"/> - <package name="suse-build-key"/> - <package name="sle-module-basesystem-release"/> - </packages> - <packages type="oem"> - <package name="dracut-kiwi-oem-repart"/> - <package name="dracut-kiwi-oem-dump"/> - </packages> - <packages type="bootstrap"> - <package name="udev"/> - <package name="filesystem"/> - <package name="glibc-locale"/> - <package name="cracklib-dict-full"/> - <package name="ca-certificates"/> - <package name="SLE_HPC-release"/> - <package name="sle-module-basesystem-release"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/motd new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/motd --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/motd 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -This is the Leap 15.0 JeOS SuSE Linux System. -To upgrade your system call: - - zypper refresh - zypper up - -Have a lot of fun... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/dhcp new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/dhcp --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/dhcp 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/dhcp 1970-01-01 01:00:00.000000000 +0100 @@ -1,381 +0,0 @@ -## Type: list(enabled,disabled,default,) -## Default: "" -# -# Default is to use the FQDN option, when the DHCLIENT_HOSTNAME_OPTION -# variable is set to a full hostname, that is, when it contains a dot. -# When DHCLIENT_HOSTNAME_OPTION is set to AUTO, short hostname from -# /etc/hostname is send via hostname option 12 (same as SLES-11). -# -DHCLIENT_FQDN_ENABLED="" - -## Type: list(both,ptr,none,) -## Default: "" -# -# Request to update A and PTR or only the PTR DNS records using the -# hostname specified in DHCLIENT_HOSTNAME_OPTION variable. -# Default is to update 'both' when hostname is set or 'none' when -# the hostname is empty and DHCLIENT_FQDN_ENABLED is set to enabled. -# -DHCLIENT_FQDN_UPDATE="" - -## Type: yesno -## Default: yes -# -# Qualify relative sub-domains/hostname in the DHCLIENT_HOSTNAME_OPTION -# variable adding a final dot ('foo.bar' -> 'foo.bar.'). -# When disabled, the DHCP server may append it's update domain to the -# hostname (e.g. 'foo.bar' -> 'foo.bar.example.net'). -# -DHCLIENT_FQDN_QUALIFY="yes" - -## Type: yesno -## Default: yes -# -# The FQDN option is encoding hostnames using canonical DNS wire format -# by default. This flag permits to enable use of the deprecated ascii -# format limited to a single label (host hostname) for compatibility -# purposes with draft implementation, which may be unsupported and cause -# that a DHCP server ignores the fqdn option request completely. -# -DHCLIENT_FQDN_ENCODE="yes" - -## Type: list(,default,none,all,dns,ntp,nis,tz,boot,smb,nds,slp,sip,log) -## Default: "" -# -# This variable permits to specify a space separated list of build-in -# facility names supported by the dhcp4 client modifying the default -# options used in requests and to update system settings (via netconfig). -# -# When empty, default settings configured in wicked-config(5) or built-in -# defaults are used. The special "default", "all", and "none" sets enable -# to request none, the built-in default set or all supported options, -# respectively. A "no-" or "-" in the front of a facility name permit to -# remove/disable it from the currently applied set, e.g. "default,-nis" -# disables request for nis options. -# More specific variables as DHCLIENT_SET_DEFAULT_ROUTE,_SET_HOSTNAME or -# the MTU option have higher precedence. -# -DHCLIENT_UPDATE="" - -## Type: list(enabled,disabled,default,) -## Default: "" -# -# Default is to use the FQDN option, when the DHCLIENT6_HOSTNAME_OPTION -# variable provides a hostname. -# When DHCLIENT6_HOSTNAME_OPTION is set to AUTO, short hostname from the -# /etc/hostname file is send (same to SLES-11). -# -DHCLIENT6_FQDN_ENABLED="" - -## Type: list(both,ptr,none,) -## Default: "" -# -# Request to update AAAA and PTR or only the PTR DNS records using the -# hostname specified in DHCLIENT6_HOSTNAME_OPTION variable. -# Default is to update \fIboth\fR when hostname is given or \fInone\fR -# when hostname is empty and DHCLIENT6_FQDN_ENABLED is set to enabled. -# -DHCLIENT6_FQDN_UPDATE="" - -## Type: yesno -## Default: yes -# -# Qualify relative sub-domains/hostname in the DHCLIENT6_HOSTNAME_OPTION -# variable adding a final dot ('foo.bar' -> 'foo.bar.'). -# When disabled, the DHCP server may append it's update domain to the -# hostname (e.g. 'foo.bar' -> 'foo.bar.example.net'). -# -DHCLIENT6_FQDN_QUALIFY="yes" - -## Type: list(,default,none,all,dns,ntp,tz,boot,nis,sip) -## Default: "" -# -# This variable permits to specify a space separated list of build-in -# facility names supported by the dhcp6 client modifying the default -# options used in requests and to update system settings (via netconfig). -# -# When empty, default settings configured in wicked-config(5) or built-in -# defaults are used. The special "default", "all", and "none" sets enable -# to request none, the built-in default set or all supported options, -# respectively. A "no-" or "-" in the front of a facility name permit to -# remove/disable it from the currently applied set, e.g. "default,-nis" -# disables request for nis options. -# The more specific variable DHCLIENT6_SET_HOSTNAME has higher precedence. -# -DHCLIENT6_UPDATE="" -## Path: Network/DHCP/DHCP client -## Description: DHCPv4 client configuration variables -# -# Note: -# To configure one or more interfaces for DHCP configuration, you have to -# change the BOOTPROTO variable in /etc/sysconfig/network/ifcfg-<interface> -# to 'dhcp' (and possibly set STARTMODE='onboot'). -# -# Most of the options can and should be overridden by per-interface -# settings in the ifcfg-* files. -# -# Note: NetworkManager is not using any sysconfig settings. -# - -## Type: yesno -## Default: no -# -# Should the DHCPv4 client set the hostname? (yes|no) -# -# When it is likely that this would occur during a running X session, -# your DISPLAY variable could be screwed up and you won't be able to open -# new windows anymore, then this should be "no". -# -# If it happens during booting it won't be a problem and you can -# safely say "yes" here. For a roaming notebook with X kept running, "no" -# makes more sense. -# -DHCLIENT_SET_HOSTNAME="yes" - -## Type: string -## Default: AUTO -# -# Specifies the hostname option field when DHCPv4 client sends messages. -# Some DHCP servers will update nameserver entries (dynamic DNS) to it. -# Also, some DHCP servers, notably those used by @Home Networks, require -# the hostname option field containing a specific string in the DHCP -# messages from clients. -# -# When set to "AUTO", the current hostname from /etc/hostname is sent. -# Use this variable to override it with another hostname, or leave it -# empty to not send any hostname. -# -DHCLIENT_HOSTNAME_OPTION="AUTO" - -## Type: yesno -## Default: yes -# -# Should the DHCP client set a default route (default Gateway) (yes|no) -# -# When multiple copies of dhcp client run, it would make sense that only -# one of them does it. -# -DHCLIENT_SET_DEFAULT_ROUTE="yes" - -## Type: integer -## Default: "0" -# -# This option allows to set a metrics/priority for DHCPv4 routes. -# -DHCLIENT_ROUTE_PRIORITY="0" - -## Type: string -## Default: "" -# -# specify a client ID -# -# Specifies a client identifier string. By default an id derived from the -# hardware address of the network interface is sent as client identifier. -# -DHCLIENT_CLIENT_ID="" - -## Type: string -## Default: "" -# -# Specifies the vendor class identifier string. The default is dhcp client -# specific. -# -DHCLIENT_VENDOR_CLASS_ID="" - -## Type: list<rfc3004,string> -## Default: string -# -# Specifies the format of the DHCLIENT_USER_CLASS_ID variable. -# -# The DHCPv4 option and it's format is specified by RFC3004 as an array -# of class identifiers, but most DHCP clients/servers aren't compliant -# with the specification and send/expect a single string without proper -# RFC3004 length-value tuple format instead. -# -# When set to "rfc3004" DHCLIENT_USER_CLASS_ID[SUFFIX] permit an RFC -# compliant array, otherwise DHCLIENT_USER_CLASS_ID is used as string. -# -DHCLIENT_USER_CLASS_FORMAT="" - -## Type: string -## Default: "" -## Suffix: yes -# -# Specifies the user class identifier (array) to send in dhcp requests. -# The DHCLIENT_USER_CLASS_FORMAT variable specified how to interpret it. -# -DHCLIENT_USER_CLASS_ID="" - -## Type: integer -## Default: "" -# -# Specifies the lease time (in seconds), that is suggested to the -# server. Default is to use the lease time offered by the server. -# -DHCLIENT_LEASE_TIME="" - -## Type: yesno -## Default: yes -# -# This setting controls whether dhcp client should try to use DHCP settings -# provided in its last lease when the dhcp-server is not reachable and -# the lease hasn't expired yet. -# Set this variable to "no" to disable the fallback to the last lease. -# -DHCLIENT_USE_LAST_LEASE="yes" - -## Type: yesno -## Default: no -# -# Send a DHCPRELEASE to the server (sign off the address)? (yes|no) -# This may lead to getting a different address/hostname next time an address -# is requested. But some servers require it. -# -DHCLIENT_RELEASE_BEFORE_QUIT="no" - -## Type: integer -## Default: 0 -# -# Some interfaces need time to initialize and/or do not report correct status. -# Add the latency time in seconds so these can be handled properly. Should -# probably set per interface rather than here. -# This setting causes a sleep time before dhcp clients are started regardless -# of the link status. -# -# Note: RFC 2131 specifies, that the dhcp client should wait a random time -# between one and ten seconds to desynchronize the use of DHCP at startup. -# We do not use this initial delay to not slow down start/boot time. -# -DHCLIENT_SLEEP="0" - -## Type: integer -## Default: 15 -# -# The DHCPv4 client will try to get a lease for DHCLIENT_WAIT_AT_BOOT seconds, -# then inform ifup waiting for it, that it continues in background. -# When you increase this time, increase also the WAIT_FOR_INTERFACES variable -# e.g. to a value twice as high as the time specified here. -# -DHCLIENT_WAIT_AT_BOOT="15" - -## Type: integer -## Default: "0" -# -# The DHCPv4 client will stop processing / fail after this time when it does -# not get a reply from the dhcp server. Before you set this variable, take a -# look at DHCLIENT_WAIT_AT_BOOT allowing to continue in background instead. -# -DHCLIENT_TIMEOUT="0" - -## Path: Network/DHCP/DHCPv6 client -## Description: Global DHCPv6 client configuration - -## Type: list(auto,managed,info) -## Default: auto -# -# This option allows to specify the request mode used by the DHCPv6 -# client when the BOOTPROTO is set to dhcp or dhcp6, and overrides -# the "Managed Address Configuration" and the "Other Configuration" -# flags provided by the IPv6 router its Router Advertisement (RA) -# for the network connected to this interface. -# -# auto: follow RA flags, remain silent when no RA flag is set -# info: request other configuration (dns,ntp) only, no IP address -# managed: request IP address as well as other configuration -# -DHCLIENT6_MODE="auto" - -## Type: yesno -### Default: yes -# -# This option allows the DHCPv6 client to indicate its desire to accept -# rapid commit leases using two-packet exchange (solicitation, lease ack) -# instead of the four packet (solicitation, offer, request, lease ack). -# -DHCLIENT6_RAPID_COMMIT="yes" - -## Type: yesno -## Default: no -# -# Should the DHCPv6 client set the hostname? (yes|no) -# -# When it is likely that this would occur during a running X session, -# your DISPLAY variable could be screwed up and you won't be able to -# open new windows anymore, then this should be "no". -# -# If it happens during booting it won't be a problem and you can -# safely say "yes" here. For a roaming notebook with X kept running, -# "no" makes more sense. -# -DHCLIENT6_SET_HOSTNAME="no" - -## Type: string -### Default: AUTO -# -# Specifies the hostname option field when DHCPv6 client sends messages. -# Some DHCP servers will update nameserver entries (dynamic DNS) to it. -# -# When set to "AUTO", the current hostname from /etc/hostname is sent. -# Use this variable to override it with another hostname, or leave it -# empty to not send any hostname. -# -DHCLIENT6_HOSTNAME_OPTION="AUTO" - -## Type: integer -### Default: "" -# -# Specifies the preferred lifetime (in seconds) used as T1/renewal -# (1/2 of it) and T1/rebind (4/5 of it) in DHCPv6 IA NA requests. -# -# Default is to not propose anything but use the times as offered -# by the DHCPv6 server. -# -DHCLIENT6_LEASE_TIME="" - -## Type: yesno -## Default: yes -# -# This setting controls whether DHCPv6 client should try to use settings -# provided in its last lease when the DHCPv6-server is not reachable and -# the lease hasn't expired yet. -# Set this variable to "no" to disable the fallback to the last lease. -# -DHCLIENT6_USE_LAST_LEASE="yes" - -## Type: yesno -## Default: no -# -# Send a DHCPv6 RELEASE to the server (sign off the address)? (yes|no) -# This may lead to getting a different address/hostname next time an address -# is requested. But some servers require it. -# -DHCLIENT6_RELEASE_BEFORE_QUIT="no" - -## Type: integer -## Default: 0 -# -# Some interfaces need time to initialize and/or do not report correct status. -# By default, DHCPv6 waits until the link-local address (fe80::) is available -# and then ~1 second as specified by RFC3315. -# This setting allows override to use a non-standsrd initial delay. -# -DHCLIENT6_SLEEP="0" - -## Type: integer -## Default: 15 -# -# The DHCPv6 client will try to get a lease for DHCLIENT6_WAIT_AT_BOOT seconds, -# then inform ifup waiting for it, that it continues in background. -# When you increase this time, increase also the WAIT_FOR_INTERFACES variable -# e.g. to a value twice as high as the time specified here. -# -DHCLIENT6_WAIT_AT_BOOT="15" - -## Type: integer -## Default: "0" -# -# The dhcpv6 client will stop processing / fail after this time when it does -# not get a reply from the dhcp server. Before you set this variable, take a -# look at DHCLIENT6_WAIT_AT_BOOT allowing to continue in background instead. -# -DHCLIENT6_TIMEOUT="0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/sysconfig/network/ifcfg-lan0 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -BOOTPROTO='dhcp' -MTU='' -REMOTE_IPADDR='' -STARTMODE='onboot' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/systemd/system/RegisterFirst.service 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -[Unit] -Description=Register System at first boot -After=network.target -Before=getty.target -ConditionFileNotEmpty=!/etc/zypp/repos.d/HPC_Module_15_SP1_x86_64:SLE-Module-HPC15-SP1-Pool.repo - -[Service] -ExecStart=/usr/sbin/SUSEConnect -e EMAIL -r REGCODE -Type=oneshot -RemainAfterExit=true - -[Install] -WantedBy=basic.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/etc/udev/rules.d/70-persistent-net.rules 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="?*", NAME="lan0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service 2019-05-02 10:21:21.000000000 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/root/usr/lib/systemd/system/grub_config.service 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -[Unit] -Description=Rebuild grub config from distro toolkit -ConditionPathExists=/.kiwi_grub_config.trigger - -[Service] -Type=oneshot -ExecStart=/bin/bash -c 'grub2-mkconfig -o /boot/grub2/grub.cfg' -ExecStartPost=/bin/bash -c 'rm -f /.kiwi_grub_config.trigger' - -[Install] -WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/sles-15.1-JeOS.kiwi new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/sles-15.1-JeOS.kiwi --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/sles-15.1-JeOS.kiwi 2019-05-03 22:47:52.127967871 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/SUSE/x86_64/sles-15.1-JeOS/sles-15.1-JeOS.kiwi 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to config.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clustduct-0.0.1_alpha8/kiwi-descriptions/openSUSE/x86_64/suse-leap-15.0-JeOS/leap-15.0-JeOS.kiwi new/clustduct-0.0.2/kiwi-descriptions/openSUSE/x86_64/suse-leap-15.0-JeOS/leap-15.0-JeOS.kiwi --- old/clustduct-0.0.1_alpha8/kiwi-descriptions/openSUSE/x86_64/suse-leap-15.0-JeOS/leap-15.0-JeOS.kiwi 2019-05-03 22:47:52.123967862 +0200 +++ new/clustduct-0.0.2/kiwi-descriptions/openSUSE/x86_64/suse-leap-15.0-JeOS/leap-15.0-JeOS.kiwi 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to config.xml

1 0

commit python-Cheetah3 for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package python-Cheetah3 for openSUSE:Factory checked in at 2019-05-03 22:47:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Cheetah3 (Old) and /work/SRC/openSUSE:Factory/.python-Cheetah3.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Cheetah3" Fri May 3 22:47:48 2019 rev:5 rq:700373 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Cheetah3/python-Cheetah3.changes 2019-03-22 15:10:37.921325059 +0100 +++ /work/SRC/openSUSE:Factory/.python-Cheetah3.new.5148/python-Cheetah3.changes 2019-05-03 22:47:49.747962408 +0200 @@ -1,0 +2,11 @@ +Fri May 3 11:57:28 UTC 2019 - Martin Pluskal <mpluskal(a)suse.com> + +- Update to version 3.2.2: + * Replaced outdated and insecure mktemp with mkstemp. + * Fixed bugs in TemplateCmdLineIface.py: read binary pickles from + stdin and files. + * Use cgi.escape() for Python 2, html.escape() for Python 3. + * Created tests for TemplateCmdLineIface. +- Update test dependencies + +------------------------------------------------------------------- Old: ---- Cheetah3-3.2.1.tar.gz New: ---- Cheetah3-3.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Cheetah3.spec ++++++ --- /var/tmp/diff_new_pack.V2FwMk/_old 2019-05-03 22:47:50.227963510 +0200 +++ /var/tmp/diff_new_pack.V2FwMk/_new 2019-05-03 22:47:50.231963519 +0200 @@ -18,13 +18,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Cheetah3 -Version: 3.2.1 +Version: 3.2.2 Release: 0 Summary: Template engine and code generation tool License: MIT Group: Development/Languages/Python URL: http://cheetahtemplate.org/ Source: https://files.pythonhosted.org/packages/source/C/Cheetah3/Cheetah3-%{versio… +BuildRequires: %{python_module Markdown} +BuildRequires: %{python_module Pygments} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes ++++++ Cheetah3-3.2.1.tar.gz -> Cheetah3-3.2.2.tar.gz ++++++ ++++ 73111 lines of diff (skipped)

1 0

commit signing-party for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package signing-party for openSUSE:Factory checked in at 2019-05-03 22:47:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/signing-party (Old) and /work/SRC/openSUSE:Factory/.signing-party.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "signing-party" Fri May 3 22:47:45 2019 rev:4 rq:700370 version:2.9 Changes: -------- --- /work/SRC/openSUSE:Factory/signing-party/signing-party.changes 2019-03-26 15:43:41.936200120 +0100 +++ /work/SRC/openSUSE:Factory/.signing-party.new.5148/signing-party.changes 2019-05-03 22:47:47.119956374 +0200 @@ -1,0 +2,6 @@ +Fri May 3 11:46:01 UTC 2019 - Sebastian Wagner <sebix+novell.com(a)sebix.at> + +- Add patch cve-2019-11627.patch from https://salsa.debian.org/signing-party-team/signing-party/commit/cd69b6c042… + to fix CVE-2019-11627. + +------------------------------------------------------------------- New: ---- cve-2019-11627.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ signing-party.spec ++++++ --- /var/tmp/diff_new_pack.PUZ5IO/_old 2019-05-03 22:47:47.699957706 +0200 +++ /var/tmp/diff_new_pack.PUZ5IO/_new 2019-05-03 22:47:47.707957724 +0200 @@ -26,6 +26,8 @@ Source: http://ftp.debian.org/debian/pool/main/s/signing-party/signing-party_%{vers… # PATCH-FIX-OPENSUSE caff-manpage.patch [bnc#722626] Patch1: caff-manpage.patch +# PATCH-FIX-UPSTREAM cve-2019-11627.patch boo#1134040 +Patch2: cve-2019-11627.patch Requires: %{_sbindir}/sendmail Requires: gpg Requires: perl @@ -83,6 +85,7 @@ %prep %setup -q -n signing-party-%{version} %patch1 -p1 +%patch2 -p1 %build %if 0%{?suse_version} > 1320 ++++++ cve-2019-11627.patch ++++++ >From cd69b6c0426a6160ef3de03fce9c7f112166d5a8 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin <guilhem(a)debian.org> Date: Tue, 30 Apr 2019 19:49:45 +0200 Subject: [PATCH] gpg-key2ps: Fix shell injection vulnerability in UIDs rendering. --- debian/changelog | 7 +++++++ gpg-key2ps/gpg-key2ps | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7b071b7..26a665b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +signing-party (2.10-1) UNRELEASED; urgency=high + + * gpg-key2ps: Fix shell injection vulnerability in UIDs rendering. + (Closes: #928256.) + + -- Guilhem Moulin <guilhem(a)debian.org> Tue, 30 Apr 2019 19:47:04 +0200 + signing-party (2.9-1) unstable; urgency=medium * gpglist: diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps index 4d76fb4..1a67e04 100755 --- a/gpg-key2ps/gpg-key2ps +++ b/gpg-key2ps/gpg-key2ps @@ -9,6 +9,7 @@ # use strict; +use Encode (); use Getopt::Long; my $version = '@@VERSION@@'; @@ -267,7 +268,7 @@ while(<GPG>) { } # user ids s/\\x(\p{AHex}{2})/ chr(hex($1)) /ge; - $_ = `echo "$_" | iconv -c -f utf-8 -t latin1`; + $_ = Encode::encode("latin1", Encode::decode_utf8($_)); s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) uid/; # revoked user id if (s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) revuid/) { -- 2.20.1

1 0

commit openshot-qt for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package openshot-qt for openSUSE:Factory checked in at 2019-05-03 22:47:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openshot-qt (Old) and /work/SRC/openSUSE:Factory/.openshot-qt.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openshot-qt" Fri May 3 22:47:35 2019 rev:6 rq:700348 version:2.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/openshot-qt/openshot-qt.changes 2019-01-21 10:51:50.763910641 +0100 +++ /work/SRC/openSUSE:Factory/.openshot-qt.new.5148/openshot-qt.changes 2019-05-03 22:47:41.775944106 +0200 @@ -1,0 +2,44 @@ +Fri May 3 08:14:07 UTC 2019 - Adrian Schröter <adrian(a)suse.de> + +- update to version 2.4.4 + * Scale keyframe coordinates when changing Profile or Exporting using a different FPS (#2620) + * Large performance improvements on AngularJS Timeline (and solved some Async issues) (#2533) + * Integration of resvg SVG library (gitlab and freeze updates) (#2540) + * Improved Tracks (simpler numbering, faster inserting, prevent deletion of locked tracks) (#2491) + * Improved Docking (Timeline widget is now dockable and Properties works in pillar mode) (#2490) + * Use libopenshot to generate preview images for our Title editor, and no longer use Qt's SVG parsing by default. (#2544) + * Improving UTF-8 path detection and conversion (#2525) + * Rewrite conversion of relative and absolute path support in OpenShot (#2477) + * Fixing many Python issues reported in our automatic exception tracking (#2482) + * Fixing regressions to Split Audio (#2660) + * Integrate Constant Rate Factor (CRF) into Export Dialog (#2543) + * Separating PrepareStreams() from Open(), to allow SetOption() to correctly function (#2568) + * Adding h265 export preset (thanks Peter) (#2680) + * Adding ~/.openshot_qt/presets/ User-defined Presets, so users can easily install custom export presets (devices and formats) (#2555) + * Dragging an OSP file into the Project Files widget will open the entire project file (and prompt to save unsaved changes) (#2616) + * Persist undo/redo history correctly across OpenShot sessions (#2474) + * Fix audio waveform display when slicing clips or resizing/trimming clips + * Color picker: Never use native dialog (#2425) + * Adding Git Changelog screen (#2566) + * Converting to new Settings class, instead of the old ENV VAR method (#2520) + * Reverting Angular from 1.7.2 to 1.6.0 (for stability reasons) (#2479) + * Completed Arabic, Hindi, Chinese (Simplified and Traditional) translations (#2594) + * Update messaging integration on build server (#2426) + * Add init.py file for installed module (#2419) + * launch.py: Path-detect via openshot_qt init (#2419) + * Exit using sys.exit() (#2409) + * preferences: Tweak item layout (#2401) + * Widen export window (#2373) + * Pass remaining command line args to Qt (#2355) + * Copy (cleaned up) xdg icon to src/images (#2316) + * Add strings to be translated and fix tuple error (#2275) + * added browse button in file properties dialog, to allow relinking of individual media files (#2275) + * fix for automatic relinking of missing media files during project open (#2275) + * Add the same browse type for inkscape and blender field (#2255) + * Remove CRLF line endings from chromebook preset (#2204) + * Convert language.py line endings (#2204) + * Missing files are now automatically deleted from the recent menu (#2202) + * Append correct extension to snapshot frames (#2196) + * Update Contributors & Translations (#2679) + +------------------------------------------------------------------- Old: ---- openshot-qt-2.4.3.obscpio New: ---- openshot-qt-2.4.4.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openshot-qt.spec ++++++ --- /var/tmp/diff_new_pack.kxxbRy/_old 2019-05-03 22:47:45.315952233 +0200 +++ /var/tmp/diff_new_pack.kxxbRy/_new 2019-05-03 22:47:45.331952270 +0200 @@ -17,7 +17,7 @@ Name: openshot-qt -Version: 2.4.3 +Version: 2.4.4 Release: 0 Summary: Non-linear video editor with broad format support License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.kxxbRy/_old 2019-05-03 22:47:45.803953353 +0200 +++ /var/tmp/diff_new_pack.kxxbRy/_new 2019-05-03 22:47:45.831953417 +0200 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/OpenShot/openshot-qt.git</param> <param name="scm">git</param> - <param name="revision">v2.4.3</param> - <param name="version">2.4.3</param> + <param name="revision">v2.4.4</param> + <param name="version">2.4.4</param> </service> <service name="set_version" mode="disabled"/> ++++++ openshot-qt-2.4.3.obscpio -> openshot-qt-2.4.4.obscpio ++++++ /work/SRC/openSUSE:Factory/openshot-qt/openshot-qt-2.4.3.obscpio /work/SRC/openSUSE:Factory/.openshot-qt.new.5148/openshot-qt-2.4.4.obscpio differ: char 8, line 1 ++++++ openshot-qt.obsinfo ++++++ --- /var/tmp/diff_new_pack.kxxbRy/_old 2019-05-03 22:47:45.943953674 +0200 +++ /var/tmp/diff_new_pack.kxxbRy/_new 2019-05-03 22:47:45.943953674 +0200 @@ -1,5 +1,11 @@ name: openshot-qt +<<<<<<< ./openshot-qt.obsinfo.mine +version: 2.4.4 +mtime: 1553118655 +commit: 7c8925b5c3002cd8cebef77868d43b47bf93242b +======= version: 2.4.3 mtime: 1537652981 commit: b90557dfd7fe3318435f5968a52d3aa36522cc9c +>>>>>>> ./openshot-qt.obsinfo.rbcf7158d0beaf65e7270d47c6282b447

1 0

commit blogc for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package blogc for openSUSE:Factory checked in at 2019-05-03 22:47:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blogc (Old) and /work/SRC/openSUSE:Factory/.blogc.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blogc" Fri May 3 22:47:32 2019 rev:15 rq:700320 version:0.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/blogc/blogc.changes 2019-04-23 14:37:21.057523343 +0200 +++ /work/SRC/openSUSE:Factory/.blogc.new.5148/blogc.changes 2019-05-03 22:47:33.655925465 +0200 @@ -1,0 +2,12 @@ +Fri May 3 06:55:59 UTC 2019 - mvetter(a)suse.com + +- Update to 0.17.0: + * blogc(1) now supports sorting source files by DATE variable, + by providing the FILTER_SORT=1 global variable. + The source files are sorted in descending order by default, and + can be reversed by providing the FILTER_REVERSE=1 global variable. + See blogc-pagination(7) for details. + * blogc-make(1) got a new setting to support sorting posts: + posts_sort. See blogcfile(5) for details. + +------------------------------------------------------------------- Old: ---- blogc-0.16.1.tar.xz New: ---- blogc-0.17.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blogc.spec ++++++ --- /var/tmp/diff_new_pack.7ypLvY/_old 2019-05-03 22:47:34.179926668 +0200 +++ /var/tmp/diff_new_pack.7ypLvY/_new 2019-05-03 22:47:34.179926668 +0200 @@ -17,7 +17,7 @@ Name: blogc -Version: 0.16.1 +Version: 0.17.0 Release: 0 Summary: Blog compiler License: BSD-3-Clause ++++++ blogc-0.16.1.tar.xz -> blogc-0.17.0.tar.xz ++++++ ++++ 1632 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/.tarball-version new/blogc-0.17.0/.tarball-version --- old/blogc-0.16.1/.tarball-version 2019-04-21 20:03:18.000000000 +0200 +++ new/blogc-0.17.0/.tarball-version 2019-05-02 22:19:18.000000000 +0200 @@ -1 +1 @@ -0.16.1 +0.17.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/.version new/blogc-0.17.0/.version --- old/blogc-0.16.1/.version 2019-04-21 20:03:17.000000000 +0200 +++ new/blogc-0.17.0/.version 2019-05-02 22:19:18.000000000 +0200 @@ -1 +1 @@ -0.16.1 +0.17.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/Makefile.am new/blogc-0.17.0/Makefile.am --- old/blogc-0.16.1/Makefile.am 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/Makefile.am 2019-05-02 22:18:40.000000000 +0200 @@ -69,6 +69,7 @@ src/common/config-parser.h \ src/common/error.h \ src/common/file.h \ + src/common/sort.h \ src/common/stdin.h \ src/common/utf8.h \ src/common/utils.h \ @@ -151,6 +152,7 @@ src/common/config-parser.c \ src/common/error.c \ src/common/file.c \ + src/common/sort.c \ src/common/stdin.c \ src/common/utf8.c \ src/common/utils.c \ @@ -472,6 +474,7 @@ tests/blogc/check_template_parser \ tests/common/check_config_parser \ tests/common/check_error \ + tests/common/check_sort \ tests/common/check_utf8 \ tests/common/check_utils \ $(NULL) @@ -745,6 +748,23 @@ $(CMOCKA_LIBS) \ libblogc_common.la \ $(NULL) + +tests_common_check_sort_SOURCES = \ + tests/common/check_sort.c \ + $(NULL) + +tests_common_check_sort_CFLAGS = \ + $(CMOCKA_CFLAGS) \ + $(NULL) + +tests_common_check_sort_LDFLAGS = \ + -no-install \ + $(NULL) + +tests_common_check_sort_LDADD = \ + $(CMOCKA_LIBS) \ + libblogc_common.la \ + $(NULL) tests_common_check_utf8_SOURCES = \ tests/common/check_utf8.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc-git-receiver.1 new/blogc-0.17.0/blogc-git-receiver.1 --- old/blogc-0.16.1/blogc-git-receiver.1 2019-04-21 20:03:17.000000000 +0200 +++ new/blogc-0.17.0/blogc-git-receiver.1 2019-05-02 22:19:18.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BLOGC\-GIT\-RECEIVER" "1" "April 2019" "Rafael G. Martins" "blogc Manual" +.TH "BLOGC\-GIT\-RECEIVER" "1" "May 2019" "Rafael G. Martins" "blogc Manual" . .SH "NAME" \fBblogc\-git\-receiver\fR \- a simple login shell/git hook to deploy blogc websites diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc-make.1 new/blogc-0.17.0/blogc-make.1 --- old/blogc-0.16.1/blogc-make.1 2019-04-21 20:03:17.000000000 +0200 +++ new/blogc-0.17.0/blogc-make.1 2019-05-02 22:19:18.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BLOGC\-MAKE" "1" "April 2019" "Rafael G. Martins" "blogc Manual" +.TH "BLOGC\-MAKE" "1" "May 2019" "Rafael G. Martins" "blogc Manual" . .SH "NAME" \fBblogc\-make\fR \- a simple build tool for blogc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc-pagination.7 new/blogc-0.17.0/blogc-pagination.7 --- old/blogc-0.16.1/blogc-pagination.7 2019-04-21 20:03:17.000000000 +0200 +++ new/blogc-0.17.0/blogc-pagination.7 2019-05-02 22:19:18.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BLOGC\-PAGINATION" "7" "April 2019" "Rafael G. Martins" "blogc Manual" +.TH "BLOGC\-PAGINATION" "7" "May 2019" "Rafael G. Martins" "blogc Manual" . .SH "NAME" \fBblogc\-pagination\fR \- blogc\'s pagination support @@ -26,7 +26,11 @@ . .TP \fBFILTER_REVERSE\fR -Any string, if defined, blogc(1) will list files in reverse order\. This is always the first filter applied to the files\. All the other filters will get the files already in the reverse order, and won\'t care about this\. +Boolean (1/y/yes/true/on), if set, blogc(1) will list files in reverse order\. This filter is combined with \fBFILTER_SORT\fR, and all the other filters will get the files already in the reverse order\. +. +.TP +\fBFILTER_SORT\fR +Boolean (1/y/yes/true/on), if set, blogc(1) will sort files using the \fBDATE\fR variable provided in the files, instead of respecting the order of the source files provided to blogc(1)\. The files are sorted in descending order and combined with \fBFILTER_REVERSE\fR, that will result in the files sorted in ascending order\. All the other filters will get the files already sorted\. . .SH "TEMPLATE VARIABLES" blogc(1) will export some global blogc\-template(7) variables, that can be used to build links for next and previous page\. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc-runserver.1 new/blogc-0.17.0/blogc-runserver.1 --- old/blogc-0.16.1/blogc-runserver.1 2019-04-21 20:03:17.000000000 +0200 +++ new/blogc-0.17.0/blogc-runserver.1 2019-05-02 22:19:18.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BLOGC\-RUNSERVER" "1" "April 2019" "Rafael G. Martins" "blogc Manual" +.TH "BLOGC\-RUNSERVER" "1" "May 2019" "Rafael G. Martins" "blogc Manual" . .SH "NAME" \fBblogc\-runserver\fR \- a simple HTTP server to test blogc websites diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc-source.7 new/blogc-0.17.0/blogc-source.7 --- old/blogc-0.16.1/blogc-source.7 2019-04-21 20:03:17.000000000 +0200 +++ new/blogc-0.17.0/blogc-source.7 2019-05-02 22:19:17.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BLOGC\-SOURCE" "7" "April 2019" "Rafael G. Martins" "blogc Manual" +.TH "BLOGC\-SOURCE" "7" "May 2019" "Rafael G. Martins" "blogc Manual" . .SH "NAME" \fBblogc\-source\fR \- blogc\'s source file format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc-template.7 new/blogc-0.17.0/blogc-template.7 --- old/blogc-0.16.1/blogc-template.7 2019-04-21 20:03:16.000000000 +0200 +++ new/blogc-0.17.0/blogc-template.7 2019-05-02 22:19:17.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BLOGC\-TEMPLATE" "7" "April 2019" "Rafael G. Martins" "blogc Manual" +.TH "BLOGC\-TEMPLATE" "7" "May 2019" "Rafael G. Martins" "blogc Manual" . .SH "NAME" \fBblogc\-template\fR \- blogc\'s template format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc.1 new/blogc-0.17.0/blogc.1 --- old/blogc-0.16.1/blogc.1 2019-04-21 20:03:17.000000000 +0200 +++ new/blogc-0.17.0/blogc.1 2019-05-02 22:19:17.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BLOGC" "1" "April 2019" "Rafael G. Martins" "blogc Manual" +.TH "BLOGC" "1" "May 2019" "Rafael G. Martins" "blogc Manual" . .SH "NAME" \fBblogc\fR \- a blog compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc.spec new/blogc-0.17.0/blogc.spec --- old/blogc-0.16.1/blogc.spec 2019-04-21 20:03:16.000000000 +0200 +++ new/blogc-0.17.0/blogc.spec 2019-05-02 22:19:16.000000000 +0200 @@ -1,11 +1,11 @@ Name: blogc -Version: 0.16.1 +Version: 0.17.0 Release: 1%{?dist} License: BSD Group: Applications/Text Summary: A blog compiler URL: https://blogc.rgm.io/ -Source0: https://github.com/blogc/blogc/releases/download/v0.16.1/blogc-0.16.1.tar.xz +Source0: https://github.com/blogc/blogc/releases/download/v0.17.0/blogc-0.17.0.tar.xz BuildRequires: gcc, libcmocka-devel, bash, coreutils, diffutils %if ! 0%{?el6} BuildRequires: git, tar, make @@ -43,7 +43,7 @@ blogc-runserver is a simple HTTP server to test blogc websites. %prep -%setup -q -n blogc-0.16.1 +%setup -q -n blogc-0.17.0 %build %if 0%{?el6} @@ -88,6 +88,9 @@ %license LICENSE %changelog +* Thu May 2 2019 Rafael G. Martins <rafael(a)rafaelmartins.eng.br> 0.17.0-1 +- New release. + * Sun Apr 21 2019 Rafael G. Martins <rafael(a)rafaelmartins.eng.br> 0.16.1-1 - New release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogc.spec.in new/blogc-0.17.0/blogc.spec.in --- old/blogc-0.16.1/blogc.spec.in 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/blogc.spec.in 2019-05-02 22:18:40.000000000 +0200 @@ -88,6 +88,9 @@ %license LICENSE %changelog +* Thu May 2 2019 Rafael G. Martins <rafael(a)rafaelmartins.eng.br> 0.17.0-1 +- New release. + * Sun Apr 21 2019 Rafael G. Martins <rafael(a)rafaelmartins.eng.br> 0.16.1-1 - New release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/blogcfile.5 new/blogc-0.17.0/blogcfile.5 --- old/blogc-0.16.1/blogcfile.5 2019-04-21 20:03:17.000000000 +0200 +++ new/blogc-0.17.0/blogcfile.5 2019-05-02 22:19:18.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BLOGCFILE" "5" "April 2019" "Rafael G. Martins" "blogc Manual" +.TH "BLOGCFILE" "5" "May 2019" "Rafael G. Martins" "blogc Manual" . .SH "NAME" \fBblogcfile\fR \- blogc\-make\'s configuration file @@ -92,6 +92,9 @@ \fBposts_per_page\fR (default: \fB10\fR): Number of posts per page in the pagination pages\. If negative, all the posts are included\. If \fB0\fR, no post listing pages are generated\. Also, if negative or \fB0\fR, the \fBpagination\fR build rule is disabled\. . .IP "\(bu" 4 +\fBposts_sort\fR (default: \fBfalse\fR): If true, blogc(1) will sort the posts by date, despite the order of the posts in the \fB[posts]\fR section, in descending order\. This setting is compatible with \fBhtml_order\fR and \fBatom_order\fR settings, to control the order of the posts\. +. +.IP "\(bu" 4 \fBsource_ext\fR (default: \fB\.txt\fR): The extension of the source files\. . .IP "\(bu" 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/man/blogc-pagination.7.ronn new/blogc-0.17.0/man/blogc-pagination.7.ronn --- old/blogc-0.16.1/man/blogc-pagination.7.ronn 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/man/blogc-pagination.7.ronn 2019-05-02 22:18:40.000000000 +0200 @@ -30,9 +30,16 @@ provided tag, instead of filtering the whole file set. * `FILTER_REVERSE`: - Any string, if defined, blogc(1) will list files in reverse order. This - is always the first filter applied to the files. All the other filters will - get the files already in the reverse order, and won't care about this. + Boolean (1/y/yes/true/on), if set, blogc(1) will list files in reverse order. + This filter is combined with `FILTER_SORT`, and all the other filters will + get the files already in the reverse order. + + * `FILTER_SORT`: + Boolean (1/y/yes/true/on), if set, blogc(1) will sort files using the `DATE` + variable provided in the files, instead of respecting the order of the + source files provided to blogc(1). The files are sorted in descending order + and combined with `FILTER_REVERSE`, that will result in the files sorted in + ascending order. All the other filters will get the files already sorted. ## TEMPLATE VARIABLES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/man/blogcfile.5.ronn new/blogc-0.17.0/man/blogcfile.5.ronn --- old/blogc-0.16.1/man/blogcfile.5.ronn 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/man/blogcfile.5.ronn 2019-05-02 22:18:40.000000000 +0200 @@ -115,6 +115,11 @@ are included. If `0`, no post listing pages are generated. Also, if negative or `0`, the `pagination` build rule is disabled. + * `posts_sort` (default: `false`): + If true, blogc(1) will sort the posts by date, despite the order of the posts + in the `[posts]` section, in descending order. This setting is compatible with + `html_order` and `atom_order` settings, to control the order of the posts. + * `source_ext` (default: `.txt`): The extension of the source files. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/blogc/loader.c new/blogc-0.17.0/src/blogc/loader.c --- old/blogc-0.16.1/src/blogc/loader.c 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/blogc/loader.c 2019-05-02 22:18:40.000000000 +0200 @@ -12,12 +12,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "datetime-parser.h" #include "source-parser.h" #include "template-parser.h" #include "loader.h" #include "../common/error.h" #include "../common/file.h" #include "../common/utils.h" +#include "../common/sort.h" char* @@ -97,26 +99,104 @@ } +static int +sort_source(const void *a, const void *b) +{ + const char *ca = bc_trie_lookup((bc_trie_t*) a, "c"); + const char *cb = bc_trie_lookup((bc_trie_t*) b, "c"); + + if (ca == NULL || cb == NULL) { + return 0; // wat + } + + return strcmp(cb, ca); +} + + +static int +sort_source_reverse(const void *a, const void *b) +{ + return sort_source(b, a); +} + + bc_slist_t* blogc_source_parse_from_files(bc_trie_t *conf, bc_slist_t *l, bc_error_t **err) { if (err == NULL || *err != NULL) return NULL; - bool reverse = bc_trie_lookup(conf, "FILTER_REVERSE"); + bool sort = bc_str_to_bool(bc_trie_lookup(conf, "FILTER_SORT")); + bc_slist_t* sources = NULL; + bc_error_t *tmp_err = NULL; + size_t with_date = 0; for (bc_slist_t *tmp = l; tmp != NULL; tmp = tmp->next) { - if (reverse) { - sources = bc_slist_prepend(sources, tmp->data); + char *f = tmp->data; + bc_trie_t *s = blogc_source_parse_from_file(f, &tmp_err); + if (s == NULL) { + *err = bc_error_new_printf(BLOGC_ERROR_LOADER, + "An error occurred while parsing source file: %s\n\n%s", + f, tmp_err->msg); + bc_error_free(tmp_err); + bc_slist_free_full(sources, (bc_free_func_t) bc_trie_free); + return NULL; } - else { - sources = bc_slist_append(sources, tmp->data); + + const char *date = bc_trie_lookup(s, "DATE"); + if (date != NULL) { + with_date++; } + + if (sort) { + if (date == NULL) { + *err = bc_error_new_printf(BLOGC_ERROR_LOADER, + "'FILTER_SORT' requires that 'DATE' variable is set for " + "every source file: %s", f); + bc_trie_free(s); + bc_slist_free_full(sources, (bc_free_func_t) bc_trie_free); + return NULL; + } + + char *timestamp = blogc_convert_datetime(date, "%s", &tmp_err); + if (timestamp == NULL) { + *err = bc_error_new_printf(BLOGC_ERROR_LOADER, + "An error occurred while parsing 'DATE' variable: %s" + "\n\n%s", f, tmp_err->msg); + bc_error_free(tmp_err); + bc_trie_free(s); + bc_slist_free_full(sources, (bc_free_func_t) bc_trie_free); + return NULL; + } + + bc_trie_insert(s, "c", timestamp); + } + + sources = bc_slist_append(sources, s); } - bc_error_t *tmp_err = NULL; - bc_slist_t *rv = NULL; - size_t with_date = 0; + if (with_date > 0 && with_date < bc_slist_length(l)) { + *err = bc_error_new_printf(BLOGC_ERROR_LOADER, + "'DATE' variable provided for at least one source file, but not " + "for all source files. It must be provided for all files."); + bc_slist_free_full(sources, (bc_free_func_t) bc_trie_free); + return NULL; + } + + bool reverse = bc_str_to_bool(bc_trie_lookup(conf, "FILTER_REVERSE")); + + if (sort) { + sources = bc_slist_sort(sources, reverse ? sort_source_reverse : sort_source); + } + else if (reverse) { + bc_slist_t *tmp_sources = NULL; + for (bc_slist_t *tmp = sources; tmp != NULL; tmp = tmp->next) { + tmp_sources = bc_slist_prepend(tmp_sources, tmp->data); + } + bc_slist_t *tmp = sources; + sources = tmp_sources; + bc_slist_free(tmp); + } const char *filter_tag = bc_trie_lookup(conf, "FILTER_TAG"); const char *filter_page = bc_trie_lookup(conf, "FILTER_PAGE"); @@ -146,19 +226,9 @@ size_t end = start + per_page; size_t counter = 0; + bc_slist_t *rv = NULL; for (bc_slist_t *tmp = sources; tmp != NULL; tmp = tmp->next) { - char *f = tmp->data; - bc_trie_t *s = blogc_source_parse_from_file(f, &tmp_err); - if (s == NULL) { - *err = bc_error_new_printf(BLOGC_ERROR_LOADER, - "An error occurred while parsing source file: %s\n\n%s", - f, tmp_err->msg); - bc_error_free(tmp_err); - tmp_err = NULL; - bc_slist_free_full(rv, (bc_free_func_t) bc_trie_free); - rv = NULL; - break; - } + bc_trie_t *s = tmp->data; if (filter_tag != NULL) { const char *tags_str = bc_trie_lookup(s, "TAGS"); // if user wants to filter by tag and no tag is provided, skip it @@ -188,21 +258,11 @@ } counter++; } - if (bc_trie_lookup(s, "DATE") != NULL) - with_date++; rv = bc_slist_append(rv, s); } bc_slist_free(sources); - if (with_date > 0 && with_date < bc_slist_length(rv)) { - *err = bc_error_new_printf(BLOGC_ERROR_LOADER, - "'DATE' variable provided for at least one source file, but not " - "for all source files. It must be provided for all files.\n"); - bc_slist_free_full(rv, (bc_free_func_t) bc_trie_free); - rv = NULL; - } - bool first = true; for (bc_slist_t *tmp = rv; tmp != NULL; tmp = tmp->next) { bc_trie_t *s = tmp->data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/blogc-make/ctx.c new/blogc-0.17.0/src/blogc-make/ctx.c --- old/blogc-0.16.1/src/blogc-make/ctx.c 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/blogc-make/ctx.c 2019-05-02 22:18:40.000000000 +0200 @@ -172,22 +172,21 @@ if (settings_file == NULL || err == NULL || *err != NULL) return NULL; - char real_filename[PATH_MAX]; - if (NULL == realpath(settings_file, real_filename)) { - *err = bc_error_new_printf(BLOGC_MAKE_ERROR_SETTINGS, - "Failed to resolve settings file (%s): %s", settings_file, - strerror(errno)); + char *abs_filename = bm_abspath(settings_file, err); + if (*err != NULL) return NULL; - } size_t content_len; - char *content = bc_file_get_contents(real_filename, true, &content_len, + char *content = bc_file_get_contents(abs_filename, true, &content_len, err); - if (*err != NULL) + if (*err != NULL) { + free(abs_filename); return NULL; + } bm_settings_t *settings = bm_settings_parse(content, content_len, err); if (settings == NULL || *err != NULL) { + free(abs_filename); free(content); return NULL; } @@ -208,6 +207,7 @@ atom_template = bm_atom_deploy(settings, err); atom_template_tmp = true; if (*err != NULL) { + free(abs_filename); bm_settings_free(settings); return NULL; } @@ -228,8 +228,9 @@ } rv->settings = settings; - rv->settings_fctx = bm_filectx_new(rv, real_filename, NULL, NULL); - rv->root_dir = bc_strdup(dirname(real_filename)); + rv->settings_fctx = bm_filectx_new(rv, abs_filename, NULL, NULL); + rv->root_dir = bc_strdup(dirname(abs_filename)); + free(abs_filename); const char *output_dir = getenv("OUTPUT_DIR"); rv->short_output_dir = bc_strdup(output_dir != NULL ? output_dir : "_build"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/blogc-make/exec-native.c new/blogc-0.17.0/src/blogc-make/exec-native.c --- old/blogc-0.16.1/src/blogc-make/exec-native.c 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/blogc-make/exec-native.c 2019-05-02 22:18:40.000000000 +0200 @@ -45,7 +45,7 @@ fprintf(stderr, "blogc-make: error: failed to create output " "directory (%s): %s\n", fname, strerror(errno)); free(fname); - exit(2); + return 1; } *tmp = bkp; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/blogc-make/rules.c new/blogc-0.17.0/src/blogc-make/rules.c --- old/blogc-0.16.1/src/blogc-make/rules.c 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/blogc-make/rules.c 2019-05-02 22:18:40.000000000 +0200 @@ -31,10 +31,16 @@ return; // something is wrong, let's not add any variable const char *value = bm_ctx_settings_lookup_str(ctx, variable); - if (value != NULL && ((0 == strcmp(value, "ASC")) || (0 == strcmp(value, "asc")))) - return; // user explicitly asked for ASC + bool asc = 0 == strcasecmp(value, "asc"); + bool sort = bc_str_to_bool(bm_ctx_settings_lookup(ctx, "posts_sort")); - bc_trie_insert(variables, "FILTER_REVERSE", bc_strdup("1")); + if (sort) { + bc_trie_insert(variables, "FILTER_SORT", bc_strdup("1")); + } + + if ((sort && asc) || (!sort && !asc)) { + bc_trie_insert(variables, "FILTER_REVERSE", bc_strdup("1")); + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/blogc-make/settings.c new/blogc-0.17.0/src/blogc-make/settings.c --- old/blogc-0.16.1/src/blogc-make/settings.c 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/blogc-make/settings.c 2019-05-02 22:18:40.000000000 +0200 @@ -28,6 +28,7 @@ {"main_template", "main.tmpl"}, {"source_ext", ".txt"}, {"listing_entry", NULL}, + {"posts_sort", NULL}, // pagination {"pagination_prefix", "page"}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/blogc-make/utils.c new/blogc-0.17.0/src/blogc-make/utils.c --- old/blogc-0.16.1/src/blogc-make/utils.c 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/blogc-make/utils.c 2019-05-02 22:18:40.000000000 +0200 @@ -6,10 +6,18 @@ * See the file LICENSE. */ +#include <errno.h> +#include <limits.h> #include <stdbool.h> #include <string.h> +#include <unistd.h> +#include "../common/error.h" #include "../common/utils.h" +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + char* bm_generate_filename(const char *dir, const char *prefix, const char *fname, @@ -59,3 +67,30 @@ return bc_string_free(rv, false); } + + +char* +bm_abspath(const char *path, bc_error_t **err) +{ + if (err == NULL || *err != NULL) + return NULL; + + if (path[0] == '/') { + return bc_strdup(path); + } + + char cwd[PATH_MAX]; + if (NULL == getcwd(cwd, sizeof(cwd))) { + *err = bc_error_new_printf(BLOGC_MAKE_ERROR_UTILS, + "Failed to detect absolute path (%s): %s", path, strerror(errno)); + return NULL; + } + + if (cwd[0] != '/') { + *err = bc_error_new_printf(BLOGC_MAKE_ERROR_UTILS, + "Failed to get current working directory: %s", cwd); + return NULL; + } + + return bc_strdup_printf("%s/%s", cwd, path); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/blogc-make/utils.h new/blogc-0.17.0/src/blogc-make/utils.h --- old/blogc-0.16.1/src/blogc-make/utils.h 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/blogc-make/utils.h 2019-05-02 22:18:40.000000000 +0200 @@ -9,7 +9,10 @@ #ifndef _MAKE_UTILS_H #define _MAKE_UTILS_H +#include "../common/error.h" + char* bm_generate_filename(const char *dir, const char *prefix, const char *fname, const char *ext); +char* bm_abspath(const char *path, bc_error_t **err); #endif /* _MAKE_UTILS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/common/error.c new/blogc-0.17.0/src/common/error.c --- old/blogc-0.16.1/src/common/error.c 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/common/error.c 2019-05-02 22:18:40.000000000 +0200 @@ -136,6 +136,12 @@ case BLOGC_MAKE_ERROR_EXEC: fprintf(stderr, "error: exec: %s\n", err->msg); break; + case BLOGC_MAKE_ERROR_ATOM: + fprintf(stderr, "error: atom: %s\n", err->msg); + break; + case BLOGC_MAKE_ERROR_UTILS: + fprintf(stderr, "error: utils: %s\n", err->msg); + break; default: fprintf(stderr, "error: %s\n", err->msg); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/common/error.h new/blogc-0.17.0/src/common/error.h --- old/blogc-0.16.1/src/common/error.h 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/src/common/error.h 2019-05-02 22:18:40.000000000 +0200 @@ -28,6 +28,7 @@ BLOGC_MAKE_ERROR_SETTINGS = 300, BLOGC_MAKE_ERROR_EXEC, BLOGC_MAKE_ERROR_ATOM, + BLOGC_MAKE_ERROR_UTILS, } bc_error_type_t; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/common/sort.c new/blogc-0.17.0/src/common/sort.c --- old/blogc-0.16.1/src/common/sort.c 1970-01-01 01:00:00.000000000 +0100 +++ new/blogc-0.17.0/src/common/sort.c 2019-05-02 22:18:40.000000000 +0200 @@ -0,0 +1,44 @@ +/* + * blogc: A blog compiler. + * Copyright (C) 2014-2019 Rafael G. Martins <rafael(a)rafaelmartins.eng.br> + * + * This program can be distributed under the terms of the BSD License. + * See the file LICENSE. + */ + +#include <stdbool.h> +#include "utils.h" +#include "sort.h" + + +bc_slist_t* +bc_slist_sort(bc_slist_t *l, bc_sort_func_t cmp) +{ + if (l == NULL) { + return NULL; + } + + bool swapped = false; + bc_slist_t *lptr = NULL; + bc_slist_t *rptr = NULL; + + do { + swapped = false; + lptr = l; + + while (lptr->next != rptr) { + if (0 < cmp(lptr->data, lptr->next->data)) { + void *tmp = lptr->data; + lptr->data = lptr->next->data; + lptr->next->data = tmp; + swapped = true; + } + + lptr = lptr->next; + } + + rptr = lptr; + } while(swapped); + + return l; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/src/common/sort.h new/blogc-0.17.0/src/common/sort.h --- old/blogc-0.16.1/src/common/sort.h 1970-01-01 01:00:00.000000000 +0100 +++ new/blogc-0.17.0/src/common/sort.h 2019-05-02 22:18:40.000000000 +0200 @@ -0,0 +1,18 @@ +/* + * blogc: A blog compiler. + * Copyright (C) 2014-2019 Rafael G. Martins <rafael(a)rafaelmartins.eng.br> + * + * This program can be distributed under the terms of the BSD License. + * See the file LICENSE. + */ + +#ifndef _SORT_H +#define _SORT_H + +#include "utils.h" + +typedef int (*bc_sort_func_t) (const void *a, const void *b); + +bc_slist_t* bc_slist_sort(bc_slist_t *l, bc_sort_func_t cmp); + +#endif /* _SORT_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/tests/blogc/check_loader.c new/blogc-0.17.0/tests/blogc/check_loader.c --- old/blogc-0.16.1/tests/blogc/check_loader.c 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/tests/blogc/check_loader.c 2019-05-02 22:18:40.000000000 +0200 @@ -169,21 +169,52 @@ static void -test_source_parse_from_files_filter_reverse(void **state) +test_source_parse_from_files_filter_sort(void **state) { - will_return(__wrap_bc_file_get_contents, "bola3.txt"); + will_return(__wrap_bc_file_get_contents, "bola1.txt"); will_return(__wrap_bc_file_get_contents, bc_strdup( - "ASD: 789\n" - "DATE: 2003-02-03 04:05:06\n" + "ASD: 123\n" + "DATE: 2001-02-02 04:05:06\n" "--------\n" "bola")); will_return(__wrap_bc_file_get_contents, "bola2.txt"); will_return(__wrap_bc_file_get_contents, bc_strdup( "ASD: 456\n" - "DATE: 2002-02-03 04:05:06\n" - "TAGS: bola, chunda\n" + "DATE: 2001-02-01 04:05:06\n" "--------\n" "bola")); + will_return(__wrap_bc_file_get_contents, "bola3.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 789\n" + "DATE: 2001-02-03 04:05:06\n" + "--------\n" + "bola")); + bc_error_t *err = NULL; + bc_slist_t *s = NULL; + s = bc_slist_append(s, bc_strdup("bola1.txt")); + s = bc_slist_append(s, bc_strdup("bola2.txt")); + s = bc_slist_append(s, bc_strdup("bola3.txt")); + bc_trie_t *c = bc_trie_new(free); + bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); + bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + assert_null(err); + assert_non_null(t); + assert_int_equal(bc_slist_length(t), 3); // it is enough, no need to look at the items + assert_int_equal(bc_trie_size(c), 5); + assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); + assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola3"); + assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola2"); + assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); + assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2001-02-01 04:05:06"); + bc_trie_free(c); + bc_slist_free_full(s, free); + bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); +} + + +static void +test_source_parse_from_files_filter_reverse(void **state) +{ will_return(__wrap_bc_file_get_contents, "bola1.txt"); will_return(__wrap_bc_file_get_contents, bc_strdup( "ASD: 123\n" @@ -191,13 +222,26 @@ "TAGS: chunda\n" "--------\n" "bola")); + will_return(__wrap_bc_file_get_contents, "bola2.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 456\n" + "DATE: 2002-02-03 04:05:06\n" + "TAGS: bola, chunda\n" + "--------\n" + "bola")); + will_return(__wrap_bc_file_get_contents, "bola3.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 789\n" + "DATE: 2003-02-03 04:05:06\n" + "--------\n" + "bola")); bc_error_t *err = NULL; bc_slist_t *s = NULL; s = bc_slist_append(s, bc_strdup("bola1.txt")); s = bc_slist_append(s, bc_strdup("bola2.txt")); s = bc_slist_append(s, bc_strdup("bola3.txt")); bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_REVERSE", bc_strdup("")); + bc_trie_insert(c, "FILTER_REVERSE", bc_strdup("1")); bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); @@ -207,7 +251,53 @@ assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola1"); assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2003-02-03 04:05:06"); assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2001-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "FILTER_REVERSE"), ""); + assert_string_equal(bc_trie_lookup(c, "FILTER_REVERSE"), "1"); + bc_trie_free(c); + bc_slist_free_full(s, free); + bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); +} + + +static void +test_source_parse_from_files_filter_sort_reverse(void **state) +{ + will_return(__wrap_bc_file_get_contents, "bola1.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 123\n" + "DATE: 2001-02-02 04:05:06\n" + "--------\n" + "bola")); + will_return(__wrap_bc_file_get_contents, "bola2.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 456\n" + "DATE: 2001-02-01 04:05:06\n" + "--------\n" + "bola")); + will_return(__wrap_bc_file_get_contents, "bola3.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 789\n" + "DATE: 2001-02-03 04:05:06\n" + "--------\n" + "bola")); + bc_error_t *err = NULL; + bc_slist_t *s = NULL; + s = bc_slist_append(s, bc_strdup("bola1.txt")); + s = bc_slist_append(s, bc_strdup("bola2.txt")); + s = bc_slist_append(s, bc_strdup("bola3.txt")); + bc_trie_t *c = bc_trie_new(free); + bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); + bc_trie_insert(c, "FILTER_REVERSE", bc_strdup("1")); + bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + assert_null(err); + assert_non_null(t); + assert_int_equal(bc_slist_length(t), 3); // it is enough, no need to look at the items + assert_int_equal(bc_trie_size(c), 6); + assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); + assert_string_equal(bc_trie_lookup(c, "FILTER_REVERSE"), "1"); + assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola2"); + assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola3"); + assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-01 04:05:06"); + assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2001-02-03 04:05:06"); bc_trie_free(c); bc_slist_free_full(s, free); bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); @@ -496,7 +586,7 @@ static void -test_source_parse_from_files_filter_by_page_and_tag(void **state) +test_source_parse_from_files_filter_sort_and_by_page_and_tag(void **state) { will_return(__wrap_bc_file_get_contents, "bola1.txt"); will_return(__wrap_bc_file_get_contents, bc_strdup( @@ -555,6 +645,7 @@ s = bc_slist_append(s, bc_strdup("bola6.txt")); s = bc_slist_append(s, bc_strdup("bola7.txt")); bc_trie_t *c = bc_trie_new(free); + bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); bc_trie_insert(c, "FILTER_TAG", bc_strdup("chunda")); bc_trie_insert(c, "FILTER_PAGE", bc_strdup("2")); bc_trie_insert(c, "FILTER_PER_PAGE", bc_strdup("2")); @@ -562,11 +653,12 @@ assert_null(err); assert_non_null(t); assert_int_equal(bc_slist_length(t), 2); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 11); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola5"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola7"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2005-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2007-02-03 04:05:06"); + assert_int_equal(bc_trie_size(c), 12); + assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola3"); + assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola2"); + assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2003-02-03 04:05:06"); + assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); + assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); assert_string_equal(bc_trie_lookup(c, "FILTER_TAG"), "chunda"); assert_string_equal(bc_trie_lookup(c, "FILTER_PAGE"), "2"); assert_string_equal(bc_trie_lookup(c, "FILTER_PER_PAGE"), "2"); @@ -755,7 +847,7 @@ assert_int_equal(err->type, BLOGC_ERROR_LOADER); assert_string_equal(err->msg, "'DATE' variable provided for at least one source file, but not for " - "all source files. It must be provided for all files.\n"); + "all source files. It must be provided for all files."); bc_error_free(err); assert_int_equal(bc_trie_size(c), 0); bc_trie_free(c); @@ -764,6 +856,73 @@ static void +test_source_parse_from_files_filter_sort_without_all_dates(void **state) +{ + will_return(__wrap_bc_file_get_contents, "bola1.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 123\n" + "DATE: 2002-02-03 04:05:06\n" + "--------\n" + "bola")); + will_return(__wrap_bc_file_get_contents, "bola2.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 456\n" + "--------\n" + "bola")); + bc_error_t *err = NULL; + bc_slist_t *s = NULL; + s = bc_slist_append(s, bc_strdup("bola1.txt")); + s = bc_slist_append(s, bc_strdup("bola2.txt")); + s = bc_slist_append(s, bc_strdup("bola3.txt")); + bc_trie_t *c = bc_trie_new(free); + bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); + bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + assert_null(t); + assert_non_null(err); + assert_int_equal(err->type, BLOGC_ERROR_LOADER); + assert_string_equal(err->msg, + "'FILTER_SORT' requires that 'DATE' variable is set for every source " + "file: bola2.txt"); + bc_error_free(err); + assert_int_equal(bc_trie_size(c), 1); + assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); + bc_trie_free(c); + bc_slist_free_full(s, free); +} + + +static void +test_source_parse_from_files_filter_sort_with_wrong_date(void **state) +{ + will_return(__wrap_bc_file_get_contents, "bola1.txt"); + will_return(__wrap_bc_file_get_contents, bc_strdup( + "ASD: 123\n" + "DATE: 2002-02-03 04:05:ab\n" + "--------\n" + "bola")); + bc_error_t *err = NULL; + bc_slist_t *s = NULL; + s = bc_slist_append(s, bc_strdup("bola1.txt")); + s = bc_slist_append(s, bc_strdup("bola2.txt")); + s = bc_slist_append(s, bc_strdup("bola3.txt")); + bc_trie_t *c = bc_trie_new(free); + bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); + bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + assert_null(t); + assert_non_null(err); + assert_int_equal(err->type, BLOGC_ERROR_LOADER); + assert_string_equal(err->msg, + "An error occurred while parsing 'DATE' variable: bola1.txt\n\nInvalid " + "first digit of seconds. Found 'a', must be integer >= 0 and <= 6."); + bc_error_free(err); + assert_int_equal(bc_trie_size(c), 1); + assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); + bc_trie_free(c); + bc_slist_free_full(s, free); +} + + +static void test_source_parse_from_files_null(void **state) { bc_error_t *err = NULL; @@ -790,15 +949,19 @@ unit_test(test_source_parse_from_file), unit_test(test_source_parse_from_file_null), unit_test(test_source_parse_from_files), + unit_test(test_source_parse_from_files_filter_sort), unit_test(test_source_parse_from_files_filter_reverse), + unit_test(test_source_parse_from_files_filter_sort_reverse), unit_test(test_source_parse_from_files_filter_by_tag), unit_test(test_source_parse_from_files_filter_by_page), unit_test(test_source_parse_from_files_filter_by_page2), unit_test(test_source_parse_from_files_filter_by_page3), - unit_test(test_source_parse_from_files_filter_by_page_and_tag), + unit_test(test_source_parse_from_files_filter_sort_and_by_page_and_tag), unit_test(test_source_parse_from_files_filter_by_page_invalid), unit_test(test_source_parse_from_files_filter_by_page_invalid2), unit_test(test_source_parse_from_files_without_all_dates), + unit_test(test_source_parse_from_files_filter_sort_without_all_dates), + unit_test(test_source_parse_from_files_filter_sort_with_wrong_date), unit_test(test_source_parse_from_files_null), }; return run_tests(tests); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/tests/blogc-make/check_blogc_make.sh.in new/blogc-0.17.0/tests/blogc-make/check_blogc_make.sh.in --- old/blogc-0.16.1/tests/blogc-make/check_blogc_make.sh.in 2019-04-21 20:02:43.000000000 +0200 +++ new/blogc-0.17.0/tests/blogc-make/check_blogc_make.sh.in 2019-05-02 22:18:40.000000000 +0200 @@ -755,6 +755,226 @@ rm -rf "${TEMP}/proj/_build" +### default settings with some posts, order asc, posts_sort + +cat > "${TEMP}/proj/blogcfile" <<EOF +[global] +AUTHOR_NAME = Lol +AUTHOR_EMAIL = author(a)example.com +SITE_TITLE = Lol's Website +SITE_TAGLINE = WAT?! +BASE_DOMAIN = http://example.org + +[settings] +html_order = asc +atom_order = asc +posts_sort = yes + +[posts] +foo +bar +EOF + +${TESTS_ENVIRONMENT} @abs_top_builddir@/blogc-make -f "${TEMP}/proj/blogcfile" 2>&1 | tee "${TEMP}/output.txt" +grep "_build/index\\.html" "${TEMP}/output.txt" +grep "_build/atom\\.xml" "${TEMP}/output.txt" +grep "_build/page/1/index\\.html" "${TEMP}/output.txt" +grep "_build/post/foo/index\\.html" "${TEMP}/output.txt" +grep "_build/post/bar/index\\.html" "${TEMP}/output.txt" + +rm "${TEMP}/output.txt" + +cat > "${TEMP}/expected-index.html" <<EOF + +Listing: Bar - Sep 01, 2016, 12:00 AM GMT + +Listing: Foo - Oct 01, 2016, 12:00 AM GMT + + +EOF +diff -uN "${TEMP}/proj/_build/index.html" "${TEMP}/expected-index.html" +diff -uN "${TEMP}/proj/_build/page/1/index.html" "${TEMP}/expected-index.html" + +cat > "${TEMP}/expected-atom.xml" <<EOF +<?xml version="1.0" encoding="utf-8"?> +<feed xmlns="http://www.w3.org/2005/Atom"> + <title type="text">Lol's Website</title> + <id>http://example.org/atom.xml</id> + <updated>2016-09-01T00:00:00Z</updated> + <link href="http://example.org/" /> + <link href="http://example.org/atom.xml" rel="self" /> + <author> + <name>Lol</name> + <email>author(a)example.com</email> + </author> + <subtitle type="text">WAT?!</subtitle> + + <entry> + <title type="text">Bar</title> + <id>http://example.org/post/bar/index.html</id> + <updated>2016-09-01T00:00:00Z</updated> + <published>2016-09-01T00:00:00Z</published> + <link href="http://example.org/post/bar/index.html" /> + <author> + <name>Lol</name> + <email>author(a)example.com</email> + </author> + <content type="html"><![CDATA[This is bar. +]]></content> + </entry> + + <entry> + <title type="text">Foo</title> + <id>http://example.org/post/foo/index.html</id> + <updated>2016-10-01T00:00:00Z</updated> + <published>2016-10-01T00:00:00Z</published> + <link href="http://example.org/post/foo/index.html" /> + <author> + <name>Lol</name> + <email>author(a)example.com</email> + </author> + <content type="html"><![CDATA[This is foo. +]]></content> + </entry> + +</feed> +EOF +diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" + +cat > "${TEMP}/expected-post-foo.html" <<EOF + + +Foo - Oct 01, 2016, 12:00 AM GMT + +This is foo. + + +EOF +diff -uN "${TEMP}/proj/_build/post/foo/index.html" "${TEMP}/expected-post-foo.html" + +cat > "${TEMP}/expected-post-bar.html" <<EOF + + +Bar - Sep 01, 2016, 12:00 AM GMT + +This is bar. + + +EOF +diff -uN "${TEMP}/proj/_build/post/bar/index.html" "${TEMP}/expected-post-bar.html" + +rm -rf "${TEMP}/proj/_build" + + +### default settings with some posts, order desc, posts_sort + +cat > "${TEMP}/proj/blogcfile" <<EOF +[global] +AUTHOR_NAME = Lol +AUTHOR_EMAIL = author(a)example.com +SITE_TITLE = Lol's Website +SITE_TAGLINE = WAT?! +BASE_DOMAIN = http://example.org + +[settings] +posts_sort = yes + +[posts] +foo +bar +EOF + +${TESTS_ENVIRONMENT} @abs_top_builddir@/blogc-make -f "${TEMP}/proj/blogcfile" 2>&1 | tee "${TEMP}/output.txt" +grep "_build/index\\.html" "${TEMP}/output.txt" +grep "_build/atom\\.xml" "${TEMP}/output.txt" +grep "_build/page/1/index\\.html" "${TEMP}/output.txt" +grep "_build/post/foo/index\\.html" "${TEMP}/output.txt" +grep "_build/post/bar/index\\.html" "${TEMP}/output.txt" + +rm "${TEMP}/output.txt" + +cat > "${TEMP}/expected-index.html" <<EOF + +Listing: Foo - Oct 01, 2016, 12:00 AM GMT + +Listing: Bar - Sep 01, 2016, 12:00 AM GMT + + +EOF +diff -uN "${TEMP}/proj/_build/index.html" "${TEMP}/expected-index.html" +diff -uN "${TEMP}/proj/_build/page/1/index.html" "${TEMP}/expected-index.html" + +cat > "${TEMP}/expected-atom.xml" <<EOF +<?xml version="1.0" encoding="utf-8"?> +<feed xmlns="http://www.w3.org/2005/Atom"> + <title type="text">Lol's Website</title> + <id>http://example.org/atom.xml</id> + <updated>2016-10-01T00:00:00Z</updated> + <link href="http://example.org/" /> + <link href="http://example.org/atom.xml" rel="self" /> + <author> + <name>Lol</name> + <email>author(a)example.com</email> + </author> + <subtitle type="text">WAT?!</subtitle> + + <entry> + <title type="text">Foo</title> + <id>http://example.org/post/foo/index.html</id> + <updated>2016-10-01T00:00:00Z</updated> + <published>2016-10-01T00:00:00Z</published> + <link href="http://example.org/post/foo/index.html" /> + <author> + <name>Lol</name> + <email>author(a)example.com</email> + </author> + <content type="html"><![CDATA[This is foo. +]]></content> + </entry> + + <entry> + <title type="text">Bar</title> + <id>http://example.org/post/bar/index.html</id> + <updated>2016-09-01T00:00:00Z</updated> + <published>2016-09-01T00:00:00Z</published> + <link href="http://example.org/post/bar/index.html" /> + <author> + <name>Lol</name> + <email>author(a)example.com</email> + </author> + <content type="html"><![CDATA[This is bar. +]]></content> + </entry> + +</feed> +EOF +diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" + +cat > "${TEMP}/expected-post-foo.html" <<EOF + + +Foo - Oct 01, 2016, 12:00 AM GMT + +This is foo. + + +EOF +diff -uN "${TEMP}/proj/_build/post/foo/index.html" "${TEMP}/expected-post-foo.html" + +cat > "${TEMP}/expected-post-bar.html" <<EOF + + +Bar - Sep 01, 2016, 12:00 AM GMT + +This is bar. + + +EOF +diff -uN "${TEMP}/proj/_build/post/bar/index.html" "${TEMP}/expected-post-bar.html" + +rm -rf "${TEMP}/proj/_build" + + ### default settings with some posts, order asc, listing_entry cat > "${TEMP}/proj/content/hue.txt" <<EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/blogc-0.16.1/tests/common/check_sort.c new/blogc-0.17.0/tests/common/check_sort.c --- old/blogc-0.16.1/tests/common/check_sort.c 1970-01-01 01:00:00.000000000 +0100 +++ new/blogc-0.17.0/tests/common/check_sort.c 2019-05-02 22:18:40.000000000 +0200 @@ -0,0 +1,147 @@ +/* + * blogc: A blog compiler. + * Copyright (C) 2014-2019 Rafael G. Martins <rafael(a)rafaelmartins.eng.br> + * + * This program can be distributed under the terms of the BSD License. + * See the file LICENSE. + */ + +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> +#include <stdlib.h> +#include "../../src/common/utils.h" +#include "../../src/common/sort.h" + + +static int +sort_func(void *a, void *b) +{ + return strcmp((char*) a, (char*) b); +} + + +static void +test_slist_sort_empty(void **state) +{ + bc_slist_t *l = NULL; + assert_null(bc_slist_sort(l, sort_func)); +} + + +static void +test_slist_sort_single(void **state) +{ + bc_slist_t *l = NULL; + l = bc_slist_append(l, bc_strdup("a")); + + l = bc_slist_sort(l, sort_func); + + assert_non_null(l); + assert_string_equal(l->data, "a"); + assert_null(l->next); + + bc_slist_free_full(l, free); +} + + +static void +test_slist_sort_sorted(void **state) +{ + bc_slist_t *l = NULL; + l = bc_slist_append(l, bc_strdup("a")); + l = bc_slist_append(l, bc_strdup("b")); + l = bc_slist_append(l, bc_strdup("c")); + + l = bc_slist_sort(l, sort_func); + + assert_non_null(l); + assert_string_equal(l->data, "a"); + assert_string_equal(l->next->data, "b"); + assert_string_equal(l->next->next->data, "c"); + assert_null(l->next->next->next); + + bc_slist_free_full(l, free); +} + + +static void +test_slist_sort_reverse(void **state) +{ + bc_slist_t *l = NULL; + l = bc_slist_append(l, bc_strdup("d")); + l = bc_slist_append(l, bc_strdup("c")); + l = bc_slist_append(l, bc_strdup("b")); + l = bc_slist_append(l, bc_strdup("a")); + + l = bc_slist_sort(l, sort_func); + + assert_non_null(l); + assert_string_equal(l->data, "a"); + assert_string_equal(l->next->data, "b"); + assert_string_equal(l->next->next->data, "c"); + assert_string_equal(l->next->next->next->data, "d"); + assert_null(l->next->next->next->next); + + bc_slist_free_full(l, free); +} + + +static void +test_slist_sort_mixed1(void **state) +{ + bc_slist_t *l = NULL; + l = bc_slist_append(l, bc_strdup("a")); + l = bc_slist_append(l, bc_strdup("d")); + l = bc_slist_append(l, bc_strdup("c")); + l = bc_slist_append(l, bc_strdup("b")); + + l = bc_slist_sort(l, sort_func); + + assert_non_null(l); + assert_string_equal(l->data, "a"); + assert_string_equal(l->next->data, "b"); + assert_string_equal(l->next->next->data, "c"); + assert_string_equal(l->next->next->next->data, "d"); + assert_null(l->next->next->next->next); + + bc_slist_free_full(l, free); +} + + +static void +test_slist_sort_mixed2(void **state) +{ + bc_slist_t *l = NULL; + l = bc_slist_append(l, bc_strdup("c")); + l = bc_slist_append(l, bc_strdup("b")); + l = bc_slist_append(l, bc_strdup("a")); + l = bc_slist_append(l, bc_strdup("d")); + + l = bc_slist_sort(l, sort_func); + + assert_non_null(l); + assert_string_equal(l->data, "a"); + assert_string_equal(l->next->data, "b"); + assert_string_equal(l->next->next->data, "c"); + assert_string_equal(l->next->next->next->data, "d"); + assert_null(l->next->next->next->next); + + bc_slist_free_full(l, free); +} + + +int +main(void) +{ + const UnitTest tests[] = { + unit_test(test_slist_sort_empty), + unit_test(test_slist_sort_single), + unit_test(test_slist_sort_sorted), + unit_test(test_slist_sort_reverse), + unit_test(test_slist_sort_mixed1), + unit_test(test_slist_sort_mixed2), + }; + return run_tests(tests); +}

1 0

commit waybar for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package waybar for openSUSE:Factory checked in at 2019-05-03 22:47:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/waybar (Old) and /work/SRC/openSUSE:Factory/.waybar.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "waybar" Fri May 3 22:47:29 2019 rev:5 rq:700319 version:0.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/waybar/waybar.changes 2019-04-26 22:54:57.665295380 +0200 +++ /work/SRC/openSUSE:Factory/.waybar.new.5148/waybar.changes 2019-05-03 22:47:31.379920240 +0200 @@ -1,0 +2,11 @@ +Fri May 3 06:52:48 UTC 2019 - mvetter(a)suse.com + +- Update to 0.6.1: + Added: + * Labels rotation #287 + Changed: + * s/hidded/hidden/ typo fixed 4d4562a + * JSON parser threads concurrence fixed d027243 + * Custom modules with once interval fixed e8f31a0 + +------------------------------------------------------------------- Old: ---- 0.6.0.tar.gz New: ---- 0.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ waybar.spec ++++++ --- /var/tmp/diff_new_pack.mTCPE7/_old 2019-05-03 22:47:31.867921360 +0200 +++ /var/tmp/diff_new_pack.mTCPE7/_new 2019-05-03 22:47:31.871921369 +0200 @@ -17,7 +17,7 @@ Name: waybar -Version: 0.6.0 +Version: 0.6.1 Release: 0 Summary: Customizable Wayland bar for Sway and Wlroots based compositors License: MIT ++++++ 0.6.0.tar.gz -> 0.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Waybar-0.6.0/include/modules/sway/ipc/client.hpp new/Waybar-0.6.1/include/modules/sway/ipc/client.hpp --- old/Waybar-0.6.0/include/modules/sway/ipc/client.hpp 2019-04-25 16:59:22.000000000 +0200 +++ new/Waybar-0.6.1/include/modules/sway/ipc/client.hpp 2019-05-02 14:31:02.000000000 +0200 @@ -44,6 +44,7 @@ int fd_event_; std::mutex mutex_; std::mutex mutex_event_; + std::mutex mutex_parser_; util::JsonParser parser_; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Waybar-0.6.0/meson.build new/Waybar-0.6.1/meson.build --- old/Waybar-0.6.0/meson.build 2019-04-25 16:59:22.000000000 +0200 +++ new/Waybar-0.6.1/meson.build 2019-05-02 14:31:02.000000000 +0200 @@ -1,6 +1,6 @@ project( 'waybar', 'cpp', 'c', - version: '0.6.0', + version: '0.6.1', license: 'MIT', default_options : [ 'cpp_std=c++17', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Waybar-0.6.0/resources/style.css new/Waybar-0.6.1/resources/style.css --- old/Waybar-0.6.0/resources/style.css 2019-04-25 16:59:22.000000000 +0200 +++ new/Waybar-0.6.1/resources/style.css 2019-05-02 14:31:02.000000000 +0200 @@ -10,9 +10,11 @@ background: rgba(43, 48, 59, 0.5); border-bottom: 3px solid rgba(100, 114, 125, 0.5); color: #ffffff; + transition-property: background, background-color; + transition-duration: .5s; } -window#waybar.hidded { +window#waybar.hidden { opacity: 0.2; } @@ -32,6 +34,7 @@ window#waybar.chromium { background-color: #DEE1E6; color: #000000; + border: none; } /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-str… */ @@ -42,11 +45,19 @@ border-bottom: 3px solid transparent; } +window#waybar.chromium #workspaces button { + color: #3F3F3F; +} + #workspaces button.focused { background: #64727D; border-bottom: 3px solid #ffffff; } +window#waybar.chromium #workspaces button.focused { + color: #ffffff; +} + #workspaces button.urgent { background-color: #eb4d4b; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Waybar-0.6.0/src/ALabel.cpp new/Waybar-0.6.1/src/ALabel.cpp --- old/Waybar-0.6.0/src/ALabel.cpp 2019-04-25 16:59:22.000000000 +0200 +++ new/Waybar-0.6.1/src/ALabel.cpp 2019-05-02 14:31:02.000000000 +0200 @@ -7,7 +7,7 @@ : config_(config), format_(config_["format"].isString() ? config_["format"].asString() : format), interval_(config_["interval"] == "once" - ? std::chrono::seconds(std::numeric_limits<int>::infinity()) + ? std::chrono::seconds(100000000) : std::chrono::seconds( config_["interval"].isUInt() ? config_["interval"].asUInt() : interval)), default_format_(format_) { @@ -16,6 +16,11 @@ label_.set_max_width_chars(config_["max-length"].asUInt()); label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END); } + + if (config_["rotate"].isUInt()) { + label_.set_angle(config["rotate"].asUInt()); + } + if (config_["format-alt"].isString()) { event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &ALabel::handleToggle)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Waybar-0.6.0/src/bar.cpp new/Waybar-0.6.1/src/bar.cpp --- old/Waybar-0.6.0/src/bar.cpp 2019-04-25 16:59:22.000000000 +0200 +++ new/Waybar-0.6.1/src/bar.cpp 2019-05-02 14:31:02.000000000 +0200 @@ -198,9 +198,9 @@ visible = !visible; auto zone = visible ? height_ : 0; if (!visible) { - window.get_style_context()->add_class("hidded"); + window.get_style_context()->add_class("hidden"); } else { - window.get_style_context()->remove_class("hidded"); + window.get_style_context()->remove_class("hidden"); } zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, zone); wl_surface_commit(surface); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Waybar-0.6.0/src/modules/sway/ipc/client.cpp new/Waybar-0.6.1/src/modules/sway/ipc/client.cpp --- old/Waybar-0.6.0/src/modules/sway/ipc/client.cpp 2019-04-25 16:59:22.000000000 +0200 +++ new/Waybar-0.6.1/src/modules/sway/ipc/client.cpp 2019-05-02 14:31:02.000000000 +0200 @@ -104,6 +104,7 @@ } total += res; } + std::lock_guard<std::mutex> lock(mutex_parser_); auto parsed = parser_.parse(&payload.front()); return {data32[0], data32[1], parsed}; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Waybar-0.6.0/src/modules/sway/window.cpp new/Waybar-0.6.1/src/modules/sway/window.cpp --- old/Waybar-0.6.0/src/modules/sway/window.cpp 2019-04-25 16:59:22.000000000 +0200 +++ new/Waybar-0.6.1/src/modules/sway/window.cpp 2019-05-02 14:31:02.000000000 +0200 @@ -43,21 +43,19 @@ void Window::onCmd(const struct Ipc::ipc_response& res) { auto [nb, id, name, app_id] = getFocusedNode(res.payload); - if (nb == 0) { - bar_.window.get_style_context()->add_class("empty"); - } else { - bar_.window.get_style_context()->remove_class("empty"); - } if (!app_id_.empty()) { bar_.window.get_style_context()->remove_class(app_id_); } - if (nb == 1) { + if (nb == 0) { + bar_.window.get_style_context()->add_class("empty"); + } else if (nb == 1) { bar_.window.get_style_context()->add_class("solo"); if (!app_id.empty()) { bar_.window.get_style_context()->add_class(app_id); } } else { bar_.window.get_style_context()->remove_class("solo"); + bar_.window.get_style_context()->remove_class("empty"); } app_id_ = app_id; if (windowId_ != id || window_ != name) {

1 0

commit python-fanficfare for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package python-fanficfare for openSUSE:Factory checked in at 2019-05-03 22:47:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-fanficfare (Old) and /work/SRC/openSUSE:Factory/.python-fanficfare.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-fanficfare" Fri May 3 22:47:26 2019 rev:8 rq:700318 version:3.7.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-fanficfare/python-fanficfare.changes 2019-04-28 20:15:41.750334864 +0200 +++ /work/SRC/openSUSE:Factory/.python-fanficfare.new.5148/python-fanficfare.changes 2019-05-03 22:47:26.915909991 +0200 @@ -1,0 +2,15 @@ +Fri May 3 08:45:55 CEST 2019 - Matej Cepl <mcepl(a)suse.com> + +- Update to 3.7.6: + - Fix CLI Upload to have correct version. + - Fix for BS halping with string conversions on PI update from + Saved Meta Column. + - More improvements for adapter_asianfanficscom, including + auto_sub feature, thanks oh45454545 + - Improvements for adapter_asianfanficscom, thanks oh45454545 + - Update adapter_asianfanficscom to fetch chapter texts from + JSON url. + - Ad wall indicator has changed for adapter_webnovelcom. + - Fix use_archived_author in AO3. + +------------------------------------------------------------------- Old: ---- FanFicFare-3.7.0.tar.gz New: ---- FanFicFare-3.7.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-fanficfare.spec ++++++ --- /var/tmp/diff_new_pack.slTqOD/_old 2019-05-03 22:47:27.411911130 +0200 +++ /var/tmp/diff_new_pack.slTqOD/_new 2019-05-03 22:47:27.415911139 +0200 @@ -20,7 +20,7 @@ %define modnamedown fanficfare %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-fanficfare -Version: 3.7.0 +Version: 3.7.6 Release: 0 Summary: Tool for making eBooks from stories on fanfiction and other web sites License: GPL-3.0-only ++++++ FanFicFare-3.7.0.tar.gz -> FanFicFare-3.7.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/calibre-plugin/__init__.py new/FanFicFare-3.7.6/calibre-plugin/__init__.py --- old/FanFicFare-3.7.0/calibre-plugin/__init__.py 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/calibre-plugin/__init__.py 2019-04-24 05:29:17.000000000 +0200 @@ -33,7 +33,7 @@ from calibre.customize import InterfaceActionBase # pulled out from FanFicFareBase for saving in prefs.py -__version__ = (3, 7, 0) +__version__ = (3, 7, 6) ## Apparently the name for this class doesn't matter--it was still ## 'demo' for the first few versions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/calibre-plugin/plugin-defaults.ini new/FanFicFare-3.7.6/calibre-plugin/plugin-defaults.ini --- old/FanFicFare-3.7.0/calibre-plugin/plugin-defaults.ini 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/calibre-plugin/plugin-defaults.ini 2019-04-24 05:29:17.000000000 +0200 @@ -2133,10 +2133,11 @@ [www.asianfanfics.com] ## Unlike most sites, asianfanfics.com, instead of denying access to -## 'adult' content, will censor the text of stories to remove the -## 'adult' words. FanFicFare cannot detect when this happens, but if -## you set your username and password, FFF will log you in to prevent -## that. +## 'adult' or subscriber-only content, will censor the text of stories +## to remove 'adult' words or entire portions of the text. This is why +## an account is required to download stories from this site. It is +## also strongly recommended to consider enabling auto_sub in order to +## further avoid this from happening. #username:YourName #password:yourpassword @@ -2163,6 +2164,14 @@ ## chapter_start to remove the standard chapter title, as shown below. inject_chapter_title:false +## This website removes certain HTML tags and portions of the story +## from subscriber-only stories. It is strongly recommended to turn +## this option on. This will automatically subscribe you to such +## stories in order to acquire the unaltered text. You can +## unsubscribe manually on the website after the story has been +## downloaded. +auto_sub:false + [www.bdsmlibrary.com] ## Some sites also require the user to confirm they are adult for ## adult content. Uncomment by removing '#' in front of is_adult. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/fanficfare/adapters/adapter_archiveofourownorg.py new/FanFicFare-3.7.6/fanficfare/adapters/adapter_archiveofourownorg.py --- old/FanFicFare-3.7.0/fanficfare/adapters/adapter_archiveofourownorg.py 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/fanficfare/adapters/adapter_archiveofourownorg.py 2019-04-24 05:29:17.000000000 +0200 @@ -225,8 +225,7 @@ # Hope Roy [archived by <a href="/users/ssa_archivist/pseuds/ssa_archivist" rel="author">ssa_archivist</a>] # </h3> # stripped:"Hope Roy [archived by ssa_archivist]" - - m = re.match(r'(?P<author>.*) \[archived by (?P<archivist>.*)\]',stripHTML(byline)) + m = re.match(r'(?P<author>.*) \[archived by ?(?P<archivist>.*)\]',stripHTML(byline)) if( m and len(alist) == 1 and self.getConfig('use_archived_author') ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/fanficfare/adapters/adapter_asianfanficscom.py new/FanFicFare-3.7.6/fanficfare/adapters/adapter_asianfanficscom.py --- old/FanFicFare-3.7.0/fanficfare/adapters/adapter_asianfanficscom.py 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/fanficfare/adapters/adapter_asianfanficscom.py 2019-04-24 05:29:17.000000000 +0200 @@ -4,6 +4,7 @@ import logging logger = logging.getLogger(__name__) import re +import json from ..htmlcleanup import stripHTML from .. import exceptions as exceptions @@ -70,45 +71,40 @@ else: params['username'] = self.getConfig("username") params['password'] = self.getConfig("password") + + if not params['username']: + raise exceptions.FailedToLogin(url,params['username']) + params['from_url'] = url params['csrf_aff_token'] = soup.find('input',{'name':'csrf_aff_token'})['value'] + if not params['csrf_aff_token']: + raise exceptions.FailedToDownload('Error when logging in. This usually means a change in the website code.') + loginUrl = 'https://' + self.getSiteDomain() + '/login/index' logger.info("Will now login to URL (%s) as (%s)" % (loginUrl, params['username'])) - d = self._postUrl(loginUrl, params, usecache=False) - - if params['username'] not in d: # check if username is mentioned in output (logged in as, var visitorName, etc.) - logger.info("Failed to login to URL %s as %s" % (loginUrl, params['username'])) + data = self._postUrl(loginUrl, params) + soup = self.make_soup(data) + if self.loginNeededCheck(soup): + logger.info('Failed to login to URL %s as %s' % (loginUrl, params['username'])) raise exceptions.FailedToLogin(url,params['username']) - return False - else: - return True - def doAdultCheck(self, url, soup): - check = soup.find('form',{'action':'/account/toggle_age'}) - if check: - logger.debug("Found adult check") - if self.is_adult or self.getConfig("is_adult"): - contentFilter = check.find('a',{'href':'/account/mark_over_18'}) #two different types of adult checks - if contentFilter: - loginUrl = 'https://' + self.getSiteDomain() + '/account/mark_over_18' - self._fetchUrl(loginUrl) - else: - params = {} - params['csrf_aff_token'] = check.find('input',{'name':'csrf_aff_token'})['value'] - params['is_of_age'] = '1' - params['current_url'] = '/story/view/' + self.story.getMetadata('storyId') - loginUrl = 'https://' + self.getSiteDomain() + '/account/toggle_age' - self._postUrl(loginUrl,params) - - data = self._fetchUrl(url,usecache=False) - soup = self.make_soup(data) - if "Are you over 18 years old" in data: - raise exceptions.FailedToDownload("Error downloading Chapter: %s! Missing required element!" % url) - else: - return soup + def loginNeededCheck(self,soup): + return soup.find('div',{'id':'login'}) != None + + def doStorySubscribe(self, url, soup): + subHref = soup.find('a',{'id':'subscribe'}) + if subHref: + #does not work when using https - 403 + subUrl = 'http://' + self.getSiteDomain() + subHref['href'] + self._fetchUrl(subUrl) + data = self._fetchUrl(url,usecache=False) + soup = self.make_soup(data) + check = soup.find('div',{'class':'click-to-read-full'}) + if check: + return False else: - raise exceptions.AdultCheckRequired(self.url) + return soup else: return False @@ -123,7 +119,6 @@ def doExtractChapterUrlsAndMetadata(self,get_cover=True): url = self.url logger.info("url: "+url) - try: data = self._fetchUrl(url) @@ -136,18 +131,23 @@ # use BeautifulSoup HTML parser to make everything easier to find. soup = self.make_soup(data) - # it is best to log in whenever possible, unless already logged in from cache.. - if self.password or self.getConfig("password") and "Logout" not in data: + if self.loginNeededCheck(soup): + # always login if not already to avoid lots of headaches self.performLogin(url,soup) + # refresh website after logging in data = self._fetchUrl(url,usecache=False) soup = self.make_soup(data) - elif "Logout" not in data: - logger.info('Note: Logging in is highly recommended, as this website censors text if not logged in.') - # adult check - self.checkSoup = self.doAdultCheck(url,soup) - if self.checkSoup: - soup = self.checkSoup + # subscription check + subCheck = soup.find('div',{'class':'click-to-read-full'}) + if subCheck and self.getConfig("auto_sub"): + subSoup = self.doStorySubscribe(url,soup) + if subSoup: + soup = subSoup + else: + raise exceptions.FailedToDownload("Error when subscribing to story. This usually means a change in the website code.") + elif subCheck and not self.getConfig("auto_sub"): + raise exceptions.FailedToDownload("This story is only available to subscribers. You can subscribe manually on the web site, or set auto_sub:true in personal.ini.") ## Title a = soup.find('h1', {'id': 'story-title'}) @@ -171,6 +171,7 @@ for index, chapter in enumerate(chapters): if chapter.text != 'Foreword': # skip the foreword self.add_chapter(chapter.text,'https://' + self.getSiteDomain() + chapter['value']) # note: AFF cuts off chapter names in list. this gets kind of fixed later on + # find timestamp a = soup.find('span', text='Updated') if a == None: @@ -189,7 +190,10 @@ self.story.setMetadata('status', 'In-Progress') # story description - a = soup.find('div', {'id':'story-description'}) + jsonlink = soup.find('link',href=re.compile(r'/api/forewords/[0-9]+/foreword_[0-9a-z]+.json')) + fore_json = json.loads(self._fetchUrl(jsonlink['href'])) + content = self.make_soup(fore_json['post']).find('body') # BS4 adds <html><body> if not present. + a = content.find('div', {'id':'story-description'}) if a: self.setDescription(url,a) @@ -216,6 +220,12 @@ a = a.parent.find('time') self.story.setMetadata('dateUpdated', makeDate(a['datetime'], self.dateformat)) + # word count + a = soup.find('span', text='Total Word Count') + if a: + a = a.find_next('span') + self.story.setMetadata('numWords', int(a.text.split()[0])) + # upvote, subs, and views a = soup.find('div',{'class':'title-meta'}) spans = a.findAll('span', recursive=False) @@ -241,22 +251,21 @@ data = self._fetchUrl(url) soup = self.make_soup(data) - # have to do adult check here as well because individual chapters can be marked as mature - if not self.checkSoup: - self.checkSoup = self.doAdultCheck(url,soup) - if self.checkSoup: - soup = self.checkSoup - - # grab contents - content = soup.find('div', {'id': 'user-submitted-body'}) - if content: + try: + # https://www.asianfanfics.com/api/chapters/4791923/chapter_46d32e413d1a702a2… + jsonlink = soup.find('link',href=re.compile(r'/api/chapters/[0-9]+/chapter_[0-9a-z]+.json')) + chap_json = json.loads(self._fetchUrl(jsonlink['href'])) + content = self.make_soup(chap_json['post']).find('body') # BS4 adds <html><body> if not present. + content.name='div' # change body to a div. if self.getConfig('inject_chapter_title'): + # the dumbest workaround ever for the abbreviated chapter titles from before logger.debug("Injecting full-length chapter title") newTitle = soup.find('h1', {'id' : 'chapter-title'}).text - newTitle = self.make_soup('<h3>%s</h3>' % (newTitle)) # the dumbest workaround ever for the abbreviated chapter titles from before + newTitle = self.make_soup('<h3>%s</h3>' % (newTitle)).find('body') # BS4 adds <html><body> if not present. + newTitle.name='div' # change body to a div. newTitle.append(content) return self.utf8FromSoup(url,newTitle) else: return self.utf8FromSoup(url,content) - else: - raise exceptions.FailedToDownload("Error downloading Chapter: %s! Missing required element!" % url) + except Exception as e: + raise exceptions.FailedToDownload("Error downloading Chapter: %s %s!" % (url,e)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/fanficfare/adapters/adapter_webnovelcom.py new/FanFicFare-3.7.6/fanficfare/adapters/adapter_webnovelcom.py --- old/FanFicFare-3.7.0/fanficfare/adapters/adapter_webnovelcom.py 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/fanficfare/adapters/adapter_webnovelcom.py 2019-04-24 05:29:17.000000000 +0200 @@ -179,11 +179,9 @@ for volume in jsondata["data"]["volumeItems"]: for chap in volume["chapterItems"]: # Only allow free and VIP type 1 chapters - if chap['isVip'] not in [0]: # removed VIP type 1 - # chapter (ad-wall'ed) - # because the ad-wall - # bypass code stopped - # working. --JM + if chap['isAuth'] not in [1]: # Ad wall indicator + # seems to have changed + # --JM continue chap_title = 'Chapter ' + unicode(chap['index']) + ' - ' + chap['name'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/fanficfare/cli.py new/FanFicFare-3.7.6/fanficfare/cli.py --- old/FanFicFare-3.7.0/fanficfare/cli.py 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/fanficfare/cli.py 2019-04-24 05:29:17.000000000 +0200 @@ -39,7 +39,7 @@ def pickle_load(f): return pickle.load(f,encoding="bytes") -version="3.7.0" +version="3.7.6" os.environ['CURRENT_VERSION_ID']=version global_cache = 'global_cache' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/fanficfare/configurable.py new/FanFicFare-3.7.6/fanficfare/configurable.py --- old/FanFicFare-3.7.0/fanficfare/configurable.py 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/fanficfare/configurable.py 2019-04-24 05:29:17.000000000 +0200 @@ -244,6 +244,8 @@ 'inject_chapter_title':(['asianfanfics.com'],None,boollist), + 'auto_sub':(['asianfanfics.com'],None,boollist), + # eFiction Base adapters allow bulk_load # kept forgetting to add them, so now it's automatic. 'bulk_load':(adapters.get_bulk_load_sites(), @@ -441,6 +443,7 @@ 'conditionals_use_lists', 'description_in_chapter', 'inject_chapter_title', + 'auto_sub', 'titlepage_end', 'titlepage_entries', 'titlepage_entry', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/fanficfare/defaults.ini new/FanFicFare-3.7.6/fanficfare/defaults.ini --- old/FanFicFare-3.7.0/fanficfare/defaults.ini 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/fanficfare/defaults.ini 2019-04-24 05:29:17.000000000 +0200 @@ -2167,10 +2167,11 @@ [www.asianfanfics.com] ## Unlike most sites, asianfanfics.com, instead of denying access to -## 'adult' content, will censor the text of stories to remove the -## 'adult' words. FanFicFare cannot detect when this happens, but if -## you set your username and password, FFF will log you in to prevent -## that. +## 'adult' or subscriber-only content, will censor the text of stories +## to remove 'adult' words or entire portions of the text. This is why +## an account is required to download stories from this site. It is +## also strongly recommended to consider enabling auto_sub in order to +## further avoid this from happening. #username:YourName #password:yourpassword @@ -2197,6 +2198,14 @@ ## chapter_start to remove the standard chapter title, as shown below. inject_chapter_title:false +## This website removes certain HTML tags and portions of the story +## from subscriber-only stories. It is strongly recommended to turn +## this option on. This will automatically subscribe you to such +## stories in order to acquire the unaltered text. You can +## unsubscribe manually on the website after the story has been +## downloaded. +auto_sub:false + [www.bdsmlibrary.com] ## Some sites also require the user to confirm they are adult for ## adult content. Uncomment by removing '#' in front of is_adult. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/fanficfare/story.py new/FanFicFare-3.7.6/fanficfare/story.py --- old/FanFicFare-3.7.0/fanficfare/story.py 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/fanficfare/story.py 2019-04-24 05:29:17.000000000 +0200 @@ -703,7 +703,10 @@ elif 'list' in tag['class']: val = [] for i in tag.find_all('li'): - val.append(i.string) + # keeps & but removes <li></li> because BS4 + # halps by converting NavigableString to string + # (losing entities) + val.append(unicode(i)[4:-5]) elif 'int' in tag['class']: # Python reports true when asked isinstance(<bool>, (int)) # bools now converted to unicode when set. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/setup.py new/FanFicFare-3.7.6/setup.py --- old/FanFicFare-3.7.0/setup.py 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/setup.py 2019-04-24 05:29:17.000000000 +0200 @@ -27,7 +27,7 @@ name=package_name, # Versions should comply with PEP440. - version="3.7.0", + version="3.7.6", description='A tool for downloading fanfiction to eBook formats', long_description=long_description, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/webservice/app.yaml new/FanFicFare-3.7.6/webservice/app.yaml --- old/FanFicFare-3.7.0/webservice/app.yaml 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/webservice/app.yaml 2019-04-24 05:29:17.000000000 +0200 @@ -1,6 +1,6 @@ # ffd-retief-hrd fanficfare application: fanficfare -version: 3-7-0 +version: 3-7-6 runtime: python27 api_version: 1 threadsafe: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FanFicFare-3.7.0/webservice/index.html new/FanFicFare-3.7.6/webservice/index.html --- old/FanFicFare-3.7.0/webservice/index.html 2019-04-19 21:08:56.000000000 +0200 +++ new/FanFicFare-3.7.6/webservice/index.html 2019-04-24 05:29:17.000000000 +0200 @@ -84,7 +84,7 @@ If you have any problems with this application, please report them in the <a href="https://groups.google.com/group/fanfic-downloader">FanFicFare Google Group</a>. The - <a href="https://3-6-0.fanficfare.appspot.com">previous version</a> + <a href="https://3-7-0.fanficfare.appspot.com">previous version</a> is also available for you to use if necessary. <div id='error'>

1 0

commit gnu_parallel for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2019-05-03 22:47:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old) and /work/SRC/openSUSE:Factory/.gnu_parallel.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnu_parallel" Fri May 3 22:47:23 2019 rev:51 rq:700253 version:20190422 Changes: -------- --- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2018-11-26 10:31:58.988910059 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new.5148/gnu_parallel.changes 2019-05-03 22:47:24.931905437 +0200 @@ -1,0 +2,17 @@ +Fri Apr 26 13:41:04 UTC 2019 - Ismail Dönmez <idonmez(a)suse.com> + +- Update to new upstream release 20190422 + * 'env_parallel --end-session' makes it possible to nest + 'env_parallel --session' + * --shard makes it possible to send input to the same jobslot + based on the value in one column of the input. + It is similar to sharding in databases. + * --shellquote --shellquote will shell quote the input twice. + * SIGTERM is changed to SIGHUP, so sending SIGHUP will make + GNU Parallel start no more jobs, but wait for running jobs + to finish. + * SIGTERM SIGTERM is changed to SIGTERM, so sending SIGTERM + will make GNU Parallel kill all running jobs. + * Bug fixes and man page updates. + +------------------------------------------------------------------- Old: ---- parallel-20181122.tar.bz2 parallel-20181122.tar.bz2.sig New: ---- parallel-20190422.tar.bz2 parallel-20190422.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu_parallel.spec ++++++ --- /var/tmp/diff_new_pack.TYt14x/_old 2019-05-03 22:47:26.111908145 +0200 +++ /var/tmp/diff_new_pack.TYt14x/_new 2019-05-03 22:47:26.115908155 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnu_parallel # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gnu_parallel -Version: 20181122 +Version: 20190422 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0-or-later ++++++ parallel-20181122.tar.bz2 -> parallel-20190422.tar.bz2 ++++++ ++++ 19962 lines of diff (skipped) ++++++ parallel-20181122.tar.bz2.sig -> parallel-20190422.tar.bz2.sig ++++++ --- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20181122.tar.bz2.sig 2018-11-26 10:32:03.960904233 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new.5148/parallel-20190422.tar.bz2.sig 2019-05-03 22:47:25.411906539 +0200 @@ -2,7 +2,7 @@ # To check the signature run: # echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20181122.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20190422.tar.bz2.sig echo | gpg 2>/dev/null gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 @@ -10,32 +10,32 @@ -----BEGIN PGP SIGNATURE----- -iQTwBAABCgAGBQJb9z2JAAoJENGrRRaIiIiI6S0mn1HMIHl+3Wxog/PHiqA3N7Of -KRVZGzSTClo9dBFchs86bm20t8D7zFmTLdiSfTqh/CnNUlU530Fd2pSpcvAQECmQ -XmDrlWTkhuRYTWO/FS/Ngh0+IfVBt4ycJiO0p46OODxdp64ewXHJ8KstUy607uHv -cRnw1rKEqu8suUMx9rdZii6b+STAPNNG0/KyJnvuiiMtwVCZEFSTFS509lIKWsQH -ffkzqUNoNxy7hwkRXVD7zA9X35Iyh55TMsmhBDvn+6cDNv0AHyNHTXnQWqmok83A -0SHkK6jwndmFJWYZCNcmjykg8bW94IYO/ThoRzcthD54FgcTpKgutQtjlpSKqFBy -LjP/shHbNpJSDsnxwxcppQL2XvWz79LnTt5dKWQRQcj5Ijh0y1NiZnBP8xreVLrb -Rx+SN6gaiUtd1ig5hi/okfIRJnd2nCxAVyvrhS6cRy1XdYJf55lc3+a5p36YBT3Q -o0jmFzVsSeSnG0v17zrJiyP0SDJrmhFHLI+qN+jxLu9/lqvMqhCSzlDOjwhv0mGq -v1x3D4sYCX1cg61CvCl532hQILU0tf7duaMlAZNnsWz4cN2o9twFTi/TTQMbku8T -C05kMgbT4xQzs62LMZJ0iaD7itTGog1Rxov3Nu6i+3Tm4kv9iYKP8BdjDJ3WckGd -CBhDgBNU2OH0KGhw6rNqSsb+G+E0xZx5dO+7KByA/PCKz9n070Mhh3LUdS9lFvi3 -OO/CuaT6PGGCsTevfResqAFcKrpP+fxUWnyFF5pxVgNHpKcxX2by9RcGYDXQYpu4 -ntDnxq5idarHhj+kVzc8ehX6KVxuXVm3Arkx5QeWbVnf33lWak6rGqW+lUZlM3Dd -LZ2JKnantHjjIDzQBfMHMDt4/hPVroOwEu6uCSyWid2T80ty8DeNBH+XJY+kS8TT -zoPslLgp9KQedlApIr+2tAoiTI4n5wQArMAUx9MU0a7qWRHYIyXK3iyHM+63dJuw -vYkEi6sfn1/27EZWwiKDkLeIOR6jeZNdy7q43jjyGs05m1uhY/PfAQ6ofshlu+XR -na6gu0g7A24iOG89brptxDa2pfm0KSVjrC1t4WrjDSJ1X/JCCBAIaOAlYEskEOni -fWFYkcNEW/73b3uKFHTXl/Pjhcr0aK1xmybP1PlX/WDQpNwuNZulJpvZuY1bxAsa -4jzCjddL+VwO17d3auU8jKh/IUMUV62brOnTUeJ3lAC+aF6SF7SXVm61JTNOa1i2 -9wIt+5nJ3skQq7gs4S6IkJXSb3yCSvn2MfntULzcOc/5IaebEZ0Aya1RZRr/mqUt -nk/yhe0V/Jwnp0hVlsWIC4IftGk6mVUOio5mPfcJZ4fvEllLcQKvAAIvjGU0RMAr -LLMsuWyKydIY6LtjQil20/IAlkSz/948XyDfQjqsoho1UJoPp9yM8ilkAUijzkaA -2zTyOApT5Ts6w96WYSqMIrFwqii2ACP/xIv3g3XpupxPHPzwWFa2LrsyIhbR263X -hARwQLvugG96ef/aSEJJSZaGM6J02ntU5KjOGPBPcTx/tq1vh9YTnxhWX3G8YT7Z -Ivw4oS+wfw2fTerNqLwH+Ey38eMtsWPMojfJUo3D+dj+qnfTdcxjyVZEQWntceaB -xfgRRHFG5f9tZ6Gpu6pZhhPP6w== -=GJ5s +iQTwBAABCgAGBQJcvGgGAAoJENGrRRaIiIiIdRcmoMbZNwQGXwGwhotS2BQb4vRo +n7aXSWujKYsYBSqgI3INlB+0SnhOX6zx475mvcKMtEs/gZyJcWVpHXV3luS1OrAZ +eIP7y97at5D8pjHLzq492eAIFnZL9EG6sKu/0qUeUMh8AoHXDGOjt6mn6bLmq3aJ +T+ff0G8q4SPjJFFjlHkPrSOzMY2GT+GVzTKyMDRIX8VUAwuNwJfT7r83gG8qcHJq +uQG0l7b3FTDLc+ZWxsYOZASDfFv+RJySiVjuJ1PJ9YIU9AD1KDoe1o7tyDe+sdnw +vrSmYrKhaO+h6JagPZ4/Mt5nFrQj9FeNVV5avV3IuyZ+OlvOxKfW/g62A6A0AYCE +0LqTJ43djT8bejeIkU6aVAbikChexoG3NtfncQjHljaUtjiBCOrX+DrAZUU1Dton +FI3DHVFjrirBsLaMg7toqo0DF4U+Mjbb+8YY+KlUflt3islCUTtvfnSjuj7vKfrQ +/g43hk0lpAVzgLeq2C39nkd/jtbMkfnnwrYF2uXWa73wxz0r6KyoOWZHaUlaPtr4 +d5TNGYWcmsL/DWur+57K9iinIxyL1m3p6WrEd3h1FBQC8ohHniYAXUqKJTKXhII1 +Txz73MuQy+5QXay9UWA7mliTCDWuIeF45CSAClbcKsU99G1cx9VopbWC6K26UEj2 +6p44ExLQl5He5X356Gzjitl7gt8armpilTp91ho6y9Uzl5HEwm9X8kozZIrgeVY5 +5JuSN2qef7gc3cE+i0DfUmhLmvoMt2g9vLQGvk4FHOqNCwqUg2Ty8ut8fuz/ls4T +iEz+k2eu0VoLPvxdEYtH0SzGcWo4IK3lwAn6Sx6AXPj+/DYQ8wzn1WnU7hmBQVAW +JWU8B4jNZTlECJNGlZuNq0Rd33PZBHvCpFbh2HN6hAHiw8ai+pT0gkDmZpg0ZvZx +44nW93sxllFxeewGdQjChZYhr8BeF8GpRukvJhVl3EOOAWw2sX7fHBiGA4G7hN+X +J/WnojYYvGgnri7VBhcAzOtsH6qmlRaFv/ZHQ69q7R4xRm9gq2INwGTO1GAZCSwl +QlSZ/5Pxy4e/vPdDaB0xSzlM8B6CYYapXhRsWbA9GyiIqzjgPgon0euM6MJPy0XE +0alp1YA8Iiixih3AsOdO+5EZ2+sfB+8N59ko/T+YBWgn1WaB5c/6HrbknktI6E1P +hdy06ZT9HHjYkMxCu97x+2f7pdVzgJsBkQs5ABxh+TQW8H0Sc+vFkcwztNY3xuJc +Y25HpzayblBgznOyrPZ8OT/dAzfWd5G5rD6iYzx5xbUvOgV/TlBLew0PU+q7zXwP +M1ggDUnx9vNTdq6rkAFPkY0YrxAtIXJ8nzzSYJtI5ztPraI8o0R2Y6ACRIHncrw5 +ryjp9yTaB1E+KNT73NulPWiQxif8B23bU+ApaeWk8nb9WQLVbeX+XJYAGNUZIlrv +OgZBRakRJuTLGiHfxfoWoshdIIc7ha5ASVIWorZqBC9l+Y4Rl4IZ23UEWH9yej/I +eazY9Szx/oPwIR5kOVoC/RcEMDj4Tx5KrtPRqDQfFvodQFoMqjc7cMCsfGgc+W4z +B3LSkq25cVu8t5CyQS3SnIyEfwp9ongbTXlLgod+CTiRRUZiW5uFXdx3UKHloN0j +TtsTH8UtXMrBiZF+yXZxHTCt3A== +=BpkZ -----END PGP SIGNATURE----- ++++++ parallel-remove-nag-screen.patch ++++++ --- /var/tmp/diff_new_pack.TYt14x/_old 2019-05-03 22:47:26.739909587 +0200 +++ /var/tmp/diff_new_pack.TYt14x/_new 2019-05-03 22:47:26.743909597 +0200 @@ -1,39 +1,26 @@ -From: Andreas Stieger <astieger(a)suse.com> -Date: Fri, 07 Jul 2017 14:55:15 +0000 -Subject: remove nag screen -Upstream: no - -Removes the nag screen printed to stdout. -https://en.opensuse.org/openSUSE:Packaging_guidelines#Donation_requests - ---- - src/parallel | 2 -- - src/sem | 2 -- - 2 files changed, 4 deletions(-) - -Index: parallel-20181022/src/parallel +Index: parallel-20190422/src/parallel =================================================================== ---- parallel-20181022.orig/src/parallel -+++ parallel-20181022/src/parallel -@@ -1454,8 +1454,6 @@ sub parse_options { - # runs. If that is too much trouble for you, why not use one of - # the alternatives instead? - # See a list in: 'man parallel_alternatives' +--- parallel-20190422.orig/src/parallel ++++ parallel-20190422/src/parallel +@@ -1609,7 +1609,7 @@ sub parse_options(@) { + # + # If you are an honest person please read the above before + # changing this line. - citation_notice(); -- ++ # citation_notice(); + parse_halt(); - if($ENV{'PARALLEL_ENV'}) { -Index: parallel-20181022/src/sem +Index: parallel-20190422/src/sem =================================================================== ---- parallel-20181022.orig/src/sem -+++ parallel-20181022/src/sem -@@ -1454,8 +1454,6 @@ sub parse_options { - # runs. If that is too much trouble for you, why not use one of - # the alternatives instead? - # See a list in: 'man parallel_alternatives' +--- parallel-20190422.orig/src/sem ++++ parallel-20190422/src/sem +@@ -1609,7 +1609,7 @@ sub parse_options(@) { + # + # If you are an honest person please read the above before + # changing this line. - citation_notice(); -- ++ # citation_notice(); + parse_halt(); - if($ENV{'PARALLEL_ENV'}) {

1 0

commit python-oic for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package python-oic for openSUSE:Factory checked in at 2019-05-03 22:47:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oic (Old) and /work/SRC/openSUSE:Factory/.python-oic.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oic" Fri May 3 22:47:19 2019 rev:2 rq:700249 version:0.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oic/python-oic.changes 2019-04-23 14:35:37.677454749 +0200 +++ /work/SRC/openSUSE:Factory/.python-oic.new.5148/python-oic.changes 2019-05-03 22:47:21.699898017 +0200 @@ -1,0 +2,5 @@ +Thu Apr 18 14:36:12 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Make it so the description has proper SVO sentences. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oic.spec ++++++ --- /var/tmp/diff_new_pack.uyINDN/_old 2019-05-03 22:47:22.151899055 +0200 +++ /var/tmp/diff_new_pack.uyINDN/_new 2019-05-03 22:47:22.155899064 +0200 @@ -38,9 +38,9 @@ BuildRequires: %{python_module responses} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module testfixtures} -BuildRequires: python3-dbm BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: python3-dbm Requires: python-cryptography Requires: python-future Requires: python-pycryptodomex @@ -56,7 +56,7 @@ %description This is a complete Python implementation of OpenID Connect as specified in -the OpenID Connect Core specification. And as a side effect, a complete +the OpenID Connect Core specification. As a side effect, this is a complete implementation of OAuth2.0 too. %prep

1 0

commit paexec for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package paexec for openSUSE:Factory checked in at 2019-05-03 22:47:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/paexec (Old) and /work/SRC/openSUSE:Factory/.paexec.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "paexec" Fri May 3 22:47:16 2019 rev:2 rq:700239 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/paexec/paexec.changes 2019-03-26 22:31:12.317723408 +0100 +++ /work/SRC/openSUSE:Factory/.paexec.new.5148/paexec.changes 2019-05-03 22:47:20.471895198 +0200 @@ -1,0 +2,5 @@ +Tue Mar 19 18:04:35 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Use noun phrase in descriptions. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ paexec.spec ++++++ --- /var/tmp/diff_new_pack.mtXK3r/_old 2019-05-03 22:47:21.187896842 +0200 +++ /var/tmp/diff_new_pack.mtXK3r/_new 2019-05-03 22:47:21.191896851 +0200 @@ -19,7 +19,7 @@ Name: paexec Version: 1.1.1 Release: 0 -Summary: Distributes tasks over network or CPUs +Summary: Utility for task distribution over networks or CPUs License: MIT Group: Productivity/Clustering/Computing URL: https://paexec.sourceforge.net/ @@ -31,7 +31,7 @@ Requires: runawk %description -Small program that processes a list of tasks in parallel +A program that processes a list of tasks in parallel on different CPUs, computers in a network or whatever else. %package examples @@ -41,7 +41,7 @@ BuildArch: noarch %description examples -Small program that processes a list of tasks in parallel +A program that processes a list of tasks in parallel on different CPUs, computers in a network or whatever else. This package contains examples for paexec.

1 0

commit adminer for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package adminer for openSUSE:Factory checked in at 2019-05-03 22:47:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/adminer (Old) and /work/SRC/openSUSE:Factory/.adminer.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "adminer" Fri May 3 22:47:12 2019 rev:18 rq:700233 version:4.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/adminer/adminer.changes 2019-01-25 22:44:46.887123463 +0100 +++ /work/SRC/openSUSE:Factory/.adminer.new.5148/adminer.changes 2019-05-03 22:47:19.507892984 +0200 @@ -1,0 +2,6 @@ +Mon Mar 18 21:29:43 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Replace %__-type macro indirections. +- Replace bash-specific syntax in scriptlets by POSIX sh. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ adminer.spec ++++++ --- /var/tmp/diff_new_pack.hQqZBA/_old 2019-05-03 22:47:20.155894472 +0200 +++ /var/tmp/diff_new_pack.hQqZBA/_new 2019-05-03 22:47:20.159894482 +0200 @@ -48,7 +48,7 @@ %description Adminer (formerly phpMinAdmin) is a full-featured database management tool -written in PHP. Conversely to phpMyAdmin, it consist of a single file ready to +written in PHP. Conversely to phpMyAdmin, it consists of a single file ready to deploy to the target server. Adminer is available for MySQL, PostgreSQL, SQLite, MS SQL, Oracle, Firebird, SimpleDB, Elasticsearch and MongoDB. @@ -164,19 +164,19 @@ %install # Remove version from file names. -%{__mv} adminer-%{version}.php adminer.php -%{__mv} editor-%{version}.php editor.php +mv adminer-%{version}.php adminer.php +mv editor-%{version}.php editor.php # Install files in datadir. -%{__install} -d -m 0755 %{buildroot}%{apache_datadir}/%{name} -%{__cp} -R adminer.php editor.php designs/ \ +install -d -m 0755 %{buildroot}%{apache_datadir}/%{name} +cp -R adminer.php editor.php designs/ \ %{buildroot}%{apache_datadir}/%{name} # Default to hever theme. ln -s %{apache_datadir}/%{name}/designs/hever/adminer.css \ %{buildroot}%{apache_datadir}/%{name} -%{__install} -D -m 0644 %{SOURCE1} %{buildroot}%{apache_sysconfdir}/conf.d/%{name}.conf +install -D -m 0644 %{SOURCE1} %{buildroot}%{apache_sysconfdir}/conf.d/%{name}.conf # Fix paths in httpd config. sed -i -e "s,@apache_datadir@,%{apache_datadir},g" -e "s,@name@,%{name},g" \ %{buildroot}%{apache_sysconfdir}/conf.d/%{name}.conf @@ -189,7 +189,7 @@ if [ -x /usr/sbin/a2enmod ] ; then # Get installed php_version (5 or 7). php_version=$(php -v | grep '(cli)' | awk '{print $2}' | awk -F'.' '{print $1}') - if [[ -n ${php_version} ]]; then + if [ -n "$php_version" ]; then a2enmod -q php${php_version} || a2enmod php${php_version} a2enmod -q version || a2enmod version fi @@ -198,14 +198,14 @@ %if 0%{?suse_version} < 1310 %restart_on_update apache2 #%%else -#systemctl try-restart apache2 &>/dev/null +#systemctl try-restart apache2 >/dev/null %endif %postun %if 0%{?suse_version} < 1310 %restart_on_update apache2 #%%else -#systemctl try-restart apache2 &>/dev/null +#systemctl try-restart apache2 >/dev/null %endif %files

1 0

commit openafs for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package openafs for openSUSE:Factory checked in at 2019-05-03 22:47:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openafs (Old) and /work/SRC/openSUSE:Factory/.openafs.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openafs" Fri May 3 22:47:06 2019 rev:11 rq:700218 version:1.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/openafs/openafs.changes 2019-03-26 22:33:40.765687583 +0100 +++ /work/SRC/openSUSE:Factory/.openafs.new.5148/openafs.changes 2019-05-03 22:47:16.391885831 +0200 @@ -1,0 +2,10 @@ +Tue Apr 30 10:17:44 UTC 2019 - Christof Hanke <christof.hanke(a)mpcdf.mpg.de> + +- update to 1.8.3 +- Require krb5-client for package openafs-client +- fix broken directory layout +- fix broken post-install script +- allow crypt to be set/unset on startup of client +- clean up source-filenames + +------------------------------------------------------------------- Old: ---- RELNOTES-1.8.3pre1 openafs-1.8.3pre1-doc.tar.bz2 openafs-1.8.3pre1-doc.tar.bz2.md5 openafs-1.8.3pre1-doc.tar.bz2.sha256 openafs-1.8.3pre1-src.tar.bz2 openafs-1.8.3pre1-src.tar.bz2.md5 openafs-1.8.3pre1-src.tar.bz2.sha256 sysconfig.openafs-client-systemd sysconfig.openafs-fuse-client-systemd sysconfig.openafs-server-systemd New: ---- RELNOTES-1.8.3 openafs-1.8.3-doc.tar.bz2 openafs-1.8.3-doc.tar.bz2.md5 openafs-1.8.3-doc.tar.bz2.sha256 openafs-1.8.3-src.tar.bz2 openafs-1.8.3-src.tar.bz2.md5 openafs-1.8.3-src.tar.bz2.sha256 sysconfig.openafs-client sysconfig.openafs-server ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openafs.spec ++++++ --- /var/tmp/diff_new_pack.UZKDW3/_old 2019-05-03 22:47:17.499888375 +0200 +++ /var/tmp/diff_new_pack.UZKDW3/_new 2019-05-03 22:47:17.499888375 +0200 @@ -56,36 +56,35 @@ # used for %setup only # leave upstream tar-balls untouched for integrity checks. -%define upstream_version 1.8.3pre1 +%define upstream_version 1.8.3 Name: openafs -Version: 1.8.3~pre1 +Version: 1.8.3 Release: 0 Summary: OpenAFS Distributed File System License: IPL-1.0 Group: System/Filesystems Url: http://www.openafs.org/ -Source0: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{u… -Source1: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{u… -Source2: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{u… -Source3: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{u… -Source4: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{u… -Source5: http://www.openafs.org/dl/openafs/candidate/%{upstream_version}/openafs-%{u… +Source0: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_ve… +Source1: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_ve… +Source2: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_ve… +Source3: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_ve… +Source4: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_ve… +Source5: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_ve… Source10: README.SUSE.openafs Source15: logrotate.openafs-server Source16: ld.conf.openafs Source18: RELNOTES-%{upstream_version} Source19: ChangeLog Source20: kernel-source.build-modules.sh -Source22: sysconfig.openafs-fuse-client Source23: openafs-client.service Source25: openafs-server.service Source26: openafs-fuse-client.service -Source27: sysconfig.openafs-client-systemd -Source28: sysconfig.openafs-server-systemd -Source29: sysconfig.openafs-fuse-client-systemd +Source27: sysconfig.openafs-client +Source28: sysconfig.openafs-server +Source29: sysconfig.openafs-fuse-client Source30: preamble Source55: openafs.SuidCells Source56: openafs.CellAlias @@ -260,6 +259,7 @@ Group: System/Filesystems Requires: %{name} = %{version} Requires: %{name}-kmp +Requires: krb5-client %description client AFS is a cross-platform distributed file system product pioneered at @@ -306,12 +306,10 @@ %setup -q -n openafs-%{upstream_version} -T -b 0 -b 1 %patch3 -p1 +%patch4 -p1 %patch5 -p1 -%if %{run_regen} -%patch4 -p1 - ./regen.sh -%endif +./regen.sh %build # architecture specific settings @@ -641,14 +639,14 @@ %{fillup_only -n openafs-server} %service_add_post openafs-server.service -if [ "x$1" = "x" ]; then - my_operation=0 -else - my_operation=$1 -fi -if [ $my_operation -gt 1 ]; then +if [ "$FIRST_ARG" -gt 1 ]; then + # update no new install echo Not stopping the possibly running services. echo You must restart the service to put the upgrade into effect. + if [ -d /var/openafs ]; then + echo To upgrade, stop the server, copy the contents of /var/openafs to /var/lib/openafs, + echo remove the empty directory /var/openafs and then start the server again. + fi else echo For configuring the server, please check /etc/sysconfig/openafs-server echo and/or follow the instructions found on http://www.openafs.org to install an openafs-client. ++++++ ChangeLog ++++++ --- /var/tmp/diff_new_pack.UZKDW3/_old 2019-05-03 22:47:17.527888439 +0200 +++ /var/tmp/diff_new_pack.UZKDW3/_new 2019-05-03 22:47:17.527888439 +0200 @@ -1,3 +1,31 @@ +commit ad37d5b186c7ea62c874546472a807310acf0e75 +Author: Stephan Wiesand <stephan.wiesand(a)desy.de> +Date: Fri Apr 12 16:53:40 2019 +0200 + + Make OpenAFS 1.8.3 + + Update version strings for the 1.8.3 release. + + Change-Id: Ie8b29765e4f45bc3ddbe1aba9e31068da0bb54cf + Reviewed-on: https://gerrit.openafs.org/13546 + Tested-by: BuildBot <buildbot(a)rampaginggeek.com> + Reviewed-by: Michael Meffie <mmeffie(a)sinenomine.net> + Reviewed-by: Stephan Wiesand <stephan.wiesand(a)desy.de> + +commit 288c218fa96abd8c9ddb66bc6f6bc60a20311645 +Author: Stephan Wiesand <stephan.wiesand(a)desy.de> +Date: Fri Apr 12 16:47:28 2019 +0200 + + Update NEWS for 1.8.3 + + Finalize the release notes for OpenAFS 1.8.3 + + Change-Id: I5b5eeedde53a1135c003302719cfdeca4f67e8fd + Reviewed-on: https://gerrit.openafs.org/13545 + Tested-by: BuildBot <buildbot(a)rampaginggeek.com> + Reviewed-by: Michael Meffie <mmeffie(a)sinenomine.net> + Reviewed-by: Stephan Wiesand <stephan.wiesand(a)desy.de> + commit dc16d6fffa69fe98e8bb338daea7b35ff59651c9 Author: Stephan Wiesand <stephan.wiesand(a)desy.de> Date: Fri Jan 25 16:08:34 2019 +0100 ++++++ RELNOTES-1.8.3pre1 -> RELNOTES-1.8.3 ++++++ --- /work/SRC/openSUSE:Factory/openafs/RELNOTES-1.8.3pre1 2019-03-26 22:33:35.781688786 +0100 +++ /work/SRC/openSUSE:Factory/.openafs.new.5148/RELNOTES-1.8.3 2019-05-03 22:47:11.107873701 +0200 @@ -1,6 +1,6 @@ User-Visible OpenAFS Changes -OpenAFS 1.8.3 (in progress) +OpenAFS 1.8.3 All platforms ++++++ dir_layout.patch ++++++ --- /var/tmp/diff_new_pack.UZKDW3/_old 2019-05-03 22:47:17.559888513 +0200 +++ /var/tmp/diff_new_pack.UZKDW3/_new 2019-05-03 22:47:17.559888513 +0200 @@ -1,11 +1,17 @@ ---- openafs-1.8.2/src/cf/dirpaths.m4.orig 2019-01-16 11:16:56.160768067 +0100 -+++ openafs-1.8.2/src/cf/dirpaths.m4 2019-01-16 11:17:49.300846193 +0100 -@@ -21,7 +21,7 @@ +--- openafs-1.8.3/src/cf/dirpaths.m4.orig 2019-04-30 13:38:33.411870333 +0200 ++++ openafs-1.8.3/src/cf/dirpaths.m4 2019-04-30 13:48:06.182604169 +0200 +@@ -20,10 +20,10 @@ + afssrvbindir=${afssrvbindir='${bindir}'} afssrvsbindir=${afssrvsbindir='${sbindir}'} afssrvlibexecdir=${afssrvlibexecdir='${libexecdir}/openafs'} - afsdbdir=${afsdbdir='${localstatedir}/openafs/db'} +- afsdbdir=${afsdbdir='${localstatedir}/openafs/db'} - afslogsdir=${afslogsdir='${localstatedir}/openafs/logs'} +- afslocaldir=${afslocaldir='${localstatedir}/openafs'} +- afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'} ++ afsdbdir=${afsdbdir='/var/lib/openafs/db'} + afslogsdir=${afslogsdir='/var/log/openafs'} - afslocaldir=${afslocaldir='${localstatedir}/openafs'} - afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'} ++ afslocaldir=${afslocaldir='/var/lib/openafs'} ++ afsbackupdir=${afsbackupdir='/var/lib/openafs/backup'} afsbosconfigdir=${afsbosconfigdir='${sysconfdir}/openafs'} + afsdatadir=${afsdatadir='${datadir}/openafs'} + fi ++++++ openafs-1.8.3pre1-doc.tar.bz2 -> openafs-1.8.3-doc.tar.bz2 ++++++ ++++ 4224 lines of diff (skipped) ++++++ openafs-1.8.3pre1-doc.tar.bz2.md5 -> openafs-1.8.3-doc.tar.bz2.md5 ++++++ --- /work/SRC/openSUSE:Factory/openafs/openafs-1.8.3pre1-doc.tar.bz2.md5 2019-03-26 22:33:36.989688494 +0100 +++ /work/SRC/openSUSE:Factory/.openafs.new.5148/openafs-1.8.3-doc.tar.bz2.md5 2019-05-03 22:47:12.383876630 +0200 @@ -1 +1 @@ -c0f7a24287d38d48445dac2d59abcd85 openafs-1.8.3pre1-doc.tar.bz2 +a10f9d79400352cdec886308c1936b52 openafs-1.8.3-doc.tar.bz2 ++++++ openafs-1.8.3pre1-doc.tar.bz2.sha256 -> openafs-1.8.3-doc.tar.bz2.sha256 ++++++ --- /work/SRC/openSUSE:Factory/openafs/openafs-1.8.3pre1-doc.tar.bz2.sha256 2019-03-26 22:33:37.565688355 +0100 +++ /work/SRC/openSUSE:Factory/.openafs.new.5148/openafs-1.8.3-doc.tar.bz2.sha256 2019-05-03 22:47:12.411876694 +0200 @@ -1 +1 @@ -495e09a585a63e645437ecf42d43d2cfde3874de6e9c1d90cc7e41deb6309acd openafs-1.8.3pre1-doc.tar.bz2 +58da20546b5ad6ab8aebf3e701f13e61910a1a95f275bef762c319172c6c5593 openafs-1.8.3-doc.tar.bz2 ++++++ openafs-1.8.3pre1-src.tar.bz2 -> openafs-1.8.3-src.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/openafs/openafs-1.8.3pre1-src.tar.bz2 /work/SRC/openSUSE:Factory/.openafs.new.5148/openafs-1.8.3-src.tar.bz2 differ: char 11, line 1 ++++++ openafs-1.8.3pre1-src.tar.bz2.md5 -> openafs-1.8.3-src.tar.bz2.md5 ++++++ --- /work/SRC/openSUSE:Factory/openafs/openafs-1.8.3pre1-src.tar.bz2.md5 2019-03-26 22:33:40.165687728 +0100 +++ /work/SRC/openSUSE:Factory/.openafs.new.5148/openafs-1.8.3-src.tar.bz2.md5 2019-05-03 22:47:16.311885647 +0200 @@ -1 +1 @@ -f10b5048d256914d401c5b44f1533263 openafs-1.8.3pre1-src.tar.bz2 +1ede289bbfacf71dab09b20978b7e11a openafs-1.8.3-src.tar.bz2 ++++++ openafs-1.8.3pre1-src.tar.bz2.sha256 -> openafs-1.8.3-src.tar.bz2.sha256 ++++++ --- /work/SRC/openSUSE:Factory/openafs/openafs-1.8.3pre1-src.tar.bz2.sha256 2019-03-26 22:33:40.433687663 +0100 +++ /work/SRC/openSUSE:Factory/.openafs.new.5148/openafs-1.8.3-src.tar.bz2.sha256 2019-05-03 22:47:16.327885684 +0200 @@ -1 +1 @@ -95aa3fa70117f34f52a03cdb8abdd99db84850c4fb1067ac7202b049e7f64c2e openafs-1.8.3pre1-src.tar.bz2 +ead9c16c50404b98b06e1d22fb6359880bfc6e93a6108a12e5e4e1c73b64cea5 openafs-1.8.3-src.tar.bz2 ++++++ openafs-client.service ++++++ --- /var/tmp/diff_new_pack.UZKDW3/_old 2019-05-03 22:47:19.235892360 +0200 +++ /var/tmp/diff_new_pack.UZKDW3/_new 2019-05-03 22:47:19.235892360 +0200 @@ -11,6 +11,7 @@ ExecStartPre=/sbin/modprobe libafs ExecStart=/usr/sbin/afsd $AFSD_ARGS ExecStartPost=/usr/bin/fs sysname $SYSNAME +ExecStartPost=/usr/bin/fs setcrypt $CRYPT ExecStop=/usr/bin/umount /afs ExecStop=/usr/sbin/afsd -shutdown ExecStop=/sbin/rmmod libafs ++++++ openafs-fuse-client.service ++++++ --- /var/tmp/diff_new_pack.UZKDW3/_old 2019-05-03 22:47:19.247892388 +0200 +++ /var/tmp/diff_new_pack.UZKDW3/_new 2019-05-03 22:47:19.255892406 +0200 @@ -8,8 +8,9 @@ Type=forking RemainAfterExit=true EnvironmentFile=/etc/sysconfig/openafs-fuse-client -ExecStartPre=/bin/chmod 0644 /etc/openafs/CellServDB ExecStart=/usr/sbin/afsd.fuse $AFSD_ARGS +ExecStartPost=/usr/bin/fs sysname $SYSNAME +ExecStartPost=/usr/bin/fs setcrypt $CRYPT ExecStop=/usr/bin/umount /afs ExecStop=/usr/sbin/afsd.fuse -shutdown KillMode=none ++++++ sysconfig.openafs-client ++++++ # # startup options for the openAFS client. # see man afsd for details AFSD_ARGS="-fakestat -memcache -blocks 102400 -dynroot -afsdb" # # sysname to set after startup # leave empty for default setting. SYSNAME="" # # switch for encryption to be set after startup # must be one of "on" or "off" CRYPT="on" ++++++ sysconfig.openafs-fuse-client ++++++ --- /var/tmp/diff_new_pack.UZKDW3/_old 2019-05-03 22:47:19.323892562 +0200 +++ /var/tmp/diff_new_pack.UZKDW3/_new 2019-05-03 22:47:19.323892562 +0200 @@ -1,145 +1,17 @@ -## Path: Network/File systems/AFS client -## Description: AFS client configuration, default mode -## This package is for the fuse-client -## Type: yesno -## Default: no # -# Set to "yes" if you want to generate CellServDB and ThisCell files -# from THIS_CELL and THIS_CELL_SERVER variables. -# If you want more complicated setting, set REGENERATE_CELL_INFO to "no" -# and edit the files manually. -# -REGENERATE_CELL_INFO="no" - -## Type: string -## Default: "" -# -# This cell name -# -THIS_CELL="" - -## Type: string -## Default: "" -# -# IP address of afs server for this cell -# -THIS_CELL_SERVER="" - -## Type: string -## Default: "" -# -# DNS name of afs server for this cell -# -THIS_CELL_SERVER_NAME="" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you want to use data encription (secure, slower) -# -DATA_ENCRYPTION="yes" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you want to generate cacheinfo file -# -REGENERATE_CACHE_INFO="yes" - -## Type: string -## Default: "" -# -# AFS client configuration options -# -XXLARGE="-stat 8000 -daemons 6 -volumes 256 -files 50000" -XLARGE="-stat 3600 -daemons 5 -volumes 196 -files 50000" -LARGE="-stat 2800 -daemons 5 -volumes 128" -MEDIUM="-stat 2000 -daemons 3 -volumes 70" -SMALL="-stat 300 -daemons 2 -volumes 50" - -## Type: yesno -## Default: yes -# -# Instead of mounting the home cell's root.afs volume at the AFS mount -# point (typically /afs) a fake root is constructed from information -# available in the client's CellServDB. -# With this option enabled openafs can start up even on network outage. -# -DYNROOT="yes" +# startup options for the openAFS client. +# see man afsd for details -## Type: yesno -## Default: yes -# -# Instead of calling a stat on a mountpoint to a foreign cell, -# return a faked status to the application. -# "ls -l /afs" is the most prominent example for its usefulness. -# -FAKESTAT="yes" - - -## Type: yesno -## Default: yes -# -# Instead of looking up database server in CellServDB try DNS first. -# With this option enabled openafs can access cells which are not in the packaged CellServDB-file, but -# which do provide the required DNS-information. -# -AFSDB="yes" - -## Type: yesno -## Default: yes -# -# use memory-only cache -# -MEMCACHE="yes" - -## Type: string(AUTOMATIC) -## Default: AUTOMATIC -# -# if you set CACHESIZE to "AUTOMATIC", it will automatically be chosen -# deduced by parition sizes (does not work if your cache is on / or -# /usr or /var) or by machine memory size for memory-only cache, -# otherwise the value in (1k-blocks) specified here will be used. -# -CACHESIZE="AUTOMATIC" - -## Type: string(AUTOMATIC,$XXLARGE,$XLARGE,$LARGE,$MEDIUM,$SMALL) -## Default: AUTOMATIC -# -# If you set OPTIONS to "AUTOMATIC", the init script will choose a set -# of options based on the cache size, otherwise the values specified here -# will be used. -# -OPTIONS="AUTOMATIC" +AFSD_ARGS="-fakestat -memcache -blocks 102400 -dynroot -afsdb" -## Type: string(/var/cache/openafs) -## Default: /var/cache/openafs -# -# Path to cache directory, it is recommended to use separate partition. -# It does not work on reiserfs. A valid directory must be specified -# even if memory only cache is used. -# Recommended cache directory is "/var/cache/openafs" # -CACHEDIR="/var/cache/openafs" +# sysname to set after startup +# leave empty for default setting. -## Type: string(/afs) -## Default: /afs -# -# AFS directory. You should never need to change this -# -AFSDIR=/afs +SYSNAME="" -## Type: yesno -## Default: no -# -# Set to "yes" for a lot of debugging information from afsd. Only -# useful for debugging as it prints _a lot_ of information. # -VERBOSE="no" +# switch for encryption to be set after startup +# must be one of "on" or "off" -## Type: string -## Default: "" -# -# SYSNAME of client. Used to expand the magic "@sys" in pathes within /afs. -# If left blank, the hardcoded sysname (e.g. amd64_linux26) will be used. -SYSNAME="" +CRYPT="on" ++++++ sysconfig.openafs-server ++++++ ## Path: Network/File systems/AFS server ## Description: AFS server configuration, default mode # all is set in /etc/openafs/BosConfig

1 0

commit qbs for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package qbs for openSUSE:Factory checked in at 2019-05-03 22:47:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qbs (Old) and /work/SRC/openSUSE:Factory/.qbs.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qbs" Fri May 3 22:47:03 2019 rev:3 rq:700210 version:1.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qbs/qbs.changes 2018-10-23 20:41:59.984428946 +0200 +++ /work/SRC/openSUSE:Factory/.qbs.new.5148/qbs.changes 2019-05-03 22:47:05.787861487 +0200 @@ -1,0 +2,40 @@ +Thu May 2 14:33:36 UTC 2019 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Change the license tag. qbs contains files licensed under + GPL-3.0-only with some Qt exceptions. + +------------------------------------------------------------------- +Sat Apr 20 12:04:41 UTC 2019 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Update to 1.13.0 + * Added a lot more documentation. + * Introduced module providers. + * The `Depends` item now falls back to `pkg-config` to locate dependencies + whose names do not correspond to a qbs module. + * Added the concept of job pools for limiting concurrent execution of commands + by type. + * Added support for rules without output artifacts. + * Added `atEnd` function to the `Process` service. + * Added `canonicalPath` function to the `FileInfo` service. + * Removed the need to add "import qbs" at the head of project files. + * The `Application`, `DynamicLibrary` and `StaticLibrary` items now have + properties for more convenient installation of target binaries. + * Added recursive dependency scanning of GNU ld linkerscripts. + * Added new `cpp` property `linkerVariant` to force use of `gold`, `bfd` or + `lld`. + * It is no longer required to call `setup-qt` before building Qt projects. + * Introduced the property `Qt.core.enableBigResources` for the creation of + "big" Qt resources. + * Static builds now pull in the default set of plugins as specified by Qt, and + the user can specify the set of plugins by type. + * Files can be explicitly tagged as mocable now. + * Added `protobuf` support for C++ and Objective-C. + * Introduced the `texttemplate` module, a facility similar to qmake's + `SUBSTITUTES` feature. + * The `AndroidApk` item was deprecated, a normal `Application` item can be + used instead. + * Building Qt apps is properly supported now, by making use of the + `androiddeployqt` tool. + * Introduced the `autotest` module. + +------------------------------------------------------------------- Old: ---- qbs-src-1.12.1.tar.gz New: ---- qbs-src-1.13.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qbs.spec ++++++ --- /var/tmp/diff_new_pack.3zBaPw/_old 2019-05-03 22:47:06.895864031 +0200 +++ /var/tmp/diff_new_pack.3zBaPw/_new 2019-05-03 22:47:06.947864150 +0200 @@ -1,7 +1,7 @@ # # spec file for package qbs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 The Qt Company. # # All modifications and additions to the file contributed by third parties @@ -19,12 +19,12 @@ %define qt5_version 5.9.0 Name: qbs -Version: 1.12.1 +Version: 1.13.0 Release: 0 Summary: Modern build tool for software projects -License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only +License: (LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only) AND GPL-3.0-with-Qt-Company-Qt-exception-1.1 Group: Development/Tools/Building -URL: https://qbs.io +URL: https://wiki.qt.io/Qbs Source: https://download.qt.io/official_releases/%{name}/%{version}/%{name}-src-%{v… BuildRequires: fdupes BuildRequires: libQt5Concurrent-devel >= %{qt5_version} @@ -133,6 +133,7 @@ %{_bindir}/%{name}-setup-toolchains %{_bindir}/qbs %{_datadir}/%{name}/imports/ +%{_datadir}/%{name}/module-providers/ %{_datadir}/%{name}/modules/ %{_datadir}/%{name}/python/ %{_datadir}/%{name}/qml-type-descriptions/ @@ -141,8 +142,7 @@ %{_libdir}/%{name}/plugins/libclangcompilationdbgenerator.so %{_libdir}/%{name}/plugins/libmakefilegenerator.so %{_libdir}/%{name}/plugins/libvisualstudiogenerator.so -%{_libdir}/lib%{name}core.so.* -%{_libdir}/lib%{name}qtprofilesetup.so.* +%{_libdir}/lib%{name}*.so.* %{_libexecdir}/%{name}/%{name}_processlauncher %{_libexecdir}/%{name}/dmgbuild %{_mandir}/man1/qbs*%{ext_man} @@ -151,9 +151,7 @@ %license LGPL_EXCEPTION.txt LICENSE.LGPLv21 LICENSE.LGPLv3 %doc %{_datadir}/%{name}/examples/ %{_includedir}/%{name}/ -%{_libdir}/lib%{name}core.prl -%{_libdir}/lib%{name}core.so -%{_libdir}/lib%{name}qtprofilesetup.prl -%{_libdir}/lib%{name}qtprofilesetup.so +%{_libdir}/lib%{name}*.prl +%{_libdir}/lib%{name}*.so %changelog ++++++ qbs-src-1.12.1.tar.gz -> qbs-src-1.13.0.tar.gz ++++++ ++++ 49730 lines of diff (skipped)

1 0

commit msmtp for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package msmtp for openSUSE:Factory checked in at 2019-05-03 22:47:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/msmtp (Old) and /work/SRC/openSUSE:Factory/.msmtp.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "msmtp" Fri May 3 22:47:00 2019 rev:44 rq:700191 version:1.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/msmtp/msmtp.changes 2019-02-26 22:23:07.466050755 +0100 +++ /work/SRC/openSUSE:Factory/.msmtp.new.5148/msmtp.changes 2019-05-03 22:47:01.795852323 +0200 @@ -1,0 +2,7 @@ +Wed Apr 24 18:48:28 UTC 2019 - Benoît Monin <benoit.monin(a)gmx.fr> + +- update to version 1.8.4 + * Added support for the OAUTHBEARER authentication method. + * Several minor bug fixes. + +------------------------------------------------------------------- Old: ---- msmtp-1.8.3.tar.xz msmtp-1.8.3.tar.xz.sig New: ---- msmtp-1.8.4.tar.xz msmtp-1.8.4.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msmtp.spec ++++++ --- /var/tmp/diff_new_pack.rcPKW0/_old 2019-05-03 22:47:02.331853553 +0200 +++ /var/tmp/diff_new_pack.rcPKW0/_new 2019-05-03 22:47:02.335853562 +0200 @@ -17,7 +17,7 @@ Name: msmtp -Version: 1.8.3 +Version: 1.8.4 Release: 0 BuildRequires: gnutls-devel BuildRequires: libidn2-devel ++++++ msmtp-1.8.3.tar.xz -> msmtp-1.8.4.tar.xz ++++++ ++++ 7053 lines of diff (skipped)

1 0

commit granite for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package granite for openSUSE:Factory checked in at 2019-05-03 22:46:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/granite (Old) and /work/SRC/openSUSE:Factory/.granite.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "granite" Fri May 3 22:46:57 2019 rev:9 rq:700182 version:5.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/granite/granite.changes 2019-03-05 12:19:54.844940384 +0100 +++ /work/SRC/openSUSE:Factory/.granite.new.5148/granite.changes 2019-05-03 22:46:58.863845592 +0200 @@ -1,0 +2,5 @@ +Sun Mar 3 19:13:56 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Do away with em dashes in summaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ granite.spec ++++++ --- /var/tmp/diff_new_pack.Khw8f2/_old 2019-05-03 22:46:59.335846675 +0200 +++ /var/tmp/diff_new_pack.Khw8f2/_new 2019-05-03 22:46:59.339846685 +0200 @@ -1,7 +1,7 @@ # # spec file for package granite # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,12 +24,12 @@ Version: 5.2.3 Release: 0 Summary: An extension of GTK+ libraries -License: LGPL-3.0-or-later and LGPL-3.0+ +License: LGPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://elementary.io/ Source: https://github.com/elementary/granite/archive/%{version}.tar.gz#/%{name}-%{… -BuildRequires: meson >= 0.48.2 BuildRequires: fdupes +BuildRequires: meson >= 0.48.2 BuildRequires: pkgconfig BuildRequires: vala >= 0.28.0 BuildRequires: pkgconfig(gee-0.8) @@ -54,7 +54,7 @@ found in Elementary applications. %package common -Summary: Granite development library -- Common Files +Summary: Common files for the Granite development library Group: System/Libraries Recommends: %{name}-lang @@ -64,7 +64,7 @@ This package contains the common files needed by the library. %package demo -Summary: Granite development library -- Demo binary +Summary: Demo binaries for the Granite development library Group: Development/Libraries/Other %description demo @@ -73,7 +73,7 @@ This package contains a small demo application to show the %{name} widgets. %package -n typelib-1_0-Granite-1_0 -Summary: Granite development library -- Introspection bindings +Summary: Introspection bindings for the Granite development library Group: Development/Libraries/GNOME %description -n typelib-1_0-Granite-1_0 @@ -82,7 +82,7 @@ This package provides the GObject Introspection bindings for %{soname}. %package devel -Summary: Granite development library -- Development files +Summary: Development files for the Granite development library Group: Development/Libraries/GNOME Requires: %{soname}%{sover} = %{version}

1 0

commit stress-ng for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package stress-ng for openSUSE:Factory checked in at 2019-05-03 22:46:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stress-ng (Old) and /work/SRC/openSUSE:Factory/.stress-ng.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stress-ng" Fri May 3 22:46:54 2019 rev:58 rq:700181 version:0.09.58 Changes: -------- --- /work/SRC/openSUSE:Factory/stress-ng/stress-ng.changes 2019-03-28 22:49:04.127050587 +0100 +++ /work/SRC/openSUSE:Factory/.stress-ng.new.5148/stress-ng.changes 2019-05-03 22:46:55.859838695 +0200 @@ -1,0 +2,60 @@ +Thu May 2 12:28:27 UTC 2019 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 0.09.58 + * Makefile: bump version once more + * core-cache: cater for C libraries that don't support GLOB_ONLYDIR + * stress-bad-altstack: move help info to start of function to fix build error + * stress-icache: fix build error, add missing comma + * stress-stackmmap: move help info to start of function to fix build error + * stress-vm: include options that are no-ops for some arches + * stress-vm: fix missing return 0 + * stress-full: move help info to start of function to fix build error + * stress-af-alg: fix build error, add missing comma + * Add copyright boilerplate to some text files + * Move per stressor help info into each stressor + * stress-udp: only declare udp_lite variable if UDP lite is supported + * stress-cache: move cache_flags declaration; fixes build error + * stress-ng: free proc info when a proc is being removed from the list + * Allow multiple definition of symbols when building a static image + * stress-softlockup: fix spelling mistake "reslults" -> "results" + * stress-cpu: fix spelling mistake "maxiumum" -> "maximum" + * stress-sigsegv: fix spelling mistake "instread" -> "instead" + * stress-ng: fix spelling mistake "functon" -> "function" + * Fix spelling mistake "exercsing" -> "exercising" + * stress-ng: fix spelling mistake "compressession" -> "compression" + * stress-cpu: fix spelling mistake "Rapshon" -> "Raphson" + * Add missing colon in error message text + * stress-zlib: clarify precedence of & and ? operators + * stress-stack: reduce scope of variable i + * core-log: reduce scope of empty_ts + * stress-aio-linux: fix build issue, missing , + * stress-*: pass args using opt rather than optarg + * stress-socket: make function stress_set_socket_domain static + * stress-ng.h: compact up option flags + * stress-*: remove the use of global opt flags for non-global stressor settings + * stress-*: make various variables static + * stress-*: make some more functions static + * stress-funccall: make a few more functions static + * stress-funccall: make functions static + * Remove the declaration of stressor options in opt_set_funcs, move them to each stressor + * Move STRESSORS macro to stress-ng.h and declare stress_id_t with it + * stress-ng: remove STRESS macro and declare stress info objs using STRESSORS macro + * core-shim: remove FUTEX_WAIT from shim_enosys call + * core-shim: replace ENOSYS code with an inlined helper + * Add build time check for pidfd-send-signal system call + * Add new pidfd stressor that exercises pidfd_send_signal + * Remove stress-pidfd.c from Makefile + * stress-enosys: don't SIGKILL child when it is waiting to reap (LP: #1825089) + * Add shim_waitpid to silently handle EINTR by retrying + * stress-numa: fix undefined behaviour with left shift + * stress-numa: fix calculation of max nodes (LP: #1803468) + * stress-fanotify: add FAN_OPEN_EXEC_PERM and try all allowed masks one by one + * stress-seal: exercise F_SEAL_FUTURE_WRITE + * stress-cpu: don't use large fft arrays on the stack + * stress-cpu: don't use large correlation arrays on the stack + * stress-cpu: don't use large matrixprod arrays on the stack + * stress-kcmp: rework capfail message to unconfuse static analysis tools + * stress-af-alg: make several functions static + * stress-sysfs: rename stat buf to stafbuf to fix name shadowing warnings + +------------------------------------------------------------------- Old: ---- stress-ng-0.09.57.tar.xz New: ---- stress-ng-0.09.58.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stress-ng.spec ++++++ --- /var/tmp/diff_new_pack.bwsOgQ/_old 2019-05-03 22:46:56.399839935 +0200 +++ /var/tmp/diff_new_pack.bwsOgQ/_new 2019-05-03 22:46:56.403839944 +0200 @@ -18,7 +18,7 @@ Name: stress-ng -Version: 0.09.57 +Version: 0.09.58 Release: 0 Summary: Tool to load and stress a computer License: GPL-2.0-only ++++++ stress-ng-0.09.57.tar.xz -> stress-ng-0.09.58.tar.xz ++++++ ++++ 15504 lines of diff (skipped)

1 0

commit gnuradio for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package gnuradio for openSUSE:Factory checked in at 2019-05-03 22:46:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuradio (Old) and /work/SRC/openSUSE:Factory/.gnuradio.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnuradio" Fri May 3 22:46:47 2019 rev:33 rq:700136 version:3.7.13.5 Changes: -------- --- /work/SRC/openSUSE:Factory/gnuradio/gnuradio.changes 2019-04-23 14:36:33.533493009 +0200 +++ /work/SRC/openSUSE:Factory/.gnuradio.new.5148/gnuradio.changes 2019-05-03 22:46:47.303819053 +0200 @@ -1,0 +2,32 @@ +Mon Apr 29 11:35:24 UTC 2019 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Add some missing optional dependencies: libgsm and codec2. + +------------------------------------------------------------------- +Mon Apr 29 10:37:15 UTC 2019 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Add upstream patches to build gnuradio using Qt5 on openSUSE > 1500: + - qt5-maint-0001-CMake-Update-required-minimum-version-to-2.8.12.patch + - qt5-maint-0002-CMake-FindQwt-Find-the-Qt5-version-of-QWT-instead-of.patch + - qt5-maint-0003-gr-qtgui-update-for-Qt5.patch + - qt5-maint-0004-grc-Generate-Python-scripts-that-use-PyQt5.patch + - qt5-maint-0005-gr-qtgui-Add-a-workaround-for-an-upstream-bug-of-uic.patch + - qt5-maint-0006-qtgui-fixed-examples-for-Qt5-compatibility.patch + - qt5-maint-0007-qtgui-Fixes-for-edit_box_msg-to-work-with-QT5.patch + - qt5-maint-0008-gr-qtgui-Allow-build-with-Qt4-or-Qt5-default.patch + - qt5-maint-0009-gr-qtgui-Fix-PyQt-4-5-include-in-XMLs-for-GRC.patch + - qt5-maint-0010-gr-qtgui-Fix-range.py-to-work-with-both-Qt4-and-Qt5.patch + - qt5-maint-0011-gr-qtgui-Re-introduce-some-Qt4-specific-code.patch + - qt5-maint-0012-grc-Fix-generation-of-Python-code-for-Qt4-and-Qt5.patch + - qt5-maint-0013-grc-replace-templated-xml-files-with-search-and-repl.patch + - qt5-maint-0014-qtgui-replace-templated-xml-files-with-search-and-re.patch + - qt5-maint-0017-qtgui-fix-stylesheet-for-qt5.patch + - qt5-maint-0019-qtgui-fixed-apps-for-Qt5-compatibility.patch + - qt5-maint-0021-gnuradio-runtime-ctrlport-qt5.patch + - qt5-maint-0022-gr-uhd-qt5.patch + - qt5-maint-0023-gr-qtgui-util.patch + - qt5-maint-0024-gr-qtgui-restoreGeometry.patch +- Add 0001-Add-the-include-path-used-by-the-openSUSE-package.patch + for the Qt5 build. + +------------------------------------------------------------------- New: ---- 0001-Add-the-include-path-used-by-the-openSUSE-package.patch qt5-maint-0001-CMake-Update-required-minimum-version-to-2.8.12.patch qt5-maint-0002-CMake-FindQwt-Find-the-Qt5-version-of-QWT-instead-of.patch qt5-maint-0003-gr-qtgui-update-for-Qt5.patch qt5-maint-0004-grc-Generate-Python-scripts-that-use-PyQt5.patch qt5-maint-0005-gr-qtgui-Add-a-workaround-for-an-upstream-bug-of-uic.patch qt5-maint-0006-qtgui-fixed-examples-for-Qt5-compatibility.patch qt5-maint-0007-qtgui-Fixes-for-edit_box_msg-to-work-with-QT5.patch qt5-maint-0008-gr-qtgui-Allow-build-with-Qt4-or-Qt5-default.patch qt5-maint-0009-gr-qtgui-Fix-PyQt-4-5-include-in-XMLs-for-GRC.patch qt5-maint-0010-gr-qtgui-Fix-range.py-to-work-with-both-Qt4-and-Qt5.patch qt5-maint-0011-gr-qtgui-Re-introduce-some-Qt4-specific-code.patch qt5-maint-0012-grc-Fix-generation-of-Python-code-for-Qt4-and-Qt5.patch qt5-maint-0013-grc-replace-templated-xml-files-with-search-and-repl.patch qt5-maint-0014-qtgui-replace-templated-xml-files-with-search-and-re.patch qt5-maint-0017-qtgui-fix-stylesheet-for-qt5.patch qt5-maint-0019-qtgui-fixed-apps-for-Qt5-compatibility.patch qt5-maint-0021-gnuradio-runtime-ctrlport-qt5.patch qt5-maint-0022-gr-uhd-qt5.patch qt5-maint-0023-gr-qtgui-util.patch qt5-maint-0024-gr-qtgui-restoreGeometry.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuradio.spec ++++++ --- /var/tmp/diff_new_pack.FFn0nA/_old 2019-05-03 22:46:48.679822212 +0200 +++ /var/tmp/diff_new_pack.FFn0nA/_new 2019-05-03 22:46:48.683822221 +0200 @@ -33,7 +33,30 @@ # http://www.nathanwest.us/grc_to_37.sh Source4: grc_to_37.sh Source99: %{name}-rpmlintrc -Patch2: missing_library.patch +Patch0: missing_library.patch +# PATCH 100-120 Qt5 port patches +Patch100: qt5-maint-0001-CMake-Update-required-minimum-version-to-2.8.12.patch +Patch101: qt5-maint-0002-CMake-FindQwt-Find-the-Qt5-version-of-QWT-instead-of.patch +Patch102: qt5-maint-0003-gr-qtgui-update-for-Qt5.patch +Patch103: qt5-maint-0004-grc-Generate-Python-scripts-that-use-PyQt5.patch +Patch104: qt5-maint-0005-gr-qtgui-Add-a-workaround-for-an-upstream-bug-of-uic.patch +Patch105: qt5-maint-0006-qtgui-fixed-examples-for-Qt5-compatibility.patch +Patch106: qt5-maint-0007-qtgui-Fixes-for-edit_box_msg-to-work-with-QT5.patch +Patch107: qt5-maint-0008-gr-qtgui-Allow-build-with-Qt4-or-Qt5-default.patch +Patch108: qt5-maint-0009-gr-qtgui-Fix-PyQt-4-5-include-in-XMLs-for-GRC.patch +Patch109: qt5-maint-0010-gr-qtgui-Fix-range.py-to-work-with-both-Qt4-and-Qt5.patch +Patch110: qt5-maint-0011-gr-qtgui-Re-introduce-some-Qt4-specific-code.patch +Patch111: qt5-maint-0012-grc-Fix-generation-of-Python-code-for-Qt4-and-Qt5.patch +Patch112: qt5-maint-0013-grc-replace-templated-xml-files-with-search-and-repl.patch +Patch113: qt5-maint-0014-qtgui-replace-templated-xml-files-with-search-and-re.patch +Patch114: qt5-maint-0017-qtgui-fix-stylesheet-for-qt5.patch +Patch115: qt5-maint-0019-qtgui-fixed-apps-for-Qt5-compatibility.patch +Patch116: qt5-maint-0021-gnuradio-runtime-ctrlport-qt5.patch +Patch117: qt5-maint-0022-gr-uhd-qt5.patch +Patch118: qt5-maint-0023-gr-qtgui-util.patch +Patch119: qt5-maint-0024-gr-qtgui-restoreGeometry.patch +#PATCH-FIX-OPENSUSE 0001-Add-the-include-path-used-by-the-openSUSE-package.patch +Patch120: 0001-Add-the-include-path-used-by-the-openSUSE-package.patch BuildRequires: alsa-devel %if 0%{?suse_version} > 1325 BuildRequires: libboost_filesystem-devel @@ -49,6 +72,7 @@ BuildRequires: gcc-c++ BuildRequires: gsl-devel BuildRequires: libSDL-devel +BuildRequires: libgsm-devel BuildRequires: libjack-devel BuildRequires: libxslt-python BuildRequires: memory-constraints @@ -61,13 +85,19 @@ BuildRequires: python-lxml BuildRequires: python-mako BuildRequires: python-numpy +%if 0%{?suse_version} > 1500 +BuildRequires: python-qt5-devel +BuildRequires: qwt6-qt5-devel +%else BuildRequires: python-qt4-devel BuildRequires: qwt6-devel +%endif BuildRequires: swig BuildRequires: texlive-dvips BuildRequires: texlive-latex BuildRequires: uhd-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(codec2) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libxml-2.0) # Workaround for openssl migration @@ -77,7 +107,12 @@ Requires: python-gtk Requires: python-lxml Requires: python-numpy +%if 0%{?suse_version} > 1500 +Requires: python-qt5 +%else Requires: python-qt4 +%endif + %if 0%{?suse_version} > 1320 BuildRequires: python-wxWidgets-3_0 %else @@ -199,7 +234,31 @@ %prep %setup -q tar xzf %{SOURCE3} -C volk/ --strip-components=1 -%patch2 -p1 +%patch0 -p1 +%if 0%{?suse_version} > 1500 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 +%patch109 -p1 +%patch110 -p1 +%patch111 -p1 +%patch112 -p1 +%patch113 -p1 +%patch114 -p1 +%patch115 -p1 +%patch116 -p1 +%patch117 -p1 +%patch118 -p1 +%patch119 -p1 +%patch120 -p1 +%endif + # remove buildtime from documentation sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.swig_doc.in ++++++ 0001-Add-the-include-path-used-by-the-openSUSE-package.patch ++++++ >From a7f7123b32b00408cd32b34c479b3bc23c3ec359 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christophe(a)krop.fr> Date: Mon, 29 Apr 2019 12:53:48 +0200 Subject: [PATCH] Add the include path used by the openSUSE package. --- cmake/Modules/FindQwt.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index 2b83fbf..5d54a2b 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS PATHS /usr/local/include/qwt-qt5 /usr/local/include/qwt + /usr/include/qt5/qwt6 /usr/include/qwt6 /usr/include/qwt-qt5 /usr/include/qwt -- 2.21.0 ++++++ qt5-maint-0001-CMake-Update-required-minimum-version-to-2.8.12.patch ++++++ >From b0f4ebcf6d656c829747dded592e182144098d42 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Tue, 29 Sep 2015 13:57:13 +0200 Subject: [PATCH 01/22] CMake: Update required minimum version to 2.8.12 This is required to use the Qt5-specific macros. Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59e3c886c4..ae6c1e1d49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ ######################################################################## # Make sure this version matches ${GR_CMAKE_MIN_VERSION} (a variable can't be # used here). -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.12) project(gnuradio CXX C) enable_testing() -- 2.11.0 ++++++ qt5-maint-0002-CMake-FindQwt-Find-the-Qt5-version-of-QWT-instead-of.patch ++++++ >From 25dedc0a2a7f0790f280770a7d22e9650ae2adbf Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Tue, 29 Sep 2015 13:30:59 +0200 Subject: [PATCH 02/22] CMake: FindQwt: Find the Qt5 version of QWT instead of the Qt4 version Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- cmake/Modules/FindQwt.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index da8bbe9049..2cffbe66f4 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -11,10 +11,10 @@ find_path(QWT_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/qwt ${CMAKE_PREFIX_PATH}/include/qwt PATHS - /usr/local/include/qwt-qt4 + /usr/local/include/qwt-qt5 /usr/local/include/qwt /usr/include/qwt6 - /usr/include/qwt-qt4 + /usr/include/qwt-qt5 /usr/include/qwt /usr/include/qwt5 /opt/local/include/qwt @@ -23,7 +23,7 @@ find_path(QWT_INCLUDE_DIRS ) find_library (QWT_LIBRARIES - NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5 + NAMES qwt6 qwt6-qt5 qwt qwt-qt5 HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 -- 2.11.0 ++++++ qt5-maint-0003-gr-qtgui-update-for-Qt5.patch ++++++ >From 1f78d5f2176de31809dc34fb38945c181390cdef Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Tue, 29 Sep 2015 11:25:47 +0200 Subject: [PATCH 03/22] gr-qtgui: update for Qt5 This commit switch the gr-qtgui blocks from being usable with Qt4 to being usable with Qt5. Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- gr-qtgui/CMakeLists.txt | 11 ++++------- gr-qtgui/grc/qtgui_ber_sink_b.xml | 2 +- gr-qtgui/grc/qtgui_check_box.xml | 2 +- gr-qtgui/grc/qtgui_chooser.xml | 4 ++-- gr-qtgui/grc/qtgui_const_sink_x.xml | 2 +- gr-qtgui/grc/qtgui_entry.xml | 2 +- gr-qtgui/grc/qtgui_freq_sink_x.xml | 2 +- gr-qtgui/grc/qtgui_histogram_sink_x.xml | 2 +- gr-qtgui/grc/qtgui_label.xml | 2 +- gr-qtgui/grc/qtgui_number_sink.xml | 2 +- gr-qtgui/grc/qtgui_push_button.xml | 2 +- gr-qtgui/grc/qtgui_sink_x.xml | 2 +- gr-qtgui/grc/qtgui_tab_widget.xml | 2 +- gr-qtgui/grc/qtgui_time_raster_x.xml | 2 +- gr-qtgui/grc/qtgui_time_sink_x.xml | 2 +- gr-qtgui/grc/qtgui_vector_sink_f.xml | 2 +- gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 2 +- gr-qtgui/include/gnuradio/qtgui/form_menus.h | 1 + gr-qtgui/lib/CMakeLists.txt | 8 ++++---- gr-qtgui/lib/SpectrumGUIClass.cc | 1 - gr-qtgui/lib/const_sink_c_impl.cc | 4 ---- gr-qtgui/lib/freq_sink_c_impl.cc | 4 ---- gr-qtgui/lib/freq_sink_f_impl.cc | 4 ---- gr-qtgui/lib/histogram_sink_f_impl.cc | 4 ---- gr-qtgui/lib/sink_c_impl.cc | 4 ---- gr-qtgui/lib/sink_f_impl.cc | 4 ---- gr-qtgui/lib/time_raster_sink_b_impl.cc | 4 ---- gr-qtgui/lib/time_raster_sink_f_impl.cc | 4 ---- gr-qtgui/lib/time_sink_c_impl.cc | 4 ---- gr-qtgui/lib/time_sink_f_impl.cc | 4 ---- gr-qtgui/lib/vector_sink_f_impl.cc | 4 ---- gr-qtgui/lib/waterfall_sink_c_impl.cc | 4 ---- gr-qtgui/lib/waterfall_sink_f_impl.cc | 4 ---- gr-qtgui/python/qtgui/range.py | 26 +++++++++++++------------- 34 files changed, 39 insertions(+), 94 deletions(-) --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -22,14 +22,14 @@ ######################################################################## include(GrBoost) -find_package(Qt4 4.2.0 COMPONENTS QtCore QtGui) +find_package(Qt5Widgets) find_package(Qwt) find_package(PythonLibs 2) include(GrPython) -GR_PYTHON_CHECK_MODULE("PyQt4" PyQt4 True PYQT4_FOUND) +GR_PYTHON_CHECK_MODULE("PyQt5" PyQt5 True PYQT5_FOUND) ######################################################################## # Register component @@ -37,13 +37,13 @@ include(GrComponent) if(NOT CMAKE_CROSSCOMPILING) set(qt_gui_python_deps - PYQT4_FOUND + PYQT5_FOUND ) endif(NOT CMAKE_CROSSCOMPILING) GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI Boost_FOUND - QT4_FOUND + Qt5Widgets_FOUND QWT_FOUND ENABLE_VOLK ENABLE_GNURADIO_RUNTIME @@ -66,9 +66,6 @@ ######################################################################## if(ENABLE_GR_QTGUI) -# populate the environment with QT variables -include(GrSetupQt4) - ######################################################################## # Setup CPack components ######################################################################## --- a/gr-qtgui/grc/qtgui_ber_sink_b.xml +++ b/gr-qtgui/grc/qtgui_ber_sink_b.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Bercurve Sink</name> <key>qtgui_bercurve_sink</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <import>import numpy</import> --- a/gr-qtgui/grc/qtgui_check_box.xml +++ b/gr-qtgui/grc/qtgui_check_box.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Check Box</name> <key>variable_qtgui_check_box</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = '_%s_check_box'%$id #if not $label() --- a/gr-qtgui/grc/qtgui_chooser.xml +++ b/gr-qtgui/grc/qtgui_chooser.xml @@ -8,8 +8,8 @@ <block> <name>QT GUI Chooser</name> <key>variable_qtgui_chooser</key> - <import>from PyQt4 import Qt</import> - <import>from PyQt4.QtCore import QObject, pyqtSlot</import> + <import>from PyQt5 import Qt</import> + <import>from PyQt5.QtCore import QObject, pyqtSlot</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#slurp #set $all_options = [$option0, $option1, $option2, $option3, $option4][:int($num_opts())] --- a/gr-qtgui/grc/qtgui_const_sink_x.xml +++ b/gr-qtgui/grc/qtgui_const_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Constellation Sink</name> <key>qtgui_const_sink_x</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id --- a/gr-qtgui/grc/qtgui_entry.xml +++ b/gr-qtgui/grc/qtgui_entry.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Entry</name> <key>variable_qtgui_entry</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import eng_notation</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = 'self._%s_tool_bar'%$id --- a/gr-qtgui/grc/qtgui_freq_sink_x.xml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Frequency Sink</name> <key>qtgui_freq_sink_x</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> --- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml +++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Histogram Sink</name> <key>qtgui_histogram_sink_x</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id --- a/gr-qtgui/grc/qtgui_label.xml +++ b/gr-qtgui/grc/qtgui_label.xml @@ -9,7 +9,7 @@ <block> <name>QT GUI Label</name> <key>variable_qtgui_label</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import eng_notation</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = 'self._%s_tool_bar'%$id --- a/gr-qtgui/grc/qtgui_number_sink.xml +++ b/gr-qtgui/grc/qtgui_number_sink.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Number Sink</name> <key>qtgui_number_sink</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id --- a/gr-qtgui/grc/qtgui_push_button.xml +++ b/gr-qtgui/grc/qtgui_push_button.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Push Button</name> <key>variable_qtgui_push_button</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = '_%s_push_button'%$id #if not $label() --- a/gr-qtgui/grc/qtgui_sink_x.xml +++ b/gr-qtgui/grc/qtgui_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Sink</name> <key>qtgui_sink_x</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> --- a/gr-qtgui/grc/qtgui_tab_widget.xml +++ b/gr-qtgui/grc/qtgui_tab_widget.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Tab Widget</name> <key>qtgui_tab_widget</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <make>#set $win = 'self.%s'%$id Qt.QTabWidget() #set $all_labels = [$label0, $label1, $label2, $label3, $label4, --- a/gr-qtgui/grc/qtgui_time_raster_x.xml +++ b/gr-qtgui/grc/qtgui_time_raster_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Time Raster Sink</name> <key>qtgui_time_raster_sink_x</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Time Sink</name> <key>qtgui_time_sink_x</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> --- a/gr-qtgui/grc/qtgui_vector_sink_f.xml +++ b/gr-qtgui/grc/qtgui_vector_sink_f.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Vector Sink</name> <key>qtgui_vector_sink_f</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Waterfall Sink</name> <key>qtgui_waterfall_sink_x</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -28,6 +28,7 @@ #include <QtGui/QtGui> #include <QtGui/QIntValidator> #include <QtGui/QDoubleValidator> +#include <QtWidgets/QtWidgets> #include <qwt_symbol.h> #include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/qtgui_types.h> --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -45,8 +45,8 @@ ${qtgui_mod_includedir}/VectorDisplayPlot.h edit_box_msg_impl.h ) -QT4_WRAP_CPP(qtgui_moc_sources ${qtgui_moc_hdrs}) -QT4_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui) +QT5_WRAP_CPP(qtgui_moc_sources ${qtgui_moc_hdrs}) +QT5_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui) #FIXME the sources expect <foo>.ui.h, but the macros generate ui_foo.h #avoid changing the sources by generating the header with the include @@ -127,7 +127,7 @@ ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} ${QWT_INCLUDE_DIRS} - ${QT_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} @@ -154,7 +154,7 @@ gnuradio-filter ${VOLK_LIBRARIES} ${QWT_LIBRARIES} - ${QT_LIBRARIES} + ${Qt5Widgets_LIBRARIES} ${FFTW3F_LIBRARIES} ) if (WIN32) --- a/gr-qtgui/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/lib/SpectrumGUIClass.cc @@ -26,7 +26,6 @@ #include <gnuradio/qtgui/SpectrumGUIClass.h> //Added by qt3to4: #include <QEvent> -#include <QCustomEvent> #include <volk/volk.h> const long SpectrumGUIClass::MAX_FFT_SIZE = 32768; --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -127,10 +127,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -156,10 +156,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -155,10 +155,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -115,10 +115,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -131,10 +131,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -131,10 +131,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -130,10 +130,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -128,10 +128,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -134,10 +134,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -129,10 +129,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/vector_sink_f_impl.cc +++ b/gr-qtgui/lib/vector_sink_f_impl.cc @@ -140,10 +140,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -159,10 +159,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -155,10 +155,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/python/qtgui/range.py +++ b/gr-qtgui/python/qtgui/range.py @@ -21,7 +21,7 @@ # Boston, MA 02110-1301, USA. # -from PyQt4 import Qt, QtCore, QtGui +from PyQt5 import Qt, QtCore, QtWidgets import util class Range(object): @@ -64,10 +64,10 @@ return (val*self.step+self.min) -class RangeWidget(QtGui.QWidget): +class RangeWidget(QtWidgets.QWidget): def __init__(self, ranges, slot, label, style, rangeType=float): """ Creates the QT Range widget """ - QtGui.QWidget.__init__(self) + QtWidgets.QWidget.__init__(self) self.range = ranges self.style = style @@ -98,10 +98,10 @@ layout.addWidget(self.d_widget) self.setLayout(layout) - class Dial(QtGui.QDial): + class Dial(QtWidgets.QDial): """ Creates the range using a dial """ def __init__(self, parent, ranges, slot, rangeType=float): - QtGui.QDial.__init__(self, parent) + QtWidgets.QDial.__init__(self, parent) self.rangeType = rangeType @@ -124,10 +124,10 @@ val = self.range.map_range(value) self.notifyChanged(self.rangeType(val)) - class Slider(QtGui.QSlider): + class Slider(QtWidgets.QSlider): """ Creates the range using a slider """ def __init__(self, parent, ranges, slot, rangeType=float): - QtGui.QSlider.__init__(self, QtCore.Qt.Horizontal, parent) + QtWidgets.QSlider.__init__(self, QtCore.Qt.Horizontal, parent) self.rangeType = rangeType @@ -166,18 +166,18 @@ event.accept() # Use repaint rather than calling the super mousePressEvent. # Calling super causes issue where slider jumps to wrong value. - QtGui.QSlider.repaint(self) + QtWidgets.QSlider.repaint(self) def mouseMoveEvent(self, event): new = self.minimum() + ((self.maximum()-self.minimum()) * event.x()) / self.width() self.setValue(new) event.accept() - QtGui.QSlider.repaint(self) + QtWidgets.QSlider.repaint(self) - class Counter(QtGui.QDoubleSpinBox): + class Counter(QtWidgets.QDoubleSpinBox): """ Creates the range using a counter """ def __init__(self, parent, ranges, slot, rangeType=float): - QtGui.QDoubleSpinBox.__init__(self, parent) + QtWidgets.QDoubleSpinBox.__init__(self, parent) self.rangeType = rangeType @@ -196,10 +196,10 @@ """ Handle the valueChanged signal by converting to the right type """ self.notifyChanged(self.rangeType(value)) - class CounterSlider(QtGui.QWidget): + class CounterSlider(QtWidgets.QWidget): """ Creates the range using a counter and slider """ def __init__(self, parent, ranges, slot, rangeType=float): - QtGui.QWidget.__init__(self, parent) + QtWidgets.QWidget.__init__(self, parent) self.rangeType = rangeType ++++++ qt5-maint-0004-grc-Generate-Python-scripts-that-use-PyQt5.patch ++++++ >From e58eb487c4119866f8c820658c8cda173bc96370 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Tue, 29 Sep 2015 13:22:46 +0200 Subject: [PATCH 04/22] grc: Generate Python scripts that use PyQt5 Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- grc/blocks/options.xml | 2 +- grc/core/generator/flow_graph.tmpl | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) --- a/grc/blocks/options.xml +++ b/grc/blocks/options.xml @@ -16,7 +16,7 @@ import wx #end if #if $generate_options() == 'qt_gui' -from PyQt4 import Qt +from PyQt5 import Qt import sys #end if #if $generate_options() == 'bokeh_gui' --- a/grc/core/generator/flow_graph.tmpl +++ b/grc/core/generator/flow_graph.tmpl @@ -118,7 +118,7 @@ self.top_layout.addLayout(self.top_grid_layout) self.settings = Qt.QSettings("GNU Radio", "$class_name") - self.restoreGeometry(self.settings.value("geometry").toByteArray()) + self.restoreGeometry(self.settings.value("geometry")) #elif $generate_options == 'bokeh_gui' @@ -435,10 +435,6 @@ serverProc.terminate() serverProc.kill() #elif $generate_options == 'qt_gui' - from distutils.version import StrictVersion - if StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0"): - style = gr.prefs().get_string('qtgui', 'style', 'raster') - Qt.QApplication.setGraphicsSystem(style) qapp = Qt.QApplication(sys.argv) tb = top_block_cls($(', '.join($params_eq_list))) @@ -457,7 +453,7 @@ def quitting(): tb.stop() tb.wait() - qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting) + qapp.aboutToQuit.connect(quitting) #for $m in $monitors if $m.has_param('en'): if $m.get_param('en').get_value(): ++++++ qt5-maint-0005-gr-qtgui-Add-a-workaround-for-an-upstream-bug-of-uic.patch ++++++ >From 45c65ebeefcb20c2d2480b11b299d49f288c3b73 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Mon, 12 Oct 2015 12:19:42 +0200 Subject: [PATCH 05/22] gr-qtgui: Add a workaround for an upstream bug of 'uic' The Qt5 version of the 'uic' compiler generates incorrect code right now. The bug has been reported (https://bugreports.qt.io/browse/QTBUG-48492) and is pending review. Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- gr-qtgui/include/QtWidgets/QRegExpValidator | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 gr-qtgui/include/QtWidgets/QRegExpValidator diff --git a/gr-qtgui/include/QtWidgets/QRegExpValidator b/gr-qtgui/include/QtWidgets/QRegExpValidator new file mode 100644 index 0000000000..17f6ce8333 --- /dev/null +++ b/gr-qtgui/include/QtWidgets/QRegExpValidator @@ -0,0 +1,9 @@ +/* + * The Qt5 version of the 'uic' compiler generates incorrect code right now. + * The bug has been reported (https://bugreports.qt.io/browse/QTBUG-48492) and + * is pending review. + * + * This file will make sure that the build of gr-qtgui will succeed with the + * broken version of 'uic'. + */ +#include <QtGui/QRegExpValidator> -- 2.11.0 ++++++ qt5-maint-0006-qtgui-fixed-examples-for-Qt5-compatibility.patch ++++++ ++++ 4737 lines (skipped) ++++++ qt5-maint-0007-qtgui-Fixes-for-edit_box_msg-to-work-with-QT5.patch ++++++ >From 1dae9e033016f35416cb433a8a129b4f011eb8c1 Mon Sep 17 00:00:00 2001 From: Tom Rondeau <tom(a)trondeau.com> Date: Thu, 28 Apr 2016 10:53:12 -0400 Subject: [PATCH 07/22] qtgui: Fixes for edit_box_msg to work with QT5. --- gr-qtgui/examples/c++/CMakeLists.txt | 20 +++++++++++--------- gr-qtgui/grc/qtgui_edit_box_msg.xml | 2 +- gr-qtgui/lib/edit_box_msg_impl.cc | 4 ---- 3 files changed, 12 insertions(+), 14 deletions(-) --- a/gr-qtgui/examples/c++/CMakeLists.txt +++ b/gr-qtgui/examples/c++/CMakeLists.txt @@ -18,14 +18,14 @@ # Boston, MA 02110-1301, USA. include_directories( - ${GR_QTGUI_INCLUDE_DIRS} - ${GR_ANALOG_INCLUDE_DIRS} - ${GR_FILTER_INCLUDE_DIRS} - ${GR_BLOCKS_INCLUDE_DIRS} - ${GR_FFT_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${QT_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} + ${GR_QTGUI_INCLUDE_DIRS} + ${GR_ANALOG_INCLUDE_DIRS} + ${GR_FILTER_INCLUDE_DIRS} + ${GR_BLOCKS_INCLUDE_DIRS} + ${GR_FFT_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) list(APPEND QTGUI_LIBRARIES @@ -35,9 +35,11 @@ gnuradio-blocks gnuradio-fft gnuradio-runtime + ${QWT_LIBRARY_DIRS} + ${Qt5Widgets_LIBRARIES} ) -QT4_WRAP_CPP(qtgui_moc_sources display_qt.h) +QT5_WRAP_CPP(qtgui_moc_sources display_qt.h) add_executable(display_qt display_qt.cc ${qtgui_moc_sources}) target_link_libraries(display_qt ${QTGUI_LIBRARIES}) --- a/gr-qtgui/grc/qtgui_edit_box_msg.xml +++ b/gr-qtgui/grc/qtgui_edit_box_msg.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Message Edit Box</name> <key>qtgui_edit_box_msg</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -66,10 +66,6 @@ d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 - std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); - QApplication::setGraphicsSystem(QString(style.c_str())); -#endif d_qApplication = new QApplication(d_argc, &d_argv); } ++++++ qt5-maint-0008-gr-qtgui-Allow-build-with-Qt4-or-Qt5-default.patch ++++++ >From aa06972a708d3559eae667dd9484edadf722d73c Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Mon, 20 Jun 2016 18:37:43 +0200 Subject: [PATCH 08/22] gr-qtgui: Allow build with Qt4 or Qt5 (default) Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- gr-qtgui/CMakeLists.txt | 27 ++++++++++++++++++++------- gr-qtgui/examples/c++/CMakeLists.txt | 11 ++++++++--- gr-qtgui/include/gnuradio/qtgui/form_menus.h | 4 ++++ gr-qtgui/lib/CMakeLists.txt | 14 ++++++++++---- 4 files changed, 42 insertions(+), 14 deletions(-) --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -22,14 +22,27 @@ ######################################################################## include(GrBoost) -find_package(Qt5Widgets) - -find_package(Qwt) - find_package(PythonLibs 2) include(GrPython) -GR_PYTHON_CHECK_MODULE("PyQt5" PyQt5 True PYQT5_FOUND) + +set(DESIRED_QT_VERSION 5 CACHE STRING "The Qt version to use (4 or 5)") +set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5) + +if (DESIRED_QT_VERSION MATCHES 4) + find_package(Qt4 COMPONENTS QtCore QtGui) + set(QT_FOUND ${Qt4_FOUND}) + include(GrSetupQt4) +else() + find_package(Qt5Widgets) + set(QT_FOUND ${Qt5Widgets_FOUND}) + set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES}) + set(QT_INCLUDE_DIRS ${Qt5Widgets_INCLUDE_DIRS}) +endif() + +GR_PYTHON_CHECK_MODULE("PyQt${DESIRED_QT_VERSION}" PyQt${DESIRED_QT_VERSION} True PYQT${DESIRED_QT_VERSION}_FOUND) + +find_package(Qwt) ######################################################################## # Register component @@ -37,13 +50,13 @@ include(GrComponent) if(NOT CMAKE_CROSSCOMPILING) set(qt_gui_python_deps - PYQT5_FOUND + PYQT${DESIRED_QT_VERSION}_FOUND ) endif(NOT CMAKE_CROSSCOMPILING) GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI Boost_FOUND - Qt5Widgets_FOUND + QT_FOUND QWT_FOUND ENABLE_VOLK ENABLE_GNURADIO_RUNTIME --- a/gr-qtgui/examples/c++/CMakeLists.txt +++ b/gr-qtgui/examples/c++/CMakeLists.txt @@ -24,7 +24,7 @@ ${GR_BLOCKS_INCLUDE_DIRS} ${GR_FFT_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${Qt5Widgets_INCLUDE_DIRS} + ${QT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) @@ -36,10 +36,15 @@ gnuradio-fft gnuradio-runtime ${QWT_LIBRARY_DIRS} - ${Qt5Widgets_LIBRARIES} + ${QT_LIBRARIES} ) -QT5_WRAP_CPP(qtgui_moc_sources display_qt.h) +if (${DESIRED_QT_VERSION} MATCHES 4) + QT4_WRAP_CPP(qtgui_moc_sources display_qt.h) +else() + QT5_WRAP_CPP(qtgui_moc_sources display_qt.h) +endif() + add_executable(display_qt display_qt.cc ${qtgui_moc_sources}) target_link_libraries(display_qt ${QTGUI_LIBRARIES}) --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -28,7 +28,11 @@ #include <QtGui/QtGui> #include <QtGui/QIntValidator> #include <QtGui/QDoubleValidator> + +#if QT_VERSION >= 0x050000 #include <QtWidgets/QtWidgets> +#endif + #include <qwt_symbol.h> #include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/qtgui_types.h> --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -45,8 +45,14 @@ ${qtgui_mod_includedir}/VectorDisplayPlot.h edit_box_msg_impl.h ) -QT5_WRAP_CPP(qtgui_moc_sources ${qtgui_moc_hdrs}) -QT5_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui) + +if (${DESIRED_QT_VERSION} MATCHES 4) + QT4_WRAP_CPP(qtgui_moc_sources ${qtgui_moc_hdrs}) + QT4_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui) +else() + QT5_WRAP_CPP(qtgui_moc_sources ${qtgui_moc_hdrs}) + QT5_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui) +endif() #FIXME the sources expect <foo>.ui.h, but the macros generate ui_foo.h #avoid changing the sources by generating the header with the include @@ -127,7 +133,7 @@ ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} ${QWT_INCLUDE_DIRS} - ${Qt5Widgets_INCLUDE_DIRS} + ${QT_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} @@ -154,7 +160,7 @@ gnuradio-filter ${VOLK_LIBRARIES} ${QWT_LIBRARIES} - ${Qt5Widgets_LIBRARIES} + ${QT_LIBRARIES} ${FFTW3F_LIBRARIES} ) if (WIN32) ++++++ qt5-maint-0009-gr-qtgui-Fix-PyQt-4-5-include-in-XMLs-for-GRC.patch ++++++ >From dc3db3b5ac29769aa4ab571a670d26e2fc7b6bf6 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Tue, 21 Jun 2016 17:42:45 +0200 Subject: [PATCH 09/22] gr-qtgui: Fix PyQt[4,5] include in XMLs for GRC Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- gr-qtgui/grc/CMakeLists.txt | 9 ++++++++- .../grc/{qtgui_ber_sink_b.xml => qtgui_ber_sink_b.xml.cmakein} | 2 +- .../grc/{qtgui_block_tree.xml => qtgui_block_tree.xml.cmakein} | 0 .../grc/{qtgui_check_box.xml => qtgui_check_box.xml.cmakein} | 2 +- gr-qtgui/grc/{qtgui_chooser.xml => qtgui_chooser.xml.cmakein} | 4 ++-- .../{qtgui_const_sink_x.xml => qtgui_const_sink_x.xml.cmakein} | 2 +- .../{qtgui_edit_box_msg.xml => qtgui_edit_box_msg.xml.cmakein} | 2 +- gr-qtgui/grc/{qtgui_entry.xml => qtgui_entry.xml.cmakein} | 2 +- .../grc/{qtgui_freq_sink_x.xml => qtgui_freq_sink_x.xml.cmakein} | 2 +- ...i_histogram_sink_x.xml => qtgui_histogram_sink_x.xml.cmakein} | 2 +- gr-qtgui/grc/{qtgui_label.xml => qtgui_label.xml.cmakein} | 2 +- .../grc/{qtgui_number_sink.xml => qtgui_number_sink.xml.cmakein} | 2 +- .../grc/{qtgui_push_button.xml => qtgui_push_button.xml.cmakein} | 2 +- gr-qtgui/grc/{qtgui_range.xml => qtgui_range.xml.cmakein} | 0 gr-qtgui/grc/{qtgui_sink_x.xml => qtgui_sink_x.xml.cmakein} | 2 +- .../grc/{qtgui_tab_widget.xml => qtgui_tab_widget.xml.cmakein} | 2 +- .../{qtgui_time_raster_x.xml => qtgui_time_raster_x.xml.cmakein} | 2 +- .../grc/{qtgui_time_sink_x.xml => qtgui_time_sink_x.xml.cmakein} | 2 +- .../{qtgui_vector_sink_f.xml => qtgui_vector_sink_f.xml.cmakein} | 2 +- ...i_waterfall_sink_x.xml => qtgui_waterfall_sink_x.xml.cmakein} | 2 +- 20 files changed, 26 insertions(+), 19 deletions(-) rename gr-qtgui/grc/{qtgui_ber_sink_b.xml => qtgui_ber_sink_b.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_block_tree.xml => qtgui_block_tree.xml.cmakein} (100%) rename gr-qtgui/grc/{qtgui_check_box.xml => qtgui_check_box.xml.cmakein} (97%) rename gr-qtgui/grc/{qtgui_chooser.xml => qtgui_chooser.xml.cmakein} (98%) rename gr-qtgui/grc/{qtgui_const_sink_x.xml => qtgui_const_sink_x.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_edit_box_msg.xml => qtgui_edit_box_msg.xml.cmakein} (98%) rename gr-qtgui/grc/{qtgui_entry.xml => qtgui_entry.xml.cmakein} (97%) rename gr-qtgui/grc/{qtgui_freq_sink_x.xml => qtgui_freq_sink_x.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_histogram_sink_x.xml => qtgui_histogram_sink_x.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_label.xml => qtgui_label.xml.cmakein} (97%) rename gr-qtgui/grc/{qtgui_number_sink.xml => qtgui_number_sink.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_push_button.xml => qtgui_push_button.xml.cmakein} (97%) rename gr-qtgui/grc/{qtgui_range.xml => qtgui_range.xml.cmakein} (100%) rename gr-qtgui/grc/{qtgui_sink_x.xml => qtgui_sink_x.xml.cmakein} (98%) rename gr-qtgui/grc/{qtgui_tab_widget.xml => qtgui_tab_widget.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_time_raster_x.xml => qtgui_time_raster_x.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_time_sink_x.xml => qtgui_time_sink_x.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_vector_sink_f.xml => qtgui_vector_sink_f.xml.cmakein} (99%) rename gr-qtgui/grc/{qtgui_waterfall_sink_x.xml => qtgui_waterfall_sink_x.xml.cmakein} (99%) diff --git a/gr-qtgui/grc/CMakeLists.txt b/gr-qtgui/grc/CMakeLists.txt index d56158ac70..d01bcc52c4 100644 --- a/gr-qtgui/grc/CMakeLists.txt +++ b/gr-qtgui/grc/CMakeLists.txt @@ -18,5 +18,12 @@ # Boston, MA 02110-1301, USA. ######################################################################## -file(GLOB xml_files "*.xml") +file(GLOB xml_cmakein_files "*.xml.cmakein") + +foreach(xml_cmakein_file IN ITEMS ${xml_cmakein_files}) + get_filename_component(FILE_NAME ${xml_cmakein_file} NAME_WE) + configure_file(${xml_cmakein_file} "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.xml" @ONLY) + set(xml_files ${xml_files} "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.xml") +endforeach(xml_cmakein_file) + install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "qtgui_python") diff --git a/gr-qtgui/grc/qtgui_ber_sink_b.xml b/gr-qtgui/grc/qtgui_ber_sink_b.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_ber_sink_b.xml rename to gr-qtgui/grc/qtgui_ber_sink_b.xml.cmakein index 085bf282be..91a87ce595 100644 --- a/gr-qtgui/grc/qtgui_ber_sink_b.xml +++ b/gr-qtgui/grc/qtgui_ber_sink_b.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Bercurve Sink</name> <key>qtgui_bercurve_sink</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <import>import numpy</import> diff --git a/gr-qtgui/grc/qtgui_block_tree.xml b/gr-qtgui/grc/qtgui_block_tree.xml.cmakein similarity index 100% rename from gr-qtgui/grc/qtgui_block_tree.xml rename to gr-qtgui/grc/qtgui_block_tree.xml.cmakein diff --git a/gr-qtgui/grc/qtgui_check_box.xml b/gr-qtgui/grc/qtgui_check_box.xml.cmakein similarity index 97% rename from gr-qtgui/grc/qtgui_check_box.xml rename to gr-qtgui/grc/qtgui_check_box.xml.cmakein index ccee59dd92..9edacb24d8 100644 --- a/gr-qtgui/grc/qtgui_check_box.xml +++ b/gr-qtgui/grc/qtgui_check_box.xml.cmakein @@ -8,7 +8,7 @@ <block> <name>QT GUI Check Box</name> <key>variable_qtgui_check_box</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = '_%s_check_box'%$id #if not $label() diff --git a/gr-qtgui/grc/qtgui_chooser.xml b/gr-qtgui/grc/qtgui_chooser.xml.cmakein similarity index 98% rename from gr-qtgui/grc/qtgui_chooser.xml rename to gr-qtgui/grc/qtgui_chooser.xml.cmakein index f79bb8ccb3..40c782bede 100644 --- a/gr-qtgui/grc/qtgui_chooser.xml +++ b/gr-qtgui/grc/qtgui_chooser.xml.cmakein @@ -8,8 +8,8 @@ <block> <name>QT GUI Chooser</name> <key>variable_qtgui_chooser</key> - <import>from PyQt5 import Qt</import> - <import>from PyQt5.QtCore import QObject, pyqtSlot</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@.QtCore import QObject, pyqtSlot</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#slurp #set $all_options = [$option0, $option1, $option2, $option3, $option4][:int($num_opts())] diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml b/gr-qtgui/grc/qtgui_const_sink_x.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_const_sink_x.xml rename to gr-qtgui/grc/qtgui_const_sink_x.xml.cmakein index 10f82cce82..6fa725acb1 100644 --- a/gr-qtgui/grc/qtgui_const_sink_x.xml +++ b/gr-qtgui/grc/qtgui_const_sink_x.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Constellation Sink</name> <key>qtgui_const_sink_x</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_edit_box_msg.xml b/gr-qtgui/grc/qtgui_edit_box_msg.xml.cmakein similarity index 98% rename from gr-qtgui/grc/qtgui_edit_box_msg.xml rename to gr-qtgui/grc/qtgui_edit_box_msg.xml.cmakein index d77a4b3e1b..75ff93349f 100644 --- a/gr-qtgui/grc/qtgui_edit_box_msg.xml +++ b/gr-qtgui/grc/qtgui_edit_box_msg.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Message Edit Box</name> <key>qtgui_edit_box_msg</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_entry.xml b/gr-qtgui/grc/qtgui_entry.xml.cmakein similarity index 97% rename from gr-qtgui/grc/qtgui_entry.xml rename to gr-qtgui/grc/qtgui_entry.xml.cmakein index fc0f4089d1..da61ee723a 100644 --- a/gr-qtgui/grc/qtgui_entry.xml +++ b/gr-qtgui/grc/qtgui_entry.xml.cmakein @@ -8,7 +8,7 @@ <block> <name>QT GUI Entry</name> <key>variable_qtgui_entry</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import eng_notation</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = 'self._%s_tool_bar'%$id diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml b/gr-qtgui/grc/qtgui_freq_sink_x.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_freq_sink_x.xml rename to gr-qtgui/grc/qtgui_freq_sink_x.xml.cmakein index ed39db7781..aaf0d75271 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.xml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Frequency Sink</name> <key>qtgui_freq_sink_x</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml b/gr-qtgui/grc/qtgui_histogram_sink_x.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_histogram_sink_x.xml rename to gr-qtgui/grc/qtgui_histogram_sink_x.xml.cmakein index 9e3dcb104f..d04a44da13 100644 --- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml +++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Histogram Sink</name> <key>qtgui_histogram_sink_x</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_label.xml b/gr-qtgui/grc/qtgui_label.xml.cmakein similarity index 97% rename from gr-qtgui/grc/qtgui_label.xml rename to gr-qtgui/grc/qtgui_label.xml.cmakein index 946cee36ab..c546e09dcc 100644 --- a/gr-qtgui/grc/qtgui_label.xml +++ b/gr-qtgui/grc/qtgui_label.xml.cmakein @@ -9,7 +9,7 @@ <block> <name>QT GUI Label</name> <key>variable_qtgui_label</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import eng_notation</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = 'self._%s_tool_bar'%$id diff --git a/gr-qtgui/grc/qtgui_number_sink.xml b/gr-qtgui/grc/qtgui_number_sink.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_number_sink.xml rename to gr-qtgui/grc/qtgui_number_sink.xml.cmakein index 06837493c3..d4b4c5808f 100644 --- a/gr-qtgui/grc/qtgui_number_sink.xml +++ b/gr-qtgui/grc/qtgui_number_sink.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Number Sink</name> <key>qtgui_number_sink</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_push_button.xml b/gr-qtgui/grc/qtgui_push_button.xml.cmakein similarity index 97% rename from gr-qtgui/grc/qtgui_push_button.xml rename to gr-qtgui/grc/qtgui_push_button.xml.cmakein index 49c2e9d6f0..d99f230acf 100644 --- a/gr-qtgui/grc/qtgui_push_button.xml +++ b/gr-qtgui/grc/qtgui_push_button.xml.cmakein @@ -8,7 +8,7 @@ <block> <name>QT GUI Push Button</name> <key>variable_qtgui_push_button</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = '_%s_push_button'%$id #if not $label() diff --git a/gr-qtgui/grc/qtgui_range.xml b/gr-qtgui/grc/qtgui_range.xml.cmakein similarity index 100% rename from gr-qtgui/grc/qtgui_range.xml rename to gr-qtgui/grc/qtgui_range.xml.cmakein diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml.cmakein similarity index 98% rename from gr-qtgui/grc/qtgui_sink_x.xml rename to gr-qtgui/grc/qtgui_sink_x.xml.cmakein index a9bc469cd2..1c75921a75 100644 --- a/gr-qtgui/grc/qtgui_sink_x.xml +++ b/gr-qtgui/grc/qtgui_sink_x.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Sink</name> <key>qtgui_sink_x</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> diff --git a/gr-qtgui/grc/qtgui_tab_widget.xml b/gr-qtgui/grc/qtgui_tab_widget.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_tab_widget.xml rename to gr-qtgui/grc/qtgui_tab_widget.xml.cmakein index 805542cc8b..f5a1a73cdc 100644 --- a/gr-qtgui/grc/qtgui_tab_widget.xml +++ b/gr-qtgui/grc/qtgui_tab_widget.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Tab Widget</name> <key>qtgui_tab_widget</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <make>#set $win = 'self.%s'%$id Qt.QTabWidget() #set $all_labels = [$label0, $label1, $label2, $label3, $label4, diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml b/gr-qtgui/grc/qtgui_time_raster_x.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_time_raster_x.xml rename to gr-qtgui/grc/qtgui_time_raster_x.xml.cmakein index d458f67eb9..94b7ef136a 100644 --- a/gr-qtgui/grc/qtgui_time_raster_x.xml +++ b/gr-qtgui/grc/qtgui_time_raster_x.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Time Raster Sink</name> <key>qtgui_time_raster_sink_x</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_time_sink_x.xml rename to gr-qtgui/grc/qtgui_time_sink_x.xml.cmakein index d4347950ea..d239917907 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Time Sink</name> <key>qtgui_time_sink_x</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> diff --git a/gr-qtgui/grc/qtgui_vector_sink_f.xml b/gr-qtgui/grc/qtgui_vector_sink_f.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_vector_sink_f.xml rename to gr-qtgui/grc/qtgui_vector_sink_f.xml.cmakein index 0f456323bf..8b928eb7ea 100644 --- a/gr-qtgui/grc/qtgui_vector_sink_f.xml +++ b/gr-qtgui/grc/qtgui_vector_sink_f.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Vector Sink</name> <key>qtgui_vector_sink_f</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml.cmakein similarity index 99% rename from gr-qtgui/grc/qtgui_waterfall_sink_x.xml rename to gr-qtgui/grc/qtgui_waterfall_sink_x.xml.cmakein index a684492246..d198ca084a 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml.cmakein @@ -7,7 +7,7 @@ <block> <name>QT GUI Waterfall Sink</name> <key>qtgui_waterfall_sink_x</key> - <import>from PyQt5 import Qt</import> + <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> -- 2.11.0 ++++++ qt5-maint-0010-gr-qtgui-Fix-range.py-to-work-with-both-Qt4-and-Qt5.patch ++++++ >From 7df8c4ea6559ba211222e7d7cfb152f71dbc815b Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Tue, 21 Jun 2016 18:16:06 +0200 Subject: [PATCH 10/22] gr-qtgui: Fix range.py to work with both Qt4 and Qt5 Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- gr-qtgui/python/qtgui/CMakeLists.txt | 10 +++++++++- gr-qtgui/python/qtgui/{range.py => range.py.cmakein} | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) rename gr-qtgui/python/qtgui/{range.py => range.py.cmakein} (99%) diff --git a/gr-qtgui/python/qtgui/CMakeLists.txt b/gr-qtgui/python/qtgui/CMakeLists.txt index 1c20033db2..7e2d0321c4 100644 --- a/gr-qtgui/python/qtgui/CMakeLists.txt +++ b/gr-qtgui/python/qtgui/CMakeLists.txt @@ -20,9 +20,17 @@ ######################################################################## include(GrPython) +if (DESIRED_QT_VERSION MATCHES 4) + set(PY_QT_IMPORT "from PyQt4 import Qt, QtCore, QtGui as QtWidgets") +else() + set(PY_QT_IMPORT "from PyQt5 import Qt, QtCore, QtWidgets") +endif() + +configure_file(range.py.cmakein "${CMAKE_CURRENT_BINARY_DIR}/range.py" @ONLY) + GR_PYTHON_INSTALL( FILES __init__.py - range.py + "${CMAKE_CURRENT_BINARY_DIR}/range.py" util.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui COMPONENT "qtgui_python" diff --git a/gr-qtgui/python/qtgui/range.py b/gr-qtgui/python/qtgui/range.py.cmakein similarity index 99% rename from gr-qtgui/python/qtgui/range.py rename to gr-qtgui/python/qtgui/range.py.cmakein index f972844114..9ed7706195 100755 --- a/gr-qtgui/python/qtgui/range.py +++ b/gr-qtgui/python/qtgui/range.py.cmakein @@ -21,7 +21,7 @@ # Boston, MA 02110-1301, USA. # -from PyQt5 import Qt, QtCore, QtWidgets +@PY_QT_IMPORT@ import util class Range(object): -- 2.11.0 ++++++ qt5-maint-0011-gr-qtgui-Re-introduce-some-Qt4-specific-code.patch ++++++ >From 988c1520d5b6f763caa0164faef404185e7dbc85 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil(a)analog.com> Date: Tue, 21 Jun 2016 18:30:21 +0200 Subject: [PATCH 11/22] gr-qtgui: Re-introduce some Qt4-specific code Signed-off-by: Paul Cercueil <paul.cercueil(a)analog.com> --- gr-qtgui/lib/const_sink_c_impl.cc | 4 ++++ gr-qtgui/lib/freq_sink_c_impl.cc | 4 ++++ gr-qtgui/lib/freq_sink_f_impl.cc | 4 ++++ gr-qtgui/lib/histogram_sink_f_impl.cc | 4 ++++ gr-qtgui/lib/sink_c_impl.cc | 4 ++++ gr-qtgui/lib/sink_f_impl.cc | 4 ++++ gr-qtgui/lib/time_raster_sink_b_impl.cc | 4 ++++ gr-qtgui/lib/time_raster_sink_f_impl.cc | 4 ++++ gr-qtgui/lib/time_sink_c_impl.cc | 4 ++++ gr-qtgui/lib/time_sink_f_impl.cc | 4 ++++ gr-qtgui/lib/vector_sink_f_impl.cc | 4 ++++ gr-qtgui/lib/waterfall_sink_c_impl.cc | 4 ++++ gr-qtgui/lib/waterfall_sink_f_impl.cc | 4 ++++ 13 files changed, 52 insertions(+) --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -127,6 +127,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -156,6 +156,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -155,6 +155,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -115,6 +115,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -131,6 +131,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -131,6 +131,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -130,6 +130,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -128,6 +128,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -134,6 +134,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -129,6 +129,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/vector_sink_f_impl.cc +++ b/gr-qtgui/lib/vector_sink_f_impl.cc @@ -140,6 +140,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -159,6 +159,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -155,6 +155,10 @@ d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 + std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); + QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } ++++++ qt5-maint-0012-grc-Fix-generation-of-Python-code-for-Qt4-and-Qt5.patch ++++++ ++++ 659 lines (skipped) ++++++ qt5-maint-0013-grc-replace-templated-xml-files-with-search-and-repl.patch ++++++ ++++ 650 lines (skipped) ++++++ qt5-maint-0014-qtgui-replace-templated-xml-files-with-search-and-re.patch ++++++ >From d796f30a241ed29831d597ee27df01556a80d2f1 Mon Sep 17 00:00:00 2001 From: Sebastian Koslowski <koslowski(a)kit.edu> Date: Tue, 30 Aug 2016 17:52:09 +0200 Subject: [PATCH 14/22] qtgui: replace templated xml files with search and replace for qt4 --- gr-qtgui/grc/CMakeLists.txt | 32 +++++++++++++++++----- ...ber_sink_b.xml.cmakein => qtgui_ber_sink_b.xml} | 2 +- ...block_tree.xml.cmakein => qtgui_block_tree.xml} | 0 ...i_check_box.xml.cmakein => qtgui_check_box.xml} | 2 +- ...qtgui_chooser.xml.cmakein => qtgui_chooser.xml} | 4 +-- ...t_sink_x.xml.cmakein => qtgui_const_sink_x.xml} | 2 +- ..._box_msg.xml.cmakein => qtgui_edit_box_msg.xml} | 2 +- .../{qtgui_entry.xml.cmakein => qtgui_entry.xml} | 2 +- ...eq_sink_x.xml.cmakein => qtgui_freq_sink_x.xml} | 2 +- ...nk_x.xml.cmakein => qtgui_histogram_sink_x.xml} | 2 +- .../{qtgui_label.xml.cmakein => qtgui_label.xml} | 2 +- ...mber_sink.xml.cmakein => qtgui_number_sink.xml} | 2 +- ...sh_button.xml.cmakein => qtgui_push_button.xml} | 2 +- .../{qtgui_range.xml.cmakein => qtgui_range.xml} | 0 .../{qtgui_sink_x.xml.cmakein => qtgui_sink_x.xml} | 2 +- ...tab_widget.xml.cmakein => qtgui_tab_widget.xml} | 2 +- ...aster_x.xml.cmakein => qtgui_time_raster_x.xml} | 2 +- ...me_sink_x.xml.cmakein => qtgui_time_sink_x.xml} | 2 +- ..._sink_f.xml.cmakein => qtgui_vector_sink_f.xml} | 2 +- ...nk_x.xml.cmakein => qtgui_waterfall_sink_x.xml} | 2 +- 20 files changed, 43 insertions(+), 25 deletions(-) rename gr-qtgui/grc/{qtgui_ber_sink_b.xml.cmakein => qtgui_ber_sink_b.xml} (99%) rename gr-qtgui/grc/{qtgui_block_tree.xml.cmakein => qtgui_block_tree.xml} (100%) rename gr-qtgui/grc/{qtgui_check_box.xml.cmakein => qtgui_check_box.xml} (97%) rename gr-qtgui/grc/{qtgui_chooser.xml.cmakein => qtgui_chooser.xml} (98%) rename gr-qtgui/grc/{qtgui_const_sink_x.xml.cmakein => qtgui_const_sink_x.xml} (99%) rename gr-qtgui/grc/{qtgui_edit_box_msg.xml.cmakein => qtgui_edit_box_msg.xml} (98%) rename gr-qtgui/grc/{qtgui_entry.xml.cmakein => qtgui_entry.xml} (97%) rename gr-qtgui/grc/{qtgui_freq_sink_x.xml.cmakein => qtgui_freq_sink_x.xml} (99%) rename gr-qtgui/grc/{qtgui_histogram_sink_x.xml.cmakein => qtgui_histogram_sink_x.xml} (99%) rename gr-qtgui/grc/{qtgui_label.xml.cmakein => qtgui_label.xml} (97%) rename gr-qtgui/grc/{qtgui_number_sink.xml.cmakein => qtgui_number_sink.xml} (99%) rename gr-qtgui/grc/{qtgui_push_button.xml.cmakein => qtgui_push_button.xml} (97%) rename gr-qtgui/grc/{qtgui_range.xml.cmakein => qtgui_range.xml} (100%) rename gr-qtgui/grc/{qtgui_sink_x.xml.cmakein => qtgui_sink_x.xml} (98%) rename gr-qtgui/grc/{qtgui_tab_widget.xml.cmakein => qtgui_tab_widget.xml} (99%) rename gr-qtgui/grc/{qtgui_time_raster_x.xml.cmakein => qtgui_time_raster_x.xml} (99%) rename gr-qtgui/grc/{qtgui_time_sink_x.xml.cmakein => qtgui_time_sink_x.xml} (99%) rename gr-qtgui/grc/{qtgui_vector_sink_f.xml.cmakein => qtgui_vector_sink_f.xml} (99%) rename gr-qtgui/grc/{qtgui_waterfall_sink_x.xml.cmakein => qtgui_waterfall_sink_x.xml} (99%) diff --git a/gr-qtgui/grc/CMakeLists.txt b/gr-qtgui/grc/CMakeLists.txt index d01bcc52c4..74e6958639 100644 --- a/gr-qtgui/grc/CMakeLists.txt +++ b/gr-qtgui/grc/CMakeLists.txt @@ -18,12 +18,30 @@ # Boston, MA 02110-1301, USA. ######################################################################## -file(GLOB xml_cmakein_files "*.xml.cmakein") +file(GLOB xml_files "*.xml") -foreach(xml_cmakein_file IN ITEMS ${xml_cmakein_files}) - get_filename_component(FILE_NAME ${xml_cmakein_file} NAME_WE) - configure_file(${xml_cmakein_file} "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.xml" @ONLY) - set(xml_files ${xml_files} "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.xml") -endforeach(xml_cmakein_file) +macro(REPLACE_IN_FILE _xml_block match replace) + set(xml_block_src "${CMAKE_CURRENT_SOURCE_DIR}/${_xml_block}") + set(xml_block "${CMAKE_CURRENT_BINARY_DIR}/${_xml_block}") -install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "qtgui_python") + list(REMOVE_ITEM xml_files "${xml_block_src}") + file(READ "${xml_block_src}" xml_block_src_text) + string(REPLACE "${match}" "${replace}" + xml_block_text "${xml_block_src_text}") + file(WRITE "${xml_block}" "${xml_block_text}") + + list(APPEND generated_xml_files "${xml_block}") +endmacro() + + +if(DESIRED_QT_VERSION EQUAL 4) + foreach(xml_block_src ${xml_files}) + get_filename_component(xml_block "${xml_block_src}" NAME) + REPLACE_IN_FILE("${xml_block}" "PyQt5" "PyQt4") + endforeach() +endif() + +install( + FILES ${xml_files} ${generated_xml_files} + DESTINATION "${GRC_BLOCKS_DIR}" +) diff --git a/gr-qtgui/grc/qtgui_ber_sink_b.xml.cmakein b/gr-qtgui/grc/qtgui_ber_sink_b.xml similarity index 99% rename from gr-qtgui/grc/qtgui_ber_sink_b.xml.cmakein rename to gr-qtgui/grc/qtgui_ber_sink_b.xml index 91a87ce595..05a36dfbc0 100644 --- a/gr-qtgui/grc/qtgui_ber_sink_b.xml.cmakein +++ b/gr-qtgui/grc/qtgui_ber_sink_b.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Bercurve Sink</name> <key>qtgui_bercurve_sink</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <import>import numpy</import> diff --git a/gr-qtgui/grc/qtgui_block_tree.xml.cmakein b/gr-qtgui/grc/qtgui_block_tree.xml similarity index 100% rename from gr-qtgui/grc/qtgui_block_tree.xml.cmakein rename to gr-qtgui/grc/qtgui_block_tree.xml diff --git a/gr-qtgui/grc/qtgui_check_box.xml.cmakein b/gr-qtgui/grc/qtgui_check_box.xml similarity index 97% rename from gr-qtgui/grc/qtgui_check_box.xml.cmakein rename to gr-qtgui/grc/qtgui_check_box.xml index 9edacb24d8..ccee59dd92 100644 --- a/gr-qtgui/grc/qtgui_check_box.xml.cmakein +++ b/gr-qtgui/grc/qtgui_check_box.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Check Box</name> <key>variable_qtgui_check_box</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = '_%s_check_box'%$id #if not $label() diff --git a/gr-qtgui/grc/qtgui_chooser.xml.cmakein b/gr-qtgui/grc/qtgui_chooser.xml similarity index 98% rename from gr-qtgui/grc/qtgui_chooser.xml.cmakein rename to gr-qtgui/grc/qtgui_chooser.xml index 40c782bede..f79bb8ccb3 100644 --- a/gr-qtgui/grc/qtgui_chooser.xml.cmakein +++ b/gr-qtgui/grc/qtgui_chooser.xml @@ -8,8 +8,8 @@ <block> <name>QT GUI Chooser</name> <key>variable_qtgui_chooser</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> - <import>from PyQt@DESIRED_QT_VERSION@.QtCore import QObject, pyqtSlot</import> + <import>from PyQt5 import Qt</import> + <import>from PyQt5.QtCore import QObject, pyqtSlot</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#slurp #set $all_options = [$option0, $option1, $option2, $option3, $option4][:int($num_opts())] diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml.cmakein b/gr-qtgui/grc/qtgui_const_sink_x.xml similarity index 99% rename from gr-qtgui/grc/qtgui_const_sink_x.xml.cmakein rename to gr-qtgui/grc/qtgui_const_sink_x.xml index 6fa725acb1..10f82cce82 100644 --- a/gr-qtgui/grc/qtgui_const_sink_x.xml.cmakein +++ b/gr-qtgui/grc/qtgui_const_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Constellation Sink</name> <key>qtgui_const_sink_x</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_edit_box_msg.xml.cmakein b/gr-qtgui/grc/qtgui_edit_box_msg.xml similarity index 98% rename from gr-qtgui/grc/qtgui_edit_box_msg.xml.cmakein rename to gr-qtgui/grc/qtgui_edit_box_msg.xml index 75ff93349f..d77a4b3e1b 100644 --- a/gr-qtgui/grc/qtgui_edit_box_msg.xml.cmakein +++ b/gr-qtgui/grc/qtgui_edit_box_msg.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Message Edit Box</name> <key>qtgui_edit_box_msg</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_entry.xml.cmakein b/gr-qtgui/grc/qtgui_entry.xml similarity index 97% rename from gr-qtgui/grc/qtgui_entry.xml.cmakein rename to gr-qtgui/grc/qtgui_entry.xml index da61ee723a..fc0f4089d1 100644 --- a/gr-qtgui/grc/qtgui_entry.xml.cmakein +++ b/gr-qtgui/grc/qtgui_entry.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Entry</name> <key>variable_qtgui_entry</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import eng_notation</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = 'self._%s_tool_bar'%$id diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml.cmakein b/gr-qtgui/grc/qtgui_freq_sink_x.xml similarity index 99% rename from gr-qtgui/grc/qtgui_freq_sink_x.xml.cmakein rename to gr-qtgui/grc/qtgui_freq_sink_x.xml index aaf0d75271..ed39db7781 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.xml.cmakein +++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Frequency Sink</name> <key>qtgui_freq_sink_x</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml.cmakein b/gr-qtgui/grc/qtgui_histogram_sink_x.xml similarity index 99% rename from gr-qtgui/grc/qtgui_histogram_sink_x.xml.cmakein rename to gr-qtgui/grc/qtgui_histogram_sink_x.xml index d04a44da13..9e3dcb104f 100644 --- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml.cmakein +++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Histogram Sink</name> <key>qtgui_histogram_sink_x</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_label.xml.cmakein b/gr-qtgui/grc/qtgui_label.xml similarity index 97% rename from gr-qtgui/grc/qtgui_label.xml.cmakein rename to gr-qtgui/grc/qtgui_label.xml index c546e09dcc..946cee36ab 100644 --- a/gr-qtgui/grc/qtgui_label.xml.cmakein +++ b/gr-qtgui/grc/qtgui_label.xml @@ -9,7 +9,7 @@ <block> <name>QT GUI Label</name> <key>variable_qtgui_label</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import eng_notation</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = 'self._%s_tool_bar'%$id diff --git a/gr-qtgui/grc/qtgui_number_sink.xml.cmakein b/gr-qtgui/grc/qtgui_number_sink.xml similarity index 99% rename from gr-qtgui/grc/qtgui_number_sink.xml.cmakein rename to gr-qtgui/grc/qtgui_number_sink.xml index d4b4c5808f..06837493c3 100644 --- a/gr-qtgui/grc/qtgui_number_sink.xml.cmakein +++ b/gr-qtgui/grc/qtgui_number_sink.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Number Sink</name> <key>qtgui_number_sink</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_push_button.xml.cmakein b/gr-qtgui/grc/qtgui_push_button.xml similarity index 97% rename from gr-qtgui/grc/qtgui_push_button.xml.cmakein rename to gr-qtgui/grc/qtgui_push_button.xml index d99f230acf..49c2e9d6f0 100644 --- a/gr-qtgui/grc/qtgui_push_button.xml.cmakein +++ b/gr-qtgui/grc/qtgui_push_button.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Push Button</name> <key>variable_qtgui_push_button</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = '_%s_push_button'%$id #if not $label() diff --git a/gr-qtgui/grc/qtgui_range.xml.cmakein b/gr-qtgui/grc/qtgui_range.xml similarity index 100% rename from gr-qtgui/grc/qtgui_range.xml.cmakein rename to gr-qtgui/grc/qtgui_range.xml diff --git a/gr-qtgui/grc/qtgui_sink_x.xml.cmakein b/gr-qtgui/grc/qtgui_sink_x.xml similarity index 98% rename from gr-qtgui/grc/qtgui_sink_x.xml.cmakein rename to gr-qtgui/grc/qtgui_sink_x.xml index 1c75921a75..a9bc469cd2 100644 --- a/gr-qtgui/grc/qtgui_sink_x.xml.cmakein +++ b/gr-qtgui/grc/qtgui_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Sink</name> <key>qtgui_sink_x</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> diff --git a/gr-qtgui/grc/qtgui_tab_widget.xml.cmakein b/gr-qtgui/grc/qtgui_tab_widget.xml similarity index 99% rename from gr-qtgui/grc/qtgui_tab_widget.xml.cmakein rename to gr-qtgui/grc/qtgui_tab_widget.xml index f5a1a73cdc..805542cc8b 100644 --- a/gr-qtgui/grc/qtgui_tab_widget.xml.cmakein +++ b/gr-qtgui/grc/qtgui_tab_widget.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Tab Widget</name> <key>qtgui_tab_widget</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <make>#set $win = 'self.%s'%$id Qt.QTabWidget() #set $all_labels = [$label0, $label1, $label2, $label3, $label4, diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml.cmakein b/gr-qtgui/grc/qtgui_time_raster_x.xml similarity index 99% rename from gr-qtgui/grc/qtgui_time_raster_x.xml.cmakein rename to gr-qtgui/grc/qtgui_time_raster_x.xml index 94b7ef136a..d458f67eb9 100644 --- a/gr-qtgui/grc/qtgui_time_raster_x.xml.cmakein +++ b/gr-qtgui/grc/qtgui_time_raster_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Time Raster Sink</name> <key>qtgui_time_raster_sink_x</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml.cmakein b/gr-qtgui/grc/qtgui_time_sink_x.xml similarity index 99% rename from gr-qtgui/grc/qtgui_time_sink_x.xml.cmakein rename to gr-qtgui/grc/qtgui_time_sink_x.xml index d239917907..d4347950ea 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml.cmakein +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Time Sink</name> <key>qtgui_time_sink_x</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> diff --git a/gr-qtgui/grc/qtgui_vector_sink_f.xml.cmakein b/gr-qtgui/grc/qtgui_vector_sink_f.xml similarity index 99% rename from gr-qtgui/grc/qtgui_vector_sink_f.xml.cmakein rename to gr-qtgui/grc/qtgui_vector_sink_f.xml index 8b928eb7ea..0f456323bf 100644 --- a/gr-qtgui/grc/qtgui_vector_sink_f.xml.cmakein +++ b/gr-qtgui/grc/qtgui_vector_sink_f.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Vector Sink</name> <key>qtgui_vector_sink_f</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml.cmakein b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml similarity index 99% rename from gr-qtgui/grc/qtgui_waterfall_sink_x.xml.cmakein rename to gr-qtgui/grc/qtgui_waterfall_sink_x.xml index d198ca084a..a684492246 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml.cmakein +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Waterfall Sink</name> <key>qtgui_waterfall_sink_x</key> - <import>from PyQt@DESIRED_QT_VERSION@ import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>from gnuradio.filter import firdes</import> <import>import sip</import> -- 2.11.0 ++++++ qt5-maint-0017-qtgui-fix-stylesheet-for-qt5.patch ++++++ >From ae10f7b4f1ec25fc2e800d42a061603a08c0283b Mon Sep 17 00:00:00 2001 From: Bastian Bloessl <bloessl(a)ccs-labs.org> Date: Fri, 11 Nov 2016 13:27:55 +0100 Subject: [PATCH 17/22] qtgui: fix stylesheet for qt5 --- gr-qtgui/python/qtgui/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gr-qtgui/python/qtgui/util.py b/gr-qtgui/python/qtgui/util.py index d2e9495ac6..fffc482615 100644 --- a/gr-qtgui/python/qtgui/util.py +++ b/gr-qtgui/python/qtgui/util.py @@ -25,7 +25,7 @@ from PyQt4 import Qt, QtCore, QtGui from gnuradio import gr def check_set_qss(): - app = QtGui.qApp + app = QtWidgets.qApp qssfile = gr.prefs().get_string("qtgui","qss","") if(len(qssfile)>0): try: -- 2.11.0 ++++++ qt5-maint-0019-qtgui-fixed-apps-for-Qt5-compatibility.patch ++++++ ++++ 2382 lines (skipped) ++++++ qt5-maint-0021-gnuradio-runtime-ctrlport-qt5.patch ++++++ >From b12439f3f600b9d0be03189e8a82310d9ceabdd6 Mon Sep 17 00:00:00 2001 From: "A. Maitland Bottoms" <bottoms(a)debian.org> Date: Sun, 25 Feb 2018 13:27:38 -0500 Subject: [PATCH 21/22] gnuradio runtime ctrlport qt5 --- gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py | 4 ++-- gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor | 4 ++-- gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py index c5bfd0a8cb..6d78565b3b 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py @@ -28,10 +28,10 @@ import sys, time, struct try: from gnuradio import qtgui - from PyQt4 import QtGui, QtCore + from PyQt5 import QtGui, QtCore import sip except ImportError: - print "Error: Program requires PyQt4 and gr-qtgui." + sys.stderr.write("Error: Program requires PyQt5 and gr-qtgui.\n") sys.exit(1) class GrDataPlotParent(gr.top_block, QtGui.QWidget): diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor index c866776355..ce53c60c0e 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from PyQt4 import QtCore,Qt -import PyQt4.QtGui as QtGui +from PyQt5 import QtCore,Qt +import PyQt5.QtGui as QtGui import os, sys, time, struct from gnuradio import gr, ctrlport diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx index 15a2153a0f..a9e43bff41 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx @@ -46,8 +46,8 @@ except ImportError: "Please check that they are installed and try again." sys.exit(1) -from PyQt4 import QtCore,Qt -import PyQt4.QtGui as QtGui +from PyQt5 import QtCore,Qt +import PyQt5.QtGui as QtGui import itertools from gnuradio import gr, ctrlport -- 2.11.0 ++++++ qt5-maint-0022-gr-uhd-qt5.patch ++++++ >From 18f5edf38cc6a24836f943d6976d913a4f35cab3 Mon Sep 17 00:00:00 2001 From: "A. Maitland Bottoms" <bottoms(a)debian.org> Date: Sun, 25 Feb 2018 13:28:05 -0500 Subject: [PATCH 22/22] gr uhd qt5 --- gr-uhd/apps/uhd_fft | 8 ++++---- gr-uhd/apps/uhd_siggen_gui | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -40,7 +40,7 @@ import threading import time from distutils.version import StrictVersion -from PyQt4 import Qt +from PyQt5 import Qt from gnuradio import eng_notation from gnuradio import eng_arg from gnuradio import gr @@ -478,8 +478,8 @@ Go, go, go! """ args = setup_argparser().parse_args() - if StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0"): - Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster')) + #if StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0"): + # Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster')) qapp = Qt.QApplication(sys.argv) tb = uhd_fft(args) tb.start() @@ -487,7 +487,7 @@ def quitting(): tb.stop() tb.wait() - qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting) + qapp.aboutToQuit.connect(quitting) qapp.exec_() tb = None #to clean up Qt widgets --- a/gr-uhd/apps/uhd_siggen_gui +++ b/gr-uhd/apps/uhd_siggen_gui @@ -38,8 +38,8 @@ import threading import time from distutils.version import StrictVersion -from PyQt4 import Qt -from PyQt4.QtCore import pyqtSlot +from PyQt5 import Qt +from PyQt5.QtCore import pyqtSlot from gnuradio import analog from gnuradio import eng_notation from gnuradio import gr @@ -448,14 +448,14 @@ """ Go, go, go! """ parser = setup_parser() args = parser.parse_args() - if StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0"): - Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui', 'style', 'raster')) + #if StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0"): + # Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui', 'style', 'raster')) qapp = Qt.QApplication(sys.argv) siggen_gui = uhd_siggen_gui(args) siggen_gui.show() def quitting(): siggen_gui.stop() - qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting) + qapp.aboutToQuit.connect(quitting) qapp.exec_() siggen_gui = None #to clean up Qt widgets ++++++ qt5-maint-0023-gr-qtgui-util.patch ++++++ >From af4ab4e0f745ef3d61effc71824b09d0c15d8b86 Mon Sep 17 00:00:00 2001 From: "A. Maitland Bottoms" <bottoms(a)debian.org> Date: Mon, 26 Feb 2018 21:36:29 -0500 Subject: [PATCH] gr qtgui util --- gr-qtgui/python/qtgui/util.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gr-qtgui/python/qtgui/util.py b/gr-qtgui/python/qtgui/util.py index fffc482615..ca9f6f5035 100644 --- a/gr-qtgui/python/qtgui/util.py +++ b/gr-qtgui/python/qtgui/util.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright 2016 Free Software Foundation, Inc. +# Copyright 2016,2018 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ # Boston, MA 02110-1301, USA. # -from PyQt4 import Qt, QtCore, QtGui +from PyQt5 import Qt, QtCore, QtGui, QtWidgets from gnuradio import gr def check_set_qss(): @@ -32,4 +32,3 @@ def check_set_qss(): app.setStyleSheet(open(qssfile).read()) except: print "WARNING: bad QSS file, %s"%(qssfile) - -- 2.11.0 ++++++ qt5-maint-0024-gr-qtgui-restoreGeometry.patch ++++++ >From b65bf73bc174183d6aec476c2fb161a4911c2351 Mon Sep 17 00:00:00 2001 From: Vasil Velichkov <vvvelichkov(a)gmail.com> Date: Thu, 11 Jan 2018 00:32:37 +0000 Subject: [PATCH 27/27] Fix AttributeError: 'NoneType' object has no attribute 'toByteArray' Debian Bug #886807 --- gr-uhd/apps/uhd_fft | 6 +++--- gr-uhd/apps/uhd_siggen_gui | 4 ++-- grc/blocks/options.xml | 2 +- grc/core/generator/flow_graph.tmpl | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -40,7 +40,7 @@ import threading import time from distutils.version import StrictVersion -from PyQt5 import Qt +from PyQt5 import Qt, QtCore from gnuradio import eng_notation from gnuradio import eng_arg from gnuradio import gr @@ -60,7 +60,7 @@ """ def __init__(self, args): gr.top_block.__init__(self, "UHD FFT") - Qt.QWidget.__init__(self) + Qt.QWidget.__init__(self, args=args) UHDApp.__init__(self, args=args, prefix="UHD FFT") ################################################## # Init QT App @@ -82,7 +82,7 @@ self.top_grid_layout = Qt.QGridLayout() self.top_layout.addLayout(self.top_grid_layout) self.settings = Qt.QSettings("GNU Radio", "uhd_fft") - self.restoreGeometry(self.settings.value("geometry").toByteArray()) + self.restoreGeometry(self.settings.value("geometry", type=QtCore.QByteArray)) ################################################## # Parameters --- a/gr-uhd/apps/uhd_siggen_gui +++ b/gr-uhd/apps/uhd_siggen_gui @@ -39,7 +39,7 @@ import time from distutils.version import StrictVersion from PyQt5 import Qt -from PyQt5.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot, QByteArray from gnuradio import analog from gnuradio import eng_notation from gnuradio import gr @@ -85,7 +85,7 @@ self.top_grid_layout = Qt.QGridLayout() self.top_layout.addLayout(self.top_grid_layout) self.settings = Qt.QSettings("GNU Radio", "uhd_siggen_gui") - self.restoreGeometry(self.settings.value("geometry").toByteArray()) + self.restoreGeometry(self.settings.value("geometry", type=QByteArray)) ################################################## # Widgets + Controls --- a/grc/blocks/options.xml +++ b/grc/blocks/options.xml @@ -16,7 +16,7 @@ import wx #end if #if $generate_options() == 'qt_gui' -from PyQt5 import Qt +from PyQt5 import Qt, QtCore import sys #end if #if $generate_options() == 'bokeh_gui' --- a/grc/core/generator/flow_graph.tmpl +++ b/grc/core/generator/flow_graph.tmpl @@ -122,7 +122,7 @@ self.top_layout.addLayout(self.top_grid_layout) self.settings = Qt.QSettings("GNU Radio", "$class_name") - self.restoreGeometry(self.settings.value("geometry")) + self.restoreGeometry(self.settings.value("geometry", type=QtCore.QByteArray)) #elif $generate_options == 'bokeh_gui'

1 0

commit hawk2 for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package hawk2 for openSUSE:Factory checked in at 2019-05-03 22:46:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk2 (Old) and /work/SRC/openSUSE:Factory/.hawk2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hawk2" Fri May 3 22:46:42 2019 rev:55 rq:700134 version:2.1.0+git.1539077520.05b7f2b2 Changes: -------- --- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2019-03-13 09:14:00.979394251 +0100 +++ /work/SRC/openSUSE:Factory/.hawk2.new.5148/hawk2.changes 2019-05-03 22:46:45.195814214 +0200 @@ -1,0 +2,5 @@ +Thu May 2 11:11:06 UTC 2019 - Kristoffer Gronlund <kgronlund(a)suse.com> + +- Revert previous change to ruby version detection. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk2.spec ++++++ --- /var/tmp/diff_new_pack.W23k8q/_old 2019-05-03 22:46:45.763815517 +0200 +++ /var/tmp/diff_new_pack.W23k8q/_new 2019-05-03 22:46:45.763815517 +0200 @@ -1,7 +1,7 @@ # # spec file for package hawk2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -39,8 +39,8 @@ %if 0%{suse_version} && 0%{suse_version} < 1330 %define rb_build_versions ruby24 -%define rb_build_abi ruby:2.4.0 -%define rb_suffix ruby2.4 +%define rb_default_ruby_abi ruby:2.4.0 +%define rb_default_ruby_suffix ruby2.4 %endif Name: hawk2 @@ -130,21 +130,21 @@ %patch -p1 %build -sed -i 's$#!/.*$#!%{_bindir}/ruby%{?rb_ruby_suffix:.%rb_ruby_suffix}$' hawk/bin/rails -sed -i 's$#!/.*$#!%{_bindir}/ruby%{?rb_ruby_suffix:.%rb_ruby_suffix}$' hawk/bin/rake -sed -i 's$#!/.*$#!%{_bindir}/ruby%{?rb_ruby_suffix:.%rb_ruby_suffix}$' hawk/bin/bundle +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_default_ruby_suffix}$' hawk/bin/rails +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_default_ruby_suffix}$' hawk/bin/rake +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_default_ruby_suffix}$' hawk/bin/bundle pushd hawk -if [ -x /usr/bin/bundle.ruby%{?rb_ruby_suffix:.%rb_ruby_suffix} ]; then - bundlerexe=bundle.ruby%{?rb_ruby_suffix:.%rb_ruby_suffix} +if [ -x /usr/bin/bundle.ruby.%{rb_default_ruby_suffix} ]; then + bundlerexe=bundle.ruby.%{rb_default_ruby_suffix} else - bundlerexe=bundle%{?rb_ruby_suffix:.%rb_ruby_suffix} + bundlerexe=bundle.%{rb_default_ruby_suffix} fi $bundlerexe exec bin/rails version popd export NOKOGIRI_USE_SYSTEM_LIBRARIES=1 CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS -make WWW_BASE=%{www_base} WWW_TMP=%{www_tmp} WWW_LOG=%{www_log} INIT_STYLE=%{init_style} LIBDIR=%{_libdir} BINDIR=%{_bindir} SBINDIR=%{_sbindir} RUBY_SUFFIX=.%{rb_ruby_suffix} +make WWW_BASE=%{www_base} WWW_TMP=%{www_tmp} WWW_LOG=%{www_log} INIT_STYLE=%{init_style} LIBDIR=%{_libdir} BINDIR=%{_bindir} SBINDIR=%{_sbindir} RUBY_SUFFIX=.%{rb_default_ruby_suffix} %install make WWW_BASE=%{www_base} WWW_TMP=%{www_tmp} WWW_LOG=%{www_log} INIT_STYLE=%{init_style} DESTDIR=%{buildroot} install

1 0

commit python-sphinxcontrib-github-alt for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package python-sphinxcontrib-github-alt for openSUSE:Factory checked in at 2019-05-03 22:46:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-github-alt (Old) and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-github-alt.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-sphinxcontrib-github-alt" Fri May 3 22:46:39 2019 rev:4 rq:700124 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-sphinxcontrib-github-alt/python-sphinxcontrib-github-alt.changes 2019-04-30 13:05:11.657945755 +0200 +++ /work/SRC/openSUSE:Factory/.python-sphinxcontrib-github-alt.new.5148/python-sphinxcontrib-github-alt.changes 2019-05-03 22:46:39.707801615 +0200 @@ -1,0 +2,5 @@ +Thu May 2 05:30:03 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Use noun phrase in descriptions. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sphinxcontrib-github-alt.spec ++++++ --- /var/tmp/diff_new_pack.kpwOvv/_old 2019-05-03 22:46:40.291802955 +0200 +++ /var/tmp/diff_new_pack.kpwOvv/_new 2019-05-03 22:46:40.299802974 +0200 @@ -21,7 +21,7 @@ Name: python-sphinxcontrib-github-alt Version: 1.1 Release: 0 -Summary: Link to GitHub issues, pull requests, commits and users from Sphinx docs +Summary: Sphinx extension to link to GitHub issues, pull requests, commits and users License: BSD-2-Clause Group: Development/Languages/Python Url: http://github.com/Calysto/octave_kernel @@ -36,8 +36,8 @@ %python_subpackages %description -Link to GitHub issues, pull requests, commits and users for a -particular project. +A Sphinx extension to link to GitHub issues, pull requests, commits +and users for a particular project. To use this extension, add it to the extensions list in conf.py, and set the variable github_project_url:

1 0

commit gnome-calendar for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package gnome-calendar for openSUSE:Factory checked in at 2019-05-03 22:46:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-calendar (Old) and /work/SRC/openSUSE:Factory/.gnome-calendar.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-calendar" Fri May 3 22:46:36 2019 rev:27 rq:699597 version:3.32.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-calendar/gnome-calendar.changes 2018-11-09 07:54:10.983727387 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-calendar.new.5148/gnome-calendar.changes 2019-05-03 22:46:37.939797556 +0200 @@ -1,0 +2,24 @@ +Sun Apr 28 10:57:37 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.1: + + Fix release date field in AppData. + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 11 15:51:54 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.0: + + Updated translations. + +------------------------------------------------------------------- +Fri Feb 15 21:28:57 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.31.90: + + Fix build failures against latest EDS. + + New app icon. + + Rewrite timezone support for events. + + Run nested EDS in Flatpak. + + Updated translations. +- Add new check section to spec and run meson_test macro. + +------------------------------------------------------------------- Old: ---- gnome-calendar-3.30.1.tar.xz New: ---- gnome-calendar-3.32.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-calendar.spec ++++++ --- /var/tmp/diff_new_pack.znszn0/_old 2019-05-03 22:46:39.159800356 +0200 +++ /var/tmp/diff_new_pack.znszn0/_new 2019-05-03 22:46:39.159800356 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-calendar # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: gnome-calendar -Version: 3.30.1 +Version: 3.32.1 Release: 0 Summary: A calendar application for GNOME License: GPL-3.0-or-later Group: Productivity/Office/Organizers URL: https://wiki.gnome.org/Design/Apps/Calendar -Source0: https://download.gnome.org/sources/gnome-calendar/3.30/%{name}-%{version}.t… +Source0: https://download.gnome.org/sources/gnome-calendar/3.32/%{name}-%{version}.t… BuildRequires: gtk-doc BuildRequires: meson @@ -72,6 +72,9 @@ %meson_install %find_lang %{name} %{?no_lang_C} +%check +%meson_test + %files %license COPYING %doc NEWS README.md TODO.md ++++++ gnome-calendar-3.30.1.tar.xz -> gnome-calendar-3.32.1.tar.xz ++++++ ++++ 12559 lines of diff (skipped)

1 0

commit gnome-weather for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package gnome-weather for openSUSE:Factory checked in at 2019-05-03 22:46:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-weather (Old) and /work/SRC/openSUSE:Factory/.gnome-weather.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-weather" Fri May 3 22:46:32 2019 rev:34 rq:699585 version:3.32.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-weather/gnome-weather.changes 2019-02-06 14:07:01.666653539 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-weather.new.5148/gnome-weather.changes 2019-05-03 22:46:34.363789346 +0200 @@ -1,0 +2,41 @@ +Mon Apr 22 16:30:40 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.2: + + Bugs fixed: Logged warning about non-standard use of + `array.toString() on a Uint8Array instance`. + + Updated translations. + +------------------------------------------------------------------- +Fri Apr 5 18:43:51 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.1: + + Bugs fixed: The app is not translated. + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 11 20:35:10 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.0: + + Migrate app menu to primary menu. + + New icon. + + Show tomorrow's forecasts at the end of the day. + +------------------------------------------------------------------- +Tue Mar 5 05:58:34 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.31.92: + + Bugs fixed: 3.31.90 no longer installs a binary in the path. + + Updated translations. + +------------------------------------------------------------------- +Sun Feb 17 07:11:50 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.31.90: + + Port from Autotools to Meson. + + Show tomorrow's forecasts at the end of the day. + + Unify App ID. + + Updated translations. +- Add meson BuildRequires and macros following upstreams port to + meson buildsystem. + +------------------------------------------------------------------- @@ -4,0 +46,15 @@ + +------------------------------------------------------------------- +Fri Jan 4 22:50:12 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.31.3: + + Migrate app menu to primary menu. + + New icon. + + Update GJS dependency. + + Updated translations. +- Drop upstream fixed patches: + + gnome-weather-fix-gettext-domain.patch. + + gnome-weather-fix-clicking-rows-places-popover.patch. +- Drop unneeded gjs BuildRequires, we have the pkgconfig variant + already. +- Drop glib2_gsettings_schema_requires, no longer needed. Old: ---- gnome-weather-3.26.0.tar.xz gnome-weather-fix-clicking-rows-places-popover.patch gnome-weather-fix-gettext-domain.patch New: ---- gnome-weather-3.32.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-weather.spec ++++++ --- /var/tmp/diff_new_pack.zKptRs/_old 2019-05-03 22:46:35.931792946 +0200 +++ /var/tmp/diff_new_pack.zKptRs/_new 2019-05-03 22:46:35.947792983 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-weather # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,42 +12,36 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define _name org.gnome.Weather Name: gnome-weather -Version: 3.26.0 +Version: 3.32.2 Release: 0 Summary: Weather App for GNOME License: GPL-2.0-or-later Group: Productivity/Other URL: https://live.gnome.org/Design/Apps/Weather -Source0: http://download.gnome.org/sources/gnome-weather/3.26/%{name}-%{version}.tar… +Source0: https://download.gnome.org/sources/gnome-weather/3.32/%{name}-%{version}.ta… -# PATCH-FIX-UPSTREAM gnome-weather-fix-gettext-domain.patch zaitor(a)opensuse.org -- gschema: Fix gettext-domain -Patch0: gnome-weather-fix-gettext-domain.patch -# PATCH-FIX-UPSTREAM gnome-weather-fix-clicking-rows-places-popover.patch bjorn.lie(a)gmail.com -- Fix clicking on rows in the places popover -Patch1: gnome-weather-fix-clicking-rows-places-popover.patch - -BuildRequires: gjs BuildRequires: intltool >= 0.26 +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gjs-1.0) >= 1.39.91 +BuildRequires: pkgconfig(gjs-1.0) >= 1.50.0 BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.35.9 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.11.4 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 BuildRequires: pkgconfig(gweather-3.0) >= 3.25.91 BuildRequires: pkgconfig(libgeoclue-2.0) >= 2.3.1 Recommends: %{name}-lang BuildArch: noarch -%glib2_gsettings_schema_requires %description GNOME 3 weather app that does: @@ -72,31 +66,31 @@ %autosetup -p1 %build -%configure --libdir=/unused-in-noarch -%make_build +%meson \ + %{nil} +%meson_build %install -%make_install -%suse_update_desktop_file %{_name}.Application Utility DesktopUtility -%find_lang %{_name} +%meson_install +%suse_update_desktop_file %{_name} Utility DesktopUtility +%find_lang %{_name} %{?no_lang_C} %{name}.lang %files -%license COPYING +%license COPYING.md %{_bindir}/%{name} -%dir %{_datadir}/appdata -%{_datadir}/appdata/org.gnome.Weather.appdata.xml -%{_datadir}/applications/org.gnome.Weather.Application.desktop +%{_datadir}/metainfo/org.gnome.Weather.appdata.xml +%{_datadir}/applications/org.gnome.Weather.desktop %{_datadir}/%{_name}/ -%{_datadir}/dbus-1/services/org.gnome.Weather.Application.service +%{_datadir}/dbus-1/services/org.gnome.Weather.service %{_datadir}/dbus-1/services/org.gnome.Weather.BackgroundService.service -%{_datadir}/glib-2.0/schemas/org.gnome.Weather.Application.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.Weather.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{_name}* %files -n gnome-shell-search-provider-gnome-weather %dir %{_datadir}/gnome-shell %dir %{_datadir}/gnome-shell/search-providers -%{_datadir}/gnome-shell/search-providers/org.gnome.Weather.Application.search-provider.ini +%{_datadir}/gnome-shell/search-providers/org.gnome.Weather.search-provider.ini -%files lang -f %{_name}.lang +%files lang -f %{name}.lang %changelog ++++++ gnome-weather-3.26.0.tar.xz -> gnome-weather-3.32.2.tar.xz ++++++ ++++ 31438 lines of diff (skipped)

1 0

commit python-tooz for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package python-tooz for openSUSE:Factory checked in at 2019-05-03 22:46:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tooz (Old) and /work/SRC/openSUSE:Factory/.python-tooz.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tooz" Fri May 3 22:46:29 2019 rev:9 rq:699141 version:1.64.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tooz/python-tooz.changes 2019-03-26 15:44:53.904116336 +0100 +++ /work/SRC/openSUSE:Factory/.python-tooz.new.5148/python-tooz.changes 2019-05-03 22:46:30.643780806 +0200 @@ -1,0 +2,27 @@ +Mon Apr 29 06:01:18 UTC 2019 - Dirk Mueller <dmueller(a)suse.com> + +- fix python-enum34 dependency + +------------------------------------------------------------------- +Mon Apr 8 14:02:40 UTC 2019 - cloud-devel(a)suse.de + +- update to version 1.64.2 + - More explicitly document driver connection strings + - fix tox python3 overrides + - Ensure consistent encoding of strings for ID + - Add release note link in README + - add lib-forward-testing-python3 test job + - Change openstack-dev to openstack-discuss + - Unblock tooz gate + - Update reno for stable/rocky + - Fixed UnicodeEncodeError for Python2 unicode objects + - Switch to autodoc_default_options + - Migrate to stestr + - add python 3.6 unit test job + - Use templates for cover + - Fix coverage tests + - import zuul job settings from project-config + - coordination: do not retry the whole heartbeat on fail +- add 0001-Remove-grpcio-from-requirements.txt.patch + +------------------------------------------------------------------- Old: ---- tooz-1.62.1.tar.gz New: ---- 0001-Remove-grpcio-from-requirements.txt.patch tooz-1.64.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tooz.spec ++++++ --- /var/tmp/diff_new_pack.xXJMeS/_old 2019-05-03 22:46:32.099784149 +0200 +++ /var/tmp/diff_new_pack.xXJMeS/_new 2019-05-03 22:46:32.123784204 +0200 @@ -16,43 +16,56 @@ # -%global pypi_name tooz %if 0%{?rhel} || 0%{?fedora} %global rdo 1 %endif Name: python-tooz -Version: 1.62.1 +Version: 1.64.2 Release: 0 Summary: Coordination library for distributed systems License: Apache-2.0 Group: Development/Languages/Python URL: https://docs.openstack.org/developer/tooz/ -Source0: https://files.pythonhosted.org/packages/source/t/%{pypi_name}/%{pypi_name}-… +Source0: https://files.pythonhosted.org/packages/source/t/tooz/tooz-1.64.2.tar.gz +# https://review.openstack.org/#/c/640695/ +Patch1: 0001-Remove-grpcio-from-requirements.txt.patch BuildRequires: memcached BuildRequires: openstack-macros -BuildRequires: python-devel -BuildRequires: python-enum34 -BuildRequires: python-fasteners >= 0.7 -BuildRequires: python-fixtures -BuildRequires: python-futures >= 3.0 -BuildRequires: python-futurist >= 0.11.0 -BuildRequires: python-iso8601 -BuildRequires: python-mock -BuildRequires: python-oslo.serialization >= 1.10.0 -BuildRequires: python-oslo.utils >= 3.15.0 -BuildRequires: python-pbr >= 1.6 -BuildRequires: python-pifpaf -BuildRequires: python-pymemcache -BuildRequires: python-setuptools -BuildRequires: python-stevedore >= 1.16.0 -BuildRequires: python-tenacity >= 3.2.1 -BuildRequires: python-testtools -BuildRequires: python-voluptuous >= 0.8.9 +BuildRequires: python2-enum34 >= 1.0.4 +BuildRequires: python2-fasteners >= 0.7 +BuildRequires: python2-fixtures +BuildRequires: python2-futures >= 3.0 +BuildRequires: python2-futurist >= 1.2.0 +BuildRequires: python2-iso8601 +BuildRequires: python2-mock +BuildRequires: python2-oslo.serialization >= 1.10.0 +BuildRequires: python2-oslo.utils >= 3.15.0 +BuildRequires: python2-pbr >= 1.6 +BuildRequires: python2-pifpaf +BuildRequires: python2-pymemcache +BuildRequires: python2-setuptools +BuildRequires: python2-stevedore >= 1.16.0 +BuildRequires: python2-tenacity >= 3.2.1 +BuildRequires: python2-testtools +BuildRequires: python2-voluptuous >= 0.8.9 +BuildRequires: python3-fasteners >= 0.7 +BuildRequires: python3-fixtures +BuildRequires: python3-futurist >= 1.2.0 +BuildRequires: python3-iso8601 +BuildRequires: python3-mock +BuildRequires: python3-oslo.serialization >= 1.10.0 +BuildRequires: python3-oslo.utils >= 3.15.0 +BuildRequires: python3-pbr >= 1.6 +BuildRequires: python3-pifpaf +BuildRequires: python3-pymemcache +BuildRequires: python3-setuptools +BuildRequires: python3-stevedore >= 1.16.0 +BuildRequires: python3-tenacity >= 3.2.1 +BuildRequires: python3-testtools +BuildRequires: python3-voluptuous >= 0.8.9 Requires: python-Babel -Requires: python-enum34 Requires: python-fasteners >= 0.7 -Requires: python-futures >= 3.0 -Requires: python-futurist >= 0.11.0 +Requires: python-futurist >= 1.2.0 Requires: python-iso8601 Requires: python-msgpack >= 0.4.0 Requires: python-oslo.serialization >= 1.10.0 @@ -61,22 +74,25 @@ Requires: python-stevedore >= 1.16.0 Requires: python-tenacity >= 3.2.1 Requires: python-voluptuous >= 0.8.9 -Requires: python-zake BuildArch: noarch +%ifpython2 +Requires: python-enum34 >= 1.0.4 +Requires: python-futures >= 3.0 +%endif +%python_subpackages %description The Tooz project aims at centralizing the most common distributed primitives like group membership protocol, lock service and leader election by providing a coordination API helping developers to build distributed applications. -%package doc +%package -n python-tooz-doc Summary: Documentation for %{name} Group: Documentation/HTML BuildRequires: python-Sphinx BuildRequires: python-openstackdocstheme -BuildRequires: python-redis -%description doc +%description -n python-tooz-doc The Tooz project aims at centralizing the most common distributed primitives like group membership protocol, lock service and leader election by providing a coordination API helping developers to build distributed applications. @@ -84,36 +100,36 @@ This package contains documentation in HTML format. %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -p1 -n tooz-1.64.2 %py_req_cleanup -sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build -%py2_build +%{python_build} # generate html docs -%{__python2} setup.py build_sphinx +PYTHONPATH=. \ + sphinx-build -b html doc/source doc/build/html # remove the Sphinx-build leftovers -rm -rf build/sphinx/html/.{doctrees,buildinfo} +rm -rf doc/build/html/.{doctrees,buildinfo} %check %if ! 0%{?rdo} export TOOZ_TEST_DRIVERS="memcached" export PATH=%{_prefix}/sbin:$PATH +export LC_ALL=en_US.UTF-8 bash run-tests.sh %endif %install -%py2_install +%{python_install} -%files +%files %{python_files} %license LICENSE -%doc README.rst -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-*.egg-info +%{python_sitelib}/tooz +%{python_sitelib}/tooz-*.egg-info -%files doc +%files -n python-tooz-doc %license LICENSE -%doc build/sphinx/html +%doc doc/build/html README.rst %changelog ++++++ 0001-Remove-grpcio-from-requirements.txt.patch ++++++ >From 9c2807281be01c28643471ebe9f9ef3d40b4c2c5 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <tbechtold(a)suse.com> Date: Mon, 4 Mar 2019 10:17:07 +0100 Subject: [PATCH] Remove grpcio from requirements.txt It is not used anywhere. Change-Id: I0a0215f56b37d9a4286097b7f748f68d59afcb35 --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b2aee6d..1af5228 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,3 @@ futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD futurist>=1.2.0 # Apache-2.0 oslo.utils>=3.15.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 -grpcio>=1.0.0,<1.16.0 -- 2.21.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xXJMeS/_old 2019-05-03 22:46:32.507785085 +0200 +++ /var/tmp/diff_new_pack.xXJMeS/_new 2019-05-03 22:46:32.507785085 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/open…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/open…</param> <param name="output-name">python-tooz.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/tooz/stable/rocky/requirements.…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/tooz/stable/stein/requirements.…</param> <param name="changelog-email">cloud-devel(a)suse.de</param> <param name="changelog-provider">gh,openstack,tooz</param> </service> ++++++ tooz-1.62.1.tar.gz -> tooz-1.64.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/.coveragerc new/tooz-1.64.2/.coveragerc --- old/tooz-1.62.1/.coveragerc 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/.coveragerc 2019-02-26 01:17:24.000000000 +0100 @@ -1,7 +1,7 @@ [run] branch = True source = tooz -omit = tooz/tests/*,tooz/openstack/* +omit = tooz/tests/* [report] ignore_errors = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/.stestr.conf new/tooz-1.64.2/.stestr.conf --- old/tooz-1.62.1/.stestr.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/tooz-1.64.2/.stestr.conf 2019-02-26 01:17:24.000000000 +0100 @@ -0,0 +1,2 @@ +[DEFAULT] +test_path=tooz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/.testr.conf new/tooz-1.64.2/.testr.conf --- old/tooz-1.62.1/.testr.conf 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/.testr.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ - OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ - OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \ - OS_DEBUG=${OS_DEBUG:-TRACE} \ - OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \ - ${PYTHON:-python} -m subunit.run discover tooz $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/.zuul.yaml new/tooz-1.64.2/.zuul.yaml --- old/tooz-1.62.1/.zuul.yaml 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/.zuul.yaml 2019-02-26 01:17:24.000000000 +0100 @@ -1,84 +1,60 @@ - project: + templates: + - check-requirements + - lib-forward-testing + - lib-forward-testing-python3 + - openstack-cover-jobs + - openstack-python-jobs + - openstack-python35-jobs + - openstack-python36-jobs + - periodic-stable-jobs + - publish-openstack-docs-pti + - release-notes-jobs-python3 check: jobs: - tooz-tox-py27-etcd - - tooz-tox-py35-etcd: - branches: ^(?!stable/newton).*$ - - tooz-tox-py27-etcd3: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py35-etcd3: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py27-etcd3gw: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py35-etcd3gw: - branches: ^(?!stable/(newton|ocata)).*$ + - tooz-tox-py35-etcd + - tooz-tox-py27-etcd3 + - tooz-tox-py35-etcd3 + - tooz-tox-py27-etcd3gw + - tooz-tox-py35-etcd3gw - tooz-tox-py27-zookeeper - - tooz-tox-py35-zookeeper: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-zookeeper - tooz-tox-py27-redis - - tooz-tox-py35-redis: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-redis - tooz-tox-py27-sentinel - - tooz-tox-py35-sentinel: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-sentinel - tooz-tox-py27-memcached - - tooz-tox-py35-memcached: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-memcached - tooz-tox-py27-postgresql - - tooz-tox-py35-postgresql: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-postgresql - tooz-tox-py27-mysql - - tooz-tox-py35-mysql: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-mysql - tooz-tox-py27-consul - - tooz-tox-py35-consul: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-consul gate: jobs: - tooz-tox-py27-etcd - - tooz-tox-py35-etcd: - branches: ^(?!stable/newton).*$ - - tooz-tox-py27-etcd3: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py35-etcd3: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py27-etcd3gw: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py35-etcd3gw: - branches: ^(?!stable/(newton|ocata)).*$ + - tooz-tox-py35-etcd + - tooz-tox-py27-etcd3 + - tooz-tox-py35-etcd3 + - tooz-tox-py27-etcd3gw + - tooz-tox-py35-etcd3gw - tooz-tox-py27-zookeeper - - tooz-tox-py35-zookeeper: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-zookeeper - tooz-tox-py27-redis - - tooz-tox-py35-redis: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-redis - tooz-tox-py27-sentinel - - tooz-tox-py35-sentinel: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-sentinel - tooz-tox-py27-memcached - - tooz-tox-py35-memcached: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-memcached - tooz-tox-py27-postgresql - - tooz-tox-py35-postgresql: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-postgresql - tooz-tox-py27-mysql - - tooz-tox-py35-mysql: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-mysql - tooz-tox-py27-consul - - tooz-tox-py35-consul: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-consul - templates: - - check-requirements - - openstack-python-jobs - - openstack-python35-jobs - - publish-openstack-docs-pti - - lib-forward-testing - - release-notes-jobs-python3 - - periodic-stable-jobs - post: - jobs: - - openstack-tox-cover - job: name: tooz-tox-py27-consul parent: openstack-tox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/AUTHORS new/tooz-1.64.2/AUTHORS --- old/tooz-1.62.1/AUTHORS 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/AUTHORS 2019-02-26 01:18:41.000000000 +0100 @@ -2,6 +2,7 @@ Adam Gandelman <adamg(a)ubuntu.com> Akihiro Motoki <amotoki(a)gmail.com> Andreas Jaeger <aj(a)suse.com> +Ben Nemec <bnemec(a)redhat.com> Cao Xuan Hoang <hoangcx(a)vn.fujitsu.com> ChangBo Guo(gcb) <eric.guo(a)easystack.cn> Chris Dent <chdent(a)redhat.com> @@ -18,6 +19,7 @@ Hoang Trung Hieu <hieuht(a)vn.fujitsu.com> Imran Ansari <imran.ansari(a)hpe.com> James E. Blair <jeblair(a)redhat.com> +James Page <james.page(a)ubuntu.com> Jay Clark <jason.t.clark(a)hp.com> Jay Pipes <jaypipes(a)gmail.com> Jeremy Stanley <fungi(a)yuggoth.org> @@ -45,6 +47,7 @@ Tony Breeds <tony(a)bakeyournoodle.com> Victor Morales <victor.morales(a)intel.com> Vilobh Meshram <vilobhmm(a)yahoo-inc.com> +XiaojueGuan <guanalbertjone(a)gmail.com> Yassine Lamgarchal <yassine.lamgarchal(a)enovance.com> Yassine Lamgarchal <yassine.lamgarchal(a)redhat.com> fuzk <fuzk(a)inspur.com> @@ -53,6 +56,7 @@ howardlee <lihongweibj(a)inspur.com> lahoucine BENLAHMR <lahoucine(a)benlahmr.com> liu-sheng <liusheng(a)huawei.com> +malei <malei(a)maleideMacBook-Pro.local> melissaml <ma.lei(a)99cloud.net> mengalong <alongmeng(a)gmail.com> zhangguoqing <zhang.guoqing(a)99cloud.net> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/ChangeLog new/tooz-1.64.2/ChangeLog --- old/tooz-1.62.1/ChangeLog 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/ChangeLog 2019-02-26 01:18:41.000000000 +0100 @@ -1,13 +1,41 @@ CHANGES ======= -1.62.1 +1.64.2 +------ + + +1.64.1 ------ * Fixed UnicodeEncodeError for Python2 unicode objects + +1.64.0 +------ + +* More explicitly document driver connection strings +* Unblock tooz gate +* Change openstack-dev to openstack-discuss + +1.63.1 +------ + + +1.63.0 +------ + +* coordination: do not retry the whole heartbeat on fail +* Use templates for cover +* Migrate to stestr +* Fix coverage tests +* Switch to autodoc\_default\_options +* Ensure consistent encoding of strings for ID +* add lib-forward-testing-python3 test job +* add python 3.6 unit test job * import zuul job settings from project-config +* Update reno for stable/rocky +* Add release note link in README * fix tox python3 overrides -* Update .gitreview for stable/rocky 1.62.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/PKG-INFO new/tooz-1.64.2/PKG-INFO --- old/tooz-1.62.1/PKG-INFO 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/PKG-INFO 2019-02-26 01:18:41.000000000 +0100 @@ -1,10 +1,10 @@ Metadata-Version: 2.1 Name: tooz -Version: 1.62.1 +Version: 1.64.2 Summary: Coordination library for distributed systems. Home-page: https://docs.openstack.org/tooz/latest/ Author: OpenStack -Author-email: openstack-dev(a)lists.openstack.org +Author-email: openstack-discuss(a)lists.openstack.org License: Apache-2 Description: Tooz ==== @@ -25,6 +25,7 @@ * Documentation: https://docs.openstack.org/tooz/latest/ * Source: https://git.openstack.org/cgit/openstack/tooz * Bugs: https://bugs.launchpad.net/python-tooz/ + * Release notes: https://docs.openstack.org/releasenotes/tooz Join us ------- @@ -44,16 +45,16 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.5 Classifier: Topic :: System :: Distributed Computing -Provides-Extra: zake Provides-Extra: zookeeper -Provides-Extra: ipc -Provides-Extra: test -Provides-Extra: mysql Provides-Extra: postgresql Provides-Extra: consul -Provides-Extra: etcd3gw -Provides-Extra: etcd3 Provides-Extra: doc -Provides-Extra: memcached -Provides-Extra: redis +Provides-Extra: zake +Provides-Extra: etcd3 Provides-Extra: etcd +Provides-Extra: etcd3gw +Provides-Extra: redis +Provides-Extra: test +Provides-Extra: memcached +Provides-Extra: ipc +Provides-Extra: mysql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/README.rst new/tooz-1.64.2/README.rst --- old/tooz-1.62.1/README.rst 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/README.rst 2019-02-26 01:17:24.000000000 +0100 @@ -17,6 +17,7 @@ * Documentation: https://docs.openstack.org/tooz/latest/ * Source: https://git.openstack.org/cgit/openstack/tooz * Bugs: https://bugs.launchpad.net/python-tooz/ +* Release notes: https://docs.openstack.org/releasenotes/tooz Join us ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/doc/requirements.txt new/tooz-1.64.2/doc/requirements.txt --- old/tooz-1.62.1/doc/requirements.txt 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/doc/requirements.txt 2019-02-26 01:17:24.000000000 +0100 @@ -10,3 +10,5 @@ psycopg2>=2.5 # LGPL/ZPL PyMySQL>=0.6.2 # MIT License pymemcache!=1.3.0,>=1.2.9 # Apache 2.0 License +etcd3>=0.6.2 # Apache-2.0 +etcd3gw>=0.1.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/doc/source/conf.py new/tooz-1.64.2/doc/source/conf.py --- old/tooz-1.62.1/doc/source/conf.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/doc/source/conf.py 2019-02-26 01:17:24.000000000 +0100 @@ -260,4 +260,8 @@ # extlinks = { # } -autodoc_default_flags = ['members', 'special-members', 'show-inheritance'] +autodoc_default_options = { + 'members': None, + 'special-members': None, + 'show_inheritance': None, + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/doc/source/reference/index.rst new/tooz-1.64.2/doc/source/reference/index.rst --- old/tooz-1.62.1/doc/source/reference/index.rst 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/doc/source/reference/index.rst 2019-02-26 01:17:24.000000000 +0100 @@ -20,6 +20,18 @@ .. autoclass:: tooz.drivers.etcd.EtcdDriver :members: +Etcd3 +~~~~~ + +.. autoclass:: tooz.drivers.etcd3.Etcd3Driver + :members: + +Etcd3gw +~~~~~~~ + +.. autoclass:: tooz.drivers.etcd3gw.Etcd3Driver + :members: + File ~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/doc/source/user/drivers.rst new/tooz-1.64.2/doc/source/user/drivers.rst --- old/tooz-1.62.1/doc/source/user/drivers.rst 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/doc/source/user/drivers.rst 2019-02-26 01:17:24.000000000 +0100 @@ -198,6 +198,38 @@ and is based on the `etcd server`_ supported key/value storage and associated primitives. +Etcd3 +----- + +**Driver:** :py:class:`tooz.drivers.etcd3.Etcd3Driver` + +**Characteristics:** :py:attr:`tooz.drivers.etcd3.Etcd3Driver.CHARACTERISTICS` + +**Entrypoint name:** ``etcd3`` + +**Summary:** + +The etcd3 driver is a driver providing only distributed locks (for now) +and is based on the `etcd server`_ supported key/value storage and +associated primitives. + +Etcd3 Gateway +------------- + +**Driver:** :py:class:`tooz.drivers.etcd3gw.Etcd3Driver` + +**Characteristics:** +:py:attr:`tooz.drivers.etcd3gw.Etcd3Driver.CHARACTERISTICS` + +**Entrypoint name:** ``etcd3+http`` + +**Summary:** + +The etcd3gw driver is a driver providing only distributed locks (for now) +and is based on the `etcd server`_ supported key/value storage and +associated primitives. It relies on the `GRPC Gateway`_ to provide HTTP access +to etcd3. + Consul ------ @@ -231,3 +263,4 @@ .. _PostgreSQL database server: http://postgresql.org .. _MySQL database server: http://mysql.org .. _redis-sentinel: http://redis.io/topics/sentinel +.. _GRPC Gateway: https://github.com/grpc-ecosystem/grpc-gateway diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/releasenotes/source/index.rst new/tooz-1.64.2/releasenotes/source/index.rst --- old/tooz-1.62.1/releasenotes/source/index.rst 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/releasenotes/source/index.rst 2019-02-26 01:17:24.000000000 +0100 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + rocky queens pike ocata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/releasenotes/source/rocky.rst new/tooz-1.64.2/releasenotes/source/rocky.rst --- old/tooz-1.62.1/releasenotes/source/rocky.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/tooz-1.64.2/releasenotes/source/rocky.rst 2019-02-26 01:17:24.000000000 +0100 @@ -0,0 +1,6 @@ +=================================== + Rocky Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/rocky diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/requirements.txt new/tooz-1.64.2/requirements.txt --- old/tooz-1.62.1/requirements.txt 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/requirements.txt 2019-02-26 01:17:24.000000000 +0100 @@ -4,12 +4,13 @@ pbr>=1.6 # Apache-2.0 stevedore>=1.16.0 # Apache-2.0 six>=1.9.0 # MIT -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD +enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD voluptuous>=0.8.9 # BSD License msgpack>=0.4.0 # Apache-2.0 fasteners>=0.7 # Apache-2.0 tenacity>=3.2.1 # Apache-2.0 futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD -futurist!=0.15.0,>=0.11.0 # Apache-2.0 +futurist>=1.2.0 # Apache-2.0 oslo.utils>=3.15.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 +grpcio>=1.0.0,<1.16.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/setup.cfg new/tooz-1.64.2/setup.cfg --- old/tooz-1.62.1/setup.cfg 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/setup.cfg 2019-02-26 01:18:41.000000000 +0100 @@ -1,7 +1,7 @@ [metadata] name = tooz author = OpenStack -author-email = openstack-dev(a)lists.openstack.org +author-email = openstack-discuss(a)lists.openstack.org summary = Coordination library for distributed systems. description-file = README.rst license = Apache-2 @@ -65,12 +65,12 @@ test = mock>=2.0 # BSD python-subunit>=0.0.18 # Apache-2.0/BSD - testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT coverage>=3.6 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD pifpaf>=0.10.0 # Apache-2.0 os-testr>=0.8.0 # Apache-2.0 + stestr>=2.0.0 doc = sphinx>=1.6.2 # BSD openstackdocstheme>=1.11.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tools/pretty_tox.sh new/tooz-1.64.2/tools/pretty_tox.sh --- old/tooz-1.62.1/tools/pretty_tox.sh 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tools/pretty_tox.sh 2019-02-26 01:17:24.000000000 +0100 @@ -10,7 +10,7 @@ # # this work around exists until that is addressed if [[ "$TESTARGS" =~ "until-failure" ]]; then - python setup.py testr --slowest --testr-args="$TESTRARGS" + stestr run --slowest "$TESTRARGS" else - python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f + stestr run --slowest --subunit "$TESTRARGS" | subunit-trace -f fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/coordination.py new/tooz-1.64.2/tooz/coordination.py --- old/tooz-1.62.1/tooz/coordination.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/coordination.py 2019-02-26 01:17:24.000000000 +0100 @@ -23,11 +23,11 @@ import threading from oslo_utils import encodeutils -from oslo_utils import excutils from oslo_utils import netutils from oslo_utils import timeutils import six from stevedore import driver +import tenacity import tooz from tooz import _retry @@ -179,12 +179,15 @@ return not (self._runner is None or not self._runner.is_alive()) - @excutils.forever_retry_uncaught_exceptions def _beat_forever_until_stopped(self): """Inner beating loop.""" + retry = tenacity.Retrying( + wait=tenacity.wait_fixed(1), + before_sleep=tenacity.before_sleep_log(LOG, logging.warning), + ) while not self._dead.is_set(): with timeutils.StopWatch() as w: - wait_until_next_beat = self._driver.heartbeat() + wait_until_next_beat = retry(self._driver.heartbeat) ran_for = w.elapsed() has_to_sleep_for = wait_until_next_beat - ran_for if has_to_sleep_for < 0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/consul.py new/tooz-1.64.2/tooz/drivers/consul.py --- old/tooz-1.62.1/tooz/drivers/consul.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/consul.py 2019-02-26 01:17:24.000000000 +0100 @@ -91,10 +91,22 @@ needed to make Consul being used as an option for Distributed Locking. The data is stored in Consul's key-value store. - To configure the client to your liking please refer - http://python-consul.readthedocs.org/en/latest/. Few options like 'ttl' - and 'namespace' will be passed as part of the options. 'ttl' governs the - duration till when the session holding the lock will be active. + The Consul driver connection URI should look like:: + + consul://HOST[:PORT][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, PORT defaults to 8500. + Available options are: + + ================== ======= + Name Default + ================== ======= + ttl 15 + namespace tooz + ================== ======= + + For details on the available options, refer to + http://python-consul.readthedocs.org/en/latest/. .. _python-consul: http://python-consul.readthedocs.org/ .. _consul: https://consul.io/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/etcd.py new/tooz-1.64.2/tooz/drivers/etcd.py --- old/tooz-1.62.1/tooz/drivers/etcd.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/etcd.py 2019-02-26 01:17:24.000000000 +0100 @@ -203,6 +203,21 @@ This driver uses etcd provide the coordination driver semantics and required API(s). + + The Etcd driver connection URI should look like:: + + etcd://[HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, HOST defaults to localhost and PORT defaults to 2379. + Available options are: + + ================== ======= + Name Default + ================== ======= + protocol http + timeout 30 + lock_timeout 30 + ================== ======= """ #: Default socket/lock/member/leader timeout used when none is provided. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/etcd3.py new/tooz-1.64.2/tooz/drivers/etcd3.py --- old/tooz-1.62.1/tooz/drivers/etcd3.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/etcd3.py 2019-02-26 01:17:24.000000000 +0100 @@ -115,6 +115,22 @@ This driver uses etcd provide the coordination driver semantics and required API(s). + + The Etcd driver connection URI should look like:: + + etcd3://[HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, HOST defaults to localhost and PORT defaults to 2379. + Available options are: + + ================== ======= + Name Default + ================== ======= + protocol http + timeout 30 + lock_timeout 30 + membership_timeout 30 + ================== ======= """ #: Default socket/lock/member/leader timeout used when none is provided. @@ -160,10 +176,10 @@ GROUP_PREFIX = b"tooz/groups/" def _encode_group_id(self, group_id): - return self.GROUP_PREFIX + group_id + b"/" + return self.GROUP_PREFIX + utils.to_binary(group_id) + b"/" def _encode_group_member_id(self, group_id, member_id): - return self._encode_group_id(group_id) + member_id + return self._encode_group_id(group_id) + utils.to_binary(member_id) def create_group(self, group_id): encoded_group = self._encode_group_id(group_id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/etcd3gw.py new/tooz-1.64.2/tooz/drivers/etcd3gw.py --- old/tooz-1.62.1/tooz/drivers/etcd3gw.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/etcd3gw.py 2019-02-26 01:17:24.000000000 +0100 @@ -166,6 +166,22 @@ This driver uses etcd provide the coordination driver semantics and required API(s). + + The Etcd driver connection URI should look like:: + + etcd3+http://[HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, HOST defaults to localhost and PORT defaults to 2379. + Available options are: + + ================== ======= + Name Default + ================== ======= + protocol http + timeout 30 + lock_timeout 30 + membership_timeout 30 + ================== ======= """ #: Default socket/lock/member/leader timeout used when none is provided. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/file.py new/tooz-1.64.2/tooz/drivers/file.py --- old/tooz-1.62.1/tooz/drivers/file.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/file.py 2019-02-26 01:17:24.000000000 +0100 @@ -186,6 +186,13 @@ missing some functionality but in the future these not implemented API(s) will be filled in. + The File driver connection URI should look like:: + + file://DIRECTORY[?timeout=TIMEOUT] + + DIRECTORY is the location that should be used to store lock files. + TIMEOUT defaults to 10. + General recommendations/usage considerations: - It does **not** automatically delete members from diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/ipc.py new/tooz-1.64.2/tooz/drivers/ipc.py --- old/tooz-1.62.1/tooz/drivers/ipc.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/ipc.py 2019-02-26 01:17:24.000000000 +0100 @@ -141,6 +141,10 @@ semantics and required API(s). It **is** missing some functionality but in the future these not implemented API(s) will be filled in. + The IPC driver connection URI should look like:: + + ipc:// + General recommendations/usage considerations: - It is **not** distributed (or recommended to be used in those diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/memcached.py new/tooz-1.64.2/tooz/drivers/memcached.py --- old/tooz-1.62.1/tooz/drivers/memcached.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/memcached.py 2019-02-26 01:17:24.000000000 +0100 @@ -190,6 +190,23 @@ all of the coordination driver API(s). It stores data into memcache using expiries and `msgpack`_ encoded values. + The Memcached driver connection URI should look like:: + + memcached://[HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, HOST defaults to localhost and PORT defaults to 11211. + Available options are: + + ================== ======= + Name Default + ================== ======= + timeout 30 + membership_timeout 30 + lock_timeout 30 + leader_timeout 30 + max_pool_size None + ================== ======= + General recommendations/usage considerations: - Memcache (without different backend technology) is a **cache** enough @@ -285,13 +302,13 @@ self.client.close() def _encode_group_id(self, group_id): - return self.GROUP_PREFIX + group_id + return self.GROUP_PREFIX + utils.to_binary(group_id) def _encode_member_id(self, member_id): - return self.MEMBER_PREFIX + member_id + return self.MEMBER_PREFIX + utils.to_binary(member_id) def _encode_group_leader(self, group_id): - return self.GROUP_LEADER_PREFIX + group_id + return self.GROUP_LEADER_PREFIX + utils.to_binary(group_id) @_retry.retry() def _add_group_to_group_list(self, group_id): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/mysql.py new/tooz-1.64.2/tooz/drivers/mysql.py --- old/tooz-1.62.1/tooz/drivers/mysql.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/mysql.py 2019-02-26 01:17:24.000000000 +0100 @@ -114,6 +114,12 @@ missing some functionality but in the future these not implemented API(s) will be filled in. + The MySQL driver connection URI should look like:: + + mysql://USERNAME:PASSWORD@HOST[:PORT]/DBNAME[?unix_socket=SOCKET_PATH] + + If not specified, PORT defaults to 3306. + .. _MySQL: http://dev.mysql.com/ """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/pgsql.py new/tooz-1.64.2/tooz/drivers/pgsql.py --- old/tooz-1.62.1/tooz/drivers/pgsql.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/pgsql.py 2019-02-26 01:17:24.000000000 +0100 @@ -174,6 +174,10 @@ missing some functionality but in the future these not implemented API(s) will be filled in. + The PostgreSQL driver connection URI should look like:: + + postgresql://[USERNAME[:PASSWORD]@]HOST:PORT?dbname=DBNAME + .. _PostgreSQL: http://www.postgresql.org/ """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/redis.py new/tooz-1.64.2/tooz/drivers/redis.py --- old/tooz-1.62.1/tooz/drivers/redis.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/redis.py 2019-02-26 01:17:24.000000000 +0100 @@ -138,6 +138,14 @@ some notion of HA (values *can* be lost when a failover transition occurs). + The Redis driver connection URI should look like:: + + redis://[:PASSWORD@]HOST:PORT[?OPTION=VALUE[&OPTION2=VALUE2[&...]]] + + For a list of options recognized by this driver, see the documentation + for the member CLIENT_ARGS, and to determine the expected types of those + options see CLIENT_BOOL_ARGS, CLIENT_INT_ARGS, and CLIENT_LIST_ARGS. + To use a `sentinel`_ the connection URI must point to the sentinel server. At connection time the sentinel will be asked for the current IP and port of the master and then connect there. The connection URI for sentinel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/zookeeper.py new/tooz-1.64.2/tooz/drivers/zookeeper.py --- old/tooz-1.62.1/tooz/drivers/zookeeper.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/zookeeper.py 2019-02-26 01:17:24.000000000 +0100 @@ -88,6 +88,10 @@ will be extracted from the coordinator url (or any provided options), so that a specific coordinator can be created that will work for you. + The Zookeeper coordinator url should look like:: + + zookeeper://[USERNAME:PASSWORD@][HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + Currently the following options will be proxied to the contained client: ================ =============================== ==================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz.egg-info/PKG-INFO new/tooz-1.64.2/tooz.egg-info/PKG-INFO --- old/tooz-1.62.1/tooz.egg-info/PKG-INFO 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/tooz.egg-info/PKG-INFO 2019-02-26 01:18:41.000000000 +0100 @@ -1,10 +1,10 @@ Metadata-Version: 2.1 Name: tooz -Version: 1.62.1 +Version: 1.64.2 Summary: Coordination library for distributed systems. Home-page: https://docs.openstack.org/tooz/latest/ Author: OpenStack -Author-email: openstack-dev(a)lists.openstack.org +Author-email: openstack-discuss(a)lists.openstack.org License: Apache-2 Description: Tooz ==== @@ -25,6 +25,7 @@ * Documentation: https://docs.openstack.org/tooz/latest/ * Source: https://git.openstack.org/cgit/openstack/tooz * Bugs: https://bugs.launchpad.net/python-tooz/ + * Release notes: https://docs.openstack.org/releasenotes/tooz Join us ------- @@ -44,16 +45,16 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.5 Classifier: Topic :: System :: Distributed Computing -Provides-Extra: zake Provides-Extra: zookeeper -Provides-Extra: ipc -Provides-Extra: test -Provides-Extra: mysql Provides-Extra: postgresql Provides-Extra: consul -Provides-Extra: etcd3gw -Provides-Extra: etcd3 Provides-Extra: doc -Provides-Extra: memcached -Provides-Extra: redis +Provides-Extra: zake +Provides-Extra: etcd3 Provides-Extra: etcd +Provides-Extra: etcd3gw +Provides-Extra: redis +Provides-Extra: test +Provides-Extra: memcached +Provides-Extra: ipc +Provides-Extra: mysql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz.egg-info/SOURCES.txt new/tooz-1.64.2/tooz.egg-info/SOURCES.txt --- old/tooz-1.62.1/tooz.egg-info/SOURCES.txt 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/tooz.egg-info/SOURCES.txt 2019-02-26 01:18:41.000000000 +0100 @@ -1,5 +1,5 @@ .coveragerc -.testr.conf +.stestr.conf .zuul.yaml AUTHORS CONTRIBUTING.rst @@ -50,6 +50,7 @@ releasenotes/source/ocata.rst releasenotes/source/pike.rst releasenotes/source/queens.rst +releasenotes/source/rocky.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz.egg-info/pbr.json new/tooz-1.64.2/tooz.egg-info/pbr.json --- old/tooz-1.62.1/tooz.egg-info/pbr.json 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/tooz.egg-info/pbr.json 2019-02-26 01:18:41.000000000 +0100 @@ -1 +1 @@ -{"git_version": "747f022", "is_release": true} \ No newline at end of file +{"git_version": "d554492", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz.egg-info/requires.txt new/tooz-1.64.2/tooz.egg-info/requires.txt --- old/tooz-1.62.1/tooz.egg-info/requires.txt 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/tooz.egg-info/requires.txt 2019-02-26 01:18:41.000000000 +0100 @@ -5,12 +5,13 @@ msgpack>=0.4.0 fasteners>=0.7 tenacity>=3.2.1 -futurist!=0.15.0,>=0.11.0 +futurist>=1.2.0 oslo.utils>=3.15.0 oslo.serialization>=1.10.0 +grpcio<1.16.0,>=1.0.0 [:(python_version=='2.7' or python_version=='2.6' or python_version=='3.3')] -enum34 +enum34>=1.0.4 [:(python_version=='2.7' or python_version=='2.6')] futures>=3.0 @@ -50,12 +51,12 @@ [test] mock>=2.0 python-subunit>=0.0.18 -testrepository>=0.0.18 testtools>=1.4.0 coverage>=3.6 fixtures>=3.0.0 pifpaf>=0.10.0 os-testr>=0.8.0 +stestr>=2.0.0 [zake] zake>=0.1.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tox.ini new/tooz-1.64.2/tox.ini --- old/tooz-1.62.1/tox.ini 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tox.ini 2019-02-26 01:17:24.000000000 +0100 @@ -46,7 +46,42 @@ [testenv:cover] basepython = python3 -commands = python setup.py testr --slowest --coverage --testr-args="{posargs}" +# NOTE(bnemec): Unfortunately, referencing testenv deps doesn't work here, so +# we have to duplicate the entire list. +# See https://github.com/tox-dev/tox/issues/706 +deps = .[test,zake,ipc,memcached,mysql,etcd,etcd3,etcd3gw] + zookeeper: .[zookeeper] + redis: .[redis] + sentinel: .[redis] + memcached: .[memcached] + postgresql: .[postgresql] + mysql: .[mysql] + etcd: .[etcd] + etcd3: .[etcd3] + etcd3gw: .[etcd3gw] + consul: .[consul] + coverage +setenv = + PYTHON=coverage run --source tooz --parallel-mode + TOOZ_TEST_URLS = file:///tmp zake:// ipc:// + zookeeper: TOOZ_TEST_DRIVERS = zookeeper + redis: TOOZ_TEST_DRIVERS = redis + sentinel: TOOZ_TEST_DRIVERS = redis --sentinel + memcached: TOOZ_TEST_DRIVERS = memcached + mysql: TOOZ_TEST_DRIVERS = mysql + postgresql: TOOZ_TEST_DRIVERS = postgresql + etcd: TOOZ_TEST_DRIVERS = etcd,etcd --cluster + etcd3: TOOZ_TEST_DRIVERS = etcd + etcd3: TOOZ_TEST_ETCD3 = 1 + etcd3gw: TOOZ_TEST_DRIVERS = etcd + etcd3gw: TOOZ_TEST_ETCD3GW = 1 + consul: TOOZ_TEST_DRIVERS = consul +commands = + {toxinidir}/run-tests.sh {toxinidir}/tools/pretty_tox.sh "{posargs}" + {toxinidir}/run-examples.sh + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [testenv:docs] basepython = python3

1 0

commit mame for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package mame for openSUSE:Factory checked in at 2019-05-03 22:46:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mame (Old) and /work/SRC/openSUSE:Factory/.mame.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mame" Fri May 3 22:46:19 2019 rev:16 rq:699037 version:0.209 Changes: -------- --- /work/SRC/openSUSE:Factory/mame/mame.changes 2019-03-28 22:49:20.267047664 +0100 +++ /work/SRC/openSUSE:Factory/.mame.new.5148/mame.changes 2019-05-03 22:46:20.667757904 +0200 @@ -1,0 +2,6 @@ +Wed Apr 24 18:21:14 UTC 2019 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 0.209 + See http://mamedev.org/releases/whatsnew_0209.txt for details + +------------------------------------------------------------------- Old: ---- mame0208.tar.gz whatsnew_0208.txt New: ---- mame0209.tar.gz whatsnew_0209.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mame.spec ++++++ --- /var/tmp/diff_new_pack.1Xhh8I/_old 2019-05-03 22:46:26.087770347 +0200 +++ /var/tmp/diff_new_pack.1Xhh8I/_new 2019-05-03 22:46:26.087770347 +0200 @@ -16,7 +16,7 @@ # -%define fver 208 +%define fver 209 # Build mame-mess by default, and use system libraries %bcond_without mess ++++++ mame0208.tar.gz -> mame0209.tar.gz ++++++ /work/SRC/openSUSE:Factory/mame/mame0208.tar.gz /work/SRC/openSUSE:Factory/.mame.new.5148/mame0209.tar.gz differ: char 14, line 1 ++++++ whatsnew_0208.txt -> whatsnew_0209.txt ++++++ ++++ 1255 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mame/whatsnew_0208.txt ++++ and /work/SRC/openSUSE:Factory/.mame.new.5148/whatsnew_0209.txt

1 0

commit kicad for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package kicad for openSUSE:Factory checked in at 2019-05-03 22:46:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kicad (Old) and /work/SRC/openSUSE:Factory/.kicad.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kicad" Fri May 3 22:46:15 2019 rev:32 rq:697956 version:5.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kicad/kicad.changes 2019-04-14 12:23:23.807829492 +0200 +++ /work/SRC/openSUSE:Factory/.kicad.new.5148/kicad.changes 2019-05-03 22:46:17.611750888 +0200 @@ -1,0 +2,13 @@ +Thu Apr 25 13:40:29 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de> + +- Update to minor release 5.1.2 + This version contains critical bugfixes and minor improvements. + See http://kicad-pcb.org/blog/2019/04/KiCad-5.1.2-Release/ for details. + +------------------------------------------------------------------- +Mon Apr 15 19:07:28 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de> + +- Update to minor release 5.1.1 + (Withdrawn due to a critical bug in netlist generation) + +------------------------------------------------------------------- Old: ---- kicad-5.1.0.tar.xz New: ---- kicad-5.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kicad.spec ++++++ --- /var/tmp/diff_new_pack.ply65I/_old 2019-05-03 22:46:18.287752440 +0200 +++ /var/tmp/diff_new_pack.ply65I/_new 2019-05-03 22:46:18.287752440 +0200 @@ -20,7 +20,7 @@ # symbol libraries from version 5.0.0 %define compatversion 5.0.0 Name: kicad -Version: 5.1.0 +Version: 5.1.2 Release: 0 Summary: EDA software suite for the creation of schematics and PCB License: GPL-3.0-or-later AND AGPL-3.0-or-later ++++++ kicad-5.1.0.tar.xz -> kicad-5.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/kicad/kicad-5.1.0.tar.xz /work/SRC/openSUSE:Factory/.kicad.new.5148/kicad-5.1.2.tar.xz differ: char 26, line 1

1 0

commit kicad-doc for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package kicad-doc for openSUSE:Factory checked in at 2019-05-03 22:46:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kicad-doc (Old) and /work/SRC/openSUSE:Factory/.kicad-doc.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kicad-doc" Fri May 3 22:46:09 2019 rev:20 rq:697955 version:5.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kicad-doc/kicad-doc.changes 2019-03-22 15:04:05.977664158 +0100 +++ /work/SRC/openSUSE:Factory/.kicad-doc.new.5148/kicad-doc.changes 2019-05-03 22:46:12.975740245 +0200 @@ -1,0 +2,12 @@ +Thu Apr 25 19:43:37 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de> + +- Update to minor release 5.1.2 + * Updates to chinese and italian translations + +------------------------------------------------------------------- +Tue Apr 16 15:46:57 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de> + +- Update to minor release 5.1.1 + * Various smaller changes and translation updates + +------------------------------------------------------------------- Old: ---- kicad-doc-5.1.0.tar.gz New: ---- kicad-doc-5.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kicad-doc.spec ++++++ --- /var/tmp/diff_new_pack.FkYzq5/_old 2019-05-03 22:46:14.859744570 +0200 +++ /var/tmp/diff_new_pack.FkYzq5/_new 2019-05-03 22:46:14.859744570 +0200 @@ -39,14 +39,13 @@ %endif Name: kicad-doc%{?pkg_suffix} -Version: 5.1.0 +Version: 5.1.2 Release: 0 Summary: Documentation and tutorials for KiCad License: GPL-3.0-or-later AND CC-BY-SA-3.0 +Group: Documentation/HTML %if "%flavor" == "pdf" -Group: Documentation/Other %else -Group: Documentation/HTML %endif Url: http://kicad-pcb.org Source: https://github.com/KiCad/%{sname}/archive/%{version}.tar.gz#/%{sname}-%{ver… @@ -104,6 +103,7 @@ %package ca Summary: Catalan documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:ca) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -113,6 +113,7 @@ %package de Summary: German documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:de) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -122,6 +123,7 @@ %package en Summary: English documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:en) Requires: kicad = %{version} Requires: kicad-doc = %{version} @@ -131,6 +133,7 @@ %package es Summary: Spanish documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:es) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -140,6 +143,7 @@ %package fr Summary: French documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:fr) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -149,6 +153,7 @@ %package id Summary: Indonesian documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:id) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -158,6 +163,7 @@ %package it Summary: Italian documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:it) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -167,6 +173,7 @@ %package ja Summary: Japanese documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:ja) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -176,6 +183,7 @@ %package pl Summary: Polish documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:pl) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -185,6 +193,7 @@ %package ru Summary: Russian documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:ru) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} @@ -194,6 +203,7 @@ %package zh Summary: Chinese documentation and tutorials for KiCad +Group: Documentation/Other Provides: locale(kicad-doc:zh) Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} ++++++ kicad-doc-5.1.0.tar.gz -> kicad-doc-5.1.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/kicad-doc/kicad-doc-5.1.0.tar.gz /work/SRC/openSUSE:Factory/.kicad-doc.new.5148/kicad-doc-5.1.2.tar.gz differ: char 13, line 1

1 0

commit ekiga for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package ekiga for openSUSE:Factory checked in at 2019-05-03 22:46:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ekiga (Old) and /work/SRC/openSUSE:Factory/.ekiga.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ekiga" Fri May 3 22:46:06 2019 rev:60 rq:696488 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ekiga/ekiga.changes 2018-05-11 11:28:23.472126880 +0200 +++ /work/SRC/openSUSE:Factory/.ekiga.new.5148/ekiga.changes 2019-05-03 22:46:08.379729694 +0200 @@ -1,0 +2,17 @@ +Tue Apr 2 16:41:44 CEST 2019 - ro(a)suse.de + +- get rid of boost:signal dependency + - rebase to git commit 12641b735a9886a080949465d4da6d4569822ed2 + - use 4.1.0 as version + - add patches to make it compile: + - ekiga-po-Makefile.patch (re-add po/Makefile.in.in) + - ekiga-signals2-leftover.patch (fix a left over signal1 incl) + - ekiga-missing-includes.patch (include iostream where needed) +- use -fexceptions for builds older than code15 + +------------------------------------------------------------------- +Tue Mar 5 16:10:36 UTC 2019 - Andreas Schwab <schwab(a)suse.de> + +- boost-configure.patch: add riscv64 to the list of lib64 architectures + +------------------------------------------------------------------- Old: ---- ekiga-4.0.1.tar.xz New: ---- ekiga-12641b735a9886a080949465d4da6d4569822ed2.tar.bz2 ekiga-missing-includes.patch ekiga-po-Makefile.patch ekiga-signals2-leftover.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ekiga.spec ++++++ --- /var/tmp/diff_new_pack.a4i8ok/_old 2019-05-03 22:46:09.383731999 +0200 +++ /var/tmp/diff_new_pack.a4i8ok/_new 2019-05-03 22:46:09.383731999 +0200 @@ -1,7 +1,7 @@ # # spec file for package ekiga # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define with_evolution 1 %define with_gstreamer_0_10 0 Name: ekiga -Version: 4.0.1 +Version: 4.1.0 Release: 0 Summary: A GNOME based SIP/H323 teleconferencing application License: SUSE-GPL-2.0-with-openssl-exception Group: Productivity/Telephony/SIP/Clients Url: http://www.ekiga.org/ -Source: http://download.gnome.org/sources/ekiga/4.0/%{name}-%{version}.tar.xz +#Source: http://download.gnome.org/sources/ekiga/4.0/%{name}-%{version}.tar.xz +Source: ekiga-12641b735a9886a080949465d4da6d4569822ed2.tar.bz2 # PATCH-FIX-UPSTREAM boost-configure.patch schwab(a)suse.de -- AX_BOOST_BASE: add aarch64 to the list of lib64 architectures Patch0: boost-configure.patch # PATCH-FIX-UPSTREAM ekiga-appdata.patch badshah400(a)gmail.com -- Add, translate and install appstream metainfo file taken from upstream git @@ -36,9 +37,12 @@ Patch3: ekiga-4.0.1-libresolv.patch # PATCH-FIX-UPSTREAM ekiga-dont-require-gnome-icon-theme.patch badshah400(a)opensuse.org -- Patch configure.ac to not check for gnome-icon-theme; all required icons are already in hicolor-icon-theme. Patch4: ekiga-dont-require-gnome-icon-theme.patch +Patch5: ekiga-po-Makefile.patch +Patch6: ekiga-signals2-leftover.patch +Patch7: ekiga-missing-includes.patch %if 0%{?suse_version} > 1325 -BuildRequires: libboost_signals-devel +BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif @@ -48,7 +52,10 @@ BuildRequires: gcc-c++ BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: clutter-gtk-devel +BuildRequires: gstreamer-plugins-base-devel +BuildRequires: libgudev-1_0-devel BuildRequires: intltool BuildRequires: libavahi-glib-devel BuildRequires: libnotify-devel @@ -61,6 +68,7 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(xv) +BuildRequires: gettext # Required for Patch1 BuildRequires: libtool Requires: hicolor-icon-theme @@ -110,15 +118,22 @@ %lang_package %prep -%setup -q +%setup -q -n ekiga %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 translation-update-upstream +cp -av /usr/share/gnome-doc-utils/gnome-doc-utils.make . %build +%if 0%{?suse_version} < 1500 +export CXXFLAGS="%optflags -fexceptions" +%endif autoreconf -fi %configure \ --disable-schemas-install \ ++++++ boost-configure.patch ++++++ --- /var/tmp/diff_new_pack.a4i8ok/_old 2019-05-03 22:46:09.399732036 +0200 +++ /var/tmp/diff_new_pack.a4i8ok/_new 2019-05-03 22:46:09.399732036 +0200 @@ -1,26 +1,11 @@ -Index: ekiga-4.0.1/configure -=================================================================== ---- ekiga-4.0.1.orig/configure -+++ ekiga-4.0.1/configure -@@ -17800,7 +17800,7 @@ $as_echo_n "checking for boostlib >= $bo - - libsubdirs="lib" - ax_arch=`uname -m` -- if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then -+ if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64 -o $ax_arch = ppc64le ; then - libsubdirs="lib64 lib lib64" - fi - -Index: ekiga-4.0.1/m4/ax_boost_base.m4 -=================================================================== ---- ekiga-4.0.1.orig/m4/ax_boost_base.m4 -+++ ekiga-4.0.1/m4/ax_boost_base.m4 -@@ -91,7 +91,7 @@ if test "x$want_boost" = "xyes"; then - dnl are found, e.g. when only header-only libraries are installed! +--- ekiga/m4/ax_boost_base.m4 2019/04/02 13:20:49 1.1 ++++ ekiga/m4/ax_boost_base.m4 2019/04/02 13:20:54 +@@ -92,7 +92,7 @@ libsubdirs="lib" ax_arch=`uname -m` -- if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then -+ if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64 -o $ax_arch = ppc64le ; then + case $ax_arch in +- x86_64|ppc64|s390x|sparc64|aarch64) ++ x86_64|ppc64|s390x|sparc64|aarch64|ppc64le|riscv64) libsubdirs="lib64 lib lib64" - fi - + ;; + esac ++++++ ekiga-4.0.1.tar.xz -> ekiga-12641b735a9886a080949465d4da6d4569822ed2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ekiga/ekiga-4.0.1.tar.xz /work/SRC/openSUSE:Factory/.ekiga.new.5148/ekiga-12641b735a9886a080949465d4da6d4569822ed2.tar.bz2 differ: char 1, line 1 ++++++ ekiga-dont-require-gnome-icon-theme.patch ++++++ --- /var/tmp/diff_new_pack.a4i8ok/_old 2019-05-03 22:46:09.423732090 +0200 +++ /var/tmp/diff_new_pack.a4i8ok/_new 2019-05-03 22:46:09.427732100 +0200 @@ -1,13 +1,11 @@ -Index: ekiga-4.0.1/configure.ac -=================================================================== ---- ekiga-4.0.1.orig/configure.ac -+++ ekiga-4.0.1/configure.ac -@@ -155,7 +155,7 @@ dnl ############################### +--- ekiga/configure.ac 2019/04/02 13:21:51 1.1 ++++ ekiga/configure.ac 2019/04/02 13:22:00 +@@ -155,7 +155,7 @@ if test "x${gm_platform}" = "xmingw" ; then - PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0]) + PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4.0]) else -- PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0 gnome-icon-theme >= 3.0.0]) -+ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0]) +- PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4.0 gnome-icon-theme >= 3.0.0]) ++ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4.0]) fi PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24.0 gmodule-2.0 gobject-2.0 gthread-2.0]) AC_ARG_ENABLE([gtk-debug], ++++++ ekiga-missing-includes.patch ++++++ --- ekiga/plugins/avahi/avahi-heap.cpp 2019/04/02 14:08:47 1.1 +++ ekiga/plugins/avahi/avahi-heap.cpp 2019/04/02 14:09:00 @@ -36,6 +36,7 @@ */ #include <cstdlib> +#include <iostream> #include <glib/gi18n.h> #include "avahi-heap.h" --- ekiga/plugins/resource-list/rl-presentity.cpp 2019/04/02 14:23:25 1.1 +++ ekiga/plugins/resource-list/rl-presentity.cpp 2019/04/02 14:23:38 @@ -34,6 +34,7 @@ */ #include <algorithm> +#include <iostream> #include <set> #include <glib/gi18n.h> --- ekiga/plugins/resource-list/rl-entry-ref.cpp 2019/04/02 14:24:07 1.1 +++ ekiga/plugins/resource-list/rl-entry-ref.cpp 2019/04/02 14:24:20 @@ -35,6 +35,8 @@ * */ +#include <iostream> + #include "config.h" #include <glib/gi18n-lib.h> --- ekiga/plugins/resource-list/rl-heap.cpp 2019/04/02 14:30:57 1.1 +++ ekiga/plugins/resource-list/rl-heap.cpp 2019/04/02 14:31:09 @@ -35,6 +35,8 @@ * */ +#include <iostream> + #include <glib/gi18n.h> #include "robust-xml.h" ++++++ ekiga-po-Makefile.patch ++++++ --- ekiga/po/Makefile.in.in 2019/04/02 13:54:11 1.1 +++ ekiga/po/Makefile.in.in 2019/04/02 13:54:17 @@ -0,0 +1,222 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper(a)gnu.ai.mit.edu> +# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns(a)gmail.com> +# +# This file may be copied and used freely without restrictions. It may +# be used in projects which are not available under a GNU Public License, +# but which still want to provide support for the GNU gettext functionality. +# +# - Modified by Owen Taylor <otaylor(a)redhat.com> to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman <jacob(a)ximian.com> to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize +# +# - Modified by Rodney Dawes <dobey.pwns(a)gmail.com> for use with intltool +# +# We have the following line for use by intltoolize: +# INTLTOOL_MAKEFILE + +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = @datadir@ +datarootdir = @datarootdir@ +libdir = @libdir@ +DATADIRNAME = @DATADIRNAME@ +itlocaledir = $(prefix)/$(DATADIRNAME)/locale +subdir = po +install_sh = @install_sh@ +# Automake >= 1.8 provides @mkdir_p@. +# Until it can be supposed, use the safe fallback: +mkdir_p = $(install_sh) -d + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ + +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT = @XGETTEXT@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot + +ALL_LINGUAS = @ALL_LINGUAS@ + +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) + +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) + +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) + +POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) + +DISTFILES = Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS + +POTFILES = \ +# This comment gets stripped out + +CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) + +.SUFFIXES: +.SUFFIXES: .po .pox .gmo .mo .msg .cat + +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< + +.po.gmo: + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && gencat $@ $*.msg + + +all: all-@USE_NLS@ + +all-yes: $(CATALOGS) +all-no: + +$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(GENPOT) + +install: install-data +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $$dir; \ + if test -r $$lang.gmo; then \ + $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $(srcdir)/$$lang.gmo as" \ + "$$dir/$(GETTEXT_PACKAGE).mo"; \ + fi; \ + if test -r $$lang.gmo.m; then \ + $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + if test -r $(srcdir)/$$lang.gmo.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ + $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $(srcdir)/$$lang.gmo.m as" \ + "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + true; \ + fi; \ + fi; \ + done + +# Empty stubs to satisfy archaic automake needs +dvi info ctags tags CTAGS TAGS ID: + +# Define this as empty until I found a useful application. +install-exec installcheck: + +uninstall: + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + done + +check: all $(GETTEXT_PACKAGE).pot + rm -f missing notexist + srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m + if [ -r missing -o -r notexist ]; then \ + exit 1; \ + fi + +mostlyclean: + rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -f .intltool-merge-cache + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES stamp-it + rm -f *.mo *.msg *.cat *.cat.m *.gmo + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f Makefile.in.in + +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: $(DISTFILES) + dists="$(DISTFILES)"; \ + extra_dists="$(EXTRA_DISTFILES)"; \ + for file in $$extra_dists; do \ + test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ + done; \ + for file in $$dists; do \ + test -f $$file || file="$(srcdir)/$$file"; \ + ln $$file $(distdir) 2> /dev/null \ + || cp -p $$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + echo "$$lang:"; \ + result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ + if $$result; then \ + if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$lang.gmo failed!"; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi; \ + done + +Makefile POTFILES: stamp-it + @if test ! -f $@; then \ + rm -f stamp-it; \ + $(MAKE) stamp-it; \ + fi + +stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ + $(SHELL) ./config.status + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: ++++++ ekiga-signals2-leftover.patch ++++++ --- ekiga/lib/engine/framework/scoped-connections.h 2019/04/02 13:58:29 1.1 +++ ekiga/lib/engine/framework/scoped-connections.h 2019/04/02 13:58:38 @@ -38,7 +38,7 @@ #define __SCOPED_CONNECTIONS_H__ #include <list> -#include <boost/signal.hpp> +#include <boost/signals2.hpp> /* The boost signals library has several tricks to disconnect connections on signals * automatically, namely :

1 0

commit gnome-multi-writer for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package gnome-multi-writer for openSUSE:Factory checked in at 2019-05-03 22:45:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-multi-writer (Old) and /work/SRC/openSUSE:Factory/.gnome-multi-writer.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-multi-writer" Fri May 3 22:45:59 2019 rev:16 rq:695801 version:3.32.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-multi-writer/gnome-multi-writer.changes 2018-12-28 12:36:13.639925465 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-multi-writer.new.5148/gnome-multi-writer.changes 2019-05-03 22:46:04.243720199 +0200 @@ -1,0 +2,18 @@ +Thu Apr 18 14:21:57 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Use noun phrase in summary. + +------------------------------------------------------------------- +Fri Mar 8 12:55:21 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.0: + + Use newer meson features to avoid a build warning. + + Various C99 cleanups. + + Use G_DECLARE_FINAL_TYPE for GmwDevice. + + Remove the AppMenu. + + Updated translations. +- Drop patches fixed upstream: + + gnome-multi-writer-Various-C99-cleanups.patch. + + gnome-multi-writer-Use-G_DECLARE_FINAL_TYPE.patch. + +------------------------------------------------------------------- Old: ---- gnome-multi-writer-3.30.0.tar.xz gnome-multi-writer-Use-G_DECLARE_FINAL_TYPE.patch gnome-multi-writer-Various-C99-cleanups.patch New: ---- gnome-multi-writer-3.32.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-multi-writer.spec ++++++ --- /var/tmp/diff_new_pack.yvjg7J/_old 2019-05-03 22:46:04.879721659 +0200 +++ /var/tmp/diff_new_pack.yvjg7J/_new 2019-05-03 22:46:04.891721686 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-multi-writer # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,13 @@ Name: gnome-multi-writer -Version: 3.30.0 +Version: 3.32.0 Release: 0 -Summary: Write an ISO file to multiple USB devices at once +Summary: Program for writing an ISO file to multiple USB devices at once License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/MultiWriter -Source0: https://download.gnome.org/sources/gnome-multi-writer/3.30/%{name}-%{versio… -# PATCH-FIX-UPSTREAM gnome-multi-writer-Various-C99-cleanups.patch -- Various C99 cleanups -Patch0: gnome-multi-writer-Various-C99-cleanups.patch -Patch1: gnome-multi-writer-Use-G_DECLARE_FINAL_TYPE.patch +Source0: https://download.gnome.org/sources/gnome-multi-writer/3.32/%{name}-%{versio… BuildRequires: docbook-utils-minimal BuildRequires: gobject-introspection-devel >= 0.9.8 ++++++ gnome-multi-writer-3.30.0.tar.xz -> gnome-multi-writer-3.32.0.tar.xz ++++++ ++++ 2496 lines of diff (skipped)

1 0

commit hitori for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package hitori for openSUSE:Factory checked in at 2019-05-03 22:45:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hitori (Old) and /work/SRC/openSUSE:Factory/.hitori.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hitori" Fri May 3 22:45:56 2019 rev:21 rq:695780 version:3.31.92 Changes: -------- --- /work/SRC/openSUSE:Factory/hitori/hitori.changes 2018-03-09 10:40:12.444483505 +0100 +++ /work/SRC/openSUSE:Factory/.hitori.new.5148/hitori.changes 2019-05-03 22:46:01.595714119 +0200 @@ -1,0 +2,31 @@ +Mon Mar 4 13:32:47 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.31.92: + + Add high-resolution icon. + + Bugs fixed: glgo#GNOME/hitori#6, glgo#GNOME/hitori!16, + glgo#GNOME/hitori!17, glgo#GNOME/hitori!19. + + Updated translations. +- Add itstool BuildRequires: New dependency. +- Add fdupes BuildRequires and macro, remove duplicate files. + +------------------------------------------------------------------- +Wed Feb 20 17:27:33 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.31.0: + + Migrated to Meson. + + Bugs fixed: + - Retire app menu. + - Migrate to Meson. + - Use G_DECLARE_FINAL_TYPE() to declare type. + - snap: Add snap build configuration. + - Port README to Markdown. + - docs: Reformat NEWS to be valid Markdown. + + Updated translations. +- Switch to meson build system, add meson BuildRequires and macros. +- Stop handling icon_theme_cache_post(un), + desktop_database_post(un) and glib2_gsettings_schema_post(un) in + post(un) and drop glib2_gsettings_schema_requires. +- Drop yelp-tools and hicolor-icon-theme BuildRequires: No longer + needed. + +------------------------------------------------------------------- Old: ---- hitori-3.22.4.tar.xz New: ---- hitori-3.31.92.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hitori.spec ++++++ --- /var/tmp/diff_new_pack.dj4E6A/_old 2019-05-03 22:46:02.831716957 +0200 +++ /var/tmp/diff_new_pack.dj4E6A/_new 2019-05-03 22:46:02.863717031 +0200 @@ -1,7 +1,7 @@ # # spec file for package hitori # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,29 +12,30 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: hitori -Version: 3.22.4 +Version: 3.31.92 Release: 0 Summary: Original puzzle of Nikoli License: GPL-3.0-or-later Group: Amusements/Games/Logic -URL: https://live.gnome.org/Hitori -Source: http://download.gnome.org/sources/hitori/3.22/%{name}-%{version}.tar.xz +URL: https://gitlab.gnome.org/GNOME/hitori +Source0: https://download.gnome.org/sources/hitori/3.31/%{name}-%{version}.tar.xz + BuildRequires: desktop-file-utils -BuildRequires: hicolor-icon-theme +BuildRequires: fdupes +BuildRequires: itstool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: yelp-tools BuildRequires: pkgconfig(cairo) >= 1.4 BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.0 Recommends: %{name}-lang -%glib2_gsettings_schema_requires %description Hitori is played with a grid of squares or cells, and each cell contains a number. @@ -48,36 +49,27 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build -%configure -make %{?_smp_mflags} +%meson \ + %{nil} +%meson_build %install -%make_install +%meson_install %find_lang %{name} %suse_update_desktop_file org.gnome.Hitori - -%post -%icon_theme_cache_post -%desktop_database_post -%glib2_gsettings_schema_post - -%postun -%icon_theme_cache_postun -%desktop_database_postun -%glib2_gsettings_schema_postun +%fdupes %{buildroot}%{_prefix} %files %license COPYING -%doc ChangeLog README +%doc README.md %{_bindir}/%{name} %{_datadir}/applications/org.gnome.Hitori.desktop %{_datadir}/icons/hicolor/*/apps/org.gnome.Hitori* %{_datadir}/glib-2.0/schemas/org.gnome.hitori.gschema.xml -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/org.gnome.Hitori.appdata.xml +%{_datadir}/metainfo/org.gnome.Hitori.appdata.xml %files lang -f %{name}.lang ++++++ hitori-3.22.4.tar.xz -> hitori-3.31.92.tar.xz ++++++ ++++ 78717 lines of diff (skipped)

1 0

commit gnome-getting-started-docs for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package gnome-getting-started-docs for openSUSE:Factory checked in at 2019-05-03 22:45:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-getting-started-docs (Old) and /work/SRC/openSUSE:Factory/.gnome-getting-started-docs.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-getting-started-docs" Fri May 3 22:45:48 2019 rev:20 rq:695768 version:3.32.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-getting-started-docs/gnome-getting-started-docs.changes 2018-09-19 14:33:42.799289378 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-getting-started-docs.new.5148/gnome-getting-started-docs.changes 2019-05-03 22:45:58.927707994 +0200 @@ -1,0 +2,20 @@ +Wed Apr 10 09:59:41 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.1: + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 11 19:55:29 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.0: + + Updates to Getting Started. + + Updated translations. +- Modernize spec. + +------------------------------------------------------------------- +Thu Feb 21 10:43:46 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.31.91: + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-getting-started-docs-3.30.0.tar.xz New: ---- gnome-getting-started-docs-3.32.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-getting-started-docs.spec ++++++ --- /var/tmp/diff_new_pack.zWHWSj/_old 2019-05-03 22:46:00.515711640 +0200 +++ /var/tmp/diff_new_pack.zWHWSj/_new 2019-05-03 22:46:00.519711649 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-getting-started-docs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gnome-getting-started-docs -Version: 3.30.0 +Version: 3.32.1 Release: 0 Summary: Getting started with GNOME - Documentation License: CC-BY-SA-3.0 Group: Documentation/Other URL: https://www.gnome.org -Source: https://download.gnome.org/sources/gnome-getting-started-docs/3.30/%{name}-… +Source0: https://download.gnome.org/sources/gnome-getting-started-docs/3.32/%{name}-… BuildRequires: fdupes BuildRequires: yelp-tools @@ -38,11 +38,11 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %configure -make %{?_smp_mflags} +%make_build %install %make_install ++++++ gnome-getting-started-docs-3.30.0.tar.xz -> gnome-getting-started-docs-3.32.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/gnome-getting-started-docs/gnome-getting-started-docs-3.30.0.tar.xz /work/SRC/openSUSE:Factory/.gnome-getting-started-docs.new.5148/gnome-getting-started-docs-3.32.1.tar.xz differ: char 26, line 1

1 0

commit gnome-devel-docs for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package gnome-devel-docs for openSUSE:Factory checked in at 2019-05-03 22:45:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-devel-docs (Old) and /work/SRC/openSUSE:Factory/.gnome-devel-docs.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-devel-docs" Fri May 3 22:45:44 2019 rev:54 rq:695767 version:3.32.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-devel-docs/gnome-devel-docs.changes 2018-12-04 20:53:59.276875695 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-devel-docs.new.5148/gnome-devel-docs.changes 2019-05-03 22:45:52.891694138 +0200 @@ -1,0 +2,19 @@ +Wed Apr 10 09:52:45 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.1: + + Updated HIG guidance for menus. + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 11 18:49:50 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.0: + + Updated palette in the HIG. + + Added page on async programming to Programming Guidelines. + + Fixed typos and links in Platform Demos. + + Clarified instructions in Platform Demos. + + Fixed various types in all documents. + + Updated translations. +- Modernize spec. + +------------------------------------------------------------------- Old: ---- gnome-devel-docs-3.30.2.tar.xz New: ---- gnome-devel-docs-3.32.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-devel-docs.spec ++++++ --- /var/tmp/diff_new_pack.5w5tee/_old 2019-05-03 22:45:53.735696076 +0200 +++ /var/tmp/diff_new_pack.5w5tee/_new 2019-05-03 22:45:53.739696085 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-devel-docs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: gnome-devel-docs -Version: 3.30.2 +Version: 3.32.1 Release: 0 Summary: GNOME Platform Documentation License: GFDL-1.1-only AND CC-BY-SA-4.0 Group: Documentation/Other URL: https://www.gnome.org -Source: https://download.gnome.org/sources/gnome-devel-docs/3.30/%{name}-%{version}… +Source: https://download.gnome.org/sources/gnome-devel-docs/3.32/%{name}-%{version}… BuildRequires: fdupes BuildRequires: pkgconfig @@ -37,11 +37,11 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %configure -make %{?_smp_mflags} +%make_build %install %make_install ++++++ gnome-devel-docs-3.30.2.tar.xz -> gnome-devel-docs-3.32.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/gnome-devel-docs/gnome-devel-docs-3.30.2.tar.xz /work/SRC/openSUSE:Factory/.gnome-devel-docs.new.5148/gnome-devel-docs-3.32.1.tar.xz differ: char 25, line 1

1 0

commit gnome-sound-recorder for openSUSE:Factory
by root 03 May '19

03 May '19

Hello community, here is the log from the commit of package gnome-sound-recorder for openSUSE:Factory checked in at 2019-05-03 22:45:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-sound-recorder (Old) and /work/SRC/openSUSE:Factory/.gnome-sound-recorder.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-sound-recorder" Fri May 3 22:45:41 2019 rev:22 rq:695765 version:3.32.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-sound-recorder/gnome-sound-recorder.changes 2019-01-21 10:57:14.359518549 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-sound-recorder.new.5148/gnome-sound-recorder.changes 2019-05-03 22:45:51.619691217 +0200 @@ -1,0 +2,43 @@ +Tue Mar 12 06:12:23 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.32.0: + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 5 05:37:03 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.31.92: + + Updated translations. + +------------------------------------------------------------------- +Sun Feb 17 20:12:01 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.31.90: + + Drop application menu. + + Port to meson. + + Various translation fixes. + + Drop git.mk - it's an autotools leftover. + + Set a minimium width and height size. + + Make record button a "suggested action". + + Require gtk +> 3.13.2. + + Remove old RTL hacks. + + Fix crashes when selecting a recording. + + Fix gjs "Too many arguments" warnings. + + Set a default window title for zero sounds recorded. + + Validate appdata and desktop files. + + Use same application id everywhere in the app. + + Use latest GJS standards for variable and class declarations. + + Port to ES6 classes. + + New icon. + + Updated translations. +- Switch to meson build system, add meson BuildRequires and macros. +- Drop obsolete intltool, pkgconfig(gobject-2.0), + pkgconfig(gdk-3.0) and pkgconfig(gdk-pixbuf-2.0) BuildRequires, + no longer needed. +- Replace gjs with pkgconfig(gjs-1.0) BuildRequires. +- Add appstream-glib BuildRequires. +- Drop pkgconfig(gstreamer-1.0), gstreamer-plugins-bad, + gstreamer-plugins-base and gstreamer-plugins-good BuildRequires: + No longer needed, runtime dependencies are enough. + +------------------------------------------------------------------- Old: ---- gnome-sound-recorder-3.28.2.tar.xz New: ---- gnome-sound-recorder-3.32.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-sound-recorder.spec ++++++ --- /var/tmp/diff_new_pack.5CPhgp/_old 2019-05-03 22:45:52.019692136 +0200 +++ /var/tmp/diff_new_pack.5CPhgp/_new 2019-05-03 22:45:52.019692136 +0200 @@ -18,29 +18,23 @@ Name: gnome-sound-recorder -Version: 3.28.2 +Version: 3.32.0 Release: 0 Summary: Sound Recorder License: BSD-3-Clause AND LGPL-2.0-or-later Group: Productivity/Multimedia/Sound/Utilities URL: https://wiki.gnome.org/Design/Apps/SoundRecorder -Source: http://download.gnome.org/sources/gnome-sound-recorder/3.28/%{name}-%{versi… +Source0: https://download.gnome.org/sources/gnome-sound-recorder/3.32/%{name}-%{vers… Source99: gnome-sound-recorder-rpmlintrc -BuildRequires: gjs -BuildRequires: gstreamer-plugins-bad -BuildRequires: gstreamer-plugins-base -BuildRequires: gstreamer-plugins-good -BuildRequires: intltool >= 0.26 +BuildRequires: appstream-glib +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gdk-3.0) -BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gjs-1.0) BuildRequires: pkgconfig(glib-2.0) >= 2.46 -BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.31.6 -BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.12 Requires: gstreamer-plugins-bad Requires: gstreamer-plugins-base @@ -57,24 +51,22 @@ %autosetup -p1 %build -%configure \ - --disable-static \ +%meson \ %{nil} -%make_build +%meson_build %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +%meson_install %suse_update_desktop_file -G "Sound Recorder" -r org.gnome.SoundRecorder GNOME AudioVideo Recorder %find_lang %{name} %files %license COPYING -%doc README NEWS AUTHORS +%doc README.md NEWS AUTHORS %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/org.gnome.SoundRecorder.desktop -%{_datadir}/glib-2.0/schemas/org.gnome.gnome-sound-recorder.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.SoundRecorder.gschema.xml %{_datadir}/icons/hicolor/*/apps/org.gnome.SoundRecorder* %{_datadir}/metainfo/org.gnome.SoundRecorder.appdata.xml ++++++ gnome-sound-recorder-3.28.2.tar.xz -> gnome-sound-recorder-3.32.0.tar.xz ++++++ ++++ 79399 lines of diff (skipped)

1 0