November 2023 - openSUSE Commits - openSUSE Mailing Lists

commit msgpack-cxx for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package msgpack-cxx for openSUSE:Factory checked in at 2023-11-30 21:59:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/msgpack-cxx (Old) and /work/SRC/openSUSE:Factory/.msgpack-cxx.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "msgpack-cxx" Thu Nov 30 21:59:57 2023 rev:4 rq:1122999 version:6.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/msgpack-cxx/msgpack-cxx.changes 2022-12-05 18:00:51.476469442 +0100 +++ /work/SRC/openSUSE:Factory/.msgpack-cxx.new.25432/msgpack-cxx.changes 2023-11-30 22:00:52.280065330 +0100 @@ -1,0 +2,7 @@ +Thu Nov 2 21:44:34 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 6.1.0 + * Remove dependency on boost in chrono.hpp + * Add support for std::variant behavior + +------------------------------------------------------------------- Old: ---- msgpack-cxx-4.1.3.tar.gz New: ---- msgpack-cxx-6.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msgpack-cxx.spec ++++++ --- /var/tmp/diff_new_pack.NiDkUr/_old 2023-11-30 22:00:53.280102169 +0100 +++ /var/tmp/diff_new_pack.NiDkUr/_new 2023-11-30 22:00:53.280102169 +0100 @@ -1,7 +1,7 @@ # # spec file for package msgpack-cxx # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: msgpack-cxx -Version: 4.1.3 +Version: 6.1.0 Release: 0 Summary: Object serialization library for cross-language communication (C++ interface) License: BSL-1.0 @@ -27,6 +27,7 @@ BuildRequires: boost-devel BuildRequires: c++_compiler BuildRequires: cmake +BuildRequires: fdupes BuildRequires: pkg-config %description @@ -37,9 +38,9 @@ Summary: Development headers for libmsgpack C++ library Group: Development/Libraries/C and C++ Requires: libboost_headers-devel -Requires: msgpack-c-devel >= 4 +Requires: msgpack-c-devel >= 6 Provides: libmsgpack-devel = %{version}-%{release} -Conflicts: msgpack-devel < 4 +Conflicts: msgpack-devel < 6 %description devel MessagePack is a binary-based object serialization library. It enables to @@ -52,10 +53,11 @@ %build %cmake -%make_jobs +%cmake_build %install %cmake_install +%fdupes %buildroot/%_prefix %files devel %license COPYING ++++++ msgpack-cxx-4.1.3.tar.gz -> msgpack-cxx-6.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/CMakeLists.txt new/msgpack-cxx-6.1.0/CMakeLists.txt --- old/msgpack-cxx-4.1.3/CMakeLists.txt 2022-09-07 05:49:03.000000000 +0200 +++ new/msgpack-cxx-6.1.0/CMakeLists.txt 2023-07-08 05:21:22.000000000 +0200 @@ -2,9 +2,9 @@ CMAKE_POLICY (SET CMP0054 NEW) -PROJECT (msgpack LANGUAGES CXX) +PROJECT (msgpack-cxx LANGUAGES CXX) -ADD_LIBRARY (msgpackc-cxx INTERFACE) +ADD_LIBRARY (msgpack-cxx INTERFACE) FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.hpp contents) STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents}) @@ -23,16 +23,17 @@ OPTION (MSGPACK_CXX17 "Using c++17 compiler" OFF) OPTION (MSGPACK_CXX20 "Using c++20 compiler" OFF) -OPTION (MSGPACK_32BIT "32bit compile" OFF) -OPTION (MSGPACK_USE_BOOST "Use Boost libraried" ON) -OPTION (MSGPACK_USE_X3_PARSE "Use Boost X3 parse" OFF) -OPTION (MSGPACK_BUILD_TESTS "Build tests" OFF) -OPTION (MSGPACK_BUILD_DOCS "Build Doxygen documentation" ON) -OPTION (MSGPACK_FUZZ_REGRESSION "Enable regression testing" OFF) -OPTION (MSGPACK_BUILD_EXAMPLES "Build msgpack examples" OFF) -OPTION (MSGPACK_GEN_COVERAGE "Generate coverage report" OFF) -OPTION (MSGPACK_USE_STATIC_BOOST "Statically link with boost libraries" OFF) -OPTION (MSGPACK_CHAR_SIGN "Char sign to use (signed or unsigned)") +OPTION (MSGPACK_32BIT "32bit compile" OFF) +OPTION (MSGPACK_USE_BOOST "Use Boost libraried" ON) +OPTION (MSGPACK_USE_X3_PARSE "Use Boost X3 parse" OFF) +OPTION (MSGPACK_BUILD_TESTS "Build tests" OFF) +OPTION (MSGPACK_BUILD_DOCS "Build Doxygen documentation" ON) +OPTION (MSGPACK_FUZZ_REGRESSION "Enable regression testing" OFF) +OPTION (MSGPACK_BUILD_EXAMPLES "Build msgpack examples" OFF) +OPTION (MSGPACK_GEN_COVERAGE "Generate coverage report" OFF) +OPTION (MSGPACK_USE_STATIC_BOOST "Statically link with boost libraries" OFF) +OPTION (MSGPACK_CHAR_SIGN "Char sign to use (signed or unsigned)") +OPTION (MSGPACK_USE_STD_VARIANT_ADAPTOR "Enable the adaptor for std::variant" OFF) SET (CMAKE_CXX_STANDARD_REQUIRED ON) @@ -57,11 +58,11 @@ IF (MSGPACK_32BIT) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32) - TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32) + TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -m32) + TARGET_LINK_OPTIONS(msgpack-cxx INTERFACE -m32) ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") - TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32) - TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32) + TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -m32) + TARGET_LINK_OPTIONS(msgpack-cxx INTERFACE -m32) ENDIF () ENDIF () @@ -78,18 +79,22 @@ FIND_PACKAGE (Boost REQUIRED) ELSE () - TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_NO_BOOST) + TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_NO_BOOST) ENDIF () IF (MSGPACK_CHAR_SIGN) - TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -f${MSGPACK_CHAR_SIGN}-char) + TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -f${MSGPACK_CHAR_SIGN}-char) ENDIF () IF (MSGPACK_DEFAULT_API_VERSION) - TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION}) + TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION}) ELSE () SET (MSGPACK_DEFAULT_API_VERSION 3) - TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=3) + TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=3) +ENDIF () + +IF (MSGPACK_USE_STD_VARIANT_ADAPTOR) + TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_USE_STD_VARIANT_ADAPTOR) ENDIF () IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") @@ -112,7 +117,7 @@ INCLUDE (Files.cmake) -TARGET_INCLUDE_DIRECTORIES (msgpackc-cxx +TARGET_INCLUDE_DIRECTORIES (msgpack-cxx INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> @@ -120,7 +125,7 @@ ) IF (MSGPACK_USE_BOOST) - TARGET_LINK_LIBRARIES (msgpackc-cxx INTERFACE Boost::boost) + TARGET_LINK_LIBRARIES (msgpack-cxx INTERFACE Boost::boost) ENDIF () IF (MSGPACK_GEN_COVERAGE) @@ -156,7 +161,7 @@ ENDIF () IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc") - TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_ZONE_ALIGN=8) + TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_ZONE_ALIGN=8) ENDIF () IF (MSGPACK_BUILD_EXAMPLES) @@ -193,9 +198,9 @@ include (GNUInstallDirs) # Install library. -INSTALL (TARGETS msgpackc-cxx - EXPORT msgpackc-cxx-targets - COMPONENT msgpackc-cxx +INSTALL (TARGETS msgpack-cxx + EXPORT msgpack-cxx-targets + COMPONENT msgpack-cxx # This provides include directory in exported target # relative to prefix in single directory we've put everything in. INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" @@ -204,7 +209,7 @@ # Install headers from source tree. INSTALL (DIRECTORY include/ DESTINATION include - COMPONENT msgpackc-cxx + COMPONENT msgpack-cxx ) INCLUDE (CMakePackageConfigHelpers) @@ -212,18 +217,18 @@ IF (NOT (CMAKE_VERSION VERSION_LESS 3.14)) SET (extra_version_file_args ARCH_INDEPENDENT) ENDIF () -SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc-cxx") +SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack-cxx") # Configure the main package file from source tree. CONFIGURE_PACKAGE_CONFIG_FILE ( - msgpack-config.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config.cmake" + msgpack-cxx-config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config.cmake" INSTALL_DESTINATION "${cmake_config_path}" ) # Write package version file. WRITE_BASIC_PACKAGE_VERSION_FILE ( - msgpack-config-version.cmake + msgpack-cxx-config-version.cmake VERSION ${VERSION} COMPATIBILITY SameMajorVersion ${extra_version_file_args} @@ -231,16 +236,16 @@ # Install the generated package version file and the main package file. INSTALL (FILES - "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config-version.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config-version.cmake" DESTINATION "${cmake_config_path}" - COMPONENT msgpackc-cxx + COMPONENT msgpack-cxx ) # This installs package in install tree for using installed targets. INSTALL ( - EXPORT msgpackc-cxx-targets - FILE msgpackc-cxx-targets.cmake + EXPORT msgpack-cxx-targets + FILE msgpack-cxx-targets.cmake DESTINATION "${cmake_config_path}" - COMPONENT msgpackc-cxx + COMPONENT msgpack-cxx ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/ChangeLog new/msgpack-cxx-6.1.0/ChangeLog --- old/msgpack-cxx-4.1.3/ChangeLog 2022-11-02 05:47:51.000000000 +0100 +++ new/msgpack-cxx-6.1.0/ChangeLog 2023-03-04 14:47:52.000000000 +0100 @@ -1,3 +1,13 @@ +# 2023-03-02 version 6.0.0 +## << breaking changes >> + * Change CMake package name of C++ library to msgpack-cxx (#1054) + Unified all C++ package, library, cmake, tarball name become msgpack-cxx. + +# 2023-01-10 version 5.0.0 for C++ + * Fix config for new MSVC preprocessor (#1040) +## << breaking changes >> + * Change CMake package name of C++ library to msgpackc-cxx (#1045, #1048) + # 2022-11-02 version 4.1.3 for C++ * Fix compile error that direct inclusion of chrono with `MSGPACK_NO_BOOST` (#1038)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/Files.cmake new/msgpack-cxx-6.1.0/Files.cmake --- old/msgpack-cxx-4.1.3/Files.cmake 2022-09-07 06:25:24.000000000 +0200 +++ new/msgpack-cxx-6.1.0/Files.cmake 2023-07-08 05:28:00.000000000 +0200 @@ -1,4 +1,4 @@ -SET (msgpackc_HEADERS +SET (msgpack-cxx_HEADERS include/msgpack.hpp include/msgpack/adaptor/adaptor_base.hpp include/msgpack/adaptor/adaptor_base_decl.hpp @@ -33,6 +33,7 @@ include/msgpack/adaptor/cpp17/carray_byte.hpp include/msgpack/adaptor/cpp17/optional.hpp include/msgpack/adaptor/cpp17/string_view.hpp + include/msgpack/adaptor/cpp17/variant.hpp include/msgpack/adaptor/cpp17/vector_byte.hpp include/msgpack/adaptor/cpp20/span.hpp include/msgpack/adaptor/define.hpp @@ -542,6 +543,7 @@ include/msgpack/v1/adaptor/cpp17/carray_byte.hpp include/msgpack/v1/adaptor/cpp17/optional.hpp include/msgpack/v1/adaptor/cpp17/string_view.hpp + include/msgpack/v1/adaptor/cpp17/variant.hpp include/msgpack/v1/adaptor/cpp17/vector_byte.hpp include/msgpack/v1/adaptor/cpp20/span.hpp include/msgpack/v1/adaptor/define.hpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/README new/msgpack-cxx-6.1.0/README --- old/msgpack-cxx-4.1.3/README 2022-11-02 05:47:51.000000000 +0100 +++ new/msgpack-cxx-6.1.0/README 2023-03-04 14:47:52.000000000 +0100 @@ -1,7 +1,7 @@ `msgpack` for C++ =================== -Version 4.1.3 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=… [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch… +Version 6.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=… [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch… [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master) It's like JSON but smaller and faster. @@ -98,7 +98,7 @@ # ... find_package(msgpack REQUIRED) # ... - target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpackc-cxx) + target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpack-cxx) # ... ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/README.md new/msgpack-cxx-6.1.0/README.md --- old/msgpack-cxx-4.1.3/README.md 2022-11-02 05:47:31.000000000 +0100 +++ new/msgpack-cxx-6.1.0/README.md 2023-07-08 06:16:09.000000000 +0200 @@ -1,7 +1,7 @@ `msgpack` for C++ =================== -Version 4.1.3 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=… [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch… +Version 6.1.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=… [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch… [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master) It's like JSON but smaller and faster. @@ -98,7 +98,7 @@ # ... find_package(msgpack REQUIRED) # ... - target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpackc-cxx) + target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpack-cxx) # ... ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/example/boost/CMakeLists.txt new/msgpack-cxx-6.1.0/example/boost/CMakeLists.txt --- old/msgpack-cxx-4.1.3/example/boost/CMakeLists.txt 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/example/boost/CMakeLists.txt 2023-07-08 05:21:22.000000000 +0200 @@ -21,7 +21,7 @@ ${source_file} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx Boost::system Threads::Threads ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/example/cpp03/CMakeLists.txt new/msgpack-cxx-6.1.0/example/cpp03/CMakeLists.txt --- old/msgpack-cxx-4.1.3/example/cpp03/CMakeLists.txt 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/example/cpp03/CMakeLists.txt 2023-07-08 05:21:22.000000000 +0200 @@ -43,7 +43,7 @@ ${source_file} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx ) IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra") @@ -64,7 +64,7 @@ ${source_file} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx Threads::Threads ) IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") @@ -86,7 +86,7 @@ ${source_file} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx Boost::timer ) IF (NOT MSVC AND NOT APPLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/example/cpp11/CMakeLists.txt new/msgpack-cxx-6.1.0/example/cpp11/CMakeLists.txt --- old/msgpack-cxx-4.1.3/example/cpp11/CMakeLists.txt 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/example/cpp11/CMakeLists.txt 2023-07-08 05:21:22.000000000 +0200 @@ -17,7 +17,7 @@ ${source_file} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx ) IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/example/x3/CMakeLists.txt new/msgpack-cxx-6.1.0/example/x3/CMakeLists.txt --- old/msgpack-cxx-4.1.3/example/x3/CMakeLists.txt 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/example/x3/CMakeLists.txt 2023-07-08 05:21:22.000000000 +0200 @@ -15,7 +15,7 @@ ${source_file_we} ${source_file} ) - TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE msgpackc-cxx) + TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE msgpack-cxx) IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra") @@ -40,7 +40,7 @@ ${source_file} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx Boost::context Boost::system Threads::Threads diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/fuzz/CMakeLists.txt new/msgpack-cxx-6.1.0/fuzz/CMakeLists.txt --- old/msgpack-cxx-4.1.3/fuzz/CMakeLists.txt 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/fuzz/CMakeLists.txt 2023-07-08 05:21:22.000000000 +0200 @@ -16,7 +16,7 @@ $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>) TARGET_LINK_LIBRARIES (${source_file_we} - msgpackc-cxx + msgpack-cxx Threads::Threads Boost::filesystem Boost::system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/include/msgpack/adaptor/cpp17/variant.hpp new/msgpack-cxx-6.1.0/include/msgpack/adaptor/cpp17/variant.hpp --- old/msgpack-cxx-4.1.3/include/msgpack/adaptor/cpp17/variant.hpp 1970-01-01 01:00:00.000000000 +0100 +++ new/msgpack-cxx-6.1.0/include/msgpack/adaptor/cpp17/variant.hpp 2023-07-08 05:21:22.000000000 +0200 @@ -0,0 +1,16 @@ +// +// MessagePack for C++ static resolution routine +// +// Copyright (C) 2023 Uy Ha +// +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +// + +#ifndef MSGPACK_TYPE_CPP17_VARIANT_HPP +#define MSGPACK_TYPE_CPP17_VARIANT_HPP + +#include "msgpack/v1/adaptor/cpp17/variant.hpp" + +#endif // MSGPACK_TYPE_CPP17_VARIANT_HPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/include/msgpack/preprocessor/config/config.hpp new/msgpack-cxx-6.1.0/include/msgpack/preprocessor/config/config.hpp --- old/msgpack-cxx-4.1.3/include/msgpack/preprocessor/config/config.hpp 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/include/msgpack/preprocessor/config/config.hpp 2023-07-08 05:21:22.000000000 +0200 @@ -24,16 +24,22 @@ # define MSGPACK_PP_CONFIG_EDG() 0x0020 # define MSGPACK_PP_CONFIG_DMC() 0x0040 # +# if !defined(__clang__) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL) +# define MSGPACK_TRADITIONAL_MSVC 1 +# else +# define MSGPACK_TRADITIONAL_MSVC 0 +# endif +# # ifndef MSGPACK_PP_CONFIG_FLAGS # if defined(__GCCXML__) || defined(__WAVE__) || defined(__MWERKS__) && __MWERKS__ >= 0x3200 # define MSGPACK_PP_CONFIG_FLAGS() (MSGPACK_PP_CONFIG_STRICT()) # elif defined(__EDG__) || defined(__EDG_VERSION__) -# if defined(_MSC_VER) && !defined(__clang__) && (defined(__INTELLISENSE__) || __EDG_VERSION__ >= 308) +# if defined(_MSC_VER) && MSGPACK_TRADITIONAL_MSVC && (defined(__INTELLISENSE__) || __EDG_VERSION__ >= 308) # define MSGPACK_PP_CONFIG_FLAGS() (MSGPACK_PP_CONFIG_MSVC()) # else # define MSGPACK_PP_CONFIG_FLAGS() (MSGPACK_PP_CONFIG_EDG() | MSGPACK_PP_CONFIG_STRICT()) # endif -# elif defined(_MSC_VER) && defined(__clang__) +# elif defined(_MSC_VER) && !MSGPACK_TRADITIONAL_MSVC # define MSGPACK_PP_CONFIG_FLAGS() (MSGPACK_PP_CONFIG_STRICT()) # elif defined(__MWERKS__) # define MSGPACK_PP_CONFIG_FLAGS() (MSGPACK_PP_CONFIG_MWCC()) @@ -75,7 +81,7 @@ # define MSGPACK_PP_VARIADICS 0 # elif defined(__CUDACC__) # define MSGPACK_PP_VARIADICS 1 -# elif defined(_MSC_VER) && defined(__clang__) +# elif defined(_MSC_VER) && !MSGPACK_TRADITIONAL_MSVC # define MSGPACK_PP_VARIADICS 1 # /* VC++ (C/C++) and Intel C++ Compiler >= 17.0 with MSVC */ # elif defined _MSC_VER && _MSC_VER >= 1400 && (!defined __EDG__ || defined(__INTELLISENSE__) || defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1700) @@ -94,7 +100,7 @@ # elif !MSGPACK_PP_VARIADICS + 1 < 2 # undef MSGPACK_PP_VARIADICS # define MSGPACK_PP_VARIADICS 1 -# if defined _MSC_VER && _MSC_VER >= 1400 && !defined(__clang__) && (defined(__INTELLISENSE__) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1700) || !(defined __EDG__ || defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || defined __SUNPRO_CC || defined __HP_aCC || defined __MRC__ || defined __SC__ || defined __IBMCPP__ || defined __PGI)) +# if defined _MSC_VER && _MSC_VER >= 1400 && MSGPACK_TRADITIONAL_MSVC && (defined(__INTELLISENSE__) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1700) || !(defined __EDG__ || defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || defined __SUNPRO_CC || defined __HP_aCC || defined __MRC__ || defined __SC__ || defined __IBMCPP__ || defined __PGI)) # undef MSGPACK_PP_VARIADICS_MSVC # define MSGPACK_PP_VARIADICS_MSVC 1 # endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/include/msgpack/type.hpp new/msgpack-cxx-6.1.0/include/msgpack/type.hpp --- old/msgpack-cxx-4.1.3/include/msgpack/type.hpp 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/include/msgpack/type.hpp 2023-07-08 05:21:22.000000000 +0200 @@ -37,9 +37,7 @@ #include "adaptor/cpp11/array_char.hpp" #include "adaptor/cpp11/array_unsigned_char.hpp" -#if !defined(MSGPACK_NO_BOOST) #include "adaptor/cpp11/chrono.hpp" -#endif // !defined(MSGPACK_NO_BOOST) #include "adaptor/cpp11/forward_list.hpp" #include "adaptor/cpp11/reference_wrapper.hpp" @@ -63,6 +61,10 @@ #include "adaptor/cpp17/carray_byte.hpp" #include "adaptor/cpp17/vector_byte.hpp" +#if MSGPACK_HAS_INCLUDE(<variant>) +#include "adaptor/cpp17/variant.hpp" +#endif // MSGPACK_HAS_INCLUDE(<variant>) + #if MSGPACK_HAS_INCLUDE() #include "adaptor/cpp20/span.hpp" #endif // MSGPACK_HAS_INCLUDE() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp new/msgpack-cxx-6.1.0/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp --- old/msgpack-cxx-4.1.3/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp 2023-07-08 05:21:22.000000000 +0200 @@ -122,6 +122,12 @@ int_init(v); } basic_variant(unsigned long long v):base(uint64_t(v)) {} + basic_variant(float v) { + double_init(v); + } + basic_variant(double v) { + double_init(v); + } bool is_nil() const { return boost::get<msgpack::type::nil_t>(this) != MSGPACK_NULLPTR; @@ -177,71 +183,50 @@ int64_t as_int64_t() const { return boost::get<int64_t>(*this); } - int64_t& as_int64_t() { - return boost::get<int64_t>(*this); - } uint64_t as_uint64_t() const { return boost::get<uint64_t>(*this); } - uint64_t& as_uint64_t() { - return boost::get<uint64_t>(*this); - } double as_double() const { - return boost::get<double>(*this); - } - double& as_double() { - return boost::get<double>(*this); + if (is_double()) { + return boost::get<double>(*this); + } + if (is_int64_t()) { + return static_cast<double>(boost::get<int64_t>(*this)); + } + if (is_uint64_t()) { + return static_cast<double>(boost::get<uint64_t>(*this)); + } + throw msgpack::type_error(); } std::string const& as_string() const { return boost::get<std::string>(*this); } - std::string& as_string() { - return boost::get<std::string>(*this); - } #if (BOOST_VERSION / 100000) >= 1 && ((BOOST_VERSION / 100) % 1000) >= 53 boost::string_ref const& as_boost_string_ref() const { return boost::get<boost::string_ref>(*this); } - boost::string_ref& as_boost_string_ref() { - return boost::get<boost::string_ref>(*this); - } #endif // (BOOST_VERSION / 100000) >= 1 && ((BOOST_VERSION / 100) % 1000) >= 53 std::vector<char> const& as_vector_char() const { return boost::get<std::vector<char> >(*this); } - std::vector<char>& as_vector_char() { - return boost::get<std::vector<char> >(*this); - } raw_ref const& as_raw_ref() const { return boost::get<raw_ref>(*this); } ext const& as_ext() const { return boost::get<ext>(*this); } - ext& as_ext() { - return boost::get<ext>(*this); - } ext_ref const& as_ext_ref() const { return boost::get<ext_ref>(*this); } std::vector<basic_variant<STR, BIN, EXT> > const& as_vector() const { return boost::get<std::vector<basic_variant<STR, BIN, EXT> > >(*this); } - std::vector<basic_variant<STR, BIN, EXT> >& as_vector() { - return boost::get<std::vector<basic_variant<STR, BIN, EXT> > >(*this); - } std::map<basic_variant<STR, BIN, EXT>, basic_variant<STR, BIN, EXT> > const& as_map() const { return boost::get<std::map<basic_variant<STR, BIN, EXT>, basic_variant<STR, BIN, EXT> > >(*this); } - std::map<basic_variant<STR, BIN, EXT>, basic_variant<STR, BIN, EXT> >& as_map() { - return boost::get<std::map<basic_variant<STR, BIN, EXT>, basic_variant<STR, BIN, EXT> > >(*this); - } std::multimap<basic_variant<STR, BIN, EXT>, basic_variant<STR, BIN, EXT> > const& as_multimap() const { return boost::get<std::multimap<basic_variant<STR, BIN, EXT>, basic_variant<STR, BIN, EXT> > >(*this); } - std::multimap<basic_variant<STR, BIN, EXT>, basic_variant<STR, BIN, EXT> >& as_multimap() { - return boost::get<std::multimap<basic_variant<STR, BIN, EXT>, basic_variant<STR, BIN, EXT> > >(*this); - } private: template <typename T> void int_init(T v) { @@ -252,6 +237,19 @@ static_cast<base&>(*this) = uint64_t(v); } } + void double_init(double v) { + if (v == v) { // check for nan + if (v >= 0 && v <= double(std::numeric_limits<uint64_t>::max()) && v == double(uint64_t(v))) { + static_cast<base&>(*this) = uint64_t(v); + return; + } + else if (v < 0 && v >= double(std::numeric_limits<int64_t>::min()) && v == double(int64_t(v))) { + static_cast<base&>(*this) = int64_t(v); + return; + } + } + static_cast<base&>(*this) = v; + } }; template <typename STR, typename BIN, typename EXT> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/include/msgpack/v1/adaptor/cpp11/chrono.hpp new/msgpack-cxx-6.1.0/include/msgpack/v1/adaptor/cpp11/chrono.hpp --- old/msgpack-cxx-4.1.3/include/msgpack/v1/adaptor/cpp11/chrono.hpp 2022-11-02 04:53:39.000000000 +0100 +++ new/msgpack-cxx-6.1.0/include/msgpack/v1/adaptor/cpp11/chrono.hpp 2023-07-08 05:21:22.000000000 +0200 @@ -11,17 +11,14 @@ #ifndef MSGPACK_V1_TYPE_CPP11_CHRONO_HPP #define MSGPACK_V1_TYPE_CPP11_CHRONO_HPP -#if !defined(MSGPACK_NO_BOOST) - #include "msgpack/versioning.hpp" #include "msgpack/adaptor/adaptor_base.hpp" #include "msgpack/object.hpp" #include "msgpack/adaptor/check_container_size.hpp" +#include <limits> #include <chrono> -#include <boost/numeric/conversion/cast.hpp> - namespace msgpack { /// @cond @@ -30,6 +27,113 @@ namespace adaptor { +namespace detail { +template < + typename Target, + typename Source, + bool target_is_signed = std::is_signed<Target>::value, + bool source_is_signed = std::is_signed<Source>::value, + typename = typename std::enable_if< + std::is_integral<Target>::value && + std::is_integral<Source>::value + >::type +> +struct would_underflow { + // The default case includes the cases that Source being unsigned, and since Source + // is unsigned, no underflow can happen + would_underflow(Source) : value{false} {} + bool value; +}; + +template <typename Target, typename Source> +struct would_underflow<Target, Source, false, true> { + // When Source is signed and Target is unsigned, we only need to compare with 0 to + // detect underflow, this works correctly and also avoids warnings from the compiler + would_underflow(Source source) : value{source < 0} {} + bool value; +}; +template <typename Target, typename Source> +struct would_underflow<Target, Source, true, true> { + // When Source and Target are signed, the promotion rules apply sensibly so we do + // not need to do anything + would_underflow(Source source) + : value{source < std::numeric_limits<Target>::min()} {} + bool value; +}; + +template < + typename Target, + typename Source, + bool target_is_signed = std::is_signed<Target>::value, + bool source_is_signed = std::is_signed<Source>::value, + typename = typename std::enable_if< + std::is_integral<Target>::value && + std::is_integral<Source>::value + >::type +> +struct would_overflow { + // The default case is Source and Target having the same signedness, the promotion + // rule also apply sensibly here so nothing special needs to be done + would_overflow(Source source) + : value{source > std::numeric_limits<Target>::max()} {} + bool value; +}; +template <typename Target, typename Source> +struct would_overflow <Target, Source, false, true> { + // When Target is unsigned and Source is signed, we cannot rely on the promotion + // rule. + would_overflow(Source source) + : value{ + sizeof(Target) >= sizeof(Source) + // Given Source is signed, Target being unsigned and having at least the + // same size makes impossible to overflow + ? false + // Source being larger than Target makes it safe to cast the maximum value + // of Target to Source + : source > static_cast<Source>(std::numeric_limits<Target>::max()) + } {} + bool value; +}; +template <typename Target, typename Source> +struct would_overflow <Target, Source, true, false> { + // When Target is signed and Source is unsigned, we cannot rely on the promotion + // rule. + would_overflow(Source source) + : value{ + sizeof(Target) > sizeof(Source) + // Target being larger than Source makes it impossible to overflow + ? false + // Source being unsigned and having at least the size of Target makes it + // safe to cast the maximum value of Target to Source + : source > static_cast<Source>(std::numeric_limits<Target>::max()) + } {} + bool value; +}; + +template < + typename Target, + typename Source, + typename = typename std::enable_if< + std::is_integral<Target>::value && + std::is_integral<Source>::value + >::type +> +Target integral_cast(Source source) { + if (would_underflow<Target, Source>(source).value) { + throw std::underflow_error{ + "casting from Source to Target causes an underflow error" + }; + } + if(would_overflow<Target, Source>(source).value) { + throw std::overflow_error{ + "casting from Source to Target causes an overflow error" + }; + } + + return static_cast<Target>(source); +} +} // namespace detail + template <typename Clock, typename Duration> struct as<std::chrono::time_point<Clock, Duration>> { typename std::chrono::time_point<Clock, Duration> operator()(msgpack::object const& o) const { @@ -45,7 +149,7 @@ case 8: { uint64_t value; _msgpack_load64(uint64_t, o.via.ext.data(), &value); - uint32_t nanosec = boost::numeric_cast<uint32_t>(value >> 34); + uint32_t nanosec = detail::integral_cast<uint32_t>(value >> 34); uint64_t sec = value & 0x00000003ffffffffLL; tp += std::chrono::duration_cast<Duration>( std::chrono::nanoseconds(nanosec)); @@ -69,7 +173,7 @@ else { ++sec; tp += std::chrono::seconds(sec); - int64_t ns = boost::numeric_cast<int64_t>(nanosec) - 1000000000L; + int64_t ns = detail::integral_cast<int64_t>(nanosec) - 1000000000L; tp += std::chrono::duration_cast<Duration>( std::chrono::nanoseconds(ns)); } @@ -98,7 +202,7 @@ case 8: { uint64_t value; _msgpack_load64(uint64_t, o.via.ext.data(), &value); - uint32_t nanosec = boost::numeric_cast<uint32_t>(value >> 34); + uint32_t nanosec = detail::integral_cast<uint32_t>(value >> 34); uint64_t sec = value & 0x00000003ffffffffLL; tp += std::chrono::duration_cast<Duration>( std::chrono::nanoseconds(nanosec)); @@ -123,7 +227,7 @@ else { ++sec; tp += std::chrono::seconds(sec); - int64_t ns = boost::numeric_cast<int64_t>(nanosec) - 1000000000L; + int64_t ns = detail::integral_cast<int64_t>(nanosec) - 1000000000L; tp += std::chrono::duration_cast<Duration>( std::chrono::nanoseconds(ns)); } @@ -142,7 +246,7 @@ struct pack<std::chrono::time_point<Clock, Duration>> { template <typename Stream> msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, std::chrono::time_point<Clock, Duration> const& v) const { - int64_t count = boost::numeric_cast<int64_t>(v.time_since_epoch().count()); + int64_t count = detail::integral_cast<int64_t>(v.time_since_epoch().count()); int64_t nano_num = Duration::period::ratio::num * (1000000000L / Duration::period::ratio::den); @@ -158,11 +262,11 @@ / Duration::period::ratio::den; if ((sec >> 34) == 0) { - uint64_t data64 = (boost::numeric_cast<uint64_t>(nanosec) << 34) | boost::numeric_cast<uint64_t>(sec); + uint64_t data64 = (detail::integral_cast<uint64_t>(nanosec) << 34) | detail::integral_cast<uint64_t>(sec); if ((data64 & 0xffffffff00000000L) == 0) { // timestamp 32 o.pack_ext(4, -1); - uint32_t data32 = boost::numeric_cast<uint32_t>(data64); + uint32_t data32 = detail::integral_cast<uint32_t>(data64); char buf[4]; _msgpack_store32(buf, data32); o.pack_ext_body(buf, 4); @@ -181,7 +285,7 @@ char buf[12]; - _msgpack_store32(&buf[0], boost::numeric_cast<uint32_t>(nanosec)); + _msgpack_store32(&buf[0], detail::integral_cast<uint32_t>(nanosec)); _msgpack_store64(&buf[4], sec); o.pack_ext_body(buf, 12); } @@ -192,7 +296,7 @@ template <typename Clock, typename Duration> struct object_with_zone<std::chrono::time_point<Clock, Duration>> { void operator()(msgpack::object::with_zone& o, const std::chrono::time_point<Clock, Duration>& v) const { - int64_t count = boost::numeric_cast<int64_t>(v.time_since_epoch().count()); + int64_t count = detail::integral_cast<int64_t>(v.time_since_epoch().count()); int64_t nano_num = Duration::period::ratio::num * @@ -208,14 +312,14 @@ * Duration::period::ratio::num / Duration::period::ratio::den; if ((sec >> 34) == 0) { - uint64_t data64 = (boost::numeric_cast<uint64_t>(nanosec) << 34) | boost::numeric_cast<uint64_t>(sec); + uint64_t data64 = (detail::integral_cast<uint64_t>(nanosec) << 34) | detail::integral_cast<uint64_t>(sec); if ((data64 & 0xffffffff00000000L) == 0) { // timestamp 32 o.type = msgpack::type::EXT; o.via.ext.size = 4; char* p = static_cast<char*>(o.zone.allocate_no_align(o.via.ext.size + 1)); p[0] = static_cast<char>(-1); - uint32_t data32 = boost::numeric_cast<uint32_t>(data64); + uint32_t data32 = detail::integral_cast<uint32_t>(data64); _msgpack_store32(&p[1], data32); o.via.ext.ptr = p; } @@ -235,7 +339,7 @@ o.via.ext.size = 12; char* p = static_cast<char*>(o.zone.allocate_no_align(o.via.ext.size + 1)); p[0] = static_cast<char>(-1); - _msgpack_store32(&p[1], boost::numeric_cast<uint32_t>(nanosec)); + _msgpack_store32(&p[1], detail::integral_cast<uint32_t>(nanosec)); _msgpack_store64(&p[1 + 4], sec); o.via.ext.ptr = p; } @@ -250,6 +354,4 @@ } // namespace msgpack -#endif // !defined(MSGPACK_NO_BOOST) - #endif // MSGPACK_V1_TYPE_CPP11_CHRONO_HPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/include/msgpack/v1/adaptor/cpp17/variant.hpp new/msgpack-cxx-6.1.0/include/msgpack/v1/adaptor/cpp17/variant.hpp --- old/msgpack-cxx-4.1.3/include/msgpack/v1/adaptor/cpp17/variant.hpp 1970-01-01 01:00:00.000000000 +0100 +++ new/msgpack-cxx-6.1.0/include/msgpack/v1/adaptor/cpp17/variant.hpp 2023-07-08 05:21:22.000000000 +0200 @@ -0,0 +1,151 @@ +// +// MessagePack for C++ static resolution routine +// +// Copyright (C) 2023 Uy Ha +// +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +// + +#ifndef MSGPACK_V1_TYPE_VARIANT_HPP +#define MSGPACK_V1_TYPE_VARIANT_HPP + +#if defined(MSGPACK_USE_STD_VARIANT_ADAPTOR) + +#include "msgpack/cpp_version.hpp" + +#if MSGPACK_CPP_VERSION >= 201703 + +#include "msgpack/adaptor/adaptor_base.hpp" +#include "msgpack/object.hpp" +#include "msgpack/versioning.hpp" + +#include <variant> + +namespace msgpack { +MSGPACK_API_VERSION_NAMESPACE(v1) { +namespace adaptor { +namespace detail { +template < + typename Variant, + typename T, + typename... Ts, + std::size_t current_index, + std::size_t... indices +> +Variant construct_variant( + std::size_t index, + msgpack::object& object, + std::index_sequence<current_index, indices...> +) { + if constexpr(sizeof...(Ts) == 0) { + return object.as<T>(); + } + else { + if (index == current_index) { + return object.as<T>(); + } + return construct_variant<Variant, Ts...>( + index, + object, + std::index_sequence<indices...>() + ); + } +} + +struct object_variant_overload { + object_variant_overload(msgpack::object& obj, msgpack::zone& zone) + : obj{obj} + , zone{zone} {} + + template<typename T> + void operator()(T const& value) { + obj = msgpack::object(value, zone); + } + + msgpack::object& obj; + msgpack::zone& zone; +}; +} // namespace detail + +template <typename... Ts> +struct as<std::variant<Ts...>, typename std::enable_if<(msgpack::has_as<Ts>::value && ...)>::type> { + std::variant<Ts...> operator()(msgpack::object const& o) const { + if ( o.type != msgpack::type::ARRAY + || o.via.array.size != 2 + || o.via.array.ptr[0].type != msgpack::type::POSITIVE_INTEGER + || o.via.array.ptr[0].via.u64 >= sizeof...(Ts)) { + throw msgpack::type_error{}; + } + + return detail::construct_variant<std::variant<Ts...>, Ts...>( + o.via.array.ptr[0].as<std::size_t>(), + o.via.array.ptr[1], + std::make_index_sequence<sizeof...(Ts)>() + ); + } +}; + +template<typename... Ts> +struct convert<std::variant<Ts...>> { + msgpack::object const& operator()(msgpack::object const& o, std::variant<Ts...>& v) const { + if ( o.type != msgpack::type::ARRAY + || o.via.array.size != 2 + || o.via.array.ptr[0].type != msgpack::type::POSITIVE_INTEGER + || o.via.array.ptr[0].via.u64 >= sizeof...(Ts)) { + throw msgpack::type_error{}; + } + + v = detail::construct_variant<std::variant<Ts...>, Ts...>( + o.via.array.ptr[0].as<std::size_t>(), + o.via.array.ptr[1], + std::make_index_sequence<sizeof...(Ts)>() + ); + return o; + } +}; + +template <typename... Ts> +struct pack<std::variant<Ts...>>{ + template<typename Stream> + msgpack::packer<Stream>& operator()( + msgpack::packer<Stream>& o, + std::variant<Ts...> const& v + ) const { + o.pack_array(2); + o.pack_uint64(v.index()); + std::visit([&o](auto const& value){o.pack(value);}, v); + return o; + } +}; + + +template<typename... Ts> +struct object_with_zone<std::variant<Ts...>> { + void operator()( + msgpack::object::with_zone& o, + std::variant<Ts...> const& v + ) const { + msgpack::object *p = + static_cast<msgpack::object *>( + o.zone.allocate_align( + sizeof(msgpack::object) * 2, + MSGPACK_ZONE_ALIGNOF(msgpack::object) + ) + ); + + o.type = msgpack::type::ARRAY; + o.via.array.size = 2; + o.via.array.ptr = p; + o.via.array.ptr[0]= msgpack::object(v.index(), o.zone); + std::visit(detail::object_variant_overload(o.via.array.ptr[1], o.zone), v); + } +}; +} // namespace adaptor +} +} // namespace msgpack + +#endif // MSGPACK_CPP_VERSION >= 201703 +#endif // defined(MSGPACK_USE_STD_VARIANT_ADAPTOR) +#endif // MSGPACK_V1_TYPE_VARIANT_HPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/include/msgpack/v1/pack.hpp new/msgpack-cxx-6.1.0/include/msgpack/v1/pack.hpp --- old/msgpack-cxx-4.1.3/include/msgpack/v1/pack.hpp 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/include/msgpack/v1/pack.hpp 2023-07-08 05:21:22.000000000 +0200 @@ -1138,11 +1138,11 @@ template <typename Stream> inline packer<Stream>& packer<Stream>::pack_float(float d) { - if(d == d) { // check for nan + if(d == d) { // check for nan // compare d to limits to avoid undefined behaviour if(d >= 0 && d <= float(std::numeric_limits<uint64_t>::max()) && d == float(uint64_t(d))) { pack_imp_uint64(uint64_t(d)); - return *this; + return *this; } else if(d < 0 && d >= float(std::numeric_limits<int64_t>::min()) && d == float(int64_t(d))) { pack_imp_int64(int64_t(d)); return *this; @@ -1160,11 +1160,11 @@ template <typename Stream> inline packer<Stream>& packer<Stream>::pack_double(double d) { - if(d == d) { // check for nan + if(d == d) { // check for nan // compare d to limits to avoid undefined behaviour if(d >= 0 && d <= double(std::numeric_limits<uint64_t>::max()) && d == double(uint64_t(d))) { pack_imp_uint64(uint64_t(d)); - return *this; + return *this; } else if(d < 0 && d >= double(std::numeric_limits<int64_t>::min()) && d == double(int64_t(d))) { pack_imp_int64(int64_t(d)); return *this; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/include/msgpack/version_master.hpp new/msgpack-cxx-6.1.0/include/msgpack/version_master.hpp --- old/msgpack-cxx-4.1.3/include/msgpack/version_master.hpp 2022-11-02 05:47:31.000000000 +0100 +++ new/msgpack-cxx-6.1.0/include/msgpack/version_master.hpp 2023-07-08 06:16:09.000000000 +0200 @@ -1,3 +1,3 @@ -#define MSGPACK_VERSION_MAJOR 4 +#define MSGPACK_VERSION_MAJOR 6 #define MSGPACK_VERSION_MINOR 1 -#define MSGPACK_VERSION_REVISION 3 +#define MSGPACK_VERSION_REVISION 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/msgpack-config.cmake.in new/msgpack-cxx-6.1.0/msgpack-config.cmake.in --- old/msgpack-cxx-4.1.3/msgpack-config.cmake.in 2022-09-07 05:49:03.000000000 +0200 +++ new/msgpack-cxx-6.1.0/msgpack-config.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) - -IF (@MSGPACK_USE_BOOST@) - find_dependency(Boost REQUIRED) -ENDIF () - -include("${CMAKE_CURRENT_LIST_DIR}/msgpackc-cxx-targets.cmake") - -check_required_components(msgpackc-cxx) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/msgpack-cxx-config.cmake.in new/msgpack-cxx-6.1.0/msgpack-cxx-config.cmake.in --- old/msgpack-cxx-4.1.3/msgpack-cxx-config.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/msgpack-cxx-6.1.0/msgpack-cxx-config.cmake.in 2023-07-08 05:21:22.000000000 +0200 @@ -0,0 +1,11 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +IF (@MSGPACK_USE_BOOST@) + find_dependency(Boost REQUIRED) +ENDIF () + +include("${CMAKE_CURRENT_LIST_DIR}/msgpack-cxx-targets.cmake") + +check_required_components(msgpack-cxx) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/test/CMakeLists.txt new/msgpack-cxx-6.1.0/test/CMakeLists.txt --- old/msgpack-cxx-4.1.3/test/CMakeLists.txt 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/test/CMakeLists.txt 2023-07-08 05:21:22.000000000 +0200 @@ -78,7 +78,7 @@ $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>) TARGET_LINK_LIBRARIES (${source_file_we} - msgpackc-cxx + msgpack-cxx Boost::system Boost::unit_test_framework Threads::Threads @@ -109,7 +109,7 @@ ) TARGET_LINK_LIBRARIES (multi_file - msgpackc-cxx + msgpack-cxx ) ADD_TEST (multi_file multi_file) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/test/boost_variant.cpp new/msgpack-cxx-6.1.0/test/boost_variant.cpp --- old/msgpack-cxx-4.1.3/test/boost_variant.cpp 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/test/boost_variant.cpp 2023-07-08 05:21:22.000000000 +0200 @@ -264,7 +264,7 @@ BOOST_CHECK(val2.is_double()); BOOST_CHECK(fabs(12.34 - val2.as_double()) <= kEPS); BOOST_CHECK_NO_THROW(boost::get<double>(val2)); - BOOST_CHECK(fabs(val2.as_double() - val2.as_double()) <= kEPS); + BOOST_CHECK(fabs(val1.as_double() - val2.as_double()) <= kEPS); } BOOST_AUTO_TEST_CASE(object_variant_float) @@ -277,7 +277,8 @@ BOOST_CHECK(val2.is_double()); BOOST_CHECK(fabs(12.34 - val2.as_double()) <= kEPS); BOOST_CHECK_NO_THROW(boost::get<double>(val2)); - BOOST_CHECK(fabs(val2.as_double() - val2.as_double()) <= kEPS); + BOOST_CHECK(fabs(val1.as_double() - val2.as_double()) <= kEPS); + BOOST_CHECK(val1 == val2); } BOOST_AUTO_TEST_CASE(object_with_zone_variant_float) @@ -291,7 +292,116 @@ BOOST_CHECK(val2.is_double()); BOOST_CHECK(fabs(12.34 - val2.as_double()) <= kEPS); BOOST_CHECK_NO_THROW(boost::get<double>(val2)); - BOOST_CHECK(fabs(val2.as_double() - val2.as_double()) <= kEPS); + BOOST_CHECK(fabs(val1.as_double() - val2.as_double()) <= kEPS); + BOOST_CHECK(val1 == val2); +} + +BOOST_AUTO_TEST_CASE(pack_convert_variant_float_zero_atdp_positive) +{ + std::stringstream ss; + msgpack::type::variant val1 = 12.0; + BOOST_CHECK(val1.is_uint64_t()); + BOOST_CHECK_EQUAL(val1.as_uint64_t(), 12); + BOOST_CHECK(fabs(12.0 - val1.as_double()) <= kEPS); + + msgpack::pack(ss, val1); + + std::string const& str = ss.str(); + msgpack::object_handle oh = + msgpack::unpack(str.data(), str.size()); + msgpack::type::variant val2 = oh.get().as<msgpack::type::variant>(); + BOOST_CHECK(val2.is_uint64_t()); + BOOST_CHECK_EQUAL(val2.as_uint64_t(), 12); + BOOST_CHECK_NO_THROW(boost::get<uint64_t>(val2)); + BOOST_CHECK(fabs(12.0 - val2.as_double()) <= kEPS); + BOOST_CHECK_EQUAL(val1.as_uint64_t(), val2.as_uint64_t()); +} + +BOOST_AUTO_TEST_CASE(object_variant_float_zero_atdp_positive) +{ + msgpack::type::variant val1 = 12.0; + BOOST_CHECK(val1.is_uint64_t()); + BOOST_CHECK_EQUAL(val1.as_uint64_t(), 12); + BOOST_CHECK(fabs(12.0 - val1.as_double()) <= kEPS); + msgpack::object obj(val1); + msgpack::type::variant val2 = obj.as<msgpack::type::variant>(); + BOOST_CHECK(val2.is_uint64_t()); + BOOST_CHECK_EQUAL(val2.as_uint64_t(), 12); + BOOST_CHECK_NO_THROW(boost::get<uint64_t>(val2)); + BOOST_CHECK(fabs(12.0 - val2.as_double()) <= kEPS); + BOOST_CHECK_EQUAL(val1.as_uint64_t(), val2.as_uint64_t()); + BOOST_CHECK(val1 == val2); +} + +BOOST_AUTO_TEST_CASE(object_with_zone_variant_float_zero_atdp_positive) +{ + msgpack::zone z; + msgpack::type::variant val1 = 12.0; + BOOST_CHECK(val1.is_uint64_t()); + BOOST_CHECK_EQUAL(val1.as_uint64_t(), 12); + BOOST_CHECK(fabs(12.0 - val1.as_double()) <= kEPS); + msgpack::object obj(val1, z); + msgpack::type::variant val2 = obj.as<msgpack::type::variant>(); + BOOST_CHECK(val2.is_uint64_t()); + BOOST_CHECK_EQUAL(val2.as_uint64_t(), 12); + BOOST_CHECK_NO_THROW(boost::get<uint64_t>(val2)); + BOOST_CHECK_EQUAL(val1.as_uint64_t(), val2.as_uint64_t()); + BOOST_CHECK(fabs(12.0 - val2.as_double()) <= kEPS); + BOOST_CHECK(val1 == val2); +} + +BOOST_AUTO_TEST_CASE(pack_convert_variant_float_zero_atdp_negative) +{ + std::stringstream ss; + msgpack::type::variant val1 = -12.0; + BOOST_CHECK(val1.is_int64_t()); + BOOST_CHECK_EQUAL(val1.as_int64_t(), -12); + BOOST_CHECK(fabs(-12.0 - val1.as_double()) <= kEPS); + + msgpack::pack(ss, val1); + + std::string const& str = ss.str(); + msgpack::object_handle oh = + msgpack::unpack(str.data(), str.size()); + msgpack::type::variant val2 = oh.get().as<msgpack::type::variant>(); + BOOST_CHECK(val2.is_int64_t()); + BOOST_CHECK_EQUAL(val2.as_int64_t(), -12); + BOOST_CHECK_NO_THROW(boost::get<int64_t>(val2)); + BOOST_CHECK(fabs(-12.0 - val2.as_double()) <= kEPS); + BOOST_CHECK_EQUAL(val1.as_int64_t(), val2.as_int64_t()); +} + +BOOST_AUTO_TEST_CASE(object_variant_float_zero_atdp_negative) +{ + msgpack::type::variant val1 = -12.0; + BOOST_CHECK(val1.is_int64_t()); + BOOST_CHECK_EQUAL(val1.as_int64_t(), -12); + BOOST_CHECK(fabs(-12.0 - val1.as_double()) <= kEPS); + msgpack::object obj(val1); + msgpack::type::variant val2 = obj.as<msgpack::type::variant>(); + BOOST_CHECK(val2.is_int64_t()); + BOOST_CHECK_EQUAL(val2.as_int64_t(), -12); + BOOST_CHECK_NO_THROW(boost::get<int64_t>(val2)); + BOOST_CHECK(fabs(-12.0 - val2.as_double()) <= kEPS); + BOOST_CHECK_EQUAL(val1.as_int64_t(), val2.as_int64_t()); + BOOST_CHECK(val1 == val2); +} + +BOOST_AUTO_TEST_CASE(object_with_zone_variant_float_zero_atdp_negative) +{ + msgpack::zone z; + msgpack::type::variant val1 = -12.0; + BOOST_CHECK(val1.is_int64_t()); + BOOST_CHECK_EQUAL(val1.as_int64_t(), -12); + BOOST_CHECK(fabs(-12.0 - val1.as_double()) <= kEPS); + msgpack::object obj(val1, z); + msgpack::type::variant val2 = obj.as<msgpack::type::variant>(); + BOOST_CHECK(val2.is_int64_t()); + BOOST_CHECK_EQUAL(val2.as_int64_t(), -12); + BOOST_CHECK_NO_THROW(boost::get<int64_t>(val2)); + BOOST_CHECK(fabs(-12.0 - val2.as_double()) <= kEPS); + BOOST_CHECK_EQUAL(val1.as_int64_t(), val2.as_int64_t()); + BOOST_CHECK(val1 == val2); } // str diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/test/msgpack_cpp11.cpp new/msgpack-cxx-6.1.0/test/msgpack_cpp11.cpp --- old/msgpack-cxx-4.1.3/test/msgpack_cpp11.cpp 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/test/msgpack_cpp11.cpp 2023-07-08 05:21:22.000000000 +0200 @@ -252,6 +252,9 @@ template <class Key> struct set_allocator : std::allocator<Key> { using std::allocator<Key>::allocator; + + template<class U> + struct rebind { using other = set_allocator; }; }; // C++ named requirement Allocator implies that the first template type @@ -262,6 +265,9 @@ template <typename KeyValuePair> struct map_allocator_impl : std::allocator<KeyValuePair> { using std::allocator<KeyValuePair>::allocator; + + template<class U> + struct rebind { using other = map_allocator_impl; }; }; template <class Key, class T> @@ -270,6 +276,9 @@ template <class T> struct allocator : std::allocator<T> { using std::allocator<T>::allocator; + + template<class U> + struct rebind { using other = allocator; }; }; } // namespace test @@ -861,8 +870,6 @@ BOOST_CHECK(val1 == val2); } -#if !defined(MSGPACK_NO_BOOST) - BOOST_AUTO_TEST_CASE(system_clock) { std::chrono::system_clock::time_point val1; @@ -1428,8 +1435,6 @@ BOOST_CHECK(val1 == val3); } -#endif // !defined(MSGPACK_NO_BOOST) - BOOST_AUTO_TEST_CASE(timespec_pack_convert_zero) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-cxx-4.1.3/test/msgpack_cpp17.cpp new/msgpack-cxx-6.1.0/test/msgpack_cpp17.cpp --- old/msgpack-cxx-4.1.3/test/msgpack_cpp17.cpp 2022-08-25 11:56:15.000000000 +0200 +++ new/msgpack-cxx-6.1.0/test/msgpack_cpp17.cpp 2023-07-08 05:21:22.000000000 +0200 @@ -461,4 +461,30 @@ } } +#if defined(MSGPACK_USE_STD_VARIANT_ADAPTOR) + +BOOST_AUTO_TEST_CASE(variant_pack_unpack_as) { + std::stringstream ss; + std::variant<bool, int, float, double> val1{1.0}; + msgpack::pack(ss, val1); + std::string const& str = ss.str(); + msgpack::object_handle oh = + msgpack::unpack(str.data(), str.size()); + std::variant<bool, int, float, double> val2 = + oh.get().as<std::variant<bool, int, float, double> >(); + BOOST_CHECK(val1 == val2); + BOOST_CHECK_THROW((oh.get().as<std::variant<bool>>()), msgpack::type_error); +} + +BOOST_AUTO_TEST_CASE(variant_with_zone) { + msgpack::zone z; + std::variant<bool, int, float, double> val1{1.0}; + msgpack::object obj(val1, z); + std::variant<bool, int, float, double> val2 = obj.as<std::variant<bool, int, float, double>>(); + BOOST_CHECK(val1 == val2); + BOOST_CHECK_THROW((obj.as<std::variant<bool>>()), msgpack::type_error); +} + +#endif // defined(MSGPACK_USE_STD_VARIANT_ADAPTOR) + #endif // MSGPACK_CPP_VERSION >= 201703

