it’s not nice to spew into syslog just for calling commands

diff --git a/Makefile.bsd-wrapper b/Makefile.bsd-wrapper
index ecbdba4..1fff601 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.34 2016/10/22 16:13:34 tg Exp $
+# $MirOS: src/gnu/usr.bin/cvs/Makefile.bsd-wrapper,v 1.36 2016/11/09 03:04:12 tg Exp $
 # $OpenBSD: Makefile.bsd-wrapper,v 1.44 2004/01/02 09:01:24 millert Exp $
 
 # MirOS patchlevel tracked in configure{.in,}
@@ -54,4 +54,10 @@ post-install:
            ${.CURDIR}/contrib/{rcs2log.1,sandbox_status.man} \
            ${DESTDIR}/usr/libexec/cvs/contrib/
 
+regress:
+       chmod +x ${.CURDIR}/lib/test-getdate.sh
+       cd ${FSFOBJDIR} && exec env \
+           GETDATE_LD_PRELOAD=/usr/lib/libposixtz.so ${FSFMAKE} check
+       -chmod -x ${.CURDIR}/lib/test-getdate.sh
+
 .include <bsd.cfwrap.mk>

diff --git a/Makefile.in b/Makefile.in
index 0e7200c..99e3cb2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $MirOS: src/gnu/usr.bin/cvs/Makefile.in,v 1.17 2013/06/26 19:57:56 tg Exp $
+# $MirOS: src/gnu/usr.bin/cvs/Makefile.in,v 1.18 2016/11/09 03:09:51 tg Exp $
 # Master Makefile for the GNU Concurrent Versions System.
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #               1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -469,7 +469,7 @@ distclean-tags:
 distdir: $(DISTFILES)
        $(am__remove_distdir)
        mkdir $(distdir)
-       $(mkdir_p) $(distdir)/contrib $(distdir)/doc $(distdir)/m4
+       $(mkdir_p) $(distdir)/contrib $(distdir)/doc $(distdir)/m4 $(distdir)/src
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \

diff --git a/configure b/configure
index ccd427b..8810ac4 100644 (file)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61-MirPorts-1 for Concurrent Versions System (CVS) 1.12.13-MirOS-0AB7.5.
+# Generated by GNU Autoconf 2.61-MirPorts-1 for Concurrent Versions System (CVS) 1.12.13-MirOS-0AB7.6.
 #
 # Report bugs to <miros-discuss@mirbsd.org>.
 #
@@ -590,8 +590,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Concurrent Versions System (CVS)'
 PACKAGE_TARNAME='cvs'
-PACKAGE_VERSION='1.12.13-MirOS-0AB7.5'
-PACKAGE_STRING='Concurrent Versions System (CVS) 1.12.13-MirOS-0AB7.5'
+PACKAGE_VERSION='1.12.13-MirOS-0AB7.6'
+PACKAGE_STRING='Concurrent Versions System (CVS) 1.12.13-MirOS-0AB7.6'
 PACKAGE_BUGREPORT='miros-discuss@mirbsd.org'
 
 ac_unique_file="src/cvs.h"
