Remove compat/utime.h, it was only useful for ancient systems that

are no longer capable of compiling sudo.

diff --git a/MANIFEST b/MANIFEST
index 69063841e5f5fefede2c4db1272076279538d5b2..4a73dfd479d96e7b0dcc0d34945510e5e96f6634 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -61,7 +61,6 @@ include/compat/nss_dbdefs.h
 include/compat/sha2.h
 include/compat/stdbool.h
 include/compat/timespec.h
-include/compat/utime.h
 include/sudo_alloc.h
 include/sudo_compat.h
 include/sudo_conf.h

diff --git a/config.h.in b/config.h.in
index f7dcb7844593823e662fa5c145aadcc7a0732ec0..e66d2b2baebd51350270e54dbf97ce6e3b4b4074 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -835,9 +835,6 @@
 /* Define to 1 if you have the `utimes' function. */
 #undef HAVE_UTIMES
 
-/* Define to 1 if you have the <utime.h> header file. */
-#undef HAVE_UTIME_H
-
 /* Define to 1 if you have the <utmpx.h> header file. */
 #undef HAVE_UTMPX_H
 

diff --git a/configure b/configure
index 4a261880b59a00e5285874a04e23c9e735812d10..b233bf9b0133e69ff93ec0ba762dcde9f0e07c71 100755 (executable)
--- a/configure
+++ b/configure
@@ -2641,7 +2641,6 @@ as_fn_append ac_header_list " malloc.h"
 as_fn_append ac_header_list " netgroup.h"
 as_fn_append ac_header_list " paths.h"
 as_fn_append ac_header_list " spawn.h"
-as_fn_append ac_header_list " utime.h"
 as_fn_append ac_header_list " utmpx.h"
 as_fn_append ac_header_list " sys/sockio.h"
 as_fn_append ac_header_list " sys/bsdtypes.h"
@@ -16830,8 +16829,6 @@ done
 
 
 
-
-
 
 
 

diff --git a/configure.ac b/configure.ac
index 29a453a19b3c687a19678aceffa5406b6c5f36f5..fb6a8773e695497d211ac914607263fcd57a38d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2191,7 +2191,7 @@ AC_HEADER_DIRENT
 AC_HEADER_TIME
 AC_HEADER_STDBOOL
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS_ONCE([malloc.h netgroup.h paths.h spawn.h utime.h utmpx.h sys/sockio.h sys/bsdtypes.h sys/select.h sys/stropts.h sys/sysmacros.h])
+AC_CHECK_HEADERS_ONCE([malloc.h netgroup.h paths.h spawn.h utmpx.h sys/sockio.h sys/bsdtypes.h sys/select.h sys/stropts.h sys/sysmacros.h])
 AC_CHECK_HEADERS([endian.h] [sys/endian.h] [machine/endian.h], [break])
 AC_CHECK_HEADERS([procfs.h] [sys/procfs.h], [AC_CHECK_MEMBERS(struct psinfo.pr_ttydev, [AC_CHECK_FUNCS([_ttyname_dev])], [], [AC_INCLUDES_DEFAULT
 #ifdef HAVE_PROCFS_H

diff --git a/include/compat/utime.h b/include/compat/utime.h
deleted file mode 100644 (file)
index 0a1eb86..0000000
--- a/include/compat/utime.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 1996, 1998-2005, 2010
- *     Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef        _UTIME_H
-#define        _UTIME_H
-
-struct utimbuf {
-       time_t  actime;         /* access time */
-       time_t  modtime;        /* mod time */
-};
-
-int utime(const char *, const struct utimbuf *);
-
-#endif /* _UTIME_H */

diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in
index fc300057e92b43465f6c8fc1282e668e6a4b6f26..28cc5daa3fc9696c81026023dac0aa939b0d428b 100644 (file)
--- a/lib/util/Makefile.in
+++ b/lib/util/Makefile.in
@@ -535,7 +535,7 @@ ttysize.lo: $(srcdir)/ttysize.c $(incdir)/compat/stdbool.h \
             $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \
             $(top_builddir)/config.h
        $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/ttysize.c
-utimens.lo: $(srcdir)/utimens.c $(incdir)/compat/timespec.h \
-            $(incdir)/compat/utime.h $(incdir)/sudo_compat.h \
-            $(top_builddir)/config.h
+utimens.lo: $(srcdir)/utimens.c $(incdir)/compat/stdbool.h \
+            $(incdir)/compat/timespec.h $(incdir)/sudo_compat.h \
+            $(incdir)/sudo_util.h $(top_builddir)/config.h
        $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/utimens.c

diff --git a/lib/util/utimens.c b/lib/util/utimens.c
index 3a62e2900ef653d61cbdfee78b56b5df222e9fb1..165c82918a3aa690d13bba11319e532efb8957fc 100644 (file)
--- a/lib/util/utimens.c
+++ b/lib/util/utimens.c
@@ -29,10 +29,8 @@
 #ifndef HAVE_STRUCT_TIMESPEC
 # include "compat/timespec.h"
 #endif
-#ifdef HAVE_UTIME_H
+#if !defined(HAVE_UTIMES) || defined(HAVE_FUTIME)
 # include <utime.h>
-#else
-# include "compat/utime.h"
 #endif
 
 #include "sudo_compat.h"