* return -1 by int rather than char

* md5 -> distinfo
* sensible patch names
This commit is contained in:
naddy 2002-02-20 21:46:48 +00:00
parent c05ee76980
commit 1808021952
10 changed files with 105 additions and 34 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.15 2001/10/28 13:05:45 espie Exp $
# $OpenBSD: Makefile,v 1.16 2002/02/20 21:46:48 naddy Exp $
COMMENT= "communication package for X11"
DISTNAME= Seyon-2.14b
PKGNAME= seyon-2.14b
CATEGORIES= comms x11
NEED_VERSION= 1.406
NEED_VERSION= 1.504
MASTER_SITES= ftp://sipb.mit.edu/pub/seyon/
EXTRACT_SUFX= -tar.Z

View File

@ -1,6 +1,7 @@
--- Imakefile.orig Sat Mar 27 16:20:12 1993
+++ Imakefile Mon Nov 29 16:29:36 1999
@@ -46,13 +46,6 @@
$OpenBSD: patch-Imakefile,v 1.1 2002/02/20 21:46:49 naddy Exp $
--- Imakefile.orig Sat Mar 27 22:20:12 1993
+++ Imakefile Wed Feb 20 22:31:21 2002
@@ -46,13 +46,6 @@ InstallAppDefaults(Seyon)
InstallAppDefaultsLong(Seyon-co,Seyon-color)
InstallNonExecFile(seyon.help,$(LIBDIR))

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-SeDecl_h,v 1.1 2002/02/20 21:46:49 naddy Exp $
--- SeDecl.h.orig Fri Apr 23 12:09:50 1993
+++ SeDecl.h Wed Feb 20 22:31:21 2002
@@ -23,8 +23,6 @@ extern char *str_strip_lead_end_space
*expand_fname(),
itoa(),
*mport(),
- MdmReadChar(),
- TermReadChar(),
read_seyon_file();
extern long mbaud();
extern int open_modem(),
@@ -40,9 +38,11 @@ extern int open_modem(),
dial_number(),
redial(),
readbyte(),
+ usleep(),
CloseModem(),
OpenModem(),
+ MdmReadChar(),
MdmSetGetBaud(),
MdmSetGetCSize(),
MdmSetGetParity(),
@@ -50,13 +50,13 @@ extern int open_modem(),
MdmSetGetIStrip(),
MdmSaveRestoreAttr(),
Online(),
+ TermReadChar(),
SuspContTerminal(),
get_modem_fio();
extern FILE *open_file(),
*open_file_va();
extern void send_break(),
- usleep(),
show(),
showf(),
SeyonMessage(),

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-SeGeneric_c,v 1.1 2002/02/20 21:46:49 naddy Exp $
--- SeGeneric.c.orig Wed Feb 20 22:26:53 2002
+++ SeGeneric.c Wed Feb 20 22:27:07 2002
@@ -179,7 +179,7 @@ TtyTimedReadChar(fd, readChar, expireTim
* TtyReadChar: reads one character from the tty.
*/
-char
+int
TtyReadChar(fd, readChar)
int fd;
char *readChar;

View File

@ -1,6 +1,18 @@
--- SePort.c.orig Thu Oct 21 16:56:56 1999
+++ SePort.c Thu Oct 21 16:54:00 1999
@@ -627,19 +627,25 @@
$OpenBSD: patch-SePort_c,v 1.1 2002/02/20 21:46:49 naddy Exp $
--- SePort.c.orig Wed Apr 21 15:38:31 1993
+++ SePort.c Wed Feb 20 22:31:21 2002
@@ -56,8 +56,8 @@
#define MAX_INPUT _POSIX_MAX_INPUT
#endif
-extern char TtyReadChar();
-extern int TtyReadStr(),
+extern int TtyReadChar(),
+ TtyReadStr(),
TtyTimedReadChar(),
TtyReadLine(),
TtyTimedWaitFor(),
@@ -627,19 +627,25 @@ mbaud(s)
#endif
break;
#if USE_NONSTD_BAUD
@ -28,7 +40,7 @@
default:
return (-1);
}
@@ -691,6 +697,14 @@
@@ -691,6 +697,14 @@ mbaud(s)
#endif
#endif
return 38400;
@ -43,7 +55,16 @@
}
SeError("Consistency error in baud rate");
@@ -997,6 +1011,7 @@
@@ -865,7 +879,7 @@ MdmReadStr(buf)
* MdmReadChar: reads one character from the modem.
*/
-char
+int
MdmReadChar(readChar)
char *readChar;
{
@@ -997,6 +1011,7 @@ lock_tty()
pid_t pid,
lckpid;
char *modemname;
@ -51,7 +72,7 @@
#if LF_USE_ASCII_PID
char pidstr[20],
lckpidstr[20];
@@ -1063,11 +1078,13 @@
@@ -1063,11 +1078,13 @@ relink:
#endif
lockPid = (pid_t) lckpid;

View File

@ -1,6 +1,7 @@
--- SeSubs.c.orig Fri Apr 23 06:24:17 1993
+++ SeSubs.c Thu Oct 21 16:53:17 1999
@@ -249,6 +249,8 @@
$OpenBSD: patch-SeSubs_c,v 1.1 2002/02/20 21:46:49 naddy Exp $
--- SeSubs.c.orig Fri Apr 23 12:24:17 1993
+++ SeSubs.c Wed Feb 20 22:31:21 2002
@@ -249,6 +249,8 @@ ExecShellCommand(command, top)
if (setuid(getuid()) < 0)
SePError("Failed to set effective uid");

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-SeTerm_c,v 1.1 2002/02/20 21:46:49 naddy Exp $
--- SeTerm.c.orig Wed Feb 20 22:27:03 2002
+++ SeTerm.c Wed Feb 20 22:28:29 2002
@@ -25,8 +25,8 @@
#include "seyon.h"
#include "SeDecl.h"
-extern char TtyReadChar();
-extern int MdmReadStr();
+extern int TtyReadChar(),
+ MdmReadStr();
extern FILE *tfp, /* terminal pointer */
*cfp; /* capture file pointer */

View File

@ -1,18 +0,0 @@
--- SeDecl.h.orig Fri Apr 23 06:09:50 1993
+++ SeDecl.h Thu Oct 21 16:54:11 1999
@@ -40,6 +40,7 @@
dial_number(),
redial(),
readbyte(),
+ usleep(),
CloseModem(),
OpenModem(),
@@ -56,7 +57,6 @@
extern FILE *open_file(),
*open_file_va();
extern void send_break(),
- usleep(),
show(),
showf(),
SeyonMessage(),

View File

@ -1,5 +1,6 @@
--- config.h.orig Wed Apr 21 08:47:48 1993
+++ config.h Thu Oct 21 17:00:34 1999
$OpenBSD: patch-config_h,v 1.1 2002/02/20 21:46:49 naddy Exp $
--- config.h.orig Wed Apr 21 14:47:48 1993
+++ config.h Wed Feb 20 22:31:21 2002
@@ -81,6 +81,14 @@
#define HAVE_USLEEP YES
#endif