December 2022 - openSUSE Commits - openSUSE Mailing Lists

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

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openQA for openSUSE:Factory checked in at 2022-12-22 16:22:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openQA (Old) and /work/SRC/openSUSE:Factory/.openQA.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openQA" Thu Dec 22 16:22:51 2022 rev:427 rq:1044112 version:4.6.1671625243.c73687c Changes: -------- openQA-devel-test.changes: same change openQA-test.changes: same change openQA-worker-test.changes: same change --- /work/SRC/openSUSE:Factory/openQA/openQA.changes 2022-12-17 20:36:50.108700552 +0100 +++ /work/SRC/openSUSE:Factory/.openQA.new.1835/openQA.changes 2022-12-22 16:23:04.638030508 +0100 @@ -1,0 +2,8 @@ +Wed Dec 21 12:20:52 UTC 2022 - okurz(a)suse.com + +- Update to version 4.6.1671625243.c73687c: + * Use signatures in WebAPI::Controller::Running + * Avoid deadlock when updating asset size during job creation + * Improve `t/api/04-jobs.t` + +------------------------------------------------------------------- Old: ---- openQA-4.6.1671158755.972ff1f.obscpio New: ---- openQA-4.6.1671625243.c73687c.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openQA-client-test.spec ++++++ --- /var/tmp/diff_new_pack.jd1osi/_old 2022-12-22 16:23:05.962038123 +0100 +++ /var/tmp/diff_new_pack.jd1osi/_new 2022-12-22 16:23:05.970038169 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-client Name: %{short_name}-test -Version: 4.6.1671158755.972ff1f +Version: 4.6.1671625243.c73687c Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA-devel-test.spec ++++++ --- /var/tmp/diff_new_pack.jd1osi/_old 2022-12-22 16:23:05.998038330 +0100 +++ /var/tmp/diff_new_pack.jd1osi/_new 2022-12-22 16:23:06.002038353 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-devel Name: %{short_name}-test -Version: 4.6.1671158755.972ff1f +Version: 4.6.1671625243.c73687c Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA-test.spec ++++++ --- /var/tmp/diff_new_pack.jd1osi/_old 2022-12-22 16:23:06.038038561 +0100 +++ /var/tmp/diff_new_pack.jd1osi/_new 2022-12-22 16:23:06.042038584 +0100 @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1671158755.972ff1f +Version: 4.6.1671625243.c73687c Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later ++++++ openQA-worker-test.spec ++++++ --- /var/tmp/diff_new_pack.jd1osi/_old 2022-12-22 16:23:06.070038745 +0100 +++ /var/tmp/diff_new_pack.jd1osi/_new 2022-12-22 16:23:06.074038768 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 4.6.1671158755.972ff1f +Version: 4.6.1671625243.c73687c Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA.spec ++++++ --- /var/tmp/diff_new_pack.jd1osi/_old 2022-12-22 16:23:06.110038975 +0100 +++ /var/tmp/diff_new_pack.jd1osi/_new 2022-12-22 16:23:06.110038975 +0100 @@ -76,7 +76,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1671158755.972ff1f +Version: 4.6.1671625243.c73687c Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later ++++++ openQA-4.6.1671158755.972ff1f.obscpio -> openQA-4.6.1671625243.c73687c.obscpio ++++++ /work/SRC/openSUSE:Factory/openQA/openQA-4.6.1671158755.972ff1f.obscpio /work/SRC/openSUSE:Factory/.openQA.new.1835/openQA-4.6.1671625243.c73687c.obscpio differ: char 49, line 1 ++++++ openQA.obsinfo ++++++ --- /var/tmp/diff_new_pack.jd1osi/_old 2022-12-22 16:23:06.222039619 +0100 +++ /var/tmp/diff_new_pack.jd1osi/_new 2022-12-22 16:23:06.226039641 +0100 @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1671158755.972ff1f -mtime: 1671158755 -commit: 972ff1ff396dfa011aa4ce5afde2fb92c37cc6f6 +version: 4.6.1671625243.c73687c +mtime: 1671625243 +commit: c73687c22fdee12430e1dab26365347517101840

1 0

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

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package skaffold for openSUSE:Factory checked in at 2022-12-22 16:22:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skaffold (Old) and /work/SRC/openSUSE:Factory/.skaffold.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skaffold" Thu Dec 22 16:22:47 2022 rev:15 rq:1044117 version:2.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/skaffold/skaffold.changes 2022-12-02 13:13:45.814058518 +0100 +++ /work/SRC/openSUSE:Factory/.skaffold.new.1835/skaffold.changes 2022-12-22 16:23:01.518012563 +0100 @@ -1,0 +2,28 @@ +Wed Dec 21 19:13:56 UTC 2022 - kastl(a)b1-systems.de + +- Update to version 2.0.4: + * fix: resolve issue where skaffold would not add digest when using helm in v1 -> v2 migration case + * fix: use python 3.9 in integration-linux.yml + * chore: remove hack/check-samples.sh and hack/check-schema-changes.sh from patch releases + * fix: remove python2.7 pin from integration-linux.yml + * fix: remove kubecontext check warning from kubectl deploy (#8256) + * fix: expand namespace with env variables (#8222) + * fix: properly wire deploy.kubectl.defaultNamespace field to be set in SKAFFOLD_NAMESPACES (#8129) + * fix: new condition to create hydrate-dir only if a kpt renderer or deployer (#8117) + * fix: correct issue where skaffold setTemplateValues env vars were in some cases empty (#8261) + * fix: support alternative env var naming using support env variable + artifact-name (vs env variable + index) + * release: v2.0.2 (#8102) + * docs: add detailed information on how to use helm rendering with v2.X.Y as well as how post-renderer usage works (#8093) + * fix: correct issues with current upgrade logic for artifactOverrides with helm imageStrategy + multiple-images (#8066) + * chore: reduce gcp integration test time (#8080) + * feat: completion for the Fish shell (#8097) + * refactor: use exclude directives instead of replace directives for pinning (#8056) + * chore: remove uncessary server bins (#8092) + * fix: add unique tag to test image to avoid collisions with other tests using the same image (#8087) + * fix: resolve issue where skaffold filter command did not properly configure the filter allow & deny lists (#8085) + * fix: override protocols argument pass to helm post-renderer (#8083) + * chore: update changelog.md to include v1.39.4 (#8078) + * chore: update examples/* repos to use v3 schema (revert 3f82f13b02117f823694125d7149bca06a8d64f3) (#8079) + * chore: update examples/* repos to use v4beta1 schema (#8065) + +------------------------------------------------------------------- Old: ---- skaffold-2.0.3.tar.gz New: ---- skaffold-2.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skaffold.spec ++++++ --- /var/tmp/diff_new_pack.INiuQZ/_old 2022-12-22 16:23:03.358023145 +0100 +++ /var/tmp/diff_new_pack.INiuQZ/_new 2022-12-22 16:23:03.366023192 +0100 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: skaffold -Version: 2.0.3 +Version: 2.0.4 Release: 0 Summary: Easy and Repeatable Kubernetes Development License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.INiuQZ/_old 2022-12-22 16:23:03.430023560 +0100 +++ /var/tmp/diff_new_pack.INiuQZ/_new 2022-12-22 16:23:03.458023721 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/GoogleContainerTools/skaffold</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v2.0.3</param> + <param name="revision">v2.0.4</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -16,7 +16,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">skaffold-2.0.3.tar.gz</param> + <param name="archive">skaffold-2.0.4.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.INiuQZ/_old 2022-12-22 16:23:03.510024020 +0100 +++ /var/tmp/diff_new_pack.INiuQZ/_new 2022-12-22 16:23:03.542024204 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/GoogleContainerTools/skaffold</param> - <param name="changesrevision">f5dee0f76014d4fb8df4eb89a845d5d45883ef96</param></service></servicedata> + <param name="changesrevision">01dd5065e6c1f91b046edef95074e68050a9c28c</param></service></servicedata> (No newline at EOF) ++++++ skaffold-2.0.3.tar.gz -> skaffold-2.0.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/skaffold/skaffold-2.0.3.tar.gz /work/SRC/openSUSE:Factory/.skaffold.new.1835/skaffold-2.0.4.tar.gz differ: char 12, line 1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/skaffold/vendor.tar.gz /work/SRC/openSUSE:Factory/.skaffold.new.1835/vendor.tar.gz differ: char 5, line 1

