kermit: Adapt to new release

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: kermit: Adapt to new release
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Sun, 04 Oct 2020 22:57:07 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Oct 4 22:57:07 2020 +0000
Changeset:	da82b8a238dc3bd3f60c9a3f52dc205d2080749b

Modified Files:
	kermit/PLIST
	kermit/distinfo
	kermit/patches/patch-aa
	kermit/patches/patch-ab
Added Files:
	kermit/patches-dont/patch-ae
	kermit/patches-dont/patch-ckcpro.w
Removed Files:
	kermit/patches/patch-ae
	kermit/patches/patch-ckcftp.c
	kermit/patches/patch-ckcpro.w

Log Message:
kermit: Adapt to new release

Merge patches.  Adjust PLIST.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=da82b8a238dc3bd3f60c9a3f52dc205d2080749b

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

diffstat:
 kermit/PLIST                       |  12 +---
 kermit/distinfo                    |   7 +-
 kermit/patches-dont/patch-ae       |  65 ++++++++++++++++++
 kermit/patches-dont/patch-ckcpro.w |  19 ++++++
 kermit/patches/patch-aa            |  30 ++++++---
 kermit/patches/patch-ab            | 135 +++++++++++--------------------------
 kermit/patches/patch-ae            |  65 ------------------
 kermit/patches/patch-ckcftp.c      |  31 ---------
 kermit/patches/patch-ckcpro.w      |  19 ------
 9 files changed, 147 insertions(+), 236 deletions(-)

diffs:
diff --git a/kermit/PLIST b/kermit/PLIST
index ed1d6575df..fb63794053 100644
--- a/kermit/PLIST
+++ b/kermit/PLIST
@@ -1,14 +1,4 @@
 @comment $NetBSD: PLIST,v 1.9 2011/08/25 14:54:06 hans Exp $
 bin/kermit
 man/man1/kermit.1
-share/doc/kermit/ckaaaa.txt
-share/doc/kermit/ckc302.txt
-share/doc/kermit/ckcbwr.txt
-share/doc/kermit/ckccfg.txt
-share/doc/kermit/ckcplm.txt
-share/doc/kermit/ckermit70.txt
-share/doc/kermit/ckermit80.txt
-share/doc/kermit/ckermit90.txt
-share/doc/kermit/ckubwr.txt
-share/doc/kermit/ckuins.txt
-share/doc/kermit/ckututor.txt
+share/doc/kermit/android.txt
diff --git a/kermit/distinfo b/kermit/distinfo
index c00b7b4e61..d781113ff7 100644
--- a/kermit/distinfo
+++ b/kermit/distinfo
@@ -4,11 +4,10 @@ SHA1 (kermit-9.0.305a2/ckucku305-alpha02.tar.gz) = 90a3cdc9d5112d752a8637b6a76f6
 RMD160 (kermit-9.0.305a2/ckucku305-alpha02.tar.gz) = 4cd3cc02f6f5367b158f2fabc910e3ab7ffcee6a
 SHA512 (kermit-9.0.305a2/ckucku305-alpha02.tar.gz) = 017c742d53fa847b844554ce46708a32bee76af2efb092c3149b92f9ef50e0aa03ce52ffe99fc46ebfb7eeda1f4660b9f936d92c48625eda92369496070dd3a1
 Size (kermit-9.0.305a2/ckucku305-alpha02.tar.gz) = 2545990 bytes
-SHA1 (patch-aa) = fd3a613ce3cd3755a2e3b8baf33df33593713024
-SHA1 (patch-ab) = 280bfca4d44630bc9ec4a9331b650b81c7f80774
+SHA1 (patch-aa) = 67754adea3116a8bab45870adbb8166d8cbac32f
+SHA1 (patch-ab) = ad074be2191f907ce7d8069e4b128c64c1a3ef1e
 SHA1 (patch-ac) = 62cc9e92f2413a42312d9f6d168ee85664b6aab9
 SHA1 (patch-ad) = 414f61c19185e4a82a8326121c2d9dacfba48077
-SHA1 (patch-ae) = 3cd335d719933fce95c2f5b05e9959d0d1ca06e0
 SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7
 SHA1 (patch-ag) = cae37680ea5af85f4d2c774fe230f73a1f0be48c
 SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037
@@ -16,8 +15,6 @@ SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82
 SHA1 (patch-ak) = 983583d79abc4fcee1b7e9bf8ae46f184aa7011d
 SHA1 (patch-al) = 616ad10e65b24a04d24ff2556d6362ef3cc64b78
 SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9
-SHA1 (patch-ckcftp.c) = 1af977dce79f61c43619186c6a5d2032d7a9a6bd
-SHA1 (patch-ckcpro.w) = 247c1d0e0bcec632c4095c10067757cc40fb3831
 SHA1 (patch-ckupty.c) = fd8966627f3642550750ccd42e3add64a36dae09
 SHA1 (patch-ckuus3.c) = 557e938b36931f7948783116d1c5c2224d51bcbb
 SHA1 (patch-ckuus4.c) = 2204f4c95f8266358b66ac0936ac83ab27bec0c9
diff --git a/kermit/patches-dont/patch-ae b/kermit/patches-dont/patch-ae
new file mode 100644
index 0000000000..db3302538d
--- /dev/null
+++ b/kermit/patches-dont/patch-ae
@@ -0,0 +1,65 @@
+$NetBSD: patch-ae,v 1.8 2020/07/30 03:03:07 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);
diff --git a/kermit/patches-dont/patch-ckcpro.w b/kermit/patches-dont/patch-ckcpro.w
new file mode 100644
index 0000000000..0b801fdb5b
--- /dev/null
+++ b/kermit/patches-dont/patch-ckcpro.w
@@ -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 */
diff --git a/kermit/patches/patch-aa b/kermit/patches/patch-aa
index f19baa30d7..e09a3e1474 100644
--- a/kermit/patches/patch-aa
+++ b/kermit/patches/patch-aa
@@ -8,9 +8,9 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
   curses include and library pathes coming from BUILDLINK_*FLAGS).
 
 
---- makefile.orig	2011-08-21 15:12:07.000000000 +0000
+--- makefile.orig	2020-09-19 20:17:04.000000000 +0000
 +++ makefile
-@@ -824,12 +824,12 @@ manroot = $(prefix)
+@@ -827,12 +827,12 @@ manroot = $(prefix)
  
  K4LIB=-L/usr/kerberos/lib
  K4INC=-I/usr/kerberos/include
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  
  # To override these assignments; for example, if your OpenSSL files are
  # not in /usr/local/ssl, invoke the desired target like this:
-@@ -1869,7 +1869,7 @@ netbsd+krb5:
+@@ -1878,7 +1878,7 @@ netbsd+krb5:
  	-DCK_CAST $$HAVE_DES -DNOFTP_GSSAPI $(K5INC) $(K5INC)/krb5 \
  	$(KFLAGS)" \
  	"LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lcurses $$DES_LIB \
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  
  # NetBSD - With Kerberos 5 and SSL and Zlib.
  # OK: 2011/08/21 on 5.1 with MIT Kerberos.
-@@ -1896,7 +1896,7 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib
+@@ -1905,7 +1905,7 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib
  	-DCK_SSL -DCK_PAM -DZLIB -DNO_DCL_INET_ATON $$OPENSSLOPTION \
  	$(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \
  	"LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lssl $$DES_LIB \
@@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  
  #Special Security Enhanced NetBSD target with SRP, SSL, and zlib support.
  #To build this, you need to BUILD the pkgsrc srp_client package.  After
-@@ -3544,7 +3544,7 @@ solaris2xg+openssl+zlib+pam+shadow:
+@@ -3553,7 +3553,7 @@ solaris2xg+openssl+zlib+pam+shadow:
  	-DCK_AUTHENTICATION -DCK_SSL -DCK_PAM -DCK_SHADOW  -DZLIB \
  	-DBIGBUFOK $(SSLINC) $(KFLAGS)" \
  	"LIBS= $(SSLLIB) -ltermlib \
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  
  #Ditto but with GCC 3.1 in which you have to specify 32-bit with -m32.
  #In Solaris 9 (and maybe 8) you'll also need specifiy the Library path.
-@@ -3899,7 +3899,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s
+@@ -3908,7 +3908,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s
  	-DCK_CURSES -DCK_NEWTERM -DDIRENT -DHDBUUCP -DTCPSOCKET  -DBIGBUFOK \
  	-DCK_AUTHENTICATION -DCK_SSL -DZLIB -DCK_KERBEROS -DKRB5 \
  	-DCK_ENCRYPTION -DCK_CAST $$OPENSSLOPTION \
@@ -63,25 +63,35 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  	"LIBS= $(SSLLIB) $(K5LIB) -lz -lssl -ltermlib -lsocket -lnsl -lm \
  	-lresolv -lcrypto \
  	$$GSSAPILIB -lkrb5 -lcom_err -lk5crypto $$DES_LIB $(LIBS)"
-@@ -6095,22 +6095,6 @@ linux:
+@@ -6207,32 +6207,6 @@ linux-2015:
  	if test `grep openpty /usr/include/pty.h | wc -l` -gt 0; \
  	then HAVE_OPENPTY='-DHAVE_OPENPTY'; \
  	else HAVE_OPENPTY=''; fi ; \
 -	HAVE_LIBCURSES=''; \
--	if test -f /usr/lib64/libncurses.so || \
+-	if test -f /lib64/libncurses.so.5 || \
+-	   test -f /lib64/libncurses.so || \
+-	   test -f /lib64/libncurses.a; then \
+-	   HAVE_LIBCURSES='-lncurses'; \
+-	else if test -f /usr/lib64/libncurses.so || \
 -	   test -f /usr/lib/libncurses.a  || \
+-	   test -f /usr/lib64/libncurses.so.5 || \
 -	   test -f /usr/lib/libncurses.so; then \
--	  HAVE_LIBCURSES='-lncurses'; \
+-	   HAVE_LIBCURSES='-lncurses'; \
+-	else if test -f /usr/lib/$(MULTIARCH)/libncurses.so || \
+-	   test -f /usr/lib/$(MULTIARCH)/libncurses.a  || \
+-	   test -f /usr/lib/$(MULTIARCH)/libncurses.so; then \
+-	   HAVE_LIBCURSES='-lncurses'; \
 -	else if test -f /usr/lib64/libcurses.so || \
 -	   test -f /usr/lib/libcurses.a || \
 -	   test -f /usr/lib/libcurses.so; then \
--	     HAVE_LIBCURSES='-lcurses'; fi; fi; \
+-	   HAVE_LIBCURSES='-lcurses'; fi; fi; fi; fi; \
 -	HAVE_CURSES=''; \
 -	if test -n '$$HAVE_LIBCURSES'; then \
 -	  if test -f /usr/include/ncurses.h; then \
 -	    HAVE_CURSES='-DCK_NCURSES  -I/usr/include/ncurses'; \
 -	  else if test -f /usr/include/curses.h; then \
 -	    HAVE_CURSES='-DCK_CURSES'; \
+-	  else HAVE_LIBCURSES=''; \
 -	fi; fi; fi; \
  	if test -f /usr/include/baudboy.h || test -f /usr/include/ttylock.h; \
  	then HAVE_LOCKDEV='-DHAVE_LOCKDEV' ; \
diff --git a/kermit/patches/patch-ab b/kermit/patches/patch-ab
index 46f328f76c..3c4d8b8417 100644
--- a/kermit/patches/patch-ab
+++ b/kermit/patches/patch-ab
@@ -5,9 +5,9 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
   *v23* methods were not version-flexible enough). Now afer simplification
   there is lots of duplicate code left over that could be simplified more.
 
---- ck_ssl.c.orig	2011-07-06 15:03:32.000000000 +0200
-+++ ck_ssl.c	2020-04-06 16:43:41.323530837 +0200
-@@ -301,7 +301,7 @@
+--- ck_ssl.c.orig	2017-04-26 15:56:23.000000000 +0000
++++ ck_ssl.c
+@@ -303,7 +303,7 @@ X509_STORE_CTX *ctx;
                  break;
              default:
                  printf("Error %d while verifying certificate.\r\n",
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
                  break;
              }
          }
-@@ -804,6 +804,17 @@
+@@ -806,6 +806,17 @@ ssl_client_cert_callback(s, x509, pkey)
  #define MS_CALLBACK
  #endif /* MS_CALLBACK */
  
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
  static RSA MS_CALLBACK *
  #ifdef CK_ANSIC
  tmp_rsa_cb(SSL * s, int export, int keylength)
-@@ -822,7 +833,16 @@
+@@ -824,7 +835,16 @@ int keylength;
          if (ssl_debug_flag)
              printf("Generating temporary (%d bit) RSA key...\r\n",keylength);
  
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
  
          if (ssl_debug_flag)
              printf("\r\n");
-@@ -936,10 +956,26 @@
+@@ -938,10 +958,26 @@ get_dh512()
  
      if ((dh=DH_new()) == NULL)
          return(NULL);
@@ -80,7 +80,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      return(dh);
  }
  
-@@ -950,10 +986,26 @@
+@@ -952,10 +988,26 @@ get_dh768()
  
      if ((dh=DH_new()) == NULL)
          return(NULL);
@@ -108,7 +108,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      return(dh);
  }
  
-@@ -964,10 +1016,26 @@
+@@ -966,10 +1018,26 @@ get_dh1024()
  
      if ((dh=DH_new()) == NULL)
          return(NULL);
@@ -136,7 +136,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      return(dh);
  }
  
-@@ -978,10 +1046,26 @@
+@@ -980,10 +1048,26 @@ get_dh1536()
  
      if ((dh=DH_new()) == NULL)
          return(NULL);
@@ -164,7 +164,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      return(dh);
  }
  
-@@ -992,10 +1076,26 @@
+@@ -994,10 +1078,26 @@ get_dh2048()
  
      if ((dh=DH_new()) == NULL)
          return(NULL);
@@ -192,21 +192,24 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      return(dh);
  }
  #endif /* NO_DH */
-@@ -1054,10 +1154,11 @@
-     if (ssl == NULL)
+@@ -1057,13 +1157,14 @@ ssl_display_comp(SSL * ssl)
          return;
  
+ #ifndef OPENSSL_NO_COMP                  /* ifdefs Bernard Spil 12/2015 */
 -    if (ssl->expand == NULL || ssl->expand->meth == NULL)
 +    const COMP_METHOD *method = SSL_get_current_compression(ssl);
 +    if (method == NULL)
+ #endif /* OPENSSL_NO_COMP */
          printf("Compression: None\r\n");
+ 
+ #ifndef OPENSSL_NO_COMP                  /* ifdefs Bernard Spil 12/2015 */
      else {
 -        printf("Compression: %s\r\n",ssl->expand->meth->name);
 +        printf("Compression: %s\r\n",SSL_COMP_get_name(method));
      }
+ #endif /* OPENSSL_NO_COMP */
  }
