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

update to conserver-8.1.11 with help from aanriot

Browse Source
This commit is contained in:
pvalchev 2005-08-02 07:25:47 +00:00
parent c58df3b755
commit 23d5b34769
12 changed files with 142 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
comms/conserver/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.27 2005/04/15 18:41:38 pvalchev Exp $
# $OpenBSD: Makefile,v 1.28 2005/08/02 07:25:47 pvalchev Exp $
COMMENT= "manage remote serial consoles via TCP/IP"
DISTNAME= conserver-7.2.7
PKGNAME= ${DISTNAME}p0
DISTNAME= conserver-8.1.11
CATEGORIES= comms
MAINTAINER= Peter Valchev <pvalchev@openbsd.org>
@ -15,13 +14,14 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
WANTLIB= c ssl crypto util
MASTER_SITES= ftp://ftp.conserver.com/conserver/
AUTOCONF_VERSION= 2.54
AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --with-64bit \
CONFIGURE_ARGS= --with-64bit \
--with-openssl \
--with-master=localhost
REGRESS_TARGET= test

8
comms/conserver/distinfo
View File

@ -1,4 +1,4 @@
MD5 (conserver-7.2.7.tar.gz) = ff22779c9cc53406e948204109879820
RMD160 (conserver-7.2.7.tar.gz) = 67fe555779293232933b30eea2efd5fcd86b6ea2
SHA1 (conserver-7.2.7.tar.gz) = e2dfe0d95ceab0e6c2db38161f540ec537d96132
SIZE (conserver-7.2.7.tar.gz) = 200861
MD5 (conserver-8.1.11.tar.gz) = 94259cd71f38e94b3f247768e3bc731f
RMD160 (conserver-8.1.11.tar.gz) = 380386c3f488787bf132809071b308bc9a00c89f
SHA1 (conserver-8.1.11.tar.gz) = d30d4c86b769d56707f6abfad47992cc59f128da
SIZE (conserver-8.1.11.tar.gz) = 299281

18
comms/conserver/patches/patch-configure_in
View File

@ -1,12 +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
$OpenBSD: patch-configure_in,v 1.2 2005/08/02 07:25:47 pvalchev Exp $
--- configure.in.orig Thu Jun 23 23:10:15 2005
+++ configure.in Thu Jun 23 23:10:59 2005
@@ -326,7 +326,7 @@ if test "$ac_cv_sys_posix_termios" != "y
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)
-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)
+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
dnl sys/proc.h needs sys/param.h on openbsd, apparently
AC_CHECK_HEADERS(sys/proc.h, [], [],
[#if HAVE_SYS_PARAM_H

25
comms/conserver/patches/patch-conserver_Makefile_in
View File

@ -1,11 +1,18 @@
$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)
$OpenBSD: patch-conserver_Makefile_in,v 1.2 2005/08/02 07:25:47 pvalchev Exp $
--- conserver/Makefile.in.orig Tue Feb 10 01:32:28 2004
+++ conserver/Makefile.in Sat Jul 30 11:57:23 2005
@@ -57,11 +57,8 @@ distclean: clean
rm -f Makefile conserver.rc
install: conserver
- $(MKDIR) $(DESTDIR)$(sbindir)
- $(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
- $(MKDIR) $(DESTDIR)$(mandir)/man8
- $(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
- $(MKDIR) $(DESTDIR)$(exampledir)
- $(INSTALL) conserver.rc $(DESTDIR)$(exampledir)
+ $(BSD_INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
+ $(BSD_INSTALL_MAN) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(exampledir)
.PHONY: clean distclean install

34
comms/conserver/patches/patch-conserver_cf_Makefile_in
View File

@ -1,20 +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
$OpenBSD: patch-conserver_cf_Makefile_in,v 1.2 2005/08/02 07:25:47 pvalchev Exp $
--- conserver.cf/Makefile.in.orig Tue Feb 10 01:32:28 2004
+++ conserver.cf/Makefile.in Sat Jul 30 09:42:34 2005
@@ -23,11 +23,10 @@ distclean: clean
rm -f Makefile
### 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
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) -m 0644 conserver.cf $(DESTDIR)$(exampledir)
- $(INSTALL) -m 0644 conserver.passwd $(DESTDIR)$(exampledir)
+ $(BSD_INSTALL_MAN) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
+ $(BSD_INSTALL_MAN) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(exampledir)
+ $(BSD_INSTALL_DATA) conserver.cf $(DESTDIR)$(exampledir)
+ $(BSD_INSTALL_DATA) conserver.passwd $(DESTDIR)$(exampledir)
.PHONY: clean distclean install

12
comms/conserver/patches/patch-conserver_cf_conserver_passwd
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-conserver_cf_conserver_passwd,v 1.1 2005/04/15 18:41:38 pvalchev Exp $
--- conserver.cf/conserver.passwd.orig Mon Jan 25 16:29:38 1999
+++ conserver.cf/conserver.passwd Fri Apr 15 12:36:30 2005
$OpenBSD: patch-conserver_cf_conserver_passwd,v 1.2 2005/08/02 07:25:47 pvalchev Exp $
--- conserver.cf/conserver.passwd.orig Thu Jun 23 23:25:24 2005
+++ conserver.cf/conserver.passwd Thu Jun 23 23:26:07 2005
@@ -1,3 +1,2 @@
-bryan:td1AgneGE3RsU:any
-djs:*passwd*:any
-todd:*passwd*:server1
-bryan:td1AgneGE3RsU
-djs:*passwd*
-todd:*passwd*
+djs:*:any
+todd:*:server1

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

@ -1,24 +1,20 @@
$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));
$OpenBSD: patch-conserver_consent_c,v 1.2 2005/08/02 07:25:47 pvalchev Exp $
--- conserver/consent.c.orig Thu Jun 23 23:28:58 2005
+++ conserver/consent.c Thu Jun 23 23:30:52 2005
@@ -528,7 +528,8 @@ VirtDev(pCE)
Error("[%s] tcgetattr(0): %s", pCE->server, 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_iflag |= ICRNL;
if (pCE->ixon == FLAGTRUE)
n_tio.c_iflag |= IXON;
@@ -536,10 +537,8 @@ VirtDev(pCE)
n_tio.c_iflag |= IXANY;
if (pCE->ixoff == FLAGTRUE)
n_tio.c_iflag |= IXOFF;
- n_tio.c_oflag &=
- ~(OLCUC | ONOCR | ONLRET | OFILL | NLDLY | CRDLY | TABDLY | BSDLY);
n_tio.c_oflag |= OPOST | ONLCR;

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

@ -0,0 +1,12 @@
$OpenBSD: patch-conserver_convert_c,v 1.1 2005/08/02 07:25:48 pvalchev Exp $
--- conserver/convert.c.orig Thu May 27 19:08:28 2004
+++ conserver/convert.c Tue Aug 2 01:22:59 2005
@@ -86,7 +86,7 @@ ReadLine2(fp, save, iLine)
|| peek) {
/* If we have a previously saved line, use it instead */
if (save->used) {
- strcpy(buf, save->string);
+ strlcpy(buf, save->string, sizeof(buf));
BuildString((char *)0, save);
}

21
comms/conserver/patches/patch-conserver_cutil_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-conserver_cutil_c,v 1.1 2005/08/02 07:25:48 pvalchev Exp $
--- conserver/cutil.c.orig Tue Nov 9 01:37:05 2004
+++ conserver/cutil.c Tue Aug 2 01:22:33 2005
@@ -84,7 +84,7 @@ StrTime(ltime)
time_t tyme;
tyme = time((time_t *)0);
- strcpy(curtime, ctime(&tyme));
+ strlcpy(curtime, ctime(&tyme), sizeof(curtime));
curtime[24] = '\000'; /* might need to adjust this at some point */
if (ltime != NULL)
*ltime = tyme;
@@ -424,7 +424,7 @@ ReadLine(fp, save, iLine)
|| peek) {
/* If we have a previously saved line, use it instead */
if (save->used) {
- strcpy(buf, save->string);
+ strlcpy(buf, save->string, sizeof(buf));
BuildString((char *)0, save);
}

49
comms/conserver/patches/patch-conserver_group_c
View File

@ -1,16 +1,16 @@
$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)
$OpenBSD: patch-conserver_group_c,v 1.2 2005/08/02 07:25:48 pvalchev Exp $
--- conserver/group.c.orig Mon Oct 25 01:25:35 2004
+++ conserver/group.c Tue Aug 2 01:20:46 2005
@@ -2409,7 +2409,7 @@ TelOpt(o)
if (o < sizeof(telopts) / sizeof(char *))
return telopts[o];
else {
- sprintf(opt, "%d", o);
+ snprintf(opt, sizeof(opt), "%d", o);
return opt;
}
}
@@ -3675,13 +3675,12 @@ DoClientRead(pGE, pCLServing)
continue;
}
# if !defined(XTABS) /* XXX hack */
@ -20,10 +20,29 @@ $OpenBSD: patch-conserver_group_c,v 1.1 2003/05/26 20:20:53 pvalchev Exp $
- if (XTABS == (TABDLY & sbuf.c_oflag)) {
- sbuf.c_oflag &= ~TABDLY;
- sbuf.c_oflag |= TAB0;
+ if (XTABS & sbuf.c_oflag) {
+ sbuf.c_oflag &= ~XTABS;
+ if (XTABS & sbuf.c_oflag) {
+ sbuf.c_oflag &= ~XTABS;
+
} else {
- sbuf.c_oflag &= ~TABDLY;
sbuf.c_oflag |= XTABS;
}
if (-1 ==
@@ -4571,7 +4570,7 @@ Kiddie(pGE, sfd)
BuildString("<unknown>@", pCL->acid);
BuildString((char *)0, pCL->username);
BuildString("<unknown>", pCL->username);
- strcpy(pCL->actym, StrTime(&(pCL->tym)));
+ strlcpy(pCL->actym, StrTime(&(pCL->tym)), sizeof(pCL->actym));
pCL->typetym = pCL->tym;
/* link into the control list for the dummy console
@@ -4681,7 +4680,7 @@ Spawn(pGE)
Error("Spawn(): path to socket too long: %s", portPath->string);
Bye(EX_OSERR);
}
- strcpy(lstn_port.sun_path, portPath->string);
+ strlcpy(lstn_port.sun_path, portPath->string, sizeof(lstn_port.sun_path));
/* create a socket to listen on
* (prepared by master so he can see the port number of the kid)

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

@ -1,13 +0,0 @@
$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>

10
comms/conserver/patches/patch-console_console_c
View File

@ -1,9 +1,9 @@
$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()
$OpenBSD: patch-console_console_c,v 1.2 2005/08/02 07:25:48 pvalchev Exp $
--- console/console.c.orig Mon Oct 25 09:18:20 2004
+++ console/console.c Thu Jun 23 23:33:26 2005
@@ -570,7 +570,7 @@ C2Raw()
Bye(EX_UNAVAILABLE);
}
# endif
n_tios = o_tios;
- n_tios.c_iflag &= ~(INLCR | IGNCR | ICRNL | IUCLC | IXON);
+ n_tios.c_iflag &= ~(INLCR | IGNCR | ICRNL | IXON);