ports/110858: [net/ztelnet] Make it use termios

[Ed Schouten]

>Number:         110858
>Category:       ports
>Synopsis:       [net/ztelnet] Make it use termios
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 26 15:10:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Ed Schouten
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD palm.hoeg.nl 6.2-STABLE FreeBSD 6.2-STABLE #0: Sun Feb 11 22:32:09 CET 2007 root at palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386
>Description:
The net/ztelnet port makes use of sgtty, while it could make use of
termios, making it work without COMPAT_43TTY.
>How-To-Repeat:
>Fix:
This patch strips down `files/patch-as' to just define POSIX instead of
V7, so it makes use of the termios code.

--- net/ztelnet/files/patch-as	Tue Jun 20 16:27:33 2000
+++ net/ztelnet/files/patch-as	Mon Mar 26 17:01:59 2007
@@ -1,61 +1,13 @@
 diff -uNr --exclude=*.orig work.old/ztelnet/zmodem/rbsb.c work/ztelnet/zmodem/rbsb.c
 --- work.old/ztelnet/zmodem/rbsb.c	Mon Apr 24 23:09:14 1995
 +++ work/ztelnet/zmodem/rbsb.c	Tue Jun 20 22:58:32 2000
-@@ -6,7 +6,7 @@
-  */
+@@ -7,6 +7,9 @@
  
  STATIC char *Copyr = "Copyright 1993 Omen Technology Inc All Rights Reserved";
--
-+#define V7
+ 
++#undef V7
++#define POSIX
++
  #ifdef V7
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -28,8 +28,6 @@
- #define OS "SYS III/V"
- #define MODE2OK
- #include <string.h>
--#include <stdlib.h>
--#include <unistd.h>
- #endif
- 
- #ifdef POSIX
-@@ -41,8 +39,6 @@
- #include <termios.h>
- #define OS "POSIX"
- #include <string.h>
--#include <stdlib.h>
--#include <unistd.h>
- #ifndef READCHECK
- #ifndef FIONREAD
- #define SV
-@@ -70,6 +66,10 @@
- #define sendline(c) net_putchar(c & 0377)
- #define xsendline(c) net_putchar(c)
- 
-+/*----Appended by yongari to shut up compiler---*/
-+STATIC zmputs();
-+/*----------------------------------------------*/
-+
- STATIC char linbuf[HOWMANY];
- STATIC int Lleft=0;		/* number of characters in linbuf */
- STATIC jmp_buf tohere;		/* For the interrupt on RX timeout */
-@@ -84,8 +84,6 @@
- 
- STATIC int Twostop;		/* Use two stop bits */
- 
--/*PMS*/
--STATIC zmputs(char *s);
- 
- /*
-  *  The following uses an external rdchk() routine if available,
-@@ -292,10 +290,8 @@
- STATIC init_rbsb()
- {
-    int i;
--#ifdef LLITOUT
-    Locmode = 0;
-    Locbit = LLITOUT;
--#endif
-    Lleft = 0;
- #ifdef ONEREAD
-    Readnum = 1;	
>Release-Note:
>Audit-Trail:
>Unformatted: