CVS commit: pkgsrc/comms/kermit

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/comms/kermit
From: "matthew green" <mrg%netbsd.org@localhost>
Date: Sat, 11 Oct 2025 22:14:36 +0000

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sat Oct 11 22:14:36 UTC 2025

Modified Files:
        pkgsrc/comms/kermit: distinfo
        pkgsrc/comms/kermit/patches: patch-aa patch-ac

Log Message:
fix some issues with the netbsd port to make GCC 14 happier.

- include <util.h> and <sys/wait.h> for openpty() and ioctl().
- set MAINTYPE=int for netbsd targets.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/comms/kermit/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/comms/kermit/patches/patch-aa
cvs rdiff -u -r1.9 -r1.10 pkgsrc/comms/kermit/patches/patch-ac

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/distinfo
diff -u pkgsrc/comms/kermit/distinfo:1.30 pkgsrc/comms/kermit/distinfo:1.31
--- pkgsrc/comms/kermit/distinfo:1.30   Tue Oct 26 10:06:00 2021
+++ pkgsrc/comms/kermit/distinfo        Sat Oct 11 22:14:36 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.30 2021/10/26 10:06:00 nia Exp $
+$NetBSD: distinfo,v 1.31 2025/10/11 22:14:36 mrg Exp $
 
 BLAKE2s (kermit-9.0.302/cku302.tar.gz) = 246c177058b8855f0b0e6d81fc624fbc2820ab4d121ac43d83c285131cae527f
 SHA512 (kermit-9.0.302/cku302.tar.gz) = 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
 Size (kermit-9.0.302/cku302.tar.gz) = 3122219 bytes
-SHA1 (patch-aa) = fd3a613ce3cd3755a2e3b8baf33df33593713024
+SHA1 (patch-aa) = f0242120b32b31bac3e0e6f2d1272f86002a2b89
 SHA1 (patch-ab) = 280bfca4d44630bc9ec4a9331b650b81c7f80774
-SHA1 (patch-ac) = 62cc9e92f2413a42312d9f6d168ee85664b6aab9
+SHA1 (patch-ac) = 4fc10a60467afe528a800a608112b7719e4d0e35
 SHA1 (patch-ad) = 414f61c19185e4a82a8326121c2d9dacfba48077
 SHA1 (patch-ae) = 3cd335d719933fce95c2f5b05e9959d0d1ca06e0
 SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7

Index: pkgsrc/comms/kermit/patches/patch-aa
diff -u pkgsrc/comms/kermit/patches/patch-aa:1.10 pkgsrc/comms/kermit/patches/patch-aa:1.11
--- pkgsrc/comms/kermit/patches/patch-aa:1.10   Tue Dec  6 01:19:16 2011
+++ pkgsrc/comms/kermit/patches/patch-aa        Sat Oct 11 22:14:36 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
+$NetBSD: patch-aa,v 1.11 2025/10/11 22:14:36 mrg Exp $
 
 * Get K5LIB, K5INC, SSLLIB and SSLINC from pkgsrc.
 * s/-lgssapi/-lgssapi_krb5/ on netbsd+krb5* 
@@ -6,10 +6,11 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:1
 * s@$(K5INC)/krb5@$(K5INC)/kerberosv5/ on solaris9g+krb5+ssl
 * On linux get HAVE_LIBCURSES and HAVE_CURSES from pkgsrc (with the 
   curses include and library pathes coming from BUILDLINK_*FLAGS).
+* Use MAINTYPE=int on NetBSD.
 
 
---- makefile.orig      2011-08-21 15:12:07.000000000 +0000
-+++ makefile
+--- makefile.orig      2011-08-21 08:12:07.000000000 -0700
++++ makefile   2025-10-11 14:48:36.917185449 -0700
 @@ -824,12 +824,12 @@ manroot = $(prefix)
  
  K4LIB=-L/usr/kerberos/lib
@@ -27,8 +28,27 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:1
  
  # 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:
+@@ -1812,6 +1812,7 @@ netbsd netbsd2 netbsd15 netbsd16 old-net
+       "CFLAGS=`grep fseeko /usr/include/stdio.h > /dev/null && \
+       echo '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'` \
+       -DBSD44 -DCK_CURSES -DTCPSOCKET -DUSE_STRERROR -DHAVE_OPENPTY \
++      -DMAINTYPE=int \
+       -funsigned-char -DHERALD=\"\\\" NetBSD `uname -r`\\\"\" \
+       -DCK_DTRCD -DCK_DTRCTS -DTPUTSARGTYPE=int -DFNFLOAT $(KFLAGS) -O" \
+       "LIBS= -lcurses -lcrypt -lm -lutil $(LIBS)"
+@@ -1839,6 +1840,7 @@ netbsd+ssl netbsd+openssl:
+       $(MAKE) netbsd KTARGET=$${KTARGET:-$(@)} "CC = $(CC)" "CC2 = $(CC2)" \
+       "KFLAGS= -DCK_AUTHENTICATION -DCK_ENCRYPTION -DCK_CAST $$HAVE_DES \
+       -DCK_SSL -DCK_PAM -DZLIB -DNO_DCL_INET_ATON $$OPENSSLOPTION \
++      -DMAINTYPE=int \
+       $(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \
+       "LIBS= -L/usr/pkg/lib -R/usr/pkg/lib -lssl $$DES_LIB -lcurses \
+       -lcrypto -lcrypt -lz -lm -lpam -lutil $(LIBS)"
+@@ -1867,9 +1869,10 @@ netbsd+krb5:
+       $(MAKE) netbsd KTARGET=$${KTARGET:-$(@)} "CC = $(CC)" "CC2 = $(CC2)" \
+       "KFLAGS= -DCK_AUTHENTICATION -DCK_ENCRYPTION -DCK_KERBEROS -DKRB5 \
        -DCK_CAST $$HAVE_DES -DNOFTP_GSSAPI $(K5INC) $(K5INC)/krb5 \
++      -DMAINTYPE=int \
        $(KFLAGS)" \
        "LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lcurses $$DES_LIB \
 -      -lcrypto -lgssapi -lkrb5 -lm -lutil $(LIBS)"
@@ -36,8 +56,11 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:1
  
  # 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
+@@ -1894,9 +1897,10 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib
+       "KFLAGS= -DCK_AUTHENTICATION -DCK_ENCRYPTION -DCK_CAST $$HAVE_DES \
+       -DCK_KERBEROS -DKRB5 -DNOFTP_GSSAPI $(K5INC) $(K5INC)/krb5 \
        -DCK_SSL -DCK_PAM -DZLIB -DNO_DCL_INET_ATON $$OPENSSLOPTION \
++      -DMAINTYPE=int \
        $(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \
        "LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lssl $$DES_LIB \
 -      -lcrypto -lcrypt -lgssapi -lkrb5 -lz -lm -lpam -lutil -lcurses $(LIBS)"
@@ -45,7 +68,23 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:1
  
  #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:
+@@ -1911,6 +1915,7 @@ netbsd+ssl+srp+zlib:
+       "CFLAGS= -DBSD44 -DCK_CURSES -DTCPSOCKET -DUSE_STRERROR -DNETBSD15 \
+       -DCK_DTRCD -DCK_DTRCTS -DTPUTSARGTYPE=int -DHAVE_OPENPTY \
+       -I/usr/include/openssl -I/usr/pkg/include \
++      -DMAINTYPE=int \
+       -DCK_AUTHENTICATION -DCK_SRP -DPRE_SRP_1_4_5 -DCK_ENCRYPTION \
+       -DCK_CAST -DCK_DES -DLIBDES -DCK_SSL -DZLIB -DFNFLOAT $(KFLAGS) -O" \
+       "LIBS= -L/usr/pkg/lib -R/usr/pkg/lib -lcurses -lsrp -lgmp -ldes \
+@@ -1928,6 +1933,7 @@ netbsdn:
+       $(MAKE) CC=$(CC) CC2=$(CC2) xermit KTARGET=$${KTARGET:-$(@)} \
+       "CFLAGS=`grep fseeko /usr/include/stdio.h > /dev/null && \
+       echo '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'` \
++      -DMAINTYPE=int \
+       -DBSD44 -DCK_CURSES -DTCPSOCKET -DUSE_STRERROR -DHAVE_OPENPTY \
+       -DHERALD=\"\\\" NetBSD `uname -r`\\\"\" \
+       -DCK_DTRCD -DCK_DTRCTS -DTPUTSARGTYPE=int -DFNFLOAT $(KFLAGS) -O" \
+@@ -3544,7 +3550,7 @@ solaris2xg+openssl+zlib+pam+shadow:
        -DCK_AUTHENTICATION -DCK_SSL -DCK_PAM -DCK_SHADOW  -DZLIB \
        -DBIGBUFOK $(SSLINC) $(KFLAGS)" \
        "LIBS= $(SSLLIB) -ltermlib \
@@ -54,7 +93,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:1
  
  #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
+@@ -3899,7 +3905,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,7 +102,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:1
        "LIBS= $(SSLLIB) $(K5LIB) -lz -lssl -ltermlib -lsocket -lnsl -lm \
        -lresolv -lcrypto \
        $$GSSAPILIB -lkrb5 -lcom_err -lk5crypto $$DES_LIB $(LIBS)"
-@@ -6095,22 +6095,6 @@ linux:
+@@ -6095,22 +6101,6 @@ linux:
        if test `grep openpty /usr/include/pty.h | wc -l` -gt 0; \
        then HAVE_OPENPTY='-DHAVE_OPENPTY'; \
        else HAVE_OPENPTY=''; fi ; \

Index: pkgsrc/comms/kermit/patches/patch-ac
diff -u pkgsrc/comms/kermit/patches/patch-ac:1.9 pkgsrc/comms/kermit/patches/patch-ac:1.10
--- pkgsrc/comms/kermit/patches/patch-ac:1.9    Thu Aug 25 14:54:06 2011
+++ pkgsrc/comms/kermit/patches/patch-ac        Sat Oct 11 22:14:36 2025
@@ -1,8 +1,18 @@
-$NetBSD: patch-ac,v 1.9 2011/08/25 14:54:06 hans Exp $
+$NetBSD: patch-ac,v 1.10 2025/10/11 22:14:36 mrg Exp $
 
---- ckcdeb.h.orig      2010-08-23 15:30:56.000000000 +0200
-+++ ckcdeb.h   2011-08-23 10:31:55.103102070 +0200
-@@ -4532,7 +4532,6 @@ extern int errno;
+--- ckcdeb.h.orig      2010-08-23 06:30:56.000000000 -0700
++++ ckcdeb.h   2025-10-11 15:06:08.218109885 -0700
+@@ -2190,6 +2190,9 @@ _PROTOTYP( void bleep, (short) );
+ #endif        /* __FreeBSD__ */
+ #endif        /* __linux__ */
+ #endif        /* HAVE_OPENPTY */
++#ifdef __NetBSD__
++#include <util.h>
++#endif
+ #endif        /* NO_OPENPTY */
+ 
+ /* Kermit feature selection */
+@@ -4532,7 +4535,6 @@ extern int errno;
    following is an anachronism and should be the execption rather than the
    rule.
  */
@@ -10,3 +20,13 @@ $NetBSD: patch-ac,v 1.9 2011/08/25 14:54
  #endif /* __GLIBC__ */
  #endif /* OS2 */
  #endif /* VMS */
+@@ -5292,6 +5294,9 @@ typedef int WAIT_T;
+ #undef CK_OSF_BSD
+ #endif /* CK_OSF_BSD */
+ #else /* !POSIX */
++#ifdef __NetBSD__
++#include <sys/wait.h>
++#endif
+ typedef int WAIT_T;
+ #endif /* POSIX */
+ #endif /* MACHWAIT */

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/mail/metamail
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/mail/metamail
Indexes:

Home | Main Index | Thread Index | Old Index