1 0

commit msgpack-c for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package msgpack-c for openSUSE:Factory checked in at 2023-11-30 21:59:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/msgpack-c (Old) and /work/SRC/openSUSE:Factory/.msgpack-c.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "msgpack-c" Thu Nov 30 21:59:55 2023 rev:2 rq:1122998 version:6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/msgpack-c/msgpack-c.changes 2022-09-02 21:57:13.880396441 +0200 +++ /work/SRC/openSUSE:Factory/.msgpack-c.new.25432/msgpack-c.changes 2023-11-30 22:00:50.832011986 +0100 @@ -1,0 +2,8 @@ +Thu Nov 2 21:37:47 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 6.0.0 + * The package name in cmake and pkgconfig files was changed + from msgpackc to msgpack-c; the SONAME of the library changed + likewise. + +------------------------------------------------------------------- Old: ---- msgpack-c-4.0.0.tar.gz New: ---- msgpack-c-6.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msgpack-c.spec ++++++ --- /var/tmp/diff_new_pack.dTOdJp/_old 2023-11-30 22:00:51.564038952 +0100 +++ /var/tmp/diff_new_pack.dTOdJp/_new 2023-11-30 22:00:51.568039100 +0100 @@ -1,7 +1,7 @@ # # spec file for package msgpack-c # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,35 +17,36 @@ Name: msgpack-c -Version: 4.0.0 +Version: 6.0.0 Release: 0 Summary: Object serialization library for cross-language communication License: BSL-1.0 Group: Development/Libraries/C and C++ URL: https://msgpack.org Source: https://github.com/msgpack/msgpack-c/releases/download/c-%{version}/msgpack… +BuildRequires: c++_compiler BuildRequires: cmake BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: pkgconfig +BuildRequires: gtest +BuildRequires: pkg-config BuildRequires: pkgconfig(zlib) %description MessagePack is a binary-based object serialization library. It enables to exchange structured objects between many languages like JSON. -%package -n libmsgpackc2 +%package -n libmsgpack-c2 Summary: Object serialization library for cross-language communication Group: System/Libraries -%description -n libmsgpackc2 +%description -n libmsgpack-c2 MessagePack is a binary-based object serialization library. It enables to exchange structured objects between many languages like JSON. %package devel Summary: Development headers for libmsgpack C library Group: Development/Libraries/C and C++ -Requires: libmsgpackc2 = %{version}-%{release} +Requires: libmsgpack-c2 = %{version}-%{release} Provides: libmsgpack-devel = %{version}-%{release} Provides: libmsgpackc-devel = %{version}-%{release} Conflicts: msgpack-devel < 4 @@ -65,23 +66,19 @@ %install %cmake_install -find %{buildroot} -type f -name "*.a" -delete -print - -# Fix duplicated files. %fdupes %{buildroot}/%{_includedir}/%{name} -%post -n libmsgpackc2 -p /sbin/ldconfig -%postun -n libmsgpackc2 -p /sbin/ldconfig +%post -n libmsgpack-c2 -p /sbin/ldconfig +%postun -n libmsgpack-c2 -p /sbin/ldconfig -%files -n libmsgpackc2 +%files -n libmsgpack-c2 %license COPYING -%{_libdir}/libmsgpackc.so.* +%_libdir/libmsgpack-c.so.* %files devel %doc NOTICE README.md -%{_libdir}/libmsgpackc.so -%{_libdir}/pkgconfig/msgpack.pc -%{_libdir}/cmake/msgpack -%{_includedir}/msgpack.h -%{_includedir}/msgpack/ +%_libdir/libmsgpack-c.so +%_libdir/pkgconfig/*.pc +%_libdir/cmake/ +%_includedir/msgpack* ++++++ msgpack-c-4.0.0.tar.gz -> msgpack-c-6.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/CMakeLists.txt new/msgpack-c-6.0.0/CMakeLists.txt --- old/msgpack-c-4.0.0/CMakeLists.txt 2021-09-01 03:32:00.000000000 +0200 +++ new/msgpack-c-6.0.0/CMakeLists.txt 2023-03-04 14:39:44.000000000 +0100 @@ -5,7 +5,14 @@ CMAKE_POLICY(SET CMP0054 NEW) ENDIF () -PROJECT (msgpack) +OPTION (MSGPACK_BUILD_TESTS "Build msgpack tests." ON) +OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage report." OFF) + +if(MSGPACK_BUILD_TESTS) + PROJECT (msgpack-c) +else() + PROJECT (msgpack-c C) +endif() FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.h contents) STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents}) @@ -31,7 +38,7 @@ SET(MSGPACK_ENDIAN_LITTLE_BYTE 0) ELSE () SET(MSGPACK_ENDIAN_BIG_BYTE 0) - SET(MSGPACK_ENDIAN_LITTLE_BYTE 1) + SET(MSGPACK_ENDIAN_LITTLE_BYTE 1) ENDIF () CONFIGURE_FILE ( @@ -74,14 +81,6 @@ SET (CMAKE_C_FLAGS "-f${MSGPACK_CHAR_SIGN}-char ${CMAKE_C_FLAGS}") ENDIF () -FIND_PACKAGE (GTest) -FIND_PACKAGE (ZLIB) -FIND_PACKAGE (Threads) -IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND) - OPTION (MSGPACK_BUILD_TESTS "Build msgpack tests." ON) - OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage report." OFF) -ENDIF () - IF (DEFINED BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS) IF (DEFINED MSGPACK_ENABLE_SHARED AND NOT MSGPACK_ENABLE_SHARED) @@ -115,20 +114,20 @@ INCLUDE (Files.cmake) CONFIGURE_FILE ( - msgpack.pc.in - msgpack.pc + msgpack-c.pc.in + msgpack-c.pc @ONLY ) IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC) - ADD_LIBRARY (msgpackc - ${msgpackc_SOURCES} - ${msgpackc_HEADERS} + ADD_LIBRARY (msgpack-c + ${msgpack-c_SOURCES} + ${msgpack-c_HEADERS} ) - SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0) + SET_TARGET_PROPERTIES (msgpack-c PROPERTIES SOVERSION 2 VERSION 2.0.0) - TARGET_INCLUDE_DIRECTORIES (msgpackc + TARGET_INCLUDE_DIRECTORIES (msgpack-c PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> @@ -141,12 +140,12 @@ IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC) - ADD_LIBRARY (msgpackc-static STATIC - ${msgpackc_SOURCES} - ${msgpackc_HEADERS} + ADD_LIBRARY (msgpack-c-static STATIC + ${msgpack-c_SOURCES} + ${msgpack-c_HEADERS} ) - TARGET_INCLUDE_DIRECTORIES (msgpackc-static + TARGET_INCLUDE_DIRECTORIES (msgpack-c-static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> @@ -156,13 +155,13 @@ ${CMAKE_CURRENT_SOURCE_DIR} ) - SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc") + SET_TARGET_PROPERTIES (msgpack-c-static PROPERTIES OUTPUT_NAME "msgpack-c") IF (MSGPACK_ENABLE_SHARED) IF (MSVC) - SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib") + SET_TARGET_PROPERTIES (msgpack-c PROPERTIES IMPORT_SUFFIX "_import.lib") ELSEIF (MINGW) - SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX ".dll.a") + SET_TARGET_PROPERTIES (msgpack-c PROPERTIES IMPORT_SUFFIX ".dll.a") ENDIF () ENDIF () ENDIF () @@ -194,19 +193,19 @@ IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC) - SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC") + SET_PROPERTY (TARGET msgpack-c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC") ENDIF () IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC) - SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" ) + SET_PROPERTY (TARGET msgpack-c-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" ) ENDIF () ENDIF () IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC) - SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + SET_PROPERTY (TARGET msgpack-c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") ENDIF () IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC) - SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + SET_PROPERTY (TARGET msgpack-c-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") ENDIF () ENDIF () @@ -227,7 +226,7 @@ ENDIF () IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC90" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC10") - SET_SOURCE_FILES_PROPERTIES(${msgpackc_SOURCES} PROPERTIES LANGUAGE C) + SET_SOURCE_FILES_PROPERTIES(${msgpack-c_SOURCES} PROPERTIES LANGUAGE C) ENDIF () IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc") @@ -247,28 +246,28 @@ ENDIF () IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC) - SET (MSGPACK_INSTALLTARGETS msgpackc) + SET (MSGPACK_INSTALLTARGETS msgpack-c) ENDIF () IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC) - LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-static) + LIST (APPEND MSGPACK_INSTALLTARGETS msgpack-c-static) ENDIF () -INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-targets +INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-c-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -FOREACH (file ${msgpackc_common_HEADERS}) +FOREACH (file ${msgpack-c_common_HEADERS}) GET_FILENAME_COMPONENT (dir ${file} PATH) INSTALL (FILES ${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir}) ENDFOREACH () -FOREACH (file ${msgpackc_configured_HEADERS}) +FOREACH (file ${msgpack-c_configured_HEADERS}) GET_FILENAME_COMPONENT (dir ${file} PATH) INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir}) ENDFOREACH () IF (NOT MSVC) - INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ENDIF () # Doxygen @@ -298,36 +297,36 @@ INCLUDE (CMakePackageConfigHelpers) -SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack") +SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack-c") WRITE_BASIC_PACKAGE_VERSION_FILE ( - msgpack-config-version.cmake + msgpack-c-config-version.cmake VERSION ${VERSION} COMPATIBILITY SameMajorVersion ) IF (NOT CMAKE_VERSION VERSION_LESS 3.0) - EXPORT (EXPORT msgpack-targets - FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-targets.cmake" + EXPORT (EXPORT msgpack-c-targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-targets.cmake" ) ENDIF () -CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-config.cmake.in - msgpack-config.cmake +CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-c-config.cmake.in + msgpack-c-config.cmake INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" ) -INSTALL (EXPORT msgpack-targets +INSTALL (EXPORT msgpack-c-targets FILE - msgpack-targets.cmake + msgpack-c-targets.cmake DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" ) INSTALL ( FILES - "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config-version.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-config-version.cmake" DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/ChangeLog new/msgpack-c-6.0.0/ChangeLog --- old/msgpack-c-4.0.0/ChangeLog 2021-09-01 04:15:39.000000000 +0200 +++ new/msgpack-c-6.0.0/ChangeLog 2023-03-04 14:48:03.000000000 +0100 @@ -1,3 +1,14 @@ +# 2023-03-02 version 6.0.0 + * Remove C++ requirement if test is disabled (#1055) +## << breaking changes >> + * Change CMake package name of C library to msgpack-c (#1053) + Unified all C package, library, cmake, tarball name become msgpack-c. + +# 2023-01-10 version 5.0.0 + * Add additional address sanitizer for CI. (#1023) +## << breaking changes >> + * Change CMake package name of C library to msgpackc (#1044, #1049) + # 2021-08-01 version 4.0.0 * Fix and improve alignment logic (#962) * Fix iovec name conflict (#953) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/Files.cmake new/msgpack-c-6.0.0/Files.cmake --- old/msgpack-c-4.0.0/Files.cmake 2021-09-01 01:54:12.000000000 +0200 +++ new/msgpack-c-6.0.0/Files.cmake 2023-03-04 13:40:57.000000000 +0100 @@ -1,5 +1,5 @@ # Source files -SET (msgpackc_SOURCES +SET (msgpack-c_SOURCES src/objectc.c src/unpack.c src/version.c @@ -8,7 +8,7 @@ ) # Header files -SET (msgpackc_common_HEADERS +SET (msgpack-c_common_HEADERS include/msgpack.h include/msgpack/fbuffer.h include/msgpack/gcc_atomic.h @@ -29,13 +29,13 @@ ) # Header files will configured -SET (msgpackc_configured_HEADERS +SET (msgpack-c_configured_HEADERS include/msgpack/pack_template.h include/msgpack/sysdep.h ) # All header files -LIST (APPEND msgpackc_HEADERS - ${msgpackc_common_HEADERS} - ${msgpackc_configured_HEADERS} +LIST (APPEND msgpack-c_HEADERS + ${msgpack-c_common_HEADERS} + ${msgpack-c_configured_HEADERS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/README new/msgpack-c-6.0.0/README --- old/msgpack-c-4.0.0/README 2021-09-01 04:15:39.000000000 +0200 +++ new/msgpack-c-6.0.0/README 2023-03-04 14:48:03.000000000 +0100 @@ -1,7 +1,7 @@ `msgpack` for C =================== -Version 4.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=… [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch… +Version 6.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=… [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch… [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master) It's like JSON but smaller and faster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/README.md new/msgpack-c-6.0.0/README.md --- old/msgpack-c-4.0.0/README.md 2021-09-01 04:12:00.000000000 +0200 +++ new/msgpack-c-6.0.0/README.md 2023-03-04 13:40:57.000000000 +0100 @@ -1,7 +1,7 @@ `msgpack` for C =================== -Version 4.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=… [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch… +Version 6.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=… [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch… [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master) It's like JSON but smaller and faster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/example/CMakeLists.txt new/msgpack-c-6.0.0/example/CMakeLists.txt --- old/msgpack-c-4.0.0/example/CMakeLists.txt 2021-09-01 01:54:12.000000000 +0200 +++ new/msgpack-c-6.0.0/example/CMakeLists.txt 2023-03-04 13:40:57.000000000 +0100 @@ -19,7 +19,7 @@ ${source_file} ) TARGET_LINK_LIBRARIES (${source_file_we} - msgpackc + msgpack-c ) IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/example/cmake/CMakeLists.txt new/msgpack-c-6.0.0/example/cmake/CMakeLists.txt --- old/msgpack-c-4.0.0/example/cmake/CMakeLists.txt 2021-09-01 01:54:12.000000000 +0200 +++ new/msgpack-c-6.0.0/example/cmake/CMakeLists.txt 2023-03-04 13:40:57.000000000 +0100 @@ -3,15 +3,15 @@ if(EXAMPLE_MSGPACK_EMBEDDED) add_subdirectory(msgpack-c) - set(msgpack_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c) + set(msgpack-c_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c) endif() -find_package(msgpack REQUIRED) +find_package(msgpack-c REQUIRED) add_executable (${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c) -target_link_libraries(${PROJECT_NAME} msgpackc) +target_link_libraries(${PROJECT_NAME} msgpack-c) -if(TARGET msgpackc-static) +if(TARGET msgpack-c-static) add_executable (${PROJECT_NAME}-static ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c) - target_link_libraries(${PROJECT_NAME}-static msgpackc-static) + target_link_libraries(${PROJECT_NAME}-static msgpack-c-static) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/include/msgpack/version_master.h new/msgpack-c-6.0.0/include/msgpack/version_master.h --- old/msgpack-c-4.0.0/include/msgpack/version_master.h 2021-09-01 04:12:00.000000000 +0200 +++ new/msgpack-c-6.0.0/include/msgpack/version_master.h 2023-03-04 13:40:57.000000000 +0100 @@ -1,3 +1,3 @@ -#define MSGPACK_VERSION_MAJOR 4 +#define MSGPACK_VERSION_MAJOR 6 #define MSGPACK_VERSION_MINOR 0 #define MSGPACK_VERSION_REVISION 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/msgpack-c-config.cmake.in new/msgpack-c-6.0.0/msgpack-c-config.cmake.in --- old/msgpack-c-4.0.0/msgpack-c-config.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/msgpack-c-6.0.0/msgpack-c-config.cmake.in 2023-03-04 13:40:57.000000000 +0100 @@ -0,0 +1,19 @@ +#.rst: +# msgpack +# ------- +# +# The following import targets are created +# +# :: +# +# msgpack-c +# msgpack-c-static (optional) +# + +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +if(NOT TARGET msgpack-c AND NOT TARGET msgpack-c-static) + include("${CMAKE_CURRENT_LIST_DIR}/msgpack-c-targets.cmake") +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/msgpack-c.pc.in new/msgpack-c-6.0.0/msgpack-c.pc.in --- old/msgpack-c-4.0.0/msgpack-c.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/msgpack-c-6.0.0/msgpack-c.pc.in 2023-03-04 13:40:57.000000000 +0100 @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: MessagePack +Description: Binary-based efficient object serialization library +Version: @VERSION@ +Libs: -L${libdir} -lmsgpack-c +Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/msgpack-config.cmake.in new/msgpack-c-6.0.0/msgpack-config.cmake.in --- old/msgpack-c-4.0.0/msgpack-config.cmake.in 2021-09-01 01:54:12.000000000 +0200 +++ new/msgpack-c-6.0.0/msgpack-config.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#.rst: -# msgpack -# ------- -# -# The following import targets are created -# -# :: -# -# msgpackc -# msgpackc-static (optional) -# - -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) - -if(NOT TARGET msgpackc AND NOT TARGET msgpackc-static) - include("${CMAKE_CURRENT_LIST_DIR}/msgpack-targets.cmake") -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/msgpack.pc.in new/msgpack-c-6.0.0/msgpack.pc.in --- old/msgpack-c-4.0.0/msgpack.pc.in 2021-09-01 01:54:12.000000000 +0200 +++ new/msgpack-c-6.0.0/msgpack.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: MessagePack -Description: Binary-based efficient object serialization library -Version: @VERSION@ -Libs: -L${libdir} -lmsgpackc -Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msgpack-c-4.0.0/test/CMakeLists.txt new/msgpack-c-6.0.0/test/CMakeLists.txt --- old/msgpack-c-4.0.0/test/CMakeLists.txt 2021-09-01 01:54:12.000000000 +0200 +++ new/msgpack-c-6.0.0/test/CMakeLists.txt 2023-03-04 13:40:57.000000000 +0100 @@ -23,7 +23,7 @@ ) TARGET_LINK_LIBRARIES (${source_file_we} - msgpackc + msgpack-c ${GTEST_BOTH_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}

