rpms/luma/FC-6 luma-2.3-smd5.patch,NONE,1.1 luma.spec,1.1,1.2

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/luma/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23395

Modified Files:
	luma.spec 
Added Files:
	luma-2.3-smd5.patch 
Log Message:
Add SMD5-patch

luma-2.3-smd5.patch:

--- NEW FILE luma-2.3-smd5.patch ---
--- luma-2.3/lib/luma/base/utils/backend/mkpasswd.py.org	2007-03-11 21:28:36.000000000 +0100
+++ luma-2.3/lib/luma/base/utils/backend/mkpasswd.py	2007-03-11 21:29:21.000000000 +0100
@@ -108,7 +108,7 @@
             return pwString[:-1]
         elif default =='smd5':
             salt = getsalt(length=4) # Newer versions of OpenLDAP should support the default length 16
-            pwString = "{SMD5}" + base64.encodestring(md5.new(str(pwd)).digest() + salt)
+            pwString = "{SMD5}" + base64.encodestring(md5.new(str(pwd) + salt).digest() + salt)
             return pwString[:-1]
         elif default =='crypt':
             return "{CRYPT}" + crypt.crypt(str(pwd),getsalt(length=2)) # crypt only uses a salt of length 2


Index: luma.spec
===================================================================
RCS file: /cvs/extras/rpms/luma/FC-6/luma.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- luma.spec	18 Oct 2006 14:43:04 -0000	1.1
+++ luma.spec	11 Mar 2007 20:36:24 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		luma
 Version:	2.3
-Release: 	8%{?dist}
+Release: 	9%{?dist}
 Summary:	A graphical tool for managing LDAP servers
 
 Group:		Applications/System
@@ -13,6 +13,7 @@
 Source0:	http://prdowloads.sourceforge.net/luma/luma-%{version}.tar.bz2
 Source1:	luma.desktop
 Patch1:		luma-2.3-plugins.patch
+Patch2:		luma-2.3-smd5.patch
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +39,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 
+%patch2 -p1
 
 %build
 
@@ -108,6 +110,9 @@
 
 
 %changelog
+* Sun Mar 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3-9
+- Add SMD5-patchno (#228269)
+
 * Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-8
 - Fix x64 problem