From 771f6b12634e8c63edc960aada0deefa5c2d9717 Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Fri, 27 Apr 2018 13:18:59 +0200 Subject: [PATCH] libyang: add patch The patch fixes a netopeer2-cli issue on musl. Signed-off-by: Mislav Novakovic --- libs/libyang/patches/001-fix-musl-issue.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 libs/libyang/patches/001-fix-musl-issue.patch diff --git a/libs/libyang/patches/001-fix-musl-issue.patch b/libs/libyang/patches/001-fix-musl-issue.patch new file mode 100644 index 0000000000..b497c9d168 --- /dev/null +++ b/libs/libyang/patches/001-fix-musl-issue.patch @@ -0,0 +1,47 @@ +Index: libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23/src/extensions.c +=================================================================== +--- libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23.orig/src/extensions.c ++++ libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23/src/extensions.c +@@ -123,11 +123,14 @@ lyext_load_plugins(void) + + /* and construct the filepath */ + asprintf(&str, "%s/%s", pluginsdir, file->d_name); +- +- /* load the plugin - first, try if it is already loaded... */ +- dlhandler = dlopen(str, RTLD_NOW | RTLD_NOLOAD); +- dlerror(); /* Clear any existing error */ +- if (dlhandler) { ++ /* load the plugin */ ++ dlhandler = dlopen(str, RTLD_NOW); ++ if (!dlhandler) { ++ LOGERR(LY_ESYS, "Loading \"%s\" as a plugin failed (%s).", str, dlerror()); ++ free(str); ++ continue; ++ } ++ if (ly_set_contains(&dlhandlers, dlhandler) != -1) { + /* the plugin is already loaded */ + LOGVRB("Extension plugin \"%s\" already loaded.", str); + free(str); +@@ -137,14 +140,6 @@ lyext_load_plugins(void) + continue; + } + +- /* ... and if not, load it */ +- dlhandler = dlopen(str, RTLD_NOW); +- if (!dlhandler) { +- LOGERR(LY_ESYS, "Loading \"%s\" as an extension plugin failed (%s).", str, dlerror()); +- free(str); +- continue; +- } +- LOGVRB("Extension plugin \"%s\" successfully loaded.", str); + free(str); + dlerror(); /* Clear any existing error */ + +@@ -156,6 +151,7 @@ lyext_load_plugins(void) + dlclose(dlhandler); + continue; + } ++ LOGVRB("Plugin \"%s\" successfully loaded.", str) + + for(u = 0; plugin[u].name; u++) { + /* check extension implementations for collisions */ -- 2.30.2