November 2023 - openSUSE Commits - openSUSE Mailing Lists

commit Ipopt 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 Ipopt for openSUSE:Factory checked in at 2023-11-30 22:00:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Ipopt (Old) and /work/SRC/openSUSE:Factory/.Ipopt.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Ipopt" Thu Nov 30 22:00:24 2023 rev:19 rq:1129759 version:3.14.13 Changes: -------- --- /work/SRC/openSUSE:Factory/Ipopt/Ipopt.changes 2023-04-13 17:32:56.766123821 +0200 +++ /work/SRC/openSUSE:Factory/.Ipopt.new.25432/Ipopt.changes 2023-11-30 22:01:14.264875217 +0100 @@ -1,0 +2,19 @@ +Wed Nov 22 11:23:14 UTC 2023 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 3.14.13: + * Reduced priority for making Spral the default value for option + linear_solver [gh#coin-or/Ipopt#677]. + * Adapted to change of integer types in Spral interface. Minimal + required Spral version is now v2023.03.29. + * Fixed that return code from TNLP::eval_jac_g() was ignored at + first call [gh#coin-or/Ipopt#697]. + * Print additional messages when reallocation of MA27 working + space failed [gh#coin-or/Ipopt#671]. + * Added option file_append to specify whether to append to + output_file instead of truncating it. + * Added default argument file_append to + Journalist::AddFileJournal(), added default argument fappend + to FileJournal::Open(), and added default argument file_append + to IpoptApplication::OpenOutputFile() [gh#coin-or/Ipopt#720]. + +------------------------------------------------------------------- Old: ---- Ipopt-3.14.12.tar.gz New: ---- Ipopt-3.14.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Ipopt.spec ++++++ --- /var/tmp/diff_new_pack.1ybFE4/_old 2023-11-30 22:01:14.844896584 +0100 +++ /var/tmp/diff_new_pack.1ybFE4/_new 2023-11-30 22:01:14.844896584 +0100 @@ -19,7 +19,7 @@ %define sover 3 %define shlib libipopt%{sover} Name: Ipopt -Version: 3.14.12 +Version: 3.14.13 Release: 0 Summary: A software package for large-scale nonlinear optimization methods License: EPL-2.0 ++++++ Ipopt-3.14.12.tar.gz -> Ipopt-3.14.13.tar.gz ++++++ ++++ 2457 lines of diff (skipped)

1 0

commit rtl_433 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 rtl_433 for openSUSE:Factory checked in at 2023-11-30 22:00:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rtl_433 (Old) and /work/SRC/openSUSE:Factory/.rtl_433.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rtl_433" Thu Nov 30 22:00:22 2023 rev:12 rq:1129767 version:23.11 Changes: -------- --- /work/SRC/openSUSE:Factory/rtl_433/rtl_433.changes 2022-11-20 19:47:01.769243192 +0100 +++ /work/SRC/openSUSE:Factory/.rtl_433.new.25432/rtl_433.changes 2023-11-30 22:01:12.576813031 +0100 @@ -1,0 +2,161 @@ +Wed Nov 29 09:15:14 UTC 2023 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 23.11 + Breaking Changes + * Changed conf dir defaults to just SYSCONFDIR. + * Changed verbosity of Protocols Registered output. + * Changed example conf file to use defaults. + * Changed help texts to print to stdout. + * Fixed Oregon Scientific channel renumbering, BREAKING change + to THN132N channel 3. + * Changed MQTT client ID to contain all params. + * Fixed GEO-minim matching, BREAKING change to id field. + * Changed Inkbird-ITH20R temperature2_C to temperature_2_C + BREAKING change. + Highlights + * Added support for Schou 72543 rain sensor + * Added support for Bresser Lightning and Bresser Air Quality. + * Added support for Tekelek oil gauge + * Added support for Nissan Leaf TPMS. + * Added support for Carchet TPMS. + * Added support for Bresser water leakage sensor PN: 7009975. + * Added support for discovering Govee water sensors to + rtl_433_mqtt_hass. + * Added support for newer Chuango DWC-102 close command. + * Added support for TFA Stratos 30.3151 and improve Fineoffset + WH1050. + * Added support for IROX ETS69 to Ewig Emos-TTX201. + * Added support for ThermoPro TX-2C. + * Added support for Fineoffset WS90. + * Added support for Acurite 592TX. + * Added support for Oregon Scientific AWR129 BBQ thermometer. + * Added support for Celsia CZC1. + * Added support for Baldr/Rainpoint rain gauge. + * Added support for EezTire-E618 TPMS10ATC. + * Added support for LaCrosse TX31U-IT. + * Added support for Revolt Energy Monitor NC-5462. + * Added support for Emax EM3551H with Gust without UV/Lux to + Emax-W6. + * Added support for Wireless M-Bus Mode T Downlink. + * Added support for Gasmate-BA1008. + * Added support for Oil-SonicSmart. + * Added support for Watchman Sonic Advanced / Plus decoder. + * Added support for CED7000 timer. + * Added support for Emax Weather Sensor, improves Altronics X7064 + sensor. + * Added support for TFA Dostmann 14.1504 Radio-controlled grill + and meat thermometer. + * Added support for new revision of Govee H5054 water leak + detector. + * Added support for Vauno EN8822C. + * Added support for WEC-2103 temperature/humidity sensor. + * Added support for Neptune R900 flow meters. + * Added support for SRSmith SRS-2C-TX Pool Remote Control. + * Added support for Kia Rio III (UB) and Hyundai TPMS sensors. + * Added support for TyreGuard 400 TPMS. + * Added support for GEO minim+ energy monitor. + * Added support for longer EFTH800 messages. + * Added decoder conf for PHOX garage gate opener. + * Added decoder conf for Driveway alarm motion sensor I8-W1901. + * Added decoder conf for Reolink doorbell. + * Added decoder conf for SWETUP garage door remote. + * Added decoder conf for ELRO AB440 remote. + * Added decoder conf for xmas tree remote 2APJZ-CW002. + * Added decoder conf for GE Smartremote Plus. + * Added standardized detect key for Govee-Water. + * Added restartable SDR device. + * Changed to async SDR acquire thread. + * Changed to second Ctrl-C is a hard abort. + * Added log output, log redirect, colored KV log. + Changed + * Changed rtl_433_mqtt_hass.py to use moisture class. + * Changed rtl_433_mqtt_hass.py to add battery_mV. + * Changed Fineoffset-WS90 packet size check. + * Fixed logging message in HA script. + * Added Pool/Spa Thermometer PN 7009973 note to Bresser-6in1. + * Added php example stream script. + * Added checksum and battery_ok to WEC-2103. + * Changed version number to exclude nightly tag. + * Changed EezTire-E618 checksum, include flags. + * Changed startup help text to the actual help page. + * Improved some strcpy strncpy to snprintf. + * Improved all plain sprintf to snprintf. + * Fixed Somfy-IOHC length check. + * Added warning if firewall blocks loopback. + * Improved HA script with precipitation and wind speed class. + * Fixed Honeywell-CM921 temperature msg. + * Added Lidl Auriol 4-LD6313 and 4-LD5972 temperature/rain sensor. + * Improved HA script with current class. + * Improved handling of units within HA UI. + * Improved HA script with detailed units. + * Fixed HA script allow list id typo. + * Fixed Fineoffset-WH1050 return value. + * Fixed Inkbird-ITH20R battery_ok key and range. + * Fixed HA script remove device name from entities. + * Fixed HA script topics. + * Fixed malformed json on empty row print. + * Fixed Ecowitt-WS90 extra data output. + * Added description of startup bit to Bresser-5in1. + * Fixed various spelling. + * Added lower temp bounds to Acurite-5n1, Acurite-Atlas. + * Added humidity_1, humidity_2 to rtl_433_mqtt_hass. + * Added timestamp to logs in rtl_433_mqtt_hass. + * Fixed HASS script rain_rate_mm_h typo. + * Fixed Eurochron-EFTH800 radio_clock hour decoding. + * Changed Fineoffset-WS90 to add firmware version. + * Changed ThermoPro TX-2C to enable humidity. + * Added radio clock to Fineoffset-WH1050. + * Added battery voltage to EcoWitt-WH40. + * Changed EMOS-E6016 wind speed and battery. + * Improved Holman ws5029, Add support for AOK-5056 and correction + for Emax. + * Fixed current frequency and sample rate info. + * Changed rtl_433_mqtt_hass to enable passing custom topics. + * Added extra digit to Oregon Scientific for AWR129. + * Changed Acurite 896 rain gauge to default enabled. + * Changed CM160 output to double. + * Fixed CM160 energy calculation factor. + * Changed r_device.fields to constant pointer. + * Added total energy kWh to CM160 readings. + * Fixed Fitipower FC0012 gain quirk. + * Added unlockable rtl_tcp control. + * Fixed rtl_tcp for slow send buffers. + * Fixed Oil-SonicAdv missing messages. + * Fixed LaCrosse-R1/LaCrosse-R3 rain value. + * Added char const check to symbolizer. + * Fixed flowis protocol decoding, alarm and back flow parameters. + * Changed literals to string const for strict + discarded-qualifiers warnings. + * Added Schrader 3039 TPMS for Infiniti Nissan Renault note to + Schrader-SMD3MA4. + * Fixed Emax units. + * Added TLS debug info for influxs and mqtts. + * Fixed Emax LUX decoding. + * Fixed Vauno-EN8822C false positives. + * Added Flowis protocol decoder. + * Added Wireless M-Bus, Mode T Downlink. + * Fixed out-of-bounds in Klimalogg-Pro. + * Fixed Somfy-RTS for wrong bitrate. + * Changed all r_device declarations to const. + * Fixed pointer restrict for C++ compilers. + * Fixed TFA-141504v2 decoder length check. + * Added radio clock decode to Eurochron-EFTH800. + * Changed Somfy-IOHC to recognize more messages. + * Fixed Oregon Scientific negative temp, add BCD sanity checks. + * Added ESIC/SCMplus fields to rtl_433_mqtt_hass. + * Changed LaCrosse TX invalid humidity handling. + * Fixed json keys for wmbus to be unique. + * Fixed Bresser-ProRainGauge rain digits. + * Fixed light reading on Cotech-367959 when no sensor installed. + * Fixed HCS200 serial ID decoding. + * Added TLS options to InfluxDB output. + * Added output log level options. + * Fixed battery flag in AmbientWeather-WH31E/WH31B. + * Changed more fprintf to log prints. + * Changed fprintf to log prints. + * Changed verbosity to match log level. + * Added basic logger. + * Fixed JSON output string escaping. + * Added decode_dm flex option. + +------------------------------------------------------------------- Old: ---- rtl_433-22.11.tar.gz New: ---- rtl_433-23.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rtl_433.spec ++++++ --- /var/tmp/diff_new_pack.fr6fvN/_old 2023-11-30 22:01:13.080831599 +0100 +++ /var/tmp/diff_new_pack.fr6fvN/_new 2023-11-30 22:01:13.080831599 +0100 @@ -1,8 +1,8 @@ # # spec file for package rtl_433 # -# Copyright (c) 2022 SUSE LLC -# Copyright (c) 2017-2022, Martin Hauke <mardnh(a)gmx.de> +# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2017-2023, Martin Hauke <mardnh(a)gmx.de> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: rtl_433 -Version: 22.11 +Version: 23.11 Release: 0 Summary: Application turning the RTL2832 dongle into a 433.92MHz generic data receiver License: GPL-2.0-only ++++++ rtl_433-22.11.tar.gz -> rtl_433-23.11.tar.gz ++++++ ++++ 24877 lines of diff (skipped)

