public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ckermit] rawhide: Updated ckermit to 11.0.505
@ 2026-09-17 18:32 John Goerzen
  0 siblings, 0 replies; only message in thread
From: John Goerzen @ 2026-09-17 18:32 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/ckermit
Branch : rawhide
Commit : ca05a09bf7a158d8c62128f193084faa3c9a4b2a
Author : John Goerzen <jgoerzen@complete.org>
Date   : 2026-07-29T04:44:01+00:00
Stats  : +61/-108 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/ckermit/c/ca05a09bf7a158d8c62128f193084faa3c9a4b2a?branch=rawhide

Log:
Updated ckermit to 11.0.505

---
diff --git a/.gitignore b/.gitignore
index d83547e..7f6f1a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /x.tar.gz
 /cku301.tar.gz
 /cku302.tar.gz
+/ckermit-11.0.505.tar.gz

diff --git a/README.fedora b/README.fedora
index bfa41ac..9130e76 100644
--- a/README.fedora
+++ b/README.fedora
@@ -2,10 +2,9 @@ If unprivileged users attempt to access a serial port, e.g.
 /dev/ttyS<n> or /dev/ttyUSB<n>, they will normally get an error
 message such as:
 
-    Sorry, write access to UUCP lockfile directory denied.
+    /dev/ttyS0: Permission denied
 
-This message is actually due to permissions on the device, not the
-lockfile directory.
+This message is due to permissions on the device.
 
 If it is desired to allow specific unprivileged users to use ckermit
 to access serial ports, add those users to the "dialout" group.  One

diff --git a/ckermit-9.0.302-fedora-c99.patch b/ckermit-9.0.302-fedora-c99.patch
deleted file mode 100644
index a7df3ba..0000000
--- a/ckermit-9.0.302-fedora-c99.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -rup a/ckcmai.c b/ckcmai.c
---- a/ckcmai.c	2011-08-20 17:20:42.000000000 -0400
-+++ b/ckcmai.c	2023-02-16 15:19:50.728291202 -0500
-@@ -1581,6 +1581,10 @@ _PROTOTYP( int getiobs, (VOID) );
- 
- #include <signal.h>
- 
-+#ifndef VMS
-+#include <time.h>
-+#endif
-+
- #ifndef NOCCTRAP
- #include <setjmp.h>
- #include "ckcsig.h"
-diff -rup a/ckupty.c b/ckupty.c
---- a/ckupty.c	2011-06-13 11:34:13.000000000 -0400
-+++ b/ckupty.c	2023-02-16 16:40:33.519202100 -0500
-@@ -384,6 +384,10 @@ struct termbuf {
- 
- #endif /* TCSANOW */
- 
-+#ifdef HAVE_OPENPTY
-+#include <pty.h>
-+#endif
-+
- struct termios termbuf, termbuf2;       /* pty control structure */
- 
- #ifdef INIT_SPTY
-diff -rup a/ckutio.c b/ckutio.c
---- a/ckutio.c	2011-08-20 17:22:35.000000000 -0400
-+++ b/ckutio.c	2023-02-16 16:04:42.656846326 -0500
-@@ -14129,6 +14129,10 @@ extern int exp_handler, exp_stderr, exp_
- #endif /* USE_CKUPTY_C */
- #endif /* HAVE_OPENPTY */
- 
-+#ifdef HAVE_OPENPTY
-+#include <pty.h>
-+#endif
-+
- VOID
- pty_make_raw(fd) int fd; {
-     int x = -23, i;
-diff -rup a/ckuusx.c b/ckuusx.c
---- a/ckuusx.c	2023-02-16 15:02:46.440896650 -0500
-+++ b/ckuusx.c	2023-02-16 15:43:24.925119195 -0500
-@@ -5883,6 +5883,9 @@ _PROTOTYP(char *tgetstr,(char *, char **
- _PROTOTYP(int tputs,(char *, int, int (*)()));
- _PROTOTYP(char *tgoto,(const char *, int, int));
- #endif	/* BUG999 */
-+#ifdef linux
-+#include <term.h>
-+#endif
- 
- #endif /* CK_CURSES */
- 

diff --git a/ckermit-9.0.302-fix_build_with_glibc_2_28_and_earlier.patch b/ckermit-9.0.302-fix_build_with_glibc_2_28_and_earlier.patch
deleted file mode 100644
index d1540cb..0000000
--- a/ckermit-9.0.302-fix_build_with_glibc_2_28_and_earlier.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru z/ckucmd.c k/ckucmd.c
---- z/ckucmd.c	2004-01-07 10:04:04.000000000 -0800
-+++ k/ckucmd.c	2019-01-01 15:52:44.798864262 -0800
-@@ -7103,7 +7103,7 @@
- 
- /* Here we must look inside the stdin buffer - highly platform dependent */
- 
--#ifdef _IO_file_flags			/* Linux */
-+#ifdef _IO_EOF_SEEN			/* Linux */
-     x = (int) ((stdin->_IO_read_end) - (stdin->_IO_read_ptr));
-     debug(F101,"cmdconchk _IO_file_flags","",x);
- #else  /* _IO_file_flags */

diff --git a/ckermit-9.0.302-printw.patch b/ckermit-9.0.302-printw.patch
deleted file mode 100644
index a2be5a9..0000000
--- a/ckermit-9.0.302-printw.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ckermit-9.0.302/ckuusx.c.orig ckermit-9.0.302/ckuusx.c
---- ckermit-9.0.302/ckuusx.c.orig	2011-06-17 10:11:34.000000000 -0400
-+++ ckermit-9.0.302/ckuusx.c	2022-08-02 11:13:37.262526928 -0400
-@@ -8022,7 +8021,7 @@ char *s;        /* a string */
-             move(CW_MSG,22);
- 	    clrtoeol();
-             if (!s) s = "";
--            printw(*s ? s : "User interruption or connection lost");
-+            printw("%s", *s ? s : "User interruption or connection lost");
- #ifdef KUI
- #ifndef K95G
-             KuiSetProperty(KUI_FILE_TRANSFER,

diff --git a/ckermit.spec b/ckermit.spec
index e5bc861..a3f99be 100644
--- a/ckermit.spec
+++ b/ckermit.spec
@@ -1,37 +1,39 @@
-%global patchlevel 302
+%bcond_without tests
 
 Summary:       The quintessential all-purpose communications program
 Name:          ckermit
-Version:       9.0.%{patchlevel}
-Release:       43%{?dist}
+Version:       11.0.505
+Release:       1%{?dist}
 # Most of the package is under a three-clause BSD license, but the file
-# ckaut2.h appears to be covered by three licenses:
+# ckuat2.h appears to be covered by three licenses:
 #   The blanket license in COPYING.TXT and ckcmai.c, which is BSD three-clause
 #   BSD four-clause (w/ advertising)
 #   MIT Old Style (no advertising without permission)
 License:       BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND BSD-4-Clause-UC AND NTP AND X11
-Source0:       ftp://ftp.kermitproject.org/kermit/archives/cku%{patchlevel}.tar.gz
+Source0:       https://github.com/OpenKermit/ckermit/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:       ckermit.ini
 Source2:       cku-%{name}.local.ini
 Source3:       cku-%{name}.modem.generic.ini
 Source4:       cku-%{name}.locale.ini
 Source5:       cku-%{name}.phone
 Source6:       README.fedora
-# See: https://bugs.gentoo.org/669332
-Patch0:        ckermit-9.0.302-fix_build_with_glibc_2_28_and_earlier.patch
-Patch1:        ckermit-9.0.302-printw.patch
-# C99 fixes - unneeded for ckermit 10
-Patch2:        ckermit-9.0.302-fedora-c99.patch
-URL:           http://www.kermitproject.org/ck90.html
+URL:           https://www.openkermit.org/
 BuildRequires: gcc
 BuildRequires: pam-devel
 BuildRequires: pkgconfig
-BuildRequires: openssl-devel >= 0.9.7
+BuildRequires: openssl-devel >= 3.0.0
 BuildRequires: gmp-devel >= 3.1.1
 BuildRequires: ncurses-devel
 BuildRequires: lockdev-devel >= 1.0.1-8
 BuildRequires: make
 BuildRequires: libxcrypt-devel
+%if %{with tests}
+BuildRequires: check-devel
+BuildRequires: python3-pytest
+BuildRequires: python3-pytest-xdist
+BuildRequires: python3-pytest-timeout
+BuildRequires: python3-pyftpdlib
+%endif
 
 Requires:      lockdev >= 1.0.1-8
 # NB There used to be a spurious "Obsoletes: gkermit" line here, but ckermit
@@ -46,15 +48,12 @@ and management, character-set translation, and automation of
 communication tasks.
 
 %prep
-%setup -q -c
+%setup -q
 cp %{SOURCE6} .
-%patch -P 0 -p 1 -b .glibc2_28
-%patch -P 1 -p 1 -b .printw
-%patch -P 2 -p 1 -b .c99
 
 %build
 %make_build linux \
-        KFLAGS="-O0 $RPM_OPT_FLAGS -Wall -ansi -D_DEFAULT_SOURCE -DOPENSSL_097 -Dsdata=s_data -DHAVE_OPENPTY -D'krb5_init_ets(__ctx)=' -DMAINTYPE=int" \
+        KFLAGS="-O0 $RPM_OPT_FLAGS -Wall -D_DEFAULT_SOURCE -Dsdata=s_data -DHAVE_OPENPTY" \
         LNKFLAGS="%{?optflags} %{?__global_ldflags}" \
         K4LIB= \
         K4INC= \
@@ -64,13 +63,6 @@ cp %{SOURCE6} .
         SSLINC= \
 ;
 
-# convert doc file from ISO-8859-1 to UTF-8 encoding
-for f in ckc%{patchlevel}.txt ; do
-    iconv -fiso88591 -tutf8 $f >$f.new
-    touch -r $f $f.new
-    mv $f.new $f
-done
-
 %install
 install -D -m 0755 wermit %{buildroot}%{_bindir}/kermit
 install -D -m 0644 ckuker.nr %{buildroot}%{_mandir}/man1/kermit.1
@@ -80,9 +72,20 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/kermit/ckermit.modem.in
 install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/kermit/ckermit.locale.ini
 install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/kermit/ckermit.phone
 
+%check
+%if %{with tests}
+make check
+# The suite locates the "wermit" binary and "tests/" by path relative
+# to tests/conftest.py.
+#
+# SSL/TLS tests are automatically skipped since we're not building
+# with SSL support.
+pytest-3 -n auto
+%endif
+
 %files
 %license COPYING.TXT
-%doc ckc%{patchlevel}.txt
+%doc doc/README.md
 %doc README.fedora
 %{_bindir}/kermit
 %dir %{_sysconfdir}/kermit
@@ -90,6 +93,35 @@ install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/kermit/ckermit.phone
 %{_mandir}/man1/kermit.1*
 
 %changelog
+* Wed Jul 29 2026 John Goerzen <jgoerzen@complete.org> - 11.0.505-1
+- Update to 11.0.505
+- Upstream noticed the discussion in README.fedora and clarified the error
+  message.  Discussion in README.fedora updated.
+- Drop -D'krb5_init_ets(__ctx)=' from KFLAGS and the
+  The makefile rules in use here never define
+  CK_KERBEROS, so krb5_init_ets() was never compiled in to begin with;
+  the macro override has done nothing since we moved off the
+  old Kerberos-enabled Red Hat build target from around 2005 (see the
+  8.0.211 changelog entry below: "remove now-unnecessary use of
+  krb5_init_ets()").
+- Drop ckermit-9.0.302-fix_build_with_glibc_2_28_and_earlier.patch.
+  Upstream modernization already addressed this.
+- Drop ckermit-9.0.302-printw.patch; upstream independently replaced
+  the one remaining unsafe printw() call with fputs()
+- Drop ckermit-9.0.302-fedora-c99.patch: all missing #includes
+  it added have been added upstream via generic mechanisms
+- Drop -DMAINTYPE=int and -ansi from KFLAGS. -DMAINTYPE=int
+  is unnecessary due to typedef upstream.  -ansi also is no longer
+  necessary due to upstream modernization.
+- Add "make check"/pytest test suite integration, gated by a new
+  "tests" bcond
+- %%files: replace %%doc ckc302.txt, which no longer exists in this
+  release. doc/*.md in the source tree now provides various
+  documentation.
+- URL: point at the current project home, openkermit.org, instead of
+  the old kermitproject.org ck90.html page, which described the 9.0
+  release specifically
+
 * Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-43
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index 854f057..28a0818 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eac4dbf18b45775e4cdee5a7c74762b0  cku302.tar.gz
+SHA512 (ckermit-11.0.505.tar.gz) = a8fa5c1c5fc9f15eb50f618a182b1c419059d4bbd0039514e840fd5c4e22875e61fcb4526aaed3ddd344a110e8aae0423f8026f46f1f6e323ff126d4948ac48c

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-17 18:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-17 18:32 [rpms/ckermit] rawhide: Updated ckermit to 11.0.505 John Goerzen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox