December 2021 - openSUSE Commits - openSUSE Mailing Lists

commit privoxy for openSUSE:Leap:15.2:Update
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package privoxy for openSUSE:Leap:15.2:Update checked in at 2021-12-30 23:33:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/privoxy (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.privoxy.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "privoxy" Thu Dec 30 23:33:05 2021 rev:4 rq:943046 version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.1VKe0B/_old 2021-12-30 23:33:07.261031368 +0100 +++ /var/tmp/diff_new_pack.1VKe0B/_new 2021-12-30 23:33:07.265031371 +0100 @@ -1,2 +1,2 @@ -<link package='privoxy.15939' cicount='copy' /> +<link package='privoxy.17332' cicount='copy' />

1 0

commit privoxy.17332 for openSUSE:Leap:15.2:Update
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package privoxy.17332 for openSUSE:Leap:15.2:Update checked in at 2021-12-30 23:33:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/privoxy.17332 (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.privoxy.17332.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "privoxy.17332" Thu Dec 30 23:33:05 2021 rev:1 rq:943046 version:3.0.33 Changes: -------- New Changes file: --- /dev/null 2021-12-30 11:57:43.217130414 +0100 +++ /work/SRC/openSUSE:Leap:15.2:Update/.privoxy.17332.new.1896/privoxy.changes 2021-12-30 23:33:06.429030927 +0100 @@ -0,0 +1,1870 @@ +------------------------------------------------------------------- +Fri Dec 10 19:50:34 UTC 2021 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- privoxy 3.0.33 (boo#1183584): + * CVE-2021-44543: Encode the template name to prevent XSS + (cross-side scripting) when Privoxy is configured to servce + the user-manual itself + * CVE-2021-44540: Free memory of compiled pattern spec + before bailing + * CVE-2021-44541: Free header memory when failing to get the + request destination. + * CVE-2021-44542: Prevent memory leaks when handling errors + * Disable fast-redirects for a number of domains + * Update default block lists + * Many bug fixes and minor enhancements + +------------------------------------------------------------------- +Sat Mar 6 18:33:24 UTC 2021 - Carsten Ziepke <kieltux(a)gmail.com> + +- Update to version 3.0.32: + - Security/Reliability (boo#1183129) + - ssplit(): Remove an assertion that could be triggered with a + crafted CGI request. + Commit 2256d7b4d67. OVE-20210203-0001. CVE-2021-20272 + Reported by: Joshua Rogers (Opera) + - cgi_send_banner(): Overrule invalid image types. Prevents a + crash with a crafted CGI request if Privoxy is toggled off. + Commit e711c505c48. OVE-20210206-0001. CVE-2021-20273 + Reported by: Joshua Rogers (Opera) + - socks5_connect(): Don't try to send credentials when none are + configured. Fixes a crash due to a NULL-pointer dereference + when the socks server misbehaves. + Commit 85817cc55b9. OVE-20210207-0001. CVE-2021-20274 + Reported by: Joshua Rogers (Opera) + - chunked_body_is_complete(): Prevent an invalid read of size + two. + Commit a912ba7bc9c. OVE-20210205-0001. CVE-2021-20275 + Reported by: Joshua Rogers (Opera) + - Obsolete pcre: Prevent invalid memory accesses with an invalid + pattern passed to pcre_compile(). Note that the obsolete pcre + code is scheduled to be removed before the 3.0.33 release. + There has been a warning since 2008 already. + Commit 28512e5b624. OVE-20210222-0001. CVE-2021-20276 + Reported by: Joshua Rogers (Opera) + - Bug fixes: + - Properly parse the client-tag-lifetime directive. Previously it was + not accepted as an obsolete hash value was being used. + Reported by: Joshua Rogers (Opera) + - decompress_iob(): Prevent reading of uninitialized data. + Reported by: Joshua Rogers (Opera). + - decompress_iob(): Don't advance cur past eod when looking + for the end of the file name and comment. + - decompress_iob(): Cast value to unsigned char before shifting. + Prevents a left-shift of a negative value which is undefined behaviour. + Reported by: Joshua Rogers (Opera) + - gif_deanimate(): Confirm that that we have enough data before doing + any work. Fixes a crash when fuzzing with an empty document. + Reported by: Joshua Rogers (Opera). + - buf_copy(): Fail if there's no data to write or nothing to do. + Prevents undefined behaviour "applying zero offset to null pointer". + Reported by: Joshua Rogers (Opera) + - log_error(): Treat LOG_LEVEL_FATAL as fatal even when --stfu is + being used while fuzzing. + Reported by: Joshua Rogers (Opera). + - Respect DESTDIR when considering whether or not to install + config files with ".new" extension. + - OpenSSL ssl_store_cert(): Fix two error messages. + - Fix a couple of format specifiers. + - Silence compiler warnings when compiling with NDEBUG. + - fuzz_server_header(): Fix compiler warning. + - fuzz_client_header(): Fix compiler warning. + - cgi_send_user_manual(): Also reject requests if the user-manual + directive specifies a https:// URL. Previously Privoxy would try and + fail to open a local file. + - General improvements: + - Log the TLS version and the the cipher when debug 2 is enabled. + - ssl_send_certificate_error(): Respect HEAD requests by not sending a body. + - ssl_send_certificate_error(): End the body with a single new line. + - serve(): Increase the chances that the host is logged when closing + a server socket. + - handle_established_connection(): Add parentheses to clarify an expression + Suggested by: David Binderman + - continue_https_chat(): Explicitly unset CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE + if process_encrypted_request() fails. This makes it more obvious that the + connection will not be reused. Previously serve() relied on + CSP_FLAG_SERVER_CONTENT_LENGTH_SET and CSP_FLAG_CHUNKED being unset. + Inspired by a patch from Joshua Rogers (Opera). + - decompress_iob(): Add periods to a couple of log messages + - Terminate the body of the HTTP snipplets with a single new line + instead of "\r\n". + - configure: Add --with-assertions option and only enable assertions + when it is used + - windows build: Use --with-brotli and --with-mbedtls by default and + enable dynamic error checking. + - gif_deanimate(): Confirm we've got an image before trying to write it + Saves a pointless buf_copy() call. + - OpenSSL ssl_store_cert(): Remove a superfluous space before the serial number. + - Action file improvements: + - Disable fast-redirects for .golem.de/ + - Unblock requests to adri*. + - Block requests for trc*.taboola.com/ + - Disable fast-redirects for .linkedin.com/ + - Filter file improvements: + - Make the second pcrs job of the img-reorder filter greedy again. + The ungreedy version broke the img tags on: + https://bulk.fefe.de/scalability/. + - Privoxy-Log-Parser: + - Highlight a few more messages. + - Clarify the --statistics output. The shown "Reused connections" + are server connections so name them appropriately. + - Bump version to 0.9.3. + - Privoxy-Regression-Test: + - Add the --check-bad-ssl option to the --help output. + - Bump version to 0.7.3. + - Documentation: + - Add pushing the created tag to the release steps in the developer manual. + - Clarify that 'debug 32768' should be used in addition to the other debug + directives when reporting problems. + - Add a 'Third-party licenses and copyrights' section to the user manual. + +------------------------------------------------------------------- +Mon Feb 1 19:51:51 UTC 2021 - Carsten Ziepke <kieltux(a)gmail.com> + +- Update to version 3.0.31: + - Security/Reliability (boo#1181650) + - Prevent an assertion from getting triggered by a crafted + CGI request. + Commit 5bba5b89193fa. OVE-20210130-0001. CVE-2021-20217 + Reported by: Joshua Rogers (Opera) + - Fixed a memory leak when decompression fails "unexpectedly". + Commit f431d61740cc0. OVE-20210128-0001. CVE-2021-20216 + - Bug fixes: + - Fixed detection of insufficient data for decompression. + Previously Privoxy could try to decompress a partly + uninitialized buffer. +- Update to version 3.0.30: + - Bug fixes: + - Check the actual URL for redirects when https inspecting requests. + Previously Privoxy would only check the path which resulted in + rewrite results being rejected as invalid URLs. + Reported by withoutname in #1736. + - Let the hide-referrer code tolerate Referer headers with https:// URLs. + Previously they would always be treated like a changed host. + - Use the https headers if the show-request handler is reached through + https://. Previously Privoxy would use the http headers which + may be empty on a reused connection. + - Make CGI_PREFIX protocol-relative when building with FEATURE_HTTPS_INSPECTION. + This unbreaks (at least) https://config.privoxy.org/client-tags whose + buttons would previously use a http:// URL resulting in browser warnings. + - Support using https-inspection and client-header-order at the same time. + Previously Privoxy would crash. + Reported by: Kai Raven + - Properly reject rewrites from http to https as they currently + aren't supported. Previously Privoxy would wait for the client + to establish an encrypted connection which obviously would not happen. + - When https inspection is enabled and Privoxy has been compiled with + FEATURE_GRACEFUL_TERMINATION (not recommended for production builds), + the TLS backend resources are free'd later on and only if no active + connections are left. Prevents crashes when exiting "gracefully" at the + wrong time. + - Let the uninstall target remove the config file even if DESTDIR + is set and properly announce the deletion of the configuration files. + - General improvements: + - Allow to rewrite the request destination for https-inspected + requests behind the client's back. The documentation already sort + of claimed that it was supported by not especially mentioning that + it didn't work for https-inspected requests. + Fixes SF bug #923 reported by withoutname. + - Add support for filtering client request bodies by using + CLIENT-BODY-FILTER filters which can be enabled with the + client-body-filter action. + Patch submitted by Maxim Antonov. + Sponsored by: Robert Klemme + - Add the new action suppress-tag{} which can be used to prevent + a tagger from adding a tag. Patch submitted by Maxim Antonov. + Sponsored by: Robert Klemme + - Gracefully handle existing website keys without matching certificates. + This can happen if Privoxy was previously running with an invalid + TLS configuration that didn't allow it to create a certificate. + - Recycle debug bit 4 for Tagging-related messages. + - Improve the message shown when the client-tags CGI page + is requested with no tags configured. + - Shorten the 'donate' and 'participate' links used by templates + using redirects. Currently the redirects lead to the FAQ entries + but in the future we may want to relocate the content and using + redirects makes this more convenient. + - Log an error when a PCRE-HOST-PATTERN is used with + FEATURE_PCRE_HOST_PATTERNS disabled. Don't treat this a + fatal error so the regression tests can be used with and + without FEATURE_PCRE_HOST_PATTERNS. + - The code compiles with older C compilers again. + - The chdir() return code is checked to fix a compiler warning. + - The packages feed has been removed from the source tarball. + It's usually out of date when the source tarball is generated + for the release. + - Fixed harmless compiler warnings from GCC9 with -D_FORTIFY_SOURCE=2. + - windows: Remove obsolete '$(DEST)/doc/images' target. ++++ 1673 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Leap:15.2:Update/.privoxy.17332.new.1896/privoxy.changes New: ---- privoxy-3.0.16-networkmanager.systemd.patch privoxy-3.0.17-utf8.patch privoxy-3.0.21-config.patch privoxy-3.0.33-stable-src.tar.gz privoxy-3.0.33-stable-src.tar.gz.asc privoxy.changes privoxy.keyring privoxy.logrotate.systemd privoxy.service privoxy.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ privoxy.spec ++++++ # # spec file for package privoxy # # Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define chroot %{_localstatedir}/lib/privoxy Name: privoxy Version: 3.0.33 Release: 0 Summary: The Internet Junkbuster - HTTP Proxy Server License: GPL-3.0-or-later Group: Productivity/Networking/Web/Proxy URL: https://www.privoxy.org/ Source: https://www.privoxy.org/sf-download-mirror/Sources/%{version}%%20%%28stable… Source2: https://www.privoxy.org/sf-download-mirror/Sources/%{version}%%20%%28stable… Source3: %{name}.service Source4: %{name}.logrotate.systemd Source5: https://www.fabiankeil.de/gpg-keys/fk-8BA2371C.asc#/%{name}.keyring Patch1: %{name}-3.0.21-config.patch Patch2: %{name}-3.0.17-utf8.patch Patch3: %{name}-3.0.16-networkmanager.systemd.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: pkgconfig BuildRequires: w3m BuildRequires: pkgconfig(libbrotlicommon) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) Requires: logrotate Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd %{?systemd_ordering} %description The Internet Junkbuster - HTTP Proxy Server: A non-caching HTTP proxy server that runs between a web browser and a web server and filters contents as described in the configuration files. %package doc Summary: The documentation of Privoxy Group: Productivity/Networking/Web/Proxy Requires: %{name} = %{version} BuildArch: noarch %description doc Documentation files for the Privoxy: The Internet Junkbuster - HTTP Proxy Server. A non-caching HTTP proxy server that runs between a web browser and a web server and filters contents as described in the configuration files. %prep %setup -q -n privoxy-%{version}-stable %patch1 -p1 %patch2 %patch3 %build autoreconf -fiv %configure \ --enable-compression \ --with-openssl\ --with-brotli \ --enable-extended-statistics \ --enable-pcre-host-patterns %make_build %install mkdir -p %{buildroot}/%{_unitdir} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}/%{chroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/%{chroot}/log mkdir -p %{buildroot}/%{chroot}%{_localstatedir}/log mkdir -p %{buildroot}/%{chroot}%{_localstatedir}/run mkdir -p %{buildroot}/%{chroot}/%{_lib} mkdir -p %{buildroot}%{_mandir}/man8 mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d cp -a templates %{buildroot}/%{chroot}%{_sysconfdir} install -m 644 config *.action *.filter trust %{buildroot}/%{chroot}%{_sysconfdir} sed -e 's/@lib@/%{_lib}/g' %{SOURCE3} > %{buildroot}/%{_unitdir}/%{name}.service ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} install -m 755 privoxy %{buildroot}%{_sbindir} install -m 755 privoxy_nm %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/privoxyd install -m 644 privoxy.8 %{buildroot}%{_mandir}/man8 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/privoxy ln -s ../../log %{buildroot}/%{chroot}%{_localstatedir}/log/privoxy ln -sf %{chroot}%{_sysconfdir}/ %{buildroot}%{_sysconfdir}/privoxy %pre %service_add_pre %{name}.service %{_sbindir}/groupadd -r privoxy 2> /dev/null ||: %{_sbindir}/useradd -r -g privoxy -s /bin/false -c "Daemon user for privoxy" \ -d %{_localstatedir}/lib/privoxy privoxy 2> /dev/null ||: exit 0 %post %service_add_post %{name}.service %preun %service_del_preun %{name}.service %postun %service_del_postun %{name}.service %files %license LICENSE %doc AUTHORS README ChangeLog %{_sbindir}/privoxy %{_sysconfdir}/NetworkManager/dispatcher.d/privoxyd %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/dispatcher.d %{_mandir}/man8/privoxy.8%{?ext_man} %config(noreplace) %{_sysconfdir}/logrotate.d/privoxy %dir /%{chroot}%{_sysconfdir} %config(noreplace) /%{chroot}%{_sysconfdir}/config %config(noreplace) /%{chroot}%{_sysconfdir}/trust %config /%{chroot}%{_sysconfdir}/match-all.action %config %attr(640,privoxy,root) /%{chroot}%{_sysconfdir}/default.action %config(noreplace) %attr(640,privoxy,root) /%{chroot}%{_sysconfdir}/user.action %config(noreplace) /%{chroot}%{_sysconfdir}/*.filter %dir %{chroot} %{chroot}%{_sysconfdir}/templates %dir %attr(770,root,privoxy) %{chroot}/log %{chroot}%{_localstatedir} %{chroot}/%{_lib} %{chroot}%{_sysconfdir}/regression-tests.action %{_unitdir}/%{name}.service %{_sbindir}/rcprivoxy %{_sysconfdir}/privoxy %files doc %license LICENSE %doc doc/source %changelog ++++++ privoxy-3.0.16-networkmanager.systemd.patch ++++++ --- privoxy_nm +++ privoxy_nm @@ -0,0 +1,18 @@ +#! /bin/sh +# +# privoxy - rerun privoxy in response to interface change +# +# Wagner Thomas <wagner-thomas(a)gmx.at> +# Place this script in the /etc/NetworkManager/dispatcher.d/ directory. + +case "$2" in + up) + /usr/bin/systemctl reload privoxy + ;; + down) + /usr/bin/systemctl reload privoxy + ;; + *) + exit 0 + ;; +esac + ++++++ privoxy-3.0.17-utf8.patch ++++++ --- default.filter +++ default.filter @@ -375,7 +375,7 @@ s/\x84/,,/g s/\x85/.../g #s/\x88/^/g -#s-\x89- �/��-g +#s-\x89- ��/��-g s/\x8B/</g s/\x8C/Oe/g s/\x91/`/g ++++++ privoxy-3.0.21-config.patch ++++++ --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: privoxy-3.0.22-stable/config =================================================================== --- privoxy-3.0.22-stable.orig/config 2014-11-14 11:31:53.000000000 +0000 +++ privoxy-3.0.22-stable/config 2014-11-28 22:59:49.000000000 +0000 @@ -260,7 +260,7 @@ # # No trailing "/", please. # -confdir . +confdir /etc # # 2.2. templdir # ============== @@ -345,7 +345,7 @@ confdir . # # No trailing "/", please. # -logdir . +logdir /log # # 2.5. actionsfile # ================= ++++++ privoxy.logrotate.systemd ++++++ /var/lib/privoxy/log/logfile { compress dateext notifempty create 640 privoxy root su privoxy privoxy rotate 99 size 4M #maxage 365 postrotate /usr/bin/systemctl reload privoxy endscript } /var/lib/privoxy/log/jarfile { compress dateext notifempty create 640 privoxy root su privoxy privoxy rotate 99 size 4M #maxage 365 postrotate /usr/bin/systemctl reload privoxy endscript } ++++++ privoxy.service ++++++ [Unit] Description=Privoxy Web Proxy With Advanced Filtering Capabilities After=network.target [Service] Type=forking PIDFile=/run/privoxy.pid ExecStartPre=-/usr/bin/cp -upf /etc/resolv.conf /etc/host.conf /etc/hosts /etc/localtime /var/lib/privoxy/etc/ ExecStartPre=-/usr/bin/cp -upf /@lib@/libresolv.so.2 /@lib@/libnss_dns.so.2 /var/lib/privoxy/@lib@/ ExecStart=/usr/sbin/privoxy --chroot --pidfile /run/privoxy.pid --user privoxy /etc/config ExecReload=/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target

1 0

commit 000release-packages for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2021-12-30 22:43:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Thu Dec 30 22:43:22 2021 rev:1358 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.4TA7oM/_old 2021-12-30 22:43:24.195604279 +0100 +++ /var/tmp/diff_new_pack.4TA7oM/_new 2021-12-30 22:43:24.199604281 +0100 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20211229 +Version: 20211230 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -176,9 +176,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20211229-0 +Provides: product(MicroOS) = 20211230-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20211229 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20211230 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(MicroOS) @@ -194,7 +194,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20211229-0 +Provides: product_flavor(MicroOS) = 20211230-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -210,7 +210,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(MicroOS) = 20211229-0 +Provides: product_flavor(MicroOS) = 20211230-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -226,7 +226,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20211229-0 +Provides: product_flavor(MicroOS) = 20211230-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -242,7 +242,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(MicroOS) = 20211229-0 +Provides: product_flavor(MicroOS) = 20211230-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -299,11 +299,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20211229</version> + <version>20211230</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20211229</cpeid> + <cpeid>cpe:/o:opensuse:microos:20211230</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.4TA7oM/_old 2021-12-30 22:43:24.219604292 +0100 +++ /var/tmp/diff_new_pack.4TA7oM/_new 2021-12-30 22:43:24.223604294 +0100 @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20211229) +# spec file for package openSUSE-Addon-NonOss-release (Version 20211230) # # Copyright (c) 2021 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20211229 +Version: 20211230 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20211229-0 +Provides: product(openSUSE-Addon-NonOss) = 20211230-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20211229 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20211230 AutoReqProv: on @@ -48,10 +48,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20211229</version> + <version>20211230</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20211229</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20211230</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.4TA7oM/_old 2021-12-30 22:43:24.243604304 +0100 +++ /var/tmp/diff_new_pack.4TA7oM/_new 2021-12-30 22:43:24.247604306 +0100 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20211229 +Version: 20211230 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -178,7 +178,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20211229-0 +Provides: product(openSUSE) = 20211230-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -192,7 +192,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20211229 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20211230 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -206,7 +206,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -221,7 +221,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -236,7 +236,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -251,7 +251,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -266,7 +266,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -281,7 +281,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -296,7 +296,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -311,7 +311,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -326,7 +326,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -341,7 +341,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -356,7 +356,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -371,7 +371,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -386,7 +386,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -401,7 +401,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -416,7 +416,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -431,7 +431,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -446,7 +446,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -461,7 +461,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -476,7 +476,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20211229-0 +Provides: product_flavor(openSUSE) = 20211230-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -552,10 +552,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20211229</version> + <version>20211230</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20211229</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20211230</cpeid> <productline>openSUSE</productline> <register> <pool>

1 0

commit 000update-repos for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2021-12-30 21:08:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Thu Dec 30 21:08:45 2021 rev:1881 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- 15.2:update_1640883876.packages.xz factory:non-oss_3040.1.packages.xz factory_20211228.packages.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit kopete for openSUSE:Leap:15.2:Update
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kopete for openSUSE:Leap:15.2:Update checked in at 2021-12-30 18:01:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/kopete (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.kopete.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kopete" Thu Dec 30 18:01:52 2021 rev:1 rq:942795 version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='kopete.17321' cicount='copy' />

1 0

commit btop for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package btop for openSUSE:Factory checked in at 2021-12-30 17:10:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btop (Old) and /work/SRC/openSUSE:Factory/.btop.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "btop" Thu Dec 30 17:10:29 2021 rev:11 rq:943242 version:1.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/btop/btop.changes 2021-12-13 20:51:18.960670220 +0100 +++ /work/SRC/openSUSE:Factory/.btop.new.1896/btop.changes 2021-12-30 17:10:31.282856026 +0100 @@ -1,0 +2,9 @@ +Wed Dec 29 21:39:39 UTC 2021 - Scott Bradnick <scott.bradnick(a)suse.com> - 1.1.4 + +- Update to upstream release 1.1.4: + * Fixed: Create dependency files in build directory when compiling, by @stwnt + * Fixed: fix CPU temp fallback on macOS, by @joske + * Changed: From rng::sort() to rng::stable_sort() for more stability + * Fixed: in_avail() can always be zero, by @pg83 + +------------------------------------------------------------------- Old: ---- v1.1.3.tar.gz New: ---- v1.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btop.spec ++++++ --- /var/tmp/diff_new_pack.dLt4cu/_old 2021-12-30 17:10:31.770856297 +0100 +++ /var/tmp/diff_new_pack.dLt4cu/_new 2021-12-30 17:10:31.774856300 +0100 @@ -17,7 +17,7 @@ Name: btop -Version: 1.1.3 +Version: 1.1.4 Release: 0 Summary: Usage and stats for processor, memory, disks, network and processes License: Apache-2.0 ++++++ v1.1.3.tar.gz -> v1.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/CHANGELOG.md new/btop-1.1.4/CHANGELOG.md --- old/btop-1.1.3/CHANGELOG.md 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/CHANGELOG.md 2021-12-29 14:40:32.000000000 +0100 @@ -1,3 +1,13 @@ +## v1.1.4 + +* Fixed: Create dependency files in build directory when compiling, by @stwnt + +* Fixed: fix CPU temp fallback on macOS, by @joske + +* Changed: From rng::sort() to rng::stable_sort() for more stability + +* Fixed: in_avail() can always be zero, by @pg83 + ## v1.1.3 * Added: New theme ayu, by @AlphaNecron diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/Makefile new/btop-1.1.4/Makefile --- old/btop-1.1.3/Makefile 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/Makefile 2021-12-29 14:40:32.000000000 +0100 @@ -223,12 +223,7 @@ @sleep 0.3 2>/dev/null || true @TSTAMP=$$(date +%s 2>/dev/null || echo "0") @$(QUIET) || printf "\033[1;97mCompiling $<\033[0m\n" - @$(CXX) $(CXXFLAGS) $(INC) -c -o $@ $< || exit 1 - @$(CXX) $(CXXFLAGS) $(INC) -MM $(SRCDIR)/$*.$(SRCEXT) > $(BUILDDIR)/$*.$(DEPEXT) >/dev/null || exit 1 - @cp -f $(BUILDDIR)/$*.$(DEPEXT) $(BUILDDIR)/$*.$(DEPEXT).tmp - @sed -e 's|.*:|$(BUILDDIR)/$*.$(OBJEXT):|' < $(BUILDDIR)/$*.$(DEPEXT).tmp > $(BUILDDIR)/$*.$(DEPEXT) - @sed -e 's/.*://' -e 's/\\$$//' < $(BUILDDIR)/$*.$(DEPEXT).tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $(BUILDDIR)/$*.$(DEPEXT) - @rm -f $(BUILDDIR)/$*.$(DEPEXT).tmp + @$(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $< || exit 1 @printf "\033[1;92m-> \033[1;37m$@ \033[100D\033[35C\033[1;93m(\033[1;97m$$(du -ah $@ | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n" #? Non-File Targets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/README.md new/btop-1.1.4/README.md --- old/btop-1.1.3/README.md 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/README.md 2021-12-29 14:40:32.000000000 +0100 @@ -507,8 +507,8 @@ force_tty = False #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets. -#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positons, G=graph symbol to use for box. -#* Use withespace " " as seprator between different presets. +#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box. +#* Use withespace " " as separator between different presets. #* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty" presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/btop.cpp new/btop-1.1.4/src/btop.cpp --- old/btop-1.1.3/src/btop.cpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/btop.cpp 2021-12-29 14:40:32.000000000 +0100 @@ -17,6 +17,7 @@ */ #include <csignal> +#include <clocale> #include <pthread.h> #include <thread> #include <numeric> @@ -56,7 +57,7 @@ {"#801414", "�� "}, {"#000000", "�� "}, }; - const string Version = "1.1.3"; + const string Version = "1.1.4"; int coreCount; string overlay; @@ -237,14 +238,14 @@ } Logger::info("Quitting! Runtime: " + sec_to_dhms(time_s() - Global::start_time)); + const auto excode = (sig != -1 ? sig : 0); + //? Assume error if still not cleaned up and call quick_exit to avoid a segfault from Tools::atomic_lock destructor -#ifndef __APPLE__ - if (Tools::active_locks > 0) { - quick_exit((sig != -1 ? sig : 0)); - } +#ifdef __APPLE__ + _Exit(excode); +#else + quick_exit(excode); #endif - - if (sig != -1) exit(sig); } //* Handler for SIGTSTP; stops threads, restores terminal and sends SIGSTOP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/btop_config.cpp new/btop-1.1.4/src/btop_config.cpp --- old/btop-1.1.3/src/btop_config.cpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/btop_config.cpp 2021-12-29 14:40:32.000000000 +0100 @@ -50,8 +50,8 @@ "#* Will force 16-color mode and TTY theme, set all graph symbols to \"tty\" and swap out other non tty friendly symbols."}, {"presets", "#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.\n" - "#* Format: \"box_name:P:G,box_name:P:G\" P=(0 or 1) for alternate positons, G=graph symbol to use for box.\n" - "#* Use withespace \" \" as seprator between different presets.\n" + "#* Format: \"box_name:P:G,box_name:P:G\" P=(0 or 1) for alternate positions, G=graph symbol to use for box.\n" + "#* Use withespace \" \" as separator between different presets.\n" "#* Example: \"cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty\""}, {"vim_keys", "#* Set to True to enable \"h,j,k,l\" keys for directional control in lists.\n" @@ -603,4 +603,4 @@ } } } -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/btop_config.hpp new/btop-1.1.4/src/btop_config.hpp --- old/btop-1.1.3/src/btop_config.hpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/btop_config.hpp 2021-12-29 14:40:32.000000000 +0100 @@ -48,7 +48,7 @@ extern vector<string> available_batteries; extern int current_preset; - //* Check if string only contains space seperated valid names for boxes + //* Check if string only contains space separated valid names for boxes bool check_boxes(const string& boxes); //* Toggle box and update config string shown_boxes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/btop_input.cpp new/btop-1.1.4/src/btop_input.cpp --- old/btop-1.1.3/src/btop_input.cpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/btop_input.cpp 2021-12-29 14:40:32.000000000 +0100 @@ -19,6 +19,8 @@ #include <iostream> #include <ranges> #include <vector> +#include <thread> +#include <mutex> #include <btop_input.hpp> #include <btop_tools.hpp> @@ -78,14 +80,66 @@ deque<string> history(50, ""); string old_filter; + struct InputThr { + InputThr() : thr(run, this) { + } + + static void run(InputThr* that) { + that->runImpl(); + } + + void runImpl() { + char ch = 0; + + // TODO(pg83): read whole buffer + while (cin.get(ch)) { + std::lock_guard<std::mutex> g(lock); + current.push_back(ch); + if (current.size() > 100) { + current.clear(); + } + } + } + + size_t avail() { + std::lock_guard<std::mutex> g(lock); + + return current.size(); + } + + std::string get() { + std::string res; + + { + std::lock_guard<std::mutex> g(lock); + + res.swap(current); + } + + return res; + } + + static InputThr& instance() { + // intentional memory leak, to simplify shutdown process + static InputThr* input = new InputThr(); + + return *input; + } + + std::string current; + // TODO(pg83): use std::conditional_variable instead of sleep + std::mutex lock; + std::thread thr; + }; + bool poll(int timeout) { - if (timeout < 1) return cin.rdbuf()->in_avail() > 0; + if (timeout < 1) return InputThr::instance().avail() > 0; while (timeout > 0) { if (interrupt) { interrupt = false; return false; } - if (cin.rdbuf()->in_avail() > 0) return true; + if (InputThr::instance().avail() > 0) return true; sleep_ms(timeout < 10 ? timeout : 10); timeout -= 10; } @@ -93,9 +147,7 @@ } string get() { - string key; - while (cin.rdbuf()->in_avail() > 0 and key.size() < 100) key += cin.get(); - if (cin.rdbuf()->in_avail() > 0) clear(); + string key = InputThr::instance().get(); if (not key.empty()) { //? Remove escape code prefix if present if (key.substr(0, 2) == Fx::e) { @@ -168,19 +220,14 @@ } string wait() { - while (cin.rdbuf()->in_avail() < 1) { + while (InputThr::instance().avail() < 1) { sleep_ms(10); } return get(); } void clear() { - if (auto first_num = cin.rdbuf()->in_avail(); first_num > 0) { - while (cin.rdbuf()->in_avail() == first_num) { - if (first_num-- <= 0) break; - cin.ignore(1); - } - } + // do not need it, actually } void process(const string& key) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/btop_menu.cpp new/btop-1.1.4/src/btop_menu.cpp --- old/btop-1.1.3/src/btop_menu.cpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/btop_menu.cpp 2021-12-29 14:40:32.000000000 +0100 @@ -194,10 +194,10 @@ "Max 9 presets.", "", "Format: \"box_name:P:G,box_name:P:G\"", - "P=(0 or 1) for alternate positons.", + "P=(0 or 1) for alternate positions.", "G=graph symbol to use for box.", "", - "Use withespace \" \" as seprator between", + "Use withespace \" \" as separator between", "different presets.", "", "Example:", @@ -206,7 +206,7 @@ "Manually set which boxes to show.", "", "Available values are \"cpu mem net proc\".", - "Seperate values with whitespace.", + "Separate values with whitespace.", "", "Toggle between presets with key \"p\"."}, {"update_ms", @@ -435,7 +435,7 @@ "equals 100 percent in the io graphs.", "(100 MiB/s by default).", "", - "Format: \"device:speed\" seperate disks with", + "Format: \"device:speed\" separate disks with", "whitespace \" \".", "", "Example: \"/dev/sda:100, /dev/sdb:20\"."}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/linux/btop_collect.cpp new/btop-1.1.4/src/linux/btop_collect.cpp --- old/btop-1.1.3/src/linux/btop_collect.cpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/linux/btop_collect.cpp 2021-12-29 14:40:32.000000000 +0100 @@ -1631,17 +1631,29 @@ //* Sort processes if (sorted_change or not no_update) { - switch (v_index(sort_vector, sorting)) { - case 0: rng::sort(current_procs, rng::greater{}, &proc_info::pid); break; - case 1: rng::sort(current_procs, rng::greater{}, &proc_info::name); break; - case 2: rng::sort(current_procs, rng::greater{}, &proc_info::cmd); break; - case 3: rng::sort(current_procs, rng::greater{}, &proc_info::threads); break; - case 4: rng::sort(current_procs, rng::greater{}, &proc_info::user); break; - case 5: rng::sort(current_procs, rng::greater{}, &proc_info::mem); break; - case 6: rng::sort(current_procs, rng::greater{}, &proc_info::cpu_p); break; - case 7: rng::sort(current_procs, rng::greater{}, &proc_info::cpu_c); break; + if (reverse) { + switch (v_index(sort_vector, sorting)) { + case 0: rng::stable_sort(current_procs, rng::less{}, &proc_info::pid); break; + case 1: rng::stable_sort(current_procs, rng::less{}, &proc_info::name); break; + case 2: rng::stable_sort(current_procs, rng::less{}, &proc_info::cmd); break; + case 3: rng::stable_sort(current_procs, rng::less{}, &proc_info::threads); break; + case 4: rng::stable_sort(current_procs, rng::less{}, &proc_info::user); break; + case 5: rng::stable_sort(current_procs, rng::less{}, &proc_info::mem); break; + case 6: rng::stable_sort(current_procs, rng::less{}, &proc_info::cpu_p); break; + case 7: rng::stable_sort(current_procs, rng::less{}, &proc_info::cpu_c); break; + } + } else { + switch (v_index(sort_vector, sorting)) { + case 0: rng::stable_sort(current_procs, rng::greater{}, &proc_info::pid); break; + case 1: rng::stable_sort(current_procs, rng::greater{}, &proc_info::name); break; + case 2: rng::stable_sort(current_procs, rng::greater{}, &proc_info::cmd); break; + case 3: rng::stable_sort(current_procs, rng::greater{}, &proc_info::threads); break; + case 4: rng::stable_sort(current_procs, rng::greater{}, &proc_info::user); break; + case 5: rng::stable_sort(current_procs, rng::greater{}, &proc_info::mem); break; + case 6: rng::stable_sort(current_procs, rng::greater{}, &proc_info::cpu_p); break; + case 7: rng::stable_sort(current_procs, rng::greater{}, &proc_info::cpu_c); break; + } } - if (reverse) rng::reverse(current_procs); //* When sorting with "cpu lazy" push processes over threshold cpu usage to the front regardless of cumulative usage if (not tree and not reverse and sorting == "cpu lazy") { @@ -1714,9 +1726,7 @@ } //? Final sort based on tree index - rng::sort(current_procs, rng::less{}, &proc_info::tree_index); - if (reverse) rng::reverse(current_procs); - + rng::stable_sort(current_procs, rng::less{}, &proc_info::tree_index); } numpids = (int)current_procs.size() - filter_found; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/osx/btop_collect.cpp new/btop-1.1.4/src/osx/btop_collect.cpp --- old/btop-1.1.3/src/osx/btop_collect.cpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/osx/btop_collect.cpp 2021-12-29 14:40:32.000000000 +0100 @@ -15,6 +15,7 @@ indent = tab tab-size = 4 */ + #include <CoreFoundation/CoreFoundation.h> #include <IOKit/IOKitLib.h> #include <arpa/inet.h> @@ -68,6 +69,7 @@ cpu_info current_cpu; fs::path freq_path = "/sys/devices/system/cpu/cpufreq/policy0/scaling_cur_freq"; bool got_sensors = false, cpu_temp_only = false; + int core_offset = 0; //* Populate found_sensors map bool get_sensors(); @@ -241,21 +243,34 @@ } bool get_sensors() { + Logger::debug("get_sensors(): show_coretemp=" + std::to_string(Config::getB("show_coretemp")) + " check_temp=" + std::to_string(Config::getB("check_temp"))); got_sensors = false; if (Config::getB("show_coretemp") and Config::getB("check_temp")) { ThermalSensors sensors; if (sensors.getSensors() > 0) { + Logger::debug("M1 sensors found"); got_sensors = true; cpu_temp_only = true; macM1 = true; } else { // try SMC (intel) + Logger::debug("checking intel"); SMCConnection smcCon; try { long long t = smcCon.getTemp(-1); // check if we have package T if (t > -1) { + Logger::debug("intel sensors found"); got_sensors = true; + t = smcCon.getTemp(0); + if (t == -1) { + // for some macs the core offset is 1 - check if we get a sane value with 1 + if (smcCon.getTemp(1) > -1) { + Logger::debug("intel sensors with offset 1"); + core_offset = 1; + } + } } else { + Logger::debug("no intel sensors found"); got_sensors = false; } } catch (std::runtime_error &e) { @@ -282,14 +297,12 @@ long long packageT = smcCon.getTemp(-1); // -1 returns package T current_cpu.temp.at(0).push_back(packageT); - if (Config::getB("show_coretemp") and not cpu_temp_only) { - for (int core = 0; core < Shared::coreCount; core++) { - long long temp = smcCon.getTemp(core / threadsPerCore); // same temp for all threads of same physical core - if (cmp_less(core + 1, current_cpu.temp.size())) { - current_cpu.temp.at(core + 1).push_back(temp); - if (current_cpu.temp.at(core + 1).size() > 20) - current_cpu.temp.at(core + 1).pop_front(); - } + for (int core = 0; core < Shared::coreCount; core++) { + long long temp = smcCon.getTemp((core / threadsPerCore) + core_offset); // same temp for all threads of same physical core + if (cmp_less(core + 1, current_cpu.temp.size())) { + current_cpu.temp.at(core + 1).push_back(temp); + if (current_cpu.temp.at(core + 1).size() > 20) + current_cpu.temp.at(core + 1).pop_front(); } } } @@ -1306,17 +1319,29 @@ //* Sort processes if (sorted_change or not no_update) { - switch (v_index(sort_vector, sorting)) { - case 0: rng::sort(current_procs, rng::greater{}, &proc_info::pid); break; - case 1: rng::sort(current_procs, rng::greater{}, &proc_info::name); break; - case 2: rng::sort(current_procs, rng::greater{}, &proc_info::cmd); break; - case 3: rng::sort(current_procs, rng::greater{}, &proc_info::threads); break; - case 4: rng::sort(current_procs, rng::greater{}, &proc_info::user); break; - case 5: rng::sort(current_procs, rng::greater{}, &proc_info::mem); break; - case 6: rng::sort(current_procs, rng::greater{}, &proc_info::cpu_p); break; - case 7: rng::sort(current_procs, rng::greater{}, &proc_info::cpu_c); break; + if (reverse) { + switch (v_index(sort_vector, sorting)) { + case 0: rng::stable_sort(current_procs, rng::less{}, &proc_info::pid); break; + case 1: rng::stable_sort(current_procs, rng::less{}, &proc_info::name); break; + case 2: rng::stable_sort(current_procs, rng::less{}, &proc_info::cmd); break; + case 3: rng::stable_sort(current_procs, rng::less{}, &proc_info::threads); break; + case 4: rng::stable_sort(current_procs, rng::less{}, &proc_info::user); break; + case 5: rng::stable_sort(current_procs, rng::less{}, &proc_info::mem); break; + case 6: rng::stable_sort(current_procs, rng::less{}, &proc_info::cpu_p); break; + case 7: rng::stable_sort(current_procs, rng::less{}, &proc_info::cpu_c); break; + } + } else { + switch (v_index(sort_vector, sorting)) { + case 0: rng::stable_sort(current_procs, rng::greater{}, &proc_info::pid); break; + case 1: rng::stable_sort(current_procs, rng::greater{}, &proc_info::name); break; + case 2: rng::stable_sort(current_procs, rng::greater{}, &proc_info::cmd); break; + case 3: rng::stable_sort(current_procs, rng::greater{}, &proc_info::threads); break; + case 4: rng::stable_sort(current_procs, rng::greater{}, &proc_info::user); break; + case 5: rng::stable_sort(current_procs, rng::greater{}, &proc_info::mem); break; + case 6: rng::stable_sort(current_procs, rng::greater{}, &proc_info::cpu_p); break; + case 7: rng::stable_sort(current_procs, rng::greater{}, &proc_info::cpu_c); break; + } } - if (reverse) rng::reverse(current_procs); //* When sorting with "cpu lazy" push processes over threshold cpu usage to the front regardless of cumulative usage if (not tree and not reverse and sorting == "cpu lazy") { @@ -1382,8 +1407,7 @@ } //? Final sort based on tree index - rng::sort(current_procs, rng::less{}, &proc_info::tree_index); - if (reverse) rng::reverse(current_procs); + rng::stable_sort(current_procs, rng::less{}, &proc_info::tree_index); } numpids = (int)current_procs.size() - filter_found; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/osx/sensors.cpp new/btop-1.1.4/src/osx/sensors.cpp --- old/btop-1.1.3/src/osx/sensors.cpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/osx/sensors.cpp 2021-12-29 14:40:32.000000000 +0100 @@ -1,3 +1,21 @@ +/* Copyright 2021 Aristocratos (jakob(a)qvantnet.com) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +indent = tab +tab-size = 4 +*/ + #include "sensors.hpp" #include <CoreFoundation/CoreFoundation.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/osx/sensors.hpp new/btop-1.1.4/src/osx/sensors.hpp --- old/btop-1.1.3/src/osx/sensors.hpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/osx/sensors.hpp 2021-12-29 14:40:32.000000000 +0100 @@ -1,3 +1,20 @@ +/* Copyright 2021 Aristocratos (jakob(a)qvantnet.com) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +indent = tab +tab-size = 4 +*/ namespace Cpu { class ThermalSensors { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/osx/smc.cpp new/btop-1.1.4/src/osx/smc.cpp --- old/btop-1.1.3/src/osx/smc.cpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/osx/smc.cpp 2021-12-29 14:40:32.000000000 +0100 @@ -1,3 +1,21 @@ +/* Copyright 2021 Aristocratos (jakob(a)qvantnet.com) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +indent = tab +tab-size = 4 +*/ + #include "smc.hpp" static UInt32 _strtoul(char *str, int size, int base) { @@ -50,32 +68,39 @@ IOServiceClose(conn); } + long long SMCConnection::getSMCTemp(char *key) { + SMCVal_t val; + kern_return_t result; + result = SMCReadKey(key, &val); + if (result == kIOReturnSuccess) { + if (val.dataSize > 0) { + if (strcmp(val.dataType, DATATYPE_SP78) == 0) { + // convert sp78 value to temperature + int intValue = val.bytes[0] * 256 + (unsigned char)val.bytes[1]; + return static_cast<long long>(intValue / 256.0); + } + } + } + return -1; + } + // core means physical core in SMC, while in core map it's cpu threads :-/ Only an issue on hackintosh? // this means we can only get the T per physical core // another issue with the SMC API is that the key is always 4 chars -> what with systems with more than 9 physical cores? // no Mac models with more than 18 threads are released, so no problem so far // according to VirtualSMC docs (hackintosh fake SMC) the enumeration follows with alphabetic chars - not implemented yet here (nor in VirtualSMC) long long SMCConnection::getTemp(int core) { - SMCVal_t val; - kern_return_t result; char key[] = SMC_KEY_CPU_TEMP; if (core >= 0) { snprintf(key, 5, "TC%1dc", core); } - result = SMCReadKey(key, &val); - if (result != kIOReturnSuccess) { + long long result = getSMCTemp(key); + if (result == -1) { // try again with C snprintf(key, 5, "TC%1dC", core); - result = SMCReadKey(key, &val); + result = getSMCTemp(key); } - if (result == kIOReturnSuccess) { - if (strcmp(val.dataType, DATATYPE_SP78) == 0) { - // convert sp78 value to temperature - int intValue = val.bytes[0] * 256 + (unsigned char)val.bytes[1]; - return static_cast<long long>(intValue / 256.0); - } - } - return -1; + return result; } kern_return_t SMCConnection::SMCReadKey(UInt32Char_t key, SMCVal_t *val) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btop-1.1.3/src/osx/smc.hpp new/btop-1.1.4/src/osx/smc.hpp --- old/btop-1.1.3/src/osx/smc.hpp 2021-12-11 18:22:08.000000000 +0100 +++ new/btop-1.1.4/src/osx/smc.hpp 2021-12-29 14:40:32.000000000 +0100 @@ -1,3 +1,21 @@ +/* Copyright 2021 Aristocratos (jakob(a)qvantnet.com) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +indent = tab +tab-size = 4 +*/ + #pragma once #include <CoreFoundation/CoreFoundation.h> @@ -26,7 +44,8 @@ // key values #define SMC_KEY_CPU_TEMP "TC0P" // proximity temp? -#define SMC_KEY_CPU_DIE_TEMP "TC0D" // die temp? +#define SMC_KEY_CPU_DIODE_TEMP "TC0D" // diode temp? +#define SMC_KEY_CPU_DIE_TEMP "TC0F" // die temp? #define SMC_KEY_CPU1_TEMP "TC1C" #define SMC_KEY_CPU2_TEMP "TC2C" // etc #define SMC_KEY_FAN0_RPM_CUR "F0Ac" @@ -86,6 +105,7 @@ private: kern_return_t SMCReadKey(UInt32Char_t key, SMCVal_t *val); + long long getSMCTemp(char *key); kern_return_t SMCCall(int index, SMCKeyData_t *inputStructure, SMCKeyData_t *outputStructure); io_connect_t conn;

1 0

commit log4j for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package log4j for openSUSE:Factory checked in at 2021-12-30 17:10:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/log4j (Old) and /work/SRC/openSUSE:Factory/.log4j.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "log4j" Thu Dec 30 17:10:28 2021 rev:35 rq:943087 version:2.17.1 Changes: -------- --- /work/SRC/openSUSE:Factory/log4j/log4j.changes 2021-12-18 20:31:17.890277601 +0100 +++ /work/SRC/openSUSE:Factory/.log4j.new.1896/log4j.changes 2021-12-30 17:10:30.350855507 +0100 @@ -1,0 +2,24 @@ +Wed Dec 29 08:34:08 UTC 2021 - David Anes <david.anes(a)suse.com> + +- Update to 2.17.1 [bsc#1194127, CVE-2021-44832] + * Fixed bugs: + - JdbcAppender now uses JndiManager to access JNDI resources. + JNDI is only enabled when system property log4j2.enableJndiJdbc + is set to true. + - Remove unused method. + - ExtendedLoggerWrapper.logMessage no longer double-logs when + location is requested. + - log4j-to-slf4j no longer re-interpolates formatted message + contents. + - Correct SpringLookup package name in Interpolator. + - log4j-to-slf4j takes the provided MessageFactory into account. + - Fix MapLookup to lookup MapMessage before DefaultMap. + - Buffered I/O checked had inverted logic in + RollingFileAppenderBuidler. + - Fix NPE when input is null in + StrSubstitutor.replace(String, Properties). + - Lookups with no prefix only read values from the configuration + properties as expected. + - Reduce ignored package scope of KafkaAppender. + +------------------------------------------------------------------- Old: ---- apache-log4j-2.17.0-src.tar.gz apache-log4j-2.17.0-src.tar.gz.asc New: ---- apache-log4j-2.17.1-src.tar.gz apache-log4j-2.17.1-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4j.spec ++++++ --- /var/tmp/diff_new_pack.1uUB4R/_old 2021-12-30 17:10:31.094855921 +0100 +++ /var/tmp/diff_new_pack.1uUB4R/_new 2021-12-30 17:10:31.102855926 +0100 @@ -17,7 +17,7 @@ Name: log4j -Version: 2.17.0 +Version: 2.17.1 Release: 0 Summary: Java logging package License: Apache-2.0 ++++++ apache-log4j-2.17.0-src.tar.gz -> apache-log4j-2.17.1-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/log4j/apache-log4j-2.17.0-src.tar.gz /work/SRC/openSUSE:Factory/.log4j.new.1896/apache-log4j-2.17.1-src.tar.gz differ: char 25, line 1 ++++++ log4j.keyring ++++++ --- /var/tmp/diff_new_pack.1uUB4R/_old 2021-12-30 17:10:31.162855959 +0100 +++ /var/tmp/diff_new_pack.1uUB4R/_new 2021-12-30 17:10:31.166855961 +0100 @@ -1033,4 +1033,76 @@ UJ9MVCU= =yL9f -----END PGP PUBLIC KEY BLOCK----- +pub rsa4096/0x47B1D6AD0E682C9C 2020-08-03 [SC] + Key fingerprint = C47B C76D F019 2CB2 9465 BBCF 47B1 D6AD 0E68 2C9C +uid [ full ] Davyd McColl <davydm(a)gmail.com> +sig 3 0x47B1D6AD0E682C9C 2020-08-03 Davyd McColl <davydm(a)gmail.com> +sig 0xD7C92B70FA1C814D 2020-09-21 Matt Sicker (Apache Software Foundation) <mattsicker(a)apache.org> +sub rsa4096/0x7C9D34B68B32C4AE 2020-08-03 [E] + Key fingerprint = 8CEF B3E7 914C 238C 44F5 37D6 7C9D 34B6 8B32 C4AE +sig 0x47B1D6AD0E682C9C 2020-08-03 Davyd McColl <davydm(a)gmail.com> + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=hEmT +-----END PGP PUBLIC KEY BLOCK-----

1 0

commit gnome-todo for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-todo for openSUSE:Factory checked in at 2021-12-30 17:10:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-todo (Old) and /work/SRC/openSUSE:Factory/.gnome-todo.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-todo" Thu Dec 30 17:10:27 2021 rev:23 rq:943239 version:41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-todo/gnome-todo.changes 2021-11-05 22:59:22.476310666 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-todo.new.1896/gnome-todo.changes 2021-12-30 17:10:29.302854924 +0100 @@ -1,0 +2,8 @@ +Wed Dec 29 09:47:45 UTC 2021 - Bj��rn Lie <bjorn.lie(a)gmail.com> + +- Add fdupes BuildRequires and macro, remove duplicate files. Add + a note about why we are passing introspection=false to meson and + not building introspection support (brings a dependency on a + private library). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-todo.spec ++++++ --- /var/tmp/diff_new_pack.0EJyt7/_old 2021-12-30 17:10:29.858855234 +0100 +++ /var/tmp/diff_new_pack.0EJyt7/_new 2021-12-30 17:10:29.862855236 +0100 @@ -26,6 +26,7 @@ URL: https://wiki.gnome.org/Apps/Todo Source0: https://download.gnome.org/sources/gnome-todo/41/%{name}-%{version}.tar.xz +BuildRequires: fdupes BuildRequires: itstool BuildRequires: meson BuildRequires: pkgconfig @@ -74,6 +75,7 @@ %autosetup -p1 %build +# NOTE: We are not building introspection support as that introduces a dep on a private lib, last checked ver 41.0 %meson \ -Dintrospection=false \ %{nil} @@ -83,6 +85,7 @@ %meson_install %suse_update_desktop_file -r org.gnome.Todo Office ProjectManagement %find_lang %{name} %{?no_lang_C} +%fdupes %{buildroot}%{_datadir} %files %license COPYING @@ -95,7 +98,6 @@ %{_datadir}/help/C/%{name}/ %{_datadir}/icons/hicolor/*/apps/org.gnome.Todo* %{_datadir}/icons/hicolor/symbolic/actions/ -%dir %{_datadir}/metainfo %{_datadir}/metainfo/org.gnome.Todo.appdata.xml %files devel

1 0

commit seadrive-gui for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package seadrive-gui for openSUSE:Factory checked in at 2021-12-30 15:56:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seadrive-gui (Old) and /work/SRC/openSUSE:Factory/.seadrive-gui.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seadrive-gui" Thu Dec 30 15:56:23 2021 rev:9 rq:943231 version:2.0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/seadrive-gui/seadrive-gui.changes 2021-11-10 21:47:06.587828752 +0100 +++ /work/SRC/openSUSE:Factory/.seadrive-gui.new.1896/seadrive-gui.changes 2021-12-30 15:56:24.660700363 +0100 @@ -1,0 +2,5 @@ +Thu Dec 30 14:26:28 UTC 2021 - Paolo Stivanin <info(a)paolostivanin.com> + +- Update to v2.0.19 (no changelog) + +------------------------------------------------------------------- Old: ---- seadrive-gui-2.0.18.tar.gz New: ---- seadrive-gui-2.0.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seadrive-gui.spec ++++++ --- /var/tmp/diff_new_pack.p4qQAD/_old 2021-12-30 15:56:25.304700860 +0100 +++ /var/tmp/diff_new_pack.p4qQAD/_new 2021-12-30 15:56:25.312700866 +0100 @@ -17,7 +17,7 @@ Name: seadrive-gui -Version: 2.0.18 +Version: 2.0.19 Release: 0 Summary: GUI part of seafile drive License: GPL-3.0-only ++++++ seadrive-gui-2.0.18.tar.gz -> seadrive-gui-2.0.19.tar.gz ++++++ /work/SRC/openSUSE:Factory/seadrive-gui/seadrive-gui-2.0.18.tar.gz /work/SRC/openSUSE:Factory/.seadrive-gui.new.1896/seadrive-gui-2.0.19.tar.gz differ: char 16, line 1

1 0

commit libcotp for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libcotp for openSUSE:Factory checked in at 2021-12-30 15:55:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcotp (Old) and /work/SRC/openSUSE:Factory/.libcotp.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcotp" Thu Dec 30 15:55:47 2021 rev:3 rq:943233 version:1.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libcotp/libcotp.changes 2020-04-23 18:39:59.297184015 +0200 +++ /work/SRC/openSUSE:Factory/.libcotp.new.1896/libcotp.changes 2021-12-30 15:56:14.420692468 +0100 @@ -1,0 +2,7 @@ +Wed Dec 29 08:44:18 UTC 2021 - Paolo Stivanin <info(a)paolostivanin.com> + +- Update to v1.2.4: + * small fixes from PVS scan + * tests: do no require installation to run tests + +------------------------------------------------------------------- Old: ---- v1.2.2.tar.gz New: ---- v1.2.4.tar.gz v1.2.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcotp.spec ++++++ --- /var/tmp/diff_new_pack.dRfkLB/_old 2021-12-30 15:56:14.876692819 +0100 +++ /var/tmp/diff_new_pack.dRfkLB/_new 2021-12-30 15:56:14.884692825 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcotp # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,19 @@ # +%define libsoname %{name}12 %if 0%{?fedora_version} %global debug_package %{nil} %endif -%define libsoname %{name}12 Name: libcotp -Version: 1.2.2 +Version: 1.2.4 Release: 0 Summary: C library for generating TOTP and HOTP License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/paolostivanin/%{name} -Source: https://github.com/paolostivanin/%{name}/archive/v%{version}.tar.gz +Source0: https://github.com/paolostivanin/%{name}/archive/v%{version}.tar.gz +Source1: https://github.com/paolostivanin/%{name}/archive/v%{version}.tar.gz.asc BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ ++++++ v1.2.2.tar.gz -> v1.2.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/CMakeLists.txt new/libcotp-1.2.4/CMakeLists.txt --- old/libcotp-1.2.2/CMakeLists.txt 2019-02-01 17:15:54.000000000 +0100 +++ new/libcotp-1.2.4/CMakeLists.txt 2021-12-29 09:35:40.000000000 +0100 @@ -17,7 +17,7 @@ # set up versioning. set(BUILD_MAJOR "1") set(BUILD_MINOR "2") -set(BUILD_VERSION "2") +set(BUILD_VERSION "4") set(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_VERSION}) set(CMAKE_C_STANDARD 11) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/README.md new/libcotp-1.2.4/README.md --- old/libcotp-1.2.2/README.md 2019-02-01 17:15:54.000000000 +0100 +++ new/libcotp-1.2.4/README.md 2021-12-29 09:35:40.000000000 +0100 @@ -4,11 +4,6 @@ src="https://scan.coverity.com/projects/12748/badge.svg"/> </a> -<a href="https://app.shippable.com/github/paolostivanin/libcotp"> - <img alt="Shippable Build Status" - src="https://api.shippable.com/projects/58e3d5759401b40600a7c026/badge?branch=ma…"/> -</a> - C library that generates TOTP and HOTP according to [RFC-6238](https://tools.ietf.org/html/rfc6238) ## Requirements @@ -63,3 +58,4 @@ `totp_verify` and `hotp_verify` can return, in addition to one of the previous code, also the error `INVALID_OTP` if the given OTP doesn't match the computed one. In case of success, the value returned by `get_totp`, `get_hotp` and `get_totp_at` **must be freed** once no longer needed. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/shippable.yml new/libcotp-1.2.4/shippable.yml --- old/libcotp-1.2.2/shippable.yml 2019-02-01 17:15:54.000000000 +0100 +++ new/libcotp-1.2.4/shippable.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -language: c - -branches: - only: - - master - -compiler: - - gcc - - clang - -build: - ci: - - mkdir -pv "shippable/testresults" - - sudo add-apt-repository ppa:snaipewastaken/ppa - - sudo apt update - - sudo apt install cmake libgcrypt20-dev criterion-dev - - git clone https://github.com/paolostivanin/libbaseencode.git - - cd libbaseencode && mkdir build && cd $_ - - cmake .. -DCMAKE_INSTALL_PREFIX=/usr - - make - - sudo make install - - cd ../.. - - mkdir build && cd $_ - - cmake .. -DCMAKE_INSTALL_PREFIX=/usr - - make - - sudo make install - - cmake .. -DBUILD_TESTING=ON - - make - - ./tests/test_cotp --xml=test.xml - - mv -v test.xml ../shippable/testresults diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/src/otp.c new/libcotp-1.2.4/src/otp.c --- old/libcotp-1.2.2/src/otp.c 2019-02-01 17:15:54.000000000 +0100 +++ new/libcotp-1.2.4/src/otp.c 2021-12-29 09:35:40.000000000 +0100 @@ -31,6 +31,10 @@ normalize_secret (const char *K) { char *nK = calloc (1, strlen (K) + 1); + if (nK == NULL) { + fprintf (stderr, "Error during memory allocation\n"); + return nK; + } int i = 0, j = 0; while (K[i] != '\0') { @@ -58,9 +62,10 @@ const char steam_alphabet[] = "23456789BCDFGHJKMNPQRTVWXY"; char code[6]; + size_t steam_alphabet_len = strlen(steam_alphabet); for (int i = 0; i < 5; i++) { - int mod = bin_code % strlen(steam_alphabet); - bin_code = bin_code / strlen(steam_alphabet); + int mod = bin_code % steam_alphabet_len; + bin_code = bin_code / steam_alphabet_len; code[i] = steam_alphabet[mod]; } code[5] = '\0'; @@ -104,6 +109,9 @@ size_t secret_len = (size_t) ((strlen(K) + 1.6 - 1) / 1.6); char *normalized_K = normalize_secret (K); + if (normalized_K == NULL) { + return NULL; + } unsigned char *secret = base32_decode(normalized_K, strlen(normalized_K), &err); free (normalized_K); if (secret == NULL) { @@ -134,11 +142,16 @@ char *token = malloc((size_t)digits_length + 1); if (token == NULL) { fprintf (stderr, "Error during memory allocation\n"); - return NULL; + return token; } else { int extra_char = digits_length < 10 ? 0 : 1; char *fmt = calloc(1, 5 + extra_char); - memcpy (fmt, "%.", 2); + if (fmt == NULL) { + fprintf (stderr, "Error during memory allocation\n"); + free (token); + return fmt; + } + memcpy (fmt, "%.", 3); snprintf (fmt + 2, 2 + extra_char, "%d", digits_length); memcpy (fmt + 3 + extra_char, "d", 2); snprintf (token, digits_length + 1, fmt, tk); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/tests/CMakeLists.txt new/libcotp-1.2.4/tests/CMakeLists.txt --- old/libcotp-1.2.2/tests/CMakeLists.txt 2019-02-01 17:15:54.000000000 +0100 +++ new/libcotp-1.2.4/tests/CMakeLists.txt 2021-12-29 09:35:40.000000000 +0100 @@ -3,6 +3,8 @@ add_executable (test_cotp test_otp.c) target_link_libraries (test_cotp -lcotp -lcriterion -lbaseencode -lgcrypt) + target_link_directories (test_cotp PRIVATE ${PROJECT_BINARY_DIR}) + add_dependencies (test_cotp cotp) add_test (NAME TestCOTP COMMAND test_cotp) ENDIF(BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/tests/docker/Dockerfile new/libcotp-1.2.4/tests/docker/Dockerfile --- old/libcotp-1.2.2/tests/docker/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/libcotp-1.2.4/tests/docker/Dockerfile 2021-12-29 09:35:40.000000000 +0100 @@ -0,0 +1,34 @@ +FROM archlinux:latest + +ARG BRANCH=master + +COPY PKGBUILD /tmp/PKGBUILD + +RUN pacman -Syu --noconfirm ; \ + pacman -S gcc git clang cmake pkg-config libgcrypt fakeroot sudo --noconfirm ; \ + pacman -S base-devel --noconfirm + +RUN useradd -m -G wheel -s /bin/bash test ; \ + cp /tmp/PKGBUILD /home/test/ && chown test:test /home/test/PKGBUILD ; \ + sed -i 's/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers + +USER test +RUN cd /home/test && makepkg + +USER root +RUN pacman -U /home/test/*zst --noconfirm + +USER test +RUN yay -S criterion --noconfirm ; \ + gpg --keyserver pool.sks-keyservers.net --recv-keys 4EC1EA64 ; \ + yay -S libbaseencode --noconfirm + +USER root +RUN git clone https://github.com/paolostivanin/libcotp -b $BRANCH ; \ + cd libcotp ; \ + mkdir build && cd $_ ; \ + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=ON ; \ + make -j2 ;\ + ./tests/test_cotp ;\ + make install + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/tests/docker/PKGBUILD new/libcotp-1.2.4/tests/docker/PKGBUILD --- old/libcotp-1.2.2/tests/docker/PKGBUILD 1970-01-01 01:00:00.000000000 +0100 +++ new/libcotp-1.2.4/tests/docker/PKGBUILD 2021-12-29 09:35:40.000000000 +0100 @@ -0,0 +1,43 @@ +# Maintainer: Jguer <joaogg3 at gmail dot com> +pkgname=yay-bin +pkgver=11.0.2 +pkgrel=1 +pkgdesc="Yet another yogurt. Pacman wrapper and AUR helper written in go. Pre-compiled." +arch=('x86_64' 'aarch64' 'armv6h' 'armv7h') +url="https://github.com/Jguer/yay" +license=('GPL3') +depends=( + 'git' +) +optdepends=( + 'sudo' +) +provides=('yay') +conflicts=('yay' 'libalpm.so<13') + +source_x86_64=("https://github.com/Jguer/yay/releases/download/v${pkgver}/${pkgname/-bin/}_…") +source_aarch64=("https://github.com/Jguer/yay/releases/download/v${pkgver}/${pkgname/-bin/}_…") +source_armv6h=("https://github.com/Jguer/yay/releases/download/v${pkgver}/${pkgname/-bin/}_…") +source_armv7h=("https://github.com/Jguer/yay/releases/download/v${pkgver}/${pkgname/-bin/}_…") + +sha256sums_x86_64=('3b6334a4e719138c80f4c271a77b97bd740329677dfffe6bbe54679a0052140e') +sha256sums_aarch64=('d1c1b2d74783cb366a86480fcea9d7fbb325d170815014642ac0790e9bad6637') +sha256sums_armv6h=('7b4dd9d33d56b600955ead52bb5bd86bc9ac6fc45c24f0c6b686153b184eb905') +sha256sums_armv7h=('80a6317383552272ca9a9d251531fb2ca6e310e811b034a680e6632d4a294f15') + +package() { + _output="${srcdir}/${pkgname/-bin/}_${pkgver}_${CARCH}" + install -Dm755 "${_output}/${pkgname/-bin/}" "${pkgdir}/usr/bin/${pkgname/-bin/}" + install -Dm644 "${_output}/yay.8" "${pkgdir}/usr/share/man/man8/yay.8" + + # Shell autocompletion script + install -Dm644 "${_output}/bash" "${pkgdir}/usr/share/bash-completion/completions/yay" + install -Dm644 "${_output}/zsh" "${pkgdir}/usr/share/zsh/site-functions/_yay" + install -Dm644 "${_output}/fish" "${pkgdir}/usr/share/fish/vendor_completions.d/yay.fish" + + LANGS="pt pt_BR en es eu fr_FR ja pl_PL ru_RU zh_CN ko" + for lang in ${LANGS}; do + install -Dm644 "${_output}/${lang}.mo" "${pkgdir}/usr/share/locale/${lang}/LC_MESSAGES/yay.mo" + done +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/tests/docker/run_docker.sh new/libcotp-1.2.4/tests/docker/run_docker.sh --- old/libcotp-1.2.2/tests/docker/run_docker.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libcotp-1.2.4/tests/docker/run_docker.sh 2021-12-29 09:35:40.000000000 +0100 @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ -z "$1" ]]; then + echo "Usage: $0 <branch-name>" + exit 1 +fi + +docker build -t "testme:Dockerfile" --build-arg BRANCH="$1" . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcotp-1.2.2/tests/test_otp.c new/libcotp-1.2.4/tests/test_otp.c --- old/libcotp-1.2.2/tests/test_otp.c 2019-02-01 17:15:54.000000000 +0100 +++ new/libcotp-1.2.4/tests/test_otp.c 2021-12-29 09:35:40.000000000 +0100 @@ -1,6 +1,6 @@ #include <criterion/criterion.h> #include <string.h> -#include <cotp.h> +#include "../src/cotp.h" #include <baseencode.h> ++++++ v1.2.4.tar.gz.asc ++++++ Not Found (No newline at EOF)

1 0