@@ -1259,7 +1259,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Concurrent Versions System (CVS) 1.12.13-MirOS-0AB7.5 to adapt to many kinds of systems.
+\`configure' configures Concurrent Versions System (CVS) 1.12.13-MirOS-0AB7.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1325,7 +1325,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Concurrent Versions System (CVS) 1.12.13-MirOS-0AB7.5:";;
+     short | recursive ) echo "Configuration of Concurrent Versions System (CVS) 1.12.13-MirOS-0AB7.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1532,7 +1532,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Concurrent Versions System (CVS) configure 1.12.13-MirOS-0AB7.5
+Concurrent Versions System (CVS) configure 1.12.13-MirOS-0AB7.6
 generated by GNU Autoconf 2.61-MirPorts-1
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1562,7 +1562,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Concurrent Versions System (CVS) $as_me 1.12.13-MirOS-0AB7.5, which was
+It was created by Concurrent Versions System (CVS) $as_me 1.12.13-MirOS-0AB7.6, which was
 generated by GNU Autoconf 2.61-MirPorts-1.  Invocation command line was
 
   $ $0 $@
@@ -2257,7 +2257,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cvs'
- VERSION='1.12.13-MirOS-0AB7.5'
+ VERSION='1.12.13-MirOS-0AB7.6'
 
 
 # Some tools Automake needs.
@@ -33164,7 +33164,7 @@ ac_config_files="$ac_config_files contrib/sccs2rcs"
 ac_config_files="$ac_config_files doc/mkman:doc/mkman.pl"
 
 
-ac_config_files="$ac_config_files Makefile contrib/Makefile diff/Makefile doc/Makefile lib/Makefile man/Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile contrib/Makefile diff/Makefile doc/Makefile lib/Makefile man/Makefile src/Makefile src/sanity.config.sh"
 
 
 cat >confcache <<\_ACEOF
@@ -33598,7 +33598,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Concurrent Versions System (CVS) $as_me 1.12.13-MirOS-0AB7.5, which was
+This file was extended by Concurrent Versions System (CVS) $as_me 1.12.13-MirOS-0AB7.6, which was
 generated by GNU Autoconf 2.61-MirPorts-1.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33651,7 +33651,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Concurrent Versions System (CVS) config.status 1.12.13-MirOS-0AB7.5
+Concurrent Versions System (CVS) config.status 1.12.13-MirOS-0AB7.6
 configured by $0, generated by GNU Autoconf 2.61-MirPorts-1,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -33780,6 +33780,7 @@ do
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/sanity.config.sh") CONFIG_FILES="$CONFIG_FILES src/sanity.config.sh" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

diff --git a/configure.in b/configure.in
index 3881c01..153083c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $MirOS: src/gnu/usr.bin/cvs/configure.in,v 1.24 2016/11/08 21:59:31 tg Exp $
+dnl $MirOS: src/gnu/usr.bin/cvs/configure.in,v 1.25 2016/11/09 03:04:12 tg Exp $
 dnl
 dnl configure.in for cvs
 
@@ -19,7 +19,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.])
 
-AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirOS-0AB7.5],
+AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirOS-0AB7.6],
        [miros-discuss@mirbsd.org],[cvs])
 AC_CONFIG_SRCDIR(src/cvs.h)
 AM_INIT_AUTOMAKE([gnu 1.9.2 dist-bzip2 no-define])
@@ -1430,7 +1430,9 @@ AC_CONFIG_FILES([Makefile \
          doc/Makefile \
          lib/Makefile \
          man/Makefile \
-         src/Makefile])
+         src/Makefile \
+         src/sanity.config.sh \
+])
 
 dnl and we're done
 AC_OUTPUT

diff --git a/src/Makefile.in b/src/Makefile.in
index 1d59e95..443ff5f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $MirOS: src/gnu/usr.bin/cvs/src/Makefile.in,v 1.20 2013/06/26 19:58:11 tg Exp $
+# $MirOS: src/gnu/usr.bin/cvs/src/Makefile.in,v 1.21 2016/11/09 03:09:59 tg Exp $
 # Makefile for GNU CVS program.
 #
 # Copyright (C) 1986-2005 The Free Software Foundation, Inc.
@@ -54,7 +54,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = cvs$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(srcdir)/sanity.config.sh.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/allocsa.m4 \
        $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/bison.m4 \
@@ -113,7 +114,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(GNUSYSTEM_AUX_DIR)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = sanity.config.sh
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -405,6 +406,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+sanity.config.sh: $(top_builddir)/config.status $(srcdir)/sanity.config.sh.in
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS:
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"

diff --git a/src/server.c b/src/server.c
index 6ef9bae..10cfa4f 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -20,7 +20,7 @@
 #include "getline.h"
 #include "getnline.h"
 
-__RCSID("$MirOS: src/gnu/usr.bin/cvs/src/server.c,v 1.10 2016/11/08 21:46:14 tg Exp $");
+__RCSID("$MirOS: src/gnu/usr.bin/cvs/src/server.c,v 1.11 2016/11/09 02:54:33 tg Exp $");
 
 int server_active = 0;
 
@@ -83,7 +83,11 @@ static Key_schedule sched;
 # include "xselect.h"
 
 /* for TCP_NODELAY */
-#include <netinet/tcp.h>
+# include <netinet/tcp.h>
+
+# ifndef S_ISSOCK
+#   define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+# endif
 
 # ifndef O_NONBLOCK
 #   define O_NONBLOCK O_NDELAY
@@ -7210,8 +7214,10 @@ pserver_authenticate_connection (void)
        if the client dies while we are waiting for input.  */
     {
        int on = 1;
+       struct stat sb;
 
-       if (setsockopt (STDIN_FILENO, SOL_SOCKET, SO_KEEPALIVE,
+       if (fstat (STDIN_FILENO, &sb) == 0 && S_ISSOCK(sb.st_mode) &&
+           setsockopt (STDIN_FILENO, SOL_SOCKET, SO_KEEPALIVE,
                        &on, sizeof on) < 0)
        {
 # ifdef HAVE_SYSLOG_H
@@ -7225,8 +7231,10 @@ pserver_authenticate_connection (void)
     /* Avoid latency due to Nagle algorithm.  */
     {
        int on = 1;
+       struct stat sb;
 
-       if (setsockopt (STDOUT_FILENO, IPPROTO_TCP, TCP_NODELAY,
+       if (fstat (STDOUT_FILENO, &sb) == 0 && S_ISSOCK(sb.st_mode) &&
+           setsockopt (STDOUT_FILENO, IPPROTO_TCP, TCP_NODELAY,
                        &on, sizeof on) < 0)
        {
 # ifdef HAVE_SYSLOG_H
@@ -7378,8 +7386,10 @@ error %s getpeername or getsockname failed\n", strerror (errno));
        if the client dies while we are waiting for input.  */
     {
        int on = 1;
+       struct stat sb;
 
-       if (setsockopt (STDIN_FILENO, SOL_SOCKET, SO_KEEPALIVE,
+       if (fstat (STDIN_FILENO, &sb) == 0 && S_ISSOCK(sb.st_mode) &&
+           setsockopt (STDIN_FILENO, SOL_SOCKET, SO_KEEPALIVE,
                           (char *) &on, sizeof on) < 0)
        {
 # ifdef HAVE_SYSLOG_H
@@ -7393,8 +7403,10 @@ error %s getpeername or getsockname failed\n", strerror (errno));
     /* Avoid latency due to Nagle algorithm.  */
     {
        int on = 1;
+       struct stat sb;
 
-       if (setsockopt (STDOUT_FILENO, IPPROTO_TCP, TCP_NODELAY,
+       if (fstat (STDOUT_FILENO, &sb) == 0 && S_ISSOCK(sb.st_mode) &&
+           setsockopt (STDOUT_FILENO, IPPROTO_TCP, TCP_NODELAY,
                           (char *) &on, sizeof on) < 0)
        {
 # ifdef HAVE_SYSLOG_H