diff --git a/expect-5.45-check-telnet.patch b/expect-5.45-check-telnet.patch deleted file mode 100644 index 0b67dc664905a883e9221e8e5330d323b9025803..0000000000000000000000000000000000000000 --- a/expect-5.45-check-telnet.patch +++ /dev/null @@ -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 { diff --git a/expect.spec b/expect.spec index bbd1a590c0b8189f26479fbc6d2e68d022631776..9c703b5d75ed1410fb055db2603634d74c96c03e 100644 --- a/expect.spec +++ b/expect.spec @@ -4,7 +4,7 @@ Name: expect Epoch: 1 Version: 5.45.4 -Release: 4 +Release: 5 Summary: A tool for automating interactive applications License: Public Domain 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 # 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 @@ -120,6 +117,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so %{_mandir}/man3/libexpect.3* %changelog +* Fri Jan 8 2021 fuanan - 1:5.45.4-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove useless telnet patch. + * Mon Apr 20 2020 openEuler Buildteam - 1:5.45.4-4 - Type:bugfix - ID:NA