July 2024 - openSUSE Commits - openSUSE Mailing Lists

commit netdata for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package netdata for openSUSE:Factory checked in at 2024-07-26 16:15:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netdata (Old) and /work/SRC/openSUSE:Factory/.netdata.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netdata" Fri Jul 26 16:15:19 2024 rev:57 rq:1189607 version:1.46.3 Changes: -------- --- /work/SRC/openSUSE:Factory/netdata/netdata.changes 2024-07-12 17:05:31.598066283 +0200 +++ /work/SRC/openSUSE:Factory/.netdata.new.1882/netdata.changes 2024-07-26 16:15:38.562049979 +0200 @@ -1,0 +2,10 @@ +Thu Jul 25 12:11:12 UTC 2024 - Mia Herkt <mia(a)0x0.st> + +- Update to 1.46.3 + * Fixed an issue where some contexts were initially missing from + the dashboard on a newly installed Netdata + gh#netdata/netdata#18198 + * Fixed "Directory existence" chart label (go.d/filecheck) + gh#netdata/netdata#18126 + +------------------------------------------------------------------- Old: ---- netdata-v1.46.2.tar.gz New: ---- netdata-v1.46.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netdata.spec ++++++ --- /var/tmp/diff_new_pack.JyzHAa/_old 2024-07-26 16:15:40.154114111 +0200 +++ /var/tmp/diff_new_pack.JyzHAa/_new 2024-07-26 16:15:40.158114271 +0200 @@ -22,7 +22,7 @@ %define __builder ninja Name: netdata -Version: 1.46.2 +Version: 1.46.3 Release: 0 Summary: A system for distributed real-time performance and health monitoring # netdata is GPL-3.0+, other licenses refer to included third-party software (see REDISTRIBUTED.md) ++++++ netdata-v1.46.2.tar.gz -> netdata-v1.46.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/netdata/netdata-v1.46.2.tar.gz /work/SRC/openSUSE:Factory/.netdata.new.1882/netdata-v1.46.3.tar.gz differ: char 13, line 1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/netdata/vendor.tar.gz /work/SRC/openSUSE:Factory/.netdata.new.1882/vendor.tar.gz differ: char 5, line 1

1 0

commit ulp-macros for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ulp-macros for openSUSE:Factory checked in at 2024-07-26 16:15:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ulp-macros (Old) and /work/SRC/openSUSE:Factory/.ulp-macros.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ulp-macros" Fri Jul 26 16:15:16 2024 rev:2 rq:1189254 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ulp-macros/ulp-macros.changes 2023-06-24 20:14:10.744227797 +0200 +++ /work/SRC/openSUSE:Factory/.ulp-macros.new.1882/ulp-macros.changes 2024-07-26 16:15:31.869780401 +0200 @@ -1,0 +2,5 @@ +Mon Jul 22 15:55:53 UTC 2024 - Giuliano Belinassi <giuliano.belinassi(a)suse.com> + +- Fix FIXME and warnings. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulp-macros.spec ++++++ --- /var/tmp/diff_new_pack.SjlrVS/_old 2024-07-26 16:15:33.333839376 +0200 +++ /var/tmp/diff_new_pack.SjlrVS/_new 2024-07-26 16:15:33.341839698 +0200 @@ -20,9 +20,8 @@ Version: 1.0 Release: 0 Summary: Macros for enabling Userspace Live Patching into processes -# FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses -License: MIT -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" +URL: https://github.com/SUSE/libpulp +License: LGPL-2.1-or-later Group: Development Source1: ulp.macros BuildArch: noarch @@ -40,3 +39,5 @@ %files %{_rpmmacrodir}/macros.ulp +%check +

1 0

commit ncurses for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2024-07-26 16:15:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncurses" Fri Jul 26 16:15:15 2024 rev:268 rq:1189039 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2024-07-03 20:28:04.236168654 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new.1882/ncurses.changes 2024-07-26 16:15:30.353719331 +0200 @@ -1,0 +2,14 @@ +Mon Jul 15 12:37:55 UTC 2024 - Dr. Werner Fink <werner(a)suse.de> + +- Add ncurses patch 20240713 + + modify misc/ncurses-config.in, improved match with pkg-config output. + +------------------------------------------------------------------- +Mon Jul 8 06:19:21 UTC 2024 - Dr. Werner Fink <werner(a)suse.de> + +- Add ncurses patch 20240706 + + update configure script to use macro changes from dialog. + + modify CF_NCURSES_PTHREADS to avoid equating package and library + names. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses-6.4.dif ++++++ --- /var/tmp/diff_new_pack.48lg1I/_old 2024-07-26 16:15:31.245755264 +0200 +++ /var/tmp/diff_new_pack.48lg1I/_new 2024-07-26 16:15:31.249755425 +0200 @@ -18,8 +18,8 @@ 16 files changed, 202 insertions(+), 72 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2024-05-27 08:45:58.822250073 +0000 -@@ -6132,12 +6132,12 @@ cat >>$cf_edit_man <<CF_EOF ++++ aclocal.m4 2024-07-08 06:19:51.779534788 +0000 +@@ -6138,12 +6138,12 @@ cat >>$cf_edit_man <<CF_EOF echo "? missing rename for \$cf_source" cf_target="\$cf_source" fi @@ -34,7 +34,7 @@ sed -f "$cf_man_alias" \\ CF_EOF -@@ -6147,7 +6147,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6153,7 +6153,7 @@ cat >>$cf_edit_man <<CF_EOF CF_EOF else cat >>$cf_edit_man <<CF_EOF @@ -43,7 +43,7 @@ CF_EOF fi -@@ -6187,7 +6187,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6193,7 +6193,7 @@ cat >>$cf_edit_man <<CF_EOF mv \$TMP.$cf_manpage_so_strip \$TMP fi fi @@ -52,7 +52,7 @@ CF_EOF fi -@@ -6196,31 +6196,31 @@ case "$MANPAGE_FORMAT" in +@@ -6202,31 +6202,31 @@ case "$MANPAGE_FORMAT" in cat >>$cf_edit_man <<CF_EOF if test "\$form" = format ; then # BSDI installs only .0 suffixes in the cat directories @@ -91,7 +91,7 @@ for cf_alias in \$aliases do if test "\$section" = 1 ; then -@@ -6230,7 +6230,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6236,7 +6236,7 @@ cat >>$cf_edit_man <<CF_EOF if test "$MANPAGE_SYMLINKS" = yes ; then if test -f "\$cf_alias\${suffix}" ; then @@ -100,7 +100,7 @@ then continue fi -@@ -6240,18 +6240,18 @@ CF_EOF +@@ -6246,18 +6246,18 @@ CF_EOF case "x$LN_S" in (*-f) cat >>$cf_edit_man <<CF_EOF @@ -122,7 +122,7 @@ echo ".so \$cf_source" >\$TMP CF_EOF if test -n "$cf_manpage_compress" ; then -@@ -6271,9 +6271,9 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6277,9 +6277,9 @@ cat >>$cf_edit_man <<CF_EOF ) ) elif test "\$verb" = removing ; then @@ -135,7 +135,7 @@ ) test -d "\$cf_subdir\${section}" && test -n "\$aliases" && ( -@@ -6294,6 +6294,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6300,6 +6300,7 @@ cat >>$cf_edit_man <<CF_EOF # echo ".hy 0" cat \$TMP fi @@ -144,8 +144,8 @@ esac done --- configure -+++ configure 2024-05-27 08:45:58.826249981 +0000 -@@ -6741,7 +6741,7 @@ echo $ECHO_N "checking for an rpath opti ++++ configure 2024-07-08 06:19:51.779534788 +0000 +@@ -6744,7 +6744,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; (linux*|gnu*|k*bsd*-gnu|freebsd*) @@ -154,7 +154,7 @@ ;; (openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," -@@ -7114,8 +7114,8 @@ echo "${ECHO_T}$cf_cv_ldflags_search_pat +@@ -7117,8 +7117,8 @@ echo "${ECHO_T}$cf_cv_ldflags_search_pat else cf_cv_shared_soname='`basename $@`' fi @@ -165,7 +165,7 @@ ;; (mingw*msvc*) cf_cv_shlib_version=msvcdll -@@ -8354,7 +8354,7 @@ echo "${ECHO_T}$with_pcre2" >&6 +@@ -8357,7 +8357,7 @@ echo "${ECHO_T}$with_pcre2" >&6 if test "x$with_pcre2" != xno ; then cf_with_pcre2_ok=no @@ -174,7 +174,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -15598,12 +15598,12 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15601,12 +15601,12 @@ cat >>$cf_edit_man <<CF_EOF echo "? missing rename for \$cf_source" cf_target="\$cf_source" fi @@ -189,7 +189,7 @@ sed -f "$cf_man_alias" \\ CF_EOF -@@ -15613,7 +15613,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15616,7 +15616,7 @@ cat >>$cf_edit_man <<CF_EOF CF_EOF else cat >>$cf_edit_man <<CF_EOF @@ -198,7 +198,7 @@ CF_EOF fi -@@ -15653,7 +15653,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15656,7 +15656,7 @@ cat >>$cf_edit_man <<CF_EOF mv \$TMP.$cf_manpage_so_strip \$TMP fi fi @@ -207,7 +207,7 @@ CF_EOF fi -@@ -15662,31 +15662,31 @@ case "$MANPAGE_FORMAT" in +@@ -15665,31 +15665,31 @@ case "$MANPAGE_FORMAT" in cat >>$cf_edit_man <<CF_EOF if test "\$form" = format ; then # BSDI installs only .0 suffixes in the cat directories @@ -246,7 +246,7 @@ for cf_alias in \$aliases do if test "\$section" = 1 ; then -@@ -15696,7 +15696,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15699,7 +15699,7 @@ cat >>$cf_edit_man <<CF_EOF if test "$MANPAGE_SYMLINKS" = yes ; then if test -f "\$cf_alias\${suffix}" ; then @@ -255,7 +255,7 @@ then continue fi -@@ -15706,18 +15706,18 @@ CF_EOF +@@ -15709,18 +15709,18 @@ CF_EOF case "x$LN_S" in (*-f) cat >>$cf_edit_man <<CF_EOF @@ -277,7 +277,7 @@ echo ".so \$cf_source" >\$TMP CF_EOF if test -n "$cf_manpage_compress" ; then -@@ -15737,9 +15737,9 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15740,9 +15740,9 @@ cat >>$cf_edit_man <<CF_EOF ) ) elif test "\$verb" = removing ; then @@ -290,7 +290,7 @@ ) test -d "\$cf_subdir\${section}" && test -n "\$aliases" && ( -@@ -15760,6 +15760,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15763,6 +15763,7 @@ cat >>$cf_edit_man <<CF_EOF # echo ".hy 0" cat \$TMP fi ++++++ ncurses-6.5-patches.tar.bz2 ++++++ Binary files old/patches/ncurses-6.5-20240706.patch.gz and new/patches/ncurses-6.5-20240706.patch.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.5-20240706.patch.gz.asc new/patches/ncurses-6.5-20240706.patch.gz.asc --- old/patches/ncurses-6.5-20240706.patch.gz.asc 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.5-20240706.patch.gz.asc 2024-07-07 01:21:50.000000000 +0200 @@ -0,0 +1,15 @@ +-----BEGIN PGP SIGNATURE----- +Comment: See https://invisible-island.net/public/public.html for info + +iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmaJ0Y4ACgkQzCr0RyFn +vgMVkwwAuTb72gGS64iTK7e8NIWIxYtFS5QGNEbJjhYW7a2yoyIL3JUK3aSPYzMX +Wokaj77AQ/+zUkSvYCpYuq7P4OR/uqspG0kURPmPLrbShicDKe6c82LDwK6XfLaq +NbSD/9EQ0kt+AOnad0FMCsgQ9oQDAvXyAEHLv4gcxvAw0tpXAPHwYykP8pn5gt4R +SuveV42KC0lQp29HwHchq6eMcvMdBGpR6CRxRUVyF2/GzlsK/3uc9qkHptdKcRpX +BXvu7HE9pjNY4xH2bsmx9HRtq0BhCm2N2fY1pyF2AQIBOI2X4sfB3kX6ZunoWvab +klnaAMrw6IUs26zHzNmwAKt51M5q/zn+OnwYygXTbu6wrH+YaPPN3nIZW6PZJ4rr +y+FZ9tk7G3szbHf/Q6DhOa1C9LXCt/B/oFecyiKRhpURyBD6C/JZMMXjzUmZvjcu +fmC1VrweiRMctQZeu3rCb59lz3YiQtJ1IKlOYNEj3owAnax1+r4unuttCo5B6yLq +sfBovH0W +=6i6v +-----END PGP SIGNATURE----- Binary files old/patches/ncurses-6.5-20240713.patch.gz and new/patches/ncurses-6.5-20240713.patch.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.5-20240713.patch.gz.asc new/patches/ncurses-6.5-20240713.patch.gz.asc --- old/patches/ncurses-6.5-20240713.patch.gz.asc 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.5-20240713.patch.gz.asc 2024-07-14 01:06:28.000000000 +0200 @@ -0,0 +1,15 @@ +-----BEGIN PGP SIGNATURE----- +Comment: See https://invisible-island.net/public/public.html for info + +iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmaTCHQACgkQzCr0RyFn +vgO1PAv/a/RQd1J6ZHZ78ICjGEuWDT8gUusnAI3waOpHwg7Asoyz1GNacTEK82Xv +H1/DXKzZMhQn2IvqX5XiLtVGAzda3YuEWCImQ4Vv2y0c0Rrtow8QVX9qJoeq8dND +99tYI/aA0ch0t1Kg7qOyBj2yHCAM+/R+lUpLLA4z6nJWsXFZzf6wa4Is3SsJq1eH +ByDsLg6VtgT5tjWXzFxsw/AV8mqpLbzuspCV/GtIZF6atb+YxQ/ndGb+q9ftRuhV +u9XmCcE2tXQ48ntvITiFQ0EmI7paxaRVPaweHjfkHiiWUtQC4qIzKXHXD42lkex5 +kSZUWC9oKik+RJFCLfmuvjaSkaDNGKG9x+xivtpKYRpGQKku6rsEQmUoH9y0F8cu +FV+q9Y0+38BeAX5YiKp8n6v9RwNhwzrO0/SR3wAVBejnpoX5Nx/f3YCo4rIeyI0e +Jm8J5R5joh+AhHYnk2pmj1f01/iWWywX2DnY4Wk7u5EhQoe1l8btIOL8H5fpbgEX +FwDUs1b5 +=S17t +-----END PGP SIGNATURE-----

1 0

commit salt for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2024-07-26 16:15:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "salt" Fri Jul 26 16:15:11 2024 rev:154 rq:1189357 version:3006.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2024-07-17 15:14:24.096427923 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.1882/salt.changes 2024-07-26 16:15:24.513484075 +0200 @@ -1,0 +2,8 @@ +Wed Jul 24 10:12:25 UTC 2024 - Pablo Suárez Hernández <pablo.suarezhernandez(a)suse.com> + +- Fix rich rule comparison in firewalld module (bsc#1222684) + +- Added: + * firewalld-normalize-new-rich-rules-before-comparing-.patch + +------------------------------------------------------------------- New: ---- firewalld-normalize-new-rich-rules-before-comparing-.patch BETA DEBUG BEGIN: New:- Added: * firewalld-normalize-new-rich-rules-before-comparing-.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.pa2BrU/_old 2024-07-26 16:15:27.001584301 +0200 +++ /var/tmp/diff_new_pack.pa2BrU/_new 2024-07-26 16:15:27.001584301 +0200 @@ -408,6 +408,8 @@ Patch124: some-more-small-tests-fixes-enhancements-661.patch # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/666 Patch125: test_vultrpy-adjust-test-expectation-to-prevent-fail.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/66698 +Patch126: firewalld-normalize-new-rich-rules-before-comparing-.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.pa2BrU/_old 2024-07-26 16:15:27.081587524 +0200 +++ /var/tmp/diff_new_pack.pa2BrU/_new 2024-07-26 16:15:27.085587685 +0200 @@ -1,3 +1,3 @@ -131b293221061447f0dc87b9b57ba29c1b8a7ae4 +597049dd3d38cffb3d6e555ded591bc36ed09a58 (No newline at EOF) ++++++ firewalld-normalize-new-rich-rules-before-comparing-.patch ++++++ From 522b2331e6584758aeaefbf2d41f0c18cd1113d9 Mon Sep 17 00:00:00 2001 From: Marek Czernek <marek.czernek(a)suse.com> Date: Tue, 23 Jul 2024 13:01:27 +0200 Subject: [PATCH] firewalld: normalize new rich rules before comparing to old (bsc#1222684) (#648) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Normalize new rich rules before comparing to old Firewallcmd rich rule output quotes each assigned part of the rich rule, for example: rule family="ipv4" source port port="161" ... The firewalld module must first normalize the user defined rich rules to match the firewallcmd output before comparison to ensure idempotency. * Add changelog entry * Enhance documentation for normalization function * Add unit tests to cover rich rules normalization --------- Co-authored-by: Pablo Suárez Hernández <psuarezhernandez(a)suse.com> --- changelog/61235.fixed.md | 1 + salt/states/firewalld.py | 38 +++++++++++- tests/pytests/unit/states/test_firewalld.py | 64 +++++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 changelog/61235.fixed.md create mode 100644 tests/pytests/unit/states/test_firewalld.py diff --git a/changelog/61235.fixed.md b/changelog/61235.fixed.md new file mode 100644 index 00000000000..7ae9bb40800 --- /dev/null +++ b/changelog/61235.fixed.md @@ -0,0 +1 @@ +- firewalld: normalize new rich rules before comparing to old ones diff --git a/salt/states/firewalld.py b/salt/states/firewalld.py index 534b9dd62df..9ce0bfc61a8 100644 --- a/salt/states/firewalld.py +++ b/salt/states/firewalld.py @@ -204,7 +204,6 @@ def present( rich_rules=None, prune_rich_rules=False, ): - """ Ensure a zone has specific attributes. @@ -378,6 +377,42 @@ def service(name, ports=None, protocols=None): return ret +def _normalize_rich_rules(rich_rules): + """ + Make sure rich rules are normalized and attributes + are quoted with double quotes so it matches the output + from firewall-cmd + + Example: + + rule family="ipv4" source address="192.168.0.0/16" port port=22 protocol=tcp accept + rule family="ipv4" source address="192.168.0.0/16" port port='22' protocol=tcp accept + rule family='ipv4' source address='192.168.0.0/16' port port='22' protocol=tcp accept + + normalized to: + + rule family="ipv4" source address="192.168.0.0/16" port port="22" protocol="tcp" accept + """ + normalized_rules = [] + for rich_rule in rich_rules: + normalized_rule = "" + for cmd in rich_rule.split(" "): + cmd_components = cmd.split("=", 1) + if len(cmd_components) == 2: + assigned_component = cmd_components[1] + if not assigned_component.startswith( + '"' + ) and not assigned_component.endswith('"'): + if assigned_component.startswith( + "'" + ) and assigned_component.endswith("'"): + assigned_component = assigned_component[1:-1] + cmd_components[1] = f'"{assigned_component}"' + normalized_rule = f"{normalized_rule} {'='.join(cmd_components)}" + normalized_rules.append(normalized_rule.lstrip()) + return normalized_rules + + def _present( name, block_icmp=None, @@ -761,6 +796,7 @@ def _present( if rich_rules or prune_rich_rules: rich_rules = rich_rules or [] + rich_rules = _normalize_rich_rules(rich_rules) try: _current_rich_rules = __salt__["firewalld.get_rich_rules"]( name, permanent=True diff --git a/tests/pytests/unit/states/test_firewalld.py b/tests/pytests/unit/states/test_firewalld.py new file mode 100644 index 00000000000..0cbc59633bf --- /dev/null +++ b/tests/pytests/unit/states/test_firewalld.py @@ -0,0 +1,64 @@ +""" + :codeauthor: Hristo Voyvodov <hristo.voyvodov(a)redsift.io> +""" + +import pytest + +import salt.states.firewalld as firewalld +from tests.support.mock import MagicMock, patch + + +(a)pytest.fixture +def configure_loader_modules(): + return {firewalld: {"__opts__": {"test": False}}} + + +(a)pytest.mark.parametrize( + "rich_rule", + [ + ( + [ + 'rule family="ipv4" source address="192.168.0.0/16" port port=22 protocol=tcp accept' + ] + ), + ( + [ + 'rule family="ipv4" source address="192.168.0.0/16" port port=\'22\' protocol=tcp accept' + ] + ), + ( + [ + "rule family='ipv4' source address='192.168.0.0/16' port port='22' protocol=tcp accept" + ] + ), + ], +) +def test_present_rich_rules_normalized(rich_rule): + firewalld_reload_rules = MagicMock(return_value={}) + firewalld_rich_rules = [ + 'rule family="ipv4" source address="192.168.0.0/16" port port="22" protocol="tcp" accept', + ] + + firewalld_get_zones = MagicMock( + return_value=[ + "block", + "public", + ] + ) + firewalld_get_masquerade = MagicMock(return_value=False) + firewalld_get_rich_rules = MagicMock(return_value=firewalld_rich_rules) + + __salt__ = { + "firewalld.reload_rules": firewalld_reload_rules, + "firewalld.get_zones": firewalld_get_zones, + "firewalld.get_masquerade": firewalld_get_masquerade, + "firewalld.get_rich_rules": firewalld_get_rich_rules, + } + with patch.dict(firewalld.__dict__, {"__salt__": __salt__}): + ret = firewalld.present("public", rich_rules=rich_rule) + assert ret == { + "changes": {}, + "result": True, + "comment": "'public' is already in the desired state.", + "name": "public", + } -- 2.45.2

1 0

commit nuspell for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nuspell for openSUSE:Factory checked in at 2024-07-26 16:15:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nuspell (Old) and /work/SRC/openSUSE:Factory/.nuspell.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nuspell" Fri Jul 26 16:15:08 2024 rev:10 rq:1189319 version:5.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/nuspell/nuspell.changes 2023-11-23 21:38:45.291307055 +0100 +++ /work/SRC/openSUSE:Factory/.nuspell.new.1882/nuspell.changes 2024-07-26 16:15:22.981422361 +0200 @@ -1,0 +2,25 @@ +Wed Jul 24 04:32:43 UTC 2024 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Disable man file generation to avoid BuildRequires on pandoc + (nuspell is a Ring1 package). + +------------------------------------------------------------------- +Wed Jul 17 04:38:53 UTC 2024 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 5.1.6: + * Be more explicit about Pandoc dependency, do not quietly + continue building if it is not found. + * Fix compatibility with older versions of Pandoc. +- Changes from version 5.1.5: + * Added man-page for the CLI tool. Pandoc is again dependency + for building. + * Fix edge case when parsing LONG flags in the .aff file. +- New BuildRequires: pandoc to build man file. + +------------------------------------------------------------------- +Wed Mar 20 12:02:20 UTC 2024 - Richard Biener <rguenther(a)suse.com> + +- Avoid relying on macro expansion in BuildRequires as that breaks + Substitute. + +------------------------------------------------------------------- Old: ---- nuspell-5.1.4.tar.gz New: ---- nuspell-5.1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nuspell.spec ++++++ --- /var/tmp/diff_new_pack.LjaY9s/_old 2024-07-26 16:15:23.441440892 +0200 +++ /var/tmp/diff_new_pack.LjaY9s/_new 2024-07-26 16:15:23.441440892 +0200 @@ -1,7 +1,7 @@ # # spec file for package nuspell # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,14 @@ %define libname libnuspell # Due to std::filesystem and std::charconv used by code, at least gcc-c++ >= 10 and std=c++17 is required %if 0%{?suse_version} < 1550 -%define gcc_ver 10 %bcond_with tests %else %bcond_without tests %endif +# Ring1 package, avoid pandoc requirement by disabling mnan file generation +%bcond_with man Name: nuspell -Version: 5.1.4 +Version: 5.1.6 Release: 0 Summary: A spell checker library and command-line tool License: LGPL-3.0-or-later @@ -36,12 +37,19 @@ BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: gcc%{?gcc_ver}-c++ +%if 0%{?suse_version} < 1550 +BuildRequires: gcc10-c++ +%else +BuildRequires: gcc-c++ +%endif BuildRequires: graphviz BuildRequires: libicu-devel BuildRequires: pkgconfig BuildRequires: rubygem(%{rb_default_ruby_abi}:ronn) Requires: hunspell +%if %{with man} +BuildRequires: pandoc +%endif %if %{with tests} BuildRequires: pkgconfig(catch2) >= 3.3.2 %endif @@ -102,11 +110,13 @@ %build %cmake -DBUILD_SHARED_LIBS:BOOL=ON \ %if 0%{?suse_version} < 1550 - -DCMAKE_CXX_COMPILER:STRING=g++-%{?gcc_ver} \ + -DCMAKE_CXX_COMPILER:STRING=g++-10 \ -DCMAKE_CXX_FLAGS:STRING="%{optflags} -std=c++17" \ %endif -DBUILD_TESTING:BOOL=%{?with_tests:ON}%{!?with_tests:OFF} \ - -DCMAKE_SKIP_RPATH:BOOL=OFF + -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DBUILD_DOCS=%{?with_man:ON}%{!?with_man:OFF} \ + %{nil} %cmake_build cd ../ @@ -132,11 +142,16 @@ %doc README.md CHANGELOG.md AUTHORS %license COPYING.LESSER COPYING %{_bindir}/nuspell +%if %{with man} +%{_mandir}/man1/nuspell.1%{?ext_man} +%endif %files -n %{libname}%{sonum} %license COPYING.LESSER COPYING %{_libdir}/%{libname}.so.* +%if 0%{?suse_version} < 1650 && 0%{?sle_version} <= 150500 %exclude %{_datadir}/doc/nuspell/README.md +%endif %files devel %license COPYING.LESSER COPYING ++++++ nuspell-5.1.4.tar.gz -> nuspell-5.1.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/.github/workflows/cmake.yml new/nuspell-5.1.6/.github/workflows/cmake.yml --- old/nuspell-5.1.4/.github/workflows/cmake.yml 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/.github/workflows/cmake.yml 2024-07-04 13:45:35.000000000 +0200 @@ -21,10 +21,10 @@ env: CXXFLAGS: ${{ matrix.cxxflags }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies - run: sudo apt-get update && sudo apt-get install catch2 + run: sudo apt-get update && sudo apt-get install catch2 pandoc - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. @@ -45,7 +45,7 @@ runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Bring runner env vars to workflows shell: bash @@ -53,13 +53,16 @@ echo "local_app_data=$LOCALAPPDATA" >> $GITHUB_ENV echo "vcpkg_root=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: # use backslashes in path here for Windows. path: ${{ env.local_app_data }}\vcpkg\archives key: windows-vcpkg-cache-${{ hashFiles('vcpkg.json') }} restore-keys: windows-vcpkg-cache- + - name: Install pandoc + run: choco install pandoc + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} env: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/CHANGELOG.md new/nuspell-5.1.6/CHANGELOG.md --- old/nuspell-5.1.4/CHANGELOG.md 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/CHANGELOG.md 2024-07-04 13:45:35.000000000 +0200 @@ -6,6 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [5.1.6] - 2024-07-04 +### Changed +- Be more explicit about Pandoc dependency, do not quietly continue building if + it is not found. Otherwise, packagers will forget to add it as dependency. + Alternatively, one can disable building the docs and the dependency with the + CMake option BUILD_DOCS=OFF. + +### Fix +- Fix compatibility with older versions of Pandoc. + +## [5.1.5] - 2024-07-03 +### Added +- Added man-page for the CLI tool. Pandoc is again dependency for building. + +### Fixed +- Fix edge case when parsing LONG flags in the .aff file. + ## [5.1.4] - 2023-11-08 ### Changed - Raise the minimum required version of dependency Catch2 to v3.1.1. See #133. @@ -271,7 +288,8 @@ - Spelling error detection (checking) is closely matching Hunspell - Support for spelling error correction (suggestions) -[Unreleased]: https://github.com/nuspell/nuspell/compare/v5.1.4...HEAD +[5.1.6]: https://github.com/nuspell/nuspell/compare/v5.1.5...v5.1.6 +[5.1.5]: https://github.com/nuspell/nuspell/compare/v5.1.4...v5.1.5 [5.1.4]: https://github.com/nuspell/nuspell/compare/v5.1.3...v5.1.4 [5.1.3]: https://github.com/nuspell/nuspell/compare/v5.1.2...v5.1.3 [5.1.2]: https://github.com/nuspell/nuspell/compare/v5.1.1...v5.1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/CMakeLists.txt new/nuspell-5.1.6/CMakeLists.txt --- old/nuspell-5.1.4/CMakeLists.txt 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/CMakeLists.txt 2024-07-04 13:45:35.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.12) project(nuspell - VERSION 5.1.4 + VERSION 5.1.6 DESCRIPTION "Nuspell spellchecking library" HOMEPAGE_URL https://nuspell.github.io/ LANGUAGES CXX) @@ -8,6 +8,7 @@ option(BUILD_SHARED_LIBS "Build as shared library" ON) option(BUILD_TESTING "Build the testing tree." ON) option(BUILD_TOOLS "Build the CLI tool." ON) +option(BUILD_DOCS "Build the docs." ON) include(GNUInstallDirs) include(CMakePackageConfigHelpers) @@ -33,6 +34,9 @@ # no need to test, build docs or install return() endif() +if (BUILD_DOCS) + add_subdirectory(docs) +endif() macro(fetch_catch2) include(FetchContent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/README.md new/nuspell-5.1.6/README.md --- old/nuspell-5.1.4/README.md 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/README.md 2024-07-04 13:45:35.000000000 +0200 @@ -33,6 +33,7 @@ - Getopt (It is needed only on Windows + MSVC and only when the CLI tool or the tests are built. It is available in vcpkg. Other platforms provide it out of the box.) + - Pandoc (optional, needed for building the man-page) Run-time (and build-time) dependencies: @@ -49,7 +50,7 @@ For Ubuntu and Debian: ```bash -sudo apt install git cmake libicu-dev +sudo apt install g++ cmake libicu-dev catch2 pandoc ``` Then run the following commands inside the Nuspell directory: @@ -83,7 +84,7 @@  ```bash -brew install cmake icu4c +brew install cmake icu4c catch2 pandoc export ICU_ROOT=$(brew --prefix icu4c) ``` @@ -104,7 +105,8 @@ Visual Studio Build Tools. 2. Install Git for Windows and Cmake. 3. Install Vcpkg in some folder, e.g. in `c:\vcpkg`. -4. Run the commands bellow. Vcpkg will work in manifest mode and it will +4. Install Pandoc. You can manually install or use `choco install pandoc`. +5. Run the commands bellow. Vcpkg will work in manifest mode and it will automatically install the dependencies.  @@ -122,7 +124,7 @@ ```bash pacman -S base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-icu \ - mingw-w64-x86_64-cmake + mingw-w64-x86_64-cmake mingw-w64-x86_64-catch ``` Then from inside the Nuspell folder run: @@ -130,7 +132,7 @@ ```bash mkdir build cd build -cmake .. -G "Unix Makefiles" +cmake .. -G "Unix Makefiles" -DBUILD_DOCS=OFF make make install ``` @@ -146,7 +148,7 @@ Install the following required packages ```bash -pkg cmake icu catch +pkg cmake icu catch2 pandoc ``` Then run the standard cmake and make as on Linux. See above. @@ -162,7 +164,7 @@ nuspell -d en_US text.txt -For more details run `nuspell --help`. +For more details run see the [man-page](docs/nuspell.1.md). <!-- old hunspell v1 stuff The src/tools directory contains ten executables after compiling. @@ -300,5 +302,3 @@ The result can be viewed by opening `doxygen/html/index.html` in a web browser. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/docs/CMakeLists.txt new/nuspell-5.1.6/docs/CMakeLists.txt --- old/nuspell-5.1.4/docs/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/nuspell-5.1.6/docs/CMakeLists.txt 2024-07-04 13:45:35.000000000 +0200 @@ -0,0 +1,20 @@ +find_program(PANDOC_EXECUTABLE pandoc) + +if (NOT PANDOC_EXECUTABLE) + message(FATAL_ERROR "Pandoc not found, can not build man-pages. " + "Either install Pandoc or disable builing the docs with " + "cmake -DBUILD_DOCS=OFF") +endif() + +if (BUILD_TOOLS) + add_custom_command(OUTPUT nuspell.1 + COMMAND + ${PANDOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/nuspell.1.md + --from=markdown --to=man --standalone --output=nuspell.1 + "--metadata=footer:Nuspell ${PROJECT_VERSION}" + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/nuspell.1.md + COMMENT "Building manpage nuspell.1") + add_custom_target(nuspell-man-pages ALL DEPENDS nuspell.1) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nuspell.1 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/docs/nuspell.1.md new/nuspell-5.1.6/docs/nuspell.1.md --- old/nuspell-5.1.4/docs/nuspell.1.md 1970-01-01 01:00:00.000000000 +0100 +++ new/nuspell-5.1.6/docs/nuspell.1.md 2024-07-04 13:45:35.000000000 +0200 @@ -0,0 +1,96 @@ +--- +title: NUSPELL +section: 1 +header: User Commands +footer: Nuspell vX.Y # override this on the command line in CMake +author: Dimitrij Mijoski +date: 2024-07-03 # This date should be changed when signifcant changes in this + # document are made. It is not release date or build date. +--- + +# NAME + +nuspell - Command-line tool for spellchecking. + +# SYNOPSIS + +**nuspell** \[**-d** _dict_NAME_\] \[_OPTION_\]... \[_FILE_\]... +**nuspell** **-D|\--help|\--version** + +# DESCRIPTION + +Check spelling of each _FILE_. If no _FILE_ is specified, check standard input. +The text in the input is first segmented into words with an algorithm +that recognizes punctuation and then each word is checked. + +# OPTIONS + +__-d, \--dictionary=__*di_CT* +: Use _di_CT_ dictionary. Only one is supported. A dictionary consists of two + files with extensions .dic and .aff. The **-d** option accepts either + dictionary name without filename extension, usually a language tag, or a + path (with slash) to the .aff file including the filename extension. When + just a name is given, it will be searched among the list of dictionaries in + the default directories (see option **-D**). When a path to .aff is given, + only the dictionary under the path is considered. When **-d** is not present, + the CLI tools tries to load a dictionary using the language tag from the + active locale. + +**-D, \--list-dictionaries** +: Print search paths and available dictionaries and exit. + +__\--encoding=__*ENC* +: Set both input and output encoding. + +__\--input-encoding=__*ENC* +: Set input encoding, default is active locale. + +__\--output-encoding=__*ENC* +: Set output encoding, default is active locale. + +**\--help** +: Print short help. + +**\--version** +: Print version number. + +# EXIT STATUS + +Returns error if the argument syntax is invalid, if the dictionary can not be +loaded or if some input file can not be opened. Otherwise, spell checking has +occurred and returns success. + +# ENVIRONMENT + +**DICTIONARY** +: Specify dictionary, same as option **-d**. + +**DICPATH** +: Path to additional directory to search for dictionaries. + +# CAVEATS + +The CLI tool is primarily intended to be used interactively by human. The input +is plain text and the output is mostly plain text with some symbols and words +that are meant to be read by human and not by machine. The format of the output +is not strictly defined and may change, thus it is not machine-readable. Other +programs should use the C++ library directly which has stable API. + +# EXAMPLES + + nuspell -d en_US file.txt + nuspell -d ../../subdir/di_CT.aff + +# REPORTING BUGS + +Bug reports: <https://github.com/nuspell/nuspell/issues> + +# COPYRIGHT + +Copyright 2016-2024 Nuspell authors. + +# SEE ALSO + +Full documentation: <https://github.com/nuspell/nuspell/wiki> + +Home page: <http://nuspell.github.io/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/aff_data.cxx new/nuspell-5.1.6/src/nuspell/aff_data.cxx --- old/nuspell-5.1.4/src/nuspell/aff_data.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/aff_data.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -113,8 +113,8 @@ auto i = s.begin(); auto e = s.end(); for (; i != e; i += 2) { - auto c1 = *i; - auto c2 = *(i + 1); + unsigned char c1 = *i; + unsigned char c2 = *(i + 1); out.push_back((c1 << 8) | c2); } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/aff_data.hxx new/nuspell-5.1.6/src/nuspell/aff_data.hxx --- old/nuspell-5.1.4/src/nuspell/aff_data.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/aff_data.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -38,7 +38,10 @@ Encoding() = default; explicit Encoding(const std::string& e) : name(e) { normalize_name(); } - explicit Encoding(std::string&& e) : name(move(e)) { normalize_name(); } + explicit Encoding(std::string&& e) : name(std::move(e)) + { + normalize_name(); + } explicit Encoding(const char* e) : name(e) { normalize_name(); } auto& operator=(const std::string& e) { @@ -48,7 +51,7 @@ } auto& operator=(std::string&& e) { - name = move(e); + name = std::move(e); normalize_name(); return *this; } @@ -86,78 +89,78 @@ using Word_List = Hash_Multimap<std::string, Flag_Set>; struct Aff_Data { - static constexpr auto HIDDEN_HOMONYM_FLAG = char16_t(-1); - static constexpr auto MAX_SUGGESTIONS = size_t(16); + static constexpr char16_t HIDDEN_HOMONYM_FLAG = -1; + static constexpr size_t MAX_SUGGESTIONS = 16; // spell checking options - Word_List words; - Prefix_Table prefixes; - Suffix_Table suffixes; - - bool complex_prefixes; - bool fullstrip; - bool checksharps; - bool forbid_warn; - char16_t compound_onlyin_flag; - char16_t circumfix_flag; - char16_t forbiddenword_flag; - char16_t keepcase_flag; - char16_t need_affix_flag; - char16_t warn_flag; + Word_List words = {}; + Prefix_Table prefixes = {}; + Suffix_Table suffixes = {}; + + bool complex_prefixes = {}; + bool fullstrip = {}; + bool checksharps = {}; + bool forbid_warn = {}; + char16_t compound_onlyin_flag = {}; + char16_t circumfix_flag = {}; + char16_t forbiddenword_flag = {}; + char16_t keepcase_flag = {}; + char16_t need_affix_flag = {}; + char16_t warn_flag = {}; // compounding options - char16_t compound_flag; - char16_t compound_begin_flag; - char16_t compound_last_flag; - char16_t compound_middle_flag; - Compound_Rule_Table compound_rules; + char16_t compound_flag = {}; + char16_t compound_begin_flag = {}; + char16_t compound_last_flag = {}; + char16_t compound_middle_flag = {}; + Compound_Rule_Table compound_rules = {}; // spell checking options - Break_Table break_table; - Substr_Replacer input_substr_replacer; - std::string ignored_chars; - icu::Locale icu_locale; - Substr_Replacer output_substr_replacer; + Break_Table break_table = {}; + Substr_Replacer input_substr_replacer = {}; + std::string ignored_chars = {}; + icu::Locale icu_locale = {}; + Substr_Replacer output_substr_replacer = {}; // suggestion options - Replacement_Table replacements; - std::vector<Similarity_Group> similarities; - std::string keyboard_closeness; - std::string try_chars; - // Phonetic_Table phonetic_table; - - char16_t nosuggest_flag; - char16_t substandard_flag; - unsigned short max_compound_suggestions; - unsigned short max_ngram_suggestions; - unsigned short max_diff_factor; - bool only_max_diff; - bool no_split_suggestions; - bool suggest_with_dots; + Replacement_Table replacements = {}; + std::vector<Similarity_Group> similarities = {}; + std::string keyboard_closeness = {}; + std::string try_chars = {}; + // Phonetic_Table phonetic_table = {}; + + char16_t nosuggest_flag = {}; + char16_t substandard_flag = {}; + unsigned short max_compound_suggestions = {}; + unsigned short max_ngram_suggestions = {}; + unsigned short max_diff_factor = {}; + bool only_max_diff = {}; + bool no_split_suggestions = {}; + bool suggest_with_dots = {}; // compounding options - unsigned short compound_min_length; - unsigned short compound_max_word_count; - char16_t compound_permit_flag; - char16_t compound_forbid_flag; - char16_t compound_root_flag; - char16_t compound_force_uppercase; - bool compound_more_suffixes; - bool compound_check_duplicate; - bool compound_check_rep; - bool compound_check_case; - bool compound_check_triple; - bool compound_simplified_triple; - bool compound_syllable_num; - unsigned short compound_syllable_max; - std::string compound_syllable_vowels; - std::vector<Compound_Pattern> compound_patterns; + unsigned short compound_min_length = {}; + unsigned short compound_max_word_count = {}; + char16_t compound_permit_flag = {}; + char16_t compound_forbid_flag = {}; + char16_t compound_root_flag = {}; + char16_t compound_force_uppercase = {}; + bool compound_more_suffixes = {}; + bool compound_check_duplicate = {}; + bool compound_check_rep = {}; + bool compound_check_case = {}; + bool compound_check_triple = {}; + bool compound_simplified_triple = {}; + bool compound_syllable_num = {}; + unsigned short compound_syllable_max = {}; + std::string compound_syllable_vowels = {}; + std::vector<Compound_Pattern> compound_patterns = {}; // data members used only while parsing - Flag_Type flag_type; - Encoding encoding; - std::vector<Flag_Set> flag_aliases; - std::string wordchars; // deprecated? + Flag_Type flag_type = {}; + Encoding encoding = {}; + std::vector<Flag_Set> flag_aliases = {}; + std::string wordchars = {}; // deprecated? auto parse_aff(std::istream& in, std::ostream& err_msg) -> bool; auto parse_dic(std::istream& in, std::ostream& err_msg) -> bool; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/checker.cxx new/nuspell-5.1.6/src/nuspell/checker.cxx --- old/nuspell-5.1.4/src/nuspell/checker.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/checker.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/checker.hxx new/nuspell-5.1.6/src/nuspell/checker.hxx --- old/nuspell-5.1.4/src/nuspell/checker.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/checker.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -89,10 +89,7 @@ ACCEPT_HIDDEN_HOMONYM = false, SKIP_HIDDEN_HOMONYM = true }; - Checker() - : Aff_Data() // we explicity do value init so content is zeroed - { - } + auto spell_priv(std::string& s) const -> bool; auto spell_break(std::string& s, size_t depth = 0) const -> bool; auto spell_casing(std::string& s) const -> const Flag_Set*; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/defines.hxx new/nuspell-5.1.6/src/nuspell/defines.hxx --- old/nuspell-5.1.4/src/nuspell/defines.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/defines.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/dictionary.cxx new/nuspell-5.1.6/src/nuspell/dictionary.cxx --- old/nuspell-5.1.4/src/nuspell/dictionary.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/dictionary.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -21,7 +21,6 @@ #include <fstream> #include <sstream> -#include <stdexcept> using namespace std; @@ -65,7 +64,7 @@ auto err = "Dic file " + dic_path.string() + " not found."; throw Dictionary_Loading_Error(err); } - return {move(aff_file), move(dic_file)}; + return {std::move(aff_file), std::move(dic_file)}; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/dictionary.hxx new/nuspell-5.1.6/src/nuspell/dictionary.hxx --- old/nuspell-5.1.4/src/nuspell/dictionary.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/dictionary.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/finder.cxx new/nuspell-5.1.6/src/nuspell/finder.cxx --- old/nuspell-5.1.4/src/nuspell/finder.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/finder.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/finder.hxx new/nuspell-5.1.6/src/nuspell/finder.hxx --- old/nuspell-5.1.4/src/nuspell/finder.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/finder.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/structures.hxx new/nuspell-5.1.6/src/nuspell/structures.hxx --- old/nuspell-5.1.4/src/nuspell/structures.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/structures.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2018-2023 Dimitrij Mijoski +/* Copyright 2018-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -330,7 +330,7 @@ { sort_uniq(); } - explicit Substr_Replacer(Table_Pairs&& v) : table(move(v)) + explicit Substr_Replacer(Table_Pairs&& v) : table(std::move(v)) { sort_uniq(); } @@ -343,7 +343,7 @@ } auto& operator=(Table_Pairs&& v) { - table = move(v); + table = std::move(v); sort_uniq(); return *this; } @@ -454,7 +454,7 @@ public: Break_Table() = default; explicit Break_Table(const Table_Str& v) : table(v) { order_entries(); } - explicit Break_Table(Table_Str&& v) : table(move(v)) + explicit Break_Table(Table_Str&& v) : table(std::move(v)) { order_entries(); } @@ -468,7 +468,7 @@ auto& operator=(Table_Str&& v) { - table = move(v); + table = std::move(v); order_entries(); return *this; } @@ -667,7 +667,7 @@ { construct(); } - explicit Condition(Str&& condition) : cond(move(condition)) + explicit Condition(Str&& condition) : cond(std::move(condition)) { construct(); } @@ -1393,7 +1393,7 @@ fill_all_flags(); } explicit Compound_Rule_Table(std::vector<std::u16string>&& tbl) - : rules(move(tbl)) + : rules(std::move(tbl)) { fill_all_flags(); } @@ -1405,7 +1405,7 @@ } auto& operator=(std::vector<std::u16string>&& tbl) { - rules = move(tbl); + rules = std::move(tbl); fill_all_flags(); return *this; } @@ -1538,7 +1538,7 @@ { order_entries(); } - explicit Replacement_Table(Table_Str&& v) : table(move(v)) + explicit Replacement_Table(Table_Str&& v) : table(std::move(v)) { order_entries(); } @@ -1552,7 +1552,7 @@ auto& operator=(Table_Str&& v) { - table = move(v); + table = std::move(v); order_entries(); return *this; } @@ -1667,7 +1667,7 @@ { order(); } - explicit Phonetic_Table(std::vector<Pair_Str>&& v) : table(move(v)) + explicit Phonetic_Table(std::vector<Pair_Str>&& v) : table(std::move(v)) { order(); } @@ -1679,7 +1679,7 @@ } auto& operator=(std::vector<Pair_Str>&& v) { - table = move(v); + table = std::move(v); order(); return *this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/suggester.cxx new/nuspell-5.1.6/src/nuspell/suggester.cxx --- old/nuspell-5.1.4/src/nuspell/suggester.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/suggester.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -202,7 +202,7 @@ if (it != last) { for (auto it2 = it + 1; it2 != last; ++it2) if (is_ok(*it2)) - *it++ = move(*it2); + *it++ = std::move(*it2); out.erase(it, last); } } @@ -975,12 +975,12 @@ if (guess_words.size() != 200) { guess_words.push_back( - {move(expanded_word), score}); + {std::move(expanded_word), score}); push_heap(begin(guess_words), end(guess_words)); } else if (score > guess_words.front().score) { pop_heap(begin(guess_words), end(guess_words)); - guess_words.back() = {move(expanded_word), + guess_words.back() = {std::move(expanded_word), score}; push_heap(begin(guess_words), end(guess_words)); } @@ -1051,7 +1051,7 @@ else continue; } - out.push_back(move(guess_word_u8)); + out.push_back(std::move(guess_word_u8)); } } @@ -1088,7 +1088,7 @@ continue; auto expanded = suffix.to_derived_copy(root); - expanded_list.push_back(move(expanded)); + expanded_list.push_back(std::move(expanded)); cross_affix.push_back(suffix.cross_product); } @@ -1114,7 +1114,7 @@ continue; auto expanded = prefix.to_derived_copy(root_sfx); - expanded_list.push_back(move(expanded)); + expanded_list.push_back(std::move(expanded)); } } @@ -1135,7 +1135,7 @@ continue; auto expanded = prefix.to_derived_copy(root); - expanded_list.push_back(move(expanded)); + expanded_list.push_back(std::move(expanded)); } } NUSPELL_END_INLINE_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/suggester.hxx new/nuspell-5.1.6/src/nuspell/suggester.hxx --- old/nuspell-5.1.4/src/nuspell/suggester.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/suggester.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/unicode.hxx new/nuspell-5.1.6/src/nuspell/unicode.hxx --- old/nuspell-5.1.4/src/nuspell/unicode.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/unicode.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2021-2023 Dimitrij Mijoski +/* Copyright 2021-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/utils.cxx new/nuspell-5.1.6/src/nuspell/utils.cxx --- old/nuspell-5.1.4/src/nuspell/utils.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/utils.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -20,7 +20,6 @@ #include "unicode.hxx" #include <algorithm> -#include <limits> #include <locale> #include <unicode/stringoptions.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/nuspell/utils.hxx new/nuspell-5.1.6/src/nuspell/utils.hxx --- old/nuspell-5.1.4/src/nuspell/utils.hxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/nuspell/utils.hxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/src/tools/nuspell.cxx new/nuspell-5.1.6/src/tools/nuspell.cxx --- old/nuspell-5.1.4/src/tools/nuspell.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/src/tools/nuspell.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -66,7 +66,7 @@ The text in the input is first segmented into words with an algorithm that recognizes punctuation and then each word is checked. - -d, --dictionary=di_CT use di_CT dictionary (only one is supported) + -d, --dictionary=di_CT use di_CT dictionary, only one is supported -D, --list-dictionaries print search paths and available dictionaries --encoding=enc set both input and output encoding --input-encoding=enc input encoding, default is active locale @@ -74,12 +74,17 @@ --help print this help --version print version number -One dictionary consists of two files with extensions .dic and .aff. -The -d option accepts either dictionary name without filename extension or a -path with slash (and with extension) to the .aff file of the dictionary. When -just a name is given, it will be searched among the list of dictionaries in the -default directories (see option -D). When a path to .aff is given, only the -dictionary under the path is considered. +A dictionary consists of two files with extensions .dic and .aff. The -d option +accepts either dictionary name without filename extension, usually a language +tag, or a path (with slash) to the .aff file including the filename extension. +When just a name is given, it will be searched among the list of dictionaries in +the default directories (see option -D). When a path to .aff is given, only the +dictionary under the path is considered. When -d is not present, the CLI tools +tries to load a dictionary using the language tag from the active locale. + +Returns error if the argument syntax is invalid, if the dictionary can not be +loaded or if some input file can not be opened. Otherwise, spell checking has +occurred and returns success. The following environment variables can have effect: @@ -98,7 +103,7 @@ } auto ver_str = "nuspell " PROJECT_VERSION R"( -Copyright (C) 2016-2023 Dimitrij Mijoski +Copyright 2016-2024 Dimitrij Mijoski License LGPLv3+: GNU LGPL version 3 or later <http://gnu.org/licenses/lgpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/tests/legacy_test.cxx new/nuspell-5.1.6/tests/legacy_test.cxx --- old/nuspell-5.1.4/tests/legacy_test.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/tests/legacy_test.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2018-2023 Dimitrij Mijoski +/* Copyright 2018-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/tests/unit_test.cxx new/nuspell-5.1.6/tests/unit_test.cxx --- old/nuspell-5.1.4/tests/unit_test.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/tests/unit_test.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2021-2023 Dimitrij Mijoski +/* Copyright 2021-2024 Dimitrij Mijoski * * This file is part of Nuspell. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nuspell-5.1.4/tests/verify.cxx new/nuspell-5.1.6/tests/verify.cxx --- old/nuspell-5.1.4/tests/verify.cxx 2023-11-08 10:44:28.000000000 +0100 +++ new/nuspell-5.1.6/tests/verify.cxx 2024-07-04 13:45:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2016-2023 Dimitrij Mijoski +/* Copyright 2016-2024 Dimitrij Mijoski * * This file is part of Nuspell. * @@ -92,7 +92,7 @@ } auto ver_str = "nuspell " PROJECT_VERSION R"( -Copyright (C) 2016-2023 Dimitrij Mijoski +Copyright 2016-2024 Dimitrij Mijoski License LGPLv3+: GNU LGPL version 3 or later <http://gnu.org/licenses/lgpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.

1 0

commit emacs for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2024-07-26 16:15:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "emacs" Fri Jul 26 16:15:06 2024 rev:189 rq:1189610 version:29.4 Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2024-07-11 20:29:41.765191936 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new.1882/emacs.changes 2024-07-26 16:15:21.337356135 +0200 @@ -1,0 +2,18 @@ +Thu Jul 25 12:23:48 UTC 2024 - Dr. Werner Fink <werner(a)suse.de> + +- Use simple trusted members of the group games (boo#1228058) + +------------------------------------------------------------------- +Wed Jul 17 09:11:18 UTC 2024 - Dr. Werner Fink <werner(a)suse.de> + +- Split off the emacs-games package for score handling (boo#1227737) +- Implement setgid based score handling + +------------------------------------------------------------------- +Thu Jul 11 09:31:21 UTC 2024 - Dr. Werner Fink <werner(a)suse.de> + +- The xauth patch should ignore any locking at read time + as otherwise emacs server might hang +- Provide support of ELPA systemwide installations to OBS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.s9KJZW/_old 2024-07-26 16:15:22.641408665 +0200 +++ /var/tmp/diff_new_pack.s9KJZW/_new 2024-07-26 16:15:22.645408826 +0200 @@ -30,6 +30,14 @@ %bcond_with tex4pdf %bcond_with memmmap %bcond_with checks +# +# Compare with AUDIT bug boo#1228058 +# With this setup only members of the group "games" can use +# already existing score files below /var/games/emacs/ +# +# +%bcond_without games +%define gattr 00755 Name: emacs %if %{with checks} @@ -74,7 +82,7 @@ %endif BuildRequires: makeinfo BuildRequires: ncurses-devel -%if 0%{?suse_version} >= 1500 +%if %{with games} BuildRequires: user(games) %endif BuildRequires: systemd-rpm-macros @@ -163,6 +171,7 @@ Obsoletes: nxml-mode < 20041004 Provides: epg = 1.0.0 Obsoletes: epg < 1.0.0 +Provides: emacs(ELPA) Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} Requires: etags @@ -170,9 +179,12 @@ Requires: mailutils %endif Requires(pre): fileutils -%if 0%{?suse_version} >= 1500 -Requires(pre): group(games) -Requires(pre): user(games) +%if %{with games} +%if !0%{?is_opensuse} +Suggests: %{name}-games +%else +Recommends: %{name}-games +%endif %endif Source: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz Source1: app-defaults.Emacs @@ -314,7 +326,7 @@ Group: Documentation/Other %if 0%{?suse_version} <= 1500 Requires(post): %install_info_prereq -Requires(preun):%install_info_prereq +Requires(preun): %install_info_prereq %endif BuildArch: noarch @@ -323,11 +335,26 @@ be read online with GNU Emacs. They describe Emacs and some of its modes. +%if %{with games} +%package games +Requires: emacs = %{version}-%{release} +Requires(pre): group(games) +Requires(pre): user(games) +Requires(pre): permissions +Provides: emacs:%{_localstatedir}/games/emacs +Summary: Provides scores for Emacs games +Group: Amusements/Games/Other + +%description games +This package provides capability to play games for members of the user +group called "games". +%endif + %package -n etags Summary: Generate Tag Files for Use with Emacs Group: Development/Tools/Navigators Requires(post): coreutils update-alternatives -Requires(preun):coreutils update-alternatives +Requires(preun): coreutils update-alternatives Provides: ctags:/usr/bin/etags %description -n etags @@ -520,7 +547,9 @@ --without-native-compilation \ %endif --without-hesiod \ +%if %{with games} --with-gameuser=:games \ +%endif --with-kerberos \ --with-kerberos5 \ --with-file-notification=inotify \ @@ -796,14 +825,44 @@ done %endif +%if %{with games} && "%{gattr}" == "02755" +%if 0%{?suse_version} >= 1699 +mkdir -p %{buildroot}%{_datadir}/permissions/permissions.d +(cat > %{buildroot}%{_datadir}/permissions/permissions.d/emacs-games) <<-'EOF' + %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score games:games 02755 + EOF +(cat > %{buildroot}%{_datadir}/permissions/permissions.d/emacs-games.paranoid) <<-'EOF' + %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score games:games 00755 + EOF +%else +mkdir -p %{buildroot}%{_sysconfdir}/permissions.d +(cat > %{buildroot}%{_sysconfdir}/permissions.d/emacs-games) <<-'EOF' + %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score games:games 02755 + EOF +(cat > %{buildroot}%{_sysconfdir}/permissions.d/emacs-games.paranoid) <<-'EOF' + %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score games:games 00755 + EOF +%endif +%endif + %if %{with checks} %check make check %endif +%if %{with games} && "%{gattr}" == "02755" +%verifyscript games +%verify_permissions -e %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score +%endif + %pre test -L usr/bin/emacs && rm -f usr/bin/emacs || true +%if %{with games} && "%{gattr}" == "02755" +%post games +%set_permissions %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score +%endif + %post -n emacs-x11 %glib2_gsettings_schema_post @@ -850,17 +909,12 @@ %dir %{_libdir}/emacs/elpa/ %dir %{_libexecdir}/emacs/ %dir %{_libexecdir}/emacs/%{version}/ -%dir %{_libexecdir}/emacs/%{version}/*-suse-linux*/ -%{_libexecdir}/emacs/%{version}/*-suse-linux*/hexl +%dir %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/ +%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/hexl %if %{without mailutils} -%{_libexecdir}/emacs/%{version}/*-suse-linux*/movemail -%endif -%{_libexecdir}/emacs/%{version}/*-suse-linux*/rcs2log -%if 0 -%attr(04755,games,games) %{_libexecdir}/emacs/%{version}/*-suse-linux*/update-game-score -%else -%{_libexecdir}/emacs/%{version}/*-suse-linux*/update-game-score +%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/movemail %endif +%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/rcs2log %{_userunitdir}/emacs.service %dir %{_datadir}/doc/packages/emacs/ %{_datadir}/doc/packages/emacs/doc @@ -3475,23 +3529,40 @@ %dir %{_datadir}/emacs/site-lisp/site-start.d/ %{_mandir}/man1/*.1%{ext_man} %exclude %{_mandir}/man1/*tags.1%{ext_man} -%dir %attr(775,games,games) %{_localstatedir}/games/emacs -%attr(660,games,games) %{_localstatedir}/games/emacs/snake-scores -%attr(660,games,games) %{_localstatedir}/games/emacs/tetris-scores + +%if %{with games} +%files games +%if "%{gattr}" == "02755" +%attr(%{gattr},root,games) %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score +%if 0%{?suse_version} >= 1699 +%attr(0755,root,root) %{_datadir}/permissions/permissions.d/ +%attr(0644,root,root) %{_datadir}/permissions/permissions.d/emacs-games +%attr(0644,root,root) %{_datadir}/permissions/permissions.d/emacs-games.paranoid +%else +%config %attr(0644,root,root) %{_sysconfdir}/permissions.d/emacs-games +%config %attr(0644,root,root) %{_sysconfdir}/permissions.d/emacs-games.paranoid +%endif +%else +%attr(%{gattr},root,root) %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score +%endif +%dir %attr(0750,root,games) %{_localstatedir}/games/emacs +%attr(0660,root,games) %{_localstatedir}/games/emacs/snake-scores +%attr(0660,root,games) %{_localstatedir}/games/emacs/tetris-scores +%endif %files -n emacs-nox %defattr(-, root, root) %{_bindir}/emacs-nox -%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-nox*.pdmp +%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/emacs-nox*.pdmp %files -n emacs-x11 %defattr(-, root, root) %{_bindir}/emacs-x11 %{_bindir}/emacs-gtk %{_bindir}/emacs-wayland -%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-x11*.pdmp -%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-gtk*.pdmp -%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-wayland*.pdmp +%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/emacs-x11*.pdmp +%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/emacs-gtk*.pdmp +%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/emacs-wayland*.pdmp %dir %{appDefaultsDir} %{appDefaultsFile} %{_datadir}/applications/emacs*.desktop ++++++ emacs-27.1-Xauthority4server.patch ++++++ --- /var/tmp/diff_new_pack.s9KJZW/_old 2024-07-26 16:15:22.757413338 +0200 +++ /var/tmp/diff_new_pack.s9KJZW/_new 2024-07-26 16:15:22.761413499 +0200 @@ -119,7 +119,7 @@ + (setq xauth-file (expand-file-name "~/.Xauthority"))) + (if (and (file-exists-p xauth-file) (not (file-equal-p xauth-file server-xauth-file))) + (progn -+ (setq xauth-cmd (concat "xauth -f " xauth-file " extract - " display ++ (setq xauth-cmd (concat "xauth -i -f " xauth-file " extract - " display + "| xauth -f " server-xauth-file " merge -")) + (shell-command xauth-cmd))))) +

1 0

commit xdg-utils for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2024-07-26 16:15:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old) and /work/SRC/openSUSE:Factory/.xdg-utils.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdg-utils" Fri Jul 26 16:15:01 2024 rev:64 rq:1189600 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2024-04-15 20:19:33.895025420 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new.1882/xdg-utils.changes 2024-07-26 16:15:18.589245436 +0200 @@ -1,0 +2,6 @@ +Sun Jul 21 08:08:07 UTC 2024 - Matej Cepl <mcepl(a)cepl.eu> + +- Separate xdg-screensaver into a subpackage to isolate Perl + dependency (bsc#1216537). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.YI952i/_old 2024-07-26 16:15:19.117266706 +0200 +++ /var/tmp/diff_new_pack.YI952i/_new 2024-07-26 16:15:19.117266706 +0200 @@ -30,10 +30,8 @@ # for xmlto to be able to generate text from html BuildRequires: w3m BuildRequires: xmlto -Requires: perl -Requires: perl-Net-DBus -Requires: perl-X11-Protocol Requires: which +Recommends: %{name}-screensaver BuildArch: noarch %description @@ -53,6 +51,22 @@ simply make sure that these utilities work properly in their environment. +%package screensaver +Summary: Command line tool for controlling the screensaver +Requires: %{name} = %{version}-%{release} +Provides: xdg-utils:%{_bindir}/xdg-screensaver +Requires: perl +Requires: perl-Net-DBus +Requires: perl-X11-Protocol + +%description screensaver +xdg-screensaver provides commands to control the screensaver. + +For use inside a desktop session only. It is not recommended to +use xdg-screensaver as root. + +Separated from the main package to isolate Perl dependency. + %prep %autosetup -p1 -n %{name}-v%{version} @@ -80,7 +94,6 @@ %{_bindir}/xdg-mime %{_bindir}/xdg-open %{_bindir}/xdg-su -%{_bindir}/xdg-screensaver %{_bindir}/xdg-settings %{_bindir}/xdg-terminal %{_mandir}/man1/xdg-desktop-icon.1%{?ext_man} @@ -90,7 +103,11 @@ %{_mandir}/man1/xdg-mime.1%{?ext_man} %{_mandir}/man1/xdg-open.1%{?ext_man} %{_mandir}/man1/xdg-terminal.1%{?ext_man} -%{_mandir}/man1/xdg-screensaver.1%{?ext_man} %{_mandir}/man1/xdg-settings.1%{?ext_man} %{_mandir}/man1/xdg-su.1%{?ext_man} +%files screensaver +%license LICENSE +%{_bindir}/xdg-screensaver +%{_mandir}/man1/xdg-screensaver.1%{?ext_man} +

1 0

commit gnutls for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnutls for openSUSE:Factory checked in at 2024-07-26 16:14:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnutls (Old) and /work/SRC/openSUSE:Factory/.gnutls.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnutls" Fri Jul 26 16:14:59 2024 rev:156 rq:1189560 version:3.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/gnutls/gnutls.changes 2024-04-08 17:37:36.813213926 +0200 +++ /work/SRC/openSUSE:Factory/.gnutls.new.1882/gnutls.changes 2024-07-26 16:15:17.353195646 +0200 @@ -1,0 +2,19 @@ +Thu Jul 25 08:51:56 UTC 2024 - Pedro Monreal <pmonreal(a)suse.com> + +- Update to 3.8.6: + * libgnutls: PBMAC1 is now supported as a MAC mechanism for PKCS#12 + To be compliant with FIPS 140-3, PKCS#12 files with MAC based on + PBKDF2 (PBMAC1) is now supported, according to the specification + proposed in draft-ietf-lamps-pkcs12-pbmac1. + * libgnutls: SHA3 extendable output functions (XOF) are now supported + SHA3 XOF, SHAKE128 and SHAKE256, are now usable through a new + public API gnutls_hash_squeeze. + * API and ABI modifications: + - gnutls_pkcs12_generate_mac3: New function + - gnutls_pkcs12_flags_t: New enum + - gnutls_hash_squeeze: New function + * Rebase patches: + - gnutls-FIPS-140-3-references.patch + - gnutls-FIPS-jitterentropy.patch + +------------------------------------------------------------------- Old: ---- gnutls-3.8.5.tar.xz gnutls-3.8.5.tar.xz.sig New: ---- gnutls-3.8.6.tar.xz gnutls-3.8.6.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnutls.spec ++++++ --- /var/tmp/diff_new_pack.eTaO49/_old 2024-07-26 16:15:18.001221749 +0200 +++ /var/tmp/diff_new_pack.eTaO49/_new 2024-07-26 16:15:18.005221910 +0200 @@ -40,7 +40,7 @@ %endif %bcond_with tpm Name: gnutls -Version: 3.8.5 +Version: 3.8.6 Release: 0 Summary: The GNU Transport Layer Security Library License: GPL-3.0-or-later AND LGPL-2.1-or-later ++++++ gnutls-3.8.5.tar.xz -> gnutls-3.8.6.tar.xz ++++++ /work/SRC/openSUSE:Factory/gnutls/gnutls-3.8.5.tar.xz /work/SRC/openSUSE:Factory/.gnutls.new.1882/gnutls-3.8.6.tar.xz differ: char 26, line 1 ++++++ gnutls-FIPS-140-3-references.patch ++++++ ++++ 974 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/gnutls/gnutls-FIPS-140-3-references.patch ++++ and /work/SRC/openSUSE:Factory/.gnutls.new.1882/gnutls-FIPS-140-3-references.patch ++++++ gnutls-FIPS-jitterentropy.patch ++++++ --- /var/tmp/diff_new_pack.eTaO49/_old 2024-07-26 16:15:18.089225294 +0200 +++ /var/tmp/diff_new_pack.eTaO49/_new 2024-07-26 16:15:18.093225456 +0200 @@ -1,7 +1,7 @@ -Index: gnutls-3.8.1/lib/nettle/sysrng-linux.c +Index: gnutls-3.8.6/lib/nettle/sysrng-linux.c =================================================================== ---- gnutls-3.8.1.orig/lib/nettle/sysrng-linux.c -+++ gnutls-3.8.1/lib/nettle/sysrng-linux.c +--- gnutls-3.8.6.orig/lib/nettle/sysrng-linux.c ++++ gnutls-3.8.6/lib/nettle/sysrng-linux.c @@ -49,6 +49,15 @@ get_entropy_func _rnd_get_system_entropy = NULL; @@ -158,11 +158,11 @@ +#endif return; } -Index: gnutls-3.8.1/lib/nettle/Makefile.in +Index: gnutls-3.8.6/lib/nettle/Makefile.in =================================================================== ---- gnutls-3.8.1.orig/lib/nettle/Makefile.in -+++ gnutls-3.8.1/lib/nettle/Makefile.in -@@ -402,7 +402,7 @@ am__v_CC_1 = +--- gnutls-3.8.6.orig/lib/nettle/Makefile.in ++++ gnutls-3.8.6/lib/nettle/Makefile.in +@@ -497,7 +497,7 @@ am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -171,10 +171,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -Index: gnutls-3.8.1/lib/nettle/Makefile.am +Index: gnutls-3.8.6/lib/nettle/Makefile.am =================================================================== ---- gnutls-3.8.1.orig/lib/nettle/Makefile.am -+++ gnutls-3.8.1/lib/nettle/Makefile.am +--- gnutls-3.8.6.orig/lib/nettle/Makefile.am ++++ gnutls-3.8.6/lib/nettle/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/lib/common.mk @@ -184,10 +184,10 @@ AM_CPPFLAGS = \ -I$(srcdir)/int \ -Index: gnutls-3.8.1/lib/nettle/rnd-fips.c +Index: gnutls-3.8.6/lib/nettle/rnd-fips.c =================================================================== ---- gnutls-3.8.1.orig/lib/nettle/rnd-fips.c -+++ gnutls-3.8.1/lib/nettle/rnd-fips.c +--- gnutls-3.8.6.orig/lib/nettle/rnd-fips.c ++++ gnutls-3.8.6/lib/nettle/rnd-fips.c @@ -129,6 +129,10 @@ static int drbg_init(struct fips_ctx *fc uint8_t buffer[DRBG_AES_SEED_SIZE]; int ret; @@ -210,16 +210,16 @@ ret = get_entropy(fctx, buffer, sizeof(buffer)); if (ret < 0) { _gnutls_switch_fips_state(GNUTLS_FIPS140_OP_ERROR); -Index: gnutls-3.8.1/tests/Makefile.am +Index: gnutls-3.8.6/tests/Makefile.am =================================================================== ---- gnutls-3.8.1.orig/tests/Makefile.am -+++ gnutls-3.8.1/tests/Makefile.am -@@ -208,7 +208,7 @@ ctests += mini-record-2 simple gnutls_hm +--- gnutls-3.8.6.orig/tests/Makefile.am ++++ gnutls-3.8.6/tests/Makefile.am +@@ -209,7 +209,7 @@ ctests += mini-record-2 simple gnutls_hm dtls12-cert-key-exchange dtls10-cert-key-exchange x509-cert-callback-legacy \ keylog-env ssl2-hello tlsfeature-ext dtls-rehandshake-cert-2 dtls-session-ticket-lost \ tlsfeature-crt dtls-rehandshake-cert-3 resume-with-false-start \ -- set_x509_key_file_ocsp client-fastopen rng-sigint srp rng-pthread \ -+ set_x509_key_file_ocsp client-fastopen srp rng-pthread \ +- set_x509_key_file_ocsp client-fastopen rng-sigint srp \ ++ set_x509_key_file_ocsp client-fastopen srp \ safe-renegotiation/srn0 safe-renegotiation/srn1 safe-renegotiation/srn2 \ safe-renegotiation/srn3 safe-renegotiation/srn4 safe-renegotiation/srn5 \ rsa-illegal-import set_x509_ocsp_multi_invalid set_key set_x509_key_file_ocsp_multi2 \

1 0

commit latex2html for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package latex2html for openSUSE:Factory checked in at 2024-07-26 16:14:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/latex2html (Old) and /work/SRC/openSUSE:Factory/.latex2html.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "latex2html" Fri Jul 26 16:14:41 2024 rev:50 rq:1189530 version:2024 Changes: -------- --- /work/SRC/openSUSE:Factory/latex2html/latex2html.changes 2024-03-01 23:35:00.092148531 +0100 +++ /work/SRC/openSUSE:Factory/.latex2html.new.1882/latex2html.changes 2024-07-26 16:15:03.344631354 +0200 @@ -1,0 +2,5 @@ +Fri Jul 19 03:30:32 UTC 2024 - Bernhard Wiedemann <bwiedemann(a)suse.com> + +- cleanup after test to not modify the install result (boo#1227364) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ latex2html.spec ++++++ --- /var/tmp/diff_new_pack.YFiqQB/_old 2024-07-26 16:15:09.552881434 +0200 +++ /var/tmp/diff_new_pack.YFiqQB/_new 2024-07-26 16:15:09.556881595 +0200 @@ -88,7 +88,9 @@ %check %make_build test +# cleanup after test to not modify the install result (boo#1227364) find docs/manual tests $ -name \*.log -o -name \*.aux -o -name WARNINGS $ -delete +rm -rf tests/l2htest %files %doc Changes FAQ README.md TODO dot.latex2html-init

1 0

commit powerdevil6 for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package powerdevil6 for openSUSE:Factory checked in at 2024-07-26 16:14:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerdevil6 (Old) and /work/SRC/openSUSE:Factory/.powerdevil6.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "powerdevil6" Fri Jul 26 16:14:12 2024 rev:11 rq:1189503 version:6.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/powerdevil6/powerdevil6.changes 2024-07-17 15:14:01.751614583 +0200 +++ /work/SRC/openSUSE:Factory/.powerdevil6.new.1882/powerdevil6.changes 2024-07-26 16:15:01.768567868 +0200 @@ -1,0 +2,6 @@ +Wed Jul 24 17:23:00 UTC 2024 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Add patch to fix crash on display wake up (kde#490356, kde#490421): + * 0001-daemon-Don-t-leave-dangling-Action-pointers-in-idle-.patch + +------------------------------------------------------------------- New: ---- 0001-daemon-Don-t-leave-dangling-Action-pointers-in-idle-.patch BETA DEBUG BEGIN: New:- Add patch to fix crash on display wake up (kde#490356, kde#490421): * 0001-daemon-Don-t-leave-dangling-Action-pointers-in-idle-.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerdevil6.spec ++++++ --- /var/tmp/diff_new_pack.qgQlBi/_old 2024-07-26 16:15:02.580600578 +0200 +++ /var/tmp/diff_new_pack.qgQlBi/_new 2024-07-26 16:15:02.580600578 +0200 @@ -36,6 +36,8 @@ Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.x… Source2: plasma.keyring %endif +# PATCH-FIX-UPSTREAM +Patch1: 0001-daemon-Don-t-leave-dangling-Action-pointers-in-idle-.patch BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} # Needed by FindLibcap.cmake BuildRequires: libcap-progs ++++++ 0001-daemon-Don-t-leave-dangling-Action-pointers-in-idle-.patch ++++++ From 8c1686c9e97edb9a06e06e2f41cfe5351cef7986 Mon Sep 17 00:00:00 2001 From: Jakob Petsovits <jpetso(a)petsovits.com> Date: Thu, 18 Jul 2024 17:14:06 +0000 Subject: [PATCH] daemon: Don't leave dangling Action pointers in idle-time containers If we delete the Action but don't clean up related map/set elements, the powerdevil daemon can crash e.g. in Core::onResumingFromIdle() and Core::onKIdleTimeoutReached(). This has been an issue since commit 584cfdf0 (or d91bc62f on 6.1) which made it possible for already-created actions to get deleted again at a later time. BUG: 490356 BUG: 490421 (cherry picked from commit 7a929fa01ed036f60c5a15c72416b4e40eb03160) Co-authored-by: Jakob Petsovits <jpetso(a)petsovits.com> --- daemon/powerdevilcore.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp index 915ca0ad..838b5c05 100644 --- a/daemon/powerdevilcore.cpp +++ b/daemon/powerdevilcore.cpp @@ -224,10 +224,16 @@ void Core::refreshActions() } // Remove now-unsupported actions - std::erase_if(m_actionPool, [](const auto &pair) { - const auto &[name, action] = pair; - return !action->isSupported(); - }); + for (auto it = m_actionPool.begin(); it != m_actionPool.end();) { + Action *action = it->second.get(); + if (!action->isSupported()) { + m_registeredActionTimeouts.remove(action); + m_pendingResumeFromIdleActions.remove(action); + it = m_actionPool.erase(it); + } else { + ++it; + } + } } bool Core::isActionSupported(const QString &actionName) -- 2.45.2

1 0