head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.46 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.44 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.42 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.40 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.38 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.36 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.34 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.32 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.30 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.28 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.26 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.24 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.22 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.20 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.18 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.16 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.14 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.12 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.10 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.8 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.6 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.4 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.2 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.6.0.70 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.50 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.72 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.68 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.66 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.64 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.62 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.60 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.58 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.56 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.54 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.52 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.48 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.46 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.44 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.42 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.40 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.38 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.36 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.34 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.32 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.30 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.28 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.26 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.24 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.22 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.20 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.18 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.16 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.14 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.12 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.10 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.8 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.6 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.2 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.5.0.50 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.48 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.46 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.44 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.42 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.40 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.38 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.36 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.34 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.32 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.30 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.28 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.26 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.24 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.22 pkgsrc-2008Q1:1.5.0.20 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.18 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.16 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.14 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.12 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.10 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.8 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.6 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.4 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.2 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 buildlink2-base:1.4 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.3; locks; strict; comment @# @; 1.8 date 2020.07.30.03.03.07; author gutteridge; state Exp; branches; next 1.7; commitid U2R6rHpmy5nQd3iC; 1.7 date 2020.07.30.00.02.10; author gutteridge; state Exp; branches; next 1.6; commitid PQpQOdqnnenJc2iC; 1.6 date 2011.08.25.13.46.28; author hans; state Exp; branches; next 1.5; 1.5 date 2005.12.18.23.15.43; author joerg; state Exp; branches; next 1.4; 1.4 date 99.12.20.12.33.49; author fredb; state dead; branches; next 1.3; 1.3 date 98.08.07.10.36.40; author agc; state Exp; branches; next 1.2; 1.2 date 98.06.20.20.58.43; author tron; state Exp; branches; next 1.1; 1.1 date 98.06.19.21.17.21; author tron; state Exp; branches; next ; desc @@ 1.8 log @kermit: add a more detailed patch comment @ text @$NetBSD: patch-ae,v 1.7 2020/07/30 00:02:10 gutteridge Exp $ Portability fixes for DragonFly, SunOS, and Linux. The Linux fix is taken from upstream's 9.0.305 Alpha.01 release, and is noted to be a temporary workaround, so it may change in form in a pending release. --- ckucmd.c.orig 2011-07-14 12:14:37.000000000 +0000 +++ ckucmd.c @@@@ -7370,7 +7370,11 @@@@ cmdconchk() { /* Here we must look inside the stdin buffer - highly platform dependent */ -#ifdef _IO_file_flags /* Linux */ +#ifdef __FILE_defined /* glibc 2.28 1 Aug 2018 */ + x = (int) ((stdin->_IO_read_end) - (stdin->_IO_read_ptr)); + debug(F101,"cmdconchk __FILE_defined","",x); +#else /* __FILE_defined */ +#ifdef _IO_file_flags /* Linux (glibc 2.28 removed this symbol */ x = (int) ((stdin->_IO_read_end) - (stdin->_IO_read_ptr)); debug(F101,"cmdconchk _IO_file_flags","",x); #else /* _IO_file_flags */ @@@@ -7382,8 +7386,19 @@@@ cmdconchk() { #ifdef NOARROWKEYS debug(F101,"cmdconchk NOARROWKEYS x","",0); #else +#if defined(__sun) && (defined(__amd64) || defined(__sparcv9)) + struct sun_64_FILE { + unsigned char *_ptr; /* next character from/to here in buffer */ + unsigned char *_base; /* the buffer */ + unsigned char *_end; /* the end of the buffer */ + ssize_t _cnt; /* number of available characters in buffer */ + } *sun_64_stdin = (struct sun_64_FILE *)stdin; + debug(F101,"cmdconchk sun_64_stdin->_cnt","",sun_64_stdin->_cnt); + x = sun_64_stdin->_cnt; +#else debug(F101,"cmdconchk stdin->_cnt","",stdin->_cnt); x = stdin->_cnt; +#endif #endif /* NOARROWKEYS */ #endif /* VMS */ if (x == 0) x = conchk(); @@@@ -7395,7 +7410,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(); @@@@ -7407,6 +7427,7 @@@@ cmdconchk() { #endif /* USE_FILE__CNT */ #endif /* USE_FILE_CNT */ #endif /* _IO_file_flags */ +#endif /* __FILE_defined */ #endif /* CMD_CONINC */ #endif /* OS2 */ return(x + y); @ 1.7 log @kermit: fix compilation on Linux with glibc >= 2.28 Fix taken from the upstream project's 9.0.305 Alpha.01 release, noted to be a temporary workaround. (Separately, from how I read the change log, there has been no stable 9.0 release since 9.0.302.) Tested on Debian 9.13 (which has an older version of glibc which wouldn't reproduce the issue) and Fedora 31 & 32. (This issue was reported on pkgsrc-users back in July 2019 by Pierre Dupond, and I'd provided a workaround for it in that email chain, but I'd never actually committed anything to pkgsrc.) @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.6 2011/08/25 13:46:28 hans Exp $ d5 4 @ 1.6 log @FILE is a opaque data type on 64bit SunOS, its true definition is not available in any headers. Hack around this by adding the definition from the Illumos source in the relevant place. Fixes 64bit build. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.5 2005/12/18 23:15:43 joerg Exp $ d3 3 a5 1 --- ckucmd.c.orig 2005-12-18 22:57:18.000000000 +0000 d7 14 a20 1 @@@@ -7115,8 +7115,19 @@@@ cmdconchk() { d40 1 a40 1 @@@@ -7128,7 +7128,12 @@@@ cmdconchk() { d54 8 @ 1.5 log @Add read-ahead hack for DragonFly, manually casting to the "public" version of FILE. Kids, don't try that at home. Fix errno. @ text @d1 1 a1 1 $NetBSD$ d5 20 @ 1.4 log @Update kermit to 7.0.96.beta11. Numerous changes, too many to list, but here's a couple: - - kermit protocol transfers default to "fast" mode - - support for SOCKS and sun X.25 (both untested) @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 1998/08/07 10:36:40 agc Exp $ d3 16 a18 12 --- ckufio.c.orig Mon Nov 25 01:20:49 1996 +++ ckufio.c Sat Jun 20 22:37:35 1998 @@@@ -2743,7 +2743,8 @@@@ /* and this should have been declared always through a header file */ #endif /* OS2 */ - long tmx, days; + time_t tmx; + long days; int i, n, isleapyear; /* J F M A M J J A S O N D */ /* 31 28 31 30 31 30 31 31 30 31 30 31 */ @ 1.3 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Really fix the code for 64 bit architectures instead of only making the compiler happy. Problem pointed out by Klaus Klein. @ text @d1 2 @ 1.1 log @Make "kermit" 64bit clean using patches supplied by Tim Rightnour in PR pkg/5609. @ text @d1 12 a12 18 --- ckufio.c.orig Thu Jun 18 05:15:10 1998 +++ ckufio.c Thu Jun 18 05:19:26 1998 @@@@ -2961,6 +2961,14 @@@@ } +#ifdef __NetBSD__ + time_stamp = localtime((time_t *)&tmx); +#else time_stamp = localtime(&tmx); +#endif if (!time_stamp) return(-1); +#ifdef __NetBSD__ + if (localtime((time_t *)&tmx)->tm_isdst) +#else if (localtime(&tmx)->tm_isdst) +#endif tmx -= 60L * 60L; /* Adjust for daylight savings time */ @