1.1 --- a/yaml/yaml.patch Wed Feb 08 20:14:10 2012 +0200 1.2 +++ b/yaml/yaml.patch Tue Aug 28 18:50:10 2012 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 Index: YAML-AppConfig-0.16/Makefile.PL 1.5 ---- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51 +0200 1.6 -+++ YAML-AppConfig-0.16/Makefile.PL 2009-11-27 13:24:07 +0100 1.7 +--- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51.000000000 +0200 1.8 ++++ YAML-AppConfig-0.16/Makefile.PL 2012-07-31 16:07:20.000000000 +0200 1.9 @@ -21,6 +21,7 @@ 1.10 eval "require $info->[0]; 0;"; 1.11 push @yamls, @$info unless $@; 1.12 @@ -11,9 +11,9 @@ 1.13 } 1.14 + 1.15 Index: syck-0.70/lib/bytecode.c 1.16 ---- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34 +0200 1.17 -+++ syck-0.70/lib/bytecode.c 2009-11-27 13:24:07 +0100 1.18 -@@ -7,6 +7,10 @@ 1.19 +--- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34.000000000 +0200 1.20 ++++ syck-0.70/lib/bytecode.c 2012-07-31 16:10:17.000000000 +0200 1.21 +@@ -7,11 +7,16 @@ 1.22 * 1.23 * Copyright (C) 2003 why the lucky stiff 1.24 */ 1.25 @@ -24,9 +24,36 @@ 1.26 #include "syck.h" 1.27 1.28 #if GRAM_FILES_HAVE_TAB_SUFFIX 1.29 + #include "gram.tab.h" 1.30 + #else 1.31 ++#define YYPARSE_PARAM 1.32 + #include "gram.h" 1.33 + #endif 1.34 + 1.35 +Index: syck-0.70/lib/gram.y 1.36 +--- syck-0.70/lib/gram.y.orig 2009-09-30 19:29:34.000000000 +0200 1.37 ++++ syck-0.70/lib/gram.y 2012-07-31 16:09:51.000000000 +0200 1.38 +@@ -19,14 +19,14 @@ 1.39 + #define YYSTACK_USE_ALLOCA 0 1.40 + #endif 1.41 + 1.42 ++#define YYPARSE_PARAM parser 1.43 ++#define YYLEX_PARAM parser 1.44 ++ 1.45 + #include "syck.h" 1.46 + #include "sycklex.h" 1.47 + 1.48 + void apply_seq_in_map( SyckParser *parser, SyckNode *n ); 1.49 + 1.50 +-#define YYPARSE_PARAM parser 1.51 +-#define YYLEX_PARAM parser 1.52 +- 1.53 + #define NULL_NODE(parser, node) \ 1.54 + SyckNode *node = syck_new_str( "", scalar_plain ); \ 1.55 + if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \ 1.56 Index: syck-0.70/lib/handler.c 1.57 ---- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34 +0200 1.58 -+++ syck-0.70/lib/handler.c 2009-11-27 13:24:07 +0100 1.59 +--- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34.000000000 +0200 1.60 ++++ syck-0.70/lib/handler.c 2012-07-31 16:07:20.000000000 +0200 1.61 @@ -7,6 +7,9 @@ 1.62 * Copyright (C) 2003 why the lucky stiff 1.63 */ 1.64 @@ -38,8 +65,8 @@ 1.65 1.66 SYMID 1.67 Index: syck-0.70/lib/implicit.c 1.68 ---- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34 +0200 1.69 -+++ syck-0.70/lib/implicit.c 2009-11-27 13:24:07 +0100 1.70 +--- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34.000000000 +0200 1.71 ++++ syck-0.70/lib/implicit.c 2012-07-31 16:07:20.000000000 +0200 1.72 @@ -8,6 +8,7 @@ 1.73 * Copyright (C) 2003 why the lucky stiff 1.74 */ 1.75 @@ -49,8 +76,8 @@ 1.76 1.77 #define YYCTYPE char 1.78 Index: syck-0.70/lib/node.c 1.79 ---- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34 +0200 1.80 -+++ syck-0.70/lib/node.c 2009-11-27 13:24:07 +0100 1.81 +--- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34.000000000 +0200 1.82 ++++ syck-0.70/lib/node.c 2012-07-31 16:07:20.000000000 +0200 1.83 @@ -7,6 +7,9 @@ 1.84 * Copyright (C) 2003 why the lucky stiff 1.85 */ 1.86 @@ -62,8 +89,8 @@ 1.87 1.88 /* 1.89 Index: syck-0.70/lib/syck.c 1.90 ---- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34 +0200 1.91 -+++ syck-0.70/lib/syck.c 2009-11-27 13:24:07 +0100 1.92 +--- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34.000000000 +0200 1.93 ++++ syck-0.70/lib/syck.c 2012-07-31 16:07:20.000000000 +0200 1.94 @@ -7,6 +7,7 @@ 1.95 * Copyright (C) 2003 why the lucky stiff 1.96 */ 1.97 @@ -89,8 +116,8 @@ 1.98 { 1.99 str->ptr = str->end; 1.100 Index: syck-0.70/lib/syck.h 1.101 ---- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34 +0200 1.102 -+++ syck-0.70/lib/syck.h 2009-11-27 13:24:07 +0100 1.103 +--- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34.000000000 +0200 1.104 ++++ syck-0.70/lib/syck.h 2012-07-31 16:07:20.000000000 +0200 1.105 @@ -36,6 +36,8 @@ 1.106 1.107 #include <stddef.h> 1.108 @@ -101,9 +128,9 @@ 1.109 #ifdef HAVE_ST_H 1.110 #include <st.h> 1.111 Index: syck-0.70/lib/token.c 1.112 ---- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34 +0200 1.113 -+++ syck-0.70/lib/token.c 2009-11-27 13:24:07 +0100 1.114 -@@ -7,6 +7,8 @@ 1.115 +--- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34.000000000 +0200 1.116 ++++ syck-0.70/lib/token.c 2012-07-31 16:10:37.000000000 +0200 1.117 +@@ -7,11 +7,14 @@ 1.118 * 1.119 * Copyright (C) 2003 why the lucky stiff 1.120 */ 1.121 @@ -112,9 +139,15 @@ 1.122 #include "syck.h" 1.123 1.124 #if GRAM_FILES_HAVE_TAB_SUFFIX 1.125 + #include "gram.tab.h" 1.126 + #else 1.127 ++#define YYPARSE_PARAM 1.128 + #include "gram.h" 1.129 + #endif 1.130 + 1.131 Index: syck-0.70/lib/yaml2byte.c 1.132 ---- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34 +0200 1.133 -+++ syck-0.70/lib/yaml2byte.c 2009-11-27 13:24:31 +0100 1.134 +--- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34.000000000 +0200 1.135 ++++ syck-0.70/lib/yaml2byte.c 2012-07-31 16:07:20.000000000 +0200 1.136 @@ -11,6 +11,8 @@ 1.137 */ 1.138 #include "syck.h"