diff --git a/expect-5.45-mkpasswd-man.patch b/expect-5.45-mkpasswd-man.patch new file mode 100644 index 0000000..901117d --- /dev/null +++ b/expect-5.45-mkpasswd-man.patch @@ -0,0 +1,38 @@ +diff -up expect5.45/example/mkpasswd.man.mkpasswd-man expect5.45/example/mkpasswd.man +--- expect5.45/example/mkpasswd.man.mkpasswd-man 2000-08-04 20:01:56.000000000 +0200 ++++ expect5.45/example/mkpasswd.man 2013-08-13 16:36:26.860711972 +0200 +@@ -40,8 +40,8 @@ The following example creates a 20 chara + + The + .B \-d +-flag defines the minimum number of digits that must be in the password. +-The default is 2. The following example creates a password with at least ++flag defines the number of digits that must be in the password. ++The default is 2. The following example creates a password with + 3 digits. + + mkpasswd -d 3 +@@ -53,12 +53,12 @@ The default is 2. + + The + .B \-C +-flag defines the minimum number of uppercase alphabetic characters that must be in the password. ++flag defines the number of uppercase alphabetic characters that must be in the password. + The default is 2. + + The + .B \-s +-flag defines the minimum number of special characters that must be in the password. ++flag defines the number of special characters that must be in the password. + The default is 1. + + The +@@ -80,7 +80,7 @@ By default, it is suppressed. + + .SH EXAMPLE + The following example creates a 15-character password +-that contains at least 3 digits and 5 uppercase characters. ++that contains 3 digits and 5 uppercase characters. + + mkpasswd -l 15 -d 3 -C 5 + diff --git a/expect.spec b/expect.spec index 12c3657..de51f35 100644 --- a/expect.spec +++ b/expect.spec @@ -5,7 +5,7 @@ Summary: A program-script interaction and testing utility Name: expect Version: %{majorver} -Release: 10%{?dist} +Release: 11%{?dist} License: Public Domain Group: Development/Languages # URL: probably more useful is http://sourceforge.net/projects/expect/ @@ -31,6 +31,8 @@ Patch101: expect-5.45-mkpasswd-dash.patch 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 +Patch104: expect-5.45-mkpasswd-man.patch %description Expect is a tcl application for automating and testing @@ -81,6 +83,7 @@ of expectk. %patch101 -p1 -b .mkpasswd-dash %patch102 -p1 -b .check-telnet %patch103 -p1 -b .passmass-su-full-path +%patch104 -p1 -b .mkpasswd-man # -pkgpath.patch touch configure.in aclocal autoconf @@ -164,6 +167,10 @@ rm -rf "$RPM_BUILD_ROOT" %{_mandir}/man1/tknewsbiff.1* %changelog +* Tue Aug 27 2013 Vitezslav Crhonek - 5.45-11 +- Fix inaccuracy in mkpasswd man page + Resolves: #963889 + * Sat Aug 03 2013 Fedora Release Engineering - 5.45-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild