June 2024 - openSUSE Commits - openSUSE Mailing Lists

commit cilium-cli for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cilium-cli for openSUSE:Factory checked in at 2024-06-10 17:37:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cilium-cli (Old) and /work/SRC/openSUSE:Factory/.cilium-cli.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cilium-cli" Mon Jun 10 17:37:23 2024 rev:68 rq:1179601 version:0.16.10 Changes: -------- --- /work/SRC/openSUSE:Factory/cilium-cli/cilium-cli.changes 2024-06-03 17:42:19.760531710 +0200 +++ /work/SRC/openSUSE:Factory/.cilium-cli.new.19518/cilium-cli.changes 2024-06-10 17:37:35.666865548 +0200 @@ -1,0 +2,25 @@ +Sat Jun 08 09:57:49 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 0.16.10: + * Prepare for v0.16.10 release + * fix(deps): update module golang.org/x/term to v0.21.0 + * fix(deps): update all go dependencies main + * connectivity: Introduce local redirect policy tests + * connectivity: Add ResultCurlTimeout + * connectivity: Add a scenario getter + * features: Add LocalRedirectPolicy + * connectivity: add egress-gateway-with-l7-policy test + * connectivity: add pod to external with DNS case in EGW scenario + * chore(deps): update golang docker tag to v1.22.4 + * chore(deps): update docker.io/library/busybox:stable-glibc + docker digest to 25e9fcb + * Update go.mod + * fix: properly count wrapped lines in status output in --wait + mode + * chore(deps): update go to v1.22.4 + * chore(deps): update docker.io/library/busybox:stable-glibc + docker digest to 082a03d + * fix: conn tests JUnit file name + * Update stable release to v0.16.9 + +------------------------------------------------------------------- Old: ---- cilium-cli-0.16.9.obscpio New: ---- cilium-cli-0.16.10.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cilium-cli.spec ++++++ --- /var/tmp/diff_new_pack.ojEs5Y/_old 2024-06-10 17:37:38.742980211 +0200 +++ /var/tmp/diff_new_pack.ojEs5Y/_new 2024-06-10 17:37:38.746980360 +0200 @@ -21,7 +21,7 @@ %define executable_name cilium Name: cilium-cli -Version: 0.16.9 +Version: 0.16.10 Release: 0 Summary: CLI to install, manage & troubleshoot Kubernetes clusters running Cilium License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ojEs5Y/_old 2024-06-10 17:37:38.794982149 +0200 +++ /var/tmp/diff_new_pack.ojEs5Y/_new 2024-06-10 17:37:38.798982299 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/cilium/cilium-cli</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.16.9</param> + <param name="revision">v0.16.10</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ojEs5Y/_old 2024-06-10 17:37:38.826983342 +0200 +++ /var/tmp/diff_new_pack.ojEs5Y/_new 2024-06-10 17:37:38.834983640 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/cilium/cilium-cli</param> - <param name="changesrevision">d86ae1ca5755139d6ca9423b9606cb047fc8e00f</param></service></servicedata> + <param name="changesrevision">511f0173c21db1c3c959b96fd68eef18f83a0a9f</param></service></servicedata> (No newline at EOF) ++++++ cilium-cli-0.16.9.obscpio -> cilium-cli-0.16.10.obscpio ++++++ /work/SRC/openSUSE:Factory/cilium-cli/cilium-cli-0.16.9.obscpio /work/SRC/openSUSE:Factory/.cilium-cli.new.19518/cilium-cli-0.16.10.obscpio differ: char 49, line 1 ++++++ cilium-cli.obsinfo ++++++ --- /var/tmp/diff_new_pack.ojEs5Y/_old 2024-06-10 17:37:38.882985430 +0200 +++ /var/tmp/diff_new_pack.ojEs5Y/_new 2024-06-10 17:37:38.886985579 +0200 @@ -1,5 +1,5 @@ name: cilium-cli -version: 0.16.9 -mtime: 1717172885 -commit: d86ae1ca5755139d6ca9423b9606cb047fc8e00f +version: 0.16.10 +mtime: 1717801773 +commit: 511f0173c21db1c3c959b96fd68eef18f83a0a9f ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/cilium-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.cilium-cli.new.19518/vendor.tar.gz differ: char 5, line 1

1 0

commit deno for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deno for openSUSE:Factory checked in at 2024-06-10 17:37:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deno (Old) and /work/SRC/openSUSE:Factory/.deno.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deno" Mon Jun 10 17:37:18 2024 rev:42 rq:1179595 version:1.44.1 Changes: -------- --- /work/SRC/openSUSE:Factory/deno/deno.changes 2024-03-10 20:24:24.865548377 +0100 +++ /work/SRC/openSUSE:Factory/.deno.new.19518/deno.changes 2024-06-10 17:37:28.870612217 +0200 @@ -1,0 +2,139 @@ +Sun Jun 9 20:33:44 UTC 2024 - Avindra Goolcharan <avindra(a)opensuse.org> + +- update to 1.44.1 + * many changes since April 4, see GitHub releases for info +- add deno-rm-upgrade.patch (merged 2 patches) +- remove deno-disable-update-check.patch +- remove deno-rm-upgrade-cmd.patch + +------------------------------------------------------------------- +Thu Apr 4 19:01:31 UTC 2024 - Avindra Goolcharan <avindra(a)opensuse.org> + +- update to 1.42.1: + * fix(check): ignore certain diagnostics in remote modules and + when publishing (#23119) + * fix(ext/node): support stdin: "inherit" in node:child_process (#23110) + * fix(ext/node): use tty stdin from ext/io (#23044) + * fix(jsr): exclude yanked versions from 'deno add' and completions (#23113) + * fix(lsp): don't apply preload limit to workspace walk (#23123) + * fix(lsp): implement missing ts server host apis (#23131) + * fix(node): handle empty 'main' entry in pkg json (#23155) + * fix(node): remove unwrap in op_require_node_module_paths (#23114) + * fix: deno_graph 0.69.10 (#23147) + +------------------------------------------------------------------- +Thu Mar 28 22:30:04 UTC 2024 - Avindra Goolcharan <avindra(a)opensuse.org> + +- update to 1.42.0: + * feat(add): always produce multiline config file (#23077) + * feat(ext/node): add riscv64 in process.arch (#23016) + * feat(init): use jsr specifier for @std/assert (#23073) + * feat(install): require -g / --global flag (#23060) + * feat(lint): deno lint --fix and lsp quick fixes (#22615) + * feat(lint): automatically opt-in packages to jsr lint tag (#23072) + * feat(node): load ES modules defined as CJS (#22945) + * feat(publish): check for uncommitted files in + deno publish --dry-run (#22981) + * feat(task): Task description in the form of comments (#23101) + * feat(task): cross-platform shebang support (#23091) + * feat(unstable/publish): error when a package's module is excluded from + publishing (#22948) + * feat: TypeScript 5.4 (#23086) + * feat: add --watch-exclude flag (#21935) + * feat: deno_task_shell 0.15 (#23019) + * feat: remove deprecated methods from namespace with DENO_FUTURE=1 (#23075) + * feat: type declarations for new Set methods (#23090) + * fix(bench): Fix group header printing logic + don't filter + out the warmup benchmark (#23083) + * fix(check): do not suggest running with --unstable (#23092) + * fix(cli): output more detailed information for steps when + using JUnit reporter (#22797) + * fix(cli): sanitizer should ignore count of ops started before + tests begin (#22932) + * fix(coverage): Error if no files are included in the report (#22952) + * fix(ext/fetch): do not truncate field value in EventSource (#22368) + * fix(ext/fetch): make EventSource more robust (#22493) + * fix(ext/node): ECDH.publicKey() point encoding (#23013) + * fix(ext/node): FsWatcher ref and unref (#22987) + * fix(ext/node): Reimplement StringDecoder to match node's behavior (#22933) + * fix(ext/node): add crypto.getRandomValues (#23028) + * fix(ext/node): add crypto.subtle (#23027) + * fix(ext/node): add process.setSourceMapsEnabled noop (#22993) + * fix(ext/node): handle KeyObject in prepareAsymmetricKey (#23026) + * fix(ext/node): handle null in stdio array (#23048) + * fix(ext/node): implement EventEmitterAsyncResource (#22994) + * fix(ext/node): implement v8 serialize and deserialize (#22975) + * fix(ext/node): panic in op_node_ecdh_generate_keys (#23011) + * fix(ext/node): pass normalized watchFile handler to StatWatcher (#22940) + * fix(ext/node): spread args in setImmediate (#22998) + * fix(ext/node): support Diffie-Hellman key type in + crypto.createPrivateKey() (#22984) + * fix(ext/node): support MessagePort in WorkerOptions.workerData (#22950) + * fix(ext/node): support public key point encoding in ECDH. + generateKeys() (#22976) + * fix(ext/node): worker_threads ESM handling (#22841) + * fix(ext/node): worker_threads doesn't exit if there are + message listeners (#22944) + * fix(ext/web): Fix structuredClone Web API type declaration + (any -> generic) (#22968) + * fix(jupyter): Do not increase counter if store_history=false (#20848) + * fix(lsp): decoding percent-encoding(non-ASCII) file path correctly (#22582) + * fix(lsp): prefer cache over tsc quick fixes (#23093) + * fix(lsp): use registry cache for completion search (#23094) + * fix(runtime): use FQDN in NetDescriptor (#23084) + * fix: do not memoize Deno.ppid (#23006) + * fix: don't panic in test and bench if ops not available (#23055) + * fix: handle cache body file not existing when using etag (#22931) + * fix: less aggressive vendor folder ignoring (#23100) + * perf: warm expensive init code at snapshot time (#22714) +- includes 1.41.3: + * fix(cli): occasional panics on progress bar (#22809) + * fix(cli): show asserts before leaks (#22904) + * fix(cli): unbreak extension example and fix __runtime_js_sources (#22906) + * fix(cli): use Instant for test times (#22853) + * fix(config): add unstable features as examples to config schema (#22814) + * fix(config): remove pkg name example and add pattern to schema (#22813) + * fix(ext/node): add more named curves in + crypto.generateKeyPair[Sync]() (#22882) + * fix(ext/node) implement receiveMessageOnPort for node:worker_threads (#22766) + * fix(ext/node): DH (dhKeyAgreement) support for createPrivateKey (#22891) + * fix(ext/node): Add Immediate class to mirror NodeJS.Immediate (#22808) + * fix(ext/node): Implement isBuiltin in node:module (#22817) + * fix(ext/node): Match punycode module behavior to node (#22847) + * fix(ext/node): Support private EC key signing (#22914) + * fix(ext/node): allow automatic worker_thread termination (#22647) + * fix(ext/node): crypto.getCipherInfo() (#22916) + * fix(ext/node): flush brotli decompression stream (#22856) + * fix(ext/node): initial crypto.createPublicKey() support (#22509) + * fix(ext/node): make worker ids sequential (#22884) + * fix(ext/node): make worker setup synchronous (#22815) + * fix(ext/node): support spki format in createPublicKey (#22918) + * fix(ext/node): support junction symlinks on Windows (#22762) + * fix(ext/node): worker_threads.parentPort is updated on startup (#20794) + * fix(ext/websocket): do not continue reading if socket rid closes (#21849) + * fix(node): add nul byte to statfs path on windows (#22905) + * fix(node): implement fs.statfs() (#22862) + * fix(node): require of pkg json imports was broken (#22821) + * fix(node): resolve .css files in npm packages when type checking (#22804) + * fix(node): resolve types via package.json for directory import (#22878) + * fix(node:http) Export validateHeaderName and + validateHeaderValue functions (#22616) + * fix(publish): ability to un-exclude when .gitignore ignores + everything (#22805) + * fix(publish): regression - publishing with vendor folder (#22830) + * fix(publish): suggest using --allow-dirty on uncommitted changes (#22810) + * fix(publish): typo in --allow-dirty help text (#22799) + * fix(runtime): Restore default signal handler after user handlers are + unregistered (#22757) + * fix(runtime): negate partial condition for deny flags (#22866) + * fix(slow-types): improved exports tracing and infer type + literals in as exprs (#22849) + * fix: fix crate vulnerabilities (#22825) + * fix: stop type checking during runtime (#22854) + * fix: support sloppy resolution to file where directory exists (#22800) + * fix: typo in error from GPUBuffer.prototype.mapAsync (#22913) + * perf(permissions): Fast exit from checks when permission is + in "fully-granted" state (#22894) +- rebase deno-rm-upgrade-cmd.patch + +------------------------------------------------------------------- Old: ---- deno-1.41.2.tar.xz deno-disable-update-check.patch deno-rm-upgrade-cmd.patch New: ---- deno-1.44.1.tar.xz deno-rm-upgrade.patch BETA DEBUG BEGIN: Old:- add deno-rm-upgrade.patch (merged 2 patches) - remove deno-disable-update-check.patch - remove deno-rm-upgrade-cmd.patch Old:- remove deno-disable-update-check.patch - remove deno-rm-upgrade-cmd.patch BETA DEBUG END: BETA DEBUG BEGIN: New: * many changes since April 4, see GitHub releases for info - add deno-rm-upgrade.patch (merged 2 patches) - remove deno-disable-update-check.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deno.spec ++++++ --- /var/tmp/diff_new_pack.Ii7ffX/_old 2024-06-10 17:37:32.426744773 +0200 +++ /var/tmp/diff_new_pack.Ii7ffX/_new 2024-06-10 17:37:32.426744773 +0200 @@ -19,7 +19,7 @@ Name: deno -Version: 1.41.2 +Version: 1.44.1 Release: 0 Summary: A secure JavaScript and TypeScript runtime License: MIT @@ -29,8 +29,7 @@ Source1: vendor.tar.xz Source2: cargo_config Source99: revendor_source.sh -Patch0: deno-disable-update-check.patch -Patch1: deno-rm-upgrade-cmd.patch +Patch1: deno-rm-upgrade.patch BuildRequires: cargo-packaging # gcc-c++ needed to build SPIRV-Cross BuildRequires: clang @@ -69,12 +68,13 @@ %prep %autosetup -a1 -p1 -cp %{SOURCE2} .cargo/config # Drop lock file due to revendor_source.sh breaking check rm Cargo.lock # drop checksum for ICU 72 -> 73 echo '{"files":{},"package":""}' > vendor/deno_core/.cargo-checksum.json +cp %{SOURCE2} .cargo/config + %build export V8_FROM_SOURCE=1 export CLANG_BASE_PATH=%{_prefix} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Ii7ffX/_old 2024-06-10 17:37:32.498747457 +0200 +++ /var/tmp/diff_new_pack.Ii7ffX/_new 2024-06-10 17:37:32.502747606 +0200 @@ -13,8 +13,8 @@ <service name="tar_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/denoland/deno</param> - <param name="revision">v1.41.2</param> - <param name="version">1.41.2</param> + <param name="revision">v1.44.1</param> + <param name="version">1.44.1</param>  <param name="exclude">docs</param> @@ -37,8 +37,8 @@ <service name="tar_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/denoland/rusty_v8</param> - <param name="revision">v0.84.0</param> - <param name="version">0.84.0</param> + <param name="revision">v0.92.0</param> + <param name="version">0.92.0</param> <param name="exclude">.github</param> <!-- ++++++ deno-1.41.2.tar.xz -> deno-1.44.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/deno/deno-1.41.2.tar.xz /work/SRC/openSUSE:Factory/.deno.new.19518/deno-1.44.1.tar.xz differ: char 15, line 1 ++++++ deno-rm-upgrade-cmd.patch -> deno-rm-upgrade.patch ++++++ --- /work/SRC/openSUSE:Factory/deno/deno-rm-upgrade-cmd.patch 2024-03-10 20:24:24.841547496 +0100 +++ /work/SRC/openSUSE:Factory/.deno.new.19518/deno-rm-upgrade.patch 2024-06-10 17:37:28.862611919 +0200 @@ -1,3 +1,22 @@ +diff --git a/cli/tools/run/mod.rs.1 b/cli/tools/run/mod.rs +index 4805ea7..57bb752 100644 +--- a/cli/tools/run/mod.rs.1 ++++ b/cli/tools/run/mod.rs +@@ -51,14 +51,6 @@ To grant permissions, set them before the script argument. For example: + ); + } + +- // Run a background task that checks for available upgrades or output +- // if an earlier run of this background task found a new version of Deno. +- #[cfg(feature = "upgrade")] +- super::upgrade::check_for_upgrades( +- http_client.clone(), +- deno_dir.upgrade_check_file_path(), +- ); +- + let main_module = cli_options.resolve_main_module()?; + + maybe_npm_install(&factory).await?; diff --git a/cli/main.rs.1 b/cli/main.rs index 031ab07..4f3b05c 100644 --- a/cli/main.rs.1 @@ -22,23 +41,7 @@ index 72841df..1c93da1 100644 --- a/cli/args/flags.rs.1 +++ b/cli/args/flags.rs -@@ -281,15 +281,6 @@ pub struct TestFlags { - pub junit_path: Option<String>, - } - --#[derive(Clone, Debug, Eq, PartialEq)] --pub struct UpgradeFlags { -- pub dry_run: bool, -- pub force: bool, -- pub canary: bool, -- pub version: Option<String>, -- pub output: Option<PathBuf>, --} -- - #[derive(Clone, Debug, Eq, PartialEq)] - pub struct VendorFlags { - pub specifiers: Vec<String>, -@@ -328,7 +319,6 @@ pub enum DenoSubcommand { +@@ -397,7 +397,6 @@ pub enum DenoSubcommand { Task(TaskFlags), Test(TestFlags), Types, @@ -46,15 +49,15 @@ Vendor(VendorFlags), Publish(PublishFlags), } -@@ -768,7 +768,7 @@ impl Flags { +@@ -917,7 +917,7 @@ impl Flags { + Some(current_dir.to_path_buf()) } Add(_) | Bundle(_) | Completions(_) | Doc(_) | Fmt(_) | Init(_) - | Install(_) | Uninstall(_) | Jupyter(_) | Lsp | Lint(_) | Types -- | Upgrade(_) | Vendor(_) => None, -+ | Vendor(_) => None, - } - } - +- | Uninstall(_) | Jupyter(_) | Lsp | Lint(_) | Types | Upgrade(_) ++ | Uninstall(_) | Jupyter(_) | Lsp | Lint(_) | Types + | Vendor(_) => None, + Install(_) => { + if *DENO_FUTURE { @@ -944,7 +934,6 @@ pub fn flags_from_vec(args: Vec<String>) -> clap::error::Result<Flags> { "test" => test_parse(&mut flags, &mut m), "types" => types_parse(&mut flags, &mut m), @@ -71,7 +74,7 @@ .subcommand(vendor_subcommand()) }) .long_about(DENO_HELP) -@@ -2262,61 +2250,6 @@ The declaration file could be saved and used for typing information.", +@@ -2413,60 +2404,6 @@ The declaration file could be saved and used for typing information.", ) } @@ -103,8 +106,7 @@ - Arg::new("output") - .long("output") - .help("The path to output the updated version to") -- // todo(dsherret): remove value_parser!(PathBuf) and instead parse as string -- .value_parser(value_parser!(PathBuf)) +- .value_parser(value_parser!(String)) - .value_hint(ValueHint::FilePath), - ) - .arg( @@ -133,7 +135,7 @@ fn vendor_subcommand() -> Command { Command::new("vendor") .about("Vendor remote modules into a local directory") -@@ -3785,23 +3718,6 @@ fn types_parse(flags: &mut Flags, _matches: &mut ArgMatches) { +@@ -3965,23 +3902,6 @@ fn types_parse(flags: &mut Flags, _matches: &mut ArgMatches) { flags.subcommand = DenoSubcommand::Types; } @@ -144,7 +146,7 @@ - let force = matches.get_flag("force"); - let canary = matches.get_flag("canary"); - let version = matches.remove_one::<String>("version"); -- let output = matches.remove_one::<PathBuf>("output"); +- let output = matches.remove_one::<String>("output"); - flags.subcommand = DenoSubcommand::Upgrade(UpgradeFlags { - dry_run, - force, @@ -157,7 +159,7 @@ fn vendor_parse(flags: &mut Flags, matches: &mut ArgMatches) { ca_file_arg_parse(flags, matches); config_args_parse(flags, matches); -@@ -4251,25 +4167,6 @@ mod tests { +@@ -4442,25 +4362,6 @@ mod tests { assert_eq!(flags2, flags); } @@ -181,8 +183,8 @@ - } - #[test] - fn version() { - let r = flags_from_vec(svec!["deno", "--version"]); + fn upgrade_with_output_flag() { + let r = flags_from_vec(svec!["deno", "upgrade", "--output", "example.txt"]); @@ -7509,25 +7406,6 @@ mod tests { ); } @@ -242,18 +244,18 @@ index 573fb1e..158c136 100644 --- a/cli/lsp/language_server.rs.1 +++ b/cli/lsp/language_server.rs -@@ -124,8 +124,6 @@ use crate::npm::CliNpmResolverManagedSnapshotOption; - use crate::resolver::CliNodeResolver; +@@ -99,8 +99,6 @@ use crate::lsp::tsc::file_text_changes_to_workspace_edit; + use crate::lsp::urls::LspUrlKind; use crate::tools::fmt::format_file; use crate::tools::fmt::format_parsed_source; -use crate::tools::upgrade::check_for_upgrades_for_lsp; -use crate::tools::upgrade::upgrade_check_enabled; use crate::util::fs::remove_dir_all_if_exists; use crate::util::path::is_importable_ext; - use crate::util::path::specifier_to_file_path; -@@ -3335,28 +3333,6 @@ impl tower_lsp::LanguageServer for LanguageServer { - ls.task_queue.start(self.clone()); - }; + use crate::util::path::to_percent_decoded_str; +@@ -2982,28 +2980,6 @@ impl tower_lsp::LanguageServer for LanguageServer { + } + } - if upgrade_check_enabled() { - // spawn to avoid lsp send/sync requirement, but also just ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/deno/vendor.tar.xz /work/SRC/openSUSE:Factory/.deno.new.19518/vendor.tar.xz differ: char 15, line 1

1 0

commit lf for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lf for openSUSE:Factory checked in at 2024-06-10 17:37:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lf (Old) and /work/SRC/openSUSE:Factory/.lf.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lf" Mon Jun 10 17:37:15 2024 rev:5 rq:1179591 version:32 Changes: -------- --- /work/SRC/openSUSE:Factory/lf/lf.changes 2024-04-02 16:44:56.606574942 +0200 +++ /work/SRC/openSUSE:Factory/.lf.new.19518/lf.changes 2024-06-10 17:37:23.886426430 +0200 @@ -1,0 +2,5 @@ +Sun Jun 9 21:29:22 UTC 2024 - Joshua Smith <smolsheep(a)opensuse.org> + +- Add main package to completion Requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lf.spec ++++++ --- /var/tmp/diff_new_pack.rIVjIL/_old 2024-06-10 17:37:25.674493082 +0200 +++ /var/tmp/diff_new_pack.rIVjIL/_new 2024-06-10 17:37:25.674493082 +0200 @@ -35,6 +35,7 @@ Summary: Bash Completion for %{name} Group: System/Shells Supplements: (%{name} and bash-completion) +Requires: %{name} = %{version} Requires: bash-completion BuildArch: noarch @@ -45,6 +46,7 @@ Summary: Fish Completion for %{name} Group: System/Shells Supplements: (%{name} and fish) +Requires: %{name} = %{version} Requires: fish BuildArch: noarch @@ -55,6 +57,7 @@ Summary: Zsh Completion for %{name} Group: System/Shells Supplements: (%{name} and zsh) +Requires: %{name} = %{version} Requires: zsh BuildArch: noarch

1 0

commit vale for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vale for openSUSE:Factory checked in at 2024-06-10 17:37:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vale (Old) and /work/SRC/openSUSE:Factory/.vale.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vale" Mon Jun 10 17:37:11 2024 rev:42 rq:1179587 version:3.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vale/vale.changes 2024-05-01 14:57:49.352891418 +0200 +++ /work/SRC/openSUSE:Factory/.vale.new.19518/vale.changes 2024-06-10 17:37:21.318330704 +0200 @@ -1,0 +2,41 @@ +Sun Jun 09 18:33:04 UTC 2024 - Jeff Kowalczyk <jkowalczyk(a)suse.com> + +- Update to version 3.5.0: + * chore: fix CC/CXX entries + * chore: remove deprecated "replacements" + * chore: update cross version + * chore: fix version + * docs: add deprecation note + * chore: CGO_ENABLED=1 + * chore: switch to `jdkato/choco-cross` + * chore: add stage for GoReleaser dry run + * chore: fix workflow spacing + * chore: add step for testing release + * chore: switch to `goreleaser-cross` + * chore: upgrade tree-sitter + * docs: Add xsltproc and dita to prerequisites (#842) + * feat: YAML, CSS, and Protocol Buffers + * refactor: deprecate regex-based comment parsing + * feat: JavaScript support + * feat: C/C++ support + * feat: Ruby support + * feat: Rust support + * feat: Python support + * feat: support multi-line, line-scope comments + * refactor: fix `callRst` on Windows + * refactor: fix rst error formatting + * chore: install docutils + * chore: enable CGO for AppVeyor + * feat: tree-sitter powered fragments + * docs: fix OC embed [ci skip] + * test: fix local env + * feat: multiple queries + * test: add another rst case + * refactor: move to JSON-formatted tests + * refactor: move comment processing to tree-sitter + * docs: remove old review link +- Packaging: + * Add BuildRequires: gcc-c++ required by linked C++ library: + github.com/smacker/go-tree-sitter/yaml + +------------------------------------------------------------------- Old: ---- vale-3.4.2.tar.gz New: ---- vale-3.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vale.spec ++++++ --- /var/tmp/diff_new_pack.nEvKhZ/_old 2024-06-10 17:37:22.186363060 +0200 +++ /var/tmp/diff_new_pack.nEvKhZ/_new 2024-06-10 17:37:22.190363209 +0200 @@ -17,7 +17,7 @@ Name: vale -Version: 3.4.2 +Version: 3.5.0 Release: 0 Summary: CLI tool to lint text with extensible markup format support License: MIT @@ -25,6 +25,7 @@ URL: https://github.com/errata-ai/vale Source: %{name}-%{version}.tar.gz Source1: vendor.tar.gz +BuildRequires: gcc-c++ BuildRequires: golang(API) >= 1.21 %description ++++++ _service ++++++ --- /var/tmp/diff_new_pack.nEvKhZ/_old 2024-06-10 17:37:22.226364551 +0200 +++ /var/tmp/diff_new_pack.nEvKhZ/_new 2024-06-10 17:37:22.230364700 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/errata-ai/vale.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v3.4.2</param> + <param name="revision">v3.5.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.nEvKhZ/_old 2024-06-10 17:37:22.250365445 +0200 +++ /var/tmp/diff_new_pack.nEvKhZ/_new 2024-06-10 17:37:22.254365595 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/errata-ai/vale.git</param> - <param name="changesrevision">5532ae3af6e56d3dfa3ffbdd20d35b913a9bfcae</param></service></servicedata> + <param name="changesrevision">03c4626eddb7b6fceed3f36b91de7d1cad0f9358</param></service></servicedata> (No newline at EOF) ++++++ vale-3.4.2.tar.gz -> vale-3.5.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/vale/vale-3.4.2.tar.gz /work/SRC/openSUSE:Factory/.vale.new.19518/vale-3.5.0.tar.gz differ: char 12, line 1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/vale/vendor.tar.gz /work/SRC/openSUSE:Factory/.vale.new.19518/vendor.tar.gz differ: char 5, line 1

1 0

commit golangci-lint for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package golangci-lint for openSUSE:Factory checked in at 2024-06-10 17:37:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golangci-lint (Old) and /work/SRC/openSUSE:Factory/.golangci-lint.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golangci-lint" Mon Jun 10 17:37:09 2024 rev:20 rq:1179581 version:1.59.1 Changes: -------- --- /work/SRC/openSUSE:Factory/golangci-lint/golangci-lint.changes 2024-05-27 12:04:03.763999111 +0200 +++ /work/SRC/openSUSE:Factory/.golangci-lint.new.19518/golangci-lint.changes 2024-06-10 17:37:14.834089003 +0200 @@ -1,0 +2,33 @@ +Sun Jun 09 18:30:53 UTC 2024 - Jeff Kowalczyk <jkowalczyk(a)suse.com> + +- Update to version 1.59.1: + * build(deps): bump github.com/golangci/misspell from 0.5.1 to 0.6.0 (#4804) + * build(deps): bump github.com/sashamelentyev/usestdlibvars from 1.25.0 to 1.26.0 (#4801) + * build(deps): bump golang.org/x/tools from 0.21.0 to 0.22.0 (#4802) + * intrange: add style preset (#4797) + * docs: update revive configuration (#4790) + * chore: improve issue templates + * chore: improve issue templates + * dev: improve issue templates + * build(deps): bump github.com/go-viper/mapstructure/v2 from 2.0.0-alpha.1 to 2.0.0 (#4788) + * unparam: bump to HEAD (#4786) + * build(deps): bump github.com/polyfloyd/go-errorlint from 1.5.1 to 1.5.2 (#4785) + * build(deps): bump go-simpler.org/sloglint from 0.7.0 to 0.7.1 (#4784) + * build(deps): bump github.com/shirou/gopsutil/v3 from 3.24.4 to 3.24.5 (#4782) + * chore: fix bench scripts + * chore: update badges + * dev: remove unused field from PathPrettifier (#4778) + * fix: SARIF format require issue column >= 1 (#4775) + * dev: display version in verbose mode (#4771) + * fix: gomnd deprecated configuration compatibility (#4768) + * dev: add targets to benchmark a linter (#4761) + * docs: fix broken link (#4766) + * docs: fix typos (#4763) + * build(deps): bump github.com/Antonboom/testifylint from 1.3.0 to 1.3.1 (#4759) + * fix: init empty result slice for SARIF printer (#4758) + * dev: fix double call to startTracing (#4757) + * docs: update documentation (#4756) + * docs: update documentation assets (#4749) + * docs: update GitHub Action assets (#4750) + +------------------------------------------------------------------- Old: ---- golangci-lint-1.59.0.tar.xz New: ---- golangci-lint-1.59.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golangci-lint.spec ++++++ --- /var/tmp/diff_new_pack.k3amvY/_old 2024-06-10 17:37:17.382183984 +0200 +++ /var/tmp/diff_new_pack.k3amvY/_new 2024-06-10 17:37:17.398184580 +0200 @@ -17,7 +17,7 @@ Name: golangci-lint -Version: 1.59.0 +Version: 1.59.1 Release: 0 Summary: A fast Go linters runner License: GPL-3.0-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.k3amvY/_old 2024-06-10 17:37:17.666194570 +0200 +++ /var/tmp/diff_new_pack.k3amvY/_new 2024-06-10 17:37:17.702195912 +0200 @@ -3,7 +3,7 @@ <param name="scm">git</param> <param name="url">https://github.com/golangci/golangci-lint.git</param> <param name="exclude">.git</param> - <param name="revision">v1.59.0</param> + <param name="revision">v1.59.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="filename">golangci-lint</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.k3amvY/_old 2024-06-10 17:37:17.910203666 +0200 +++ /var/tmp/diff_new_pack.k3amvY/_new 2024-06-10 17:37:17.946205008 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/golangci/golangci-lint.git</param> - <param name="changesrevision">2059b18a39d559552839476ba78ce6acaa499b43</param></service></servicedata> + <param name="changesrevision">1a55854aff4ef60cd8c4e709b650b281303ca7aa</param></service></servicedata> (No newline at EOF) ++++++ golangci-lint-1.59.0.tar.xz -> golangci-lint-1.59.1.tar.xz ++++++ ++++ 5944 lines of diff (skipped) ++++++ vendor.tar.xz ++++++ ++++ 5064 lines of diff (skipped)

1 0

commit Modules for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package Modules for openSUSE:Factory checked in at 2024-06-10 17:37:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Modules (Old) and /work/SRC/openSUSE:Factory/.Modules.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Modules" Mon Jun 10 17:37:07 2024 rev:27 rq:1179629 version:4.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2021-08-12 09:01:50.906133574 +0200 +++ /work/SRC/openSUSE:Factory/.Modules.new.19518/Modules.changes 2024-06-10 17:37:13.114024887 +0200 @@ -1,0 +2,6 @@ +Tue May 21 10:40:16 UTC 2024 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Use %autosetup macro: allows us to eliminate usage of deprecated + %patchN syntax. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Modules.spec ++++++ --- /var/tmp/diff_new_pack.30VF8U/_old 2024-06-10 17:37:13.706046955 +0200 +++ /var/tmp/diff_new_pack.30VF8U/_new 2024-06-10 17:37:13.706046955 +0200 @@ -1,7 +1,7 @@ # # spec file for package Modules # -# Copyright (c) 2021 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 @@ -93,8 +93,8 @@ %define vimdatadir %{_datadir}/vim/site %prep -%setup -q -n modules-%{version} -%patch1 -p1 +%autosetup -p1 -n modules-%{version} + # This is debatable: # if the replace 'bash' consecutive calls to 'modules' would still # run with the original bash. Maybe not intended.

1 0

commit openssh for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at 2024-06-10 17:37:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssh (Old) and /work/SRC/openSUSE:Factory/.openssh.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssh" Mon Jun 10 17:37:06 2024 rev:178 rq:1179624 version:9.6p1 Changes: -------- --- /work/SRC/openSUSE:Factory/openssh/openssh.changes 2024-05-17 20:04:08.961185171 +0200 +++ /work/SRC/openSUSE:Factory/.openssh.new.19518/openssh.changes 2024-06-10 17:37:10.697934828 +0200 @@ -1,0 +2,7 @@ +Mon Jun 10 07:10:48 UTC 2024 - Antonio Larrosa <alarrosa(a)suse.com> + +- Add #include <stdlib.h> in some files added by the ldap patch to + fix build with gcc14 (boo#1225904). + * openssh-7.7p1-ldap.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openssh.spec: same change ++++++ openssh-7.7p1-ldap.patch ++++++ --- /var/tmp/diff_new_pack.z3rcQd/_old 2024-06-10 17:37:12.421999092 +0200 +++ /var/tmp/diff_new_pack.z3rcQd/_new 2024-06-10 17:37:12.425999241 +0200 @@ -335,7 +335,7 @@ =================================================================== --- /dev/null +++ openssh-8.9p1/ldap-helper.c -@@ -0,0 +1,155 @@ +@@ -0,0 +1,156 @@ +/* $OpenBSD: ssh-pka-ldap.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ +/* + * Copyright (c) 2009 Jan F. Chadima. All rights reserved. @@ -369,6 +369,7 @@ +#include "ldapbody.h" +#include <string.h> +#include <unistd.h> ++#include <stdlib.h> + +static int config_debug = 0; +int config_exclusive_config_file = 0; @@ -1175,7 +1176,7 @@ =================================================================== --- /dev/null +++ openssh-8.9p1/ldapconf.c -@@ -0,0 +1,711 @@ +@@ -0,0 +1,712 @@ +/* $OpenBSD: ldapconf.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ +/* + * Copyright (c) 2009 Jan F. Chadima. All rights reserved. @@ -1209,6 +1210,7 @@ +#include "ldapconf.h" +#include <unistd.h> +#include <string.h> ++#include <stdlib.h> + +/* Keyword tokens. */ +

1 0

