SOURCES/expect-5.45.4-covscan-fixes.patch

@@ -1,6 +1,6 @@
 diff -up expect5.45.4/exp_chan.c.orig expect5.45.4/exp_chan.c
 --- expect5.45.4/exp_chan.c.orig	2018-02-02 20:15:52.000000000 +0100
-+++ expect5.45.4/exp_chan.c	2018-10-09 14:14:44.851965292 +0200
++++ expect5.45.4/exp_chan.c	2018-10-10 09:29:44.702617967 +0200
 @@ -51,6 +51,8 @@ static void		ExpWatchProc _ANSI_ARGS_((C
  		            int mask));
  static int		ExpGetHandleProc _ANSI_ARGS_((ClientData instanceData,
@@ -11,8 +11,8 @@ diff -up expect5.45.4/exp_chan.c.orig expect5.45.4/exp_chan.c
  /*
   * This structure describes the channel type structure for Expect-based IO:
 diff -up expect5.45.4/exp_clib.c.orig expect5.45.4/exp_clib.c
---- expect5.45.4/exp_clib.c.orig	2018-10-09 14:14:44.841965281 +0200
+--- expect5.45.4/exp_clib.c.orig	2018-10-10 09:29:44.695617962 +0200
-+++ expect5.45.4/exp_clib.c	2018-10-09 14:14:44.873965319 +0200
++++ expect5.45.4/exp_clib.c	2018-10-10 09:29:44.723617980 +0200
 @@ -37,6 +37,14 @@ would appreciate credit if this program
  # endif
  #endif
@@ -61,8 +61,8 @@ diff -up expect5.45.4/exp_clib.c.orig expect5.45.4/exp_clib.c
  		}
  
 diff -up expect5.45.4/exp_log.c.orig expect5.45.4/exp_log.c
---- expect5.45.4/exp_log.c.orig	2018-10-09 14:14:44.838965277 +0200
+--- expect5.45.4/exp_log.c.orig	2018-10-10 09:29:44.691617960 +0200
-+++ expect5.45.4/exp_log.c	2018-10-09 14:14:44.852965294 +0200
++++ expect5.45.4/exp_log.c	2018-10-10 09:29:44.703617967 +0200
 @@ -174,7 +174,10 @@ expStdoutLog TCL_VARARGS_DEF(int,arg1)
      force_stdout = TCL_VARARGS_START(int,arg1,args);
      fmt = va_arg(args,char *);
@@ -76,8 +76,8 @@ diff -up expect5.45.4/exp_log.c.orig expect5.45.4/exp_log.c
      (void) vsnprintf(bigbuf,sizeof(bigbuf),fmt,args);
      expDiagWriteBytes(bigbuf,-1);
 diff -up expect5.45.4/exp_main_sub.c.orig expect5.45.4/exp_main_sub.c
---- expect5.45.4/exp_main_sub.c.orig	2018-10-09 14:14:44.848965289 +0200
+--- expect5.45.4/exp_main_sub.c.orig	2018-02-04 11:43:58.000000000 +0100
-+++ expect5.45.4/exp_main_sub.c	2018-10-09 14:14:44.852965294 +0200
++++ expect5.45.4/exp_main_sub.c	2018-10-10 09:29:44.703617967 +0200
 @@ -57,6 +57,7 @@ int exp_cmdlinecmds = FALSE;
  int exp_interactive =  FALSE;
  int exp_buffer_command_input = FALSE;/* read in entire cmdfile at once */
@@ -87,8 +87,8 @@ diff -up expect5.45.4/exp_main_sub.c.orig expect5.45.4/exp_main_sub.c
  Tcl_Interp *exp_interp;	/* for use by signal handlers who can't figure out */
  			/* the interpreter directly */
 diff -up expect5.45.4/pty_termios.c.orig expect5.45.4/pty_termios.c
---- expect5.45.4/pty_termios.c.orig	2018-10-09 14:17:00.132127498 +0200
+--- expect5.45.4/pty_termios.c.orig	2018-02-02 20:15:52.000000000 +0100
-+++ expect5.45.4/pty_termios.c	2018-10-09 14:33:59.393315570 +0200
++++ expect5.45.4/pty_termios.c	2018-10-10 09:29:44.703617967 +0200
 @@ -105,6 +105,7 @@ with openpty which supports 4000 while p
  
  void expDiagLog();

SPECS/expect.spec

@@ -5,12 +5,12 @@
 Summary: A program-script interaction and testing utility
 Name: expect
 Version: %{majorver}
-Release: 15%{?dist}
+Release: 5%{?dist}
 License: Public Domain
 URL: https://core.tcl.tk/expect/index
 Source: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
-Buildrequires: gcc tcl-devel autoconf automake chrpath
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: make
+Buildrequires: tcl-devel autoconf automake chrpath
 # Patch0: fixes change log file permissions
 Patch0: expect-5.43.0-log_file.patch
 # Patch1: fixes install location, change pkgIndex
@@ -131,17 +131,15 @@ rm -f "$RPM_BUILD_ROOT"%{_bindir}/{cryptdir,decryptdir}
 rm -f "$RPM_BUILD_ROOT"%{_mandir}/man1/{cryptdir,decryptdir}.1*
 rm -f "$RPM_BUILD_ROOT"%{_bindir}/autopasswd
 
-# rename mkpasswd, as it collides with more powerful variant from whois package (bug 1649456)
-mv "$RPM_BUILD_ROOT"%{_bindir}/mkpasswd "$RPM_BUILD_ROOT"%{_bindir}/mkpasswd-expect
-mv "$RPM_BUILD_ROOT"%{_mandir}/man1/mkpasswd.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/mkpasswd-expect.1
-sed -i 's/mkpasswd/mkpasswd-expect/g;s/MKPASSWD/MKPASSWD-EXPECT/g' "$RPM_BUILD_ROOT"%{_mandir}/man1/mkpasswd-expect.1
-sed -i 's/mkpasswd/mkpasswd-expect/g' "$RPM_BUILD_ROOT"%{_bindir}/mkpasswd-expect
-
 # remove rpath
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
 
 %files
+%defattr(-,root,root,-)
 %doc FAQ HISTORY NEWS README
 %{_bindir}/expect
 %{_bindir}/autoexpect
@@ -149,7 +147,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 %{_bindir}/ftp-rfc
 %{_bindir}/kibitz
 %{_bindir}/lpunlock
-%{_bindir}/mkpasswd-expect
+%{_bindir}/mkpasswd
 %{_bindir}/passmass
 %{_bindir}/rftp
 %{_bindir}/rlogin-cwd
@@ -166,16 +164,18 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 %{_mandir}/man1/dislocate.1.gz
 %{_mandir}/man1/expect.1.gz
 %{_mandir}/man1/kibitz.1.gz
-%{_mandir}/man1/mkpasswd-expect.1.gz
+%{_mandir}/man1/mkpasswd.1.gz
 %{_mandir}/man1/passmass.1.gz
 %{_mandir}/man1/unbuffer.1.gz
 %{_mandir}/man1/xkibitz.1.gz
 
 %files devel
+%defattr(-,root,root,-)
 %{_mandir}/man3/libexpect.3*
 %{_includedir}/*
 
 %files -n expectk
+%defattr(-,root,root,-)
 %{_bindir}/multixterm
 %{_bindir}/tknewsbiff
 %{_bindir}/tkpasswd
@@ -184,50 +184,23 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.45.4-15
+* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 5.45.4-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for MSVSphere 8.8
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 5.45.4-14
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.45.4-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.45.4-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.45.4-11
+* Thu Nov 29 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.45.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.45.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Nov 22 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-8
-- Rename mkpasswd to mkpasswd-expect
-  Resolves: #1649456
-
-* Wed Oct 10 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-7
 - Fix issues detected by static analysis
+  Resolves: #1602490
 
-* Wed Aug 29 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-6
+* Thu Oct 18 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-4
 - Unificate and improve both man page and usage message of expect
+  Resolves: #1612588
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.45.4-5
+* Wed Jun 27 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jun 27 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-4
 - Fix wrong log file permissions
 
-* Wed Jun 20 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-3
+* Wed Jun 20 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-2
 - Fix upstream URL
 
-* Tue Feb 27 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-2
-- Add BuildRequires gcc
-
 * Tue Feb 06 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-1
 - New upstream release 5.45.4
   Resolves: #1541735