openSUSE Commits December 2022

commit@lists.opensuse.org

1 participants
2261 discussions

commit swappy for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package swappy for openSUSE:Factory checked in at 2022-12-01 17:21:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swappy (Old) and /work/SRC/openSUSE:Factory/.swappy.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swappy" Thu Dec 1 17:21:26 2022 rev:7 rq:1039269 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/swappy/swappy.changes 2022-10-18 12:45:35.589804779 +0200 +++ /work/SRC/openSUSE:Factory/.swappy.new.1835/swappy.changes 2022-12-01 17:22:27.546638771 +0100 @@ -1,0 +2,15 @@ +Thu Dec 1 08:46:12 UTC 2022 - Michael Vetter <mvetter(a)suse.com> + +- Update to 1.5.1: + * ui: use *-symbolic variant of toolbar icons (5dc44f8), closes #34 + +------------------------------------------------------------------- +Thu Dec 1 08:45:41 UTC 2022 - Michael Vetter <mvetter(a)suse.com> + +- Update to 1.5.0: + * config: add early_exit option (60da549) + * config: allow paint_mode to be configured through config file (2f35f02) + * config: try to create save_dir if it does not exist (4fb291a) + * ui: allow filling rectangles and ellipsis (8ee55f7), closes #120 + +------------------------------------------------------------------- Old: ---- swappy-1.4.0.tar.gz.sig v1.4.0.tar.gz New: ---- swappy-1.5.1.tar.gz.sig v1.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swappy.spec ++++++ --- /var/tmp/diff_new_pack.AavoHo/_old 2022-12-01 17:22:28.118641899 +0100 +++ /var/tmp/diff_new_pack.AavoHo/_new 2022-12-01 17:22:28.122641921 +0100 @@ -17,7 +17,7 @@ Name: swappy -Version: 1.4.0 +Version: 1.5.1 Release: 0 Summary: Wayland compositor screenshot editor License: MIT ++++++ v1.4.0.tar.gz -> v1.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/.versionrc new/swappy-1.5.1/.versionrc --- old/swappy-1.4.0/.versionrc 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/.versionrc 2022-11-20 22:50:09.000000000 +0100 @@ -3,6 +3,9 @@ { "filename": "meson.build", "updater": "script/bump-meson-build.js" + }, + { + "filename": "package.json" } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/CHANGELOG.md new/swappy-1.5.1/CHANGELOG.md --- old/swappy-1.4.0/CHANGELOG.md 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/CHANGELOG.md 2022-11-20 22:50:09.000000000 +0100 @@ -2,6 +2,23 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-versio… for commit guidelines. +### [1.5.1](https://github.com/jtheoof/swappy/compare/v1.5.0...v1.5.1) (2022-11-20) + + +### Bug Fixes + +* **ui:** use *-symbolic variant of toolbar icons ([5dc44f8](https://github.com/jtheoof/swappy/commit/5dc44f8970b0f6cdf21466bc2…), closes [#34](https://github.com/jtheoof/swappy/issues/34) + +## [1.5.0](https://github.com/jtheoof/swappy/compare/v1.4.0...v1.5.0) (2022-11-18) + + +### Features + +* **config:** add early_exit option ([60da549](https://github.com/jtheoof/swappy/commit/60da5491e243c9edd85f62253…) +* **config:** allow paint_mode to be configured through config file ([2f35f02](https://github.com/jtheoof/swappy/commit/2f35f02b4e89bf67b6e9cc461…) +* **config:** try to create `save_dir` if it does not exist ([4fb291a](https://github.com/jtheoof/swappy/commit/4fb291ad4b0b116afeaa7094b…) +* **ui:** allow filling rectangles and ellipsis ([8ee55f7](https://github.com/jtheoof/swappy/commit/8ee55f7d52ce6ac7175298186…), closes [#120](https://github.com/jtheoof/swappy/issues/120) + ## [1.4.0](https://github.com/jtheoof/swappy/compare/v1.3.1...v1.4.0) (2021-09-06) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/README.md new/swappy-1.5.1/README.md --- old/swappy-1.4.0/README.md 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/README.md 2022-11-20 22:50:09.000000000 +0100 @@ -48,14 +48,20 @@ line_size=5 text_size=20 text_font=sans-serif +paint_mode=brush +early_exit=false +fill_shape=false ``` -- `save_dir` is where swappshots will be saved, can contain env variables and must exist in your filesystem +- `save_dir` is where swappshots will be saved, can contain env variables, when it does not exist, swappy attempts to create it first, but does not abort if directory creation fails - `save_filename_format`: is the filename template, if it contains a date format, this will be parsed into a timestamp. Format is detailed in [strftime(3)](https://man.archlinux.org/man/strftime.3). If this date format is missing, filename will have no timestamp - `show_panel` is used to toggle the paint panel on or off upon startup - `line_size` is the default line size (must be between 1 and 50) - `text_size` is the default text size (must be between 10 and 50) - `text_font` is the font used to render text, its format is pango friendly +- `paint_mode` is the mode activated at application start (must be one of: brush|text|rectangle|ellipse|arrow|blur, matching is case-insensitive) +- `early_exit` is used to make the application exit after saving the picture or copying it to the clipboard +- `fill_shape` is used to toggle shape filling (for the rectangle and ellipsis tools) on or off upon startup ## Keyboard Shortcuts @@ -79,6 +85,7 @@ - `Minus`: Reduce Stroke Size - `Plus`: Increase Stroke Size - `Equal`: Reset Stroke Size +- `f`: Toggle Shape Filling - `k`: Clear Paints (cannot be undone) <hr> @@ -159,12 +166,11 @@ We rely on [standard-version](https://github.com/conventional-changelog/standard-versio… which is part of the JavaScript ecosystem but works well with any project. +```sh +./script/github-release ``` -npx standard-version --sign -git push --follow-tags -# Do the release on Github with manual steps, then: -./script/sign-post-release -``` + +Make sure everything is valid in the Draft release, then publish the draft. Release tarballs are signed with this PGP key: `F44D05A50F6C9EB5C81BCF966A6B35DBE9442683` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/include/config.h new/swappy-1.5.1/include/config.h --- old/swappy-1.4.0/include/config.h 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/include/config.h 2022-11-20 22:50:09.000000000 +0100 @@ -5,6 +5,9 @@ #define CONFIG_TEXT_SIZE_DEFAULT 20 #define CONFIG_SHOW_PANEL_DEFAULT false #define CONFIG_SAVE_FILENAME_FORMAT_DEFAULT "swappy-%Y%m%d_%H%M%S.png" +#define CONFIG_PAINT_MODE_DEFAULT SWAPPY_PAINT_MODE_BRUSH +#define CONFIG_EARLY_EXIT_DEFAULT false +#define CONFIG_FILL_SHAPE_DEFAULT false void config_load(struct swappy_state *state); void config_free(struct swappy_state *state); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/include/swappy.h new/swappy-1.5.1/include/swappy.h --- old/swappy-1.4.0/include/swappy.h 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/include/swappy.h 2022-11-20 22:50:09.000000000 +0100 @@ -137,16 +137,21 @@ GtkButton *line_size; GtkButton *text_size; + + GtkToggleButton *fill_shape; }; struct swappy_config { char *config_file; char *save_dir; char *save_filename_format; + gint8 paint_mode; + gboolean fill_shape; gboolean show_panel; guint32 line_size; guint32 text_size; char *text_font; + gboolean early_exit; }; struct swappy_state { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/meson.build new/swappy-1.5.1/meson.build --- old/swappy-1.4.0/meson.build 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/meson.build 2022-11-20 22:50:09.000000000 +0100 @@ -1,7 +1,7 @@ project( 'swappy', 'c', - version: '1.4.0', + version: '1.5.1', license: 'MIT', meson_version: '>=0.48.0', default_options: [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/package.json new/swappy-1.5.1/package.json --- old/swappy-1.4.0/package.json 1970-01-01 01:00:00.000000000 +0100 +++ new/swappy-1.5.1/package.json 2022-11-20 22:50:09.000000000 +0100 @@ -0,0 +1,9 @@ +{ + "name": "swappy", + "version": "1.5.1", + "repository": { + "type": "git", + "url": "https://github.com/jtheoof/swappy.git" + }, + "author": "Jeremy Attali" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/res/swappy.glade new/swappy-1.5.1/res/swappy.glade --- old/swappy-1.4.0/res/swappy.glade 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/res/swappy.glade 2022-11-20 22:50:09.000000000 +0100 @@ -5,57 +5,57 @@ <object class="GtkImage" id="edit-redo"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">edit-redo</property> + <property name="icon_name">edit-redo-symbolic</property> </object> <object class="GtkImage" id="edit-undo"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">edit-undo</property> + <property name="icon_name">edit-undo-symbolic</property> </object> <object class="GtkImage" id="img-clear-paints"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">edit-delete</property> + <property name="icon_name">edit-delete-symbolic</property> </object> <object class="GtkImage" id="img-copy-surface"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">edit-copy</property> + <property name="icon_name">edit-copy-symbolic</property> </object> <object class="GtkImage" id="img-save-surface"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">document-save</property> + <property name="icon_name">document-save-symbolic</property> </object> <object class="GtkImage" id="img-toggle-panel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">document-properties</property> + <property name="icon_name">document-properties-symbolic</property> </object> <object class="GtkImage" id="zoom-in"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">zoom-in</property> + <property name="icon_name">zoom-in-symbolic</property> </object> <object class="GtkImage" id="zoom-in1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">zoom-in</property> + <property name="icon_name">zoom-in-symbolic</property> </object> <object class="GtkImage" id="zoom-in2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">zoom-in</property> + <property name="icon_name">zoom-in-symbolic</property> </object> <object class="GtkImage" id="zoom-out"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">zoom-out</property> + <property name="icon_name">zoom-out-symbolic</property> </object> <object class="GtkImage" id="zoom-out1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">zoom-out</property> + <property name="icon_name">zoom-out-symbolic</property> </object> <object class="GtkApplicationWindow" id="paint-window"> <property name="visible">True</property> @@ -582,6 +582,35 @@ <property name="position">4</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkToggleButton" id="fill-shape-toggle-button"> + <property name="label" translatable="yes">Fill shape</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Toggle shape filling</property> + <property name="always-show-image">True</property> + <signal name="toggled" handler="fill_shape_toggled_handler" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> </object> <packing> <property name="resize">False</property> @@ -788,9 +817,4 @@ </object> </child> </object> - <object class="GtkImage" id="zoom-out2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">zoom-out</property> - </object> </interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/script/github-release new/swappy-1.5.1/script/github-release --- old/swappy-1.4.0/script/github-release 1970-01-01 01:00:00.000000000 +0100 +++ new/swappy-1.5.1/script/github-release 2022-11-20 22:50:09.000000000 +0100 @@ -0,0 +1,104 @@ +#!/bin/bash + +set -e + +declare -r git_root=$(git rev-parse --show-toplevel) +declare -r app_name="swappy" +declare -r release_folder="$git_root/release" + +declare version="" + +die() { + echo "$*" 1>&2 + exit 1 +} + +init() { + command -v git >/dev/null 2>&1 || { echo >&2 "git required: pacman -S git"; exit 1; } + command -v gh >/dev/null 2>&1 || { echo >&2 "github cli tool required to publish the release: pacman -S github-cli"; exit 1; } + command -v npx >/dev/null 2>&1 || { echo >&2 "npx required for standard versionning the release: pacman -S npm"; exit 1; } + command -v gpg >/dev/null 2>&1 || { echo >&2 "gpg required to sign the archive: pacman -S gnupg"; exit 1; } + + mkdir -p $release_folder +} + +git_get_release_version() { + version=$(git describe --tags --abbrev=0 | sed 's/^v//') + + if [ -z "$version" ] + then + die "version not found, is the git tag valid?" + fi + + echo "found latest version: $version" +} + +npx_standard_version() { + echo "setting up new standard version with npx..." + npx standard-version --sign +} + +git_push_tags() { + echo "pushing git tags..." + git push --follow-tags +} + + +git_build_archive() { + echo "building source archives..." + cd $git_root + git archive -o "$release_folder/$app_name-$version.tar.gz" --format tar.gz --prefix "$app_name-$version/" "v$version" +} + +download_source_for_release() { + echo "downloading source assets..." + cd $release_folder + curl --location --output github-$app_name-$version.tar.gz https://github.com/jtheoof/$app_name/archive/v$version.tar.gz +} + +verify_sha256_checksums() { + echo "verifying signatures..." + cd $release_folder + sha256sum $app_name-$version.tar.gz | awk '{ print $1 }' > $app_name-$version.tar.gz.sha256 + + # sha256sum --check will exit if the checksums do not match + echo "$(cat $app_name-$version.tar.gz.sha256) github-$app_name-$version.tar.gz" | sha256sum --check +} + +gpg_sign_archive() { + echo "signing source assets..." + cd $release_folder + gpg --output $app_name-$version.tar.gz.sig --detach-sign $app_name-$version.tar.gz +} + +git_generate_changelog() { + echo "generating changelog..." + git diff "v$version"^ -- CHANGELOG.md | tail -n +9 | head -n -4 | sed 's/^+//g' > $release_folder/CHANGELOG.md +} + +github_create_release() { + echo "creating github release..." + gh release create --draft "v$version" \ + -F "$release_folder/CHANGELOG.md" \ + "$release_folder/$app_name-$version.tar.gz" \ + "$release_folder/$app_name-$version.tar.gz.sig" \ + "$release_folder/CHANGELOG.md" +} + +main() { + init + + npx_standard_version + git_push_tags + git_get_release_version + git_build_archive + # Turning off manual downloading from github + # doing all the steps, including archive, ourselves. + #download_source_for_release + #verify_sha256_checksums + git_generate_changelog + gpg_sign_archive + github_create_release +} + +main "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/script/sign-post-release new/swappy-1.5.1/script/sign-post-release --- old/swappy-1.4.0/script/sign-post-release 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/script/sign-post-release 1970-01-01 01:00:00.000000000 +0100 @@ -1,78 +0,0 @@ -#!/bin/bash - -set -e - -declare -r git_root=$(git rev-parse --show-toplevel) -declare -r app_name="swappy" -declare -r release_folder="$git_root/release" - -declare version="" - -die() { - echo "$*" 1>&2 - exit 1 -} - -init() { - command -v gh >/dev/null 2>&1 || { echo >&2 "github cli tool required: pacman -S github-cli"; exit 1; } - - mkdir -p $release_folder -} - -get_release_version() { - version=$(git describe | sed 's/^v//') - echo "found latest version: $version" -} - -build_archives_from_source() { - echo "building source archives..." - cd $git_root - git archive -o "$release_folder/local-$app_name-$version.tar.gz" --format tar.gz --prefix "$app_name-$version/" "v$version" -} - - -download_source_for_release() { - echo "downloading source assets..." - cd $release_folder - curl --location --output github-$app_name-$version.tar.gz https://github.com/jtheoof/$app_name/archive/v$version.tar.gz -} - -verify_sha256_checksums() { - echo "verifying signatures..." - cd $release_folder - sha256sum local-$app_name-$version.tar.gz | awk '{ print $1 }' > local-$app_name-$version.tar.gz.sha256 - - # sha256sum --check will exit if the checksums do not match - echo "$(cat local-$app_name-$version.tar.gz.sha256) github-$app_name-$version.tar.gz" | sha256sum --check -} - -sign_release_source() { - echo "signing source assets..." - cd $release_folder - gpg --output $app_name-$version.tar.gz.sig --detach-sign github-$app_name-$version.tar.gz -} - -upload_signed_assets_to_release() { - echo "uploading signatures to github release..." - cd $release_folder - gh release upload v$version $app_name-$version.tar.gz.sig --clobber -} - - -main() { - init - get_release_version - - if [ -z "$version" ] - then - die "version not found, is the git tag valid?" - fi - - build_archives_from_source - download_source_for_release - verify_sha256_checksums - sign_release_source - upload_signed_assets_to_release -} - -main "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/application.c new/swappy-1.5.1/src/application.c --- old/swappy-1.4.0/src/application.c 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/application.c 2022-11-20 22:50:09.000000000 +0100 @@ -45,6 +45,36 @@ gtk_widget_set_visible(painting_box, toggled); } +static void update_ui_fill_shape_toggle_button(struct swappy_state *state) { + GtkToggleButton *button = GTK_TOGGLE_BUTTON(state->ui->fill_shape); + gboolean toggled = state->config->fill_shape; + + gtk_toggle_button_set_active(button, toggled); +} + +void application_finish(struct swappy_state *state) { + g_debug("application finishing, cleaning up"); + paint_free_all(state); + pixbuf_free(state); + cairo_surface_destroy(state->rendering_surface); + cairo_surface_destroy(state->original_image_surface); + if (state->temp_file_str) { + g_info("deleting temporary file: %s", state->temp_file_str); + if (g_unlink(state->temp_file_str) != 0) { + g_warning("unable to delete temporary file: %s", state->temp_file_str); + } + g_free(state->temp_file_str); + } + g_free(state->file_str); + g_free(state->geometry); + g_free(state->window); + g_free(state->ui); + + g_object_unref(state->app); + + config_free(state); +} + static void action_undo(struct swappy_state *state) { GList *first = state->paints; @@ -103,26 +133,32 @@ static void switch_mode_to_brush(struct swappy_state *state) { state->mode = SWAPPY_PAINT_MODE_BRUSH; + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); } static void switch_mode_to_text(struct swappy_state *state) { state->mode = SWAPPY_PAINT_MODE_TEXT; + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); } static void switch_mode_to_rectangle(struct swappy_state *state) { state->mode = SWAPPY_PAINT_MODE_RECTANGLE; + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), true); } static void switch_mode_to_ellipse(struct swappy_state *state) { state->mode = SWAPPY_PAINT_MODE_ELLIPSE; + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), true); } static void switch_mode_to_arrow(struct swappy_state *state) { state->mode = SWAPPY_PAINT_MODE_ARROW; + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); } static void switch_mode_to_blur(struct swappy_state *state) { state->mode = SWAPPY_PAINT_MODE_BLUR; + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); } static void action_stroke_size_decrease(struct swappy_state *state) { @@ -179,6 +215,18 @@ update_ui_text_size_widget(state); } +static void action_fill_shape_toggle(struct swappy_state *state, + gboolean *toggled) { + // Don't allow changing the state via a shortcut if the button can't be + // clicked. + if (!gtk_widget_get_sensitive(GTK_WIDGET(state->ui->fill_shape))) return; + + gboolean toggle = (toggled == NULL) ? !state->config->fill_shape : *toggled; + state->config->fill_shape = toggle; + + update_ui_fill_shape_toggle_button(state); +} + static void save_state_to_file_or_folder(struct swappy_state *state, char *file) { GdkPixbuf *pixbuf = pixbuf_get_from_state(state); @@ -191,6 +239,10 @@ } g_object_unref(pixbuf); + + if (state->config->early_exit) { + gtk_main_quit(); + } } static void maybe_save_output_file(struct swappy_state *state) { @@ -254,28 +306,6 @@ switch_mode_to_blur(state); } -void application_finish(struct swappy_state *state) { - paint_free_all(state); - pixbuf_free(state); - cairo_surface_destroy(state->rendering_surface); - cairo_surface_destroy(state->original_image_surface); - if (state->temp_file_str) { - g_info("deleting temporary file: %s", state->temp_file_str); - if (g_unlink(state->temp_file_str) != 0) { - g_warning("unable to delete temporary file: %s", state->temp_file_str); - } - g_free(state->temp_file_str); - } - g_free(state->file_str); - g_free(state->geometry); - g_free(state->window); - g_free(state->ui); - - g_object_unref(state->app); - - config_free(state); -} - void save_clicked_handler(GtkWidget *widget, struct swappy_state *state) { // Commit a potential paint (e.g. text being written) commit_state(state); @@ -404,6 +434,9 @@ case GDK_KEY_Control_L: control_modifier_changed(true, state); break; + case GDK_KEY_f: + action_fill_shape_toggle(state, NULL); + break; default: break; } @@ -608,6 +641,12 @@ action_text_size_increase(state); } +void fill_shape_toggled_handler(GtkWidget *widget, struct swappy_state *state) { + GtkToggleButton *button = GTK_TOGGLE_BUTTON(widget); + gboolean toggled = gtk_toggle_button_get_active(button); + action_fill_shape_toggle(state, &toggled); +} + static void compute_window_size_and_scaling_factor(struct swappy_state *state) { GdkRectangle workarea = {0}; GdkDisplay *display = gdk_display_get_default(); @@ -743,6 +782,9 @@ state->ui->text_size = GTK_BUTTON(gtk_builder_get_object(builder, "text-size-button")); + state->ui->fill_shape = GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "fill-shape-toggle-button")); + state->ui->brush = brush; state->ui->text = text; state->ui->rectangle = rectangle; @@ -762,6 +804,38 @@ return true; } +static void set_paint_mode(struct swappy_state *state) { + switch (state->mode) { + case SWAPPY_PAINT_MODE_BRUSH: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(state->ui->brush), true); + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); + break; + case SWAPPY_PAINT_MODE_TEXT: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(state->ui->text), true); + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); + break; + case SWAPPY_PAINT_MODE_RECTANGLE: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(state->ui->rectangle), + true); + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), true); + break; + case SWAPPY_PAINT_MODE_ELLIPSE: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(state->ui->ellipse), true); + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), true); + break; + case SWAPPY_PAINT_MODE_ARROW: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(state->ui->arrow), true); + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); + break; + case SWAPPY_PAINT_MODE_BLUR: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(state->ui->blur), true); + gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); + break; + default: + break; + } +} + static bool init_gtk_window(struct swappy_state *state) { if (!state->original_image) { g_critical("original image not loaded"); @@ -776,10 +850,13 @@ return false; } + set_paint_mode(state); + update_ui_stroke_size_widget(state); update_ui_text_size_widget(state); update_ui_undo_redo(state); update_ui_panel_toggle_button(state); + update_ui_fill_shape_toggle_button(state); return true; } @@ -799,6 +876,7 @@ state->settings.a = 1; state->settings.w = state->config->line_size; state->settings.t = state->config->text_size; + state->mode = state->config->paint_mode; } static gint command_line_handler(GtkApplication *app, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/clipboard.c new/swappy-1.5.1/src/clipboard.c --- old/swappy-1.4.0/src/clipboard.c 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/clipboard.c 2022-11-20 22:50:09.000000000 +0100 @@ -82,5 +82,9 @@ g_object_unref(pixbuf); + if (state->config->early_exit) { + gtk_main_quit(); + } + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/config.c new/swappy-1.5.1/src/config.c --- old/swappy-1.4.0/src/config.c 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/config.c 2022-11-20 22:50:09.000000000 +0100 @@ -19,6 +19,9 @@ g_info("line_size: %d", config->line_size); g_info("text_font: %s", config->text_font); g_info("text_size: %d", config->text_size); + g_info("paint_mode: %d", config->paint_mode); + g_info("early_exit: %d", config->early_exit); + g_info("fill_shape: %d", config->fill_shape); } static char *get_default_save_dir() { @@ -75,6 +78,9 @@ gchar *save_dir_expanded = NULL; guint64 line_size, text_size; gchar *text_font = NULL; + gchar *paint_mode = NULL; + gboolean early_exit; + gboolean fill_shape; GError *error = NULL; if (file == NULL) { @@ -97,7 +103,11 @@ save_dir_expanded = g_strdup(p.we_wordv[0]); wordfree(&p); if (!save_dir_expanded || !folder_exists(save_dir_expanded)) { - g_warning("save_dir: %s is not a valid directory", save_dir_expanded); + g_info("save_dir: attempting to create non-existent directory '%s'", + save_dir_expanded); + if (g_mkdir_with_parents(save_dir_expanded, 0755)) { + g_warning("save_dir: failed to create '%s'", save_dir_expanded); + } } g_free(save_dir); @@ -176,6 +186,52 @@ error = NULL; } + early_exit = g_key_file_get_boolean(gkf, group, "early_exit", &error); + + if (error == NULL) { + config->early_exit = early_exit; + } else { + g_info("early_exit is missing in %s (%s)", file, error->message); + g_error_free(error); + error = NULL; + } + + paint_mode = g_key_file_get_string(gkf, group, "paint_mode", &error); + + if (error == NULL) { + if (g_ascii_strcasecmp(paint_mode, "brush") == 0) { + config->paint_mode = SWAPPY_PAINT_MODE_BRUSH; + } else if (g_ascii_strcasecmp(paint_mode, "text") == 0) { + config->paint_mode = SWAPPY_PAINT_MODE_TEXT; + } else if (g_ascii_strcasecmp(paint_mode, "rectangle") == 0) { + config->paint_mode = SWAPPY_PAINT_MODE_RECTANGLE; + } else if (g_ascii_strcasecmp(paint_mode, "ellipse") == 0) { + config->paint_mode = SWAPPY_PAINT_MODE_ELLIPSE; + } else if (g_ascii_strcasecmp(paint_mode, "arrow") == 0) { + config->paint_mode = SWAPPY_PAINT_MODE_ARROW; + } else if (g_ascii_strcasecmp(paint_mode, "blur") == 0) { + config->paint_mode = SWAPPY_PAINT_MODE_BLUR; + } else { + g_warning( + "paint_mode is not a valid value: %s - see man page for details", + paint_mode); + } + } else { + g_info("paint_mode is missing in %s (%s)", file, error->message); + g_error_free(error); + error = NULL; + } + + fill_shape = g_key_file_get_boolean(gkf, group, "fill_shape", &error); + + if (error == NULL) { + config->fill_shape = fill_shape; + } else { + g_info("fill_shape is missing in %s (%s)", file, error->message); + g_error_free(error); + error = NULL; + } + g_key_file_free(gkf); } @@ -190,6 +246,9 @@ config->text_font = g_strdup(CONFIG_TEXT_FONT_DEFAULT); config->text_size = CONFIG_TEXT_SIZE_DEFAULT; config->show_panel = CONFIG_SHOW_PANEL_DEFAULT; + config->paint_mode = CONFIG_PAINT_MODE_DEFAULT; + config->early_exit = CONFIG_EARLY_EXIT_DEFAULT; + config->fill_shape = CONFIG_FILL_SHAPE_DEFAULT; } void config_load(struct swappy_state *state) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/paint.c new/swappy-1.5.1/src/paint.c --- old/swappy-1.4.0/src/paint.c 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/paint.c 2022-11-20 22:50:09.000000000 +0100 @@ -118,7 +118,10 @@ paint->content.shape.a = a; paint->content.shape.w = w; paint->content.shape.type = type; - paint->content.shape.operation = SWAPPY_PAINT_SHAPE_OPERATION_STROKE; + if (state->config->fill_shape) + paint->content.shape.operation = SWAPPY_PAINT_SHAPE_OPERATION_FILL; + else + paint->content.shape.operation = SWAPPY_PAINT_SHAPE_OPERATION_STROKE; break; case SWAPPY_PAINT_MODE_TEXT: paint->can_draw = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/po/de.po new/swappy-1.5.1/src/po/de.po --- old/swappy-1.4.0/src/po/de.po 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/po/de.po 2022-11-20 22:50:09.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: swappy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-21 21:57-0400\n" +"POT-Creation-Date: 2022-11-18 16:07-0500\n" "PO-Revision-Date: 2020-11-19 18:03+0300\n" "Last-Translator: Brodi <me(a)brodi.ml>\n" "Language-Team: none\n" @@ -17,34 +17,42 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: res/swappy.glade:455 +#: res/swappy.glade:456 msgid "Line Width" msgstr "Linienst��rke" -#: res/swappy.glade:525 +#: res/swappy.glade:526 msgid "Text Size" msgstr "Textgr��e" -#: res/swappy.glade:641 +#: res/swappy.glade:592 +msgid "Fill shape" +msgstr "" + +#: res/swappy.glade:597 +msgid "Toggle shape filling" +msgstr "" + +#: res/swappy.glade:671 msgid "Toggle Paint Panel" msgstr "Farbtafel umschalten" -#: res/swappy.glade:667 +#: res/swappy.glade:697 msgid "Undo Last Paint" msgstr "Letzte Bemalung r��ckg��ngig machen" -#: res/swappy.glade:686 +#: res/swappy.glade:716 msgid "Redo Previous Paint" msgstr "Vorherige Bemalung wiederherstellen" -#: res/swappy.glade:705 +#: res/swappy.glade:735 msgid "Clear Paints" msgstr "Bemalung l��schen" -#: res/swappy.glade:733 +#: res/swappy.glade:763 msgid "Copy Surface" msgstr "Fl��che kopieren" -#: res/swappy.glade:749 +#: res/swappy.glade:779 msgid "Save Surface" msgstr "Fl��che speichern" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/po/en.po new/swappy-1.5.1/src/po/en.po --- old/swappy-1.4.0/src/po/en.po 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/po/en.po 2022-11-20 22:50:09.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: swappy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-21 21:57-0400\n" +"POT-Creation-Date: 2022-11-18 16:07-0500\n" "PO-Revision-Date: 2020-06-21 21:57-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -17,34 +17,42 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: res/swappy.glade:455 +#: res/swappy.glade:456 msgid "Line Width" msgstr "Line Width" -#: res/swappy.glade:525 +#: res/swappy.glade:526 msgid "Text Size" msgstr "Text Size" -#: res/swappy.glade:641 +#: res/swappy.glade:592 +msgid "Fill shape" +msgstr "Fill shape" + +#: res/swappy.glade:597 +msgid "Toggle shape filling" +msgstr "Toggle shape filling" + +#: res/swappy.glade:671 msgid "Toggle Paint Panel" msgstr "Toggle Paint Panel" -#: res/swappy.glade:667 +#: res/swappy.glade:697 msgid "Undo Last Paint" msgstr "Undo Last Paint" -#: res/swappy.glade:686 +#: res/swappy.glade:716 msgid "Redo Previous Paint" msgstr "Redo Previous Paint" -#: res/swappy.glade:705 +#: res/swappy.glade:735 msgid "Clear Paints" msgstr "Clear Paints" -#: res/swappy.glade:733 +#: res/swappy.glade:763 msgid "Copy Surface" msgstr "Copy Surface" -#: res/swappy.glade:749 +#: res/swappy.glade:779 msgid "Save Surface" msgstr "Save Surface" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/po/fr.po new/swappy-1.5.1/src/po/fr.po --- old/swappy-1.4.0/src/po/fr.po 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/po/fr.po 2022-11-20 22:50:09.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: swappy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-20 21:17-0500\n" +"POT-Creation-Date: 2022-11-18 16:07-0500\n" "PO-Revision-Date: 2021-02-20 21:00-0500\n" "Last-Translator: Jeremy Attali <contact(a)jtheoof.me>\n" "Language-Team: none\n" @@ -17,34 +17,42 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: res/swappy.glade:455 +#: res/swappy.glade:456 msgid "Line Width" msgstr "Epaisseur de ligne" -#: res/swappy.glade:525 +#: res/swappy.glade:526 msgid "Text Size" msgstr "Taille du texte" -#: res/swappy.glade:641 +#: res/swappy.glade:592 +msgid "Fill shape" +msgstr "Remplir la forme" + +#: res/swappy.glade:597 +msgid "Toggle shape filling" +msgstr "Activer/D��sactiver le remplissage de forme" + +#: res/swappy.glade:671 msgid "Toggle Paint Panel" msgstr "Afficher/Cacher le panneau de peinture" -#: res/swappy.glade:667 +#: res/swappy.glade:697 msgid "Undo Last Paint" msgstr "Annuler la derni��re peinture" -#: res/swappy.glade:686 +#: res/swappy.glade:716 msgid "Redo Previous Paint" msgstr "R��tablir la derni��re peinture" -#: res/swappy.glade:705 +#: res/swappy.glade:735 msgid "Clear Paints" msgstr "Supprimer les peintures" -#: res/swappy.glade:733 +#: res/swappy.glade:763 msgid "Copy Surface" msgstr "Copier la surface" -#: res/swappy.glade:749 +#: res/swappy.glade:779 msgid "Save Surface" msgstr "Sauvegarder la surface" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/po/pt_BR.po new/swappy-1.5.1/src/po/pt_BR.po --- old/swappy-1.4.0/src/po/pt_BR.po 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/po/pt_BR.po 2022-11-20 22:50:09.000000000 +0100 @@ -7,45 +7,53 @@ msgstr "" "Project-Id-Version: swappy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-21 21:57-0400\n" +"POT-Creation-Date: 2022-11-18 16:07-0500\n" "PO-Revision-Date: 2021-02-14 20:38-0300\n" +"Last-Translator: Gustavo Costa <xfgusta(a)gmail.com>\n" "Language-Team: \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.4.2\n" -"Last-Translator: Gustavo Costa <xfgusta(a)gmail.com>\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: pt_BR\n" -#: res/swappy.glade:455 +#: res/swappy.glade:456 msgid "Line Width" msgstr "Espessura da linha" -#: res/swappy.glade:525 +#: res/swappy.glade:526 msgid "Text Size" msgstr "Tamanho do texto" -#: res/swappy.glade:641 +#: res/swappy.glade:592 +msgid "Fill shape" +msgstr "" + +#: res/swappy.glade:597 +msgid "Toggle shape filling" +msgstr "" + +#: res/swappy.glade:671 msgid "Toggle Paint Panel" msgstr "Alternar painel de pintura" -#: res/swappy.glade:667 +#: res/swappy.glade:697 msgid "Undo Last Paint" msgstr "Desfazer ��ltima pintura" -#: res/swappy.glade:686 +#: res/swappy.glade:716 msgid "Redo Previous Paint" msgstr "Refazer pintura anterior" -#: res/swappy.glade:705 +#: res/swappy.glade:735 msgid "Clear Paints" msgstr "Limpar pinturas" -#: res/swappy.glade:733 +#: res/swappy.glade:763 msgid "Copy Surface" msgstr "Copiar superf��cie" -#: res/swappy.glade:749 +#: res/swappy.glade:779 msgid "Save Surface" msgstr "Salvar superf��cie" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/po/swappy.pot new/swappy-1.5.1/src/po/swappy.pot --- old/swappy-1.4.0/src/po/swappy.pot 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/po/swappy.pot 2022-11-20 22:50:09.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: swappy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-21 21:57-0400\n" +"POT-Creation-Date: 2022-11-18 16:07-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -17,34 +17,42 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: res/swappy.glade:455 +#: res/swappy.glade:456 msgid "Line Width" msgstr "" -#: res/swappy.glade:525 +#: res/swappy.glade:526 msgid "Text Size" msgstr "" -#: res/swappy.glade:641 +#: res/swappy.glade:592 +msgid "Fill shape" +msgstr "" + +#: res/swappy.glade:597 +msgid "Toggle shape filling" +msgstr "" + +#: res/swappy.glade:671 msgid "Toggle Paint Panel" msgstr "" -#: res/swappy.glade:667 +#: res/swappy.glade:697 msgid "Undo Last Paint" msgstr "" -#: res/swappy.glade:686 +#: res/swappy.glade:716 msgid "Redo Previous Paint" msgstr "" -#: res/swappy.glade:705 +#: res/swappy.glade:735 msgid "Clear Paints" msgstr "" -#: res/swappy.glade:733 +#: res/swappy.glade:763 msgid "Copy Surface" msgstr "" -#: res/swappy.glade:749 +#: res/swappy.glade:779 msgid "Save Surface" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/po/tr.po new/swappy-1.5.1/src/po/tr.po --- old/swappy-1.4.0/src/po/tr.po 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/po/tr.po 2022-11-20 22:50:09.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: swappy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-21 21:57-0400\n" +"POT-Creation-Date: 2022-11-18 16:07-0500\n" "PO-Revision-Date: 2020-10-16 22:00+0300\n" "Last-Translator: O��uz Ersen <oguzersen(a)protonmail.com>\n" "Language-Team: none\n" @@ -17,34 +17,42 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: res/swappy.glade:455 +#: res/swappy.glade:456 msgid "Line Width" msgstr "��izgi Geni��li��i" -#: res/swappy.glade:525 +#: res/swappy.glade:526 msgid "Text Size" msgstr "Metin Boyutu" -#: res/swappy.glade:641 +#: res/swappy.glade:592 +msgid "Fill shape" +msgstr "" + +#: res/swappy.glade:597 +msgid "Toggle shape filling" +msgstr "" + +#: res/swappy.glade:671 msgid "Toggle Paint Panel" msgstr "Boyama Panelini A��/Kapat" -#: res/swappy.glade:667 +#: res/swappy.glade:697 msgid "Undo Last Paint" msgstr "Son Boyamay�� Geri Al" -#: res/swappy.glade:686 +#: res/swappy.glade:716 msgid "Redo Previous Paint" msgstr "��nceki Boyamay�� Tekrarla" -#: res/swappy.glade:705 +#: res/swappy.glade:735 msgid "Clear Paints" msgstr "Boyamalar�� Temizle" -#: res/swappy.glade:733 +#: res/swappy.glade:763 msgid "Copy Surface" msgstr "Y��zeyi Kopyala" -#: res/swappy.glade:749 +#: res/swappy.glade:779 msgid "Save Surface" msgstr "Y��zeyi Kaydet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/src/render.c new/swappy-1.5.1/src/render.c --- old/swappy-1.4.0/src/render.c 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/src/render.c 2022-11-20 22:50:09.000000000 +0100 @@ -310,7 +310,19 @@ cairo_scale(cr, x / n, y / n); cairo_arc(cr, 0, 0, r, 0, 2 * G_PI); cairo_set_matrix(cr, &save_matrix); - cairo_stroke(cr); + + switch (shape.operation) { + case SWAPPY_PAINT_SHAPE_OPERATION_STROKE: + cairo_stroke(cr); + break; + case SWAPPY_PAINT_SHAPE_OPERATION_FILL: + cairo_fill(cr); + break; + default: + cairo_stroke(cr); + break; + } + cairo_close_path(cr); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.4.0/swappy.1.scd new/swappy-1.5.1/swappy.1.scd --- old/swappy-1.4.0/swappy.1.scd 2021-09-06 16:36:15.000000000 +0200 +++ new/swappy-1.5.1/swappy.1.scd 2022-11-20 22:50:09.000000000 +0100 @@ -63,14 +63,21 @@ line_size=5 text_size=20 text_font=sans-serif + paint_mode=brush + early_exit=false + fill_shape=false ``` -- *save_dir* is where swappshots will be saved, can contain env variables and must exist in your filesystem +- *save_dir* is where swappshots will be saved, can contain env variables, when it does not exist, swappy attempts to create it first, but does not abort if directory creation fails - *save_filename_format* is the filename template, if it contains a date format, this will be parsed into a timestamp. Format is detailed in strftime(3). If this date format is missing, filename will have no timestamp - *show_panel* is used to toggle the paint panel on or off upon startup - *line_size* is the default line size (must be between 1 and 50) - *text_size* is the default text size (must be between 10 and 50) - *text_font* is the font used to render text, its format is pango friendly +- *paint_mode* is the mode activated at application start (must be one of: brush|text|rectangle|ellipse|arrow|blur, matching is case-insensitive) +- *early_exit* is used to make the application exit after saving the picture or copying it to the clipboard +- *fill_shape* is used to toggle shape filling (for the rectangle and ellipsis tools) on or off upon startup + # KEY BINDINGS @@ -94,6 +101,7 @@ - *Minus*: Reduce Stroke Size - *Plus*: Increase Stroke Size - *Equal*: Reset Stroke Size +- *f*: Toggle Shape Filling - *k*: Clear Paints (cannot be undone) ## MODIFIERS

