May 2019 - openSUSE Commits - openSUSE Mailing Lists

commit dstat for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package dstat for openSUSE:Factory checked in at 2019-05-24 11:31:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dstat (Old) and /work/SRC/openSUSE:Factory/.dstat.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dstat" Fri May 24 11:31:39 2019 rev:7 rq:704919 version:0.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/dstat/dstat.changes 2017-12-14 11:03:14.898916516 +0100 +++ /work/SRC/openSUSE:Factory/.dstat.new.5148/dstat.changes 2019-05-24 11:31:44.465400964 +0200 @@ -1,0 +2,17 @@ +Thu May 23 06:22:26 UTC 2019 - mvetter(a)suse.com + +- Update to 0.7.4: + * Add plugin to show interface statistics for infiniband and RoCE adapters + * Make lustre plugin actually work + * Add generic thermal zone support + * Add MongoDB plugin + * Fix header updates when using --noupdate + * Change order of scripted commands to group version-specific output + * Replace dict keys() method with in-operator + * Add jvm heap monitor + * Avoid escape characters when --nocolor + * Add Python 3 support +- Move sources from python3 fork (https://github.com/eshizhan/dstat) + back to official sources which now also have python3 support + +------------------------------------------------------------------- Old: ---- 0.7.3py3.tar.gz New: ---- v0.7.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dstat.spec ++++++ --- /var/tmp/diff_new_pack.2XfhK4/_old 2019-05-24 11:31:45.521400692 +0200 +++ /var/tmp/diff_new_pack.2XfhK4/_new 2019-05-24 11:31:45.525400691 +0200 @@ -1,7 +1,7 @@ # # spec file for package dstat # -# Copyright (c) 2017 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,14 +17,13 @@ Name: dstat -Version: 0.7.3 +Version: 0.7.4 Release: 0 Summary: Versatile vmstat, iostat and ifstat Replacement -License: GPL-2.0 +License: GPL-2.0-only Group: System/Monitoring Url: http://dag.wieers.com/home-made/dstat/ -#Source: https://github.com/dagwieers/dstat/archive/#{version}.tar.gz -Source: https://github.com/eshizhan/dstat/archive/%{version}py3.tar.gz +Source: https://github.com/dagwieers/dstat/archive/v%{version}.tar.gz Source1: dstat.desktop BuildRequires: make Requires: python3 @@ -51,7 +50,7 @@ confusion, less mistakes. %prep -%setup -q -n %{name}-%{version}py3 +%setup -q # repalce env by python sed -i 's/#!\/usr\/bin\/env python/#!\/usr\/bin\/python3/' dstat

1 0

commit swayidle for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package swayidle for openSUSE:Factory checked in at 2019-05-24 11:31:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swayidle (Old) and /work/SRC/openSUSE:Factory/.swayidle.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swayidle" Fri May 24 11:31:37 2019 rev:2 rq:704917 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/swayidle/swayidle.changes 2019-02-25 17:50:47.106771824 +0100 +++ /work/SRC/openSUSE:Factory/.swayidle.new.5148/swayidle.changes 2019-05-24 11:31:39.813402162 +0200 @@ -1,0 +2,9 @@ +Thu May 23 06:13:01 UTC 2019 - mvetter(a)suse.com + +- Update to 1.3: + * Add an error message when before-sleep is used without dbus support + * Add support for logind's lock/unlock signals + * Set version in project file +- Add swayidle-version.patch: they forgot to increase the version + +------------------------------------------------------------------- Old: ---- 1.2.tar.gz New: ---- 1.3.tar.gz swayidle-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swayidle.spec ++++++ --- /var/tmp/diff_new_pack.Nd9cIF/_old 2019-05-24 11:31:41.101401831 +0200 +++ /var/tmp/diff_new_pack.Nd9cIF/_new 2019-05-24 11:31:41.109401828 +0200 @@ -12,18 +12,19 @@ # 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/ # Name: swayidle -Version: 1.2 +Version: 1.3 Release: 0 Summary: Idle management daemon for Wayland License: MIT Group: System/GUI/Other URL: https://github.com/swaywm/swayidle Source0: https://github.com/swaywm/swayidle/archive/%{version}.tar.gz +Patch0: swayidle-version.patch BuildRequires: meson >= 0.48.0 BuildRequires: pkgconfig BuildRequires: scdoc @@ -67,6 +68,7 @@ %prep %setup -q +%patch0 -p1 %build export CFLAGS="%{optflags} -I/usr/include/wayland" ++++++ 1.2.tar.gz -> 1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swayidle-1.2/main.c new/swayidle-1.3/main.c --- old/swayidle-1.2/main.c 2019-01-27 14:22:09.000000000 +0100 +++ new/swayidle-1.3/main.c 2019-02-16 17:43:36.000000000 +0100 @@ -33,6 +33,8 @@ struct wl_list timeout_cmds; // struct swayidle_timeout_cmd * char *before_sleep_cmd; char *after_resume_cmd; + char *logind_lock_cmd; + char *logind_unlock_cmd; bool wait; } state; @@ -109,6 +111,7 @@ #if HAVE_SYSTEMD || HAVE_ELOGIND static int lock_fd = -1; static struct sd_bus *bus = NULL; +static char *session_name = NULL; static void acquire_sleep_lock(void) { sd_bus_message *msg = NULL; @@ -178,6 +181,29 @@ return 0; } +static int handle_lock(sd_bus_message *msg, void *userdata, + sd_bus_error *ret_error) { + swayidle_log(LOG_DEBUG, "Lock signal received"); + + if (state.logind_lock_cmd) { + cmd_exec(state.logind_lock_cmd); + } + swayidle_log(LOG_DEBUG, "Lock command done"); + + return 0; +} + +static int handle_unlock(sd_bus_message *msg, void *userdata, + sd_bus_error *ret_error) { + swayidle_log(LOG_DEBUG, "Unlock signal received"); + + if (state.logind_unlock_cmd) { + cmd_exec(state.logind_unlock_cmd); + } + swayidle_log(LOG_DEBUG, "Unlock command done"); + + return 0; +} static int dbus_event(int fd, uint32_t mask, void *data) { sd_bus *bus = data; @@ -205,27 +231,74 @@ return count; } -static void setup_sleep_listener(void) { +static void connect_to_bus(void) { int ret = sd_bus_default_system(&bus); + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + pid_t my_pid = getpid(); + const char *session_name_tmp; if (ret < 0) { errno = -ret; swayidle_log_errno(LOG_ERROR, "Failed to open D-Bus connection"); return; } + struct wl_event_source *source = wl_event_loop_add_fd(state.event_loop, + sd_bus_get_fd(bus), WL_EVENT_READABLE, dbus_event, bus); + wl_event_source_check(source); + ret = sd_bus_call_method(bus, "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", "GetSessionByPID", + &error, &msg, "u", my_pid); + if (ret < 0) { + swayidle_log(LOG_ERROR, + "Failed to find session name: %s", error.message); + goto cleanup; + } + + ret = sd_bus_message_read(msg, "o", &session_name_tmp); + if (ret < 0) { + swayidle_log(LOG_ERROR, + "Failed to read session name\n"); + goto cleanup; + } + session_name = strdup(session_name_tmp); +cleanup: + sd_bus_error_free(&error); + sd_bus_message_unref(msg); +} - ret = sd_bus_match_signal(bus, NULL, "org.freedesktop.login1", +static void setup_sleep_listener(void) { + int ret = sd_bus_match_signal(bus, NULL, "org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "PrepareForSleep", prepare_for_sleep, NULL); if (ret < 0) { errno = -ret; - swayidle_log_errno(LOG_ERROR, "Failed to add D-Bus signal match"); + swayidle_log_errno(LOG_ERROR, "Failed to add D-Bus signal match : sleep"); return; } acquire_sleep_lock(); +} - struct wl_event_source *source = wl_event_loop_add_fd(state.event_loop, - sd_bus_get_fd(bus), WL_EVENT_READABLE, dbus_event, bus); - wl_event_source_check(source); +static void setup_lock_listener(void) { + int ret = sd_bus_match_signal(bus, NULL, "org.freedesktop.login1", + session_name, "org.freedesktop.login1.Session", + "Lock", handle_lock, NULL); + if (ret < 0) { + errno = -ret; + swayidle_log_errno(LOG_ERROR, "Failed to add D-Bus signal match : lock"); + return; + } +} + +static void setup_unlock_listener(void) { + int ret = sd_bus_match_signal(bus, NULL, "org.freedesktop.login1", + session_name, "org.freedesktop.login1.Session", + "Unlock", handle_unlock, NULL); + if (ret < 0) { + errno = -ret; + swayidle_log_errno(LOG_ERROR, "Failed to add D-Bus signal match : unlock"); + return; + } } #endif @@ -342,6 +415,11 @@ } static int parse_sleep(int argc, char **argv) { +#if !HAVE_SYSTEMD && !HAVE_ELOGIND + swayidle_log(LOG_ERROR, "before-sleep not supported: swayidle was compiled " + "with neither systemd nor elogind support."); + exit(-1); +#endif if (argc < 2) { swayidle_log(LOG_ERROR, "Too few parameters to before-sleep command. " "Usage: before-sleep <command>"); @@ -357,6 +435,11 @@ } static int parse_resume(int argc, char **argv) { +#if !HAVE_SYSTEMD && !HAVE_ELOGIND + swayidle_log(LOG_ERROR, "after-resume not supported: swayidle was compiled " + "with neither systemd nor elogind support."); + exit(-1); +#endif if (argc < 2) { swayidle_log(LOG_ERROR, "Too few parameters to after-resume command. " "Usage: after-resume <command>"); @@ -371,6 +454,46 @@ return 2; } +static int parse_lock(int argc, char **argv) { +#if !HAVE_SYSTEMD && !HAVE_ELOGIND + swayidle_log(LOG_ERROR, "lock not supported: swayidle was compiled" + " with neither systemd nor elogind support."); + exit(-1); +#endif + if (argc < 2) { + swayidle_log(LOG_ERROR, "Too few parameters to lock command. " + "Usage: lock <command>"); + exit(-1); + } + + state.logind_lock_cmd = parse_command(argc - 1, &argv[1]); + if (state.logind_lock_cmd) { + swayidle_log(LOG_DEBUG, "Setup lock hook: %s", state.logind_lock_cmd); + } + + return 2; +} + +static int parse_unlock(int argc, char **argv) { +#if !HAVE_SYSTEMD && !HAVE_ELOGIND + swayidle_log(LOG_ERROR, "unlock not supported: swayidle was compiled" + " with neither systemd nor elogind support."); + exit(-1); +#endif + if (argc < 2) { + swayidle_log(LOG_ERROR, "Too few parameters to unlock command. " + "Usage: unlock <command>"); + exit(-1); + } + + state.logind_unlock_cmd = parse_command(argc - 1, &argv[1]); + if (state.logind_unlock_cmd) { + swayidle_log(LOG_DEBUG, "Setup unlock hook: %s", state.logind_unlock_cmd); + } + + return 2; +} + static int parse_args(int argc, char *argv[]) { int c; while ((c = getopt(argc, argv, "hdw")) != -1) { @@ -406,6 +529,12 @@ } else if (!strcmp("after-resume", argv[i])) { swayidle_log(LOG_DEBUG, "Got after-resume"); i += parse_resume(argc - i, &argv[i]); + } else if (!strcmp("lock", argv[i])) { + swayidle_log(LOG_DEBUG, "Got lock"); + i += parse_lock(argc - i, &argv[i]); + } else if (!strcmp("unlock", argv[i])) { + swayidle_log(LOG_DEBUG, "Got unlock"); + i += parse_unlock(argc - i, &argv[i]); } else { swayidle_log(LOG_ERROR, "Unsupported command '%s'", argv[i]); return 1; @@ -491,10 +620,19 @@ bool should_run = !wl_list_empty(&state.timeout_cmds); #if HAVE_SYSTEMD || HAVE_ELOGIND + connect_to_bus(); if (state.before_sleep_cmd || state.after_resume_cmd) { should_run = true; setup_sleep_listener(); } + if (state.logind_lock_cmd) { + should_run = true; + setup_lock_listener(); + } + if (state.logind_unlock_cmd) { + should_run = true; + setup_unlock_listener(); + } #endif if (!should_run) { swayidle_log(LOG_INFO, "No command specified! Nothing to do, will exit"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swayidle-1.2/meson.build new/swayidle-1.3/meson.build --- old/swayidle-1.2/meson.build 2019-01-27 14:22:09.000000000 +0100 +++ new/swayidle-1.3/meson.build 2019-02-16 17:43:36.000000000 +0100 @@ -1,6 +1,7 @@ project( 'swayidle', 'c', + version: '1.2', license: 'MIT', meson_version: '>=0.48.0', default_options: [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swayidle-1.2/swayidle.1.scd new/swayidle-1.3/swayidle.1.scd --- old/swayidle-1.2/swayidle.1.scd 2019-01-27 14:22:09.000000000 +0100 +++ new/swayidle-1.3/swayidle.1.scd 2019-02-16 17:43:36.000000000 +0100 @@ -50,6 +50,14 @@ If built with systemd support, executes _command_ after logind signals that the computer resumed from sleep. +*lock* <command> + If built with systemd support, executes _command_ when logind signals that the + session should be locked + +*unlock* <command> + If built with systemd support, executes _command_ when logind signals that the + session should be unlocked + All commands are executed in a shell. # EXAMPLE @@ -77,4 +85,4 @@ # SEE ALSO -*sway*(5) *swaymsg*(1) *sway-input*(5) *sway-output*(5) *sway-bar*(5) +*sway*(5) *swaymsg*(1) *sway-input*(5) *sway-output*(5) *sway-bar*(5) *loginctl*(1) ++++++ swayidle-version.patch ++++++ diff -urEbw swayidle-1.3/meson.build swayidle-1.3.new/meson.build --- swayidle-1.3/meson.build 2019-02-16 17:43:36.000000000 +0100 +++ swayidle-1.3.new/meson.build 2019-05-23 08:14:03.661720253 +0200 @@ -1,7 +1,7 @@ project( 'swayidle', 'c', - version: '1.2', + version: '1.3', license: 'MIT', meson_version: '>=0.48.0', default_options: [

1 0

commit swaylock for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package swaylock for openSUSE:Factory checked in at 2019-05-24 11:31:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swaylock (Old) and /work/SRC/openSUSE:Factory/.swaylock.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swaylock" Fri May 24 11:31:35 2019 rev:2 rq:704916 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/swaylock/swaylock.changes 2019-02-25 18:00:56.614102553 +0100 +++ /work/SRC/openSUSE:Factory/.swaylock.new.5148/swaylock.changes 2019-05-24 11:31:38.661402459 +0200 @@ -1,0 +2,17 @@ +Thu May 23 06:07:09 UTC 2019 - mvetter(a)suse.com + +- Update to 1.4: + * Decouple the drawing of the background from drawing the indicator. + * Allow spaces in image file path + * Display xkb layout while typing + * Submit password by pressing Ctrl+m (close #75) + * Fix lock indicator position on hidpi screens. + * Do not exit if no outputs are present + * Fix minor typo in man page + * Set version in project file + * Added hide keyboard layout option + * Described hide-keyboard-layout option in swaylock.1.scd + * Fix --version when building from tarball +- Update swaylock-version.patch + +------------------------------------------------------------------- Old: ---- 1.3.tar.gz New: ---- 1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swaylock.spec ++++++ --- /var/tmp/diff_new_pack.0Yrb3W/_old 2019-05-24 11:31:39.489402245 +0200 +++ /var/tmp/diff_new_pack.0Yrb3W/_new 2019-05-24 11:31:39.493402244 +0200 @@ -12,12 +12,12 @@ # 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/ # Name: swaylock -Version: 1.3 +Version: 1.4 Release: 0 Summary: Screen locker for Wayland License: MIT @@ -26,6 +26,7 @@ Source0: https://github.com/swaywm/swaylock/archive/%{version}.tar.gz Patch0: swaylock-version.patch BuildRequires: meson >= 0.48.0 +BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: scdoc BuildRequires: pkgconfig(cairo) @@ -33,7 +34,6 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-protocols) >= 1.14 BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pam-devel Suggests: %{name}-bash-completion Suggests: %{name}-fish-completion Suggests: %{name}-zsh-completion ++++++ 1.3.tar.gz -> 1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.3/include/swaylock.h new/swaylock-1.4/include/swaylock.h --- old/swaylock-1.3/include/swaylock.h 2019-01-29 20:48:00.000000000 +0100 +++ new/swaylock-1.4/include/swaylock.h 2019-04-29 16:37:47.000000000 +0200 @@ -34,6 +34,9 @@ uint32_t caps_lock_bs_highlight; uint32_t caps_lock_key_highlight; uint32_t separator; + uint32_t layout_background; + uint32_t layout_border; + uint32_t layout_text; struct swaylock_colorset inside; struct swaylock_colorset line; struct swaylock_colorset ring; @@ -50,6 +53,8 @@ bool show_indicator; bool show_caps_lock_text; bool show_caps_lock_indicator; + bool show_keyboard_layout; + bool hide_keyboard_layout; bool show_failed_attempts; bool daemonize; }; @@ -65,6 +70,7 @@ struct loop_timer *clear_password_timer; // clears the password buffer struct wl_display *display; struct wl_compositor *compositor; + struct wl_subcompositor *subcompositor; struct zwlr_layer_shell_v1 *layer_shell; struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager; struct wl_shm *shm; @@ -86,8 +92,11 @@ uint32_t output_global_name; struct zxdg_output_v1 *xdg_output; struct wl_surface *surface; + struct wl_surface *child; // surface made into subsurface + struct wl_subsurface *subsurface; struct zwlr_layer_surface_v1 *layer_surface; struct pool_buffer buffers[2]; + struct pool_buffer indicator_buffers[2]; struct pool_buffer *current_buffer; bool frame_pending, dirty; uint32_t width, height; @@ -107,6 +116,7 @@ void swaylock_handle_key(struct swaylock_state *state, xkb_keysym_t keysym, uint32_t codepoint); +void render_frame_background(struct swaylock_surface *surface); void render_frame(struct swaylock_surface *surface); void render_frames(struct swaylock_state *state); void damage_surface(struct swaylock_surface *surface); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.3/main.c new/swaylock-1.4/main.c --- old/swaylock-1.3/main.c 2019-01-29 20:48:00.000000000 +0100 +++ new/swaylock-1.4/main.c 2019-04-29 16:37:47.000000000 +0200 @@ -126,6 +126,12 @@ surface->surface = wl_compositor_create_surface(state->compositor); assert(surface->surface); + surface->child = wl_compositor_create_surface(state->compositor); + assert(surface->child); + surface->subsurface = wl_subcompositor_get_subsurface(state->subcompositor, surface->child, surface->surface); + assert(surface->subsurface); + wl_subsurface_set_sync(surface->subsurface); + surface->layer_surface = zwlr_layer_shell_v1_get_layer_surface( state->layer_shell, surface->surface, surface->output, ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY, "lockscreen"); @@ -163,6 +169,7 @@ surface->width = width; surface->height = height; zwlr_layer_surface_v1_ack_configure(layer_surface, serial); + render_frame_background(surface); render_frame(surface); } @@ -297,6 +304,9 @@ if (strcmp(interface, wl_compositor_interface.name) == 0) { state->compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 3); + } else if (strcmp(interface, wl_subcompositor_interface.name) == 0) { + state->subcompositor = wl_registry_bind(registry, name, + &wl_subcompositor_interface, 1); } else if (strcmp(interface, wl_shm_interface.name) == 0) { state->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); @@ -364,6 +374,23 @@ return default_image; } +static char *join_args(char **argv, int argc) { + assert(argc > 0); + int len = 0, i; + for (i = 0; i < argc; ++i) { + len += strlen(argv[i]) + 1; + } + char *res = malloc(len); + len = 0; + for (i = 0; i < argc; ++i) { + strcpy(res + len, argv[i]); + len += strlen(argv[i]); + res[len++] = ' '; + } + res[len - 1] = '\0'; + return res; +} + static void load_image(char *arg, struct swaylock_state *state) { // [[<output>]:]<path> struct swaylock_image *image = calloc(1, sizeof(struct swaylock_image)); @@ -397,11 +424,19 @@ } } - // Bash doesn't replace the ~ with $HOME if the output name is supplied + // The shell will not expand ~ to the value of $HOME when an output name is + // given. Also, any image paths given in the config file need to have shell + // expansions performed wordexp_t p; + while (strstr(image->path, " ")) { + image->path = realloc(image->path, strlen(image->path) + 2); + char *ptr = strstr(image->path, " ") + 1; + memmove(ptr + 1, ptr, strlen(ptr) + 1); + *ptr = '\\'; + } if (wordexp(image->path, &p, 0) == 0) { free(image->path); - image->path = strdup(p.we_wordv[0]); + image->path = join_args(p.we_wordv, p.we_wordc); wordfree(&p); } @@ -423,6 +458,9 @@ colors->caps_lock_bs_highlight = 0xDB3300FF; colors->caps_lock_key_highlight = 0x33DB00FF; colors->separator = 0x000000FF; + colors->layout_background = 0x000000C0; + colors->layout_border = 0x00000000; + colors->layout_text = 0xFFFFFFFF; colors->inside = (struct swaylock_colorset){ .input = 0x000000C0, .cleared = 0xE5A445C0, @@ -474,6 +512,9 @@ LO_INSIDE_VER_COLOR, LO_INSIDE_WRONG_COLOR, LO_KEY_HL_COLOR, + LO_LAYOUT_TXT_COLOR, + LO_LAYOUT_BG_COLOR, + LO_LAYOUT_BORDER_COLOR, LO_LINE_COLOR, LO_LINE_CLEAR_COLOR, LO_LINE_CAPS_LOCK_COLOR, @@ -508,6 +549,8 @@ {"scaling", required_argument, NULL, 's'}, {"tiling", no_argument, NULL, 't'}, {"no-unlock-indicator", no_argument, NULL, 'u'}, + {"show-keyboard-layout", no_argument, NULL, 'k'}, + {"hide-keyboard-layout", no_argument, NULL, 'K'}, {"show-failed-attempts", no_argument, NULL, 'F'}, {"version", no_argument, NULL, 'v'}, {"bs-hl-color", required_argument, NULL, LO_BS_HL_COLOR}, @@ -522,6 +565,9 @@ {"inside-ver-color", required_argument, NULL, LO_INSIDE_VER_COLOR}, {"inside-wrong-color", required_argument, NULL, LO_INSIDE_WRONG_COLOR}, {"key-hl-color", required_argument, NULL, LO_KEY_HL_COLOR}, + {"layout-bg-color", required_argument, NULL, LO_LAYOUT_BG_COLOR}, + {"layout-border-color", required_argument, NULL, LO_LAYOUT_BORDER_COLOR}, + {"layout-text-color", required_argument, NULL, LO_LAYOUT_TXT_COLOR}, {"line-color", required_argument, NULL, LO_LINE_COLOR}, {"line-clear-color", required_argument, NULL, LO_LINE_CLEAR_COLOR}, {"line-caps-lock-color", required_argument, NULL, LO_LINE_CAPS_LOCK_COLOR}, @@ -552,12 +598,18 @@ "Enable debugging output.\n" " -e, --ignore-empty-password " "When an empty password is provided, do not validate it.\n" + " -F, --show-failed-attempts " + "Show current count of failed authentication attempts.\n" " -f, --daemonize " "Detach from the controlling terminal after locking.\n" " -h, --help " "Show help message and quit.\n" " -i, --image [[<output>]:]<path> " "Display the given image.\n" + " -k, --show-keyboard-layout " + "Display the current xkb layout while typing.\n" + " -K, --hide-keyboard-layout " + "Hide the current xkb layout while typing.\n" " -L, --disable-caps-lock-text " "Disable the Caps Lock text.\n" " -l, --indicator-caps-lock " @@ -568,8 +620,6 @@ "Same as --scaling=tile.\n" " -u, --no-unlock-indicator " "Disable the unlock indicator.\n" - " -F, --show-failed-attempts " - "Show current count of failed authentication attempts.\n" " -v, --version " "Show the version number and quit.\n" " --bs-hl-color <color> " @@ -599,6 +649,12 @@ "Sets the color of the inside of the indicator when invalid.\n" " --key-hl-color <color> " "Sets the color of the key press highlight segments.\n" + " --layout-bg-color <color> " + "Sets the background color of the box containing the layout text.\n" + " --layout-border-color <color> " + "Sets the color of the border of the box containing the layout text.\n" + " --layout-text-color <color> " + "Sets the color of the layout text.\n" " --line-color <color> " "Sets the color of the line between the inside and ring.\n" " --line-clear-color <color> " @@ -647,7 +703,7 @@ optind = 1; while (1) { int opt_idx = 0; - c = getopt_long(argc, argv, "c:deFfhi:Llnrs:tuvC:", long_options, + c = getopt_long(argc, argv, "c:deFfhi:kKLlnrs:tuvC:", long_options, &opt_idx); if (c == -1) { break; @@ -671,6 +727,11 @@ state->args.ignore_empty = true; } break; + case 'F': + if (state) { + state->args.show_failed_attempts = true; + } + break; case 'f': if (state) { state->args.daemonize = true; @@ -681,6 +742,16 @@ load_image(optarg, state); } break; + case 'k': + if (state) { + state->args.show_keyboard_layout = true; + } + break; + case 'K': + if (state) { + state->args.hide_keyboard_layout = true; + } + break; case 'L': if (state) { state->args.show_caps_lock_text = false; @@ -719,11 +790,6 @@ state->args.show_indicator = false; } break; - case 'F': - if (state) { - state->args.show_failed_attempts = true; - } - break; case 'v': fprintf(stdout, "swaylock version " SWAYLOCK_VERSION "\n"); exit(EXIT_SUCCESS); @@ -789,6 +855,21 @@ state->args.colors.key_highlight = parse_color(optarg); } break; + case LO_LAYOUT_BG_COLOR: + if (state) { + state->args.colors.layout_background = parse_color(optarg); + } + break; + case LO_LAYOUT_BORDER_COLOR: + if (state) { + state->args.colors.layout_border = parse_color(optarg); + } + break; + case LO_LAYOUT_TXT_COLOR: + if (state) { + state->args.colors.layout_text = parse_color(optarg); + } + break; case LO_LINE_COLOR: if (state) { state->args.colors.line.input = parse_color(optarg); @@ -989,6 +1070,8 @@ .show_indicator = true, .show_caps_lock_indicator = false, .show_caps_lock_text = true, + .show_keyboard_layout = false, + .hide_keyboard_layout = false, .show_failed_attempts = false }; wl_list_init(&state.images); @@ -1059,12 +1142,6 @@ return 1; } - if (wl_list_empty(&state.surfaces)) { - free(state.args.font); - swaylock_log(LOG_ERROR, "Exiting - no outputs to show on."); - return 0; - } - zwlr_input_inhibit_manager_v1_get_inhibitor(state.input_inhibit_manager); if (wl_display_roundtrip(state.display) == -1) { free(state.args.font); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.3/meson.build new/swaylock-1.4/meson.build --- old/swaylock-1.3/meson.build 2019-01-29 20:48:00.000000000 +0100 +++ new/swaylock-1.4/meson.build 2019-04-29 16:37:47.000000000 +0200 @@ -1,6 +1,7 @@ project( 'swaylock', 'c', + version: '1.3', license: 'MIT', meson_version: '>=0.48.0', default_options: [ @@ -47,17 +48,13 @@ scdoc = find_program('scdoc', required: get_option('man-pages')) wayland_scanner = find_program('wayland-scanner') -version = get_option('swaylock-version') -if version != '' - version = '"@0@"'.format(version) -else - if not git.found() - error('git is required to make the version string') +version = '"@0@"'.format(meson.project_version()) +if git.found() + git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']) + git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']) + if git_commit_hash.returncode() == 0 and git_branch.returncode() == 0 + version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash.stdout().strip(), git_branch.stdout().strip()) endif - - git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip() - git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip() - version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch) endif add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.3/meson_options.txt new/swaylock-1.4/meson_options.txt --- old/swaylock-1.3/meson_options.txt 2019-01-29 20:48:00.000000000 +0100 +++ new/swaylock-1.4/meson_options.txt 2019-04-29 16:37:47.000000000 +0200 @@ -1,4 +1,3 @@ -option('swaylock-version', type : 'string', description: 'The version string reported in `swaylock --version`') option('pam', type: 'feature', value: 'auto', description: 'Use PAM instead of shadow') option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats') option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.3/password.c new/swaylock-1.4/password.c --- old/swaylock-1.3/password.c 2019-01-29 20:48:00.000000000 +0100 +++ new/swaylock-1.4/password.c 2019-04-29 16:37:47.000000000 +0200 @@ -137,6 +137,7 @@ schedule_indicator_clear(state); schedule_password_clear(state); break; + case XKB_KEY_m: /* fallthrough */ case XKB_KEY_d: if (state->xkb.control) { submit_password(state); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.3/render.c new/swaylock-1.4/render.c --- old/swaylock-1.3/render.c 2019-01-29 20:48:00.000000000 +0100 +++ new/swaylock-1.4/render.c 2019-04-29 16:37:47.000000000 +0200 @@ -32,7 +32,7 @@ } } -void render_frame(struct swaylock_surface *surface) { +void render_frame_background(struct swaylock_surface *surface) { struct swaylock_state *state = surface->state; int buffer_width = surface->width * surface->scale; @@ -49,13 +49,6 @@ cairo_t *cairo = surface->current_buffer->cairo; cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST); - cairo_font_options_t *fo = cairo_font_options_create(); - cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL); - cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL); - cairo_font_options_set_subpixel_order(fo, to_cairo_subpixel_order(surface->subpixel)); - cairo_set_font_options(cairo, fo); - cairo_font_options_destroy(fo); - cairo_identity_matrix(cairo); cairo_save(cairo); cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE); @@ -64,20 +57,64 @@ if (surface->image && state->args.mode != BACKGROUND_MODE_SOLID_COLOR) { cairo_set_operator(cairo, CAIRO_OPERATOR_OVER); render_background_image(cairo, surface->image, - state->args.mode, buffer_width, buffer_height); + state->args.mode, buffer_width, buffer_height); } cairo_restore(cairo); cairo_identity_matrix(cairo); + wl_surface_set_buffer_scale(surface->surface, surface->scale); + wl_surface_attach(surface->surface, surface->current_buffer->buffer, 0, 0); + wl_surface_damage(surface->surface, 0, 0, surface->width, surface->height); + wl_surface_commit(surface->surface); +} + +void render_frame(struct swaylock_surface *surface) { + struct swaylock_state *state = surface->state; + int arc_radius = state->args.radius * surface->scale; int arc_thickness = state->args.thickness * surface->scale; + int buffer_diameter = (arc_radius + arc_thickness) * 2; + int buffer_height = buffer_diameter * 2; + + int indicator_radius = state->args.radius + state->args.thickness; + int subsurf_xpos = surface->width / 2 - indicator_radius; + int subsurf_ypos = surface->height / 2 - indicator_radius; + wl_subsurface_set_position(surface->subsurface, subsurf_xpos, subsurf_ypos); + + surface->current_buffer = get_next_buffer(state->shm, + surface->indicator_buffers, buffer_diameter, buffer_height); + if (surface->current_buffer == NULL) { + return; + } + + // Hide subsurface until we want it visible + wl_surface_attach(surface->child, NULL, 0, 0); + wl_surface_commit(surface->child); + + cairo_t *cairo = surface->current_buffer->cairo; + cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST); + cairo_font_options_t *fo = cairo_font_options_create(); + cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL); + cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL); + cairo_font_options_set_subpixel_order(fo, to_cairo_subpixel_order(surface->subpixel)); + cairo_set_font_options(cairo, fo); + cairo_font_options_destroy(fo); + cairo_identity_matrix(cairo); + + // Clear + cairo_save(cairo); + cairo_set_source_rgba(cairo, 0, 0, 0, 0); + cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE); + cairo_paint(cairo); + cairo_restore(cairo); + float type_indicator_border_thickness = TYPE_INDICATOR_BORDER_THICKNESS * surface->scale; if (state->args.show_indicator && state->auth_state != AUTH_STATE_IDLE) { // Draw circle cairo_set_line_width(cairo, arc_thickness); - cairo_arc(cairo, buffer_width / 2, buffer_height / 2, arc_radius, + cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, arc_radius, 0, 2 * M_PI); set_color_for_state(cairo, state, &state->args.colors.inside); cairo_fill_preserve(cairo); @@ -86,6 +123,7 @@ // Draw a message char *text = NULL; + const char *layout_text = NULL; char attempts[4]; // like i3lock: count no more than 999 set_color_for_state(cairo, state, &state->args.colors.text); cairo_select_font_face(cairo, state->args.font, @@ -116,6 +154,21 @@ text = attempts; } } + + xkb_layout_index_t num_layout = xkb_keymap_num_layouts(state->xkb.keymap); + if (!state->args.hide_keyboard_layout && + (state->args.show_keyboard_layout || num_layout > 1)) { + xkb_layout_index_t curr_layout = 0; + + // advance to the first active layout (if any) + while (curr_layout < num_layout && + xkb_state_layout_index_is_active(state->xkb.state, + curr_layout, XKB_STATE_LAYOUT_EFFECTIVE) != 1) { + ++curr_layout; + } + // will handle invalid index if none are active + layout_text = xkb_keymap_layout_get_name(state->xkb.keymap, curr_layout); + } break; default: break; @@ -127,9 +180,9 @@ double x, y; cairo_text_extents(cairo, text, &extents); cairo_font_extents(cairo, &fe); - x = (buffer_width / 2) - + x = (buffer_diameter / 2) - (extents.width / 2 + extents.x_bearing); - y = (buffer_height / 2) + + y = (buffer_diameter / 2) + (fe.height / 2 - fe.descent); cairo_move_to(cairo, x, y); @@ -144,7 +197,7 @@ static double highlight_start = 0; highlight_start += (rand() % (int)(M_PI * 100)) / 100.0 + M_PI * 0.5; - cairo_arc(cairo, buffer_width / 2, buffer_height / 2, + cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, arc_radius, highlight_start, highlight_start + TYPE_INDICATOR_RANGE); if (state->auth_state == AUTH_STATE_INPUT) { @@ -164,12 +217,12 @@ // Draw borders cairo_set_source_u32(cairo, state->args.colors.separator); - cairo_arc(cairo, buffer_width / 2, buffer_height / 2, + cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, arc_radius, highlight_start, highlight_start + type_indicator_border_thickness); cairo_stroke(cairo); - cairo_arc(cairo, buffer_width / 2, buffer_height / 2, + cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, arc_radius, highlight_start + TYPE_INDICATOR_RANGE, highlight_start + TYPE_INDICATOR_RANGE + type_indicator_border_thickness); @@ -179,17 +232,52 @@ // Draw inner + outer border of the circle set_color_for_state(cairo, state, &state->args.colors.line); cairo_set_line_width(cairo, 2.0 * surface->scale); - cairo_arc(cairo, buffer_width / 2, buffer_height / 2, + cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, arc_radius - arc_thickness / 2, 0, 2 * M_PI); cairo_stroke(cairo); - cairo_arc(cairo, buffer_width / 2, buffer_height / 2, + cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, arc_radius + arc_thickness / 2, 0, 2 * M_PI); cairo_stroke(cairo); + + // display layout text seperately + if (layout_text) { + cairo_text_extents_t extents; + cairo_font_extents_t fe; + double x, y; + double box_padding = 4.0 * surface->scale; + cairo_text_extents(cairo, layout_text, &extents); + cairo_font_extents(cairo, &fe); + // upper left coordinates for box + x = (buffer_diameter / 2) - (extents.width / 2) - box_padding; + y = (buffer_diameter / 2) + arc_radius + arc_thickness/2 + + box_padding; // use box_padding also as gap to indicator + + // background box + cairo_rectangle(cairo, x, y, + extents.width + 2.0 * box_padding, + fe.height + 2.0 * box_padding); + cairo_set_source_u32(cairo, state->args.colors.layout_background); + cairo_fill_preserve(cairo); + // border + cairo_set_source_u32(cairo, state->args.colors.layout_border); + cairo_stroke(cairo); + cairo_new_sub_path(cairo); + + // take font extents and padding into account + cairo_move_to(cairo, + x - extents.x_bearing + box_padding, + y + (fe.height - fe.descent) + box_padding); + cairo_set_source_u32(cairo, state->args.colors.layout_text); + cairo_show_text(cairo, layout_text); + cairo_new_sub_path(cairo); + } } - wl_surface_set_buffer_scale(surface->surface, surface->scale); - wl_surface_attach(surface->surface, surface->current_buffer->buffer, 0, 0); - wl_surface_damage(surface->surface, 0, 0, surface->width, surface->height); + wl_surface_set_buffer_scale(surface->child, surface->scale); + wl_surface_attach(surface->child, surface->current_buffer->buffer, 0, 0); + wl_surface_damage(surface->child, 0, 0, surface->current_buffer->width, surface->current_buffer->height); + wl_surface_commit(surface->child); + wl_surface_commit(surface->surface); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.3/swaylock.1.scd new/swaylock-1.4/swaylock.1.scd --- old/swaylock-1.3/swaylock.1.scd 2019-01-29 20:48:00.000000000 +0100 +++ new/swaylock-1.4/swaylock.1.scd 2019-04-29 16:37:47.000000000 +0200 @@ -27,6 +27,9 @@ *-e, --ignore-empty-password* When an empty password is provided by the user, do not validate it. +*-F, --show-failed-attempts* + Show the number of failed authentication attempts on the indicator. + *-f, --daemonize* Detach from the controlling terminal after locking. @@ -48,15 +51,20 @@ a background color. If the path potentially contains a ':', prefix it with another ':' to prevent interpreting part of it as <output>. +*-k, --show-keyboard-layout* + Force displaying the current xkb layout while typing, even if only one layout + is configured. + +*-K, --hide-keyboard-layout* + Force hiding the current xkb layout while typing, even if more than one layout + is configured or the show-keyboard-layout option is set. + *-L, --disable-caps-lock-text* Disable the Caps Lock Text. *-l, --indicator-caps-lock* Show the current Caps Lock state also on the indicator. -*-F, --show-failed-attempts* - Show the number of failed authentication attempts on the indicator. - *-s, --scaling* Scaling mode for images: _stretch_, _fill_, _fit_, _center_, or _tile_. Use the additional mode _solid\_color_ to display only the background color, even @@ -75,7 +83,7 @@ *--caps-lock-bs-hl-color* <rrggbb[aa]> Sets the color of backspace highlight segments when Caps Lock is active. -*--caps-lock-bs-hl-color* <rrggbb[aa]> +*--caps-lock-key-hl-color* <rrggbb[aa]> Sets the color of the key press highlight segments when Caps Lock is active. *--font* @@ -107,6 +115,15 @@ *--key-hl-color* <rrggbb[aa]> Sets the color of key press highlight segments. +*--layout-bg-color* <rrggbb[aa]> + Sets the background color of the box containing the layout text. + +*--layout-border-color* <rrggbb[aa]> + Sets the color of the border of the box containing the layout text. + +*--layout-text-color* <rrggbb[aa]> + Sets the color of the layout text. + *--line-color* <rrggbb[aa]> Sets the color of the lines that separate the inside and outside of the indicator when typing or idle. ++++++ swaylock-version.patch ++++++ --- /var/tmp/diff_new_pack.0Yrb3W/_old 2019-05-24 11:31:39.629402210 +0200 +++ /var/tmp/diff_new_pack.0Yrb3W/_new 2019-05-24 11:31:39.633402209 +0200 @@ -1,28 +1,12 @@ -diff -urEbwB swaylock-1.3/meson.build swaylock-1.3.new/meson.build ---- swaylock-1.3/meson.build 2019-01-29 20:48:00.000000000 +0100 -+++ swaylock-1.3.new/meson.build 2019-02-05 14:00:08.728822898 +0100 -@@ -1,6 +1,7 @@ +diff -urEbwB swaylock-1.4/meson.build swaylock-1.4.new/meson.build +--- swaylock-1.4/meson.build 2019-04-29 16:37:47.000000000 +0200 ++++ swaylock-1.4.new/meson.build 2019-05-23 08:09:39.276483783 +0200 +@@ -1,7 +1,7 @@ project( 'swaylock', 'c', -+ version: '1.3', +- version: '1.3', ++ version: '1.4', license: 'MIT', meson_version: '>=0.48.0', default_options: [ -@@ -47,14 +48,9 @@ - scdoc = find_program('scdoc', required: get_option('man-pages')) - wayland_scanner = find_program('wayland-scanner') - --version = get_option('swaylock-version') --if version != '' -- version = '"@0@"'.format(version) --else - if not git.found() -- error('git is required to make the version string') -- endif -- -+ version = '"@0@"'.format(meson.project_version()) -+else - git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip() - git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip() - version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)

1 0

commit benji for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package benji for openSUSE:Factory checked in at 2019-05-24 11:31:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/benji (Old) and /work/SRC/openSUSE:Factory/.benji.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "benji" Fri May 24 11:31:32 2019 rev:3 rq:704864 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/benji/benji.changes 2019-03-22 15:08:14.197449405 +0100 +++ /work/SRC/openSUSE:Factory/.benji.new.5148/benji.changes 2019-05-24 11:31:37.269402818 +0200 @@ -1,0 +2,62 @@ +Thu May 23 04:31:24 UTC 2019 - mvetter(a)suse.com + +- Update to 0.6.0: + * URL parsing of I/O resources is now conforming to standards. + Especially for the RBD I/O module the two slashes directly after + the colon are no longer valid and have to be removed + (rbd://pool/image -> rbd:pool/image). + * Added I/O module for iSCSI. It is based on libiscsi and requires + no elevated permissions. Please see the documentation as Benji + requires a special version of the libiscsi Python bindings. + The module is single-threaded and synchronous, so performance + will be limited. Contributions are welcome! + * The algorithm used by benji enforce has seen an overhaul and + should be more comprehensible as the time categories are based + on natural time boundaries (start of the hour, day, week, + month, and year) now. + * Added a restore helper script (images/benji-k8s/scripts/benji-restore-pvc) + for Kubernetes. This script is intended to be run on a management + system with access to the Kubernetes cluster and can restore + a version into a new or an existing PVC/PV pair. + * The container images are now based on the Python 3.6 included in EPEL. + The RBD support has been updated to Ceph Nautilus. Nautilus also + added RADOS and RBD Python bindings for Python 3.6 which are now + used instead of building them themselves. +- Add requires on python3-diskcache + +------------------------------------------------------------------- +Tue Apr 2 11:16:12 UTC 2019 - mvetter(a)suse.com + +- Update to 0.5.0: + * Added fsfreeze support to the benji-k8s Docker image. Just add + the benji-backup.me/fsfreeze: yes annotation to the PVC. + Kubernetes hosts are accessed via pods which are deployed by + a DaemonSet, see the Helm chart for details. + * Use bulk inserts to speed up backups of images based on a + previous version. This also decreases memory usage. + * Switched from in-memory block lists to an iterator based approach. + This will increase performance and decrease memory usage when + backing up large images. + * Fixed a wrong index on the blocks table. This should also increase + performance. The database will need to be migrated with benji + database-migrate. + * Laid the foundation for structured logging. + * Removed database table stats and assorted code and commands. + Statistics are now kept together with the other version metadata + in the versions table. This means they are also removed when the + version is removed. If you want to keep historic statistics you + need to export them beforehand with benji -m ls or benji + metadata-export. This is a breaking change and you might need + adjust your scripts. As statistics are now included in a + version's metadata the metadata version is now 1.1.0. + Old metadata backups and exports with a metadata version of + 1.0.0 can be imported by the current version. The statistics will be + empty in that case. The database will need to be migrated with + benji database-migrate. + * Fixed a bug in the time calculation of benji enforce which + could lead to a late expiration of versions, the timing was + a few hours off. +- Remove dependency on colorlog +- Add dependency on colorama and structlog + +------------------------------------------------------------------- Old: ---- v0.4.0.tar.gz New: ---- v0.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ benji.spec ++++++ --- /var/tmp/diff_new_pack.Y9lXXJ/_old 2019-05-24 11:31:38.265402561 +0200 +++ /var/tmp/diff_new_pack.Y9lXXJ/_new 2019-05-24 11:31:38.269402560 +0200 @@ -17,7 +17,7 @@ Name: benji -Version: 0.4.0 +Version: 0.6.0 Release: 0 Summary: Deduplicating block based backup software License: LGPL-3.0-only @@ -30,8 +30,9 @@ Requires: python3-PrettyTable >= 0.7.2 Requires: python3-alembic >= 1.0.5 Requires: python3-argcomplete >= 1.9.4 -Requires: python3-colorlog >= 4.0.0 +Requires: python3-colorama >= 0.4.1 Requires: python3-dateutil >= 2.6.0 +Requires: python3-diskcache >= 3.0.6 Requires: python3-psutil Requires: python3-pycryptodome >= 3.6.1 Requires: python3-pyparsing >= 2.3.0 @@ -41,6 +42,7 @@ Requires: python3-shortuuid Requires: python3-sparse >= 0.2.2 Requires: python3-sqlalchemy >= 1.2.6 +Requires: python3-structlog >= 19.1.0 Recommends: python3-boto3 Recommends: python3-psycopg2 >= 2.7.4 BuildArch: noarch ++++++ v0.4.0.tar.gz -> v0.6.0.tar.gz ++++++ ++++ 5050 lines of diff (skipped)

1 0

commit openSUSE-release-tools for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2019-05-24 11:31:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Fri May 24 11:31:29 2019 rev:180 rq:704859 version:20190522.4ee44da8 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2019-05-22 15:40:14.790448647 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.5148/openSUSE-release-tools.changes 2019-05-24 11:31:35.341403314 +0200 @@ -1,0 +2,7 @@ +Thu May 23 01:48:25 UTC 2019 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20190522.4ee44da8: + * dist/k8s/heroes: include openSUSE:Leap:15.1:NonFree in origin_manager_report. + * osclib/util: correct python3 port by casting to list directly after filter. + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20190522.4707e237.obscpio New: ---- openSUSE-release-tools-20190522.4ee44da8.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.ln79DL/_old 2019-05-24 11:31:36.069403127 +0200 +++ /var/tmp/diff_new_pack.ln79DL/_new 2019-05-24 11:31:36.073403126 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20190522.4707e237 +Version: 20190522.4ee44da8 Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ln79DL/_old 2019-05-24 11:31:36.121403114 +0200 +++ /var/tmp/diff_new_pack.ln79DL/_new 2019-05-24 11:31:36.125403112 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">90a5fe9f9010617ca5866de8fdc9891dd8a8ad33</param> + <param name="changesrevision">c4dccf80ab91f933a893b6faf5e0bc60abbb7210</param> </service> </servicedata> ++++++ openSUSE-release-tools-20190522.4707e237.obscpio -> openSUSE-release-tools-20190522.4ee44da8.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190522.4707e237/dist/kubernetes/environments/heroes/params.libsonnet new/openSUSE-release-tools-20190522.4ee44da8/dist/kubernetes/environments/heroes/params.libsonnet --- old/openSUSE-release-tools-20190522.4707e237/dist/kubernetes/environments/heroes/params.libsonnet 2019-05-22 08:18:46.000000000 +0200 +++ new/openSUSE-release-tools-20190522.4ee44da8/dist/kubernetes/environments/heroes/params.libsonnet 2019-05-23 03:45:09.000000000 +0200 @@ -13,6 +13,7 @@ "obs-operator.origin_manager_report"+: { projects: [ "openSUSE:Leap:15.1", + "openSUSE:Leap:15.1:NonFree", ], }, "repo-checker.project_only"+: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190522.4707e237/osclib/util.py new/openSUSE-release-tools-20190522.4ee44da8/osclib/util.py --- old/openSUSE-release-tools-20190522.4707e237/osclib/util.py 2019-05-22 08:18:46.000000000 +0200 +++ new/openSUSE-release-tools-20190522.4ee44da8/osclib/util.py 2019-05-23 03:45:09.000000000 +0200 @@ -35,7 +35,7 @@ prefix = ':'.join(project.split(':')[:-1]) projects = project_list_prefix(apiurl, prefix) - projects = filter(family_filter, projects) + projects = list(filter(family_filter, projects)) if project_suffix: for i, project in enumerate(projects): @@ -44,7 +44,7 @@ else: projects[i] += project_suffix - return list(projects) + return projects def project_list_family_prior(apiurl, project, include_self=False, last=None, include_update=False): """ ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.ln79DL/_old 2019-05-24 11:31:37.089402864 +0200 +++ /var/tmp/diff_new_pack.ln79DL/_new 2019-05-24 11:31:37.097402861 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20190522.4707e237 -mtime: 1558505926 -commit: 4707e23722677c0adeb6796413b19966316fb910 +version: 20190522.4ee44da8 +mtime: 1558575909 +commit: 4ee44da8ee8abf7d201ab72506679ae12d9025ff

1 0

commit enigmail for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package enigmail for openSUSE:Factory checked in at 2019-05-24 11:31:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enigmail (Old) and /work/SRC/openSUSE:Factory/.enigmail.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "enigmail" Fri May 24 11:31:26 2019 rev:32 rq:704852 version:2.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/enigmail/enigmail.changes 2019-04-01 12:38:12.461910163 +0200 +++ /work/SRC/openSUSE:Factory/.enigmail.new.5148/enigmail.changes 2019-05-24 11:31:32.917403938 +0200 @@ -1,0 +2,7 @@ +Wed May 22 20:55:11 UTC 2019 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- enigmail 2.0.11: + * CVE-2019-12269: Specially crafted inline PGP messages could + spoof a "correctly signed" message (boo#1135855) + +------------------------------------------------------------------- Old: ---- enigmail-2.0.10.tar.gz enigmail-2.0.10.tar.gz.asc New: ---- enigmail-2.0.11.tar.gz enigmail-2.0.11.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enigmail.spec ++++++ --- /var/tmp/diff_new_pack.3w1JtI/_old 2019-05-24 11:31:33.733403729 +0200 +++ /var/tmp/diff_new_pack.3w1JtI/_new 2019-05-24 11:31:33.745403725 +0200 @@ -18,7 +18,7 @@ Name: enigmail -Version: 2.0.10 +Version: 2.0.11 Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-2.0 ++++++ enigmail-2.0.10.tar.gz -> enigmail-2.0.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/configure new/enigmail/configure --- old/enigmail/configure 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/configure 2019-05-19 18:47:45.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for enigmail 2.0.10. +# Generated by GNU Autoconf 2.69 for enigmail 2.0.11. # # Report bugs to <https://www.enigmail.net>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='enigmail' PACKAGE_TARNAME='enigmail' -PACKAGE_VERSION='2.0.10' -PACKAGE_STRING='enigmail 2.0.10' +PACKAGE_VERSION='2.0.11' +PACKAGE_STRING='enigmail 2.0.11' PACKAGE_BUGREPORT='https://www.enigmail.net' PACKAGE_URL='' @@ -1195,7 +1195,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures enigmail 2.0.10 to adapt to many kinds of systems. +\`configure' configures enigmail 2.0.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1261,7 +1261,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of enigmail 2.0.10:";; + short | recursive ) echo "Configuration of enigmail 2.0.11:";; esac cat <<\_ACEOF @@ -1343,7 +1343,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -enigmail configure 2.0.10 +enigmail configure 2.0.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by enigmail $as_me 2.0.10, which was +It was created by enigmail $as_me 2.0.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/configure.ac new/enigmail/configure.ac --- old/enigmail/configure.ac 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/configure.ac 2019-05-19 18:47:45.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.61) min_automake_version="1.10" -AC_INIT([enigmail],[2.0.10], [https://www.enigmail.net] +AC_INIT([enigmail],[2.0.11], [https://www.enigmail.net] AC_PATH_PROG(PYTHON, "python2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/lang/da/enigmail.dtd new/enigmail/lang/da/enigmail.dtd --- old/enigmail/lang/da/enigmail.dtd 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/lang/da/enigmail.dtd 2019-05-19 18:47:45.000000000 +0200 @@ -757,9 +757,9 @@ <!ENTITY enigmail.setupWiz.pgImportSettings.title ""> <!ENTITY enigmail.setupWiz.pgImportSettings.desc "Enigmail giver mulighed for at overføre alle dens indstillinger, herunder din OpenPGP nøgler til en ny computer. Dette sker i to trin: -<Html: ol> -<html: li> Eksporter dine data fra din gamle computer ved hjælp af backupguiden fra Enigmail præferencerne</html:li> -<html: li> Importer dataene til din nye computer ved hjælp af denne guiden.</html:li> +<html:ol> +<html:li> Eksporter dine data fra din gamle computer ved hjælp af backupguiden fra Enigmail præferencerne</html:li> +<html:li> Importer dataene til din nye computer ved hjælp af denne guiden.</html:li> </html:ol>"> <!ENTITY enigmail.setupWiz.pgImportSettings.fileName ""> <!ENTITY enigmail.setupWiz.pgImportSettings.importing ""> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/decryption.jsm new/enigmail/package/decryption.jsm --- old/enigmail/package/decryption.jsm 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/decryption.jsm 2019-05-19 18:47:45.000000000 +0200 @@ -528,7 +528,7 @@ pgpBlock = pgpBlock.replace(/\r?\n\r?\n/g, "\n"); } - var head = cipherText.substr(0, beginIndexObj.value); + const head = ""; var tail = cipherText.substr(endIndexObj.value + 1, cipherText.length - endIndexObj.value - 1); @@ -616,8 +616,7 @@ } blockSeparationObj.value = retStatusObj.blockSeparation; - if ((head.search(/\S/) >= 0) || - (tail.search(/\S/) >= 0)) { + if (tail.search(/\S/) >= 0) { statusFlagsObj.value |= EnigmailConstants.PARTIALLY_PGP; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/gpg.jsm new/enigmail/package/gpg.jsm --- old/enigmail/package/gpg.jsm 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/gpg.jsm 2019-05-19 18:47:45.000000000 +0200 @@ -135,6 +135,7 @@ supports-wkd - does gpg support wkd (web key directory) (true for gpg >= 2.1.19) export-result - does gpg print EXPORTED when exporting keys (true for gpg >= 2.1.10) decryption-info - does gpg print DECRYPTION_INFO (true for gpg >= 2.0.19) + supports-show-only - does gpg support --import-options show-only (true for gpg >= 2.0) @return: depending on featureName - Boolean unless specified differently: (true if feature is available / false otherwise) @@ -185,6 +186,8 @@ return EnigmailVersioning.greaterThanOrEqual(gpgVersion, "2.0.19"); case "supports-wkd": return EnigmailVersioning.greaterThanOrEqual(gpgVersion, "2.1.19"); + case "supports-show-only": + return EnigmailVersioning.greaterThanOrEqual(gpgVersion, "2.0"); } return undefined; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/install.rdf new/enigmail/package/install.rdf --- old/enigmail/package/install.rdf 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/install.rdf 2019-05-19 18:47:45.000000000 +0200 @@ -5,7 +5,7 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id> - <em:version>2.0.10</em:version> + <em:version>2.0.11</em:version> <em:type>2</em:type>  <em:bootstrap>true</em:bootstrap> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/key.jsm new/enigmail/package/key.jsm --- old/enigmail/package/key.jsm 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/key.jsm 2019-05-19 18:47:45.000000000 +0200 @@ -28,6 +28,18 @@ const getKeyRing = EnigmailLazy.loader("enigmail/keyRing.jsm", "EnigmailKeyRing"); const getDialog = EnigmailLazy.loader("enigmail/dialog.jsm", "EnigmailDialog"); +const ENTRY_ID = 0; +const KEY_TRUST_ID = 1; +const KEY_SIZE_ID = 2; +const KEY_ALGO_ID = 3; +const KEY_ID = 4; +const CREATED_ID = 5; +const EXPIRY_ID = 6; +const UID_ID = 7; +const OWNERTRUST_ID = 8; +const USERID_ID = 9; +const SIG_TYPE_ID = 10; +const KEY_USE_FOR_ID = 11; var EnigmailKey = { /** @@ -55,8 +67,7 @@ if (matchb && (matchb.length > 3)) { EnigmailLog.DEBUG("enigmailCommon.jsm:: Enigmail.extractPubkey: NO_PUBKEY 0x" + matchb[3] + "\n"); return matchb[2] + matchb[3]; - } - else { + } else { return null; } }, @@ -74,8 +85,7 @@ if (key.keyTrust === "r") { // Key has already been revoked getDialog().info(null, EnigmailLocale.getString("revokeKeyAlreadyRevoked", keyId)); - } - else { + } else { let userId = key.userId + " - 0x" + key.keyId; if (!getDialog().confirmDlg(null, @@ -89,8 +99,7 @@ getDialog().alert(null, errorMsgObj.value); } } - } - else { + } else { // Suitable key for revocation certificate is not present in keyring getDialog().alert(null, EnigmailLocale.getString("revokeKeyNotPresent", keyId)); } @@ -131,70 +140,71 @@ * - state (one of "old" [existing key], "new" [new key], "invalid" [key cannot not be imported]) */ getKeyListFromKeyBlock: function(keyBlockStr, errorMsgObj, interactive = true) { - EnigmailLog.DEBUG("key.jsm: getKeyListFromKeyBlock\n"); + EnigmailLog.DEBUG("key.jsm: getKeyListFromKeyBlock()\n"); let blocks; let isBinary = false; errorMsgObj.value = ""; - if (keyBlockStr.search(/-----BEGIN PGP (PUBLIC|PRIVATE) KEY BLOCK-----/) >= 0) { - blocks = this.splitArmoredBlocks(keyBlockStr); - } - else { - isBinary = true; - blocks = [EnigmailOpenPGP.enigmailFuncs.bytesToArmor(EnigmailOpenPGP.openpgp.enums.armor.public_key, keyBlockStr)]; - } - - let keyList = []; + let keyList = getGpgKeyData(keyBlockStr); let key = {}; - for (let b of blocks) { - let m = EnigmailOpenPGP.openpgp.message.readArmored(b); - for (let i = 0; i < m.packets.length; i++) { - let packetType = EnigmailOpenPGP.openpgp.enums.read(EnigmailOpenPGP.openpgp.enums.packet, m.packets[i].tag); - switch (packetType) { - case "publicKey": - case "secretKey": - key = { - id: m.packets[i].getKeyId().toHex().toUpperCase(), - fpr: m.packets[i].getFingerprint().toUpperCase(), - name: null, - isSecret: false - }; - - if (!(key.id in keyList)) { - keyList[key.id] = key; - } - - if (packetType === "secretKey") { - keyList[key.id].isSecret = true; - } - break; - case "userid": - if (!key.name) { - key.name = m.packets[i].userid.replace(/[\r\n]+/g, " "); - } - break; - case "signature": - if (m.packets[i].signatureType === SIG_TYPE_REVOCATION) { - let keyId = m.packets[i].issuerKeyId.toHex().toUpperCase(); - if (keyId in keyList) { - keyList[keyId].revoke = true; + if (keyList.length === 0) { + EnigmailLog.DEBUG("key.jsm: getKeyListFromKeyBlock: no data from GnuPG\n"); + if (keyBlockStr.search(/-----BEGIN PGP (PUBLIC|PRIVATE) KEY BLOCK-----/) >= 0) { + blocks = this.splitArmoredBlocks(keyBlockStr); + } else { + isBinary = true; + blocks = [EnigmailOpenPGP.enigmailFuncs.bytesToArmor(EnigmailOpenPGP.openpgp.enums.armor.public_key, keyBlockStr)]; + } + + for (let b of blocks) { + let m = EnigmailOpenPGP.openpgp.message.readArmored(b); + + for (let i = 0; i < m.packets.length; i++) { + let packetType = EnigmailOpenPGP.openpgp.enums.read(EnigmailOpenPGP.openpgp.enums.packet, m.packets[i].tag); + switch (packetType) { + case "publicKey": + case "secretKey": + key = { + id: m.packets[i].getKeyId().toHex().toUpperCase(), + fpr: m.packets[i].getFingerprint().toUpperCase(), + name: null, + isSecret: false + }; + + if (!(key.id in keyList)) { + keyList[key.id] = key; } - else { - keyList[keyId] = { - revoke: true, - id: keyId - }; + + if (packetType === "secretKey") { + keyList[key.id].isSecret = true; } - } - break; + break; + case "userid": + if (!key.name) { + key.name = m.packets[i].userid.replace(/[\r\n]+/g, " "); + } + break; + case "signature": + if (m.packets[i].signatureType === SIG_TYPE_REVOCATION) { + let keyId = m.packets[i].issuerKeyId.toHex().toUpperCase(); + if (keyId in keyList) { + keyList[keyId].revoke = true; + } else { + keyList[keyId] = { + revoke: true, + id: keyId + }; + } + } + break; + } } } } - let retArr = []; for (let k in keyList) { retArr.push(keyList[k]); @@ -256,3 +266,80 @@ } }; + + +function getGpgKeyData(armorKeyString) { + if (!EnigmailGpg.getGpgFeature("supports-show-only")) return []; + + EnigmailLog.DEBUG("key.jsm: getGpgKeyData()\n"); + let command = EnigmailGpg.agentPath; + let args = EnigmailGpg.getStandardArgs(false).concat(["--no-tty", "--batch", "--no-verbose", "--dry-run", "--with-fingerprint", "--with-colons", "--import-options", "show-only", "--import"]); + + let statusFlagsObj = {}; + let statusMsgObj = {}; + let exitCodeObj = {}; + let errorMsgObj = {}; + + let output = EnigmailExecution.execCmd(command, args, armorKeyString, exitCodeObj, statusFlagsObj, statusMsgObj, errorMsgObj); + + let lines = output.split(/\r?\n/); + let key = {}; + let keyId = ""; + let keyList = []; + /* + pub:u:256:22:84F83BE88C892606:1525969855:1683649855::u:::scESC:::::ed25519:::0: + fpr:::::::::AFE1B65C5F39ACA7960B22CD84F83BE88C892606: + uid:u::::1525969914::22DB32406212400B52CDC74DA2B33418637430F1::Patrick (ECC) <patrick(a)enigmail.net>::::::::::0: + uid:u::::1525969855::F70B7A77F085AA7BA003D6AFAB6FF0DB1FC901B0::enigmail <patrick(a)enigmail.net>::::::::::0: + sub:u:256:18:329DAB3350400C40:1525969855:1683649855:::::e:::::cv25519:: + fpr:::::::::3B154538D4DFAA19BDADAAD0329DAB3350400C40: + */ + + for (let i = 0; i < lines.length; i++) { + const lineTokens = lines[i].split(/:/); + + switch (lineTokens[ENTRY_ID]) { + case "pub": + case "sec": + key = { + id: lineTokens[KEY_ID], + fpr: null, + name: null, + isSecret: false + }; + + if (!(key.id in keyList)) { + keyList[key.id] = key; + } + + if (lineTokens[ENTRY_ID] === "sec") { + keyList[key.id].isSecret = true; + } + break; + case "fpr": + if (!key.fpr) { + key.fpr = lineTokens[USERID_ID]; + } + break; + case "uid": + if (!key.name) { + key.name = lineTokens[USERID_ID]; + } + break; + case "rvs": + case "rvk": + keyId = lineTokens[KEY_ID]; + if (keyId in keyList) { + keyList[keyId].revoke = true; + } else { + keyList[keyId] = { + revoke: true, + id: keyId + }; + } + break; + } + } + + return keyList; +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/tests/encryption-test.js new/enigmail/package/tests/encryption-test.js --- old/enigmail/package/tests/encryption-test.js 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/tests/encryption-test.js 2019-05-19 18:47:45.000000000 +0200 @@ -92,4 +92,4 @@ expected = EnigmailLocale.getString("errorOwnKeyUnusable", "nobody(a)notfound.net"); Assert.equal(r.errorMsg, expected); -}))); +}))); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/tests/installGnuPG-test.js new/enigmail/package/tests/installGnuPG-test.js --- old/enigmail/package/tests/installGnuPG-test.js 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/tests/installGnuPG-test.js 2019-05-19 18:47:45.000000000 +0200 @@ -17,7 +17,7 @@ test(function shouldCheckHashSum() { let inst = new Installer(null); inst.installerFile = do_get_file("resources/dev-strike.asc", false); - inst.hash = "041af0b00ea712bf5ebe349e5cceda148e0797539ee85acd8e06ac8921c6667d"; // SHA256 sum of installerFile + inst.hash = "15bc9d49f716dfb467c4e69241e4161df4aa3004ab0a21cd616fb2f4e46f0cd3"; // SHA256 sum of installerFile Assert.ok(inst.checkHashSum()); -}); +}); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/tests/keyRing-test.js new/enigmail/package/tests/keyRing-test.js --- old/enigmail/package/tests/keyRing-test.js 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/tests/keyRing-test.js 2019-05-19 18:47:45.000000000 +0200 @@ -41,10 +41,10 @@ // Output from GnuPG varies sligtly between different versions (new output data is added // at the end of the list). Therefore each line is only compared to the length provided below let expectedListing = [ - "pub:-:4096:1:781617319CE311C4:1430756251:1556986651::-:::scESC:", + "pub:-:4096:1:781617319CE311C4:1430756251:::-:::scESC:", "fpr:::::::::65537E212DC19025AD38EDB2781617319CE311C4:", - "uid:-::::1430756251::DB54FB278F6AE719DE0DE881B17D4C762F5752A9::anonymous strike <strike.devtest(a)gmail.com>:", - "sub:-:4096:1:D535623BB60E9E71:1430756251:1556986651:::::e:" + "uid:-::::1557592308::DB54FB278F6AE719DE0DE881B17D4C762F5752A9::anonymous strike <strike.devtest(a)gmail.com>:", + "sub:-:4096:1:D535623BB60E9E71:1430756251::::::e:" ]; let keyDetList = keyDetails.split(/\n\r?/); @@ -124,7 +124,6 @@ JSUnit.createStubWindow(), false, "-----BEGIN PGP PUBLIC KEY BLOCK-----" + - "\n" + "Comment: GPGTools - https://gpgtools.org" + "\n" + "\n" + "mQINBFVHm5sBEACs94Ln+RMdeyBpWQtTZ/NZnwntsB10Wd3HTgo5sdA/OOFOJrWe" + "\n" + "tJfAZ/HRxiSu1bwRaFVC8p061ftTbxf8bsdfsykYJQQqPODfcO0/oY2n/Z93ya8K" + @@ -137,48 +136,48 @@ "\n" + "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" + - "\n" + "LBn4tb400iHp7byO85tF/H0OOI1K" + - "\n" + "=CVNK" + + "\n" + "tCthbm9ueW1vdXMgc3RyaWtlIDxzdHJpa2UuZGV2dGVzdEBnbWFpbC5jb20+iQJO" + + "\n" + "BBMBCgA4AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAFiEEZVN+IS3BkCWtOO2y" + + "\n" + "eBYXMZzjEcQFAlzW+PQACgkQeBYXMZzjEcTLFBAApEsiJaTaDIQ539ZlsHZE0Fcu" + + "\n" + "Wlo0buZhUAG6XvL8U+J9JQ9B5z9hpbPdYiRgaJScxOA4h8V2sNPS1n0u1mBaW3sd" + + "\n" + "dTHLnUb75Mwh+1AgNhIDybyFVtvdOUVzvcNvQ+HoQDGgf8KgsqD8BiPatA+v3R/B" + + "\n" + "JQH07pa7w6rb9d1RHYDGaNcmzP1zUrf84vrrXvW+VGdUxR9jM7PanD9nJkXyFmeK" + + "\n" + "NNOTqq4+ofYbc9a6huo+rvb6zWAHiPkD0Phz7cLknmY2oE4Mxc0UAchAlmZ/ElQD" + + "\n" + "xThq3wFi0DrIficnjnf1044Q9jTcVgiYFNr171pFpKUeAsq6Nn+3K3cjVqSNfn3G" + + "\n" + "v9fIKEy6P4UQdhxl7VkP1oaON9FINPYcnHd5QImUFX30odE3r7v5C9TNPDgfQ+nm" + + "\n" + "SKIpBdnAnkJbpEfVmQ5qOZ793hoH+w7YQxo6ijyYmRB+DEGTXjIiv7u/8JjyXJFw" + + "\n" + "j3rblmmczYQT3ch2QZQ/+kFqf1VpiE2ORpNI5WfVlovFgLsSu0uaEuQt9N0PJ/7t" + + "\n" + "sxVVT+hFZV57oS1z5VO51LpkIV46GhCNdlkRTlKGDj3j97bWcs8UY8O128W/P/CI" + + "\n" + "67BzUTw5uTWBB6tEK+yLBiRuiRyEPgOFrUs4lP/qJVbonJtph9NYnC2HGD62Mx9G" + + "\n" + "sgNr3hL/LDYyew7Zsoy5Ag0EVUebmwEQAMFfbxtHlDFusY1U9PeMzrQhP6b8ZMsf" + + "\n" + "qWbg5xmiYB6P9esE5xf/QFi06qo/sO6vyTQDx9wuRkJIGx7Wbp+98AKjxVt66e/g" + + "\n" + "itJPkWBeHttg9mx4jLlTtefR0uqlVclGoy3dQtL9HDLXxfHyP2xckkMAoipngwfC" + + "\n" + "AGSc954GcPhobpskC4EQjpFbmWFsbxYUl8KeIW5GeKb5UPq5x/3fHc2QvRNZjSXQ" + + "\n" + "9tR1b3awt+IqnWebP7V1GgFyRPvTWwyzamTjw7lj+8/o4QPMXOMZ0DWv1iRuVeM3" + + "\n" + "1XGFI3TRaWZyrUOoRTfr4yqLhghCy4Xc19LXf5TaWGOVHkelHF0Mx8eMViWTmGU6" + + "\n" + "26+imx5hOUzKQWXwPvLSpIUgCKpWXql2VIFTzhs4segJQZ6ez5SXubRRKHBl1WYy" + + "\n" + "J8XD98nAhJkjwPm8aQzesTtPGscBD87V8mcZk0FGCfwuOdmNEYD+7V/B6m0VjQ3L" + + "\n" + "M7mU7NNYjocEmXWExq97aXS+3AE8utFttGHLpnvsE18T1rbDtjhoV6yGMSlbETxt" + + "\n" + "AjIysEZpFqJDaWleYDpdhnFDzE5R+y2wBHVMz4luhckO5PD5iFpVrZbtn9HN202d" + + "\n" + "qFYIKOm0WrrQO6CAvAAaeOvkdy2kuDC8tUoJ4N9TydyHMKQvseKSHYsLvJJRH9XM" + + "\n" + "5FqD9OSPFhFHABEBAAGJAjYEGAEKACACGwwWIQRlU34hLcGQJa047bJ4FhcxnOMR" + + "\n" + "xAUCXNb5GQAKCRB4FhcxnOMRxC5aD/9ibGiHb2c4ZKL0FBPZ5kPrBAWmxhXWEILc" + + "\n" + "Y2J/NZn3QeXbBnfA7NBs8vpjPjSazz/I+eOEKNZ07oq35EARG/v9X3JYu60q+Bo9" + + "\n" + "557W3K2csFAxSGzHz1EyPiYMVb/p8+R+3WK7QlVffc4+8lLCal+tTjwCVCmtWHsg" + + "\n" + "Kh2ctZVmeiP+ovJ7gjfVdNO6KRceOU25ZzEWoh4t0/K6Hmshcjtwt/43Nlg3GywA" + + "\n" + "QJq+lj3s5Lgm1mXdrktZV1iszu72aBFxH+qi66AjPk/kTabNJ7OxNca+5+v6Smwi" + + "\n" + "N3/9goW1VyLt7wV2YWpAE+ihq86U+efRseml9WFicOOBDL9ivwVVi5XUy1RS56Qk" + + "\n" + "o81Uolc1my/FZ75EGrdpORVXt8Uus/oNaX7LY2rKXSA3NzOIgtmfJzRkREsP6Uuf" + + "\n" + "w2npZFWCuPVtttw5I9n+EEcuSGvyEREtv8LpUlUIksJ5M+Mhxje7O94XPqHrPozK" + + "\n" + "fPwAuFygazVGCPvbZQohsHRKsq93a2T4gQ32Fo2SQLnY3+wh3qt1cnj29Hla9HVt" + + "\n" + "yPcvcN/nAC5IJkbrp8SV8zKSYBiwEcs1nc3Nan1byo8m1Up4+HlAyz70oMzUHThd" + + "\n" + "Znr5k9Xl24h14LlZfk450yj6CvVFilhH8wwQ7WRSzqAhTp6i/N9KXUHOczdXf7Zt" + + "\n" + "J14nd8wqFA==" + + "\n" + "=Hflu" + "\n" + "-----END PGP PUBLIC KEY BLOCK-----" + "\n" + "-----BEGIN PGP PRIVATE KEY BLOCK-----" + - "\n" + "Comment: GPGTools - https://gpgtools.org" + "\n" + - "\n" + "lQc+BFVHm5sBEACs94Ln+RMdeyBpWQtTZ/NZnwntsB10Wd3HTgo5sdA/OOFOJrWe" + + "\n" + "lQdGBFVHm5sBEACs94Ln+RMdeyBpWQtTZ/NZnwntsB10Wd3HTgo5sdA/OOFOJrWe" + "\n" + "tJfAZ/HRxiSu1bwRaFVC8p061ftTbxf8bsdfsykYJQQqPODfcO0/oY2n/Z93ya8K" + "\n" + "TzjXR3qBQ1P7f5x71yeuo7Zrj7B0G44Xjfy+1L0eka9paBqmm3U5cUew5wSr772L" + "\n" + "cflipWfncWXD2rBqgRfR339lRHd3Vwo7V8jje8rlP9msOuTMWCvQuQvpEkfIioXA" + @@ -189,98 +188,99 @@ "\n" + "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" + - "\n" + "=h0dN" + + "\n" + "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" + + "\n" + "=HPTr" + "\n" + "-----END PGP PRIVATE KEY BLOCK-----", null, {}); const keyDetails = EnigmailKeyRing.getValidUids("0xD535623BB60E9E71").join("\n"); @@ -301,9 +301,9 @@ "TzjXR3qBQ1P7f5x71yeuo7Zrj7B0G44Xjfy+1L0eka9paBqmm3U5cUew5wSr772L"); Assert.equal(pubKey.keyData.substr(-52), - "p1ovyC/fp5XjZaLHcyPAWAXKLBn4tb400iHp7byO85tF/H0OOI1K"); + "CvVFilhH8wwQ7WRSzqAhTp6i/N9KXUHOczdXf7ZtJ14nd8wqFA=="); - Assert.equal(pubKey.keyData.length, 2972); + Assert.equal(pubKey.keyData.length, 3020); @@ -368,11 +368,11 @@ EnigmailKeyRing.getAllKeys(); let pub = EnigmailKeyRing.extractKey(false, "0x781617319CE311C4", null, {}, {}).replace(/\r\n/g, "\n"); - Assert.equal(pub.substr(-50), "/H0OOI1K\n=CVNK\n-----END PGP PUBLIC KEY BLOCK-----\n"); + Assert.equal(pub.substr(-50), "d8wqFA==\n=Hflu\n-----END PGP PUBLIC KEY BLOCK-----\n"); let pubAndSec = EnigmailKeyRing.extractKey(true, "strike.devtest(a)gmail.com", null, {}, {}).replace(/\r\n/g, "\n"); Assert.equal(pubAndSec.substr(-37), "\n-----END PGP PRIVATE KEY BLOCK-----\n"); - Assert.equal(pubAndSec.split(/\n/).length, 159); + Assert.equal(pubAndSec.split(/\n/).length, 160); }))); @@ -674,9 +674,8 @@ const importResult = EnigmailKeyRing.importKeyFromFile(publicKey, errorMsgObj, importedKeysObj); Assert.assertContains(importedKeysObj.value, "CC68572FE740754B38D758D1227073A53A6FA857"); Assert.equal(importResult, 0, errorMsgObj); - const output = { - "alice(a)example.org": - "mQGNBFhoRoABDADJFyP60NvQWTE1e5+UVBy5jXyaRHsQrr5Zufoe3qcBC7eR27ngsdc2RhFY5PW/" + + const output = { + "alice(a)example.org": "mQGNBFhoRoABDADJFyP60NvQWTE1e5+UVBy5jXyaRHsQrr5Zufoe3qcBC7eR27ngsdc2RhFY5PW/" + "2gLtS7fnwHTXS5xGbUUnjEZHeI1YLAgojxVrl4roR9dUNCArkqeJ3A2qx/9fhjzLgehmQDJyTjTn" + "jTEoPsHizAmnnfuAQIrdiqwqyFRols+CVhb7rELUS4PsFTxX+p/w0UDiAHmPs0yXo6YZeFMW4xCL" + "Wng35jRAui0Bz1ImG6tttqJDaWxz/RYn+otLpqFWLGR3ohp13Mddm4fksVFWPcynFhoJrwRjUcmL" + @@ -729,8 +728,7 @@ "FEQwORk9HrbeImH/e2MvsGZ+UClLPHtBw9XsveIZ18Xk+8YgGbg5gaU5FlytWEyooKAplBbh5wzO" + "XKcnZrAxUr+ZjqC7YhskjettjoI3Y03C7LmjIocBpF9bGnO0YZvctnOwHxhAAOeP2dm+rgpUApHy" + "cBT1Hh+hwH0QlY6iafgVCG6gzwGk5uXjHe+wf71sjWhZ3mRi7E6CD9KkYHVMqW78", - "alice(a)example.net": - "mQGNBFhoRoABDADJFyP60NvQWTE1e5+UVBy5jXyaRHsQrr5Zufoe3qcBC7eR27ngsdc2RhFY5PW/" + + "alice(a)example.net": "mQGNBFhoRoABDADJFyP60NvQWTE1e5+UVBy5jXyaRHsQrr5Zufoe3qcBC7eR27ngsdc2RhFY5PW/" + "2gLtS7fnwHTXS5xGbUUnjEZHeI1YLAgojxVrl4roR9dUNCArkqeJ3A2qx/9fhjzLgehmQDJyTjTn" + "jTEoPsHizAmnnfuAQIrdiqwqyFRols+CVhb7rELUS4PsFTxX+p/w0UDiAHmPs0yXo6YZeFMW4xCL" + "Wng35jRAui0Bz1ImG6tttqJDaWxz/RYn+otLpqFWLGR3ohp13Mddm4fksVFWPcynFhoJrwRjUcmL" + @@ -791,10 +789,10 @@ Assert.equal(k.exitCode, 0); Assert.equal(k.errorMsg, ""); EnigmailLog.DEBUG(" -> address: " + address + - "\n -> wanted: " + output[address] + - "\n -> got: " + k.keyData + - "\n"); + "\n -> wanted: " + output[address] + + "\n -> got: " + k.keyData + + "\n"); Assert.equal(k.keyData, output[address]); } -})))); +})))); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/tests/resources/dev-strike.asc new/enigmail/package/tests/resources/dev-strike.asc --- old/enigmail/package/tests/resources/dev-strike.asc 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/tests/resources/dev-strike.asc 2019-05-19 18:47:45.000000000 +0200 @@ -1,5 +1,4 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Comment: GPGTools - https://gpgtools.org mQINBFVHm5sBEACs94Ln+RMdeyBpWQtTZ/NZnwntsB10Wd3HTgo5sdA/OOFOJrWe tJfAZ/HRxiSu1bwRaFVC8p061ftTbxf8bsdfsykYJQQqPODfcO0/oY2n/Z93ya8K @@ -12,41 +11,42 @@ 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 -LBn4tb400iHp7byO85tF/H0OOI1K -=CVNK +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 +J14nd8wqFA== +=Hflu -----END PGP PUBLIC KEY BLOCK----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/tests/resources/dev-strike.sec new/enigmail/package/tests/resources/dev-strike.sec --- old/enigmail/package/tests/resources/dev-strike.sec 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/tests/resources/dev-strike.sec 2019-05-19 18:47:45.000000000 +0200 @@ -1,7 +1,6 @@ -----BEGIN PGP PRIVATE KEY BLOCK----- -Comment: GPGTools - https://gpgtools.org -lQc+BFVHm5sBEACs94Ln+RMdeyBpWQtTZ/NZnwntsB10Wd3HTgo5sdA/OOFOJrWe +lQdGBFVHm5sBEACs94Ln+RMdeyBpWQtTZ/NZnwntsB10Wd3HTgo5sdA/OOFOJrWe tJfAZ/HRxiSu1bwRaFVC8p061ftTbxf8bsdfsykYJQQqPODfcO0/oY2n/Z93ya8K TzjXR3qBQ1P7f5x71yeuo7Zrj7B0G44Xjfy+1L0eka9paBqmm3U5cUew5wSr772L cflipWfncWXD2rBqgRfR339lRHd3Vwo7V8jje8rlP9msOuTMWCvQuQvpEkfIioXA @@ -12,96 +11,97 @@ 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 -=h0dN +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 +=HPTr -----END PGP PRIVATE KEY BLOCK----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/wkdLookup.jsm new/enigmail/package/wkdLookup.jsm --- old/enigmail/package/wkdLookup.jsm 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/package/wkdLookup.jsm 2019-05-19 18:47:45.000000000 +0200 @@ -16,6 +16,7 @@ const Ci = Components.interfaces; const Cu = Components.utils; +Cu.importGlobalProperties(["XMLHttpRequest"]); Cu.import("resource://gre/modules/Sqlite.jsm"); /* global Sqlite: false */ Cu.import("resource://enigmail/log.jsm"); /* global EnigmailLog: false*/ Cu.import("resource://enigmail/funcs.jsm"); /* global EnigmailFuncs: false*/ @@ -56,9 +57,9 @@ } Promise.all(emails.map( - function(mailAddr) { - return self.determineLastAttempt(mailAddr.trim().toLowerCase()); - })) + function(mailAddr) { + return self.determineLastAttempt(mailAddr.trim().toLowerCase()); + })) .then(function(checks) { let toCheck = []; @@ -68,8 +69,7 @@ if (checks[i]) { EnigmailLog.DEBUG("wkdLookup.jsm: findKeys: recheck " + emails[i] + "\n"); toCheck.push(emails[i]); - } - else { + } else { EnigmailLog.DEBUG("wkdLookup.jsm: findKeys: skip check " + emails[i] + "\n"); } } @@ -90,13 +90,11 @@ if (gotKeys.length > 0) { importDownloadedKeys(gotKeys); resolve(true); - } - else + } else resolve(false); }); - } - else { + } else { resolve(false); } @@ -142,45 +140,16 @@ }); }, - /** - * get the download URL for an email address for WKD or domain-specific locations - * - * @param {String} email: email address - * - * @return URL - */ - - getDownloadUrlFromEmail: async function(email) { - email = email.toLowerCase().trim(); - - let at = email.indexOf("@"); - - let domain = email.substr(at + 1); - let user = email.substr(0, at); - - var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Ci.nsIScriptableUnicodeConverter); - converter.charset = "UTF-8"; - var data = converter.convertToByteArray(user, {}); - - var ch = Components.classes["@mozilla.org/security/hash;1"].createInstance(Components.interfaces.nsICryptoHash); - ch.init(ch.SHA1); - ch.update(data, data.length); - let gotHash = ch.finish(false); - let encodedHash = EnigmailZBase32.encode(gotHash); - - let url = "https://" + domain + "/.well-known/openpgpkey/hu/" + encodedHash; - return url; - }, - - /** + /** * get the WKD URL for an email address * * @param email: String - email address + * @param advancedMethod: Boolean - use "advanced" method as specifed in draft 08 * * @return String: URL (or null if not possible) */ - getWkdUrlFromEmail: function(email) { + getWkdUrlFromEmail: function(email, advancedMethod) { email = email.toLowerCase().trim(); let at = email.indexOf("@"); @@ -197,53 +166,71 @@ let gotHash = ch.finish(false); let encodedHash = EnigmailZBase32.encode(gotHash); - let url = "https://" + domain + "/.well-known/openpgpkey/hu/" + encodedHash; + let url = ""; + + if (advancedMethod) { + url = "https://openpgpkey." + domain + "/.well-known/openpgpkey/" + domain + "/hu/" + encodedHash + "?l=" + escape(user); + } else { + url = "https://" + domain + "/.well-known/openpgpkey/hu/" + encodedHash + "?l=" + escape(user); + } return url; }, downloadWkdKey: async function(email) { - EnigmailLog.DEBUG("wkdLookup.jsm: downloadWkdKey(" + email + ")\n"); + EnigmailLog.DEBUG("wkdLookup.jsm: downloadKey(" + email + ")\n"); + + let keyData = await this.doWkdKeyDownload(email, true); - if (!window) { - let appShellSvc = Cc["@mozilla.org/appshell/appShellService;1"].getService(Ci.nsIAppShellService); - window = appShellSvc.hiddenDOMWindow; + if (!keyData) { + keyData = await this.doWkdKeyDownload(email, false); } - let url = await EnigmailWkdLookup.getDownloadUrlFromEmail(email); + return keyData; + }, - let hdrs = new window.Headers(); - hdrs.append('Authorization', 'Basic ' + btoa("no-user:")); - hdrs.append('Content-Type', 'application/octet-stream'); - - let myRequest = new window.Request(url, { - method: 'GET', - headers: hdrs, - mode: 'cors', - //redirect: 'error', - redirect: 'follow', - cache: 'default' - }); + doWkdKeyDownload: function(email, advancedMethod) { + EnigmailLog.DEBUG("wkdLookup.jsm: doWkdKeyDownload(" + email + ", " + advancedMethod + ")\n"); - let response; - try { - EnigmailLog.DEBUG("wkdLookup.jsm: downloadKey: requesting " + url + "\n"); - response = await window.fetch(myRequest); - if (!response.ok) { - return null; - } - } catch (ex) { - EnigmailLog.DEBUG("wkdLookup.jsm: downloadKey: error " + ex.toString() + "\n"); - return null; - } + return new Promise((resolve, reject) => { + let oReq = new XMLHttpRequest(); - try { - let keyData = EnigmailData.arrayBufferToString(await response.arrayBuffer()); - EnigmailLog.DEBUG("wkdLookup.jsm: downloadKey: got data for " + email + "\n"); - return keyData; - } catch (ex) { - EnigmailLog.DEBUG("wkdLookup.jsm: downloadKey: error " + ex.toString() + "\n"); - return null; - } + oReq.addEventListener("load", function _f() { + EnigmailLog.DEBUG("wkdLookup.jsm: doWkdKeyDownload: data for " + email + "\n"); + if (oReq.status !== 200) { + resolve(null); + } + else { + try { + let keyData = EnigmailData.arrayBufferToString(oReq.response); + resolve(keyData); + } catch (ex) { + EnigmailLog.DEBUG("wkdLookup.jsm: doWkdKeyDownload: error " + ex.toString() + "\n"); + resolve(null); + } + } + }); + + oReq.addEventListener("error", (e) => { + EnigmailLog.DEBUG("wkdLookup.jsm: doWkdKeyDownload: error for " + email + "\n"); + EnigmailLog.DEBUG(" got error: " + e + "\n"); + resolve(null); + }, + false); + + try { + let url = EnigmailWkdLookup.getWkdUrlFromEmail(email, advancedMethod); + EnigmailLog.DEBUG(`wkdLookup.jsm: doWkdKeyDownload: requesting ${url}\n`); + + oReq.overrideMimeType("application/octet-stream"); + oReq.responseType = "arraybuffer"; + oReq.open("GET", url, true); + oReq.setRequestHeader('Authorization', 'Basic ' + btoa("no-user:")); + + oReq.send(); + } catch (ex) { + EnigmailLog.DEBUG(" got error: " + ex.toString() + "\n"); + } + }); } }; @@ -263,8 +250,7 @@ EnigmailLog.DEBUG("wkdLookup.jsm: checkDatabaseStructure - success\n"); if (!exists) { return createAutoKeyLocateTable(connection); - } - else { + } else { return PromiseUtils.defer(); } }, @@ -344,4 +330,4 @@ } EnigmailKeyRing.importKey(null, false, keyData, "", {}, {}); -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailMessengerOverlay.js new/enigmail/ui/content/enigmailMessengerOverlay.js --- old/enigmail/ui/content/enigmailMessengerOverlay.js 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/ui/content/enigmailMessengerOverlay.js 2019-05-19 18:47:45.000000000 +0200 @@ -852,6 +852,13 @@ if (bodyElement.firstChild) { let node = bodyElement.firstChild; while (node) { + if (node.firstChild && + node.firstChild.nodeName == "LEGEND" && + node.firstChild.className == "mimeAttachmentHeaderName") { + // we reached the area where inline attachments are displayed + // --> don't try to decrypt displayed inline attachments + break; + } if (node.nodeName == "DIV") { foundIndex = node.textContent.indexOf(findStr); @@ -950,12 +957,10 @@ } } - // extract text preceeding and/or following armored block + // extract text following armored block var head = ""; var tail = ""; if (findStr) { - head = msgText.substring(0, msgText.indexOf(findStr)).replace(/^[\n\r\s]*/, ""); - head = head.replace(/[\n\r\s]*$/, ""); var endStart = msgText.indexOf("-----END PGP"); var nextLine = msgText.substring(endStart).search(/[\n\r]/); if (nextLine > 0) { @@ -1095,9 +1100,8 @@ if (!msgUriSpec || (displayedUriSpec == msgUriSpec)) { if (EnigmailPEPAdapter.usingPep() && pEpResult) { Enigmail.hdrView.displayPepStatus(pEpResult.rating, pEpResult.fpr, null, pEpResult.persons); - } - else { - if ((head.length > 0) || (tail.length > 0)) { + } else { + if (tail.length > 0) { statusFlags |= EnigmailConstants.PARTIALLY_PGP; } Enigmail.hdrView.updateHdrIcons(exitCode, statusFlags, keyIdObj.value, userIdObj.value, @@ -1216,20 +1220,11 @@ } var msgRfc822Text = ""; - if (head || tail) { - if (head) { - // print a warning if the signed or encrypted part doesn't start - // quite early in the message - let matches = head.match(/(\n)/g); - if (matches && matches.length > 10) { - msgRfc822Text = EnigmailData.convertFromUnicode(EnigmailLocale.getString("notePartEncrypted"), charset) + "\n\n"; - } - msgRfc822Text += head + "\n\n"; - } + if (tail) { msgRfc822Text += EnigmailData.convertFromUnicode(EnigmailLocale.getString("beginPgpPart"), charset) + "\n\n"; } msgRfc822Text += plainText; - if (head || tail) { + if (tail) { msgRfc822Text += "\n\n" + EnigmailData.convertFromUnicode(EnigmailLocale.getString("endPgpPart"), charset) + "\n\n" + tail; } @@ -1262,17 +1257,11 @@ while (node) { if (node.nodeName == "DIV") { - foundIndex = node.textContent.indexOf(findStr); - - if (foundIndex >= 0) { - if (node.textContent.indexOf(findStr + " LICENSE AUTHORIZATION") == foundIndex) - foundIndex = -1; - } - if (foundIndex >= 0) { - node.innerHTML = EnigmailFuncs.formatPlaintextMsg(EnigmailData.convertToUnicode(messageContent, charset)); - Enigmail.msg.movePEPsubject(); - return; - } + // for safety reasons, we replace the complete visible message with + // the decrypted or signed part (bug 983) + node.innerHTML = EnigmailFuncs.formatPlaintextMsg(EnigmailData.convertToUnicode(messageContent, charset)); + Enigmail.msg.movePEPsubject(); + return; } node = node.nextSibling; } @@ -1282,17 +1271,9 @@ foundIndex = -1; while (node) { if (node.nodeName == "PRE") { - foundIndex = node.textContent.indexOf(findStr); - - if (foundIndex >= 0) { - if (node.textContent.indexOf(findStr + " LICENSE AUTHORIZATION") == foundIndex) - foundIndex = -1; - } - if (foundIndex >= 0) { - node.innerHTML = EnigmailFuncs.formatPlaintextMsg(EnigmailData.convertToUnicode(messageContent, charset)); - Enigmail.msg.movePEPsubject(); - return; - } + node.innerHTML = EnigmailFuncs.formatPlaintextMsg(EnigmailData.convertToUnicode(messageContent, charset)); + Enigmail.msg.movePEPsubject(); + return; } node = node.nextSibling; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailMsgComposeOverlay.js new/enigmail/ui/content/enigmailMsgComposeOverlay.js --- old/enigmail/ui/content/enigmailMsgComposeOverlay.js 2019-03-24 13:09:35.000000000 +0100 +++ new/enigmail/ui/content/enigmailMsgComposeOverlay.js 2019-05-19 18:47:45.000000000 +0200 @@ -4775,7 +4775,7 @@ var beginIndex = beginIndexObj.value; var endIndex = endIndexObj.value; - var head = docText.substr(0, beginIndex); + const head = ""; var tail = docText.substr(endIndex + 1); var pgpBlock = docText.substr(beginIndex, endIndex - beginIndex + 1);

1 0

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

24 May '19

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2019-05-24 11:31:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Fri May 24 11:31:10 2019 rev:489 rq:704713 version:5.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2019-05-20 10:27:42.437929975 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.5148/dtb-aarch64.changes 2019-05-24 11:31:19.245407460 +0200 @@ -1,0 +2,246 @@ +Wed May 22 13:11:40 CEST 2019 - jslaby(a)suse.cz + +- Update config files. +- commit 0739fa4 + +------------------------------------------------------------------- +Wed May 22 09:23:31 CEST 2019 - jslaby(a)suse.cz + +- dm: make sure to obey max_io_len_target_boundary (bnc#1135868). +- commit 4be0add + +------------------------------------------------------------------- +Wed May 22 08:01:07 CEST 2019 - jslaby(a)suse.cz + +- Linux 5.1.4 (bnc#1012628). +- s390/mm: convert to the generic get_user_pages_fast code + (bnc#1012628). +- s390/mm: make the pxd_offset functions more robust + (bnc#1012628). +- libnvdimm/namespace: Fix label tracking error (bnc#1012628). +- powerpc/32s: fix flush_hash_pages() on SMP (bnc#1012628). +- xen/pvh: correctly setup the PV EFI interface for dom0 + (bnc#1012628). +- xen/pvh: set xen_domain_type to HVM in xen_pvh_init + (bnc#1012628). +- kbuild: turn auto.conf.cmd into a mandatory include file + (bnc#1012628). +- smb3: display session id in debug data (bnc#1012628). +- KVM: lapic: Busy wait for timer to expire when using hv_timer + (bnc#1012628). +- KVM: x86: Skip EFER vs. guest CPUID checks for host-initiated + writes (bnc#1012628). +- KVM: Fix the bitmap range to copy during clear dirty + (bnc#1012628). +- Revert "KVM: nVMX: Expose RDPMC-exiting only when guest supports + PMU" (bnc#1012628). +- jbd2: fix potential double free (bnc#1012628). +- ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal + microphone bug (bnc#1012628). +- ALSA: hda/realtek - Fixup headphone noise via runtime suspend + (bnc#1012628). +- ALSA: hda/realtek - Corrected fixup for System76 Gazelle + (gaze14) (bnc#1012628). +- ext4: avoid panic during forced reboot due to aborted journal + (bnc#1012628). +- ext4: fix use-after-free in dx_release() (bnc#1012628). +- ext4: fix data corruption caused by overlapping unaligned and + aligned IO (bnc#1012628). +- ext4: zero out the unused memory region in the extent tree block + (bnc#1012628). +- tty: Don't force RISCV SBI console as preferred console + (bnc#1012628). +- fs/writeback.c: use rcu_barrier() to wait for inflight wb + switches going into workqueue when umount (bnc#1012628). +- mm/compaction.c: correct zone boundary handling when isolating + pages from a pageblock (bnc#1012628). +- ARM: dts: imx: Fix the AR803X phy-mode (bnc#1012628). +- ipmi:ssif: compare block number correctly for multi-part return + messages (bnc#1012628). +- ipmi: Add the i2c-addr property for SSIF interfaces + (bnc#1012628). +- bcache: never set KEY_PTRS of journal key to 0 in + journal_reclaim() (bnc#1012628). +- bcache: fix a race between cache register and cacheset + unregister (bnc#1012628). +- Btrfs: fix race between send and deduplication that lead to + failures and crashes (bnc#1012628). +- Btrfs: do not start a transaction at iterate_extent_inodes() + (bnc#1012628). +- Btrfs: do not start a transaction during fiemap (bnc#1012628). +- Btrfs: send, flush dellaloc in order to avoid data loss + (bnc#1012628). +- btrfs: Honour FITRIM range constraints during free space trim + (bnc#1012628). +- btrfs: Correctly free extent buffer in case + btree_read_extent_buffer_pages fails (bnc#1012628). +- btrfs: Check the first key and level for cached extent buffer + (bnc#1012628). +- ext4: fix ext4_show_options for file systems w/o journal + (bnc#1012628). +- ext4: actually request zeroing of inode table after grow + (bnc#1012628). +- ext4: fix use-after-free race with debug_want_extra_isize + (bnc#1012628). +- ext4: avoid drop reference to iloc.bh twice (bnc#1012628). +- ext4: ignore e_value_offs for xattrs with value-in-ea-inode + (bnc#1012628). +- ext4: make sanity check in mballoc more strict (bnc#1012628). +- jbd2: check superblock mapped prior to committing (bnc#1012628). +- tty/vt: fix write/write race in ioctl(KDSKBSENT) handler + (bnc#1012628). +- tty: vt.c: Fix TIOCL_BLANKSCREEN console blanking if + blankinterval == 0 (bnc#1012628). +- mtd: maps: Allow MTD_PHYSMAP with MTD_RAM (bnc#1012628). +- mtd: maps: physmap: Store gpio_values correctly (bnc#1012628). +- mtd: spi-nor: intel-spi: Avoid crossing 4K address boundary + on read/write (bnc#1012628). +- mfd: max77620: Fix swapped FPS_PERIOD_MAX_US values + (bnc#1012628). +- mfd: da9063: Fix OTP control register names to match datasheets + for DA9063/63L (bnc#1012628). +- ACPICA: Linux: move ACPI_DEBUG_DEFAULT flag out of ifndef + (bnc#1012628). +- ACPI: PM: Set enable_for_wake for wakeup GPEs during + suspend-to-idle (bnc#1012628). +- userfaultfd: use RCU to free the task struct when fork fails + (bnc#1012628). +- ocfs2: fix ocfs2 read inode data panic in ocfs2_iget + (bnc#1012628). +- hugetlb: use same fault hash key for shared and private mappings + (bnc#1012628). +- mm/hugetlb.c: don't put_page in lock of hugetlb_lock + (bnc#1012628). +- mm/huge_memory: fix vmf_insert_pfn_{pmd, pud}() crash, handle + unaligned addresses (bnc#1012628). +- mm/mincore.c: make mincore() more conservative (bnc#1012628). +- crypto: ccree - handle tee fips error during power management + resume (bnc#1012628). +- crypto: ccree - add function to handle cryptocell tee fips error + (bnc#1012628). +- crypto: ccree - HOST_POWER_DOWN_EN should be the last CC access + during suspend (bnc#1012628). +- crypto: ccree - pm resume first enable the source clk + (bnc#1012628). +- crypto: ccree - don't map AEAD key and IV on stack + (bnc#1012628). +- crypto: ccree - use correct internal state sizes for export + (bnc#1012628). +- crypto: ccree - don't map MAC key on stack (bnc#1012628). +- crypto: ccree - fix mem leak on error path (bnc#1012628). +- crypto: ccree - remove special handling of chained sg + (bnc#1012628). +- bpf: fix out of bounds backwards jmps due to dead code removal + (bnc#1012628). +- bpf, arm64: remove prefetch insn in xadd mapping (bnc#1012628). +- ASoC: codec: hdac_hdmi add device_link to card device + (bnc#1012628). +- ASoC: fsl_esai: Fix missing break in switch statement + (bnc#1012628). +- ASoC: RT5677-SPI: Disable 16Bit SPI Transfers (bnc#1012628). +- ASoC: max98090: Fix restore of DAPM Muxes (bnc#1012628). +- ALSA: hdea/realtek - Headset fixup for System76 Gazelle (gaze14) + (bnc#1012628). +- ALSA: hda/realtek - EAPD turn on later (bnc#1012628). +- ALSA: hda/hdmi - Consider eld_valid when reporting jack event + (bnc#1012628). +- ALSA: hda/hdmi - Read the pin sense from register when repolling + (bnc#1012628). +- ALSA: usb-audio: Fix a memory leak bug (bnc#1012628). +- ALSA: line6: toneport: Fix broken usage of timer for delayed + execution (bnc#1012628). +- mmc: sdhci-pci: Fix BYT OCP setting (bnc#1012628). +- mmc: core: Fix tag set memory leak (bnc#1012628). +- mmc: tegra: fix ddr signaling for non-ddr modes (bnc#1012628). +- dt-bindings: mmc: Add disable-cqe-dcmd property (bnc#1012628). +- drivers/dax: Allow to include DEV_DAX_PMEM as builtin + (bnc#1012628). +- crypto: arm64/aes-neonbs - don't access already-freed walk.iv + (bnc#1012628). +- crypto: arm/aes-neonbs - don't access already-freed walk.iv + (bnc#1012628). +- crypto: caam/qi2 - generate hash keys in-place (bnc#1012628). +- crypto: caam/qi2 - fix DMA mapping of stack memory + (bnc#1012628). +- crypto: caam/qi2 - fix zero-length buffer DMA mapping + (bnc#1012628). +- crypto: rockchip - update IV buffer to contain the next IV + (bnc#1012628). +- crypto: gcm - fix incompatibility between "gcm" and "gcm_base" + (bnc#1012628). +- crypto: arm64/gcm-aes-ce - fix no-NEON fallback code + (bnc#1012628). +- crypto: x86/crct10dif-pcl - fix use via crypto_shash_digest() + (bnc#1012628). +- crypto: crct10dif-generic - fix use via crypto_shash_digest() + (bnc#1012628). +- crypto: skcipher - don't WARN on unprocessed data after slow + walk step (bnc#1012628). +- crypto: vmx - fix copy-paste error in CTR mode (bnc#1012628). +- crypto: ccp - Do not free psp_master when PLATFORM_INIT fails + (bnc#1012628). +- crypto: ccm - fix incompatibility between "ccm" and "ccm_base" + (bnc#1012628). +- crypto: chacha20poly1305 - set cra_name correctly (bnc#1012628). +- crypto: chacha-generic - fix use as arm64 no-NEON fallback + (bnc#1012628). +- crypto: lrw - don't access already-freed walk.iv (bnc#1012628). +- crypto: salsa20 - don't access already-freed walk.iv + (bnc#1012628). +- crypto: crypto4xx - fix cfb and ofb "overran dst buffer" issues + (bnc#1012628). +- crypto: crypto4xx - fix ctr-aes missing output IV (bnc#1012628). +- x86/MCE/AMD: Don't report L1 BTB MCA errors on some family + 17h models (bnc#1012628). +- x86/MCE: Add an MCE-record filtering function (bnc#1012628). +- sched/x86: Save [ER]FLAGS on context switch (bnc#1012628). +- arm64: Save and restore OSDLR_EL1 across suspend/resume ++++ 56 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.5148/dtb-aarch64.changes 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.OZaLZ6/_old 2019-05-24 11:31:29.713404764 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:29.733404758 +0200 @@ -17,7 +17,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:29.813404738 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:29.817404737 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %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-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 -Provides: kernel-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: kernel-%build_flavor-base-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 +Provides: kernel-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 # END COMMON DEPS -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 %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.OZaLZ6/_old 2019-05-24 11:31:29.833404733 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:29.837404732 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %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-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 -Provides: kernel-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: kernel-%build_flavor-base-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 +Provides: kernel-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 # END COMMON DEPS -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:29.857404726 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:29.861404725 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %define variant %{nil} %define vanilla_only 0 @@ -62,9 +62,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 5.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %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-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 -Provides: kernel-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: kernel-%build_flavor-base-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 +Provides: kernel-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 # END COMMON DEPS -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:29.885404719 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:29.889404718 +0200 @@ -17,7 +17,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 5.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %else Release: 0 %endif @@ -63,7 +63,7 @@ %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 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.OZaLZ6/_old 2019-05-24 11:31:29.917404711 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:29.925404709 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %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-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 -Provides: kernel-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: kernel-%build_flavor-base-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 +Provides: kernel-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 # END COMMON DEPS -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 %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.OZaLZ6/_old 2019-05-24 11:31:30.017404685 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:30.021404685 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 5.1.3 +%define patchversion 5.1.4 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +BuildRequires: kernel%kernel_flavor-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:30.053404676 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:30.065404673 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 5.1.3 +%define patchversion 5.1.4 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:30.109404662 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:30.117404660 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %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-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 -Provides: kernel-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: kernel-%build_flavor-base-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 +Provides: kernel-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 # END COMMON DEPS -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:30.161404648 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:30.165404647 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 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.OZaLZ6/_old 2019-05-24 11:31:30.217404634 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:30.221404633 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 5.1.3 +Version: 5.1.4 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %else Release: 0 %endif @@ -55,7 +55,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:30.241404628 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:30.249404625 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.1 -%define patchversion 5.1.3 +%define patchversion 5.1.4 %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.1.3 +Version: 5.1.4 %if 0%{?is_kotd} -Release: <RELEASE>.g07d2e25 +Release: <RELEASE>.g0739fa4 %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-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 -Provides: kernel-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: kernel-%build_flavor-base-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 +Provides: kernel-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 # END COMMON DEPS -Provides: %name-srchash-07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +Provides: %name-srchash-0739fa4bcf7a21941c7e28c52b33b0f531044868 %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 ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2019-05-14 10:37:17.000000000 +0200 +++ new/config/ppc64/default 2019-05-22 13:11:40.000000000 +0200 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.1.1 Kernel Configuration +# Linux/powerpc 5.1.2 Kernel Configuration # # -# Compiler: powerpc64-suse-linux-gcc (SUSE Linux) 8.3.1 20190226 [gcc-8-branch revision 269204] +# Compiler: gcc (SUSE Linux) 8.3.1 20190226 [gcc-8-branch revision 269204] # CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=80301 @@ -2032,62 +2032,7 @@ CONFIG_MISC_RTSX_USB=m CONFIG_HABANA_AI=m CONFIG_HAVE_IDE=y -CONFIG_IDE=y - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_IDE_TASK_IOCTL=y -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -# CONFIG_BLK_DEV_PLATFORM is not set -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_JMICRON is not set -# CONFIG_BLK_DEV_PIIX is not set -CONFIG_BLK_DEV_IT8172=m -# CONFIG_BLK_DEV_IT8213 is not set -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SL82C105 is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -# CONFIG_BLK_DEV_TC86C001 is not set -CONFIG_BLK_DEV_IDE_PMAC=y -CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/default new/config/ppc64le/default --- old/config/ppc64le/default 2019-05-14 10:37:17.000000000 +0200 +++ new/config/ppc64le/default 2019-05-22 13:11:40.000000000 +0200 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.1.1 Kernel Configuration +# Linux/powerpc 5.1.2 Kernel Configuration # # -# Compiler: powerpc64le-suse-linux-gcc (SUSE Linux) 8.3.1 20190226 [gcc-8-branch revision 269204] +# Compiler: gcc (SUSE Linux) 8.3.1 20190226 [gcc-8-branch revision 269204] # CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=80301 @@ -1938,59 +1938,7 @@ CONFIG_MISC_RTSX_USB=m CONFIG_HABANA_AI=m CONFIG_HAVE_IDE=y -CONFIG_IDE=y - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_IDE_TASK_IOCTL=y -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -# CONFIG_BLK_DEV_PLATFORM is not set -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_JMICRON is not set -# CONFIG_BLK_DEV_PIIX is not set -CONFIG_BLK_DEV_IT8172=m -# CONFIG_BLK_DEV_IT8213 is not set -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SL82C105 is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -# CONFIG_BLK_DEV_TC86C001 is not set -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default --- old/config/s390x/default 2019-05-14 10:37:17.000000000 +0200 +++ new/config/s390x/default 2019-05-22 13:11:40.000000000 +0200 @@ -615,6 +615,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MEMBLOCK_PHYS_MAP=y +CONFIG_HAVE_GENERIC_GUP=y CONFIG_MEMORY_ISOLATION=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_MEMORY_HOTPLUG=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/zfcpdump new/config/s390x/zfcpdump --- old/config/s390x/zfcpdump 2019-05-14 10:37:17.000000000 +0200 +++ new/config/s390x/zfcpdump 2019-05-22 13:11:40.000000000 +0200 @@ -504,6 +504,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MEMBLOCK_PHYS_MAP=y +CONFIG_HAVE_GENERIC_GUP=y CONFIG_MEMORY_ISOLATION=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set # CONFIG_MEMORY_HOTPLUG is not set ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 12045 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/TTY-serial_core-add-install.patch new/patches.suse/TTY-serial_core-add-install.patch --- old/patches.suse/TTY-serial_core-add-install.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/TTY-serial_core-add-install.patch 2019-05-22 11:07:33.000000000 +0200 @@ -0,0 +1,128 @@ +From: Jiri Slaby <jslaby(a)suse.cz> +Date: Wed, 17 Apr 2019 10:58:53 +0200 +Subject: TTY: serial_core, add ->install +Git-commit: 4cdd17ba1dff20ffc99fdbd2e6f0201fc7fe67df +Patch-mainline: v5.2-rc1 +References: bnc#1129693 + +We need to compute the uart state only on the first open. This is +usually what is done in the ->install hook. serial_core used to do this +in ->open on every open. So move it to ->install. + +As a side effect, it ensures the state is set properly in the window +after tty_init_dev is called, but before uart_open. This fixes a bunch +of races between tty_open and flush_to_ldisc we were dealing with +recently. + +One of such bugs was attempted to fix in commit fedb5760648a (serial: +fix race between flush_to_ldisc and tty_open), but it only took care of +a couple of functions (uart_start and uart_unthrottle). I was able to +reproduce the crash on a SLE system, but in uart_write_room which is +also called from flush_to_ldisc via process_echoes. I was *unable* to +reproduce the bug locally. It is due to having this patch in my queue +since 2012! + + general protection fault: 0000 [#1] SMP KASAN PTI + CPU: 1 PID: 5 Comm: kworker/u4:0 Tainted: G L 4.12.14-396-default #1 SLE15-SP1 (unreleased) + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c89-prebuilt.qemu.org 04/01/2014 + Workqueue: events_unbound flush_to_ldisc + task: ffff8800427d8040 task.stack: ffff8800427f0000 + RIP: 0010:uart_write_room+0xc4/0x590 + RSP: 0018:ffff8800427f7088 EFLAGS: 00010202 + RAX: dffffc0000000000 RBX: 0000000000000000 RCX: 0000000000000000 + RDX: 000000000000002f RSI: 00000000000000ee RDI: ffff88003888bd90 + RBP: ffffffffb9545850 R08: 0000000000000001 R09: 0000000000000400 + R10: ffff8800427d825c R11: 000000000000006e R12: 1ffff100084fee12 + R13: ffffc900004c5000 R14: ffff88003888bb28 R15: 0000000000000178 + FS: 0000000000000000(0000) GS:ffff880043300000(0000) knlGS:0000000000000000 + CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + CR2: 0000561da0794148 CR3: 000000000ebf4000 CR4: 00000000000006e0 + Call Trace: + tty_write_room+0x6d/0xc0 + __process_echoes+0x55/0x870 + n_tty_receive_buf_common+0x105e/0x26d0 + tty_ldisc_receive_buf+0xb7/0x1c0 + tty_port_default_receive_buf+0x107/0x180 + flush_to_ldisc+0x35d/0x5c0 +... + +0 in rbx means tty->driver_data is NULL in uart_write_room. 0x178 is +tried to be dereferenced (0x178 >> 3 is 0x2f in rdx) at +uart_write_room+0xc4. 0x178 is exactly (struct uart_state *)NULL->refcount +used in uart_port_lock from uart_write_room. + +So revert the upstream commit here as my local patch should fix the +whole family. + +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +Cc: Li RongQing <lirongqing(a)baidu.com> +Cc: Wang Li <wangli39(a)baidu.com> +Cc: Zhang Yu <zhangyu31(a)baidu.com> +Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> +Cc: stable <stable(a)vger.kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> +--- + drivers/tty/serial/serial_core.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +--- a/drivers/tty/serial/serial_core.c ++++ b/drivers/tty/serial/serial_core.c +@@ -130,9 +130,6 @@ static void uart_start(struct tty_struct + struct uart_port *port; + unsigned long flags; + +- if (!state) +- return; +- + port = uart_port_lock(state, flags); + __uart_start(tty); + uart_port_unlock(port, flags); +@@ -730,9 +727,6 @@ static void uart_unthrottle(struct tty_s + upstat_t mask = UPSTAT_SYNC_FIFO; + struct uart_port *port; + +- if (!state) +- return; +- + port = uart_port_ref(state); + if (!port) + return; +@@ -1747,6 +1741,16 @@ static void uart_dtr_rts(struct tty_port + uart_port_deref(uport); + } + ++static int uart_install(struct tty_driver *driver, struct tty_struct *tty) ++{ ++ struct uart_driver *drv = driver->driver_state; ++ struct uart_state *state = drv->state + tty->index; ++ ++ tty->driver_data = state; ++ ++ return tty_standard_install(driver, tty); ++} ++ + /* + * Calls to uart_open are serialised by the tty_lock in + * drivers/tty/tty_io.c:tty_open() +@@ -1759,11 +1763,8 @@ static void uart_dtr_rts(struct tty_port + */ + static int uart_open(struct tty_struct *tty, struct file *filp) + { +- struct uart_driver *drv = tty->driver->driver_state; +- int retval, line = tty->index; +- struct uart_state *state = drv->state + line; +- +- tty->driver_data = state; ++ struct uart_state *state = tty->driver_data; ++ int retval; + + retval = tty_port_open(&state->port, tty, filp); + if (retval > 0) +@@ -2448,6 +2449,7 @@ static void uart_poll_put_char(struct tt + #endif + + static const struct tty_operations uart_ops = { ++ .install = uart_install, + .open = uart_open, + .close = uart_close, + .write = uart_write, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/dm-make-sure-to-obey-max_io_len_target_boundary.patch new/patches.suse/dm-make-sure-to-obey-max_io_len_target_boundary.patch --- old/patches.suse/dm-make-sure-to-obey-max_io_len_target_boundary.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/dm-make-sure-to-obey-max_io_len_target_boundary.patch 2019-05-22 11:07:33.000000000 +0200 @@ -0,0 +1,47 @@ +From: Michael Lass <bevan(a)bi-co.net> +Date: Tue, 21 May 2019 21:58:07 +0200 +Subject: dm: make sure to obey max_io_len_target_boundary +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#fo… +Git-commit: 51b86f9a8d1c4bb4e3862ee4b4c5f46072f7520d +Patch-mainline: Queued in subsystem maintainer repository +References: bnc#1135868 + +Commit 61697a6abd24 ("dm: eliminate 'split_discard_bios' flag from DM +target interface") incorrectly removed code from +__send_changing_extent_only() that is required to impose a per-target IO +boundary on IO that exceeds max_io_len_target_boundary(). Otherwise +"special" IO (e.g. DISCARD, WRITE SAME, WRITE ZEROES) can write beyond +where allowed. + +Fix this by restoring the max_io_len_target_boundary() limit in +__send_changing_extent_only() + +Fixes: 61697a6abd24 ("dm: eliminate 'split_discard_bios' flag from DM target interface") +Cc: stable(a)vger.kernel.org # 5.1+ +Signed-off-by: Michael Lass <bevan(a)bi-co.net> +Signed-off-by: Mike Snitzer <snitzer(a)redhat.com> +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +--- + drivers/md/dm.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c +@@ -1483,7 +1483,7 @@ static unsigned get_num_write_zeroes_bio + static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *ti, + unsigned num_bios) + { +- unsigned len = ci->sector_count; ++ unsigned len; + + /* + * Even though the device advertised support for this type of +@@ -1494,6 +1494,8 @@ static int __send_changing_extent_only(s + if (!num_bios) + return -EOPNOTSUPP; + ++ len = min((sector_t)ci->sector_count, max_io_len_target_boundary(ci->sector, ti)); ++ + __send_duplicate_bios(ci, ti, num_bios, &len); + + ci->sector += len; 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 2019-05-17 06:54:29.000000000 +0200 +++ new/patches.suse/memcg-make-it-work-on-sparse-non-0-node-systems.patch 2019-05-22 11:07:33.000000000 +0200 @@ -1,7 +1,7 @@ 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 +Patch-mainline: submitted on 2019/05/17 References: bnc#1133616 We have a single node system with node 0 disabled: @@ -36,21 +36,36 @@ 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. +So fix this by avoiding checks on node 0. Remember the memcg-awareness +by a bool flag in struct list_lru. 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> +Suggested-by: Vladimir Davydov <vdavydov.dev(a)gmail.com> +Acked-by: 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(-) - + include/linux/list_lru.h | 1 + + mm/list_lru.c | 8 +++----- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h +index aa5efd9351eb..d5ceb2839a2d 100644 +--- a/include/linux/list_lru.h ++++ b/include/linux/list_lru.h +@@ -54,6 +54,7 @@ struct list_lru { + #ifdef CONFIG_MEMCG_KMEM + struct list_head list; + int shrinker_id; ++ bool memcg_aware; + #endif + }; + diff --git a/mm/list_lru.c b/mm/list_lru.c -index 0730bf8ff39f..7689910f1a91 100644 +index 0730bf8ff39f..d3b538146efd 100644 --- a/mm/list_lru.c +++ b/mm/list_lru.c @@ -37,11 +37,7 @@ static int lru_shrinker_id(struct list_lru *lru) @@ -62,10 +77,19 @@ - * in the systems supporting sparse numa ids. - */ - return !!lru->node[0].memcg_lrus; -+ return !!lru->node[first_online_node].memcg_lrus; ++ return lru->memcg_aware; } static inline struct list_lru_one * +@@ -451,6 +447,8 @@ static int memcg_init_list_lru(struct list_lru *lru, bool memcg_aware) + { + int i; + ++ lru->memcg_aware = memcg_aware; ++ + if (!memcg_aware) + return 0; + -- 2.21.0 ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:31.861404210 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:31.861404210 +0200 @@ -130,6 +130,132 @@ patches.kernel.org/5.1.3-042-PCI-hv-Add-pci_destroy_slot-in-pci_devices_pre… patches.kernel.org/5.1.3-043-f2fs-Fix-use-of-number-of-devices.patch patches.kernel.org/5.1.3-044-Linux-5.1.3.patch + patches.kernel.org/5.1.4-001-locking-rwsem-Prevent-decrement-of-reader-coun… + patches.kernel.org/5.1.4-002-x86-speculation-mds-Revert-CPU-buffer-clear-on… + patches.kernel.org/5.1.4-003-x86-speculation-mds-Improve-CPU-buffer-clear-d… + patches.kernel.org/5.1.4-004-objtool-Fix-function-fallthrough-detection.pat… + patches.kernel.org/5.1.4-005-arm64-dts-rockchip-fix-IO-domain-voltage-setti… + patches.kernel.org/5.1.4-006-arm64-dts-rockchip-Disable-DCMDs-on-RK3399-s-e… + patches.kernel.org/5.1.4-007-ARM-dts-qcom-ipq4019-enlarge-PCIe-BAR-range.pa… + patches.kernel.org/5.1.4-008-ARM-dts-exynos-Fix-interrupt-for-shared-EINTs-… + patches.kernel.org/5.1.4-009-ARM-dts-exynos-Fix-audio-routing-on-Odroid-XU3… + patches.kernel.org/5.1.4-010-ARM-dts-exynos-Fix-audio-microphone-routing-on… + patches.kernel.org/5.1.4-011-mmc-sdhci-of-arasan-Add-DTS-property-to-disabl… + patches.kernel.org/5.1.4-012-ARM-exynos-Fix-a-leaked-reference-by-adding-mi… + patches.kernel.org/5.1.4-013-power-supply-axp288_charger-Fix-unchecked-retu… + patches.kernel.org/5.1.4-014-power-supply-axp288_fuel_gauge-Add-ACEPC-T8-an… + patches.kernel.org/5.1.4-015-arm64-mmap-Ensure-file-offset-is-treated-as-un… + patches.kernel.org/5.1.4-016-arm64-arch_timer-Ensure-counter-register-reads… + patches.kernel.org/5.1.4-017-arm64-compat-Reduce-address-limit.patch + patches.kernel.org/5.1.4-018-arm64-Clear-OSDLR_EL1-on-CPU-boot.patch + patches.kernel.org/5.1.4-019-arm64-Save-and-restore-OSDLR_EL1-across-suspen… + patches.kernel.org/5.1.4-020-sched-x86-Save-ER-FLAGS-on-context-switch.patch + patches.kernel.org/5.1.4-021-x86-MCE-Add-an-MCE-record-filtering-function.p… + patches.kernel.org/5.1.4-022-x86-MCE-AMD-Don-t-report-L1-BTB-MCA-errors-on-… + patches.kernel.org/5.1.4-023-crypto-crypto4xx-fix-ctr-aes-missing-output-IV… + patches.kernel.org/5.1.4-024-crypto-crypto4xx-fix-cfb-and-ofb-overran-dst-b… + patches.kernel.org/5.1.4-025-crypto-salsa20-don-t-access-already-freed-walk… + patches.kernel.org/5.1.4-026-crypto-lrw-don-t-access-already-freed-walk.iv.… + patches.kernel.org/5.1.4-027-crypto-chacha-generic-fix-use-as-arm64-no-NEON… + patches.kernel.org/5.1.4-028-crypto-chacha20poly1305-set-cra_name-correctly… + patches.kernel.org/5.1.4-029-crypto-ccm-fix-incompatibility-between-ccm-and… + patches.kernel.org/5.1.4-030-crypto-ccp-Do-not-free-psp_master-when-PLATFOR… + patches.kernel.org/5.1.4-031-crypto-vmx-fix-copy-paste-error-in-CTR-mode.pa… + patches.kernel.org/5.1.4-032-crypto-skcipher-don-t-WARN-on-unprocessed-data… + patches.kernel.org/5.1.4-033-crypto-crct10dif-generic-fix-use-via-crypto_sh… + patches.kernel.org/5.1.4-034-crypto-x86-crct10dif-pcl-fix-use-via-crypto_sh… + patches.kernel.org/5.1.4-035-crypto-arm64-gcm-aes-ce-fix-no-NEON-fallback-c… + patches.kernel.org/5.1.4-036-crypto-gcm-fix-incompatibility-between-gcm-and… + patches.kernel.org/5.1.4-037-crypto-rockchip-update-IV-buffer-to-contain-th… + patches.kernel.org/5.1.4-038-crypto-caam-qi2-fix-zero-length-buffer-DMA-map… + patches.kernel.org/5.1.4-039-crypto-caam-qi2-fix-DMA-mapping-of-stack-memor… + patches.kernel.org/5.1.4-040-crypto-caam-qi2-generate-hash-keys-in-place.pa… + patches.kernel.org/5.1.4-041-crypto-arm-aes-neonbs-don-t-access-already-fre… + patches.kernel.org/5.1.4-042-crypto-arm64-aes-neonbs-don-t-access-already-f… + patches.kernel.org/5.1.4-043-drivers-dax-Allow-to-include-DEV_DAX_PMEM-as-b… + patches.kernel.org/5.1.4-044-dt-bindings-mmc-Add-disable-cqe-dcmd-property.… + patches.kernel.org/5.1.4-045-mmc-tegra-fix-ddr-signaling-for-non-ddr-modes.… + patches.kernel.org/5.1.4-046-mmc-core-Fix-tag-set-memory-leak.patch + patches.kernel.org/5.1.4-047-mmc-sdhci-pci-Fix-BYT-OCP-setting.patch + patches.kernel.org/5.1.4-048-ALSA-line6-toneport-Fix-broken-usage-of-timer-… + patches.kernel.org/5.1.4-049-ALSA-usb-audio-Fix-a-memory-leak-bug.patch + patches.kernel.org/5.1.4-050-ALSA-hda-hdmi-Read-the-pin-sense-from-register… + patches.kernel.org/5.1.4-051-ALSA-hda-hdmi-Consider-eld_valid-when-reportin… + patches.kernel.org/5.1.4-052-ALSA-hda-realtek-EAPD-turn-on-later.patch + patches.kernel.org/5.1.4-053-ALSA-hdea-realtek-Headset-fixup-for-System76-G… + patches.kernel.org/5.1.4-054-ASoC-max98090-Fix-restore-of-DAPM-Muxes.patch + patches.kernel.org/5.1.4-055-ASoC-RT5677-SPI-Disable-16Bit-SPI-Transfers.pa… + patches.kernel.org/5.1.4-056-ASoC-fsl_esai-Fix-missing-break-in-switch-stat… + patches.kernel.org/5.1.4-057-ASoC-codec-hdac_hdmi-add-device_link-to-card-d… + patches.kernel.org/5.1.4-058-bpf-arm64-remove-prefetch-insn-in-xadd-mapping… + patches.kernel.org/5.1.4-059-bpf-fix-out-of-bounds-backwards-jmps-due-to-de… + patches.kernel.org/5.1.4-060-crypto-ccree-remove-special-handling-of-chaine… + patches.kernel.org/5.1.4-061-crypto-ccree-fix-mem-leak-on-error-path.patch + patches.kernel.org/5.1.4-062-crypto-ccree-don-t-map-MAC-key-on-stack.patch + patches.kernel.org/5.1.4-063-crypto-ccree-use-correct-internal-state-sizes-… + patches.kernel.org/5.1.4-064-crypto-ccree-don-t-map-AEAD-key-and-IV-on-stac… + patches.kernel.org/5.1.4-065-crypto-ccree-pm-resume-first-enable-the-source… + patches.kernel.org/5.1.4-066-crypto-ccree-HOST_POWER_DOWN_EN-should-be-the-… + patches.kernel.org/5.1.4-067-crypto-ccree-add-function-to-handle-cryptocell… + patches.kernel.org/5.1.4-068-crypto-ccree-handle-tee-fips-error-during-powe… + patches.kernel.org/5.1.4-069-mm-mincore.c-make-mincore-more-conservative.pa… + patches.kernel.org/5.1.4-070-mm-huge_memory-fix-vmf_insert_pfn_-pmd-pud-cra… + patches.kernel.org/5.1.4-071-mm-hugetlb.c-don-t-put_page-in-lock-of-hugetlb… + patches.kernel.org/5.1.4-072-hugetlb-use-same-fault-hash-key-for-shared-and… + patches.kernel.org/5.1.4-073-ocfs2-fix-ocfs2-read-inode-data-panic-in-ocfs2… + patches.kernel.org/5.1.4-074-userfaultfd-use-RCU-to-free-the-task-struct-wh… + patches.kernel.org/5.1.4-075-ACPI-PM-Set-enable_for_wake-for-wakeup-GPEs-du… + patches.kernel.org/5.1.4-076-ACPICA-Linux-move-ACPI_DEBUG_DEFAULT-flag-out-… + patches.kernel.org/5.1.4-077-mfd-da9063-Fix-OTP-control-register-names-to-m… + patches.kernel.org/5.1.4-078-mfd-max77620-Fix-swapped-FPS_PERIOD_MAX_US-val… + patches.kernel.org/5.1.4-079-mtd-spi-nor-intel-spi-Avoid-crossing-4K-addres… + patches.kernel.org/5.1.4-080-mtd-maps-physmap-Store-gpio_values-correctly.p… + patches.kernel.org/5.1.4-081-mtd-maps-Allow-MTD_PHYSMAP-with-MTD_RAM.patch + patches.kernel.org/5.1.4-082-tty-vt.c-Fix-TIOCL_BLANKSCREEN-console-blankin… + patches.kernel.org/5.1.4-083-tty-vt-fix-write-write-race-in-ioctl-KDSKBSENT… + patches.kernel.org/5.1.4-084-jbd2-check-superblock-mapped-prior-to-committi… + patches.kernel.org/5.1.4-085-ext4-make-sanity-check-in-mballoc-more-strict.… + patches.kernel.org/5.1.4-086-ext4-ignore-e_value_offs-for-xattrs-with-value… + patches.kernel.org/5.1.4-087-ext4-avoid-drop-reference-to-iloc.bh-twice.pat… + patches.kernel.org/5.1.4-088-ext4-fix-use-after-free-race-with-debug_want_e… + patches.kernel.org/5.1.4-089-ext4-actually-request-zeroing-of-inode-table-a… + patches.kernel.org/5.1.4-090-ext4-fix-ext4_show_options-for-file-systems-w-… + patches.kernel.org/5.1.4-091-btrfs-Check-the-first-key-and-level-for-cached… + patches.kernel.org/5.1.4-092-btrfs-Correctly-free-extent-buffer-in-case-btr… + patches.kernel.org/5.1.4-093-btrfs-Honour-FITRIM-range-constraints-during-f… + patches.kernel.org/5.1.4-094-Btrfs-send-flush-dellaloc-in-order-to-avoid-da… + patches.kernel.org/5.1.4-095-Btrfs-do-not-start-a-transaction-during-fiemap… + patches.kernel.org/5.1.4-096-Btrfs-do-not-start-a-transaction-at-iterate_ex… + patches.kernel.org/5.1.4-097-Btrfs-fix-race-between-send-and-deduplication-… + patches.kernel.org/5.1.4-098-bcache-fix-a-race-between-cache-register-and-c… + patches.kernel.org/5.1.4-099-bcache-never-set-KEY_PTRS-of-journal-key-to-0-… + patches.kernel.org/5.1.4-100-ipmi-Add-the-i2c-addr-property-for-SSIF-interf… + patches.kernel.org/5.1.4-101-ipmi-ssif-compare-block-number-correctly-for-m… + patches.kernel.org/5.1.4-102-ARM-dts-imx-Fix-the-AR803X-phy-mode.patch + patches.kernel.org/5.1.4-103-mm-compaction.c-correct-zone-boundary-handling… + patches.kernel.org/5.1.4-104-fs-writeback.c-use-rcu_barrier-to-wait-for-inf… + patches.kernel.org/5.1.4-105-tty-Don-t-force-RISCV-SBI-console-as-preferred… + patches.kernel.org/5.1.4-106-ext4-zero-out-the-unused-memory-region-in-the-… + patches.kernel.org/5.1.4-107-ext4-fix-data-corruption-caused-by-overlapping… + patches.kernel.org/5.1.4-108-ext4-fix-use-after-free-in-dx_release.patch + patches.kernel.org/5.1.4-109-ext4-avoid-panic-during-forced-reboot-due-to-a… + patches.kernel.org/5.1.4-110-ALSA-hda-realtek-Corrected-fixup-for-System76-… + patches.kernel.org/5.1.4-111-ALSA-hda-realtek-Fixup-headphone-noise-via-run… + patches.kernel.org/5.1.4-112-ALSA-hda-realtek-Fix-for-Lenovo-B50-70-inverte… + patches.kernel.org/5.1.4-113-jbd2-fix-potential-double-free.patch + patches.kernel.org/5.1.4-114-Revert-KVM-nVMX-Expose-RDPMC-exiting-only-when… + patches.kernel.org/5.1.4-115-KVM-Fix-the-bitmap-range-to-copy-during-clear-… + patches.kernel.org/5.1.4-116-KVM-x86-Skip-EFER-vs.-guest-CPUID-checks-for-h… + patches.kernel.org/5.1.4-117-KVM-lapic-Busy-wait-for-timer-to-expire-when-u… + patches.kernel.org/5.1.4-118-smb3-display-session-id-in-debug-data.patch + patches.kernel.org/5.1.4-119-kbuild-turn-auto.conf.cmd-into-a-mandatory-inc… + patches.kernel.org/5.1.4-120-xen-pvh-set-xen_domain_type-to-HVM-in-xen_pvh_… + patches.kernel.org/5.1.4-121-xen-pvh-correctly-setup-the-PV-EFI-interface-f… + patches.kernel.org/5.1.4-122-powerpc-32s-fix-flush_hash_pages-on-SMP.patch + patches.kernel.org/5.1.4-123-libnvdimm-namespace-Fix-label-tracking-error.p… + patches.kernel.org/5.1.4-124-s390-mm-make-the-pxd_offset-functions-more-rob… + patches.kernel.org/5.1.4-125-s390-mm-convert-to-the-generic-get_user_pages_… + patches.kernel.org/5.1.4-126-Linux-5.1.4.patch ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -437,6 +563,7 @@ ######################################################## # Char / serial ######################################################## + patches.suse/TTY-serial_core-add-install.patch ######################################################## # Other driver fixes @@ -457,6 +584,7 @@ patches.suse/dm-mpath-leastpending-path-update patches.suse/dm-table-switch-to-readonly patches.suse/dm-mpath-no-partitions-feature + patches.suse/dm-make-sure-to-obey-max_io_len_target_boundary.patch ######################################################## # md ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.OZaLZ6/_old 2019-05-24 11:31:31.901404200 +0200 +++ /var/tmp/diff_new_pack.OZaLZ6/_new 2019-05-24 11:31:31.909404198 +0200 @@ -1,3 +1,3 @@ -2019-05-17 04:54:29 +0000 -GIT Revision: 07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 +2019-05-22 11:11:40 +0000 +GIT Revision: 0739fa4bcf7a21941c7e28c52b33b0f531044868 GIT Branch: stable

1 0

commit python-jsbeautifier for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package python-jsbeautifier for openSUSE:Factory checked in at 2019-05-24 11:31:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jsbeautifier (Old) and /work/SRC/openSUSE:Factory/.python-jsbeautifier.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jsbeautifier" Fri May 24 11:31:06 2019 rev:3 rq:704824 version:1.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jsbeautifier/python-jsbeautifier.changes 2018-12-24 11:38:38.953598140 +0100 +++ /work/SRC/openSUSE:Factory/.python-jsbeautifier.new.5148/python-jsbeautifier.changes 2019-05-24 11:31:10.821409629 +0200 @@ -1,0 +2,10 @@ +Wed May 22 14:13:04 UTC 2019 - pgajdos(a)suse.com + +- version update to 1.10.0 + * lot of releases, lot of changes, see + https://github.com/beautify-web/js-beautify/blob/master/CHANGELOG.md +- added sources + https://github.com/beautify-web/js-beautify/issues/1674 + + LICENSE + +------------------------------------------------------------------- Old: ---- jsbeautifier-1.6.14.tar.gz New: ---- LICENSE jsbeautifier-1.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jsbeautifier.spec ++++++ --- /var/tmp/diff_new_pack.5jBlZG/_old 2019-05-24 11:31:11.473409461 +0200 +++ /var/tmp/diff_new_pack.5jBlZG/_new 2019-05-24 11:31:11.477409461 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jsbeautifier # -# 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,24 +17,26 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without test Name: python-jsbeautifier -Version: 1.6.14 +Version: 1.10.0 Release: 0 Summary: JavaScript unobfuscator and beautifier License: MIT Group: Development/Languages/Python Url: http://jsbeautifier.org -Source: https://files.pythonhosted.org/packages/source/j/jsbeautifier/jsbeautifier-… +Source0: https://files.pythonhosted.org/packages/source/j/jsbeautifier/jsbeautifier-… +# https://github.com/beautify-web/js-beautify/issues/1674 +Source1: https://raw.githubusercontent.com/beautify-web/js-beautify/master/LICENSE BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros -%if %{with test} +# SECTION test requirements BuildRequires: %{python_module EditorConfig >= 0.12.0} BuildRequires: %{python_module pytest} BuildRequires: %{python_module six >= 1.6.1} -%endif +# /SECTION BuildRequires: fdupes Requires: python-EditorConfig >= 0.12.0 +Requires: python-setuptools Requires: python-six >= 1.6.1 BuildArch: noarch @@ -45,28 +47,21 @@ %prep %setup -q -n jsbeautifier-%{version} +cp %{SOURCE1} . %build %python_build %install %python_install -%{python_expand chmod a+x %{buildroot}%{$python_sitelib}/jsbeautifier/tests/test-perf-jsbeautifier.py -chmod a+x %{buildroot}%{$python_sitelib}/jsbeautifier/tests/generated/tests.py -sed -i "s|^#!/usr/bin/env python$|#!%__$python|" %{buildroot}%{$python_sitelib}/jsbeautifier/tests/test-perf-jsbeautifier.py -sed -i "s|^#!/usr/bin/env python$|#!%__$python|" %{buildroot}%{$python_sitelib}/jsbeautifier/tests/generated/tests.py -$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jsbeautifier/tests/ -$python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jsbeautifier/tests/ -%fdupes %{buildroot}%{$python_sitelib} -} +%{python_expand %fdupes %{buildroot}%{$python_sitelib}} -%if %{with test} %check %python_exec setup.py test -%endif %files %{python_files} %defattr(-,root,root,-) +%license LICENSE %python3_only %{_bindir}/js-beautify %{python_sitelib}/jsbeautifier %{python_sitelib}/jsbeautifier-%{version}-py*.egg-info ++++++ LICENSE ++++++ The MIT License (MIT) Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++++++ jsbeautifier-1.6.14.tar.gz -> jsbeautifier-1.10.0.tar.gz ++++++ ++++ 12566 lines of diff (skipped)

1 0

commit python-validators for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package python-validators for openSUSE:Factory checked in at 2019-05-24 11:31:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-validators (Old) and /work/SRC/openSUSE:Factory/.python-validators.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-validators" Fri May 24 11:31:01 2019 rev:5 rq:704822 version:0.12.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-validators/python-validators.changes 2019-04-17 10:10:38.626931699 +0200 +++ /work/SRC/openSUSE:Factory/.python-validators.new.5148/python-validators.changes 2019-05-24 11:31:02.497411774 +0200 @@ -1,0 +2,6 @@ +Wed May 22 15:16:16 UTC 2019 - pgajdos(a)suse.com + +- version update to 0.12.6 + * Fixed domain validator for single character domains + +------------------------------------------------------------------- Old: ---- validators-0.12.5.tar.gz New: ---- validators-0.12.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-validators.spec ++++++ --- /var/tmp/diff_new_pack.Fq4Zxi/_old 2019-05-24 11:31:03.369411549 +0200 +++ /var/tmp/diff_new_pack.Fq4Zxi/_new 2019-05-24 11:31:03.373411548 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-validators -Version: 0.12.5 +Version: 0.12.6 Release: 0 Summary: Python Data Validation License: MIT @@ -54,7 +54,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_expand py.test-%{$python_bin_suffix} +%pytest %files %{python_files} %doc CHANGES.rst README.rst ++++++ validators-0.12.5.tar.gz -> validators-0.12.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/validators-0.12.5/CHANGES.rst new/validators-0.12.6/CHANGES.rst --- old/validators-0.12.5/CHANGES.rst 2019-04-15 13:22:27.000000000 +0200 +++ new/validators-0.12.6/CHANGES.rst 2019-05-08 08:47:31.000000000 +0200 @@ -2,6 +2,12 @@ --------- +0.12.6 (2019-05-08) +^^^^^^^^^^^^^^^^^^^ + +- Fixed domain validator for single character domains (#118, pull request courtesy kingbuzzman) + + 0.12.5 (2019-04-15) ^^^^^^^^^^^^^^^^^^^ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/validators-0.12.5/PKG-INFO new/validators-0.12.6/PKG-INFO --- old/validators-0.12.5/PKG-INFO 2019-04-15 13:28:25.000000000 +0200 +++ new/validators-0.12.6/PKG-INFO 2019-05-08 08:49:11.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: validators -Version: 0.12.5 +Version: 0.12.6 Summary: Python Data Validation for Humans™. Home-page: https://github.com/kvesteri/validators Author: Konsta Vesterinen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/validators-0.12.5/tests/test_domain.py new/validators-0.12.6/tests/test_domain.py --- old/validators-0.12.5/tests/test_domain.py 2018-06-03 12:00:00.000000000 +0200 +++ new/validators-0.12.6/tests/test_domain.py 2019-05-08 08:46:23.000000000 +0200 @@ -10,6 +10,9 @@ 'underscore_subdomain.example.com', 'something.versicherung', '11.com', + '3.cn', + 'a.cn', + 'sub1.sub2.sample.co.uk', 'somerandomexample.xn--fiqs8s' ]) def test_returns_true_on_valid_domain(value): @@ -22,6 +25,9 @@ 'example.-com', 'example.', '-example.com', + 'example-.com', + '_example.com', + 'example_.com', 'example', 'a......b.com' ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/validators-0.12.5/validators/__init__.py new/validators-0.12.6/validators/__init__.py --- old/validators-0.12.5/validators/__init__.py 2019-04-15 13:22:37.000000000 +0200 +++ new/validators-0.12.6/validators/__init__.py 2019-05-08 08:47:35.000000000 +0200 @@ -14,4 +14,4 @@ from .utils import ValidationFailure, validator # noqa from .uuid import uuid # noqa -__version__ = '0.12.5' +__version__ = '0.12.6' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/validators-0.12.5/validators/domain.py new/validators-0.12.6/validators/domain.py --- old/validators-0.12.5/validators/domain.py 2018-06-03 12:00:00.000000000 +0200 +++ new/validators-0.12.6/validators/domain.py 2019-05-08 08:46:23.000000000 +0200 @@ -3,10 +3,10 @@ from .utils import validator pattern = re.compile( - r'^(:?(([a-zA-Z]{1})|([a-zA-Z]{1}[a-zA-Z]{1})|' # domain pt.1 - r'([a-zA-Z]{1}[0-9]{1})|([0-9]{1}[a-zA-Z]{1})|' # domain pt.2 - r'([a-zA-Z0-9][-_a-zA-Z0-9]{0,61}[a-zA-Z0-9]))\.)+' # domain pt.3 - r'([a-zA-Z]{2,13}|(xn--[a-zA-Z0-9]{2,30}))$' # TLD + r'^(?:[a-z0-9]' # First character of the domain + r'(?:[a-z0-9-_]{0,61}[a-z0-9])?\.)' # Sub domain + hostname + r'+[a-z0-9][a-z0-9-_]{0,61}' # First 61 characters of the gTLD + r'[a-z0-9]$' # Last character of the gTLD ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/validators-0.12.5/validators.egg-info/PKG-INFO new/validators-0.12.6/validators.egg-info/PKG-INFO --- old/validators-0.12.5/validators.egg-info/PKG-INFO 2019-04-15 13:28:24.000000000 +0200 +++ new/validators-0.12.6/validators.egg-info/PKG-INFO 2019-05-08 08:49:11.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: validators -Version: 0.12.5 +Version: 0.12.6 Summary: Python Data Validation for Humans™. Home-page: https://github.com/kvesteri/validators Author: Konsta Vesterinen

1 0

commit eolie for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package eolie for openSUSE:Factory checked in at 2019-05-24 11:30:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eolie (Old) and /work/SRC/openSUSE:Factory/.eolie.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eolie" Fri May 24 11:30:58 2019 rev:15 rq:704814 version:0.9.62 Changes: -------- --- /work/SRC/openSUSE:Factory/eolie/eolie.changes 2019-05-02 19:20:44.413751630 +0200 +++ /work/SRC/openSUSE:Factory/.eolie.new.5148/eolie.changes 2019-05-24 11:30:59.669412502 +0200 @@ -1,0 +2,6 @@ +Tue May 21 20:04:19 UTC 2019 - Antoine Belvire <antoine.belvire(a)opensuse.org> + +- Update to version 0.9.62: + * Bug fixes. + +------------------------------------------------------------------- Old: ---- eolie-0.9.61.tar.xz New: ---- eolie-0.9.62.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eolie.spec ++++++ --- /var/tmp/diff_new_pack.pv1H1H/_old 2019-05-24 11:31:00.453412300 +0200 +++ /var/tmp/diff_new_pack.pv1H1H/_new 2019-05-24 11:31:00.457412299 +0200 @@ -20,7 +20,7 @@ %global __requires_exclude typelib\$Unity\$ Name: eolie -Version: 0.9.61 +Version: 0.9.62 Release: 0 Summary: Web browser for GNOME License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.pv1H1H/_old 2019-05-24 11:31:00.497412289 +0200 +++ /var/tmp/diff_new_pack.pv1H1H/_new 2019-05-24 11:31:00.501412288 +0200 @@ -1,6 +1,6 @@ <services> <service mode="disabled" name="tar_scm"> - <param name="revision">0.9.61</param> + <param name="revision">0.9.62</param> <param name="scm">git</param> <param name="url">https://gitlab.gnome.org/World/eolie.git</param> <param name="versionformat">@PARENT_TAG@</param> ++++++ eolie-0.9.61.tar.xz -> eolie-0.9.62.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/data/org.gnome.Eolie.appdata.xml.in new/eolie-0.9.62/data/org.gnome.Eolie.appdata.xml.in --- old/eolie-0.9.61/data/org.gnome.Eolie.appdata.xml.in 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/data/org.gnome.Eolie.appdata.xml.in 2019-05-21 21:33:37.000000000 +0200 @@ -10,11 +10,10 @@ Eolie is a new GNOME web browser. </description> <releases> - <release version="0.9.61" date="2019-05-01"> + <release version="0.9.62" date="2019-05-21"> <description> <ul> - <li>Enable 2 factor auth for Firefox sync</li> - <li>Disable hw acceleration (like in Epiphany)</li> + <li>Bug Fixes</li> </ul> </description> </release> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/eolie/helper_dbus.py new/eolie-0.9.62/eolie/helper_dbus.py --- old/eolie-0.9.61/eolie/helper_dbus.py 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/eolie/helper_dbus.py 2019-05-21 21:33:37.000000000 +0200 @@ -10,7 +10,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from gi.repository import Gio +from gi.repository import Gio, GLib from eolie.define import PROXY_BUS, PROXY_PATH, PROXY_INTERFACE, App from eolie.logger import Logger @@ -35,14 +35,17 @@ try: bus = App().get_dbus_connection() proxy_bus = PROXY_BUS % page_id + cancellable = Gio.Cancellable() + GLib.timeout_add(2000, cancellable.cancel) Gio.DBusProxy.new(bus, Gio.DBusProxyFlags.NONE, None, proxy_bus, PROXY_PATH, - PROXY_INTERFACE, None, + PROXY_INTERFACE, cancellable, self.__on_get_proxy, call, dbus_args, callback, *args) except Exception as e: Logger.error("DBusHelper::call(): %s", e) + callback(None, None, *args) def connect(self, signal, callback, page_id): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/eolie/popover_uri.py new/eolie-0.9.62/eolie/popover_uri.py --- old/eolie-0.9.61/eolie/popover_uri.py 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/eolie/popover_uri.py 2019-05-21 21:33:37.000000000 +0200 @@ -89,24 +89,21 @@ if favicon is not None: grid.attach(favicon, 0, 0, 1, 2) - self.__title = Gtk.Label.new(title) + uri = item.get_property("uri") + self.__title = Gtk.Label.new() self.__title.set_ellipsize(Pango.EllipsizeMode.END) self.__title.set_property("halign", Gtk.Align.START) self.__title.set_hexpand(True) self.__title.set_property('has-tooltip', True) self.__title.connect('query-tooltip', self.__on_query_tooltip) self.__title.show() - grid.attach(self.__title, 1, 0, 1, 1) - - if favicon is not None: - uri = Gtk.Label.new(item.get_property("uri")) - uri.set_ellipsize(Pango.EllipsizeMode.END) - uri.set_property("halign", Gtk.Align.START) - uri.get_style_context().add_class("dim-label") - uri.set_property('has-tooltip', True) - uri.connect('query-tooltip', self.__on_query_tooltip) - uri.show() - grid.attach(uri, 1, 1, 1, 1) + if uri: + self.__title.set_markup("%s\n%s" % + (GLib.markup_escape_text(title), + GLib.markup_escape_text(uri))) + else: + self.__title.set_text(title) + grid.attach(self.__title, 1, 0, 1, 2) if item_type == Type.HISTORY: dt = datetime.fromtimestamp(item.get_property("atime")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/eolie/sites_manager_child.py new/eolie-0.9.62/eolie/sites_manager_child.py --- old/eolie-0.9.61/eolie/sites_manager_child.py 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/eolie/sites_manager_child.py 2019-05-21 21:33:37.000000000 +0200 @@ -118,7 +118,9 @@ """ if event in [WebKit2.LoadEvent.STARTED, WebKit2.LoadEvent.COMMITTED]: - self.__label.set_text(webview.get_uri()) + uri = webview.get_uri() + if uri is not None: + self.__label.set_text(uri) def __on_webview_title_changed(self, webview, title): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/eolie/toolbar_title.py new/eolie-0.9.62/eolie/toolbar_title.py --- old/eolie-0.9.61/eolie/toolbar_title.py 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/eolie/toolbar_title.py 2019-05-21 21:33:37.000000000 +0200 @@ -570,15 +570,20 @@ GLib.idle_add(self.__window.close_popovers) parsed = urlparse(uri) # Search a missing scheme - if uri.find(".") != -1 and not parsed.scheme: - db_uri = App().history.get_match(uri) - if db_uri is not None: - db_parsed = urlparse(db_uri) - if db_parsed.netloc.startswith("www.") and\ - not parsed.netloc.startswith("www."): - uri = "%s://www.%s" % (db_parsed.scheme, uri) - else: - uri = "%s://%s" % (db_parsed.scheme, uri) + if uri.find(".") != -1 and\ + uri.find(" ") == -1 and\ + not parsed.scheme: + # Add missing www. + if not uri.startswith("www."): + db_uri = App().history.get_match("://www." + uri) + if db_uri is not None: + uri = "www." + uri + # Add missing scheme + db_uri = App().history.get_match("https://" + uri) + if db_uri is None: + uri = "http://" + uri + else: + uri = "https://" + uri self.__window.container.load_uri(uri) self.__window.container.set_expose(False) if self.__entry_changed_id is not None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/eolie/utils.py new/eolie-0.9.62/eolie/utils.py --- old/eolie-0.9.61/eolie/utils.py 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/eolie/utils.py 2019-05-21 21:33:37.000000000 +0200 @@ -80,8 +80,6 @@ favicon_uri = None try: parsed = urlparse(uri) - if parsed.path == "/": - return None for uri in [parsed.netloc + parsed.path, parsed.netloc]: sql = sqlite3.connect(favicons_path, 600.0) result = sql.execute("SELECT url\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/eolie/webview_artwork.py new/eolie-0.9.62/eolie/webview_artwork.py --- old/eolie-0.9.61/eolie/webview_artwork.py 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/eolie/webview_artwork.py 2019-05-21 21:33:37.000000000 +0200 @@ -119,7 +119,6 @@ @param uri as str @param initial_uri as str """ - resized = None # Save webview favicon if surface is not None: if surface.get_width() >= ArtSize.FAVICON: @@ -130,12 +129,10 @@ exists = App().art.exists(uri, favicon_type) if not exists: resized = resize_favicon(surface) - # We wait for a better favicon - if resized is not None: - self.__save_favicon_to_cache(resized, - uri, - initial_uri, - favicon_type) + self.__save_favicon_to_cache(resized, + uri, + initial_uri, + favicon_type) def __save_favicon_to_cache(self, surface, uri, initial_uri, favicon_type): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/meson.build new/eolie-0.9.62/meson.build --- old/eolie-0.9.61/meson.build 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/meson.build 2019-05-21 21:33:37.000000000 +0200 @@ -1,5 +1,5 @@ project('eolie', 'c', - version: '0.9.61', + version: '0.9.62', meson_version: '>= 0.40.0', ) i18n = import('i18n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/org.gnome.Eolie.json new/eolie-0.9.62/org.gnome.Eolie.json --- old/eolie-0.9.61/org.gnome.Eolie.json 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/org.gnome.Eolie.json 2019-05-21 21:33:37.000000000 +0200 @@ -4,6 +4,8 @@ "runtime-version": "master", "sdk": "org.gnome.Sdk", "command": "eolie", + "tags": ["devel", "development", "nightly"], + "desktop-file-name-prefix": "(Development) ", "finish-args": [ "--share=ipc", "--share=network", @@ -24,8 +26,7 @@ "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf" ], - "modules": [ - { + "modules": [{ "name": "gst-libav", "config-opts": [ "--disable-gtk-doc" @@ -34,13 +35,11 @@ "*.la", "/share/gtk-doc" ], - "sources": [ - { - "type": "archive", - "url": "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz", - "sha256": "2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62" - } - ] + "sources": [{ + "type": "archive", + "url": "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz", + "sha256": "dfd78591901df7853eab7e56a86c34a1b03635da0d3d56b89aa577f1897865da" + }] }, { "name": "gst-plugins-ugly", @@ -51,13 +50,11 @@ "*.la", "/share/gtk-doc" ], - "sources": [ - { - "type": "archive", - "url": "https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.1…", - "sha256": "1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522" - } - ] + "sources": [{ + "type": "archive", + "url": "https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.1…", + "sha256": "ac02d837f166c35ff6ce0738e281680d0b90052cfb1f0255dcf6aaca5f0f6d23" + }] }, { "name": "enchant", @@ -67,13 +64,11 @@ "*.la", "/share" ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.t…", - "sha256": "abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d" - } - ] + "sources": [{ + "type": "archive", + "url": "https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.t…", + "sha256": "abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d" + }] }, { "name": "gtkspell", @@ -81,41 +76,47 @@ "*.la", "/share/gtk-doc" ], - "sources": [ - { - "type": "archive", - "url": "https://sourceforge.net/projects/gtkspell/files/3.0.10/gtkspell3-3.0.10.tar…", - "sha256": "b040f63836b347eb344f5542443dc254621805072f7141d49c067ecb5a375732" - } - ] + "sources": [{ + "type": "archive", + "url": "https://sourceforge.net/projects/gtkspell/files/3.0.10/gtkspell3-3.0.10.tar…", + "sha256": "b040f63836b347eb344f5542443dc254621805072f7141d49c067ecb5a375732" + }] }, { "name": "python-requests", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app requests-2.14.2-py2.py3-none-any.whl" + "pip3 install --prefix=/app requests-2.21.0-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/e4/b0/286e8a936158e5cc5791d5fa3bc4b1d5a7e1…", - "sha256": "3b39cde35be51762885631cf586f4dc2284951b44d479a4454020758d767cc2f" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/7d/e3/20f3d364d6c8e5d2353c72a67778e…", + "sha256": "7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" + }] }, { "name": "python-beautifulsoup4", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app beautifulsoup4-4.6.0-py3-none-any.whl" + "pip3 install --prefix=/app beautifulsoup4-4.7.1-py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/9e/d4/10f46e5cfac773e22707237bfcd51bbffeaf…", - "sha256": "11a9a27b7d3bddc6d86f59fb76afb70e921a25ac2d6cc55b40d072bd68435a76" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/1d/5d/3260694a59df0ec52f8b4883f5d23…", + "sha256": "034740f6cb549b4e932ae1ab975581e6103ac8f942200a0e9759065984391858" + }], + "modules": [{ + "name": "soupsieve", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --prefix=/app soupsieve-1.9.1-py2.py3-none-any.whl" + ], + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/b9/a5/7ea40d0f8676bde6e464a6435a48b…", + "sha256": "6898e82ecb03772a0d82bd0d0a10c0d6dcc342f77e0701d0ec4a8271be465ece" + }] + }] }, { "name": "six", @@ -123,27 +124,23 @@ "build-commands": [ "python3 setup.py install --prefix=/app" ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/benjaminp/six/archive/1.11.0.tar.gz", - "sha256": "927dc6fcfccd4e32e1ce161a20bf8cda39d8c9d5f7a845774486907178f69bd4" - } - ] + "sources": [{ + "type": "archive", + "url": "https://github.com/benjaminp/six/archive/1.12.0.tar.gz", + "sha256": "0ce7aef70d066b8dda6425c670d00c25579c3daad8108b3e3d41bef26003c852" + }] }, { "name": "mohawk", "buildsystem": "simple", "build-commands": [ - "python3 setup.py install --prefix=/app --root=/" + "pip3 install --prefix=/app mohawk-1.0.0-py2-none-any.whl" ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.python.org/packages/19/22/10f696548a8d41ad41b92ab6c848c60c669e…", - "sha256": "e98b331d9fa9ece7b8be26094cbe2d57613ae882133cc755167268a984bc0ab3" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/b8/ac/b5b421dddcd731fb3dfb1b473d96a…", + "sha256": "aa57e6626a6ea323ab714779f23734de1d1feca8cb6fc00b65e65ce115c1696a" + }] }, { "name": "requests_hawk", @@ -151,27 +148,23 @@ "build-commands": [ "pip3 install --prefix=/app requests_hawk-1.0.0-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/3b/6a/d1aa3fab0b788bf4cf3d60898ff6b80852c8…", - "sha256": "c2626ab31ebef0c81b97781c44c2275bfcc6d8e8520fc4ced495f0f386f8fe26" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/3b/6a/d1aa3fab0b788bf4cf3d60898ff6b…", + "sha256": "c2626ab31ebef0c81b97781c44c2275bfcc6d8e8520fc4ced495f0f386f8fe26" + }] }, { "name": "hawkauthlib", "buildsystem": "simple", "build-commands": [ - "python3 setup.py install --prefix=/app --root=/" + "pip3 install --prefix=/app hawkauthlib-2.0.0-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.python.org/packages/46/62/54729cbfc8d115f07f41f74a43a8e3711be3…", - "sha256": "7ac93c892e7629721dde196193c9af3bde1f20540945569f7c7d34d3ea92680a" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/53/ec/23dd5cbd5e950543fdd30d91ddac4…", + "sha256": "935878d3a75832aa76f78ddee13491f1466cbd69a8e7e4248902763cf9953ba9" + }] }, { "name": "cffi", @@ -179,13 +172,11 @@ "build-commands": [ "python3 setup.py install --prefix=/app --root=/" ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.python.org/packages/5b/b9/790f8eafcdab455bcd3bd908161f802c9ce5…", - "sha256": "b3b02911eb1f6ada203b0763ba924234629b51586f72a21faacc638269f4ced5" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761f…", + "sha256": "e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7" + }] }, { "name": "pycparser", @@ -193,13 +184,11 @@ "build-commands": [ "python3 setup.py install --prefix=/app --root=/" ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.python.org/packages/be/64/1bb257ffb17d01f4a38d7ce686809a736837…", - "sha256": "0aac31e917c24cb3357f5a4d5566f2cc91a19ca41862f6c3c22dc60a629673b6" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7…", + "sha256": "a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" + }] }, { "name": "cryptography", @@ -207,13 +196,11 @@ "build-commands": [ "python3 setup.py install --prefix=/app --root=/ --skip-build" ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.python.org/packages/ec/5f/d5bc241d06665eed93cd8d3aa7198024ce78…", - "sha256": "323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff9…", + "sha256": "26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6" + }] }, { "name": "PyYAML", @@ -221,13 +208,11 @@ "build-commands": [ "python3 setup.py install --prefix=/app --root=/" ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.python.org/packages/4a/85/db5a2df477072b2902b0eb892feb37d88ac6…", - "sha256": "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/9f/2c/9417b5c774792634834e730932745…", + "sha256": "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95" + }] }, { "name": "PyBrowserID", @@ -235,83 +220,71 @@ "build-commands": [ "python3 setup.py install --prefix=/app --root=/" ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.python.org/packages/d7/fd/729ef9ff743bc1758f24c5dbbe4c650f892b…", - "sha256": "bf72f57eaa4d2ea36c6888e868f49e588c7b9c0b78dfbf2bc79fee93e97f39d2" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/e4/2e/e9bb9e24e600da08ff6a4d0033624…", + "sha256": "6c227669e87cc25796ae76f6a0ef65025528c8ad82d352679fa9a3e5663a71e3" + }] }, { "name": "pyparsing", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app pyparsing-2.2.0-py2.py3-none-any.whl" + "pip3 install --prefix=/app pyparsing-2.4.0-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/6a/8a/718fd7d3458f9fab8e67186b00abdd345b63…", - "sha256": "fee43f17a9c4087e7ed1605bd6df994c6173c1e977d7ade7b651292fab2bd010" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/dd/d9/3ec19e966301a6e25769976999bd7…", + "sha256": "9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03" + }] }, { "name": "packaging", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app packaging-16.8-py2.py3-none-any.whl" + "pip3 install --prefix=/app packaging-19.0-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/87/1b/c39b7c65b5612812b83d6cab7ef2885eac9f…", - "sha256": "99276dc6e3a7851f32027a68f1095cd3f77c148091b092ea867a351811cfe388" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/91/32/58bc30e646e55eab8b21abf89e353…", + "sha256": "9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3" + }] }, { "name": "asn1crypto", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app asn1crypto-0.22.0-py2.py3-none-any.whl" + "pip3 install --prefix=/app asn1crypto-0.24.0-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/97/ba/7e8117d8efcee589f4d96dd2b2eb1d997f96…", - "sha256": "d232509fefcfcdb9a331f37e9c9dc20441019ad927c7d2176cf18ed5da0ba097" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/ea/cd/35485615f45f30a510576f1a56d1e…", + "sha256": "2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87" + }] }, { "name": "WebOb", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app WebOb-1.6.0-py2.py3-none-any.whl" + "pip3 install --prefix=/app WebOb-1.8.5-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/12/5a/b6ef092cf8e70d2d63fdd8d2c6d479b1896d…", - "sha256": "69356a75980172f3e76717f6899b6c75d95ccdc7a2cb6a3b8bd6a7de3fc72401" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/06/e1/4acd2b4327fceb4c6446bdbca515f…", + "sha256": "36db8203c67023d68c1b00208a7bf55e3b10de2aa317555740add29c619de12b" + }] }, { "name": "idna", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app idna-2.5-py2.py3-none-any.whl" + "pip3 install --prefix=/app idna-2.8-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/11/7d/9bbbd7bb35f34b0169542487d2a8859e4430…", - "sha256": "cc19709fd6d0cbfed39ea875d29ba6d4e22c0cebc510a76d6302a28385e8bb70" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/14/2c/cd551d81dbe15200be1cf41cd0386…", + "sha256": "ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" + }] }, { "name": "Naked", @@ -319,13 +292,11 @@ "build-commands": [ "pip3 install --prefix=/app Naked-0.1.31-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/02/36/b8107b51adca73402ec1860d88f41d958e27…", - "sha256": "19de9961f4edb29e75cf837e8e031d6b52fbba4f0033515893d26f69c74b3b1f" - } - ] + "sources": [{ + "type": "file", + "url": "https://pypi.python.org/packages/02/36/b8107b51adca73402ec1860d88f41d958e27…", + "sha256": "19de9961f4edb29e75cf837e8e031d6b52fbba4f0033515893d26f69c74b3b1f" + }] }, { "name": "shellescape", @@ -333,13 +304,11 @@ "build-commands": [ "pip3 install --prefix=/app shellescape-3.4.1-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/51/b6/986c99a10040beaaefca1ad6c93bd7738cb8…", - "sha256": "3ff2aeb6ce2c5a4e6059fe4a2a745a824f5a3834fe8365a39c5ea691073cfdb6" - } - ] + "sources": [{ + "type": "file", + "url": "https://pypi.python.org/packages/51/b6/986c99a10040beaaefca1ad6c93bd7738cb8…", + "sha256": "3ff2aeb6ce2c5a4e6059fe4a2a745a824f5a3834fe8365a39c5ea691073cfdb6" + }] }, { "name": "pycrypto", @@ -347,51 +316,43 @@ "build-commands": [ "python3 setup.py install --prefix=/app --root=/" ], - "sources": [ - { - "type": "archive", - "url": "https://pypi.python.org/packages/60/db/645aa9af249f059cc3a368b118de33889219…", - "sha256": "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/60/db/645aa9af249f059cc3a368b118de3…", + "sha256": "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" + }] }, { "name": "python-dateutil", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app python_dateutil-2.6.1-py2.py3-none-any.whl" + "pip3 install --prefix=/app python_dateutil-2.8.0-py2.py3-none-any.whl" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/4b/0d/7ed381ab4fe80b8ebf34411d14f253e1cf3e…", - "sha256": "95511bae634d69bc7329ba55e646499a842bc4ec342ad54a8cdb65645a0aad3c" - } - ] + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/41/17/c62faccbfbd163c7f57f3844689e3…", + "sha256": "7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb" + }] }, { "name": "PyFxA", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app PyFxA-0.3.0-py2.py3-none-any.whl" + "python3 setup.py install --prefix=/app" ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/b6/97/91b810a1b5678c2b84e0e1fc8a47736fd8d4…", - "sha256": "e5963db092b71bff0f51e0695eeeb59405e5646c51998c2d3f06b96d5aca6ace" - } - ] + "sources": [{ + "type": "archive", + "url": "https://files.pythonhosted.org/packages/cf/93/002ded7990d847f730cd9b63fec2f…", + "sha256": "616689486d8d63956aa40836cffafde6e7590cdeb200badabaaf3c17d5b26cce" + }] }, { "name": "Eolie", "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/World/eolie.git" - } - ] + "sources": [{ + "type": "git", + "url": "https://gitlab.gnome.org/World/eolie.git" + }] } ] -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/subprojects/po/ar.po new/eolie-0.9.62/subprojects/po/ar.po --- old/eolie-0.9.61/subprojects/po/ar.po 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/subprojects/po/ar.po 2019-05-21 21:33:37.000000000 +0200 @@ -8,17 +8,17 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01 14:09+0200\n" -"PO-Revision-Date: 2018-12-16 10:08+0000\n" +"PO-Revision-Date: 2019-05-03 21:37+0000\n" "Last-Translator: mohammadA <mohammadAbdulhadi1(a)gmail.com>\n" -"Language-Team: Arabic <https://hosted.weblate.org/projects/gnumdk/eolie/ar/" -">\n" +"Language-Team: Arabic <https://hosted.weblate.org/projects/gnumdk/eolie/ar/>" +"\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 3.4-dev\n" +"X-Generator: Weblate 3.7-dev\n" #: ../data/org.gnome.Eolie.gschema.xml:19 msgid "Show debug messages" @@ -50,7 +50,7 @@ #: ../data/org.gnome.Eolie.gschema.xml:54 msgid "Enable smooth scrolling" -msgstr "" +msgstr "فعِّل التمرير السلس" #: ../data/org.gnome.Eolie.gschema.xml:59 msgid "Block all unwanted popups" @@ -184,7 +184,7 @@ #: ../data/AboutDialog.ui.in:67 ../eolie/container.py:470 msgid "Patreon" -msgstr "" +msgstr "باتريون" #: ../data/AboutDialog.ui.in:77 ../eolie/container.py:470 msgid "PayPal" @@ -351,7 +351,7 @@ #: ../data/DialogCookies.ui:19 msgid "Cookies manager" -msgstr "" +msgstr "مدير الكعكات" #: ../data/DialogCookies.ui:23 msgid "Delete cookies" @@ -727,11 +727,11 @@ #: ../data/SettingsDialog.ui:929 msgid "Login :" -msgstr "" +msgstr "الولوج :" #: ../data/SettingsDialog.ui:951 msgid "Password :" -msgstr "" +msgstr "كلمة السر :" #: ../data/SettingsDialog.ui:972 msgid "Allow synchronization" @@ -743,11 +743,12 @@ #: ../data/SettingsDialog.ui:1028 msgid "Code :" -msgstr "" +msgstr "الرمز :" #: ../data/SettingsDialog.ui:1039 ../data/SettingsDialog.ui:1040 +#, fuzzy msgid "You need to enable Two Factor Authentication" -msgstr "" +msgstr "تحتاج إلى تفعيل الاستيثاق ذو العاملين" #: ../data/SettingsDialog.ui:1059 msgid "Syncing" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/subprojects/po/de.po new/eolie-0.9.62/subprojects/po/de.po --- old/eolie-0.9.61/subprojects/po/de.po 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/subprojects/po/de.po 2019-05-21 21:33:37.000000000 +0200 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01 14:09+0200\n" -"PO-Revision-Date: 2019-02-22 21:17+0000\n" -"Last-Translator: Vincent Bermel <willovince(a)openmailbox.org>\n" -"Language-Team: German <https://hosted.weblate.org/projects/gnumdk/eolie/de/" -">\n" +"PO-Revision-Date: 2019-05-06 19:48+0000\n" +"Last-Translator: ssantos <ssantos(a)web.de>\n" +"Language-Team: German <https://hosted.weblate.org/projects/gnumdk/eolie/de/>" +"\n" "Language: de\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 3.5-dev\n" +"X-Generator: Weblate 3.7-dev\n" #: ../data/org.gnome.Eolie.gschema.xml:19 msgid "Show debug messages" @@ -25,7 +25,7 @@ #: ../data/org.gnome.Eolie.gschema.xml:29 msgid "INTERNAL" -msgstr "" +msgstr "INTERN" #: ../data/org.gnome.Eolie.gschema.xml:34 msgid "Show sidebar(sites manager)" @@ -47,7 +47,7 @@ #: ../data/org.gnome.Eolie.gschema.xml:54 msgid "Enable smooth scrolling" -msgstr "" +msgstr "Sanftes Scrollen aktivieren" #: ../data/org.gnome.Eolie.gschema.xml:59 msgid "Block all unwanted popups" @@ -181,7 +181,7 @@ #: ../data/AboutDialog.ui.in:67 ../eolie/container.py:470 msgid "Patreon" -msgstr "" +msgstr "Patreon" #: ../data/AboutDialog.ui.in:77 ../eolie/container.py:470 msgid "PayPal" @@ -350,7 +350,7 @@ #: ../data/DialogCookies.ui:19 msgid "Cookies manager" -msgstr "" +msgstr "Manager für Cookies" #: ../data/DialogCookies.ui:23 msgid "Delete cookies" @@ -730,11 +730,11 @@ #: ../data/SettingsDialog.ui:929 msgid "Login :" -msgstr "" +msgstr "Anmeldung:" #: ../data/SettingsDialog.ui:951 msgid "Password :" -msgstr "" +msgstr "Passwort:" #: ../data/SettingsDialog.ui:972 msgid "Allow synchronization" @@ -746,11 +746,11 @@ #: ../data/SettingsDialog.ui:1028 msgid "Code :" -msgstr "" +msgstr "Code :" #: ../data/SettingsDialog.ui:1039 ../data/SettingsDialog.ui:1040 msgid "You need to enable Two Factor Authentication" -msgstr "" +msgstr "Sie müssen die Zwei-Faktor-Authentifizierung aktivieren" #: ../data/SettingsDialog.ui:1059 msgid "Syncing" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/subprojects/po/es.po new/eolie-0.9.62/subprojects/po/es.po --- old/eolie-0.9.61/subprojects/po/es.po 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/subprojects/po/es.po 2019-05-21 21:33:37.000000000 +0200 @@ -8,16 +8,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01 14:09+0200\n" -"PO-Revision-Date: 2018-07-18 01:42+0000\n" -"Last-Translator: Wilfer Daniel Ciro Maya <wilcirom(a)gmail.com>\n" -"Language-Team: Spanish <https://hosted.weblate.org/projects/gnumdk/eolie/es/" -">\n" +"PO-Revision-Date: 2019-05-19 15:48+0000\n" +"Last-Translator: Fernando Espada <fespada(a)posteo.net>\n" +"Language-Team: Spanish <https://hosted.weblate.org/projects/gnumdk/eolie/es/>" +"\n" "Language: es\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 3.1-dev\n" +"X-Generator: Weblate 3.7-dev\n" #: ../data/org.gnome.Eolie.gschema.xml:19 msgid "Show debug messages" @@ -181,7 +181,7 @@ #: ../data/AboutDialog.ui.in:67 ../eolie/container.py:470 msgid "Patreon" -msgstr "" +msgstr "Patreon" #: ../data/AboutDialog.ui.in:77 ../eolie/container.py:470 msgid "PayPal" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eolie-0.9.61/subprojects/po/nb_NO.po new/eolie-0.9.62/subprojects/po/nb_NO.po --- old/eolie-0.9.61/subprojects/po/nb_NO.po 2019-05-01 14:11:55.000000000 +0200 +++ new/eolie-0.9.62/subprojects/po/nb_NO.po 2019-05-21 21:33:37.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01 14:09+0200\n" -"PO-Revision-Date: 2019-04-20 19:33+0000\n" +"PO-Revision-Date: 2019-05-19 15:48+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/gnumdk/" "eolie/nb_NO/>\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.6\n" +"X-Generator: Weblate 3.7-dev\n" #: ../data/org.gnome.Eolie.gschema.xml:19 msgid "Show debug messages" @@ -1367,7 +1367,7 @@ #: ../eolie/webview_errors.py:140 msgid "Network not available" -msgstr "Nettverk utilgjengelig" +msgstr "Nettverk ikke tilgjengelig" #: ../eolie/webview_errors.py:141 msgid "Check your network connection"

1 0