yaml/yaml.patch@f65313225f8a
yaml/yaml.patch
Tue, 28 Aug 2012 18:50:10 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:50:10 +0200
- changeset 591
- f65313225f8a
- parent 356
- 14df3eec63f9
- permissions
- -rw-r--r--
Resynchronize with upstream maintainer version as it seems to work fine again.
1 Index: YAML-AppConfig-0.16/Makefile.PL
2 --- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51.000000000 +0200
3 +++ YAML-AppConfig-0.16/Makefile.PL 2012-07-31 16:07:20.000000000 +0200
4 @@ -21,6 +21,7 @@
5 eval "require $info->[0]; 0;";
6 push @yamls, @$info unless $@;
7 }
8 - die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
9 + # die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
10 return @yamls;
11 }
12 +
13 Index: syck-0.70/lib/bytecode.c
14 --- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34.000000000 +0200
15 +++ syck-0.70/lib/bytecode.c 2012-07-31 16:10:17.000000000 +0200
16 @@ -7,11 +7,16 @@
17 *
18 * Copyright (C) 2003 why the lucky stiff
19 */
20 +
21 +#include <stdlib.h>
22 +#include <string.h>
23 +
24 #include "syck.h"
26 #if GRAM_FILES_HAVE_TAB_SUFFIX
27 #include "gram.tab.h"
28 #else
29 +#define YYPARSE_PARAM
30 #include "gram.h"
31 #endif
33 Index: syck-0.70/lib/gram.y
34 --- syck-0.70/lib/gram.y.orig 2009-09-30 19:29:34.000000000 +0200
35 +++ syck-0.70/lib/gram.y 2012-07-31 16:09:51.000000000 +0200
36 @@ -19,14 +19,14 @@
37 #define YYSTACK_USE_ALLOCA 0
38 #endif
40 +#define YYPARSE_PARAM parser
41 +#define YYLEX_PARAM parser
42 +
43 #include "syck.h"
44 #include "sycklex.h"
46 void apply_seq_in_map( SyckParser *parser, SyckNode *n );
48 -#define YYPARSE_PARAM parser
49 -#define YYLEX_PARAM parser
50 -
51 #define NULL_NODE(parser, node) \
52 SyckNode *node = syck_new_str( "", scalar_plain ); \
53 if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
54 Index: syck-0.70/lib/handler.c
55 --- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34.000000000 +0200
56 +++ syck-0.70/lib/handler.c 2012-07-31 16:07:20.000000000 +0200
57 @@ -7,6 +7,9 @@
58 * Copyright (C) 2003 why the lucky stiff
59 */
61 +#include <stdlib.h>
62 +#include <string.h>
63 +
64 #include "syck.h"
66 SYMID
67 Index: syck-0.70/lib/implicit.c
68 --- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34.000000000 +0200
69 +++ syck-0.70/lib/implicit.c 2012-07-31 16:07:20.000000000 +0200
70 @@ -8,6 +8,7 @@
71 * Copyright (C) 2003 why the lucky stiff
72 */
74 +#include <stdlib.h>
75 #include "syck.h"
77 #define YYCTYPE char
78 Index: syck-0.70/lib/node.c
79 --- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34.000000000 +0200
80 +++ syck-0.70/lib/node.c 2012-07-31 16:07:20.000000000 +0200
81 @@ -7,6 +7,9 @@
82 * Copyright (C) 2003 why the lucky stiff
83 */
85 +#include <stdlib.h>
86 +#include <string.h>
87 +
88 #include "syck.h"
90 /*
91 Index: syck-0.70/lib/syck.c
92 --- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34.000000000 +0200
93 +++ syck-0.70/lib/syck.c 2012-07-31 16:07:20.000000000 +0200
94 @@ -7,6 +7,7 @@
95 * Copyright (C) 2003 why the lucky stiff
96 */
97 #include <stdio.h>
98 +#include <stdlib.h>
99 #include <string.h>
101 #include "syck.h"
102 @@ -67,12 +68,13 @@
104 ASSERT( str != NULL );
105 beg = str->ptr;
106 +
107 if ( max_size >= 0 )
108 {
109 max_size -= skip;
110 - if ( max_size <= 0 ) max_size = 0;
111 - else str->ptr += max_size;
112 + if ( max_size < 0 ) max_size = 0;
114 + str->ptr += max_size;
115 if ( str->ptr > str->end )
116 {
117 str->ptr = str->end;
118 Index: syck-0.70/lib/syck.h
119 --- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34.000000000 +0200
120 +++ syck-0.70/lib/syck.h 2012-07-31 16:07:20.000000000 +0200
121 @@ -36,6 +36,8 @@
123 #include <stddef.h>
124 #include <stdio.h>
125 +#include <stdlib.h>
126 +#include <string.h>
127 #include <ctype.h>
128 #ifdef HAVE_ST_H
129 #include <st.h>
130 Index: syck-0.70/lib/token.c
131 --- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34.000000000 +0200
132 +++ syck-0.70/lib/token.c 2012-07-31 16:10:37.000000000 +0200
133 @@ -7,11 +7,14 @@
134 *
135 * Copyright (C) 2003 why the lucky stiff
136 */
137 +#include <stdlib.h>
138 +#include <string.h>
139 #include "syck.h"
141 #if GRAM_FILES_HAVE_TAB_SUFFIX
142 #include "gram.tab.h"
143 #else
144 +#define YYPARSE_PARAM
145 #include "gram.h"
146 #endif
148 Index: syck-0.70/lib/yaml2byte.c
149 --- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34.000000000 +0200
150 +++ syck-0.70/lib/yaml2byte.c 2012-07-31 16:07:20.000000000 +0200
151 @@ -11,6 +11,8 @@
152 */
153 #include "syck.h"
154 #include <assert.h>
155 +#include <stdlib.h>
156 +#include <string.h>
157 #define YAMLBYTE_UTF8
158 #include "yamlbyte.h"
