3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
6 Index: sudo-1.6.8p6/configure.in
7 ===================================================================
8 --- sudo-1.6.8p6.orig/configure.in 2004-11-25 12:31:20.000000000 -0500
9 +++ sudo-1.6.8p6/configure.in 2005-01-21 19:09:27.248233336 -0500
10 @@ -1700,12 +1700,14 @@
11 if test -z "$BROKEN_GETCWD"; then
12 AC_REPLACE_FUNCS(getcwd)
14 -AC_CHECK_FUNCS(lockf flock, [break])
15 -AC_CHECK_FUNCS(waitpid wait3, [break])
16 -AC_CHECK_FUNCS(innetgr _innetgr, [AC_CHECK_FUNCS(getdomainname) [break]])
17 -AC_CHECK_FUNCS(lsearch, , [AC_CHECK_LIB(compat, lsearch, AC_CHECK_HEADER(search.h, AC_DEFINE(HAVE_LSEARCH) [LIBS="${LIBS} -lcompat"], AC_LIBOBJ(lsearch), -), AC_LIBOBJ(lsearch))])
18 -AC_CHECK_FUNCS(utimes, [AC_CHECK_FUNCS(futimes futimesat, [break])], [AC_CHECK_FUNCS(futime) AC_LIBOBJ(utimes)])
19 -SUDO_FUNC_FNMATCH(AC_DEFINE(HAVE_FNMATCH), AC_LIBOBJ(fnmatch))
20 +AC_CHECK_FUNCS(lockf flock)
21 +AC_CHECK_FUNCS(waitpid wait3)
22 +AC_CHECK_FUNCS(innetgr _innetgr, [AC_CHECK_FUNCS(getdomainname)])
24 +AC_CHECK_FUNCS(lsearch, , [AC_CHECK_LIB(compat, lsearch, [AC_CHECK_HEADER(search.h, [AC_DEFINE(HAVE_LSEARCH) LIBS="$LIBS -lcompat"], [AC_LIBOBJ([lsearch])])], [AC_LIBOBJ([lsearch])])])
26 +AC_CHECK_FUNCS(utime, [SUDO_FUNC_UTIME_POSIX], [AC_LIBOBJ([utime])])
27 +SUDO_FUNC_FNMATCH([AC_DEFINE([HAVE_FNMATCH], [1], [Define if you have the 'fnmatch' function.])], [AC_LIBOBJ([fnmatch])])
29 AC_REPLACE_FUNCS(strerror strcasecmp sigaction strlcpy strlcat closefrom)
30 AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf, , [NEED_SNPRINTF=1])
31 Index: sudo-1.6.8p6/aclocal.m4
32 ===================================================================
33 --- sudo-1.6.8p6.orig/aclocal.m4 2004-09-07 13:14:51.000000000 -0400
34 +++ sudo-1.6.8p6/aclocal.m4 2005-01-21 19:17:00.029400136 -0500
37 dnl check for sendmail
39 -AC_DEFUN(SUDO_PROG_SENDMAIL, [AC_MSG_CHECKING(for sendmail)
40 +AC_DEFUN([SUDO_PROG_SENDMAIL], [AC_MSG_CHECKING(for sendmail)
41 if test -f "/usr/sbin/sendmail"; then
42 AC_MSG_RESULT(/usr/sbin/sendmail)
43 SUDO_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/sbin/sendmail")
48 -AC_DEFUN(SUDO_PROG_VI, [AC_MSG_CHECKING(for vi)
49 +AC_DEFUN([SUDO_PROG_VI], [AC_MSG_CHECKING(for vi)
50 if test -f "/usr/bin/vi"; then
51 AC_MSG_RESULT(/usr/bin/vi)
52 SUDO_DEFINE(_PATH_VI, "/usr/bin/vi")
57 -AC_DEFUN(SUDO_PROG_MV, [AC_MSG_CHECKING(for mv)
58 +AC_DEFUN([SUDO_PROG_MV], [AC_MSG_CHECKING(for mv)
59 if test -f "/usr/bin/mv"; then
60 AC_MSG_RESULT(/usr/bin/mv)
61 SUDO_DEFINE(_PATH_MV, "/usr/bin/mv")
64 dnl check for bourne shell
66 -AC_DEFUN(SUDO_PROG_BSHELL, [AC_MSG_CHECKING(for bourne shell)
67 +AC_DEFUN([SUDO_PROG_BSHELL], [AC_MSG_CHECKING(for bourne shell)
68 if test -f "/bin/sh"; then
69 AC_MSG_RESULT(/bin/sh)
70 SUDO_DEFINE(_PATH_BSHELL, "/bin/sh")
73 dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm
75 -AC_DEFUN(SUDO_LOGFILE, [AC_MSG_CHECKING(for log file location)
76 +AC_DEFUN([SUDO_LOGFILE], [AC_MSG_CHECKING(for log file location)
77 if test -n "$with_logpath"; then
78 AC_MSG_RESULT($with_logpath)
79 SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LOGFILE, "$with_logpath")
82 dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm
84 -AC_DEFUN(SUDO_TIMEDIR, [AC_MSG_CHECKING(for timestamp file location)
85 +AC_DEFUN([SUDO_TIMEDIR], [AC_MSG_CHECKING(for timestamp file location)
86 if test -n "$with_timedir"; then
87 AC_MSG_RESULT($with_timedir)
88 SUDO_DEFINE_UNQUOTED(_PATH_SUDO_TIMEDIR, "$with_timedir")
91 dnl check for fullly working void
93 -AC_DEFUN(SUDO_FULL_VOID, [AC_MSG_CHECKING(for full void implementation)
94 +AC_DEFUN([SUDO_FULL_VOID], [AC_MSG_CHECKING(for full void implementation)
95 AC_TRY_COMPILE(, [void *foo;
96 foo = (void *)0; (void *)"test";], AC_DEFINE(VOID, void, [Define to "void" if your compiler supports void pointers, else use "char"].)
97 AC_MSG_RESULT(yes), AC_DEFINE(VOID, char)
99 dnl SUDO_CHECK_TYPE(TYPE, DEFAULT)
100 dnl XXX - should require the check for unistd.h...
102 -AC_DEFUN(SUDO_CHECK_TYPE,
103 +AC_DEFUN([SUDO_CHECK_TYPE],
104 [AC_REQUIRE([AC_HEADER_STDC])dnl
105 AC_MSG_CHECKING(for $1)
106 AC_CACHE_VAL(sudo_cv_type_$1,
107 @@ -189,31 +189,31 @@
109 dnl Check for size_t declation
111 -AC_DEFUN(SUDO_TYPE_SIZE_T,
112 +AC_DEFUN([SUDO_TYPE_SIZE_T],
113 [SUDO_CHECK_TYPE(size_t, int)])
116 dnl Check for ssize_t declation
118 -AC_DEFUN(SUDO_TYPE_SSIZE_T,
119 +AC_DEFUN([SUDO_TYPE_SSIZE_T],
120 [SUDO_CHECK_TYPE(ssize_t, int)])
123 dnl Check for dev_t declation
125 -AC_DEFUN(SUDO_TYPE_DEV_T,
126 +AC_DEFUN([SUDO_TYPE_DEV_T],
127 [SUDO_CHECK_TYPE(dev_t, int)])
130 dnl Check for ino_t declation
132 -AC_DEFUN(SUDO_TYPE_INO_T,
133 +AC_DEFUN([SUDO_TYPE_INO_T],
134 [SUDO_CHECK_TYPE(ino_t, unsigned int)])
137 dnl check for working fnmatch(3)
139 -AC_DEFUN(SUDO_FUNC_FNMATCH,
140 +AC_DEFUN([SUDO_FUNC_FNMATCH],
141 [AC_MSG_CHECKING(for working fnmatch with FNM_CASEFOLD)
142 AC_CACHE_VAL(sudo_cv_func_fnmatch,
143 [rm -f conftestdata; > conftestdata
145 rm -f core core.* *.core])dnl
146 AC_MSG_RESULT($sudo_cv_func_fnmatch)
147 if test $sudo_cv_func_fnmatch = yes; then
158 dnl check for sa_len field in struct sockaddr
160 -AC_DEFUN(SUDO_SOCK_SA_LEN,
161 +AC_DEFUN([SUDO_SOCK_SA_LEN],
162 [AC_MSG_CHECKING(for sa_len field in struct sockaddr)
163 AC_CACHE_VAL(sudo_cv_sock_sa_len,
164 [AC_TRY_RUN([#include <sys/types.h>
166 dnl we can't really trust UID_MAX or MAXUID since they may exist
167 dnl only for backwards compatibility.
169 -AC_DEFUN(SUDO_UID_T_LEN,
170 +AC_DEFUN([SUDO_UID_T_LEN],
171 [AC_REQUIRE([AC_TYPE_UID_T])
172 AC_MSG_CHECKING(max length of uid_t)
173 AC_CACHE_VAL(sudo_cv_uid_t_len,
174 @@ -303,15 +303,21 @@
175 dnl check for "long long"
176 dnl XXX hard to cache since it includes 2 tests
178 -AC_DEFUN(SUDO_LONG_LONG, [AC_MSG_CHECKING(for long long support)
179 -AC_TRY_LINK(, [long long foo = 1000; foo /= 10;], AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.])
180 -[AC_TRY_RUN([main() {if (sizeof(long long) == sizeof(long)) exit(0); else exit(1);}], AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]))]
181 -AC_MSG_RESULT(yes), AC_MSG_RESULT(no))])
183 +AC_DEFUN([SUDO_LONG_LONG], [AC_MSG_CHECKING(for long long support)
184 +AC_LINK_IFELSE([long long foo = 1000; foo /= 10;],
185 + AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.])
186 + AC_CHECK_SIZEOF([long])
187 + AC_CHECK_SIZEOF([long long])
188 + if x"$ac_cv_sizeof_long" = x"$ac_cv_sizeof_long_long"; then
189 + AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).])
191 +, AC_MSG_RESULT(yes), AC_MSG_RESULT(no))])
194 dnl append a libpath to an LDFLAGS style variable
196 -AC_DEFUN(SUDO_APPEND_LIBPATH, [
197 +AC_DEFUN([SUDO_APPEND_LIBPATH], [
198 if test X"$with_rpath" = X"yes"; then