[rpms/ckermit] epel8: Merge branch 'rawhide' into epel8

[rpms/ckermit] epel8: Merge branch 'rawhide' into epel8

[Martin Jackson]

A new commit has been pushed.

Repo   : rpms/ckermit
Branch : epel8
Commit : 5dc135ca57880e37259271c2f39b7787a52aa7ae
Author : Martin Jackson <martjack@redhat.com>
Date   : 2026-09-18T08:56:54-05:00
Stats  : +175/-43 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/ckermit/c/5dc135ca57880e37259271c2f39b7787a52aa7ae?branch=epel8

Log:
Merge branch 'rawhide' into epel8

---
diff --git a/.gitignore b/.gitignore
index 670614a..4766a23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
+/log
+/x.tar.gz
+/cku301.tar.gz
 /cku302.tar.gz
+/ckermit-11.0.505.tar.gz
+/ckermit-11.0.509.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.spec b/ckermit.spec
index 23c672a..d121e97 100644
--- a/ckermit.spec
+++ b/ckermit.spec
@@ -1,34 +1,44 @@
-%global patchlevel 302
+# Disable tests on el8 and el9 because they lack python packages (pyftpdlib)
+%if 0%{?rhel} == 8 || 0%{?rhel} == 9
+%bcond_with tests
+%else
+%bcond_without tests
+%endif
 
 Summary:       The quintessential all-purpose communications program
 Name:          ckermit
-Version:       9.0.%{patchlevel}
-Release:       21%{?dist}
-License:       BSD with advertising and MIT
+Version:       11.0.509
+Release:       2%{?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)
-Source0:       ftp://ftp.kermitproject.org/kermit/archives/cku%{patchlevel}.tar.gz
+License:       BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND BSD-4-Clause-UC AND NTP AND X11
+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
-URL:           http://www.kermitproject.org/ck90.html
-BuildRequires:  gcc
+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: libtermcap-devel
 BuildRequires: ncurses-devel
 BuildRequires: lockdev-devel >= 1.0.1-8
-BuildRequires: perl-interpreter
+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
@@ -43,14 +53,14 @@ and management, character-set translation, and automation of
 communication tasks.
 
 %prep
-%setup -q -c
+%setup -q
 cp %{SOURCE6} .
-%patch0 -p 1 -b .glibc2_28
 
 %build
 %make_build linux \
-        KFLAGS="-O0 $RPM_OPT_FLAGS -Wall -DOPENSSL_097 -Dsdata=s_data -DHAVE_OPENPTY -D'krb5_init_ets(__ctx)='" \
+        KFLAGS="-O0 $RPM_OPT_FLAGS -Wall -D_DEFAULT_SOURCE -Dsdata=s_data -DHAVE_OPENPTY" \
         LNKFLAGS="%{?optflags} %{?__global_ldflags}" \
+        LIBS="-llockdev" \
         K4LIB= \
         K4INC= \
         K5LIB=-lutil \
@@ -59,38 +69,144 @@ 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
-rm -rf %{buildroot}
-install -d %{buildroot}{%{_bindir},%{_mandir}/man1,%{_sysconfdir}/kermit}
-
-perl -pi -e "s|%{_prefix}/local/bin/kermit|%{_bindir}/kermit|g" ckermit.ini
-
-install -m 755 wermit %{buildroot}%{_bindir}/kermit
-install -m 644 ckuker.nr %{buildroot}%{_mandir}/man1/kermit.1
-install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/kermit/
-install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/kermit/ckermit.local.ini
-install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/kermit/ckermit.modem.ini
-install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/kermit/ckermit.locale.ini
-install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/kermit/ckermit.phone
+install -D -m 0755 wermit %{buildroot}%{_bindir}/kermit
+install -D -m 0644 ckuker.nr %{buildroot}%{_mandir}/man1/kermit.1
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/kermit/ckermit.ini
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/kermit/ckermit.local.ini
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/kermit/ckermit.modem.ini
+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 doc/*
+%doc README.fedora
 %{_bindir}/kermit
 %dir %{_sysconfdir}/kermit
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/kermit/*
 %{_mandir}/man1/kermit.1*
-%license COPYING.TXT
-%doc ckc%{patchlevel}.txt
-%doc README.fedora
 
 %changelog
+* Thu Sep 17 2026 Martin Jackson <mhjacks@swbell.net> - 11.0.509-2
+- Conditionalize tests - skip on EL8 and EL9 due to missing pyftpdlib.
+  Run tests by default.
+- Include new docs files.
+
+* Thu Sep 17 2026 Martin Jackson <mhjacks@swbell.net> - 11.0.509-1
+- Update to 11.0.509
+- Link with -llockdev (upstream linux target passes -DHAVE_LOCKDEV instead)
+- Keep optflags/ldflags so debuginfo is generated
+
+* 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
+
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 9.0.302-42
+- Rebuilt for openssl 4.0
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 9.0.302-38
+- Add explicit BR: libxcrypt-devel
+
+* Wed Jan 22 2025 David Cantrell <dcantrell@redhat.com> - 9.0.302-37
+- Add '-ansi -D_DEFAULT_SOURCE' to KFLAG variable to fix FTBFS (#2339971)
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Sep 21 2023 David Cantrell <dcantrell@redhat.com> - 9.0.302-32
+- Drop perl-interpreter BuildRequires
+- Do not modify the ckermit.ini file in the source tree
+- Use non-deprecated %%patch macro syntax in %%prep
+- Convert license tag to SPDX
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Feb 16 2023 DJ Delorie <dj@redhat.com> - 9.0.302-30
+- Fix C99 compatibility issue
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Aug 02 2022 David Cantrell <dcantrell@redhat.com> - 9.0.302-28
+- Fix FTBFS (#2113148)
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 27 2020 David Cantrell <dcantrell@redhat.com> - 9.0.302-22
+- Drop BR libtermcap-devel (#1799227)
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

diff --git a/sources b/sources
index 96b75e5..47888cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cku302.tar.gz) = 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
+SHA512 (ckermit-11.0.509.tar.gz) = 82e9bf62b42aa27940078949fec6c58119fbb5dc862068533f2db21c07f2a4d8ac823c6ddd60c332f4bde7550a0c5561027ad6b87d516fa4702f4233a4c0d66a

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
new file mode 100644
index 0000000..d1540cb
--- /dev/null
+++ b/ckermit-9.0.302-fix_build_with_glibc_2_28_and_earlier.patch
@@ -0,0 +1,12 @@
+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 */