summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/zlib/qt_attribution.json
Commit message (Collapse)AuthorAgeFilesLines
* Update Zlib to 1.3.1Mårten Nordheim2024-01-251-3/+3
| | | | | | | | | | | [ChangeLog][Third-Party Code] zlib was updated to version 1.3.1. Task-number: QTBUG-121325 Fixes: QTBUG-121444 Pick-to: 6.7 6.6.2 6.6 6.5 6.2 5.15 Change-Id: I0a72b7966916ccb825c7a8ae251e09b2914f0cf4 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
* Update bundled zlib to version 1.3Dennis Oberst2023-09-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zlib 1.3 has been available since August 18, 2023. Version 1.3 now defines the following: # define crc32_combine_gen z_crc32_combine_gen # define crc32_combine_gen64 z_crc32_combine_gen64 # define crc32_combine_op z_crc32_combine_op We patched those in manually with qtpatches.diff, so we update it to reflect these changes. Updated the diff with 'git diff --relative > qtpatches.diff' from within the 3rdparty/zlib directory. Since updating zlib always requires some manual intervention add a minimal guide that will be printed on using import_from_zlib_tarball.sh. As a drive-by fix an error in import_from_zlib_tarball.sh where passing in a path already containing a backslash as: import_from_zlib_tarball.sh zlib-1.x/ ./ would append another backshlash to that path (zlib-1.x//). Furthermore add the '-v' flag to the copy command to make it more verbose. [ChangeLog][Third-Party Code] zlib was updated to version 1.3. Task-number: QTBUG-116236 Pick-to: 6.6 6.5 6.2 5.15 Change-Id: Ib7c8698035e1e049b455308c5774fcaf88b7622a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Highlight third-party modules that are security criticalKai Köhne2023-03-311-0/+2
| | | | | | | | | | | | | | Mark any modules listed as 'processing untrusted content' in https://wiki.qt.io/Third_Party_Code_in_Qt also in the qt_attribution.json files. For reasoning, see also https://lists.qt-project.org/pipermail/development/2023-February/043667.html Pick-to: 6.5 Change-Id: Id547d4f7e77dac8c7e8e382e65169e7bd0330fcf Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update bundled zlib to version 1.2.13Dennis Oberst2022-11-181-3/+3
| | | | | | | | | | | | zlib 1.2.13 has been available since October 13, 2022. Also fixes CVE-2022-37434. [ChangeLog][Third-Party Code] zlib was updated to version 1.2.13. Fixes: QTBUG-108130 Pick-to: 6.4 6.2 5.15 Change-Id: Iaa2a9486f1cbbcd6a23d48df632e01bc05b414d5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update bundled zlib to version 1.2.12André Klitzing2022-03-311-2/+2
| | | | | | | | | | | | The remaining diff to clean 1.2.12 is archived in the qtpatches.diff file. Also this fixes CVE-2018-25032. [ChangeLog][Third-Party Code] zlib was updated to version 1.2.12. Change-Id: Ifab5d57acdc90ace61f2fd22c6dbb7ec6b4ad319 Pick-to: 6.2 6.3 6.3.0 5.15 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* zlib: Fix spelling of licenseKai Koehne2018-10-021-1/+1
| | | | | | | Follow spelling convention at https://spdx.org/licenses/Zlib.html Change-Id: Ib25b98cf7f3a052ec25ba6924748a962733e2ed8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update bundled zlib to version 1.2.11André Klitzing2017-08-041-2/+2
| | | | | | | | | | | Also clean up some unused files. The remaining diff to clean 1.2.11 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] zlib was updated to version 1.2.11. Task-number: QTBUG-31020 Change-Id: I89f890904af48c6e9ba6eabc5d58f5adbe2c53f0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add qt_attribution.json filesKai Koehne2016-08-121-0/+15
The format is documented in http://wiki.qt.io/Qt_attribution.json Also add a LICENSE file in case there is none yet (usually copied from the source headers). Task-number: QTBUG-55139 Change-Id: Ib54c73d0bb9946cfd8579e86c6858035184ca516 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>