1 0

commit dpkg for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dpkg for openSUSE:Factory checked in at 2023-11-30 21:59:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpkg (Old) and /work/SRC/openSUSE:Factory/.dpkg.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dpkg" Thu Nov 30 21:59:52 2023 rev:39 rq:1129618 version:1.22.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dpkg/dpkg.changes 2023-09-22 21:46:37.551143379 +0200 +++ /work/SRC/openSUSE:Factory/.dpkg.new.25432/dpkg.changes 2023-11-30 22:00:47.235879509 +0100 @@ -1,0 +2,8 @@ +Wed Nov 22 20:45:45 UTC 2023 - Martin Schreiner <martin.schreiner(a)suse.com> + +- Update to version 1.22.1. + The full changelog is very large. Please check it here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.1 +- Refresh update-alternatives-suse.patch so it applies cleanly. + +------------------------------------------------------------------- update-alternatives.changes: same change Old: ---- dpkg_1.22.0.tar.xz New: ---- dpkg_1.22.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpkg.spec ++++++ --- /var/tmp/diff_new_pack.df8fQG/_old 2023-11-30 22:00:48.559928285 +0100 +++ /var/tmp/diff_new_pack.df8fQG/_new 2023-11-30 22:00:48.559928285 +0100 @@ -17,7 +17,7 @@ Name: dpkg -Version: 1.22.0 +Version: 1.22.1 Release: 0 Summary: Debian package management system License: GPL-2.0-or-later update-alternatives.spec: same change ++++++ dpkg_1.22.0.tar.xz -> dpkg_1.22.1.tar.xz ++++++ ++++ 92551 lines of diff (skipped) ++++++ update-alternatives-suse.patch ++++++ --- /var/tmp/diff_new_pack.df8fQG/_old 2023-11-30 22:00:50.271991355 +0100 +++ /var/tmp/diff_new_pack.df8fQG/_new 2023-11-30 22:00:50.275991503 +0100 @@ -10,28 +10,10 @@ utils/update-alternatives.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) -Index: dpkg-1.21.8/man/update-alternatives.pod +Index: dpkg-1.22.1/man/update-alternatives.pod =================================================================== ---- dpkg-1.21.8.orig/man/update-alternatives.pod -+++ dpkg-1.21.8/man/update-alternatives.pod -@@ -37,7 +37,7 @@ B<update-alternatives> - - B<update-alternatives> - creates, removes, maintains and displays information about the symbolic --links comprising the Debian alternatives system. -+links comprising the SUSE alternatives system. - - It is possible for several programs fulfilling the same or similar - functions to be installed on a single system at the same time. -@@ -47,7 +47,7 @@ different editor, if desired, but makes - to make a good choice for an editor to invoke if the - user has not specified a particular preference. - --Debian's alternatives system aims to solve this problem. -+SUSE's alternatives system aims to solve this problem. - A generic name in the filesystem is - shared by all files providing interchangeable functionality. - The alternatives system and the system administrator +--- dpkg-1.22.1.orig/man/update-alternatives.pod ++++ dpkg-1.22.1/man/update-alternatives.pod @@ -85,8 +85,8 @@ installed, changed or removed, B<update-alternatives> is called to update information about that file in the alternatives system. @@ -43,10 +25,10 @@ (configure) to install the alternative and from B<prerm> and B<postrm> (remove) to remove the alternative. -Index: dpkg-1.21.8/utils/Makefile.am +Index: dpkg-1.22.1/utils/Makefile.am =================================================================== ---- dpkg-1.21.8.orig/utils/Makefile.am -+++ dpkg-1.21.8/utils/Makefile.am +--- dpkg-1.22.1.orig/utils/Makefile.am ++++ dpkg-1.22.1/utils/Makefile.am @@ -47,8 +47,8 @@ update_alternatives_SOURCES = \ update_alternatives_CPPFLAGS = \ @@ -71,10 +53,10 @@ UA_ADMINDIR_DEFAULT=$(admindir) \ # EOL -Index: dpkg-1.21.8/utils/t/update_alternatives.t +Index: dpkg-1.22.1/utils/t/update_alternatives.t =================================================================== ---- dpkg-1.21.8.orig/utils/t/update_alternatives.t -+++ dpkg-1.21.8/utils/t/update_alternatives.t +--- dpkg-1.22.1.orig/utils/t/update_alternatives.t ++++ dpkg-1.22.1/utils/t/update_alternatives.t @@ -32,8 +32,8 @@ my $bindir = File::Spec->rel2abs("$tmpdi my @ua = ("$ENV{builddir}/update-alternatives", '--log', '/dev/null', '--quiet', '--admindir', "$admindir", '--altdir', "$altdir"); @@ -86,17 +68,4 @@ delete $ENV{$rootdir_envvar}; delete $ENV{$admindir_envvar}; -Index: dpkg-1.21.8/utils/update-alternatives.c -=================================================================== ---- dpkg-1.21.8.orig/utils/update-alternatives.c -+++ dpkg-1.21.8/utils/update-alternatives.c -@@ -116,7 +116,7 @@ static int opt_force = 0; - static void - version(void) - { -- printf(_("Debian %s version %s.\n"), PROGNAME, VERSION); -+ printf(_("SUSE %s version %s.\n"), PROGNAME, VERSION); - printf("\n"); - - printf(_(

1 0

commit wireshark for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2023-11-30 21:59:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireshark (Old) and /work/SRC/openSUSE:Factory/.wireshark.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark" Thu Nov 30 21:59:47 2023 rev:213 rq:1129844 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2023-11-23 21:43:08.040984945 +0100 +++ /work/SRC/openSUSE:Factory/.wireshark.new.25432/wireshark.changes 2023-11-30 22:00:45.487815113 +0100 @@ -1,0 +2,27 @@ +Wed Nov 29 15:05:49 UTC 2023 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Install SDK using cmake --install --component Development instead + of manually copying. This brings back the .pc file and simplifies + the spec file. + +------------------------------------------------------------------- +Fri Nov 24 09:40:38 UTC 2023 - Robert Frohl <rfrohl(a)suse.com> + +- Wireshark 4.2.0: + * Packet list sorting has been improved. + * Wireshark and TShark are now better about generating valid UTF-8 output. + * A new display filter feature for filtering raw bytes has been added. + * Display filter autocomplete is smarter about not suggesting invalid syntax. + * Tools › MAC Address Blocks can lookup a MAC address in the IEEE OUI registry. + * The installation target no longer installs development headers by default. + * The Wireshark installation is relocatable on Linux (and other ELF platforms with support for relative RPATHs). + * Tools › Browser (SSL Keylog) can launch your web browser with the SSLKEYLOGFILE environment variable set to the appropriate value. + * Wireshark now supports the Korean language. + * Many other improvements have been made. See the “New and Updated Features” section below for more details. +- Further features, bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-4.2.0.html +- Updated patches + wireshark-0000-wsutil-implicit_declaration_memcpy.patch + wireshark-0010-dumpcap-permission-denied.patch + +------------------------------------------------------------------- Old: ---- wireshark-4.0.11.tar.xz wireshark-4.0.11.tar.xz.hash New: ---- wireshark-4.2.0.tar.xz wireshark-4.2.0.tar.xz.hash ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.4lOsaS/_old 2023-11-30 22:00:46.607856374 +0100 +++ /var/tmp/diff_new_pack.4lOsaS/_new 2023-11-30 22:00:46.607856374 +0100 @@ -17,18 +17,18 @@ # define libraries -%define libcodecs libwscodecs2 -%define libtap libwiretap13 -%define libutil libwsutil14 -%define libwire libwireshark16 +%define libtap libwiretap14 +%define libutil libwsutil15 +%define libwire libwireshark17 %define org_name org.wireshark.Wireshark +%bcond_without qt5 %if 0%{?suse_version} >= 1500 %bcond_without lz4 %else %bcond_with lz4 %endif Name: wireshark -Version: 4.0.11 +Version: 4.2.0 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,14 +48,11 @@ BuildRequires: hicolor-icon-theme BuildRequires: krb5-devel BuildRequires: libbrotli-devel -# keep until libbrotli-devel bug is fixed -BuildRequires: libbrotlidec1 BuildRequires: libcap-devel BuildRequires: libcares-devel >= 1.5.0 BuildRequires: libgcrypt-devel >= 1.4.2 BuildRequires: libgnutls-devel >= 3.2 BuildRequires: libpcap-devel -BuildRequires: libqt5-linguist-devel BuildRequires: libsmi-devel BuildRequires: libtool BuildRequires: lua51-devel @@ -69,6 +66,8 @@ BuildRequires: tcpd-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel +%if %{with qt5} +BuildRequires: libqt5-linguist-devel BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0 BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 BuildRequires: pkgconfig(Qt5Gui) @@ -76,6 +75,17 @@ BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) +%else +BuildRequires: qt6-linguist-devel +BuildRequires: qt6-qt5compat-devel +BuildRequires: pkgconfig(Qt6Concurrent) +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Multimedia) +BuildRequires: pkgconfig(Qt6PrintSupport) +BuildRequires: pkgconfig(Qt6Svg) +BuildRequires: pkgconfig(Qt6Widgets) +%endif BuildRequires: pkgconfig(libmaxminddb) BuildRequires: pkgconfig(libnghttp2) BuildRequires: pkgconfig(libnl-3.0) @@ -86,14 +96,9 @@ BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(sbc) BuildRequires: pkgconfig(speexdsp) -# keep until libbrotli-devel bug is fixed -Requires: libbrotlidec1 Requires(pre): permissions Requires(pre): shadow Recommends: wireshark-ui = %{version} -Provides: ethereal = %{version} -Obsoletes: %{libcodecs} < %{version} -Obsoletes: ethereal < %{version} Provides: group(wireshark) %if 0%{?is_opensuse} && 0%{?suse_version} >= 1550 # enable ITU G.729 Annex A/B speech codec only in Tumbleweed @@ -145,8 +150,6 @@ Requires: %{name} = %{version} Requires: glib2-devel Requires: glibc-devel -Provides: ethereal-devel = %{version} -Obsoletes: ethereal-devel < %{version} %description devel Wireshark is a network protocol analyzer. It allows examining data @@ -174,7 +177,11 @@ %autosetup -p1 %build +%if %{with qt5} +%cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/' -DUSE_qt6=OFF +%else %cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/' +%endif %if 0%{?is_opensuse} %cmake_build %else @@ -190,36 +197,16 @@ %install %cmake_install -find %{buildroot} -type f -name "*.la" -delete -print - -# Ethereal support (remove when SLE-11 is out of scope -ln -fs wireshark %{buildroot}%{_bindir}/ethereal -ln -fs tshark %{buildroot}%{_bindir}/tethereal +cmake --install build --component Development --prefix %{buildroot}%{_prefix} +# removing doc files that are not needed` +rm %{buildroot}/usr/share/doc/wireshark/COPYING +rm %{buildroot}/usr/share/doc/wireshark/README.xml-output +rm %{buildroot}/usr/share/doc/wireshark/pdml2html.xsl +rm %{buildroot}/usr/share/doc/wireshark/ws.css install -d -m 0755 %{buildroot}%{_sysconfdir} install -d -m 0755 %{buildroot}%{_mandir}/man1/ -# -devel -install -d -m 0755 %{buildroot}%{_includedir}/wireshark -IDIR="%{buildroot}%{_includedir}/wireshark" -mkdir -p "${IDIR}/epan" -mkdir -p "${IDIR}/epan/crypt" -mkdir -p "${IDIR}/epan/ftypes" -mkdir -p "${IDIR}/epan/dfilter" -mkdir -p "${IDIR}/epan/dissectors" -mkdir -p "${IDIR}/epan/wmem" -mkdir -p "${IDIR}/wiretap" -mkdir -p "${IDIR}/wsutil" -install -m 644 *.h "${IDIR}/" -install -m 644 build/config.h "${IDIR}/" -install -m 644 epan/*.h "${IDIR}/epan/" -install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" -install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" -install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" -install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" -install -m 644 wiretap/*.h "${IDIR}/wiretap" -install -m 644 wsutil/*.h "${IDIR}/wsutil" - # desktop file cp resources/freedesktop/%{org_name}.desktop %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop sed -i -e 's|Name=Wireshark|Name=Wireshark - Super User Mode|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop @@ -262,7 +249,6 @@ %{_bindir}/rawshark %{_bindir}/reordercap %{_bindir}/sharkd -%{_bindir}/tethereal %{_bindir}/text2pcap %{_bindir}/tshark %verify(not mode caps) %attr(0750,root,wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap @@ -279,19 +265,17 @@ %{_libdir}/libwiretap.so.* %files devel -%{_includedir}/wireshark -%{_includedir}/wireshark/config.h +%{_includedir}/wireshark/ %{_libdir}/lib*.so %{_libdir}/pkgconfig/wireshark.pc +%{_libdir}/cmake/wireshark/ %files ui-qt %{_bindir}/wireshark -%{_bindir}/ethereal %{_datadir}/applications/%{org_name}.desktop %{_datadir}/applications/%{org_name}-su.desktop %{_datadir}/icons/hicolor/*/apps/%{org_name}.png %{_datadir}/icons/hicolor/*/mimetypes/%{org_name}-mimetype.png -%{_datadir}/icons/hicolor/scalable/apps/%{org_name}.svg %{_datadir}/mime/packages/%{org_name}.xml %{_datadir}/metainfo/%{org_name}.metainfo.xml ++++++ wireshark-0000-wsutil-implicit_declaration_memcpy.patch ++++++ --- /var/tmp/diff_new_pack.4lOsaS/_old 2023-11-30 22:00:46.635857405 +0100 +++ /var/tmp/diff_new_pack.4lOsaS/_new 2023-11-30 22:00:46.635857405 +0100 @@ -1,15 +1,15 @@ -Index: wireshark-3.6.1/wsutil/glib-compat.h +Index: wireshark-4.2.0rc2/wsutil/glib-compat.h =================================================================== ---- wireshark-3.6.1.orig/wsutil/glib-compat.h -+++ wireshark-3.6.1/wsutil/glib-compat.h -@@ -21,6 +21,9 @@ extern "C" { +--- wireshark-4.2.0rc2.orig/wsutil/glib-compat.h ++++ wireshark-4.2.0rc2/wsutil/glib-compat.h +@@ -23,6 +23,9 @@ extern "C" { #endif /* __cplusplus */ #if !GLIB_CHECK_VERSION(2, 68, 0) + +#include <string.h> + - static inline gpointer - g_memdup2(gconstpointer mem, gsize byte_size) + static inline void * + g_memdup2(gconstpointer mem, size_t byte_size) { ++++++ wireshark-0010-dumpcap-permission-denied.patch ++++++ --- /var/tmp/diff_new_pack.4lOsaS/_old 2023-11-30 22:00:46.647857848 +0100 +++ /var/tmp/diff_new_pack.4lOsaS/_new 2023-11-30 22:00:46.651857995 +0100 @@ -1,15 +1,15 @@ -commit 1865e02e6c22ee55b0bb11b8c78330d4e65a1132 +commit acac613af7d702dae533cbdf9ef49cef803d0559 Author: Robert Frohl <rfrohl(a)suse.com> -Date: Wed Jan 13 14:18:36 2021 +0100 +Date: Tue Sep 12 14:53:17 2023 +0200 Warn if user can't access dumpcap. -diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c -index f31914886a..d3baab6c50 100644 ---- a/capture/capture_sync.c -+++ b/capture/capture_sync.c +Index: wireshark-4.2.0rc2/capture/capture_sync.c +=================================================================== +--- wireshark-4.2.0rc2.orig/capture/capture_sync.c ++++ wireshark-4.2.0rc2/capture/capture_sync.c @@ -24,6 +24,10 @@ - #include <wsutil/wslog.h> + #include <wsutil/strtoi.h> #include <wsutil/ws_assert.h> +#include <sys/stat.h> @@ -19,45 +19,15 @@ #ifdef _WIN32 #include <wsutil/unicode-utils.h> #include <wsutil/win32-utils.h> -@@ -592,11 +596,22 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf - * Child process - run dumpcap with the right arguments to make - * it just capture with the specified capture parameters - */ +@@ -530,10 +534,21 @@ sync_pipe_open_command(char* const argv[ + ws_close(data_pipe[PIPE_READ]); + ws_close(data_pipe[PIPE_WRITE]); + } + char * grp_warning = calloc(1, 256); dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); - execv(argv[0], argv); -- snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", -- argv[0], g_strerror(errno)); -+ if (errno == EPERM || errno == EACCES) { -+ struct stat statbuf; -+ struct group *grp; -+ if(stat("/usr/bin/dumpcap", &statbuf) == 0) { -+ if ((grp = getgrgid(statbuf.st_gid)) != NULL) { -+ snprintf(grp_warning , 256, "\nYou need to be a member of the '%s' group. Try running\n'usermod -a -G %s <YOUR_USERNAME>' as root.", grp->gr_name, grp->gr_name); -+ } -+ } -+ } -+ snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", -+ argv[0], g_strerror(errno), grp_warning); -+ free(grp_warning); - sync_pipe_errmsg_to_parent(2, errmsg, ""); - - /* Exit with "_exit()", so that we don't close the connection -@@ -827,6 +842,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, - * Child process - run dumpcap with the right arguments to make - * it just capture with the specified capture parameters - */ -+ char * grp_warning = calloc(1, 256); - dup2(data_pipe[PIPE_WRITE], 1); - ws_close(data_pipe[PIPE_READ]); - ws_close(data_pipe[PIPE_WRITE]); -@@ -834,8 +850,18 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, - ws_close(sync_pipe[PIPE_READ]); ws_close(sync_pipe[PIPE_WRITE]); execv(argv[0], argv); -- snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", -- argv[0], g_strerror(errno)); + if (errno == EPERM || errno == EACCES) { + struct stat statbuf; + struct group *grp; @@ -67,10 +37,8 @@ + } + } + } -+ snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", -+ argv[0], g_strerror(errno), grp_warning); + free(grp_warning); - sync_pipe_errmsg_to_parent(2, errmsg, ""); + sync_pipe_write_int_msg(2, SP_EXEC_FAILED, errno); /* Exit with "_exit()", so that we don't close the connection ++++++ wireshark-4.0.11.tar.xz -> wireshark-4.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/wireshark/wireshark-4.0.11.tar.xz /work/SRC/openSUSE:Factory/.wireshark.new.25432/wireshark-4.2.0.tar.xz differ: char 15, line 1 ++++++ wireshark-4.0.11.tar.xz.hash -> wireshark-4.2.0.tar.xz.hash ++++++ --- /work/SRC/openSUSE:Factory/wireshark/wireshark-4.0.11.tar.xz.hash 2023-11-17 20:48:46.403440613 +0100 +++ /work/SRC/openSUSE:Factory/.wireshark.new.25432/wireshark-4.2.0.tar.xz.hash 2023-11-30 22:00:45.303808334 +0100 @@ -1,29 +1,33 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -wireshark-4.0.11.tar.xz: 43153680 bytes -SHA256(wireshark-4.0.11.tar.xz)=4c341cc33a6c512d983f4126e6f3e5c249f604e14ab7f337d38b1cbe58199e3d -SHA1(wireshark-4.0.11.tar.xz)=4af3140d69f9d41e1c4e161fad66304a6920ddce - -Wireshark-win64-4.0.11.exe: 79609384 bytes -SHA256(Wireshark-win64-4.0.11.exe)=f3bb3156ef2c3470d45d4150038c2cc86ae0d04d501ff2c662196eeeaf85d633 -SHA1(Wireshark-win64-4.0.11.exe)=24f51cc40b0c404146f5436223ec29c35476c353 - -Wireshark-win64-4.0.11.msi: 54325248 bytes -SHA256(Wireshark-win64-4.0.11.msi)=b06fab0a8d02788f71a21cf9473c4c38c2d93195b8029825d3de00e9bf199ca9 -SHA1(Wireshark-win64-4.0.11.msi)=13eebda94ff1bb39fcd039ca7070e26cf990134a - -WiresharkPortable64_4.0.11.paf.exe: 46772200 bytes -SHA256(WiresharkPortable64_4.0.11.paf.exe)=686c04c42fdd101986e664216033d2b5a13911b379ffc93c3546ec354245e998 -SHA1(WiresharkPortable64_4.0.11.paf.exe)=cf1417b2fc190a118e5d8711966eaa2521a50a23 - -Wireshark 4.0.11 Arm 64.dmg: 65048706 bytes -SHA256(Wireshark 4.0.11 Arm 64.dmg)=f8bf18df6c74624c18d79f937c537588f53e1cca5ecfd5d59edbcaa6029ce852 -SHA1(Wireshark 4.0.11 Arm 64.dmg)=519322ec6cdc5e9e9831fc62597ee1aff1923550 - -Wireshark 4.0.11 Intel 64.dmg: 68640199 bytes -SHA256(Wireshark 4.0.11 Intel 64.dmg)=b9a0dc1942c5f78214a986773b22180bba720f51b45e2da4260318b83b504d0d -SHA1(Wireshark 4.0.11 Intel 64.dmg)=8712a3168703935032b828ea69fd1ae12620b20d +wireshark-4.2.0.tar.xz: 44941948 bytes +SHA256(wireshark-4.2.0.tar.xz)=0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b +SHA1(wireshark-4.2.0.tar.xz)=939871febe92cb2eea5527578d3cd815721b58bf + +Wireshark-4.2.0-arm64.exe: 67657344 bytes +SHA256(Wireshark-4.2.0-arm64.exe)=a010a996ed7122eef5df784ec72de4168fbad6aac5b09081862fa74696d70ca3 +SHA1(Wireshark-4.2.0-arm64.exe)=edb969bfb21805045b81f2ac21f30ae16c40ede5 + +Wireshark-4.2.0-x64.exe: 86161264 bytes +SHA256(Wireshark-4.2.0-x64.exe)=a68a8298662af5cc4bb4a454c66f49d0bcc0bacfd16e00e818b4c77ae8281c26 +SHA1(Wireshark-4.2.0-x64.exe)=608777817d53668a19b3c34f7dbdf4696329377b + +Wireshark-4.2.0-x64.msi: 62783488 bytes +SHA256(Wireshark-4.2.0-x64.msi)=1d613828ce6d4c7f9031590421264198d4d8e736811976886911c328b51efa61 +SHA1(Wireshark-4.2.0-x64.msi)=52cb9e8efe4b799b13c46abd68e7b3929ef0b1d8 + +WiresharkPortable64_4.2.0.paf.exe: 53440512 bytes +SHA256(WiresharkPortable64_4.2.0.paf.exe)=340972a4f0dea1c23c75baa3f06a77b4ab55ebf8683dc13258975f2afb0e0a52 +SHA1(WiresharkPortable64_4.2.0.paf.exe)=bfa00748ad6826e00cbc553028c312d7084da7cc + +Wireshark 4.2.0 Arm 64.dmg: 65635120 bytes +SHA256(Wireshark 4.2.0 Arm 64.dmg)=d2fba92c2f88271fad6929e8d8d06d50992fd82e00230c9f503c57a4bfe4f54f +SHA1(Wireshark 4.2.0 Arm 64.dmg)=7fe2400eee9f9bf6fbe37d7a4b5471d09851ead5 + +Wireshark 4.2.0 Intel 64.dmg: 68989977 bytes +SHA256(Wireshark 4.2.0 Intel 64.dmg)=9e10e57a24ea5c8f66fa6dab8d9b21751e8b370d9ef2a5f4be8b6c29dc4437b6 +SHA1(Wireshark 4.2.0 Intel 64.dmg)=cf7c0193d127a6f7e6a73e407ee3c426fc673e59 You can validate these hashes using the following commands (among others): @@ -33,17 +37,17 @@ Other: openssl sha256 wireshark-x.y.z.tar.xz -----BEGIN PGP SIGNATURE----- -iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmVVHrsACgkQgiRKeOb+ -rur9yQ//Ti9zIrOVFcjkrSVRlI/DmuK5LH4A+phpMRztbd9z3Idzpk8XjyMwQc+q -5bgWuVEFky6h8bQUILJqAaFH1eUIYWXztNP0QwKPkRu3qB0g6cSiAl3q1Ef9/onl -C191aFjb+NaAJl2oU0/5KxbMrcRw66d4FkW7AiPcDibGq804Q1ZUwRnzkrnud8l/ -VJPRu9Ps8nCN0W59RqgGq2NV6DXGXLh8LpHMyqcygX8l19DIQRWeuWwRmXse5vtz -F5a9kOOeQ7i/QWkhDMLqbQRdB/xt2MN2BHilX8sbWsanCODCJhUx5mIe71FDvVrR -8knGIu0TajJBAQwavMfZTfst/Qi9LGJ7ChfBhIysfqetS0ns3kiAsE6bLwPddCo0 -wnh5cDXj83fX4LkGoeF+NhKnx48pLcV9r+QjYVIZrtipRdK7wruzw5gnO57JXFZI -naQjGYjT9qwHKw9iqFhn4P70Tvlu1OUH81DCE60rT2aRof5ovzoRanjKqLNp6mFb -a6jT7lHamHi2PyW1Z5jYcEHImWK5YIXpeo5MblLb0EebfiCNl2xmVSMFhrSWkGBa -9WJsHGDOa5q/a+RbLOFs532pPkJonGx5ch65BfOvvg862HtUEwilBNO3aQrXVVpv -0RBpClnBRzFY/s10NjHemyFoEtC6Z44+xJLq4rZDvQYyno6LthI= -=T37X +iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmVVHsEACgkQgiRKeOb+ +rupJ6BAAuB2BPIkMd3wIXrRTDNrX3M1sQKRBm8l9InL622x5SeX9AGxUvsh7oAtc +i3bAGAMMJlchJqLKyC1bmNS0gPlEHaYtya/PE0kktq9uzeiiqpjVo6vBERGfb6eZ +Nv9DrcIrjnKv7kZ2FENNrTXY9XjCjlKD6eSXFRGC/OkHWQKSYyJDlKeaYWShsvNW +xgUmFOU3UXtyuSKbSutqxpdh2bELaAQe+NyLwfig6yOGTFaIuPxStw1KZyBqptL5 +s1jOa2eVOOB7RsRwi5FZSEJ8elj1Z2rlcC4ptNytimcejJGaK28dX424/1xk5fRK +jvO9+YshQ1CCERB9f1dIzbbTJ2mp7Fw/mztpLwrRHuEFS6h9PS2VYmjdGhCeg0JB +0MooBxBJLOzNvBocVlWVF4+OGokiYs2XjHvcUjtF5mKhhkRShKF0XZCUMeRV3wZ3 +rCSWQARH7TyF8Fdu0GBvUQHzbjE1G97GZtm9Fm+TfhUQippJ0RZvNEqaCK1NFWP0 +2TSgE0NT/DhvR8QPsQJU8nKbyChAWlcGMTnhpXV5QInRPSkgveYUBUxpfPRJ3WmQ +RbjBdD7y+LAlpG8g8dOJS8jYUmPI6nq7m8wtTI5v+zW57thUkuJJMPh9xtBRT+1z +JI+EaflCMpT/SUgGeJZtde4JF53SPxkQ/Lb+70Yj5LRwaaJXXO0= +=MbMn -----END PGP SIGNATURE-----

