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