1 0

commit python-josepy 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-josepy for openSUSE:Factory checked in at 2023-11-30 22:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-josepy (Old) and /work/SRC/openSUSE:Factory/.python-josepy.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-josepy" Thu Nov 30 22:00:20 2023 rev:14 rq:1129754 version:1.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-josepy/python-josepy.changes 2023-06-12 15:27:07.591291634 +0200 +++ /work/SRC/openSUSE:Factory/.python-josepy.new.25432/python-josepy.changes 2023-11-30 22:01:11.192762045 +0100 @@ -1,0 +2,12 @@ +Wed Nov 29 09:34:59 UTC 2023 - ecsos <ecsos(a)opensuse.org> + +- Update to 1.14.0 + - Added support for Python 3.11 and 3.12. + - Support for Python 3.7 has been deprecated and will be removed + in the next scheduled release. + - Dropped support for Python 3.6. + - Added a new valid PGP key for signing our PyPI packages with + the fingerprint F2871B4152AE13C49519111F447BF683AA3B26C3 +- Comment out asc because no more found. + +------------------------------------------------------------------- Old: ---- josepy-1.13.0.tar.gz josepy-1.13.0.tar.gz.asc New: ---- josepy-1.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-josepy.spec ++++++ --- /var/tmp/diff_new_pack.GaXpT4/_old 2023-11-30 22:01:12.280802127 +0100 +++ /var/tmp/diff_new_pack.GaXpT4/_new 2023-11-30 22:01:12.280802127 +0100 @@ -19,20 +19,23 @@ %define libname josepy %{?sle15_python_module_pythons} Name: python-%{libname} -Version: 1.13.0 +Version: 1.14.0 Release: 0 Summary: JOSE protocol implementation in Python License: Apache-2.0 URL: https://github.com/certbot/josepy Source0: https://files.pythonhosted.org/packages/source/j/%{libname}/%{libname}-%{ve… -Source1: https://files.pythonhosted.org/packages/source/j/%{libname}/%{libname}-%{ve… +#Source1: https://files.pythonhosted.org/packages/source/j/%%{libname}/%%{libname}-%%… Source2: %{name}.keyring +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module coverage >= 4.0} BuildRequires: %{python_module cryptography >= 1.5} -BuildRequires: %{python_module devel >= 2.7} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module poetry >= 1.0.8} BuildRequires: %{python_module pyOpenSSL >= 0.13} BuildRequires: %{python_module pytest >= 2.8.0} BuildRequires: %{python_module setuptools >= 1.0} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-cryptography >= 1.5 @@ -48,13 +51,12 @@ %prep %setup -q -n %{libname}-%{version} -rm pytest.ini %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install # remove test-data %python_expand rm -rf %{buildroot}%{$python_sitelib}/%{libname}/testdata %python_expand rm -rf %{buildroot}%{$python_sitelib}/%{libname}/*_test.py* @@ -62,14 +64,18 @@ %python_expand rm -rf %{buildroot}%{$python_sitelib}/%{libname}/__pycache__/*_test* # remove duplicates %python_expand %fdupes %{buildroot}%{$python_sitelib}/%{libname} +# remove docfiles +%python_expand rm -rf %{buildroot}%{$python_sitelib}/CHANGELOG.rst +%python_expand rm -rf %{buildroot}%{$python_sitelib}/CONTRIBUTING.md %check %pytest %files %{python_files} %license LICENSE.txt +%doc CHANGELOG.rst CONTRIBUTING.md %{python_sitelib}/%{libname} -%{python_sitelib}/%{libname}-%{version}*.egg-info +%{python_sitelib}/%{libname}-%{version}.dist-info %pycache_only %{python_sitelib}/%{libname}/__pycache__ # following the certbot-packaging guide, "jws" should not be packaged %exclude %{_bindir}/jws ++++++ josepy-1.13.0.tar.gz -> josepy-1.14.0.tar.gz ++++++ ++++ 5331 lines of diff (skipped)