1 0

commit dialog for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dialog for openSUSE:Factory checked in at 2023-11-30 21:59:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dialog (Old) and /work/SRC/openSUSE:Factory/.dialog.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dialog" Thu Nov 30 21:59:45 2023 rev:42 rq:1129827 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/dialog/dialog.changes 2023-06-21 22:37:10.985404865 +0200 +++ /work/SRC/openSUSE:Factory/.dialog.new.25432/dialog.changes 2023-11-30 22:00:42.047688384 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 09:54:41 UTC 2023 - Ludwig Nussel <lnussel(a)suse.com> + +- don't install config file, dialog has built in defaults anyway +- add support for /usr/etc (dialog-1.3-usretc.diff) + +------------------------------------------------------------------- Old: ---- dialog.rc New: ---- dialog-1.3-usretc.diff BETA DEBUG BEGIN: New:- don't install config file, dialog has built in defaults anyway - add support for /usr/etc (dialog-1.3-usretc.diff) BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dialog.spec ++++++ --- /var/tmp/diff_new_pack.PV2CuK/_old 2023-11-30 22:00:43.503742023 +0100 +++ /var/tmp/diff_new_pack.PV2CuK/_new 2023-11-30 22:00:43.507742171 +0100 @@ -28,11 +28,11 @@ Source0: https://www.invisible-island.net/archives/%{name}/%{name}-%{version}-%{src_… Source1: https://www.invisible-island.net/archives/%{name}/%{name}-%{version}-%{src_… Source2: %{name}.keyring -Source3: dialog.rc Source4: dialog-rpmlintrc # PATCH-FIX-OPENSUSE : fix shadow during resizing terminal Patch0: dialog-1.2-20121230.dif Patch2: dialog-gcc-warnings.patch +Patch3: dialog-1.3-usretc.diff BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: pkgconfig @@ -69,9 +69,7 @@ %lang_package %prep -%setup -q -n %{name}-%{version}-%{src_date} -%patch0 -%patch2 -p1 +%autosetup -n %{name}-%{version}-%{src_date} %build CC=gcc @@ -113,7 +111,7 @@ rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance mkdir %{buildroot}/etc -install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/dialogrc +> %{buildroot}%{_sysconfdir}/dialogrc %find_lang %{name} xz CHANGES @@ -128,7 +126,7 @@ %else %doc CHANGES.xz README VERSION COPYING %endif -%config(noreplace) %{_sysconfdir}/dialogrc +%ghost %config(noreplace) %{_sysconfdir}/dialogrc %{_bindir}/dialog %{_mandir}/man1/dialog.1%{ext_man} ++++++ dialog-1.2-20121230.dif ++++++ --- /var/tmp/diff_new_pack.PV2CuK/_old 2023-11-30 22:00:43.523742760 +0100 +++ /var/tmp/diff_new_pack.PV2CuK/_new 2023-11-30 22:00:43.527742907 +0100 @@ -1,7 +1,7 @@ -Index: util.c +Index: dialog-1.3-20230209/util.c =================================================================== ---- util.c.orig -+++ util.c +--- dialog-1.3-20230209.orig/util.c ++++ dialog-1.3-20230209/util.c @@ -2406,8 +2406,10 @@ dlg_move_window(WINDOW *win, int height, #ifdef HAVE_COLOR if (p->shadow != 0) { ++++++ dialog-1.3-usretc.diff ++++++ Index: dialog-1.3-20230209/rc.c =================================================================== --- dialog-1.3-20230209.orig/rc.c +++ dialog-1.3-20230209/rc.c @@ -576,8 +576,11 @@ dlg_parse_rc(void) if (rc_file == NULL) { /* step (b) failed? */ /* try step (c) */ strcpy(str, GLOBALRC); - if ((rc_file = fopen(filename = str, "rt")) == NULL) - return 0; /* step (c) failed, use default values */ + if ((rc_file = fopen(filename = str, "rt")) == NULL) { + sprintf(str, "/usr/%s", GLOBALRC); + if ((rc_file = fopen(filename = str, "rt")) == NULL) + return 0; /* step (c) failed, use default values */ + } } DLG_TRACE(("# opened rc file \"%s\"\n", filename));

