patch 9.0.1963: Configure script may not detect xattr

Problem:  Configure script may not detect xattr correctly
Solution: include sys/xattr instead of attr/xattr,
          make Test_write_with_xattr_support() test
          xattr feature correctly

This also applies to the Smack security feature, so change the include
and configure script for it as well.

closes: #13229

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>

diff --git a/src/auto/configure b/src/auto/configure
index 54c1aa8159944f8be4fa92f0bb4f276726f9c3d6..9eca87c277e4f759bbfe2b56fe0aeedc01a5ed2c 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5279,7 +5279,7 @@ else
 printf "%s\n" "yes" >&6; }
 fi
 if test "$enable_smack" = "yes"; then
-  ac_fn_c_check_header_compile "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
+  ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
 if test "x$ac_cv_header_attr_xattr_h" = xyes
 then :
   true
@@ -5434,7 +5434,7 @@ fi
 if test "$enable_xattr" = "yes"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-  ac_fn_c_check_header_compile "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
+  ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
 if test "x$ac_cv_header_attr_xattr_h" = xyes
 then :
   printf "%s\n" "#define HAVE_XATTR 1" >>confdefs.h

diff --git a/src/configure.ac b/src/configure.ac
index e21e23490af12866155c87a4cef2362e4eb77534..4b2046dd526b9e1c827476939552bb94f39d4094 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -480,7 +480,7 @@ else
   AC_MSG_RESULT(yes)
 fi
 if test "$enable_smack" = "yes"; then
-  AC_CHECK_HEADER([attr/xattr.h], true, enable_smack="no")
+  AC_CHECK_HEADER([sys/xattr.h], true, enable_smack="no")
 fi
 if test "$enable_smack" = "yes"; then
   AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
@@ -520,7 +520,7 @@ AC_ARG_ENABLE(xattr,
        , enable_xattr="yes")
 if test "$enable_xattr" = "yes"; then
   AC_MSG_RESULT(yes)
-  AC_CHECK_HEADER([attr/xattr.h], [AC_DEFINE(HAVE_XATTR)])
+  AC_CHECK_HEADER([sys/xattr.h], [AC_DEFINE(HAVE_XATTR)])
 else
   AC_MSG_RESULT(no)
 fi

diff --git a/src/os_unix.c b/src/os_unix.c
index 674dd96666e32c8309374837e3dc40d3889527a3..50acd5a0c564165d104958b697e69dc83649037b 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -36,12 +36,12 @@ static int selinux_enabled = -1;
 #endif
 
 #ifdef FEAT_XATTR
-# include <attr/xattr.h>
+# include <sys/xattr.h>
 # define XATTR_VAL_LEN 1024
 #endif
 
 #ifdef HAVE_SMACK
-# include <attr/xattr.h>
+# include <sys/xattr.h>
 # include <linux/xattr.h>
 # ifndef SMACK_LABEL_LEN
 #  define SMACK_LABEL_LEN 1024

diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index a54efa7cf967f670173b636c1f030e7d5bbab6d0..3b0164e8807a97d8aef7fb46341ff7b073e5b828 100644 (file)
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -979,6 +979,7 @@ endfunc
 
 func Test_write_with_xattr_support()
   CheckLinux
+  CheckFeature xattr
   CheckExecutable setfattr
 
   let contents = ["file with xattrs", "line two"]

diff --git a/src/version.c b/src/version.c
index ffa5afcb5767c8c4981937701d48a59f3bbd3ce1..f918ad896fca8e25edace5c68ede4ef1708ebfe0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1963,
 /**/
     1962,
 /**/