diff --git a/CHANGES b/CHANGES index e28b7fd..8bfede5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,14 @@ CHANGES ======= +version 8.0.7 (Nov 20, 2003): + - renamed util.[ch] to cutil.[ch] to prevent name conflict with + system util.h, reordered some #includes, and fixed a configure + test for sys/proc.h to build on OpenBSD 3.4 (and probably + others) - reported by Kurt Raschke + - fixed missing semi-colon for cygwin build - reported by + Raymond Richmond + version 8.0.6 (Nov 16, 2003): - code was missing regarding the 'setproctitle' option - patch by Dmitry Morozovsky @@ -616,5 +624,5 @@ before version 6.05: and enhancements of various types were applied. # -# $Id: CHANGES,v 1.131 2003/11/15 23:57:18 bryan Exp $ +# $Id: CHANGES,v 1.135 2003/11/20 14:48:29 bryan Exp $ # diff --git a/compat.h b/compat.h index e30f34e..a25fb04 100644 --- a/compat.h +++ b/compat.h @@ -7,8 +7,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/config.guess b/config.guess index 193e328..4c5bde8 100755 --- a/config.guess +++ b/config.guess @@ -1227,6 +1227,9 @@ EOF SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; + *:DRAGONFLY:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/config.h.in b/config.h.in index bb6691f..18ea785 100644 --- a/config.h.in +++ b/config.h.in @@ -207,6 +207,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_IOCTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PROC_H diff --git a/config.sub b/config.sub index e1e455b..5698174 100755 --- a/config.sub +++ b/config.sub @@ -1152,7 +1152,7 @@ case $os in | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/configure b/configure index d9fd320..c6b04b4 100755 --- a/configure +++ b/configure @@ -3485,7 +3485,7 @@ fi -for ac_header in unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/proc.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h +for ac_header in unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h sys/param.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -3626,6 +3626,61 @@ fi done + +for ac_header in sys/proc.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#if HAVE_SYS_PARAM_H +#include +#endif + + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then diff --git a/configure.in b/configure.in index 04ff735..ec87328 100644 --- a/configure.in +++ b/configure.in @@ -244,7 +244,13 @@ if test "$ac_cv_sys_posix_termios" != "yes"; then AC_MSG_ERROR([POSIX termios interface required]) fi -AC_CHECK_HEADERS(unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/proc.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h) +AC_CHECK_HEADERS(unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h sys/param.h) +dnl sys/proc.h needs sys/param.h on openbsd, apparently +AC_CHECK_HEADERS(sys/proc.h, [], [], +[#if HAVE_SYS_PARAM_H +#include +#endif +]) AC_HEADER_TIME AC_HEADER_SYS_WAIT AC_TYPE_MODE_T diff --git a/conserver.cf/conserver.cf.man b/conserver.cf/conserver.cf.man index 836460a..cd60196 100644 --- a/conserver.cf/conserver.cf.man +++ b/conserver.cf/conserver.cf.man @@ -1,5 +1,5 @@ .\" $Id: conserver.cf.man,v 1.51 2003/11/15 20:00:11 bryan Exp $ -.TH CONSERVER.CF 5 "2003/11/15" "conserver-8.0.6" "conserver" +.TH CONSERVER.CF 5 "2003/11/15" "conserver-8.0.7" "conserver" .SH NAME conserver.cf \- console configuration file for .BR conserver (8) diff --git a/conserver.cf/conserver.passwd.man b/conserver.cf/conserver.passwd.man index a884782..4998847 100644 --- a/conserver.cf/conserver.passwd.man +++ b/conserver.cf/conserver.passwd.man @@ -1,5 +1,5 @@ .\" $Id: conserver.passwd.man,v 1.9 2003/07/04 20:20:52 bryan Exp $ -.TH CONSERVER.PASSWD 5 "2003/07/04" "conserver-8.0.6" "conserver" +.TH CONSERVER.PASSWD 5 "2003/07/04" "conserver-8.0.7" "conserver" .SH NAME conserver.passwd \- user access information for .BR conserver (8) diff --git a/conserver.html b/conserver.html index 315fc4d..415ad34 100644 --- a/conserver.html +++ b/conserver.html @@ -183,11 +183,11 @@

Downloading

-

The current version, released on Nov 16, 2003, is 8.0.6.tar.gz. You can get it via +

The current version, released on Nov 20, 2003, is 8.0.7.tar.gz. You can get it via FTP - or HTTP. See the FTP + or HTTP. See the CHANGES file for information on the latest updates.

diff --git a/conserver/Makefile.in b/conserver/Makefile.in index 2a1fb0d..73ad2e8 100644 --- a/conserver/Makefile.in +++ b/conserver/Makefile.in @@ -27,7 +27,7 @@ LIBS = @LIBS@ @CONSLIBS@ ### Makefile rules - no user-servicable parts below CONSERVER_OBJS = access.o client.o consent.o group.o main.o master.o \ - readcfg.o fallback.o util.o + readcfg.o fallback.o cutil.o CONSERVER_HDRS = ../config.h $(top_srcdir)/compat.h $(srcdir)/access.h \ $(srcdir)/client.h $(srcdir)/consent.h $(srcdir)/group.h \ $(srcdir)/main.h $(srcdir)/master.h $(srcdir)/readcfg.h \ @@ -40,8 +40,8 @@ all: $(ALL) conserver: $(CONSERVER_OBJS) $(CC) $(CFLAGS) $(LDFLAGS) -o conserver $(CONSERVER_OBJS) $(LIBS) -convert: convert.o util.o - $(CC) $(CFLAGS) $(LDFLAGS) -o convert convert.o util.o $(LIBS) +convert: convert.o cutil.o + $(CC) $(CFLAGS) $(LDFLAGS) -o convert convert.o cutil.o $(LIBS) .c.o: $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/conserver/access.c b/conserver/access.c index a62102b..f4e5c72 100644 --- a/conserver/access.c +++ b/conserver/access.c @@ -1,5 +1,5 @@ /* - * $Id: access.c,v 5.70 2003/11/04 19:41:00 bryan Exp $ + * $Id: access.c,v 5.71 2003/11/20 13:56:38 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -36,7 +36,7 @@ #include -#include +#include #include #include #include diff --git a/conserver/client.c b/conserver/client.c index 7f69e6a..aabb292 100644 --- a/conserver/client.c +++ b/conserver/client.c @@ -1,5 +1,5 @@ /* - * $Id: client.c,v 5.75 2003/11/16 15:35:33 bryan Exp $ + * $Id: client.c,v 5.76 2003/11/20 13:56:38 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -36,7 +36,7 @@ #include -#include +#include #include #include #include diff --git a/conserver/consent.c b/conserver/consent.c index ea9a3b1..711c558 100644 --- a/conserver/consent.c +++ b/conserver/consent.c @@ -1,5 +1,5 @@ /* - * $Id: consent.c,v 5.130 2003/11/08 05:16:36 bryan Exp $ + * $Id: consent.c,v 5.131 2003/11/20 13:56:38 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -42,7 +42,7 @@ #include -#include +#include #include #include #include diff --git a/conserver/conserver.man b/conserver/conserver.man index f6a50b5..d9139c1 100644 --- a/conserver/conserver.man +++ b/conserver/conserver.man @@ -1,6 +1,6 @@ .\" @(#)conserver.8 01/06/91 OSU CIS; Thomas A. Fine .\" $Id: conserver.man,v 1.40 2003/11/10 15:37:24 bryan Exp $ -.TH CONSERVER 8 "2003/11/10" "conserver-8.0.6" "conserver" +.TH CONSERVER 8 "2003/11/10" "conserver-8.0.7" "conserver" .SH NAME conserver \- console server daemon .SH SYNOPSIS diff --git a/conserver/convert.c b/conserver/convert.c index ffec675..2e6e041 100644 --- a/conserver/convert.c +++ b/conserver/convert.c @@ -1,5 +1,5 @@ /* - * $Id: convert.c,v 1.7 2003/08/15 21:24:39 bryan Exp $ + * $Id: convert.c,v 1.8 2003/11/20 13:56:38 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -32,7 +32,7 @@ #include -#include +#include #include #include #include diff --git a/conserver/util.c b/conserver/cutil.c similarity index 99% rename from conserver/util.c rename to conserver/cutil.c index 8e30b1a..21dc0e3 100644 --- a/conserver/util.c +++ b/conserver/cutil.c @@ -1,5 +1,5 @@ /* - * $Id: util.c,v 1.105 2003/11/15 16:31:51 bryan Exp $ + * $Id: cutil.c,v 1.107 2003/11/20 13:59:55 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -8,7 +8,7 @@ #include -#include +#include #if HAVE_OPENSSL #include @@ -879,15 +879,15 @@ FileClose(pcfp) /* flush out the client socket - set it to blocking, * then write to it */ - SetFlags(cfp->fd, 0, O_NONBLOCK) + SetFlags(cfp->fd, 0, O_NONBLOCK); - /* sent it a byte - guaranteed to block - ensure delivery - * of prior data yeah - this is a bit paranoid - try - * without this at first - */ - /* write(cfp->fd, "\n", 1); */ - /* this is the guts of the workaround for Winsock close bug */ - shutdown(cfp->fd, 1); + /* sent it a byte - guaranteed to block - ensure delivery + * of prior data yeah - this is a bit paranoid - try + * without this at first + */ + /* write(cfp->fd, "\n", 1); */ + /* this is the guts of the workaround for Winsock close bug */ + shutdown(cfp->fd, 1); /* enable lingering */ lingeropt.l_onoff = 1; diff --git a/conserver/util.h b/conserver/cutil.h similarity index 98% rename from conserver/util.h rename to conserver/cutil.h index 6b049dc..779e421 100644 --- a/conserver/util.h +++ b/conserver/cutil.h @@ -1,5 +1,5 @@ /* - * $Id: util.h,v 1.56 2003/11/10 20:38:25 bryan Exp $ + * $Id: cutil.h,v 1.56 2003/11/10 20:38:25 bryan Exp $ * * Copyright conserver.com, 2000 * diff --git a/conserver/fallback.c b/conserver/fallback.c index 8c7b6d6..8af13e9 100644 --- a/conserver/fallback.c +++ b/conserver/fallback.c @@ -1,5 +1,5 @@ /* - * $Id: fallback.c,v 5.59 2003/10/03 13:32:34 bryan Exp $ + * $Id: fallback.c,v 5.60 2003/11/20 13:56:38 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -16,7 +16,7 @@ #include -#include +#include /* * get a pty for the user diff --git a/conserver/group.c b/conserver/group.c index dfed178..0a67d1d 100644 --- a/conserver/group.c +++ b/conserver/group.c @@ -1,5 +1,5 @@ /* - * $Id: group.c,v 5.274 2003/11/16 19:29:20 bryan Exp $ + * $Id: group.c,v 5.275 2003/11/20 13:56:38 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -62,7 +62,7 @@ #endif #include -#include +#include #include #include #include diff --git a/conserver/main.c b/conserver/main.c index d0644b2..f2848b8 100644 --- a/conserver/main.c +++ b/conserver/main.c @@ -1,5 +1,5 @@ /* - * $Id: main.c,v 5.171 2003/11/16 19:29:20 bryan Exp $ + * $Id: main.c,v 5.172 2003/11/20 13:56:39 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -31,7 +31,7 @@ #include -#include +#include #include #include #include diff --git a/conserver/master.c b/conserver/master.c index 8f76036..af7d16f 100644 --- a/conserver/master.c +++ b/conserver/master.c @@ -1,5 +1,5 @@ /* - * $Id: master.c,v 5.122 2003/11/16 19:29:20 bryan Exp $ + * $Id: master.c,v 5.123 2003/11/20 13:56:39 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -29,7 +29,7 @@ #include -#include +#include #include #include #include diff --git a/conserver/readcfg.c b/conserver/readcfg.c index 21557d6..f465b2b 100644 --- a/conserver/readcfg.c +++ b/conserver/readcfg.c @@ -1,5 +1,5 @@ /* - * $Id: readcfg.c,v 5.157 2003/11/15 20:00:09 bryan Exp $ + * $Id: readcfg.c,v 5.158 2003/11/20 13:56:39 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -25,7 +25,7 @@ #include -#include +#include #include #include #include diff --git a/conserver/version.h b/conserver/version.h index 4e6b461..f0e16e8 100644 --- a/conserver/version.h +++ b/conserver/version.h @@ -1,5 +1,5 @@ /* - * $Id: version.h,v 1.52 2003/11/07 20:54:49 bryan Exp $ + * $Id: version.h,v 1.53 2003/11/20 14:15:39 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -14,4 +14,4 @@ @(#) Copyright 2000 conserver.com.\n\ All rights reserved.\n" -#define THIS_VERSION "conserver.com version 8.0.6" +#define THIS_VERSION "conserver.com version 8.0.7" diff --git a/console/Makefile.in b/console/Makefile.in index fa5fbea..3f3dbf8 100644 --- a/console/Makefile.in +++ b/console/Makefile.in @@ -25,7 +25,7 @@ LIBS = @LIBS@ ### Makefile rules - no user-servicable parts below -CONSOLE_OBJS = console.o getpassword.o ../conserver/util.o +CONSOLE_OBJS = console.o getpassword.o ../conserver/cutil.o CONSOLE_HDRS = ../config.h $(top_srcdir)/compat.h $(top_srcdir)/conserver/port.h ALL = console diff --git a/console/console.c b/console/console.c index 0b0200f..e085d4c 100644 --- a/console/console.c +++ b/console/console.c @@ -1,5 +1,5 @@ /* - * $Id: console.c,v 5.150 2003/11/15 16:32:21 bryan Exp $ + * $Id: console.c,v 5.151 2003/11/20 13:56:41 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -32,7 +32,7 @@ #include #include -#include +#include #include #if HAVE_OPENSSL #include diff --git a/console/console.man b/console/console.man index 452a116..c09d116 100644 --- a/console/console.man +++ b/console/console.man @@ -1,5 +1,5 @@ .\" $Id: console.man,v 1.40 2003/11/16 15:35:45 bryan Exp $ -.TH CONSOLE 1 "2003/11/16" "conserver-8.0.6" "conserver" +.TH CONSOLE 1 "2003/11/16" "conserver-8.0.7" "conserver" .SH NAME console \- console server client program .SH SYNOPSIS diff --git a/console/getpassword.c b/console/getpassword.c index 7d2d66e..14f4bf0 100644 --- a/console/getpassword.c +++ b/console/getpassword.c @@ -1,5 +1,5 @@ /* - * $Id: getpassword.c,v 1.7 2003/09/28 19:29:17 bryan Exp $ + * $Id: getpassword.c,v 1.8 2003/11/20 13:56:41 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -12,7 +12,7 @@ #include -#include +#include #include diff --git a/contrib/redhat-rpm/conserver.spec b/contrib/redhat-rpm/conserver.spec index d3125a8..1d1cd5b 100644 --- a/contrib/redhat-rpm/conserver.spec +++ b/contrib/redhat-rpm/conserver.spec @@ -4,7 +4,7 @@ # %define pkg conserver -%define ver 8.0.6 +%define ver 8.0.7 # define the name of the machine on which the main conserver # daemon will be running if you don't want to use the default diff --git a/contrib/solaris-package/pkginfo b/contrib/solaris-package/pkginfo index 2e1748f..72ca78c 100644 --- a/contrib/solaris-package/pkginfo +++ b/contrib/solaris-package/pkginfo @@ -1,7 +1,7 @@ PKG="conserver" NAME="Console server and client" CATEGORY="system" -VERSION="8.0.6" +VERSION="8.0.7" DESC="Console server and client" CLASSES=none ARCH=sparc