Skip to content

Commit 8c358e0

Browse files
illia-bobyrchrisbra
authored andcommitted
patch 9.0.1965: wrong auto/configure script
Problem: wrong auto/configure script Solution: regenerate with autoconf 2.71 configure: sys/xattr.hs: Regenerate with autoconf 2.71 It seems that `auto/configure` update in commit 6de4e58 (tag: v9.0.1963) Author: zeertzjq <[email protected]> Date: Sat Sep 30 14:19:14 2023 +0200 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 <[email protected]> Co-authored-by: zeertzjq <[email protected]> was done manually, and missed an update to the generated variable name. closes: #13235 Signed-off-by: Christian Brabandt <[email protected]> Co-authored-by: Illia Bobyr <[email protected]>
1 parent a4dfbfe commit 8c358e0

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/auto/configure

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5279,8 +5279,8 @@ else
52795279
printf "%s\n" "yes" >&6; }
52805280
fi
52815281
if test "$enable_smack" = "yes"; then
5282-
ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
5283-
if test "x$ac_cv_header_attr_xattr_h" = xyes
5282+
ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default"
5283+
if test "x$ac_cv_header_sys_xattr_h" = xyes
52845284
then :
52855285
true
52865286
else $as_nop
@@ -5434,8 +5434,8 @@ fi
54345434
if test "$enable_xattr" = "yes"; then
54355435
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
54365436
printf "%s\n" "yes" >&6; }
5437-
ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
5438-
if test "x$ac_cv_header_attr_xattr_h" = xyes
5437+
ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default"
5438+
if test "x$ac_cv_header_sys_xattr_h" = xyes
54395439
then :
54405440
printf "%s\n" "#define HAVE_XATTR 1" >>confdefs.h
54415441

@@ -5447,7 +5447,6 @@ printf "%s\n" "no" >&6; }
54475447
fi
54485448

54495449

5450-
54515450
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-features argument" >&5
54525451
printf %s "checking --with-features argument... " >&6; }
54535452

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
1965,
707709
/**/
708710
1964,
709711
/**/

0 commit comments

Comments
 (0)