- 
-@@ -1072,7 +1173,7 @@
+@@ -1079,7 +1180,7 @@ int verbose;
  #endif /* CK_ANSIC */
  {
      X509 *peer;
@@ -215,7 +218,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      const char *cipher_list;
      char buf[512]="";
  
-@@ -1457,13 +1558,23 @@
+@@ -1489,13 +1590,23 @@ the build.\r\n\r\n");
  
  #ifdef ZLIB
      cm = COMP_zlib();
@@ -239,72 +242,33 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
  
      /* Ensure the Random number generator has enough entropy */
      if ( !RAND_status() ) {
-@@ -1483,8 +1594,12 @@
-         }
-         debug(F110,"ssl_rnd_file",ssl_rnd_file,0);
- 
-+#ifdef OPENSSL_NO_EGD
-+	rc1 = 0;
-+#else
-         rc1 = RAND_egd(ssl_rnd_file);
-         debug(F111,"ssl_once_init","RAND_egd()",rc1);
-+#endif
-         if ( rc1 <= 0 ) {
-             rc2 = RAND_load_file(ssl_rnd_file, -1);
-             debug(F111,"ssl_once_init","RAND_load_file()",rc1);
-@@ -1579,25 +1694,13 @@
+@@ -1613,12 +1724,6 @@ ssl_tn_init(mode) int mode;
              /* This can fail because we do not have RSA available */
              if ( !ssl_ctx ) {
                  debug(F110,"ssl_tn_init","SSLv23_client_method failed",0);
+-#ifndef OPENSSL_NO_SSL3                  /* ifdef Bernard Spil 12/2015 */
 -                ssl_ctx=(SSL_CTX *)SSL_CTX_new(SSLv3_client_method());
+-#endif /* OPENSSL_NO_SSL3 */
 -            }
 -            if ( !ssl_ctx ) {
 -                debug(F110,"ssl_tn_init","SSLv3_client_method failed",0);
                  last_ssl_mode = -1;
                  return(0);
              }
--#ifndef COMMENT
--            tls_ctx=(SSL_CTX *)SSL_CTX_new(TLSv1_client_method());
--#else /* COMMENT */
-             tls_ctx=(SSL_CTX *)SSL_CTX_new(SSLv23_client_method());
-             /* This can fail because we do not have RSA available */
-             if ( !tls_ctx ) {
-                 debug(F110,"ssl_tn_init","SSLv23_client_method failed",0);
--                tls_ctx=(SSL_CTX *)SSL_CTX_new(SSLv3_client_method());
--            }
--#endif /* COMMENT */
--            if ( !tls_ctx ) {
--                debug(F110,"ssl_tn_init","TLSv1_client_method failed",0);
-                 last_ssl_mode = -1;
-                 return(0);
-             }
-@@ -1611,25 +1714,13 @@
+@@ -1664,12 +1769,6 @@ ssl_tn_init(mode) int mode;
              /* This can fail because we do not have RSA available */
              if ( !ssl_ctx ) {
                  debug(F110,"ssl_tn_init","SSLv23_server_method failed",0);
+-#ifndef OPENSSL_NO_SSL3           /* ifdef Bernard Spil 12/2015 */
 -                ssl_ctx=(SSL_CTX *)SSL_CTX_new(SSLv3_server_method());
+-#endif /* OPENSSL_NO_SSL3 */
 -            }
 -            if ( !ssl_ctx ) {
 -                debug(F110,"ssl_tn_init","SSLv3_server_method failed",0);
                  last_ssl_mode = -1;
                  return(0);
              }
--#ifdef COMMENT
--            tls_ctx=(SSL_CTX *)SSL_CTX_new(TLSv1_server_method());
--#else /* COMMENT */
-             tls_ctx=(SSL_CTX *)SSL_CTX_new(SSLv23_server_method());
-             /* This can fail because we do not have RSA available */
-             if ( !tls_ctx ) {
-                 debug(F110,"ssl_tn_init","SSLv23_server_method failed",0);
--                tls_ctx=(SSL_CTX *)SSL_CTX_new(TLSv1_server_method());
--            }
--#endif /* COMMENT */
--            if ( !tls_ctx ) {
--                debug(F110,"ssl_tn_init","TLSv1_server_method failed",0);
-                 last_ssl_mode = -1;
-                 return(0);
-             }
-@@ -1655,7 +1746,6 @@
+@@ -1710,7 +1809,6 @@ ssl_tn_init(mode) int mode;
          SSL_CTX_set_info_callback(ssl_ctx,ssl_client_info_callback);
          SSL_CTX_set_info_callback(tls_ctx,ssl_client_info_callback);
  
@@ -312,7 +276,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
          /* Set the proper caching mode */
          if ( mode == SSL_SERVER ) {
              SSL_CTX_set_session_cache_mode(ssl_ctx,SSL_SESS_CACHE_SERVER);
-@@ -1666,10 +1756,6 @@
+@@ -1721,10 +1819,6 @@ ssl_tn_init(mode) int mode;
          }
          SSL_CTX_set_session_id_context(ssl_ctx,(CHAR *)"1",1);
          SSL_CTX_set_session_id_context(tls_ctx,(CHAR *)"2",1);
@@ -323,7 +287,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      }
  
      /* The server uses defaults for the certificate files. */
-@@ -1777,7 +1863,14 @@
+@@ -1832,7 +1926,14 @@ ssl_tn_init(mode) int mode;
  
                  if ( ssl_debug_flag )
                      printf("Generating temp (512 bit) RSA key ...\r\n");
@@ -339,26 +303,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
                  if ( ssl_debug_flag )
                      printf("Generation of temp (512 bit) RSA key done\r\n");
  
-@@ -2153,18 +2246,10 @@
-         printf("SSL_DEBUG_FLAG on\r\n");
- 
-     if (!tls_http_ctx ) {
--#ifdef COMMENT
--        /* too many web servers still do not support TLSv1 */
--        tls_http_ctx=(SSL_CTX *)SSL_CTX_new(TLSv1_client_method());
--#else /* COMMENT */
-         tls_http_ctx=(SSL_CTX *)SSL_CTX_new(SSLv23_client_method());
-         /* This can fail because we do not have RSA available */
-         if ( !tls_http_ctx ) {
-             debug(F110,"ssl_http_init","SSLv23_client_method failed",0);
--            tls_http_ctx=(SSL_CTX *)SSL_CTX_new(SSLv3_client_method());
--        }
--#endif /* COMMENT */
--        if ( !tls_http_ctx ) {
-             debug(F110,"ssl_http_init","TLSv1_client_method failed",0);
-             return(0);
-         }
-@@ -2182,7 +2267,7 @@
+@@ -2230,7 +2331,7 @@ ssl_http_init(hostname) char * hostname;
       * for TLS be sure to prevent use of SSLv2
       */
      SSL_CTX_set_options(tls_http_ctx,
@@ -367,7 +312,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
  
      SSL_CTX_set_info_callback(tls_http_ctx,ssl_client_info_callback);
  
-@@ -2575,7 +2660,11 @@
+@@ -2623,7 +2724,11 @@ ssl_anonymous_cipher(ssl) SSL * ssl;
  int
  ssl_verify_crl(int ok, X509_STORE_CTX *ctx)
  {
@@ -379,7 +324,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      X509_NAME *subject = NULL;
      X509_NAME *issuer = NULL;
      X509 *xs = NULL;
-@@ -2595,6 +2684,14 @@
+@@ -2643,6 +2748,14 @@ ssl_verify_crl(int ok, X509_STORE_CTX *c
      if (!crl_store)
          return ok;
  
@@ -394,7 +339,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      store_ctx = X509_STORE_CTX_new();
      if ( !store_ctx )
          return(ok);
-@@ -2641,11 +2738,16 @@
+@@ -2689,11 +2802,16 @@ ssl_verify_crl(int ok, X509_STORE_CTX *c
       * Try to retrieve a CRL corresponding to the _subject_ of
       * the current certificate in order to verify it's integrity.
       */
@@ -412,7 +357,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      if (rc > 0 && crl != NULL) {
          /*
           * Verify the signature on this CRL
-@@ -2653,7 +2755,11 @@
+@@ -2701,7 +2819,11 @@ ssl_verify_crl(int ok, X509_STORE_CTX *c
          if (X509_CRL_verify(crl, X509_get_pubkey(xs)) <= 0) {
              fprintf(stderr, "Invalid signature on CRL!\n");
              X509_STORE_CTX_set_error(ctx, X509_V_ERR_CRL_SIGNATURE_FAILURE);
@@ -424,7 +369,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
              X509_STORE_CTX_free(store_ctx);
              return 0;
          }
-@@ -2661,12 +2767,16 @@
+@@ -2709,12 +2831,16 @@ ssl_verify_crl(int ok, X509_STORE_CTX *c
          /*
           * Check date of CRL to make sure it's not expired
           */
@@ -442,7 +387,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
              X509_STORE_CTX_free(store_ctx);
              return 0;
          }
-@@ -2675,22 +2785,38 @@
+@@ -2723,22 +2849,38 @@ ssl_verify_crl(int ok, X509_STORE_CTX *c
  "Found CRL is expired - revoking all certificates until you get updated CRL.\n"
                      );
              X509_STORE_CTX_set_error(ctx, X509_V_ERR_CRL_HAS_EXPIRED);
@@ -482,7 +427,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      if (rc > 0 && crl != NULL) {
          /*
           * Check if the current certificate is revoked by this CRL
-@@ -2698,19 +2824,34 @@
+@@ -2746,19 +2888,34 @@ ssl_verify_crl(int ok, X509_STORE_CTX *c
          n = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
          for (i = 0; i < n; i++) {
              revoked = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
@@ -517,7 +462,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      }
      return ok;
  }
-@@ -2877,6 +3018,7 @@
+@@ -2929,6 +3086,7 @@ show_hostname_warning(char *s1, char *s2
  #ifndef OpenBSD
  #ifndef FREEBSD4
  #ifndef NETBSD15
@@ -525,7 +470,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
  #ifndef LINUX
  #ifndef AIX41
  #ifndef UW7
-@@ -2919,6 +3061,7 @@
+@@ -2971,6 +3129,7 @@ inet_aton(char * ipaddress, struct in_ad
  #endif /* UW7 */
  #endif /* AIX41 */
  #endif /* LINUX */
@@ -533,7 +478,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
  #endif /* NETBSD15 */
  #endif /* FREEBSD4 */
  #endif /* OpenBSD */
-@@ -3057,7 +3200,7 @@
+@@ -3113,7 +3272,7 @@ int
  tls_is_anon(int x)
  {
      char buf[128];
@@ -542,7 +487,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      SSL * ssl = NULL;
  
      switch ( x ) {
-@@ -3101,7 +3244,7 @@
+@@ -3157,7 +3316,7 @@ int
  tls_is_krb5(int x)
  {
      char buf[128];
@@ -551,7 +496,7 @@ $NetBSD: patch-ab,v 1.8 2020/04/08 15:22:07 rhialto Exp $
      SSL * ssl = NULL;
  
      switch ( x ) {
-@@ -4343,7 +4486,14 @@
+@@ -4399,7 +4558,14 @@ X509_userok(X509 * peer_cert, const char
      if (!(fp = fopen(buf, "r")))
          return 0;
      while (!r && (file_cert = PEM_read_X509(fp, NULL, NULL, NULL))) {
diff --git a/kermit/patches/patch-ae b/kermit/patches/patch-ae
deleted file mode 100644
index db3302538d..0000000000
--- a/kermit/patches/patch-ae
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2020/07/30 03:03:07 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);
diff --git a/kermit/patches/patch-ckcftp.c b/kermit/patches/patch-ckcftp.c
deleted file mode 100644
index adaabc1eaf..0000000000
--- a/kermit/patches/patch-ckcftp.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ckcftp.c,v 1.1 2020/04/08 16:22:00 rhialto Exp $
-
-Use SSLv23_client_method() because it is version-flexible.
-The difference that Kermit makes between SSL and TLS is gone.
-
---- ckcftp.c.orig	2011-07-14 18:17:30.000000000 +0200
-+++ ckcftp.c	2020-04-06 17:01:35.943676852 +0200
-@@ -10196,19 +10196,19 @@
- #define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0L
- #endif
-     if (auth_type && !strcmp(auth_type,"TLS")) {
--        ssl_ftp_ctx=SSL_CTX_new(SSLv3_client_method());
-+        ssl_ftp_ctx=SSL_CTX_new(SSLv23_client_method());
-         if (!ssl_ftp_ctx)
-           return(0);
-         SSL_CTX_set_options(ssl_ftp_ctx,
-                             SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA
-                             );
-     } else {
--        ssl_ftp_ctx = SSL_CTX_new(ftp_bug_use_ssl_v2 ? SSLv23_client_method() : 
--                                  SSLv3_client_method());
-+        ssl_ftp_ctx = SSL_CTX_new(SSLv23_client_method());
-         if (!ssl_ftp_ctx)
-           return(0);
-         SSL_CTX_set_options(ssl_ftp_ctx,
--                            (ftp_bug_use_ssl_v2 ? 0 : SSL_OP_NO_SSLv2)|
-+                            
-+                            (ftp_bug_use_ssl_v2 ? 0 : SSL_OP_NO_SSLv2/*|SSL_OP_NO_SSLv3*/)|
-                             SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA
-                             );
-     }
diff --git a/kermit/patches/patch-ckcpro.w b/kermit/patches/patch-ckcpro.w
deleted file mode 100644
index 0b801fdb5b..0000000000
--- a/kermit/patches/patch-ckcpro.w
+++ /dev/null
@@ -1,19 +0,0 @@
-$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 */
Prev by Date: terminology: update TODO
Next by Date: py-bintrees: remove, same version in pkgsrc
Previous by Thread: enlightenment-current: sysactions.conf path fix on NetBSD
Next by Thread: py-bintrees: remove, same version in pkgsrc
Indexes:
Home | Main Index | Thread Index | Old Index