yaml/yaml.patch@300d43423c2e (annotated)
yaml/yaml.patch
Wed, 08 Feb 2012 20:07:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:07:00 +0200
- changeset 588
- 300d43423c2e
- child 591
- f65313225f8a
- permissions
- -rw-r--r--
Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.
| michael@356 | 1 | Index: YAML-AppConfig-0.16/Makefile.PL |
| michael@356 | 2 | --- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51 +0200 |
| michael@356 | 3 | +++ YAML-AppConfig-0.16/Makefile.PL 2009-11-27 13:24:07 +0100 |
| 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@356 | 14 | --- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34 +0200 |
| michael@356 | 15 | +++ syck-0.70/lib/bytecode.c 2009-11-27 13:24:07 +0100 |
| michael@356 | 16 | @@ -7,6 +7,10 @@ |
| 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@356 | 27 | Index: syck-0.70/lib/handler.c |
| michael@356 | 28 | --- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34 +0200 |
| michael@356 | 29 | +++ syck-0.70/lib/handler.c 2009-11-27 13:24:07 +0100 |
| michael@356 | 30 | @@ -7,6 +7,9 @@ |
| michael@356 | 31 | * Copyright (C) 2003 why the lucky stiff |
| michael@356 | 32 | */ |
| michael@356 | 33 | |
| michael@356 | 34 | +#include <stdlib.h> |
| michael@356 | 35 | +#include <string.h> |
| michael@356 | 36 | + |
| michael@356 | 37 | #include "syck.h" |
| michael@356 | 38 | |
| michael@356 | 39 | SYMID |
| michael@356 | 40 | Index: syck-0.70/lib/implicit.c |
| michael@356 | 41 | --- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34 +0200 |
| michael@356 | 42 | +++ syck-0.70/lib/implicit.c 2009-11-27 13:24:07 +0100 |
| michael@356 | 43 | @@ -8,6 +8,7 @@ |
| michael@356 | 44 | * Copyright (C) 2003 why the lucky stiff |
| michael@356 | 45 | */ |
| michael@356 | 46 | |
| michael@356 | 47 | +#include <stdlib.h> |
| michael@356 | 48 | #include "syck.h" |
| michael@356 | 49 | |
| michael@356 | 50 | #define YYCTYPE char |
| michael@356 | 51 | Index: syck-0.70/lib/node.c |
| michael@356 | 52 | --- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34 +0200 |
| michael@356 | 53 | +++ syck-0.70/lib/node.c 2009-11-27 13:24:07 +0100 |
| michael@356 | 54 | @@ -7,6 +7,9 @@ |
| michael@356 | 55 | * Copyright (C) 2003 why the lucky stiff |
| michael@356 | 56 | */ |
| michael@356 | 57 | |
| michael@356 | 58 | +#include <stdlib.h> |
| michael@356 | 59 | +#include <string.h> |
| michael@356 | 60 | + |
| michael@356 | 61 | #include "syck.h" |
| michael@356 | 62 | |
| michael@356 | 63 | /* |
| michael@356 | 64 | Index: syck-0.70/lib/syck.c |
| michael@356 | 65 | --- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34 +0200 |
| michael@356 | 66 | +++ syck-0.70/lib/syck.c 2009-11-27 13:24:07 +0100 |
| michael@356 | 67 | @@ -7,6 +7,7 @@ |
| michael@356 | 68 | * Copyright (C) 2003 why the lucky stiff |
| michael@356 | 69 | */ |
| michael@356 | 70 | #include <stdio.h> |
| michael@356 | 71 | +#include <stdlib.h> |
| michael@356 | 72 | #include <string.h> |
| michael@356 | 73 | |
| michael@356 | 74 | #include "syck.h" |
| michael@356 | 75 | @@ -67,12 +68,13 @@ |
| michael@356 | 76 | |
| michael@356 | 77 | ASSERT( str != NULL ); |
| michael@356 | 78 | beg = str->ptr; |
| michael@356 | 79 | + |
| michael@356 | 80 | if ( max_size >= 0 ) |
| michael@356 | 81 | { |
| michael@356 | 82 | max_size -= skip; |
| michael@356 | 83 | - if ( max_size <= 0 ) max_size = 0; |
| michael@356 | 84 | - else str->ptr += max_size; |
| michael@356 | 85 | + if ( max_size < 0 ) max_size = 0; |
| michael@356 | 86 | |
| michael@356 | 87 | + str->ptr += max_size; |
| michael@356 | 88 | if ( str->ptr > str->end ) |
| michael@356 | 89 | { |
| michael@356 | 90 | str->ptr = str->end; |
| michael@356 | 91 | Index: syck-0.70/lib/syck.h |
| michael@356 | 92 | --- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34 +0200 |
| michael@356 | 93 | +++ syck-0.70/lib/syck.h 2009-11-27 13:24:07 +0100 |
| michael@356 | 94 | @@ -36,6 +36,8 @@ |
| michael@356 | 95 | |
| michael@356 | 96 | #include <stddef.h> |
| michael@356 | 97 | #include <stdio.h> |
| michael@356 | 98 | +#include <stdlib.h> |
| michael@356 | 99 | +#include <string.h> |
| michael@356 | 100 | #include <ctype.h> |
| michael@356 | 101 | #ifdef HAVE_ST_H |
| michael@356 | 102 | #include <st.h> |
| michael@356 | 103 | Index: syck-0.70/lib/token.c |
| michael@356 | 104 | --- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34 +0200 |
| michael@356 | 105 | +++ syck-0.70/lib/token.c 2009-11-27 13:24:07 +0100 |
| michael@356 | 106 | @@ -7,6 +7,8 @@ |
| michael@356 | 107 | * |
| michael@356 | 108 | * Copyright (C) 2003 why the lucky stiff |
| michael@356 | 109 | */ |
| michael@356 | 110 | +#include <stdlib.h> |
| michael@356 | 111 | +#include <string.h> |
| michael@356 | 112 | #include "syck.h" |
| michael@356 | 113 | |
| michael@356 | 114 | #if GRAM_FILES_HAVE_TAB_SUFFIX |
| michael@356 | 115 | Index: syck-0.70/lib/yaml2byte.c |
| michael@356 | 116 | --- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34 +0200 |
| michael@356 | 117 | +++ syck-0.70/lib/yaml2byte.c 2009-11-27 13:24:31 +0100 |
| michael@356 | 118 | @@ -11,6 +11,8 @@ |
| michael@356 | 119 | */ |
| michael@356 | 120 | #include "syck.h" |
| michael@356 | 121 | #include <assert.h> |
| michael@356 | 122 | +#include <stdlib.h> |
| michael@356 | 123 | +#include <string.h> |
| michael@356 | 124 | #define YAMLBYTE_UTF8 |
| michael@356 | 125 | #include "yamlbyte.h" |
| michael@356 | 126 |
