[arch-commits] Commit in libsieve/trunk (PKGBUILD crash-fix.patch)

[Sergej Pupykin]

    Date: Tuesday, September 3, 2013 @ 15:53:34
  Author: spupykin
Revision: 96724

Modified:
  libsieve/trunk/PKGBUILD
  libsieve/trunk/crash-fix.patch

-----------------+
 PKGBUILD        |    3 +-
 crash-fix.patch |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-03 13:26:31 UTC (rev 96723)
+++ PKGBUILD	2013-09-03 13:53:34 UTC (rev 96724)
@@ -14,7 +14,7 @@
 	"crash-fix.patch")
 md5sums=('bb48eecf877cc7fdb2b0dfe757b48d7a'
          '0d98d9e8f0583857616b2ba98f1833fa'
-         '47a8b42be9bce4dba695258441572d99')
+         '05ce47217ced05fd32a3ae41dc37f07e')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -39,6 +39,7 @@
 
 check() {
   cd "$srcdir/$pkgname-$pkgver/src/sv_test"
+  export LD_LIBRARY_PATH=$srcdir/libsieve-$pkgver/src/.libs:$LD_LIBRARY_PATH
   ls -1 script* | while read script; do
     ls -1 message* | while read msg; do
       if [ "$script" == "script22.sv" ]; then

Modified: crash-fix.patch
===================================================================
--- crash-fix.patch	2013-09-03 13:26:31 UTC (rev 96723)
+++ crash-fix.patch	2013-09-03 13:53:34 UTC (rev 96724)
@@ -21,3 +21,58 @@
  
  /* sv_parser */
  #include "addr.h"
+@@ -74,10 +74,10 @@
+ 		context->addr_addr->name = $1;
+ 		};
+ 
+-address: mailbox_list			{ TRACE_DEBUG( "address: mailbox: %s", $1 ); }
+-	| group				{ TRACE_DEBUG( "address: group: %s", $1 ); };
++address: mailbox_list			{ $$ = $1; TRACE_DEBUG( "address: mailbox: %s", $1 ); }
++	| group				{ $$ = $1; TRACE_DEBUG( "address: group: %s", $1 ); };
+ 
+-group: phrase ':' ';'			{ TRACE_DEBUG( "group: phrase: %s", $1 ); }
++group: phrase ':' ';'			{ $$ = $1; TRACE_DEBUG( "group: phrase: %s", $1 ); }
+ 	| phrase ':' mailbox_list ';'	{ TRACE_DEBUG( "group: phrase mailbox_list: %s %s", $1, $3 ); };
+ 
+ mailbox_list: mailbox			{
+@@ -94,8 +94,8 @@
+ 		};
+ 
+ mailbox: 
+-	angle_addr			{ TRACE_DEBUG( "mailbox: angle_addr: %s", $1 ); }
+-	| addr_spec			{ TRACE_DEBUG( "mailbox: addr_spec: %s", $1 ); }
++	angle_addr			{ $$ = $1; TRACE_DEBUG( "mailbox: angle_addr: %s", $1 ); }
++	| addr_spec			{ $$ = $1; TRACE_DEBUG( "mailbox: addr_spec: %s", $1 ); }
+ 	| phrase angle_addr		{
+ 		TRACE_DEBUG( "mailbox: phrase angle_addr: %s %s", $1, $2 );
+ 		// This is a "top terminal" state...
+@@ -103,7 +103,7 @@
+ 		context->addr_addr->name = libsieve_strdup( $1 );
+ 		};
+ 
+-angle_addr: '<' addr_spec '>'		{ TRACE_DEBUG( "angle_addr: addr_spec: %s", $2 ); }
++angle_addr: '<' addr_spec '>'		{ $$ = $2;  TRACE_DEBUG( "angle_addr: addr_spec: %s", $2 ); }
+ 	| '<' route ':' addr_spec '>'	{
+ 		TRACE_DEBUG( "angle_addr: route addr_spec: %s:%s", $2, $4 );
+ 		// This is a "top terminal" state...
+@@ -133,13 +133,13 @@
+ 		$$ = libsieve_strbuf(context->strbuf, libsieve_strconcat( "@", $2, ",", $4, NULL ), strlen($2)+strlen($4)+2, FREEME);
+ 		};
+ 
+-local_part: DOTATOM { TRACE_DEBUG( "local_part: DOTATOM: %s", $1 ); }
+-	| ATOM	    { TRACE_DEBUG( "local_part: ATOM : %s", $1); }
+-	| qstring   { TRACE_DEBUG( "local_part: qstring: %s", $1); }
+-
+-domain: DOTATOM			{ TRACE_DEBUG( "domain: DOTATOM: %s", $1 ); }
+-	| ATOM		{ TRACE_DEBUG("domain: ATOM: %s", $1); }
+-	| domainlit	{ TRACE_DEBUG( "domain: domainlit: %s", $1); };
++local_part: DOTATOM { $$ = $1; TRACE_DEBUG( "local_part: DOTATOM: %s", $1 ); }
++	| ATOM	    { $$ = $1; TRACE_DEBUG( "local_part: ATOM : %s", $1); }
++	| qstring   { $$ = $1; TRACE_DEBUG( "local_part: qstring: %s", $1); }
++
++domain: DOTATOM		{ $$ = $1; TRACE_DEBUG( "domain: DOTATOM: %s", $1 ); }
++	| ATOM		{ $$ = $1; TRACE_DEBUG("domain: ATOM: %s", $1); }
++	| domainlit	{ $$ = $1; TRACE_DEBUG( "domain: domainlit: %s", $1); };
+ 
+ domainlit: '[' DTEXT ']'	{
+ 	 	TRACE_DEBUG( "domainlit: DTEXT: %s", $2 );