October 2024 - openSUSE Commits - openSUSE Mailing Lists

commit python-urllib3 for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-urllib3 for openSUSE:Factory checked in at 2024-10-03 18:00:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-urllib3 (Old) and /work/SRC/openSUSE:Factory/.python-urllib3.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-urllib3" Thu Oct 3 18:00:38 2024 rev:68 rq:1205339 version:2.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-urllib3/python-urllib3.changes 2024-06-18 22:50:49.788502503 +0200 +++ /work/SRC/openSUSE:Factory/.python-urllib3.new.19354/python-urllib3.changes 2024-10-03 18:00:51.163367944 +0200 @@ -1,0 +2,56 @@ +Thu Oct 3 05:10:09 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 2.2.3: + * Features + + Added support for Python 3.13. + * Bugfixes + + Fixed the default encoding of chunked request bodies to be UTF-8 + instead of ISO-8859-1. All other methods of supplying a request body + already use UTF-8 starting in urllib3 v2.0. + + Fixed ResourceWarning on CONNECT with Python < 3.11.4 by backporting + python/cpython#103472. + + Fixed a crash where certain standard library hash functions were absent + in restricted environments. + + Added the Proxy-Authorization header to the list of headers to strip + from requests when redirecting to a different host. As before, + different headers can be set via Retry.remove_headers_on_redirect. + + Allowed passing negative integers as amt to read methods of + http.client.HTTPResponse as an alternative to None. + + Fixed issue where InsecureRequestWarning was emitted for HTTPS + connections when using Emscripten. + + Fixed HTTPConnectionPool.urlopen to stop automatically casting + non-proxy headers to HTTPHeaderDict. This change was premature as it + did not apply to proxy headers and HTTPHeaderDict does not handle byte + header values correctly yet. + + Changed InvalidChunkLength to ProtocolError when response terminates + before the chunk length is sent. + + Changed ProtocolError to be more verbose on incomplete reads with + excess content. + + Added support for HTTPResponse.read1() method. + + Fixed issue where requests against urls with trailing dots were + failing due to SSL errors when using proxy. + + Fixed HTTPConnection.proxy_is_verified and + HTTPSConnection.proxy_is_verified to be always set to a boolean after + connecting to a proxy. It could be None in some cases previously. + + Fixed an issue where headers passed in a request with json= would be + mutated + + Fixed HTTPSConnection.is_verified to be set to False when connecting + from a HTTPS proxy to an HTTP target. It was set to True previously. + + Fixed handling of new error message from OpenSSL 3.2.0 when configuring + an HTTP proxy as HTTPS + + Fixed TLS 1.3 post-handshake auth when the server certificate + validation is disabled + * HTTP/2 (experimental) + + Excluded Transfer-Encoding: chunked from HTTP/2 request body + + Added a probing mechanism for determining whether a given target + origin supports HTTP/2 via ALPN. + + Add support for sending a request body with HTTP/2 + * Removals + + Drop support for end-of-life PyPy3.8 and PyPy3.9. +- Drop patches, they are now included upstream: + * CVE-2024-37891.patch + * openssl-3.2.patch +- Included patched hypercorn, which is only unpacked and used for the test + suite. + +------------------------------------------------------------------- Old: ---- CVE-2024-37891.patch openssl-3.2.patch urllib3-2.1.0.tar.gz New: ---- hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz urllib3-2.2.3.tar.gz BETA DEBUG BEGIN: Old:- Drop patches, they are now included upstream: * CVE-2024-37891.patch * openssl-3.2.patch Old: * CVE-2024-37891.patch * openssl-3.2.patch - Included patched hypercorn, which is only unpacked and used for the test BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-urllib3.spec ++++++ --- /var/tmp/diff_new_pack.yFxZeI/_old 2024-10-03 18:00:51.667388928 +0200 +++ /var/tmp/diff_new_pack.yFxZeI/_new 2024-10-03 18:00:51.671389095 +0200 @@ -18,6 +18,8 @@ %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" +# No Quart for Python 3.10 +%define skip_python310 1 %define psuffix -test %bcond_without test %else @@ -26,42 +28,45 @@ %endif %{?sle15_python_module_pythons} Name: python-urllib3%{psuffix} -Version: 2.1.0 +Version: 2.2.3 Release: 0 Summary: HTTP library with thread-safe connection pooling, file post, and more License: MIT URL: https://urllib3.readthedocs.org/ Source: https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-%{version}… -# PATCH-FIX-OPENSUSE openssl-3.2.patch gh#urllib3/urllib3#3271 -Patch1: openssl-3.2.patch -# PATCH-FIX-UPSTREAM https://github.com/urllib3/urllib3/commit/accff72ecc2f6cf5a76d9570198a93ac7… Strip Proxy-Authorization header on redirects -Patch2: CVE-2024-37891.patch -BuildRequires: %{python_module base >= 3.7} +# https://github.com/urllib3/urllib3/issues/3334 +%define hypercorn_commit d1719f8c1570cbd8e6a3719ffdb14a4d72880abb +Source1: https://github.com/urllib3/hypercorn/archive/%{hypercorn_commit}/hypercorn-… +BuildRequires: %{python_module base >= 3.8} +BuildRequires: %{python_module hatch-vcs} BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros #!BuildIgnore: python-requests Requires: ca-certificates-mozilla -Requires: python-certifi -Requires: python-cryptography >= 1.9 -Requires: python-idna >= 3.4 -Requires: python-pyOpenSSL >= 23.2.0 Recommends: python-Brotli >= 1.0.9 Recommends: python-PySocks >= 1.7.1 +Recommends: python-h2 >= 4 +Recommends: python-zstandard >= 0.18 BuildArch: noarch %if %{with test} BuildRequires: %{python_module Brotli >= 1.0.9} BuildRequires: %{python_module PySocks >= 1.7.1} -BuildRequires: %{python_module certifi} -BuildRequires: %{python_module cryptography >= 1.9} +BuildRequires: %{python_module Quart >= 0.19} +BuildRequires: %{python_module cryptography >= 43} BuildRequires: %{python_module flaky} -BuildRequires: %{python_module idna >= 3.4} +BuildRequires: %{python_module h2 >= 4.1} +BuildRequires: %{python_module httpx >= 0.25} +BuildRequires: %{python_module idna >= 3.7} BuildRequires: %{python_module psutil} +BuildRequires: %{python_module pyOpenSSL >= 24.2} BuildRequires: %{python_module pytest >= 7.4.0} +BuildRequires: %{python_module pytest-socket >= 0.7} BuildRequires: %{python_module pytest-timeout >= 2.1.0} BuildRequires: %{python_module pytest-xdist} -BuildRequires: %{python_module tornado >= 6.2} +BuildRequires: %{python_module quart-trio >= 0.11} +BuildRequires: %{python_module trio >= 0.26} BuildRequires: %{python_module trustme >= 0.9.0} BuildRequires: %{python_module urllib3 >= %{version}} BuildRequires: timezone @@ -88,6 +93,11 @@ %prep %autosetup -p1 -n urllib3-%{version} +# https://github.com/urllib3/urllib3/issues/3334 +%if %{with test} +mkdir ../patched-hypercorn +tar -C ../patched-hypercorn -zxf %{SOURCE1} +%endif find . -type f -exec chmod a-x '{}' \; find . -name __pycache__ -type d -exec rm -fr {} + @@ -104,6 +114,8 @@ %if %{with test} %check +# https://github.com/urllib3/urllib3/issues/3334 +export PYTHONPATH="$PWD/../patched-hypercorn/hypercorn-%{hypercorn_commit}/src" # gh#urllib3/urllib3#2109 export CI="true" # skip some randomly failing tests (mostly on i586, but sometimes they fail on other architectures) @@ -116,6 +128,8 @@ skiplist+=" or test_requesting_large_resources_via_ssl" # Try to access external evil.com skiplist+=" or test_deprecated_no_scheme" +# weird threading issues on OBS runners +skiplist+=" or test_http2_probe_blocked_per_thread" %pytest %{?jobs:-n %jobs} -k "not (${skiplist})" --ignore test/with_dummyserver/test_socketlevel.py %endif @@ -124,6 +138,6 @@ %license LICENSE.txt %doc CHANGES.rst README.md %{python_sitelib}/urllib3 -%{python_sitelib}/urllib3-%{version}*-info +%{python_sitelib}/urllib3-%{version}.dist-info %endif ++++++ urllib3-2.1.0.tar.gz -> urllib3-2.2.3.tar.gz ++++++ ++++ 10989 lines of diff (skipped)

1 0

commit open-iscsi for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2024-10-03 18:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-iscsi" Thu Oct 3 18:00:34 2024 rev:133 rq:1205287 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2023-12-26 18:27:12.817279758 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new.19354/open-iscsi.changes 2024-10-03 18:00:47.311207566 +0200 @@ -1,0 +2,24 @@ +Mon Sep 30 19:25:24 UTC 2024 - lduncan(a)suse.com + +- Update to version 2.1.10.suse+51.fea0fde82ed1: + * Incudes upstream version 2.1.10 plus some fixes + * Fix firmware targets startup to always be "onboot" (#482) + (bsc#1228084) + * Change a discovery function to void return type (#481) + * Fix gcc issues (#480) + * Bugfix read specific sysfs value "off" of session attribute (#466) + * Fix bug where abort_tmo read failures were ignored. (#467) + * grammar nitpicks (#464) + * Fix memory leak in iscsi_check_session_use_count (#465) + * improve the comments in idbm_lock() (#458) + * Make it visible when memory allocation failure (#457) + * Better handle multiple iscsiadm commands (#453) + * iscsiadm: allow hostnames in node-mode commands (#451) + * Modify how workqueue priority is set (#445) + * Fix authmethod check by printing a warning message when CHAP used and authmethod=None (#443) + * iscsid: Rescan devices on relogin (#444) + * Adds missing characters in README. (#440) + * Turn off iSCSI NOP-Outs, by default. + * fix: add usr/iscsid_req.h missinig underline (#431) (#436) + +------------------------------------------------------------------- Old: ---- open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz New: ---- open-iscsi-2.1.10.suse+52.9a4cb8fdee02.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.xNkxlV/_old 2024-10-03 18:00:48.907274016 +0200 +++ /var/tmp/diff_new_pack.xNkxlV/_new 2024-10-03 18:00:48.911274182 +0200 @@ -1,7 +1,7 @@ # # spec file for package open-iscsi # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,13 +46,13 @@ %endif %define iscsi_minor_release 1 -%define iscsi_patch_release 9 +%define iscsi_patch_release 10 %define iscsi_patch_release_suse %{iscsi_patch_release}.suse -%define iscsi_service_tag 844.d557967bc9ae +%define iscsi_service_tag 52.9a4cb8fdee02 %define libname libopeniscsiusr0 %define libversion 0.2.0 Name: open-iscsi -Version: 2.1.9 +Version: 2.1.10 Release: 0 Summary: Linux iSCSI Software Initiator License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xNkxlV/_old 2024-10-03 18:00:49.111282509 +0200 +++ /var/tmp/diff_new_pack.xNkxlV/_new 2024-10-03 18:00:49.143283841 +0200 @@ -3,9 +3,9 @@ <param name="url">https://github.com/openSUSE/open-iscsi.git</param> <param name="scm">git</param> <param name="filename">open-iscsi</param> - <param name="version">d557967bc9ae</param> - <param name="versionformat">2.1.9.suse+@TAG_OFFSET@.%h</param> - <param name="match-tag">2.1.[0-9]</param> + <param name="version">fea0fde82ed1</param> + <param name="versionformat">2.1.10.suse+@TAG_OFFSET@.%h</param> + <param name="match-tag">2.1.[0-9]*</param> <param name="revision">openSUSE-Factory</param> <param name="changesgenerate">enable</param> <param name="exclude">.git</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.xNkxlV/_old 2024-10-03 18:00:49.271289171 +0200 +++ /var/tmp/diff_new_pack.xNkxlV/_new 2024-10-03 18:00:49.299290337 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/open-iscsi.git</param> - <param name="changesrevision">d557967bc9aeaa9aa4f62b443c0aec48a8e8e046</param></service></servicedata> + <param name="changesrevision">fea0fde82ed1f2974839501bf68121d9ad0fc4b5</param></service></servicedata> (No newline at EOF) ++++++ open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz -> open-iscsi-2.1.10.suse+52.9a4cb8fdee02.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/Changelog new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/Changelog --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/Changelog 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/Changelog 2024-10-01 21:06:22.000000000 +0200 @@ -1,3 +1,38 @@ +-> open-iscsi-2.1.9 - open-iscsi-2.1.10 + +Chris Leech (1): + remove unicode symbol from iscsid.conf (#423) + +Christian Steinert (1): + Adds missing characters in README. (#440) + +Daniel Moulton (1): + Incorrect documentation for `iscsiadm -m session` print level (#432) + +Fabrice Fontaine (1): + usr/idbm.c: fix musl build (#426) + +Graham Inggs (1): + discoveryd: fix additional format overflow warnings (#425) + +Lee Duncan (9): + iscsiuio build: use correct new version (#422) + Iscsiuio fixes v2 (#427) + iscsiuio: manage threads better at shutdown (#428) + iscsiuio: update version to 0.7.8.8 (#429) + Stop using deprecated inet_aton and inet_ntoa (#435) + Fix authmethod check by printing a warning message when CHAP used and authmethod=None (#443) + Modify how workqueue priority is set (#445) + iscsiadm: allow hostnames in node-mode commands (#451) + Better handle multiple iscsiadm commands (#453) + +cooper.wu (1): + fix: add usr/iscsid_req.h missinig underline (#431) (#436) + +mikechristie (1): + iscsid: Rescan devices on relogin (#444) + + -> open-iscsi-2.1.8 - open-iscsi-2.1.9 Chris Leech (5): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/Makefile new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/Makefile --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/Makefile 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/Makefile 2024-10-01 21:06:22.000000000 +0200 @@ -7,7 +7,7 @@ DESTDIR ?= # our VERSION String -ISCSI_VERSION_STR ?= 2.1.9 +ISCSI_VERSION_STR ?= 2.1.10 prefix = /usr exec_prefix = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/README new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/README --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/README 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/README 2024-10-01 21:06:22.000000000 +0200 @@ -182,9 +182,9 @@ ==================== The iscsid daemon implements control path of iSCSI protocol, plus some -anagement facilities. For example, the daemon could be configured to -utomatically re-start discovery at startup, based on the contents of -ersistent iSCSI database (see next section). +management facilities. For example, the daemon could be configured to +automatically re-start discovery at startup, based on the contents of +persistent iSCSI database (see next section). For help, run: @@ -1603,12 +1603,14 @@ node.conn[0].timeo.noop_out_interval = X -Where X is in seconds and the default is 10 seconds. To control the -timeout for the NOP-Out the noop_out_timeout value can be used: +Where X is in seconds and the default is 0 seconds, which that NOP-outs +should be disabled. Upstream default is 5 seconds. + +o control the timeout for the NOP-Out the noop_out_timeout value can be used: node.conn[0].timeo.noop_out_timeout = X -Again X is in seconds and the default is 15 seconds. +Again X is in seconds and the default is 5 seconds. Normally for these values you can use: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/doc/iscsiadm.8.template new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/doc/iscsiadm.8.template --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/doc/iscsiadm.8.template 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/doc/iscsiadm.8.template 2024-10-01 21:06:22.000000000 +0200 @@ -186,12 +186,12 @@ .TP .B Home Directory The \fIhome directory\fR for open-iscsi is @HOMEDIR@. This is -where it keeps it's configuration file (\fIiscsid.conf\fR) and it's +where it keeps its configuration file (\fIiscsid.conf\fR) and its initiator name file (\fIinitiatorname.iscsi\fR). .TP .B Database Root Directory The \fIdatabase root directory\fR for open-iscsi is @DBROOT@. This -is where it keeps its flat database files, such as it's list of \fInode\fRs +is where it keeps its flat database files, such as its list of \fInode\fRs (see below). .SH OPTIONS .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/etc/iscsid.conf new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/etc/iscsid.conf --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/etc/iscsid.conf 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/etc/iscsid.conf 2024-10-01 21:06:22.000000000 +0200 @@ -64,6 +64,13 @@ # To enable CHAP authentication set node.session.auth.authmethod # to CHAP. The default is None. +# +# NOTE: currently this attribute is checked for validity but then +# ignored, so even if it is set to None, CHAP will be used if the +# credentials (username/password and possibly username_in/password_in) +# are set. This behavior is deprecated, and in the future CHAP will +# not be used if authmethod is set to None. +# #node.session.auth.authmethod = CHAP # To configure which CHAP algorithms to enable, set @@ -86,6 +93,9 @@ # To enable CHAP authentication for a discovery session to the target, # set discovery.sendtargets.auth.authmethod to CHAP. The default is None. +# +# See NOTE above for node.session.auth.authmethod being mostly ignored. +# #discovery.sendtargets.auth.authmethod = CHAP # To set a discovery session CHAP username and password for the initiator @@ -124,8 +134,9 @@ node.conn[0].timeo.logout_timeout = 15 # Time interval to wait for on connection before sending a ping. -# The value is in seconds and the default is 5 seconds. -node.conn[0].timeo.noop_out_interval = 5 +# The value is in seconds and the default is 0, which means +# do not send any NOOPs. Upstream default is 5 seconds. +node.conn[0].timeo.noop_out_interval = 0 # To specify the time to wait for a Nop-out response before failing # the connection, edit this line. Failing the connection will @@ -214,8 +225,21 @@ # Note: For cxgb3i, you must set all sessions to the same value. # Otherwise the behavior is not defined. # -# The default value is -20. The setting must be between -20 and 20. -node.session.xmit_thread_priority = -20 +# This is done by scanning /proc/PID/stat, and this doesn't work in +# newer kernels (6.* on), as the workqueue transmit thread can be +# passive, and not show in in the process table when not actively +# doing work. If the proper workqueue process is found, and the +# priority value is non-zero, then the priority of that process will +# be modified when a session is created. +# +# Note: as mentioned above, the default value is now zero, which means +# that we don't do anything to the transmit workqueue process priority, +# by default. If you wish to get the previous behavior, set this value +# to -20. In the future, this functionality will be removed, once this +# functionality is no longer needed or works. +# +# The default value is 0. The setting must be between -20 and 20. +# node.session.xmit_thread_priority = 0 #*************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/idbm.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/idbm.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/idbm.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/idbm.c 2024-10-01 21:06:22.000000000 +0200 @@ -315,27 +315,41 @@ db = ctx->db; + /* if DB is already being used just increment count and return */ if (db->refs > 0) { db->refs++; return 0; } + /* DB is not being used -- ensure there is a lock dir */ if (access(LOCK_DIR, F_OK) != 0) { - if (mkdir(LOCK_DIR, 0770) != 0) { - _error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno, - _strerror(errno, strerr_buff)); + if ((mkdir(LOCK_DIR, 0770) != 0) && (errno != EEXIST)) { + _error(ctx, "Could not open %s: %d: %s", LOCK_DIR, + errno, _strerror(errno, strerr_buff)); return LIBISCSI_ERR_IDBM; } } + /* create the lock file, if needed */ fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666); - if (fd >= 0) - close(fd); + if (fd < 0) { + _error(ctx, "Could not open/create lock file: %s", LOCK_FILE); + return LIBISCSI_ERR_IDBM; + } + close(fd); - for (i = 0; i < 3000; i++) { + /* + * try to create a link from the lock file to the + * lock "write" file, retrying everying 10 miliseconds + * for up to 30 seconds! + * + * XXX: very long -- should be configurable? + */ + for (i = 0; i < DB_LOCK_RETRIES; i++) { ret = link(LOCK_FILE, LOCK_WRITE_FILE); if (ret == 0) - break; + break; /* success */ + errno_save = errno; if (errno != EEXIST) { @@ -344,20 +358,27 @@ LOCK_WRITE_FILE, errno_save, _strerror(errno_save, strerr_buff)); return LIBISCSI_ERR_IDBM; - } else if (i == 0) + } + + /* print info the first time through this loop */ + if (i == 0) _debug(ctx, "Waiting for discovery DB lock on %s", LOCK_WRITE_FILE); - usleep(10000); + usleep(DB_LOCK_USECS_WAIT); } if (ret != 0) { - _error(ctx, "Timeout on acquiring lock on DB: %s, errno: %d %s", + _error(ctx, "Timeout on acquiring lock on DB: %s, %d: %s", LOCK_WRITE_FILE, errno_save, _strerror(errno_save, strerr_buff)); return LIBISCSI_ERR_IDBM; } + /* + * if we get here, we were able to "own" the DB by creating + * a link, so we are now the only DB user + */ db->refs = 1; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/idbm.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/idbm.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/idbm.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/idbm.h 2024-10-01 21:06:22.000000000 +0200 @@ -40,6 +40,12 @@ #define BOOT_NAME_MAXLEN 256 #define IDBM_DUMP_SIZE 8192 +/* + * wait up to DB_LOCK_USECS_WAIT * DB_LOCK_RETRIES to a cquire + * the DB lock, before giving up + */ +#define DB_LOCK_USECS_WAIT 10000 /* per-loop waiting for lock */ +#define DB_LOCK_RETRIES 3000 /* number of retries */ struct __DLL_LOCAL idbm; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/sysfs.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/sysfs.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/sysfs.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/sysfs.c 2024-10-01 21:06:22.000000000 +0200 @@ -285,14 +285,18 @@ } } - errno = 0; - tmp_val = strtoll((const char *) buff, NULL, 10 /* base */); - errno_save = errno; - if ((errno_save != 0) && (! ignore_error)) { - rc = LIBISCSI_ERR_BUG; - _error(ctx, "Sysfs: %s: Error when converting '%s' " - "to number", file_path, (char *) buff, errno_save); - goto out; + if (strncmp((const char *) buff, "off", 3) == 0) { + tmp_val = -1; + } else { + errno = 0; + tmp_val = strtoll((const char *) buff, NULL, 10 /* base */); + errno_save = errno; + if ((errno_save != 0) && (! ignore_error)) { + rc = LIBISCSI_ERR_BUG; + _error(ctx, "Sysfs: %s: Error when converting '%s' " + "to number", file_path, (char *) buff, errno_save); + goto out; + } } *val = tmp_val; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/meson.build new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/meson.build --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/meson.build 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/meson.build 2024-10-01 21:06:22.000000000 +0200 @@ -4,7 +4,7 @@ project('open-iscsi', 'c', meson_version: '>= 0.54.0', - version: '2.1.9', + version: '2.1.10', license: 'LGPL-2.1-or-later', default_options: [ 'c_std=gnu99', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/sysfs-documentation new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/sysfs-documentation --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/sysfs-documentation 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/sysfs-documentation 2024-10-01 21:06:22.000000000 +0200 @@ -139,7 +139,7 @@ --- IPv4 Time to Live (TTL) -This attribute contain TTL value sent in IPv4 TCP packets transmitted on +This attribute contains the TTL value sent in IPv4 TCP packets transmitted on iSCSI connections. Valid range: 8-bit value. [0-255] @@ -301,7 +301,7 @@ --- Ethernet MTU Size. -This field specifies the maximum payload length in byte of an +This field specifies the maximum payload length in bytes of an Ethernet frame supported by iSCSI initiator. Valid values: 576 bytes to 9000 bytes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/discovery.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/discovery.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/discovery.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/discovery.c 2024-10-01 21:06:22.000000000 +0200 @@ -682,7 +682,7 @@ return 1; } -static int +static void process_sendtargets_response(struct str_buffer *sendtargets, int final, discovery_rec_t *drec, struct list_head *rec_list) @@ -696,7 +696,7 @@ if (start == end) { /* no SendTargets data */ - goto done; + return; } /* scan backwards to find the last NUL in the data, to ensure we @@ -711,7 +711,7 @@ /* couldn't find anything we can process now, * it's one big partial string */ - goto done; + return; } /* find the boundaries between target records (TargetName or final PDU) @@ -739,7 +739,7 @@ drec, rec_list)) { log_error("failed to add target record"); str_truncate_buffer(sendtargets, 0); - goto done; + return; } num_targets++; } @@ -769,7 +769,7 @@ } else { log_error("failed to add target record"); str_truncate_buffer(sendtargets, 0); - goto done; + return; } } else { /* remove the parts of the sendtargets buffer we've @@ -785,10 +785,6 @@ record - str_buffer_data(sendtargets)); } } - -done: - - return 1; } static void iscsi_free_session(struct iscsi_session *session) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/idbm.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/idbm.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/idbm.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/idbm.c 2024-10-01 21:06:22.000000000 +0200 @@ -898,14 +898,17 @@ return info; } -void idbm_print(int type, void *rec, int show, FILE *f) +int idbm_print(int type, void *rec, int show, FILE *f) { int i; recinfo_t *info; info = idbm_recinfo_alloc(MAX_KEYS); - if (!info) - return; + if (!info) { + log_error("Out of Memory."); + return ISCSI_ERR_NOMEM; + } + switch (type) { case IDBM_PRINT_TYPE_DISCOVERY: @@ -945,6 +948,7 @@ fprintf(f, "%s\n", ISCSI_END_REC); free(info); + return 0; } static void @@ -1341,29 +1345,36 @@ int idbm_print_discovery_info(discovery_rec_t *rec, int show) { - idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, show, stdout); - return 1; + int rc; + + rc = idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, show, stdout); + return !rc; } int idbm_print_node_info(void *data, node_rec_t *rec) { int show = *((int *)data); + int rc; - idbm_print(IDBM_PRINT_TYPE_NODE, rec, show, stdout); - return 0; + rc = idbm_print(IDBM_PRINT_TYPE_NODE, rec, show, stdout); + return rc; } int idbm_print_host_chap_info(struct iscsi_chap_rec *chap) { + int rc; + /* User only calls this to print chap so always print */ - idbm_print(IDBM_PRINT_TYPE_HOST_CHAP, chap, 1, stdout); - return 0; + rc = idbm_print(IDBM_PRINT_TYPE_HOST_CHAP, chap, 1, stdout); + return rc; } int idbm_print_flashnode_info(struct flashnode_rec *fnode) { - idbm_print(IDBM_PRINT_TYPE_FLASHNODE, fnode, 1, stdout); - return 0; + int rc; + + rc = idbm_print(IDBM_PRINT_TYPE_FLASHNODE, fnode, 1, stdout); + return rc; } int idbm_print_node_flat(__attribute__((unused))void *data, node_rec_t *rec) @@ -1435,43 +1446,79 @@ return 0; } +/* + * lock the DB, ensuring we are the only user, + * waiting as needed (for quite a while) + * + * uses global "db" (pointer to the DB instance) + */ int idbm_lock(void) { int fd, i, ret; + int errno_save = 0; + /* if DB is already being used just increment count and return */ if (db->refs > 0) { db->refs++; return 0; } + /* DB is not being used -- ensure there is a lock dir */ if (access(LOCK_DIR, F_OK) != 0) { - if (mkdir(LOCK_DIR, 0770) != 0) { - log_error("Could not open %s: %s", LOCK_DIR, - strerror(errno)); + if ((mkdir(LOCK_DIR, 0770) != 0) && (errno != EEXIST)) { + log_error("Could not open %s: %d: %s", LOCK_DIR, + errno, strerror(errno)); return ISCSI_ERR_IDBM; } } + /* create the lock file, if needed */ fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666); - if (fd >= 0) - close(fd); + if (fd < 0) { + log_error("Could not open/create lock file: %s", + LOCK_FILE); + return ISCSI_ERR_IDBM; + } + close(fd); - for (i = 0; i < 3000; i++) { + /* + * try to create a link from the lock file to the + * lock "write" file, retrying everying 10 miliseconds + * for up to 30 seconds! + * + * XXX: very long -- should be configurable? + */ + for (i = 0; i < DB_LOCK_RETRIES; i++) { ret = link(LOCK_FILE, LOCK_WRITE_FILE); if (ret == 0) - break; + break; /* success */ + + errno_save = errno; if (errno != EEXIST) { log_error("Maybe you are not root?"); log_error("Could not lock discovery DB: %s: %s", LOCK_WRITE_FILE, strerror(errno)); return ISCSI_ERR_IDBM; - } else if (i == 0) + } + + /* print info the first time through this loop */ + if (i == 0) log_debug(2, "Waiting for discovery DB lock"); - usleep(10000); + usleep(DB_LOCK_USECS_WAIT); /* wait 10 ms */ + } + + if (ret != 0) { + log_error("Timeout on acquiring lock on DB: %s: %d: %s", + LOCK_WRITE_FILE, errno_save, strerror(errno_save)); + return ISCSI_ERR_IDBM; } + /* + * if we get here, we were able to "own" the DB by creating + * a link, so we are now the only DB user + */ db->refs = 1; return 0; } @@ -1491,6 +1538,8 @@ * Backwards Compat: * If the portal is a file then we are doing the old style default * session behavior (svn pre 780). + * + * XXX can't we remove this now? */ static FILE *idbm_open_rec_r(char *portal, char *config) { @@ -2207,7 +2256,7 @@ goto free_portal; } - idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f); + rc = idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f); fclose(f); free_portal: free(portal); @@ -2271,7 +2320,7 @@ rc = ISCSI_ERR_IDBM; goto free_portal; } - idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f); + rc = idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f); fclose(f); free_portal: free(portal); @@ -2376,7 +2425,7 @@ goto unlock; } - idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, 1, f); + rc = idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, 1, f); fclose(f); unlock: idbm_unlock(); @@ -2520,16 +2569,16 @@ if (rc) goto unlock; - if (drec->type == DISCOVERY_TYPE_FW) { - log_debug(8, "setting firmware node 'startup' to 'onboot'"); - newrec->startup = ISCSI_STARTUP_ONBOOT; - newrec->conn[0].startup = ISCSI_STARTUP_ONBOOT; - } log_debug(7, "overwriting existing record"); } else log_debug(7, "adding new DB record"); if (drec) { + if (drec->type == DISCOVERY_TYPE_FW) { + log_debug(8, "setting firmware node 'startup' to 'onboot'"); + newrec->startup = ISCSI_STARTUP_ONBOOT; + newrec->conn[0].startup = ISCSI_STARTUP_ONBOOT; + } newrec->disc_type = drec->type; newrec->disc_port = drec->port; strcpy(newrec->disc_address, drec->address); @@ -3231,7 +3280,7 @@ rec->disc_type = DISCOVERY_TYPE_STATIC; rec->leading_login = 0; rec->session.cmds_max = CMDS_MAX; - rec->session.xmit_thread_priority = XMIT_THREAD_PRIORITY; + rec->session.xmit_thread_priority = DEFAULT_XMIT_THREAD_PRIORITY; rec->session.initial_cmdsn = 0; rec->session.queue_depth = QUEUE_DEPTH; rec->session.nr_sessions = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/idbm.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/idbm.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/idbm.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/idbm.h 2024-10-01 21:06:22.000000000 +0200 @@ -51,6 +51,14 @@ #define NAME_MAXVAL 128 /* the maximum length of key name */ #define VALUE_MAXVAL 256 /* the maximum length of 223 bytes in the RFC. */ #define OPTS_MAXVAL 8 + +/* + * wait up to DB_LOCK_USECS_WAIT * DB_LOCK_RETRIES to a cquire + * the DB lock, before giving up + */ +#define DB_LOCK_USECS_WAIT 10000 /* per-loop waiting for lock */ +#define DB_LOCK_RETRIES 3000 /* number of retries */ + typedef struct recinfo { int type; char name[NAME_MAXVAL]; @@ -167,6 +175,12 @@ int line_number); extern void idbm_recinfo_node(node_rec_t *r, recinfo_t *ri); +/* from libopeniscsiusr/idbm.h */ +enum iscsi_auth_method { + ISCSI_AUTH_METHOD_NONE, + ISCSI_AUTH_METHOD_CHAP, +}; + enum { IDBM_PRINT_TYPE_DISCOVERY, IDBM_PRINT_TYPE_NODE, @@ -175,7 +189,7 @@ IDBM_PRINT_TYPE_FLASHNODE }; -extern void idbm_print(int type, void *rec, int show, FILE *f); +extern int idbm_print(int type, void *rec, int show, FILE *f); struct boot_context; extern struct node_rec *idbm_create_rec(char *targetname, int tpgt, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iface.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iface.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iface.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iface.c 2024-10-01 21:06:22.000000000 +0200 @@ -282,7 +282,7 @@ if (rc) goto close_f; - idbm_print(IDBM_PRINT_TYPE_IFACE, iface, 1, f); + rc = idbm_print(IDBM_PRINT_TYPE_IFACE, iface, 1, f); idbm_unlock(); close_f: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/initiator.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/initiator.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/initiator.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/initiator.c 2024-10-01 21:06:22.000000000 +0200 @@ -395,26 +395,37 @@ session->isid[5] = 0; /* setup authentication variables for the session*/ - iscsi_setup_authentication(session, &rec->session.auth); + if (iscsi_setup_authentication(session, &rec->session.auth)) { + /* + * FIXME: The return value used to be ignored here. It + * would be nice to start paying attention to it, but + * that may break a few corner-case login scenarios, + * and in the case of a root-iSCSI setup, may break it + * badly. So, for now, just print a warning that + * ignoring such errors is being deprecated. + */ + log_warning("Warning: DEPRECATED: Ignoring Authorization setup failure. " + "This will be considered a login authorization error in the future."); + } iscsi_session_init_params(session); - if (t->template->bind_ep_required) { - hostno = iscsi_sysfs_get_host_no_from_hwinfo(&rec->iface, rc); - if (!*rc) { - /* - * if the netdev or mac was set, then we are going to want - * to want to bind the all the conns/eps to a specific host - * if offload is used. - */ - session->conn[0].bind_ep = 1; - session->hostno = hostno; - } else if (*rc == ISCSI_ERR_HOST_NOT_FOUND) { - goto free_session; - } else { - *rc = 0; - } - } + if (t->template->bind_ep_required) { + hostno = iscsi_sysfs_get_host_no_from_hwinfo(&rec->iface, rc); + if (!*rc) { + /* + * if the netdev or mac was set, then we are going to want + * to want to bind the all the conns/eps to a specific host + * if offload is used. + */ + session->conn[0].bind_ep = 1; + session->hostno = hostno; + } else if (*rc == ISCSI_ERR_HOST_NOT_FOUND) { + goto free_session; + } else { + *rc = 0; + } + } /* reset session reopen count */ session->reopen_cnt = 0; @@ -1008,11 +1019,14 @@ } static void session_scan_host(struct iscsi_session *session, int hostno, - queue_task_t *qtask) + queue_task_t *qtask, bool rescan) { pid_t pid; - pid = iscsi_sysfs_scan_host(hostno, 1, idbm_session_autoscan(session)); + if (!rescan && !idbm_session_autoscan(session)) + return; + + pid = iscsi_sysfs_scan_host(hostno, session->id, 1, rescan); if (pid == 0) { mgmt_ipc_write_rsp(qtask, ISCSI_SUCCESS); @@ -1062,7 +1076,8 @@ * don't want to re-scan it on recovery. */ if (conn->id == 0) - session_scan_host(session, session->hostno, c->qtask); + session_scan_host(session, session->hostno, c->qtask, + false); log_warning("Connection%d:%d to [target: %s, portal: %s,%d] " "through [iface: %s] is operational now", @@ -1073,7 +1088,7 @@ } else { session->notify_qtask = NULL; - session_online_devs(session->hostno, session->id); + session_scan_host(session, session->hostno, NULL, true); mgmt_ipc_write_rsp(c->qtask, ISCSI_SUCCESS); log_warning("connection%d:%d is operational after recovery " "(%d attempts)", session->id, conn->id, @@ -1226,7 +1241,7 @@ if (sshdr.asc == 0x3f && sshdr.ascq == 0x0e && idbm_session_autoscan(session)) - session_scan_host(session, session->hostno, NULL); + session_scan_host(session, session->hostno, NULL, true); break; case ISCSI_ASYNC_MSG_REQUEST_LOGOUT: conn_warn(conn, "Target requests logout within %u seconds" , ntohs(async_hdr->param3)); @@ -1399,8 +1414,23 @@ uint32_t host_no; /* drivers like bnx2i and qla4xxx do not have a write wq */ - if (session->t->caps & CAP_DATA_PATH_OFFLOAD) + if (session->t->caps & CAP_DATA_PATH_OFFLOAD) { + log_debug(5, "Skipping setting xmit thread priority: Not needed for offload"); + return; + } + + /* + * optimization: if the priority to be set is zero, just + * return now, saving the trouble of scanning the proc table + * + * TODO: this function should be removed some day "soon", since + * it ony seems to be needed in older (5.4) kernels. But for now + * the optimization should be enough + */ + if (session->nrec.session.xmit_thread_priority == 0) { + log_debug(5, "Skipping setting xmit thread priority to zero: not needed"); return; + } proc_dir = opendir(PROC_DIR); if (!proc_dir) @@ -1457,6 +1487,9 @@ if (!setpriority(PRIO_PROCESS, pid, session->nrec.session.xmit_thread_priority)) { closedir(proc_dir); + log_debug(5, "Set priority for pid=%u to \"%d\"", + pid, + session->nrec.session.xmit_thread_priority); return; } else break; @@ -1465,9 +1498,9 @@ } closedir(proc_dir); fail: - log_error("Could not set session%d priority. " - "READ/WRITE throughout and latency could be " - "affected.", session->id); + log_warning("Could not set session%d priority. " + "READ/WRITE throughout and latency could be affected.", + session->id); } static int session_ipc_create(struct iscsi_session *session) @@ -1700,8 +1733,7 @@ * scan host is one-time deal. We * don't want to re-scan it on recovery. */ - session_scan_host(session, session->hostno, - c->qtask); + session_scan_host(session, session->hostno, c->qtask, false); session->notify_qtask = NULL; log_warning("Connection%d:%d to [target: %s, portal: %s,%d] " @@ -1711,6 +1743,7 @@ session->nrec.conn[conn->id].port, session->nrec.iface.name); } else { + session_scan_host(session, session->hostno, NULL, true); session->notify_qtask = NULL; mgmt_ipc_write_rsp(c->qtask, ISCSI_SUCCESS); } @@ -2209,7 +2242,7 @@ log_debug(3, "session created sid %u host no %d", sid, host_no); session_online_devs(host_no, sid); - session_scan_host(NULL, host_no, NULL); + session_scan_host(NULL, host_no, NULL, false); } static void iscsi_async_session_destruction(uint32_t host_no, uint32_t sid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/initiator_common.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/initiator_common.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/initiator_common.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/initiator_common.c 2024-10-01 21:06:22.000000000 +0200 @@ -38,6 +38,7 @@ #include "sysdeps.h" #include "iscsi_err.h" #include "iscsi_net_util.h" +#include "idbm.h" struct iscsi_session *session_find_by_sid(uint32_t sid) { @@ -61,6 +62,22 @@ int iscsi_setup_authentication(struct iscsi_session *session, struct iscsi_auth_config *auth_cfg) { + /* + * check for authmethod being set correctly, + * and for now just warn user this isn't correct. In the + * future, we should return an error here. + */ + if ((auth_cfg->authmethod == ISCSI_AUTH_METHOD_NONE) && + (auth_cfg->password_length || auth_cfg->password_in_length)) { + /* + * FIXME: if authmethod=None we should really not be using + * CHAP, but fixing this may break some configurations, so + * just warn the user, for now + */ + log_warning("Warning: DEPRECATED: Using CHAP even though 'authmethod' is set to None. " + "In the future 'authmethod=None' will be honored."); + } + /* if we have any incoming credentials, we insist on authenticating * the target or not logging in at all */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_settings.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_settings.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_settings.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_settings.h 2024-10-01 21:06:22.000000000 +0200 @@ -21,8 +21,8 @@ #define CMDS_MAX 128 #define QUEUE_DEPTH 32 -/* system */ -#define XMIT_THREAD_PRIORITY -20 +/* system -- default used for setpriority() of the xmit workqueue process */ +#define DEFAULT_XMIT_THREAD_PRIORITY 0 /* interface */ #define UNKNOWN_VALUE "<empty>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_sysfs.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_sysfs.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_sysfs.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_sysfs.c 2024-10-01 21:06:22.000000000 +0200 @@ -1342,7 +1342,7 @@ if (ret) (info->tmo).lu_reset_tmo = -1; - sysfs_get_int(session, ISCSI_SESSION_SUBSYS, "abort_tmo", + ret = sysfs_get_int(session, ISCSI_SESSION_SUBSYS, "abort_tmo", &((info->tmo).abort_tmo)); if (ret) (info->tmo).abort_tmo = -1; @@ -1979,7 +1979,7 @@ strlen(write_buf)); } -pid_t iscsi_sysfs_scan_host(int hostno, int async, int autoscan) +pid_t iscsi_sysfs_scan_host(int hostno, int sid, int async, bool rescan) { char id[NAME_SIZE]; char *write_buf = "- - -"; @@ -1988,10 +1988,7 @@ if (async) pid = fork(); - if (pid >= 0 && !autoscan) { - if (pid) - log_debug(4, "host%d in manual scan mode, skipping scan", hostno); - } else if (pid == 0) { + if (pid == 0) { /* child */ log_debug(4, "scanning host%d", hostno); @@ -2001,9 +1998,18 @@ */ set_thread_io_flusher(0); - snprintf(id, sizeof(id), ISCSI_HOST_ID, hostno); - sysfs_set_param(id, SCSI_HOST_SUBSYS, "scan", write_buf, - strlen(write_buf)); + if (rescan) { + iscsi_sysfs_for_each_device(NULL, hostno, sid, + iscsi_sysfs_set_device_online); + + /* rescan each device to pick up size changes */ + iscsi_sysfs_for_each_device(NULL, hostno, sid, + iscsi_sysfs_rescan_device); + } else { + snprintf(id, sizeof(id), ISCSI_HOST_ID, hostno); + sysfs_set_param(id, SCSI_HOST_SUBSYS, "scan", write_buf, + strlen(write_buf)); + } log_debug(4, "scanning host%d completed", hostno); } else if (pid > 0) { log_debug(4, "scanning host%d from pid %d", hostno, pid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_sysfs.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_sysfs.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_sysfs.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_sysfs.h 2024-10-01 21:06:22.000000000 +0200 @@ -17,6 +17,7 @@ #ifndef ISCSI_SYSFS_H #define ISCSI_SYSFS_H +#include <stdbool.h> #include <sys/types.h> #include "sysfs.h" @@ -89,7 +90,7 @@ struct iscsi_session_operational_config *conf); extern void iscsi_sysfs_get_negotiated_conn_conf(int sid, struct iscsi_conn_operational_config *conf); -extern pid_t iscsi_sysfs_scan_host(int hostno, int async, int autoscan); +extern pid_t iscsi_sysfs_scan_host(int hostno, int sid, int async, bool rescan); extern int iscsi_sysfs_get_session_state(char *state, int sid); extern int iscsi_sysfs_get_host_state(char *state, int host_no); extern int iscsi_sysfs_get_device_state(char *state, int host_no, int target, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_util.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_util.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_util.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_util.c 2024-10-01 21:06:22.000000000 +0200 @@ -279,7 +279,7 @@ * * If address1 is blank then it matches any string passed in. */ -static int iscsi_addr_match(char *address1, char *address2) +int iscsi_addr_match(const char *address1, const char *address2) { struct addrinfo hints1, hints2, *res1, *res2; int rc; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_util.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_util.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_util.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_util.h 2024-10-01 21:06:22.000000000 +0200 @@ -30,4 +30,6 @@ struct sockaddr_un; extern int setup_abstract_addr(struct sockaddr_un *addr, char *unix_sock_name); +extern int iscsi_addr_match(const char *address1, const char *address2); + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsiadm.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsiadm.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsiadm.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsiadm.c 2024-10-01 21:06:22.000000000 +0200 @@ -787,41 +787,49 @@ const char *target_name, const char *address, int32_t port, const char *iface_name) { - int rc = 0; + int rc = ISCSI_SUCCESS; struct iscsi_node **nodes = NULL; struct iscsi_node *node = NULL; uint32_t node_count = 0; uint32_t i = 0; - bool match = false; bool has_match = false; rc = iscsi_nodes_get(ctx, &nodes, &node_count); if (rc != LIBISCSI_OK) return rc; + log_debug(7, "%s(target_name=%s, address=%s): found %d node(s) to scan ...", + __FUNCTION__, target_name, address, node_count); + for (i = 0; i < node_count; ++i) { node = nodes[i]; - match = true; + /* + * node matches *unless* one of the following conditions + * is true + */ if ((target_name != NULL) && (strlen(target_name) != 0) && (strcmp(target_name, iscsi_node_target_name_get(node)) != 0)) - match = false; + continue; /* target name mismatch */ + if ((address != NULL) && (strlen(address) != 0) && - (strcmp(address, iscsi_node_conn_address_get(node)) != 0)) - match = false; - if ((port != -1) && (port != (int32_t)iscsi_node_conn_port_get(node))) - match = false; + (iscsi_addr_match(address, + iscsi_node_conn_address_get(node)) != 1)) + continue; /* address/name mismatch */ + + if ((port != -1) && + (port != (int32_t)iscsi_node_conn_port_get(node))) + continue; /* port number mismatch */ + if ((iface_name != NULL) && (strlen(iface_name) != 0) && (strcmp(iface_name, iscsi_node_iface_name_get(node)) != 0)) - match = false; + continue; /* iface mismatch */ - if (match == true) { - iscsi_node_print_config(node, show_secret); - has_match = true; - } + iscsi_node_print_config(node, show_secret); + has_match = true; } iscsi_nodes_free(nodes, node_count); @@ -874,7 +882,7 @@ iscsi_sysfs_for_each_device(NULL, host_no, info->sid, iscsi_sysfs_rescan_device); /* now scan for new devices */ - iscsi_sysfs_scan_host(host_no, 0, 1); + iscsi_sysfs_scan_host(host_no, info->sid, 0, false); return 0; } @@ -2026,6 +2034,7 @@ static int iscsi_check_session_use_count(uint32_t sid) { char *config_file; char *safe_logout; + int rc = 0; config_file = get_config_file(); if (!config_file) { @@ -2034,10 +2043,11 @@ } safe_logout = cfg_get_string_param(config_file, "iscsid.safe_logout"); - if (!safe_logout || strcmp(safe_logout, "Yes")) - return 0; + if (safe_logout && !strcmp(safe_logout, "Yes")) + rc = session_in_use(sid); + free(safe_logout); - return session_in_use(sid); + return rc; } int iscsi_logout_flashnode_sid(struct iscsi_transport *t, uint32_t host_no, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsid.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsid.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsid.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsid.c 2024-10-01 21:06:22.000000000 +0200 @@ -221,7 +221,9 @@ iscsi_err_to_str(err)); return 0; } - iscsi_sysfs_scan_host(host_no, 0, idbm_session_autoscan(NULL)); + + if (idbm_session_autoscan(NULL)) + iscsi_sysfs_scan_host(host_no, info->sid, 0, false); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsid_req.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsid_req.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsid_req.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsid_req.h 2024-10-01 21:06:22.000000000 +0200 @@ -19,7 +19,7 @@ */ #ifndef ISCSID_REQ_H_ -#define ISCSID_REQ_H +#define ISCSID_REQ_H_ #define ISCSID_REQ_TIMEOUT 1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/sysfs.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/sysfs.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/sysfs.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/sysfs.c 2024-10-01 21:06:22.000000000 +0200 @@ -563,7 +563,12 @@ if (!sysfs_value) return EIO; - *value = atoi(sysfs_value); + if (strncmp(sysfs_value, "off", 3) == 0 && + strncmp(subsys, "iscsi_session", 13) == 0) { + *value = -1; + } else { + *value = atoi(sysfs_value); + } free(sysfs_value); return 0; }

1 0

commit python-anyio for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-anyio for openSUSE:Factory checked in at 2024-10-03 18:00:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-anyio (Old) and /work/SRC/openSUSE:Factory/.python-anyio.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-anyio" Thu Oct 3 18:00:37 2024 rev:22 rq:1205309 version:4.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-anyio/python-anyio.changes 2024-08-15 09:57:40.625343532 +0200 +++ /work/SRC/openSUSE:Factory/.python-anyio.new.19354/python-anyio.changes 2024-10-03 18:00:50.323332971 +0200 @@ -1,0 +2,60 @@ +Wed Oct 2 18:02:06 UTC 2024 - Antonio Larrosa <alarrosa(a)suse.com> + +- update to 4.6.0: + * Dropped support for Python 3.8 (as #698 cannot be resolved + without cancel message support) + * Fixed 100% CPU use on asyncio while waiting for an exiting task + group to finish while said task group is within a cancelled + cancel scope (#695) + * Fixed cancel scopes on asyncio not propagating CancelledError + on exit when the enclosing cancel scope has been effectively + cancelled (#698) + * Fixed asyncio task groups not yielding control to the event + loop at exit if there were no child tasks to wait on + * Fixed inconsistent task uncancellation with asyncio cancel + scopes belonging to a task group when said task group has child + tasks running +- update to 4.5.0: + * Improved the performance of anyio.Lock and anyio.Semaphore on + asyncio (even up to 50 %) + * Added the fast_acquire parameter to anyio.Lock and + anyio.Semaphore to further boost performance at the expense of + safety (acquire() will not yield control back if there is no + contention) + * Added support for the from_uri(), full_match(), parser + methods/properties in anyio.Path, newly added in Python 3.13 + (#737) + * Added support for more keyword arguments for run_process() and + open_process(): startupinfo, creationflags, pass_fds, user, + group, extra_groups and umask (#742) + * Improved the type annotations and support for PathLike in + run_process() and open_process() to allow for path-like + arguments, just like subprocess.Popen + * Changed the ResourceWarning from an unclosed memory object + stream to include its address for easier identification + * Changed start_blocking_portal() to always use daemonic threads, + to accommodate the "loitering event loop" use case + * Bumped the minimum version of Trio to v0.26.1 + * Fixed __repr__() of MemoryObjectItemReceiver, when item is not + defined (#767; PR by @Danipulok) + * Fixed to_process.run_sync() failing to initialize if + __main__.__file__ pointed to a file in a nonexistent directory + (#696) + * Fixed AssertionError: feed_data after feed_eof on asyncio when + a subprocess is closed early, before its output has been read + (#490) + * Fixed TaskInfo.has_pending_cancellation() on asyncio not + respecting shielded scopes (#771; PR by @gschaffner) + * Fixed SocketStream.receive() returning bytearray instead of + bytes when using asyncio with ProactorEventLoop (Windows) + (#776) + * Fixed quitting the debugger in a pytest test session while in + an active task group failing the test instead of exiting the + test session (because the exit exception arrives in an + exception group) + * Fixed support for Linux abstract namespaces in UNIX sockets + that was broken in v4.2 (#781; PR by @tapetersen) + * Fixed KeyboardInterrupt (ctrl+c) hanging the asyncio pytest + runner + +------------------------------------------------------------------- Old: ---- anyio-4.4.0.tar.gz New: ---- anyio-4.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-anyio.spec ++++++ --- /var/tmp/diff_new_pack.IhNCrT/_old 2024-10-03 18:00:50.827353955 +0200 +++ /var/tmp/diff_new_pack.IhNCrT/_new 2024-10-03 18:00:50.827353955 +0200 @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-anyio -Version: 4.4.0 +Version: 4.6.0 Release: 0 Summary: High level compatibility layer for asynchronous event loop implementations License: MIT @@ -39,7 +39,7 @@ BuildRequires: %{python_module hypothesis >= 4.0} BuildRequires: %{python_module pytest >= 7.0} BuildRequires: %{python_module pytest-mock >= 3.6.1} -BuildRequires: %{python_module trio >= 0.23} +BuildRequires: %{python_module trio >= 0.26.1} BuildRequires: %{python_module trustme} # /SECTION BuildRequires: fdupes @@ -49,7 +49,7 @@ Requires: python-exceptiongroup Requires: python-typing_extensions %endif -Suggests: python-trio >= 0.23 +Suggests: python-trio >= 0.26.1 BuildArch: noarch %python_subpackages ++++++ anyio-4.4.0.tar.gz -> anyio-4.6.0.tar.gz ++++++ ++++ 3980 lines of diff (skipped)

1 0

commit relaxngDatatype for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package relaxngDatatype for openSUSE:Factory checked in at 2024-10-03 18:00:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/relaxngDatatype (Old) and /work/SRC/openSUSE:Factory/.relaxngDatatype.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "relaxngDatatype" Thu Oct 3 18:00:32 2024 rev:22 rq:1205282 version:2011.1 Changes: -------- --- /work/SRC/openSUSE:Factory/relaxngDatatype/relaxngDatatype.changes 2022-03-28 16:59:53.804915216 +0200 +++ /work/SRC/openSUSE:Factory/.relaxngDatatype.new.19354/relaxngDatatype.changes 2024-10-03 18:00:43.895065342 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 16:00:49 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ relaxngDatatype.spec ++++++ --- /var/tmp/diff_new_pack.lQ8GJ3/_old 2024-10-03 18:00:46.271164266 +0200 +++ /var/tmp/diff_new_pack.lQ8GJ3/_new 2024-10-03 18:00:46.287164932 +0200 @@ -1,7 +1,7 @@ # # spec file for package relaxngDatatype # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Source1: copying.txt BuildRequires: ant BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 Obsoletes: %{name}-javadoc BuildArch: noarch @@ -54,7 +54,7 @@ # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar -a relaxngDatatype:relaxngDatatype %files -f .mfiles

1 0

commit regexp for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package regexp for openSUSE:Factory checked in at 2024-10-03 18:00:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/regexp (Old) and /work/SRC/openSUSE:Factory/.regexp.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "regexp" Thu Oct 3 18:00:30 2024 rev:24 rq:1205281 version:1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/regexp/regexp.changes 2022-03-28 16:59:35.304890084 +0200 +++ /work/SRC/openSUSE:Factory/.regexp.new.19354/regexp.changes 2024-10-03 18:00:42.439004722 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 16:00:24 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ regexp.spec ++++++ --- /var/tmp/diff_new_pack.dqJ2vR/_old 2024-10-03 18:00:43.051030202 +0200 +++ /var/tmp/diff_new_pack.dqJ2vR/_new 2024-10-03 18:00:43.055030369 +0200 @@ -1,7 +1,7 @@ # # spec file for package regexp # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,6 @@ %define full_name jakarta-%{name} -%define section free Name: regexp Version: 1.5 Release: 0 @@ -28,15 +27,15 @@ URL: http://jakarta.apache.org/%{name}/ Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz Source1: regexp-%{version}.pom -BuildRequires: ant BuildRequires: ant >= 1.6 BuildRequires: java-devel -BuildRequires: javapackages-local -BuildRequires: javapackages-tools +BuildRequires: javapackages-local >= 6 BuildRequires: xml-commons-apis-bootstrap -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 +#!BuildIgnore: xerces-j2 +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-apis #!BuildIgnore: xml-commons-jaxp-1.3-apis +#!BuildIgnore: xml-commons-resolver BuildArch: noarch %description @@ -53,26 +52,19 @@ find . -type f -name "*.jar" | xargs -t rm %build -export OPT_JAR_LIST=: -export CLASSPATH= mkdir lib ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar %install # jars -install -d -m 755 %{buildroot}%{_javadir} -install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 build/*.jar %{buildroot}%{_javadir}/%{name}.jar [ -d docs/api ] && rm -rf docs/api # pom mkdir -p %{buildroot}%{_mavenpomdir} -install -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a %{full_name}:%{full_name} -%files -%defattr(0644,root,root,0755) -%doc LICENSE -%{_javadir}/*.jar -%{_mavenpomdir}/* -%{_datadir}/maven-metadata/%{name}.xml* +%files -f .mfiles +%license LICENSE

1 0

commit libvirt for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2024-10-03 18:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Thu Oct 3 18:00:28 2024 rev:403 rq:1205278 version:10.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2024-09-05 15:47:08.603961492 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new.19354/libvirt.changes 2024-10-03 18:00:40.178910627 +0200 @@ -1,0 +2,11 @@ +Tue Oct 1 19:57:06 UTC 2024 - James Fehlig <jfehlig(a)suse.com> + +- Update to libvirt 10.8.0 + - libvirt-daemon-driver-storage-core: Change dependency on + nfs-utils from Requires to Recommends + - Switch from YAJL to json-c for JSON parsing and formatting + - jsc#PED-8909 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html#v10-8-0-2024-10-01 + +------------------------------------------------------------------- Old: ---- libvirt-10.7.0.tar.xz New: ---- libvirt-10.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.6rVOG2/_old 2024-10-03 18:00:41.226954260 +0200 +++ /var/tmp/diff_new_pack.6rVOG2/_new 2024-10-03 18:00:41.230954427 +0200 @@ -149,7 +149,7 @@ Name: libvirt URL: https://libvirt.org/ -Version: 10.7.0 +Version: 10.8.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -210,8 +210,8 @@ BuildRequires: readline-devel # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 +BuildRequires: libjson-c-devel BuildRequires: libpciaccess0-devel >= 0.10.9 -BuildRequires: libyajl-devel BuildRequires: pkgconfig(libudev) >= 145 %if %{with_sanlock} BuildRequires: sanlock-devel >= 2.4 @@ -487,7 +487,7 @@ Summary: Storage driver plugin including base backends for the libvirtd daemon Requires: %{name}-daemon-common = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -Requires: nfs-utils +Recommends: nfs-utils # For mkfs Requires: util-linux %if %{with_qemu} @@ -1070,7 +1070,7 @@ %{?arg_apparmor} \ %{?arg_apparmor_profiles} \ -Dudev=enabled \ - -Dyajl=enabled \ + -Djson_c=enabled \ %{?arg_sanlock} \ -Dlibpcap=enabled \ -Dlibnl=enabled \ ++++++ libvirt-10.7.0.tar.xz -> libvirt-10.8.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-10.7.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.19354/libvirt-10.8.0.tar.xz differ: char 15, line 1

1 0

commit flatpak for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package flatpak for openSUSE:Factory checked in at 2024-10-03 18:00:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flatpak (Old) and /work/SRC/openSUSE:Factory/.flatpak.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flatpak" Thu Oct 3 18:00:26 2024 rev:90 rq:1205277 version:1.15.10 Changes: -------- --- /work/SRC/openSUSE:Factory/flatpak/flatpak.changes 2024-08-27 19:38:13.849675772 +0200 +++ /work/SRC/openSUSE:Factory/.flatpak.new.19354/flatpak.changes 2024-10-03 18:00:36.990777895 +0200 @@ -1,0 +2,6 @@ +Wed Oct 2 15:16:49 UTC 2024 - Robert Frohl <rfrohl(a)suse.com> + +- Explicitly BuildRequire selinux-policy-targeted to allow + selinux_relabel_* in scriptlets to work on other codestreams + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flatpak.spec ++++++ --- /var/tmp/diff_new_pack.7uW2Qi/_old 2024-10-03 18:00:37.722808372 +0200 +++ /var/tmp/diff_new_pack.7uW2Qi/_new 2024-10-03 18:00:37.726808539 +0200 @@ -64,6 +64,7 @@ BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-pyparsing +BuildRequires: selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-devel BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools

1 0