1 0

commit ouch for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ouch for openSUSE:Factory checked in at 2022-12-01 17:21:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ouch (Old) and /work/SRC/openSUSE:Factory/.ouch.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ouch" Thu Dec 1 17:21:24 2022 rev:3 rq:1039268 version:0.4.0~0 Changes: -------- --- /work/SRC/openSUSE:Factory/ouch/ouch.changes 2022-11-05 14:46:57.626660819 +0100 +++ /work/SRC/openSUSE:Factory/.ouch.new.1835/ouch.changes 2022-12-01 17:22:21.546605963 +0100 @@ -1,0 +2,12 @@ +Thu Dec 1 09:11:10 UTC 2022 - Michael Vetter <mvetter(a)suse.com> + +- Update to 0.4.0: + * More than 15 bug fixes (including major bugs). + * New accessible mode. + * Added list command. + * Added support for .lz4 and .sz (snappy). + * Infer file type while decompressing via MIME types. + * New flags to ignore hidden files and .gitignore'd files when compressing. + * Flag -o/--output was renamed to -d/--dir. + +------------------------------------------------------------------- Old: ---- ouch-0.3.1~0.tar.xz New: ---- ouch-0.4.0~0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ouch.spec ++++++ --- /var/tmp/diff_new_pack.rqpFYv/_old 2022-12-01 17:22:27.278637306 +0100 +++ /var/tmp/diff_new_pack.rqpFYv/_new 2022-12-01 17:22:27.282637328 +0100 @@ -17,7 +17,7 @@ Name: ouch -Version: 0.3.1~0 +Version: 0.4.0~0 Release: 0 Summary: Compression and decompression utility for the terminal License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rqpFYv/_old 2022-12-01 17:22:27.322637546 +0100 +++ /var/tmp/diff_new_pack.rqpFYv/_new 2022-12-01 17:22:27.326637568 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/ouch-org/ouch.git</param> <param name="versionformat">@PARENT_TAG@~@TAG_OFFSET@</param> <param name="scm">git</param> - <param name="revision">0.3.1</param> + <param name="revision">0.4.0</param> <param name="match-tag">*</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> ++++++ ouch-0.3.1~0.tar.xz -> ouch-0.4.0~0.tar.xz ++++++ ++++ 6709 lines of diff (skipped) ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/ouch/vendor.tar.xz /work/SRC/openSUSE:Factory/.ouch.new.1835/vendor.tar.xz differ: char 25, line 1

