diff options
| -rw-r--r-- | compat_reports/1.4.0_to_1.5.0/compat_report.html | 518 | ||||
| -rw-r--r-- | libzip-multilib.patch | 218 | ||||
| -rw-r--r-- | libzip-upstream.patch | 140 | ||||
| -rw-r--r-- | libzip.spec | 18 | ||||
| -rw-r--r-- | libzip.xml | 2 |
5 files changed, 528 insertions, 368 deletions
diff --git a/compat_reports/1.4.0_to_1.5.0/compat_report.html b/compat_reports/1.4.0_to_1.5.0/compat_report.html new file mode 100644 index 0000000..591b60e --- /dev/null +++ b/compat_reports/1.4.0_to_1.5.0/compat_report.html @@ -0,0 +1,518 @@ +<!-- kind:binary;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:0;tool_version:2.2 --> +<!-- kind:source;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:2;tool_version:2.2 --> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="keywords" content="libzip, compatibility, API, ABI, report" /> +<meta name="description" content="API/ABI compatibility report for the libzip library between 1.4.0 and 1.5.0 versions" /> +<title>libzip: 1.4.0 to 1.5.0 compatibility report</title> +<style type="text/css"> +body { + font-family:Arial, sans-serif; + background-color:White; + color:Black; +} +hr { + color:Black; + background-color:Black; + height:1px; + border:0; +} +h1 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.625em; +} +h2 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.25em; + white-space:nowrap; +} +span.section { + font-weight:bold; + cursor:pointer; + color:#003E69; + white-space:nowrap; + margin-left:0.3125em; +} +span.new_sign { + font-weight:bold; + margin-left:1.65em; + color:#003E69; +} +span.new_sign_lbl { + margin-left:3em; + font-size:1em; + color:Black; +} +span:hover.section { + color:#336699; +} +span.sect_aff { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:#cc3300; +} +span.sect_info { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:Black; +} +span.ext { + font-weight:normal; +} +span.h_name { + color:#cc3300; + font-size:0.875em; + font-weight:bold; +} +div.h_list, div.lib_list { + font-size:0.94em; + padding-left:0.4em; +} +span.ns { + color:#408080; + font-size:0.94em; +} +span.lib_name { + color:Green; + font-size:0.875em; + font-weight:bold; +} +span.iname { + font-weight:bold; + color:#003E69; + margin-left:0.3125em; +} +span.iname_b { + font-weight:bold; +} +span.iname_a { + color:#333333; + font-weight:bold; + font-size:0.94em; +} +span.sym_p { + font-weight:normal; + white-space:normal; +} +span.sym_pd { + white-space:normal; +} +span.sym_p span, span.sym_pd span { + white-space:nowrap; +} +div.affect { + padding-left:1em; + padding-bottom:10px; + font-size:0.87em; + font-style:italic; + line-height:0.9em; +} +div.affected { + padding-left:1.9em; + padding-top:10px; +} +table.ptable { + border-collapse:collapse; + border:1px outset black; + margin-left:0.95em; + margin-top:3px; + margin-bottom:3px; + width:56.25em; +} +table.ptable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + text-align:left; + vertical-align:top; + max-width:28em; + word-wrap:break-word; +} +table.ptable th.pn { + width:2%; +} +table.ptable th.chg { + width:47%; +} +table.vtable { + border-collapse:collapse; + border:1px outset black; + margin-left:1.9em; + margin-top:0.7em; +} +table.vtable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + vertical-align:top; + max-width:450px; + word-wrap:break-word; +} +table.ptable th, table.vtable th { + background-color:#eeeeee; + font-weight:bold; + color:#333333; + font-family:Verdana, Arial; + font-size:0.875em; + border:1px solid gray; + text-align:center; + vertical-align:top; + white-space:nowrap; + padding:3px; +} +table.summary { + border-collapse:collapse; + border:1px outset black; +} +table.summary th { + background-color:#eeeeee; + font-weight:normal; + text-align:left; + font-size:0.94em; + white-space:nowrap; + border:1px inset gray; + padding:3px; +} +table.summary td { + text-align:right; + white-space:nowrap; + border:1px inset gray; + padding:3px 5px 3px 10px; +} +span.mngl { + padding-left:1em; + font-size:0.875em; + cursor:text; + color:#444444; + font-weight:bold; +} +span.pleft { + padding-left:2.5em; +} +span.sym_ver { + color:#333333; + white-space:nowrap; + font-family:"DejaVu Sans Mono", Monospace; +} +span.attr { + color:#333333; + font-weight:normal; +} +span.color_p { + font-style:italic; + color:Brown; +} +span.p { + font-style:italic; +} +span.fp { + font-style:italic; + background-color:#DCDCDC; +} +span.ttype { + font-weight:normal; +} +span.nowrap { + white-space:nowrap; +} +span.value { + font-weight:bold; +} +.passed { + background-color:#CCFFCC; + font-weight:normal; +} +.warning { + background-color:#F4F4AF; + font-weight:normal; +} +.failed { + background-color:#FFCCCC; + font-weight:normal; +} +.new { + background-color:#C6DEFF; + font-weight:normal; +} +.compatible { + background-color:#CCFFCC; + font-weight:normal; +} +.almost_compatible { + background-color:#FFDAA3; + font-weight:normal; +} +.incompatible { + background-color:#FFCCCC; + font-weight:normal; +} +.gray { + background-color:#DCDCDC; + font-weight:normal; +} +.top_ref { + font-size:0.69em; +} +.footer { + font-size:0.75em; +} + +.tabset { + float:left; +} +a.tab { + border:1px solid Black; + float:left; + margin:0px 5px -1px 0px; + padding:3px 5px 3px 5px; + position:relative; + font-size:0.875em; + background-color:#DDD; + text-decoration:none; + color:Black; +} +a.disabled:hover +{ + color:Black; + background:#EEE; +} +a.active:hover +{ + color:Black; + background:White; +} +a.active { + border-bottom-color:White; + background-color:White; +} +div.tab { + border-top:1px solid Black; + padding:0px; + width:100%; + clear:both; +} +</style> +<script type="text/javascript" language="JavaScript"> +<!-- +function showContent(header, id) +{ + e = document.getElementById(id); + if(e.style.display == 'none') + { + e.style.display = 'block'; + e.style.visibility = 'visible'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[−]"); + } + else + { + e.style.display = 'none'; + e.style.visibility = 'hidden'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[+]"); + } +} +function initTabs() +{ + var url = window.location.href; + if(url.indexOf('_Source_')!=-1 || url.indexOf('#Source')!=-1) + { + var tab1 = document.getElementById('BinaryID'); + var tab2 = document.getElementById('SourceID'); + tab1.className='tab disabled'; + tab2.className='tab active'; + } + var sets = document.getElementsByTagName('div'); + for (var i = 0; i < sets.length; i++) + { + if (sets[i].className.indexOf('tabset') != -1) + { + var tabs = []; + var links = sets[i].getElementsByTagName('a'); + for (var j = 0; j < links.length; j++) + { + if (links[j].className.indexOf('tab') != -1) + { + tabs.push(links[j]); + links[j].tabs = tabs; + var tab = document.getElementById(links[j].href.substr(links[j].href.indexOf('#') + 1)); + //reset all tabs on start + if (tab) + { + if (links[j].className.indexOf('active')!=-1) { + tab.style.display = 'block'; + } + else { + tab.style.display = 'none'; + } + } + links[j].onclick = function() + { + var tab = document.getElementById(this.href.substr(this.href.indexOf('#') + 1)); + if (tab) + { + //reset all tabs before change + for (var k = 0; k < this.tabs.length; k++) + { + document.getElementById(this.tabs[k].href.substr(this.tabs[k].href.indexOf('#') + 1)).style.display = 'none'; + this.tabs[k].className = this.tabs[k].className.replace('active', 'disabled'); + } + this.className = 'tab active'; + tab.style.display = 'block'; + // window.location.hash = this.id.replace('ID', ''); + return false; + } + } + } + } + } + } + if(url.indexOf('#')!=-1) { + location.href=location.href; + } +} +if (window.addEventListener) window.addEventListener('load', initTabs, false); +else if (window.attachEvent) window.attachEvent('onload', initTabs); +--> +</script> +</head> +<body><a name='Source'></a><a name='Binary'></a><a name='Top'></a><h1>API compatibility report for the <span style='color:Blue;'>libzip</span> library between <span style='color:Red;'>1.4.0</span> and <span style='color:Red;'>1.5.0</span> versions on <span style='color:Blue;'>x86_64</span></h1> + + <br/> + <div class='tabset'> + <a id='BinaryID' href='#BinaryTab' class='tab active'>Binary<br/>Compatibility</a> + <a id='SourceID' href='#SourceTab' style='margin-left:3px' class='tab disabled'>Source<br/>Compatibility</a> + </div><div id='BinaryTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libzip</td></tr> +<tr><th>Version #1</th><td>1.4.0</td></tr> +<tr><th>Version #2</th><td>1.5.0</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>GCC Version</th><td>7</td></tr> +<tr><th>Subject</th><td width='150px'>Binary Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>2</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>122 / 49</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr> +</table> + +<a name='Headers'></a><h2>Header Files <span class='gray'> 2 </span></h2><hr/> +<div class='h_list'> +zip.h<br/> +zipconf.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libzip.so.5.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><div id='SourceTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libzip</td></tr> +<tr><th>Version #1</th><td>1.4.0</td></tr> +<tr><th>Version #2</th><td>1.5.0</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>Subject</th><td width='150px'>Source Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>2</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>276 / 82</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td class='warning'><a href='#Constant_Source_Problems_Low' style='color:Blue;'>2</a></td></tr> +</table> + +<a name='Low_Risk_Source_Problems'></a><a name='Constant_Source_Problems_Low'></a> +<h2>Problems with Constants, Low Severity <span class='warning'> 2 </span></h2><hr/> +<span class='h_name'>zipconf.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_1')"> +<span class='ext'>[+]</span> LIBZIP_VERSION</span> +<br/> +<div id="c_1" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The value of constant <b>LIBZIP_VERSION</b> has been changed from <b>"1.4.0"</b> to <b>"1.5.0"</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_2')"> +<span class='ext'>[+]</span> LIBZIP_VERSION_MINOR</span> +<br/> +<div id="c_2" style="display:none;"> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>The value of constant <b>LIBZIP_VERSION_MINOR</b> has been changed from <b>4</b> to <b>5</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Headers'></a><h2>Header Files <span class='gray'> 2 </span></h2><hr/> +<div class='h_list'> +zip.h<br/> +zipconf.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libzip.so.5.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><hr/> +<div class='footer' align='right'><i>Generated by <a href='https://github.com/lvc/abi-compliance-checker'>ABI Compliance Checker</a> 2.2  </i> +</div> +<br/> + +</body></html> diff --git a/libzip-multilib.patch b/libzip-multilib.patch deleted file mode 100644 index 175698b..0000000 --- a/libzip-multilib.patch +++ /dev/null @@ -1,218 +0,0 @@ -From 72440acea2369d3903ef73c62f02d62bd6dcde0a Mon Sep 17 00:00:00 2001 -From: Dieter Baron <dillo@nih.at> -Date: Tue, 2 Jan 2018 15:15:48 +0100 -Subject: [PATCH] Simplify generated zipconf.h by moving logic into - CMakeLists.txt. - ---- - CMakeLists.txt | 82 ++++++++++++++++++++++++++++++++++++++++++ - cmake-zipconf.h.in | 103 ++++++----------------------------------------------- - 2 files changed, 92 insertions(+), 93 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3366b25..dfa22d5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -169,6 +169,88 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD) - CONFIGURE_FILE(libzip.pc.in libzip.pc @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - -+# fixed size integral types -+ -+IF(HAVE_STDINT_H_LIBZIP) -+ SET(LIBZIP_TYPES_INCLUDE "#include <stdint.h>") -+ELSEIF(HAVE_INTTYPES_H_LIBZIP) -+ SET(LIBZIP_TYPES_INCLUDE "#include <inttypes.h>") -+ELSEIF(HAVE_SYS_TYPES_H_LIBZIP) -+ SET(LIBZIP_TYPES_INCLUDE "#include <sys/types.h>") -+ENDIF() -+ -+IF(HAVE_INT8_T_LIBZIP) -+ SET(ZIP_INT8_T int8_t) -+ELSEIF(HAVE___INT8_LIBZIP) -+ SET(ZIP_INT8_T __int8) -+ELSE() -+ SET(ZIP_INT8_T "signed char") -+ENDIF() -+ -+IF(HAVE_UINT8_T_LIBZIP) -+ SET(ZIP_UINT8_T uint8_t) -+ELSEIF(HAVE___INT8_LIBZIP) -+ SET(ZIP_UINT8_T "unsigned __int8") -+ELSE() -+ SET(ZIP_UINT8_T "unsigned char") -+ENDIF() -+ -+IF(HAVE_INT16_T_LIBZIP) -+ SET(ZIP_INT16_T int16_t) -+ELSEIF(HAVE___INT16_LIBZIP) -+ SET(INT16_T_LIBZIP __int16) -+ELSEIF(SHORT_LIBZIP EQUAL 2) -+ SET(INT16_T_LIBZIP short) -+ENDIF() -+ -+IF(HAVE_UINT16_T_LIBZIP) -+ SET(ZIP_UINT16_T uint16_t) -+ELSEIF(HAVE___INT16_LIBZIP) -+ SET(UINT16_T_LIBZIP "unsigned __int16") -+ELSEIF(SHORT_LIBZIP EQUAL 2) -+ SET(UINT16_T_LIBZIP "unsigned short") -+ENDIF() -+ -+IF(HAVE_INT32_T_LIBZIP) -+ SET(ZIP_INT32_T int32_t) -+ELSEIF(HAVE___INT32_LIBZIP) -+ SET(ZIP_INT32_T __int32) -+ELSEIF(INT_LIBZIP EQUAL 4) -+ SET(ZIP_INT32_T int) -+ELSEIF(LONG_LIBZIP EQUAL 4) -+ SET(ZIP_INT32_T long) -+ENDIF() -+ -+IF(HAVE_UINT32_T_LIBZIP) -+SET(ZIP_UINT32_T uint32_t) -+ELSEIF(HAVE___INT32_LIBZIP) -+SET(ZIP_UINT32_T "unsigned __int32") -+ELSEIF(INT_LIBZIP EQUAL 4) -+SET(ZIP_UINT32_T "unsigned int") -+ELSEIF(LONG_LIBZIP EQUAL 4) -+SET(ZIP_UINT32_T "unsigned long") -+ENDIF() -+ -+IF(HAVE_INT64_T_LIBZIP) -+ SET(ZIP_INT64_T int64_t) -+ELSEIF(HAVE___INT64_LIBZIP) -+ SET(ZIP_INT64_T __int64) -+ELSEIF(LONG_LIBZIP EQUAL 8) -+ SET(ZIP_INT64_T long) -+ELSEIF(LONG_LONG_LIBZIP EQUAL 8) -+ SET(ZIP_INT64_T "long long") -+ENDIF() -+ -+IF(HAVE_UINT64_T_LIBZIP) -+ SET(ZIP_UINT64_T uint64_t) -+ELSEIF(HAVE___INT64_LIBZIP) -+ SET(ZIP_UINT64_T "unsigned __int64") -+ELSEIF(LONG_LIBZIP EQUAL 8) -+ SET(ZIP_UINT64_T "unsigned long") -+ELSEIF(LONG_LONG_LIBZIP EQUAL 8) -+ SET(ZIP_UINT64_T "unsigned long long") -+ENDIF() -+ - # write out config file - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake-zipconf.h.in ${CMAKE_CURRENT_BINARY_DIR}/zipconf.h) -diff --git a/cmake-zipconf.h.in b/cmake-zipconf.h.in -index f0e24e8..6ff4fe3 100644 ---- a/cmake-zipconf.h.in -+++ b/cmake-zipconf.h.in -@@ -15,99 +15,16 @@ - - #cmakedefine ZIP_STATIC - --#cmakedefine HAVE_INTTYPES_H_LIBZIP --#cmakedefine HAVE_STDINT_H_LIBZIP --#cmakedefine HAVE_SYS_TYPES_H_LIBZIP --#cmakedefine HAVE___INT8_LIBZIP --#cmakedefine HAVE_INT8_T_LIBZIP --#cmakedefine HAVE_UINT8_T_LIBZIP --#cmakedefine HAVE___INT16_LIBZIP --#cmakedefine HAVE_INT16_T_LIBZIP --#cmakedefine HAVE_UINT16_T_LIBZIP --#cmakedefine HAVE___INT32_LIBZIP --#cmakedefine HAVE_INT32_T_LIBZIP --#cmakedefine HAVE_UINT32_T_LIBZIP --#cmakedefine HAVE___INT64_LIBZIP --#cmakedefine HAVE_INT64_T_LIBZIP --#cmakedefine HAVE_UINT64_T_LIBZIP --#cmakedefine HAVE_SSIZE_T_LIBZIP --#cmakedefine SHORT_LIBZIP ${SHORT_LIBZIP} --#cmakedefine INT_LIBZIP ${INT_LIBZIP} --#cmakedefine LONG_LIBZIP ${LONG_LIBZIP} --#cmakedefine LONG_LONG_LIBZIP ${LONG_LONG_LIBZIP} -- --#if defined(HAVE_STDINT_H_LIBZIP) --#include <stdint.h> --#elif defined(HAVE_INTTYPES_H_LIBZIP) --#include <inttypes.h> --#elif defined(HAVE_SYS_TYPES_H_LIBZIP) --#include <sys/types.h> --#endif -- --#if defined(HAVE_INT8_T_LIBZIP) --typedef int8_t zip_int8_t; --#elif defined(HAVE___INT8_LIBZIP) --typedef __int8 zip_int8_t; --#else --typedef signed char zip_int8_t; --#endif --#if defined(HAVE_UINT8_T_LIBZIP) --typedef uint8_t zip_uint8_t; --#elif defined(HAVE___INT8_LIBZIP) --typedef unsigned __int8 zip_uint8_t; --#else --typedef unsigned char zip_uint8_t; --#endif --#if defined(HAVE_INT16_T_LIBZIP) --typedef int16_t zip_int16_t; --#elif defined(HAVE___INT16_LIBZIP) --typedef __int16 zip_int16_t; --#elif defined(SHORT_LIBZIP) && SHORT_LIBZIP == 2 --typedef signed short zip_int16_t; --#endif --#if defined(HAVE_UINT16_T_LIBZIP) --typedef uint16_t zip_uint16_t; --#elif defined(HAVE___INT16_LIBZIP) --typedef unsigned __int16 zip_uint16_t; --#elif defined(SHORT_LIBZIP) && SHORT_LIBZIP == 2 --typedef unsigned short zip_uint16_t; --#endif --#if defined(HAVE_INT32_T_LIBZIP) --typedef int32_t zip_int32_t; --#elif defined(HAVE___INT32_LIBZIP) --typedef __int32 zip_int32_t; --#elif defined(INT_LIBZIP) && INT_LIBZIP == 4 --typedef signed int zip_int32_t; --#elif defined(LONG_LIBZIP) && LONG_LIBZIP == 4 --typedef signed long zip_int32_t; --#endif --#if defined(HAVE_UINT32_T_LIBZIP) --typedef uint32_t zip_uint32_t; --#elif defined(HAVE___INT32_LIBZIP) --typedef unsigned __int32 zip_uint32_t; --#elif defined(INT_LIBZIP) && INT_LIBZIP == 4 --typedef unsigned int zip_uint32_t; --#elif defined(LONG_LIBZIP) && LONG_LIBZIP == 4 --typedef unsigned long zip_uint32_t; --#endif --#if defined(HAVE_INT64_T_LIBZIP) --typedef int64_t zip_int64_t; --#elif defined(HAVE___INT64_LIBZIP) --typedef __int64 zip_int64_t; --#elif defined(LONG_LIBZIP) && LONG_LIBZIP == 8 --typedef signed long zip_int64_t; --#elif defined(LONG_LONG_LIBZIP) && LONG_LONG_LIBZIP == 8 --typedef signed long long zip_int64_t; --#endif --#if defined(HAVE_UINT64_T_LIBZIP) --typedef uint64_t zip_uint64_t; --#elif defined(HAVE___INT64_LIBZIP) --typedef unsigned __int64 zip_uint64_t; --#elif defined(LONG_LIBZIP) && LONG_LONG_LIBZIP == 8 --typedef unsigned long zip_uint64_t; --#elif defined(LONG_LONG_LIBZIP) && LONG_LONG_LIBZIP == 8 --typedef unsigned long long zip_uint64_t; --#endif -+${LIBZIP_TYPES_INCLUDE} -+ -+typedef ${ZIP_INT8_T} zip_int8_t; -+typedef ${ZIP_UINT8_T} zip_uint8_t; -+typedef ${ZIP_INT16_T} zip_int16_t; -+typedef ${ZIP_UINT16_T} zip_uint16_t; -+typedef ${ZIP_INT32_T} zip_int32_t; -+typedef ${ZIP_UINT32_T} zip_uint32_t; -+typedef ${ZIP_INT64_T} zip_int64_t; -+typedef ${ZIP_UINT64_T} zip_uint64_t; - - #define ZIP_INT8_MIN (-ZIP_INT8_MAX-1) - #define ZIP_INT8_MAX 0x7f diff --git a/libzip-upstream.patch b/libzip-upstream.patch deleted file mode 100644 index 50be182..0000000 --- a/libzip-upstream.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 42a3c4a40b9925b8ef0fb8f38b200fdc9f6fe5a4 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <tk@giga.or.at> -Date: Fri, 29 Dec 2017 22:29:37 +0100 -Subject: [PATCH] Use GNUInstallDirs variables to allow installation - customization. - ---- - CMakeLists.txt | 13 ++++++------- - lib/CMakeLists.txt | 8 ++++---- - src/CMakeLists.txt | 6 +++--- - 3 files changed, 13 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 69cdb8b..b61f5ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,5 @@ - # TODO: --# 1. Problems generating html pages. --# 2. create usable libtool .la file -+# create usable libtool .la file - - CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2) - -@@ -141,7 +140,7 @@ endif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES Window - ADD_DEFINITIONS("-DHAVE_CONFIG_H") - - # rpath handling: use rpath in installed binaries --SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - # Testing -@@ -157,8 +156,8 @@ ADD_SUBDIRECTORY(examples) - # pkgconfig file - SET(prefix ${CMAKE_INSTALL_PREFIX}) - SET(exec_prefix \${prefix}) --SET(libdir \${exec_prefix}/lib) --SET(includedir \${prefix}/include) -+SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) -+SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) - IF(BZIP2_FOUND) - SET(LIBS "${LIBS} -lbz2") - ENDIF() -@@ -167,7 +166,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES BSD) - SET(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") - ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD) - CONFIGURE_FILE(libzip.pc.in libzip.pc @ONLY) --INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION lib/pkgconfig) -+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - # write out config file - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) -@@ -188,4 +187,4 @@ FILE(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/runtest - - # installation - --INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zipconf.h DESTINATION include) -+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 855ccf5..ecbb45e 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -1,6 +1,6 @@ - INCLUDE(CheckFunctionExists) - --INSTALL(FILES zip.h DESTINATION include) -+INSTALL(FILES zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - # from http://www.cmake.org/Wiki/CMakeMacroLibtoolFile - MACRO(GET_TARGET_PROPERTY_WITH_DEFAULT _variable _target _property _default_value) -@@ -203,7 +203,7 @@ ADD_LIBRARY(zip ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPSYS_FILES}) - SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.0 SOVERSION 5) - TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY}) - INSTALL(TARGETS zip -- RUNTIME DESTINATION bin -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - #CREATE_LIBTOOL_FILE(zip lib) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2a3f4d2..ccc8f7e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -8,12 +8,12 @@ ENDIF(NOT HAVE_GETOPT) - - ADD_EXECUTABLE(zipcmp zipcmp.c ${SRC_EXTRA_FILES}) - TARGET_LINK_LIBRARIES(zipcmp zip) --INSTALL(TARGETS zipcmp RUNTIME DESTINATION bin) -+INSTALL(TARGETS zipcmp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - ADD_EXECUTABLE(zipmerge zipmerge.c ${SRC_EXTRA_FILES}) - TARGET_LINK_LIBRARIES(zipmerge zip) --INSTALL(TARGETS zipmerge RUNTIME DESTINATION bin) -+INSTALL(TARGETS zipmerge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - ADD_EXECUTABLE(ziptool ziptool.c ${SRC_EXTRA_FILES}) - TARGET_LINK_LIBRARIES(ziptool zip) --INSTALL(TARGETS ziptool RUNTIME DESTINATION bin) -+INSTALL(TARGETS ziptool RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -From 3a7497b791289e316aa794b7f2f1a95dd26ced26 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <tk@giga.or.at> -Date: Fri, 29 Dec 2017 22:35:53 +0100 -Subject: [PATCH] Set bindir in pkgconfig file and use it. - ---- - CMakeLists.txt | 1 + - libzip.pc.in | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b61f5ea..3366b25 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -156,6 +156,7 @@ ADD_SUBDIRECTORY(examples) - # pkgconfig file - SET(prefix ${CMAKE_INSTALL_PREFIX}) - SET(exec_prefix \${prefix}) -+SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR}) - SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) - SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) - IF(BZIP2_FOUND) -diff --git a/libzip.pc.in b/libzip.pc.in -index 53abc47..7be7f3e 100644 ---- a/libzip.pc.in -+++ b/libzip.pc.in -@@ -1,9 +1,10 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+bindir=@bindir@ - libdir=@libdir@ - includedir=@includedir@ - --zipcmp=@prefix@/bin/zipcmp -+zipcmp=@bindir@/zipcmp - - Name: libzip - Description: library for handling zip archives diff --git a/libzip.spec b/libzip.spec index 49fefb6..1724642 100644 --- a/libzip.spec +++ b/libzip.spec @@ -12,13 +12,13 @@ %global soname 5 %global with_tests 0%{!?_without_tests:1} -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Name: %{libname} %else Name: %{libname}%{soname} %endif -Version: 1.4.0 -Release: 5%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: C library for reading, creating, and modifying zip archives License: BSD @@ -27,14 +27,11 @@ Source0: https://libzip.org/download/libzip-%{version}.tar.xz # drop RPATH from installed binaries Patch0: libzip-rpath.patch -# allow path customization (lib64) -Patch1: libzip-upstream.patch -# fix multi-lib issue -Patch2: libzip-multilib.patch BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: bzip2-devel +BuildRequires: openssl-devel %if 0%{?rhel} == 6 || 0%{?rhel} == 7 BuildRequires: cmake3 >= 3.0.2 %else @@ -114,9 +111,7 @@ The %{name}-tools package provides command line tools split off %{name}: %prep %setup -q -n %{libname}-%{version} -%patch1 -p1 -b .upstream %patch0 -p1 -b .rpm -%patch2 -p1 -b .multilib # unwanted in package documentation rm INSTALL.md @@ -126,6 +121,7 @@ rm INSTALL.md %if 0%{?rhel} == 6 || 0%{?rhel} == 7 # drop skipped test which make test suite fails (cmake issue ?) sed -e '/clone-fs-/d' -i regress/CMakeLists.txt +sed -e 's/COMMAND cmake /COMMAND cmake3 /' -i CMakeLists.txt regress/CMakeLists.txt %cmake3 . %else %cmake . @@ -176,6 +172,10 @@ make check %changelog +* Mon Mar 12 2018 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- update to 1.5.0 +- use openssl for cryptography instead of bundled custom AES implementation + * Tue Feb 20 2018 Remi Collet <remi@remirepo.net> - 1.4.0-5 - missing BR on C compiler - drop ldconfig scriptlets (F28+) @@ -9,7 +9,7 @@ <version> <!-- Version of the library --> -1.4.0 +1.5.0 </version> <headers> |