summaryrefslogtreecommitdiff
path: root/net-fs/samba/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-08-24 02:45:57 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-08-24 02:45:57 +0100
commit2d51a70c0ec989cfc28d2d9a140206a601378c58 (patch)
tree5ff136d8b7452def4a7f53ea9b4ad96dc4312c35 /net-fs/samba/files
parent26062b5638b6d2a6eedba7797ed6dde6f3d1f01c (diff)
gentoo auto-resync : 24:08:2022 - 02:45:57
Diffstat (limited to 'net-fs/samba/files')
-rw-r--r--net-fs/samba/files/samba-4.16.4-glibc-2.36.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/net-fs/samba/files/samba-4.16.4-glibc-2.36.patch b/net-fs/samba/files/samba-4.16.4-glibc-2.36.patch
new file mode 100644
index 000000000000..7d3d231f50c9
--- /dev/null
+++ b/net-fs/samba/files/samba-4.16.4-glibc-2.36.patch
@@ -0,0 +1,51 @@
+https://gitlab.com/samba-team/samba/-/commit/df7d6f0c48612feea428643006d32c2292c662e2
+https://bugs.gentoo.org/863830
+
+From: Andreas Schneider <asn@samba.org>
+Date: Tue, 2 Aug 2022 07:55:46 +0200
+Subject: [PATCH] lib:replace: Only include <sys/mount.h> on non-Linux systems
+
+Details at:
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Ralph Boehme <slow@samba.org>
+(cherry picked from commit 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0)
+
+Autobuild-User(v4-16-test): Jule Anger <janger@samba.org>
+Autobuild-Date(v4-16-test): Tue Aug 23 08:53:41 UTC 2022 on sn-devel-184
+--- a/lib/replace/system/filesys.h
++++ b/lib/replace/system/filesys.h
+@@ -36,7 +36,8 @@
+ #include <sys/param.h>
+ #endif
+
+-#ifdef HAVE_SYS_MOUNT_H
++/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */
++#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H)
+ #include <sys/mount.h>
+ #endif
+
+@@ -44,6 +45,7 @@
+ #include <mntent.h>
+ #endif
+
++/* This include is required on Linux for statfs() */
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+--- a/lib/replace/wscript
++++ b/lib/replace/wscript
+@@ -31,6 +31,9 @@ def configure(conf):
+
+ conf.env.standalone_replace = conf.IN_LAUNCH_DIR()
+
++ if sys.platform.rfind('linux') > -1:
++ conf.DEFINE('LINUX', '1')
++
+ conf.DEFINE('BOOL_DEFINED', 1)
+ conf.DEFINE('HAVE_LIBREPLACE', 1)
+ conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
+GitLab