1 0

commit python-asgiref for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-asgiref for openSUSE:Factory checked in at 2023-11-30 21:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-asgiref (Old) and /work/SRC/openSUSE:Factory/.python-asgiref.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-asgiref" Thu Nov 30 21:59:42 2023 rev:10 rq:1129812 version:3.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-asgiref/python-asgiref.changes 2023-04-22 22:03:06.386165616 +0200 +++ /work/SRC/openSUSE:Factory/.python-asgiref.new.25432/python-asgiref.changes 2023-11-30 22:00:40.927647124 +0100 @@ -1,0 +2,21 @@ +Wed Nov 29 13:04:33 UTC 2023 - Dirk Müller <dmueller(a)suse.com> + +- update to 3.7.2: + * The type annotations for SyncToAsync and AsyncToSync have been + changed to more accurately reflect the kind of callables they + return. + * On Python 3.10 and below, the version of the "typing_extensions" + package is now constrained to be at least version 4 (as we depend + on functionality in that version and above) + * Contextvars are now required for the implementation of `sync` + as Python 3.6 is now no longer a supported version. + * sync_to_async and async_to_sync now pass-through + * Debug and Lifespan State extensions have resulted in a typing + change for some request and response types. This change should + be backwards-compatible. + * ``asgiref`` frames will now be hidden in Django tracebacks + by default. + * Raw performance and garbage collection improvements in Local, + SyncToAsync, and AsyncToSync. + +------------------------------------------------------------------- Old: ---- asgiref-3.6.0.tar.gz New: ---- asgiref-3.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-asgiref.spec ++++++ --- /var/tmp/diff_new_pack.TyK56N/_old 2023-11-30 22:00:41.431665691 +0100 +++ /var/tmp/diff_new_pack.TyK56N/_new 2023-11-30 22:00:41.435665839 +0100 @@ -16,32 +16,25 @@ # -%define skip_python2 1 -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?sle15_python_module_pythons} Name: python-asgiref -Version: 3.6.0 +Version: 3.7.2 Release: 0 Summary: ASGI specs, helper code, and adapters License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/django/asgiref/ Source: https://files.pythonhosted.org/packages/source/a/asgiref/asgiref-%{version}… -BuildRequires: %{python_module base >= 3.6} +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest-asyncio} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch -%if %{?suse_version} < 1540 -BuildRequires: %{python_module typing_extensions} -%else -BuildRequires: %{python_module typing_extensions if %python-base < 3.8} -%endif -%if 0%{python_version_nodots} < 38 -Requires: python-typing_extensions -%endif +BuildRequires: %{python_module typing-extensions > 4} +Requires: python-typing-extensions > 4 %python_subpackages %description @@ -53,10 +46,10 @@ %setup -q -n asgiref-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -65,5 +58,6 @@ %files %{python_files} %license LICENSE %doc README.rst -%{python_sitelib}/* +%{python_sitelib}/asgiref +%{python_sitelib}/asgiref-%{version}.dist-info ++++++ asgiref-3.6.0.tar.gz -> asgiref-3.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/PKG-INFO new/asgiref-3.7.2/PKG-INFO --- old/asgiref-3.6.0/PKG-INFO 2022-12-20 10:06:25.459167200 +0100 +++ new/asgiref-3.7.2/PKG-INFO 2023-05-27 19:21:19.747680700 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: asgiref -Version: 3.6.0 +Version: 3.7.2 Summary: ASGI specs, helper code, and adapters Home-page: https://github.com/django/asgiref/ Author: Django Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/asgiref/__init__.py new/asgiref-3.7.2/asgiref/__init__.py --- old/asgiref-3.6.0/asgiref/__init__.py 2022-12-20 09:57:26.000000000 +0100 +++ new/asgiref-3.7.2/asgiref/__init__.py 2023-05-27 19:20:44.000000000 +0200 @@ -1 +1 @@ -__version__ = "3.6.0" +__version__ = "3.7.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/asgiref/current_thread_executor.py new/asgiref-3.7.2/asgiref/current_thread_executor.py --- old/asgiref-3.6.0/asgiref/current_thread_executor.py 2022-04-19 09:47:42.000000000 +0200 +++ new/asgiref-3.7.2/asgiref/current_thread_executor.py 2023-05-23 18:35:51.000000000 +0200 @@ -1,6 +1,17 @@ import queue +import sys import threading from concurrent.futures import Executor, Future +from typing import TYPE_CHECKING, Any, Callable, TypeVar, Union + +if sys.version_info >= (3, 10): + from typing import ParamSpec +else: + from typing_extensions import ParamSpec + +_T = TypeVar("_T") +_P = ParamSpec("_P") +_R = TypeVar("_R") class _WorkItem: @@ -9,13 +20,20 @@ Copied from ThreadPoolExecutor (but it's private, so we're not going to rely on importing it) """ - def __init__(self, future, fn, args, kwargs): + def __init__( + self, + future: "Future[_R]", + fn: Callable[_P, _R], + *args: _P.args, + **kwargs: _P.kwargs, + ): self.future = future self.fn = fn self.args = args self.kwargs = kwargs - def run(self): + def run(self) -> None: + __traceback_hide__ = True # noqa: F841 if not self.future.set_running_or_notify_cancel(): return try: @@ -23,7 +41,7 @@ except BaseException as exc: self.future.set_exception(exc) # Break a reference cycle with the exception 'exc' - self = None + self = None # type: ignore[assignment] else: self.future.set_result(result) @@ -35,12 +53,12 @@ the thread they came from. """ - def __init__(self): + def __init__(self) -> None: self._work_thread = threading.current_thread() - self._work_queue = queue.Queue() + self._work_queue: queue.Queue[Union[_WorkItem, "Future[Any]"]] = queue.Queue() self._broken = False - def run_until_future(self, future): + def run_until_future(self, future: "Future[Any]") -> None: """ Runs the code in the work queue until a result is available from the future. Should be run from the thread the executor is initialised in. @@ -59,12 +77,18 @@ work_item = self._work_queue.get() if work_item is future: return + assert isinstance(work_item, _WorkItem) work_item.run() del work_item finally: self._broken = True - def submit(self, fn, *args, **kwargs): + def _submit( + self, + fn: Callable[_P, _R], + *args: _P.args, + **kwargs: _P.kwargs, + ) -> "Future[_R]": # Check they're not submitting from the same thread if threading.current_thread() == self._work_thread: raise RuntimeError( @@ -74,8 +98,18 @@ if self._broken: raise RuntimeError("CurrentThreadExecutor already quit or is broken") # Add to work queue - f = Future() - work_item = _WorkItem(f, fn, args, kwargs) + f: "Future[_R]" = Future() + work_item = _WorkItem(f, fn, *args, **kwargs) self._work_queue.put(work_item) # Return the future return f + + # Python 3.9+ has a new signature for submit with a "/" after `fn`, to enforce + # it to be a positional argument. If we ignore[override] mypy on 3.9+ will be + # happy but 3.7/3.8 will say that the ignore comment is unused, even when + # defining them differently based on sys.version_info. + # We should be able to remove this when we drop support for 3.7/3.8. + if not TYPE_CHECKING: + + def submit(self, fn, *args, **kwargs): + return self._submit(fn, *args, **kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/asgiref/sync.py new/asgiref-3.7.2/asgiref/sync.py --- old/asgiref-3.6.0/asgiref/sync.py 2022-12-15 10:04:51.000000000 +0100 +++ new/asgiref-3.7.2/asgiref/sync.py 2023-05-27 19:19:57.000000000 +0200 @@ -9,21 +9,48 @@ import warnings import weakref from concurrent.futures import Future, ThreadPoolExecutor -from typing import Any, Callable, Dict, Optional, overload +from typing import ( + TYPE_CHECKING, + Any, + Awaitable, + Callable, + Coroutine, + Dict, + Generic, + List, + Optional, + TypeVar, + Union, + overload, +) from .current_thread_executor import CurrentThreadExecutor from .local import Local +if sys.version_info >= (3, 10): + from typing import ParamSpec +else: + from typing_extensions import ParamSpec -def _restore_context(context): +if TYPE_CHECKING: + # This is not available to import at runtime + from _typeshed import OptExcInfo + +_F = TypeVar("_F", bound=Callable[..., Any]) +_P = ParamSpec("_P") +_R = TypeVar("_R") + + +def _restore_context(context: contextvars.Context) -> None: # Check for changes in contextvars, and set them to the current # context for downstream consumers for cvar in context: + cvalue = context.get(cvar) try: - if cvar.get() != context.get(cvar): - cvar.set(context.get(cvar)) + if cvar.get() != cvalue: + cvar.set(cvalue) except LookupError: - cvar.set(context.get(cvar)) + cvar.set(cvalue) # Python 3.12 deprecates asyncio.iscoroutinefunction() as an alias for @@ -32,29 +59,25 @@ # Until 3.12 is the minimum supported Python version, provide a shim. # Django 4.0 only supports 3.8+, so don't concern with the _or_partial backport. -# Type hint: should be generic: whatever T it takes it returns. (Same id) -def markcoroutinefunction(func: Any) -> Any: - if hasattr(inspect, "markcoroutinefunction"): - return inspect.markcoroutinefunction(func) - else: +if hasattr(inspect, "markcoroutinefunction"): + iscoroutinefunction = inspect.iscoroutinefunction + markcoroutinefunction: Callable[[_F], _F] = inspect.markcoroutinefunction +else: + iscoroutinefunction = asyncio.iscoroutinefunction # type: ignore[assignment] + + def markcoroutinefunction(func: _F) -> _F: func._is_coroutine = asyncio.coroutines._is_coroutine # type: ignore return func -def iscoroutinefunction(func: Any) -> bool: - if hasattr(inspect, "markcoroutinefunction"): - return inspect.iscoroutinefunction(func) - else: - return asyncio.iscoroutinefunction(func) - - -def _iscoroutinefunction_or_partial(func: Any) -> bool: - # Python < 3.8 does not correctly determine partially wrapped - # coroutine functions are coroutine functions, hence the need for - # this to exist. Code taken from CPython. - if sys.version_info >= (3, 8): - return iscoroutinefunction(func) - else: +if sys.version_info >= (3, 8): + _iscoroutinefunction_or_partial = iscoroutinefunction +else: + + def _iscoroutinefunction_or_partial(func: Any) -> bool: + # Python < 3.8 does not correctly determine partially wrapped + # coroutine functions are coroutine functions, hence the need for + # this to exist. Code taken from CPython. while inspect.ismethod(func): func = func.__func__ while isinstance(func, functools.partial): @@ -104,7 +127,7 @@ SyncToAsync.thread_sensitive_context.reset(self.token) -class AsyncToSync: +class AsyncToSync(Generic[_P, _R]): """ Utility class which turns an awaitable that only works on the thread with the event loop into a synchronous callable that works in a subthread. @@ -128,7 +151,14 @@ # inside create_task, we'll look it up here from the running event loop. loop_thread_executors: "Dict[asyncio.AbstractEventLoop, CurrentThreadExecutor]" = {} - def __init__(self, awaitable, force_new_loop=False): + def __init__( + self, + awaitable: Union[ + Callable[_P, Coroutine[Any, Any, _R]], + Callable[_P, Awaitable[_R]], + ], + force_new_loop: bool = False, + ): if not callable(awaitable) or ( not _iscoroutinefunction_or_partial(awaitable) and not _iscoroutinefunction_or_partial( @@ -142,7 +172,7 @@ ) self.awaitable = awaitable try: - self.__self__ = self.awaitable.__self__ + self.__self__ = self.awaitable.__self__ # type: ignore[union-attr] except AttributeError: pass if force_new_loop: @@ -166,7 +196,9 @@ else: self.main_event_loop = None - def __call__(self, *args, **kwargs): + def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R: + __traceback_hide__ = True # noqa: F841 + # You can't call AsyncToSync from a thread with a running event loop try: event_loop = asyncio.get_running_loop() @@ -184,7 +216,7 @@ context = [contextvars.copy_context()] # Make a future for the return information - call_result = Future() + call_result: "Future[_R]" = Future() # Get the source thread source_thread = threading.current_thread() # Make a CurrentThreadExecutor we'll use to idle in this thread - we @@ -202,7 +234,12 @@ # in this thread. try: awaitable = self.main_wrap( - args, kwargs, call_result, source_thread, sys.exc_info(), context + call_result, + source_thread, + sys.exc_info(), + context, + *args, + **kwargs, ) if not (self.main_event_loop and self.main_event_loop.is_running()): @@ -275,7 +312,7 @@ loop.close() asyncio.set_event_loop(self.main_event_loop) - def __get__(self, parent, objtype): + def __get__(self, parent: Any, objtype: Any) -> Callable[_P, _R]: """ Include self for methods """ @@ -283,16 +320,26 @@ return functools.update_wrapper(func, self.awaitable) async def main_wrap( - self, args, kwargs, call_result, source_thread, exc_info, context - ): + self, + call_result: "Future[_R]", + source_thread: threading.Thread, + exc_info: "OptExcInfo", + context: List[contextvars.Context], + *args: _P.args, + **kwargs: _P.kwargs, + ) -> None: """ Wraps the awaitable with something that puts the result into the result/exception future. """ + + __traceback_hide__ = True # noqa: F841 + if context is not None: _restore_context(context[0]) current_task = SyncToAsync.get_current_task() + assert current_task is not None self.launch_map[current_task] = source_thread try: # If we have an exception, run the function inside the except block @@ -314,7 +361,7 @@ context[0] = contextvars.copy_context() -class SyncToAsync: +class SyncToAsync(Generic[_P, _R]): """ Utility class which turns a synchronous callable into an awaitable that runs in a threadpool. It also sets a threadlocal inside the thread so @@ -347,8 +394,8 @@ # Maintain a contextvar for the current execution context. Optionally used # for thread sensitive mode. - thread_sensitive_context: "contextvars.ContextVar[str]" = contextvars.ContextVar( - "thread_sensitive_context" + thread_sensitive_context: "contextvars.ContextVar[ThreadSensitiveContext]" = ( + contextvars.ContextVar("thread_sensitive_context") ) # Contextvar that is used to detect if the single thread executor @@ -359,13 +406,13 @@ # Maintaining a weak reference to the context ensures that thread pools are # erased once the context goes out of scope. This terminates the thread pool. - context_to_thread_executor: "weakref.WeakKeyDictionary[object, ThreadPoolExecutor]" = ( + context_to_thread_executor: "weakref.WeakKeyDictionary[ThreadSensitiveContext, ThreadPoolExecutor]" = ( weakref.WeakKeyDictionary() ) def __init__( self, - func: Callable[..., Any], + func: Callable[_P, _R], thread_sensitive: bool = True, executor: Optional["ThreadPoolExecutor"] = None, ) -> None: @@ -387,7 +434,8 @@ except AttributeError: pass - async def __call__(self, *args, **kwargs): + async def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R: + __traceback_hide__ = True # noqa: F841 loop = asyncio.get_running_loop() # Work out what thread to run the code in @@ -395,9 +443,7 @@ if hasattr(AsyncToSync.executors, "current"): # If we have a parent sync thread above somewhere, use that executor = AsyncToSync.executors.current - elif self.thread_sensitive_context and self.thread_sensitive_context.get( - None - ): + elif self.thread_sensitive_context.get(None): # If we have a way of retrieving the current context, attempt # to use a per-context thread pool executor thread_sensitive_context = self.thread_sensitive_context.get() @@ -412,15 +458,14 @@ elif loop in AsyncToSync.loop_thread_executors: # Re-use thread executor for running loop executor = AsyncToSync.loop_thread_executors[loop] - elif self.deadlock_context and self.deadlock_context.get(False): + elif self.deadlock_context.get(False): raise RuntimeError( "Single thread executor already being used, would deadlock" ) else: # Otherwise, we run it in a fixed single thread executor = self.single_thread_executor - if self.deadlock_context: - self.deadlock_context.set(True) + self.deadlock_context.set(True) else: # Use the passed in executor, or the loop's default if it is None executor = self._executor @@ -428,12 +473,10 @@ context = contextvars.copy_context() child = functools.partial(self.func, *args, **kwargs) func = context.run - args = (child,) - kwargs = {} try: # Run the code in the right thread - future = loop.run_in_executor( + ret: _R = await loop.run_in_executor( executor, functools.partial( self.thread_handler, @@ -441,20 +484,19 @@ self.get_current_task(), sys.exc_info(), func, - *args, - **kwargs, + child, ), ) - ret = await asyncio.wait_for(future, timeout=None) finally: _restore_context(context) - if self.deadlock_context: - self.deadlock_context.set(False) + self.deadlock_context.set(False) return ret - def __get__(self, parent, objtype): + def __get__( + self, parent: Any, objtype: Any + ) -> Callable[_P, Coroutine[Any, Any, _R]]: """ Include self for methods """ @@ -465,6 +507,9 @@ """ Wraps the sync application with exception handling. """ + + __traceback_hide__ = True # noqa: F841 + # Set the threadlocal for AsyncToSync self.threadlocal.main_event_loop = loop self.threadlocal.main_event_loop_pid = os.getpid() @@ -477,6 +522,9 @@ else: self.launch_map[current_thread] = source_task parent_set = True + source_task = ( + None # allow the task to be garbage-collected in case of exceptions + ) # Run the function try: # If we have an exception, run the function inside the except block @@ -495,7 +543,7 @@ del self.launch_map[current_thread] @staticmethod - def get_current_task(): + def get_current_task() -> Optional["asyncio.Task[Any]"]: """ Implementation of asyncio.current_task() that returns None if there is no task. @@ -506,33 +554,84 @@ return None -# Lowercase aliases (and decorator friendliness) -async_to_sync = AsyncToSync +@overload +def async_to_sync( + *, + force_new_loop: bool = False, +) -> Callable[ + [Union[Callable[_P, Coroutine[Any, Any, _R]], Callable[_P, Awaitable[_R]]]], + Callable[_P, _R], +]: + ... + + +@overload +def async_to_sync( + awaitable: Union[ + Callable[_P, Coroutine[Any, Any, _R]], + Callable[_P, Awaitable[_R]], + ], + *, + force_new_loop: bool = False, +) -> Callable[_P, _R]: + ... + + +def async_to_sync( + awaitable: Optional[ + Union[ + Callable[_P, Coroutine[Any, Any, _R]], + Callable[_P, Awaitable[_R]], + ] + ] = None, + *, + force_new_loop: bool = False, +) -> Union[ + Callable[ + [Union[Callable[_P, Coroutine[Any, Any, _R]], Callable[_P, Awaitable[_R]]]], + Callable[_P, _R], + ], + Callable[_P, _R], +]: + if awaitable is None: + return lambda f: AsyncToSync( + f, + force_new_loop=force_new_loop, + ) + return AsyncToSync( + awaitable, + force_new_loop=force_new_loop, + ) @overload def sync_to_async( - func: None = None, + *, thread_sensitive: bool = True, executor: Optional["ThreadPoolExecutor"] = None, -) -> Callable[[Callable[..., Any]], SyncToAsync]: +) -> Callable[[Callable[_P, _R]], Callable[_P, Coroutine[Any, Any, _R]]]: ... @overload def sync_to_async( - func: Callable[..., Any], + func: Callable[_P, _R], + *, thread_sensitive: bool = True, executor: Optional["ThreadPoolExecutor"] = None, -) -> SyncToAsync: +) -> Callable[_P, Coroutine[Any, Any, _R]]: ... def sync_to_async( - func=None, - thread_sensitive=True, - executor=None, -): + func: Optional[Callable[_P, _R]] = None, + *, + thread_sensitive: bool = True, + executor: Optional["ThreadPoolExecutor"] = None, +) -> Union[ + Callable[[Callable[_P, _R]], Callable[_P, Coroutine[Any, Any, _R]]], + Callable[_P, Coroutine[Any, Any, _R]], +]: if func is None: return lambda f: SyncToAsync( f, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/asgiref/typing.py new/asgiref-3.7.2/asgiref/typing.py --- old/asgiref-3.6.0/asgiref/typing.py 2022-12-15 10:04:51.000000000 +0100 +++ new/asgiref-3.7.2/asgiref/typing.py 2023-05-23 18:35:51.000000000 +0200 @@ -1,11 +1,26 @@ import sys -from typing import Awaitable, Callable, Dict, Iterable, Optional, Tuple, Type, Union +from typing import ( + Any, + Awaitable, + Callable, + Dict, + Iterable, + Optional, + Tuple, + Type, + Union, +) if sys.version_info >= (3, 8): from typing import Literal, Protocol, TypedDict else: from typing_extensions import Literal, Protocol, TypedDict +if sys.version_info >= (3, 11): + from typing import NotRequired +else: + from typing_extensions import NotRequired + __all__ = ( "ASGIVersions", "HTTPScope", @@ -62,6 +77,7 @@ headers: Iterable[Tuple[bytes, bytes]] client: Optional[Tuple[str, int]] server: Optional[Tuple[str, Optional[int]]] + state: NotRequired[Dict[str, Any]] extensions: Optional[Dict[str, Dict[object, object]]] @@ -78,12 +94,14 @@ client: Optional[Tuple[str, int]] server: Optional[Tuple[str, Optional[int]]] subprotocols: Iterable[str] + state: NotRequired[Dict[str, Any]] extensions: Optional[Dict[str, Dict[object, object]]] class LifespanScope(TypedDict): type: Literal["lifespan"] asgi: ASGIVersions + state: NotRequired[Dict[str, Any]] WWWScope = Union[HTTPScope, WebSocketScope] @@ -96,6 +114,11 @@ more_body: bool +class HTTPResponseDebugEvent(TypedDict): + type: Literal["http.response.debug"] + info: Dict[str, object] + + class HTTPResponseStartEvent(TypedDict): type: Literal["http.response.start"] status: int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/asgiref.egg-info/PKG-INFO new/asgiref-3.7.2/asgiref.egg-info/PKG-INFO --- old/asgiref-3.6.0/asgiref.egg-info/PKG-INFO 2022-12-20 10:06:25.000000000 +0100 +++ new/asgiref-3.7.2/asgiref.egg-info/PKG-INFO 2023-05-27 19:21:19.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: asgiref -Version: 3.6.0 +Version: 3.7.2 Summary: ASGI specs, helper code, and adapters Home-page: https://github.com/django/asgiref/ Author: Django Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/asgiref.egg-info/requires.txt new/asgiref-3.7.2/asgiref.egg-info/requires.txt --- old/asgiref-3.6.0/asgiref.egg-info/requires.txt 2022-12-20 10:06:25.000000000 +0100 +++ new/asgiref-3.7.2/asgiref.egg-info/requires.txt 2023-05-27 19:21:19.000000000 +0200 @@ -1,6 +1,6 @@ -[:python_version < "3.8"] -typing_extensions +[:python_version < "3.11"] +typing_extensions>=4 [tests] pytest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/setup.cfg new/asgiref-3.7.2/setup.cfg --- old/asgiref-3.6.0/setup.cfg 2022-12-20 10:06:25.459771600 +0100 +++ new/asgiref-3.7.2/setup.cfg 2023-05-27 19:21:19.747680700 +0200 @@ -32,7 +32,7 @@ packages = find: include_package_data = true install_requires = - typing_extensions; python_version < "3.8" + typing_extensions>=4; python_version < "3.11" zip_safe = false [options.extras_require] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asgiref-3.6.0/tests/test_sync_contextvars.py new/asgiref-3.7.2/tests/test_sync_contextvars.py --- old/asgiref-3.6.0/tests/test_sync_contextvars.py 2022-07-06 16:22:11.000000000 +0200 +++ new/asgiref-3.7.2/tests/test_sync_contextvars.py 2023-05-23 18:35:51.000000000 +0200 @@ -1,4 +1,5 @@ import asyncio +import contextvars import threading import time @@ -6,9 +7,7 @@ from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async -contextvars = pytest.importorskip("contextvars") - -foo = contextvars.ContextVar("foo") +foo: "contextvars.ContextVar[str]" = contextvars.ContextVar("foo") @pytest.mark.asyncio