1 0

commit matomo 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 matomo for openSUSE:Factory checked in at 2023-11-30 22:00:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/matomo (Old) and /work/SRC/openSUSE:Factory/.matomo.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "matomo" Thu Nov 30 22:00:17 2023 rev:55 rq:1129707 version:4.16.0 Changes: -------- --- /work/SRC/openSUSE:Factory/matomo/matomo.changes 2023-08-03 17:31:01.220212661 +0200 +++ /work/SRC/openSUSE:Factory/.matomo.new.25432/matomo.changes 2023-11-30 22:01:09.660705606 +0100 @@ -1,0 +2,33 @@ +Tue Nov 28 17:11:44 UTC 2023 - ecsos <ecsos(a)opensuse.org> + +- Update to 4.16.0 + * matomo-org/matomo + - #19617 Segment with ‘Does not contain’ operand is invalid if comma is in value + - #20959 [PHP 8.1 compatibility] Deprecated – trim(): Passing + null to parameter #1 ($string) of type string + - #21190 Fix for unexpected zero value last edit dates in segment archiving + - #21357 Archiving issue in DataTable.php: Deprecated + – Implicit conversion from float 2009.999 to int loses precision + - #21569 Fix “revenue per visit” calculation + - #21234 Row evolution does not work for reports with special labels + - #21266 Process general goal metrics if no conversions, but site is ecommerce enabled + - #21403 Add markup and content for premium plugins promos + - #21504 Escape underscore in archive name when used in like query + - #21512 Add more visually striking marketplace menu item in sidebar + - #21522 Fixing PHP 8.3 deprecation error + * matomo-org/matomo-log-analytics + - #358 Add Traefik json log support + - #359 Update test action + - #361 Merge 4.x changes into 5.x + - #362 fix nginx format detection + * matomo-org/searchengine-and-social-list + - #89 Add Bluesky to social media list + * matomo-org/referrer-spam-list + - #1367 Add urlumbrella.com + - #1368 Add bonniesblog.online + - #1369 Ass bonniesblog.online + - #1370 Add jacblog.xyz + * matomo-org/tracker-proxy + - #84 added JS option to $SUPPORTED_METHODS in opt out + +------------------------------------------------------------------- Old: ---- matomo-4.15.1.tar.gz New: ---- matomo-4.16.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ matomo.spec ++++++ --- /var/tmp/diff_new_pack.Y7LTes/_old 2023-11-30 22:01:10.896751140 +0100 +++ /var/tmp/diff_new_pack.Y7LTes/_new 2023-11-30 22:01:10.900751288 +0100 @@ -21,7 +21,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.15.1 +Version: 4.16.0 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later ++++++ matomo-4.15.1.tar.gz -> matomo-4.16.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/matomo/matomo-4.15.1.tar.gz /work/SRC/openSUSE:Factory/.matomo.new.25432/matomo-4.16.0.tar.gz differ: char 12, line 1

1 0

commit rust-stable-image 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 rust-stable-image for openSUSE:Factory checked in at 2023-11-30 22:00:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rust-stable-image (Old) and /work/SRC/openSUSE:Factory/.rust-stable-image.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rust-stable-image" Thu Nov 30 22:00:09 2023 rev:6 rq:1129681 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/rust-stable-image/rust-stable-image.changes 2023-10-15 19:29:23.456897297 +0200 +++ /work/SRC/openSUSE:Factory/.rust-stable-image.new.25432/rust-stable-image.changes 2023-11-30 22:01:03.084463347 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 10:43:08 UTC 2023 - Dan Čermák <dcermak(a)suse.com> + +- switch stable to 1.74, oldstable to 1.73 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.S3fOOy/_old 2023-11-30 22:01:04.488515070 +0100 +++ /var/tmp/diff_new_pack.S3fOOy/_new 2023-11-30 22:01:04.492515218 +0100 @@ -16,8 +16,8 @@ #!BuildTag: opensuse/bci/rust:stable #!BuildTag: opensuse/bci/rust:stable-1.%RELEASE% -#!BuildTag: opensuse/bci/rust:1.73 -#!BuildTag: opensuse/bci/rust:1.73-1.%RELEASE% +#!BuildTag: opensuse/bci/rust:1.74 +#!BuildTag: opensuse/bci/rust:1.74-1.%RELEASE% #!BuildTag: opensuse/bci/rust:latest FROM opensuse/tumbleweed:latest @@ -26,21 +26,21 @@ # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=org.opensuse.bci.rust -LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.73" -LABEL org.opencontainers.image.description="Rust 1.73 container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="1.73" +LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.74" +LABEL org.opencontainers.image.description="Rust 1.74 container based on the openSUSE Tumbleweed Base Container Image." +LABEL org.opencontainers.image.version="1.74" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/rust:1.73-1.%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/rust:1.74-1.%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime" LABEL org.opensuse.release-stage="released" # endlabelprefix -RUN set -euo pipefail; zypper -n in --no-recommends rust1.73 cargo1.73; zypper -n clean; rm -rf /var/log/* +RUN set -euo pipefail; zypper -n in --no-recommends rust1.74 cargo1.74; zypper -n clean; rm -rf /var/log/* ENV RUST_VERSION="%%RUST_VERSION%%" ENV CARGO_VERSION="%%CARGO_VERSION%%" ENV CC="/usr/local/bin/gcc" ++++++ _service ++++++ --- /var/tmp/diff_new_pack.S3fOOy/_old 2023-11-30 22:01:04.524516397 +0100 +++ /var/tmp/diff_new_pack.S3fOOy/_new 2023-11-30 22:01:04.528516544 +0100 @@ -4,12 +4,12 @@ <service name="replace_using_package_version" mode="buildtime"> <param name="file">Dockerfile</param> <param name="regex">%%RUST_VERSION%%</param> - <param name="package">rust1.73</param> + <param name="package">rust1.74</param> </service> <service name="replace_using_package_version" mode="buildtime"> <param name="file">Dockerfile</param> <param name="regex">%%CARGO_VERSION%%</param> - <param name="package">cargo1.73</param> + <param name="package">cargo1.74</param> </service> </services> (No newline at EOF)

