aboutsummaryrefslogtreecommitdiff
path: root/net/SSLtelnet
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>1998-10-19 15:49:06 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>1998-10-19 15:49:06 +0000
commit74ed251b0ed9b6d44347fd50e3060163219b930a (patch)
treec48fb73ef5cc96b3af4fb125d5382beaf1960fc9 /net/SSLtelnet
parent6e8eda83e15a1236e22d6c7100cc1c5dc4fce8cf (diff)
downloadports-74ed251b0ed9b6d44347fd50e3060163219b930a.tar.gz
ports-74ed251b0ed9b6d44347fd50e3060163219b930a.zip
Notes
Diffstat (limited to 'net/SSLtelnet')
-rw-r--r--net/SSLtelnet/Makefile6
-rw-r--r--net/SSLtelnet/distinfo2
-rw-r--r--net/SSLtelnet/files/patch-ab80
-rw-r--r--net/SSLtelnet/files/patch-ac17
-rw-r--r--net/SSLtelnet/files/patch-ad65
5 files changed, 86 insertions, 84 deletions
diff --git a/net/SSLtelnet/Makefile b/net/SSLtelnet/Makefile
index a7013a2b5e5c..9c93adcaec5b 100644
--- a/net/SSLtelnet/Makefile
+++ b/net/SSLtelnet/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: SSLtelnet
-# Version required: 0.11
+# Version required: 0.13
# Date created: Mar 29, 1998
# Whom: issei@jp.FreeBSD.ORG
#
-# $Id: Makefile,v 1.3 1998/08/26 09:14:48 vanilla Exp $
+# $Id: Makefile,v 1.4 1998/09/25 10:20:18 asami Exp $
-DISTNAME= SSLtelnet-0.11
+DISTNAME= SSLtelnet-0.13
CATEGORIES= net security
MASTER_SITES= ftp://ftp.psy.uq.oz.au/pub/Crypto/SSLapps/
diff --git a/net/SSLtelnet/distinfo b/net/SSLtelnet/distinfo
index 77e154d0f301..e8ba32132f21 100644
--- a/net/SSLtelnet/distinfo
+++ b/net/SSLtelnet/distinfo
@@ -1 +1 @@
-MD5 (SSLtelnet-0.11.tar.gz) = 187bc35bda63c6797c6727ec1e5886fe
+MD5 (SSLtelnet-0.13.tar.gz) = 51025a9aaceaa2581377f7be7e0d913e
diff --git a/net/SSLtelnet/files/patch-ab b/net/SSLtelnet/files/patch-ab
index 874b479581d2..1175eef711b8 100644
--- a/net/SSLtelnet/files/patch-ab
+++ b/net/SSLtelnet/files/patch-ab
@@ -1,5 +1,5 @@
--- telnetd/pathnames.h.orig Sat Jun 15 17:26:10 1996
-+++ telnetd/pathnames.h Wed Sep 2 12:53:18 1998
++++ telnetd/pathnames.h Sat Oct 17 22:11:51 1998
@@ -53,7 +53,7 @@
/* I'm working on having this work as is with SunOS 5.x */
#ifndef USE_SRALOGIN
@@ -9,19 +9,79 @@
#define _PATH_LOGIN "/usr/bin/login"
#else
#define _PATH_LOGIN "/bin/login"
---- telnetd/sys_term.c.orig Wed Sep 2 12:53:19 1998
-+++ telnetd/sys_term.c Wed Sep 2 12:53:22 1998
-@@ -739,7 +739,7 @@
+--- telnetd/sys_term.c.orig Sat Aug 2 14:37:00 1997
++++ telnetd/sys_term.c Sat Oct 17 22:11:51 1998
+@@ -531,7 +531,7 @@
+ return(p);
+ #else
+
+- register char c, *p1, *p2;
++ register char c, *p1, *p2, *cp;
+ register int i;
+
+ #if defined(__GNUC__) || defined(__sgi)
+@@ -548,20 +548,40 @@
+ p1 = &line[8];
+ p2 = &line[9];
+ #endif
+-
+- for (c = 'p'; c <= 's'; c++) {
++ for (cp = "pqrsPQRS"; *cp; cp++) {
+ struct stat stb;
+
+- *p1 = c;
++ *p1 = *cp;
+ *p2 = '0';
++ /*
++ * This stat() check is just to keep us from
++ * looping through all 256 combinations if there
++ * aren't that many ptys available.
++ */
+ if (stat(line, &stb) < 0)
+ break;
+- for (i = 0; i < 16; i++) {
+- *p2 = "0123456789abcdef"[i];
++ for (i = 0; i < 32; i++) {
++ *p2 = "0123456789abcdefghijklmnopqrstuv"[i];
+ p = open(line, 2);
+ if (p > 0) {
++#ifndef __hpux
+ line[5] = 't';
+- return(p);
++#else
++ for (p1 = &line[8]; *p1; p1++)
++ *p1 = *(p1+1);
++ line[9] = 't';
++#endif
++ chown(line, 0, 0);
++ chmod(line, 0600);
++#if defined(sun) && defined(TIOCGPGRP) && BSD < 199207
++ if (ioctl(p, TIOCGPGRP, &dummy) == 0
++ || errno != EIO) {
++ chmod(line, 0666);
++ close(p);
++ line[5] = 'p';
++ } else
++#endif /* defined(sun) && defined(TIOCGPGRP) && BSD < 199207 */
++ return(p);
+ }
+ }
+ }
+@@ -733,11 +753,7 @@
else
termbuf.lflags &= ~LPASS8;
#else
- if (on) {
-+ if (1) {
- termbuf.c_iflag &= ~ISTRIP;
- } else {
- termbuf.c_iflag |= ISTRIP;
+- termbuf.c_iflag &= ~ISTRIP;
+- } else {
+- termbuf.c_iflag |= ISTRIP;
+- }
++ termbuf.c_iflag &= ~ISTRIP;
+ #endif
+ }
+
--- telnetd/telnetd.c.orig Sat Aug 2 14:40:48 1997
-+++ telnetd/telnetd.c Wed Sep 2 12:53:21 1998
++++ telnetd/telnetd.c Sat Oct 17 22:13:52 1998
@@ -140,7 +140,7 @@
highpty = getnpty();
#endif /* CRAY */
@@ -67,7 +127,7 @@
}
}
--- telnetd/Makefile.orig Tue Sep 12 10:22:51 1995
-+++ telnetd/Makefile Fri Sep 4 15:10:46 1998
++++ telnetd/Makefile Sat Oct 17 22:11:51 1998
@@ -4,16 +4,13 @@
PROG= telnetd
diff --git a/net/SSLtelnet/files/patch-ac b/net/SSLtelnet/files/patch-ac
index 8464a700b1a5..23de97ed64e5 100644
--- a/net/SSLtelnet/files/patch-ac
+++ b/net/SSLtelnet/files/patch-ac
@@ -1,16 +1,19 @@
--- telnet/sys_bsd.c.orig Sat Aug 2 14:18:09 1997
-+++ telnet/sys_bsd.c Wed Sep 2 12:53:22 1998
-@@ -580,7 +580,7 @@
++++ telnet/sys_bsd.c Fri Oct 16 20:43:32 1998
+@@ -580,10 +580,7 @@
else
lmode &= ~LPASS8;
#else
- if (f & MODE_INBIN)
-+ if (1)
- tmp_tc.c_iflag &= ~ISTRIP;
- else
- tmp_tc.c_iflag |= ISTRIP;
+- tmp_tc.c_iflag &= ~ISTRIP;
+- else
+- tmp_tc.c_iflag |= ISTRIP;
++ tmp_tc.c_iflag &= ~ISTRIP;
+ if (f & MODE_OUTBIN) {
+ tmp_tc.c_cflag &= ~(CSIZE|PARENB);
+ tmp_tc.c_cflag |= CS8;
--- telnet/Makefile.orig Sat Aug 2 13:30:16 1997
-+++ telnet/Makefile Wed Sep 2 13:20:26 1998
++++ telnet/Makefile Fri Oct 16 20:42:09 1998
@@ -6,14 +6,12 @@
PROG= telnet
diff --git a/net/SSLtelnet/files/patch-ad b/net/SSLtelnet/files/patch-ad
index 042fe53b8524..54344b9f5a6f 100644
--- a/net/SSLtelnet/files/patch-ad
+++ b/net/SSLtelnet/files/patch-ad
@@ -1,66 +1,5 @@
---- lib/libtelnet/sslapp.c.orig Sat Aug 2 13:52:35 1997
-+++ lib/libtelnet/sslapp.c Wed Sep 2 12:53:21 1998
-@@ -31,6 +31,7 @@
- int ssl_cert_required=0;
- int ssl_verbose_flag=0;
- int ssl_disabled_flag=0;
-+int ssl_quiet_flag=0;
- char *ssl_cert_file=NULL;
- char *ssl_key_file=NULL;
- char *ssl_cipher_list=NULL;
-@@ -59,7 +60,7 @@
- * a clean interface for doing things
- */
- if (ssl_debug_flag)
-- BIO_printf(bio_err,"SSL_DEBUG_FLAG on\n");
-+ BIO_printf(bio_err,"SSL_DEBUG_FLAG on\r\n");
-
-
- /* init things so we will get meaningful error messages
-@@ -79,15 +80,18 @@
- if (SSL_CTX_need_tmp_RSA(ssl_ctx)) {
- RSA *rsa;
-
-- BIO_printf(bio_err,"Generating temp (512 bit) RSA key ...\n");
-+ if (!ssl_quiet_flag)
-+ BIO_printf(bio_err,"Generating temp (512 bit) RSA key ...\r\n");
- rsa=RSA_generate_key(512,RSA_F4,NULL);
-- BIO_printf(bio_err,"Generation of temp (512 bit) RSA key done\n");
-+ if (!ssl_quiet_flag)
-+ BIO_printf(bio_err,"Generation of temp (512 bit) RSA key done\r\n");
-
-- if (!SSL_CTX_set_tmp_rsa(ssl_ctx,rsa)) {
-- BIO_printf(bio_err,"Failed to assign generated temp RSA key!\n");
-+ if (!SSL_CTX_set_tmp_rsa(ssl_ctx,rsa) && !ssl_quiet_flag) {
-+ BIO_printf(bio_err,"Failed to assign generated temp RSA key!\r\n");
- }
- RSA_free(rsa);
-- BIO_printf(bio_err,"Assigned temp (512 bit) RSA key\n");
-+ if (!ssl_quiet_flag)
-+ BIO_printf(bio_err,"Assigned temp (512 bit) RSA key\r\n");
- }
- }
-
-@@ -161,14 +165,14 @@
- int ret;
- {
- if (where==SSL_CB_CONNECT_LOOP) {
-- BIO_printf(bio_err,"SSL_connect:%s %s\n",
-+ BIO_printf(bio_err,"SSL_connect:%s %s\r\n",
- SSL_state_string(s),SSL_state_string_long(s));
- } else if (where==SSL_CB_CONNECT_EXIT) {
- if (ret == 0) {
-- BIO_printf(bio_err,"SSL_connect:failed in %s %s\n",
-+ BIO_printf(bio_err,"SSL_connect:failed in %s %s\r\n",
- SSL_state_string(s),SSL_state_string_long(s));
- } else if (ret < 0) {
-- BIO_printf(bio_err,"SSL_connect:error in %s %s\n",
-+ BIO_printf(bio_err,"SSL_connect:error in %s %s\r\n",
- SSL_state_string(s),SSL_state_string_long(s));
- }
- }
---- lib/libtelnet/sslapp.h.orig Sat Aug 2 13:56:21 1997
-+++ lib/libtelnet/sslapp.h Wed Sep 2 12:53:22 1998
+--- lib/libtelnet/sslapp.h.orig Fri Oct 16 21:14:59 1998
++++ lib/libtelnet/sslapp.h Fri Oct 16 21:15:07 1998
@@ -53,6 +53,7 @@
extern int ssl_disabled_flag;
extern int ssl_cert_required;