kermit: Update to beta06

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: kermit: Update to beta06
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Mon, 17 Oct 2022 21:58:33 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Oct 17 17:58:33 2022 -0400
Changeset:	fa3a68fcead0e77d14e7d915365febd6df2feb0e

Modified Files:
	kermit/Makefile
	kermit/distinfo
	kermit/patches/patch-makefile
Removed Files:
	kermit/patches/patch-ckuath.c

Log Message:
kermit: Update to beta06

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

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

diffstat:
 kermit/Makefile               |  2 +-
 kermit/distinfo               | 10 +++++-----
 kermit/patches/patch-ckuath.c | 16 ----------------
 kermit/patches/patch-makefile | 30 +++++++++++-------------------
 4 files changed, 17 insertions(+), 41 deletions(-)

diffs:
diff --git a/kermit/Makefile b/kermit/Makefile
index 1629231585..242118d386 100644
--- a/kermit/Makefile
+++ b/kermit/Makefile
@@ -5,7 +5,7 @@
 VERSION=	10.0
 VERSIONDIST=	400	# ?
 VERSIONSEP=	-
-VERSIONRC=	beta05
+VERSIONRC=	beta06
 DISTNAME=	cku${VERSIONDIST}${VERSIONSEP}${VERSIONRC}
 PKGNAME=	kermit-${VERSION}${VERSIONRC}
 CATEGORIES=	comms
diff --git a/kermit/distinfo b/kermit/distinfo
index 0712043da4..6f4fc28c2e 100644
--- a/kermit/distinfo
+++ b/kermit/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.28 2020/07/30 03:03:07 gutteridge Exp $
 
-BLAKE2s (cku400-beta05.tar.gz) = 22e1582c7715fa206351a0d9fc2e50a90d210bf30b816e9561a68523657e93f0
-SHA512 (cku400-beta05.tar.gz) = d590966f38de4ca9f343b64997141f66919f4b55ba379a09e81ce92cde89c4909409142c71e5e97eb5e88e78eca4df549b0317033c97fc1c78460dc1afa5cac3
-Size (cku400-beta05.tar.gz) = 3022920 bytes
-SHA1 (patch-ckuath.c) = 494e9f5dc9edc2b8738129bb53de2d5affa8cca2
+BLAKE2s (cku400-beta06.tar.gz) = e8a84583e82842e0ca55b43af4e5e13f36c1ffa9d7750a728ad22f7cf40c5941
+SHA512 (cku400-beta06.tar.gz) = b363042d7ae5d0454be04988d716d21f825372fb44aa6b09ff9217a4a69548a7403a1ff100a1ee723dcc13d4f7c75298a6a1adb5036010fc77351324fcc2f5b1
+Size (cku400-beta06.tar.gz) = 3124191 bytes
+SHA1 (patch-ckuath.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ckupty.c) = 97cb6cca9b90d4c9a3a2faf9161310cb51fd2a58
 SHA1 (patch-ckuusx.c) = 4482c383b25cac5382863b811b6e13b3a64c85c1
-SHA1 (patch-makefile) = f60bad5ed3cb1ce556ceb714204c9876ac49a12f
+SHA1 (patch-makefile) = 918d820b05495740b220498fdd4fea01e41e0353
diff --git a/kermit/patches/patch-ckuath.c b/kermit/patches/patch-ckuath.c
deleted file mode 100644
index 73b869e99a..0000000000
--- a/kermit/patches/patch-ckuath.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.3 2014/06/23 22:24:24 christos Exp $
-
---- ckuath.c.orig	2020-10-08 19:37:25.000000000 +0000
-+++ ckuath.c
-@@ -5476,7 +5476,11 @@ k5_auth_is(how,data,cnt) int how; unsign
-         if ((how & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
-             /* do ap_rep stuff here */
-             if ((r = krb5_mk_rep(k5_context,
-+#ifdef HEIMDAL
-+                                  &auth_context,
-+#else /* HEIMDAL */
-                                   auth_context,
-+#endif /* HEIMDAL */
-                                   &outbuf))) {
-                 debug(F111,"k5_auth_is","krb5_mk_rep",r);
-                 (void) ckstrncpy(errbuf, "Make reply failed: ",sizeof(errbuf));
diff --git a/kermit/patches/patch-makefile b/kermit/patches/patch-makefile
index 46d598f6f0..5de05b253f 100644
--- a/kermit/patches/patch-makefile
+++ b/kermit/patches/patch-makefile
@@ -15,17 +15,9 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
 
 Not yet sent upstream.
 
---- makefile.orig	2022-06-02 14:59:50.000000000 +0000
+--- makefile.orig	2022-10-16 18:28:47.000000000 +0000
 +++ makefile
-@@ -824,19 +824,19 @@ CKVER= "10.0 Beta.03"
- #
- # The following symbols are used to specify library and header file locations:
- # 
--prefix  = /usr/local
-+prefix  ?= /usr/local
- srproot = $(prefix)
- sslroot = $(prefix)
- manroot = $(prefix)
+@@ -834,12 +834,12 @@ manroot = $(prefix)
  
  K4LIB=-L/usr/kerberos/lib
  K4INC=-I/usr/kerberos/include
@@ -42,7 +34,7 @@ Not yet sent upstream.
  
  # To override these assignments; for example, if your OpenSSL files are
  # not in /usr/local/ssl, invoke the desired target like this:
-@@ -973,7 +973,7 @@ BOOTFILE=/edition7
+@@ -976,7 +976,7 @@ BOOTFILE=/edition7
  #
  WERMIT = makewhat
  BINARY = wermit
@@ -51,7 +43,7 @@ Not yet sent upstream.
  BINDIR = $(prefix)/bin
  MANDIR = $(manroot)/man/man1
  MANEXT = 1
-@@ -1088,13 +1088,9 @@ install:
+@@ -1091,13 +1091,9 @@ install:
  	rm -f $(DESTDIR)$(BINDIR)/kermit;\
  	cp $(BINARY) $(DESTDIR)$(BINDIR)/kermit || exit 1;\
  	chmod 755    $(DESTDIR)$(BINDIR)/kermit || exit 1;\
@@ -66,7 +58,7 @@ Not yet sent upstream.
  		echo "#!$(BINDIR)/kermit" >\
  			$(DESTDIR)$(BINDIR)/_tmp.ini;\
  		cat ckermit.ini >> $(DESTDIR)$(BINDIR)/_tmp.ini;\
-@@ -1107,7 +1103,6 @@ install:
+@@ -1110,7 +1106,6 @@ install:
  	echo 'EfM' >&3;\
  	echo "Kermit binary installed:";\
  	ls -l $(DESTDIR)$(BINDIR)/kermit\
@@ -74,7 +66,7 @@ Not yet sent upstream.
  	      $(DESTDIR)$(BINDIR)/ckermit.ini;\
  	echo;\
  	echo " WARNING: If C-Kermit is to be used for dialing out,";\
-@@ -1120,9 +1115,9 @@ install:
+@@ -1123,9 +1118,9 @@ install:
  		if test -d $(DESTDIR)$(MANDIR); then\
  			echo  "$(DESTDIR)$(MANDIR) exists...";\
  		else\
@@ -87,7 +79,7 @@ Not yet sent upstream.
  		fi;\
  		rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
  		cp ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
-@@ -1935,7 +1930,7 @@ netbsd+krb5:
+@@ -1937,7 +1932,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 \
@@ -96,7 +88,7 @@ Not yet sent upstream.
  
  # NetBSD - With Kerberos 5 and SSL and Zlib.
  # OK: 2011/08/21 on 5.1 with MIT Kerberos.
-@@ -1962,7 +1957,7 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib
+@@ -1964,7 +1959,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 \
@@ -105,7 +97,7 @@ Not yet sent upstream.
  
  #Special Security Enhanced NetBSD target with SRP, SSL, and zlib support.
  #To build this, you need to BUILD the pkgsrc srp_client package.  After
-@@ -3673,7 +3668,7 @@ solaris2xg+openssl+zlib+pam+shadow:
+@@ -3675,7 +3670,7 @@ solaris2xg+openssl+zlib+pam+shadow:
  	-DCK_AUTHENTICATION -DCK_SSL -DCK_PAM -DCK_SHADOW  -DZLIB \
  	-DBIGBUFOK $(SSLINC) $(KFLAGS)" \
  	"LIBS= $(SSLLIB) -ltermlib \
@@ -114,7 +106,7 @@ Not yet sent upstream.
  
  #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.
-@@ -4028,7 +4023,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s
+@@ -4030,7 +4025,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 \
@@ -123,7 +115,7 @@ Not yet sent upstream.
  	"LIBS= $(SSLLIB) $(K5LIB) -lz -lssl -ltermlib -lsocket -lnsl -lm \
  	-lresolv -lcrypto \
  	$$GSSAPILIB -lkrb5 -lcom_err -lk5crypto $$DES_LIB $(LIBS)"
-@@ -6367,32 +6362,6 @@ linux-2015:
+@@ -6359,32 +6354,6 @@ linux-2015:
  	if test `grep openpty /usr/include/pty.h | wc -l` -gt 0; \
  	then HAVE_OPENPTY='-DHAVE_OPENPTY'; \
  	else HAVE_OPENPTY=''; fi ; \
Prev by Date: xtrlock: add OpenBSD support.
Next by Date: openvdb: Update to release 10.0.0
Previous by Thread: xtrlock: add OpenBSD support.
Next by Thread: openvdb: Update to release 10.0.0
Indexes:
Home | Main Index | Thread Index | Old Index