From 21152f2b237977011d74f02321f0959b7d956afd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Aug 2023 17:19:29 +0200 Subject: update to 1.10.1 --- .gitignore | 1 + compat_reports/1.10.0_to_1.10.1/compat_report.html | 607 +++++++++++++++ compat_reports/1.9.2_to_1.10.0/compat_report.html | 826 +++++++++++++++++++++ libzip-tests.patch | 60 -- libzip-upstream.patch | 36 - libzip.spec | 17 +- libzip.xml | 2 +- 7 files changed, 1444 insertions(+), 105 deletions(-) create mode 100644 compat_reports/1.10.0_to_1.10.1/compat_report.html create mode 100644 compat_reports/1.9.2_to_1.10.0/compat_report.html delete mode 100644 libzip-tests.patch delete mode 100644 libzip-upstream.patch diff --git a/.gitignore b/.gitignore index 0cfd800..01f0400 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +clog package-*.xml *.tgz *.tar.bz2 diff --git a/compat_reports/1.10.0_to_1.10.1/compat_report.html b/compat_reports/1.10.0_to_1.10.1/compat_report.html new file mode 100644 index 0000000..16d8f2d --- /dev/null +++ b/compat_reports/1.10.0_to_1.10.1/compat_report.html @@ -0,0 +1,607 @@ + + + + + + + + + +libzip: 1.10.0 to 1.10.1 compatibility report + + + +

API compatibility report for the libzip library between 1.10.0 and 1.10.1 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibzip
Version #11.10.0
Version #21.10.1
Archx86_64
GCC Version12
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types131 / 56
Compatibility100%
+

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
Other Changes
in Constants		-2
+ + +

Other Changes in Constants  2 

+zip.h
+ +[+] ZIP_LENGTH_TO_END +
+ + + +[+] ZIP_LENGTH_UNCHECKED +
+ + +
+to the top
+

Header Files  2 

+
+zip.h
+zipconf.h
+
+
to the top
+

Libraries  1 

+
+libzip.so.5.5
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibzip
Version #11.10.0
Version #21.10.1
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types269 / 93
Compatibility100%
+

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low2
Other Changes
in Constants		-2
+ + +

Problems with Constants, Low Severity  2 

+zipconf.h
+ +[+] LIBZIP_VERSION +
+ + + +[+] LIBZIP_VERSION_MICRO +
+ + +
+to the top
+ +

Other Changes in Constants  2 

+zip.h
+ +[+] ZIP_LENGTH_TO_END +
+ + + +[+] ZIP_LENGTH_UNCHECKED +
+ + +
+to the top
+

Header Files  2 

+
+zip.h
+zipconf.h
+
+
to the top
+

Libraries  1 

+
+libzip.so.5.5
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/compat_reports/1.9.2_to_1.10.0/compat_report.html b/compat_reports/1.9.2_to_1.10.0/compat_report.html new file mode 100644 index 0000000..aff8b2c --- /dev/null +++ b/compat_reports/1.9.2_to_1.10.0/compat_report.html @@ -0,0 +1,826 @@ + + + + + + + + + +libzip: 1.9.2 to 1.10.0 compatibility report + + + +

API compatibility report for the libzip library between 1.9.2 and 1.10.0 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibzip
Version #11.9.2
Version #21.10.0
Archx86_64
GCC Version12
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types124 / 54
Compatibility100%
+

Problem Summary

+ + + + + + + + + + + +
SeverityCount
Added Symbols-7
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
Other Changes
in Data Types		-1
Other Changes
in Constants		-5
+ +

Added Symbols  7 

+zip.h, libzip.so.5.5
+zip_error_set_from_source ( zip_error_t* p1, zip_source_t* p2 )
+zip_source_is_seekable ( zip_source_t* p1 )
+zip_source_layered ( zip_t* p1, zip_source_t* p2, zip_source_layered_callback p3, void* p4 )
+zip_source_layered_create ( zip_source_t* p1, zip_source_layered_callback p2, void* p3, zip_error_t* p4 )
+zip_source_pass_to_lower_layer ( zip_source_t* p1, void* p2, zip_uint64_t p3, zip_source_cmd_t p4 )
+zip_source_zip_file ( zip_t* p1, zip_t* p2, zip_uint64_t p3, zip_flags_t p4, zip_uint64_t p5, zip_int64_t p6, char const* p7 )
+zip_source_zip_file_create ( zip_t* p1, zip_uint64_t p2, zip_flags_t p3, zip_uint64_t p4, zip_int64_t p5, char const* p6, zip_error_t* p7 )
+
+to the top
+ +

Other Changes in Data Types  1 

+zip.h
+ +[+] enum zip_source_cmd  1  +
+ + +
+to the top
+ +

Other Changes in Constants  5 

+zip.h
+ +[+] ZIP_AFL_CREATE_OR_KEEP_FILE_FOR_EMPTY_ARCHIVE +
+ + + +[+] ZIP_AFL_IS_TORRENTZIP +
+ + + +[+] ZIP_AFL_WANT_TORRENTZIP +
+ + + +[+] ZIP_ER_DATA_LENGTH +
+ + + +[+] ZIP_ER_NOT_ALLOWED +
+ + +
+to the top
+

Header Files  2 

+
+zip.h
+zipconf.h
+
+
to the top
+

Libraries  1 

+
+libzip.so.5.5
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibzip
Version #11.9.2
Version #21.10.0
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types262 / 91
Compatibility100%
+

Problem Summary

+ + + + + + + + + + + +
SeverityCount
Added Symbols-7
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low3
Other Changes
in Data Types		-1
Other Changes
in Constants		-5
+ +

Added Symbols  7 

+zip.h
+zip_error_set_from_source ( zip_error_t* p1, zip_source_t* p2 )
+zip_source_is_seekable ( zip_source_t* p1 )
+zip_source_layered ( zip_t* p1, zip_source_t* p2, zip_source_layered_callback p3, void* p4 )
+zip_source_layered_create ( zip_source_t* p1, zip_source_layered_callback p2, void* p3, zip_error_t* p4 )
+zip_source_pass_to_lower_layer ( zip_source_t* p1, void* p2, zip_uint64_t p3, zip_source_cmd_t p4 )
+zip_source_zip_file ( zip_t* p1, zip_t* p2, zip_uint64_t p3, zip_flags_t p4, zip_uint64_t p5, zip_int64_t p6, char const* p7 )
+zip_source_zip_file_create ( zip_t* p1, zip_uint64_t p2, zip_flags_t p3, zip_uint64_t p4, zip_int64_t p5, char const* p6, zip_error_t* p7 )
+
+to the top
+ +

Problems with Constants, Low Severity  3 

+zipconf.h
+ +[+] LIBZIP_VERSION +
+ + + +[+] LIBZIP_VERSION_MICRO +
+ + + +[+] LIBZIP_VERSION_MINOR +
+ + +
+to the top
+ +

Other Changes in Data Types  1 

+zip.h
+ +[+] enum zip_source_cmd  1  +
+ + +
+to the top
+ +

Other Changes in Constants  5 

+zip.h
+ +[+] ZIP_AFL_CREATE_OR_KEEP_FILE_FOR_EMPTY_ARCHIVE +
+ + + +[+] ZIP_AFL_IS_TORRENTZIP +
+ + + +[+] ZIP_AFL_WANT_TORRENTZIP +
+ + + +[+] ZIP_ER_DATA_LENGTH +
+ + + +[+] ZIP_ER_NOT_ALLOWED +
+ + +
+to the top
+

Header Files  2 

+
+zip.h
+zipconf.h
+
+
to the top
+

Libraries  1 

+
+libzip.so.5.5
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/libzip-tests.patch b/libzip-tests.patch deleted file mode 100644 index 228b51c..0000000 --- a/libzip-tests.patch +++ /dev/null @@ -1,60 +0,0 @@ -From cabb10e1519fb0379472c12ec77b09b00a1f13ec Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Sun, 25 Jun 2023 23:34:17 +0200 -Subject: [PATCH] Work around Linux's non-POSIX behaviour in getopt(3). - -Closes #386. ---- - regress/cancel_45.test | 2 +- - regress/cancel_90.test | 2 +- - regress/cm-default.test | 2 +- - regress/progress.test | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/regress/cancel_45.test b/regress/cancel_45.test -index c6989b58..591c4105 100644 ---- a/regress/cancel_45.test -+++ b/regress/cancel_45.test -@@ -1,6 +1,6 @@ - # test default compression stores if smaller; test cancel after 45% - return 1 --arguments -n test.zip cancel 45 add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 -+arguments -n -- test.zip cancel 45 add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 - file large-uncompressible large-uncompressible - stdout - 0.0% done -diff --git a/regress/cancel_90.test b/regress/cancel_90.test -index da68ae77..ac34af73 100644 ---- a/regress/cancel_90.test -+++ b/regress/cancel_90.test -@@ -1,6 +1,6 @@ - # test default compression stores if smaller; test cancel after 90% - return 1 --arguments -n test.zip cancel 90 add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 -+arguments -n -- test.zip cancel 90 add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 - file large-uncompressible large-uncompressible - stdout - 0.0% done -diff --git a/regress/cm-default.test b/regress/cm-default.test -index 0d3665f7..d7baa6e0 100644 ---- a/regress/cm-default.test -+++ b/regress/cm-default.test -@@ -1,5 +1,5 @@ - # test default compression stores if smaller - return 0 --arguments -n test.zip add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 -+arguments -n -- test.zip add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 - file test.zip {} cm-default.zip - file large-uncompressible large-uncompressible -diff --git a/regress/progress.test b/regress/progress.test -index a8ebefe7..e5c26003 100644 ---- a/regress/progress.test -+++ b/regress/progress.test -@@ -1,6 +1,6 @@ - # test default compression stores if smaller; print progress - return 0 --arguments -n test.zip print_progress add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 -+arguments -n -- test.zip print_progress add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 - file test.zip {} cm-default.zip - file large-uncompressible large-uncompressible - stdout diff --git a/libzip-upstream.patch b/libzip-upstream.patch deleted file mode 100644 index d8b61d3..0000000 --- a/libzip-upstream.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c5ca7bba468beff67c437553ad47a656296b2cb7 Mon Sep 17 00:00:00 2001 -From: Dieter Baron -Date: Tue, 28 Jun 2022 13:24:13 +0200 -Subject: [PATCH] Update for 1.9.1 release. - ---- - CMakeLists.txt | 2 +- - NEWS.md | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13634302..3ded4094 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,7 @@ if (${CMAKE_VERSION} VERSION_LESS "3.17.0") - endif() - - project(libzip -- VERSION 1.9.0 -+ VERSION 1.9.1 - LANGUAGES C) - - option(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) -diff --git a/NEWS.md b/NEWS.md -index d8e1850b..78d663c7 100644 ---- a/NEWS.md -+++ b/NEWS.md -@@ -1,3 +1,8 @@ -+1.9.1 [2022-06-28] -+=================== -+ -+* Fix `zip_file_is_seekable()`. -+ - 1.9.0 [2022-06-13] - ================== - diff --git a/libzip.spec b/libzip.spec index 2d0d57a..54dacbd 100644 --- a/libzip.spec +++ b/libzip.spec @@ -20,9 +20,12 @@ %global libname libzip %global soname 5 +%if 0%{?fedora} >= 37 +%bcond_without tests +%else # missing nihtest -# see https://bugzilla.redhat.com/show_bug.cgi?id=2217257 %bcond_with tests +%endif %if 0%{?vendeur:1} && 0%{?rhel} >= 8 %bcond_without move_to_opt @@ -42,7 +45,7 @@ Name: %{libname} %endif %endif -Version: 1.10.0 +Version: 1.10.1 Release: 1%{?dist} Summary: C library for reading, creating, and modifying zip archives @@ -50,9 +53,6 @@ License: BSD-3-Clause URL: https://libzip.org/ Source0: https://libzip.org/download/libzip-%{version}.tar.xz -# Upstream patch -Patch0: libzip-tests.patch - BuildRequires: gcc BuildRequires: zlib-devel >= 1.1.2 BuildRequires: bzip2-devel @@ -68,7 +68,7 @@ BuildRequires: cmake >= 3.4 %endif BuildRequires: mandoc %if %{with tests} -BuildRequires: python3-nihtest +BuildRequires: nihtest %endif %if 0%{?rhel} == 7 @@ -167,8 +167,6 @@ The %{name}-tools package provides command line tools split off %{name}: %setup -q -n %{libname}-%{version} : ========== BUILD in %{_prefix} ========== -%patch -P0 -p1 -b .upstream - # unwanted in package documentation rm INSTALL.md @@ -282,6 +280,9 @@ make check %changelog +* Wed Aug 23 2023 Remi Collet - 1.10.1-1 +- update to 1.10.1 + * Fri Jun 23 2023 Remi Collet - 1.10.0-1 - update to 1.10.0 diff --git a/libzip.xml b/libzip.xml index c6a5fb1..0738b9d 100644 --- a/libzip.xml +++ b/libzip.xml @@ -9,7 +9,7 @@ -1.10.0 +1.10.1 -- cgit