r59565 - in /trunk/libhtml-template-pro-perl: Changes META.yml README debian/changelog expr.c expr.y lib/HTML/Template/Pro.pm perl-HTML-Template-Pro.spec procore.c tags.inc
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri Jun 18 23:55:33 UTC 2010
Author: gregoa
Date: Fri Jun 18 23:55:27 2010
New Revision: 59565
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59565
Log:
New upstream release.
Modified:
trunk/libhtml-template-pro-perl/Changes
trunk/libhtml-template-pro-perl/META.yml
trunk/libhtml-template-pro-perl/README
trunk/libhtml-template-pro-perl/debian/changelog
trunk/libhtml-template-pro-perl/expr.c
trunk/libhtml-template-pro-perl/expr.y
trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm
trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec
trunk/libhtml-template-pro-perl/procore.c
trunk/libhtml-template-pro-perl/tags.inc
Modified: trunk/libhtml-template-pro-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/Changes?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/Changes (original)
+++ trunk/libhtml-template-pro-perl/Changes Fri Jun 18 23:55:27 2010
@@ -285,3 +285,8 @@
- perl specific: fixed bug in perl wrapper
(list evaluated to false). thanks to Shigeki Morimoto
for bugreport and patch.
+
+0.9501 Wed Jun 9 10:36:07 EEST 2010
+ - bugfix release: segfault in EXPR log subroutine.
+ thanks to Robert Hanniger and Mike Shogin
+
Modified: trunk/libhtml-template-pro-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/META.yml?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/META.yml (original)
+++ trunk/libhtml-template-pro-perl/META.yml Fri Jun 18 23:55:27 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: HTML-Template-Pro
-version: 0.95
+version: 0.9501
abstract: Perl/XS module to use HTML Templates from CGI scripts
author:
- I. Yu. Vlasenko <viy at altlinux.org>
Modified: trunk/libhtml-template-pro-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/README?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/README (original)
+++ trunk/libhtml-template-pro-perl/README Fri Jun 18 23:55:27 2010
@@ -1,4 +1,4 @@
-HTML-Template-Pro version 0.95
+HTML-Template-Pro version 0.9501
==============================
DESCRIPTION
Modified: trunk/libhtml-template-pro-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/debian/changelog?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/debian/changelog (original)
+++ trunk/libhtml-template-pro-perl/debian/changelog Fri Jun 18 23:55:27 2010
@@ -1,3 +1,9 @@
+libhtml-template-pro-perl (0.9501-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org> Sat, 19 Jun 2010 01:54:04 +0200
+
libhtml-template-pro-perl (0.95-1) unstable; urgency=low
* New upstream release.
Modified: trunk/libhtml-template-pro-perl/expr.c
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/expr.c?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/expr.c (original)
+++ trunk/libhtml-template-pro-perl/expr.c Fri Jun 18 23:55:27 2010
@@ -1577,7 +1577,7 @@
PSTRING varvalue=_get_variable_value(state->param, (yyvsp[(1) - (1)].uservar));
if (varvalue.begin==NULL) {
int loglevel = state->param->warn_unused ? TMPL_LOG_ERROR : TMPL_LOG_INFO;
- log_expr(exprobj,loglevel, "non-initialized variable %.*s\n",(int)(varvalue.endnext-varvalue.begin),varvalue.begin);
+ log_expr(exprobj,loglevel, "non-initialized variable %.*s\n",(int)((yyvsp[(1) - (1)].uservar).endnext-(yyvsp[(1) - (1)].uservar).begin),(yyvsp[(1) - (1)].uservar).begin);
}
(yyval.numval).type=EXPR_TYPE_PSTR;
(yyval.numval).val.strval=varvalue;
@@ -2208,7 +2208,7 @@
log_state(exprobj->state, loglevel, "in EXPR:at pos " MOD_TD " [" MOD_TD "]: ",
TO_PTRDIFF_T((exprobj->expr_curpos)-(exprobj->state->top)),
TO_PTRDIFF_T((exprobj->expr_curpos)-(exprobj->exprarea).begin));
- tmpl_log(loglevel, fmt, vl);
+ tmpl_vlog(loglevel, fmt, vl);
va_end(vl);
}
@@ -2346,6 +2346,7 @@
}
}
(*lvalp).uservar=name;
+ /*log_expr(exprobj,TMPL_LOG_DEBUG2, "yylex: returned variable name %.*s\n",(int)(name.endnext-name.begin),name.begin);*/
return VAR;
}
}
Modified: trunk/libhtml-template-pro-perl/expr.y
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/expr.y?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/expr.y (original)
+++ trunk/libhtml-template-pro-perl/expr.y Fri Jun 18 23:55:27 2010
@@ -73,7 +73,7 @@
PSTRING varvalue=_get_variable_value(state->param, $1);
if (varvalue.begin==NULL) {
int loglevel = state->param->warn_unused ? TMPL_LOG_ERROR : TMPL_LOG_INFO;
- log_expr(exprobj,loglevel, "non-initialized variable %.*s\n",(int)(varvalue.endnext-varvalue.begin),varvalue.begin);
+ log_expr(exprobj,loglevel, "non-initialized variable %.*s\n",(int)($1.endnext-$1.begin),$1.begin);
}
$$.type=EXPR_TYPE_PSTR;
$$.val.strval=varvalue;
@@ -318,7 +318,7 @@
log_state(exprobj->state, loglevel, "in EXPR:at pos " MOD_TD " [" MOD_TD "]: ",
TO_PTRDIFF_T((exprobj->expr_curpos)-(exprobj->state->top)),
TO_PTRDIFF_T((exprobj->expr_curpos)-(exprobj->exprarea).begin));
- tmpl_log(loglevel, fmt, vl);
+ tmpl_vlog(loglevel, fmt, vl);
va_end(vl);
}
@@ -456,6 +456,7 @@
}
}
(*lvalp).uservar=name;
+ /*log_expr(exprobj,TMPL_LOG_DEBUG2, "yylex: returned variable name %.*s\n",(int)(name.endnext-name.begin),name.begin);*/
return VAR;
}
}
Modified: trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm (original)
+++ trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm Fri Jun 18 23:55:27 2010
@@ -12,7 +12,7 @@
use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
@ISA = qw(DynaLoader Exporter);
-$VERSION = '0.95';
+$VERSION = '0.9501';
@EXPORT_OK = qw/ASK_NAME_DEFAULT ASK_NAME_AS_IS ASK_NAME_LOWERCASE ASK_NAME_UPPERCASE ASK_NAME_MASK/;
%EXPORT_TAGS = (const => [qw/ASK_NAME_DEFAULT ASK_NAME_AS_IS ASK_NAME_LOWERCASE ASK_NAME_UPPERCASE ASK_NAME_MASK/]);
Modified: trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec (original)
+++ trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec Fri Jun 18 23:55:27 2010
@@ -6,7 +6,7 @@
%define module HTML-Template-Pro
Name: perl-%module
-Version: 0.95
+Version: 0.9501
Release: alt1
Packager: Igor Yu. Vlasenko <viy at altlinux.org>
@@ -54,6 +54,9 @@
%perl_vendor_man3dir/*
%changelog
+* Wed Jun 09 2010 Igor Vlasenko <viy at altlinux.ru> 0.9501-alt1
+- new version; see Changes
+
* Fri May 21 2010 Igor Vlasenko <viy at altlinux.ru> 0.95-alt1
- new version; see Changes
Modified: trunk/libhtml-template-pro-perl/procore.c
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/procore.c?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/procore.c (original)
+++ trunk/libhtml-template-pro-perl/procore.c Fri Jun 18 23:55:27 2010
@@ -239,7 +239,7 @@
try_tag_parameter(state, tagopt[i], TAGOPT[i])) {
TagOptVal[i] = read_tag_parameter_value(state);
found_in_loop=1;
- if (debuglevel) log_state(state,TMPL_LOG_DEBUG,"in tag %s: found option %s\n", TAGNAME[tag_type], TAGOPT[i]);
+ if (debuglevel) log_state(state,TMPL_LOG_DEBUG,"in tag %s: found option %s=%.*s\n", TAGNAME[tag_type], TAGOPT[i],(int)(TagOptVal[i].endnext-TagOptVal[i].begin),TagOptVal[i].begin);
}
}
if (!found_in_loop) opt_found = 0;
Modified: trunk/libhtml-template-pro-perl/tags.inc
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/tags.inc?rev=59565&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/tags.inc (original)
+++ trunk/libhtml-template-pro-perl/tags.inc Fri Jun 18 23:55:27 2010
@@ -229,6 +229,10 @@
{
register int ifval=-1; /*not yet defined*/
if (TagOptVal[TAG_OPT_EXPR].begin!=NULL) {
+ /*
+ if (debuglevel>=TMPL_LOG_DEBUG2) {
+ tmpl_log(TMPL_LOG_DEBUG2,"is_var_true: expr = %.*s\n",(int)(TagOptVal[TAG_OPT_EXPR].endnext-TagOptVal[TAG_OPT_EXPR].begin),TagOptVal[TAG_OPT_EXPR].begin);
+ }*/
ifval=is_pstring_true(parse_expr(TagOptVal[TAG_OPT_EXPR], state));
} else
if (state->param->loop_context_vars) {
More information about the Pkg-perl-cvs-commits
mailing list