]>
Commit | Line | Data |
---|---|---|
468f4c2f | 1 | diff -Nur sudo-1.6.8p12.orig/acinclude.m4 sudo-1.6.8p12.ac/acinclude.m4 |
2 | --- sudo-1.6.8p12.orig/acinclude.m4 2004-09-07 20:14:51.000000000 +0300 | |
3 | +++ sudo-1.6.8p12.ac/acinclude.m4 2006-09-05 16:50:19.000000000 +0300 | |
4 | @@ -224,9 +224,9 @@ | |
5 | rm -f core core.* *.core])dnl | |
6 | AC_MSG_RESULT($sudo_cv_func_fnmatch) | |
7 | if test $sudo_cv_func_fnmatch = yes; then | |
8 | - [$1] | |
9 | + $1 | |
10 | else | |
11 | - [$2] | |
12 | + $2 | |
13 | fi | |
14 | ]) | |
15 | ||
16 | diff -Nur sudo-1.6.8p12.orig/configure.in sudo-1.6.8p12.ac/configure.in | |
17 | --- sudo-1.6.8p12.orig/configure.in 2006-09-05 16:50:19.000000000 +0300 | |
18 | +++ sudo-1.6.8p12.ac/configure.in 2006-09-05 16:51:03.000000000 +0300 | |
19 | @@ -1609,7 +1609,7 @@ | |
20 | AC_CHECK_FUNCS(getspnam, [CHECKSHADOW="false"], [AC_CHECK_LIB(gen, getspnam, AC_DEFINE(HAVE_GETSPNAM) [SUDO_LIBS="${SUDO_LIBS} -lgen"; LIBS="${LIBS} -lgen"])]) | |
21 | fi | |
22 | if test "$CHECKSHADOW" = "true"; then | |
23 | - AC_CHECK_FUNC(getprpwnam, [AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1], AC_CHECK_LIB(sec, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lsec"; LIBS="${LIBS} -lsec"], AC_CHECK_LIB(security, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lsecurity"; LIBS="${LIBS} -lsecurity"], AC_CHECK_LIB(prot, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lprot"; LIBS="${LIBS} -lprot"])))]) | |
24 | + AC_CHECK_FUNC(getprpwnam, [AC_DEFINE(HAVE_GETPRPWNAM) AC_CHECK_LIB(sec, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lsec"; LIBS="${LIBS} -lsec"], AC_CHECK_LIB(security, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lsecurity"; LIBS="${LIBS} -lsecurity"], AC_CHECK_LIB(prot, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lprot"; LIBS="${LIBS} -lprot"]))) [CHECKSHADOW="false"; SECUREWARE=1]]) | |
25 | fi | |
26 | ||
27 | dnl | |
dd44b34a | 28 | @@ -1703,9 +1703,9 @@ |
8bc52606 JB |
29 | AC_CHECK_FUNCS(lockf flock, [break]) |
30 | AC_CHECK_FUNCS(waitpid wait3, [break]) | |
31 | AC_CHECK_FUNCS(innetgr _innetgr, [AC_CHECK_FUNCS(getdomainname) [break]]) | |
32 | -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))]) | |
33 | +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)])]) | |
dd44b34a JB |
34 | AC_CHECK_FUNCS(utimes, [AC_CHECK_FUNCS(futimes futimesat, [break])], [AC_CHECK_FUNCS(futime) AC_LIBOBJ(utimes)]) |
35 | -SUDO_FUNC_FNMATCH(AC_DEFINE(HAVE_FNMATCH), AC_LIBOBJ(fnmatch)) | |
36 | +SUDO_FUNC_FNMATCH(AC_DEFINE(HAVE_FNMATCH), [AC_LIBOBJ(fnmatch)]) | |
8bc52606 JB |
37 | SUDO_FUNC_ISBLANK |
38 | AC_REPLACE_FUNCS(strerror strcasecmp sigaction strlcpy strlcat closefrom) | |
39 | AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf, , [NEED_SNPRINTF=1]) | |
468f4c2f | 40 | diff -Nur sudo-1.6.8p12.orig/Makefile.in sudo-1.6.8p12.ac/Makefile.in |
41 | --- sudo-1.6.8p12.orig/Makefile.in 2006-09-05 16:50:19.000000000 +0300 | |
42 | +++ sudo-1.6.8p12.ac/Makefile.in 2006-09-05 16:50:19.000000000 +0300 | |
8bc52606 JB |
43 | @@ -187,7 +187,7 @@ |
44 | $(CC) -o $@ $(TESTOBJS) $(LIBOBJS) $(LDFLAGS) $(LIBS) $(NET_LIBS) | |
45 | ||
46 | sudo_noexec.la: sudo_noexec.lo | |
47 | - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir) | |
48 | + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -module -avoid-version -rpath $(noexecdir) | |
49 | ||
50 | # Uncomment the following if you want "make distclean" to clean the parser | |
51 | @DEV@PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c def_data.c def_data.h |