1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
To: vim_dev@googlegroups.com
Subject: Patch 7.4.2
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.4.254
Problem: Smack support detection is incomplete.
Solution: Check for attr/xattr.h and specific macro.
Files: src/configure.in, src/auto/configure
*** ../vim-7.4.253/src/configure.in 2014-04-05 12:02:20.747100138 +0200
--- src/configure.in 2014-04-10 11:02:59.256035996 +0200
***************
*** 396,405 ****
AC_MSG_RESULT(no)
AC_CHECK_HEADER([linux/xattr.h], true, enable_smack="no")
else
! AC_MSG_RESULT(yes)
fi
if test "$enable_smack" = "yes"; then
! AC_CHECK_LIB(attr, llistxattr,
[LIBS="$LIBS -lattr"
found_smack="yes"
AC_DEFINE(HAVE_SMACK)])
--- 396,414 ----
AC_MSG_RESULT(no)
AC_CHECK_HEADER([linux/xattr.h], true, enable_smack="no")
else
! AC_MSG_RESULT(yes)
fi
if test "$enable_smack" = "yes"; then
! AC_CHECK_HEADER([attr/xattr.h], true, enable_smack="no")
! fi
! if test "$enable_smack" = "yes"; then
! AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
! AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>],
! AC_MSG_RESULT(yes),
! AC_MSG_RESULT(no); enable_smack = "no")
! fi
! if test "$enable_smack" = "yes"; then
! AC_CHECK_LIB(attr, setxattr,
[LIBS="$LIBS -lattr"
found_smack="yes"
AC_DEFINE(HAVE_SMACK)])
*** ../vim-7.4.253/src/auto/configure 2014-04-05 12:02:20.751100138 +0200
--- src/auto/configure 2014-04-10 11:03:04.220036007 +0200
***************
*** 4611,4623 ****
else
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
if test "$enable_smack" = "yes"; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for llistxattr in -lattr" >&5
! $as_echo_n "checking for llistxattr in -lattr... " >&6; }
! if ${ac_cv_lib_attr_llistxattr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
--- 4611,4651 ----
else
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
if test "$enable_smack" = "yes"; then
! ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
! if test "x$ac_cv_header_attr_xattr_h" = xyes; then :
! true
! else
! enable_smack="no"
! fi
!
!
! fi
! if test "$enable_smack" = "yes"; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XATTR_NAME_SMACKEXEC in linux/xattr.h" >&5
! $as_echo_n "checking for XATTR_NAME_SMACKEXEC in linux/xattr.h... " >&6; }
! cat confdefs.h - <<_ACEOF >conftest.$ac_ext
! /* end confdefs.h. */
! #include <linux/xattr.h>
! _ACEOF
! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
! $EGREP "XATTR_NAME_SMACKEXEC" >/dev/null 2>&1; then :
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
! $as_echo "yes" >&6; }
! else
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
! $as_echo "no" >&6; }; enable_smack = "no"
! fi
! rm -f conftest*
!
! fi
! if test "$enable_smack" = "yes"; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setxattr in -lattr" >&5
! $as_echo_n "checking for setxattr in -lattr... " >&6; }
! if ${ac_cv_lib_attr_setxattr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
***************
*** 4631,4657 ****
#ifdef __cplusplus
extern "C"
#endif
! char llistxattr ();
int
main ()
{
! return llistxattr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
! ac_cv_lib_attr_llistxattr=yes
else
! ac_cv_lib_attr_llistxattr=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_llistxattr" >&5
! $as_echo "$ac_cv_lib_attr_llistxattr" >&6; }
! if test "x$ac_cv_lib_attr_llistxattr" = xyes; then :
LIBS="$LIBS -lattr"
found_smack="yes"
$as_echo "#define HAVE_SMACK 1" >>confdefs.h
--- 4659,4685 ----
#ifdef __cplusplus
extern "C"
#endif
! char setxattr ();
int
main ()
{
! return setxattr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
! ac_cv_lib_attr_setxattr=yes
else
! ac_cv_lib_attr_setxattr=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_setxattr" >&5
! $as_echo "$ac_cv_lib_attr_setxattr" >&6; }
! if test "x$ac_cv_lib_attr_setxattr" = xyes; then :
LIBS="$LIBS -lattr"
found_smack="yes"
$as_echo "#define HAVE_SMACK 1" >>confdefs.h
*** ../vim-7.4.253/src/version.c 2014-04-06 21:33:39.675363743 +0200
--- src/version.c 2014-04-10 11:00:57.200035730 +0200
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 254,
/**/
--
George: "I just got a new set of golf clubs for my wife!"
John: "Great trade!"
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
