!9 Delete the telnet patch to remove the dependency on telnet

From: @panxh_purple
Reviewed-by: @overweight
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2021-06-22 07:05:14 +00:00 committed by Gitee
commit 101edf8413
2 changed files with 4 additions and 33 deletions

View File

@ -1,29 +0,0 @@
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 {

View File

@ -4,7 +4,7 @@
Name: expect Name: expect
Epoch: 1 Epoch: 1
Version: 5.45.4 Version: 5.45.4
Release: 4 Release: 5
Summary: A tool for automating interactive applications Summary: A tool for automating interactive applications
License: Public Domain License: Public Domain
URL: https://core.tcl.tk/expect/index URL: https://core.tcl.tk/expect/index
@ -35,9 +35,6 @@ Patch7: expect-5.45-fd-leak.patch
Patch100: expect-5.32.2-random.patch Patch100: expect-5.32.2-random.patch
# Patch101: fixes bz674184 - mkpasswd fails randomly # Patch101: fixes bz674184 - mkpasswd fails randomly
Patch101: expect-5.45-mkpasswd-dash.patch 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: use full path to 'su', it's safer
Patch103: expect-5.45-passmass-su-full-path.patch Patch103: expect-5.45-passmass-su-full-path.patch
# Patch104: rhbz 963889, fixes inaccuracy in mkpasswd man page # Patch104: rhbz 963889, fixes inaccuracy in mkpasswd man page
@ -120,6 +117,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
%{_mandir}/man3/libexpect.3* %{_mandir}/man3/libexpect.3*
%changelog %changelog
* 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 * Mon Apr 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:5.45.4-4
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA