Thu Apr 11 02:21:09 2019 UTC ()
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.


(mrg)
diff -r1.89 -r1.90 pkgsrc/comms/kermit/Makefile
diff -r1.24 -r1.25 pkgsrc/comms/kermit/distinfo
diff -r1.1 -r0 pkgsrc/comms/kermit/patches/patch-ai
diff -r0 -r1.1 pkgsrc/comms/kermit/patches/patch-ckcpro.w
diff -r0 -r1.1 pkgsrc/comms/kermit/patches/patch-ckuus4.c

cvs diff -r1.89 -r1.90 pkgsrc/comms/kermit/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/kermit/Makefile 2016/03/05 11:28:10 1.89
+++ pkgsrc/comms/kermit/Makefile 2019/04/11 02:21:09 1.90
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.89 2016/03/05 11:28:10 jperkin Exp $ 1# $NetBSD: Makefile,v 1.90 2019/04/11 02:21:09 mrg Exp $
2 2
3DISTNAME= cku302 3DISTNAME= cku302
4PKGNAME= kermit-9.0.302 4PKGNAME= kermit-9.0.302
5PKGREVISION= 9 5PKGREVISION= 10
6CATEGORIES= comms 6CATEGORIES= comms
7MASTER_SITES= ftp://ftp.kermitproject.org/kermit/archives/ 7MASTER_SITES= ftp://ftp.kermitproject.org/kermit/archives/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.kermitproject.org/ 10HOMEPAGE= http://www.kermitproject.org/
11COMMENT= Network and serial communication, file transfer, and scripting utility 11COMMENT= Network and serial communication, file transfer, and scripting utility
12 12
13# UNIX C-Kermit 9.0 has been released with the Revised 3-Clause BSD License. 13# UNIX C-Kermit 9.0 has been released with the Revised 3-Clause BSD License.
14# http://www.columbia.edu/kermit/licensing.html 14# http://www.columbia.edu/kermit/licensing.html
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18

cvs diff -r1.24 -r1.25 pkgsrc/comms/kermit/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/kermit/distinfo 2015/11/07 23:20:59 1.24
+++ pkgsrc/comms/kermit/distinfo 2019/04/11 02:21:09 1.25
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.24 2015/11/07 23:20:59 dholland Exp $ 1$NetBSD: distinfo,v 1.25 2019/04/11 02:21:09 mrg Exp $
2 2
3SHA1 (kermit-9.0.302/cku302.tar.gz) = d04c8b5600bc0bb0f163d294881f7a5a0d4395b5 3SHA1 (kermit-9.0.302/cku302.tar.gz) = d04c8b5600bc0bb0f163d294881f7a5a0d4395b5
4RMD160 (kermit-9.0.302/cku302.tar.gz) = ef3a71b5a42868c80408ac09662d00b71da0b0c8 4RMD160 (kermit-9.0.302/cku302.tar.gz) = ef3a71b5a42868c80408ac09662d00b71da0b0c8
5SHA512 (kermit-9.0.302/cku302.tar.gz) = 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa 5SHA512 (kermit-9.0.302/cku302.tar.gz) = 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
6Size (kermit-9.0.302/cku302.tar.gz) = 3122219 bytes 6Size (kermit-9.0.302/cku302.tar.gz) = 3122219 bytes
7SHA1 (patch-aa) = fd3a613ce3cd3755a2e3b8baf33df33593713024 7SHA1 (patch-aa) = fd3a613ce3cd3755a2e3b8baf33df33593713024
8SHA1 (patch-ab) = 2dd97608d57d7b46630bcff7ec234449e8abe472 8SHA1 (patch-ab) = 2dd97608d57d7b46630bcff7ec234449e8abe472
9SHA1 (patch-ac) = 62cc9e92f2413a42312d9f6d168ee85664b6aab9 9SHA1 (patch-ac) = 62cc9e92f2413a42312d9f6d168ee85664b6aab9
10SHA1 (patch-ad) = 414f61c19185e4a82a8326121c2d9dacfba48077 10SHA1 (patch-ad) = 414f61c19185e4a82a8326121c2d9dacfba48077
11SHA1 (patch-ae) = 53384e9cbfe13559d69ab95215a4575f726dc325 11SHA1 (patch-ae) = 53384e9cbfe13559d69ab95215a4575f726dc325
12SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7 12SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7
13SHA1 (patch-ag) = cae37680ea5af85f4d2c774fe230f73a1f0be48c 13SHA1 (patch-ag) = cae37680ea5af85f4d2c774fe230f73a1f0be48c
14SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037 14SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037
15SHA1 (patch-ai) = 975a18c41b7fc031515bda5c4a9c284e80c9d1a4 
16SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82 15SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82
17SHA1 (patch-ak) = 9ded2d7cc3a83158edfbbe87851f892ccb09df0b 16SHA1 (patch-ak) = 9ded2d7cc3a83158edfbbe87851f892ccb09df0b
18SHA1 (patch-al) = 616ad10e65b24a04d24ff2556d6362ef3cc64b78 17SHA1 (patch-al) = 616ad10e65b24a04d24ff2556d6362ef3cc64b78
19SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9 18SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9
 19SHA1 (patch-ckcpro.w) = 247c1d0e0bcec632c4095c10067757cc40fb3831
20SHA1 (patch-ckupty.c) = fd8966627f3642550750ccd42e3add64a36dae09 20SHA1 (patch-ckupty.c) = fd8966627f3642550750ccd42e3add64a36dae09
 21SHA1 (patch-ckuus4.c) = 2204f4c95f8266358b66ac0936ac83ab27bec0c9

File Deleted: pkgsrc/comms/kermit/patches/Attic/patch-ai

File Added: pkgsrc/comms/kermit/patches/patch-ckcpro.w
$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 */

File Added: pkgsrc/comms/kermit/patches/patch-ckuus4.c
$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