1 0

commit blog for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blog for openSUSE:Factory checked in at 2023-11-30 21:59:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blog (Old) and /work/SRC/openSUSE:Factory/.blog.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blog" Thu Nov 30 21:59:40 2023 rev:18 rq:1129802 version:2.28 Changes: -------- --- /work/SRC/openSUSE:Factory/blog/blog.changes 2023-07-11 15:56:34.232915624 +0200 +++ /work/SRC/openSUSE:Factory/.blog.new.25432/blog.changes 2023-11-30 22:00:39.683601295 +0100 @@ -1,0 +2,7 @@ +Wed Nov 29 12:27:52 UTC 2023 - Dr. Werner Fink <werner(a)suse.de> + +- Update to version 2.28 + * UTMP support is gone, remove dependency also add support for + initramfs at shutdown. + +------------------------------------------------------------------- Old: ---- showconsole-2.27.tar.gz New: ---- showconsole-2.28.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blog.spec ++++++ --- /var/tmp/diff_new_pack.UI4Z76/_old 2023-11-30 22:00:40.367626493 +0100 +++ /var/tmp/diff_new_pack.UI4Z76/_new 2023-11-30 22:00:40.367626493 +0100 @@ -17,7 +17,7 @@ Name: blog -Version: 2.27 +Version: 2.28 %define sonum 2 Release: 0 Summary: Boot logging @@ -163,6 +163,9 @@ %dir %{_unitdir}/rescue.target.wants/ %dir %{_unitdir}/sysinit.target.wants/ %dir %{_unitdir}/shutdown.target.wants/ +%dir %{_unitdir}/reboot.target.wants/ +%dir %{_unitdir}/poweroff.target.wants/ +%dir %{_unitdir}/kexec.target.wants/ %dir %{_unitdir}/local-fs-pre.target.wants/ %dir %{_unitdir}/systemd-ask-password-blog.service.wants/ %{_prefix}/lib/dracut/modules.d/99blog/module-setup.sh @@ -170,6 +173,7 @@ %{_unitdir}/blog-quit.service %{_unitdir}/blog-store-messages.service %{_unitdir}/blog-switch-root.service +%{_unitdir}/blog-switch-initramfs.service %{_unitdir}/blog.service %{_unitdir}/systemd-ask-password-blog.path %{_unitdir}/systemd-ask-password-blog.service @@ -183,6 +187,13 @@ %{_unitdir}/sysinit.target.wants/blog-store-messages.service %{_unitdir}/sysinit.target.wants/systemd-ask-password-blog.path %{_unitdir}/shutdown.target.wants/blog-final.service +%{_unitdir}/reboot.target.wants/blog-final.service +%{_unitdir}/poweroff.target.wants/blog-final.service +%{_unitdir}/kexec.target.wants/blog-final.service +%{_unitdir}/shutdown.target.wants/blog-switch-initramfs.service +%{_unitdir}/reboot.target.wants/blog-switch-initramfs.service +%{_unitdir}/poweroff.target.wants/blog-switch-initramfs.service +%{_unitdir}/kexec.target.wants/blog-switch-initramfs.service %{_unitdir}/local-fs-pre.target.wants/blog-umount.service %ghost %{_unitdir}/systemd-ask-password-blog.service.wants/systemd-vconsole-setup.service ++++++ blog-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.UI4Z76/_old 2023-11-30 22:00:40.395627525 +0100 +++ /var/tmp/diff_new_pack.UI4Z76/_new 2023-11-30 22:00:40.399627672 +0100 @@ -1,5 +1,3 @@ addFilter(".*systemd-service-without-service_del_p.*") addFilter(".*systemd-service-without-service_add_p.*") -addFilter(".*suse-missing-rclink.*") -addFilter(".*E:.*unused-rpmlintrc-filter.*suse-missing-rclink.*") ++++++ showconsole-2.27.tar.gz -> showconsole-2.28.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/Makefile new/showconsole-2.28/Makefile --- old/showconsole-2.27/Makefile 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/Makefile 2023-11-29 13:17:01.000000000 +0100 @@ -15,7 +15,7 @@ DEBUG = DESTDIR = MAJOR := 2 -MINOR := 24 +MINOR := 28 VERSION := $(MAJOR).$(MINOR) DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]') COPTS = @@ -137,13 +137,13 @@ $(INSTSCR) module-setup.sh $(DESTDIR)$(DRACUTMOD)/ $(LINK) libblogger.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblogger.so.$(MAJOR) $(LINK) libblogger.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblogger.so - for unit in blog blog-final blog-quit blog-store-messages blog-switch-root blog-umount ; do \ + for unit in blog blog-final blog-quit blog-store-messages blog-switch-root blog-switch-initramfs blog-umount ; do \ $(INSTCON) $${unit}.service $(DESTDIR)$(SYSDUNITS)/ ; \ done for unit in systemd-ask-password-blog.path systemd-ask-password-blog.service ; do \ $(INSTCON) $${unit} $(DESTDIR)$(SYSDUNITS)/ ; \ done - for target in default sysinit basic local-fs-pre rescue shutdown emergency initrd-switch-root; do \ + for target in default sysinit basic local-fs-pre rescue shutdown reboot poweroff kexec emergency initrd-switch-root; do \ $(MKDIR) $(DESTDIR)$(SYSDUNITS)/$${target}.target.wants ; \ done for service in systemd-ask-password-blog ; do \ @@ -163,8 +163,11 @@ for unit in blog-umount.service ; do \ $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/local-fs-pre.target.wants/$${unit} ; \ done - for unit in blog-final.service ; do \ + for unit in blog-final.service blog-switch-initramfs.service ; do \ $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/shutdown.target.wants/$${unit} ; \ + $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/reboot.target.wants/$${unit} ; \ + $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/poweroff.target.wants/$${unit} ; \ + $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/kexec.target.wants/$${unit} ; \ done for target in systemd-ask-password-blog.service ; do \ $(MKDIR) $(DESTDIR)$(SYSDUNITS)/$${target}.wants ; \ @@ -203,7 +206,8 @@ blog-quit.service \ blog-store-messages.service.in \ blog-switch-root.service \ - blog-umount.service.in \ + blog-switch-initramfs.service \ + blog-umount.service.in \ systemd-ask-password-blog.path \ systemd-ask-password-blog.service \ module-setup.sh \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-final.service new/showconsole-2.28/blog-final.service --- old/showconsole-2.27/blog-final.service 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-final.service 2023-11-29 13:17:01.000000000 +0100 @@ -8,6 +8,3 @@ Type=forking SendSIGKILL=no ExecStart=/sbin/blogd -f - -[Install] -WantedBy=shutdown.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-quit.service new/showconsole-2.28/blog-quit.service --- old/showconsole-2.27/blog-quit.service 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-quit.service 2023-11-29 13:17:01.000000000 +0100 @@ -12,8 +12,3 @@ TimeoutSec=20 RemainAfterExit=yes ExecStart=/sbin/blogctl quit - -[Install] -WantedBy=default.target -WantedBy=emergency.target -WantedBy=rescue.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-store-messages.service.in new/showconsole-2.28/blog-store-messages.service.in --- old/showconsole-2.27/blog-store-messages.service.in 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-store-messages.service.in 2023-11-29 13:17:01.000000000 +0100 @@ -3,17 +3,13 @@ DefaultDependencies=no RequiresMountsFor=@@BOOT_LOGFILE@@ Conflicts=shutdown.target -Requisite=systemd-update-utmp.service -After=systemd-update-utmp.service After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service Before=sysinit.target shutdown.target ConditionPathExists=!/etc/initrd-release +ConditionPathIsReadWrite=/var/log [Service] Type=oneshot TimeoutSec=20 RemainAfterExit=yes ExecStart=/sbin/blogctl ready - -[Install] -WantedBy=sysinit.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-switch-initramfs.service new/showconsole-2.28/blog-switch-initramfs.service --- old/showconsole-2.27/blog-switch-initramfs.service 1970-01-01 01:00:00.000000000 +0100 +++ new/showconsole-2.28/blog-switch-initramfs.service 2023-11-29 13:17:01.000000000 +0100 @@ -0,0 +1,17 @@ +[Unit] +Description=Tell blogd to switch to initramfs +DefaultDependencies=no +# dracut-shutdown.service restores the initramfs when it is _stopped_ +# use Conflicts to make sure its ExecStop has run before we do +Conflicts=dracut-shutdown.service +After=plymouth-final.service blog-umount.service dracut-shutdown.service mkinitcpio-generate-shutdown-ramfs.service +ConditionPathExists=|/run/initramfs/bin/sh +ConditionPathExists=|/run/initramfs/shutdown + +[Service] +Type=oneshot +StandardInput=null +StandardOutput=null +StandardError=null +RemainAfterExit=yes +ExecStart=-/sbin/blogctl root=/run/initramfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-switch-root.service new/showconsole-2.28/blog-switch-root.service --- old/showconsole-2.27/blog-switch-root.service 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-switch-root.service 2023-11-29 13:17:01.000000000 +0100 @@ -5,8 +5,8 @@ Before=initrd-switch-root.service [Service] -ExecStart=-/sbin/blogctl root=/sysroot Type=oneshot StandardInput=null StandardOutput=null StandardError=null +ExecStart=-/sbin/blogctl root=/sysroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-umount.service.in new/showconsole-2.28/blog-umount.service.in --- old/showconsole-2.27/blog-umount.service.in 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-umount.service.in 2023-11-29 13:17:01.000000000 +0100 @@ -4,12 +4,10 @@ Conflicts=shutdown.target Before=systemd-tmpfiles-setup.service RequiresMountsFor=@@BOOT_OLDLOGFILE@@ +ConditionPathIsReadWrite=/var/log [Service] Type=oneshot TimeoutSec=0 RemainAfterExit=yes ExecStop=/sbin/blogctl close - -[Install] -WantedBy=local-fs-pre.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog.service new/showconsole-2.28/blog.service --- old/showconsole-2.27/blog.service 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog.service 2023-11-29 13:17:01.000000000 +0100 @@ -15,6 +15,3 @@ SendSIGKILL=no RemainAfterExit=yes ExecStart=/sbin/blogd - -[Install] -WantedBy=basic.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blogd.c new/showconsole-2.28/blogd.c --- old/showconsole-2.27/blogd.c 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blogd.c 2023-11-29 13:17:01.000000000 +0100 @@ -342,9 +342,18 @@ /* * Reconnecting to stdin aka ptm to 0 is done after we fork away */ - - dup2(pts, 1); - dup2(pts, 2); /* Now we are blind upto safeIO() loop */ +#ifdef DEBUG + int l; + if ((l = open("/dev/shm/blog.out", O_WRONLY|O_NOCTTY|O_NONBLOCK|O_CREAT|O_APPEND, S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH)) >= 0) { + dup2(l, STDOUT_FILENO); + dup2(l, STDERR_FILENO); + close(l); + } else +#endif + { + dup2(pts, 1); + dup2(pts, 2); /* Now we are blind upto safeIO() loop */ + } if (pts > 2) close(pts); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/libconsole/log.c new/showconsole-2.28/libconsole/log.c --- old/showconsole-2.27/libconsole/log.c 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/libconsole/log.c 2023-11-29 13:17:01.000000000 +0100 @@ -608,7 +608,7 @@ unlock(&ljoin); ljoin.canceled = 1; pthread_cond_broadcast(&lcond); - pthread_yield(); + sched_yield(); if (ljoin.used && lthread) pthread_cancel(lthread); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/libconsole/shm.c new/showconsole-2.28/libconsole/shm.c --- old/showconsole-2.27/libconsole/shm.c 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/libconsole/shm.c 2023-11-29 13:17:01.000000000 +0100 @@ -97,7 +97,7 @@ if (area == MAP_FAILED) error("can not map shared memory object into memory"); - shm_unlink(template); + /* shm_ */ unlink(template); free(template); return area; }

