[expect/f15/master] Fix mkpasswd fails randomly

[vcrhonek]

commit 35f0bef30b1cdd41490a786f41dcd85b54d73ccf
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Wed Mar 16 14:43:08 2011 +0100

    Fix mkpasswd fails randomly

 expect-5.45-mkpasswd-dash.patch |   13 +++++++++++++
 expect.spec                     |   12 +++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/expect-5.45-mkpasswd-dash.patch b/expect-5.45-mkpasswd-dash.patch
new file mode 100644
index 0000000..fbdecde
--- /dev/null
+++ b/expect-5.45-mkpasswd-dash.patch
@@ -0,0 +1,13 @@
+diff -up expect5.45/example/mkpasswd.orig expect5.45/example/mkpasswd
+--- expect5.45/example/mkpasswd.orig	2011-03-16 13:23:23.125480017 +0100
++++ expect5.45/example/mkpasswd	2011-03-16 13:24:08.739353139 +0100
+@@ -202,7 +202,8 @@ if {[info exists user]} {
+ 	expect {
+ 		"assword*:" {
+ 			# some systems say "Password (again):"
+-			send "$password\r"
++			send -- "$password\r"
++			# "--" because of passwords beginning with dash
+ 			exp_continue
+ 		}
+ 	}
diff --git a/expect.spec b/expect.spec
index 5778ab7..924cd8b 100644
--- a/expect.spec
+++ b/expect.spec
@@ -1,16 +1,15 @@
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
-%define majorver 5.45
+%global majorver 5.45
 
 Summary: A program-script interaction and testing utility
 Name: expect
 Version: %{majorver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: Development/Languages
 # URL: probably more useful is http://sourceforge.net/projects/expect/
 URL: http://expect.nist.gov/
-# Source: upstream doesn't release tarballs, CVS snapshot packed
 Source: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires: tcl-devel tk-devel autoconf automake libXft-devel chrpath
@@ -21,6 +20,8 @@ Patch1: expect-5.43.0-pkgpath.patch
 # examples patches
 # Patch100: changes random function
 Patch100: expect-5.32.2-random.patch
+# Patch101: fixes bz674184 - mkpasswd fails randomly
+Patch101: expect-5.45-mkpasswd-dash.patch
 
 %description
 Expect is a tcl application for automating and testing
@@ -66,6 +67,7 @@ of expectk.
 %patch1 -p1 -b .pkgpath
 # examples fixes
 %patch100 -p1 -b .random
+%patch101 -p1 -b .mkpasswd-dash
 # -pkgpath.patch touch configure.in
 aclocal
 autoconf
@@ -149,6 +151,10 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* Wed Mar 16 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 5.45-3
+- Fix mkpasswd fails randomly
+  Resolves: #674184
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.45-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild