one last round of updates from MirBSD, won’t affect Debian

diff --git a/Makefile.bsd-wrapper b/Makefile.bsd-wrapper
index 426d364..06cee39 100644 (file)
--- a/Makefile.bsd-wrapper
+++ b/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $MirOS: src/gnu/usr.bin/cvs/Makefile.bsd-wrapper,v 1.32 2013/08/06 17:06:18 tg Exp $
+# $MirOS: src/gnu/usr.bin/cvs/Makefile.bsd-wrapper,v 1.33 2016/10/21 22:55:07 tg Exp $

 # $OpenBSD: Makefile.bsd-wrapper,v 1.44 2004/01/02 09:01:24 millert Exp $
 
 # MirOS patchlevel tracked in configure{.in,}
 # $OpenBSD: Makefile.bsd-wrapper,v 1.44 2004/01/02 09:01:24 millert Exp $
 
 # MirOS patchlevel tracked in configure{.in,}


@@ -21,7 +21,7 @@ CFARGS+=      --prefix=/usr \
                --enable-case-sensitivity \
                --disable-encryption \
                --disable-lock-compatibility \
                --enable-case-sensitivity \
                --disable-encryption \
                --disable-lock-compatibility \

-               --disable-rootcommit \
+               --enable-rootcommit \

                --disable-old-info-format-support \
                --enable-config-override=no \
                --with-external-zlib \
                --disable-old-info-format-support \
                --enable-config-override=no \
                --with-external-zlib \

diff --git a/lib/getdate.h b/lib/getdate.h
index ef2b64e..46cc65e 100644 (file)
--- a/lib/getdate.h
+++ b/lib/getdate.h
@@ -1,4 +1,4 @@
-/* $MirOS: src/gnu/usr.bin/cvs/lib/getdate.h,v 1.5 2010/09/19 19:42:59 tg Exp $ */
+/* $MirOS: src/gnu/usr.bin/cvs/lib/getdate.h,v 1.6 2016/10/21 23:28:49 tg Exp $ */

 
 /* Parse a string into an internal time stamp.
 
 
 /* Parse a string into an internal time stamp.
 


@@ -33,6 +33,10 @@
 #include <sys/time.h>
 #include <time.h>
 #define gettime(ts)    clock_gettime(CLOCK_REALTIME,(ts))
 #include <sys/time.h>
 #include <time.h>
 #define gettime(ts)    clock_gettime(CLOCK_REALTIME,(ts))

+#ifndef HAVE_CONFIG_H
+#define HAVE_TM_GMTOFF         1
+#define HAVE_STRUCT_TM_TM_ZONE 1
+#endif

 #endif
 
 bool get_date (struct timespec *, char const *, struct timespec const *);
 #endif
 
 bool get_date (struct timespec *, char const *, struct timespec const *);

diff --git a/src/add.c b/src/add.c
index 42ded0a..93b589e 100644 (file)
--- a/src/add.c
+++ b/src/add.c
@@ -34,6 +34,8 @@
 #include "save-cwd.h"
 #include "fileattr.h"
 
 #include "save-cwd.h"
 #include "fileattr.h"
 

+__RCSID("$MirOS: src/gnu/usr.bin/cvs/src/add.c,v 1.4 2016/10/21 20:01:55 tg Exp $");
+

 static int add_directory (struct file_info *finfo);
 static int build_entry (const char *repository, const char *user,
                         const char *options, const char *message,
 static int add_directory (struct file_info *finfo);
 static int build_entry (const char *repository, const char *user,
                         const char *options, const char *message,

diff --git a/src/vers_ts.c b/src/vers_ts.c
index 9ed252e..e245da7 100644 (file)
--- a/src/vers_ts.c
+++ b/src/vers_ts.c
@@ -14,6 +14,8 @@
 #include "cvs.h"
 #include "lstat.h"
 
 #include "cvs.h"
 #include "lstat.h"
 

+__RCSID("$MirOS: src/gnu/usr.bin/cvs/src/vers_ts.c,v 1.3 2016/10/21 20:01:55 tg Exp $");
+

 #ifdef SERVER_SUPPORT
 static void time_stamp_server (const char *, Vers_TS *, Entnode *);
 #endif
 #ifdef SERVER_SUPPORT
 static void time_stamp_server (const char *, Vers_TS *, Entnode *);
 #endif