2 files changed, 1 insertions, 94 deletions

diff --git a/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch b/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch
deleted file mode 100644
index d47f692c0e..0000000000
--- a/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-fuse: Fix linking issues with gold linker
-
-fuse has problems when linking with gold since it uses version
-scripts in a way thats so perticular to bfd ld
-
-/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstro
-error: symbol __fuse_exited has undefined version
-| collect2: ld returned 1 exit status
-| make[1]: *** [libfuse.la] Error 1
-| make[1]: *** Waiting for unfinished jobs....
-
-For more details
-
-http://blog.flameeyes.eu/2011/06/01/gold-readiness-obstacle-2-base-versioning
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=10861
-http://comments.gmane.org/gmane.comp.file-systems.fuse.devel/9524
-http://www.airs.com/blog/archives/300
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- lib/fuse.c             | 10 +++++-----
- lib/fuse_mt.c          |  2 +-
- lib/fuse_versionscript |  3 +++
- lib/helper.c           |  6 +++---
- 4 files changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/lib/fuse.c b/lib/fuse.c
-index 067d0dc..6d27711 100644
---- a/lib/fuse.c
-+++ b/lib/fuse.c
-@@ -4873,11 +4873,11 @@ struct fuse *fuse_new_compat1(int fd, int flags,
-                                      11);
- }
- 
--FUSE_SYMVER(".symver fuse_exited,__fuse_exited@");
--FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@");
--FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@");
--FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@");
--FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@");
-+FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED");
- FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2");
- 
- #endif /* __FreeBSD__ || __NetBSD__  */
-diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c
-index f6dbe71..fd5ac23 100644
---- a/lib/fuse_mt.c
-+++ b/lib/fuse_mt.c
-@@ -119,4 +119,4 @@ int fuse_loop_mt(struct fuse *f)
-        return res;
- }
- 
--FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@");
-+FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED");
-diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
-index 8d91887..de16ab2 100644
---- a/lib/fuse_versionscript
-+++ b/lib/fuse_versionscript
-@@ -1,3 +1,6 @@
-+FUSE_UNVERSIONED {
-+};
-+
- FUSE_2.2 {
-        global:
-                fuse_destroy;
-diff --git a/lib/helper.c b/lib/helper.c
-index b644012..c5349bf 100644
---- a/lib/helper.c
-+++ b/lib/helper.c
-@@ -436,10 +436,10 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[])
-        return fuse_mount_compat22(mountpoint, NULL);
- }
- 
--FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@");
-+FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED");
- FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2");
--FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@");
--FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@");
-+FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED");
- FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2");
- 
- #endif /* __FreeBSD__ || __NetBSD__ */
--- 
-1.8.1.2
-
diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
index 6f613e9cd1..094ed8c8ad 100644
--- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
+++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar.gz \
-           file://gold-unversioned-symbol.patch \
            file://aarch64.patch \
            file://0001-fuse-fix-the-return-value-of-help-option.patch \
            file://fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch \
@@ -23,7 +22,7 @@ SRC_URI[sha256sum] = "d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7
 UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases"
 UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>2(\.\d+)+).tar.gz"
 
-CVE_PRODUCT = "fuse_project:fuse"
+CVE_PRODUCT = "fuse_project:fuse fuse:fuse"
 
 inherit autotools pkgconfig update-rc.d systemd