[kdebase] Password & User account becomes non responding

[Than Ngo]

commit 8651829f0f90b2986d4e975932b978302e48a771
Author: Than Ngo <than at redhat.com>
Date:   Thu Sep 30 15:53:57 2010 +0200

    Password & User account becomes non responding

 kdebase-4.3.4-bz#609039-chfn-parse.patch |   37 ++++++++++++++++++++++++++++++
 kdebase.spec                             |   26 ++++++++++++++++-----
 2 files changed, 57 insertions(+), 6 deletions(-)
---
diff --git a/kdebase-4.3.4-bz#609039-chfn-parse.patch b/kdebase-4.3.4-bz#609039-chfn-parse.patch
new file mode 100644
index 0000000..ae316f5
--- /dev/null
+++ b/kdebase-4.3.4-bz#609039-chfn-parse.patch
@@ -0,0 +1,37 @@
+diff -up kdebase-4.5.1/apps/kdepasswd/kcm/chfnprocess.cpp.orig kdebase-4.5.1/apps/kdepasswd/kcm/chfnprocess.cpp
+--- kdebase-4.5.1/apps/kdepasswd/kcm/chfnprocess.cpp.orig	2010-09-29 18:28:02.000000000 +0200
++++ kdebase-4.5.1/apps/kdepasswd/kcm/chfnprocess.cpp	2010-09-30 14:39:38.000000000 +0200
+@@ -63,19 +63,16 @@ int ChfnProcess::ConverseChfn(const char
+       break;
+     }
+ 
+-    if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ )
++    if ( line.contains( "Changing finger info" ) )
++    {
++      // do nothing
++    }
++    else if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ )
+     {
+       WaitSlave();
+       write(fd(), pass, strlen(pass));
+       write(fd(), "\n", 1);
+     }
+-
+-    line = readLine(); // Let's see what the outcome was
+-
+-    if ( line.contains( "Changing finger info" ) )
+-    {
+-      // do nothing
+-    }
+     else if ( line.contains( "information changed" ) )
+     {
+       status=0;
+@@ -86,7 +83,7 @@ int ChfnProcess::ConverseChfn(const char
+       status=0;
+       break;
+     }
+-    else if ( line.contains( "Password error" ) || line.contains("Incorrect password") )
++    else if ( line.contains( "Password error" ) || line.contains("Incorrect password") || line.contains("Authentication failure") )
+     {
+       status=PasswordError;
+       break;
diff --git a/kdebase.spec b/kdebase.spec
index 05bc0c6..93f4869 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -2,7 +2,7 @@ Name:    kdebase
 Summary: KDE Core Applications 
 Epoch:   6
 Version: 4.5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -10,17 +10,25 @@ URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:   kdebase-4.1.80-nsplugins-paths.patch
+# search path for plugins
+Patch0: kdebase-4.1.80-nsplugins-paths.patch
+
 # backwards compatibility hack for a config option changed by our old
-# konsole-session patch
-Patch1:   kdebase-4.4.3-konsole-activetabindex.patch
-Patch2:   kdebase-4.2.1-home-icon.patch
+Patch1: kdebase-4.4.3-konsole-activetabindex.patch
+
+# make menuitem Home visible
+Patch2: kdebase-4.2.1-home-icon.patch
+
 # fix disabling automatic spell checking in the Konqueror UI (kde#228593)
-Patch3:   kdebase-4.4.0-konqueror-kde#228593.patch
+Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
+
+# Password & User account becomes non responding
+patch4: kdebase-4.3.4-bz#609039-chfn-parse.patch
 
 ## upstream patches
 # backport http://websvn.kde.org/?view=revision&revision=1168744
 Patch100: kdebase-4.5.1-ebrowsing_categories.patch
+
 # http://bugs.kde.org/166573 -  minimum tab width is too wide 
 Patch101: kdebase-konsole_min_tab_width.patch 
 
@@ -112,10 +120,13 @@ Requires: kdelibs4-devel kdepimlibs4-devel
 
 %prep
 %setup -q -n kdebase-%{version}%{?alphatag}
+
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-activetabindex
 %patch2 -p1 -b .home-icon
 %patch3 -p1 -b .kde#228593
+%patch4 -p1 -b .bz#631481
+
 %patch100 -p3 -b .ebrowsing_categories
 %patch101 -p4 -b .konsole_min_tab_width
 
@@ -273,6 +284,9 @@ fi
 
 
 %changelog
+* Thu Sep 30 2010 Than Ngo <than at redhat.com> - 6:4.5.1-4
+- Password & User account becomes non responding
+
 * Wed Sep 29 2010 jkeating - 6:4.5.1-3
 - Rebuilt for gcc bug 634757