[lfs-patches] r3606 - in trunk: fuse httpd

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Sat Jul 15 08:36:34 PDT 2017


Author: bdubbs
Date: Sat Jul 15 08:36:34 2017
New Revision: 3606

Log:
Bring forware apache patch.
Add upstream fuse patch.

Added:
   trunk/fuse/
   trunk/fuse/fuse-3.1.0-upstream_fix-1.patch
   trunk/httpd/httpd-2.4.27-blfs_layout-1.patch   (contents, props changed)

Added: trunk/fuse/fuse-3.1.0-upstream_fix-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/fuse/fuse-3.1.0-upstream_fix-1.patch	Sat Jul 15 08:36:34 2017	(r3606)
@@ -0,0 +1,49 @@
+Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch.org>
+Date: 2017-07-14
+Initial Package Version: 3.1.0
+Upstream Status: Committed
+Origin: Upstream
+Description: Although the comments below concern GCC 4.x, they are 
+needed for gcc7 also.
+
+From 503e32d01e4db00e90d7acfd81ab05386559069f Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Sat, 8 Jul 2017 13:11:47 +0200
+Subject: [PATCH] Fixup symbol versioning for GCC 4.x
+
+GCC 4.8 doesn't like to rename fuse_new_30 to fuse_new, if we
+also define an implementation for fuse_new.
+---
+ lib/fuse.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lib/fuse.c b/lib/fuse.c
+index ce298192..5160eb11 100644
+--- a/lib/fuse.c
++++ b/lib/fuse.c
+@@ -4626,10 +4626,8 @@ void fuse_stop_cleanup_thread(struct fuse *f)
+ }
+ 
+ 
+-/* Emulates 3.0-style fuse_new(), which processes
+-   --help */
++/* Emulates 3.0-style fuse_new(), which processes --help */
+ FUSE_SYMVER(".symver fuse_new_30,fuse_new at FUSE_3.0");
+-FUSE_SYMVER(".symver fuse_new,fuse_new@@FUSE_3.1");
+ struct fuse *fuse_new_30(struct fuse_args *args,
+ 			 const struct fuse_operations *op,
+ 			 size_t op_size, void *user_data)
+@@ -4652,7 +4650,12 @@ struct fuse *fuse_new_30(struct fuse_args *args,
+ 		return fuse_new(args, op, op_size, user_data);
+ }
+ 
+-struct fuse *fuse_new(struct fuse_args *args,
++/* Explicit prototype to prevent compiler warnings
++   (fuse.h only defines fuse_new()) */
++struct fuse *fuse_new_31(struct fuse_args *args, const struct fuse_operations *op,
++		      size_t op_size, void *private_data);
++FUSE_SYMVER(".symver fuse_new_31,fuse_new@@FUSE_3.1");
++struct fuse *fuse_new_31(struct fuse_args *args,
+ 		      const struct fuse_operations *op,
+ 		      size_t op_size, void *user_data)
+ {

Added: trunk/httpd/httpd-2.4.27-blfs_layout-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/httpd/httpd-2.4.27-blfs_layout-1.patch	Sat Jul 15 08:36:34 2017	(r3606)
@@ -0,0 +1 @@
+link httpd-2.4.10-blfs_layout-1.patch
\ No newline at end of file


More information about the patches mailing list