1 0

commit rust-oldstable-image 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 rust-oldstable-image for openSUSE:Factory checked in at 2023-11-30 22:00:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rust-oldstable-image (Old) and /work/SRC/openSUSE:Factory/.rust-oldstable-image.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rust-oldstable-image" Thu Nov 30 22:00:08 2023 rev:6 rq:1129680 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/rust-oldstable-image/rust-oldstable-image.changes 2023-10-15 19:29:21.796837497 +0200 +++ /work/SRC/openSUSE:Factory/.rust-oldstable-image.new.25432/rust-oldstable-image.changes 2023-11-30 22:01:01.576407793 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 10:43:08 UTC 2023 - Dan Čermák <dcermak(a)suse.com> + +- switch stable to 1.74, oldstable to 1.73 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.zwXttV/_old 2023-11-30 22:01:02.232431960 +0100 +++ /var/tmp/diff_new_pack.zwXttV/_new 2023-11-30 22:01:02.236432107 +0100 @@ -16,8 +16,8 @@ #!BuildTag: opensuse/bci/rust:oldstable #!BuildTag: opensuse/bci/rust:oldstable-2.%RELEASE% -#!BuildTag: opensuse/bci/rust:1.72 -#!BuildTag: opensuse/bci/rust:1.72-2.%RELEASE% +#!BuildTag: opensuse/bci/rust:1.73 +#!BuildTag: opensuse/bci/rust:1.73-2.%RELEASE% FROM opensuse/tumbleweed:latest @@ -25,21 +25,21 @@ # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=org.opensuse.bci.rust -LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.72" -LABEL org.opencontainers.image.description="Rust 1.72 container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="1.72" +LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.73" +LABEL org.opencontainers.image.description="Rust 1.73 container based on the openSUSE Tumbleweed Base Container Image." +LABEL org.opencontainers.image.version="1.73" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/rust:1.72-2.%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/rust:1.73-2.%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime" LABEL org.opensuse.release-stage="released" # endlabelprefix -RUN set -euo pipefail; zypper -n in --no-recommends rust1.72 cargo1.72; zypper -n clean; rm -rf /var/log/* +RUN set -euo pipefail; zypper -n in --no-recommends rust1.73 cargo1.73; zypper -n clean; rm -rf /var/log/* ENV RUST_VERSION="%%RUST_VERSION%%" ENV CARGO_VERSION="%%CARGO_VERSION%%" ENV CC="/usr/local/bin/gcc" ++++++ _service ++++++ --- /var/tmp/diff_new_pack.zwXttV/_old 2023-11-30 22:01:02.268433286 +0100 +++ /var/tmp/diff_new_pack.zwXttV/_new 2023-11-30 22:01:02.272433433 +0100 @@ -4,12 +4,12 @@ <service name="replace_using_package_version" mode="buildtime"> <param name="file">Dockerfile</param> <param name="regex">%%RUST_VERSION%%</param> - <param name="package">rust1.72</param> + <param name="package">rust1.73</param> </service> <service name="replace_using_package_version" mode="buildtime"> <param name="file">Dockerfile</param> <param name="regex">%%CARGO_VERSION%%</param> - <param name="package">cargo1.72</param> + <param name="package">cargo1.73</param> </service> </services> (No newline at EOF)

1 0

commit postgres-16-image 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 postgres-16-image for openSUSE:Factory checked in at 2023-11-30 22:00:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgres-16-image (Old) and /work/SRC/openSUSE:Factory/.postgres-16-image.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postgres-16-image" Thu Nov 30 22:00:07 2023 rev:3 rq:1129679 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/postgres-16-image/postgres-16-image.changes 2023-10-26 17:15:16.570157763 +0200 +++ /work/SRC/openSUSE:Factory/.postgres-16-image.new.25432/postgres-16-image.changes 2023-11-30 22:01:00.472367122 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 11:43:33 UTC 2023 - Dan Čermák <dcermak(a)suse.com> + +- move the latest tag to postgresql 16 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.9qW085/_old 2023-11-30 22:01:00.964385247 +0100 +++ /var/tmp/diff_new_pack.9qW085/_new 2023-11-30 22:01:00.968385394 +0100 @@ -18,6 +18,7 @@ #!BuildTag: opensuse/postgres:16-%RELEASE% #!BuildTag: opensuse/postgres:%%pg_version%% #!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:latest FROM opensuse/tumbleweed:latest

1 0

commit python-psycopg2 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-psycopg2 for openSUSE:Factory checked in at 2023-11-30 22:00:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-psycopg2 (Old) and /work/SRC/openSUSE:Factory/.python-psycopg2.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-psycopg2" Thu Nov 30 22:00:04 2023 rev:45 rq:1129668 version:2.9.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python-psycopg2/python-psycopg2.changes 2023-09-07 21:15:30.387236805 +0200 +++ /work/SRC/openSUSE:Factory/.python-psycopg2.new.25432/python-psycopg2.changes 2023-11-30 22:00:58.536295800 +0100 @@ -1,0 +2,9 @@ +Tue Nov 28 21:39:17 UTC 2023 - Dirk Müller <dmueller(a)suse.com> + +- update to 2.9.9: + * Add support for Python 3.12. + * Drop support for Python 3.6. + * Wheel package bundled with PostgreSQL 16 libpq in order to + add support for recent features, such as ``sslcertmode``. + +------------------------------------------------------------------- Old: ---- psycopg2-2.9.7.tar.gz New: ---- psycopg2-2.9.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-psycopg2.spec ++++++ --- /var/tmp/diff_new_pack.DozLl1/_old 2023-11-30 22:00:59.048314662 +0100 +++ /var/tmp/diff_new_pack.DozLl1/_new 2023-11-30 22:00:59.048314662 +0100 @@ -18,22 +18,22 @@ %{?sle15_python_module_pythons} Name: python-psycopg2 -Version: 2.9.7 +Version: 2.9.9 Release: 0 Summary: Python-PostgreSQL Database Adapter License: LGPL-3.0-or-later AND (LGPL-3.0-or-later OR ZPL-2.0) AND SUSE-GPL-2.0-with-openssl-exception URL: https://www.psycopg.org/ Source: https://files.pythonhosted.org/packages/source/p/psycopg2/psycopg2-%{versio… -BuildRequires: %{python_module devel >= 3.6} +BuildRequires: %{python_module devel >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros # newer postgresql packages pg_config in -server-devel %if 0%{?sle_version} > 150100 || 0%{?suse_version} > 1500 -BuildRequires: postgresql-server-devel >= 9.1 +BuildRequires: postgresql-server-devel >= 15 %else -BuildRequires: postgresql-devel >= 9.1 +BuildRequires: postgresql-devel >= 15 %endif %if 0%{?suse_version} || 0%{?fedora_version} >= 24 Suggests: postgresql-server ++++++ psycopg2-2.9.7.tar.gz -> psycopg2-2.9.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/NEWS new/psycopg2-2.9.9/NEWS --- old/psycopg2-2.9.7/NEWS 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/NEWS 2023-10-03 11:41:53.000000000 +0200 @@ -1,13 +1,27 @@ Current release --------------- +What's new in psycopg 2.9.9 +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- Add support for Python 3.12. +- Drop support for Python 3.6. + + +What's new in psycopg 2.9.8 +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- Wheel package bundled with PostgreSQL 16 libpq in order to add support for + recent features, such as ``sslcertmode``. + + What's new in psycopg 2.9.7 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Fix propagation of exceptions raised during module initialization (:ticket:`#1598`). - Fix building when pg_config returns an empty string (:ticket:`#1599`). -- Wheel package compiled against OpenSSL 1.1.1v. +- Wheel package bundled with OpenSSL 1.1.1v. What's new in psycopg 2.9.6 @@ -15,7 +29,7 @@ - Package manylinux 2014 for aarch64 and ppc64le platforms, in order to include libpq 15 in the binary package (:ticket:`#1396`). -- Wheel package compiled against OpenSSL 1.1.1t. +- Wheel package bundled with OpenSSL 1.1.1t. What's new in psycopg 2.9.5 @@ -24,7 +38,7 @@ - Add support for Python 3.11. - Add support for rowcount in MERGE statements in binary packages (:ticket:`#1497`). -- Wheel package compiled against OpenSSL 1.1.1r and PostgreSQL 15 libpq. +- Wheel package bundled with OpenSSL 1.1.1r and PostgreSQL 15 libpq. What's new in psycopg 2.9.4 @@ -38,7 +52,7 @@ binary packages (:ticket:`#1365`). - `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to PostgreSQL 15. -- Wheel package compiled against OpenSSL 1.1.1q and PostgreSQL 14.4 libpq. +- Wheel package bundled with OpenSSL 1.1.1q and PostgreSQL 14.4 libpq. What's new in psycopg 2.9.3 @@ -55,7 +69,7 @@ - `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to PostgreSQL 14. - Add preliminary support for Python 3.11 (:tickets:`#1376, #1386`). -- Wheel package compiled against OpenSSL 1.1.1l and PostgreSQL 14.1 libpq +- Wheel package bundled with OpenSSL 1.1.1l and PostgreSQL 14.1 libpq (:ticket:`#1388`). @@ -92,7 +106,7 @@ platforms. - Provide :pep:`600` wheels packages (manylinux_2_24 tag) for aarch64 and ppc64le platforms. -- Wheel package compiled against OpenSSL 1.1.1k and PostgreSQL 13.3 libpq. +- Wheel package bundled with OpenSSL 1.1.1k and PostgreSQL 13.3 libpq. - Build system for Linux/MacOS binary packages moved to GitHub Actions. @@ -116,7 +130,7 @@ - `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to PostgreSQL 13. - Added wheel packages for ARM architecture (:ticket:`#1125`). -- Wheel package compiled against OpenSSL 1.1.1g. +- Wheel package bundled with OpenSSL 1.1.1g. What's new in psycopg 2.8.5 @@ -145,7 +159,7 @@ and `~psycopg2.extensions.Column.type_code` (:ticket:`#961`). - `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to PostgreSQL 12. -- Wheel package compiled against OpenSSL 1.1.1d and PostgreSQL at least 11.4. +- Wheel package bundled with OpenSSL 1.1.1d and PostgreSQL at least 11.4. What's new in psycopg 2.8.3 @@ -234,7 +248,7 @@ source files are now compatible with Python 2 & 3 as is. - The `!psycopg2.test` package is no longer installed by ``python setup.py install``. -- Wheel package compiled against OpenSSL 1.0.2r and PostgreSQL 11.2 libpq. +- Wheel package bundled with OpenSSL 1.0.2r and PostgreSQL 11.2 libpq. What's new in psycopg 2.7.7 @@ -242,14 +256,14 @@ - Cleanup of the cursor results assignment code, which might have solved double free and inconsistencies in concurrent usage (:tickets:`#346, #384`). -- Wheel package compiled against OpenSSL 1.0.2q. +- Wheel package bundled with OpenSSL 1.0.2q. What's new in psycopg 2.7.6.1 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Fixed binary package broken on OS X 10.12 (:ticket:`#807`). -- Wheel package compiled against PostgreSQL 11.1 libpq. +- Wheel package bundled with PostgreSQL 11.1 libpq. What's new in psycopg 2.7.6 @@ -266,7 +280,7 @@ - `~psycopg2.extras.execute_values()` accepts `~psycopg2.sql.Composable` objects (:ticket:`#794`). - `~psycopg2.errorcodes` map updated to PostgreSQL 11. -- Wheel package compiled against PostgreSQL 10.5 libpq and OpenSSL 1.0.2p. +- Wheel package bundled with PostgreSQL 10.5 libpq and OpenSSL 1.0.2p. What's new in psycopg 2.7.5 @@ -280,7 +294,7 @@ - Maybe fixed building on MSYS2 (as reported in :ticket:`#658`). - Allow string subclasses in connection and other places (:ticket:`#679`). - Don't raise an exception closing an unused named cursor (:ticket:`#716`). -- Wheel package compiled against PostgreSQL 10.4 libpq and OpenSSL 1.0.2o. +- Wheel package bundled with PostgreSQL 10.4 libpq and OpenSSL 1.0.2o. What's new in psycopg 2.7.4 @@ -302,7 +316,7 @@ - Fixed `~cursor.rowcount` after `~cursor.executemany()` with :sql:`RETURNING` statements (:ticket:`#633`). - Fixed compatibility problem with pypy3 (:ticket:`#649`). -- Wheel packages compiled against PostgreSQL 10.1 libpq and OpenSSL 1.0.2n. +- Wheel packages bundled with PostgreSQL 10.1 libpq and OpenSSL 1.0.2n. - Wheel packages for Python 2.6 no more available (support dropped from wheel building infrastructure). @@ -310,7 +324,7 @@ What's new in psycopg 2.7.3.2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- Wheel package compiled against PostgreSQL 10.0 libpq and OpenSSL 1.0.2l +- Wheel package bundled with PostgreSQL 10.0 libpq and OpenSSL 1.0.2l (:tickets:`#601, #602`). @@ -383,7 +397,7 @@ them together. - Added `~psycopg2.__libpq_version__` and `~psycopg2.extensions.libpq_version()` to inspect the version of the - ``libpq`` library the module was compiled/loaded with + ``libpq`` library the module was bundled with (:tickets:`#35, #323`). - The attributes `~connection.notices` and `~connection.notifies` can be customized replacing them with any object exposing an `!append()` method diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/PKG-INFO new/psycopg2-2.9.9/PKG-INFO --- old/psycopg2-2.9.7/PKG-INFO 2023-08-04 18:33:04.492184200 +0200 +++ new/psycopg2-2.9.9/PKG-INFO 2023-10-03 11:41:54.191774800 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: psycopg2 -Version: 2.9.7 +Version: 2.9.9 Summary: psycopg2 - Python-PostgreSQL Database Adapter Home-page: https://psycopg.org/ Author: Federico Di Gregorio @@ -19,12 +19,12 @@ Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL) Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 +Classifier: Programming Language :: Python :: 3.12 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: C @@ -35,7 +35,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Operating System :: Microsoft :: Windows Classifier: Operating System :: Unix -Requires-Python: >=3.6 +Requires-Python: >=3.7 License-File: LICENSE Psycopg is the most popular PostgreSQL database adapter for the Python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/doc/requirements.txt new/psycopg2-2.9.9/doc/requirements.txt --- old/psycopg2-2.9.7/doc/requirements.txt 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/doc/requirements.txt 2023-10-03 11:41:53.000000000 +0200 @@ -8,7 +8,7 @@ # via sphinx babel==2.12.1 # via sphinx -certifi==2022.12.7 +certifi>=2023.7.22 # via requests charset-normalizer==3.1.0 # via requests @@ -26,7 +26,7 @@ # via sphinx pygments==2.15.0 # via sphinx -requests==2.28.2 +requests==2.31.0 # via sphinx snowballstemmer==2.2.0 # via sphinx @@ -46,5 +46,5 @@ # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -urllib3==1.26.15 +urllib3==1.26.17 # via requests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/doc/src/install.rst new/psycopg2-2.9.9/doc/src/install.rst --- old/psycopg2-2.9.7/doc/src/install.rst 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/doc/src/install.rst 2023-10-03 11:41:53.000000000 +0200 @@ -131,8 +131,8 @@ .. NOTE: keep consistent with setup.py and the /features/ page. -- Python versions from 3.6 to 3.11 -- PostgreSQL server versions from 7.4 to 15 +- Python versions from 3.7 to 3.12 +- PostgreSQL server versions from 7.4 to 16 - PostgreSQL client library version from 9.1 .. note:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/psycopg/python.h new/psycopg2-2.9.9/psycopg/python.h --- old/psycopg2-2.9.7/psycopg/python.h 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/psycopg/python.h 2023-10-03 11:41:53.000000000 +0200 @@ -27,8 +27,8 @@ #ifndef PSYCOPG_PYTHON_H #define PSYCOPG_PYTHON_H 1 -#if PY_VERSION_HEX < 0x03060000 -#error "psycopg requires Python 3.6" +#if PY_VERSION_HEX < 0x03070000 +#error "psycopg requires Python 3.7" #endif #include <structmember.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/psycopg/typecast_datetime.c new/psycopg2-2.9.9/psycopg/typecast_datetime.c --- old/psycopg2-2.9.7/psycopg/typecast_datetime.c 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/psycopg/typecast_datetime.c 2023-10-03 11:41:53.000000000 +0200 @@ -103,18 +103,8 @@ goto exit; } -#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x03070000 - { - PyObject *tzoff; - if (!(tzoff = PyDelta_FromDSU(0, 0, 0))) { goto exit; } - tzinfo = PyObject_CallFunctionObjArgs(tzinfo_factory, tzoff, NULL); - Py_DECREF(tzoff); - if (!tzinfo) { goto exit; } - } -#else tzinfo = PyDateTime_TimeZone_UTC; Py_INCREF(tzinfo); -#endif /* m.replace(tzinfo=tzinfo) */ if (!(args = PyTuple_New(0))) { goto exit; } @@ -178,11 +168,6 @@ appropriate tzinfo object calling the factory */ Dprintf("typecast_PYDATETIMETZ_cast: UTC offset = %ds", tzsec); -#if PY_VERSION_HEX < 0x03070000 - /* Before Python 3.7 the timezone offset had to be a whole number - * of minutes, so round the seconds to the closest minute */ - tzsec = 60 * (int)round(tzsec / 60.0); -#endif if (!(tzoff = PyDelta_FromDSU(0, tzsec, 0))) { goto exit; } if (!(tzinfo = PyObject_CallFunctionObjArgs( tzinfo_factory, tzoff, NULL))) { @@ -270,11 +255,6 @@ appropriate tzinfo object calling the factory */ Dprintf("typecast_PYTIME_cast: UTC offset = %ds", tzsec); -#if PY_VERSION_HEX < 0x03070000 - /* Before Python 3.7 the timezone offset had to be a whole number - * of minutes, so round the seconds to the closest minute */ - tzsec = 60 * (int)round(tzsec / 60.0); -#endif if (!(tzoff = PyDelta_FromDSU(0, tzsec, 0))) { goto exit; } if (!(tzinfo = PyObject_CallFunctionObjArgs(tzinfo_factory, tzoff, NULL))) { goto exit; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/psycopg2.egg-info/PKG-INFO new/psycopg2-2.9.9/psycopg2.egg-info/PKG-INFO --- old/psycopg2-2.9.7/psycopg2.egg-info/PKG-INFO 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/psycopg2.egg-info/PKG-INFO 2023-10-03 11:41:54.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: psycopg2 -Version: 2.9.7 +Version: 2.9.9 Summary: psycopg2 - Python-PostgreSQL Database Adapter Home-page: https://psycopg.org/ Author: Federico Di Gregorio @@ -19,12 +19,12 @@ Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL) Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 +Classifier: Programming Language :: Python :: 3.12 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: C @@ -35,7 +35,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Operating System :: Microsoft :: Windows Classifier: Operating System :: Unix -Requires-Python: >=3.6 +Requires-Python: >=3.7 License-File: LICENSE Psycopg is the most popular PostgreSQL database adapter for the Python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/psycopg2.egg-info/SOURCES.txt new/psycopg2-2.9.9/psycopg2.egg-info/SOURCES.txt --- old/psycopg2-2.9.7/psycopg2.egg-info/SOURCES.txt 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/psycopg2.egg-info/SOURCES.txt 2023-10-03 11:41:54.000000000 +0200 @@ -142,6 +142,7 @@ scripts/build/download_packages_appveyor.py scripts/build/print_so_versions.sh scripts/build/run_build_macos_arm64.sh +scripts/build/scaleway_m1.sh scripts/build/strip_wheel.sh scripts/build/wheel_linux_before_all.sh scripts/build/wheel_macos_before_all.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/scripts/build/appveyor.py new/psycopg2-2.9.9/scripts/build/appveyor.py --- old/psycopg2-2.9.7/scripts/build/appveyor.py 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/scripts/build/appveyor.py 2023-10-03 11:41:53.000000000 +0200 @@ -660,7 +660,7 @@ For large values of 2, occasionally. """ rv = os.environ['PY_VER'] - assert rv in ('36', '37', '38', '39', '310', '311'), rv + assert rv in ('37', '38', '39', '310', '311', "312"), rv return rv @property @@ -742,12 +742,12 @@ # Py 3.6--3.8 = VS Ver. 14.0 (VS 2015) # Py 3.9 = VS Ver. 16.0 (VS 2019) vsvers = { - '36': '14.0', '37': '14.0', '38': '14.0', '39': '16.0', '310': '16.0', '311': '16.0', + '312': '16.0', } return vsvers[self.py_ver] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/scripts/build/build_libpq.sh new/psycopg2-2.9.9/scripts/build/build_libpq.sh --- old/psycopg2-2.9.7/scripts/build/build_libpq.sh 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/scripts/build/build_libpq.sh 2023-10-03 11:41:53.000000000 +0200 @@ -155,7 +155,8 @@ # export LD_LIBRARY_PATH="${LIBPQ_BUILD_PREFIX}/lib" ./configure --prefix=${LIBPQ_BUILD_PREFIX} --sysconfdir=/etc/postgresql-common \ - --without-readline --with-gssapi --with-openssl --with-pam --with-ldap \ + --with-gssapi --with-openssl --with-pam --with-ldap \ + --without-readline --without-icu \ CPPFLAGS=-I${LIBPQ_BUILD_PREFIX}/include/ LDFLAGS=-L${LIBPQ_BUILD_PREFIX}/lib make -C src/interfaces/libpq make -C src/bin/pg_config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/scripts/build/build_macos_arm64.sh new/psycopg2-2.9.9/scripts/build/build_macos_arm64.sh --- old/psycopg2-2.9.7/scripts/build/build_macos_arm64.sh 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/scripts/build/build_macos_arm64.sh 2023-10-03 11:41:53.000000000 +0200 @@ -8,10 +8,14 @@ # so it can pretty much only be executed by a sudo user as it is. set -euo pipefail -set -x +# set -x -python_versions="3.8.10 3.9.13 3.10.5 3.11.0" -pg_version=15 +python_versions="3.8.10 3.9.13 3.10.5 3.11.0 3.12.0" +pg_version=16 + +function log { + echo "$@" >&2 +} # Move to the root of the project dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -26,6 +30,7 @@ if [[ -x /opt/homebrew/bin/brew ]]; then eval "$(/opt/homebrew/bin/brew shellenv)" else + log "installing brew" command -v brew > /dev/null || ( # Not necessary: already installed # xcode-select --install @@ -39,11 +44,12 @@ # Install PostgreSQL, if necessary command -v pg_config > /dev/null || ( + log "installing postgres" brew install postgresql@${pg_version} ) -# After PostgreSQL 15, the bin path is not in the path. -export PATH=$(ls -d1 /opt/homebrew/Cellar/postgresql@${pg_version}/*/bin):$PATH +# Starting from PostgreSQL 15, the bin path is not in the path. +export PATH="$(ls -d1 /opt/homebrew/Cellar/postgresql@${pg_version}/*/bin):$PATH" # Make sure the server is running @@ -51,7 +57,8 @@ # brew services start postgresql@${pg_version} if ! pg_ctl status; then - pg_ctl -l /opt/homebrew/var/log/postgresql(a)${pg_version}.log start + log "starting the server" + pg_ctl -l "/opt/homebrew/var/log/postgresql(a)${pg_version}.log" start fi @@ -59,6 +66,7 @@ for ver3 in $python_versions; do ver2=$(echo $ver3 | sed 's/$[^\.]*$$\.[^\.]*$$.*$/\1\2/') command -v python${ver2} > /dev/null || ( + log "installing Python $ver3" (cd /tmp && curl -fsSl -O \ https://www.python.org/ftp/python/${ver3}/python-${ver3}-macos11.pkg) @@ -68,12 +76,16 @@ # Create a virtualenv where to work if [[ ! -x .venv/bin/python ]]; then + log "creating a virtualenv" python3 -m venv .venv fi +log "installing cibuildwheel" source .venv/bin/activate pip install cibuildwheel +log "building wheels" + # Build the binary packages export CIBW_PLATFORM=macos export CIBW_ARCHS=arm64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/scripts/build/run_build_macos_arm64.sh new/psycopg2-2.9.9/scripts/build/run_build_macos_arm64.sh --- old/psycopg2-2.9.7/scripts/build/run_build_macos_arm64.sh 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/scripts/build/run_build_macos_arm64.sh 2023-10-03 11:41:53.000000000 +0200 @@ -5,36 +5,61 @@ # This script is designed to run on a local machine: it will clone the repos # remotely and execute the `build_macos_arm64.sh` script remotely, then will # download the built packages. A tag to build must be specified. -# -# In order to run the script, the `m1` host must be specified in -# `~/.ssh/config`; for instance: -# -# Host m1 -# User m1 -# HostName 1.2.3.4 + +# The script requires a Scaleway secret key in the SCW_SECRET_KEY env var: +# It will use scaleway_m1.sh to provision a server and use it. set -euo pipefail # set -x +function log { + echo "$@" >&2 +} +function error { + # Print an error message and exit. + log "ERROR: $@" + exit 1 +} + tag=${1:-} if [[ ! "${tag}" ]]; then - echo "Usage: $0 TAG" >&2 - exit 2 + error "Usage: $0 REF" fi -rdir=psycobuild +dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -# Clone the repos -ssh m1 rm -rf "${rdir}" -ssh m1 git clone https://github.com/psycopg/psycopg2.git --branch ${tag} "${rdir}" +server=$("${dir}/scaleway_m1.sh" ensure) -# Allow sudoing without password, to allow brew to install -ssh -t m1 bash -c \ - 'test -f /etc/sudoers.d/m1 || echo "m1 ALL=(ALL) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/m1' +status=$(echo "$server" | jq -r .status) +if [[ "$status" != "ready" ]]; then + error "server status is $status" +fi + +# Get user, password, ip from vnc url +tmp=$(echo "$server" | jq -r .vnc_url) # vnc://m1:PASS@1.2.3.4:5900 +tmp=${tmp/vnc:\/\//} # m1:PASS@1.2.3.4:5900 +user=${tmp%%:*} # m1 +tmp=${tmp#*:} # PASS@1.2.3.4:5900 +password=${tmp%%@*} # PASS +tmp=${tmp#*@} # 1.2.3.4:5900 +host=${tmp%%:*} # 1.2.3.4 + +ssh="ssh ${user}@${host} -o StrictHostKeyChecking=no" + +# Allow the user to sudo without asking for password. +echo "$password" | \ + $ssh sh -c "test -f /etc/sudoers.d/${user} \ + || sudo -S --prompt= sh -c \ + 'echo \"${user} ALL=(ALL) NOPASSWD:ALL\" > /etc/sudoers.d/${user}'" + +# Clone the repos +rdir=psycobuild +$ssh rm -rf "${rdir}" +$ssh git clone https://github.com/psycopg/psycopg2.git --branch ${tag} "${rdir}" # Build the wheel packages -ssh m1 "${rdir}/scripts/build/build_macos_arm64.sh" +$ssh "${rdir}/scripts/build/build_macos_arm64.sh" # Transfer the packages locally -scp -r "m1:${rdir}/wheelhouse" . +scp -r "${user}@${host}:${rdir}/wheelhouse" . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/scripts/build/scaleway_m1.sh new/psycopg2-2.9.9/scripts/build/scaleway_m1.sh --- old/psycopg2-2.9.7/scripts/build/scaleway_m1.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/psycopg2-2.9.9/scripts/build/scaleway_m1.sh 2023-10-03 11:41:53.000000000 +0200 @@ -0,0 +1,119 @@ +#!/bin/bash + +# Implement the following commands: +# +# ensure: +# +# Get data about currently provisioned M1 server on Scaleway. If needed, +# provision one. +# +# The script requires the SCW_SECRET_KEY env var set to a valid secret. +# +# If successful, return the response data on stdout. It may look like: +# +# { +# "id": "8b196119-3cea-4a9d-b916-265037a85e60", +# "type": "M1-M", +# "name": "mac-m1-psycopg", +# "project_id": "4cf7a85e-f21e-40d4-b758-21d1f4ad3dfb", +# "organization_id": "4cf7a85e-f21e-40d4-b758-21d1f4ad3dfb", +# "ip": "1.2.3.4", +# "vnc_url": "vnc://m1:PASSWORD@1.2.3.4:5900", +# "status": "starting", +# "created_at": "2023-09-22T18:00:18.754646Z", +# "updated_at": "2023-09-22T18:00:18.754646Z", +# "deletable_at": "2023-09-23T18:00:18.754646Z", +# "zone": "fr-par-3" +# } +# +# delete: +# +# Delete one provisioned server, if available. +# +# See https://www.scaleway.com/en/developers/api/apple-silicon/ for api docs. + +set -euo pipefail +# set -x + +project_id="4cf7a85e-f21e-40d4-b758-21d1f4ad3dfb" +zone=fr-par-3 +servers_url="https://api.scaleway.com/apple-silicon/v1alpha1/zones/${zone}/servers" + +function log { + echo "$@" >&2 +} +function error { + log "ERROR: $@" + exit 1 +} + +function req { + method=$1 + shift + curl -sSL --fail-with-body -X $method \ + -H "Content-Type: application/json" \ + -H "X-Auth-Token: ${SCW_SECRET_KEY}" \ + "$@" +} +function get { + req GET "$@" +} +function post { + req POST "$@" +} +function delete { + req DELETE "$@" +} + +function server_id { + # Return the id of the first server available, else the empty string + servers=$(get $servers_url || error "failed to request servers list") + server_ids=$(echo "$servers" | jq -r ".servers[].id") + for id in $server_ids; do + echo $id + break + done +} + +function maybe_jq { + # Process the output via jq if displaying on console, otherwise leave + # it unprocessed. + if [ -t 1 ]; then + jq . + else + cat + fi +} + +cmd=${1:-list} +case $cmd in + ensure) + id=$(server_id) + if [[ "$id" ]]; then + log "You have servers." + get "$servers_url/$id" | maybe_jq + else + log "Creating new server." + post $servers_url -d " + { + \"name\": \"mac-m1-psycopg\", + \"project_id\": \"$project_id\", + \"type\": \"M1-M\" + }" | maybe_jq + fi + ;; + delete) + id=$(server_id) + if [[ "$id" ]]; then + log "Deleting server $id." + delete "$servers_url/$id" | maybe_jq + else + log "No server found." + fi + ;; + list) + get $servers_url | maybe_jq + ;; + *) + error "Usage: $(basename $0) [list|ensure|delete]" +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/scripts/build/wheel_macos_before_all.sh new/psycopg2-2.9.9/scripts/build/wheel_macos_before_all.sh --- old/psycopg2-2.9.7/scripts/build/wheel_macos_before_all.sh 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/scripts/build/wheel_macos_before_all.sh 2023-10-03 11:41:53.000000000 +0200 @@ -2,6 +2,8 @@ # Configure the environment needed to build wheel packages on Mac OS. # This script is designed to be used by cibuildwheel as CIBW_BEFORE_ALL_MACOS +# +# The PG_VERSION env var must be set to a Postgres major version (e.g. 16). set -euo pipefail set -x @@ -9,7 +11,7 @@ dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" prjdir="$( cd "${dir}/../.." && pwd )" -brew install gnu-sed postgresql@15 +brew install gnu-sed postgresql@${PG_VERSION} # Start the database for testing brew services start postgresql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/setup.py new/psycopg2-2.9.9/setup.py --- old/psycopg2-2.9.7/setup.py 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/setup.py 2023-10-03 11:41:53.000000000 +0200 @@ -36,15 +36,12 @@ from distutils.ccompiler import get_default_compiler from distutils.errors import CompileError -try: - import configparser -except ImportError: - import ConfigParser as configparser +import configparser # Take a look at https://www.python.org/dev/peps/pep-0440/ # for a consistent versioning pattern. -PSYCOPG_VERSION = '2.9.7' +PSYCOPG_VERSION = '2.9.9' # note: if you are changing the list of supported Python version please fix @@ -55,12 +52,12 @@ License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL) Programming Language :: Python Programming Language :: Python :: 3 -Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 +Programming Language :: Python :: 3.12 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython Programming Language :: C @@ -161,10 +158,7 @@ return None def _get_pg_config_from_registry(self): - try: - import winreg - except ImportError: - import _winreg as winreg + import winreg reg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) try: @@ -557,7 +551,7 @@ url="https://psycopg.org/", license="LGPL with exceptions", platforms=["any"], - python_requires='>=3.6', + python_requires='>=3.7', description=readme.split("\n")[0], long_description="\n".join(readme.split("\n")[2:]).lstrip(), classifiers=[x for x in classifiers.split("\n") if x], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psycopg2-2.9.7/tests/test_connection.py new/psycopg2-2.9.9/tests/test_connection.py --- old/psycopg2-2.9.7/tests/test_connection.py 2023-08-04 18:33:04.000000000 +0200 +++ new/psycopg2-2.9.9/tests/test_connection.py 2023-10-03 11:41:53.000000000 +0200 @@ -1922,6 +1922,10 @@ @skip_before_libpq(9, 5) @skip_after_libpq(16) def test_ssl_attribute(self): + # Skip this test even if libpq built == 15, runtime == 16 (see #1619) + if ext.libpq_version() >= 160000: + return self.skipTest("libpq runtime version == %s" % ext.libpq_version()) + attribs = self.conn.info.ssl_attribute_names self.assert_(attribs) if self.conn.info.ssl_in_use:

1 0

commit neovim 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 neovim for openSUSE:Factory checked in at 2023-11-30 21:59:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/neovim (Old) and /work/SRC/openSUSE:Factory/.neovim.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "neovim" Thu Nov 30 21:59:59 2023 rev:57 rq:1125802 version:0.9.4 Changes: -------- --- /work/SRC/openSUSE:Factory/neovim/neovim.changes 2023-10-15 19:29:40.641516337 +0200 +++ /work/SRC/openSUSE:Factory/.neovim.new.25432/neovim.changes 2023-11-30 22:00:53.988128252 +0100 @@ -1,0 +2,5 @@ +Fri Nov 3 06:58:28 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- msgpack has changed its pkgconfig name, follow suit in neovim. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ neovim.spec ++++++ --- /var/tmp/diff_new_pack.V3YSdy/_old 2023-11-30 22:00:54.692154187 +0100 +++ /var/tmp/diff_new_pack.V3YSdy/_new 2023-11-30 22:00:54.692154187 +0100 @@ -74,7 +74,7 @@ BuildRequires: unzip BuildRequires: pkgconfig(libutf8proc) BuildRequires: pkgconfig(libuv) >= 1.42.0 -BuildRequires: pkgconfig(msgpack) +BuildRequires: pkgconfig(msgpack-c) BuildRequires: pkgconfig(termkey) BuildRequires: pkgconfig(tree-sitter) >= 0.20.8 BuildRequires: pkgconfig(unibilium)

1 0

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