December 2022 - openSUSE Commits - openSUSE Mailing Lists

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

02 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package socket_wrapper for openSUSE:Factory checked in at 2022-12-02 13:12:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/socket_wrapper (Old) and /work/SRC/openSUSE:Factory/.socket_wrapper.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "socket_wrapper" Fri Dec 2 13:12:03 2022 rev:19 rq:1039284 version:1.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/socket_wrapper/socket_wrapper.changes 2022-07-31 23:00:54.507685552 +0200 +++ /work/SRC/openSUSE:Factory/.socket_wrapper.new.1835/socket_wrapper.changes 2022-12-02 13:12:05.457507702 +0100 @@ -1,0 +2,9 @@ +Thu Nov 24 09:40:58 UTC 2022 - Andreas Schneider <asn(a)cryptomilk.org> + +- Update to version 1.3.5 + * Inject O_LARGEFILE as needed on 32bit + * pkgconfig: Fix path to libsocket_wrapper.so + * Fix -Wcast-qual warnings + * Fix dclose(RTLD_NEXT) + +------------------------------------------------------------------- Old: ---- socket_wrapper-1.3.4.tar.gz socket_wrapper-1.3.4.tar.gz.asc New: ---- socket_wrapper-1.3.5.tar.gz socket_wrapper-1.3.5.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ socket_wrapper.spec ++++++ --- /var/tmp/diff_new_pack.gyLu6W/_old 2022-12-02 13:12:06.681514387 +0100 +++ /var/tmp/diff_new_pack.gyLu6W/_new 2022-12-02 13:12:06.745514737 +0100 @@ -24,7 +24,7 @@ ############################# NOTE ################################## Name: socket_wrapper -Version: 1.3.4 +Version: 1.3.5 Release: 0 Summary: A library passing all socket communications through Unix sockets License: BSD-3-Clause ++++++ socket_wrapper-1.3.4.tar.gz -> socket_wrapper-1.3.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.3.4/CHANGELOG new/socket_wrapper-1.3.5/CHANGELOG --- old/socket_wrapper-1.3.4/CHANGELOG 2022-07-21 14:50:10.000000000 +0200 +++ new/socket_wrapper-1.3.5/CHANGELOG 2022-11-24 10:27:14.000000000 +0100 @@ -1,6 +1,12 @@ ChangeLog ========== +version 1.3.5 (released 2022-11-23) + * Inject O_LARGEFILE as needed on 32bit + * pkgconfig: Fix path to libsocket_wrapper.so + * Fix -Wcast-qual warnings + * Fix dclose(RTLD_NEXT) + version 1.3.4 (released 2022-07-21) * Fixed TOCTOU issue with udp auto binding * Fixed running on FreeBSD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.3.4/CMakeLists.txt new/socket_wrapper-1.3.5/CMakeLists.txt --- old/socket_wrapper-1.3.4/CMakeLists.txt 2022-07-21 14:50:10.000000000 +0200 +++ new/socket_wrapper-1.3.5/CMakeLists.txt 2022-11-24 10:27:14.000000000 +0100 @@ -11,7 +11,7 @@ include(DefineCMakeDefaults) include(DefineCompilerFlags) -project(socket_wrapper VERSION 1.3.4 LANGUAGES C) +project(socket_wrapper VERSION 1.3.5 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) @@ -25,7 +25,7 @@ # Increment PATCH. set(LIBRARY_VERSION_MAJOR 0) set(LIBRARY_VERSION_MINOR 3) -set(LIBRARY_VERSION_PATCH 1) +set(LIBRARY_VERSION_PATCH 2) set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.3.4/CompilerChecks.cmake new/socket_wrapper-1.3.5/CompilerChecks.cmake --- old/socket_wrapper-1.3.4/CompilerChecks.cmake 2022-07-21 14:50:10.000000000 +0200 +++ new/socket_wrapper-1.3.5/CompilerChecks.cmake 2022-11-24 10:27:14.000000000 +0100 @@ -22,7 +22,7 @@ add_c_compiler_flag("-Wshadow" SUPPORTED_COMPILER_FLAGS) add_c_compiler_flag("-Wmissing-prototypes" SUPPORTED_COMPILER_FLAGS) add_c_compiler_flag("-Wcast-align" SUPPORTED_COMPILER_FLAGS) - #add_c_compiler_flag("-Wcast-qual" SUPPORTED_COMPILER_FLAGS) + add_c_compiler_flag("-Wcast-qual" SUPPORTED_COMPILER_FLAGS) add_c_compiler_flag("-Werror=address" SUPPORTED_COMPILER_FLAGS) add_c_compiler_flag("-Wstrict-prototypes" SUPPORTED_COMPILER_FLAGS) add_c_compiler_flag("-Werror=strict-prototypes" SUPPORTED_COMPILER_FLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.3.4/socket_wrapper.pc.cmake new/socket_wrapper-1.3.5/socket_wrapper.pc.cmake --- old/socket_wrapper-1.3.4/socket_wrapper.pc.cmake 2021-01-26 14:29:48.000000000 +0100 +++ new/socket_wrapper-1.3.5/socket_wrapper.pc.cmake 2022-11-24 10:27:14.000000000 +0100 @@ -1,4 +1,4 @@ Name: @PROJECT_NAME@ Description: The socket_wrapper library Version: @PROJECT_VERSION@ -Libs: @CMAKE_INSTALL_LIBDIR@/@SOCKET_WRAPPER_LIB@ +Libs: @CMAKE_INSTALL_FULL_LIBDIR@/@SOCKET_WRAPPER_LIB@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.3.4/src/socket_wrapper.c new/socket_wrapper-1.3.5/src/socket_wrapper.c --- old/socket_wrapper-1.3.4/src/socket_wrapper.c 2022-07-21 14:50:10.000000000 +0200 +++ new/socket_wrapper-1.3.5/src/socket_wrapper.c 2022-11-24 10:27:14.000000000 +0100 @@ -984,6 +984,19 @@ } #endif /* HAVE_FOPEN64 */ +static void swrap_inject_o_largefile(int *flags) +{ + (void)*flags; /* maybe unused */ +#if SIZE_MAX == 0xffffffffUL && defined(O_LARGEFILE) +#ifdef O_PATH + if (((*flags) & O_PATH) == 0) +#endif + { + *flags |= O_LARGEFILE; + } +#endif +} + static int libc_vopen(const char *pathname, int flags, va_list ap) { int mode = 0; @@ -991,6 +1004,8 @@ swrap_bind_symbol_all(); + swrap_inject_o_largefile(&flags); + if (flags & O_CREAT) { mode = va_arg(ap, int); } @@ -1019,6 +1034,8 @@ swrap_bind_symbol_all(); + swrap_inject_o_largefile(&flags); + if (flags & O_CREAT) { mode = va_arg(ap, int); } @@ -1035,6 +1052,8 @@ swrap_bind_symbol_all(); + swrap_inject_o_largefile(&flags); + if (flags & O_CREAT) { mode = va_arg(ap, int); } @@ -5325,7 +5344,7 @@ struct cmsghdr *cmsg; }; -static int swrap_sendmsg_unix_scm_rights(const struct cmsghdr *cmsg, +static int swrap_sendmsg_unix_scm_rights(struct cmsghdr *cmsg, uint8_t **cm_data, size_t *cm_data_space, int *scm_rights_pipe_fd) @@ -5557,7 +5576,7 @@ return 0; } -static int swrap_sendmsg_unix_sol_socket(const struct cmsghdr *cmsg, +static int swrap_sendmsg_unix_sol_socket(struct cmsghdr *cmsg, uint8_t **cm_data, size_t *cm_data_space, int *scm_rights_pipe_fd) @@ -5581,7 +5600,7 @@ return rc; } -static int swrap_recvmsg_unix_scm_rights(const struct cmsghdr *cmsg, +static int swrap_recvmsg_unix_scm_rights(struct cmsghdr *cmsg, uint8_t **cm_data, size_t *cm_data_space) { @@ -5860,7 +5879,7 @@ return 0; } -static int swrap_recvmsg_unix_sol_socket(const struct cmsghdr *cmsg, +static int swrap_recvmsg_unix_sol_socket(struct cmsghdr *cmsg, uint8_t **cm_data, size_t *cm_data_space) { @@ -7831,10 +7850,18 @@ SAFE_FREE(sockets); - if (swrap.libc.handle != NULL) { + if (swrap.libc.handle != NULL +#ifdef RTLD_NEXT + && swrap.libc.handle != RTLD_NEXT +#endif + ) { dlclose(swrap.libc.handle); } - if (swrap.libc.socket_handle) { + if (swrap.libc.socket_handle +#ifdef RTLD_NEXT + && swrap.libc.socket_handle != RTLD_NEXT +#endif + ) { dlclose(swrap.libc.socket_handle); } }

1 0

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

02 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package swig for openSUSE:Factory checked in at 2022-12-02 13:12:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swig (Old) and /work/SRC/openSUSE:Factory/.swig.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swig" Fri Dec 2 13:12:02 2022 rev:80 rq:1039267 version:4.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/swig/swig.changes 2022-11-03 19:13:16.895688957 +0100 +++ /work/SRC/openSUSE:Factory/.swig.new.1835/swig.changes 2022-12-02 13:12:04.481502372 +0100 @@ -1,0 +2,10 @@ +Thu Dec 1 08:30:26 UTC 2022 - Klaus K��mpf <kkaempf(a)suse.com> + +- Update to 4.1.1 + * Couple of stability fixes. + * Stability fix in ccache-swig when calculating hashes of inputs. + * Some template handling improvements. + * R - minor fixes plus deprecation for rtypecheck typemaps being + optional. + +------------------------------------------------------------------- Old: ---- v4.1.0.tar.gz New: ---- swig-v4.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swig.spec ++++++ --- /var/tmp/diff_new_pack.SaD5eV/_old 2022-12-02 13:12:05.157506064 +0100 +++ /var/tmp/diff_new_pack.SaD5eV/_new 2022-12-02 13:12:05.165506108 +0100 @@ -30,14 +30,13 @@ BuildRequires: ruby-devel %endif Name: swig -Version: 4.1.0 -%define srcversion v4.1.0 +Version: 4.1.1 Release: 0 Summary: Simplified Wrapper and Interface Generator License: BSD-3-Clause AND GPL-3.0-or-later Group: Development/Languages/C and C++ URL: http://www.swig.org/ -Source: https://github.com/swig/swig/archive/refs/tags/%{srcversion}.tar.gz +Source: https://github.com/swig/swig/archive/v%{version}/%{name}-v%{version}.tar.gz Source1: %{name}.rpmlintrc BuildRequires: autoconf

1 0

commit selinux-policy for openSUSE:Factory
by Source-Sync 02 Dec '22

