aboutsummaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2019-04-04 16:37:29 +0000
committerRene Ladan <rene@FreeBSD.org>2019-04-04 16:37:29 +0000
commitcc5fe2dd620082c6185b6968505daa180908270f (patch)
tree4cee0f81cfd6da29fc9cf44ab5caf8f38bcb7006 /comms
parent94667a5ac650f84230ad89c0926d95d39bdf63ac (diff)
Remove expired ports:
2019-03-25 chinese/reciteword: depends on audio/esound 2019-03-31 comms/conserver: Superseeded by comms/conserver-com 2019-03-24 databases/flamerobin: Abandonware since 2009, does not work with newer version of wxGTK 2019-04-01 databases/mariadb100-client: Upstream End-of-Life March 2019 (https://mariadb.org/about/maintenance-policy/) 2019-04-01 databases/mariadb100-server: Upstream End-of-Life March 2019 (https://mariadb.org/about/maintenance-policy/) 2019-03-12 devel/physfs-devel: is the same as devel/physfs, serving no purpose 2019-03-20 devel/py-construct28: Latest upstream version is in ports tree devel/py-construct 2019-03-31 devel/xtoolchain-llvm40: No supported release uses this version 2019-03-31 devel/xtoolchain-llvm50: No supported release uses this version 2019-03-31 finance/aqmoney: no longer maintained upstream 2019-03-31 finance/openhbci: no longer maintained upstream 2019-03-31 graphics/py-exiv2: py-exiv2 has been deprecated in favour of GExiv2 2019-04-04 mail/dbmail22: Please use mail/dbmail which uses latest version of 3.X 2019-03-31 net/rubygem-fog-google17: Use net/rubygem-fog-google instead 2019-03-31 ports-mgmt/bsdadminscripts: Upstream stale nearly 10 years, no longer works properly, use ports-mgmt/bsdadminscripts2 instead 2019-03-24 www/mod_md-devel: Use the module that is shipped with Apache 2.4 2019-03-25 x11/xbelld: Depends on audio/esound
Notes
Notes: svn path=/head/; revision=497852
Diffstat (limited to 'comms')
-rw-r--r--comms/Makefile1
-rw-r--r--comms/conserver/Makefile65
-rw-r--r--comms/conserver/distinfo2
-rw-r--r--comms/conserver/files/Makefile5
-rw-r--r--comms/conserver/files/conserver.in38
-rw-r--r--comms/conserver/files/patch-autologin-Make.host11
-rw-r--r--comms/conserver/files/patch-conserver-Make.host10
-rw-r--r--comms/conserver/files/patch-console-Make.host10
-rw-r--r--comms/conserver/files/patch-etc-autologin-autologin.c68
-rw-r--r--comms/conserver/files/patch-etc-autologin-machine.h73
-rw-r--r--comms/conserver/files/patch-etc_conserver_consent.c34
-rw-r--r--comms/conserver/files/patch-etc_conserver_console.m57
-rw-r--r--comms/conserver/files/patch-etc_conserver_group.c_131
-rw-r--r--comms/conserver/files/patch-etc_conserver_group.c_221
-rw-r--r--comms/conserver/files/patch-etc_conserver_master.c23
-rw-r--r--comms/conserver/files/patch-group.h5
-rw-r--r--comms/conserver/files/patch-machine.h17
-rw-r--r--comms/conserver/files/patch-readcfg.c12
-rw-r--r--comms/conserver/pkg-descr12
-rw-r--r--comms/conserver/pkg-plist8
20 files changed, 0 insertions, 503 deletions
diff --git a/comms/Makefile b/comms/Makefile
index eb9eb336cc58..4a5757055a64 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -24,7 +24,6 @@
SUBDIR += comserv
SUBDIR += concordance
SUBDIR += congruity
- SUBDIR += conserver
SUBDIR += conserver-com
SUBDIR += cqrlog
SUBDIR += cubicsdr
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
deleted file mode 100644
index 603d60b47ef2..000000000000
--- a/comms/conserver/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# Created by: Peter Wemm <peter@netplex.com.au>
-# $FreeBSD$
-
-PORTNAME= conserver
-PORTVERSION= 8.5
-PORTREVISION= 4
-CATEGORIES= comms
-MASTER_SITES= http://www.komquats.com/distfiles/ \
- http://people.freebsd.org/~cy/distfiles/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= Manage remote serial consoles via TCP/IP
-
-DEPRECATED= Superseeded by comms/conserver-com
-EXPIRATION_DATE= 2019-03-31
-
-BUILD_DEPENDS= makeme:devel/msrc0 \
- mkcmd:devel/mkcmd
-
-CONFLICTS_INSTALL= conserver-com-[0-9]*
-
-# Set this to where you want console(8) to connect to by default
-# or use something like ``make DEFAULTHOST=myserver.mydomain.net''
-DEFAULTHOST?= localhost
-DEFAULTPORT?= 782
-MAKE_ENV+= DEFAULTHOST="${DEFAULTHOST}" DEFAULTPORT="${DEFAULTPORT}"
-#PKGMESSAGE= ${WRKDIR}/MESSAGE
-USE_RC_SUBR= conserver
-
-do-build:
- ${REINPLACE_CMD} -e 's:/usr/local/lib:${PREFIX}/etc:g' \
- ${WRKSRC}/etc/conserver/cons.h
-.for d in etc/conserver etc/console etc/autologin
- @(cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \
- ${MAKE_ARGS} ${ALL_TARGET})
-.endfor
- #@${SED} -e 's:/usr/local:${PREFIX}:g' \
- # ${.CURDIR}/pkg-message > ${PKGMESSAGE}
-
-do-install:
-.for d in etc/conserver etc/console etc/autologin
- (cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \
- ${MAKE_ARGS} ${INSTALL_TARGET})
-.endfor
- @${INSTALL_DATA} ${WRKSRC}/lib/conserver.cf/conserver.cf \
- ${STAGEDIR}${PREFIX}/etc/conserver.cf.eg
- @${SED} -e 's:/usr/local/lib:${PREFIX}/etc:g' \
- ${WRKSRC}/lib/conserver.cf/conserver.cf.man \
- > ${STAGEDIR}${PREFIX}/man/man5/conserver.cf.5
- @${SED} -e 's:/usr/local/etc:${PREFIX}/sbin:g' \
- ${WRKSRC}/etc/autologin/autologin.man \
- > ${STAGEDIR}${PREFIX}/man/man8/autologin.8
- @${SED} -e 's:/usr/local/lib:${PREFIX}/etc:g' \
- ${WRKSRC}/etc/conserver/conserver.man \
- > ${STAGEDIR}${PREFIX}/man/man8/conserver.8
- @${SED} -e 's:console\.itsd\.fedex\.com:${DEFAULTHOST}:g' \
- ${WRKSRC}/etc/console/console.man \
- > ${STAGEDIR}${PREFIX}/man/man8/console.8
- @${CHMOD} 0444 ${STAGEDIR}${PREFIX}/man/man5/conserver.cf.5 \
- ${STAGEDIR}${PREFIX}/man/man8/autologin.8 \
- ${STAGEDIR}${PREFIX}/man/man8/conserver.8 \
- ${STAGEDIR}${PREFIX}/man/man8/console.8
-
-.include <bsd.port.mk>
diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo
deleted file mode 100644
index d1965e310130..000000000000
--- a/comms/conserver/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (conserver-8.5.tgz) = cd6c76a6f335c252344751c6d6596136cbbb155cd81003d323f2e2c416205edc
-SIZE (conserver-8.5.tgz) = 99743
diff --git a/comms/conserver/files/Makefile b/comms/conserver/files/Makefile
deleted file mode 100644
index 3b1a4791f697..000000000000
--- a/comms/conserver/files/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= autologin conserver.cf conserver console
-
-.include <bsd.subdir.mk>
diff --git a/comms/conserver/files/conserver.in b/comms/conserver/files/conserver.in
deleted file mode 100644
index 0cc210e94f2e..000000000000
--- a/comms/conserver/files/conserver.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-# PROVIDE: conserver
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# To enable conserver, add lines like below to /etc/rc.conf.
-#
-# conserver_enable="YES"
-
-conserver_enable=${conserver_enable:-"no"}
-
-. /etc/rc.subr
-
-name=conserver
-rcvar=conserver_enable
-
-command=%%PREFIX%%/sbin/conserver
-conserver_configfile=${conserver_configfile:-"%%PREFIX%%/etc/conserver.cf"}
-command_args="-d -n -C ${conserver_configfile}"
-required_files=${conserver_configfile}
-
-load_rc_config $name
-
-case "$1" in
-start) if [ -x ${command} -a -f ${configfile} ]; then
- run_rc_command "$1"
- fi
- ;;
-*)
- run_rc_command "$1"
- ;;
-esac
-
-exit 0
diff --git a/comms/conserver/files/patch-autologin-Make.host b/comms/conserver/files/patch-autologin-Make.host
deleted file mode 100644
index 0d87cf120ab1..000000000000
--- a/comms/conserver/files/patch-autologin-Make.host
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/autologin/Make.host.orig Sat Nov 22 20:19:33 1997
-+++ etc/autologin/Make.host Tue Nov 21 18:07:15 2000
-@@ -11,7 +11,7 @@
- HOSTTYPE,`PARAGON',`
- BINDIR= ${DESTDIR}/etc
- ',`
--BINDIR= ${DESTDIR}/usr/local/etc
-+BINDIR= ${DESTDIR}${PREFIX}/sbin
- ')`
-
- INCLUDE=
diff --git a/comms/conserver/files/patch-conserver-Make.host b/comms/conserver/files/patch-conserver-Make.host
deleted file mode 100644
index 064116961f18..000000000000
--- a/comms/conserver/files/patch-conserver-Make.host
+++ /dev/null
@@ -1,10 +0,0 @@
---- etc/conserver/Make.host.orig Sat Nov 22 20:19:31 1997
-+++ etc/conserver/Make.host Tue Nov 21 18:11:42 2000
-@@ -10,2 +10,2 @@
--ETC= ${DESTDIR}/usr/'ifdef(`NEW',`new',`local')`/etc
--DOC= ${DESTDIR}/usr/local/man
-+ETC= ${DESTDIR}/${PREFIX}/sbin
-+DOC= ${DESTDIR}/${PREFIX}/man
-@@ -36 +36 @@
--HOSTTYPE,`EPIX',` -systype bsd43')`
-+HOSTTYPE,`EPIX',` -systype bsd43')` -DPORT=${DEFAULTPORT}
diff --git a/comms/conserver/files/patch-console-Make.host b/comms/conserver/files/patch-console-Make.host
deleted file mode 100644
index 1d2e690044c1..000000000000
--- a/comms/conserver/files/patch-console-Make.host
+++ /dev/null
@@ -1,10 +0,0 @@
---- etc/console/Make.host.orig Sat Nov 22 20:19:33 1997
-+++ etc/console/Make.host Tue Nov 21 18:12:28 2000
-@@ -18,2 +18,2 @@
--ETC= ${DESTDIR}/usr/'ifdef(`NEW',`new',`local')`/etc
--DOC= ${DESTDIR}/usr/local/man
-+ETC= ${DESTDIR}/${PREFIX}/bin
-+DOC= ${DESTDIR}/${PREFIX}/man
-@@ -34 +34 @@
--HOSTTYPE,`EPIX',` -systype bsd43')` -DHOST=\"${SERVER}\"
-+HOSTTYPE,`EPIX',` -systype bsd43')` -DHOST=\"${DEFAULTHOST}\" -DPORT=${DEFAULTPORT}
diff --git a/comms/conserver/files/patch-etc-autologin-autologin.c b/comms/conserver/files/patch-etc-autologin-autologin.c
deleted file mode 100644
index e5109dcbcab8..000000000000
--- a/comms/conserver/files/patch-etc-autologin-autologin.c
+++ /dev/null
@@ -1,68 +0,0 @@
---- etc/autologin/autologin.c.orig 2000-08-02 11:39:42.000000000 -0700
-+++ etc/autologin/autologin.c 2010-01-28 21:04:23.000000000 -0800
-@@ -23,7 +23,15 @@
- #include <pwd.h>
- #include <grp.h>
- #include <errno.h>
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
-+#include <utmpx.h>
-+#define utmp utmpx
-+#define setutent setutxent
-+#define getutent getutxent
-+#define endutent endutxent
-+#else
- #include <utmp.h>
-+#endif
-
-
- #include "machine.h"
-@@ -189,7 +197,12 @@
- (void)strncpy(utmp.ut_host, "(autologin)", sizeof(utmp.ut_host));
- #endif
- #endif
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
-+ utmp.ut_tv.tv_sec = time((time_t *) 0);
-+ utmp.ut_tv.tv_usec = 0;
-+#else
- utmp.ut_time = time((time_t *) 0);
-+#endif
-
- if (0 == iFound) {
- fprintf(stderr, "%s: %s: no ttyslot\n", progname, pctty);
-@@ -443,11 +456,36 @@
- /* NOTREACHED */
- }
- #endif
-+#ifdef __FreeBSD_version
-+ /* XXX: FreeBSD does not support IUCLC, translate uppercase characters
-+ to lowercase */
-+ n_tio.c_iflag &= ~(IGNCR);
-+#else
- n_tio.c_iflag &= ~(IGNCR|IUCLC);
-+#endif
- n_tio.c_iflag |= ICRNL|IXON|IXANY;
-+#ifdef __FreeBSD_version
-+ /*
-+ XXX: FreeBSD does not support OLCUC, translater lowercase
-+ to uppercase
-+ XXX: FreeBSD does not support OFILL, use fill (padding) characters
-+ instead of timing for delays
-+ XXX: FreeBSD does not support NLDLY, newline delay (nlN)
-+ XXX: FreeBSD does not support CRDLY, carrier return delay (crN)
-+ XXX: FreeBSD does not support BSDLY, backspace dealy (bsN)
-+ */
-+ n_tio.c_oflag &= ~(ONOCR|ONLRET|TABDLY);
-+#else
- n_tio.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY);
-+#endif
- n_tio.c_oflag |= OPOST|ONLCR|TAB3;
-+#ifdef __FreeBSD_version
-+ /* XXX: FreeBSD does not support XCASE, with icanon, escape with '\'
-+ for uppercase characters */
-+ n_tio.c_lflag &= ~(NOFLSH|ECHOK|ECHONL);
-+#else
- n_tio.c_lflag &= ~(XCASE|NOFLSH|ECHOK|ECHONL);
-+#endif
- n_tio.c_lflag |= ISIG|ICANON|ECHO;
- n_tio.c_cc[VEOF] = '\004'; /* ^D */
- n_tio.c_cc[VEOL] = '\000'; /* EOL */
diff --git a/comms/conserver/files/patch-etc-autologin-machine.h b/comms/conserver/files/patch-etc-autologin-machine.h
deleted file mode 100644
index 96e622d1cded..000000000000
--- a/comms/conserver/files/patch-etc-autologin-machine.h
+++ /dev/null
@@ -1,73 +0,0 @@
---- etc/autologin/machine.h.orig 2000-08-02 11:39:42.000000000 -0700
-+++ etc/autologin/machine.h 2010-01-28 21:01:18.000000000 -0800
-@@ -1,7 +1,6 @@
- /* $Id: machine.h,v 2.8 1997/11/10 17:10:34 ksb Exp $
- * leverage in liew of L7
- */
--
- #if !defined(HPUX) && (defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(HPUX10))
- #define HPUX 1
- #endif
-@@ -17,11 +16,11 @@
- #endif
-
- #if !defined(USE_OLD_UTENT)
--#define USE_OLD_UTENT (defined(SUN4)||defined(FREEBSD)||defined(NETBSD)||defined(S81))
-+#define USE_OLD_UTENT (defined(SUN4)||(defined(FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version < 900008)||defined(NETBSD)||defined(S81))
- #endif
-
- #if !defined(USE_UTENT)
--#define USE_UTENT (defined(SUN5)||defined(EPIX)||defined(PARAGON)||defined(IBMR2)||defined(HPUX9)||defined(HPUX10)||defined(LINUX))
-+#define USE_UTENT (defined(SUN5)||defined(EPIX)||defined(PARAGON)||defined(IBMR2)||defined(HPUX9)||defined(HPUX10)||defined(LINUX)||(defined(__FreeBSD_version) && (__FreeBSD_version > 900007)))
- #endif
-
- #if !defined(NEED_PUTENV)
-@@ -38,7 +37,7 @@
- #define USE_TERMIO (defined(ETA10)||defined(V386))
- #endif
- #if !defined(USE_TERMIOS)
--#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(LINUX))
-+#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(LINUX)||(defined(__FreeBSD_version) && ((__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007)))
- #endif
- #if !defined(USE_TCBREAK)
- #define USE_TCBREAK (defined(SUN4)||defined(PTX))
-@@ -66,7 +65,7 @@
- #endif
-
- #if !defined(USE_TC)
--#define USE_TC (defined(EPIX)||defined(IBMR2)||defined(V386)||defined(S81)||defined(PARAGON))
-+#define USE_TC (defined(EPIX)||defined(IBMR2)||defined(V386)||defined(S81)||defined(PARAGON)||(defined(__FreeBSD_version) && (__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007))
- #endif
-
- #if !defined(HAVE_GETUSERATTR)
-@@ -74,7 +73,7 @@
- #endif
-
- #if !defined(USE_IOCTL)
--#define USE_IOCTL (defined(V386)||defined(S81)||defined(NETBSD)||defined(FREEBSD))
-+#define USE_IOCTL (defined(V386)||defined(S81)||defined(NETBSD)||(defined(FREEBSD)&&(defined(__FreeBSD_version) && (__FreeBSD_version < 800044 || (__FreeBSD_version >= 900000 &&__FreeBSD_version < 900008)))))
- #endif
-
-
-@@ -127,8 +126,11 @@
- #if FREEBSD
- #include <sys/uio.h>
- #include <sys/proc.h>
-+#if defined(__FreeBSD_version) && ((__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007)
-+#include <termios.h>
-+#else
- #include <sys/ioctl_compat.h>
--#define setsid() getpid()
-+#endif
- #else
-
- #endif /* NETBSD */
-@@ -148,7 +150,7 @@
- #if HPUX
- #define HAVE_GETSID (defined(HPUX10)||defined(LINUX))
- #else
--#if PARAGON || SUNOS || SUN4 || SUN5 || NETBSD || S81 || V386 || IBMR2 || EPIX
-+#if PARAGON || SUNOS || SUN4 || SUN5 || NETBSD || S81 || V386 || IBMR2 || EPIX || FREEBSD
- #define HAVE_GETSID 1
- #else
- #define HAVE_GETSID 0
diff --git a/comms/conserver/files/patch-etc_conserver_consent.c b/comms/conserver/files/patch-etc_conserver_consent.c
deleted file mode 100644
index 632dd0464753..000000000000
--- a/comms/conserver/files/patch-etc_conserver_consent.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- etc/conserver/consent.c.orig Wed Nov 17 18:10:14 1999
-+++ etc/conserver/consent.c Wed Nov 17 18:12:57 1999
-@@ -295,7 +295,7 @@
- */
- termp.c_iflag = IXON|IXOFF|BRKINT;
- termp.c_oflag = 0;
-- termp.c_cflag = CREAD;
-+ termp.c_cflag = CREAD | (termp.c_cflag & (CLOCAL|CRTSCTS));
- termp.c_cflag |= pCE->pparity->iset;
- termp.c_lflag = 0;
- /*
-@@ -303,7 +303,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)) {
-@@ -563,11 +563,10 @@
- exit(1);
- }
- #endif
-- n_tios.c_iflag &= ~(IGNCR|IUCLC);
-+ n_tios.c_iflag &= ~(IGNCR);
- n_tios.c_iflag |= ICRNL|IXON|IXANY;
-- n_tios.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY);
- n_tios.c_oflag |= OPOST|ONLCR;
-- n_tios.c_lflag &= ~(XCASE|NOFLSH|ECHOK|ECHONL);
-+ n_tios.c_lflag &= ~(NOFLSH|ECHOK|ECHONL);
- n_tios.c_lflag |= ISIG|ICANON|ECHO;
- n_tios.c_cc[VEOF] = '\004';
- n_tios.c_cc[VEOL] = '\000';
diff --git a/comms/conserver/files/patch-etc_conserver_console.m b/comms/conserver/files/patch-etc_conserver_console.m
deleted file mode 100644
index c85432d262c5..000000000000
--- a/comms/conserver/files/patch-etc_conserver_console.m
+++ /dev/null
@@ -1,57 +0,0 @@
---- etc/console/console.m.orig 2000-08-02 11:39:42.000000000 -0700
-+++ etc/console/console.m 2007-09-12 09:30:56.000000000 -0700
-@@ -582,17 +582,17 @@
- return;
-
- #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);
- }
-@@ -668,7 +668,7 @@
- if (!screwy)
- return;
- #if USE_TERMIOS
-- (void)ioctl(0, TCSETS, (char *)&o_tios);
-+ (void)tcsetattr(0, TCSANOW, &o_tios);
- #else
- #if USE_TERMIO
- (void)ioctl(0, TCSETA, (char *)&o_tio);
-@@ -693,7 +693,7 @@
- register int nr;
-
- while (0 != iLen) {
-- if (-1 == (nr = write(fd, pcBuf, iLen))) {
-+ if (0 >= (nr = write(fd, pcBuf, iLen))) {
- c2cooked();
- fprintf(stderr, "%s: lost connection\n", progname);
- exit(3);
-@@ -980,6 +980,7 @@
- static int SawUrg = 0;
- #if DO_POWER
- static char acPowCtl[128];
-+static int Indir();
-
- /* We take a moment to call the power controller and ask (ksb)
- * them about the console line we were chatting with. We'll be right
-@@ -991,7 +992,6 @@
- char *pcControl, *pcLine, *pcCurrent;
- {
- register char *pcAt;
-- static int Indir();
-
- if ((char *)0 != (pcAt = strchr(pcControl, '@'))) {
- *pcAt++ = '\000';
diff --git a/comms/conserver/files/patch-etc_conserver_group.c_1 b/comms/conserver/files/patch-etc_conserver_group.c_1
deleted file mode 100644
index dc4a1bb3a2ef..000000000000
--- a/comms/conserver/files/patch-etc_conserver_group.c_1
+++ /dev/null
@@ -1,31 +0,0 @@
---- etc/conserver/group.c.orig Wed Nov 17 18:07:38 1999
-+++ etc/conserver/group.c Wed Nov 17 18:09:43 1999
-@@ -902,7 +902,7 @@
- #endif
- #if USE_TERMIO
- if (-1 == ioctl(pCEServing->fdtty, TCSBRK, (char *)0)) {
-- CSTROUT(pCLServing->fd, "failed]\r\n");
-+ CSTROUT(pCLServing->fd, "tcsendbreak failed]\r\n");
- continue;
- }
- #else
-@@ -1274,15 +1274,12 @@
- continue;
- }
- #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;
-- } else {
-- sbuf.c_oflag &= ~TABDLY;
-+ if (XTABS & sbuf.c_oflag)
-+ sbuf.c_oflag &= ~XTABS;
-+ else
- sbuf.c_oflag |= XTABS;
-- }
- if (-1 == tcsetattr(pCEServing->fdtty, TCSANOW, & sbuf)) {
- CSTROUT(pCLServing->fd, "failed]\r\n");
- continue;
diff --git a/comms/conserver/files/patch-etc_conserver_group.c_2 b/comms/conserver/files/patch-etc_conserver_group.c_2
deleted file mode 100644
index 75c5821c05bf..000000000000
--- a/comms/conserver/files/patch-etc_conserver_group.c_2
+++ /dev/null
@@ -1,21 +0,0 @@
---- etc/conserver/group.c.orig Thu Aug 3 03:39:42 2000
-+++ etc/conserver/group.c Sat Jul 7 16:10:53 2001
-@@ -228,6 +228,18 @@
- struct passwd *pwd;
- char *pcEPass, *pcWord;
- {
-+ if (pcEPass && '#' == pcEPass[0] && '#' == pcEPass[1] && '\0' != pcEPass[2] && (MAXLOGNAME + 1) > strlen(pcEPass)) {
-+ /* If the encrypted password field from the config file
-+ * looks like ##USER, look up the password for that
-+ * user for the match.
-+ */
-+ pwd = getpwnam(pcEPass+2);
-+ if ((struct passwd *) NULL == pwd) {
-+ return 0;
-+ }
-+ pcEPass = (char *)0;
-+ }
-+
- if (pcEPass && '\0' != pcEPass[0])
- if (MD5CheckPass(pcEPass, pcWord))
- return 1;
diff --git a/comms/conserver/files/patch-etc_conserver_master.c b/comms/conserver/files/patch-etc_conserver_master.c
deleted file mode 100644
index 6c45ce8e02dc..000000000000
--- a/comms/conserver/files/patch-etc_conserver_master.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- etc/conserver/master.c.orig 2000-08-02 11:39:42.000000000 -0700
-+++ etc/conserver/master.c 2013-09-18 00:48:10.621087079 -0700
-@@ -200,17 +200,17 @@
-
- if ((msfd=socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- fprintf(stderr, "%s: socket: %s\n", progname, strerror(errno));
-- return;
-+ return 0;
- }
- #if defined(SO_REUSEADDR) && defined(SOL_SOCKET)
- if (setsockopt(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&iTrue, sizeof(iTrue))<0) {
- fprintf(stderr, "%s: setsockopt: %s\n", progname, strerror(errno));
-- return;
-+ return 0;
- }
- #endif
- if (bind(msfd, (struct sockaddr *)&master_port, sizeof(master_port))<0) {
- fprintf(stderr, "%s: bind: %s\n", progname, strerror(errno));
-- return;
-+ return 0;
- }
- if (listen(msfd, SOMAXCONN) < 0) {
- fprintf(stderr, "%s: listen: %s\n", progname, strerror(errno));
diff --git a/comms/conserver/files/patch-group.h b/comms/conserver/files/patch-group.h
deleted file mode 100644
index 868c538cfa47..000000000000
--- a/comms/conserver/files/patch-group.h
+++ /dev/null
@@ -1,5 +0,0 @@
---- etc/conserver/group.h.orig Wed Aug 2 11:39:42 2000
-+++ etc/conserver/group.h Thu Nov 8 09:53:10 2001
-@@ -29 +29 @@
--#define MAXPSWDLEN 16 /* max length of encrypted password */
-+#define MAXPSWDLEN 64 /* max length of encrypted password */
diff --git a/comms/conserver/files/patch-machine.h b/comms/conserver/files/patch-machine.h
deleted file mode 100644
index 973c6833dd25..000000000000
--- a/comms/conserver/files/patch-machine.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- etc/conserver/machine.h.orig Wed Aug 2 11:39:42 2000
-+++ etc/conserver/machine.h Thu Nov 23 03:45:25 2000
-@@ -85,3 +85,3 @@
- #if !defined(HAVE_UWAIT)
--#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(HPUX10)||defined(HPUX11)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX))
-+#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(HPUX10)||defined(HPUX11)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD))
- #endif
-@@ -137,3 +137,3 @@
- #if !defined(HAVE_SETSID)
--#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX))
-+#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD))
- #endif
-@@ -159,3 +159,3 @@
- #if !defined(USE_TERMIOS)
--#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX))
-+#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD))
- #endif
diff --git a/comms/conserver/files/patch-readcfg.c b/comms/conserver/files/patch-readcfg.c
deleted file mode 100644
index 6128a75f581e..000000000000
--- a/comms/conserver/files/patch-readcfg.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- etc/conserver/readcfg.c.orig Wed Aug 2 19:39:42 2000
-+++ etc/conserver/readcfg.c Tue Jul 24 12:09:27 2001
-@@ -194,7 +194,7 @@
- if ('\000' != pGE->passwd[0] && 0 != strcmp(pcPass, pGE->passwd)) {
- fprintf(stderr, "%s: %s(%d) group %d has more than one password, first taken\n", progname, pcFile, iLine, iG);
- } else if ((int)strlen(pcPass) > MAXPSWDLEN) {
-- fprintf(stderr, "%s: %s(%d) password too long (%d is the limit)\n", progname, pcFile, iLine, iG, MAXPSWDLEN);
-+ fprintf(stderr, "%s: %s(%d) password too long (%d is the limit)\n", progname, pcFile, iLine, MAXPSWDLEN);
- } else {
- (void)strcpy(pGE->passwd, pcPass);
- }
-
diff --git a/comms/conserver/pkg-descr b/comms/conserver/pkg-descr
deleted file mode 100644
index d3137366f445..000000000000
--- a/comms/conserver/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This program provides a convenient way to manage many remote serial
-consoles for machines. A server (conserver(8)) 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
-connect to all the slave servers, providing a single point of access
-to the entire cluster.
-
-This is very handy for remote unattended FreeBSD servers. It can send
-serial break signals which is useful for breaking into DDB on hung machines.
-
-WWW: http://www.conserver.com/
diff --git a/comms/conserver/pkg-plist b/comms/conserver/pkg-plist
deleted file mode 100644
index 584be1d5da4a..000000000000
--- a/comms/conserver/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/console
-etc/conserver.cf.eg
-man/man5/conserver.cf.5.gz
-man/man8/autologin.8.gz
-man/man8/console.8.gz
-man/man8/conserver.8.gz
-sbin/autologin
-sbin/conserver