commit javamail for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javamail for openSUSE:Factory checked in at 2024-10-03 18:00:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javamail (Old) and /work/SRC/openSUSE:Factory/.javamail.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javamail" Thu Oct 3 18:00:23 2024 rev:10 rq:1205260 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/javamail/javamail.changes 2024-09-09 14:43:18.475879606 +0200 +++ /work/SRC/openSUSE:Factory/.javamail.new.19354/javamail.changes 2024-10-03 18:00:30.462506103 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 15:48:59 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javamail.spec ++++++ --- /var/tmp/diff_new_pack.YhGH0H/_old 2024-10-03 18:00:31.382544407 +0200 +++ /var/tmp/diff_new_pack.YhGH0H/_new 2024-10-03 18:00:31.382544407 +0200 @@ -78,10 +78,8 @@ rm mail/src/test/java/com/sun/mail/imap/IMAPIdleUntaggedResponseTest.java rm mail/src/test/java/com/sun/mail/smtp/SMTPWriteTimeoutTest.java -%pom_remove_parent . - %build -%{ant} -Djavac.source=1.8 -Djavac.target=1.8 \ +ant -Djavac.source=1.8 -Djavac.target=1.8 \ -Dactivation.jar=$(find-jar glassfish-activation-api) \ jar jars docs @@ -108,20 +106,20 @@ # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name pom.xml).pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name pom.xml).pom pompart=%{name}/$(get_name pom.xml).pom %add_maven_depmap ${pompart} for i in mailapijar smtp imap gimap pop3 dsn; do - %mvn_install_pom ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name ${i}/pom.xml).pom + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name ${i}/pom.xml).pom pompart=%{name}/$(get_name ${i}/pom.xml).pom jarpart=%{name}/$(get_name ${i}/pom.xml).jar %add_maven_depmap ${pompart} ${jarpart} done -%mvn_install_pom mail/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mail/pom.xml).pom +%{mvn_install_pom} mail/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mail/pom.xml).pom pompart=%{name}/$(get_name mail/pom.xml).pom jarpart=%{name}/$(get_name mail/pom.xml).jar %add_maven_depmap ${pompart} ${jarpart} -a javax.mail:mail,org.eclipse.jetty.orbit:javax.mail.glassfish,com.sun.mail:jakarta.mail -%mvn_install_pom mailapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mailapi/pom.xml).pom +%{mvn_install_pom} mailapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mailapi/pom.xml).pom pompart=%{name}/$(get_name mailapi/pom.xml).pom jarpart=%{name}/$(get_name mailapi/pom.xml).jar %add_maven_depmap ${pompart} ${jarpart} -a javax.mail:mailapi

1 0

commit javacc for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javacc for openSUSE:Factory checked in at 2024-10-03 18:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javacc (Old) and /work/SRC/openSUSE:Factory/.javacc.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javacc" Thu Oct 3 18:00:20 2024 rev:25 rq:1205259 version:7.0.13 Changes: -------- --- /work/SRC/openSUSE:Factory/javacc/javacc.changes 2023-11-23 21:38:54.943662634 +0100 +++ /work/SRC/openSUSE:Factory/.javacc.new.19354/javacc.changes 2024-10-03 18:00:28.878440154 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 15:48:03 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javacc.spec ++++++ --- /var/tmp/diff_new_pack.4YBxvO/_old 2024-10-03 18:00:29.706474627 +0200 +++ /var/tmp/diff_new_pack.4YBxvO/_new 2024-10-03 18:00:29.710474794 +0200 @@ -1,7 +1,7 @@ # -# spec file +# spec file for package javacc # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2000-2005, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -42,7 +42,7 @@ Name: %{base_name} BuildRequires: %{base_name} BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -82,7 +82,7 @@ This package contains the API documentation for %{name}. %prep -%setup -n %{base_name}-%{base_name}-%{version} +%setup -q -n %{base_name}-%{base_name}-%{version} rm -f lib/*.jar %if %{without bootstrap} rm -f bootstrap/javacc.jar @@ -96,7 +96,7 @@ %endif %build -%{ant} -Dant.build.javac.{source,target}=8 \ +ant -Dant.build.javac.{source,target}=8 \ %if %{with bootstrap} jar %else @@ -112,7 +112,7 @@ # pom install -dm0755 %{buildroot}%{_mavenpomdir} -install -pm0644 pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom %add_maven_depmap %{base_name}.pom %{base_name}.jar # javadoc install -dm0755 %{buildroot}%{_javadocdir}/%{name}

1 0

commit glassfish-annotation-api for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glassfish-annotation-api for openSUSE:Factory checked in at 2024-10-03 18:00:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glassfish-annotation-api (Old) and /work/SRC/openSUSE:Factory/.glassfish-annotation-api.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glassfish-annotation-api" Thu Oct 3 18:00:17 2024 rev:4 rq:1205251 version:1.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/glassfish-annotation-api/glassfish-annotation-api.changes 2022-03-19 22:22:52.704948517 +0100 +++ /work/SRC/openSUSE:Factory/.glassfish-annotation-api.new.19354/glassfish-annotation-api.changes 2024-10-03 18:00:25.370294099 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 15:40:10 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glassfish-annotation-api.spec ++++++ --- /var/tmp/diff_new_pack.O0Pr6x/_old 2024-10-03 18:00:26.098324409 +0200 +++ /var/tmp/diff_new_pack.O0Pr6x/_new 2024-10-03 18:00:26.102324576 +0200 @@ -1,7 +1,7 @@ # # spec file for package glassfish-annotation-api # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -49,10 +49,8 @@ cp %{SOURCE1} build.xml cp %{SOURCE2} . -%pom_remove_parent . - %build -%{ant} +ant %install # jar @@ -60,7 +58,7 @@ install -pm 0644 target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}

1 0