CVS commit: pkgsrc/comms/kermit

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Thu Apr 11 02:21:09 UTC 2019

Modified Files:
        pkgsrc/comms/kermit: Makefile distinfo
Added Files:
        pkgsrc/comms/kermit/patches: patch-ckcpro.w patch-ckuus4.c
Removed Files:
        pkgsrc/comms/kermit/patches: patch-ai

Log Message:
fix the build on arm64:  several variables were 'extern'd as the
wrong size, and the linker complained about ckcpro's 'dest' (which
was int vs long.)

i bumped the package version since it actually fixes real bugs on
big endian 64 bit platforms, and maybe bugs on other 64 bit.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/comms/kermit/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/comms/kermit/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/comms/kermit/patches/patch-ai
cvs rdiff -u -r0 -r1.1 pkgsrc/comms/kermit/patches/patch-ckcpro.w \
    pkgsrc/comms/kermit/patches/patch-ckuus4.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/kermit/Makefile
diff -u pkgsrc/comms/kermit/Makefile:1.89 pkgsrc/comms/kermit/Makefile:1.90
--- pkgsrc/comms/kermit/Makefile:1.89   Sat Mar  5 11:28:10 2016
+++ pkgsrc/comms/kermit/Makefile        Thu Apr 11 02:21:09 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2016/03/05 11:28:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.90 2019/04/11 02:21:09 mrg Exp $
 
 DISTNAME=      cku302
 PKGNAME=       kermit-9.0.302
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    comms
 MASTER_SITES=  ftp://ftp.kermitproject.org/kermit/archives/
 

Index: pkgsrc/comms/kermit/distinfo
diff -u pkgsrc/comms/kermit/distinfo:1.24 pkgsrc/comms/kermit/distinfo:1.25
--- pkgsrc/comms/kermit/distinfo:1.24   Sat Nov  7 23:20:59 2015
+++ pkgsrc/comms/kermit/distinfo        Thu Apr 11 02:21:09 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2015/11/07 23:20:59 dholland Exp $
+$NetBSD: distinfo,v 1.25 2019/04/11 02:21:09 mrg Exp $
 
 SHA1 (kermit-9.0.302/cku302.tar.gz) = d04c8b5600bc0bb0f163d294881f7a5a0d4395b5
 RMD160 (kermit-9.0.302/cku302.tar.gz) = ef3a71b5a42868c80408ac09662d00b71da0b0c8
@@ -12,9 +12,10 @@ SHA1 (patch-ae) = 53384e9cbfe13559d69ab9
 SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7
 SHA1 (patch-ag) = cae37680ea5af85f4d2c774fe230f73a1f0be48c
 SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037
-SHA1 (patch-ai) = 975a18c41b7fc031515bda5c4a9c284e80c9d1a4
 SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82
 SHA1 (patch-ak) = 9ded2d7cc3a83158edfbbe87851f892ccb09df0b
 SHA1 (patch-al) = 616ad10e65b24a04d24ff2556d6362ef3cc64b78
 SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9
+SHA1 (patch-ckcpro.w) = 247c1d0e0bcec632c4095c10067757cc40fb3831
 SHA1 (patch-ckupty.c) = fd8966627f3642550750ccd42e3add64a36dae09
+SHA1 (patch-ckuus4.c) = 2204f4c95f8266358b66ac0936ac83ab27bec0c9

Added files:

Index: pkgsrc/comms/kermit/patches/patch-ckcpro.w
diff -u /dev/null pkgsrc/comms/kermit/patches/patch-ckcpro.w:1.1
--- /dev/null   Thu Apr 11 02:21:09 2019
+++ pkgsrc/comms/kermit/patches/patch-ckcpro.w  Thu Apr 11 02:21:09 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-ckcpro.w,v 1.1 2019/04/11 02:21:09 mrg Exp $
+
+dest is an int.
+ffc and calibrate are CK_OFF_Ts.
+
+--- ckcpro.w.orig      2011-06-07 11:39:21.000000000 -0700
++++ ckcpro.w   2019-04-10 19:15:37.736900735 -0700
+@@ -151,8 +151,9 @@
+   extern int quiet, tsecs, parity, backgrd, nakstate, atcapu, wslotn, winlo;
+   extern int wslots, success, xitsta, rprintf, discard, cdtimo, keep, fdispla;
+   extern int timef, stdinf, rscapu, sendmode, epktflg, epktrcvd, epktsent;
+-  extern int binary, fncnv;
+-  extern long speed, ffc, crc16, calibrate, dest;
++  extern int binary, fncnv, dest;
++  extern CK_OFF_T ffc, calibrate;
++  extern long speed, crc16;
+ #ifdef COMMENT
+   extern char *TYPCMD, *DIRCMD, *DIRCM2;
+ #endif /* COMMENT */
Index: pkgsrc/comms/kermit/patches/patch-ckuus4.c
diff -u /dev/null pkgsrc/comms/kermit/patches/patch-ckuus4.c:1.1
--- /dev/null   Thu Apr 11 02:21:09 2019
+++ pkgsrc/comms/kermit/patches/patch-ckuus4.c  Thu Apr 11 02:21:09 2019
@@ -0,0 +1,29 @@
+$NetBSD: patch-ckuus4.c,v 1.1 2019/04/11 02:21:09 mrg Exp $
+
+Always include errno.h.
+crc16 is a long.
+
+--- ckuus4.c.orig      2011-06-24 11:58:10.000000000 -0700
++++ ckuus4.c   2019-04-10 18:25:09.650654615 -0700
+@@ -34,8 +34,9 @@
+ #include "ck_ssl.h"
+ #endif /* CK_SSL */
+ 
++#include <errno.h>
++
+ #ifdef VMS
+-#include <errno.h>                      /* For \v(errno) */
+ extern char * ckvmserrstr(unsigned long);
+ #ifndef OLD_VMS
+ #include <lib$routines.h>               /* Not for VAX C 2.4 */
+@@ -409,7 +410,9 @@
+   npad, pkttim, bigrbsiz, bigsbsiz, keep, atcapr, autopar, bctr, bctu,
+   crunched, ckdelay, ebq, ebqflg, pktlog, retrans, rpackets, rptflg, rptq,
+   rtimo, spackets, spsiz, spsizf, spsizr, timeouts, fncact, fncnv, urpsiz,
+-  wmax, wslotn, wslotr, fdispla, spmax, fnrpath, fnspath, crc16;
++  wmax, wslotn, wslotr, fdispla, spmax, fnrpath, fnspath;
++extern long
++  crc16;
+ #endif /* NOXFER */
+ 
+ #ifdef OS2