expect-5.45-check-telnet.patch

@@ -0,0 +1,29 @@
+diff -up expect5.45/example/passmass.orig expect5.45/example/passmass
+--- expect5.45/example/passmass.orig	2011-07-27 16:09:31.013843393 +0200
++++ expect5.45/example/passmass	2011-07-27 16:10:55.667843578 +0200
+@@ -107,6 +107,10 @@ for {set i 0} {$i<$argc} {incr i} {
+ 	set login "ssh"
+ 	continue
+     } "-telnet" {
++	if {[file executable /usr/bin/telnet] == 0} {
++		send_user "It seems that telnet is not installed. Please install telnet in order to use the script with this option.\n"
++		exit 1
++	}
+ 	set login "telnet"
+ 	continue
+     } "-program" {
+diff -up expect5.45/example/weather.orig expect5.45/example/weather
+--- expect5.45/example/weather.orig	2011-07-27 15:49:57.878843862 +0200
++++ expect5.45/example/weather	2011-07-27 16:08:48.067843491 +0200
+@@ -33,6 +33,11 @@ set timeout 60
+ 
+ set env(TERM) vt100	;# actual value doesn't matter, just has to be set
+ 
++if {[file executable /usr/bin/telnet] == 0} {
++	send_user "It seems that telnet is not installed. Please install telnet in order to use this script.\n"
++	exit 1
++}
++
+ spawn telnet rainmaker.wunderground.com 3000
+ while {1} {
+ 	expect timeout {

expect-5.45-format-security.patch

@@ -1,5 +1,5 @@
---- expect5.45.4/exp_clib.c	2017-03-24 10:34:37.269183513 -0400
+--- exp_clib.c.orig	2017-03-24 10:34:37.269183513 -0400
-+++ expect5.45.4/exp_clib.c	2017-03-24 10:34:41.171117943 -0400
++++ exp_clib.c	2017-03-24 10:34:41.171117943 -0400
 @@ -1938,8 +1938,8 @@
       char *str;
  {

expect.spec

@@ -4,12 +4,12 @@
 Name: expect
 Epoch: 1
 Version: 5.45.4
-Release: 8
+Release: 4
 Summary: A tool for automating interactive applications
 License: Public Domain
 URL: https://core.tcl.tk/expect/index
 Source0: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
-Buildrequires: gcc tcl-devel autoconf automake chrpath
+Buildrequires: gcc git tcl-devel autoconf automake chrpath
 Provides: expectk
 Obsoletes: expectk
 
@@ -35,6 +35,9 @@ Patch7: expect-5.45-fd-leak.patch
 Patch100: expect-5.32.2-random.patch
 # Patch101: fixes bz674184 - mkpasswd fails randomly
 Patch101: expect-5.45-mkpasswd-dash.patch
+# Patch102: fixes bz703702 - let user know that telnet is needed for
+# running some examples
+Patch102: expect-5.45-check-telnet.patch
 # Patch103: use full path to 'su', it's safer
 Patch103: expect-5.45-passmass-su-full-path.patch
 # Patch104: rhbz 963889, fixes inaccuracy in mkpasswd man page
@@ -72,7 +75,7 @@ Expect is also useful for testing these same applications.
 This package contains man pages and other related documents for expect.
 
 %prep
-%autosetup -n %{name}%{version} -p1
+%autosetup -n %{name}%{version} -S git
 
 %build
 %configure \
@@ -100,14 +103,7 @@ rm -f "$RPM_BUILD_ROOT"%{_mandir}/man1/{cryptdir,decryptdir}.1*
 
 # remove rpath
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/expect
 
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-
-%post  -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 %files
 %doc ChangeLog FAQ HISTORY NEWS README
@@ -115,7 +111,6 @@ echo "%{_libdir}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %dir %{tcl_sitearch}/expect%{version}
 %{tcl_sitearch}/expect%{version}/pkgIndex.tcl
 %{_libdir}/libexpect*.so
-%config(noreplace) /etc/ld.so.conf.d/*
 
 %files devel
 %{_includedir}/*
@@ -125,18 +120,6 @@ echo "%{_libdir}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_mandir}/man3/libexpect.3*
 
 %changelog
-* Thu Feb 22 2024 hongjinghao <hongjinghao@huawei.com> - 1:5.45.4-8
-- remove rpath and runpath of exec files and libraries
-
-* Thu Jun 9 2022 yangzhao1 <yangzhao1@kylinos.cn> - 1:5.45.4-7
-- Remove unnecessary Buildrequires git
-
-* Thu Sep 9 2021 wangchen <wangchen137@huawei.com> - 1:5.45.4-6
-- Delete -S git from %autosetup
-
-* Tue Jun 22 2021 panxiaohe <panxiaohe@huawei.com> - 1:5.45.4-5
-- Delete the telnet patch to remove the dependency on telnet
-
 * Mon Apr 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:5.45.4-4
 - Type:bugfix
 - ID:NA

expect.yaml

@@ -1,4 +0,0 @@
-version_control: NA
-src_repo: NA
-tag_prefix:
-seperator: .