1 0

commit terraform for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package terraform for openSUSE:Factory checked in at 2022-12-01 17:21:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terraform (Old) and /work/SRC/openSUSE:Factory/.terraform.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "terraform" Thu Dec 1 17:21:20 2022 rev:46 rq:1039262 version:1.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/terraform/terraform.changes 2022-11-18 15:44:21.678780398 +0100 +++ /work/SRC/openSUSE:Factory/.terraform.new.1835/terraform.changes 2022-12-01 17:22:15.606573482 +0100 @@ -1,0 +2,8 @@ +Thu Dec 1 05:48:20 UTC 2022 - Johannes Kastl <kastl(a)b1-systems.de> + +- update to 1.3.6: + * BUG FIXES: + - Terraform could crash if an orphaned resource instance was deleted externally and had condition checks in the configuration (#32246) + - Module output changes were being removed and re-added to the stored plan, impacting performance with large numbers of outputs (#32307) + +------------------------------------------------------------------- Old: ---- terraform-1.3.5.obscpio terraform-1.3.5.tar.gz New: ---- terraform-1.3.6.obscpio terraform-1.3.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terraform.spec ++++++ --- /var/tmp/diff_new_pack.aYn5pO/_old 2022-12-01 17:22:19.242593365 +0100 +++ /var/tmp/diff_new_pack.aYn5pO/_new 2022-12-01 17:22:19.278593562 +0100 @@ -17,7 +17,7 @@ Name: terraform -Version: 1.3.5 +Version: 1.3.6 Release: 0 Summary: Tool for building infrastructure safely and efficiently License: MPL-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.aYn5pO/_old 2022-12-01 17:22:19.558595092 +0100 +++ /var/tmp/diff_new_pack.aYn5pO/_new 2022-12-01 17:22:19.570595158 +0100 @@ -3,8 +3,8 @@ <param name="url">https://github.com/hashicorp/terraform</param> <param name="scm">git</param> <param name="filename">terraform</param> - <param name="versionformat">1.3.5</param> - <param name="revision">v1.3.5</param> + <param name="versionformat">1.3.6</param> + <param name="revision">v1.3.6</param> <param name="exclude">.git</param> </service> <service name="tar" mode="disabled"/> @@ -16,7 +16,7 @@ <param name="basename">terraform</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">terraform-1.3.5.tar.gz</param> + <param name="archive">terraform-1.3.6.tar.gz</param> </service> </services> ++++++ terraform-1.3.5.obscpio -> terraform-1.3.6.obscpio ++++++ /work/SRC/openSUSE:Factory/terraform/terraform-1.3.5.obscpio /work/SRC/openSUSE:Factory/.terraform.new.1835/terraform-1.3.6.obscpio differ: char 49, line 1 ++++++ terraform-1.3.5.tar.gz -> terraform-1.3.6.tar.gz ++++++ ++++ 6885 lines of diff (skipped) ++++++ terraform.obsinfo ++++++ --- /var/tmp/diff_new_pack.aYn5pO/_old 2022-12-01 17:22:21.362604957 +0100 +++ /var/tmp/diff_new_pack.aYn5pO/_new 2022-12-01 17:22:21.366604978 +0100 @@ -1,5 +1,5 @@ name: terraform -version: 1.3.5 -mtime: 1668714155 -commit: 6e904a14881063158833a0245f113559a120c590 +version: 1.3.6 +mtime: 1669840974 +commit: 603f48b2a1e27f102e4f53c0fae53cd591bb03ae ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/terraform/vendor.tar.gz /work/SRC/openSUSE:Factory/.terraform.new.1835/vendor.tar.gz differ: char 5, line 1

1 0

commit direnv for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package direnv for openSUSE:Factory checked in at 2022-12-01 17:21:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/direnv (Old) and /work/SRC/openSUSE:Factory/.direnv.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "direnv" Thu Dec 1 17:21:18 2022 rev:13 rq:1039259 version:2.32.1 Changes: -------- --- /work/SRC/openSUSE:Factory/direnv/direnv.changes 2022-05-09 18:45:30.428306256 +0200 +++ /work/SRC/openSUSE:Factory/.direnv.new.1835/direnv.changes 2022-12-01 17:22:10.918547848 +0100 @@ -1,0 +2,12 @@ +Thu Nov 24 15:48:26 UTC 2022 - Andrea Manzini <andrea.manzini(a)suse.com> + +- Update to version 2.32.1 + * Support custom VIRTUAL_ENV for layout_python + * Add gha shell for GitHub Actions + * allow conda environment names to be detected from environment.yml + * source_up_if_exists: A strict_env compatible version of source_up + * Expand ~/ in whitelist paths + * Add "block" and "revoke" as aliases of the "deny" command + * Add "permit" and "grant" as aliases of the "allow" command + +------------------------------------------------------------------- Old: ---- direnv-2.31.0.tar.gz New: ---- direnv-2.32.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ direnv.spec ++++++ --- /var/tmp/diff_new_pack.WapjeT/_old 2022-12-01 17:22:11.562551370 +0100 +++ /var/tmp/diff_new_pack.WapjeT/_new 2022-12-01 17:22:11.566551392 +0100 @@ -18,7 +18,7 @@ %define gopackagepath github.com/direnv/direnv Name: direnv -Version: 2.31.0 +Version: 2.32.1 Release: 0 Summary: Environment switcher for shells License: MIT ++++++ direnv-2.31.0.tar.gz -> direnv-2.32.1.tar.gz ++++++ ++++ 2037 lines of diff (skipped) ++++++ vendor.tar.gz ++++++ ++++ 11549 lines of diff (skipped)

1 0

commit etckeeper for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package etckeeper for openSUSE:Factory checked in at 2022-12-01 17:21:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/etckeeper (Old) and /work/SRC/openSUSE:Factory/.etckeeper.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "etckeeper" Thu Dec 1 17:21:19 2022 rev:10 rq:1039260 version:1.18.18 Changes: -------- --- /work/SRC/openSUSE:Factory/etckeeper/etckeeper.changes 2022-10-14 15:42:31.979917768 +0200 +++ /work/SRC/openSUSE:Factory/.etckeeper.new.1835/etckeeper.changes 2022-12-01 17:22:12.190554804 +0100 @@ -1,0 +2,7 @@ +Thu Nov 17 13:52:20 UTC 2022 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Do not have the main package recommend the bash-completion + sub-package, but rather have the subpackage supplement the + combination of etckeeper and bash-completion. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ etckeeper.spec ++++++ --- /var/tmp/diff_new_pack.OKFqTt/_old 2022-12-01 17:22:12.634557232 +0100 +++ /var/tmp/diff_new_pack.OKFqTt/_new 2022-12-01 17:22:12.638557253 +0100 @@ -2,7 +2,7 @@ # # spec file for package etckeeper # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2014 Mitsutoshi NAKANO <bkbin005(a)rinku.zaq.ne.jp> # Copyright (c) 2013 Pascal Bleser <pascal.bleser(a)opensuse.org> # @@ -62,9 +62,8 @@ BuildRequires: bzr %endif -Recommends: git-core -Recommends: %{name}-bash-completion = %{version}-%{release} Recommends: %{name}-zypp-plugin = %{version}-%{release} +Recommends: git-core %if %{with bzr} Recommends: %{name}-bzr = %{version}-%{release} %endif @@ -126,6 +125,7 @@ Group: System/Shells Requires: bash-completion Requires: etckeeper = %{version}-%{release} +Supplements: (%{name} and bash-completion) %description bash-completion Bash command line completion support for %{name}.

1 0

commit yank for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yank for openSUSE:Factory checked in at 2022-12-01 17:21:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yank (Old) and /work/SRC/openSUSE:Factory/.yank.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yank" Thu Dec 1 17:21:18 2022 rev:4 rq:1039257 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yank/yank.changes 2019-09-19 15:53:08.579265229 +0200 +++ /work/SRC/openSUSE:Factory/.yank.new.1835/yank.changes 2022-12-01 17:22:10.182543824 +0100 @@ -1,0 +2,6 @@ +Tue Nov 29 08:38:56 UTC 2022 - Andrea Manzini <andrea.manzini(a)suse.com> + +- Version 1.3.0 + - Add opt-in selection of one and only field. + +------------------------------------------------------------------- Old: ---- yank-1.2.0.tar.gz New: ---- yank-1.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yank.spec ++++++ --- /var/tmp/diff_new_pack.nbCaEm/_old 2022-12-01 17:22:10.670546492 +0100 +++ /var/tmp/diff_new_pack.nbCaEm/_new 2022-12-01 17:22:10.674546514 +0100 @@ -1,7 +1,7 @@ # # spec file for package yank # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yank -Version: 1.2.0 +Version: 1.3.0 Release: 0 Summary: Tool for selecting and copying text from stdin without a mouse License: MIT ++++++ yank-1.2.0.tar.gz -> yank-1.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yank-1.2.0/.gitignore new/yank-1.3.0/.gitignore --- old/yank-1.2.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/yank-1.3.0/.gitignore 2022-06-18 08:25:45.000000000 +0200 @@ -0,0 +1,2 @@ +/yank.o +/yank diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yank-1.2.0/CHANGELOG.md new/yank-1.3.0/CHANGELOG.md --- old/yank-1.2.0/CHANGELOG.md 2019-08-12 10:27:17.000000000 +0200 +++ new/yank-1.3.0/CHANGELOG.md 2022-06-18 08:25:45.000000000 +0200 @@ -1,5 +1,12 @@ -v1.2.0 - 2019-08-12 -=================== +# v1.3.0 - 2022-06-18 + +## News + +- Add opt-in selection of one and only field. + (d8b2024) + (Anton Lindqvist) + +# v1.2.0 - 2019-08-12 - Add openSUSE installation instructions to README. (c4ce72e) @@ -17,8 +24,7 @@ (dffe105) (Anton Lindqvist) -v1.1.0 - 2018-11-01 -=================== +# v1.1.0 - 2018-11-01 - Fix compilation on FreeBSD by passing preprocessor macros in `CFLAGS` as opposed of using `CPPFLAGS` which is not honored. @@ -33,8 +39,7 @@ (8dff9f3) (Tobias Kortkamp) -v1.0.0 - 2018-09-09 -=================== +# v1.0.0 - 2018-09-09 - Fix a broken reference and improve the semantics of the manual. (f99c6ed, 7a964c1) @@ -52,8 +57,7 @@ instead of relying on the ones created by GitHub. (99a91e2) -v0.8.3 - 2017-06-05 -=================== +# v0.8.3 - 2017-06-05 - Fix typo in README and man page (fe45fc1) (Jakub Wilk) @@ -68,13 +72,11 @@ - `snprintf(3)` can return `-1` (9ecb1f5) (Anton Lindqvist) -v0.8.2 - 2017-02-19 -=================== +# v0.8.2 - 2017-02-19 - Ensure `make clean` always exits with success (47a0ee9) (S��bastien Delafond) -v0.8.1 - 2017-02-18 -=================== +# v0.8.1 - 2017-02-18 - Add Fedora install instructions to README (#33, #34, 8d90aae) (Nemanja Milosevic) @@ -82,8 +84,7 @@ - Allow the name of the compiled binary to be changed using the `PROG` variable (#35, #36, 1c43c46) (Nemanja Milosevic) -v0.8.0 - 2017-01-17 -=================== +# v0.8.0 - 2017-01-17 - Update man page and README (9eac46f, 252a419) (Anton Lindqvist) @@ -93,8 +94,7 @@ - Add support for `DESTDIR` to Makefile (77cf987) (Anton Lindqvist) -v0.7.1 - 2016-10-08 -=================== +# v0.7.1 - 2016-10-08 - Update man page (2e78c28, a5cdba9) (Anton Lindqvist) @@ -110,22 +110,19 @@ - Refactoring and cleanup (2017de6) (Anton Lindqvist) -v0.7.0 - 2016-05-18 -=================== +# v0.7.0 - 2016-05-18 - Add MANPREFIX support to installation task (Anton Lindqvist) - Pledge on OpenBSD (Anton Lindqvist) -v0.6.4 - 2016-03-13 -=================== +# v0.6.4 - 2016-03-13 - Add Vi key bindings (Samson Yeung) - Fix wrong exit code on yank command failure (Anton Lindqvist) -v0.6.3 - 2016-02-20 -=================== +# v0.6.3 - 2016-02-20 - Exit with correct code on invocation failure (Anton Lindqvist) @@ -133,24 +130,20 @@ - Fix endless loop while executing the supplied regex (Anton Lindqvist) -v0.6.2 - 2015-12-15 -=================== +# v0.6.2 - 2015-12-15 - Fix non string literal compilation warning (Anton Lindqvist) -v0.6.1 - 2015-12-15 -=================== +# v0.6.1 - 2015-12-15 - Use more common save/restore cursor capabilities (Eli Young) -v0.6.0 - 2015-12-06 -=================== +# v0.6.0 - 2015-12-06 - Add regex delimiter support using the `-g` option and `-i` to make the pattern case-insensitive (Anton Lindqvist) -v0.5.0 - 2015-11-12 -=================== +# v0.5.0 - 2015-11-12 - Add arrow key bindings (Anton Lindqvist) @@ -158,8 +151,7 @@ - Add OS X installation instructions (Carl Dong) -v0.4.1 - 2015-10-19 -=================== +# v0.4.1 - 2015-10-19 - Fix number of lines in input bug (Anton Lindqvist) @@ -167,8 +159,7 @@ - Fix description in man page (Jeremiah LaRocco) -v0.4.0 - 2015-10-10 -=================== +# v0.4.0 - 2015-10-10 - Always recognize carriage return as a delimiter (Anton Lindqvist) @@ -178,20 +169,17 @@ - Fix number of lines in input bug (Anton Lindqvist) -v0.3.1 - 2015-09-24 -=================== +# v0.3.1 - 2015-09-24 - Fix moving beyond input bug (Anton Lindqvist) -v0.3.0 - 2015-09-21 -=================== +# v0.3.0 - 2015-09-21 - Add `-x` option used to enable usage of the alternate screen (Anton Lindqvist) - Fix `style(9)` violations (Anton Lindqvist) -v0.2.0 - 2015-09-10 -=================== +# v0.2.0 - 2015-09-10 - Add `-l` option used to yank a whole line (Anton Lindqvist) @@ -203,12 +191,10 @@ - Fix number of lines in input bug (Anton Lindqvist) -v0.1.1 - 2015-08-28 -=================== +# v0.1.1 - 2015-08-28 - Add support for linking against musl (Anton Lindqvist) -v0.1.0 - 2015-08-24 -=================== +# v0.1.0 - 2015-08-24 - Initial commit (Anton Lindqvist) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yank-1.2.0/LICENSE new/yank-1.3.0/LICENSE --- old/yank-1.2.0/LICENSE 2019-08-12 10:27:17.000000000 +0200 +++ new/yank-1.3.0/LICENSE 2022-06-18 08:25:45.000000000 +0200 @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018 Anton Lindqvist +Copyright (c) 2022 Anton Lindqvist Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yank-1.2.0/Makefile new/yank-1.3.0/Makefile --- old/yank-1.2.0/Makefile 2019-08-12 10:27:17.000000000 +0200 +++ new/yank-1.3.0/Makefile 2022-06-18 08:25:45.000000000 +0200 @@ -1,4 +1,4 @@ -VERSION= 1.2.0 +VERSION= 1.3.0 YANKCMD= xsel @@ -8,6 +8,8 @@ PROG= yank OBJS= yank.o +KNFMT+= yank.c + INSTALL_PROGRAM= install -s -m 0755 INSTALL_MAN= install -m 0644 @@ -28,28 +30,36 @@ clean: rm -f ${PROG} ${OBJS} +.PHONY: clean dist: set -e; \ - d=${PROG}-${VERSION}; \ + d=yank-${VERSION}; \ mkdir $$d; \ for f in ${DISTFILES}; do \ mkdir -p $$d/`dirname $$f`; \ - cp $$f $$d/$$f; \ + cp -p ${.CURDIR}/$$f $$d/$$f; \ done; \ - tar czvf $$d.tar.gz $$d; \ - sha256 $$d.tar.gz >$$d.sha256; \ + find $$d -type d -exec touch -r ${.CURDIR}/Makefile {} \;; \ + tar czvf ${.CURDIR}/$$d.tar.gz $$d; \ + (cd ${.CURDIR}; sha256 $$d.tar.gz >$$d.sha256); \ rm -r $$d +.PHONY: dist -distclean: clean - rm -f ${PROG}-${VERSION}.tar.gz ${PROG}-${VERSION}.sha256 +format: + cd ${.CURDIR} && knfmt -is ${KNFMT} +.PHONY: format install: ${PROG} @mkdir -p ${DESTDIR}${PREFIX}/bin @mkdir -p ${DESTDIR}${MANPREFIX}/man1 ${INSTALL_PROGRAM} ${PROG} ${DESTDIR}${PREFIX}/bin ${INSTALL_MAN} yank.1 ${DESTDIR}${MANPREFIX}/man1 +.PHONY: install -.PHONY: all clean dist distclean install +lint: + cd ${.CURDIR} && mandoc -Tlint -Wstyle yank.1 + cd ${.CURDIR} && knfmt -ds ${KNFMT} +.PHONY: lint -include config.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yank-1.2.0/README.md new/yank-1.3.0/README.md --- old/yank-1.2.0/README.md 2019-08-12 10:27:17.000000000 +0200 +++ new/yank-1.3.0/README.md 2022-06-18 08:25:45.000000000 +0200 @@ -81,8 +81,6 @@ ### Debian -On testing and unstable: - ```sh $ sudo apt-get install yank ``` @@ -112,12 +110,18 @@ $ zypper install yank ``` -### macOS +### macOS via Homebrew ```sh $ brew install yank ``` +### macOS via MacPorts + +```sh +$ sudo port install yank +``` + ### FreeBSD ```sh @@ -154,7 +158,7 @@ ## License -Copyright (c) 2018 Anton Lindqvist. +Copyright (c) 2015-2022 Anton Lindqvist. Distributed under the MIT license. [xsel]: http://www.vergenet.net/~conrad/software/xsel/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yank-1.2.0/yank.1 new/yank-1.3.0/yank.1 --- old/yank-1.2.0/yank.1 2019-08-12 10:27:17.000000000 +0200 +++ new/yank-1.3.0/yank.1 2022-06-18 08:25:45.000000000 +0200 @@ -6,7 +6,7 @@ .Nd yank terminal output to clipboard .Sh SYNOPSIS .Nm -.Op Fl ilxv +.Op Fl 1ilxv .Op Fl d Ar delim .Op Fl g Ar pattern .Op Fl - Ar command Op Ar argument ... @@ -39,6 +39,10 @@ .Pp The options are as follows: .Bl -tag -width Ds +.It Fl 1 +If only one field is recognized, select it and invoke +.Ar command +without displaying the selection interface. .It Fl d Ar delim All input characters not present in .Ar delim @@ -131,7 +135,7 @@ Yank the selected field to the clipboard as opposed of the default primary clipboard: .Pp -.Dl $ yank -- xsel -b +.Dl $ yank \(em xsel -b .Sh DIAGNOSTICS .Ex -std .Sh SEE ALSO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yank-1.2.0/yank.c new/yank-1.3.0/yank.c --- old/yank-1.2.0/yank.c 2019-08-12 10:27:17.000000000 +0200 +++ new/yank-1.3.0/yank.c 2022-06-18 08:25:45.000000000 +0200 @@ -49,14 +49,14 @@ static char **yankargv; static struct { - size_t nmemb; - size_t size; - struct field *v; + size_t nmemb; + size_t size; + struct field *v; } f; static struct { - size_t size; - size_t nmemb; + size_t size; + size_t nmemb; char *v; } in; @@ -70,7 +70,7 @@ static void input(void) { - int n; + int n; in.size = BUFSIZ; if ((in.v = malloc(in.size)) == NULL) @@ -97,10 +97,10 @@ static char * strtopat(const char *s) { - const char *fmt = "[^%s\f\n\r\t]+"; - char *pat; - size_t len; - int n; + const char *fmt = "[^%s\f\n\r\t]+"; + char *pat; + size_t len; + int n; len = strlen(s) + strlen(fmt) + 1; if ((pat = malloc(len)) == NULL) @@ -120,7 +120,7 @@ static int fcmp(const struct field *f1, const struct field *f2) { - size_t s1, s2, e1, e2; + size_t e1, e2, s1, s2; s1 = f1->so - f1->lo, e1 = f1->eo - f1->lo; s2 = f2->so - f2->lo, e2 = f2->eo - f2->lo; @@ -131,8 +131,8 @@ static ssize_t xwrite(int fd, const char *s, size_t nmemb) { - ssize_t r; - size_t n; + ssize_t r; + size_t n; n = nmemb; do { @@ -149,9 +149,9 @@ static void yank(const char *s, size_t nmemb) { - int fd[2]; - int status; - pid_t pid; + int fd[2]; + int status; + pid_t pid; if (!isatty(1)) { if (xwrite(1, s, nmemb) == -1) @@ -198,7 +198,7 @@ static void tputs(const char *s) { - size_t n; + size_t n; n = strlen(s); twrite(s, n); @@ -207,12 +207,12 @@ static void tsetup(void) { - struct termios attr; - struct winsize ws; - regmatch_t r; - char *s, *e; - size_t m, n, w; - unsigned int i, j; + struct termios attr; + struct winsize ws; + regmatch_t r; + char *e, *s; + size_t m, n, w; + unsigned int i, j; if ((tty.rfd = open("/dev/tty", O_RDONLY)) == -1) err(1, "/dev/tty"); @@ -253,8 +253,8 @@ } f.nmemb = MIN(f.nmemb, j); /* Ensure last field does not exceed the terminal width. */ - if (n > 0 && f.nmemb > 0 - && f.v[f.nmemb - 1].eo - f.v[f.nmemb - 1].lo >= ws.ws_col) + if (n > 0 && f.nmemb > 0 && + f.v[f.nmemb - 1].eo - f.v[f.nmemb - 1].lo >= ws.ws_col) f.v[f.nmemb - 1].eo = f.v[f.nmemb - 1].lo + ws.ws_col - 1; /* Number of bytes to output. */ f.v[f.nmemb].lo = MAX(s - in.v - 1, 0); @@ -296,8 +296,8 @@ { static struct { const char *s; - int c; - } keys[] = { + int c; + } keys[] = { { "\n", KEY_ENTER }, { "\001", KEY_HOME }, /* Ctrl-A */ { "\003", KEY_TERM }, /* Ctrl-C */ @@ -317,9 +317,9 @@ { "\033[D", KEY_LEFT }, { NULL, 0 }, }; - char buf[4]; - ssize_t n; - int i; + char buf[4]; + ssize_t n; + int i; n = read(tty.rfd, buf, sizeof(buf) - 1); if (n == -1) @@ -338,8 +338,8 @@ static const struct field * tmain(void) { - size_t n; - int c, i, j, k; + size_t n; + int c, i, j, k; i = j = 0; n = f.v[f.nmemb].lo; @@ -376,24 +376,25 @@ j = i - 1; break; case KEY_DOWN: - j = i; - while (j < (ssize_t)f.nmemb && f.v[i].lo == f.v[j].lo) - j++; - if (j == (ssize_t)f.nmemb) - break; - /* FALLTHROUGH */ - if (0) { case KEY_UP: - k = i; - while (k && f.v[i].lo == f.v[k].lo) - k--; - j = k; - while (j && f.v[j - 1].lo == f.v[k].lo) - j--; - } - for (; fcmp(&f.v[i], &f.v[j]) < 0 - && f.v[j].lo == f.v[j + 1].lo; j++) - /* NOP */; + if (c == KEY_DOWN) { + j = i; + while (j < (ssize_t)f.nmemb && + f.v[i].lo == f.v[j].lo) + j++; + if (j == (ssize_t)f.nmemb) + break; + } else { + k = i; + while (k && f.v[i].lo == f.v[k].lo) + k--; + j = k; + while (j && f.v[j - 1].lo == f.v[k].lo) + j--; + } + for (; fcmp(&f.v[i], &f.v[j]) < 0 && + f.v[j].lo == f.v[j + 1].lo; j++) + continue; break; } if (j >= 0 && j < (ssize_t)f.nmemb) @@ -404,7 +405,7 @@ static void usage(void) { - fprintf(stderr, "usage: yank [-ilxv] [-d delim] [-g pattern] " + fprintf(stderr, "usage: yank [-1ilxv] [-d delim] [-g pattern] " "[-- command [args]]\n"); exit(2); } @@ -412,9 +413,11 @@ int main(int argc, char *argv[]) { - const struct field *field; - char *pat; - int c, i, rflags = REG_EXTENDED; + const struct field *field; + char *pat; + int one = 0; + int rflags = REG_EXTENDED; + int c, i; setlocale(LC_CTYPE, ""); @@ -424,8 +427,11 @@ #endif pat = strtopat(" "); - while ((c = getopt(argc, argv, "ilvxd:g:")) != -1) + while ((c = getopt(argc, argv, "1ilvxd:g:")) != -1) switch (c) { + case '1': + one = 1; + break; case 'd': free(pat); pat = strtopat(optarg); @@ -467,7 +473,10 @@ input(); tsetup(); - field = tmain(); + if (one && f.nmemb == 1) + field = &f.v[0]; + else + field = tmain(); tend(); if (field == NULL) return 1;

1 0

commit bat for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bat for openSUSE:Factory checked in at 2022-12-01 17:21:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bat (Old) and /work/SRC/openSUSE:Factory/.bat.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bat" Thu Dec 1 17:21:14 2022 rev:18 rq:1039254 version:0.22.1 Changes: -------- --- /work/SRC/openSUSE:Factory/bat/bat.changes 2022-10-14 15:44:03.236070152 +0200 +++ /work/SRC/openSUSE:Factory/.bat.new.1835/bat.changes 2022-12-01 17:22:08.206533019 +0100 @@ -1,0 +2,6 @@ +Wed Nov 30 22:20:13 UTC 2022 - Filippo Bonazzi <filippo.bonazzi(a)suse.com> + +- Add shell completion packages +- Install manpage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bat.spec ++++++ --- /var/tmp/diff_new_pack.31RMo8/_old 2022-12-01 17:22:09.946542534 +0100 +++ /var/tmp/diff_new_pack.31RMo8/_new 2022-12-01 17:22:09.950542556 +0100 @@ -36,6 +36,33 @@ A cat(1) clone which supports syntax highlighting for a large number of programming and markup languages. It has git integration and automatic paging. +%package bash-completion +Summary: Bash completion for %{name} +Requires: %{name} = %{version} +Supplements: (%{name} and bash-completion) +BuildArch: noarch + +%description bash-completion +Bash command line completion support for %{name}. + +%package fish-completion +Summary: Fish completion for %{name} +Requires: %{name} = %{version} +Supplements: (%{name} and fish) +BuildArch: noarch + +%description fish-completion +Fish command line completion support for %{name}. + +%package zsh-completion +Summary: Zsh completion for %{name} +Requires: %{name} = %{version} +Supplements: (%{name} and zsh) +BuildArch: noarch + +%description zsh-completion +Zsh command line completion support for %{name}. + %prep %setup -qa1 mkdir .cargo @@ -47,6 +74,12 @@ %install install -D -m 0755 target/release/%{name} %{buildroot}%{_bindir}/%{name} +install -D -m 0644 $(find target/release/build -name "%{name}.1") "%{buildroot}/%{_mandir}/man1/%{name}.1" + +install -D -m 0644 $(find target/release/build -name "%{name}.bash") "%{buildroot}/%{_datadir}/bash-completion/completions/%{name}" +install -D -m 0644 $(find target/release/build -name "%{name}.fish") "%{buildroot}/%{_datadir}/fish/vendor_completions.d/%{name}.fish" +install -D -m 0644 $(find target/release/build -name "%{name}.zsh") "%{buildroot}/%{_datadir}/zsh/site-functions/_%{name}" + %if %{with check} %check %{cargo_test} @@ -56,5 +89,19 @@ %doc README.md CONTRIBUTING.md CHANGELOG.md %license LICENSE-MIT LICENSE-APACHE %{_bindir}/%{name} +%{_mandir}/man1/%{name}.1%{ext_man} + +%files bash-completion +%{_datadir}/bash-completion/completions/%{name} + +%files fish-completion +%dir %{_datadir}/fish +%dir %{_datadir}/fish/vendor_completions.d +%{_datadir}/fish/vendor_completions.d/%{name}.fish + +%files zsh-completion +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_%{name} %changelog ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/bat/vendor.tar.xz /work/SRC/openSUSE:Factory/.bat.new.1835/vendor.tar.xz differ: char 26, line 1

1 0

commit exa for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package exa for openSUSE:Factory checked in at 2022-12-01 17:21:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/exa (Old) and /work/SRC/openSUSE:Factory/.exa.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "exa" Thu Dec 1 17:21:13 2022 rev:9 rq:1039255 version:0.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/exa/exa.changes 2021-08-23 10:08:54.816194360 +0200 +++ /work/SRC/openSUSE:Factory/.exa.new.1835/exa.changes 2022-12-01 17:22:07.526529301 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 22:26:27 UTC 2022 - Filippo Bonazzi <filippo.bonazzi(a)suse.com> + +- Install ZSH shell completion to /usr/share/zsh/site-functions/ + +------------------------------------------------------------------- New: ---- _service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exa.spec ++++++ --- /var/tmp/diff_new_pack.vV3FGV/_old 2022-12-01 17:22:08.022532013 +0100 +++ /var/tmp/diff_new_pack.vV3FGV/_new 2022-12-01 17:22:08.026532035 +0100 @@ -1,7 +1,7 @@ # # spec file for package exa # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -101,9 +101,8 @@ pandoc --standalone -f markdown -t man man/exa_colors.5.md > %{buildroot}%{_mandir}/man5/exa_colors.5 # Completion files -install -Dm0644 completions/completions.bash \ - %{buildroot}%{_datarootdir}/bash-completion/completions/%{name} -install -Dm0644 completions/completions.zsh "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{name}" +install -Dm0644 completions/completions.bash "%{buildroot}%{_datadir}/bash-completion/completions/%{name}" +install -Dm0644 completions/completions.zsh "%{buildroot}%{_datadir}/zsh/site-functions/_%{name}" install -Dm0644 completions/completions.fish "%{buildroot}/%{_datadir}/fish/vendor_completions.d/%{name}.fish" %files @@ -114,10 +113,10 @@ %{_mandir}/man5/exa_colors.5%{ext_man} %files bash-completion -%{_datarootdir}/bash-completion/completions/%{name} +%{_datadir}/bash-completion/completions/%{name} %files zsh-completion -%{_sysconfdir}/zsh_completion.d/%{name} +%{_datadir}/zsh/site-functions/_%{name} %files fish-completion %{_datadir}/fish/vendor_completions.d/%{name}.fish ++++++ _service ++++++ <services> <service name="cargo_audit" mode="disabled"> </service> </services>

1 0

commit crmsh for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2022-12-01 17:21:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Thu Dec 1 17:21:11 2022 rev:268 rq:1039249 version:4.4.1+20221201.bdfb0f2c Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-11-23 09:48:27.999154228 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new.1835/crmsh.changes 2022-12-01 17:22:05.914520486 +0100 @@ -1,0 +2,46 @@ +Thu Dec 01 06:28:39 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221201.bdfb0f2c: + * Change: store the upgrade_seq in /etc/crm/ + +------------------------------------------------------------------- +Thu Dec 01 04:31:00 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221201.280e5afb: + * Fix: qdevice: Adjust SBD_WATCHDOG_TIMEOUT when configuring qdevice not using stage (bsc#1205727) + +------------------------------------------------------------------- +Wed Nov 30 02:00:58 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221130.c3547a20: + * Dev: testcases: Adjust original regression test based on previous changes + * Dev: behave: Add functional test for previous changes + * Fix: cibconfig: Complete promotable=true and interlave=true for Promoted/Unpromoted resource (bsc#1205522) + +------------------------------------------------------------------- +Mon Nov 28 09:03:47 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221128.75c824f5: + * Dev: bootstrap: return when -N option not specified + * Dev: unittest: Add unit test for previous commit + * Dev: bootstrap: join process return immediately when joining itself + +------------------------------------------------------------------- +Mon Nov 28 07:51:22 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221128.1b8068a8: + * Dev: log: Use original way for the prompt input + +------------------------------------------------------------------- +Fri Nov 25 07:39:10 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221125.ef74cf11: + * Dev: bootstrap: add timeout to wait_for_cluster and wait_for_resource + +------------------------------------------------------------------- +Thu Nov 24 08:45:07 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221124.37ac467f: + * Fix: corosync: show corosync ring status if has fault (bsc#1205615) + +------------------------------------------------------------------- Old: ---- crmsh-4.4.1+20221122.102a8e11.tar.bz2 New: ---- crmsh-4.4.1+20221201.bdfb0f2c.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.Pvd32a/_old 2022-12-01 17:22:06.546523942 +0100 +++ /var/tmp/diff_new_pack.Pvd32a/_new 2022-12-01 17:22:06.550523964 +0100 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0-or-later Group: %{pkg_group} -Version: 4.4.1+20221122.102a8e11 +Version: 4.4.1+20221201.bdfb0f2c Release: 0 URL: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Pvd32a/_old 2022-12-01 17:22:06.606524270 +0100 +++ /var/tmp/diff_new_pack.Pvd32a/_new 2022-12-01 17:22:06.610524292 +0100 @@ -9,7 +9,7 @@ </service> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">5baaacb0a20a8ed89adaa403a50dacde998688f6</param> + <param name="changesrevision">bdfb0f2ca98a8d652455b883049070054e677869</param> </service> </servicedata> (No newline at EOF) ++++++ crmsh-4.4.1+20221122.102a8e11.tar.bz2 -> crmsh-4.4.1+20221201.bdfb0f2c.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/bootstrap.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/bootstrap.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/bootstrap.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/bootstrap.py 2022-12-01 07:11:27.000000000 +0100 @@ -20,6 +20,7 @@ import readline import shutil import yaml +import socket from string import Template from lxml import etree from pathlib import Path @@ -33,7 +34,7 @@ from . import tmpfiles from . import lock from . import userdir -from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT, REJOIN_COUNT, REJOIN_INTERVAL, PCMK_DELAY_MAX +from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT, REJOIN_COUNT, REJOIN_INTERVAL, PCMK_DELAY_MAX, WAIT_TIMEOUT_MS_DEFAULT from . import ocfs2 from . import qdevice from . import parallax @@ -174,6 +175,8 @@ """ Validate -N/--nodes option """ + if not self.node_list: + return self.node_list = utils.parse_append_action_argument(self.node_list) me = utils.this_node() if me in self.node_list: @@ -185,6 +188,19 @@ for node in self.node_list: utils.ping_node(node) + def _validate_cluster_node(self): + """ + Validate cluster_node on join side + """ + if self.cluster_node and self.type == 'join': + try: + # self.cluster_node might be hostname or IP address + ip_addr = socket.gethostbyname(self.cluster_node) + if utils.InterfacesInfo.ip_in_local(ip_addr): + utils.fatal("Please specify peer node's hostname or IP address") + except socket.gaierror as err: + utils.fatal("\"{}\": {}".format(self.cluster_node, err)) + def validate_option(self): """ Validate options @@ -204,6 +220,7 @@ logger.warning("-w option is deprecated and will be removed in future versions") if self.ocfs2_devices or self.stage == "ocfs2": ocfs2.OCFS2Manager.verify_ocfs2(self) + self._validate_cluster_node() self._validate_nodes_option() self._validate_sbd_option() @@ -358,24 +375,30 @@ utils.fatal("Failed to commit cluster configuration") -def wait_for_resource(message, resource): +def wait_for_resource(message, resource, timeout_ms=WAIT_TIMEOUT_MS_DEFAULT): """ Wait for resource started """ with logger_utils.status_long(message) as progress_bar: + start_time = int(time.clock_gettime(time.CLOCK_MONOTONIC) * 1000) while True: if xmlutil.CrmMonXmlParser.is_resource_started(resource): break status_progress(progress_bar) + if 0 < timeout_ms <= (int(time.clock_gettime(time.CLOCK_MONOTONIC) * 1000) - start_time): + utils.fatal('Time out waiting for resource.') sleep(1) -def wait_for_cluster(): +def wait_for_cluster(timeout_ms=WAIT_TIMEOUT_MS_DEFAULT): with logger_utils.status_long("Waiting for cluster") as progress_bar: + start_time = int(time.clock_gettime(time.CLOCK_MONOTONIC) * 1000) while True: if is_online(): break status_progress(progress_bar) + if 0 < timeout_ms <= (int(time.clock_gettime(time.CLOCK_MONOTONIC) * 1000) - start_time): + utils.fatal('Time out waiting for cluster.') sleep(2) @@ -2108,7 +2131,6 @@ init() _context.init_sbd_manager() - _context.validate_option() check_tty() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/cibconfig.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/cibconfig.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/cibconfig.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/cibconfig.py 2022-12-01 07:11:27.000000000 +0100 @@ -25,7 +25,7 @@ from . import crm_gv from . import ui_utils from . import userdir -from .ra import get_ra, get_properties_list, get_pe_meta, get_properties_meta +from .ra import get_ra, get_properties_list, get_pe_meta, get_properties_meta, RAInfo from .utils import ext_cmd, safe_open_w, pipe_string, safe_close_w, crm_msec from .utils import ask, lines2cli, olist from .utils import page_string, cibadmin_can_patch, str2tmp, ensure_sudo_readable @@ -42,7 +42,7 @@ from .xmlutil import is_simpleconstraint, is_template, rmnode, is_defaults, is_live_cib from .xmlutil import get_rsc_operations, delete_rscref, xml_equals, lookup_node, RscState from .xmlutil import text2elem, is_related, check_id_ref, xml_tostring -from .xmlutil import sanitize_cib_for_patching +from .xmlutil import sanitize_cib_for_patching, is_attr_set, get_set_nodes, set_attr from .cliformat import get_score, nvpairs2list, abs_pos_score, cli_acl_roleref, nvpair_format from .cliformat import cli_nvpair, cli_acl_rule, rsc_set_constraint, get_kind, head_id_format from .cliformat import simple_rsc_constraint, cli_rule, cli_format @@ -793,7 +793,7 @@ return obj_id -def postprocess_cli(node, oldnode=None, id_hint=None): +def postprocess_cli(node, oldnode=None, id_hint=None, complete_advised=False): """ input: unprocessed but parsed XML output: XML, obj_type, obj_id @@ -816,26 +816,58 @@ resolve_references(node) if oldnode is not None: remove_id_used_attributes(oldnode) + if complete_advised: + complete_advised_meta(node) return node, obj_type, obj_id +def complete_advised_meta(node): + """ + Complete advised meta attributes + """ + if node.tag != "clone": + return + primitive_list = node.xpath('primitive') + if not primitive_list: + return + set_list = [] + for meta_item in ["promotable", "interleave"]: + if not is_attr_set(node, meta_item): + set_list.append(meta_item) + if not set_list: + return + + meta_node = get_set_nodes(node, "meta_attributes", create=True)[0] + p = primitive_list[0] + ra_inst = RAInfo(p.get('class'), p.get('type'), p.get('provider')) + ra_actions_dict = ra_inst.actions() + if ra_actions_dict and "promote" in ra_actions_dict and "demote" in ra_actions_dict: + for item in set_list: + set_attr(meta_node, item, "true") + # Add interleave=true as long as it's not set, no matter if it's promotable clone or not + elif "interleave" in set_list: + set_attr(meta_node, "interleave", "true") + + def parse_cli_to_xml(cli, oldnode=None): """ input: CLI text output: XML, obj_type, obj_id """ node = None + complete = False comments = [] if isinstance(cli, str): for s in lines2cli(cli): node = parse.parse(s, comments=comments) else: # should be a pre-tokenized list - node = parse.parse(cli, comments=comments, ignore_empty=False, complete_op_advised=True) + complete = True + node = parse.parse(cli, comments=comments, ignore_empty=False, complete_advised=complete) if node is False: return None, None, None elif node is None: return None, None, None - return postprocess_cli(node, oldnode) + return postprocess_cli(node, oldnode, complete_advised=complete) # # cib element classes (CibObject the parent class) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/constants.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/constants.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/constants.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/constants.py 2022-12-01 07:11:27.000000000 +0100 @@ -528,4 +528,6 @@ ADVISED_KEY_LIST = ['timeout', 'interval', 'role'] DEFAULT_INTERVAL_IN_ACTION = "20s" DEFAULT_TIMEOUT_IN_ACTION = "60s" + +WAIT_TIMEOUT_MS_DEFAULT = 120000 # vim:ts=4:sw=4:et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/corosync.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/corosync.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/corosync.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/corosync.py 2022-12-01 07:11:27.000000000 +0100 @@ -62,7 +62,7 @@ rc, out, err = utils.get_stdout_stderr("corosync-cfgtool -s") if rc != 0 and err: raise ValueError(err) - if rc == 0 and out: + if out: print(out) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/log.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/log.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/log.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/log.py 2022-12-01 07:11:27.000000000 +0100 @@ -332,12 +332,11 @@ """ Wrap input function with recording prompt string and input result """ - with self.suppress_new_line(): + with self.only_file(): self.logger.info(prompt_string) - value = input() + value = input(prompt_string) if not value: value = default - print() with self.only_file(): self.logger.info("input result: %s", value) return value diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/parse.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/parse.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/parse.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/parse.py 2022-12-01 07:11:27.000000000 +0100 @@ -170,13 +170,13 @@ self.begin(cmd, min_args=min_args) return self.match_dispatch(errmsg="Unknown command") - def do_parse(self, cmd, ignore_empty, complete_op_advised): + def do_parse(self, cmd, ignore_empty, complete_advised): """ Called by CliParser. Calls parse() Parsers should pass their return value through this method. """ self.ignore_empty = ignore_empty - self.complete_op_advised = complete_op_advised + self.complete_advised = complete_advised out = self.parse(cmd) if self.has_tokens(): self.err("Unknown arguments: " + ' '.join(self._cmd[self._currtok:])) @@ -661,7 +661,7 @@ """ Complete operation actions advised values """ - if not self.complete_op_advised or out.tag != "primitive": + if not self.complete_advised or out.tag != "primitive": return ra_inst = ra.RAInfo(out.get('class'), out.get('type'), out.get('provider')) ra_actions_dict = ra_inst.actions() @@ -1774,7 +1774,7 @@ return ret -def parse(s, comments=None, ignore_empty=True, complete_op_advised=False): +def parse(s, comments=None, ignore_empty=True, complete_advised=False): ''' Input: a list of tokens (or a CLI format string). Return: a cibobject @@ -1820,7 +1820,7 @@ return False try: - ret = parser.do_parse(s, ignore_empty, complete_op_advised) + ret = parser.do_parse(s, ignore_empty, complete_advised) if ret is not None and len(comments) > 0: if ret.tag in constants.defaults_tags: xmlutil.stuff_comments(ret[0], comments) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/qdevice.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/qdevice.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/qdevice.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/qdevice.py 2022-12-01 07:11:27.000000000 +0100 @@ -3,6 +3,7 @@ import socket import functools from enum import Enum +from . import constants from . import utils from . import parallax from . import corosync @@ -635,18 +636,17 @@ """ Adjust SBD_WATCHDOG_TIMEOUT when configuring qdevice and diskless SBD """ - if self.is_stage: - from .sbd import SBDManager, SBDTimeout - utils.check_all_nodes_reachable() - using_diskless_sbd = SBDManager.is_using_diskless_sbd() - self.qdevice_reload_policy = evaluate_qdevice_quorum_effect(QDEVICE_ADD, using_diskless_sbd) - # add qdevice after diskless sbd started - if using_diskless_sbd: - res = SBDManager.get_sbd_value_from_config("SBD_WATCHDOG_TIMEOUT") - if not res or int(res) < SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE: - sbd_watchdog_timeout_qdevice = SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE - SBDManager.update_configuration({"SBD_WATCHDOG_TIMEOUT": str(sbd_watchdog_timeout_qdevice)}) - utils.set_property("stonith-timeout", SBDTimeout.get_stonith_timeout()) + from .sbd import SBDManager, SBDTimeout + utils.check_all_nodes_reachable() + using_diskless_sbd = SBDManager.is_using_diskless_sbd() + self.qdevice_reload_policy = evaluate_qdevice_quorum_effect(QDEVICE_ADD, using_diskless_sbd) + # add qdevice after diskless sbd started + if using_diskless_sbd: + res = SBDManager.get_sbd_value_from_config("SBD_WATCHDOG_TIMEOUT") + if not res or int(res) < SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE: + sbd_watchdog_timeout_qdevice = SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE + SBDManager.update_configuration({"SBD_WATCHDOG_TIMEOUT": str(sbd_watchdog_timeout_qdevice)}) + utils.set_property("stonith-timeout", SBDTimeout.get_stonith_timeout()) @qnetd_lock_for_same_cluster_name def config_and_start_qdevice(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/ui_cluster.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/ui_cluster.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/ui_cluster.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/ui_cluster.py 2022-12-01 07:11:27.000000000 +0100 @@ -478,6 +478,7 @@ join_context.ui_context = context join_context.stage = stage join_context.type = "join" + join_context.validate_option() bootstrap.bootstrap_join(join_context) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/upgradeutil.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/upgradeutil.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/upgradeutil.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/upgradeutil.py 2022-12-01 07:11:27.000000000 +0100 @@ -12,7 +12,7 @@ # pump this seq when upgrade check need to be run CURRENT_UPGRADE_SEQ = (1, 0) -DATA_DIR = os.path.expanduser('~hacluster/crmsh') +DATA_DIR = '/var/lib/crmsh' SEQ_FILE_PATH = DATA_DIR + '/upgrade_seq' # touch this file to force a upgrade process FORCE_UPGRADE_FILE_PATH = DATA_DIR + '/upgrade_forced' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/xmlutil.py new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/xmlutil.py --- old/crmsh-4.4.1+20221122.102a8e11/crmsh/xmlutil.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/xmlutil.py 2022-12-01 07:11:27.000000000 +0100 @@ -550,10 +550,14 @@ return node.tag == "group" +def is_attr_set(node, attr): + return get_attr_value(get_child_nvset_node(node), attr) is not None + + def is_ms_or_promotable_clone(node): - is_promotable = is_boolean_true(get_attr_value(get_child_nvset_node(node), "promotable")) - is_ms = node.tag in ("master", "ms") - return is_ms or is_promotable + is_promotable_type = is_boolean_true(is_attr_set(node, "promotable")) + is_ms_type = node.tag in ("master", "ms") + return is_ms_type or is_promotable_type def is_clone(node): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/test/features/resource_set.feature new/crmsh-4.4.1+20221201.bdfb0f2c/test/features/resource_set.feature --- old/crmsh-4.4.1+20221122.102a8e11/test/features/resource_set.feature 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/test/features/resource_set.feature 2022-12-01 07:11:27.000000000 +0100 @@ -129,3 +129,15 @@ Then Run "ls /trace_log_d/Dummy/d.monitor.*" OK When Run "crm resource untrace d" on "hanode1" Then Expected "Stop tracing d" in stdout + + @clean + Scenario: Add promotable=true and interleave=true automatically (bsc#1205522) + When Run "crm configure primitive s2 ocf:pacemaker:Stateful" on "hanode1" + And Run "crm configure clone p2 s2" on "hanode1" + Then Run "sleep 2;crm configure show|grep -A1 'clone p2 s2'|grep 'promotable=true interleave=true'" OK + When Run "crm configure primitive s3 ocf:pacemaker:Stateful" on "hanode1" + And Run "crm configure clone p3 s3 meta promotable=false" on "hanode1" + Then Run "sleep 2;crm configure show|grep -A1 'clone p3 s3'|grep 'promotable=false interleave=true'" OK + When Run "crm configure primitive d2 Dummy" on "hanode1" + And Run "crm configure clone p4 d2" on "hanode1" + Then Run "sleep 2;crm configure show|grep -A1 'clone p4 d2'|grep 'interleave=true'" OK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/test/testcases/bugs.exp new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/bugs.exp --- old/crmsh-4.4.1+20221122.102a8e11/test/testcases/bugs.exp 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/bugs.exp 2022-12-01 07:11:27.000000000 +0100 @@ -58,7 +58,8 @@ op monitor timeout=20s interval=10s \ op start timeout=20s interval=0s \ op stop timeout=20s interval=0s -clone cl-p5 p5 +clone cl-p5 p5 \ + meta interleave=true colocation c2 inf: ( p1 p2 ) p3 p4 .INP: commit .INP: _test @@ -95,7 +96,8 @@ op monitor timeout=20s interval=10s \ op start timeout=20s interval=0s \ op stop timeout=20s interval=0s -clone cl-p5 p5 +clone cl-p5 p5 \ + meta interleave=true colocation c2 inf: ( p1 p2 ) p3 p4 .TRY Unordered load file .INP: options @@ -141,7 +143,8 @@ group g1 gr1 gr2 group g2 gr3 group g3 gr4 -clone cl-p5 p5 +clone cl-p5 p5 \ + meta interleave=true colocation c2 inf: ( p1 p2 ) p3 p4 location loc1 g1 \ rule 200: #uname eq node1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/test/testcases/confbasic-xml.exp new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/confbasic-xml.exp --- old/crmsh-4.4.1+20221122.102a8e11/test/testcases/confbasic-xml.exp 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/confbasic-xml.exp 2022-12-01 07:11:27.000000000 +0100 @@ -75,6 +75,7 @@ <clone id="c"> <meta_attributes id="c-meta_attributes"> <nvpair name="clone-max" value="1" id="c-meta_attributes-clone-max"/> + <nvpair name="interleave" value="true" id="c-meta_attributes-interleave"/> </meta_attributes> <primitive id="d3" class="ocf" provider="pacemaker" type="Dummy"> <operations> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/test/testcases/confbasic.exp new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/confbasic.exp --- old/crmsh-4.4.1+20221122.102a8e11/test/testcases/confbasic.exp 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/confbasic.exp 2022-12-01 07:11:27.000000000 +0100 @@ -145,9 +145,9 @@ ms m5 s5 ms m6 s6 clone c d3 \ - meta clone-max=1 + meta clone-max=1 interleave=true clone m7 d8 \ - meta promotable=true \ + meta promotable=true interleave=true \ meta promoted-max=1 \ meta promoted-node-max=1 tag t1 m5 m6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/test/testcases/file.exp new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/file.exp --- old/crmsh-4.4.1+20221122.102a8e11/test/testcases/file.exp 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/file.exp 2022-12-01 07:11:27.000000000 +0100 @@ -23,9 +23,10 @@ op monitor timeout=20 interval=3600 \ op start timeout=20 interval=0s \ op stop timeout=15 interval=0s -clone c1 p1 +clone c1 p1 \ + meta interleave=true clone m1 p2 \ - meta promotable=true + meta promotable=true interleave=true rsc_defaults build-resource-defaults: \ resource-stickiness=1 op_defaults op-options: \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/test/testcases/resource.exp new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/resource.exp --- old/crmsh-4.4.1+20221122.102a8e11/test/testcases/resource.exp 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/test/testcases/resource.exp 2022-12-01 07:11:27.000000000 +0100 @@ -65,6 +65,7 @@ <resources> <clone id="c1"> <meta_attributes id="c1-meta_attributes"> + <nvpair id="c1-meta_attributes-interleave" name="interleave" value="true"/> <nvpair id="c1-meta_attributes-is-managed" name="is-managed" value="true"/> </meta_attributes> <primitive id="p1" class="ocf" provider="pacemaker" type="Dummy"> @@ -92,6 +93,7 @@ <resources> <clone id="c1"> <meta_attributes id="c1-meta_attributes"> + <nvpair id="c1-meta_attributes-interleave" name="interleave" value="true"/> <nvpair id="c1-meta_attributes-is-managed" name="is-managed" value="false"/> </meta_attributes> <primitive id="p1" class="ocf" provider="pacemaker" type="Dummy"> @@ -121,6 +123,7 @@ <clone id="m1"> <meta_attributes id="m1-meta_attributes"> <nvpair name="promotable" value="true" id="m1-meta_attributes-promotable"/> + <nvpair id="m1-meta_attributes-interleave" name="interleave" value="true"/> <nvpair id="m1-meta_attributes-maintenance" name="maintenance" value="true"/> </meta_attributes> <primitive id="p2" class="ocf" provider="heartbeat" type="Delay"> @@ -154,6 +157,7 @@ <clone id="m1"> <meta_attributes id="m1-meta_attributes"> <nvpair name="promotable" value="true" id="m1-meta_attributes-promotable"/> + <nvpair id="m1-meta_attributes-interleave" name="interleave" value="true"/> <nvpair id="m1-meta_attributes-maintenance" name="maintenance" value="false"/> </meta_attributes> <primitive id="p2" class="ocf" provider="heartbeat" type="Delay"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/test/unittests/test_bootstrap.py new/crmsh-4.4.1+20221201.bdfb0f2c/test/unittests/test_bootstrap.py --- old/crmsh-4.4.1+20221122.102a8e11/test/unittests/test_bootstrap.py 2022-11-22 15:17:41.000000000 +0100 +++ new/crmsh-4.4.1+20221201.bdfb0f2c/test/unittests/test_bootstrap.py 2022-12-01 07:11:27.000000000 +0100 @@ -13,6 +13,7 @@ import os import unittest import yaml +import socket try: from unittest import mock @@ -131,6 +132,30 @@ ctx.validate_option() mock_error.assert_called_once_with("Duplicated input for -i/--interface option") + @mock.patch('crmsh.utils.fatal') + @mock.patch('socket.gethostbyname') + @mock.patch('crmsh.utils.InterfacesInfo.ip_in_local') + def test_validate_cluster_node_same_name(self, mock_ip_in_local, mock_gethost, mock_fatal): + options = mock.Mock(cluster_node="me", type="join") + ctx = self.ctx_inst.set_context(options) + mock_fatal.side_effect = SystemExit + mock_gethost.return_value = ("10.10.10.41", None) + mock_ip_in_local.return_value = True + with self.assertRaises(SystemExit): + ctx._validate_cluster_node() + mock_fatal.assert_called_once_with("Please specify peer node's hostname or IP address") + + @mock.patch('crmsh.utils.fatal') + @mock.patch('socket.gethostbyname') + def test_validate_cluster_node_unknown_name(self, mock_gethost, mock_fatal): + options = mock.Mock(cluster_node="xxxx", type="join") + ctx = self.ctx_inst.set_context(options) + mock_fatal.side_effect = SystemExit + mock_gethost.side_effect = socket.gaierror("gethostbyname error") + with self.assertRaises(SystemExit): + ctx._validate_cluster_node() + mock_fatal.assert_called_once_with('"xxxx": gethostbyname error') + @mock.patch('logging.Logger.warning') @mock.patch('crmsh.bootstrap.Validation.valid_admin_ip') def test_validate_option(self, mock_admin_ip, mock_warn):

1 0

commit syft for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package syft for openSUSE:Factory checked in at 2022-12-01 17:21:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syft (Old) and /work/SRC/openSUSE:Factory/.syft.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syft" Thu Dec 1 17:21:08 2022 rev:16 rq:1039246 version:0.62.3 Changes: -------- --- /work/SRC/openSUSE:Factory/syft/syft.changes 2022-11-29 13:23:21.537987372 +0100 +++ /work/SRC/openSUSE:Factory/.syft.new.1835/syft.changes 2022-12-01 17:21:56.362468255 +0100 @@ -1,0 +2,11 @@ +Thu Dec 01 05:41:03 UTC 2022 - kastl(a)b1-systems.de + +- Update to version 0.62.3: + * Update Stereoscope to 3b80d983223f6e6fc2d33b0ffa003d30268418e9 (#1376) + * fix: Update node binary package name (#1375) + * feat: Generic Binary Cataloger (#1336) + * recover from bad parsing of golang binary (#1371) + * Fix parsing of apk databases with large entries (#1365) + * Update syft bootstrap tools to latest versions. (#1369) + +------------------------------------------------------------------- Old: ---- syft-0.62.2.tar.gz New: ---- syft-0.62.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syft.spec ++++++ --- /var/tmp/diff_new_pack.1FAR4H/_old 2022-12-01 17:22:04.634513487 +0100 +++ /var/tmp/diff_new_pack.1FAR4H/_new 2022-12-01 17:22:04.642513531 +0100 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: syft -Version: 0.62.2 +Version: 0.62.3 Release: 0 Summary: CLI tool and library for generating a Software Bill of Materials License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.1FAR4H/_old 2022-12-01 17:22:04.686513771 +0100 +++ /var/tmp/diff_new_pack.1FAR4H/_new 2022-12-01 17:22:04.690513793 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/anchore/syft</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.62.2</param> + <param name="revision">v0.62.3</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -16,7 +16,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">syft-0.62.2.tar.gz</param> + <param name="archive">syft-0.62.3.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.1FAR4H/_old 2022-12-01 17:22:04.718513946 +0100 +++ /var/tmp/diff_new_pack.1FAR4H/_new 2022-12-01 17:22:04.722513968 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/anchore/syft</param> - <param name="changesrevision">0cbd0cc70377d5b1b11b808fbbf9ddec450c68ee</param></service></servicedata> + <param name="changesrevision">247b054ab56f848c477495218754166272f470b5</param></service></servicedata> (No newline at EOF) ++++++ syft-0.62.2.tar.gz -> syft-0.62.3.tar.gz ++++++ ++++ 174446 lines of diff (skipped) ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/syft/vendor.tar.gz /work/SRC/openSUSE:Factory/.syft.new.1835/vendor.tar.gz differ: char 5, line 1

1 0

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits December 2022