commit resource-agents for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2024-06-10 17:37:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "resource-agents" Mon Jun 10 17:37:05 2024 rev:130 rq:1179621 version:4.14.0+git15.c784b83c Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2024-04-08 17:37:50.513718884 +0200 +++ /work/SRC/openSUSE:Factory/.resource-agents.new.19518/resource-agents.changes 2024-06-10 17:37:08.797864002 +0200 @@ -1,0 +2,27 @@ +Fri Jun 07 05:18:24 UTC 2024 - varkoly(a)suse.com + +- Update to version 4.14.0+git15.c784b83c: + * ocf-shellfuncs: fix version regex in ocf_local_nodename() + * azure-events-az: update to API versions, add retry functionality for metadata requests, update tests + * Mid: storage-mon: Add logging to daemon mode. + * outscale: new resource agent (#1938) + * Azure-lb fails if IPv6 disabled (#1939) + * Filesystem: fail when leading or trailing whitespace is present in device or directory parameters + * AWS agents: use curl_retry() + * Filesystem: fail when incorrect device mounted on mountpoint, and dont unmount the mountpoint in this case, or if mountpoint set to "/" + * ocf-shellfuncs: add curl_retry() + * build: update ChangeLog for 4.14.0 + * doc: writing-python-agents: add description of is_probe() and distro() + * build: update ChangeLog for 4.14.0-rc1 + * db2: fix OCF_SUCESS name in db2_notify (#1933) + * docs: writing-python-agents: update required Python version to 3.6+ + * findif.sh: fix corner cases + * portblock: remove write to tcp_tw_recycle +- Normalize log format from RAs with one of Pacemaker (bsc#1217456) +- Remove unsupported RAs from resource-agents package (jsc#PED-5577) (jsc#PED-8232) + add-patch: + drop-deprecated-agents.patch + remove-patch: + 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch + +------------------------------------------------------------------- Old: ---- 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch resource-agents-4.13.0+git41.828c175c.tar.xz New: ---- drop-deprecated-agents.patch resource-agents-4.14.0+git15.c784b83c.tar.xz BETA DEBUG BEGIN: Old: remove-patch: 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch BETA DEBUG END: BETA DEBUG BEGIN: New: add-patch: drop-deprecated-agents.patch remove-patch: BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.0Qi2ZU/_old 2024-06-10 17:37:09.777900533 +0200 +++ /var/tmp/diff_new_pack.0Qi2ZU/_new 2024-06-10 17:37:09.777900533 +0200 @@ -17,7 +17,7 @@ Name: resource-agents -Version: 4.13.0+git41.828c175c +Version: 4.14.0+git15.c784b83c Release: 0 Summary: HA Reusable Cluster Resource Scripts License: GPL-2.0-only AND LGPL-2.1-or-later AND GPL-3.0-or-later @@ -26,16 +26,17 @@ Source: resource-agents-%{version}.tar.xz Source1: monitoring-plugins-metadata.tar.bz2 -# PATCH-FIX-OPENSUSE: activate VG with partial PV by default -Patch1: 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch +Patch1: drop-deprecated-agents.patch # PATCH-FIX-OPENSUSE: fix path to sm-notify Patch2: 0002-nfsserver-fix-path-to-sm-notify.patch # PATCH-FIX-OPENSUSE: ldirectord: don't create subsys lock Patch3: 0003-ldirectord-don-t-create-subsys-lock.patch # PATCH-FIX-OPENSUSE: Revert moving binaries to /usr/libexec Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch +%if 0%{?suse_version} < 1600 # PATCH-FIX-OPENSUSE: Revert ocf_log: use same log format at pacemaker Patch6: 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch +%endif # PATCH-FIX-OPENSUSE: Patch7: 0007-Request-to-add-gcp-vpc-move-route.patch @@ -128,7 +129,9 @@ %patch -P 2 -p1 %patch -P 3 -p1 %patch -P 4 -p1 +%if 0%{?suse_version} < 1600 %patch -P 6 -p1 +%endif %patch -P 7 -p0 %patch -P 8 -p0 %patch -P 9 -p0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.0Qi2ZU/_old 2024-06-10 17:37:09.845903068 +0200 +++ /var/tmp/diff_new_pack.0Qi2ZU/_new 2024-06-10 17:37:09.849903217 +0200 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/resource-agents.git</param> -<param name="changesrevision">828c175c452f46ddb23192917504f60bcf010608</param> +<param name="changesrevision">34e51ac4a554a103f70c9ecb69b65236b7c8615d</param> </service> </servicedata> (No newline at EOF) ++++++ drop-deprecated-agents.patch ++++++ --- a/heartbeat/Makefile.am 2024-06-07 07:19:37.336355067 +0200 +++ b/heartbeat/Makefile.am 2024-06-07 08:43:49.674399158 +0200 @@ -60,10 +60,8 @@ ocf_SCRIPTS = AoEtarget \ Evmsd \ Filesystem \ ICP \ - IPaddr \ IPaddr2 \ IPsrcaddr \ - LVM \ LinuxSCSI \ lvmlockd \ LVM-activate \ @@ -137,7 +135,6 @@ ocf_SCRIPTS = AoEtarget \ minio \ mysql \ mysql-proxy \ - nagios \ named \ nfsnotify \ nfsserver \ @@ -166,7 +163,6 @@ ocf_SCRIPTS = AoEtarget \ rabbitmq-cluster \ rabbitmq-server-ha \ redis \ - rkt \ rsyncd \ rsyslog \ scsi2reservation \ ++++++ portblock.patch ++++++ --- /var/tmp/diff_new_pack.0Qi2ZU/_old 2024-06-10 17:37:09.881904410 +0200 +++ /var/tmp/diff_new_pack.0Qi2ZU/_new 2024-06-10 17:37:09.889904708 +0200 @@ -1,10 +1,9 @@ ---- heartbeat/portblock.orig 2022-01-19 15:27:39.056294933 +0100 -+++ heartbeat/portblock 2022-01-19 17:43:18.986060453 +0100 -@@ -299,7 +299,8 @@ +--- heartbeat/portblock.orig 2024-06-07 08:35:56.538587042 +0200 ++++ heartbeat/portblock 2024-06-07 08:36:36.086905689 +0200 +@@ -328,6 +328,8 @@ save_tcp_connections() tickle_remote() { [ -z "$OCF_RESKEY_tickle_dir" ] && return -- echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle + [ -f "/proc/sys/net/ipv4/tcp_tw_recycle" ] && echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle + [ -f "/proc/sys/net/ipv4/tcp_tw_reuse" ] && echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse f=$OCF_RESKEY_tickle_dir/$OCF_RESKEY_ip ++++++ resource-agents-4.13.0+git41.828c175c.tar.xz -> resource-agents-4.14.0+git15.c784b83c.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/ChangeLog new/resource-agents-4.14.0+git15.c784b83c/ChangeLog --- old/resource-agents-4.13.0+git41.828c175c/ChangeLog 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/ChangeLog 2024-05-31 13:49:56.000000000 +0200 @@ -1,3 +1,31 @@ +* Wed Apr 24 2024 resource-agents contributors +- stable release 4.14.0 +- doc: writing-python-agents: add description of is_probe() and distro() + +* Wed Apr 17 2024 resource-agents contributors +- release candidate 4.14.0 rc1 +- all agents: remove -S state/status that are either ignored, or give an error message in newer versions of Pacemaker +- configure: fix "C preprocessor "gcc -E" fails sanity check" error caused by autoconf 2.72 +- configure: prepare to not build with -ansi by default in the future +- docs: writing-python-agents: update required Python version to 3.6+ +- spec: use /usr/sbin paths for Fedora 40+ +- LVM-activate: avoid false positive for VG activation (fail when system_id_source and volume_list are set) +- aws-vpc-move-ip/aws-vpc-route53/awseip/awsvip: add auth_type parameter and AWS Policy based authentication type +- azure-lb: support IPv6 with Azure load balancer when using socat +- db2: fix OCF_SUCESS typo in db2_notify +- docker: return OCF_NOT_RUNNING when Docker isn't running +- findif.sh: fix corner cases +- findif.sh: fix loopback handling +- findif: check that netmaskbits != EOS in addition to != NULL in all cases +- galera: allow joiner to report non-Primary during initial IST +- nfsserver: fix "server scope" functionality for both potentially other dropins AND multiple ExecStart +- ocivip: fix PRIMARY_IFACE variable when it returns two lines +- openstack-info: ensure no newlines in openstack_ports +- portblock: accept numeric protocol from iptables (to fix regression in iptables 1.8.9 that has shipped in some distros) +- portblock: remove write to tcp_tw_recycle +- storage_mon: fix file handler out of scope leak and uninitialized values +- storage_mon: use memset() to fix "uninitialized value" covscan error, as qb_ipcc_recv() will always set a message + * Wed Oct 11 2023 resource-agents contributors - stable release 4.13.0 - findif.sh: dont use table parameter as it returns no netmask (tested with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/doc/dev-guides/writing-python-agents.md new/resource-agents-4.14.0+git15.c784b83c/doc/dev-guides/writing-python-agents.md --- old/resource-agents-4.13.0+git41.828c175c/doc/dev-guides/writing-python-agents.md 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/doc/dev-guides/writing-python-agents.md 2024-05-31 13:49:56.000000000 +0200 @@ -5,8 +5,7 @@ A simple library for authoring resource agents in Python is provided in the `ocf.py` library. -Agents written in Python should be ideally compatible both with Python -2.7+ and Python 3.3+. +Agents written in Python should be compatible with Python 3.6+. The library provides various helper constants and functions, a logging implementation as well as a run loop and metadata generation facility. @@ -53,7 +52,11 @@ * `ocf_exit_reason`: Prints the exit error string to stderr. * `have_binary`: Returns True if the given binary is available. * `is_true`: Converts an OCF truth value to a Python boolean. +* `is_probe`: Returns True when running a probe action. Used to return + OCF_NOT_RUNNING instead of error code that would cause unexpected actions + like fencing before starting the resource or when it is disabled. * `get_parameter`: Looks up the matching `OCF_RESKEY_` environment variable. +* `distro`: Returns <Distro>/<Version> or <Distro> if version info is unavailable. * `Agent`: Class which helps to generate the XML metadata. * `run`: OCF run loop implementation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/doc/man/Makefile.am new/resource-agents-4.14.0+git15.c784b83c/doc/man/Makefile.am --- old/resource-agents-4.13.0+git41.828c175c/doc/man/Makefile.am 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/doc/man/Makefile.am 2024-05-31 13:49:56.000000000 +0200 @@ -7,12 +7,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -181,6 +181,7 @@ ocf_heartbeat_oraasm.7 \ ocf_heartbeat_oracle.7 \ ocf_heartbeat_oralsnr.7 \ + ocf_heartbeat_osceip.7 \ ocf_heartbeat_ovsmonitor.7 \ ocf_heartbeat_pgagent.7 \ ocf_heartbeat_pgsql.7 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/Filesystem new/resource-agents-4.14.0+git15.c784b83c/heartbeat/Filesystem --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/Filesystem 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/Filesystem 2024-05-31 13:49:56.000000000 +0200 @@ -582,10 +582,16 @@ fi # See if the device is already mounted. - if Filesystem_status >/dev/null 2>&1 ; then - ocf_log info "Filesystem $MOUNTPOINT is already mounted." - return $OCF_SUCCESS - fi + Filesystem_status + case "$?" in + $OCF_SUCCESS) + ocf_log info "Filesystem $MOUNTPOINT is already mounted." + return $OCF_SUCCESS + ;; + $OCF_ERR_CONFIGURED) + return $OCF_ERR_CONFIGURED + ;; + esac fstype_supported || exit $OCF_ERR_INSTALLED @@ -801,10 +807,42 @@ # Filesystem_status() { - match_string="${TAB}${CANONICALIZED_MOUNTPOINT}${TAB}" - if list_mounts | grep "$match_string" >/dev/null 2>&1; then - rc=$OCF_SUCCESS - msg="$MOUNTPOINT is mounted (running)" + local match_string="${TAB}${CANONICALIZED_MOUNTPOINT}${TAB}" + local mounted_device=$(list_mounts | grep "$match_string" | awk '{print $1}') + + if [ -n "$mounted_device" ]; then + if [ "X$blockdevice" = "Xyes" ]; then + if [ -e "$DEVICE" ] ; then + local canonicalized_device="$(readlink -f "$DEVICE")" + if [ $? -ne 0 ]; then + ocf_exit_reason "Could not canonicalize $DEVICE because readlink failed" + exit $OCF_ERR_GENERIC + fi + else + local canonicalized_device="$DEVICE" + fi + if [ -e "$mounted_device" ] ; then + local canonicalized_mounted_device="$(readlink -f "$mounted_device")" + if [ $? -ne 0 ]; then + ocf_exit_reason "Could not canonicalize $mounted_device because readlink failed" + exit $OCF_ERR_GENERIC + fi + else + local canonicalized_mounted_device="$mounted_device" + fi + if [ "$canonicalized_device" != "$canonicalized_mounted_device" ]; then + if ocf_is_probe || [ "$__OCF_ACTION" = "stop" ]; then + ocf_log debug "Another device ($mounted_device) is already mounted on $MOUNTPOINT" + rc=$OCF_NOT_RUNNING + else + ocf_exit_reason "Another device ($mounted_device) is already mounted on $MOUNTPOINT" + rc=$OCF_ERR_CONFIGURED + fi + fi + else + rc=$OCF_SUCCESS + msg="$MOUNTPOINT is mounted (running)" + fi else rc=$OCF_NOT_RUNNING msg="$MOUNTPOINT is unmounted (stopped)" @@ -995,6 +1033,12 @@ fi DEVICE="$OCF_RESKEY_device" +case "$DEVICE" in + [[:space:]]*|*[[:space:]]) + ocf_exit_reason "device parameter does not accept leading or trailing whitespace characters" + exit $OCF_ERR_CONFIGURED + ;; +esac FSTYPE=$OCF_RESKEY_fstype if [ ! -z "$OCF_RESKEY_options" ]; then options="-o $OCF_RESKEY_options" @@ -1032,6 +1076,12 @@ else MOUNTPOINT="$(echo "$OCF_RESKEY_directory" | sed 's/\/*$//')" : ${MOUNTPOINT:=/} + case "$MOUNTPOINT" in + [[:space:]]*|*[[:space:]]) + ocf_exit_reason "directory parameter does not accept leading or trailing whitespace characters" + exit $OCF_ERR_CONFIGURED + ;; + esac if [ -e "$MOUNTPOINT" ] ; then CANONICALIZED_MOUNTPOINT="$(readlink -f "$MOUNTPOINT")" if [ $? -ne 0 ]; then @@ -1041,9 +1091,18 @@ else CANONICALIZED_MOUNTPOINT="$MOUNTPOINT" fi - # At this stage, $MOUNTPOINT does not contain trailing "/" unless it is "/" - # TODO: / mounted via Filesystem sounds dangerous. On stop, we'll - # kill the whole system. Is that a good idea? + + if echo "$CANONICALIZED_MOUNTPOINT" | grep -q "^\s*/\s*$"; then + if ocf_is_probe; then + ocf_log debug "/ cannot be managed in a cluster" + exit $OCF_NOT_RUNNING + elif [ "$__OCF_ACTION" = "start" ] || [ "$__OCF_ACTION" = "monitor" ] || [ "$__OCF_ACTION" = "status" ]; then + ocf_exit_reason "/ cannot be managed in a cluster" + exit $OCF_ERR_CONFIGURED + elif [ "$__OCF_ACTION" = "stop" ]; then + exit $OCF_SUCCESS + fi + fi fi # Check to make sure the utilites are found @@ -1124,5 +1183,3 @@ ;; esac exit $? - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/Makefile.am new/resource-agents-4.14.0+git15.c784b83c/heartbeat/Makefile.am --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/Makefile.am 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/Makefile.am 2024-05-31 13:49:56.000000000 +0200 @@ -153,6 +153,7 @@ oraasm \ oracle \ oralsnr \ + osceip \ ovsmonitor \ pgagent \ pgsql \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/aws-vpc-move-ip new/resource-agents-4.14.0+git15.c784b83c/heartbeat/aws-vpc-move-ip --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/aws-vpc-move-ip 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/aws-vpc-move-ip 2024-05-31 13:49:56.000000000 +0200 @@ -47,6 +47,8 @@ OCF_RESKEY_iflabel_default="" OCF_RESKEY_monapi_default="false" OCF_RESKEY_lookup_type_default="InstanceId" +OCF_RESKEY_curl_retries_default="3" +OCF_RESKEY_curl_sleep_default="1" : ${OCF_RESKEY_awscli=${OCF_RESKEY_awscli_default}} : ${OCF_RESKEY_auth_type=${OCF_RESKEY_auth_type_default}} @@ -60,6 +62,8 @@ : ${OCF_RESKEY_iflabel=${OCF_RESKEY_iflabel_default}} : ${OCF_RESKEY_monapi=${OCF_RESKEY_monapi_default}} : ${OCF_RESKEY_lookup_type=${OCF_RESKEY_lookup_type_default}} +: ${OCF_RESKEY_curl_retries=${OCF_RESKEY_curl_retries_default}} +: ${OCF_RESKEY_curl_sleep=${OCF_RESKEY_curl_sleep_default}} ####################################################################### @@ -194,6 +198,22 @@ <content type="string" default="${OCF_RESKEY_lookup_type_default}" /> </parameter> +<parameter name="curl_retries" unique="0"> +<longdesc lang="en"> +curl retries before failing +</longdesc> +<shortdesc lang="en">curl retries</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_retries_default}" /> +</parameter> + +<parameter name="curl_sleep" unique="0"> +<longdesc lang="en"> +curl sleep between tries +</longdesc> +<shortdesc lang="en">curl sleep</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_sleep_default}" /> +</parameter> + </parameters> <actions> @@ -250,8 +270,10 @@ fi fi - TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") - EC2_INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN") + TOKEN=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -sX PUT -H 'X-aws-ec2-metadata-token-ttl-seconds: 21600'" "http://169.254.169.254/latest/api/token") + [ $? -ne 0 ] && exit $OCF_ERR_GENERIC + EC2_INSTANCE_ID=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/instance-id") + [ $? -ne 0 ] && exit $OCF_ERR_GENERIC if [ -z "${EC2_INSTANCE_ID}" ]; then ocf_exit_reason "Instance ID not found. Is this a EC2 instance?" @@ -365,14 +387,9 @@ fi ocf_log debug "MAC address associated with interface ${OCF_RESKEY_interface}: ${MAC_ADDR}" - cmd="curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDR}… -H \"X-aws-ec2-metadata-token: $TOKEN\"" - ocf_log debug "executing command: $cmd" + cmd="curl_retry \"$OCF_RESKEY_curl_retries\" \"$OCF_RESKEY_curl_sleep\" \"--show-error -s -H 'X-aws-ec2-metadata-token: $TOKEN'\" \"http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDR}…"" EC2_NETWORK_INTERFACE_ID="$(eval $cmd)" - rc=$? - if [ $rc != 0 ]; then - ocf_log warn "command failed, rc: $rc" - return $OCF_ERR_GENERIC - fi + [ $? -ne 0 ] && exit $OCF_ERR_GENERIC ocf_log debug "network interface id associated MAC address ${MAC_ADDR}: ${EC2_NETWORK_INTERFACE_ID}" echo $EC2_NETWORK_INTERFACE_ID } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/aws-vpc-route53.in new/resource-agents-4.14.0+git15.c784b83c/heartbeat/aws-vpc-route53.in --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/aws-vpc-route53.in 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/aws-vpc-route53.in 2024-05-31 13:49:56.000000000 +0200 @@ -53,6 +53,8 @@ OCF_RESKEY_fullname_default="" OCF_RESKEY_ip_default="local" OCF_RESKEY_ttl_default=10 +OCF_RESKEY_curl_retries_default="3" +OCF_RESKEY_curl_sleep_default="1" : ${OCF_RESKEY_awscli=${OCF_RESKEY_awscli_default}} : ${OCF_RESKEY_auth_type=${OCF_RESKEY_auth_type_default}} @@ -62,6 +64,8 @@ : ${OCF_RESKEY_fullname:=${OCF_RESKEY_fullname_default}} : ${OCF_RESKEY_ip:=${OCF_RESKEY_ip_default}} : ${OCF_RESKEY_ttl:=${OCF_RESKEY_ttl_default}} +: ${OCF_RESKEY_curl_retries=${OCF_RESKEY_curl_retries_default}} +: ${OCF_RESKEY_curl_sleep=${OCF_RESKEY_curl_sleep_default}} usage() { cat <<-EOT @@ -185,6 +189,22 @@ <shortdesc lang="en">ARECORD TTL</shortdesc> <content type="string" default="${OCF_RESKEY_ttl_default}" /> </parameter> + +<parameter name="curl_retries" unique="0"> +<longdesc lang="en"> +curl retries before failing +</longdesc> +<shortdesc lang="en">curl retries</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_retries_default}" /> +</parameter> + +<parameter name="curl_sleep" unique="0"> +<longdesc lang="en"> +curl sleep between tries +</longdesc> +<shortdesc lang="en">curl sleep</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_sleep_default}" /> +</parameter> </parameters> <actions> @@ -357,8 +377,11 @@ _get_ip() { case $OCF_RESKEY_ip in local|public) - TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") - IPADDRESS=$(curl -s http://169.254.169.254/latest/meta-data/${OCF_RESKEY_ip}-ipv4 -H "X-aws-ec2-metadata-token: $TOKEN");; + TOKEN=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -sX PUT -H 'X-aws-ec2-metadata-token-ttl-seconds: 21600'" "http://169.254.169.254/latest/api/token") + [ $? -ne 0 ] && exit $OCF_ERR_GENERIC + IPADDRESS=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/${OCF_RESKEY_ip}-ipv4") + [ $? -ne 0 ] && exit $OCF_ERR_GENERIC + ;; *.*.*.*) IPADDRESS="${OCF_RESKEY_ip}";; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/awseip new/resource-agents-4.14.0+git15.c784b83c/heartbeat/awseip --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/awseip 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/awseip 2024-05-31 13:49:56.000000000 +0200 @@ -49,12 +49,16 @@ OCF_RESKEY_profile_default="default" OCF_RESKEY_region_default="" OCF_RESKEY_api_delay_default="3" +OCF_RESKEY_curl_retries_default="3" +OCF_RESKEY_curl_sleep_default="1" : ${OCF_RESKEY_awscli=${OCF_RESKEY_awscli_default}} : ${OCF_RESKEY_auth_type=${OCF_RESKEY_auth_type_default}} : ${OCF_RESKEY_profile=${OCF_RESKEY_profile_default}} : ${OCF_RESKEY_region=${OCF_RESKEY_region_default}} : ${OCF_RESKEY_api_delay=${OCF_RESKEY_api_delay_default}} +: ${OCF_RESKEY_curl_retries=${OCF_RESKEY_curl_retries_default}} +: ${OCF_RESKEY_curl_sleep=${OCF_RESKEY_curl_sleep_default}} meta_data() { cat <<END @@ -141,6 +145,22 @@ <content type="integer" default="${OCF_RESKEY_api_delay_default}" /> </parameter> +<parameter name="curl_retries" unique="0"> +<longdesc lang="en"> +curl retries before failing +</longdesc> +<shortdesc lang="en">curl retries</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_retries_default}" /> +</parameter> + +<parameter name="curl_sleep" unique="0"> +<longdesc lang="en"> +curl sleep between tries +</longdesc> +<shortdesc lang="en">curl sleep</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_sleep_default}" /> +</parameter> + </parameters> <actions> @@ -171,14 +191,18 @@ awseip_monitor && return $OCF_SUCCESS if [ -n "${PRIVATE_IP_ADDRESS}" ]; then - NETWORK_INTERFACES_MACS=$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/ -H "X-aws-ec2-metadata-token: $TOKEN") + NETWORK_INTERFACES_MACS=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "-s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/network/interfaces/macs/") for MAC in ${NETWORK_INTERFACES_MACS}; do - curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC}/loca… -H "X-aws-ec2-metadata-token: $TOKEN" | + curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "-s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC%/*}/l…" | grep -q "^${PRIVATE_IP_ADDRESS}$" if [ $? -eq 0 ]; then - NETWORK_ID=$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC}/inte… -H "X-aws-ec2-metadata-token: $TOKEN") + NETWORK_ID=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "-s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC%/*}/i…") fi done + if [ -z "$NETWORK_ID" ]; then + ocf_exit_reason "Could not find network interface for private_ip_address: $PRIVATE_IP_ADDRESS" + exit $OCF_ERR_GENERIC + fi $AWSCLI_CMD ec2 associate-address \ --network-interface-id ${NETWORK_ID} \ --allocation-id ${ALLOCATION_ID} \ @@ -282,8 +306,10 @@ ELASTIC_IP="${OCF_RESKEY_elastic_ip}" ALLOCATION_ID="${OCF_RESKEY_allocation_id}" PRIVATE_IP_ADDRESS="${OCF_RESKEY_private_ip_address}" -TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") -INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN") +TOKEN=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -sX PUT -H 'X-aws-ec2-metadata-token-ttl-seconds: 21600'" "http://169.254.169.254/latest/api/token") +[ $? -ne 0 ] && exit $OCF_ERR_GENERIC +INSTANCE_ID=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/instance-id") +[ $? -ne 0 ] && exit $OCF_ERR_GENERIC case $__OCF_ACTION in start) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/awsvip new/resource-agents-4.14.0+git15.c784b83c/heartbeat/awsvip --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/awsvip 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/awsvip 2024-05-31 13:49:56.000000000 +0200 @@ -48,12 +48,16 @@ OCF_RESKEY_profile_default="default" OCF_RESKEY_region_default="" OCF_RESKEY_api_delay_default="3" +OCF_RESKEY_curl_retries_default="3" +OCF_RESKEY_curl_sleep_default="1" : ${OCF_RESKEY_awscli=${OCF_RESKEY_awscli_default}} : ${OCF_RESKEY_auth_type=${OCF_RESKEY_auth_type_default}} : ${OCF_RESKEY_profile=${OCF_RESKEY_profile_default}} : ${OCF_RESKEY_region=${OCF_RESKEY_region_default}} : ${OCF_RESKEY_api_delay=${OCF_RESKEY_api_delay_default}} +: ${OCF_RESKEY_curl_retries=${OCF_RESKEY_curl_retries_default}} +: ${OCF_RESKEY_curl_sleep=${OCF_RESKEY_curl_sleep_default}} meta_data() { cat <<END @@ -124,6 +128,22 @@ <content type="integer" default="${OCF_RESKEY_api_delay_default}" /> </parameter> +<parameter name="curl_retries" unique="0"> +<longdesc lang="en"> +curl retries before failing +</longdesc> +<shortdesc lang="en">curl retries</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_retries_default}" /> +</parameter> + +<parameter name="curl_sleep" unique="0"> +<longdesc lang="en"> +curl sleep between tries +</longdesc> +<shortdesc lang="en">curl sleep</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_sleep_default}" /> +</parameter> + </parameters> <actions> @@ -246,10 +266,14 @@ AWSCLI_CMD="$AWSCLI_CMD --region ${OCF_RESKEY_region}" fi SECONDARY_PRIVATE_IP="${OCF_RESKEY_secondary_private_ip}" -TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") -INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN") -MAC_ADDRESS=$(curl -s http://169.254.169.254/latest/meta-data/mac -H "X-aws-ec2-metadata-token: $TOKEN") -NETWORK_ID=$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDRE… -H "X-aws-ec2-metadata-token: $TOKEN") +TOKEN=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -sX PUT -H 'X-aws-ec2-metadata-token-ttl-seconds: 21600'" "http://169.254.169.254/latest/api/token") +[ $? -ne 0 ] && exit $OCF_ERR_GENERIC +INSTANCE_ID=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/instance-id") +[ $? -ne 0 ] && exit $OCF_ERR_GENERIC +MAC_ADDRESS=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/mac") +[ $? -ne 0 ] && exit $OCF_ERR_GENERIC +NETWORK_ID=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "--show-error -s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDRE…") +[ $? -ne 0 ] && exit $OCF_ERR_GENERIC case $__OCF_ACTION in start) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/azure-events-az.in new/resource-agents-4.14.0+git15.c784b83c/heartbeat/azure-events-az.in --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/azure-events-az.in 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/azure-events-az.in 2024-05-31 13:49:56.000000000 +0200 @@ -27,7 +27,7 @@ ############################################################################## -VERSION = "0.10" +VERSION = "0.20" USER_AGENT = "Pacemaker-ResourceAgent/%s %s" % (VERSION, ocf.distro()) attr_globalPullState = "azure-events-az_globalPullState" @@ -39,9 +39,6 @@ default_loglevel = ocf.logging.INFO default_relevantEventTypes = set(["Reboot", "Redeploy"]) -global_pullMaxAttempts = 3 -global_pullDelaySecs = 1 - ############################################################################## class attrDict(defaultdict): @@ -71,16 +68,22 @@ metadata_host = "http://169.254.169.254/metadata" instance_api = "instance" events_api = "scheduledevents" - api_version = "2019-08-01" + events_api_version = "2020-07-01" + instance_api_version = "2021-12-13" @staticmethod - def _sendMetadataRequest(endpoint, postData=None): + def _sendMetadataRequest(endpoint, postData=None, api_version="2019-08-01"): """ Send a request to Azure's Azure Metadata Service API """ - url = "%s/%s?api-version=%s" % (azHelper.metadata_host, endpoint, azHelper.api_version) + + retryCount = int(ocf.get_parameter("retry_count",3)) + retryWaitTime = int(ocf.get_parameter("retry_wait",20)) + requestTimeout = int(ocf.get_parameter("request_timeout",15)) + + url = "%s/%s?api-version=%s" % (azHelper.metadata_host, endpoint, api_version) data = "" - ocf.logger.debug("_sendMetadataRequest: begin; endpoint = %s, postData = %s" % (endpoint, postData)) + ocf.logger.debug("_sendMetadataRequest: begin; endpoint = %s, postData = %s, retry_count = %s, retry_wait time = %s, request_timeout = %s" % (endpoint, postData, retryCount, retryWaitTime, requestTimeout)) ocf.logger.debug("_sendMetadataRequest: url = %s" % url) if postData and type(postData) != bytes: @@ -89,18 +92,37 @@ req = urllib2.Request(url, postData) req.add_header("Metadata", "true") req.add_header("User-Agent", USER_AGENT) - try: - resp = urllib2.urlopen(req) - except URLError as e: - if hasattr(e, 'reason'): - ocf.logger.warning("Failed to reach the server: %s" % e.reason) - clusterHelper.setAttr(attr_globalPullState, "IDLE") - elif hasattr(e, 'code'): - ocf.logger.warning("The server couldn\'t fulfill the request. Error code: %s" % e.code) - clusterHelper.setAttr(attr_globalPullState, "IDLE") - else: - data = resp.read() - ocf.logger.debug("_sendMetadataRequest: response = %s" % data) + + if retryCount > 0: + ocf.logger.debug("_sendMetadataRequest: retry enabled") + + successful = None + for retry in range(retryCount+1): + try: + resp = urllib2.urlopen(req, timeout=requestTimeout) + except Exception as e: + excType = e.__class__.__name__ + if excType == TimeoutError.__name__: + ocf.logger.warning("Request timed out after %s seconds Error: %s" % (requestTimeout, e)) + if excType == URLError.__name__: + if hasattr(e, 'reason'): + ocf.logger.warning("Failed to reach the server: %s" % e.reason) + elif hasattr(e, 'code'): + ocf.logger.warning("The server couldn\'t fulfill the request. Error code: %s" % e.code) + + if retryCount > 1 and retry != retryCount: + ocf.logger.warning("Request failed, retry (%s/%s) wait %s seconds before retry (wait time)" % (retry + 1,retryCount,retryWaitTime)) + time.sleep(retryWaitTime) + + else: + data = resp.read() + ocf.logger.debug("_sendMetadataRequest: response = %s" % data) + successful = 1 + break + + # When no request was successful also with retry enabled, set the cluster to idle + if successful is None: + clusterHelper.setAttr(attr_globalPullState, "IDLE") if data: data = json.loads(data) @@ -115,14 +137,15 @@ """ ocf.logger.debug("getInstanceInfo: begin") - jsondata = azHelper._sendMetadataRequest(azHelper.instance_api) + jsondata = azHelper._sendMetadataRequest(azHelper.instance_api, None, azHelper.instance_api_version) ocf.logger.debug("getInstanceInfo: json = %s" % jsondata) if jsondata: ocf.logger.debug("getInstanceInfo: finished, returning {}".format(jsondata["compute"])) return attrDict(jsondata["compute"]) else: - ocf.ocf_exit_reason("getInstanceInfo: Unable to get instance info") + apiCall = "%s/%s?api-version=%s" % (azHelper.metadata_host, azHelper.instance_api, azHelper.instance_api_version) + ocf.ocf_exit_reason("getInstanceInfo: Unable to get instance info - call: %s" % apiCall) sys.exit(ocf.OCF_ERR_GENERIC) @staticmethod @@ -132,11 +155,17 @@ """ ocf.logger.debug("pullScheduledEvents: begin") - jsondata = azHelper._sendMetadataRequest(azHelper.events_api) + jsondata = azHelper._sendMetadataRequest(azHelper.events_api, None, azHelper.events_api_version) ocf.logger.debug("pullScheduledEvents: json = %s" % jsondata) - ocf.logger.debug("pullScheduledEvents: finished") - return attrDict(jsondata) + if jsondata: + ocf.logger.debug("pullScheduledEvents: finished") + return attrDict(jsondata) + else: + apiCall = "%s/%s?api-version=%s" % (azHelper.metadata_host, azHelper.events_api, azHelper.events_api_version) + ocf.ocf_exit_reason("pullScheduledEvents: Unable to get scheduledevents info - call: %s" % apiCall) + sys.exit(ocf.OCF_ERR_GENERIC) + @staticmethod def forceEvents(eventIDs): @@ -534,7 +563,7 @@ except ValueError: # Handle the exception ocf.logger.warn("Health attribute %s on node %s cannot be converted to an integer value" % (healthAttributeStr, node)) - + ocf.logger.debug("isNodeInStandby: finished - result %s" % isInStandy) return isInStandy @@ -584,7 +613,7 @@ def monitor(self): ocf.logger.debug("monitor: begin") - + events = azHelper.pullScheduledEvents() # get current document version @@ -600,21 +629,21 @@ ocf.logger.info("monitor: already handled curDocVersion, skip") return ocf.OCF_SUCCESS - localAzEventIDs = set() + localAzEventIds = dict() for e in localEvents: - localAzEventIDs.add(e.EventId) + localAzEventIds[e.EventId] = json.dumps(e) curState = self.node.getState() clusterEventIDs = self.node.getEventIDs() ocf.logger.debug("monitor: curDocVersion has not been handled yet") - + if clusterEventIDs: # there are pending events set, so our state must be STOPPING or IN_EVENT i = 0; touchedEventIDs = False while i < len(clusterEventIDs): # clean up pending events that are already finished according to AZ - if clusterEventIDs[i] not in localAzEventIDs: + if clusterEventIDs[i] not in localAzEventIds.keys(): ocf.logger.info("monitor: remove finished local clusterEvent %s" % (clusterEventIDs[i])) clusterEventIDs.pop(i) touchedEventIDs = True @@ -644,12 +673,12 @@ ocf.logger.info("monitor: all local events finished, but some resources have not completed startup yet -> wait") else: if curState == AVAILABLE: - if len(localAzEventIDs) > 0: + if len(localAzEventIds) > 0: if clusterHelper.otherNodesAvailable(self.node): - ocf.logger.info("monitor: can handle local events %s -> set state STOPPING" % (str(localAzEventIDs))) - curState = self.node.updateNodeStateAndEvents(STOPPING, localAzEventIDs) + ocf.logger.info("monitor: can handle local events %s -> set state STOPPING - %s" % (str(list(localAzEventIds.keys())), str(list(localAzEventIds.values())))) + curState = self.node.updateNodeStateAndEvents(STOPPING, localAzEventIds.keys()) else: - ocf.logger.info("monitor: cannot handle azEvents %s (only node available) -> set state ON_HOLD" % str(localAzEventIDs)) + ocf.logger.info("monitor: cannot handle azEvents %s (only node available) -> set state ON_HOLD - %s" % (str(list(localAzEventIds.keys())), str(list(localAzEventIds.values())))) self.node.setState(ON_HOLD) else: ocf.logger.debug("monitor: no local azEvents to handle") @@ -761,6 +790,24 @@ longdesc="Set to true to enable verbose logging", content_type="boolean", default="false") + agent.add_parameter( + "retry_count", + shortdesc="Azure IMDS webservice retry count", + longdesc="Set to any number bigger than zero to enable retry count", + content_type="integer", + default="3") + agent.add_parameter( + "retry_wait", + shortdesc="Configure a retry wait time", + longdesc="Set retry wait time in seconds", + content_type="integer", + default="20") + agent.add_parameter( + "request_timeout", + shortdesc="Configure a request timeout", + longdesc="Set request timeout in seconds", + content_type="integer", + default="15") agent.add_action("start", timeout=10, handler=lambda: ocf.OCF_SUCCESS) agent.add_action("stop", timeout=10, handler=lambda: ocf.OCF_SUCCESS) agent.add_action("validate-all", timeout=20, handler=validate_action) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/azure-lb new/resource-agents-4.14.0+git15.c784b83c/heartbeat/azure-lb --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/azure-lb 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/azure-lb 2024-05-31 13:49:56.000000000 +0200 @@ -24,9 +24,13 @@ fi OCF_RESKEY_port_default="61000" +OCF_RESKEY_listen_default="default" + +[ "$(cat /sys/module/ipv6/parameters/disable)" = "1" ] && OCF_RESKEY_listen_default="ipv4only" : ${OCF_RESKEY_nc=${OCF_RESKEY_nc_default}} : ${OCF_RESKEY_port=${OCF_RESKEY_port_default}} +: ${OCF_RESKEY_listen=${OCF_RESKEY_listen_default}} process="$OCF_RESOURCE_INSTANCE" pidfile="/var/run/$OCF_RESOURCE_INSTANCE.pid" @@ -73,6 +77,25 @@ <content type="string" default="${OCF_RESKEY_port_default}"/> </parameter> +<parameter name="listen"> +<longdesc lang="en"> +This parameter can have following walues: +default: Neither -4 nor -6 will be used. The default behavior of socat and nc will be used. + socat: Listen only on IPv4 addresses + nc: If net.ipv6.bindv6only = 0 => Listen on both IPv4 and IP6 addresses + If net.ipv6.bindv6only = 1 => Listen only on IPv4 addresses +ipv4only: Listen only on IPv4 addresses. +ipv6enable: Enable TCP6 support. + nc: Listen only on IPv6 adresses independent of net.ipv6.bindv6only + socat: If net.ipv6.bindv6only = 0 => Listen on both IPv4 and IP6 addresses. + If net.ipv6.bindv6only = 1 => Listen only on IPv6 adresses. +</longdesc> +<shortdesc lang="en">Usage of IPv4 and IPv6 addresses.</shortdesc> +<content type="string" default="${OCF_RESKEY_listen_default}"/> +</parameter> + + + </parameters> <actions> @@ -111,10 +134,24 @@ } lb_start() { - cmd="$OCF_RESKEY_nc -l -k $OCF_RESKEY_port" - if [ $( basename $OCF_RESKEY_nc ) = 'socat' ]; then - #socat has different parameters - cmd="$OCF_RESKEY_nc -U TCP6-LISTEN:$OCF_RESKEY_port,backlog=10,fork,reuseaddr /dev/null" + if [ "$( basename $OCF_RESKEY_nc )" = 'socat' ]; then + case "${OCF_RESKEY_listen,,}" in + ipv4only) + cmd="$OCF_RESKEY_nc -4 -U TCP4-LISTEN:$OCF_RESKEY_port,backlog=10,fork,reuseaddr /dev/null" ;; + ipv6enable) + cmd="$OCF_RESKEY_nc -U TCP6-LISTEN:$OCF_RESKEY_port,backlog=10,fork,reuseaddr /dev/null" ;; + *) + cmd="$OCF_RESKEY_nc -U TCP-LISTEN:$OCF_RESKEY_port,backlog=10,fork,reuseaddr /dev/null" ;; + esac + else + case "${OCF_RESKEY_listen,,}" in + ipv4only) + cmd="$OCF_RESKEY_nc -4 -l -k $OCF_RESKEY_port" ;; + ipv6enable) + cmd="$OCF_RESKEY_nc -6 -l -k $OCF_RESKEY_port" ;; + *) + cmd="$OCF_RESKEY_nc -l -k $OCF_RESKEY_port" ;; + esac fi if ! lb_monitor; then ocf_log debug "Starting $process: $cmd" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/db2 new/resource-agents-4.14.0+git15.c784b83c/heartbeat/db2 --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/db2 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/db2 2024-05-31 13:49:56.000000000 +0200 @@ -848,7 +848,7 @@ # only interested in pre-start [ $OCF_RESKEY_CRM_meta_notify_type = pre \ - -a $OCF_RESKEY_CRM_meta_notify_operation = start ] || return $OCF_SUCESS + -a $OCF_RESKEY_CRM_meta_notify_operation = start ] || return $OCF_SUCCESS # gets FIRST_ACTIVE_LOG db2_get_cfg $dblist || return $? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/findif.sh new/resource-agents-4.14.0+git15.c784b83c/heartbeat/findif.sh --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/findif.sh 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/findif.sh 2024-05-31 13:49:56.000000000 +0200 @@ -215,9 +215,9 @@ fi if [ -n "$nic" ] ; then # NIC supports more than two. - set -- $(ip -o -f $family route list match $match $scope | grep "dev $nic " | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') + set -- $(ip -o -f $family route list match $match $scope | grep "dev $nic " | sed -e 's,^$[0-9.]\+$ ,\1/32 ,;s,^$[0-9a-f:]\+$ ,\1/128 ,' | sort -t/ -k2,2nr) else - set -- $(ip -o -f $family route list match $match $scope | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') + set -- $(ip -o -f $family route list match $match $scope | sed -e 's,^$[0-9.]\+$ ,\1/32 ,;s,^$[0-9a-f:]\+$ ,\1/128 ,' | sort -t/ -k2,2nr) fi if [ $# = 0 ] ; then case $OCF_RESKEY_ip in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/ocf-shellfuncs.in new/resource-agents-4.14.0+git15.c784b83c/heartbeat/ocf-shellfuncs.in --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/ocf-shellfuncs.in 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/ocf-shellfuncs.in 2024-05-31 13:49:56.000000000 +0200 @@ -606,7 +606,7 @@ # use crm_node -n for pacemaker > 1.1.8 which pacemakerd > /dev/null 2>&1 if [ $? -eq 0 ]; then - local version=$(pacemakerd -$ | grep "Pacemaker .*" | awk '{ print $2 }') + local version=$(pacemakerd -$ | awk '/^Pacemaker /{ print $2 }') version=$(echo $version | awk -F- '{ print $1 }') ocf_version_cmp "$version" "1.1.8" if [ $? -eq 2 ]; then @@ -672,6 +672,40 @@ systemctl daemon-reload } +# usage: curl_retry RETRIES SLEEP ARGS URL +# +# Use --show-error in ARGS to log HTTP error code +# +# returns: +# 0 success +# exit: +# 1 fail +curl_retry() +{ + local retries=$1 sleep=$2 opts=$3 url=$4 + local tries=$(($retries + 1)) + local args="--fail $opts $url" + local result rc + + for try in $(seq $tries); do + ocf_log debug "curl $args try $try of $tries" + result=$(echo "$args" | xargs curl 2>&1) + rc=$? + + ocf_log debug "result: $result" + [ $rc -eq 0 ] && break + sleep $sleep + done + + if [ $rc -ne 0 ]; then + ocf_exit_reason "curl $args failed $tries tries" + exit $OCF_ERR_GENERIC + fi + + echo "$result" + return $rc +} + # move process to root cgroup if realtime scheduling is enabled ocf_move_to_root_cgroup_if_rt_enabled() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/ocf.py new/resource-agents-4.14.0+git15.c784b83c/heartbeat/ocf.py --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/ocf.py 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/ocf.py 2024-05-31 13:49:56.000000000 +0200 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# import sys, os, logging, syslog @@ -42,19 +42,19 @@ # OCF does not include the concept of master/slave resources so we # need to extend it so we can discover a resource's complete state. # -# OCF_RUNNING_MASTER: +# OCF_RUNNING_MASTER: # The resource is in "master" mode and fully operational # OCF_FAILED_MASTER: # The resource is in "master" mode but in a failed state -# +# # The extra two values should only be used during a probe. # # Probes are used to discover resources that were started outside of # the CRM and/or left behind if the LRM fails. -# +# # They can be identified in RA scripts by checking for: # [ "${__OCF_ACTION}" = "monitor" -a "${OCF_RESKEY_CRM_meta_interval}" = "0" ] -# +# # Failed "slaves" should continue to use: OCF_ERR_GENERIC # Fully operational "slaves" should continue to use: OCF_SUCCESS # @@ -451,15 +451,17 @@ sys.exit(OCF_ERR_UNIMPLEMENTED) + if __name__ == "__main__": import unittest + import logging class TestMetadata(unittest.TestCase): def test_noparams_noactions(self): m = Agent("foo", shortdesc="shortdesc", longdesc="longdesc") self.assertEqual("""<?xml version="1.0"?> <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd"> -<resource-agent name="foo"> +<resource-agent name="foo" version="1.0"> <version>1.0</version> <longdesc lang="en"> longdesc @@ -483,4 +485,40 @@ m.add_action("start") self.assertEqual(str(m.actions[0]), '<action name="start" />\n') + def test_retry_params_actions(self): + log= logging.getLogger( "test_retry_params_actions" ) + + m = Agent("foo", shortdesc="shortdesc", longdesc="longdesc") + m.add_parameter( + "retry_count", + shortdesc="Azure ims webservice retry count", + longdesc="Set to any number bigger than zero to enable retry count", + content_type="integer", + default="0") + m.add_parameter( + "retry_wait", + shortdesc="Configure a retry wait time", + longdesc="Set retry wait time in seconds", + content_type="integer", + default="20") + m.add_parameter( + "request_timeout", + shortdesc="Configure a request timeout", + longdesc="Set request timeout in seconds", + content_type="integer", + default="15") + + m.add_action("start") + + log.debug( "actions= %s", str(m.actions[0] )) + self.assertEqual(str(m.actions[0]), '<action name="start" />\n') + + log.debug( "parameters= %s", str(m.parameters[0] )) + log.debug( "parameters= %s", str(m.parameters[1] )) + log.debug( "parameters= %s", str(m.parameters[2] )) + self.assertEqual(str(m.parameters[0]), '<parameter name="retry_count">\n<longdesc lang="en">Set to any number bigger than zero to enable retry count</longdesc>\n<shortdesc lang="en">Azure ims webservice retry count</shortdesc>\n<content type="integer" default="0" />\n</parameter>\n') + self.assertEqual(str(m.parameters[1]), '<parameter name="retry_wait">\n<longdesc lang="en">Set retry wait time in seconds</longdesc>\n<shortdesc lang="en">Configure a retry wait time</shortdesc>\n<content type="integer" default="20" />\n</parameter>\n') + self.assertEqual(str(m.parameters[2]), '<parameter name="request_timeout">\n<longdesc lang="en">Set request timeout in seconds</longdesc>\n<shortdesc lang="en">Configure a request timeout</shortdesc>\n<content type="integer" default="15" />\n</parameter>\n') + + logging.basicConfig( stream=sys.stderr ) unittest.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/osceip new/resource-agents-4.14.0+git15.c784b83c/heartbeat/osceip --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/osceip 1970-01-01 01:00:00.000000000 +0100 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/osceip 2024-05-31 13:49:56.000000000 +0200 @@ -0,0 +1,260 @@ +#!/bin/sh +# +# +# Manage Outscale Elastic IP with Pacemaker +# +# +# Copyright 2016-2018 guessi <guessi(a)gmail.com> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + +# +# Prerequisites: +# +# - preconfigured OSC-CLI running environment (AccessKey, SecretAccessKey, +# etc.) to allow agent related functions to be executed. +# - a reserved secondary private IP address for vm instances high availability +# - IAM user role with the following permissions: +# * DescribeInstances +# * AssociateAddress +# * DescribeAddresses +# * DisassociateAddress +# + +####################################################################### +# Initialization: + +: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat} +. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs + +####################################################################### + +# +# Defaults +# +OCF_RESKEY_osccli_default="/usr/local/bin/osc-cli" +OCF_RESKEY_profile_default="default" +OCF_RESKEY_region_default="" +OCF_RESKEY_curl_retries_default="3" +OCF_RESKEY_curl_sleep_default="1" + +: ${OCF_RESKEY_osccli=${OCF_RESKEY_osccli_default}} +: ${OCF_RESKEY_profile=${OCF_RESKEY_profile_default}} +: ${OCF_RESKEY_region=${OCF_RESKEY_region_default}} +: ${OCF_RESKEY_curl_retries=${OCF_RESKEY_curl_retries_default}} +: ${OCF_RESKEY_curl_sleep=${OCF_RESKEY_curl_sleep_default}} + +meta_data() { + cat <<END +<?xml version="1.0"?> +<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd"> +<resource-agent name="osceip" version="1.0"> +<version>1.0</version> + +<longdesc lang="en"> +Resource Agent for Outscale Elastic IP Addresses. + +It manages Outscale Elastic IP Addresses with osc-cli. + +Credentials needs to be setup. + +See https://docs.outscale.com/en/userguide/Installing-and-Configuring-OSC-CLI.h… for more information about osccli. +</longdesc> +<shortdesc lang="en">Outscale Elastic IP Address Resource Agent</shortdesc> + +<parameters> + +<parameter name="osccli" unique="0"> +<longdesc lang="en"> +command line tools for outscale services +</longdesc> +<shortdesc lang="en">OSC-CLI tools</shortdesc> +<content type="string" default="${OCF_RESKEY_osccli_default}" /> +</parameter> + +<parameter name="profile"> +<longdesc lang="en"> +Valid OSC-CLI profile name (see ~/.osc/config and 'osc configure') +</longdesc> +<shortdesc lang="en">profile name</shortdesc> +<content type="string" default="${OCF_RESKEY_profile_default}" /> +</parameter> + +<parameter name="elastic_ip" unique="1" required="1"> +<longdesc lang="en"> +reserved elastic ip for vm instance +</longdesc> +<shortdesc lang="en">reserved elastic ip for vm instance</shortdesc> +<content type="string" default="" /> +</parameter> + +<parameter name="region" required="0"> +<longdesc lang="en"> +Region for osc resource (required for role-based authentication) +</longdesc> +<shortdesc lang="en">Region</shortdesc> +<content type="string" default="${OCF_RESKEY_region_default}" /> +</parameter> + +<parameter name="curl_retries" unique="0"> +<longdesc lang="en"> +curl retries before failing +</longdesc> +<shortdesc lang="en">curl retries</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_retries_default}" /> +</parameter> + +<parameter name="curl_sleep" unique="0"> +<longdesc lang="en"> +curl sleep between tries +</longdesc> +<shortdesc lang="en">curl sleep</shortdesc> +<content type="integer" default="${OCF_RESKEY_curl_sleep_default}" /> +</parameter> + + +</parameters> + +<actions> +<action name="start" timeout="30s" /> +<action name="stop" timeout="30s" /> +<action name="monitor" timeout="30s" interval="20s" depth="0" /> +<action name="migrate_to" timeout="30s" /> +<action name="migrate_from" timeout="30s" /> +<action name="meta-data" timeout="5s" /> +<action name="validate" timeout="10s" /> +<action name="validate-all" timeout="10s" /> +</actions> +</resource-agent> +END +} + +####################################################################### + +osceip_usage() { + cat <<END +usage: $0 {start|stop|monitor|migrate_to|migrate_from|validate|validate-all|meta-data} + +Expects to have a fully populated OCF RA-compliant environment set. +END +} + +osceip_start() { + osceip_monitor && return $OCF_SUCCESS + + $oscCLI_CMD api LinkPublicIp --profile "${OCF_RESKEY_profile}" --PublicIp "${ELASTIC_IP}" --VmId "${INSTANCE_ID}" --AllowRelink True + RET=$? + + + if [ $RET -ne 0 ]; then + return $OCF_NOT_RUNNING + fi + + ocf_log info "elastic_ip has been successfully brought up (${ELASTIC_IP})" + return $OCF_SUCCESS +} + +osceip_stop() { + osceip_monitor || return $OCF_SUCCESS + + $oscCLI_CMD api UnlinkPublicIp --profile "${OCF_RESKEY_profile}" --PublicIp "${ELASTIC_IP}" + RET=$? + + if [ $RET -ne 0 ]; then + return $OCF_NOT_RUNNING + fi + + ocf_log info "elastic_ip has been successfully brought down (${ELASTIC_IP})" + return $OCF_SUCCESS +} + +osceip_monitor() { + $oscCLI_CMD api ReadPublicIps --profile "${OCF_RESKEY_profile}" --Filters '{"VmIds": ["'${INSTANCE_ID}'"],}' |grep LinkPublicIpId + RET=$? + + if [ $RET -ne 0 ]; then + return $OCF_NOT_RUNNING + fi + return $OCF_SUCCESS +} + +osceip_validate() { + check_binary "${OCF_RESKEY_osccli}" + + if [ -z "${INSTANCE_ID}" ]; then + ocf_exit_reason "instance_id not found. Is this a vm instance?" + return $OCF_ERR_GENERIC + fi + + if [ -z "${ELASTIC_IP}" ] ; then + ocf_exit_reason "elastic_ip is a mandatory paramater. " + return $OCF_ERR_CONFIGURED + fi + + return $OCF_SUCCESS +} + +case $__OCF_ACTION in + meta-data) + meta_data + exit $OCF_SUCCESS + ;; + usage|help) + osceip_usage + exit $OCF_SUCCESS + ;; +esac + +oscCLI_CMD="${OCF_RESKEY_osccli}" +if [ -n "${OCF_RESKEY_region}" ]; then + oscCLI_CMD="$oscCLI_CMD --region ${OCF_RESKEY_region}" +fi +ELASTIC_IP="${OCF_RESKEY_elastic_ip}" +INSTANCE_ID=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "-s" "http://169.254.169.254/latest/meta-data/instance-id") + +case $__OCF_ACTION in + start) + osceip_validate || exit $? + osceip_start + ;; + stop) + osceip_stop + ;; + monitor) + osceip_monitor + ;; + migrate_to) + ocf_log info "Migrating ${OCF_RESOURCE_INSTANCE} to ${OCF_RESKEY_CRM_meta_migrate_target}." + osceip_stop + ;; + migrate_from) + ocf_log info "Migrating ${OCF_RESOURCE_INSTANCE} from ${OCF_RESKEY_CRM_meta_migrate_source}." + osceip_start + ;; + reload) + ocf_log info "Reloading ${OCF_RESOURCE_INSTANCE} ..." + ;; + validate|validate-all) + osceip_validate + ;; + *) + osceip_usage + exit $OCF_ERR_UNIMPLEMENTED + ;; +esac + +rc=$? +ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc" +exit $rc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/heartbeat/portblock new/resource-agents-4.14.0+git15.c784b83c/heartbeat/portblock --- old/resource-agents-4.13.0+git41.828c175c/heartbeat/portblock 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/heartbeat/portblock 2024-05-31 13:49:56.000000000 +0200 @@ -328,7 +328,6 @@ tickle_remote() { [ -z "$OCF_RESKEY_tickle_dir" ] && return - echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle f=$OCF_RESKEY_tickle_dir/$OCF_RESKEY_ip [ -r $f ] || return $TICKLETCP -n 3 < $f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-4.13.0+git41.828c175c/tools/storage_mon.c new/resource-agents-4.14.0+git15.c784b83c/tools/storage_mon.c --- old/resource-agents-4.13.0+git41.828c175c/tools/storage_mon.c 2024-04-04 09:51:26.000000000 +0200 +++ new/resource-agents-4.14.0+git15.c784b83c/tools/storage_mon.c 2024-05-31 13:49:56.000000000 +0200 @@ -308,6 +308,8 @@ /* so add the final_score from the exit code of the terminated child process. */ if (qb_loop_timer_is_running(storage_mon_poll_handle, expire_handle)) { if (WEXITSTATUS(status) !=0) { + syslog(LOG_ERR, "Error reading from device %s", devices[index]); + final_score += scores[index]; /* Update response values immediately in preparation for inquiries from clients. */ @@ -403,6 +405,8 @@ if (is_child_runnning()) { for (i=0; i<device_count; i++) { if (test_forks[i] > 0) { + syslog(LOG_ERR, "Reading from device %s did not complete in %d seconds timeout", devices[i], timeout); + /* If timeout occurs before SIGCHLD, add child process failure score to final_score. */ final_score += scores[i];

1 0

commit yast2-trans for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-trans for openSUSE:Factory checked in at 2024-06-10 17:37:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-trans (Old) and /work/SRC/openSUSE:Factory/.yast2-trans.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-trans" Mon Jun 10 17:37:02 2024 rev:344 rq:1179603 version:84.87.20240610.1108c0c7e7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-trans/yast2-trans.changes 2024-06-04 12:50:09.489708182 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-trans.new.19518/yast2-trans.changes 2024-06-10 17:37:04.513704310 +0200 @@ -1,0 +2,36 @@ +Mon Jun 10 05:12:44 UTC 2024 - git(a)opensuse.org + +- Update to version 84.87.20240610.1108c0c7e7: + * Translated using Weblate (Japanese) + * Translated using Weblate (Japanese) + * Translated using Weblate (Tamil) + * Translated using Weblate (Tamil) + * Translated using Weblate (Tamil) + * Translated using Weblate (Slovak) + * Translated using Weblate (Romanian) + * Translated using Weblate (Dutch) + * Translated using Weblate (Japanese) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovak) + * Translated using Weblate (Slovak) + * Translated using Weblate (Catalan) + * New POT for text domain 'timezone_db'. + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Slovenian) + * Translated using Weblate (Romanian) + * New POT for text domain 'registration'. + * New POT for text domain 'control'. + +------------------------------------------------------------------- Old: ---- yast2-trans-84.87.20240603.1527509889.tar.xz New: ---- yast2-trans-84.87.20240610.1108c0c7e7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans.spec ++++++ --- /var/tmp/diff_new_pack.voMfZq/_old 2024-06-10 17:37:05.377736516 +0200 +++ /var/tmp/diff_new_pack.voMfZq/_new 2024-06-10 17:37:05.377736516 +0200 @@ -17,7 +17,7 @@ Name: yast2-trans -Version: 84.87.20240603.1527509889 +Version: 84.87.20240610.1108c0c7e7 Release: 0 Summary: YaST2 - Translation Container Package License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.voMfZq/_old 2024-06-10 17:37:05.445739051 +0200 +++ /var/tmp/diff_new_pack.voMfZq/_new 2024-06-10 17:37:05.449739200 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/yast/yast-translations.git</param> - <param name="changesrevision">15275098896609089a3b4f4f3b7fc628c9be1a93</param></service></servicedata> + <param name="changesrevision">1108c0c7e74ceac0bb5e20ef6a968aa0359c25f7</param></service></servicedata> (No newline at EOF) ++++++ yast2-trans-84.87.20240603.1527509889.tar.xz -> yast2-trans-84.87.20240610.1108c0c7e7.tar.xz ++++++ /work/SRC/openSUSE:Factory/yast2-trans/yast2-trans-84.87.20240603.1527509889.tar.xz /work/SRC/openSUSE:Factory/.yast2-trans.new.19518/yast2-trans-84.87.20240610.1108c0c7e7.tar.xz differ: char 27, line 1

1 0

commit python-typeguard for openSUSE:Factory
by Source-Sync 10 Jun '24

10 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-typeguard for openSUSE:Factory checked in at 2024-06-10 17:36:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-typeguard (Old) and /work/SRC/openSUSE:Factory/.python-typeguard.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-typeguard" Mon Jun 10 17:36:58 2024 rev:6 rq:1179514 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-typeguard/python-typeguard.changes 2023-12-05 17:01:15.328811173 +0100 +++ /work/SRC/openSUSE:Factory/.python-typeguard.new.19518/python-typeguard.changes 2024-06-10 17:37:01.841604707 +0200 @@ -1,0 +2,25 @@ +Sat Jun 8 13:05:55 UTC 2024 - Dirk Müller <dmueller(a)suse.com> + +- update to 4.3.0: + * Added support for checking against static protocols + * Fixed some compatibility problems when running on Python 3.13 + * Fixed test suite incompatibility with pytest 8.2 + * Fixed pytest plugin crashing on pytest version older than + v7.0.0 (even if it's just present) + * Fixed missing typing_extensions dependency for Python 3.12 + * Fixed deprecation warning in the test suite on Python 3.13 + * Added support for specifying options for the pytest plugin + via pytest config files + * Avoid creating reference cycles when type checking unions (PR + by Shantanu) + * Fixed Optional[...] being removed from the AST if it was + located within a subscript + * Fixed TypedDict from typing_extensions not being recognized + as one + * Fixed typing types (dict[str, int], List[str], etc.) not + passing checks against type or Type + * Fixed detection of optional fields (NotRequired[...]) in + TypedDict when using forward references + * Fixed mapping checks against Django's MultiValueDict + +------------------------------------------------------------------- Old: ---- typeguard-4.1.5.tar.gz New: ---- typeguard-4.3.0-gh.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-typeguard.spec ++++++ --- /var/tmp/diff_new_pack.y8Rxf2/_old 2024-06-10 17:37:02.409625880 +0200 +++ /var/tmp/diff_new_pack.y8Rxf2/_new 2024-06-10 17:37:02.413626029 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-typeguard # -# 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 @@ -18,20 +18,23 @@ %{?sle15_python_module_pythons} Name: python-typeguard -Version: 4.1.5 +Version: 4.3.0 Release: 0 Summary: Library for runtime checking of Python types License: MIT URL: https://github.com/agronholm/typeguard -Source0: https://files.pythonhosted.org/packages/source/t/typeguard/typeguard-%{vers… +Source0: https://github.com/agronholm/typeguard/archive/refs/tags/%{version}.tar.gz#… +BuildRequires: %{python_module mypy} BuildRequires: %{python_module pip} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module typing-extensions >= 4.10.0} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch Requires: python-importlib-metadata >= 3.6 -Requires: python-typing-extensions >= 4.4.0 +Requires: python-typing-extensions >= 4.10.0 %python_subpackages %description @@ -48,7 +51,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# No testsuite +%pytest %files %{python_files} %license LICENSE

1 0