From c5616ea1427c289fa9baf96b03f09fac38c9c1f6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Nov 2017 06:46:31 +0100 Subject: update to 1.3.1 drop multilib header hack --- 9879affbbdec684adb343b331f47f06788681e3b.patch | 63 --- compat_reports/1.3.0_to_1.3.1/compat_report.html | 530 +++++++++++++++++++++++ libzip.spec | 32 +- libzip.xml | 63 +++ zipconf.h | 23 - 5 files changed, 599 insertions(+), 112 deletions(-) delete mode 100644 9879affbbdec684adb343b331f47f06788681e3b.patch create mode 100644 compat_reports/1.3.0_to_1.3.1/compat_report.html create mode 100644 libzip.xml delete mode 100644 zipconf.h diff --git a/9879affbbdec684adb343b331f47f06788681e3b.patch b/9879affbbdec684adb343b331f47f06788681e3b.patch deleted file mode 100644 index a6a451e..0000000 --- a/9879affbbdec684adb343b331f47f06788681e3b.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 9879affbbdec684adb343b331f47f06788681e3b Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Fri, 6 Oct 2017 12:24:22 +0200 -Subject: [PATCH] nonrandomopen: override open64() as well. - ---- - regress/nonrandomopen.c | 32 +++++++++++++++++++++++++++++++- - 1 file changed, 31 insertions(+), 1 deletion(-) - -diff --git a/regress/nonrandomopen.c b/regress/nonrandomopen.c -index 4f74222..dd90c14 100644 ---- a/regress/nonrandomopen.c -+++ b/regress/nonrandomopen.c -@@ -47,7 +47,8 @@ - #endif - - static int inited = 0; --static int (*real_open)(const char *path, int mode, ...) = NULL; -+static int (*real_open)(const char *path, int flags, ...) = NULL; -+static int (*real_open64)(const char *path, int flags, ...) = NULL; - - static void - init(void) -@@ -55,6 +56,10 @@ init(void) - real_open = dlsym(RTLD_NEXT, "open"); - if (!real_open) - abort(); -+ real_open64 = dlsym(RTLD_NEXT, "open64"); -+ if (!real_open64) { -+ /* does not have to exist */ -+ } - inited = 1; - } - -@@ -78,3 +83,28 @@ open(const char *path, int flags, ...) - return real_open(path, flags, mode); - } - } -+ -+int -+open64(const char *path, int flags, ...) -+{ -+ va_list ap; -+ mode_t mode; -+ -+ if (!inited) { -+ init(); -+ } -+ -+ if (!real_open64) { -+ abort(); -+ } -+ -+ va_start(ap, flags); -+ mode = va_arg(ap, mode_t); -+ va_end(ap); -+ -+ if (strcmp(path, "/dev/urandom") == 0) { -+ return real_open64("/dev/zero", flags, mode); -+ } else { -+ return real_open64(path, flags, mode); -+ } -+} diff --git a/compat_reports/1.3.0_to_1.3.1/compat_report.html b/compat_reports/1.3.0_to_1.3.1/compat_report.html new file mode 100644 index 0000000..66da708 --- /dev/null +++ b/compat_reports/1.3.0_to_1.3.1/compat_report.html @@ -0,0 +1,530 @@ + + + + + + + + +libzip: 1.3.0 to 1.3.1 compatibility report + + + +

API compatibility report for the libzip library between 1.3.0 and 1.3.1 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibzip
Version #11.3.0
Version #21.3.1
Archx86_64
GCC Version6.4.1
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files3
Total Libraries1
Total Symbols / Types118 / 48
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-1
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Added Symbols  1 

+zip.h, libzip.so.5.0.0
+zip_libzip_version ( )
+
+to the top
+

Header Files  3 

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

Libraries  1 

+
+libzip.so.5.0.0
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibzip
Version #11.3.0
Version #21.3.1
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files3
Total Libraries1
Total Symbols / Types278 / 85
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-1
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low2
+ +

Added Symbols  1 

+zip.h
+zip_libzip_version ( )
+
+to the top
+ +

Problems with Constants, Low Severity  2 

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

Header Files  3 

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

