From 2cc8437f18af39147526abb34930ea34ca879dfc Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 18 Dec 2005 23:15:43 +0000 Subject: Add read-ahead hack for DragonFly, manually casting to the "public" version of FILE. Kids, don't try that at home. Fix errno. --- comms/kermit/distinfo | 10 ++++++++-- comms/kermit/patches/patch-ab | 12 +++++++----- comms/kermit/patches/patch-ac | 12 ++++++++++++ comms/kermit/patches/patch-ad | 14 ++++++++++++++ comms/kermit/patches/patch-ae | 18 ++++++++++++++++++ comms/kermit/patches/patch-af | 13 +++++++++++++ comms/kermit/patches/patch-ag | 16 ++++++++++++++++ comms/kermit/patches/patch-ah | 14 ++++++++++++++ 8 files changed, 102 insertions(+), 7 deletions(-) create mode 100644 comms/kermit/patches/patch-ac create mode 100644 comms/kermit/patches/patch-ad create mode 100644 comms/kermit/patches/patch-ae create mode 100644 comms/kermit/patches/patch-af create mode 100644 comms/kermit/patches/patch-ag create mode 100644 comms/kermit/patches/patch-ah (limited to 'comms/kermit') diff --git a/comms/kermit/distinfo b/comms/kermit/distinfo index df2405e5d94..a5f04bf5567 100644 --- a/comms/kermit/distinfo +++ b/comms/kermit/distinfo @@ -1,7 +1,13 @@ -$NetBSD: distinfo,v 1.12 2005/02/23 16:05:30 agc Exp $ +$NetBSD: distinfo,v 1.13 2005/12/18 23:15:43 joerg Exp $ SHA1 (kermit-8.0.211/cku211.tar.gz) = cd5e0524d27fea0275a0938da2a5fc115e0978b8 RMD160 (kermit-8.0.211/cku211.tar.gz) = c80de6eeec3b4d87a09946a4d440da3b4faaa3b2 Size (kermit-8.0.211/cku211.tar.gz) = 2878523 bytes SHA1 (patch-aa) = 376dc03cc9f75322f2fda308b268c70a13ebba8a -SHA1 (patch-ab) = 24032ad61815ce88e8638d0bbcdaf86175b9715b +SHA1 (patch-ab) = 7e874c4d7d6febe4c6694134879fe0008f6e9c8f +SHA1 (patch-ac) = 01e7ab07fcebd971672488221efa4d987c4ebf3e +SHA1 (patch-ad) = 8f6073b0e68cf3191ffba6d818a87ab3f3095ea4 +SHA1 (patch-ae) = 751ef97b601f3ef408023c2390acfd3ab6c4b532 +SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7 +SHA1 (patch-ag) = 5eff93d977bff114d2d193b6d069264388ebc997 +SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037 diff --git a/comms/kermit/patches/patch-ab b/comms/kermit/patches/patch-ab index 8c6fb7eb747..86a7e5936c2 100644 --- a/comms/kermit/patches/patch-ab +++ b/comms/kermit/patches/patch-ab @@ -1,19 +1,21 @@ -$NetBSD: patch-ab,v 1.4 2003/07/02 20:37:35 kim Exp $ +$NetBSD: patch-ab,v 1.5 2005/12/18 23:15:43 joerg Exp $ ---- ck_ssl.c.orig 2003-03-14 09:37:28.000000000 -0500 -+++ ck_ssl.c 2003-07-02 15:43:07.000000000 -0400 -@@ -2728,6 +2728,7 @@ +--- ck_ssl.c.orig 2004-03-14 17:07:55.000000000 +0000 ++++ ck_ssl.c +@@ -2782,6 +2782,8 @@ show_hostname_warning(char *s1, char *s2 #ifndef HPUX1100 #ifndef SCO_OSR505 #ifndef OpenBSD +#ifndef __NetBSD__ ++#ifndef __DragonFly__ #ifndef FREEBSD4 #ifndef LINUX #ifndef AIX41 -@@ -2764,6 +2765,7 @@ +@@ -2818,6 +2820,8 @@ inet_aton(char * ipaddress, struct in_ad #endif /* AIX41 */ #endif /* LINUX */ #endif /* FREEBSD4 */ ++#endif /* __DragonFly__ */ +#endif /* __NetBSD__ */ #endif /* OpenBSD */ #endif /* SCO_OSR505 */ diff --git a/comms/kermit/patches/patch-ac b/comms/kermit/patches/patch-ac new file mode 100644 index 00000000000..cdabfe8cbe5 --- /dev/null +++ b/comms/kermit/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.8 2005/12/18 23:15:43 joerg Exp $ + +--- ckcdeb.h.orig 2005-12-18 22:51:39.000000000 +0000 ++++ ckcdeb.h +@@ -4481,7 +4481,6 @@ extern int errno; + The following declaration would cause problems for VMS and OS/2, in which + errno is an "extern volatile int noshare"... + */ +- extern int errno; /* Needed by most modules. */ + #endif /* __GLIBC__ */ + #endif /* OS2 */ + #endif /* VMS */ diff --git a/comms/kermit/patches/patch-ad b/comms/kermit/patches/patch-ad new file mode 100644 index 00000000000..c408024aa7a --- /dev/null +++ b/comms/kermit/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.8 2005/12/18 23:15:43 joerg Exp $ + +--- ckcasc.h.orig 2005-12-18 22:55:40.000000000 +0000 ++++ ckcasc.h +@@ -42,7 +42,9 @@ + #define SYN 22 /* SYN, Ctrl-V */ + #define ETB 23 /* Ctrl-W */ + #define CAN 24 /* CAN, Ctrl-X */ ++#if 0 /* OpenSSL conflict */ + #define EM 25 /* Ctrl-Y */ ++#endif + #define SUB 26 /* SUB Ctrl-Z */ + #define ESC 27 /* Escape Ctrl-[ */ + #define XFS 28 /* Field Separator, Ctrl-Backslash */ diff --git a/comms/kermit/patches/patch-ae b/comms/kermit/patches/patch-ae new file mode 100644 index 00000000000..dad5b49f79d --- /dev/null +++ b/comms/kermit/patches/patch-ae @@ -0,0 +1,18 @@ +$NetBSD: patch-ae,v 1.5 2005/12/18 23:15:43 joerg Exp $ + +--- ckucmd.c.orig 2005-12-18 22:57:18.000000000 +0000 ++++ ckucmd.c +@@ -7128,7 +7128,12 @@ cmdconchk() { + if (x == 0) x = conchk(); + if (x < 0) x = 0; + #else /* USE_FILE_CNT */ +-#ifdef USE_FILE_R /* FreeBSD, OpenBSD, etc */ ++#if defined(__DragonFly__) && defined(feof_unlocked) ++ debug(F101,"cmdconchk stdin->_r","",((struct __FILE_public *)stdin)->_r); ++ x = ((struct __FILE_public *)stdin)->_r; ++ if (x == 0) x = conchk(); ++ if (x < 0) x = 0; ++#elif defined(USE_FILE_R) /* FreeBSD, OpenBSD, etc */ + debug(F101,"cmdconchk stdin->_r","",stdin->_r); + x = stdin->_r; + if (x == 0) x = conchk(); diff --git a/comms/kermit/patches/patch-af b/comms/kermit/patches/patch-af new file mode 100644 index 00000000000..6547c595be7 --- /dev/null +++ b/comms/kermit/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2005/12/18 23:15:43 joerg Exp $ + +--- ckuusr.c.orig 2005-12-18 23:04:34.000000000 +0000 ++++ ckuusr.c +@@ -87,6 +87,8 @@ char *userv = "User Interface 8.0.278, 1 + #define MULTINET_OLD_STYLE /* Leave select prototype undefined */ + #endif /* MULTINET */ + ++#include ++ + #include "ckcdeb.h" + #include "ckcasc.h" + #include "ckcker.h" diff --git a/comms/kermit/patches/patch-ag b/comms/kermit/patches/patch-ag new file mode 100644 index 00000000000..6fa62bb88dd --- /dev/null +++ b/comms/kermit/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.1 2005/12/18 23:15:43 joerg Exp $ + +--- ckuus6.c.orig 2005-12-18 23:06:04.000000000 +0000 ++++ ckuus6.c +@@ -26,11 +26,7 @@ + #include "ckcnet.h" /* Network symbols */ + #include + +-#ifdef VMS +-#ifndef TCPSOCKET + #include +-#endif /* TCPSOCKET */ +-#endif /* VMS */ + + #ifdef datageneral + #define fgets(stringbuf,max,fd) dg_fgets(stringbuf,max,fd) diff --git a/comms/kermit/patches/patch-ah b/comms/kermit/patches/patch-ah new file mode 100644 index 00000000000..906ee4ab097 --- /dev/null +++ b/comms/kermit/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.1 2005/12/18 23:15:43 joerg Exp $ + +--- ckcfns.c.orig 2005-12-18 23:06:48.000000000 +0000 ++++ ckcfns.c +@@ -93,9 +93,7 @@ _PROTOTYP( long zfsize, (char *) ); + #endif /* OS2ONLY */ + #endif /* OS2 */ + +-#ifdef VMS + #include +-#endif /* VMS */ + + /* Externals from ckcmai.c */ + -- cgit v1.2.3