cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to conserver-7.2.7. many many changes to list, see http://www.conserver.com

Browse Source 
some minor tweaks may still be coming
This commit is contained in:
pvalchev 2003-05-26 20:20:53 +00:00
parent 4e300c889a
commit 63b158d508
27 changed files with 278 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
comms/conserver/Makefile
View File

@ -1,32 +1,24 @@
# $OpenBSD: Makefile,v 1.21 2003/05/24 19:46:14 pvalchev Exp $
# $OpenBSD: Makefile,v 1.22 2003/05/26 20:20:53 pvalchev Exp $
COMMENT= "manage remote serial consoles via TCP/IP"
PKGNAME= conserver-5.21
DISTFILES= conserver-5.21-Beta.shar.gz
DISTNAME= conserver-7.2.7
CATEGORIES= comms
MAINTAINER= Peter Valchev <pvalchev@openbsd.org>
HOMEPAGE= http://www.conserver.com
# License: BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MAINTAINER= Peter Valchev <pvalchev@openbsd.org>
MASTER_SITES= ftp://ftp.conserver.com/conserver/
MASTER_SITES= ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \
ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/
WRKDIST= ${WRKDIR}
# Set this to where you want console(8) to connect to by default
# or use something like ``make DEFAULTHOST=myserver.mydomain.net''
DEFAULTHOST?= localhost
MAKE_ENV+= CC="${CC}" DEFAULTHOST="${DEFAULTHOST}"
NO_REGRESS= Yes
post-extract:
cp ${FILESDIR}/Makefile ${WRKSRC}
AUTOCONF_NEW= Yes
CONFIGURE_STYLE= autoconf
post-install:
@${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/examples/conserver

6
comms/conserver/distinfo
View File

@ -1,3 +1,3 @@
MD5 (conserver-5.21-Beta.shar.gz) = f19d56fba0c85d8b2c680c4b630f1a1b
RMD160 (conserver-5.21-Beta.shar.gz) = 1298d94f71c6e6fa6e6e4852a1e74a8cefa9ec08
SHA1 (conserver-5.21-Beta.shar.gz) = 486737a7713c72f24ac2077b9fd4be5e49968c57
MD5 (conserver-7.2.7.tar.gz) = ff22779c9cc53406e948204109879820
RMD160 (conserver-7.2.7.tar.gz) = 67fe555779293232933b30eea2efd5fcd86b6ea2
SHA1 (conserver-7.2.7.tar.gz) = e2dfe0d95ceab0e6c2db38161f540ec537d96132

3
comms/conserver/files/Makefile
View File

@ -1,3 +0,0 @@
SUBDIR= conserver.cf conserver console
.include <bsd.subdir.mk>

3
comms/conserver/files/README.OpenBSD
View File

@ -1,7 +1,6 @@
Using conserver in an OpenBSD environment:
1. Copy /usr/local/share/examples/conserver/conserver.cf.eg to
/etc/conserver.cf and customize it as necessary.
1. Customize the configuration for your needs, see /etc/conserver.cf
2. Edit /etc/rc.conf file:
...

45
comms/conserver/patches/patch-aa
View File

@ -1,45 +0,0 @@
--- conserver/Makefile.orig Wed Feb 28 00:26:07 2001
+++ conserver/Makefile Wed Feb 28 00:27:47 2001
@@ -7,8 +7,8 @@
# (1) change ETC below to where you would like the console server installed
# I would not change the name, you have to much with the docs then...
PROG= conserver
-ETC= ${DESTDIR}/usr/local/etc
-DOC= ${DESTDIR}/usr/local/man
+ETC= ${DESTDIR}/usr/local/sbin
+DOC= ${DESTDIR}/usr/local/man/man8
# if we have to PUCC ptyd daemon we can use it to get ptys, else use fallback.o
# and change the CDEFS line below to =0
@@ -23,9 +23,9 @@
P=
INCLUDE=
-DEBUG=-O
-CDEFS= -DSUN5 -DHAVE_PTYD=0 -DDO_VIRTUAL=1
-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}
+DEBUG=
+CDEFS= -DOPENBSD -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782
+CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE}
HDR= cons.h \
access.h client.h consent.h group.h main.h master.h \
@@ -41,7 +41,7 @@
all: ${PROG}
${PROG}:$P ${OBJ}
- ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lsocket -lnsl
+ ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB}
clean: FRC
rm -f Makefile.bak ${PROG} a.out *.o core errs lint.out tags
@@ -59,7 +59,8 @@
distrib -c ${ETC}/${PROG}
install: all dirs FRC
- install -c -s ${PROG} ${ETC}/${PROG}
+ install -c -s -o bin -g bin -m 555 ${PROG} ${ETC}/${PROG}
+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/conserver.8
lint: ${HDR} ${SRC} FRC
lint -h ${CDEFS} ${INCLUDE} ${SRC}

56
comms/conserver/patches/patch-ab
View File

@ -1,56 +0,0 @@
--- ./conserver/cons.h.orig Mon Jan 4 19:55:36 1999
+++ ./conserver/cons.h Mon Jan 4 20:05:26 1999
@@ -53,7 +53,7 @@
#endif
#endif
#if !defined(HAVE_UWAIT)
-#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5))
+#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)||defined(OPENBSD))
#endif
#if !defined(HAVE_WAIT3)
@@ -85,7 +85,7 @@
/* Location of the configuration file
*/
#if !defined(CONFIG)
-#define CONFIG "/usr/local/lib/conserver.cf"
+#define CONFIG "/etc/conserver.cf"
#endif
@@ -170,7 +170,7 @@
#endif /* virtual (process on a pseudo-tty) console support */
#if !defined(HAVE_SETSID)
-#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5))
+#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)||defined(OPENBSD))
#endif
/* should we use flock to keep multiple conservers from hurting each other?
@@ -192,7 +192,7 @@
#define USE_TERMIO (defined(ETA10)||defined(V386))
#endif
#if !defined(USE_TERMIOS)
-#define USE_TERMIOS (defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(SUN5)||defined(PTX)||defined(IRIX5))
+#define USE_TERMIOS (defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(OPENBSD))
#endif
#if !defined(USE_TCBREAK)
#define USE_TCBREAK (defined(SUN4)||defined(PTX))
@@ -257,7 +257,7 @@
/* which type signal handlers return on this machine
*/
-#if defined(sun) || defined(NEXT2) || defined(SUN5) || defined(PTX) || defined(IRIX5)
+#if defined(sun) || defined(NEXT2) || defined(SUN5) || defined(PTX) || defined(IRIX5) || defined(OPENBSD)
#define SIGRETS void
#else
#define SIGRETS int
@@ -272,7 +272,7 @@
/* does this system have the ANSI strerror() function?
*/
#if !defined(HAVE_STRERROR)
-#define HAVE_STRERROR (defined(IBMR2)||defined(ETA10)||defined(V386)||defined(SUN5)||defined(NEXT2)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5))
+#define HAVE_STRERROR (defined(IBMR2)||defined(ETA10)||defined(V386)||defined(SUN5)||defined(NEXT2)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)||defined(OPENBSD))
#endif
#if ! HAVE_STRERROR
extern int errno;

24
comms/conserver/patches/patch-ac
View File