Libraries  1 

+
+libzip.so.5.0.0
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.2   +
+
+ + diff --git a/libzip.spec b/libzip.spec index 61aec08..b262082 100644 --- a/libzip.spec +++ b/libzip.spec @@ -11,35 +11,25 @@ %global multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9 %global libname libzip %global soname 5 -%if 0%{?rhel} == 5 -# Perl is too old -%global with_tests 0 -%else %if %{?runselftest}%{!?runselftest:1} %global with_tests 0%{!?_without_tests:1} %else %global with_tests 0%{?_with_tests:1} %endif -%endif %if 0%{?fedora} >= 26 Name: %{libname} %else Name: %{libname}%{soname} %endif -Version: 1.3.0 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Group: System Environment/Libraries Summary: C library for reading, creating, and modifying zip archives License: BSD URL: http://www.nih.at/libzip/index.html Source0: http://www.nih.at/libzip/libzip-%{version}.tar.xz -# to handle multiarch headers, ex from mysql-devel package -Source1: zipconf.h - -# Upstream for 32-bit test suite -Patch0: 9879affbbdec684adb343b331f47f06788681e3b.patch BuildRequires: zlib-devel BuildRequires: bzip2-devel @@ -119,7 +109,6 @@ The %{name}-tools package provides command line tools split off %{name}: %prep %setup -q -n %{libname}-%{version} -%patch0 -p1 # Avoid lib64 rpaths (FIXME: recheck this on newer releases) %if "%{_libdir}" != "/usr/lib" @@ -141,17 +130,6 @@ make install DESTDIR=%{buildroot} INSTALL='install -p' ## unpackaged files rm -fv %{buildroot}%{_libdir}/lib*.la -## FIXME: someday fix consumers of libzip to properly handle -## header @ %%{_libdir}/libzip/include/zipconf.h -- rex -%ifarch %{multilib_archs} -ln -s ../%{_lib}/libzip/include/zipconf.h \ - %{buildroot}%{_includedir}/zipconf-%{__isa_bits}.h -install -D -m644 -p %{SOURCE1} %{buildroot}%{_includedir}/zipconf.h -%else -ln -s ../%{_lib}/libzip/include/zipconf.h \ - %{buildroot}%{_includedir}/zipconf.h -%endif - %check %if %{with_tests} @@ -181,8 +159,6 @@ make check %doc API-CHANGES AUTHORS THANKS *.md %{_includedir}/zip.h %{_includedir}/zipconf*.h -%dir %{_libdir}/libzip -%{_libdir}/libzip/include %{_libdir}/libzip.so %{_libdir}/pkgconfig/libzip.pc %{_mandir}/man3/libzip* @@ -191,6 +167,10 @@ make check %changelog +* Mon Nov 20 2017 Remi Collet - 1.3.1-1 +- update to 1.3.1 +- drop multilib header hack + * Fri Oct 6 2017 Remi Collet - 1.3.0-2 - test build diff --git a/libzip.xml b/libzip.xml new file mode 100644 index 0000000..15cfaec --- /dev/null +++ b/libzip.xml @@ -0,0 +1,63 @@ + + + + + + + + + +1.3.1 + + + + +/usr/include/zip.h +/usr/include/zipconf.h + + + + +/usr/lib64/libzip.so + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/zipconf.h b/zipconf.h deleted file mode 100644 index 4de5c8d..0000000 --- a/zipconf.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Kluge to support multilib installation of both 32 and 64-bit RPMS: - * we need to arrange that header files that appear in both RPMs are - * identical. Hence, this file is architecture-independent and calls - * in an arch-dependent file that will appear in just one RPM. - * - * To avoid breaking arches not explicitly supported by Fedora, we - * use this indirection file *only* on known multilib arches. - * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */ - -#ifndef ZIPCONF_MULTILIB_H -#define ZIPCONF_MULTILIB_H - -#include -#if __WORDSIZE == 32 -#include "zipconf-32.h" -#elif __WORDSIZE == 64 -#include "zipconf-64.h" -#else -#error "unexpected value for __WORDSIZE macro" -#endif - -#endif -- cgit