Hello community, here is the log from the commit of package libzip for openSUSE:Factory checked in at 2018-03-26 11:52:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzip (Old) and /work/SRC/openSUSE:Factory/.libzip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzip" Mon Mar 26 11:52:24 2018 rev:33 rq:588459 version:1.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libzip/libzip.changes 2017-12-21 11:26:11.796755998 +0100 +++ /work/SRC/openSUSE:Factory/.libzip.new/libzip.changes 2018-03-26 11:52:30.293671173 +0200 @@ -1,0 +2,23 @@ +Mon Mar 19 08:16:51 UTC 2018 - [email protected] + +- Enable tests again +- Enable more functionality by updating dependencies +- Deduplicate manpages + +------------------------------------------------------------------- +Mon Mar 12 23:28:56 UTC 2018 - [email protected] + +- update to version 1.5.0: + * Use standard cryptographic library instead of custom AES + implementation. This also simplifies the license. +- includes 1.4.0: + * Improve build with cmake (retires autoconf/automake) + * Add zip_source_buffer_fragment(). + * Add support to clone unchanged beginning of archive (instead + of rewriting it). Supported for buffer sources and on AFS. +- rebase libzip-ocloexec.patch +- drop libzip-uninitialized-value.patch + * merged in 8609c9ce6c8e613a7b5825e4d0eba8a31fe67e75 +- cleanup with spec-cleaner + +------------------------------------------------------------------- Old: ---- libzip-1.3.2.tar.gz libzip-uninitialized-value.patch New: ---- libzip-1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzip.spec ++++++ --- /var/tmp/diff_new_pack.gwxtjh/_old 2018-03-26 11:52:31.425630335 +0200 +++ /var/tmp/diff_new_pack.gwxtjh/_new 2018-03-26 11:52:31.425630335 +0200 @@ -1,7 +1,7 @@ # # spec file for package libzip # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,26 +18,25 @@ %define sover 5 Name: libzip -Version: 1.3.2 +Version: 1.5.0 Release: 0 Summary: C library for reading, creating, and modifying zip archives License: BSD-3-Clause Group: Development/Libraries/C and C++ -Url: https://libzip.org/ +URL: https://libzip.org/ Source0: https://libzip.org/download/libzip-%{version}.tar.gz Source1: baselibs.conf -# PATCH-FIX-OPENSUSE: close on exec, upstream is aware, will be probably fixes next release +# PATCH-FIX-OPENSUSE: close on exec, upstream is aware Patch1: libzip-ocloexec.patch -# https://github.com/nih-at/libzip/commit/8609c9ce6c8e613a7b5825e4d0eba8a31fe67e75 -Patch2: libzip-uninitialized-value.patch -BuildRequires: automake -BuildRequires: libtool +BuildRequires: cmake +BuildRequires: fdupes +BuildRequires: libbz2-devel +BuildRequires: openssl-devel BuildRequires: pkgconfig # for tests BuildRequires: timezone # for tests BuildRequires: unzip -BuildRequires: xz BuildRequires: zlib-devel Provides: libzip-util = %{version} Obsoletes: libzip-util < %{version} @@ -81,55 +80,42 @@ archives, and merging multiple archives together, respectively. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build -autoreconf -fi -%configure \ - --disable-static -%if %{do_profiling} - make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" - TZ=Europe/Vienna make %{?_smp_mflags} check VERBOSE=1 - make clean - make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" -%else - make %{?_smp_mflags} CFLAGS="%{optflags}" -%endif - -%check -TZ=Europe/Vienna make %{?_smp_mflags} check VERBOSE=1 +%cmake %install -%make_install -install -Dpm 0644 lib/zipconf.h %{buildroot}/%{_includedir}/zipconf.h +%cmake_install rm -f %{buildroot}%{_libdir}/libzip.la +%fdupes %{buildroot}%{_mandir}/man3 + +%check +# path needs to be exported otherwise unit tests will fail +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} +%ctest %post -n libzip%{sover} -p /sbin/ldconfig %postun -n libzip%{sover} -p /sbin/ldconfig %files tools -%defattr(-,root,root) %{_bindir}/zipcmp %{_bindir}/zipmerge %{_bindir}/ziptool -%{_mandir}/man1/zipcmp.1%{ext_man} -%{_mandir}/man1/zipmerge.1%{ext_man} -%{_mandir}/man1/ziptool.1%{ext_man} +%{_mandir}/man1/zipcmp.1%{?ext_man} +%{_mandir}/man1/zipmerge.1%{?ext_man} +%{_mandir}/man1/ziptool.1%{?ext_man} %files -n libzip%{sover} -%defattr(-,root,root) -%doc LICENSE +%license LICENSE %{_libdir}/libzip.so.%{sover}* %files devel -%defattr(-,root,root) -%doc AUTHORS API-CHANGES NEWS.md THANKS +%doc AUTHORS NEWS.md THANKS %{_libdir}/%{name}.so %{_includedir}/zip.h %{_includedir}/zipconf.h %{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man3/*.3%{ext_man} +%{_mandir}/man3/*.3%{?ext_man} %changelog ++++++ libzip-1.3.2.tar.gz -> libzip-1.5.0.tar.gz ++++++ ++++ 82195 lines of diff (skipped) ++++++ libzip-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.gwxtjh/_old 2018-03-26 11:52:31.981610277 +0200 +++ /var/tmp/diff_new_pack.gwxtjh/_new 2018-03-26 11:52:31.985610133 +0200 @@ -1,13 +1,7 @@ ---- - lib/zip_source_filep.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -Index: libzip-1.2.0/lib/zip_source_filep.c -=================================================================== ---- libzip-1.2.0.orig/lib/zip_source_filep.c 2016-12-31 13:39:23.000000000 +0100 -+++ libzip-1.2.0/lib/zip_source_filep.c 2017-02-20 08:42:53.406688474 +0100 -@@ -42,10 +42,7 @@ - #include <unistd.h> +--- a/lib/zip_source_filep.c 2016-12-31 13:39:23.000000000 +0100 ++++ b/lib/zip_source_filep.c 2017-02-20 08:42:53.406688474 +0100 +@@ -53,10 +53,7 @@ + #define CAN_CLONE #endif -#ifdef _WIN32 @@ -17,21 +11,21 @@ /* Windows sys/types.h does not provide these */ #ifndef S_ISREG -@@ -232,7 +229,7 @@ create_temp_output(struct read_file *ctx +@@ -254,7 +251,7 @@ sprintf(temp, "%s.XXXXXX", ctx->fname); mask = umask(_SAFE_MASK); -- if ((tfd=mkstemp(temp)) == -1) { -+ if ((tfd=mkostemp(temp, O_CLOEXEC)) == -1) { - zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno); +- if ((tfd = mkstemp(temp)) == -1) { ++ if ((tfd = mkostemp(temp, O_CLOEXEC)) == -1) { + zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno); umask(mask); - free(temp); -@@ -323,7 +320,7 @@ read_file(void *state, void *data, zip_u + free(temp); +@@ -449,7 +446,7 @@ - case ZIP_SOURCE_OPEN: - if (ctx->fname) { -- if ((ctx->f=fopen(ctx->fname, "rb")) == NULL) { -+ if ((ctx->f=fopen(ctx->fname, "rbe")) == NULL) { - zip_error_set(&ctx->error, ZIP_ER_OPEN, errno); - return -1; - } + case ZIP_SOURCE_OPEN: + if (ctx->fname) { +- if ((ctx->f = fopen(ctx->fname, "rb")) == NULL) { ++ if ((ctx->f = fopen(ctx->fname, "rbe")) == NULL) { + zip_error_set(&ctx->error, ZIP_ER_OPEN, errno); + return -1; + }
