diff options
| author | Remi Collet <remi@remirepo.net> | 2020-04-17 17:10:59 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-04-17 17:10:59 +0200 |
| commit | 54c2eed89f3036c39e6594aa10774cff605a5f8f (patch) | |
| tree | c2218fbc7e37dc59cd6d5416fd41e4eb8b9b6df8 | |
| parent | 8dd0522c2759f2dbb0351c2002862d1dfd9bc846 (diff) | |
update to 0.7.0
drop patches merged upstream
open https://github.com/jbboehr/handlebars.c/issues/81
_hardened_ldflags break build
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | compat_reports/0.6.4_to_0.8.0/compat_report.html | 860 | ||||
| -rw-r--r-- | libhandlebars-check.patch | 996 | ||||
| -rw-r--r-- | libhandlebars-gcc10.patch | 21 | ||||
| -rw-r--r-- | libhandlebars.spec | 23 | ||||
| -rw-r--r-- | libhandlebars.xml | 88 |
6 files changed, 963 insertions, 1027 deletions
@@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/compat_reports/0.6.4_to_0.8.0/compat_report.html b/compat_reports/0.6.4_to_0.8.0/compat_report.html new file mode 100644 index 0000000..48a708f --- /dev/null +++ b/compat_reports/0.6.4_to_0.8.0/compat_report.html @@ -0,0 +1,860 @@ +<!-- kind:binary;verdict:incompatible;affected:2;added:4;removed:0;type_problems_high:0;type_problems_medium:1;type_problems_low:0;interface_problems_high:1;interface_problems_medium:1;interface_problems_low:0;changed_constants:0;constant_changes_other:1;tool_version:2.3 --> +<!-- kind:source;verdict:compatible;affected:0;added:4;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:1;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:2;changed_constants:4;constant_changes_other:1;tool_version:2.3 --> +<!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="viewport" content="width=device-width,initial-scale=1" /> +<meta name="keywords" content="libhandlebars, compatibility, API, ABI, report" /> +<meta name="description" content="API/ABI compatibility report for the libhandlebars library between 0.6.4 and 0.8.0 versions" /> +<title>libhandlebars: 0.6.4 to 0.8.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;'>libhandlebars</span> library between <span style='color:Red;'>0.6.4</span> and <span style='color:Red;'>0.8.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>libhandlebars</td></tr> +<tr><th>Version #1</th><td>0.6.4</td></tr> +<tr><th>Version #2</th><td>0.8.0</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>GCC Version</th><td>9</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;'>26</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>246 / 123</td></tr> +<tr><th>Compatibility</th> +<td class='warning'>98%</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 class='new'><a href='#Binary_Added' style='color:Blue;'>4</a></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 class='failed'><a href='#Type_Binary_Problems_Medium' style='color:Blue;'>1</a></td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td class='failed'><a href='#Symbol_Binary_Problems_High' style='color:Blue;'>1</a></td></tr> +<tr><td>Medium</td><td class='failed'><a href='#Symbol_Binary_Problems_Medium' style='color:Blue;'>1</a></td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr> +<tr><th>Other Changes<br/>in Constants</th><td>-</td><td class='passed'><a href='#Other_Binary_Changes_In_Constants' style='color:Blue;'>1</a></td></tr> +</table> + +<a name='Binary_Added'></a><h2>Added Symbols <span class='new'> 4 </span></h2><hr/> +<span class='h_name'>handlebars_ast_printer.h</span>, <span class='lib_name'>libhandlebars.so.5.2.0</span><br/> +<span class="iname">handlebars_ast_to_string <span class='sym_p'><span>( struct handlebars_context* <span class='color_p'>context</span></span>, <span>struct handlebars_ast_node* <span class='color_p'>ast_node</span></span> )</span></span><br/> +<br/> +<span class='h_name'>handlebars_partial_loader.h</span>, <span class='lib_name'>libhandlebars.so.5.2.0</span><br/> +<span class="iname">handlebars_value_get_std_partial_loader_handlers <span class='sym_p'>( )</span></span><br/> +<span class="iname">handlebars_value_partial_loader_ctor <span class='sym_p'><span>( struct handlebars_context* <span class='color_p'>context</span></span>, <span>struct handlebars_string* <span class='color_p'>base_path</span></span>, <span>struct handlebars_string* <span class='color_p'>extension</span></span> )</span></span><br/> +<br/> +<span class='h_name'>handlebars_string.h</span>, <span class='lib_name'>libhandlebars.so.5.2.0</span><br/> +<span class="iname">handlebars_str_replace <span class='sym_p'><span>( struct handlebars_context* <span class='color_p'>context</span></span>, <span>struct handlebars_string const* <span class='color_p'>string</span></span>, <span>char const* <span class='color_p'>search</span></span>, <span>size_t <span class='color_p'>search_len</span></span>, <span>char const* <span class='color_p'>replacement</span></span>, <span>size_t <span class='color_p'>replacement_len</span></span> )</span></span><br/> +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='High_Risk_Binary_Problems'></a><a name='Symbol_Binary_Problems_High'></a><a name='Interface_Binary_Problems_High'></a> +<h2>Problems with Symbols, High Severity <span class='failed'> 1 </span></h2><hr/> +<span class='h_name'>handlebars.lex.h</span>, <span class='lib_name'>libhandlebars.so.5.1.0</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_1')"> +<span class='ext'>[+]</span> handlebars_yy__scan_bytes <span class='sym_p'><span>( char const* <span class='color_p'>bytes</span></span>, <span>yy_size_t <span class='color_p'>len</span></span>, <span>yyscan_t <span class='color_p'>yyscanner</span></span> )</span> <span class='failed'> 1 </span></span> +<br/> +<div id="c_1" style="display:none;"> + + +<span class='new_sign_lbl'>⇣</span> +<br/> +<span class='new_sign'>handlebars_yy__scan_bytes <span class='sym_p'><span>( char const* <span class='color_p'>bytes</span></span>, <span>int <span class='color_p'>len</span></span>, <span>yyscan_t <span class='color_p'>yyscanner</span></span> )</span></span><br/> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>Type of <b>2nd</b> parameter <b>len</b> has been changed from <span class='nowrap'><b>yy_size_t</b> (<b>8</b> bytes)</span> to <span class='nowrap'><b>int</b> (<b>4</b> bytes)</span>.</td> +<td>Layout of parameter's stack has been changed and therefore parameters at higher positions in the stack may be incorrectly initialized by applications.</td> +</tr> +</table> +<br/> +</div> +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Medium_Risk_Binary_Problems'></a><a name='Type_Binary_Problems_Medium'></a> +<h2>Problems with Data Types, Medium Severity <span class='failed'> 1 </span></h2><hr/> +<span class='h_name'>handlebars.lex.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_2')"> +<span class='ext'>[+]</span> <span class='ttype'>struct</span> yy_buffer_state <span class='failed'> 1 </span></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>Type of field <b>yy_buf_size</b> has been changed from <span class='nowrap'><b>yy_size_t</b> (<b>8</b> bytes)</span> to <span class='nowrap'><b>int</b> (<b>4</b> bytes)</span>.</td> +<td>Previous accesses of applications and library functions to this field and fields at higher positions of the structure definition may be broken.</td> +</tr> +</table> +<span class="sect_aff" onclick="javascript:showContent(this, 'c_3')"> +[+] affected symbols: 8 (3.3%)</span> +<div id="c_3" style="display:none;"> +<div class='affected'><span class='iname_a'>handlebars_yy__create_buffer <span class='sym_p'><span>( FILE* <i>file</i></span>, <span>int <i>size</i></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>Return value (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__delete_buffer <span class='sym_p'><span>( YY_BUFFER_STATE <span class='fp'>b</span></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>1st parameter 'b' (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__flush_buffer <span class='sym_p'><span>( YY_BUFFER_STATE <span class='fp'>b</span></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>1st parameter 'b' (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__scan_buffer <span class='sym_p'><span>( char* <i>base</i></span>, <span>yy_size_t <i>size</i></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>Return value (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__scan_bytes <span class='sym_p'><span>( char const* <i>bytes</i></span>, <span>yy_size_t <i>len</i></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>Return value (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__scan_string <span class='sym_p'><span>( char const* <i>yy_str</i></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>Return value (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__switch_to_buffer <span class='sym_p'><span>( YY_BUFFER_STATE <span class='fp'>new_buffer</span></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>1st parameter 'new_buffer' (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy_push_buffer_state <span class='sym_p'><span>( YY_BUFFER_STATE <span class='fp'>new_buffer</span></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>1st parameter 'new_buffer' (pointer) has base type 'struct yy_buffer_state'.</div> +</div> +</div> +<br/><br/></div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Symbol_Binary_Problems_Medium'></a><a name='Interface_Binary_Problems_Medium'></a> +<h2>Problems with Symbols, Medium Severity <span class='failed'> 1 </span></h2><hr/> +<span class='h_name'>handlebars.lex.h</span>, <span class='lib_name'>libhandlebars.so.5.1.0</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_4')"> +<span class='ext'>[+]</span> handlebars_yy_get_leng <span class='sym_p'><span>( yyscan_t <span class='color_p'>yyscanner</span></span> )</span> <span class='failed'> 1 </span></span> +<br/> +<div id="c_4" 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>Type of return value has been changed from <span class='nowrap'><b>yy_size_t</b> (<b>8</b> bytes)</span> to <span class='nowrap'><b>int</b> (<b>4</b> bytes)</span>.</td> +<td>Applications will obtain a different return value and execution may change.</td> +</tr> +</table> +<br/> +</div> +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Other_Binary_Changes'></a><a name='Other_Binary_Changes_In_Constants'></a> +<h2>Other Changes in Constants <span class='passed'> 1 </span></h2><hr/> +<span class='h_name'>handlebars_compiler.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_5')"> +<span class='ext'>[+]</span> handlebars_compiler_flag_mustache_style_lambdas</span> +<br/> +<div id="c_5" 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 constant <b>handlebars_compiler_flag_mustache_style_lambdas</b> with value <b>4096</b> has been added.</td> +<td>No effect.</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'> 26 </span></h2><hr/> +<div class='h_list'> +handlebars.h<br/> +handlebars.lex.h<br/> +handlebars.tab.h<br/> +handlebars_ast.h<br/> +handlebars_ast_helpers.h<br/> +handlebars_ast_list.h<br/> +handlebars_ast_printer.h<br/> +handlebars_cache.h<br/> +handlebars_compiler.h<br/> +handlebars_config.h<br/> +handlebars_helpers.h<br/> +handlebars_map.h<br/> +handlebars_memory.h<br/> +handlebars_opcode_printer.h<br/> +handlebars_opcode_serializer.h<br/> +handlebars_opcodes.h<br/> +handlebars_private.h<br/> +handlebars_scanners.h<br/> +handlebars_stack.h<br/> +handlebars_string.h<br/> +handlebars_token.h<br/> +handlebars_utils.h<br/> +handlebars_value.h<br/> +handlebars_value_handlers.h<br/> +handlebars_vm.h<br/> +handlebars_whitespace.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'> +libhandlebars.so.5.1.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>libhandlebars</td></tr> +<tr><th>Version #1</th><td>0.6.4</td></tr> +<tr><th>Version #2</th><td>0.8.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;'>26</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>814 / 190</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 class='new'><a href='#Source_Added' style='color:Blue;'>4</a></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 class='warning'><a href='#Type_Source_Problems_Low' style='color:Blue;'>1</a></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 class='warning'><a href='#Symbol_Source_Problems_Low' style='color:Blue;'>2</a></td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td class='warning'><a href='#Constant_Source_Problems_Low' style='color:Blue;'>4</a></td></tr> +<tr><th>Other Changes<br/>in Constants</th><td>-</td><td class='passed'><a href='#Other_Source_Changes_In_Constants' style='color:Blue;'>1</a></td></tr> +</table> + +<a name='Source_Added'></a><h2>Added Symbols <span class='new'> 4 </span></h2><hr/> +<span class='h_name'>handlebars_ast_printer.h</span><br/> +<span class="iname">handlebars_ast_to_string <span class='sym_p'><span>( struct handlebars_context* <span class='color_p'>context</span></span>, <span>struct handlebars_ast_node* <span class='color_p'>ast_node</span></span> )</span></span><br/> +<br/> +<span class='h_name'>handlebars_partial_loader.h</span><br/> +<span class="iname">handlebars_value_get_std_partial_loader_handlers <span class='sym_p'>( )</span></span><br/> +<span class="iname">handlebars_value_partial_loader_ctor <span class='sym_p'><span>( struct handlebars_context* <span class='color_p'>context</span></span>, <span>struct handlebars_string* <span class='color_p'>base_path</span></span>, <span>struct handlebars_string* <span class='color_p'>extension</span></span> )</span></span><br/> +<br/> +<span class='h_name'>handlebars_string.h</span><br/> +<span class="iname">handlebars_str_replace <span class='sym_p'><span>( struct handlebars_context* <span class='color_p'>context</span></span>, <span>struct handlebars_string const* <span class='color_p'>string</span></span>, <span>char const* <span class='color_p'>search</span></span>, <span>size_t <span class='color_p'>search_len</span></span>, <span>char const* <span class='color_p'>replacement</span></span>, <span>size_t <span class='color_p'>replacement_len</span></span> )</span></span><br/> +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Low_Risk_Source_Problems'></a><a name='Type_Source_Problems_Low'></a> +<h2>Problems with Data Types, Low Severity <span class='warning'> 1 </span></h2><hr/> +<span class='h_name'>handlebars.lex.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_6')"> +<span class='ext'>[+]</span> <span class='ttype'>struct</span> yy_buffer_state <span class='warning'> 1 </span></span> +<br/> +<div id="c_6" 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>Type of field <b>yy_buf_size</b> has been changed from <b>yy_size_t</b> to <b>int</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<span class="sect_aff" onclick="javascript:showContent(this, 'c_7')"> +[+] affected symbols: 8 (1%)</span> +<div id="c_7" style="display:none;"> +<div class='affected'><span class='iname_a'>handlebars_yy__create_buffer <span class='sym_p'><span>( FILE* <i>file</i></span>, <span>int <i>size</i></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>Return value (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__delete_buffer <span class='sym_p'><span>( YY_BUFFER_STATE <span class='fp'>b</span></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>1st parameter 'b' (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__flush_buffer <span class='sym_p'><span>( YY_BUFFER_STATE <span class='fp'>b</span></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>1st parameter 'b' (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__scan_buffer <span class='sym_p'><span>( char* <i>base</i></span>, <span>yy_size_t <i>size</i></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>Return value (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__scan_bytes <span class='sym_p'><span>( char const* <i>bytes</i></span>, <span>yy_size_t <i>len</i></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>Return value (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__scan_string <span class='sym_p'><span>( char const* <i>yy_str</i></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>Return value (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy__switch_to_buffer <span class='sym_p'><span>( YY_BUFFER_STATE <span class='fp'>new_buffer</span></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>1st parameter 'new_buffer' (pointer) has base type 'struct yy_buffer_state'.</div> +<span class='iname_a'>handlebars_yy_push_buffer_state <span class='sym_p'><span>( YY_BUFFER_STATE <span class='fp'>new_buffer</span></span>, <span>yyscan_t <i>yyscanner</i></span> )</span></span><br/> +<div class='affect'>1st parameter 'new_buffer' (pointer) has base type 'struct yy_buffer_state'.</div> +</div> +</div> +<br/><br/></div> + +<br/> +<a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Symbol_Source_Problems_Low'></a><a name='Interface_Source_Problems_Low'></a> +<h2>Problems with Symbols, Low Severity <span class='warning'> 2 </span></h2><hr/> +<span class='h_name'>handlebars.lex.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_8')"> +<span class='ext'>[+]</span> handlebars_yy__scan_bytes <span class='sym_p'><span>( char const* <span class='color_p'>bytes</span></span>, <span>yy_size_t <span class='color_p'>len</span></span>, <span>yyscan_t <span class='color_p'>yyscanner</span></span> )</span> <span class='warning'> 1 </span></span> +<br/> +<div id="c_8" style="display:none;"> + + +<span class='new_sign_lbl'>⇣</span> +<br/> +<span class='new_sign'>handlebars_yy__scan_bytes <span class='sym_p'><span>( char const* <span class='color_p'>bytes</span></span>, <span>int <span class='color_p'>len</span></span>, <span>yyscan_t <span class='color_p'>yyscanner</span></span> )</span></span><br/> +<table class='ptable'> +<tr> +<th class='pn'></th> +<th class='chg'>Change</th> +<th>Effect</th> +</tr> +<tr> +<th>1</th> +<td>Type of <b>2nd</b> parameter <b>len</b> has been changed from <b>yy_size_t</b> to <b>int</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> +<span class="section" onclick="javascript:showContent(this, 'c_9')"> +<span class='ext'>[+]</span> handlebars_yy_get_leng <span class='sym_p'><span>( yyscan_t <span class='color_p'>yyscanner</span></span> )</span> <span class='warning'> 1 </span></span> +<br/> +<div id="c_9" 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>Type of return value has been changed from <b>yy_size_t</b> to <b>int</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='Constant_Source_Problems_Low'></a> +<h2>Problems with Constants, Low Severity <span class='warning'> 4 </span></h2><hr/> +<span class='h_name'>handlebars_config.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_10')"> +<span class='ext'>[+]</span> HANDLEBARS_VERSION_INT</span> +<br/> +<div id="c_10" 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>HANDLEBARS_VERSION_INT</b> has been changed from <span class='value'>(4 + 6 * 100 + 0 * 10000)</span> to <span class='value'>(0 + 7 * 100 + 0 * 10000)</span>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_11')"> +<span class='ext'>[+]</span> HANDLEBARS_VERSION_MINOR</span> +<br/> +<div id="c_11" 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>HANDLEBARS_VERSION_MINOR</b> has been changed from <b>6</b> to <b>7</b>.</td> +<td>Recompilation of a client program may be broken.</td> +</tr> +</table> +<br/> +</div> + +<span class="section" onclick="javascript:showContent(this, 'c_12')"> +<span class='ext'>[+]</span> HANDLEBARS_VERSION_PATCH</span> +<br/> +<div id="c_12" 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>HANDLEBARS_VERSION_PATCH</b> has been changed from <b>4</b> to <b>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_13')"> +<span class='ext'>[+]</span> HANDLEBARS_VERSION_STRING</span> +<br/> +<div id="c_13" 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>HANDLEBARS_VERSION_STRING</b> has been changed from <b>"0.6.4"</b> to <b>"0.7.0"</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='Other_Source_Changes'></a><a name='Other_Source_Changes_In_Constants'></a> +<h2>Other Changes in Constants <span class='passed'> 1 </span></h2><hr/> +<span class='h_name'>handlebars_compiler.h</span><br/> +<span class="section" onclick="javascript:showContent(this, 'c_14')"> +<span class='ext'>[+]</span> handlebars_compiler_flag_mustache_style_lambdas</span> +<br/> +<div id="c_14" 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 constant <b>handlebars_compiler_flag_mustache_style_lambdas</b> with value <b>4096</b> has been added.</td> +<td>No effect.</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'> 26 </span></h2><hr/> +<div class='h_list'> +handlebars.h<br/> +handlebars.lex.h<br/> +handlebars.tab.h<br/> +handlebars_ast.h<br/> +handlebars_ast_helpers.h<br/> +handlebars_ast_list.h<br/> +handlebars_ast_printer.h<br/> +handlebars_cache.h<br/> +handlebars_compiler.h<br/> +handlebars_config.h<br/> +handlebars_helpers.h<br/> +handlebars_map.h<br/> +handlebars_memory.h<br/> +handlebars_opcode_printer.h<br/> +handlebars_opcode_serializer.h<br/> +handlebars_opcodes.h<br/> +handlebars_private.h<br/> +handlebars_scanners.h<br/> +handlebars_stack.h<br/> +handlebars_string.h<br/> +handlebars_token.h<br/> +handlebars_utils.h<br/> +handlebars_value.h<br/> +handlebars_value_handlers.h<br/> +handlebars_vm.h<br/> +handlebars_whitespace.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'> +libhandlebars.so.5.1.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.3  </i> +</div> +<br/> + +</body></html> diff --git a/libhandlebars-check.patch b/libhandlebars-check.patch deleted file mode 100644 index 7780862..0000000 --- a/libhandlebars-check.patch +++ /dev/null @@ -1,996 +0,0 @@ -Adapted for 0.6.4 using upstream patch - - - -From e1b94ca3e4bfda19914230720e4f43a47114a850 Mon Sep 17 00:00:00 2001 -From: John Boehr <john@johnboehr.is> -Date: Tue, 10 Dec 2019 21:54:57 -0800 -Subject: [PATCH] Fix issue with newer versions of libcheck - ---- - tests/test_cache.c | 16 ++++++++ - tests/test_opcode_printer.c | 28 +++++++++++--- - tests/test_opcodes.c | 56 ++++++++++++++------------- - tests/test_string.c | 76 +++++++++++++++++++++++++++++++++++++ - tests/test_token.c | 36 +++++++++++------- - tests/test_value.c | 4 ++ - 6 files changed, 170 insertions(+), 46 deletions(-) - -diff -up ./tests/test_cache.c.newcheck ./tests/test_cache.c ---- ./tests/test_cache.c.newcheck 2020-02-19 16:17:30.602476530 +0100 -+++ ./tests/test_cache.c 2020-02-19 16:18:51.212075794 +0100 -@@ -210,35 +210,44 @@ static void execute_reset_test(struct ha - } - - START_TEST(test_simple_cache_gc) -+{ - struct handlebars_cache * cache = handlebars_cache_simple_ctor(context); - execute_gc_test(cache); - handlebars_cache_dtor(cache); -+} - END_TEST - - START_TEST(test_simple_cache_reset) -+{ - struct handlebars_cache * cache = handlebars_cache_simple_ctor(context); - execute_reset_test(cache); - handlebars_cache_dtor(cache); -+} - END_TEST - - #ifdef HAVE_LIBLMDB - START_TEST(test_lmdb_cache_gc) -+{ - char tmp[256]; - snprintf(tmp, 256, "%s/%s", getenv("TMPDIR") ?: "/tmp", "handlebars-lmdb-cache-test.mdb"); - struct handlebars_cache * cache = handlebars_cache_lmdb_ctor(context, tmp); - execute_gc_test(cache); - handlebars_cache_dtor(cache); -+} - END_TEST - - START_TEST(test_lmdb_cache_reset) -+{ - char tmp[256]; - snprintf(tmp, 256, "%s/%s", getenv("TMPDIR") ?: "/tmp", "handlebars-lmdb-cache-test.mdb"); - struct handlebars_cache * cache = handlebars_cache_lmdb_ctor(context, tmp); - execute_reset_test(cache); - handlebars_cache_dtor(cache); -+} - END_TEST - #else - START_TEST(test_lmdb_cache_error) -+{ - jmp_buf buf; - char tmp[256]; - snprintf(tmp, 256, "%s/%s", getenv("TMPDIR") ?: "/tmp", "handlebars-lmdb-cache-test.mdb"); -@@ -250,19 +259,24 @@ START_TEST(test_lmdb_cache_error) - - struct handlebars_cache * cache = handlebars_cache_lmdb_ctor(context, tmp); - ck_assert(0); -+} - END_TEST - #endif - - START_TEST(test_mmap_cache_gc) -+{ - struct handlebars_cache * cache = handlebars_cache_mmap_ctor(context, 2097152, 2053); - execute_gc_test(cache); - handlebars_cache_dtor(cache); -+} - END_TEST - - START_TEST(test_mmap_cache_reset) -+{ - struct handlebars_cache * cache = handlebars_cache_mmap_ctor(context, 2097152, 2053); - execute_gc_test(cache); - handlebars_cache_dtor(cache); -+} - END_TEST - - Suite * parser_suite(void) -diff -up ./tests/test_opcode_printer.c.newcheck ./tests/test_opcode_printer.c ---- ./tests/test_opcode_printer.c.newcheck 2017-07-18 03:21:21.000000000 +0200 -+++ ./tests/test_opcode_printer.c 2020-02-19 16:17:30.602476530 +0100 -@@ -38,6 +38,7 @@ - - - START_TEST(test_operand_print_append_null) -+{ - struct handlebars_operand op; - struct handlebars_string * string; - handlebars_operand_set_null(&op); -@@ -45,9 +46,11 @@ START_TEST(test_operand_print_append_nul - ck_assert_ptr_ne(NULL, string); - ck_assert_str_eq("[NULL]", string->val); - handlebars_talloc_free(string); -+} - END_TEST - - START_TEST(test_operand_print_append_boolean) -+{ - struct handlebars_operand op; - struct handlebars_string * string; - handlebars_operand_set_boolval(&op, 1); -@@ -55,9 +58,11 @@ START_TEST(test_operand_print_append_boo - ck_assert_ptr_ne(NULL, string); - ck_assert_str_eq("[BOOLEAN:1]", string->val); - handlebars_talloc_free(string); -+} - END_TEST - - START_TEST(test_operand_print_append_long) -+{ - struct handlebars_operand op; - struct handlebars_string * string; - handlebars_operand_set_longval(&op, 2358); -@@ -65,9 +70,11 @@ START_TEST(test_operand_print_append_lon - ck_assert_ptr_ne(NULL, string); - ck_assert_str_eq("[LONG:2358]", string->val); - handlebars_talloc_free(string); -+} - END_TEST - - START_TEST(test_operand_print_append_string) -+{ - struct handlebars_operand op; - struct handlebars_string * string; - struct handlebars_opcode * opcode = handlebars_opcode_ctor(context, handlebars_opcode_type_nil); -@@ -76,10 +83,13 @@ START_TEST(test_operand_print_append_str - ck_assert_ptr_ne(NULL, string); - ck_assert_str_eq("[STRING:baz]", string->val); - handlebars_talloc_free(string); -+} - END_TEST - - START_TEST(test_operand_print_append_array) -+{ - // @todo -+} - END_TEST - - START_TEST(test_opcode_print_1) -@@ -94,6 +104,7 @@ START_TEST(test_opcode_print_1) - END_TEST - - START_TEST(test_opcode_print_2) -+{ - struct handlebars_opcode * opcode = handlebars_opcode_ctor(context, handlebars_opcode_type_get_context); - char * expected = "getContext[LONG:2358]"; - struct handlebars_string * string; -@@ -102,9 +113,11 @@ START_TEST(test_opcode_print_2) - ck_assert_str_eq(expected, string->val); - handlebars_talloc_free(opcode); - handlebars_talloc_free(string); -+} - END_TEST - - START_TEST(test_opcode_print_3) -+{ - struct handlebars_opcode * opcode = handlebars_opcode_ctor(context, handlebars_opcode_type_invoke_helper); - char * expected = "invokeHelper[LONG:123][STRING:baz][LONG:456]"; - struct handlebars_string * string; -@@ -117,9 +130,11 @@ START_TEST(test_opcode_print_3) - ck_assert_str_eq(expected, string->val); - handlebars_talloc_free(opcode); - handlebars_talloc_free(string); -+} - END_TEST - - START_TEST(test_opcode_print_4) -+{ - struct handlebars_opcode * opcode = handlebars_opcode_ctor(context, handlebars_opcode_type_lookup_on_context); - char * expected = "lookupOnContext[LONG:123][STRING:baz][LONG:456][STRING:bat]"; - struct handlebars_string * string; -@@ -133,13 +148,14 @@ START_TEST(test_opcode_print_4) - ck_assert_str_eq(expected, string->val); - handlebars_talloc_free(opcode); - handlebars_talloc_free(string); -+} - END_TEST - - - Suite * parser_suite(void) - { - Suite * s = suite_create("Opcode Printer"); -- -+ - REGISTER_TEST_FIXTURE(s, test_operand_print_append_null, "Operand Print Append (null)"); - REGISTER_TEST_FIXTURE(s, test_operand_print_append_boolean, "Operand Print Append (boolean)"); - REGISTER_TEST_FIXTURE(s, test_operand_print_append_long, "Operand Print Append (long)"); -@@ -149,7 +165,7 @@ Suite * parser_suite(void) - REGISTER_TEST_FIXTURE(s, test_opcode_print_2, "Opcode Print (2)"); - REGISTER_TEST_FIXTURE(s, test_opcode_print_3, "Opcode Print (3)"); - REGISTER_TEST_FIXTURE(s, test_opcode_print_4, "Opcode Print (4)"); -- -+ - return s; - } - -@@ -160,13 +176,13 @@ int main(void) - int error; - - talloc_set_log_stderr(); -- -+ - // Check if memdebug enabled - memdebug = getenv("MEMDEBUG") ? atoi(getenv("MEMDEBUG")) : 0; - if( memdebug ) { - talloc_enable_leak_report_full(); - } -- -+ - // Set up test suite - Suite * s = parser_suite(); - SRunner * sr = srunner_create(s); -@@ -177,12 +193,12 @@ int main(void) - number_failed = srunner_ntests_failed(sr); - srunner_free(sr); - error = (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -- -+ - // Generate report for memdebug - if( memdebug ) { - talloc_report_full(NULL, stderr); - } -- -+ - // Return - return error; - } -diff -up ./tests/test_opcodes.c.newcheck ./tests/test_opcodes.c ---- ./tests/test_opcodes.c.newcheck 2017-07-18 03:21:21.000000000 +0200 -+++ ./tests/test_opcodes.c 2020-02-19 16:17:30.602476530 +0100 -@@ -37,10 +37,10 @@ - START_TEST(test_opcode_ctor) - { - struct handlebars_opcode * opcode = handlebars_opcode_ctor(context, handlebars_opcode_type_append); -- -+ - ck_assert_ptr_ne(NULL, opcode); - ck_assert_int_eq(handlebars_opcode_type_append, opcode->type); -- -+ - handlebars_talloc_free(opcode); - } - END_TEST -@@ -76,7 +76,7 @@ START_TEST(test_opcode_readable_type) - const char * actual = handlebars_opcode_readable_type(_RTYPE_MK(type)); \ - ck_assert_str_eq(expected, actual); \ - } while(0) -- -+ - _RTYPE_TEST(nil, nil); - _RTYPE_TEST(ambiguous_block_value, ambiguousBlockValue); - _RTYPE_TEST(append, append); -@@ -86,33 +86,33 @@ START_TEST(test_opcode_readable_type) - _RTYPE_TEST(push_context, pushContext); - _RTYPE_TEST(push_hash, pushHash); - _RTYPE_TEST(resolve_possible_lambda, resolvePossibleLambda); -- -+ - _RTYPE_TEST(get_context, getContext); - _RTYPE_TEST(push_program, pushProgram); -- -+ - _RTYPE_TEST(append_content, appendContent); - _RTYPE_TEST(assign_to_hash, assignToHash); - _RTYPE_TEST(block_value, blockValue); - _RTYPE_TEST(push, push); - _RTYPE_TEST(push_literal, pushLiteral); - _RTYPE_TEST(push_string, pushString); -- -+ - _RTYPE_TEST(invoke_partial, invokePartial); - _RTYPE_TEST(push_id, pushId); - _RTYPE_TEST(push_string_param, pushStringParam); -- -+ - _RTYPE_TEST(invoke_ambiguous, invokeAmbiguous); -- -+ - _RTYPE_TEST(invoke_known_helper, invokeKnownHelper); -- -+ - _RTYPE_TEST(invoke_helper, invokeHelper); -- -+ - _RTYPE_TEST(lookup_on_context, lookupOnContext); -- -+ - _RTYPE_TEST(lookup_data, lookupData); -- -+ - _RTYPE_TEST(invalid, invalid); -- -+ - ck_assert_str_eq("invalid", handlebars_opcode_readable_type(13434534)); - } - END_TEST -@@ -120,7 +120,7 @@ END_TEST - START_TEST(test_operand_set_null) - { - struct handlebars_operand op; -- -+ - handlebars_operand_set_null(&op); - ck_assert_int_eq(handlebars_operand_type_null, op.type); - ck_assert_int_eq(0, op.data.boolval); -@@ -132,7 +132,7 @@ END_TEST - START_TEST(test_operand_set_boolval) - { - struct handlebars_operand op; -- -+ - handlebars_operand_set_boolval(&op, 1); - ck_assert_int_eq(handlebars_operand_type_boolean, op.type); - ck_assert_int_eq(1, op.data.boolval); -@@ -142,11 +142,11 @@ END_TEST - START_TEST(test_operand_set_longval) - { - struct handlebars_operand op; -- -+ - handlebars_operand_set_longval(&op, 12); - ck_assert_int_eq(handlebars_operand_type_long, op.type); - ck_assert_int_eq(12, op.data.longval); -- -+ - handlebars_operand_set_longval(&op, -65); - ck_assert_int_eq(handlebars_operand_type_long, op.type); - ck_assert_int_eq(-65, op.data.longval); -@@ -158,7 +158,7 @@ START_TEST(test_operand_set_stringval) - struct handlebars_operand op; - struct handlebars_opcode * opcode = handlebars_opcode_ctor(context, handlebars_opcode_type_nil); - struct handlebars_string * string = handlebars_string_ctor(context, HBS_STRL("bar")); -- -+ - handlebars_operand_set_stringval(context, opcode, &op, string); - - ck_assert_int_eq(handlebars_operand_type_string, op.type); -@@ -190,6 +190,7 @@ END_TEST - */ - - START_TEST(test_operand_set_arrayval) -+{ - struct handlebars_operand op; - struct handlebars_opcode * opcode = handlebars_opcode_ctor(context, handlebars_opcode_type_nil); - const char * strs[] = { -@@ -208,9 +209,11 @@ START_TEST(test_operand_set_arrayval) - for( ptr1 = strs, ptr2 = op.data.array.array; *ptr1 /*|| *ptr2*/; ptr1++, ptr2++ ) { - ck_assert_str_eq(*ptr1, ptr2->string->val); - } -+} - END_TEST - - START_TEST(test_operand_set_arrayval_string) -+{ - struct handlebars_string * strings[5]; - struct handlebars_opcode * opcode = handlebars_opcode_ctor(context, handlebars_opcode_type_invalid); - -@@ -232,16 +235,17 @@ START_TEST(test_operand_set_arrayval_str - for( ptr1 = strings, ptr2 = opcode->op1.data.array.array; *ptr1 /* || *ptr2*/; ptr1++, ptr2++ ) { - ck_assert_str_eq((*ptr1)->val, ptr2->string->val); - } -+} - END_TEST - - Suite * parser_suite(void) - { - Suite * s = suite_create("Opcodes"); -- -+ - REGISTER_TEST_FIXTURE(s, test_opcode_ctor, "Constructor"); - REGISTER_TEST_FIXTURE(s, test_opcode_ctor_failed_alloc, "Constructor (failed alloc)"); - REGISTER_TEST_FIXTURE(s, test_opcode_readable_type, "Readable Type"); -- -+ - REGISTER_TEST_FIXTURE(s, test_operand_set_null, "Set operand null"); - REGISTER_TEST_FIXTURE(s, test_operand_set_boolval, "Set operand boolval"); - REGISTER_TEST_FIXTURE(s, test_operand_set_longval, "Set operand longval"); -@@ -249,8 +253,8 @@ Suite * parser_suite(void) - //REGISTER_TEST_FIXTURE(s, test_operand_set_stringval_failed_alloc, "Set operand stringval (failed alloc)"); - REGISTER_TEST_FIXTURE(s, test_operand_set_arrayval, "Set operand arrayval"); - REGISTER_TEST_FIXTURE(s, test_operand_set_arrayval_string, "operand_set_arrayval_string"); -- -- -+ -+ - return s; - } - -@@ -261,13 +265,13 @@ int main(void) - int error; - - talloc_set_log_stderr(); -- -+ - // Check if memdebug enabled - memdebug = getenv("MEMDEBUG") ? atoi(getenv("MEMDEBUG")) : 0; - if( memdebug ) { - talloc_enable_leak_report_full(); - } -- -+ - // Set up test suite - Suite * s = parser_suite(); - SRunner * sr = srunner_create(s); -@@ -278,12 +282,12 @@ int main(void) - number_failed = srunner_ntests_failed(sr); - srunner_free(sr); - error = (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -- -+ - // Generate report for memdebug - if( memdebug ) { - talloc_report_full(NULL, stderr); - } -- -+ - // Return - return error; - } -diff -up ./tests/test_string.c.newcheck ./tests/test_string.c ---- ./tests/test_string.c.newcheck 2017-07-18 03:21:21.000000000 +0200 -+++ ./tests/test_string.c 2020-02-19 16:17:30.602476530 +0100 -@@ -33,167 +33,210 @@ - - - START_TEST(test_handlebars_string_hash) -+{ - #if ULONG_MAX <= 4294967295 - ck_assert_uint_eq(3127933309, handlebars_string_hash(HBS_STRL("foobar\xFF"))); - #else - ck_assert_uint_eq(229466050689405, handlebars_string_hash(HBS_STRL("foobar\xFF"))); - #endif -+} - END_TEST - - START_TEST(test_handlebars_strnstr_1) -+{ - const char string[] = ""; - const char * res = handlebars_strnstr(HBS_STRL(string), HBS_STRL("")); - ck_assert_ptr_eq(res, NULL); -+} - END_TEST - - START_TEST(test_handlebars_strnstr_2) -+{ - const char string[] = "abcdefgh"; - const char * res = handlebars_strnstr(HBS_STRL(string), HBS_STRL("def")); - ck_assert_ptr_eq(res, string + 3); -+} - END_TEST - - START_TEST(test_handlebars_strnstr_3) -+{ - const char string[] = "a\0bcdefgh"; - const char * res = handlebars_strnstr(HBS_STRL(string), HBS_STRL("def")); - ck_assert_ptr_eq(res, string + 4); -+} - END_TEST - - START_TEST(test_handlebars_strnstr_4) -+{ - const char string[] = "abcdefgh"; - const char * res = handlebars_strnstr(string, 4, HBS_STRL("fgh")); - ck_assert_ptr_eq(res, NULL); -+} - END_TEST - - START_TEST(test_handlebars_strnstr_5) -+{ - const char string[] = "[foo\\\\]"; - const char * res = handlebars_strnstr(HBS_STRL(string), HBS_STRL("\\]")); - ck_assert_ptr_eq(res, string + 5); -+} - END_TEST - - START_TEST(test_handlebars_string_reduce_1) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("abcdef")); - input = handlebars_str_reduce(input, HBS_STRL("bcd"), HBS_STRL("qq")); - ck_assert_str_eq("aqqef", input->val); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_reduce_2) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("")); - input = handlebars_str_reduce(input, HBS_STRL("a"), HBS_STRL("")); - ck_assert_str_eq("", input->val); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_reduce_3) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("QQQ")); - input = handlebars_str_reduce(input, HBS_STRL("Q"), HBS_STRL("W")); - ck_assert_str_eq("WWW", input->val); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_addcslashes_1) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("")); - struct handlebars_string * actual = handlebars_string_addcslashes(context, input, HBS_STRL("")); - ck_assert_str_eq("", actual->val); - ck_assert_ptr_ne(input, actual); - handlebars_talloc_free(input); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_addcslashes_2) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("\ttest\rlines\n")); - struct handlebars_string * actual = handlebars_string_addcslashes(context, input, HBS_STRL("\r\n\t")); - ck_assert_str_eq("\\ttest\\rlines\\n", actual->val); - ck_assert_ptr_ne(input, actual); - handlebars_talloc_free(input); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_addcslashes_3) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("amazing biscuit circus")); - struct handlebars_string * actual = handlebars_string_addcslashes(context, input, HBS_STRL("abc")); - ck_assert_str_eq("\\am\\azing \\bis\\cuit \\cir\\cus", actual->val); - ck_assert_ptr_ne(input, actual); - handlebars_talloc_free(input); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_addcslashes_4) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("kaboemkara!")); - struct handlebars_string * actual = handlebars_string_addcslashes(context, input, HBS_STRL("")); - ck_assert_str_eq("kaboemkara!", actual->val); - ck_assert_ptr_ne(input, actual); - handlebars_talloc_free(input); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_addcslashes_5) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("foobarbaz")); - struct handlebars_string * actual = handlebars_string_addcslashes(context, input, HBS_STRL("bar")); - ck_assert_str_eq("foo\\b\\a\\r\\b\\az", actual->val); - ck_assert_ptr_ne(input, actual); - handlebars_talloc_free(input); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_addcslashes_6) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("\a\v\b\f\x3")); - struct handlebars_string * actual = handlebars_string_addcslashes(context, input, HBS_STRL("\a\v\b\f\x3")); - ck_assert_str_eq("\\a\\v\\b\\f\\003", actual->val); - ck_assert_ptr_ne(input, actual); - handlebars_talloc_free(input); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_stripcslashes_1) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("\\n\\r")); - struct handlebars_string * actual = handlebars_string_stripcslashes(input); - ck_assert_str_eq("\n\r", actual->val); - ck_assert_ptr_eq(input, actual); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_stripcslashes_2) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("\\065\\x64")); - struct handlebars_string * actual = handlebars_string_stripcslashes(input); - ck_assert_str_eq("5d", actual->val); - ck_assert_ptr_eq(input, actual); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_stripcslashes_3) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("")); - struct handlebars_string * actual = handlebars_string_stripcslashes(input); - ck_assert_str_eq("", actual->val); - ck_assert_ptr_eq(input, actual); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_stripcslashes_4) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("\\{")); - struct handlebars_string * actual = handlebars_string_stripcslashes(input); - ck_assert_str_eq("{", actual->val); - ck_assert_ptr_eq(input, actual); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_stripcslashes_5) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("\\a\\t\\v\\b\\f\\\\")); - struct handlebars_string * actual = handlebars_string_stripcslashes(input); - ck_assert_str_eq("\a\t\v\b\f\\", actual->val); - ck_assert_ptr_eq(input, actual); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_stripcslashes_6) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("\\x3")); - struct handlebars_string * actual = handlebars_string_stripcslashes(input); - ck_assert_str_eq("\x3", actual->val); - ck_assert_ptr_eq(input, actual); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_stripcslashes_7) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("\\0test")); - struct handlebars_string * actual = handlebars_string_stripcslashes(input); - ck_assert_str_eq("", actual->val); -@@ -203,67 +246,87 @@ START_TEST(test_handlebars_string_stripc - ck_assert_int_eq(0, actual->val[5]); - ck_assert_ptr_eq(input, actual); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_asprintf) -+{ - struct handlebars_string * actual = handlebars_string_asprintf(context, "|%d|%c|%s|", 148, 56, "1814"); - ck_assert_str_eq(actual->val, "|148|8|1814|"); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_asprintf_append) -+{ - struct handlebars_string * input = handlebars_string_ctor(context, HBS_STRL("PREFIX")); - input = handlebars_string_asprintf_append(context, input, "|%d|%c|%s|", 148, 56, "1814"); - ck_assert_str_eq(input->val, "PREFIX|148|8|1814|"); - handlebars_talloc_free(input); -+} - END_TEST - - START_TEST(test_handlebars_string_htmlspecialchars_1) -+{ - struct handlebars_string * actual = handlebars_string_htmlspecialchars(context, HBS_STRL("&")); - ck_assert_str_eq("&", actual->val); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_htmlspecialchars_2) -+{ - struct handlebars_string * actual = handlebars_string_htmlspecialchars(context, HBS_STRL("<")); - ck_assert_str_eq("<", actual->val); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_htmlspecialchars_3) -+{ - struct handlebars_string * actual = handlebars_string_htmlspecialchars(context, HBS_STRL(">")); - ck_assert_str_eq(">", actual->val); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_htmlspecialchars_4) -+{ - struct handlebars_string * actual = handlebars_string_htmlspecialchars(context, HBS_STRL("'")); - ck_assert_str_eq("'", actual->val); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_htmlspecialchars_5) -+{ - struct handlebars_string * actual = handlebars_string_htmlspecialchars(context, HBS_STRL("\"")); - ck_assert_str_eq(""", actual->val); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_htmlspecialchars_6) -+{ - struct handlebars_string * actual = handlebars_string_htmlspecialchars(context, HBS_STRL("a&b<c>d\'e\"f")); - ck_assert_str_eq("a&b<c>d'e"f", actual->val); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_implode_1) -+{ - struct handlebars_string ** parts = handlebars_talloc_array(context, struct handlebars_string *, 1); - parts[0] = NULL; - struct handlebars_string * actual = handlebars_string_implode(context, HBS_STRL("!!!"), parts); - ck_assert_str_eq(actual->val, ""); - handlebars_talloc_free(parts); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_implode_2) -+{ - struct handlebars_string ** parts = handlebars_talloc_array(context, struct handlebars_string *, 3); - parts[0] = handlebars_string_ctor(context, HBS_STRL("one")); - parts[1] = handlebars_string_ctor(context, HBS_STRL("two")); -@@ -272,54 +335,67 @@ START_TEST(test_handlebars_string_implod - ck_assert_str_eq(actual->val, "one!two"); - handlebars_talloc_free(parts); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_handlebars_string_ltrim_1) -+{ - struct handlebars_string * in = handlebars_string_ctor(context, HBS_STRL(" \n \r test ")); - struct handlebars_string * ret = handlebars_string_ltrim(in, HBS_STRL(" \t\r\n")); - ck_assert_str_eq(ret->val, "test "); - ck_assert_ptr_eq(in, ret); - handlebars_talloc_free(in); -+} - END_TEST - - START_TEST(test_handlebars_string_ltrim_2) -+{ - struct handlebars_string * in = handlebars_string_ctor(context, HBS_STRL("\n ")); - struct handlebars_string * ret = handlebars_string_ltrim(in, HBS_STRL(" \t")); - ck_assert_str_eq(ret->val, "\n "); - ck_assert_ptr_eq(in, ret); - handlebars_talloc_free(in); -+} - END_TEST - - START_TEST(test_handlebars_string_ltrim_3) -+{ - struct handlebars_string * in = handlebars_string_ctor(context, HBS_STRL("")); - struct handlebars_string * ret = handlebars_string_ltrim(in, HBS_STRL("")); - ck_assert_str_eq(ret->val, ""); - ck_assert_ptr_eq(in, ret); - handlebars_talloc_free(in); -+} - END_TEST - - START_TEST(test_handlebars_string_rtrim_1) -+{ - struct handlebars_string * in = handlebars_string_ctor(context, HBS_STRL("test \n \r ")); - struct handlebars_string * ret = handlebars_string_rtrim(in, HBS_STRL(" \t\r\n")); - ck_assert_str_eq(ret->val, "test"); - ck_assert_ptr_eq(in, ret); - handlebars_talloc_free(in); -+} - END_TEST - - START_TEST(test_handlebars_string_rtrim_2) -+{ - struct handlebars_string * in = handlebars_string_ctor(context, HBS_STRL("\n")); - struct handlebars_string * ret = handlebars_string_rtrim(in, HBS_STRL(" \v\t\r\n")); - ck_assert_str_eq(ret->val, ""); - ck_assert_ptr_eq(in, ret); - handlebars_talloc_free(in); -+} - END_TEST - - START_TEST(test_handlebars_string_rtrim_3) -+{ - struct handlebars_string * in = handlebars_string_ctor(context, HBS_STRL("")); - struct handlebars_string * ret = handlebars_string_rtrim(in, HBS_STRL("")); - ck_assert_str_eq(ret->val, ""); - ck_assert_ptr_eq(in, ret); - handlebars_talloc_free(in); -+} - END_TEST - - Suite * parser_suite(void) -diff -up ./tests/test_token.c.newcheck ./tests/test_token.c ---- ./tests/test_token.c.newcheck 2017-07-18 03:21:21.000000000 +0200 -+++ ./tests/test_token.c 2020-02-19 16:17:30.603476525 +0100 -@@ -38,13 +38,13 @@ START_TEST(test_token_ctor) - { - struct handlebars_string * string = handlebars_string_ctor(context, HBS_STRL("{{")); - struct handlebars_token * token = handlebars_token_ctor(HBSCTX(parser), OPEN, string); -- -+ - ck_assert_ptr_ne(NULL, token); - ck_assert_ptr_ne(NULL, token->string); - ck_assert_int_eq(OPEN, token->token); - ck_assert_str_eq(token->string->val, "{{"); - ck_assert_uint_eq(sizeof("{{") - 1, token->string->len); -- -+ - handlebars_token_dtor(token); - } - END_TEST -@@ -85,9 +85,9 @@ START_TEST(test_token_get_type) - { - struct handlebars_string * string = handlebars_string_ctor(context, HBS_STRL("{{")); - struct handlebars_token * token = handlebars_token_ctor(context, OPEN, string); -- -+ - ck_assert_int_eq(OPEN, handlebars_token_get_type(token)); -- -+ - handlebars_token_dtor(token); - } - END_TEST -@@ -99,7 +99,7 @@ START_TEST(test_token_get_text) - - ck_assert_str_eq("{{", handlebars_token_get_text(token)->val); - ck_assert_uint_eq(sizeof("{{") - 1, handlebars_token_get_text(token)->len); -- -+ - handlebars_token_dtor(token); - } - END_TEST -@@ -113,7 +113,7 @@ START_TEST(test_token_readable_type) - const char * actual = handlebars_token_readable_type(str); \ - ck_assert_str_eq(expected, actual); \ - } while(0) -- -+ - _RTYPE_TEST(BOOLEAN); - _RTYPE_TEST(CLOSE); - _RTYPE_TEST(CLOSE_RAW_BLOCK); -@@ -140,7 +140,7 @@ START_TEST(test_token_readable_type) - _RTYPE_TEST(SEP); - _RTYPE_TEST(STRING); - ck_assert_str_eq("UNKNOWN", handlebars_token_readable_type(-1)); -- -+ - // Added in v3 - _RTYPE_TEST(CLOSE_BLOCK_PARAMS); - _RTYPE_TEST(OPEN_BLOCK_PARAMS); -@@ -163,7 +163,7 @@ START_TEST(test_token_reverse_readable_t - int actual = handlebars_token_reverse_readable_type(actual_str); \ - ck_assert_int_eq(expected, actual); \ - } while(0) -- -+ - _RTYPE_REV_TEST(BOOLEAN); - _RTYPE_REV_TEST(CLOSE); - _RTYPE_REV_TEST(CLOSE_RAW_BLOCK); -@@ -190,7 +190,7 @@ START_TEST(test_token_reverse_readable_t - _RTYPE_REV_TEST(SEP); - _RTYPE_REV_TEST(STRING); - ck_assert_int_eq(-1, handlebars_token_reverse_readable_type("UNKNOWN")); -- -+ - // Added in v3 - _RTYPE_REV_TEST(CLOSE_BLOCK_PARAMS); - _RTYPE_REV_TEST(OPEN_BLOCK_PARAMS); -@@ -204,33 +204,40 @@ START_TEST(test_token_reverse_readable_t - END_TEST - - START_TEST(test_token_print) -+{ - struct handlebars_string * string = handlebars_string_ctor(context, HBS_STRL("{{")); - struct handlebars_token * tok = handlebars_token_ctor(context, OPEN, string); - struct handlebars_string * actual = handlebars_token_print(context, tok, 0); - ck_assert_str_eq("OPEN [{{] ", actual->val); - handlebars_talloc_free(tok); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_token_print2) -+{ - struct handlebars_string * string = handlebars_string_ctor(context, HBS_STRL("this\nis\ra\ttest")); - struct handlebars_token * tok = handlebars_token_ctor(context, CONTENT, string); - struct handlebars_string * actual = handlebars_token_print(context, tok, 0); - ck_assert_str_eq("CONTENT [this\\nis\\ra\\ttest] ", actual->val); - handlebars_talloc_free(tok); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_token_print3) -+{ - struct handlebars_string * string = handlebars_string_ctor(context, HBS_STRL("this\nis\ra\ttest")); - struct handlebars_token * tok = handlebars_token_ctor(context, CONTENT, string); - struct handlebars_string * actual = handlebars_token_print(context, tok, handlebars_token_print_flag_newlines); - ck_assert_str_eq("CONTENT [this\\nis\\ra\\ttest]\n", actual->val); - handlebars_talloc_free(tok); - handlebars_talloc_free(actual); -+} - END_TEST - - START_TEST(test_token_print_failed_alloc) -+{ - #if HANDLEBARS_MEMORY - struct handlebars_string * string = handlebars_string_ctor(context, HBS_STRL("tok1")); - struct handlebars_token * tok = handlebars_token_ctor(context, CONTENT, string); -@@ -251,12 +258,13 @@ START_TEST(test_token_print_failed_alloc - #else - fprintf(stderr, "Skipped, memory testing functions are disabled\n"); - #endif -+} - END_TEST - - Suite * parser_suite(void) - { - Suite * s = suite_create("Token"); -- -+ - REGISTER_TEST_FIXTURE(s, test_token_ctor, "Constructor"); - REGISTER_TEST_FIXTURE(s, test_token_ctor_failed_alloc, "Constructor (failed alloc)"); - REGISTER_TEST_FIXTURE(s, test_token_dtor, "Destructor"); -@@ -279,13 +287,13 @@ int main(void) - int error; - - talloc_set_log_stderr(); -- -+ - // Check if memdebug enabled - memdebug = getenv("MEMDEBUG") ? atoi(getenv("MEMDEBUG")) : 0; - if( memdebug ) { - talloc_enable_leak_report_full(); - } -- -+ - // Set up test suite - Suite * s = parser_suite(); - SRunner * sr = srunner_create(s); -@@ -296,12 +304,12 @@ int main(void) - number_failed = srunner_ntests_failed(sr); - srunner_free(sr); - error = (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -- -+ - // Generate report for memdebug - if( memdebug ) { - talloc_report_full(NULL, stderr); - } -- -+ - // Return - return error; - } -diff -up ./tests/test_value.c.newcheck ./tests/test_value.c ---- ./tests/test_value.c.newcheck 2017-07-18 03:21:21.000000000 +0200 -+++ ./tests/test_value.c 2020-02-19 16:17:30.603476525 +0100 -@@ -438,6 +438,7 @@ START_TEST(test_convert) - END_TEST - - START_TEST(test_json_parse_error) -+{ - jmp_buf buf; - - if( handlebars_setjmp_ex(context, &buf) ) { -@@ -450,9 +451,11 @@ START_TEST(test_json_parse_error) - - handlebars_value_from_json_string(context, "{\"key\":1"); - ck_assert_msg(0, "Parse error should have longjmp'd"); -+} - END_TEST - - START_TEST(test_yaml_parse_error) -+{ - jmp_buf buf; - - if( handlebars_setjmp_ex(context, &buf) ) { -@@ -465,6 +468,7 @@ START_TEST(test_yaml_parse_error) - - handlebars_value_from_yaml_string(context, "---\n'"); - ck_assert_msg(0, "Parse error should have longjmp'd"); -+} - END_TEST - - Suite * parser_suite(void) diff --git a/libhandlebars-gcc10.patch b/libhandlebars-gcc10.patch deleted file mode 100644 index f687156..0000000 --- a/libhandlebars-gcc10.patch +++ /dev/null @@ -1,21 +0,0 @@ -From d936e6364b3b86c913258be1248fa530ce75e2f0 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 19 Feb 2020 15:52:43 +0100 -Subject: [PATCH] fix multiple definition - ---- - tests/utils.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tests/utils.h b/tests/utils.h -index 5515e93..1ccbb2e 100644 ---- a/tests/utils.h -+++ b/tests/utils.h -@@ -67,7 +67,6 @@ - #endif - - struct handlebars_value; --const int MOD_ADLER; - - typedef void (*scan_directory_cb)(char * filename); - diff --git a/libhandlebars.spec b/libhandlebars.spec index 185822d..0446634 100644 --- a/libhandlebars.spec +++ b/libhandlebars.spec @@ -6,8 +6,12 @@ # # Please, preserve the changelog entries # + +# Workaround to https://github.com/jbboehr/handlebars.c/issues/81 +%global _hardened_ldflags %nil + %global libname libhandlebars -%global gh_commit 9863359d28fa57cabe5494a00453ff12e8581d56 +%global gh_commit 91c94d0264c3cd2f0544876ca35cb2dc70b98ad1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner jbboehr %global gh_project handlebars.c @@ -23,8 +27,8 @@ %global mspec_project spec Name: %{libname} -Version: 0.6.4 -Release: 4%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: Handlebars C library License: LGPLv2+ @@ -33,11 +37,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_ Source1: https://github.com/%{hspec_owner}/%{hspec_project}/archive/%{hspec_commit}/%{hspec_project}-%{hspec_short}.tar.gz Source2: https://github.com/%{mspec_owner}/%{mspec_project}/archive/%{mspec_commit}/%{mspec_project}-%{mspec_short}.tar.gz -# For GCC 10 -Patch0: %{libname}-gcc10.patch -# Fox new check library -Patch1: %{libname}-check.patch - BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake @@ -83,8 +82,6 @@ This package provides handlebarsc command line tool split off %{libname}. %prep %setup -qn %{gh_project}-%{gh_commit} -a1 -a2 -%patch0 -p1 -b .gcc10 -%patch1 -p1 -b .newcheck mkdir spec mv %{hspec_project}-%{hspec_commit} spec/handlebars @@ -130,6 +127,12 @@ make test %changelog +* Fri Apr 17 2020 Remi Collet <remi@remirepo.net> - 0.7.0-1 +- update to 0.7.0 +- drop patches merged upstream +- open https://github.com/jbboehr/handlebars.c/issues/81 + _hardened_ldflags break build + * Wed Feb 19 2020 Remi Collet <remi@remirepo.net> - 0.6.4-4 - add fix for GCC 10 from https://github.com/jbboehr/handlebars.c/pull/76 diff --git a/libhandlebars.xml b/libhandlebars.xml new file mode 100644 index 0000000..22dc92f --- /dev/null +++ b/libhandlebars.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8"?> +<descriptor> + +<!-- Template for the Library Descriptor --> + +<!-- + Necessary Sections + --> + +<version> + <!-- Version of the library --> +0.8.0 +</version> + +<headers> + <!-- The list of paths to header files and/or + directories with header files, one per line --> +/usr/include/handlebars.h +/usr/include/handlebars.lex.h +/usr/include/handlebars.tab.h +/usr/include/handlebars_ast.h +/usr/include/handlebars_ast_helpers.h +/usr/include/handlebars_ast_list.h +/usr/include/handlebars_ast_printer.h +/usr/include/handlebars_cache.h +/usr/include/handlebars_compiler.h +/usr/include/handlebars_config.h +/usr/include/handlebars_helpers.h +/usr/include/handlebars_map.h +/usr/include/handlebars_memory.h +/usr/include/handlebars_opcode_printer.h +/usr/include/handlebars_opcode_serializer.h +/usr/include/handlebars_opcodes.h +/usr/include/handlebars_partial_loader.h +/usr/include/handlebars_private.h +/usr/include/handlebars_scanners.h +/usr/include/handlebars_stack.h +/usr/include/handlebars_string.h +/usr/include/handlebars_token.h +/usr/include/handlebars_utils.h +/usr/include/handlebars_value.h +/usr/include/handlebars_value_handlers.h +/usr/include/handlebars_vm.h +/usr/include/handlebars_whitespace.h +</headers> + +<libs> + <!-- The list of paths to shared objects and/or + directories with shared objects, one per line --> +/usr/lib64/libhandlebars.so +</libs> + +<!-- + Additional Sections + --> + +<include_paths> + <!-- The list of paths to be searched for header files + needed for compiling of library headers, one per line --> +</include_paths> + +<gcc_options> + <!-- Additional gcc options, one per line --> +</gcc_options> + +<include_preamble> + <!-- The list of header files that should be included before other headers, one per line. + For example, it is a tree.h for libxml2 and ft2build.h for freetype2 --> +</include_preamble> + +<opaque_types> + <!-- The list of opaque types, one per line --> +</opaque_types> + +<skip_interfaces> + <!-- The list of functions (mangled/symbol names in C++) + that should be skipped while testing, one per line --> +</skip_interfaces> + +<skip_constants> + <!-- The list of constants that should not be checked, one name per line --> +</skip_constants> + +<skip_headers> + <!-- The list of headers that should not be processed, one name per line --> +</skip_headers> + +</descriptor> |