@ -1,24 +0,0 @@
--- ./conserver/group.c Sat Nov 22 20:11:49 1997
+++ ./conserver/group.c Sat Aug 23 17:19:13 1997
@@ -750,5 +750,5 @@
CSTROUT(pCLServing->fd, "- ");
if (-1 == tcsendbreak(pCEServing->fdtty, 9)) {
- CSTROUT(pCLServing->fd, "failed]\r\n");
+ CSTROUT(pCLServing->fd, "tcsendbreak failed]\r\n");
continue;
}
@@ -1119,11 +1119,9 @@
}
#if !defined(XTABS) /* XXX hack */
-#define XTABS TAB3
+#define XTABS OXTABS
#endif
- if (XTABS == (TABDLY&sbuf.c_oflag)) {
- sbuf.c_oflag &= ~TABDLY;
- sbuf.c_oflag |= TAB0;
+ if (XTABS & sbuf.c_oflag) {
+ sbuf.c_oflag &= ~XTABS;
} else {
- sbuf.c_oflag &= ~TABDLY;
sbuf.c_oflag |= XTABS;
}

62
comms/conserver/patches/patch-ad
View File

@ -1,62 +0,0 @@
--- conserver/consent.c.orig Fri May 11 16:39:58 2001
+++ conserver/consent.c Fri May 11 16:42:45 2001
@@ -78,6 +78,12 @@
BAUD baud [] = {
+#if defined(B115200)
+ { "115200", B115200 },
+#endif
+#if defined(B57600)
+ { "57600", B57600 },
+#endif
#if defined(B38400)
{ "38400", B38400 },
#endif
@@ -197,7 +203,7 @@
*/
termp.c_iflag = IXON|IXOFF|BRKINT;
termp.c_oflag = 0;
- termp.c_cflag = CREAD;
+ termp.c_cflag = CREAD|CLOCAL;
termp.c_cflag |= pCE->pparity->iset;
termp.c_lflag = 0;
/*
@@ -205,7 +211,7 @@
* Set the VTIME == 1 (0.1 sec)
* Don't bother with the control characters as they are not used
*/
- termp.c_cc[VMIN] = 128;
+ termp.c_cc[VMIN] = 1;
termp.c_cc[VTIME] = 1;
if (-1 == cfsetospeed(&termp,pCE->pbaud->irate)) {
@@ -424,15 +430,15 @@
#endif
#if USE_TERMIOS
- if (0 != ioctl(0, TCGETS, & n_tio)) {
+ if (0 != tcgetattr(0, & n_tio)) {
fprintf(stderr, "%s: iotcl: getsw: %s\n", progname, strerror(errno));
exit(1);
}
- n_tio.c_iflag &= ~(IGNCR|IUCLC);
+
+ n_tio.c_iflag &= ~(IGNCR);
n_tio.c_iflag |= ICRNL|IXON|IXANY;
- n_tio.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY);
n_tio.c_oflag |= OPOST|ONLCR;
- n_tio.c_lflag &= ~(XCASE|NOFLSH|ECHOK|ECHONL);
+ n_tio.c_lflag &= ~(NOFLSH|ECHOK|ECHONL);
n_tio.c_lflag |= ISIG|ICANON|ECHO;
n_tio.c_cc[VEOF] = '\004';
n_tio.c_cc[VEOL] = '\000';
@@ -444,7 +450,7 @@
n_tio.c_cc[VSTART] = '\021';
n_tio.c_cc[VSTOP] = '\023';
n_tio.c_cc[VSUSP] = '\032';
- if (0 != ioctl(0, TCSETS, & n_tio)) {
+ if (0 != tcsetattr(0, TCSANOW, & n_tio)) {
fprintf(stderr, "%s: getarrt: %s\n", progname, strerror(errno));
exit(1);
}

45
comms/conserver/patches/patch-ae
View File

@ -1,45 +0,0 @@
--- console/Makefile.orig Wed Feb 28 00:26:03 2001
+++ console/Makefile Wed Feb 28 00:28:19 2001
@@ -6,8 +6,8 @@
# edit the ETC directory below to change where the console client
# is installed.
PROG= console
-ETC= ${DESTDIR}/usr/local/etc
-DOC= ${DESTDIR}/usr/local/man
+ETC= ${DESTDIR}/usr/local/sbin
+DOC= ${DESTDIR}/usr/local/man/man8
I=/usr/include
S=/usr/include/sys
@@ -16,9 +16,9 @@
P=
INCLUDE= -I$C
-DEBUG=-O
-CDEFS= -DSUN5
-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}
+DEBUG=
+CDEFS= -DOPENBSD -DHOST=\"${DEFAULTHOST}\" -DPORT=782
+CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE}
HDR=
ONEC= console.c
@@ -29,7 +29,7 @@
all: ${PROG}
${PROG}:
- ${CC} -o $@ ${CFLAGS} ${ONEC} -lsocket -lnsl
+ ${CC} -o $@ ${CFLAGS} ${ONEC}
clean: FRC
rm -f Makefile.bak ${PROG} a.out *.o core errs lint.out tags
@@ -47,7 +47,8 @@
distrib -c ${ETC}/${PROG}
install: all dirs FRC
- install -cs ${PROG} ${ETC}/${PROG}
+ install -c -s -o bin -g bin -m 555 ${PROG} ${ETC}/${PROG}
+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/console.8
lint: ${HDR} ${ONEC} FRC
lint -h ${CDEFS} ${INCLUDE} ${ONEC}

28
comms/conserver/patches/patch-af
View File

@ -1,28 +0,0 @@
--- ./console/console.c Sat Nov 22 20:11:48 1997
+++ ./console/console.c Sat Aug 23 17:40:44 1997
@@ -367,15 +367,15 @@
#if USE_TERMIOS
- if (0 != ioctl(0, TCGETS, & o_tios)) {
+ if (0 != tcgetattr(0, & o_tios)) {
fprintf(stderr, "%s: iotcl: getsw: %s\n", progname, strerror(errno));
exit(10);
}
n_tios = o_tios;
- n_tios.c_iflag &= ~(INLCR|IGNCR|ICRNL|IUCLC|IXON);
+ n_tios.c_iflag &= ~(INLCR|IGNCR|ICRNL|IXON);
n_tios.c_oflag &= ~OPOST;
n_tios.c_lflag &= ~(ICANON|ISIG|ECHO);
n_tios.c_cc[VMIN] = 1;
n_tios.c_cc[VTIME] = 0;
- if (0 != ioctl(0, TCSETS, & n_tios)) {
+ if (0 != tcsetattr(0, TCSANOW, & n_tios)) {
fprintf(stderr, "%s: getarrt: %s\n", progname, strerror(errno));
exit(10);
@@ -453,5 +453,5 @@
return;
#if USE_TERMIOS
- (void)ioctl(0, TCSETS, (char *)&o_tios);
+ (void)tcsetattr(0, TCSANOW, &o_tios);
#else
#if USE_TERMIO

45
comms/conserver/patches/patch-ag
View File

@ -1,45 +0,0 @@
--- ./conserver.cf/Makefile.orig Mon Jan 4 19:55:41 1999
+++ ./conserver.cf/Makefile Mon Jan 4 20:03:10 1999
@@ -4,18 +4,19 @@
#
# if you edit LIB below you have to change cons.hs default config define.
-PROG= conserver.cf
-LIB= ${DESTDIR}/usr/local/lib
-DOC= ${DESTDIR}/usr/man
+PROG= conserver.cf.eg
+LIB= ${DESTDIR}/usr/local/share/examples/conserver
+DOC= ${DESTDIR}/usr/local/man/man5
SRCs= conserver.cf
MAN= conserver.cf.5l
OTHER= README
SOURCE= Makefile ${OTHER} ${MAN} ${SRCl} ${SRCs}
-all: ${SRCl} ${PROG}
+all: ${PROG}
${PROG}: ${SRCs}
+ sed -e '/^[^#]/s/^/#/' < ${SRCs} > ${PROG}
clean: FRC
rm -f Makefile.bak a.out core errs lint.out tags
@@ -29,7 +30,8 @@
dirs: ${LIB} ${DOC}
install: all dirs FRC
- install -c ${PROG} ${LIB}/${PROG}
+ install -c -o bin -g bin -m 444 ${PROG} ${LIB}
+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/conserver.cf.5
lint: FRC
@@ -47,7 +49,7 @@
tags: FRC
/ ${LIB} ${LIB}:
- install -dr $@
+ install -d $@
${SOURCE}:
co -q $@

29
comms/conserver/patches/patch-ah
View File

@ -1,29 +0,0 @@
--- ./conserver/conserver.man.orig Mon Jan 4 19:55:39 1999
+++ ./conserver/conserver.man Mon Jan 4 20:17:41 1999
@@ -18,7 +18,7 @@
error messages, these unloved errors are labeled with a machine name
and output on stdout.
.PP
-When started, it forks a child for each group in /usr/local/etc/conserver.cf,
+When started, it forks a child for each group in /etc/conserver.cf,
and assigns each process a port number to listen on.
The \fIconsole\fP client program knows how to request port numbers and
forwards to find the various slave hosts.
@@ -38,7 +38,7 @@
.TP
.BI \-C config
With this option the invoker may specify an alternate confguration.
-The default \fIconfig\fP is /usr/local/lib/conserver.cf.
+The default \fIconfig\fP is /etc/conserver.cf.
.TP
.B \-h
Output a brief help message.
@@ -65,7 +65,7 @@
.SH FILES
.TS
l l.
-/usr/local/lib/conserver.cf description of console terminal lines
+/etc/conserver.cf description of console terminal lines
/usr/adm/\fIhost\fP.console log files for \fIhost\fP's console
/dev/tty?? terminal line device files
\fIstdout\fP summary of unloved console errors

11
comms/conserver/patches/patch-ai
View File

@ -1,11 +0,0 @@
--- ./conserver.cf/conserver.cf.5l.orig Mon Jan 4 19:55:40 1999
+++ ./conserver.cf/conserver.cf.5l Mon Jan 4 19:59:21 1999
@@ -4,7 +4,7 @@
.SH NAME
conserver.cf \- table of server console terminals used by conserver(8L)
.SH SYNOPSIS
-.B /usr/local/lib/conserver.cf
+.B /etc/conserver.cf
.br
\fIaccess hosts\fP
.br

12
comms/conserver/patches/patch-configure_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure_in,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- configure.in.orig Sat May 24 13:54:37 2003
+++ configure.in Sat May 24 13:55:07 2003
@@ -231,7 +231,7 @@ if test "$ac_cv_header_termios_h" != "ye
fi
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)
+AC_CHECK_HEADERS(unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/types.h sys/param.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)
AC_HEADER_TIME
AC_HEADER_SYS_WAIT
AC_TYPE_MODE_T

11
comms/conserver/patches/patch-conserver_Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-conserver_Makefile_in,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- conserver/Makefile.in.orig Sat May 24 14:08:15 2003
+++ conserver/Makefile.in Sat May 24 14:08:56 2003
@@ -53,7 +53,5 @@ install: conserver
$(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
$(MKDIR) $(DESTDIR)$(mandir)/man8
$(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
- $(MKDIR) $(DESTDIR)$(sysconfdir)
- [ -f $(DESTDIR)$(sysconfdir)/conserver.rc ] || $(INSTALL) conserver.rc $(DESTDIR)$(sysconfdir)
.PHONY: clean distclean install

20
comms/conserver/patches/patch-conserver_cf_Makefile_in Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-conserver_cf_Makefile_in,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- conserver.cf/Makefile.in.orig Thu Jul 26 13:05:03 2001
+++ conserver.cf/Makefile.in Sat May 24 14:27:52 2003
@@ -3,6 +3,7 @@ srcdir = @srcdir@
prefix = @prefix@
mandir = @mandir@
sysconfdir = @sysconfdir@
+exampledir = @prefix@/share/examples/conserver
### Installation programs and flags
INSTALL = @INSTALL@
@@ -24,5 +25,8 @@ install:
$(MKDIR) $(DESTDIR)$(mandir)/man5
$(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
$(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
+ $(MKDIR) $(DESTDIR)$(exampledir)
+ $(INSTALL) conserver.cf $(DESTDIR)$(exampledir)/conserver.cf
+ $(INSTALL) conserver.passwd $(DESTDIR)$(exampledir)/conserver.passwd
.PHONY: clean distclean install

19
comms/conserver/patches/patch-conserver_cf_Makefile_in.orig Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-conserver_cf_Makefile_in.orig,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- conserver.cf/Makefile.in.orig Thu Jul 26 13:05:03 2001
+++ conserver.cf/Makefile.in Sat May 24 14:24:22 2003
@@ -3,6 +3,7 @@ srcdir = @srcdir@
prefix = @prefix@
mandir = @mandir@
sysconfdir = @sysconfdir@
+exampledir = @prefix@/share/examples/conserver
### Installation programs and flags
INSTALL = @INSTALL@
@@ -24,5 +25,7 @@ install:
$(MKDIR) $(DESTDIR)$(mandir)/man5
$(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
$(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
+ $(INSTALL) conserver.cf $(DESTDIR)$(exampledir)/conserver.cf
+ $(INSTALL) conserver.passwd $(DESTDIR)$(exampledir)/conserver.passwd
.PHONY: clean distclean install

29
comms/conserver/patches/patch-conserver_consent_c Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-conserver_consent_c,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- conserver/consent.c.orig Sun Apr 6 06:32:41 2003
+++ conserver/consent.c Sat May 24 14:14:43 2003
@@ -45,8 +45,8 @@
#include <sys/file.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#include <stdio.h>
#include <ctype.h>
@@ -508,12 +508,11 @@ VirtDev(pCE)
strerror(errno));
Bye(EX_OSERR);
}
- n_tio.c_iflag &= ~(IGNCR | IUCLC);
+
+ n_tio.c_iflag &= ~(IGNCR);
n_tio.c_iflag |= ICRNL | IXON | IXANY;
- n_tio.c_oflag &=
- ~(OLCUC | ONOCR | ONLRET | OFILL | NLDLY | CRDLY | TABDLY | BSDLY);
n_tio.c_oflag |= OPOST | ONLCR;
- n_tio.c_lflag &= ~(XCASE | NOFLSH | ECHOK | ECHONL);
+ n_tio.c_lflag &= ~(NOFLSH|ECHOK|ECHONL);
n_tio.c_lflag |= ISIG | ICANON | ECHO;
n_tio.c_cc[VEOF] = '\004';
n_tio.c_cc[VEOL] = '\000';

13
comms/conserver/patches/patch-conserver_consent_c.orig Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-conserver_consent_c.orig,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- conserver/consent.c.orig Sat May 24 14:02:38 2003
+++ conserver/consent.c Sat May 24 14:02:58 2003
@@ -45,8 +45,8 @@
#include <sys/file.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#include <stdio.h>
#include <ctype.h>

29
comms/conserver/patches/patch-conserver_group_c Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-conserver_group_c,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- conserver/group.c.orig Sat May 24 14:10:43 2003
+++ conserver/group.c Sat May 24 14:12:07 2003
@@ -1232,7 +1232,7 @@ SendRealBreak(pCLServing, pCEServing)
#else
# if HAVE_TCSENDBREAK
if (-1 == tcsendbreak(pCEServing->fdtty, 0)) {
- FileWrite(pCLServing->fd, "failed]\r\n", -1);
+ FileWrite(pCLServing->fd, "tcsendbreak failed]\r\n", -1);
return;
}
# else
@@ -3009,13 +3009,11 @@ Kiddie(pGE, sfd)
continue;
}
# if !defined(XTABS) /* XXX hack */
-# define XTABS TAB3
+# define XTABS OXTAB3
# endif
- if (XTABS == (TABDLY & sbuf.c_oflag)) {
- sbuf.c_oflag &= ~TABDLY;
- sbuf.c_oflag |= TAB0;
+ if (XTABS & sbuf.c_oflag) {
+ sbuf.c_oflag &= ~XTABS;
} else {
- sbuf.c_oflag &= ~TABDLY;
sbuf.c_oflag |= XTABS;
}
if (-1 ==

13
comms/conserver/patches/patch-conserver_readcfg_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-conserver_readcfg_c,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- conserver/readcfg.c.orig Sat May 24 14:03:22 2003
+++ conserver/readcfg.c Sat May 24 14:03:30 2003
@@ -37,8 +37,8 @@
#include <sys/file.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#include <stdio.h>
#include <ctype.h>

12
comms/conserver/patches/patch-console_console_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-console_console_c,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
--- console/console.c.orig Sat May 24 14:15:20 2003
+++ console/console.c Sat May 24 14:15:35 2003
@@ -576,7 +576,7 @@ C2Raw()
}
# endif
n_tios = o_tios;
- n_tios.c_iflag &= ~(INLCR | IGNCR | ICRNL | IUCLC | IXON);
+ n_tios.c_iflag &= ~(INLCR | IGNCR | ICRNL | IXON);
n_tios.c_oflag &= ~OPOST;
n_tios.c_lflag &= ~(ICANON | ISIG | ECHO | IEXTEN);
n_tios.c_cc[VMIN] = 1;

25
comms/conserver/pkg/DEINSTALL Normal file
View File

@ -0,0 +1,25 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
#
# conserver de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=${SYSCONFDIR}/conserver.cf
if [ -f $CONFIG_FILE ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to perform"
echo "| this step as root:"
echo "|"
echo "| rm -f $CONFIG_FILE"
echo "|"
echo "| Do not do this if you plan on re-installing $1"
echo "| at some future time."
echo "+---------------"
echo
fi
exit 0

6
comms/conserver/pkg/DESCR
View File

@ -1,11 +1,13 @@
This program provides a convenient way to manage many remote serial
consoles for machines. A server (conserver(8)) runs on each server
consoles for machines. A server (conserver(1)) runs on each server
machine and it connects to the specified serial port. It can log,
provide shared access to remote consoles, etc. If there are multiple
machines running conserver(8), a master conserver(8) can be run to
machines running conserver(1), a master conserver(1) can be run to
connect to all the slave servers, providing a single point of access
to the entire cluster.
This is very handy for remote unattended OpenBSD servers. It can
send serial break signals (if the driver supports it, cy does not!)
which is useful for breaking into DDB on hung machines.
WWW: ${HOMEPAGE}

70
comms/conserver/pkg/INSTALL Normal file
View File

@ -0,0 +1,70 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
#
# Pre/post-installation setup of conserver
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=${SYSCONFDIR}/conserver.cf
SAMPLE_CONFIG_FILE=$PREFIX/share/examples/conserver/conserver.cf
# Function: tell the user what s/he needs to do to use the port just installed
#
do_notice()
{
echo
echo "+---------------"
echo "| The existing $1 configuration file, $CONFIG_FILE,"
echo "| has NOT been changed. You may want to compare it to the"
echo "| current sample file, $SAMPLE_CONFIG_FILE,"
echo "| and update your configuration as needed."
echo "+---------------"
echo
}
# Function: install the system conserver.cf from the sample
#
do_install()
{
install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
echo
echo "+---------------"
echo "| The $1 configuration file, $CONFIG_FILE,"
echo "| has been installed. Please view this file and change"
echo "| the configuration to meet your needs."
echo "| Refer to $PREFIX/share/examples/conserver/README.OpenBSD"
echo "+---------------"
echo
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
: nothing to pre-install for this port
;;
POST-INSTALL)
if [ -f $CONFIG_FILE ]; then
do_notice $1
else
do_install $1
fi
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

5
comms/conserver/pkg/MESSAGE
View File

@ -1,5 +0,0 @@
This package includes software developed by
The Ohio State University and its contributors
Refer to /usr/local/share/examples/conserver/README.OpenBSD
for setup information.

14
comms/conserver/pkg/PLIST
View File

@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST,v 1.3 2002/04/07 01:54:48 naddy Exp $
share/examples/conserver/conserver.cf.eg
share/examples/conserver/README.OpenBSD
@dirrm share/examples/conserver
@comment $OpenBSD: PLIST,v 1.4 2003/05/26 20:20:53 pvalchev Exp $
bin/console
man/man1/console.1
man/man5/conserver.cf.5
man/man5/conserver.passwd.5
man/man8/conserver.8
man/man8/console.8
sbin/conserver
sbin/console
share/examples/conserver/README.OpenBSD
share/examples/conserver/conserver.cf
share/examples/conserver/conserver.passwd
@dirrm share/examples/conserver