1 0

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

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hoard for openSUSE:Factory checked in at 2022-12-22 16:22:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hoard (Old) and /work/SRC/openSUSE:Factory/.hoard.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hoard" Thu Dec 22 16:22:45 2022 rev:2 rq:1044110 version:1.3.0~0 Changes: -------- --- /work/SRC/openSUSE:Factory/hoard/hoard.changes 2022-12-07 17:37:35.281400871 +0100 +++ /work/SRC/openSUSE:Factory/.hoard.new.1835/hoard.changes 2022-12-22 16:22:47.837933880 +0100 @@ -1,0 +2,12 @@ +Wed Dec 21 18:31:33 UTC 2022 - Michael Vetter <mvetter(a)suse.com> + +- Update to 1.3.0: + * Inline command editing in the GUI. Press to get started. + Only editing the command, its description and the tags are + supported for now + * Inline command deletion in the GUI. Press to delete a command + in the GUI view + * Inline command creation in the GUI. Press to create a new + command in the GUI view + +------------------------------------------------------------------- Old: ---- hoard-1.2.0~0.tar.xz New: ---- hoard-1.3.0~0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hoard.spec ++++++ --- /var/tmp/diff_new_pack.h2fAdA/_old 2022-12-22 16:22:52.997963559 +0100 +++ /var/tmp/diff_new_pack.h2fAdA/_new 2022-12-22 16:22:53.005963605 +0100 @@ -17,7 +17,7 @@ Name: hoard -Version: 1.2.0~0 +Version: 1.3.0~0 Release: 0 Summary: CLI command organizer License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.h2fAdA/_old 2022-12-22 16:22:53.049963857 +0100 +++ /var/tmp/diff_new_pack.h2fAdA/_new 2022-12-22 16:22:53.053963881 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/Hyde46/hoard.git</param> <param name="versionformat">@PARENT_TAG@~@TAG_OFFSET@</param> <param name="scm">git</param> - <param name="revision">v1.2.0</param> + <param name="revision">v1.3.0</param> <param name="match-tag">*</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> @@ -20,6 +20,9 @@ <param name="compression">xz</param> <param name="update">true</param> </service> + <service name="cargo_audit" mode="disabled"> + <param name="srcdir">hoard</param> + </service> </services> ++++++ hoard-1.2.0~0.tar.xz -> hoard-1.3.0~0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/CHANGES.md new/hoard-1.3.0~0/CHANGES.md --- old/hoard-1.2.0~0/CHANGES.md 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/CHANGES.md 2022-12-21 14:06:28.000000000 +0100 @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## 1.3 +- �� Inline command editing in the GUI. Press `<TAB>` to get started. Only editing the command, its description and the tags are supported for now +- �� Inline command deletion in the GUI. Press `<Ctrl-X>` to delete a command in the GUI view +- �� Inline command creation in the GUI. Press `<Ctrl-W>` to create a new command in the GUI view ## 1.2 - �� You can now synchronize your commands across multiple terminals! Run `hoard sync --help` to start ## 1.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/Cargo.lock new/hoard-1.3.0~0/Cargo.lock --- old/hoard-1.2.0~0/Cargo.lock 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/Cargo.lock 2022-12-21 14:06:28.000000000 +0100 @@ -4,9 +4,9 @@ [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "array_tool" @@ -20,7 +20,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -101,14 +101,14 @@ [[package]] name = "clap" -version = "4.0.17" +version = "4.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06badb543e734a2d6568e19a40af66ed5364360b9226184926f89d229b4b4267" +checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" dependencies = [ - "atty", "bitflags", "clap_derive", "clap_lex", + "is-terminal", "once_cell", "strsim", "termcolor", @@ -116,9 +116,9 @@ [[package]] name = "clap_derive" -version = "4.0.13" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f169caba89a7d512b5418b09864543eeb4d497416c917d7137863bd2076ad" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck", "proc-macro-error", @@ -149,13 +149,13 @@ [[package]] name = "console" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" +checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" dependencies = [ "encode_unicode 0.3.6", + "lazy_static", "libc", - "once_cell", "terminal_size", "unicode-width", "winapi", @@ -338,6 +338,27 @@ ] [[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] name = "eyre" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -486,8 +507,17 @@ ] [[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] name = "hoard-rs" -version = "1.2.0" +version = "1.3.0" dependencies = [ "anyhow", "array_tool", @@ -623,12 +653,34 @@ ] [[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + +[[package]] name = "ipnet" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys 0.42.0", +] + +[[package]] name = "itoa" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -657,9 +709,9 @@ [[package]] name = "libc" -version = "0.2.126" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "linked-hash-map" @@ -668,6 +720,12 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] +name = "linux-raw-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" + +[[package]] name = "lock_api" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -707,7 +765,7 @@ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -753,7 +811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -849,7 +907,7 @@ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -1050,6 +1108,20 @@ ] [[package]] +name = "rustix" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.42.0", +] + +[[package]] name = "rustversion" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1068,7 +1140,7 @@ checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -1295,18 +1367,18 @@ [[package]] name = "thiserror" -version = "1.0.35" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.35" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1660,44 +1732,101 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", ] [[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] name = "windows_x86_64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] name = "winreg" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/Cargo.toml new/hoard-1.3.0~0/Cargo.toml --- old/hoard-1.2.0~0/Cargo.toml 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/Cargo.toml 2022-12-21 14:06:28.000000000 +0100 @@ -1,6 +1,6 @@ [package] name = "hoard-rs" -version = "1.2.0" +version = "1.3.0" edition = "2021" readme = "README.md" license = "MIT" @@ -28,7 +28,7 @@ [dependencies] # Command line argument parser -clap = { version = "4.0.7", features = ["derive"] } +clap = { version = "4.0.29", features = ["derive"] } # pretty dialogues in terminal dialoguer = "0.10.2" termion = "1.5.6" @@ -36,7 +36,7 @@ serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.8" serde_json = "1.0" -anyhow = "1.0.65" +anyhow = "1.0.68" dirs = "4.0.0" log = "0.4" eyre = "0.6" @@ -51,7 +51,7 @@ array_tool = "1.0.3" reqwest = { version = "0.11.12", features = ["blocking"] } url = {version="2.3.1"} -console = "0.15.1" +console = "0.15.2" enum-iterator = "1.2.0" base64 = "0.13.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/README.md new/hoard-1.3.0~0/README.md --- old/hoard-1.2.0~0/README.md 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/README.md 2022-12-21 14:06:28.000000000 +0100 @@ -92,7 +92,7 @@ If you are running `fish` shell ``` -LATEST_RELEASE=1.2.0 ./install.fish +LATEST_RELEASE=1.3.0 ./install.fish ``` ### Brew on MacOS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/example_troves/git.yml new/hoard-1.3.0~0/example_troves/git.yml --- old/hoard-1.2.0~0/example_troves/git.yml 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/example_troves/git.yml 2022-12-21 14:06:28.000000000 +0100 @@ -1,5 +1,5 @@ --- -version: 1.2.0 +version: 1.3.0 commands: - name: git_status namespace: git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/install.sh new/hoard-1.3.0~0/install.sh --- old/hoard-1.2.0~0/install.sh 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/install.sh 2022-12-21 14:06:28.000000000 +0100 @@ -42,7 +42,7 @@ __hoard_install_ubuntu(){ echo "Assuming Ubuntu distro. Trying to install .deb package" - ARTIFACT_URL="https://github.com/hyde46/hoard/releases/download/v1.2.0/hoard_1.2.0.deb" + ARTIFACT_URL="https://github.com/hyde46/hoard/releases/download/v1.3.0/hoard_1.3.0.deb" TEMP_DEB="$(mktemp)" && wget -O "$TEMP_DEB" "$ARTIFACT_URL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/command/hoard_command.rs new/hoard-1.3.0~0/src/command/hoard_command.rs --- old/hoard-1.2.0~0/src/command/hoard_command.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/command/hoard_command.rs 2022-12-21 14:06:28.000000000 +0100 @@ -24,6 +24,30 @@ } } + pub fn is_command_valid(c: &str) -> (bool, String) { + if c.is_empty() { + return (false, String::from("Command can't be empty")); + } + (true, String::new()) + } + + pub fn is_name_valid(c: &str) -> (bool, String) { + if c.is_empty() { + return (false, String::from("Name can't be empty")); + } + if c.contains(' ') { + return (false, String::from("Name can't contain whitespaces")); + } + (true, String::new()) + } + + pub fn are_tags_valid(c: &str) -> (bool, String) { + if c.is_empty() { + return (false, String::from("Tags can't be empty")); + } + (true, String::new()) + } + #[allow(dead_code)] pub fn is_complete(&self) -> bool { if self.name.is_empty() @@ -77,14 +101,7 @@ Self { name: self.name, namespace: self.namespace, - tags: Some( - tags.chars() - .filter(|c| !c.is_whitespace()) - .collect::<String>() - .split(',') - .map(std::string::ToString::to_string) - .collect(), - ), + tags: Some(string_to_tags(tags)), command: self.command, description: self.description, } @@ -207,6 +224,15 @@ } } +pub fn string_to_tags(tags: &str) -> Vec<String> { + tags.chars() + .filter(|c| !c.is_whitespace()) + .collect::<String>() + .split(',') + .map(std::string::ToString::to_string) + .collect() +} + pub trait Parameterized { // Check if parameter pointers are present fn is_parameterized(&self, token: &str) -> bool; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/command/trove.rs new/hoard-1.3.0~0/src/command/trove.rs --- old/hoard-1.2.0~0/src/command/trove.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/command/trove.rs 2022-12-21 14:06:28.000000000 +0100 @@ -12,7 +12,7 @@ const CARGO_VERSION: &str = env!("CARGO_PKG_VERSION"); #[allow(clippy::module_name_repetitions)] -#[derive(Debug, Serialize, Deserialize)] +#[derive(Debug, Serialize, Clone, Deserialize)] pub struct CommandTrove { pub version: String, pub commands: Vec<HoardCommand>, @@ -81,7 +81,7 @@ fs::write(path, s).expect("Unable to write config file"); } - fn check_name_collision(&self, command: &HoardCommand) -> Option<HoardCommand> { + pub fn check_name_collision(&self, command: &HoardCommand) -> Option<HoardCommand> { let colliding_commands = self .commands .iter() @@ -176,6 +176,15 @@ ) } + pub fn update_command_by_name(&mut self, command: &HoardCommand) -> &mut Self { + for c in &mut self.commands.iter_mut() { + if c.name == command.name { + *c = command.clone(); + } + } + self + } + pub fn is_empty(&self) -> bool { self.commands.is_empty() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/commands_gui.rs new/hoard-1.3.0~0/src/gui/commands_gui.rs --- old/hoard-1.2.0~0/src/gui/commands_gui.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/commands_gui.rs 2022-12-21 14:06:28.000000000 +0100 @@ -3,11 +3,15 @@ use crate::config::HoardConfig; use crate::gui::event::{Config, Event, Events}; use crate::gui::help::{draw as draw_help, key_handler as key_handler_help}; +use crate::gui::inline_edit::controls::key_handler as key_handler_inline_edit; use crate::gui::list_search::controls::key_handler as key_handler_list_search; use crate::gui::list_search::render::draw as draw_list_search; +use crate::gui::new_command::controls::key_handler as key_handler_create_command; +use crate::gui::new_command::render::draw as draw_new_command_input; use crate::gui::parameter_input::controls::key_handler as key_handler_parameter_input; use crate::gui::parameter_input::render::draw as draw_parameter_input; use eyre::Result; +use std::fmt; use std::io::stdout; use std::time::Duration; use termion::{raw::IntoRawMode, screen::AlternateScreen}; @@ -19,11 +23,35 @@ pub command_list_state: ListState, pub namespace_tab_state: ListState, pub should_exit: bool, + pub should_delete: bool, pub draw_state: DrawState, + pub control_state: ControlState, + pub edit_selection: EditSelection, + pub new_command: Option<HoardCommand>, + pub string_to_edit: String, pub parameter_token: String, pub parameter_ending_token: String, pub selected_command: Option<HoardCommand>, pub provided_parameter_count: u16, + pub error_message: String, +} + +impl State { + pub fn update_string_to_edit(&mut self) -> &mut Self { + let selected_idx = self.command_list_state.selected().unwrap(); + let cloned_selected_command = self.commands.get(selected_idx).unwrap().clone(); + match self.edit_selection { + EditSelection::Name => self.string_to_edit = cloned_selected_command.name, + EditSelection::Tags => self.string_to_edit = cloned_selected_command.tags_as_string(), + EditSelection::Description => { + self.string_to_edit = cloned_selected_command.description.unwrap_or_default(); + } + + EditSelection::Command => self.string_to_edit = cloned_selected_command.command, + EditSelection::Namespace => (), + }; + self + } } #[derive(Debug, Eq, PartialEq)] @@ -31,6 +59,65 @@ Search, ParameterInput, Help, + Create, +} + +#[derive(Debug, Eq, PartialEq)] +pub enum ControlState { + Search, + Edit, +} + +impl fmt::Display for ControlState { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + Self::Search => write!(f, "Search (<Tab>/<Ctrl-E> to edit)"), + Self::Edit => write!( + f, + "Edit (<Enter> to confirm. <Tab> to switch. <Esc> to abort)" + ), + } + } +} + +#[derive(Debug, Eq, PartialEq)] +pub enum EditSelection { + Name, + Tags, + Description, + Command, + Namespace, +} + +impl fmt::Display for EditSelection { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + Self::Name => write!(f, "Name"), + Self::Tags => write!(f, "Tags"), + Self::Description => write!(f, "Description"), + Self::Command => write!(f, "Command"), + Self::Namespace => write!(f, "Namespace"), + } + } +} + +impl EditSelection { + pub const fn next(&self) -> Self { + match self { + Self::Name | Self::Namespace | Self::Command => Self::Tags, + Self::Tags => Self::Description, + Self::Description => Self::Command, + } + } + pub const fn edit_next(&self) -> Self { + match self { + Self::Command => Self::Namespace, + Self::Namespace => Self::Name, + Self::Name => Self::Description, + Self::Description => Self::Tags, + Self::Tags => Self::Command, + } + } } #[allow(clippy::too_many_lines)] @@ -38,19 +125,25 @@ let events = Events::with_config(Config { tick_rate: Duration::from_millis(200), }); - + let trove_clone = trove.clone(); let mut app_state = State { input: String::new(), - commands: trove.commands.clone(), + commands: trove_clone.commands.clone(), command_list_state: ListState::default(), namespace_tab_state: ListState::default(), should_exit: false, + should_delete: false, draw_state: DrawState::Search, + control_state: ControlState::Search, + edit_selection: EditSelection::Command, + new_command: None, + string_to_edit: String::new(), parameter_token: config.parameter_token.as_ref().unwrap().clone(), parameter_ending_token: config.parameter_ending_token.as_ref().unwrap().clone(), selected_command: None, provided_parameter_count: 0, + error_message: String::new(), }; app_state.command_list_state.select(Some(0)); @@ -63,7 +156,7 @@ terminal.clear()?; //let menu_titles = vec!["List", "Search", "Add", "Delete", "Quit"]; - let mut namespace_tabs: Vec<&str> = trove.namespaces(); + let mut namespace_tabs: Vec<&str> = trove_clone.namespaces(); namespace_tabs.insert(0, "All"); loop { // Draw GUI @@ -77,20 +170,53 @@ DrawState::Help => { draw_help(config, &mut terminal)?; } + DrawState::Create => { + draw_new_command_input( + &mut app_state, + config, + &mut terminal, + &config.default_namespace, + )?; + } } if let Event::Input(input) = events.next()? { let command = match app_state.draw_state { - DrawState::Search => { - key_handler_list_search(input, &mut app_state, &trove.commands, &namespace_tabs) - } + DrawState::Search => match app_state.control_state { + ControlState::Search => key_handler_list_search( + input, + &mut app_state, + &trove.commands, + &namespace_tabs, + ), + ControlState::Edit => key_handler_inline_edit(input, &mut app_state), + }, DrawState::ParameterInput => key_handler_parameter_input(input, &mut app_state), DrawState::Help => key_handler_help(input, &mut app_state), + DrawState::Create => { + key_handler_create_command(input, &mut app_state, &config.default_namespace) + } }; if let Some(output) = command { - terminal.show_cursor()?; - return Ok(Some(output)); + if app_state.draw_state == DrawState::Create { + trove.add_command(output); + app_state.commands = trove.commands.clone(); + app_state.draw_state = DrawState::Search; + } else if app_state.control_state == ControlState::Edit { + // Command has been edited + trove.update_command_by_name(&output); + app_state.commands = trove.commands.clone(); + app_state.control_state = ControlState::Search; + } else if app_state.should_delete { + trove.remove_command(&output.name).ok(); + app_state.commands = trove.commands.clone(); + app_state.should_delete = false; + } else { + // Command has been selected + terminal.show_cursor()?; + return Ok(Some(output)); + } } if app_state.should_exit { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/help.rs new/hoard-1.3.0~0/src/gui/help.rs --- old/hoard-1.2.0~0/src/gui/help.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/help.rs 2022-12-21 14:06:28.000000000 +0100 @@ -19,6 +19,11 @@ ("Next namespace tab", "<Ctrl-L> / <Right-Arrow>"), ("Previous namespace tab", "<Ctrl-H> / <Left-Arrow>"), ("Select command", "<Enter>"), + ("Create new command", "<Ctrl-W>"), + ("Delete command", "<Ctrl-X>"), + ("Toggle search/edit mode", "<Tab> / <Ctrl-E>"), + ("Toggle Command to edit in edit mode", "<Tab>"), + ("Exit edit mode", "<Esc>"), ("Quit", "<Ctrl-D> / <Ctrl-C> / <Ctrl-G>"), ("Show help", HELP_KEY), ("Close help", "<Any key>"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/inline_edit/controls.rs new/hoard-1.3.0~0/src/gui/inline_edit/controls.rs --- old/hoard-1.2.0~0/src/gui/inline_edit/controls.rs 1970-01-01 01:00:00.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/inline_edit/controls.rs 2022-12-21 14:06:28.000000000 +0100 @@ -0,0 +1,45 @@ +use crate::command::hoard_command::{string_to_tags, HoardCommand}; +use crate::gui::commands_gui::{ControlState, EditSelection, State}; +use termion::event::Key; + +pub fn key_handler(input: Key, state: &mut State) -> Option<HoardCommand> { + match input { + // Quit command + Key::Esc => { + // Only exit the edit mode + state.control_state = ControlState::Search; + None + } + Key::Char('\n') => { + let mut edited_command = state.selected_command.clone().unwrap(); + let new_string = state.string_to_edit.clone(); + match state.edit_selection { + EditSelection::Description => edited_command.description = Some(new_string), + EditSelection::Command => edited_command.command = new_string, + EditSelection::Tags => edited_command.tags = Some(string_to_tags(&new_string)), + EditSelection::Name | EditSelection::Namespace => (), + }; + Some(edited_command) + } + Key::Char('\t') => { + state.edit_selection = state.edit_selection.next(); + state.update_string_to_edit(); + None + } + Key::Ctrl('c' | 'd' | 'g') => { + // Definitely exit program + state.should_exit = true; + None + } + // Handle query input + Key::Backspace => { + state.string_to_edit.pop(); + None + } + Key::Char(c) => { + state.string_to_edit.push(c); + None + } + _ => None, + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/inline_edit/mod.rs new/hoard-1.3.0~0/src/gui/inline_edit/mod.rs --- old/hoard-1.2.0~0/src/gui/inline_edit/mod.rs 1970-01-01 01:00:00.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/inline_edit/mod.rs 2022-12-21 14:06:28.000000000 +0100 @@ -0,0 +1 @@ +pub mod controls; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/list_search/controls.rs new/hoard-1.3.0~0/src/gui/list_search/controls.rs --- old/hoard-1.2.0~0/src/gui/list_search/controls.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/list_search/controls.rs 2022-12-21 14:06:28.000000000 +0100 @@ -1,7 +1,8 @@ use crate::command::hoard_command::{HoardCommand, Parameterized}; -use crate::gui::commands_gui::{DrawState, State}; +use crate::gui::commands_gui::{ControlState, DrawState, EditSelection, State}; use termion::event::Key; +#[allow(clippy::too_many_lines)] pub fn key_handler( input: Key, state: &mut State, @@ -9,8 +10,9 @@ namespace_tabs: &[&str], ) -> Option<HoardCommand> { match input { - // Quit command Key::Esc | Key::Ctrl('c' | 'd' | 'g') => { + // Definitely exit program + state.control_state = ControlState::Search; state.should_exit = true; None } @@ -19,6 +21,31 @@ state.draw_state = DrawState::Help; None } + // Show help + Key::Ctrl('w') => { + state.draw_state = DrawState::Create; + state.edit_selection = EditSelection::Command; + state.new_command = Some(HoardCommand::default()); + None + } + // Switch to edit command mode + Key::Ctrl('e') | Key::Char('\t') => { + let selected_command = state + .commands + .clone() + .get( + state + .command_list_state + .selected() + .expect("there is always a selected command"), + ) + .expect("exists") + .clone(); + state.control_state = ControlState::Edit; + state.selected_command = Some(selected_command); + state.update_string_to_edit(); + None + } // Switch namespace Key::Left | Key::Ctrl('h') => { if let Some(selected) = state.namespace_tab_state.selected() { @@ -53,6 +80,24 @@ } None } + Key::Ctrl('x') => { + if state.commands.is_empty() { + return None; + } + let selected_command = state + .commands + .clone() + .get( + state + .command_list_state + .selected() + .expect("there is always a selected command"), + ) + .expect("exists") + .clone(); + state.should_delete = true; + Some(selected_command) + } // Select command Key::Char('\n') => { if state.commands.is_empty() { @@ -193,11 +238,17 @@ command_list_state: ListState::default(), namespace_tab_state: ListState::default(), should_exit: false, + should_delete: false, draw_state: DrawState::Search, + control_state: ControlState::Search, + new_command: None, + edit_selection: crate::gui::commands_gui::EditSelection::Command, + string_to_edit: String::new(), parameter_token: "#".to_string(), parameter_ending_token: "!".to_string(), selected_command: None, provided_parameter_count: 0, + error_message: String::new(), }; state.command_list_state.select(Some(0)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/list_search/render.rs new/hoard-1.3.0~0/src/gui/list_search/render.rs --- old/hoard-1.2.0~0/src/gui/list_search/render.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/list_search/render.rs 2022-12-21 14:06:28.000000000 +0100 @@ -1,6 +1,7 @@ use crate::command::hoard_command::HoardCommand; use crate::config::HoardConfig; use crate::gui::commands_gui::State; +use crate::gui::commands_gui::{ControlState, EditSelection}; use crate::gui::help::HELP_KEY; use termion::screen::AlternateScreen; use tui::backend::TermionBackend; @@ -12,6 +13,7 @@ const VERSION: &str = env!("CARGO_PKG_VERSION"); +#[allow(clippy::too_many_lines)] pub fn draw( app_state: &mut State, config: &HoardConfig, @@ -102,19 +104,80 @@ rect.render_widget(command, command_detail_chunks[2]); rect.render_widget(input, chunks[2]); - let help_hint = Paragraph::new(format!("Show help - {HELP_KEY} ")) + let (footer_left, footer_right) = get_footer_constraints(&app_state.control_state); + let footer_chunk = Layout::default() + .direction(Direction::Horizontal) + .margin(0) + .constraints([ + Constraint::Percentage(footer_left), + Constraint::Percentage(footer_right), + ]) + .split(chunks[3]); + + let control_state_str = &app_state.control_state; + let help_hint_l = Paragraph::new(format!("{control_state_str}")) .style(Style::default().fg(Color::Rgb( config.primary_color.unwrap().0, config.primary_color.unwrap().1, config.primary_color.unwrap().2, ))) - .alignment(Alignment::Right); + .alignment(Alignment::Left); + let help_hint = Paragraph::new(format!( + "Create <Ctrl-W> | Delete <Ctrl-X> | Help {HELP_KEY}" + )) + .style(Style::default().fg(Color::Rgb( + config.primary_color.unwrap().0, + config.primary_color.unwrap().1, + config.primary_color.unwrap().2, + ))) + .alignment(Alignment::Right); - rect.render_widget(help_hint, chunks[3]); + rect.render_widget(help_hint_l, footer_chunk[0]); + if app_state.control_state == ControlState::Search { + rect.render_widget(help_hint, footer_chunk[1]); + } })?; Ok(()) } +fn get_color( + app: &mut State, + config: &HoardConfig, + command_render: &EditSelection, +) -> tui::style::Color { + let highlighted = Color::Rgb( + config.secondary_color.unwrap().0, + config.secondary_color.unwrap().1, + config.secondary_color.unwrap().2, + ); + let normal = Color::Rgb( + config.primary_color.unwrap().0, + config.primary_color.unwrap().1, + config.primary_color.unwrap().2, + ); + match app.control_state { + ControlState::Search => normal, + ControlState::Edit => { + if command_render == &app.edit_selection { + return highlighted; + } + normal + } + } +} + +fn coerce_string_by_mode(s: String, app: &State, command_render: &EditSelection) -> String { + match app.control_state { + ControlState::Search => s, + ControlState::Edit => { + if command_render == &app.edit_selection { + return app.string_to_edit.clone(); + } + s + } + } +} + #[allow(clippy::too_many_lines)] fn render_commands<'a>( commands_list: &[HoardCommand], @@ -129,11 +192,7 @@ ) { let commands = Block::default() .borders(Borders::ALL) - .style(Style::default().fg(Color::Rgb( - config.primary_color.unwrap().0, - config.primary_color.unwrap().1, - config.primary_color.unwrap().2, - ))) + .style(Style::default().fg(get_color(app, config, &EditSelection::Name))) .title(" Commands ") .border_type(BorderType::Plain); @@ -181,64 +240,64 @@ .add_modifier(Modifier::BOLD), ); - let command = Paragraph::new(selected_command.command.clone()) - .style(Style::default().fg(Color::Rgb( - config.command_color.unwrap().0, - config.command_color.unwrap().1, - config.command_color.unwrap().2, - ))) - .alignment(Alignment::Left) - .wrap(Wrap { trim: true }) - .block( - Block::default() - .borders(Borders::ALL) - .style(Style::default().fg(Color::Rgb( - config.primary_color.unwrap().0, - config.primary_color.unwrap().1, - config.primary_color.unwrap().2, - ))) - .title(" Hoarded command ") - .border_type(BorderType::Plain), - ); + let command = Paragraph::new(coerce_string_by_mode( + selected_command.command.clone(), + app, + &EditSelection::Command, + )) + .style(Style::default().fg(Color::Rgb( + config.primary_color.unwrap().0, + config.primary_color.unwrap().1, + config.primary_color.unwrap().2, + ))) + .alignment(Alignment::Left) + .wrap(Wrap { trim: true }) + .block( + Block::default() + .borders(Borders::ALL) + .style(Style::default().fg(get_color(app, config, &EditSelection::Command))) + .title(" Hoarded command ") + .border_type(BorderType::Plain), + ); - let tags = Paragraph::new(selected_command.tags_as_string()) - .style(Style::default().fg(Color::Rgb( - config.primary_color.unwrap().0, - config.primary_color.unwrap().1, - config.primary_color.unwrap().2, - ))) - .alignment(Alignment::Left) - .block( - Block::default() - .borders(Borders::ALL) - .style(Style::default().fg(Color::Rgb( - config.primary_color.unwrap().0, - config.primary_color.unwrap().1, - config.primary_color.unwrap().2, - ))) - .title(" Tags ") - .border_type(BorderType::Plain), - ); + let tags = Paragraph::new(coerce_string_by_mode( + selected_command.tags_as_string(), + app, + &EditSelection::Tags, + )) + .style(Style::default().fg(Color::Rgb( + config.primary_color.unwrap().0, + config.primary_color.unwrap().1, + config.primary_color.unwrap().2, + ))) + .alignment(Alignment::Left) + .block( + Block::default() + .borders(Borders::ALL) + .style(Style::default().fg(get_color(app, config, &EditSelection::Tags))) + .title(" Tags ") + .border_type(BorderType::Plain), + ); - let description = Paragraph::new(selected_command.description.unwrap_or_default()) - .style(Style::default().fg(Color::Rgb( - config.primary_color.unwrap().0, - config.primary_color.unwrap().1, - config.primary_color.unwrap().2, - ))) - .alignment(Alignment::Left) - .wrap(Wrap { trim: true }) - .block( - Block::default() - .borders(Borders::ALL) - .style(Style::default().fg(Color::Rgb( - config.primary_color.unwrap().0, - config.primary_color.unwrap().1, - config.primary_color.unwrap().2, - ))) - .title(" Description ") - .border_type(BorderType::Plain), - ); + let description = Paragraph::new(coerce_string_by_mode( + selected_command.description.unwrap_or_default(), + app, + &EditSelection::Description, + )) + .style(Style::default().fg(Color::Rgb( + config.primary_color.unwrap().0, + config.primary_color.unwrap().1, + config.primary_color.unwrap().2, + ))) + .alignment(Alignment::Left) + .wrap(Wrap { trim: true }) + .block( + Block::default() + .borders(Borders::ALL) + .style(Style::default().fg(get_color(app, config, &EditSelection::Description))) + .title(" Description ") + .border_type(BorderType::Plain), + ); let mut query_string = config.query_prefix.clone(); query_string.push_str(&app.input.clone()[..]); @@ -256,3 +315,10 @@ (list, command, tags, description, input) } + +const fn get_footer_constraints(control_state: &ControlState) -> (u16, u16) { + match control_state { + ControlState::Search => (50, 50), + ControlState::Edit => (99, 1), + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/mod.rs new/hoard-1.3.0~0/src/gui/mod.rs --- old/hoard-1.2.0~0/src/gui/mod.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/mod.rs 2022-12-21 14:06:28.000000000 +0100 @@ -3,8 +3,10 @@ pub mod event; #[allow(clippy::module_name_repetitions)] mod help; +mod inline_edit; mod list_search; pub mod merge; +mod new_command; mod parameter_input; pub mod prompts; pub mod theme; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/new_command/controls.rs new/hoard-1.3.0~0/src/gui/new_command/controls.rs --- old/hoard-1.2.0~0/src/gui/new_command/controls.rs 1970-01-01 01:00:00.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/new_command/controls.rs 2022-12-21 14:06:28.000000000 +0100 @@ -0,0 +1,87 @@ +use crate::command::hoard_command::{string_to_tags, HoardCommand}; +use crate::command::trove::CommandTrove; +use crate::gui::commands_gui::{DrawState, EditSelection, State}; +use termion::event::Key; + +pub fn key_handler(input: Key, app: &mut State, default_namespace: &str) -> Option<HoardCommand> { + // Make sure there is an empty command set + if app.new_command.is_none() { + app.new_command = Some(HoardCommand::default()); + } + match input { + Key::Esc => { + app.draw_state = DrawState::Search; + app.new_command = None; + app.edit_selection = EditSelection::Command; + None + } + // Quit command + Key::Ctrl('c' | 'd' | 'g') => { + app.should_exit = true; + app.new_command = None; + app.edit_selection = EditSelection::Command; + None + } + Key::Char('\n') => { + let mut command = app.new_command.clone().unwrap(); + let parameter = app.input.clone(); + app.error_message = match app.edit_selection { + EditSelection::Command => { + let (_, msg) = HoardCommand::is_command_valid(&parameter); + command.command = parameter; + msg + } + EditSelection::Name => { + let (_, mut msg) = HoardCommand::is_name_valid(&parameter); + command.name = parameter; + let trove = CommandTrove::from_commands(&app.commands); + if trove.check_name_collision(&command).is_some() { + msg = String::from( + "Command with that name already exists in another namespace", + ); + } + msg + } + EditSelection::Namespace => { + if parameter.is_empty() { + command.namespace = default_namespace.into(); + } else { + command.namespace = parameter; + } + String::new() + } + EditSelection::Description => { + command.description = Some(parameter); + String::new() + } + EditSelection::Tags => { + let (is_valid, msg) = HoardCommand::are_tags_valid(&parameter); + if is_valid { + command.tags = Some(string_to_tags(&parameter)); + } + msg + } + }; + app.input = String::new(); + if !app.error_message.is_empty() { + return None; + } + app.edit_selection = app.edit_selection.edit_next(); + if app.edit_selection == EditSelection::Command { + return Some(command); + } + app.new_command = Some(command); + None + } + // Handle query input + Key::Backspace => { + app.input.pop(); + None + } + Key::Char(c) => { + app.input.push(c); + None + } + _ => None, + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/new_command/mod.rs new/hoard-1.3.0~0/src/gui/new_command/mod.rs --- old/hoard-1.2.0~0/src/gui/new_command/mod.rs 1970-01-01 01:00:00.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/new_command/mod.rs 2022-12-21 14:06:28.000000000 +0100 @@ -0,0 +1,2 @@ +pub mod controls; +pub mod render; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/gui/new_command/render.rs new/hoard-1.3.0~0/src/gui/new_command/render.rs --- old/hoard-1.2.0~0/src/gui/new_command/render.rs 1970-01-01 01:00:00.000000000 +0100 +++ new/hoard-1.3.0~0/src/gui/new_command/render.rs 2022-12-21 14:06:28.000000000 +0100 @@ -0,0 +1,80 @@ +use crate::config::HoardConfig; +use crate::gui::commands_gui::State; +use termion::screen::AlternateScreen; +use tui::backend::TermionBackend; +use tui::layout::{Constraint, Direction, Layout}; +use tui::style::{Color, Style}; +use tui::widgets::{Block, Paragraph}; +use tui::Terminal; + +pub fn draw( + app_state: &mut State, + config: &HoardConfig, + terminal: &mut Terminal< + TermionBackend<AlternateScreen<termion::raw::RawTerminal<std::io::Stdout>>>, + >, + default_namespace: &str, +) -> Result<(), eyre::Error> { + terminal.draw(|rect| { + let size = rect.size(); + // Overlay + let overlay_chunks = Layout::default() + .direction(Direction::Vertical) + .margin(1) + .constraints( + [ + Constraint::Percentage(30), + Constraint::Percentage(30), + Constraint::Percentage(10), + Constraint::Percentage(20), + Constraint::Percentage(10), + ] + .as_ref(), + ) + .split(size); + + let mut query_string = config.query_prefix.clone(); + query_string.push_str(&app_state.input.clone()[..]); + let title_string = format!("Provide {} for the command", app_state.edit_selection); + + let command_style = Style::default().fg(Color::Rgb( + config.command_color.unwrap().0, + config.command_color.unwrap().1, + config.command_color.unwrap().2, + )); + + let primary_style = Style::default().fg(Color::Rgb( + config.primary_color.unwrap().0, + config.primary_color.unwrap().1, + config.primary_color.unwrap().2, + )); + + let input = Paragraph::new(query_string) + .style(primary_style) + .block(Block::default().style(command_style).title(title_string)); + let new_command = app_state.new_command.clone().unwrap(); + let command_render = format!( + "Command: {}\nNamespace: {}(\"{}\" if empty)\nName: {}\nDescription: {}\nTags: {}", + new_command.command, + new_command.namespace, + default_namespace, + new_command.name, + new_command.clone().description.unwrap_or_default(), + new_command.tags_as_string() + ); + let new_command = Paragraph::new(command_render) + .style(primary_style) + .block(Block::default().style(command_style).title("New command:")); + + let error_message = Paragraph::new(app_state.error_message.clone()) + .style(primary_style) + .block(Block::default().style(command_style).title("Error:")); + + rect.render_widget(new_command, overlay_chunks[1]); + rect.render_widget(input, overlay_chunks[2]); + if !app_state.error_message.is_empty() { + rect.render_widget(error_message, overlay_chunks[3]); + } + })?; + Ok(()) +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/hoard.rs new/hoard-1.3.0~0/src/hoard.rs --- old/hoard-1.2.0~0/src/hoard.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/hoard.rs 2022-12-21 14:06:28.000000000 +0100 @@ -176,6 +176,7 @@ } else { match commands_gui::run(&mut self.trove, self.config.as_ref().unwrap()) { Ok(selected_command) => { + self.save_trove(None); if let Some(c) = selected_command { // Is set if a command is selected in GUI if !c.command.is_empty() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hoard-1.2.0~0/src/util.rs new/hoard-1.3.0~0/src/util.rs --- old/hoard-1.2.0~0/src/util.rs 2022-11-28 18:38:14.000000000 +0100 +++ new/hoard-1.3.0~0/src/util.rs 2022-12-21 14:06:28.000000000 +0100 @@ -32,37 +32,30 @@ } pub fn split_with_delim(s: &str, delim: &str) -> Vec<String> { - let mut result: Vec<String> = Vec::new(); - let s: String = s.to_string(); - - let matched_indices: Vec<(usize, usize)> = s - .match_indices(delim) - .map(|(i, _)| (i, i + delim.len() - 1)) - .collect(); - let mut split_indices: Vec<(usize, usize)> = Vec::new(); - - // string starts with delimiter - if matched_indices.first().unwrap().0 != 0 { - split_indices.push((0, matched_indices.first().unwrap().0 - 1)); + //Credits to chatGPT for simplifying this wtf + let mut result = Vec::new(); + let mut start = 0; + + for (i, _) in s.match_indices(delim) { + if i > start { + result.push(s[start..i].to_string()); + } + result.push(delim.to_string()); + start = i + delim.len(); } - for (i, indices) in matched_indices.iter().enumerate() { - split_indices.push((indices.0, indices.1)); - if let Some(peeked_index) = matched_indices.get(i + 1) { - split_indices.push((indices.1 + 1, peeked_index.0 - 1)); - } + if start < s.len() { + result.push(s[start..].to_string()); } - // Delimiter is at the end - if matched_indices.last().unwrap().1 != s.len() - 1 { - split_indices.push((matched_indices.last().unwrap().1 + 1, s.len() - 1)); + while result.first().map_or(false, std::string::String::is_empty) { + result.remove(0); } - // What the hell was I thinking - for (i, k) in &split_indices { - let slice = &s[(*i)..=(*k)]; - result.push(slice.to_string()); + while result.last().map_or(false, std::string::String::is_empty) { + result.pop(); } + result } ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/hoard/vendor.tar.xz /work/SRC/openSUSE:Factory/.hoard.new.1835/vendor.tar.xz differ: char 26, line 1

1 0

commit guile-cairo for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package guile-cairo for openSUSE:Factory checked in at 2022-12-22 16:22:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guile-cairo (Old) and /work/SRC/openSUSE:Factory/.guile-cairo.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "guile-cairo" Thu Dec 22 16:22:44 2022 rev:6 rq:1044102 version:1.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/guile-cairo/guile-cairo.changes 2020-11-26 23:15:52.829060259 +0100 +++ /work/SRC/openSUSE:Factory/.guile-cairo.new.1835/guile-cairo.changes 2022-12-22 16:22:45.989923251 +0100 @@ -1,0 +2,6 @@ +Wed Dec 21 16:22:00 UTC 2022 - Dirk M��ller <dmueller(a)suse.com> + +- update to 1.11.2: + * Include build-aux/git-version-gen in distcheck. + +------------------------------------------------------------------- Old: ---- guile-cairo-1.11.1.tar.gz guile-cairo-1.11.1.tar.gz.sig New: ---- guile-cairo-1.11.2.tar.gz guile-cairo-1.11.2.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile-cairo.spec ++++++ --- /var/tmp/diff_new_pack.BF4HHc/_old 2022-12-22 16:22:46.813927990 +0100 +++ /var/tmp/diff_new_pack.BF4HHc/_new 2022-12-22 16:22:46.829928082 +0100 @@ -1,7 +1,7 @@ # # spec file for package guile-cairo # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define sover 0 Name: guile-cairo -Version: 1.11.1 +Version: 1.11.2 Release: 0 Summary: Guile bindings to Cairo License: LGPL-3.0-or-later @@ -29,7 +29,7 @@ BuildRequires: cairo-devel >= 1.10.0 BuildRequires: guile-devel Requires(post): %{install_info_prereq} -Requires(preun): %{install_info_prereq} +Requires(preun):%{install_info_prereq} Requires: lib%{name}%{sover} %description ++++++ guile-cairo-1.11.1.tar.gz -> guile-cairo-1.11.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/ChangeLog new/guile-cairo-1.11.2/ChangeLog --- old/guile-cairo-1.11.1/ChangeLog 2020-05-20 23:46:53.000000000 +0200 +++ new/guile-cairo-1.11.2/ChangeLog 2020-11-19 21:10:51.000000000 +0100 @@ -1,3 +1,11 @@ +2020-11-19 Daniel Llorens <daniel.llorens(a)bluewin.ch> + + Include build-aux/git-version-gen in distribution + Requested by tohoyn for Debian so that autogen.sh works from the .tar.gz. + + * Makefile.am: As stated. + * Bump version to 1.11.2. + 2020-05-20 Daniel Llorens <daniel.llorens(a)bluewin.ch> Prepare release 1.11.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/Makefile.am new/guile-cairo-1.11.2/Makefile.am --- old/guile-cairo-1.11.1/Makefile.am 2018-10-01 11:49:04.000000000 +0200 +++ new/guile-cairo-1.11.2/Makefile.am 2020-11-19 14:21:34.000000000 +0100 @@ -47,4 +47,4 @@ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi -EXTRA_DIST = env.in autogen.sh HACKING COPYING.LESSER $(scm_DATA) +EXTRA_DIST = env.in autogen.sh build-aux/git-version-gen HACKING COPYING.LESSER $(scm_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/Makefile.in new/guile-cairo-1.11.2/Makefile.in --- old/guile-cairo-1.11.1/Makefile.in 2020-05-20 23:40:58.000000000 +0200 +++ new/guile-cairo-1.11.2/Makefile.in 2020-11-19 21:08:07.000000000 +0100 @@ -218,8 +218,8 @@ $(top_srcdir)/build-aux/missing AUTHORS COPYING COPYING.LESSER \ ChangeLog INSTALL NEWS README TODO build-aux/compile \ build-aux/config.guess build-aux/config.rpath \ - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ - build-aux/ltmain.sh build-aux/missing build-aux/texinfo.tex + build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \ + build-aux/missing build-aux/texinfo.tex DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -402,7 +402,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = guile-cairo.pc gen_start_rev = 16429179fee5c3de5f74766232f4068ce75c4fc6 -EXTRA_DIST = env.in autogen.sh HACKING COPYING.LESSER $(scm_DATA) +EXTRA_DIST = env.in autogen.sh build-aux/git-version-gen HACKING COPYING.LESSER $(scm_DATA) all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/NEWS new/guile-cairo-1.11.2/NEWS --- old/guile-cairo-1.11.1/NEWS 2020-05-20 23:37:41.000000000 +0200 +++ new/guile-cairo-1.11.2/NEWS 2020-11-19 21:05:37.000000000 +0100 @@ -4,6 +4,12 @@ Guile-Cairo wraps the Cairo graphics library for Guile Scheme. +guile-cairo 1.11.2 -- 2020-10-19 +================================ + +* Include build-aux/git-version-gen in distcheck. + + guile-cairo 1.11.1 -- 2020-05-20 ================================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/build-aux/git-version-gen new/guile-cairo-1.11.2/build-aux/git-version-gen --- old/guile-cairo-1.11.1/build-aux/git-version-gen 1970-01-01 01:00:00.000000000 +0100 +++ new/guile-cairo-1.11.2/build-aux/git-version-gen 2018-10-01 11:49:04.000000000 +0200 @@ -0,0 +1,232 @@ +#!/bin/sh +# Print a version string. +scriptversion=2017-01-09.19; # UTC + +# Copyright (C) 2007-2017 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>. + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# As with any generated file in a VC'd directory, you should add +# /.version to .gitignore, so that you don't accidentally commit it. +# .tarball-version is never generated in a VC'd directory, so needn't +# be listed there. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project@example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .version and +# .tarball-version will exist in distribution tarballs. +# +# EXTRA_DIST = $(top_srcdir)/.version +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + + +me=$0 + +version="git-version-gen $scriptversion + +Copyright 2011 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING." + +usage="\ +Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] +Print a version string. + +Options: + + --prefix PREFIX prefix of git tags (default 'v') + --match pattern for git tags to match (default: '\$prefix*') + --fallback VERSION + fallback version to use if \"git --version\" fails + + --help display this help and exit + --version output version information and exit + +Running without arguments will suffice in most cases." + +prefix=v +fallback= + +unset match +unset tag_sed_script + +while test $# -gt 0; do + case $1 in + --help) echo "$usage"; exit 0;; + --version) echo "$version"; exit 0;; + --prefix) shift; prefix=${1?};; + --match) shift; match="$1";; + --fallback) shift; fallback=${1?};; + -*) + echo "$0: Unknown option '$1'." >&2 + echo "$0: Try '--help' for more information." >&2 + exit 1;; + *) + if test "x$tarball_version_file" = x; then + tarball_version_file="$1" + elif test "x$tag_sed_script" = x; then + tag_sed_script="$1" + else + echo "$0: extra non-option argument '$1'." >&2 + exit 1 + fi;; + esac + shift +done + +if test "x$tarball_version_file" = x; then + echo "$usage" + exit 1 +fi + +match="${match:-$prefix*}" +tag_sed_script="${tag_sed_script:-s/x/x/}" + +nl=' +' + +# Avoid meddling by environment variable of the same name. +v= +v_from_git= + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || v= + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test "x$v" = x \ + && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 +fi + +if test "x$v" != x +then + : # use $v +# Otherwise, if there is at least one git commit involving the working +# directory, and "git describe" output looks sensible, use that to +# derive a version string. +elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ + && v=`git describe --abbrev=4 --match="$match" HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ + && case $v in + $prefix[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \ + || { commit_list=failed; + echo "$0: WARNING: git rev-list failed" 1>&2; } + numcommits=`echo "$commit_list" | wc -l` + v=`echo "$v" | sed "s/$.*$-$.*$/\1-$numcommits-\2/"`; + test "$commit_list" = failed && v=UNKNOWN + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/$.*$-g/\1-/'`; + v_from_git=1 +elif test "x$fallback" = x || git --version >/dev/null 2>&1; then + v=UNKNOWN +else + v=$fallback +fi + +v=`echo "$v" |sed "s/^$prefix//"` + +# Test whether to append the "-dirty" suffix only if the version +# string we're using came from git. I.e., skip the test if it's "UNKNOWN" +# or if it came from .tarball-version. +if test "x$v_from_git" != x; then + # Don't declare a version "dirty" merely because a timestamp has changed. + git update-index --refresh > /dev/null 2>&1 + + dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty= + case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; + esac +fi + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +printf %s "$v" + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/configure new/guile-cairo-1.11.2/configure --- old/guile-cairo-1.11.1/configure 2020-05-20 23:40:58.000000000 +0200 +++ new/guile-cairo-1.11.2/configure 2020-11-19 21:08:06.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for guile-cairo 1.11.0.2-9d63-dirty. +# Generated by GNU Autoconf 2.69 for guile-cairo 1.11.1-dirty. # # Report bugs to <guile-user(a)gnu.org>. # @@ -613,8 +613,8 @@ # Identity of this package. PACKAGE_NAME='guile-cairo' PACKAGE_TARNAME='guile-cairo' -PACKAGE_VERSION='1.11.0.2-9d63-dirty' -PACKAGE_STRING='guile-cairo 1.11.0.2-9d63-dirty' +PACKAGE_VERSION='1.11.1-dirty' +PACKAGE_STRING='guile-cairo 1.11.1-dirty' PACKAGE_BUGREPORT='guile-user(a)gnu.org' PACKAGE_URL='' @@ -1374,7 +1374,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures guile-cairo 1.11.0.2-9d63-dirty to adapt to many kinds of systems. +\`configure' configures guile-cairo 1.11.1-dirty to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1445,7 +1445,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of guile-cairo 1.11.0.2-9d63-dirty:";; + short | recursive ) echo "Configuration of guile-cairo 1.11.1-dirty:";; esac cat <<\_ACEOF @@ -1574,7 +1574,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -guile-cairo configure 1.11.0.2-9d63-dirty +guile-cairo configure 1.11.1-dirty generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1875,7 +1875,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by guile-cairo $as_me 1.11.0.2-9d63-dirty, which was +It was created by guile-cairo $as_me 1.11.1-dirty, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2744,7 +2744,7 @@ # Define the identity of the package. PACKAGE='guile-cairo' - VERSION='1.11.0.2-9d63-dirty' + VERSION='1.11.1-dirty' cat >>confdefs.h <<_ACEOF @@ -2900,7 +2900,7 @@ AM_BACKSLASH='\' -VERSION=1.11.1 +VERSION=1.11.2 DEPDIR="${am__leading_dot}deps" @@ -14090,7 +14090,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by guile-cairo $as_me 1.11.0.2-9d63-dirty, which was +This file was extended by guile-cairo $as_me 1.11.1-dirty, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14156,7 +14156,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -guile-cairo config.status 1.11.0.2-9d63-dirty +guile-cairo config.status 1.11.1-dirty configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/configure.ac new/guile-cairo-1.11.2/configure.ac --- old/guile-cairo-1.11.1/configure.ac 2020-05-20 23:38:40.000000000 +0200 +++ new/guile-cairo-1.11.2/configure.ac 2020-11-19 21:06:14.000000000 +0100 @@ -24,7 +24,7 @@ AC_PREREQ(2.52) AC_INIT([guile-cairo], - m4_esyscmd([build-aux/git-version-gen --match v1.11.1\* .tarball-version]), + m4_esyscmd([build-aux/git-version-gen --match v1.11.2\* .tarball-version]), [guile-user(a)gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -37,7 +37,7 @@ AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) -AC_SUBST(VERSION, 1.11.1) +AC_SUBST(VERSION, 1.11.2) AC_ISC_POSIX AC_PROG_CC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/doc/guile-cairo.info new/guile-cairo-1.11.2/doc/guile-cairo.info --- old/guile-cairo-1.11.1/doc/guile-cairo.info 2020-05-20 23:41:32.000000000 +0200 +++ new/guile-cairo-1.11.2/doc/guile-cairo.info 2020-11-19 21:08:27.000000000 +0100 @@ -1,7 +1,8 @@ This is guile-cairo.info, produced by makeinfo version 6.3 from guile-cairo.texi. -This manual is for Guile-Cairo (version 1.11.1, updated 20 May 2020) +This manual is for Guile-Cairo (version 1.11.2, updated 19 November +2020) Copyright 2002-2020 Carl Worth and others @@ -21,7 +22,8 @@ Guile-Cairo *********** -This manual is for Guile-Cairo (version 1.11.1, updated 20 May 2020) +This manual is for Guile-Cairo (version 1.11.2, updated 19 November +2020) Copyright 2002-2020 Carl Worth and others @@ -5254,33 +5256,33 @@ Tag Table: -Node: Top583 -Node: cairo_t2777 -Node: Paths37270 -Node: Patterns55499 -Node: Transformations73003 -Node: Regions78108 -Node: Text83157 -Node: Font Faces99917 -Node: Scaled Fonts100866 -Node: Font Options113627 -Node: FreeType Fonts118307 -Node: Win32 Fonts118645 -Node: Quartz Fonts118963 -Node: User Fonts119346 -Node: cairo_device_t121150 -Node: cairo_surface_t126364 -Node: Image Surfaces140784 -Node: PDF Surfaces144438 -Node: PNG Support147058 -Node: PostScript Surfaces148918 -Node: Recording Surfaces157576 -Node: SVG Surfaces161046 -Node: cairo_matrix_t163394 -Node: Error handling167064 -Node: Version Information167920 -Node: Types172203 -Node: Concept Index172456 -Node: Function Index172580 +Node: Top588 +Node: cairo_t2787 +Node: Paths37280 +Node: Patterns55509 +Node: Transformations73013 +Node: Regions78118 +Node: Text83167 +Node: Font Faces99927 +Node: Scaled Fonts100876 +Node: Font Options113637 +Node: FreeType Fonts118317 +Node: Win32 Fonts118655 +Node: Quartz Fonts118973 +Node: User Fonts119356 +Node: cairo_device_t121160 +Node: cairo_surface_t126374 +Node: Image Surfaces140794 +Node: PDF Surfaces144448 +Node: PNG Support147068 +Node: PostScript Surfaces148928 +Node: Recording Surfaces157586 +Node: SVG Surfaces161056 +Node: cairo_matrix_t163404 +Node: Error handling167074 +Node: Version Information167930 +Node: Types172213 +Node: Concept Index172466 +Node: Function Index172590 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guile-cairo-1.11.1/doc/guile-cairo.texi new/guile-cairo-1.11.2/doc/guile-cairo.texi --- old/guile-cairo-1.11.1/doc/guile-cairo.texi 2020-05-20 23:39:04.000000000 +0200 +++ new/guile-cairo-1.11.2/doc/guile-cairo.texi 2020-11-19 21:06:43.000000000 +0100 @@ -4,8 +4,8 @@ @settitle Guile-Cairo @c %**end of header -@set VERSION 1.11.1 -@set UPDATED 20 May 2020 +@set VERSION 1.11.2 +@set UPDATED 19 November 2020 @copying This manual is for Guile-Cairo (version @value{VERSION}, updated

1 0

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

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package VirtualGL for openSUSE:Factory checked in at 2022-12-22 16:22:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/VirtualGL (Old) and /work/SRC/openSUSE:Factory/.VirtualGL.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "VirtualGL" Thu Dec 22 16:22:43 2022 rev:15 rq:1044106 version:3.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/VirtualGL/VirtualGL.changes 2020-12-24 19:39:04.963058855 +0100 +++ /work/SRC/openSUSE:Factory/.VirtualGL.new.1835/VirtualGL.changes 2022-12-22 16:22:44.389914049 +0100 @@ -1,0 +2,41 @@ +Wed Dec 21 16:50:58 UTC 2022 - Dirk M��ller <dmueller(a)suse.com> + +- update to 3.0.2: + 1. Support for transparent overlay visuals has been retired in this version of + VirtualGL. That feature will continue to be maintained in the 2.6.x branch on + a break/fix basis only. Most applications that once used transparent overlay + visuals used them with color index rendering, which was removed in OpenGL 3.1 + in 2009. Thus, almost all applications that render overlays now do so using + other mechanisms. Furthermore, the need for VirtualGL to hand off the + rendering of transparent overlay visuals to the 2D X server has always limited + the usefulness of the feature, and the discontinuation of the VirtualGL Client + for Exceed relegated the feature to Un*x clients (with workstation-class GPUs) + and the VGL Transport only. Given that nVidia's implementation of transparent + overlay visuals requires disabling the X Composite extension, which cannot be + done in many modern Linux distributions, that further limited the feature to + the point of uselessness. + 2. The VirtualGL Faker now assigns various permutations of common OpenGL + rendering attributes to the available 2D X server visuals. This maximizes the + chances that "visual hunting" 3D applications (applications that use X11 + functions to obtain a list of 2D X server visuals, then iterate through the + list with `glXGetConfig()` until they find a visual with a desired set of + OpenGL rendering attributes) will find a suitable visual. + `VGL_DEFAULTFBCONFIG` can still be used to assign a specified set of OpenGL + rendering attributes to all 2D X server visuals, although the usefulness of + that feature is now very limited. + 3. The VirtualGL Faker now includes an EGL back end that optionally emulates + the GLX API using a combination of the EGL API (with the + `EGL_EXT_platform_device` extension) and OpenGL renderbuffer objects (RBOs.) + On supported platforms, the EGL back end allows the VirtualGL Faker to be used + without a 3D X server. The EGL back end can be activated by setting the + `VGL_DISPLAY` environment variable to the path of a DRI device, such as + **/dev/dri/card0**, or by passing that device path to `vglrun` using the `-d` + argument. Some obsolete OpenGL and GLX features are not supported by the EGL + +------------------------------------------------------------------- +Sun Dec 11 11:08:12 UTC 2022 - Anonymous Checkouts <anoncvs(a)mailinator.com> + +- update to 3.0.2 + * Now supports use of EGL as well as GLX + +------------------------------------------------------------------- Old: ---- VirtualGL-2.6.5.tar.gz New: ---- VirtualGL-3.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ VirtualGL.spec ++++++ --- /var/tmp/diff_new_pack.rol3sK/_old 2022-12-22 16:22:45.069917960 +0100 +++ /var/tmp/diff_new_pack.rol3sK/_new 2022-12-22 16:22:45.073917983 +0100 @@ -1,7 +1,7 @@ # # spec file for package VirtualGL # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: VirtualGL -Version: 2.6.5 +Version: 3.0.2 Release: 0 Summary: A toolkit for displaying OpenGL applications to thin clients License: LGPL-2.1-only AND SUSE-wxWidgets-3.1 @@ -36,6 +36,7 @@ BuildRequires: opencl-headers BuildRequires: pkgconfig BuildRequires: pkgconfig(OpenCL) +BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(glu) @@ -130,6 +131,7 @@ chmod 644 doc/LGPL.txt doc/LICENSE.txt doc/index.html doc/*.png doc/*.gif doc/*.css rm -rf %{buildroot}%{_datadir}/doc mv -f %{buildroot}%{_bindir}/glxinfo %{buildroot}%{_bindir}/vglxinfo +mv -f %{buildroot}%{_bindir}/eglinfo %{buildroot}%{_bindir}/veglinfo # bsc#1097210 rely on env settings rm -rf %{buildroot}/%{_bindir}/.vglrun.* @@ -142,6 +144,7 @@ %{_bindir}/tcbench %{_bindir}/nettest %{_bindir}/cpustat +%{_bindir}/veglinfo %{_bindir}/vglxinfo %{_bindir}/glxspheres %{_bindir}/vglclient ++++++ VirtualGL-2.6.5.tar.gz -> VirtualGL-3.0.2.tar.gz ++++++ ++++ 41599 lines of diff (skipped)

1 0

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

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libheimdal for openSUSE:Factory checked in at 2022-12-22 16:22:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libheimdal (Old) and /work/SRC/openSUSE:Factory/.libheimdal.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libheimdal" Thu Dec 22 16:22:41 2022 rev:11 rq:1044099 version:7.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libheimdal/libheimdal.changes 2022-07-03 18:26:35.396708542 +0200 +++ /work/SRC/openSUSE:Factory/.libheimdal.new.1835/libheimdal.changes 2022-12-22 16:22:43.109906686 +0100 @@ -1,0 +2,76 @@ +Wed Dec 21 09:53:45 UTC 2022 - enzokiel(a)kabelmail.de + +- Update to version 7.8.0 + + This release includes both the Heimdal 7.7.1 Security + Vulnerability fixes and non-Security bug fixes/improvements. + + Security Vulnerabilities: + - CVE-2022-42898 PAC parse integer overflows + - CVE-2022-3437 Overflows and non-constant time leaks in + DES{,3} and arcfour + - CVE-2022-41916 Fix Unicode normalization read of 1 bytes past + end of array + - CVE-2021-44758 A null pointer de-reference DoS in SPNEGO + acceptors + - CVE-2021-3671 A null pointer de-reference when handling + missing sname in TGS-REQ + - CVE-2022-44640 Heimdal KDC: invalid free in ASN.1 codec + Note that CVE-2022-44640 is a severe vulnerability, + possibly a 10.0 on the Common Vulnerability Scoring + System (CVSS) v3, as we believe it should be possible to + get an RCE on a KDC, which means that credentials can be + compromised that can be used to impersonate anyone in a + realm or forest of realms. + Heimdal's ASN.1 compiler generates code that allows + specially crafted DER encodings of CHOICEs to invoke the + wrong free function on the decoded structure upon decode + error. This is known to impact the Heimdal KDC, leading to + an invalid free() of an address partly or wholly under the + control of the attacker, in turn leading to a potential + remote code execution (RCE) vulnerability. + This error affects the DER codec for all extensible CHOICE + types used in Heimdal, though not all cases will be + exploitable. We have not completed a thorough analysis of + all the Heimdal components affected, thus the Kerberos + client, the X.509 library, and other parts, may be affected + as well. + This bug has been in Heimdal's ASN.1 compiler since 2005, + but it may only affect Heimdal 1.6 and up. It was first + reported by Douglas Bagnall, though it had been found + independently by the Heimdal maintainers via fuzzing a few + weeks earlier. + While no zero-day exploit is known, such an exploit will + likely be available soon after public disclosure. + - CVE-2019-14870: Validate client attributes in + protocol-transition + - CVE-2019-14870: Apply forwardable policy in + protocol-transition + - CVE-2019-14870: Always lookup impersonate client in DB + + Other changes: + - Bugs found by UBSAN (including the incorrect encoding of + unconstrained INTEGER value -1). + - Errors found by the LLVM scan-build static analyzer. + - Errors found by the valgrind memory debugger. + - Work around GCC Bug 95189 (memcmp wrongly stripped like + strcmp). + - Correct ASN.1 OID typo for SHA-384 + - Fix a deadlock in in the MEMORY ccache type. + - TGS: strip forwardable and proxiable flags if the server is + disallowed. + - CVE-2019-14870: Validate client attributes in + protocol-transition + - CVE-2019-14870: Apply forwardable policy in + protocol-transition + - CVE-2019-14870: Always lookup impersonate client in DB + - Incremental HDB propagation improvements + Refactor send_diffs making it progressive + Handle partial writes on non-blocking sockets + Disable Nagle in iprop master and slave + Use async I/O + Don't send I_HAVE in response to AYT + Do not recover log in kadm5_get_principal() + Don't send diffs to slaves with not yet known version + Don't stutter in send_diffs + - Optional backwards-compatible anon-pkinit behavior +- Removed heimdal-7.7.0-autoconf-2.70.patch, fixed upstream. + +------------------------------------------------------------------- Old: ---- heimdal-7.7.0-autoconf-2.70.patch heimdal-7.7.0-patched.tar.bz2 New: ---- heimdal-7.8.0-patched.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libheimdal.spec ++++++ --- /var/tmp/diff_new_pack.53kAhw/_old 2022-12-22 16:22:43.769910482 +0100 +++ /var/tmp/diff_new_pack.53kAhw/_new 2022-12-22 16:22:43.777910529 +0100 @@ -17,7 +17,7 @@ Name: libheimdal -Version: 7.7.0 +Version: 7.8.0 Release: 0 Summary: The Heimdal implementation of the Kerberos 5 protocol License: BSD-3-Clause @@ -30,8 +30,6 @@ Patch0: heimdal-patched.diff # PATCH-FIX-UPSTREAM bmwiedemann -- make build reproducible (boo#1047218) Patch1: reproducible.patch -# PATCH-FIX-UPSTREAM heimdal-7.7.0-autoconf-2.70.patch -- fix build with autoconf 2.70 (gh#heimdal/heimdal#856) -Patch2: heimdal-7.7.0-autoconf-2.70.patch BuildRequires: automake >= 1.11 BuildRequires: bison BuildRequires: db-devel >= 4.8 ++++++ heimdal-7.7.0-patched.tar.bz2 -> heimdal-7.8.0-patched.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libheimdal/heimdal-7.7.0-patched.tar.bz2 /work/SRC/openSUSE:Factory/.libheimdal.new.1835/heimdal-7.8.0-patched.tar.bz2 differ: char 11, line 1 ++++++ heimdal-patched.diff ++++++ --- /var/tmp/diff_new_pack.53kAhw/_old 2022-12-22 16:22:43.841910897 +0100 +++ /var/tmp/diff_new_pack.53kAhw/_new 2022-12-22 16:22:43.845910920 +0100 @@ -1,15 +1,15 @@ -diff -uNr heimdal-7.7.0/configure.ac heimdal-7.7.0-patched/configure.ac ---- heimdal-7.7.0/configure.ac 2019-06-07 08:21:39.000000000 +0200 -+++ heimdal-7.7.0-patched/configure.ac 2019-06-23 01:05:58.354087165 +0200 +diff -uNr heimdal-7.8.0/configure.ac heimdal-7.8.0-patched/configure.ac +--- heimdal-7.8.0/configure.ac 2022-11-15 19:56:25.000000000 +0100 ++++ heimdal-7.8.0-patched/configure.ac 2022-12-20 16:57:00.506113493 +0100 @@ -3,7 +3,6 @@ AC_PREREQ(2.62) test -z "$CFLAGS" && CFLAGS="-g" - AC_INIT([Heimdal],[7.7.0],[https://github.com/heimdal/heimdal/issues]) + AC_INIT([Heimdal],[7.8.0],[https://github.com/heimdal/heimdal/issues]) -AC_CONFIG_SRCDIR([kuser/kinit.c]) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_MACRO_DIR([cf]) -@@ -591,7 +590,6 @@ +@@ -594,7 +593,6 @@ AM_CONDITIONAL(HEIMDAL_DOCUMENTATION, test "$enable_heimdal_documentation" != no) AC_CONFIG_FILES(Makefile \ @@ -17,7 +17,7 @@ include/Makefile \ include/gssapi/Makefile \ include/hcrypto/Makefile \ -@@ -616,35 +614,8 @@ +@@ -619,35 +617,8 @@ lib/sqlite/Makefile \ lib/vers/Makefile \ lib/wind/Makefile \ @@ -53,9 +53,9 @@ ) AC_OUTPUT -diff -uNr heimdal-7.7.0/doc/Makefile.am heimdal-7.7.0-patched/doc/Makefile.am ---- heimdal-7.7.0/doc/Makefile.am 2017-03-17 19:19:59.000000000 +0100 -+++ heimdal-7.7.0-patched/doc/Makefile.am 2019-06-23 01:11:42.915659771 +0200 +diff -uNr heimdal-7.8.0/doc/Makefile.am heimdal-7.8.0-patched/doc/Makefile.am +--- heimdal-7.8.0/doc/Makefile.am 2022-09-16 00:59:25.000000000 +0200 ++++ heimdal-7.8.0-patched/doc/Makefile.am 2022-12-20 17:02:32.781246824 +0100 @@ -10,50 +10,6 @@ info_TEXINFOS = heimdal.texi hx509.texi @@ -199,9 +199,9 @@ - ntlm.dxy* \ - wind.dxy* \ - vars.texi* -diff -uNr heimdal-7.7.0/kdc/Makefile.am heimdal-7.7.0-patched/kdc/Makefile.am ---- heimdal-7.7.0/kdc/Makefile.am 2016-12-20 15:23:06.000000000 +0100 -+++ heimdal-7.7.0-patched/kdc/Makefile.am 2019-06-23 01:20:05.650281843 +0200 +diff -uNr heimdal-7.8.0/kdc/Makefile.am heimdal-7.8.0-patched/kdc/Makefile.am +--- heimdal-7.8.0/kdc/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/kdc/Makefile.am 2022-12-20 17:07:05.344492344 +0100 @@ -6,35 +6,6 @@ lib_LTLIBRARIES = libkdc.la @@ -315,9 +315,9 @@ libkdc-exports.def \ - NTMakefile $(man_MANS) version-script.map + NTMakefile version-script.map -diff -uNr heimdal-7.7.0/lib/asn1/Makefile.am heimdal-7.7.0-patched/lib/asn1/Makefile.am ---- heimdal-7.7.0/lib/asn1/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/lib/asn1/Makefile.am 2019-06-23 01:21:42.864468490 +0200 +diff -uNr heimdal-7.8.0/lib/asn1/Makefile.am heimdal-7.8.0-patched/lib/asn1/Makefile.am +--- heimdal-7.8.0/lib/asn1/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/lib/asn1/Makefile.am 2022-12-20 17:08:36.808229786 +0100 @@ -44,9 +44,7 @@ gen_files_digest = asn1_digest_asn1.x gen_files_kx509 = asn1_kx509_asn1.x @@ -329,9 +329,9 @@ TESTS = check-der check-gen check-timegm check-ber check-template check_PROGRAMS = $(TESTS) -diff -uNr heimdal-7.7.0/lib/com_err/Makefile.am heimdal-7.7.0-patched/lib/com_err/Makefile.am ---- heimdal-7.7.0/lib/com_err/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/lib/com_err/Makefile.am 2019-06-23 01:23:17.626700892 +0200 +diff -uNr heimdal-7.8.0/lib/com_err/Makefile.am heimdal-7.8.0-patched/lib/com_err/Makefile.am +--- heimdal-7.8.0/lib/com_err/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/lib/com_err/Makefile.am 2022-12-20 17:14:40.343183718 +0100 @@ -13,12 +13,8 @@ libcom_err_la_LIBADD = $(LIB_libintl) @@ -353,9 +353,9 @@ libcom_err-version.rc \ libcom_err-exports.def \ version-script.map -diff -uNr heimdal-7.7.0/lib/gssapi/Makefile.am heimdal-7.7.0-patched/lib/gssapi/Makefile.am ---- heimdal-7.7.0/lib/gssapi/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/lib/gssapi/Makefile.am 2019-06-23 01:25:34.416149361 +0200 +diff -uNr heimdal-7.8.0/lib/gssapi/Makefile.am heimdal-7.8.0-patched/lib/gssapi/Makefile.am +--- heimdal-7.8.0/lib/gssapi/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/lib/gssapi/Makefile.am 2022-12-20 17:16:41.706826603 +0100 @@ -227,8 +227,6 @@ $(LIB_hcrypto) \ $(LIBADD_roken) @@ -383,9 +383,9 @@ gen-oid.pl \ gssapi/gssapi_netlogon.h \ krb5/test_acquire_cred.c \ -diff -uNr heimdal-7.7.0/lib/hx509/Makefile.am heimdal-7.7.0-patched/lib/hx509/Makefile.am ---- heimdal-7.7.0/lib/hx509/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/lib/hx509/Makefile.am 2019-06-23 01:28:59.528323408 +0200 +diff -uNr heimdal-7.8.0/lib/hx509/Makefile.am heimdal-7.8.0-patched/lib/hx509/Makefile.am +--- heimdal-7.8.0/lib/hx509/Makefile.am 2022-11-15 18:24:40.000000000 +0100 ++++ heimdal-7.8.0-patched/lib/hx509/Makefile.am 2022-12-20 17:19:57.330257091 +0100 @@ -141,7 +141,6 @@ $(heim_verbose)$(ASN1_COMPILE) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1) @@ -406,7 +406,7 @@ -dist_hxtool_SOURCES = hxtool.c -nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h - --$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h +-$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS) - -hxtool_LDADD = \ - libhx509.la \ @@ -440,10 +440,10 @@ quote.py \ ocsp.asn1 \ ocsp.opt \ -diff -uNr heimdal-7.7.0/lib/kadm5/Makefile.am heimdal-7.7.0-patched/lib/kadm5/Makefile.am ---- heimdal-7.7.0/lib/kadm5/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/lib/kadm5/Makefile.am 2019-06-23 01:32:40.000210950 +0200 -@@ -13,10 +13,6 @@ +diff -uNr heimdal-7.8.0/lib/kadm5/Makefile.am heimdal-7.8.0-patched/lib/kadm5/Makefile.am +--- heimdal-7.8.0/lib/kadm5/Makefile.am 2022-11-15 18:06:45.000000000 +0100 ++++ heimdal-7.8.0-patched/lib/kadm5/Makefile.am 2022-12-20 17:24:31.273484873 +0100 +@@ -14,10 +14,6 @@ libkadm5srv_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map endif @@ -454,16 +454,16 @@ noinst_LTLIBRARIES = sample_passwd_check.la sample_passwd_check_la_SOURCES = sample_passwd_check.c -@@ -28,8 +24,6 @@ +@@ -29,8 +25,6 @@ libkadm5clnt_la_LIBADD = \ $(LIB_com_err) ../krb5/libkrb5.la $(LIBADD_roken) -libexec_PROGRAMS = ipropd-master ipropd-slave - default_keys_SOURCES = default_keys.c + default_keys_CPPFLAGS = -I$(srcdir)/../krb5 - kadm5includedir = $(includedir)/kadm5 -@@ -120,15 +114,6 @@ +@@ -122,17 +116,6 @@ libkadm5srv_la_DEPENDENCIES = \ version-script.map @@ -471,15 +471,17 @@ -nodist_iprop_log_SOURCES = iprop-commands.c - -ipropd_master_SOURCES = ipropd_master.c ipropd_common.c iprop.h kadm5_locl.h +-ipropd_master_CPPFLAGS = -I$(srcdir)/../krb5 - -ipropd_slave_SOURCES = ipropd_slave.c ipropd_common.c iprop.h kadm5_locl.h +-ipropd_slave_CPPFLAGS = -I$(srcdir)/../krb5 - -man_MANS = kadm5_pwcheck.3 iprop.8 iprop-log.8 - LDADD = \ libkadm5srv.la \ $(top_builddir)/lib/hdb/libhdb.la \ -@@ -140,26 +125,8 @@ +@@ -144,27 +127,8 @@ $(LIB_dlopen) \ $(LIB_pidfile) @@ -496,6 +498,7 @@ - $(LIB_dlopen) \ - $(LIB_pidfile) - +-iprop_log_CPPFLAGS = -I$(srcdir)/../krb5 - -iprop-commands.c iprop-commands.h: iprop-commands.in - $(SLC) $(srcdir)/iprop-commands.in @@ -506,7 +509,7 @@ client_glue.lo server_glue.lo: $(srcdir)/common_glue.c -@@ -171,12 +138,7 @@ +@@ -176,12 +140,7 @@ ALL_OBJECTS = $(libkadm5clnt_la_OBJECTS) ALL_OBJECTS += $(libkadm5srv_la_OBJECTS) @@ -519,7 +522,7 @@ $(ALL_OBJECTS): $(srcdir)/kadm5-protos.h $(srcdir)/kadm5-private.h $(ALL_OBJECTS): kadm5_err.h -@@ -208,7 +170,6 @@ +@@ -213,7 +172,6 @@ libkadm5srv-exports.def \ kadm5_err.et \ iprop-commands.in \ @@ -527,9 +530,9 @@ check-cracklib.pl \ flush.c \ sample_passwd_check.c \ -diff -uNr heimdal-7.7.0/lib/kafs/Makefile.am heimdal-7.7.0-patched/lib/kafs/Makefile.am ---- heimdal-7.7.0/lib/kafs/Makefile.am 2016-12-20 15:23:06.000000000 +0100 -+++ heimdal-7.7.0-patched/lib/kafs/Makefile.am 2019-06-23 01:33:33.887205797 +0200 +diff -uNr heimdal-7.8.0/lib/kafs/Makefile.am heimdal-7.8.0-patched/lib/kafs/Makefile.am +--- heimdal-7.8.0/lib/kafs/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/lib/kafs/Makefile.am 2022-12-20 17:25:26.133332421 +0100 @@ -74,8 +74,6 @@ EXTRA_DIST = NTMakefile afsl.exp afslib.exp $(man_MANS) @@ -539,9 +542,9 @@ # AIX: this almost works with gcc, but somehow it fails to use the # correct ld, use ld instead afslib.so: afslib.o -diff -uNr heimdal-7.7.0/lib/krb5/Makefile.am heimdal-7.7.0-patched/lib/krb5/Makefile.am ---- heimdal-7.7.0/lib/krb5/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/lib/krb5/Makefile.am 2019-06-23 01:35:41.372827811 +0200 +diff -uNr heimdal-7.8.0/lib/krb5/Makefile.am heimdal-7.8.0-patched/lib/krb5/Makefile.am +--- heimdal-7.8.0/lib/krb5/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/lib/krb5/Makefile.am 2022-12-20 17:27:49.080935177 +0100 @@ -4,8 +4,6 @@ AM_CPPFLAGS += -I../com_err -I$(srcdir)/../com_err $(INCLUDE_sqlite3) $(INCLUDE_libintl) $(INCLUDE_openssl_crypto) @@ -620,9 +623,9 @@ version-script.map \ test_config_strings.cfg \ krb5.moduli -diff -uNr heimdal-7.7.0/lib/roken/Makefile.am heimdal-7.7.0-patched/lib/roken/Makefile.am ---- heimdal-7.7.0/lib/roken/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/lib/roken/Makefile.am 2019-06-23 01:37:25.910877865 +0200 +diff -uNr heimdal-7.8.0/lib/roken/Makefile.am heimdal-7.8.0-patched/lib/roken/Makefile.am +--- heimdal-7.8.0/lib/roken/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/lib/roken/Makefile.am 2022-12-20 17:28:54.084761232 +0100 @@ -209,8 +209,6 @@ rokenincludedir = $(includedir)/roken nodist_rokeninclude_HEADERS = $(XHEADERS) @@ -640,9 +643,9 @@ dirent.c \ dirent.hin \ dirent-test.c \ -diff -uNr heimdal-7.7.0/lib/sl/Makefile.am heimdal-7.7.0-patched/lib/sl/Makefile.am ---- heimdal-7.7.0/lib/sl/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/lib/sl/Makefile.am 2019-06-23 01:38:29.661688483 +0200 +diff -uNr heimdal-7.8.0/lib/sl/Makefile.am heimdal-7.8.0-patched/lib/sl/Makefile.am +--- heimdal-7.8.0/lib/sl/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/lib/sl/Makefile.am 2022-12-20 17:30:00.352598492 +0100 @@ -25,7 +25,7 @@ # install these? @@ -652,9 +655,9 @@ slc_SOURCES = slc-gram.y slc-lex.l slc.h -diff -uNr heimdal-7.7.0/lib/wind/Makefile.am heimdal-7.7.0-patched/lib/wind/Makefile.am ---- heimdal-7.7.0/lib/wind/Makefile.am 2016-12-20 15:23:06.000000000 +0100 -+++ heimdal-7.7.0-patched/lib/wind/Makefile.am 2019-06-23 01:39:34.124485774 +0200 +diff -uNr heimdal-7.8.0/lib/wind/Makefile.am heimdal-7.8.0-patched/lib/wind/Makefile.am +--- heimdal-7.8.0/lib/wind/Makefile.am 2022-11-15 18:14:35.000000000 +0100 ++++ heimdal-7.8.0-patched/lib/wind/Makefile.am 2022-12-20 17:31:00.324451186 +0100 @@ -83,12 +83,6 @@ $(test_punycode_OBJECTS): $(built_tests) @@ -665,12 +668,12 @@ - -LDADD = libwind.la $(LIB_roken) - - PYTHON = python - if !MAINTAINER_MODE -diff -uNr heimdal-7.7.0/Makefile.am heimdal-7.7.0-patched/Makefile.am ---- heimdal-7.7.0/Makefile.am 2019-06-07 08:21:35.000000000 +0200 -+++ heimdal-7.7.0-patched/Makefile.am 2019-06-23 01:40:47.395118733 +0200 + skip_python = test -f $@ || + endif +diff -uNr heimdal-7.8.0/Makefile.am heimdal-7.8.0-patched/Makefile.am +--- heimdal-7.8.0/Makefile.am 2022-09-16 01:54:19.000000000 +0200 ++++ heimdal-7.8.0-patched/Makefile.am 2022-12-20 17:32:16.540264008 +0100 @@ -2,12 +2,7 @@ include $(top_srcdir)/Makefile.am.common ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.53kAhw/_old 2022-12-22 16:22:43.861911012 +0100 +++ /var/tmp/diff_new_pack.53kAhw/_new 2022-12-22 16:22:43.865911035 +0100 @@ -1,5 +1,5 @@ ---- heimdal-7.7.0-patched/Makefile.am.orig 2019-06-23 01:48:28.994506480 +0200 -+++ heimdal-7.7.0-patched/Makefile.am 2019-06-23 01:48:29.018506032 +0200 +--- heimdal-7.8.0-patched/Makefile.am.orig 2022-12-20 17:40:01.919051445 +0100 ++++ heimdal-7.8.0-patched/Makefile.am 2022-12-20 17:40:01.927051422 +0100 @@ -45,7 +45,6 @@ cf/krb-prog-yacc.m4 \ cf/krb-sys-aix.m4 \ @@ -8,8 +8,8 @@ cf/roken.m4 \ cf/valgrind-suppressions \ cf/maybe-valgrind.sh \ ---- heimdal-7.7.0-patched/cf/krb-version.m4 2019-06-07 08:21:35.000000000 +0200 -+++ /dev/null 2019-06-22 12:06:27.378020779 +0200 +--- heimdal-7.8.0-patched/cf/krb-version.m4 2022-09-16 01:54:19.000000000 +0200 ++++ /dev/null 2022-12-20 16:43:58.646784977 +0100 @@ -1,24 +0,0 @@ -dnl $Id$ -dnl @@ -35,9 +35,9 @@ - sed -e "s/@USER@/$User/" -e "s/@HOST@/$Host/" -e "s/@DATE@/$Date/" include/version.h.in > include/version.h -fi -]) ---- heimdal-7.7.0-patched/configure.ac.orig 2019-06-23 01:55:47.954316969 +0200 -+++ heimdal-7.7.0-patched/configure.ac 2019-06-23 01:55:47.974316595 +0200 -@@ -624,22 +624,63 @@ +--- heimdal-7.8.0-patched/configure.ac.orig 2022-12-20 17:47:29.421826289 +0100 ++++ heimdal-7.8.0-patched/configure.ac 2022-12-20 17:47:29.437826248 +0100 +@@ -627,22 +627,63 @@ dnl This is the release version name-number[beta] dnl

1 0

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

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2022-12-22 16:22:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Thu Dec 22 16:22:02 2022 rev:364 rq:1044094 version:108.0.5359.124 Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2022-12-14 14:11:50.175751868 +0100 +++ /work/SRC/openSUSE:Factory/.chromium.new.1835/chromium.changes 2022-12-22 16:22:15.881750080 +0100 @@ -1,0 +2,7 @@ +Sun Dec 18 17:31:22 UTC 2022 - Callum Farmer <gmbr3(a)opensuse.org> + +- Add chromium-disable-GlobalMediaControlsCastStartStop.patch: + disable GlobalMediaControlsCastStartStop to fix crashes + occurring when interacting with the Media UI (bsc#1198124) + +------------------------------------------------------------------- @@ -4 +11 @@ -- Chromium 108.0.5359.124: +- Chromium 108.0.5359.124 (boo#1206403): New: ---- chromium-disable-GlobalMediaControlsCastStartStop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.yzLP83/_old 2022-12-22 16:22:24.681800694 +0100 +++ /var/tmp/diff_new_pack.yzLP83/_new 2022-12-22 16:22:24.693800764 +0100 @@ -130,6 +130,7 @@ Patch202: chromium-prop-codecs.patch Patch203: chromium-106-ffmpeg-duration.patch Patch204: chromium-107-system-zlib.patch +Patch205: chromium-disable-GlobalMediaControlsCastStartStop.patch BuildRequires: SDL-devel BuildRequires: bison BuildRequires: cups-devel ++++++ chromium-disable-GlobalMediaControlsCastStartStop.patch ++++++ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc index a8d544f..f28f9b0 100644 --- a/chrome/browser/media/router/media_router_feature.cc +++ b/chrome/browser/media/router/media_router_feature.cc @@ -54,7 +54,7 @@ #else BASE_FEATURE(kGlobalMediaControlsCastStartStop, "GlobalMediaControlsCastStartStop", - base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_ANDROID)

1 0

commit python-maturin for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-maturin for openSUSE:Factory checked in at 2022-12-22 16:22:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-maturin (Old) and /work/SRC/openSUSE:Factory/.python-maturin.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-maturin" Thu Dec 22 16:22:01 2022 rev:22 rq:1044089 version:0.14.7 Changes: -------- --- /work/SRC/openSUSE:Factory/python-maturin/python-maturin.changes 2022-12-13 18:55:29.855212958 +0100 +++ /work/SRC/openSUSE:Factory/.python-maturin.new.1835/python-maturin.changes 2022-12-22 16:22:13.389735747 +0100 @@ -1,0 +2,17 @@ +Wed Dec 21 12:01:29 UTC 2022 - Mia Herkt <mia(a)0x0.st> + +- Update to v0.14.7: + * Update uniffi_bindgen to 0.22.0 + gh#PyO3/maturin#1359 + * Add workspace lock file to sdist as a fallback + gh#PyO3/maturin#1362 +- Changes in v0.14.6: + * Allow Rust crate to be placed outside of the directory + containing pyproject.toml + gh#PyO3/maturin#1347 + * Disallow uniffi bin bindings + gh#PyO3/maturin#1353 + * Update bundled Python sysconfigs for Linux and macOS + gh#PyO3/maturin#1355 + +------------------------------------------------------------------- Old: ---- maturin-0.14.5.tar.gz New: ---- maturin-0.14.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-maturin.spec ++++++ --- /var/tmp/diff_new_pack.ChTgig/_old 2022-12-22 16:22:15.297746722 +0100 +++ /var/tmp/diff_new_pack.ChTgig/_new 2022-12-22 16:22:15.309746790 +0100 @@ -17,7 +17,7 @@ Name: python-maturin -Version: 0.14.5 +Version: 0.14.7 Release: 0 Summary: Rust/Python Interoperability License: Apache-2.0 OR MIT ++++++ maturin-0.14.5.tar.gz -> maturin-0.14.7.tar.gz ++++++ ++++ 1644 lines of diff (skipped) ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/python-maturin/vendor.tar.xz /work/SRC/openSUSE:Factory/.python-maturin.new.1835/vendor.tar.xz differ: char 27, line 1

1 0

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

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package picom for openSUSE:Factory checked in at 2022-12-22 16:21:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picom (Old) and /work/SRC/openSUSE:Factory/.picom.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "picom" Thu Dec 22 16:21:59 2022 rev:7 rq:1044090 version:10.2 Changes: -------- --- /work/SRC/openSUSE:Factory/picom/picom.changes 2022-11-23 09:48:38.175207321 +0100 +++ /work/SRC/openSUSE:Factory/.picom.new.1835/picom.changes 2022-12-22 16:22:12.429730226 +0100 @@ -1,0 +2,8 @@ +Wed Dec 21 14:31:20 UTC 2022 - Mia Herkt <mia(a)0x0.st> + +- Update to version 10.2 +Fixes: + * Window border not being considered when calculating its mask + gh#yshui/picom#950 + +------------------------------------------------------------------- Old: ---- v10.1.tar.gz New: ---- v10.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picom.spec ++++++ --- /var/tmp/diff_new_pack.3U19To/_old 2022-12-22 16:22:13.053733814 +0100 +++ /var/tmp/diff_new_pack.3U19To/_new 2022-12-22 16:22:13.061733860 +0100 @@ -17,7 +17,7 @@ Name: picom -Version: 10.1 +Version: 10.2 Release: 0 Summary: Stand-alone compositor for X11 License: MIT AND MPL-2.0 ++++++ v10.1.tar.gz -> v10.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picom-10.1/src/backend/gl/egl.c new/picom-10.2/src/backend/gl/egl.c --- old/picom-10.1/src/backend/gl/egl.c 2022-11-22 17:29:57.000000000 +0100 +++ new/picom-10.2/src/backend/gl/egl.c 2022-11-30 20:20:01.000000000 +0100 @@ -37,6 +37,10 @@ }; static PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC glEGLImageTargetTexStorage = NULL; +static PFNEGLCREATEIMAGEKHRPROC eglCreateImageProc = NULL; +static PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageProc = NULL; +static PFNEGLGETPLATFORMDISPLAYPROC eglGetPlatformDisplayProc = NULL; +static PFNEGLCREATEPLATFORMWINDOWSURFACEPROC eglCreatePlatformWindowSurfaceProc = NULL; /** * Free a glx_texture_t. @@ -46,7 +50,7 @@ struct egl_pixmap *p = tex->user_data; // Release binding if (p->image != EGL_NO_IMAGE) { - eglDestroyImage(gd->display, p->image); + eglDestroyImageProc(gd->display, p->image); p->image = EGL_NO_IMAGE; } @@ -103,6 +107,21 @@ * Initialize OpenGL. */ static backend_t *egl_init(session_t *ps) { + bool success = false; + struct egl_data *gd = NULL; + +#define get_proc(name, type) \ + name##Proc = (type)eglGetProcAddress(#name); \ + if (!name##Proc) { \ + log_error("Failed to get EGL function " #name); \ + goto end; \ + } + get_proc(eglCreateImage, PFNEGLCREATEIMAGEKHRPROC); + get_proc(eglDestroyImage, PFNEGLDESTROYIMAGEKHRPROC); + get_proc(eglGetPlatformDisplay, PFNEGLGETPLATFORMDISPLAYPROC); + get_proc(eglCreatePlatformWindowSurface, PFNEGLCREATEPLATFORMWINDOWSURFACEPROC); +#undef get_proc + // Check if we have the X11 platform const char *exts = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS); if (strstr(exts, "EGL_EXT_platform_x11") == NULL) { @@ -110,14 +129,13 @@ return NULL; } - bool success = false; - auto gd = ccalloc(1, struct egl_data); - gd->display = eglGetPlatformDisplay(EGL_PLATFORM_X11_EXT, ps->dpy, - (EGLAttrib[]){ - EGL_PLATFORM_X11_SCREEN_EXT, - ps->scr, - EGL_NONE, - }); + gd = ccalloc(1, struct egl_data); + gd->display = eglGetPlatformDisplayProc(EGL_PLATFORM_X11_EXT, ps->dpy, + (EGLAttrib[]){ + EGL_PLATFORM_X11_SCREEN_EXT, + ps->scr, + EGL_NONE, + }); if (gd->display == EGL_NO_DISPLAY) { log_error("Failed to get EGL display."); goto end; @@ -129,6 +147,11 @@ goto end; } + if (major < 1 || (major == 1 && minor < 5)) { + log_error("EGL version too old, need at least 1.5."); + goto end; + } + // Check if EGL supports OpenGL const char *apis = eglQueryString(gd->display, EGL_CLIENT_APIS); if (strstr(apis, "OpenGL") == NULL) { @@ -172,7 +195,7 @@ EGLConfig target_cfg = cfgs[0]; free(cfgs); - gd->target_win = eglCreatePlatformWindowSurface( + gd->target_win = eglCreatePlatformWindowSurfaceProc( gd->display, target_cfg, (xcb_window_t[]){session_get_target_window(ps)}, NULL); if (gd->target_win == EGL_NO_SURFACE) { log_error("Failed to create EGL surface."); @@ -227,7 +250,9 @@ end: if (!success) { - egl_deinit(&gd->gl.base); + if (gd != NULL) { + egl_deinit(&gd->gl.base); + } return NULL; } @@ -260,8 +285,8 @@ eglpixmap = cmalloc(struct egl_pixmap); eglpixmap->pixmap = pixmap; - eglpixmap->image = eglCreateImage(gd->display, gd->ctx, EGL_NATIVE_PIXMAP_KHR, - (EGLClientBuffer)(uintptr_t)pixmap, NULL); + eglpixmap->image = eglCreateImageProc(gd->display, gd->ctx, EGL_NATIVE_PIXMAP_KHR, + (EGLClientBuffer)(uintptr_t)pixmap, NULL); eglpixmap->owned = owned; if (eglpixmap->image == EGL_NO_IMAGE) { @@ -287,7 +312,7 @@ return wd; err: if (eglpixmap && eglpixmap->image) { - eglDestroyImage(gd->display, eglpixmap->image); + eglDestroyImageProc(gd->display, eglpixmap->image); } free(eglpixmap); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picom-10.1/src/win.c new/picom-10.2/src/win.c --- old/picom-10.1/src/win.c 2022-11-22 17:29:57.000000000 +0100 +++ new/picom-10.2/src/win.c 2022-11-30 20:20:01.000000000 +0100 @@ -350,7 +350,7 @@ auto reg_bound_local = win_get_bounding_shape_global_by_val(w); pixman_region32_translate(&reg_bound_local, -w->g.x, -w->g.y); w->mask_image = b->ops->make_mask( - b, (geometry_t){.width = w->g.width, .height = w->g.height}, &reg_bound_local); + b, (geometry_t){.width = w->widthb, .height = w->heightb}, &reg_bound_local); pixman_region32_fini(&reg_bound_local); if (!w->mask_image) {

1 0

commit kernel-source for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2022-12-22 16:21:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Thu Dec 22 16:21:57 2022 rev:669 rq:1044103 version:6.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2022-12-10 21:17:41.553508853 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.1835/dtb-aarch64.changes 2022-12-22 16:21:58.681651150 +0100 @@ -1,0 +2,180 @@ +Wed Dec 21 17:29:07 CET 2022 - jslaby(a)suse.cz + +- tcp: Add TIME_WAIT sockets in bhash2 (bsc#1206466). +- commit d8defbe + +------------------------------------------------------------------- +Wed Dec 21 11:16:47 CET 2022 - mkubecek(a)suse.cz + +- series.conf: cleanup +- update upstream reference and resort: + - patches.suse/NFSD-fix-use-after-free-in-__nfs42_ssc_open.patch +- commit bf66071 + +------------------------------------------------------------------- +Tue Dec 20 06:23:29 CET 2022 - jslaby(a)suse.cz + +- io_uring/net: ensure compat import handlers clear free_iov + (bsc#1206509). +- commit 747fc96 + +------------------------------------------------------------------- +Mon Dec 19 06:26:40 CET 2022 - neilb(a)suse.de + +- NFSD: fix use-after-free in __nfs42_ssc_open() (bsc#1206209 + CVE-2022-4379). +- commit 338ca73 + +------------------------------------------------------------------- +Fri Dec 16 22:33:46 CET 2022 - mkubecek(a)suse.cz + +- series.conf: cleanup +- update upstream references and move into sorted section: + - patches.suse/char-xillybus-Fix-trivial-bug-with-mutex.patch + - patches.suse/char-xillybus-Prevent-use-after-free-due-to-race-con.patch + - patches.suse/media-dvb-core-Fix-UAF-due-to-refcount-races-at-rele.patch + - patches.suse/misc-sgi-gru-fix-use-after-free-error-in-gru_set_con.patch +- commit 7f1864f + +------------------------------------------------------------------- +Fri Dec 16 17:44:53 CET 2022 - vbabka(a)suse.cz + +- mm, mremap: fix mremap() expanding vma with addr inside vma (bsc#1206359). +- Delete + patches.suse/Revert-mm-add-merging-after-mremap-resize.patch. +- commit 3440c9c + +------------------------------------------------------------------- +Fri Dec 16 17:41:26 CET 2022 - vbabka(a)suse.cz + +- mm, mremap: fix mremap() expanding vma with addr inside + vma (bsc#1206359). +- commit b61d296 + +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby(a)suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + +------------------------------------------------------------------- +Mon Dec 12 09:48:46 CET 2022 - jslaby(a)suse.cz + +- series.conf: remove stale comment +- commit ab17686 + +------------------------------------------------------------------- +Mon Dec 12 09:43:43 CET 2022 - jslaby(a)suse.cz + +- Refresh patches.suse/Bluetooth-L2CAP-Fix-u8-overflow.patch. +- Refresh patches.suse/can-slcan-fix-freed-work-crash.patch. + Update upstream status. +- commit a6c4f4e + +------------------------------------------------------------------- +Sun Dec 11 23:46:16 CET 2022 - mkubecek(a)suse.cz + +- Update to 6.1 final +- refresh configs (headers only) +- commit d1335c0 + +------------------------------------------------------------------- +Fri Dec 9 12:31:58 CET 2022 - jslaby(a)suse.cz + +- Delete + patches.suse/Input-synaptics-retry-query-upon-error.patch. + The patch is not needed (bsc#1194086 comment 50). +- commit d03b675 + +------------------------------------------------------------------- +Fri Dec 9 12:29:11 CET 2022 - jslaby(a)suse.cz + +- Delete patches.suse/iwlwifi-module-firmware-ucode-fix.patch. + Not needed anymore. kernel-firmware contains -72s since 06dbfbc74388 + released in 20221109 already. +- commit e1d0837 + +------------------------------------------------------------------- +Fri Dec 9 12:05:20 CET 2022 - jslaby(a)suse.cz + +- Delete + patches.suse/drm-sched-Fix-kernel-NULL-pointer-dereference-error.patch. + This can be dropped thanks to commit bafaf67c42f4 (Revert "drm/sched: + Use parent fence instead of finished") in v6.1-rc1. +- commit 15d1c2b + +------------------------------------------------------------------- +Fri Dec 9 11:18:07 CET 2022 - jslaby(a)suse.cz + +- Refresh + patches.suse/media-dvb-core-Fix-UAF-due-to-refcount-races-at-rele.patch. + Update upstream status. +- commit d504053 + +------------------------------------------------------------------- +Fri Dec 9 11:13:07 CET 2022 - jslaby(a)suse.cz + +- Delete patches.suse/dm-mpath-no-partitions-feature. (bsc#1189976) +- commit e544c6d + +------------------------------------------------------------------- +Fri Dec 9 11:12:07 CET 2022 - jslaby(a)suse.cz + +- Refresh + patches.suse/misc-sgi-gru-fix-use-after-free-error-in-gru_set_con.patch. + Update to final version and update upstream status. +- commit dd048d9 + +------------------------------------------------------------------- +Fri Dec 9 11:04:25 CET 2022 - jslaby(a)suse.cz + +- Delete patches.suse/suse-hv-guest-os-id.patch. (bsc#1189965) +- commit de46b50 + +------------------------------------------------------------------- +Fri Dec 9 11:00:25 CET 2022 - jslaby(a)suse.cz + +- Delete patches.suse/dm-mpath-leastpending-path-update. (bsc#1189962) +- commit fb9bee7 + +------------------------------------------------------------------- +Fri Dec 9 10:52:41 CET 2022 - jslaby(a)suse.cz + +- Delete patches.suse/dm-table-switch-to-readonly. (bsc#1189963) +- commit 3a71c4d + +------------------------------------------------------------------- +Fri Dec 9 10:49:18 CET 2022 - jslaby(a)suse.cz + +- Delete patches.suse/kbd-ignore-gfx.patch. (bsc#1189975) +- commit 900ecbb + +------------------------------------------------------------------- +Thu Dec 8 21:15:35 CET 2022 - jeffm(a)suse.com + +- Revert "config: update CONFIG_LSM defaults" + This reverts commit a05e86cb8200d8cf785b866375a4c9d06c09ab47. + Commit 0a20128a486 (Revert "config: Enable BPF LSM" (bsc#1197746)) + indicates this needs more specific testing before merging. +- commit 7453fbc + +------------------------------------------------------------------- +Thu Dec 8 20:32:18 CET 2022 - jeffm(a)suse.com + +- config: update CONFIG_LSM defaults (bsc#1205603). + CONFIG_LSM determines what the default order of LSM usage is. The + default order is set based on whether AppArmor or SELinux is preferred + in the config (we still prefer AppArmor). The default set has changed + over time and we haven't updated it, leading to things like bpf LSMs + not working out of the box. + This change just updates CONFIG_LSM to what the default would be now. +- config: update CONFIG_LSM defaults + CONFIG_LSM determines what the default order of LSM usage is. The + default order is set based on whether AppArmor or SELinux is preferred + in the config (we still prefer AppArmor). The default set has changed + over time and we haven't updated it, leading to things like bpf LSMs + not working out of the box. + This change just updates CONFIG_LSM to what the default would be now. +- commit b64d18c + +------------------------------------------------------------------- @@ -220,0 +401,6 @@ +Mon Dec 5 00:15:34 CET 2022 - mkubecek(a)suse.cz + +- Update to 6.1-rc8 +- commit 6ba05d3 + +------------------------------------------------------------------- @@ -724 +910,14 @@ -- commit cadafde +- char: xillybus: Fix trivial bug with mutex (bsc#1205764 + CVE-2022-45888). +- char: xillybus: Prevent use-after-free due to race condition + (bsc#1205764 CVE-2022-45888). +- commit 8ba91a0 + +------------------------------------------------------------------- +Tue Nov 29 16:31:50 CET 2022 - afaerber(a)suse.com ++++ 238 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.1835/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change dtb-riscv64.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-kvmsmall.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change Old: ---- linux-6.0.tar.sign linux-6.0.tar.xz New: ---- linux-6.1.tar.sign linux-6.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:07.673702869 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:07.689702961 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) Name: dtb-aarch64 -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change dtb-riscv64.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:07.837703813 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:07.853703905 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -111,9 +111,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0-only Group: System/Kernel -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 -Provides: kernel-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: kernel-%build_flavor-base-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 +Provides: kernel-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 # END COMMON DEPS -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:07.889704112 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:07.897704158 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -111,9 +111,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0-only Group: System/Kernel -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 -Provides: kernel-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: kernel-%build_flavor-base-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 +Provides: kernel-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 # END COMMON DEPS -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:07.925704319 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:07.933704366 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -111,9 +111,9 @@ Summary: The Standard Kernel License: GPL-2.0-only Group: System/Kernel -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 -Provides: kernel-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: kernel-%build_flavor-base-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 +Provides: kernel-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 # END COMMON DEPS -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:07.961704526 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:07.965704550 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0-only Group: Documentation/Man -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -67,7 +67,7 @@ %endif URL: https://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:08.013704826 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:08.017704849 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -111,9 +111,9 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0-only Group: System/Kernel -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 -Provides: kernel-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: kernel-%build_flavor-base-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 +Provides: kernel-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 # END COMMON DEPS -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:08.089705262 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:08.093705285 +0100 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 6.0.12 +%define patchversion 6.1.0 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +BuildRequires: kernel%kernel_flavor-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 %if 0%{?rhel_version} BuildRequires: kernel @@ -64,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0-only Group: SLES -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:08.129705493 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:08.141705561 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 6.0.12 +%define patchversion 6.1.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0-only Group: SLES -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:08.189705837 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:08.193705861 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -111,9 +111,9 @@ Summary: Kernel with PAE Support License: GPL-2.0-only Group: System/Kernel -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 -Provides: kernel-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: kernel-%build_flavor-base-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 +Provides: kernel-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 # END COMMON DEPS -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:08.241706137 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:08.257706229 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %define vanilla_only 0 @@ -31,9 +31,9 @@ %endif Name: kernel-source -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -50,7 +50,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 Provides: linux Provides: multiversion(kernel) Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:08.309706528 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:08.329706643 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0-only Group: Development/Sources -Version: 6.0.12 +Version: 6.1.0 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -52,7 +52,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:08.377706919 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:08.389706988 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 6.0 -%define patchversion 6.0.12 +%define srcversion 6.1 +%define patchversion 6.1.0 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -111,9 +111,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0-only Group: System/Kernel -Version: 6.0.12 +Version: 6.1.0 %if 0%{?is_kotd} -Release: <RELEASE>.g523a283 +Release: <RELEASE>.gab10a11 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 -Provides: kernel-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: kernel-%build_flavor-base-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 +Provides: kernel-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 # END COMMON DEPS -Provides: %name-srchash-523a28391cc881ac34d76adabac8ee282f6e1013 +Provides: %name-srchash-ab10a112debd048481eeb4d1d93a7b2366be6072 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc kernel-zfcpdump.spec: same change ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:08.697708760 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:08.701708783 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=6.0 +SRCVERSION=6.1 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression ++++++ config.tar.bz2 ++++++ ++++ 8510 lines of diff (skipped) ++++++ linux-6.0.tar.xz -> linux-6.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-6.0.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new.1835/linux-6.1.tar.xz differ: char 15, line 1 ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 197040 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ ++++ 2206 lines of diff (skipped) ++++++ series.conf ++++++ ++++ 2470 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.1835/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.c57UrR/_old 2022-12-22 16:22:11.617725555 +0100 +++ /var/tmp/diff_new_pack.c57UrR/_new 2022-12-22 16:22:11.645725716 +0100 @@ -1,4 +1,4 @@ -2022-12-08 10:49:09 +0000 -GIT Revision: 523a28391cc881ac34d76adabac8ee282f6e1013 +2022-12-21 16:29:21 +0000 +GIT Revision: ab10a112debd048481eeb4d1d93a7b2366be6072 GIT Branch: stable

1 0