diff -Nru libzip-1.3.2/debian/changelog libzip-1.5.0/debian/changelog --- libzip-1.3.2/debian/changelog 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/changelog 2018-04-03 20:51:36.000000000 +1000 @@ -1,3 +1,28 @@ +libzip (1.5.0-0ubuntu1) bionic; urgency=medium + + * New upstream release + - Removes custom AES implementation in favour of using standard crypto libs + * Build with cmake, autotools support was dropped. + * Bump debhelper to compat 11 + * debian/control + - Add Build-dep on libssl-dev and libbz2-dev + * debian/libzip5.symbols: Update with new symbols + * debian/patches: + - 000*.patch: Cherry-pick upstream patches to fix RPATH, man page syntax + errors, leaking private symbols and pkg-config file + * debian/rules: + - Clean up Multi-arch support + - set dh_missing to --fail-missing + - Drop flags obsolete with dh 11 + - Strip -Bsymbolic-functions link flag as it causes test failures + * debian/libzip-dev.install: don't install static lib, its not built now + * debian/libzip5.lintian-overrides: + - override possible-gpl-code-linked-with-openssl, libzip is BSD licensed + only the debian packaging is licensed under GPLv3 + * debian/copyright: Update to reflect removed code + + -- Tim Lunn Tue, 03 Apr 2018 20:51:36 +1000 + libzip (1.3.2-1) experimental; urgency=medium * Update to upstream version 1.3.2 (Closes: #881877) diff -Nru libzip-1.3.2/debian/compat libzip-1.5.0/debian/compat --- libzip-1.3.2/debian/compat 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/compat 2018-04-03 20:51:36.000000000 +1000 @@ -1 +1 @@ -9 +11 diff -Nru libzip-1.3.2/debian/control libzip-1.5.0/debian/control --- libzip-1.3.2/debian/control 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/control 2018-04-03 20:51:36.000000000 +1000 @@ -2,8 +2,10 @@ Priority: optional Maintainer: Stefan Schörghofer Uploaders: Ondřej Surý -Build-Depends: debhelper (>= 9), - dh-autoreconf, +Build-Depends: cmake, + debhelper (>= 11), + libbz2-dev, + libssl-dev, unzip, zlib1g-dev, mandoc diff -Nru libzip-1.3.2/debian/copyright libzip-1.5.0/debian/copyright --- libzip-1.3.2/debian/copyright 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/copyright 2018-04-03 20:51:36.000000000 +1000 @@ -25,12 +25,6 @@ Copyright (C) 1987-2002 The Regents of the University of California. All rights reserved. -Copyright for gladman-fcrypt: -Files: lib/gladman-fcrypt/* - - Copyright (C) 2002, Dr Brian Gladman < >, Worcester, UK. - All rights reserved. - License: Redistribution and use in source and binary forms, with or without @@ -58,31 +52,6 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License gladman-fcrypt: - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - ALTERNATIVELY, provided that this notice is retained in full, this product - may be distributed under the terms of the GNU General Public License (GPL), - in which case the provisions of the GPL apply INSTEAD OF those given above. - - DISCLAIMER - - This software is provided 'as is' with no explicit or implied warranties - in respect of its properties, including, but not limited to, correctness - and/or fitness for purpose. - The Debian packaging is: Copyright (C) 2007-2010 Fathi Boudra diff -Nru libzip-1.3.2/debian/docs libzip-1.5.0/debian/docs --- libzip-1.3.2/debian/docs 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/docs 2018-04-03 20:51:36.000000000 +1000 @@ -1,3 +1,3 @@ -API-CHANGES +API-CHANGES.md README.md TODO.md diff -Nru libzip-1.3.2/debian/libzip5.lintian-overrides libzip-1.5.0/debian/libzip5.lintian-overrides --- libzip-1.3.2/debian/libzip5.lintian-overrides 1970-01-01 10:00:00.000000000 +1000 +++ libzip-1.5.0/debian/libzip5.lintian-overrides 2018-04-03 20:51:36.000000000 +1000 @@ -0,0 +1,2 @@ +#libzip is BSD licensed only the Debian packging is GPLv3 +libzip5: possible-gpl-code-linked-with-openssl diff -Nru libzip-1.3.2/debian/libzip5.symbols libzip-1.5.0/debian/libzip5.symbols --- libzip-1.3.2/debian/libzip5.symbols 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/libzip5.symbols 2018-04-03 20:51:36.000000000 +1000 @@ -1,5 +1,4 @@ libzip.so.5 libzip5 #MINVER# - zip_libzip_version@Base 1.3.2 zip_add@Base 0.10 zip_add_dir@Base 0.10 zip_close@Base 0.10 @@ -55,9 +54,11 @@ zip_get_name@Base 0.10 zip_get_num_entries@Base 0.10 zip_get_num_files@Base 0.10 + zip_libzip_version@Base 1.5.0 zip_name_locate@Base 0.10 zip_open@Base 0.10 zip_open_from_source@Base 1.0 + zip_random@Base 1.5.0 zip_register_progress_callback@Base 1.3.0 zip_register_progress_callback_with_state@Base 1.3.0 zip_rename@Base 0.10 @@ -68,8 +69,11 @@ zip_set_file_comment@Base 0.10 zip_set_file_compression@Base 0.11.2 zip_source_begin_write@Base 1.0 + zip_source_begin_write_cloning@Base 1.5.0 zip_source_buffer@Base 0.10 zip_source_buffer_create@Base 1.0 + zip_source_buffer_fragment@Base 1.5.0 + zip_source_buffer_fragment_create@Base 1.5.0 zip_source_close@Base 1.0 zip_source_commit_write@Base 1.0 zip_source_error@Base 1.0 diff -Nru libzip-1.3.2/debian/libzip-dev.install libzip-1.5.0/debian/libzip-dev.install --- libzip-1.3.2/debian/libzip-dev.install 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/libzip-dev.install 2018-04-03 20:51:36.000000000 +1000 @@ -1,6 +1,5 @@ usr/include/zip.h usr/include/zipconf.h -usr/lib/*/libzip.a usr/lib/*/libzip.so usr/lib/*/pkgconfig/libzip.pc usr/share/man/man3/* diff -Nru libzip-1.3.2/debian/patches/0001-regen-man-pages-with-fixed-mandoc.patch libzip-1.5.0/debian/patches/0001-regen-man-pages-with-fixed-mandoc.patch --- libzip-1.3.2/debian/patches/0001-regen-man-pages-with-fixed-mandoc.patch 1970-01-01 10:00:00.000000000 +1000 +++ libzip-1.5.0/debian/patches/0001-regen-man-pages-with-fixed-mandoc.patch 2018-04-03 20:51:36.000000000 +1000 @@ -0,0 +1,204 @@ +From: Thomas Klausner +Date: Thu, 5 Apr 2018 11:14:13 +0200 +Subject: regen man pages with fixed mandoc + +Addresses man page syntax problem reported in +https://github.com/nih-at/libzip/pull/42 +--- + man/zip_errors.man | 64 ++++++++++++++++---------------- + man/zip_file_get_external_attributes.man | 1 + + man/zip_ftell.man | 1 + + man/zip_libzip_version.man | 2 +- + man/ziptool.man | 4 +- + 5 files changed, 37 insertions(+), 35 deletions(-) + +diff --git a/man/zip_errors.man b/man/zip_errors.man +index 45f8735..714d4ae 100644 +--- a/man/zip_errors.man ++++ b/man/zip_errors.man +@@ -10,100 +10,100 @@ libzip (-lzip) + \fB#include \fR + .SH "DESCRIPTION" + The following error codes are used by libzip: +-.TP 23n ++.TP 26n + [\fRZIP_ER_CHANGED\fR] + Entry has been changed. +-.TP 23n ++.TP 26n + [\fRZIP_ER_CLOSE\fR] + Closing zip archive failed. +-.TP 23n ++.TP 26n + [\fRZIP_ER_COMPNOTSUPP\fR] + Compression method not supported. +-.TP 23n ++.TP 26n + [\fRZIP_ER_COMPRESSED_DATA\fR] + Compressed data invalid. +-.TP 23n ++.TP 26n + [\fRZIP_ER_CRC\fR] + CRC error. +-.TP 23n ++.TP 26n + [\fRZIP_ER_DELETED\fR] + Entry has been deleted. +-.TP 23n ++.TP 26n + [\fRZIP_ER_ENCRNOTSUPP\fR] + Encryption method not supported. +-.TP 23n ++.TP 26n + [\fRZIP_ER_EOF\fR] + Premature end of file. +-.TP 23n ++.TP 26n + [\fRZIP_ER_EXISTS\fR] + File already exists. +-.TP 23n ++.TP 26n + [\fRZIP_ER_INCONS\fR] + Zip archive inconsistent. +-.TP 23n ++.TP 26n + [\fRZIP_ER_INTERNAL\fR] + Internal error. +-.TP 23n ++.TP 26n + [\fRZIP_ER_INUSE\fR] + Resource still in use. +-.TP 23n ++.TP 26n + [\fRZIP_ER_INVAL\fR] + Invalid argument. +-.TP 23n ++.TP 26n + [\fRZIP_ER_MEMORY\fR] + Malloc failure. +-.TP 23n ++.TP 26n + [\fRZIP_ER_MULTIDISK\fR] + Multi-disk zip archives not supported. +-.TP 23n ++.TP 26n + [\fRZIP_ER_NOENT\fR] + No such file. +-.TP 23n ++.TP 26n + [\fRZIP_ER_NOPASSWD\fR] + No password provided. +-.TP 23n ++.TP 26n + [\fRZIP_ER_NOZIP\fR] + Not a zip archive. +-.TP 23n ++.TP 26n + [\fRZIP_ER_OK\fR] + No error. +-.TP 23n ++.TP 26n + [\fRZIP_ER_OPEN\fR] + Can't open file. +-.TP 23n ++.TP 26n + [\fRZIP_ER_OPNOTSUPP\fR] + Operation not supported. +-.TP 23n ++.TP 26n + [\fRZIP_ER_RDONLY\fR] + Read-only archive. +-.TP 23n ++.TP 26n + [\fRZIP_ER_READ\fR] + Read error. +-.TP 23n ++.TP 26n + [\fRZIP_ER_REMOVE\fR] + Can't remove file. +-.TP 23n ++.TP 26n + [\fRZIP_ER_RENAME\fR] + Renaming temporary file failed. +-.TP 23n ++.TP 26n + [\fRZIP_ER_SEEK\fR] + Seek error. +-.TP 23n ++.TP 26n + [\fRZIP_ER_TELL\fR] + Tell error. +-.TP 23n ++.TP 26n + [\fRZIP_ER_TMPOPEN\fR] + Failure to create temporary file. +-.TP 23n ++.TP 26n + [\fRZIP_ER_WRITE\fR] + Write error. +-.TP 23n ++.TP 26n + [\fRZIP_ER_WRONGPASSWD\fR] + Wrong password provided. +-.TP 23n ++.TP 26n + [\fRZIP_ER_ZIPCLOSED\fR] + Containing zip archive was closed. +-.TP 23n ++.TP 26n + [\fRZIP_ER_ZLIB\fR] + Zlib error. + .SH "AUTHORS" +diff --git a/man/zip_file_get_external_attributes.man b/man/zip_file_get_external_attributes.man +index c2429f8..0c4801e 100644 +--- a/man/zip_file_get_external_attributes.man ++++ b/man/zip_file_get_external_attributes.man +@@ -10,6 +10,7 @@ libzip (-lzip) + \fB#include \fR + .sp + \fIint\fR ++.br + .PD 0 + .HP 4n + \fBzip_file_get_external_attributes\fR(\fIzip_t\ *archive\fR, \fIzip_uint64_t\ index\fR, \fIzip_flags_t\ flags\fR, \fIzip_uint8_t\ *opsys\fR, \fIzip_uint32_t\ *attributes\fR); +diff --git a/man/zip_ftell.man b/man/zip_ftell.man +index 7baa856..7951ba3 100644 +--- a/man/zip_ftell.man ++++ b/man/zip_ftell.man +@@ -10,6 +10,7 @@ libzip (-lzip) + \fB#include \fR + .sp + \fIzip_int64_t\fR ++.br + .PD 0 + .HP 4n + \fBzip_ftell\fR(\fIzip_file_t\ *file\fR); +diff --git a/man/zip_libzip_version.man b/man/zip_libzip_version.man +index 864be71..6628436 100644 +--- a/man/zip_libzip_version.man ++++ b/man/zip_libzip_version.man +@@ -18,7 +18,7 @@ libzip (-lzip) + .SH "DESCRIPTION" + \fBzip_libzip_version\fR + returns the version number of the library as string in the format +-\(Lq$MAJOR.$MINOR.$MICRO$SUFFIX\(Rq ++\(lq$MAJOR.$MINOR.$MICRO$SUFFIX\(rq + where + \fI$MAJOR\fR + is the major version, +diff --git a/man/ziptool.man b/man/ziptool.man +index 0037dd7..b3d10fc 100644 +--- a/man/ziptool.man ++++ b/man/ziptool.man +@@ -325,9 +325,9 @@ Add a file called + to the zip archive + \fItestbuffer.zip\fR + with data +-\(LqThis is a test.\en\(Rq ++\(lqThis is a test.\en\(rq + where +-\(Lq\en\(Rq ++\(lq\en\(rq + is replaced with a newline character: + .nf + .sp diff -Nru libzip-1.3.2/debian/patches/0002-cmake-add-visibility-handling.patch libzip-1.5.0/debian/patches/0002-cmake-add-visibility-handling.patch --- libzip-1.3.2/debian/patches/0002-cmake-add-visibility-handling.patch 1970-01-01 10:00:00.000000000 +1000 +++ libzip-1.5.0/debian/patches/0002-cmake-add-visibility-handling.patch 2018-04-03 20:51:36.000000000 +1000 @@ -0,0 +1,21 @@ +From: Thomas Klausner +Date: Fri, 6 Apr 2018 10:53:19 +0200 +Subject: cmake: add visibility handling + +--- + lib/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index be4db6d..7838c8c 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -2,6 +2,8 @@ INCLUDE(CheckFunctionExists) + + INSTALL(FILES zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + ++SET(CMAKE_C_VISIBILITY_PRESET hidden) ++ + # from http://www.cmake.org/Wiki/CMakeMacroLibtoolFile + MACRO(GET_TARGET_PROPERTY_WITH_DEFAULT _variable _target _property _default_value) + GET_TARGET_PROPERTY(${_variable} ${_target} ${_property}) diff -Nru libzip-1.3.2/debian/patches/0003-Don-t-set-RPATH-on-installed-libraries-on-Linux.patch libzip-1.5.0/debian/patches/0003-Don-t-set-RPATH-on-installed-libraries-on-Linux.patch --- libzip-1.3.2/debian/patches/0003-Don-t-set-RPATH-on-installed-libraries-on-Linux.patch 1970-01-01 10:00:00.000000000 +1000 +++ libzip-1.5.0/debian/patches/0003-Don-t-set-RPATH-on-installed-libraries-on-Linux.patch 2018-04-03 20:51:36.000000000 +1000 @@ -0,0 +1,25 @@ +From: Tim Lunn +Date: Thu, 5 Apr 2018 13:46:08 +1000 +Subject: Don't set RPATH on installed libraries on Linux + +--- + CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5f19291..a1ef22d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -212,8 +212,10 @@ endif(WIN32) + ADD_DEFINITIONS("-DHAVE_CONFIG_H") + + # rpath handling: use rpath in installed binaries +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++IF(NOT CMAKE_SYSTEM_NAME MATCHES Linux) ++ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++ENDIF(NOT CMAKE_SYSTEM_NAME MATCHES Linux) + + # Testing + ENABLE_TESTING() diff -Nru libzip-1.3.2/debian/patches/0004-pkg-config-Use-Libs.private-for-link-dependencies.patch libzip-1.5.0/debian/patches/0004-pkg-config-Use-Libs.private-for-link-dependencies.patch --- libzip-1.3.2/debian/patches/0004-pkg-config-Use-Libs.private-for-link-dependencies.patch 1970-01-01 10:00:00.000000000 +1000 +++ libzip-1.5.0/debian/patches/0004-pkg-config-Use-Libs.private-for-link-dependencies.patch 2018-04-03 20:51:36.000000000 +1000 @@ -0,0 +1,22 @@ +From: Martin Herkt <652892+lachs0r@users.noreply.github.com> +Date: Tue, 3 Apr 2018 02:49:40 +0200 +Subject: pkg-config: Use Libs.private for link dependencies + +Fixes #38 +--- + libzip.pc.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libzip.pc.in b/libzip.pc.in +index 7be7f3e..c2565a8 100644 +--- a/libzip.pc.in ++++ b/libzip.pc.in +@@ -9,6 +9,7 @@ zipcmp=@bindir@/zipcmp + Name: libzip + Description: library for handling zip archives + Version: @VERSION@ +-Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip @LIBS@ ++Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip ++Libs.private: @LIBS@ + Cflags: -I${includedir} + diff -Nru libzip-1.3.2/debian/patches/series libzip-1.5.0/debian/patches/series --- libzip-1.3.2/debian/patches/series 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/patches/series 2018-04-03 20:51:36.000000000 +1000 @@ -1 +1,4 @@ -# empty file +0001-regen-man-pages-with-fixed-mandoc.patch +0002-cmake-add-visibility-handling.patch +0003-Don-t-set-RPATH-on-installed-libraries-on-Linux.patch +0004-pkg-config-Use-Libs.private-for-link-dependencies.patch diff -Nru libzip-1.3.2/debian/rules libzip-1.5.0/debian/rules --- libzip-1.3.2/debian/rules 2017-11-21 07:39:26.000000000 +1100 +++ libzip-1.5.0/debian/rules 2018-04-03 20:51:36.000000000 +1000 @@ -3,14 +3,20 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?=. +# Linking with -Bsymbolic-functions causes test failures +export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: - dh $@ --parallel --list-missing --with autoreconf + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) -override_dh_link: - install -d debian/libzip-dev/usr/include/${DEB_HOST_MULTIARCH} - dh_link override_dh_installchangelogs: dh_installchangelogs NEWS.md + +override_dh_missing: + dh_missing --fail-missing