diff options
author | joerg <joerg@pkgsrc.org> | 2015-01-25 13:14:46 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2015-01-25 13:14:46 +0000 |
commit | 0e865236bbd33471c0579df2c71e87b9e8149a03 (patch) | |
tree | 34f509f1c32749e52be1dee42eeabd6f171a8ee0 /sysutils | |
parent | d444b75e1d0001f97410edfbf37e71fe547b02f9 (diff) | |
download | pkgsrc-0e865236bbd33471c0579df2c71e87b9e8149a03.tar.gz |
Just because it is a new xentools version, don't expect the horrible
dynamic type mess is fixed.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/xentools45/distinfo | 3 | ||||
-rw-r--r-- | sysutils/xentools45/patches/patch-.._.._ipxe_src_core_settings.c | 34 |
2 files changed, 36 insertions, 1 deletions
diff --git a/sysutils/xentools45/distinfo b/sysutils/xentools45/distinfo index eaf16657b6d..5ac6c683b3c 100644 --- a/sysutils/xentools45/distinfo +++ b/sysutils/xentools45/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2015/01/21 08:53:21 bouyer Exp $ +$NetBSD: distinfo,v 1.3 2015/01/25 13:14:46 joerg Exp $ SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8 @@ -6,6 +6,7 @@ Size (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 2867999 bytes SHA1 (xen-4.5.0.tar.gz) = c4aab5fb366496ad1edc7fe0a935a0d604335637 RMD160 (xen-4.5.0.tar.gz) = e35ba0cb484492c1a289218eb9bf53b57dbd3a45 Size (xen-4.5.0.tar.gz) = 18404933 bytes +SHA1 (patch-.._.._ipxe_src_core_settings.c) = 9e053e5e9936f49c46af0d59382a67d5f28cb39d SHA1 (patch-.._Config.mk) = 36a8942a9fc0f7d601c9b5f7fd1332db99f9ac4b SHA1 (patch-.._docs_man_xl.cfg.pod.5) = e2058495b6fe85af338e22560d46996d36aeedab SHA1 (patch-.._docs_man_xl.conf.pod.5) = 015da24a45388468d56f1ecfa60f6acf07bdfef8 diff --git a/sysutils/xentools45/patches/patch-.._.._ipxe_src_core_settings.c b/sysutils/xentools45/patches/patch-.._.._ipxe_src_core_settings.c new file mode 100644 index 00000000000..bca3db5c1c2 --- /dev/null +++ b/sysutils/xentools45/patches/patch-.._.._ipxe_src_core_settings.c @@ -0,0 +1,34 @@ +$NetBSD: patch-.._.._ipxe_src_core_settings.c,v 1.1 2015/01/25 13:14:46 joerg Exp $ + +--- ../../ipxe/src/core/settings.c.orig 2013-03-25 18:48:57.000000000 +0000 ++++ ../../ipxe/src/core/settings.c +@@ -284,10 +284,12 @@ static struct settings * find_child_sett + */ + static struct settings * autovivify_child_settings ( struct settings *parent, + const char *name ) { ++ size_t nlen = strlen(name) + 1; + struct { + struct autovivified_settings autovivified; +- char name[ strlen ( name ) + 1 /* NUL */ ]; ++ char name[]; + } *new_child; ++ size_t tlen = sizeof(*new_child) + nlen; + struct settings *settings; + + /* Return existing settings, if existent */ +@@ -295,13 +297,13 @@ static struct settings * autovivify_chil + return settings; + + /* Create new generic settings block */ +- new_child = zalloc ( sizeof ( *new_child ) ); ++ new_child = zalloc ( tlen ); + if ( ! new_child ) { + DBGC ( parent, "Settings %p could not create child %s\n", + parent, name ); + return NULL; + } +- memcpy ( new_child->name, name, sizeof ( new_child->name ) ); ++ memcpy ( new_child->name, name, nlen ); + ref_init ( &new_child->autovivified.refcnt, + autovivified_settings_free ); + generic_settings_init ( &new_child->autovivified.generic, |