02 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package selinux-policy for openSUSE:Factory checked in at 2022-12-02 13:12:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/selinux-policy (Old) and /work/SRC/openSUSE:Factory/.selinux-policy.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "selinux-policy" Fri Dec 2 13:12:00 2022 rev:38 rq:1039252 version:20221019 Changes: -------- --- /work/SRC/openSUSE:Factory/selinux-policy/selinux-policy.changes 2022-11-25 14:08:11.417208183 +0100 +++ /work/SRC/openSUSE:Factory/.selinux-policy.new.1835/selinux-policy.changes 2022-12-02 13:12:01.953488566 +0100 @@ -1,0 +2,10 @@ +Wed Nov 30 19:28:58 UTC 2022 - Filippo Bonazzi <filippo.bonazzi(a)suse.com> + +- Add fix_irqbalance.patch: support netlink socket operations (bsc#1205434) + +------------------------------------------------------------------- +Wed Nov 30 19:08:33 UTC 2022 - Filippo Bonazzi <filippo.bonazzi(a)suse.com> + +- Drop fix_irqbalance.patch: superseded by upstream + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fix_irqbalance.patch ++++++ --- /var/tmp/diff_new_pack.CwCOvV/_old 2022-12-02 13:12:03.505497042 +0100 +++ /var/tmp/diff_new_pack.CwCOvV/_new 2022-12-02 13:12:03.505497042 +0100 @@ -1,17 +1,14 @@ -Index: fedora-policy/policy/modules/contrib/irqbalance.te +Index: fedora-policy-20221019/policy/modules/contrib/irqbalance.te =================================================================== ---- fedora-policy.orig/policy/modules/contrib/irqbalance.te -+++ fedora-policy/policy/modules/contrib/irqbalance.te -@@ -29,8 +29,11 @@ allow irqbalance_t self:udp_socket creat +--- fedora-policy-20221019.orig/policy/modules/contrib/irqbalance.te ++++ fedora-policy-20221019/policy/modules/contrib/irqbalance.te +@@ -24,7 +24,7 @@ files_pid_file(irqbalance_var_run_t) + allow irqbalance_t self:capability { setpcap net_admin }; + dontaudit irqbalance_t self:capability sys_tty_config; + allow irqbalance_t self:process { getcap getsched setcap signal_perms }; +-allow irqbalance_t self:udp_socket create_socket_perms; ++allow irqbalance_t self:{udp_socket netlink_generic_socket} create_socket_perms; + manage_dirs_pattern(irqbalance_t, irqbalance_var_run_t, irqbalance_var_run_t) manage_files_pattern(irqbalance_t, irqbalance_var_run_t, irqbalance_var_run_t) - manage_sock_files_pattern(irqbalance_t, irqbalance_var_run_t, irqbalance_var_run_t) -+manage_sock_files_pattern(irqbalance_t, irqbalance_var_run_t, irqbalance_var_run_t) - files_pid_filetrans(irqbalance_t, irqbalance_var_run_t, { dir file sock_file }) - -+init_nnp_daemon_domain(irqbalance_t) -+ - kernel_read_network_state(irqbalance_t) - kernel_read_system_state(irqbalance_t) - kernel_read_kernel_sysctls(irqbalance_t)

1 0

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

02 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jsonschema for openSUSE:Factory checked in at 2022-12-02 13:12:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jsonschema (Old) and /work/SRC/openSUSE:Factory/.python-jsonschema.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jsonschema" Fri Dec 2 13:12:00 2022 rev:35 rq:1039224 version:4.17.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jsonschema/python-jsonschema.changes 2022-11-24 12:22:11.744903495 +0100 +++ /work/SRC/openSUSE:Factory/.python-jsonschema.new.1835/python-jsonschema.changes 2022-12-02 13:12:00.865482623 +0100 @@ -1,0 +2,14 @@ +Wed Nov 30 13:41:12 UTC 2022 - Johannes Kastl <kastl(a)b1-systems.de> + +- update to 4.17.3: + * No nice changelog provided upstream + Full Changelog: https://github.com/python-jsonschema/jsonschema/compare/v4.17.2...v4.17.3 + +------------------------------------------------------------------- +Wed Nov 30 13:38:53 UTC 2022 - Johannes Kastl <kastl(a)b1-systems.de> + +- update to 4.17.2: + * No nice changelog provided upstream + Full Changelog: https://github.com/python-jsonschema/jsonschema/compare/v4.17.1...v4.17.2 + +------------------------------------------------------------------- Old: ---- jsonschema-4.17.1.tar.gz New: ---- jsonschema-4.17.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jsonschema.spec ++++++ --- /var/tmp/diff_new_pack.NK6klA/_old 2022-12-02 13:12:01.421485659 +0100 +++ /var/tmp/diff_new_pack.NK6klA/_new 2022-12-02 13:12:01.425485681 +0100 @@ -23,7 +23,7 @@ %endif Name: python-jsonschema -Version: 4.17.1 +Version: 4.17.3 Release: 0 Summary: An implementation of JSON-Schema validation for Python License: MIT ++++++ jsonschema-4.17.1.tar.gz -> jsonschema-4.17.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/.flake8 new/jsonschema-4.17.3/.flake8 --- old/jsonschema-4.17.1/.flake8 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/.flake8 2020-02-02 01:00:00.000000000 +0100 @@ -5,6 +5,9 @@ jsonschema/__init__.py jsonschema/_reflect.py ignore = - B008, # Barring function calls in default args. Ha, no. - B306, # See https://github.com/PyCQA/flake8-bugbear/issues/131 - W503, # (flake8 default) old PEP8 boolean operator line breaks + # Barring function calls in default args. Ha, no. + B008, + # See https://github.com/PyCQA/flake8-bugbear/issues/131 + B306, + # (flake8 default) old PEP8 boolean operator line breaks + W503, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/.pre-commit-config.yaml new/jsonschema-4.17.3/.pre-commit-config.yaml --- old/jsonschema-4.17.1/.pre-commit-config.yaml 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/.pre-commit-config.yaml 2020-02-02 01:00:00.000000000 +0100 @@ -2,7 +2,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-ast - id: check-docstring-first diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/CHANGELOG.rst new/jsonschema-4.17.3/CHANGELOG.rst --- old/jsonschema-4.17.1/CHANGELOG.rst 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/CHANGELOG.rst 2020-02-02 01:00:00.000000000 +0100 @@ -1,3 +1,18 @@ +v4.17.3 +======= + +* Fix instantiating validators with cached refs to boolean schemas + rather than objects (#1018). + +v4.17.2 +======= + +* Empty strings are not valid relative JSON Pointers (aren't valid under the + RJP format). +* Durations without (trailing) units are not valid durations (aren't + valid under the duration format). This involves changing the dependency + used for validating durations (from ``isoduration`` to ``isodate``). + v4.17.1 ======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/PKG-INFO new/jsonschema-4.17.3/PKG-INFO --- old/jsonschema-4.17.1/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: jsonschema -Version: 4.17.1 +Version: 4.17.3 Summary: An implementation of JSON Schema validation for Python Project-URL: Homepage, https://github.com/python-jsonschema/jsonschema Project-URL: Documentation, https://python-jsonschema.readthedocs.io/ @@ -188,8 +188,8 @@ Release Information ------------------- -v4.17.1 +v4.17.3 ======= -* The error message when using ``unevaluatedProperties`` with a non-trivial - schema value (i.e. something other than ``false``) has been improved (#996). +* Fix instantiating validators with cached refs to boolean schemas + rather than objects (#1018). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/docs/validate.rst new/jsonschema-4.17.3/docs/validate.rst --- old/jsonschema-4.17.1/docs/validate.rst 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/docs/validate.rst 2020-02-02 01:00:00.000000000 +0100 @@ -16,7 +16,7 @@ ---------- The simplest way to validate an instance under a given schema is to use the -:func:`validate` function. +`validate <jsonschema.validators.validate>` function. .. autofunction:: validate :noindex: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/README.md new/jsonschema-4.17.3/json/README.md --- old/jsonschema-4.17.1/json/README.md 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/README.md 2020-02-02 01:00:00.000000000 +0100 @@ -283,8 +283,8 @@ ### .NET +* [JsonSchema.Net](https://github.com/gregsdennis/json-everything) * [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema) -* [Manatee.Json](https://github.com/gregsdennis/Manatee.Json) ### Perl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft-next/locationIndependentIdentifierDraft4.json new/jsonschema-4.17.3/json/remotes/draft-next/locationIndependentIdentifierDraft4.json --- old/jsonschema-4.17.1/json/remotes/draft-next/locationIndependentIdentifierDraft4.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft-next/locationIndependentIdentifierDraft4.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/next/schema", - "definitions": { - "refToInteger": { - "$ref": "#foo" - }, - "A": { - "id": "#foo", - "type": "integer" - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft-next/locationIndependentIdentifierPre2019.json new/jsonschema-4.17.3/json/remotes/draft-next/locationIndependentIdentifierPre2019.json --- old/jsonschema-4.17.1/json/remotes/draft-next/locationIndependentIdentifierPre2019.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft-next/locationIndependentIdentifierPre2019.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/next/schema", - "definitions": { - "refToInteger": { - "$ref": "#foo" - }, - "A": { - "$id": "#foo", - "type": "integer" - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft-next/name.json new/jsonschema-4.17.3/json/remotes/draft-next/name.json --- old/jsonschema-4.17.1/json/remotes/draft-next/name.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft-next/name.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/next/schema", - "definitions": { - "orNull": { - "anyOf": [ - { - "type": "null" - }, - { - "$ref": "#" - } - ] - } - }, - "type": "string" -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft-next/ref-and-definitions.json new/jsonschema-4.17.3/json/remotes/draft-next/ref-and-definitions.json --- old/jsonschema-4.17.1/json/remotes/draft-next/ref-and-definitions.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft-next/ref-and-definitions.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/next/schema", - "$id": "http://localhost:1234/draft-next/ref-and-definitions.json", - "definitions": { - "inner": { - "properties": { - "bar": { "type": "string" } - } - } - }, - "allOf": [ { "$ref": "#/definitions/inner" } ] -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft2019-09/locationIndependentIdentifierDraft4.json new/jsonschema-4.17.3/json/remotes/draft2019-09/locationIndependentIdentifierDraft4.json --- old/jsonschema-4.17.1/json/remotes/draft2019-09/locationIndependentIdentifierDraft4.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft2019-09/locationIndependentIdentifierDraft4.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - "definitions": { - "refToInteger": { - "$ref": "#foo" - }, - "A": { - "id": "#foo", - "type": "integer" - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft2019-09/locationIndependentIdentifierPre2019.json new/jsonschema-4.17.3/json/remotes/draft2019-09/locationIndependentIdentifierPre2019.json --- old/jsonschema-4.17.1/json/remotes/draft2019-09/locationIndependentIdentifierPre2019.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft2019-09/locationIndependentIdentifierPre2019.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - "definitions": { - "refToInteger": { - "$ref": "#foo" - }, - "A": { - "$id": "#foo", - "type": "integer" - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft2019-09/name.json new/jsonschema-4.17.3/json/remotes/draft2019-09/name.json --- old/jsonschema-4.17.1/json/remotes/draft2019-09/name.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft2019-09/name.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - "definitions": { - "orNull": { - "anyOf": [ - { - "type": "null" - }, - { - "$ref": "#" - } - ] - } - }, - "type": "string" -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft2019-09/ref-and-definitions.json new/jsonschema-4.17.3/json/remotes/draft2019-09/ref-and-definitions.json --- old/jsonschema-4.17.1/json/remotes/draft2019-09/ref-and-definitions.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft2019-09/ref-and-definitions.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "http://localhost:1234/draft2019-09/ref-and-definitions.json", - "definitions": { - "inner": { - "properties": { - "bar": { "type": "string" } - } - } - }, - "allOf": [ { "$ref": "#/definitions/inner" } ] -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft2020-12/locationIndependentIdentifierDraft4.json new/jsonschema-4.17.3/json/remotes/draft2020-12/locationIndependentIdentifierDraft4.json --- old/jsonschema-4.17.1/json/remotes/draft2020-12/locationIndependentIdentifierDraft4.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft2020-12/locationIndependentIdentifierDraft4.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "definitions": { - "refToInteger": { - "$ref": "#foo" - }, - "A": { - "id": "#foo", - "type": "integer" - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft2020-12/locationIndependentIdentifierPre2019.json new/jsonschema-4.17.3/json/remotes/draft2020-12/locationIndependentIdentifierPre2019.json --- old/jsonschema-4.17.1/json/remotes/draft2020-12/locationIndependentIdentifierPre2019.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft2020-12/locationIndependentIdentifierPre2019.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "definitions": { - "refToInteger": { - "$ref": "#foo" - }, - "A": { - "$id": "#foo", - "type": "integer" - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft2020-12/name.json new/jsonschema-4.17.3/json/remotes/draft2020-12/name.json --- old/jsonschema-4.17.1/json/remotes/draft2020-12/name.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft2020-12/name.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "definitions": { - "orNull": { - "anyOf": [ - { - "type": "null" - }, - { - "$ref": "#" - } - ] - } - }, - "type": "string" -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/remotes/draft2020-12/ref-and-definitions.json new/jsonschema-4.17.3/json/remotes/draft2020-12/ref-and-definitions.json --- old/jsonschema-4.17.1/json/remotes/draft2020-12/ref-and-definitions.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/remotes/draft2020-12/ref-and-definitions.json 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "http://localhost:1234/draft2020-12/ref-and-definitions.json", - "definitions": { - "inner": { - "properties": { - "bar": { "type": "string" } - } - } - }, - "allOf": [ { "$ref": "#/definitions/inner" } ] -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft-next/content.json new/jsonschema-4.17.3/json/tests/draft-next/content.json --- old/jsonschema-4.17.1/json/tests/draft-next/content.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft-next/content.json 2020-02-02 01:00:00.000000000 +0100 @@ -83,7 +83,7 @@ "$schema": "https://json-schema.org/draft/next/schema", "contentMediaType": "application/json", "contentEncoding": "base64", - "contentSchema": { "required": ["foo"], "properties": { "foo": { "type": "string" } } } + "contentSchema": { "type": "object", "required": ["foo"], "properties": { "foo": { "type": "string" } } } }, "tests": [ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft-next/dynamicRef.json new/jsonschema-4.17.3/json/tests/draft-next/dynamicRef.json --- old/jsonschema-4.17.1/json/tests/draft-next/dynamicRef.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft-next/dynamicRef.json 2020-02-02 01:00:00.000000000 +0100 @@ -484,5 +484,94 @@ "valid": true } ] + }, + { + "description": "$dynamicAnchor inside propertyDependencies", + "schema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "http://localhost:1234/draft2020-12/dynamicanchor-in-propertydependencies.js…", + "$defs": { + "inner": { + "$id": "inner", + "$dynamicAnchor": "foo", + "type": "object", + "additionalProperties": { + "$dynamicRef": "#foo" + } + } + }, + "propertyDependencies": { + "expectedTypes": { + "strings": { + "$id": "east", + "$ref": "inner", + "$defs": { + "foo": { + "$dynamicAnchor": "foo", + "type": "string" + } + } + }, + "integers": { + "$id": "west", + "$ref": "inner", + "$defs": { + "foo": { + "$dynamicAnchor": "foo", + "type": "integer" + } + } + } + } + } + }, + "tests": [ + { + "description": "expected strings - additional property as string is valid", + "data": { + "expectedTypes": "strings", + "anotherProperty": "also a string" + }, + "valid": true + }, + { + "description": "expected strings - additional property as not string is invalid", + "data": { + "expectedTypes": "strings", + "anotherProperty": 42 + }, + "valid": false + }, + { + "description": "expected integers - additional property as integer is valid", + "data": { + "expectedTypes": "integers", + "anotherProperty": 42 + }, + "valid": true + }, + { + "description": "expected integers - additional property as not integer is invalid", + "data": { + "expectedTypes": "integers", + "anotherProperty": "a string" + }, + "valid": false + }, + { + "description": "expected missing - additional property as an object is valid", + "data": { + "anotherProperty": {} + }, + "valid": true + }, + { + "description": "expected missing - additional property as not object is invalid", + "data": { + "anotherProperty": 42 + }, + "valid": false + } + ] } ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft-next/optional/format/duration.json new/jsonschema-4.17.3/json/tests/draft-next/optional/format/duration.json --- old/jsonschema-4.17.1/json/tests/draft-next/optional/format/duration.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft-next/optional/format/duration.json 2020-02-02 01:00:00.000000000 +0100 @@ -125,6 +125,11 @@ "description": "invalid non-ASCII '��' (a Bengali 2)", "data": "P��Y", "valid": false + }, + { + "description": "element without unit", + "data": "P1", + "valid": false } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft-next/optional/format/relative-json-pointer.json new/jsonschema-4.17.3/json/tests/draft-next/optional/format/relative-json-pointer.json --- old/jsonschema-4.17.1/json/tests/draft-next/optional/format/relative-json-pointer.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft-next/optional/format/relative-json-pointer.json 2020-02-02 01:00:00.000000000 +0100 @@ -67,6 +67,11 @@ "valid": false }, { + "description": "explicit positive prefix", + "data": "+1/foo/bar", + "valid": false + }, + { "description": "## is not a valid json-pointer", "data": "0##", "valid": false @@ -80,6 +85,16 @@ "description": "zero cannot be followed by other digits, plus octothorpe", "data": "01#", "valid": false + }, + { + "description": "empty string", + "data": "", + "valid": false + }, + { + "description": "multi-digit integer prefix", + "data": "120/foo/bar", + "valid": true } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft-next/optional/format/time.json new/jsonschema-4.17.3/json/tests/draft-next/optional/format/time.json --- old/jsonschema-4.17.1/json/tests/draft-next/optional/format/time.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft-next/optional/format/time.json 2020-02-02 01:00:00.000000000 +0100 @@ -192,9 +192,24 @@ "valid": false }, { + "description": "no time offset with second fraction", + "data": "12:00:00.52", + "valid": false + }, + { "description": "invalid non-ASCII '��' (a Bengali 2)", "data": "1��:00:00Z", "valid": false + }, + { + "description": "offset not starting with plus or minus", + "data": "08:30:06#00:20", + "valid": false + }, + { + "description": "contains letters", + "data": "ab:cd:ef", + "valid": false } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft-next/optional/format/uri.json new/jsonschema-4.17.3/json/tests/draft-next/optional/format/uri.json --- old/jsonschema-4.17.1/json/tests/draft-next/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft-next/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 @@ -7,6 +7,36 @@ }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "a valid URL with anchor tag", "data": "http://foo.bar/?baz=qux#quux", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft-next/optional/format/uuid.json new/jsonschema-4.17.3/json/tests/draft-next/optional/format/uuid.json --- old/jsonschema-4.17.1/json/tests/draft-next/optional/format/uuid.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft-next/optional/format/uuid.json 2020-02-02 01:00:00.000000000 +0100 @@ -7,6 +7,36 @@ }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "all upper-case", "data": "2EB8AA08-AA98-11EA-B4AA-73B441D16380", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft-next/unevaluatedProperties.json new/jsonschema-4.17.3/json/tests/draft-next/unevaluatedProperties.json --- old/jsonschema-4.17.1/json/tests/draft-next/unevaluatedProperties.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft-next/unevaluatedProperties.json 2020-02-02 01:00:00.000000000 +0100 @@ -1470,5 +1470,46 @@ "valid": true } ] + }, + { + "description": "unevaluatedProperties can see inside propertyDependencies", + "schema": { + "$schema": "https://json-schema.org/draft/next/schema", + "propertyDependencies": { + "foo": { + "foo1": { + "properties": { + "bar": true + } + } + } + }, + "unevaluatedProperties": false + }, + "tests": [ + { + "description": "allows bar if foo = foo1", + "data": { + "foo": "foo1", + "bar": 42 + }, + "valid": true + }, + { + "description": "disallows bar if foo != foo1", + "data": { + "foo": "foo2", + "bar": 42 + }, + "valid": false + }, + { + "description": "disallows bar if foo is absent", + "data": { + "bar": 42 + }, + "valid": false + } + ] } ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2019-09/content.json new/jsonschema-4.17.3/json/tests/draft2019-09/content.json --- old/jsonschema-4.17.1/json/tests/draft2019-09/content.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2019-09/content.json 2020-02-02 01:00:00.000000000 +0100 @@ -83,7 +83,7 @@ "$schema": "https://json-schema.org/draft/2019-09/schema", "contentMediaType": "application/json", "contentEncoding": "base64", - "contentSchema": { "required": ["foo"], "properties": { "foo": { "type": "string" } } } + "contentSchema": { "type": "object", "required": ["foo"], "properties": { "foo": { "type": "string" } } } }, "tests": [ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/duration.json new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/duration.json --- old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/duration.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/duration.json 2020-02-02 01:00:00.000000000 +0100 @@ -125,6 +125,11 @@ "description": "invalid non-ASCII '��' (a Bengali 2)", "data": "P��Y", "valid": false + }, + { + "description": "element without unit", + "data": "P1", + "valid": false } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/relative-json-pointer.json new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/relative-json-pointer.json --- old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/relative-json-pointer.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/relative-json-pointer.json 2020-02-02 01:00:00.000000000 +0100 @@ -67,6 +67,11 @@ "valid": false }, { + "description": "explicit positive prefix", + "data": "+1/foo/bar", + "valid": false + }, + { "description": "## is not a valid json-pointer", "data": "0##", "valid": false @@ -80,6 +85,16 @@ "description": "zero cannot be followed by other digits, plus octothorpe", "data": "01#", "valid": false + }, + { + "description": "empty string", + "data": "", + "valid": false + }, + { + "description": "multi-digit integer prefix", + "data": "120/foo/bar", + "valid": true } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/time.json new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/time.json --- old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/time.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/time.json 2020-02-02 01:00:00.000000000 +0100 @@ -192,9 +192,24 @@ "valid": false }, { + "description": "no time offset with second fraction", + "data": "12:00:00.52", + "valid": false + }, + { "description": "invalid non-ASCII '��' (a Bengali 2)", "data": "1��:00:00Z", "valid": false + }, + { + "description": "offset not starting with plus or minus", + "data": "08:30:06#00:20", + "valid": false + }, + { + "description": "contains letters", + "data": "ab:cd:ef", + "valid": false } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/uri.json new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/uri.json --- old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 @@ -7,6 +7,36 @@ }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "a valid URL with anchor tag", "data": "http://foo.bar/?baz=qux#quux", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/uuid.json new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/uuid.json --- old/jsonschema-4.17.1/json/tests/draft2019-09/optional/format/uuid.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2019-09/optional/format/uuid.json 2020-02-02 01:00:00.000000000 +0100 @@ -7,6 +7,36 @@ }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "all upper-case", "data": "2EB8AA08-AA98-11EA-B4AA-73B441D16380", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2020-12/content.json new/jsonschema-4.17.3/json/tests/draft2020-12/content.json --- old/jsonschema-4.17.1/json/tests/draft2020-12/content.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2020-12/content.json 2020-02-02 01:00:00.000000000 +0100 @@ -83,7 +83,7 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "contentMediaType": "application/json", "contentEncoding": "base64", - "contentSchema": { "required": ["foo"], "properties": { "foo": { "type": "string" } } } + "contentSchema": { "type": "object", "required": ["foo"], "properties": { "foo": { "type": "string" } } } }, "tests": [ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/duration.json new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/duration.json --- old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/duration.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/duration.json 2020-02-02 01:00:00.000000000 +0100 @@ -125,6 +125,11 @@ "description": "invalid non-ASCII '��' (a Bengali 2)", "data": "P��Y", "valid": false + }, + { + "description": "element without unit", + "data": "P1", + "valid": false } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/relative-json-pointer.json new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/relative-json-pointer.json --- old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/relative-json-pointer.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/relative-json-pointer.json 2020-02-02 01:00:00.000000000 +0100 @@ -67,6 +67,11 @@ "valid": false }, { + "description": "explicit positive prefix", + "data": "+1/foo/bar", + "valid": false + }, + { "description": "## is not a valid json-pointer", "data": "0##", "valid": false @@ -80,6 +85,16 @@ "description": "zero cannot be followed by other digits, plus octothorpe", "data": "01#", "valid": false + }, + { + "description": "empty string", + "data": "", + "valid": false + }, + { + "description": "multi-digit integer prefix", + "data": "120/foo/bar", + "valid": true } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/time.json new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/time.json --- old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/time.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/time.json 2020-02-02 01:00:00.000000000 +0100 @@ -192,9 +192,24 @@ "valid": false }, { + "description": "no time offset with second fraction", + "data": "12:00:00.52", + "valid": false + }, + { "description": "invalid non-ASCII '��' (a Bengali 2)", "data": "1��:00:00Z", "valid": false + }, + { + "description": "offset not starting with plus or minus", + "data": "08:30:06#00:20", + "valid": false + }, + { + "description": "contains letters", + "data": "ab:cd:ef", + "valid": false } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/uri.json new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/uri.json --- old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 @@ -7,6 +7,36 @@ }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "a valid URL with anchor tag", "data": "http://foo.bar/?baz=qux#quux", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/uuid.json new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/uuid.json --- old/jsonschema-4.17.1/json/tests/draft2020-12/optional/format/uuid.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft2020-12/optional/format/uuid.json 2020-02-02 01:00:00.000000000 +0100 @@ -7,6 +7,36 @@ }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "all upper-case", "data": "2EB8AA08-AA98-11EA-B4AA-73B441D16380", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft4/optional/format/uri.json new/jsonschema-4.17.3/json/tests/draft4/optional/format/uri.json --- old/jsonschema-4.17.1/json/tests/draft4/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft4/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 @@ -4,6 +4,36 @@ "schema": { "format": "uri" }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "a valid URL with anchor tag", "data": "http://foo.bar/?baz=qux#quux", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft6/optional/format/uri.json new/jsonschema-4.17.3/json/tests/draft6/optional/format/uri.json --- old/jsonschema-4.17.1/json/tests/draft6/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft6/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 @@ -4,6 +4,36 @@ "schema": { "format": "uri" }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "a valid URL with anchor tag", "data": "http://foo.bar/?baz=qux#quux", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft7/optional/format/relative-json-pointer.json new/jsonschema-4.17.3/json/tests/draft7/optional/format/relative-json-pointer.json --- old/jsonschema-4.17.1/json/tests/draft7/optional/format/relative-json-pointer.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft7/optional/format/relative-json-pointer.json 2020-02-02 01:00:00.000000000 +0100 @@ -64,6 +64,11 @@ "valid": false }, { + "description": "explicit positive prefix", + "data": "+1/foo/bar", + "valid": false + }, + { "description": "## is not a valid json-pointer", "data": "0##", "valid": false @@ -77,6 +82,16 @@ "description": "zero cannot be followed by other digits, plus octothorpe", "data": "01#", "valid": false + }, + { + "description": "empty string", + "data": "", + "valid": false + }, + { + "description": "multi-digit integer prefix", + "data": "120/foo/bar", + "valid": true } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft7/optional/format/time.json new/jsonschema-4.17.3/json/tests/draft7/optional/format/time.json --- old/jsonschema-4.17.1/json/tests/draft7/optional/format/time.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft7/optional/format/time.json 2020-02-02 01:00:00.000000000 +0100 @@ -189,9 +189,24 @@ "valid": false }, { + "description": "no time offset with second fraction", + "data": "12:00:00.52", + "valid": false + }, + { "description": "invalid non-ASCII '��' (a Bengali 2)", "data": "1��:00:00Z", "valid": false + }, + { + "description": "offset not starting with plus or minus", + "data": "08:30:06#00:20", + "valid": false + }, + { + "description": "contains letters", + "data": "ab:cd:ef", + "valid": false } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/json/tests/draft7/optional/format/uri.json new/jsonschema-4.17.3/json/tests/draft7/optional/format/uri.json --- old/jsonschema-4.17.1/json/tests/draft7/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/json/tests/draft7/optional/format/uri.json 2020-02-02 01:00:00.000000000 +0100 @@ -4,6 +4,36 @@ "schema": { "format": "uri" }, "tests": [ { + "description": "all string formats ignore integers", + "data": 12, + "valid": true + }, + { + "description": "all string formats ignore floats", + "data": 13.7, + "valid": true + }, + { + "description": "all string formats ignore objects", + "data": {}, + "valid": true + }, + { + "description": "all string formats ignore arrays", + "data": [], + "valid": true + }, + { + "description": "all string formats ignore booleans", + "data": false, + "valid": true + }, + { + "description": "all string formats ignore nulls", + "data": null, + "valid": true + }, + { "description": "a valid URL with anchor tag", "data": "http://foo.bar/?baz=qux#quux", "valid": true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/jsonschema/_format.py new/jsonschema-4.17.3/jsonschema/_format.py --- old/jsonschema-4.17.1/jsonschema/_format.py 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/jsonschema/_format.py 2020-02-02 01:00:00.000000000 +0100 @@ -454,6 +454,9 @@ # https://tools.ietf.org/html/draft-handrews-relative-json-pointer-01#section… if not isinstance(instance, str): return True + if not instance: + return False + non_negative_integer, rest = [], "" for i, character in enumerate(instance): if character.isdigit(): @@ -498,7 +501,9 @@ def is_duration(instance: object) -> bool: if not isinstance(instance, str): return True - return bool(isoduration.parse_duration(instance)) + isoduration.parse_duration(instance) + # FIXME: See bolsote/isoduration#25 and bolsote/isoduration#21 + return instance.endswith(tuple("DMYWHMS")) @_checks_drafts( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/jsonschema/protocols.py new/jsonschema-4.17.3/jsonschema/protocols.py --- old/jsonschema-4.17.1/jsonschema/protocols.py 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/jsonschema/protocols.py 2020-02-02 01:00:00.000000000 +0100 @@ -29,6 +29,7 @@ # but use `jsonschema` for any types which will otherwise not be resolvable if TYPE_CHECKING: import jsonschema + import jsonschema.validators from jsonschema.exceptions import ValidationError @@ -107,7 +108,7 @@ def __init__( self, schema: Mapping | bool, - resolver: jsonschema.RefResolver | None = None, + resolver: jsonschema.validators.RefResolver | None = None, format_checker: jsonschema.FormatChecker | None = None, ) -> None: ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/jsonschema/tests/test_jsonschema_test_suite.py new/jsonschema-4.17.3/jsonschema/tests/test_jsonschema_test_suite.py --- old/jsonschema-4.17.1/jsonschema/tests/test_jsonschema_test_suite.py 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/jsonschema/tests/test_jsonschema_test_suite.py 2020-02-02 01:00:00.000000000 +0100 @@ -407,6 +407,7 @@ TestDraft201909Format = DRAFT201909.to_unittest_testcase( DRAFT201909.format_tests(), + name="TestDraft201909Format", Validator=jsonschema.Draft201909Validator, format_checker=jsonschema.Draft201909Validator.FORMAT_CHECKER, skip=lambda test: ( @@ -532,6 +533,7 @@ TestDraft202012Format = DRAFT202012.to_unittest_testcase( DRAFT202012.format_tests(), + name="TestDraft202012Format", Validator=jsonschema.Draft202012Validator, format_checker=jsonschema.Draft202012Validator.FORMAT_CHECKER, skip=lambda test: ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/jsonschema/tests/test_validators.py new/jsonschema-4.17.3/jsonschema/tests/test_validators.py --- old/jsonschema-4.17.1/jsonschema/tests/test_validators.py 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/jsonschema/tests/test_validators.py 2020-02-02 01:00:00.000000000 +0100 @@ -1848,6 +1848,21 @@ invalid = {"type": "integer"}, "foo" +class TestLatestValidator(TestCase): + """ + These really apply to multiple versions but are easiest to test on one. + """ + + def test_ref_resolvers_may_have_boolean_schemas_stored(self): + ref = "someCoolRef" + schema = {"$ref": ref} + resolver = validators.RefResolver("", {}, store={ref: False}) + validator = validators._LATEST_VERSION(schema, resolver=resolver) + + with self.assertRaises(exceptions.ValidationError): + validator.validate(None) + + class TestValidatorFor(TestCase): def test_draft_3(self): schema = {"$schema": "http://json-schema.org/draft-03/schema"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsonschema-4.17.1/jsonschema/validators.py new/jsonschema-4.17.3/jsonschema/validators.py --- old/jsonschema-4.17.1/jsonschema/validators.py 2020-02-02 01:00:00.000000000 +0100 +++ new/jsonschema-4.17.3/jsonschema/validators.py 2020-02-02 01:00:00.000000000 +0100 @@ -4,7 +4,7 @@ from __future__ import annotations from collections import deque -from collections.abc import Sequence +from collections.abc import Mapping, Sequence from functools import lru_cache from operator import methodcaller from urllib.parse import unquote, urldefrag, urljoin, urlsplit @@ -745,7 +745,8 @@ self.store.update(store) self.store.update( (schema["$id"], schema) - for schema in store.values() if "$id" in schema + for schema in store.values() + if isinstance(schema, Mapping) and "$id" in schema ) self.store[base_uri] = referrer @@ -1060,9 +1061,9 @@ ... ValidationError: [2, 3, 4] is too long - :func:`validate` will first verify that the provided schema is - itself valid, since not doing so can lead to less obvious error - messages and fail in less obvious or consistent ways. + :func:`~jsonschema.validators.validate` will first verify that the + provided schema is itself valid, since not doing so can lead to less + obvious error messages and fail in less obvious or consistent ways. If you know you have a valid schema already, especially if you intend to validate multiple instances with

1 0

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

02 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libxcrypt for openSUSE:Factory checked in at 2022-12-02 13:11:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxcrypt (Old) and /work/SRC/openSUSE:Factory/.libxcrypt.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxcrypt" Fri Dec 2 13:11:58 2022 rev:16 rq:1039143 version:4.4.33 Changes: -------- --- /work/SRC/openSUSE:Factory/libxcrypt/libxcrypt.changes 2022-10-18 12:44:05.601599901 +0200 +++ /work/SRC/openSUSE:Factory/.libxcrypt.new.1835/libxcrypt.changes 2022-12-02 13:11:59.461474954 +0100 @@ -1,0 +2,12 @@ +Wed Nov 30 15:02:10 UTC 2022 - Andreas Schwab <schwab(a)suse.de> + +- Update to 4.4.33 + * Fix variable name in crypt(3) for a datamember of 'struct crypt_data' + * Fix -Werror=strict-overflow in lib/crypt-des.c, which is seen + by GCC 12.x + * Add some SHA-2 Maj() optimization in lib/alg-sha256.c + * Fix -Werror=conversion in lib/alg-yescrypt-opt.c + * Improvements to huge page handling in lib/alg-yescrypt-platform.c + * Fix -Werror=sign-conversion in lib/alg-yescrypt-platform.c + +------------------------------------------------------------------- @@ -5,2 +17 @@ - * Add glibc-on-or1k (OpenRISC 1000) entry to libcrypt.minver. - This was added in GNU libc 2.35. + No changes whatsoever. Old: ---- libxcrypt-4.4.28.tar.xz libxcrypt-4.4.28.tar.xz.asc New: ---- libxcrypt-4.4.33.tar.xz libxcrypt-4.4.33.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxcrypt.spec ++++++ --- /var/tmp/diff_new_pack.PeNID9/_old 2022-12-02 13:12:00.277479411 +0100 +++ /var/tmp/diff_new_pack.PeNID9/_new 2022-12-02 13:12:00.285479455 +0100 @@ -17,7 +17,7 @@ Name: libxcrypt -Version: 4.4.28 +Version: 4.4.33 Release: 0 Summary: Extended crypt library for DES, MD5, Blowfish and others License: BSD-2-Clause AND GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause AND SUSE-Public-Domain ++++++ libxcrypt-4.4.28.tar.xz -> libxcrypt-4.4.33.tar.xz ++++++ ++++ 19957 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/INSTALL new/libxcrypt-4.4.33/INSTALL --- old/libxcrypt-4.4.28/INSTALL 2022-02-01 23:32:29.000000000 +0100 +++ new/libxcrypt-4.4.33/INSTALL 2022-11-18 19:48:41.000000000 +0100 @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software -Foundation, Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free +Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -225,7 +225,7 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX 'make' updates targets which have the same time stamps as their + HP-UX 'make' updates targets which have the same timestamps as their prerequisites, which makes it generally unusable when shipped generated files such as 'configure' are involved. Use GNU 'make' instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/Makefile.am new/libxcrypt-4.4.33/Makefile.am --- old/libxcrypt-4.4.28/Makefile.am 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/Makefile.am 2022-11-01 16:58:08.000000000 +0100 @@ -156,6 +156,9 @@ if HAVE_VSCRIPT libcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map +APPLY_SYMVERS = yes +else +APPLY_SYMVERS = no endif libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS) @@ -224,6 +227,7 @@ lib/libcrypt.map.in Makefile $(AM_V_GENS)LC_ALL=C $(PERL) \ $(SCRIPTS_AUX)/gen-crypt-symbol-vers-h \ + $(APPLY_SYMVERS) \ SYMVER_MIN=$(SYMVER_MIN) \ SYMVER_FLOOR=$(SYMVER_FLOOR) \ COMPAT_ABI=$(COMPAT_ABI) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/NEWS new/libxcrypt-4.4.33/NEWS --- old/libxcrypt-4.4.28/NEWS 2022-02-01 23:32:21.000000000 +0100 +++ new/libxcrypt-4.4.33/NEWS 2022-11-18 19:45:29.000000000 +0100 @@ -3,6 +3,47 @@ Please send bug reports, questions and suggestions to <https://github.com/besser82/libxcrypt/issues>. +Version 4.4.33 +* Fix -Werror=sign-conversion in lib/alg-yescrypt-platform.c. + With commit 894aee75433b4dc8d9724b126da6e79fa5f6814b we introduced some + changes to huge page handling, that show this error when building with + GCC v12.2.1, and thus need a small fix. + +Version 4.4.32 +* Improvements to huge page handling in lib/alg-yescrypt-platform.c. + When explicitly using huge pages, request the 2 MiB page size. + This should fix the issue where on a system configured to use 1 GiB + huge pages we'd fail on munmap() as we're only rounding the size up + to a multiple of 2 MiB. With the fix, we wouldn't use huge pages on + such a system. Unfortunately, now we also wouldn't use huge pages on + Linux kernels too old to have MAP_HUGE_2MB (issue #152). + +Version 4.4.31 +* Fix -Werror=conversion in lib/alg-yescrypt-opt.c + (issues #161 and #162). +* Add some SHA-2 Maj() optimization in lib/alg-sha256.c. +* Fix issues found by Covscan in test/getrandom-fallback.c. +* Fix -Werror=strict-overflow in lib/crypt-des.c, which is seen + by GCC 12.x (issues #155 and #163). + +Version 4.4.30 +* configure: Restore ucontext api functionality check. + In c3f01c72b303cbbb0cc8983120677edee2f3fa4b the use of the ucontext api + in the main program was removed, and with it the configure check for it. + However, the ucontext api is still used in the "explicit_bzero" test and + thus this test still needs to be in place. + See also: https://bugs.gentoo.org/838172 +* configure: Restore the functionality of the '--disable-symvers' switch. + Without this fix the build was simply broken, if symbol versioning was + disabled for any reason, e.g. whether the compiler nor the linker + supporting it, or if disabled on purpose by the user (issue #142). +* Fix variable name in crypt(3) for a datamember of 'struct crypt_data' + (issue #153). + +Version 4.4.29 +* Add glibc-on-loongarch-lp64 (Loongson LA464 / LA664) entry to + libcrypt.minver. This was added in GNU libc 2.36. + Version 4.4.28 * Add glibc-on-or1k (OpenRISC 1000) entry to libcrypt.minver. This was added in GNU libc 2.35. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/m4/libtool.m4 new/libxcrypt-4.4.33/build-aux/m4/libtool.m4 --- old/libxcrypt-4.4.28/build-aux/m4/libtool.m4 2022-02-01 23:32:26.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/m4/libtool.m4 2022-11-18 19:48:38.000000000 +0100 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -778,7 +780,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1042,8 +1044,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1067,17 +1069,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1126,12 +1123,12 @@ output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1245,7 +1242,8 @@ # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1262,7 +1260,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1292,7 +1290,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1309,7 +1307,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1321,7 +1319,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1343,7 +1341,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1351,7 +1349,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1359,7 +1357,7 @@ emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1379,14 +1377,14 @@ # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1454,7 +1452,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1493,9 +1491,22 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1714,7 +1725,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1757,7 +1768,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2207,26 +2218,35 @@ striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2549,7 +2569,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2559,14 +2579,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2585,7 +2605,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2622,7 +2642,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2655,7 +2675,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3457,7 +3477,7 @@ bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3491,14 +3511,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3512,7 +3532,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3559,7 +3579,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3686,13 +3706,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3718,7 +3738,7 @@ # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3958,7 +3978,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* $.*$$/ {\"\1\", (void *) 0},/p'" @@ -3976,20 +3996,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* $.*$$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* $lib.*$$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4013,7 +4033,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4031,9 +4051,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4320,7 +4340,7 @@ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4403,7 +4423,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4739,7 +4759,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4922,7 +4942,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4930,7 +4950,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -4987,15 +5007,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5047,7 +5067,7 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5159,6 +5179,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5173,7 +5194,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5216,7 +5237,7 @@ _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5228,7 +5249,7 @@ if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5244,7 +5265,7 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5376,7 +5397,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5559,12 +5580,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5605,7 +5626,7 @@ fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5653,7 +5674,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5864,6 +5885,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6634,8 +6656,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6733,6 +6755,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6763,7 +6786,7 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6900,7 +6923,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7040,13 +7063,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8192,6 +8215,14 @@ AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/m4/ltoptions.m4 new/libxcrypt-4.4.33/build-aux/m4/ltoptions.m4 --- old/libxcrypt-4.4.28/build-aux/m4/ltoptions.m4 2022-02-01 23:32:26.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/m4/ltoptions.m4 2022-11-18 19:48:38.000000000 +0100 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/m4/ltsugar.m4 new/libxcrypt-4.4.33/build-aux/m4/ltsugar.m4 --- old/libxcrypt-4.4.28/build-aux/m4/ltsugar.m4 2022-02-01 23:32:26.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/m4/ltsugar.m4 2022-11-18 19:48:38.000000000 +0100 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/m4/ltversion.m4 new/libxcrypt-4.4.33/build-aux/m4/ltversion.m4 --- old/libxcrypt-4.4.28/build-aux/m4/ltversion.m4 2022-02-01 23:32:26.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/m4/ltversion.m4 2022-11-18 19:48:38.000000000 +0100 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/m4/lt~obsolete.m4 new/libxcrypt-4.4.33/build-aux/m4/lt~obsolete.m4 --- old/libxcrypt-4.4.28/build-aux/m4/lt~obsolete.m4 2022-02-01 23:32:26.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/m4/lt~obsolete.m4 2022-11-18 19:48:38.000000000 +0100 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/m4-autogen/compile new/libxcrypt-4.4.33/build-aux/m4-autogen/compile --- old/libxcrypt-4.4.28/build-aux/m4-autogen/compile 2022-02-01 23:32:29.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/m4-autogen/compile 2022-11-18 19:48:41.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/m4-autogen/missing new/libxcrypt-4.4.33/build-aux/m4-autogen/missing --- old/libxcrypt-4.4.28/build-aux/m4-autogen/missing 2022-02-01 23:32:29.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/m4-autogen/missing 2022-11-18 19:48:41.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/m4-autogen/test-driver new/libxcrypt-4.4.33/build-aux/m4-autogen/test-driver --- old/libxcrypt-4.4.28/build-aux/m4-autogen/test-driver 2022-02-01 23:32:29.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/m4-autogen/test-driver 2022-11-18 19:48:41.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,11 +42,13 @@ { cat <<END Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] + test-driver --test-name NAME --log-file PATH --trs-file PATH + [--expect-failure {yes|no}] [--color-tests {yes|no}] + [--enable-hard-errors {yes|no}] [--] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] + The '--test-name', '--log-file' and '--trs-file' options are mandatory. +See the GNU Automake documentation for information. END } @@ -103,8 +105,11 @@ trap "st=141; $do_exit" 13 trap "st=143; $do_exit" 15 -# Test script is run here. -"$@" >$log_file 2>&1 +# Test script is run here. We create the file first, then append to it, +# to ameliorate tests themselves also writing to the log file. Our tests +# don't, but others can (automake bug#35762). +: >"$log_file" +"$@" >>"$log_file" 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -126,7 +131,7 @@ # know whether the test passed or failed simply by looking at the '.log' # file, without the need of also peaking into the corresponding '.trs' # file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file +echo "$res $test_name (exit status: $estatus)" >>"$log_file" # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/build-aux/scripts/gen-crypt-symbol-vers-h new/libxcrypt-4.4.33/build-aux/scripts/gen-crypt-symbol-vers-h --- old/libxcrypt-4.4.28/build-aux/scripts/gen-crypt-symbol-vers-h 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/build-aux/scripts/gen-crypt-symbol-vers-h 2022-11-01 16:58:08.000000000 +0100 @@ -30,7 +30,7 @@ ); sub output { - my ($symvers) = @_; + my ($apply_symvers, $symvers) = @_; my $basemap = $symvers->basemap; print "/* Generated from $basemap by ${FindBin::Script}. " . "DO NOT EDIT. */\n"; @@ -60,6 +60,26 @@ $sym->included && !$sym->compat_only; } + if ($apply_symvers =~ m/no/) { + print <<'EOT'; + +#endif + +/* We are building this library with no symbol versioning + enabled, so let's define all macros for SYMVER_ to do + nothing. */ +EOT + for my $sym (@{$symvers->symbols}) { + my $name = $sym->name; + print "#define SYMVER_$name symver_nop()\n"; + } + print <<'EOT'; +#endif +EOT + close STDOUT or die "write error: $!\n"; + return; + } + print <<'EOT'; #endif @@ -122,7 +142,7 @@ # Main # exit 0 if eval { - output(parse_version_map_in(@ARGV)); + output($ARGV[0], parse_version_map_in(@ARGV[1 .. 4])); 1; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/config.h.in new/libxcrypt-4.4.33/config.h.in --- old/libxcrypt-4.4.28/config.h.in 2022-02-01 23:32:28.000000000 +0100 +++ new/libxcrypt-4.4.33/config.h.in 2022-11-18 19:48:40.000000000 +0100 @@ -67,6 +67,9 @@ /* Define to 1 if you have the `memset_s' function. */ #undef HAVE_MEMSET_S +/* Define to 1 if you have the <minix/config.h> header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the `open64' function. */ #undef HAVE_OPEN64 @@ -79,17 +82,21 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H -/* Always define to 1, for backward compatibility. You can assume <stdlib.h> - exists. */ +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + +/* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H -/* Always define to 1, for backward compatibility. You can assume <string.h> - exists. */ +/* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define as 1 if symbol versioning is enabled and applied. */ +#undef HAVE_SYMVER + /* Define to 1 if you have the `syscall' function. */ #undef HAVE_SYSCALL @@ -129,6 +136,9 @@ /* Define to 1 if you have the <valgrind/valgrind.h> header file. */ #undef HAVE_VALGRIND_VALGRIND_H +/* Define to 1 if you have the <wchar.h> header file. */ +#undef HAVE_WCHAR_H + /* Define if the compiler supports the _Static_assert intrinsic. */ #undef HAVE__STATIC_ASSERT @@ -156,39 +166,104 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Always define to 1, for backward compatibility. You can assume the C90 - standard headers exist. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Define as the lowest compatibility symbol version that is actually included in libcrypt.so. */ #undef SYMVER_FLOOR +/* Define to 1 if getcontext, setcontext, makecontext, and swapcontext are + available from ucontext.h without deprecation warnings. */ +#undef USE_SWAPCONTEXT + /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Enable general extensions on OSX. */ -#ifndef _DARWIN_C_SOURCE -# undef _DARWIN_C_SOURCE +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE #endif @@ -198,27 +273,12 @@ /* Define when compiling with ASan. Only affects tests. */ #undef XCRYPT_USE_ASAN -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - /* Define as a type specifier which sets the alignment of a variable or type to N bytes. C11 alignas(TYPE) does not need to be supported. */ #undef alignas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/configure.ac new/libxcrypt-4.4.33/configure.ac --- old/libxcrypt-4.4.28/configure.ac 2022-02-01 23:32:21.000000000 +0100 +++ new/libxcrypt-4.4.33/configure.ac 2022-11-18 19:24:15.000000000 +0100 @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. m4_include([build-aux/m4/zw_automodern.m4]) AC_INIT([xcrypt], - [4.4.28], + [4.4.33], [https://github.com/besser82/libxcrypt/issues], [libxcrypt], [https://github.com/besser82/libxcrypt]) @@ -290,6 +290,39 @@ AC_SUBST([PYTHON]) AM_CONDITIONAL([ENABLE_KA_TABLE_GEN], [test x"$PYTHON" != "xfalse"]) +# The ucontext.h functions that we use were withdrawn from +# POSIX.1-2008, so the existence of the header does not prove +# we can use the functions. +AS_IF([test $ac_cv_header_ucontext_h = yes], + [AC_CACHE_CHECK([whether all ucontext.h functions are available], + [ac_cv_header_ucontext_h_fns_available], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +// This code isn't intended to make sense; it just validates the +// type signature of all four context functions, and avoids tripping +// any of the many warnings we may have active. +#include <ucontext.h> +static int x; +static void fn1(void) {} +static void fn2(int a, int b) { x = a - b; } +]], [[ + ucontext_t uc1, uc2; + if (getcontext(&uc1)) return 1; + if (setcontext(&uc1)) return 1; + makecontext(&uc1, fn1, 0); + makecontext(&uc2, fn2, 2, 1, 1); + if (swapcontext(&uc1, &uc2)) return 1; + return x; +]])], + [ac_cv_header_ucontext_h_fns_available=yes], + [ac_cv_header_ucontext_h_fns_available=no])])], + [ac_cv_header_ucontext_h_fns_available=no]) + +if test $ac_cv_header_ucontext_h_fns_available = yes; then + AC_DEFINE([USE_SWAPCONTEXT], 1, + [Define to 1 if getcontext, setcontext, makecontext, and swapcontext are + available from ucontext.h without deprecation warnings.]) +fi + # Configure options. AC_ARG_ENABLE([failure-tokens], AS_HELP_STRING( @@ -480,6 +513,14 @@ AC_SUBST([SYMVER_FLOOR]) AC_SUBST([SYMVER_MIN]) +# If symbol versioning is disabled for any reason, we should not rely on +# versioned symbols in the testsuite. +have_symver=0 +if test x$ax_check_vscript_flag != x; then have_symver=1; fi + +AC_DEFINE_UNQUOTED([HAVE_SYMVER], [$have_symver], + [Define as 1 if symbol versioning is enabled and applied.]) + # If we are not building the obsolete APIs then we shouldn't install # xcrypt.h or the compatibility symlinks either. if test $enable_obsolete_api = 0; then enable_xcrypt_compat_files=0; fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/doc/crypt.3 new/libxcrypt-4.4.33/doc/crypt.3 --- old/libxcrypt-4.4.28/doc/crypt.3 2021-09-03 11:58:31.000000000 +0200 +++ new/libxcrypt-4.4.33/doc/crypt.3 2022-11-01 16:58:08.000000000 +0100 @@ -90,7 +90,7 @@ struct crypt_data { char output[CRYPT_OUTPUT_SIZE]; char setting[CRYPT_OUTPUT_SIZE]; - char phrase[CRYPT_MAX_PASSPHRASE_SIZE]; + char input[CRYPT_MAX_PASSPHRASE_SIZE]; char initialized; }; .Ed @@ -100,11 +100,11 @@ the hashed passphrase will be stored in .Fa output . Applications are encouraged, but not required, to use the -.Fa phrase +.Fa input and .Fa setting fields to store the strings that they will pass as -.Fa phrase +.Fa input phrase and .Fa setting to @@ -126,7 +126,7 @@ (Of course, do this before storing anything in .Fa setting and -.Fa phrase . ) +.Fa input . ) .Pp The .Fa data @@ -143,7 +143,7 @@ the entire .Fa data object (except for the -.Fa phrase +.Fa input and .Fa setting fields) must be zeroed before its first use; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/lib/alg-sha256.c new/libxcrypt-4.4.33/lib/alg-sha256.c --- old/libxcrypt-4.4.28/lib/alg-sha256.c 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/lib/alg-sha256.c 2022-11-13 19:35:23.000000000 +0100 @@ -1,6 +1,6 @@ /*- * Copyright 2005-2016 Colin Percival - * Copyright 2016-2018 Alexander Peslyak + * Copyright 2016-2018,2021 Alexander Peslyak * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,7 +65,11 @@ /* Elementary functions used by SHA256 */ #define Ch(x, y, z) ((x & (y ^ z)) ^ z) -#define Maj(x, y, z) ((x & (y | z)) | (y & z)) +#if 1 /* Explicit caching/reuse of common subexpression between rounds */ +#define Maj(x, y, z) (y ^ ((x_xor_y = x ^ y) & y_xor_z)) +#else /* Let the compiler cache/reuse or not */ +#define Maj(x, y, z) (y ^ ((x ^ y) & (y ^ z))) +#endif #define SHR(x, n) (x >> n) #define ROTR(x, n) ((x >> n) | (x << (32 - n))) #define S0(x) (ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22)) @@ -77,7 +81,8 @@ #define RND(a, b, c, d, e, f, g, h, k) \ h += S1(e) + Ch(e, f, g) + k; \ d += h; \ - h += S0(a) + Maj(a, b, c); + h += S0(a) + Maj(a, b, c); \ + y_xor_z = x_xor_y; /* Adjusted round function for rotating state */ #define RNDr(S, W, i, ii) \ @@ -110,6 +115,7 @@ /* 3. Mix. */ for (i = 0; i <= 48; i += 16) { + uint32_t x_xor_y, y_xor_z = S[(65 - i) % 8] ^ S[(66 - i) % 8]; RNDr(S, W, 0, i); RNDr(S, W, 1, i); RNDr(S, W, 2, i); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/lib/alg-yescrypt-opt.c new/libxcrypt-4.4.33/lib/alg-yescrypt-opt.c --- old/libxcrypt-4.4.28/lib/alg-yescrypt-opt.c 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/lib/alg-yescrypt-opt.c 2022-11-13 19:35:23.000000000 +0100 @@ -514,7 +514,7 @@ #define PWXFORM_SIMD(X) { \ uint64_t x; \ FORCE_REGALLOC_1 \ - uint32_t lo = x = EXTRACT64(X) & Smask2reg; \ + uint32_t lo = (uint32_t)(x = ((uint64_t)EXTRACT64(X)) & Smask2reg); \ FORCE_REGALLOC_2 \ uint32_t hi = x >> 32; \ X = _mm_mul_epu32(HI32(X), X); \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/lib/alg-yescrypt-platform.c new/libxcrypt-4.4.33/lib/alg-yescrypt-platform.c --- old/libxcrypt-4.4.28/lib/alg-yescrypt-platform.c 2021-09-03 11:58:31.000000000 +0200 +++ new/libxcrypt-4.4.33/lib/alg-yescrypt-platform.c 2022-11-18 19:27:56.000000000 +0100 @@ -1,5 +1,5 @@ /*- - * Copyright 2013-2018 Alexander Peslyak + * Copyright 2013-2018,2022 Alexander Peslyak * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -21,6 +21,9 @@ #ifdef __unix__ #include <sys/mman.h> #endif +#ifdef __linux__ +#include <linux/mman.h> /* for MAP_HUGE_2MB */ +#endif #define HUGEPAGE_THRESHOLD (32 * 1024 * 1024) @@ -35,16 +38,16 @@ size_t base_size = size; uint8_t *base, *aligned; #ifdef MAP_ANON - int flags = + unsigned int flags = #ifdef MAP_NOCORE MAP_NOCORE | #endif MAP_ANON | MAP_PRIVATE; -#if defined(MAP_HUGETLB) && defined(HUGEPAGE_SIZE) +#if defined(MAP_HUGETLB) && defined(MAP_HUGE_2MB) && defined(HUGEPAGE_SIZE) size_t new_size = size; const size_t hugepage_mask = (size_t)HUGEPAGE_SIZE - 1; if (size >= HUGEPAGE_THRESHOLD && size + hugepage_mask >= size) { - flags |= MAP_HUGETLB; + flags |= MAP_HUGETLB | MAP_HUGE_2MB; /* * Linux's munmap() fails on MAP_HUGETLB mappings if size is not a multiple of * huge page size, so let's round up to huge page size here. @@ -52,16 +55,16 @@ new_size = size + hugepage_mask; new_size &= ~hugepage_mask; } - base = mmap(NULL, new_size, PROT_READ | PROT_WRITE, flags, -1, 0); + base = mmap(NULL, new_size, PROT_READ | PROT_WRITE, (int)flags, -1, 0); if (base != MAP_FAILED) { base_size = new_size; } else if (flags & MAP_HUGETLB) { - flags &= ~MAP_HUGETLB; - base = mmap(NULL, size, PROT_READ | PROT_WRITE, flags, -1, 0); + flags &= (unsigned int)~(MAP_HUGETLB | MAP_HUGE_2MB); + base = mmap(NULL, size, PROT_READ | PROT_WRITE, (int)flags, -1, 0); } #else - base = mmap(NULL, size, PROT_READ | PROT_WRITE, flags, -1, 0); + base = mmap(NULL, size, PROT_READ | PROT_WRITE, (int)flags, -1, 0); #endif if (base == MAP_FAILED) base = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/lib/crypt-des.c new/libxcrypt-4.4.33/lib/crypt-des.c --- old/libxcrypt-4.4.28/lib/crypt-des.c 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/lib/crypt-des.c 2022-11-14 11:41:05.000000000 +0100 @@ -114,7 +114,7 @@ c1 = *sptr++; *output++ = ascii64[c1 >> 2]; c1 = (c1 & 0x03) << 4; - if (sptr >= end) + if (end - sptr <= 0) { *output++ = ascii64[c1]; break; @@ -124,7 +124,7 @@ c1 |= c2 >> 4; *output++ = ascii64[c1]; c1 = (c2 & 0x0f) << 2; - if (sptr >= end) + if (end - sptr <= 0) { *output++ = ascii64[c1]; break; @@ -135,7 +135,7 @@ *output++ = ascii64[c1]; *output++ = ascii64[c2 & 0x3f]; } - while (sptr < end); + while (end - sptr > 0); *output = '\0'; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/lib/libcrypt.map.in new/libxcrypt-4.4.33/lib/libcrypt.map.in --- old/libxcrypt-4.4.28/lib/libcrypt.map.in 2022-02-01 23:27:21.000000000 +0100 +++ new/libxcrypt-4.4.33/lib/libcrypt.map.in 2022-10-31 22:17:05.000000000 +0100 @@ -43,4 +43,5 @@ %chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6 %chain GLIBC_2.3 GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18 %chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.35 +%chain GLIBC_2.36 %chain OW_CRYPT_1.0 XCRYPT_2.0 XCRYPT_4.3 XCRYPT_4.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/lib/libcrypt.minver new/libxcrypt-4.4.33/lib/libcrypt.minver --- old/libxcrypt-4.4.28/lib/libcrypt.minver 2022-02-01 23:16:01.000000000 +0100 +++ new/libxcrypt-4.4.33/lib/libcrypt.minver 2022-10-31 22:17:05.000000000 +0100 @@ -60,6 +60,7 @@ ERROR kfreebsd.*gnu . # Linux with GNU libc +GLIBC_2.36 linux.*gnu loongarch64 __WORDSIZE == 64 && ULONG_MAX != UINT_MAX /* lp64* ABI */ GLIBC_2.35 linux.*gnu or1k GLIBC_2.33 linux.*gnu riscv32 GLIBC_2.32 linux.*gnu arc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/test/des-obsolete.c new/libxcrypt-4.4.33/test/des-obsolete.c --- old/libxcrypt-4.4.28/test/des-obsolete.c 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/test/des-obsolete.c 2022-11-01 16:58:08.000000000 +0100 @@ -16,8 +16,10 @@ #include <errno.h> #endif +#if HAVE_SYMVER symver_ref("encrypt", encrypt, SYMVER_FLOOR); symver_ref("setkey", setkey, SYMVER_FLOOR); +#endif static void expand (unsigned char ex[64], const unsigned char pk[8]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/test/des-obsolete_r.c new/libxcrypt-4.4.33/test/des-obsolete_r.c --- old/libxcrypt-4.4.28/test/des-obsolete_r.c 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/test/des-obsolete_r.c 2022-11-01 16:58:08.000000000 +0100 @@ -16,8 +16,10 @@ #include <errno.h> #endif +#if HAVE_SYMVER symver_ref("encrypt_r", encrypt_r, SYMVER_FLOOR); symver_ref("setkey_r", setkey_r, SYMVER_FLOOR); +#endif static void expand (unsigned char ex[64], const unsigned char pk[8]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/test/explicit-bzero.c new/libxcrypt-4.4.33/test/explicit-bzero.c --- old/libxcrypt-4.4.28/test/explicit-bzero.c 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/test/explicit-bzero.c 2022-11-01 16:58:08.000000000 +0100 @@ -40,7 +40,7 @@ #include "crypt-port.h" -#ifndef HAVE_UCONTEXT_H +#ifndef USE_SWAPCONTEXT /* We can't do this test if we don't have the ucontext API. */ int main(void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxcrypt-4.4.28/test/getrandom-fallbacks.c new/libxcrypt-4.4.33/test/getrandom-fallbacks.c --- old/libxcrypt-4.4.28/test/getrandom-fallbacks.c 2022-01-05 23:38:03.000000000 +0100 +++ new/libxcrypt-4.4.33/test/getrandom-fallbacks.c 2022-11-13 19:35:23.000000000 +0100 @@ -77,7 +77,7 @@ } else { - buflen = MIN (buflen, SSIZE_MAX); + buflen = MIN (buflen, INT16_MAX); memset (buf, MOCK_getrandom, buflen); return (ssize_t)buflen; } @@ -130,7 +130,7 @@ va_start (ap, number); void *buf = va_arg (ap, void *); size_t buflen = va_arg (ap, size_t); - buflen = MIN (buflen, SSIZE_MAX); + buflen = MIN (buflen, INT16_MAX); va_end (ap); memset (buf, MOCK_sys_getrandom, buflen); return (ssize_t)buflen; @@ -205,7 +205,7 @@ } else { - count = MIN (count, SSIZE_MAX); + count = MIN (count, INT16_MAX); memset (buf, MOCK_urandom, count); return (ssize_t)count; }

1 0

commit 000product for openSUSE:Factory
by Source-Sync 02 Dec '22

02 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2022-12-02 02:35:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Fri Dec 2 02:35:57 2022 rev:3421 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:01.917700040 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:01.921700063 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__MicroOS___20221130" schemaversion="4.1"> +<image name="OBS__MicroOS___20221201" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20221130</productvar> + <productvar name="VERSION">20221201</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:microos:20221130,openSUSE MicroOS</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:microos:20221201,openSUSE MicroOS</productinfo> <productinfo name="LINGUAS">en_US </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20221130/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20221201/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> @@ -2542,6 +2542,7 @@ <repopackage name="sudo-plugin-python" arch="x86_64"/> <repopackage name="sunpinyin-data"/> <repopackage name="suse-module-tools"/> + <repopackage name="suse-module-tools-scriptlets"/> <repopackage name="susepaste" arch="x86_64"/> <repopackage name="susepaste-screenshot" arch="x86_64"/> <repopackage name="sushi" arch="x86_64"/> ++++++ openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:01.961700290 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:01.965700313 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Addon-NonOss___20221130" schemaversion="4.1"> +<image name="OBS__openSUSE-Addon-NonOss___20221201" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -36,11 +36,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20221130</productvar> + <productvar name="VERSION">20221201</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20221130,openSUSE NonOSS Addon</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20221201,openSUSE NonOSS Addon</productinfo> <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022…</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ openSUSE-cd-mini-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:01.989700449 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:01.993700473 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20221130" schemaversion="4.1"> +<image name="OBS__openSUSE___20221201" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,11 +32,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20221130</productvar> + <productvar name="VERSION">20221201</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221201,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/i586</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221201/i586</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ openSUSE-cd-mini-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.017700609 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.021700632 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20221130" schemaversion="4.1"> +<image name="OBS__openSUSE___20221201" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20221130</productvar> + <productvar name="VERSION">20221201</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221201,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221201/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.049700791 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.057700836 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20221130" schemaversion="4.1"> +<image name="OBS__openSUSE___20221201" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,11 +32,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20221130</productvar> + <productvar name="VERSION">20221201</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221201,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/i586</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221201/i586</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> @@ -116,7 +116,7 @@ <repopackage name="apache2"/> <repopackage name="apache2-manual"/> <repopackage name="apache2-mod_dnssd"/> - <repopackage name="apache2-mod_php7"/> + <repopackage name="apache2-mod_php8"/> <repopackage name="apache2-prefork"/> <repopackage name="apache2-utils"/> <repopackage name="apparmor-abstractions"/> @@ -3427,22 +3427,21 @@ <repopackage name="phonon4qt5-lang"/> <repopackage name="phononsettings"/> <repopackage name="phononsettings-lang"/> - <repopackage name="php7"/> - <repopackage name="php7-cli"/> - <repopackage name="php7-ctype"/> - <repopackage name="php7-dom"/> - <repopackage name="php7-gd"/> - <repopackage name="php7-gettext"/> - <repopackage name="php7-iconv"/> - <repopackage name="php7-json"/> - <repopackage name="php7-mbstring"/> - <repopackage name="php7-mysql"/> - <repopackage name="php7-openssl"/> - <repopackage name="php7-pdo"/> - <repopackage name="php7-sqlite"/> - <repopackage name="php7-tokenizer"/> - <repopackage name="php7-xmlreader"/> - <repopackage name="php7-xmlwriter"/> + <repopackage name="php8"/> + <repopackage name="php8-cli"/> + <repopackage name="php8-ctype"/> + <repopackage name="php8-dom"/> + <repopackage name="php8-gd"/> + <repopackage name="php8-gettext"/> + <repopackage name="php8-iconv"/> + <repopackage name="php8-mbstring"/> + <repopackage name="php8-mysql"/> + <repopackage name="php8-openssl"/> + <repopackage name="php8-pdo"/> + <repopackage name="php8-sqlite"/> + <repopackage name="php8-tokenizer"/> + <repopackage name="php8-xmlreader"/> + <repopackage name="php8-xmlwriter"/> <repopackage name="pia"/> <repopackage name="pico"/> <repopackage name="pidgin"/> @@ -4316,6 +4315,7 @@ <repopackage name="sudo-plugin-python"/> <repopackage name="sunpinyin-data"/> <repopackage name="suse-module-tools"/> + <repopackage name="suse-module-tools-scriptlets"/> <repopackage name="susefirewall2-to-firewalld"/> <repopackage name="susepaste"/> <repopackage name="susepaste-screenshot"/> ++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.081700973 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.085700995 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20221130" schemaversion="4.1"> +<image name="OBS__openSUSE___20221201" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20221130</productvar> + <productvar name="VERSION">20221201</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221201,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221201/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> @@ -122,7 +122,7 @@ <repopackage name="apache2"/> <repopackage name="apache2-manual"/> <repopackage name="apache2-mod_dnssd"/> - <repopackage name="apache2-mod_php7"/> + <repopackage name="apache2-mod_php8"/> <repopackage name="apache2-prefork"/> <repopackage name="apache2-utils"/> <repopackage name="apparmor-abstractions"/> @@ -3695,22 +3695,21 @@ <repopackage name="phonon4qt5-lang"/> <repopackage name="phononsettings"/> <repopackage name="phononsettings-lang"/> - <repopackage name="php7"/> - <repopackage name="php7-cli"/> - <repopackage name="php7-ctype"/> - <repopackage name="php7-dom"/> - <repopackage name="php7-gd"/> - <repopackage name="php7-gettext"/> - <repopackage name="php7-iconv"/> - <repopackage name="php7-json"/> - <repopackage name="php7-mbstring"/> - <repopackage name="php7-mysql"/> - <repopackage name="php7-openssl"/> - <repopackage name="php7-pdo"/> - <repopackage name="php7-sqlite"/> - <repopackage name="php7-tokenizer"/> - <repopackage name="php7-xmlreader"/> - <repopackage name="php7-xmlwriter"/> + <repopackage name="php8"/> + <repopackage name="php8-cli"/> + <repopackage name="php8-ctype"/> + <repopackage name="php8-dom"/> + <repopackage name="php8-gd"/> + <repopackage name="php8-gettext"/> + <repopackage name="php8-iconv"/> + <repopackage name="php8-mbstring"/> + <repopackage name="php8-mysql"/> + <repopackage name="php8-openssl"/> + <repopackage name="php8-pdo"/> + <repopackage name="php8-sqlite"/> + <repopackage name="php8-tokenizer"/> + <repopackage name="php8-xmlreader"/> + <repopackage name="php8-xmlwriter"/> <repopackage name="pia"/> <repopackage name="pico"/> <repopackage name="pidgin"/> @@ -4604,6 +4603,7 @@ <repopackage name="sunpinyin-data"/> <repopackage name="supermin" arch="x86_64"/> <repopackage name="suse-module-tools"/> + <repopackage name="suse-module-tools-scriptlets"/> <repopackage name="susefirewall2-to-firewalld"/> <repopackage name="susepaste"/> <repopackage name="susepaste-screenshot"/> ++++++ openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.117701178 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.121701200 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20221130" schemaversion="4.1"> +<image name="OBS__openSUSE___20221201" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -24,7 +24,7 @@ <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> <productvar name="MAKE_LISTINGS">true</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20221130-i586-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20221201-i586-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -36,11 +36,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20221130</productvar> + <productvar name="VERSION">20221201</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221201,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221201/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221201/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ MicroOS.product ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.169701474 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.173701496 +0100 @@ -6,7 +6,7 @@ <name>MicroOS</name> <releasepkgname>MicroOS-release</releasepkgname> <endoflife/> - <version>20221130</version> + <version>20221201</version>  <release>0</release> <productline>MicroOS</productline> ++++++ dvd.group ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.281702111 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.293702179 +0100 @@ -124,7 +124,7 @@ <package name="apache2" supportstatus="unsupported"/>  <package name="apache2-manual" supportstatus="unsupported"/>  <package name="apache2-mod_dnssd" supportstatus="unsupported"/>  - <package name="apache2-mod_php7" supportstatus="unsupported"/>  + <package name="apache2-mod_php8" supportstatus="unsupported"/>  <package name="apache2-prefork" supportstatus="unsupported"/>  <package name="apache2-utils" supportstatus="unsupported"/>  <package name="apparmor-abstractions" supportstatus="unsupported"/>  @@ -3378,22 +3378,21 @@ <package name="phonon4qt5-lang" supportstatus="unsupported"/>  <package name="phononsettings" supportstatus="unsupported"/>  <package name="phononsettings-lang" supportstatus="unsupported"/>  - <package name="php7" supportstatus="unsupported"/>  - <package name="php7-cli" supportstatus="unsupported"/>  - <package name="php7-ctype" supportstatus="unsupported"/>  - <package name="php7-dom" supportstatus="unsupported"/>  - <package name="php7-gd" supportstatus="unsupported"/>  - <package name="php7-gettext" supportstatus="unsupported"/>  - <package name="php7-iconv" supportstatus="unsupported"/>  - <package name="php7-json" supportstatus="unsupported"/>  - <package name="php7-mbstring" supportstatus="unsupported"/>  - <package name="php7-mysql" supportstatus="unsupported"/>  - <package name="php7-openssl" supportstatus="unsupported"/>  - <package name="php7-pdo" supportstatus="unsupported"/>  - <package name="php7-sqlite" supportstatus="unsupported"/>  - <package name="php7-tokenizer" supportstatus="unsupported"/>  - <package name="php7-xmlreader" supportstatus="unsupported"/>  - <package name="php7-xmlwriter" supportstatus="unsupported"/>  + <package name="php8" supportstatus="unsupported"/>  + <package name="php8-cli" supportstatus="unsupported"/>  + <package name="php8-ctype" supportstatus="unsupported"/>  + <package name="php8-dom" supportstatus="unsupported"/>  + <package name="php8-gd" supportstatus="unsupported"/>  + <package name="php8-gettext" supportstatus="unsupported"/>  + <package name="php8-iconv" supportstatus="unsupported"/>  + <package name="php8-mbstring" supportstatus="unsupported"/>  + <package name="php8-mysql" supportstatus="unsupported"/>  + <package name="php8-openssl" supportstatus="unsupported"/>  + <package name="php8-pdo" supportstatus="unsupported"/>  + <package name="php8-sqlite" supportstatus="unsupported"/>  + <package name="php8-tokenizer" supportstatus="unsupported"/>  + <package name="php8-xmlreader" supportstatus="unsupported"/>  + <package name="php8-xmlwriter" supportstatus="unsupported"/>  <package name="pia" supportstatus="unsupported"/>  <package name="pico" supportstatus="unsupported"/>  <package name="pidgin" supportstatus="unsupported"/>  @@ -4266,6 +4265,7 @@ <package name="sudo-plugin-python" supportstatus="unsupported"/>  <package name="sunpinyin-data" supportstatus="unsupported"/>  <package name="suse-module-tools" supportstatus="unsupported"/>  + <package name="suse-module-tools-scriptlets" supportstatus="unsupported"/>  <package name="susefirewall2-to-firewalld" supportstatus="unsupported"/>  <package name="susepaste" supportstatus="unsupported"/>  <package name="susepaste-screenshot" supportstatus="unsupported"/>  ++++++ openSUSE-Addon-NonOss.product ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.321702338 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.325702361 +0100 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20221130</version> + <version>20221201</version> <release>0</release> <summary>openSUSE NonOSS Addon</summary> <shortsummary>non oss addon</shortsummary> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.357702543 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.361702566 +0100 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20221130</version> + <version>20221201</version> <release>0</release> <productline>openSUSE</productline> ++++++ opensuse_microos.group ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.401702794 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.405702817 +0100 @@ -1011,6 +1011,7 @@ <package name="sound-theme-freedesktop" supportstatus="unsupported"/>  <package name="sunpinyin-data" supportstatus="unsupported"/>  <package name="suse-module-tools" supportstatus="unsupported"/>  + <package name="suse-module-tools-scriptlets" supportstatus="unsupported"/>  <package name="system-group-audit" supportstatus="unsupported"/>  <package name="system-group-hardware" supportstatus="unsupported"/>  <package name="system-group-kvm" supportstatus="unsupported"/>  ++++++ unsorted.yml ++++++ --- /var/tmp/diff_new_pack.Bus17Z/_old 2022-12-02 02:36:02.481703248 +0100 +++ /var/tmp/diff_new_pack.Bus17Z/_new 2022-12-02 02:36:02.493703317 +0100 @@ -711,7 +711,7 @@ - apache2-mod_nss - apache2-mod_perl - apache2-mod_perl-devel - - apache2-mod_php8 + - apache2-mod_php7 - apache2-mod_security2 - apache2-mod_uwsgi - apache2-mod_wsgi @@ -1183,7 +1183,10 @@ - bash-legacybin - bash-loadables - bat + - bat-bash-completion - bat-extras + - bat-fish-completion + - bat-zsh-completion - batctl - bats - bazel: [x86_64] @@ -2305,6 +2308,7 @@ - consoleet-kbd-fonts - consoleet-oldschoolpc-fonts - consoleet-terminus-fonts + - consoleet-utils - consoleet-xorg-fonts - container-build-checks - container-build-checks-strict @@ -10261,7 +10265,7 @@ - libcairomm-1_16-1-32bit: [x86_64] - libcaja-extension1 - libcal3d12 - - libcalc2_14_1_0 + - libcalc2_14_1_2 - libcalcium0 - libcallaudio0_1-0 - libcallback1 @@ -10293,7 +10297,7 @@ - libcapi20-devel - libcapi20-devel-32bit: [x86_64] - libcapi20-mod_misdn - - libcapnp-0_10_2 + - libcapnp-0_10_3 - libcapnp-devel - libcapstone-devel - libcares2-32bit: [x86_64] @@ -20738,13 +20742,17 @@ - php-pear-Net_Sieve - php-pear-Net_Socket - php-pear-XML_Parser + - php7 - php7-APCu - php7-bcmath - php7-bz2 - php7-calendar + - php7-cli + - php7-ctype - php7-curl - php7-dba - php7-devel + - php7-dom - php7-embed - php7-enchant - php7-exif @@ -20752,19 +20760,27 @@ - php7-fileinfo - php7-fpm - php7-ftp + - php7-gd + - php7-gettext - php7-gmagick - php7-gmp - php7-ice + - php7-iconv - php7-imagick - php7-intl + - php7-json - php7-ldap - php7-lzf - php7-maxminddb + - php7-mbstring - php7-memcache - php7-memcached + - php7-mysql - php7-odbc - php7-opcache + - php7-openssl - php7-pcntl + - php7-pdo - php7-pear - php7-pecl - php7-pgsql @@ -20781,28 +20797,28 @@ - php7-soap - php7-sockets - php7-sodium + - php7-sqlite - php7-sysvmsg - php7-sysvsem - php7-sysvshm - php7-test - php7-tidy + - php7-tokenizer - php7-uuid - php7-xdebug + - php7-xmlreader - php7-xmlrpc + - php7-xmlwriter - php7-xsl - php7-zip - php7-zlib - - php8 - php8-APCu - php8-bcmath - php8-bz2 - php8-calendar - - php8-cli - - php8-ctype - php8-curl - php8-dba - php8-devel - - php8-dom - php8-embed - php8-enchant - php8-exif @@ -20812,26 +20828,19 @@ - php8-fpm - php8-fpm-apache - php8-ftp - - php8-gd - - php8-gettext - php8-gmagick - php8-gmp - php8-ice - - php8-iconv - php8-imagick - php8-intl - php8-ldap - php8-lzf - php8-maxminddb - - php8-mbstring - php8-memcache - php8-memcached - - php8-mysql - php8-odbc - php8-opcache - - php8-openssl - php8-pcntl - - php8-pdo - php8-pear - php8-pecl - php8-pgsql @@ -20847,17 +20856,13 @@ - php8-soap - php8-sockets - php8-sodium - - php8-sqlite - php8-sysvmsg - php8-sysvsem - php8-sysvshm - php8-test - php8-tidy - - php8-tokenizer - php8-uuid - php8-xdebug - - php8-xmlreader - - php8-xmlwriter - php8-xsl - php8-zip - php8-zlib @@ -21234,8 +21239,6 @@ - postgresql10-plr - postgresql10-plr-doc - postgresql10-pltcl - - postgresql10-postgis - - postgresql10-postgis-utils - postgresql10-server - postgresql10-test - postgresql11 @@ -21327,6 +21330,8 @@ - postgresql15-plperl - postgresql15-plpython - postgresql15-pltcl + - postgresql15-postgis + - postgresql15-postgis-utils - postgresql15-server-devel - postgresql15-test - postgrey

1 0

commit 000release-packages for openSUSE:Factory
by Source-Sync 02 Dec '22

02 Dec '22

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 2022-12-02 02:35:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Fri Dec 2 02:35:54 2022 rev:1968 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-Addon-NonOss-release.spec: same change openSUSE-release.spec: same change stub.spec: same change ++++++ weakremovers.inc ++++++ --- /var/tmp/diff_new_pack.i5glD0/_old 2022-12-02 02:35:57.521675029 +0100 +++ /var/tmp/diff_new_pack.i5glD0/_new 2022-12-02 02:35:57.529675075 +0100 @@ -8692,6 +8692,7 @@ Provides: weakremover(libcaffe_1_0-gnu-hpc) Provides: weakremover(libcalc2) Provides: weakremover(libcalc2_14_0_14) +Provides: weakremover(libcalc2_14_1_0) Provides: weakremover(libcamd-2_4_6) Provides: weakremover(libcamel-1_2-60) Provides: weakremover(libcamel-1_2-61) @@ -8716,6 +8717,7 @@ Provides: weakremover(libcap1) Provides: weakremover(libcapi20-2) Provides: weakremover(libcapnp-0_10_0) +Provides: weakremover(libcapnp-0_10_2) Provides: weakremover(libcapnp-0_6) Provides: weakremover(libcapnp-0_7) Provides: weakremover(libcapnp-0_8) @@ -14366,6 +14368,8 @@ Provides: weakremover(polkit-whitelisting) Provides: weakremover(pology) Provides: weakremover(pology-lang) +Provides: weakremover(postgresql10-postgis) +Provides: weakremover(postgresql10-postgis-utils) Provides: weakremover(postgresql10-timescaledb) Provides: weakremover(postgresql11-timescaledb) Provides: weakremover(postgresql12-devel-mini)

1 0

commit 000update-repos for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

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 2022-12-01 21:04:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Thu Dec 1 21:04:58 2022 rev:2154 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- factory:non-oss_3420.1.packages.zst factory_20221130.packages.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit containerized-data-importer for openSUSE:Factory
by Source-Sync 01 Dec '22

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package containerized-data-importer for openSUSE:Factory checked in at 2022-12-01 19:20:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerized-data-importer (Old) and /work/SRC/openSUSE:Factory/.containerized-data-importer.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "containerized-data-importer" Thu Dec 1 19:20:13 2022 rev:31 rq:1039306 version:1.55.0 Changes: -------- --- /work/SRC/openSUSE:Factory/containerized-data-importer/containerized-data-importer.changes 2022-10-16 16:09:28.722791694 +0200 +++ /work/SRC/openSUSE:Factory/.containerized-data-importer.new.1835/containerized-data-importer.changes 2022-12-01 19:20:13.474057235 +0100 @@ -1,0 +2,8 @@ +Thu Dec 1 09:58:30 UTC 2022 - Vasily Ulyanov <vasily.ulyanov(a)suse.com> + +- Ensure RPMs and containers are built against the same distro +- Be more strict when discovering the registry path: error out if the + distro is unknown, instead of falling through to 'opensuse' by + default + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerized-data-importer.spec ++++++ --- /var/tmp/diff_new_pack.DnHnOn/_old 2022-12-01 19:20:16.086071722 +0100 +++ /var/tmp/diff_new_pack.DnHnOn/_new 2022-12-01 19:20:16.094071766 +0100 @@ -156,11 +156,15 @@ labelprefix=com.suse.kubevirt registry=registry.suse.com ;; -*) +*:1) tagprefix=kubevirt labelprefix=org.opensuse.kubevirt registry=registry.opensuse.org ;; +*) + echo "Unsupported distro: ${distro}" >&2 + exit 1 + ;; esac %if "%{?kubevirt_registry_path}" == "" @@ -175,6 +179,7 @@ -e "s#_REGISTRY_#${registry}#g" \ -e "s#_PKG_VERSION_#%{version}#g" \ -e "s#_PKG_RELEASE_#%{release}#g" \ + -e "s#_DISTRO_#${distro}#g" \ %{S:1} export GOPATH=%{_builddir}/go ++++++ cdi_containers_meta ++++++ --- /var/tmp/diff_new_pack.DnHnOn/_old 2022-12-01 19:20:16.150072077 +0100 +++ /var/tmp/diff_new_pack.DnHnOn/_new 2022-12-01 19:20:16.154072099 +0100 @@ -1,10 +1,16 @@ -#!/bin/bash +#!/bin/bash -xe TAGPREFIX=_TAGPREFIX_ LABELPREFIX=_LABELPREFIX_ REGISTRY=_REGISTRY_ PKG_VERSION=_PKG_VERSION_ PKG_RELEASE=_PKG_RELEASE_ +DISTRO=_DISTRO_ + +# Set HOME=/root as a workaround for +# https://github.com/openSUSE/obs-build/issues/901 +_distro=$(HOME=/root rpm --eval '%{?sle_version}:%{?is_opensuse}%{!?is_opensuse:0}') +[ "${DISTRO}" == "${_distro}" ] || exit 1 if [ -n "${pkg}" ]; then if rpm -q ${pkg}; then

1 0

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

01 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kubevirt for openSUSE:Factory checked in at 2022-12-01 19:20:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubevirt (Old) and /work/SRC/openSUSE:Factory/.kubevirt.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubevirt" Thu Dec 1 19:20:11 2022 rev:50 rq:1039305 version:0.58.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kubevirt/kubevirt.changes 2022-10-14 15:43:38.660029114 +0200 +++ /work/SRC/openSUSE:Factory/.kubevirt.new.1835/kubevirt.changes 2022-12-01 19:20:12.314050802 +0100 @@ -1,0 +2,8 @@ +Thu Dec 1 09:16:49 UTC 2022 - Vasily Ulyanov <vasily.ulyanov(a)suse.com> + +- Ensure RPMs and containers are built against the same distro +- Be more strict when discovering the registry path: error out if the + distro is unknown, instead of falling through to 'opensuse' by + default + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubevirt.spec ++++++ --- /var/tmp/diff_new_pack.F90aI5/_old 2022-12-01 19:20:13.138055372 +0100 +++ /var/tmp/diff_new_pack.F90aI5/_new 2022-12-01 19:20:13.158055483 +0100 @@ -171,11 +171,15 @@ labelprefix=com.suse.kubevirt registry=registry.suse.com ;; -*) +*:1) tagprefix=kubevirt labelprefix=org.opensuse.kubevirt registry=registry.opensuse.org ;; +*) + echo "Unsupported distro: ${distro}" >&2 + exit 1 + ;; esac %if "%{?kubevirt_registry_path}" == "" @@ -190,6 +194,7 @@ -e "s#_REGISTRY_#${registry}#g" \ -e "s#_PKG_VERSION_#%{version}#g" \ -e "s#_PKG_RELEASE_#%{release}#g" \ + -e "s#_DISTRO_#${distro}#g" \ %{S:1} mkdir -p go/src/kubevirt.io go/pkg ++++++ kubevirt_containers_meta ++++++ --- /var/tmp/diff_new_pack.F90aI5/_old 2022-12-01 19:20:13.274056126 +0100 +++ /var/tmp/diff_new_pack.F90aI5/_new 2022-12-01 19:20:13.274056126 +0100 @@ -1,10 +1,16 @@ -#!/bin/bash +#!/bin/bash -xe TAGPREFIX=_TAGPREFIX_ LABELPREFIX=_LABELPREFIX_ REGISTRY=_REGISTRY_ PKG_VERSION=_PKG_VERSION_ PKG_RELEASE=_PKG_RELEASE_ +DISTRO=_DISTRO_ + +# Set HOME=/root as a workaround for +# https://github.com/openSUSE/obs-build/issues/901 +_distro=$(HOME=/root rpm --eval '%{?sle_version}:%{?is_opensuse}%{!?is_opensuse:0}') +[ "${DISTRO}" == "${_distro}" ] || exit 1 if [ -n "${pkg}" ]; then if rpm -q ${pkg}; then

1 0