1 0

commit polkit-default-privs for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package polkit-default-privs for openSUSE:Factory checked in at 2023-11-30 21:59:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polkit-default-privs (Old) and /work/SRC/openSUSE:Factory/.polkit-default-privs.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "polkit-default-privs" Thu Nov 30 21:59:38 2023 rev:229 rq:1129790 version:1550+20231129.269abcd Changes: -------- --- /work/SRC/openSUSE:Factory/polkit-default-privs/polkit-default-privs.changes 2023-11-05 12:19:13.906100811 +0100 +++ /work/SRC/openSUSE:Factory/.polkit-default-privs.new.25432/polkit-default-privs.changes 2023-11-30 22:00:38.351552224 +0100 @@ -1,0 +2,6 @@ +Wed Nov 29 12:06:01 UTC 2023 - wolfgang.frisch(a)suse.com + +- Update to version 1550+20231129.269abcd: + * profiles: whitelist cinnamon-settings-daemon wacom-oled-helper (bsc#1217532) + +------------------------------------------------------------------- Old: ---- polkit-default-privs-1550+20231103.3b4a82f.tar.xz New: ---- polkit-default-privs-1550+20231129.269abcd.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit-default-privs.spec ++++++ --- /var/tmp/diff_new_pack.pLySpN/_old 2023-11-30 22:00:39.267585970 +0100 +++ /var/tmp/diff_new_pack.pLySpN/_new 2023-11-30 22:00:39.271586117 +0100 @@ -23,7 +23,7 @@ %endif Name: polkit-default-privs -Version: 1550+20231103.3b4a82f +Version: 1550+20231129.269abcd Release: 0 Summary: SUSE PolicyKit default permissions License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.pLySpN/_old 2023-11-30 22:00:39.311587591 +0100 +++ /var/tmp/diff_new_pack.pLySpN/_new 2023-11-30 22:00:39.315587738 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/polkit-default-privs.git</param> - <param name="changesrevision">3b4a82fedc94789fdffd6162717bdcdd2b9c595d</param></service></servicedata> + <param name="changesrevision">269abcd34e94b4dc6faba2b5e8b122dc59bb8d50</param></service></servicedata> (No newline at EOF) ++++++ polkit-default-privs-1550+20231103.3b4a82f.tar.xz -> polkit-default-privs-1550+20231129.269abcd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-1550+20231103.3b4a82f/profiles/easy new/polkit-default-privs-1550+20231129.269abcd/profiles/easy --- old/polkit-default-privs-1550+20231103.3b4a82f/profiles/easy 2023-11-03 15:26:46.000000000 +0100 +++ new/polkit-default-privs-1550+20231129.269abcd/profiles/easy 2023-11-29 13:04:41.000000000 +0100 @@ -340,6 +340,8 @@ org.cinnamon.settings-users auth_admin # cinnamon-settings-daemon (bsc#1186845) org.cinnamon.settings-daemon.plugins.wacom.wacom-led-helper no:no:yes +# cinnamon-settings-daemon (bsc#1217532) +org.cinnamon.settings-daemon.plugins.wacom.wacom-oled-helper no:no:yes # hp-drive-guard com.hp.driveguard.toggle auth_admin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-1550+20231103.3b4a82f/profiles/restrictive new/polkit-default-privs-1550+20231129.269abcd/profiles/restrictive --- old/polkit-default-privs-1550+20231103.3b4a82f/profiles/restrictive 2023-11-03 15:26:46.000000000 +0100 +++ new/polkit-default-privs-1550+20231129.269abcd/profiles/restrictive 2023-11-29 13:04:41.000000000 +0100 @@ -341,6 +341,8 @@ org.cinnamon.settings-users auth_admin # cinnamon-settings-daemon (bsc#1186845) org.cinnamon.settings-daemon.plugins.wacom.wacom-led-helper no:no:auth_admin_keep +# cinnamon-settings-daemon (bsc#1217532) +org.cinnamon.settings-daemon.plugins.wacom.wacom-oled-helper no:no:auth_admin_keep # hp-drive-guard com.hp.driveguard.toggle no:no:auth_admin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-1550+20231103.3b4a82f/profiles/standard new/polkit-default-privs-1550+20231129.269abcd/profiles/standard --- old/polkit-default-privs-1550+20231103.3b4a82f/profiles/standard 2023-11-03 15:26:46.000000000 +0100 +++ new/polkit-default-privs-1550+20231129.269abcd/profiles/standard 2023-11-29 13:04:41.000000000 +0100 @@ -341,6 +341,8 @@ org.cinnamon.settings-users auth_admin # cinnamon-settings-daemon (bsc#1186845) org.cinnamon.settings-daemon.plugins.wacom.wacom-led-helper no:no:yes +# cinnamon-settings-daemon (bsc#1217532) +org.cinnamon.settings-daemon.plugins.wacom.wacom-oled-helper no:no:yes # hp-drive-guard com.hp.driveguard.toggle no:no:auth_admin

1 0

commit vim for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vim for openSUSE:Factory checked in at 2023-11-30 21:59:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vim (Old) and /work/SRC/openSUSE:Factory/.vim.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vim" Thu Nov 30 21:59:35 2023 rev:357 rq:1129781 version:9.0.2136 Changes: -------- --- /work/SRC/openSUSE:Factory/vim/vim.changes 2023-11-15 21:07:35.238038576 +0100 +++ /work/SRC/openSUSE:Factory/.vim.new.25432/vim.changes 2023-11-30 22:00:33.147360510 +0100 @@ -1,0 +2,58 @@ +Wed Nov 29 11:45:27 UTC 2023 - Ondřej Súkup <mimi.vx(a)gmail.com> + +- Update to version 9.0.2136 + * MSVC errorformat can be improved + * No test for mode() when executing Ex commands + * Revise Makefile + * Update syntax file + * ml_get error when scrolling + * Cannot detect overstrike mode in Cmdline mode + * Duplicate Netbeans Error Message + * not all nushell files detected + * Updated German translations + * add additional nginx keywords + * add Make_mvc.mak file for tutor + * updated Russian translations for tutorials + * updated Italian translation + * some errors with translation Makefiles + * [security]: use-after-free in call_dfunc() + * Update doc Makefiles with comments from #13567 + * add indentation plugin (fixes #13574) + * runtime(swig): add syntax and filetype plugins + * translation Makefiles can be improved + * unused assignments when checking 'listchars' + * File info disappears when 'cmdheight' has decreased + * INT overflow detection logic can be simplified + * Problem with initializing the length of range() lists + * [security]: prevent overflow in indenting + * [security]: use-after-free in ex_substitute + * Fix handling of very long filename on longlist style + * un-used assignment in do_source_buffer_init + * remove dead-condition in ex_class + * [security]: avoid double-free in get_style_font_variants + * [security] use-after-free in qf_free_items + * expand $COMSPEC without applying 'wildignore' + * Improve keymap file highlighting + * include new doc-Makefiles + * Fix whitespace and formatting of some help files + * minor typo fixes + * No test for defining sign without attribute + * crash when callback function aborts because of recursiveness + * overflow detection not accurate when adding digits + * Coverity warns for another overflow in shift_line() + * Refactor doc-Makefiles + * document proper notation of gVim, document vim-security list + * Update Serbian messages translation + * [security]: overflow in shift_line + * [security]: overflow in get_number + * [security]: overflow in ex address parsing + * [security]: overflow in nv_z_get_count + * [security]: overflow with count for :s command + * [security]: FPE in adjust_plines_for_skipcol + * [security]: Use-after-free in win_close() + * comment out strange error condition check + * skipcol not reset when topline changed + * wast filetype should be replaced by wat filetype + * fix typo in pi_gzip.txt + +------------------------------------------------------------------- @@ -8 +66 @@ - * improve the breakpoint sign label (#13525) + * improve the breakpoint sign label @@ -10,3 +68,3 @@ - * Renamed "makefile_*.mak" for Vim documentation (#13517) - * Update for Lynx 2.8.9 (#13510) - * Improve :let-heredoc syntax highlighting (#12923) + * Renamed "makefile_*.mak" for Vim documentation + * Update for Lynx 2.8.9 + * Improve :let-heredoc syntax highlighting @@ -14,4 +72,4 @@ - * Update for i3 4.23 (#13522) - * Update usr_51.txt to be more inclusive (#13496) - * Add missing null_<type> help tags (#13498) - * labeler.yml use all instead of any for doc detection (#13507) + * Update for i3 4.23 + * Update usr_51.txt to be more inclusive + * Add missing null_<type> help tags + * labeler.yml use all instead of any for doc detection @@ -20 +78 @@ - * labeler.yml: Add some more component detection rules (#13511) + * labeler.yml: Add some more component detection rules @@ -23,2 +81,2 @@ - * labeler.yml: add documentation label (#13506) - * fix grammar in termdebug doc, remove trailing spaces (#13505) + * labeler.yml: add documentation label + * fix grammar in termdebug doc, remove trailing spaces @@ -29 +87 @@ - * Update for Wget2 2.1.0 (#13497) + * Update for Wget2 2.1.0 @@ -32,2 +90,2 @@ - * Switch Hindu-Arabic to Arabic numerals in arabic keymap (#13430) - * Update the translation of Russian messages to Vim 9.0.2091 (#13490) + * Switch Hindu-Arabic to Arabic numerals in arabic keymap + * Update the translation of Russian messages to Vim 9.0.2091 @@ -36 +94 @@ - * Make dist/vim.vim work properly when lacking vim9script support (#13487) + * Make dist/vim.vim work properly when lacking vim9script support @@ -39 +97 @@ - * centralize safe executable check and add vim library (#13413) + * centralize safe executable check and add vim library @@ -42 +100 @@ - * Add Makefile for the Vim documentation on Windows (#13467) + * Add Makefile for the Vim documentation on Windows @@ -45,2 +103,2 @@ - * Update sh syntax and add shDerefOffset to shDerefVarArray for bash (#13480) - * make strace ft check less strict (#13482) + * Update sh syntax and add shDerefOffset to shDerefVarArray for bash + * make strace ft check less strict @@ -51 +109 @@ - * runtime(sh) Update sh syntax and add shDblParen to shCaseList (#13469) + * runtime(sh) Update sh syntax and add shDblParen to shCaseList @@ -53 +111 @@ - * Add noble (24.04 LTS) as Ubuntu release name (#13472) + * Add noble (24.04 LTS) as Ubuntu release name @@ -56 +114 @@ - * add shDblParen to shLoopList for bash (#13445) + * add shDblParen to shLoopList for bash @@ -58 +116 @@ - * all secure options should note this restriction in the documentation (#13448) + * all secure options should note this restriction in the documentation @@ -69 +127 @@ - * don't echo empty lines (#13431) + * don't echo empty lines @@ -71 +129 @@ - * update debian related runtime files (#13423) + * update debian related runtime files @@ -83 +141 @@ - * Fix typos in several documents (#13420) + * Fix typos in several documents @@ -89 +147 @@ - * Update ftplugin - comment motions (#13412) + * Update ftplugin - comment motions @@ -93 +151 @@ - * do not use hard-coded match id (#13393) + * do not use hard-coded match id @@ -97 +155 @@ - * Add new ftplugin (#13385) + * Add new ftplugin @@ -101 +159 @@ - * Update Zig runtime files (#13388) + * Update Zig runtime files @@ -108 +166 @@ - * allow for overriding systemd ftplugin settings (#13373) + * allow for overriding systemd ftplugin settings @@ -117 +175 @@ - * include syntax script for json5 (#13356) + * include syntax script for json5 @@ -126 +184 @@ - * Fix more typos (#13354) + * Fix more typos @@ -128 +186 @@ - * correct <PageUp>/<PageDown> behavior in 'wildmenu' (#13336) + * correct <PageUp>/<PageDown> behavior in 'wildmenu' @@ -140,2 +198,2 @@ - * Update Serbian messages translation (#13324) - * Update ftplugin (#13327) + * Update Serbian messages translation + * Update ftplugin @@ -143 +201 @@ - * Improve command-line completion docs (#13331) + * Improve command-line completion docs @@ -161 +219 @@ - * make command name for &iskeywordprg more unique (#13297) + * make command name for &iskeywordprg more unique @@ -166 +224 @@ - * Update ftplugin (#13213) + * Update ftplugin @@ -170 +228 @@ - * remove E1520 tag (#13289) + * remove E1520 tag @@ -172 +230 @@ - * Update vim9class help (#13292) + * Update vim9class help @@ -179,3 +237,3 @@ - * diff (`df`) may open the wrong window (#13275) - * Update `.netrwbook` immediately on bookmark change (#13276) - * revert permission changes for xxd manpages again (#13277) + * diff (`df`) may open the wrong window + * Update `.netrwbook` immediately on bookmark change + * revert permission changes for xxd manpages again @@ -185 +243 @@ - * Update Serbian messages translation (#13282) + * Update Serbian messages translation @@ -187 +245 @@ - * Correct filetype detection pattern and style (#13284) + * Correct filetype detection pattern and style @@ -197,2 +255,2 @@ - * fix two typos in `vim9.txt` and `options.txt` (#13258) - * remove E1507 help tag, which is no longer used (#13254) + * fix two typos in `vim9.txt` and `options.txt` + * remove E1507 help tag, which is no longer used @@ -201,3 +259,3 @@ - * Update Russian message translation to Vim 9.0.1968 (#13239) - * add missing error numbers in the help. (#13241) - * mention how to disable folding in diff mode (#13242) + * Update Russian message translation to Vim 9.0.1968 + * add missing error numbers in the help. + * mention how to disable folding in diff mode @@ -235,4 +293,4 @@ - * mention mouse scrolling in scrollbind-quickadj (#13190) - * Update syntax file (#13192) - * update i3config syntax (#13191) - * runtime(rmd) Update ftplugin and syntax files (#13193) + * mention mouse scrolling in scrollbind-quickadj + * Update syntax file + * update i3config syntax + * runtime(rmd) Update ftplugin and syntax files @@ -242 +300 @@ - * only invoke bash help in ftplugin if it has been detected to be bash (#13171) + * only invoke bash help in ftplugin if it has been detected to be bash @@ -244 +302 @@ - * Update help tags (#13180) + * Update help tags @@ -247,2 +305,2 @@ - * Update Vim9 class items (#13148) - * Vim9: Consistenly use class/object variable and class/object method in help (#13149) + * Update Vim9 class items + * Vim9: Consistenly use class/object variable and class/object method in help @@ -256,3 +314,3 @@ - * grammar fixes in doc (#13164) - * Update the version9.txt with a template for version 9.1 enhancements (#13165) - * Add a missing '<' to the help of strutf16len() (#13168) + * grammar fixes in doc + * Update the version9.txt with a template for version 9.1 enhancements + * Add a missing '<' to the help of strutf16len() @@ -260 +318 @@ - * fix typo in tutor.nl (#13175) + * fix typo in tutor.nl @@ -269 +327 @@ - * format jumplist examples more consistently (#13137) + * format jumplist examples more consistently @@ -285 +343 @@ - * Add Kotlin runtime files (#13110) + * Add Kotlin runtime files @@ -296,2 +354,2 @@ - * Highlight all :loadkeymap abbreviations in vim syntax (#13092) - * Fix :unlet error in ftplugin (#13090) + * Highlight all :loadkeymap abbreviations in vim syntax + * Fix :unlet error in ftplugin @@ -299,3 +357,3 @@ - * improve syntax highlighting (#13060) - * sync rust runtime files with upstream (#13075) - * syntax structure cleanup (#13080) + * improve syntax highlighting + * sync rust runtime files with upstream + * syntax structure cleanup @@ -303 +361 @@ - * improved i3config highlighting (#13054) + * improved i3config highlighting @@ -15376 +15434 @@ - installation in the minimal system (#239838) + installation in the minimal system @@ -15978 +16036 @@ - gvim from working (#15355) + gvim from working @@ -16037 +16095 @@ -- remove RPM_BUILD_ROOT path in man pages (#13054) +- remove RPM_BUILD_ROOT path in man pages Old: ---- vim-9.0.2103.tar.gz New: ---- vim-9.0.2136.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.kYaZa6/_old 2023-11-30 22:00:36.647489449 +0100 +++ /var/tmp/diff_new_pack.kYaZa6/_new 2023-11-30 22:00:36.651489597 +0100 @@ -17,7 +17,7 @@ %define pkg_version 9.0 -%define patchlevel 2103 +%define patchlevel 2136 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim90 %define site_runtimepath %{_datadir}/vim/site ++++++ vim-9.0.2103.tar.gz -> vim-9.0.2136.tar.gz ++++++ /work/SRC/openSUSE:Factory/vim/vim-9.0.2103.tar.gz /work/SRC/openSUSE:Factory/.vim.new.25432/vim-9.0.2136.tar.gz differ: char 17, line 1

1 0

commit qemu for openSUSE:Factory
by Source-Sync 30 Nov '23

30 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2023-11-30 21:59:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qemu" Thu Nov 30 21:59:27 2023 rev:263 rq:1129780 version:8.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2023-11-17 20:48:42.735299691 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new.25432/qemu.changes 2023-11-30 22:00:29.695233339 +0100 @@ -1,0 +2,37 @@ +Wed Nov 29 10:50:56 UTC 2023 - dfaggioli(a)suse.com + +- Align to upstream stable release. It includes many of the patches we had + backported ourself, to fix bugs and issues, plus more. See here for details: + * https://lore.kernel.org/qemu-devel/1700589639.257680.3420728.nullmailer@tls… + * https://gitlab.com/qemu-project/qemu/-/commits/stable-8.1?ref_type=heads + An (incomplete!) list of such backports is: + * Update version for 8.1.3 release + * hw/mips: LOONGSON3V depends on UNIMP device + * target/arm: HVC at EL3 should go to EL3, not EL2 + * s390x/pci: only limit DMA aperture if vfio DMA limit reported + * target/riscv/kvm: support KVM_GET_REG_LIST + * target/riscv/kvm: improve 'init_multiext_cfg' error msg + * tracetool: avoid invalid escape in Python string + * tests/tcg/s390x: Test LAALG with negative cc_src + * target/s390x: Fix LAALG not updating cc_src + * tests/tcg/s390x: Test CLC with inaccessible second operand + * target/s390x: Fix CLC corrupting cc_src + * tests/qtest: ahci-test: add test exposing reset issue with pending callback + * hw/ide: reset: cancel async DMA operation before resetting state + * target/mips: Fix TX79 LQ/SQ opcodes + * target/mips: Fix MSA BZ/BNZ opcodes displacement + * ui/gtk-egl: apply scale factor when calculating window's dimension + * ui/gtk: force realization of drawing area + * ati-vga: Implement fallback for pixman routines + * ... + +------------------------------------------------------------------- +Wed Nov 22 15:21:23 UTC 2023 - dfaggioli(a)suse.com + +- Backports and bugfixes: + * [openSUSE] Make Sphinx build reproducible (boo#1102408) + * target/s390x/arch_dump: Add arch cleanup function for PV dumps (bsc#1217227) + * dump: Add arch cleanup function (bsc#1217227) + * target/s390x/dump: Remove unneeded dump info function pointer init (bsc#1217227) + +------------------------------------------------------------------- Old: ---- qemu-8.1.2.tar.xz New: ---- qemu-8.1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu-linux-user.spec ++++++ --- /var/tmp/diff_new_pack.FZRPJN/_old 2023-11-30 22:00:31.207289040 +0100 +++ /var/tmp/diff_new_pack.FZRPJN/_new 2023-11-30 22:00:31.211289188 +0100 @@ -27,7 +27,7 @@ Summary: CPU emulator for user space License: BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC -Version: 8.1.2 +Version: 8.1.3 Release: 0 Source0: qemu-%{version}.tar.xz Source1: common.inc ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.FZRPJN/_old 2023-11-30 22:00:31.239290219 +0100 +++ /var/tmp/diff_new_pack.FZRPJN/_new 2023-11-30 22:00:31.243290366 +0100 @@ -82,7 +82,7 @@ Summary: Machine emulator and virtualizer License: BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC -Version: 8.1.2 +Version: 8.1.3 Release: 0 Source0: qemu-%{version}.tar.xz Source1: common.inc ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.FZRPJN/_old 2023-11-30 22:00:31.327293461 +0100 +++ /var/tmp/diff_new_pack.FZRPJN/_new 2023-11-30 22:00:31.331293608 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/qemu.git</param> - <param name="changesrevision">fc31c9ff6487b8d726234d2ca8bcdf479cd4e5b5</param></service></servicedata> + <param name="changesrevision">22c72f237c234c20c7ab58bfeb5d188c75a769b8</param></service></servicedata> (No newline at EOF) ++++++ qemu-8.1.2.tar.xz -> qemu-8.1.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/qemu/qemu-8.1.2.tar.xz /work/SRC/openSUSE:Factory/.qemu.new.25432/qemu-8.1.3.tar.xz differ: char 15, line 1

1 0