rpms/system-config-samba/F-10 system-config-samba-1.2.67-unicode.patch, NONE, 1.1 system-config-samba.spec, 1.67, 1.68

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26856

Modified Files:
	system-config-samba.spec 
Added Files:
	system-config-samba-1.2.67-unicode.patch 
Log Message:
write smb.conf in binary mode
use dbus.ByteArray for contents in writeSmbConf()


system-config-samba-1.2.67-unicode.patch:

--- NEW FILE system-config-samba-1.2.67-unicode.patch ---
diff -up system-config-samba-1.2.67/src/scsamba/core/sambaBackend.py.unicode system-config-samba-1.2.67/src/scsamba/core/sambaBackend.py
--- system-config-samba-1.2.67/src/scsamba/core/sambaBackend.py.unicode	2008-11-13 16:17:19.000000000 +0100
+++ system-config-samba-1.2.67/src/scsamba/core/sambaBackend.py	2008-12-10 15:25:11.000000000 +0100
@@ -96,7 +96,7 @@ class SambaBackend (object):
         except OSError, e:
             if e.errno != errno.ENOENT:
                 raise e
-        file = open (self.path + ".new", 'w', oldmode)
+        file = open (self.path + ".new", 'wb', oldmode)
         file.write (contents)
         file.close ()
         os.rename (self.path + ".new", self.path)
diff -up system-config-samba-1.2.67/src/scsamba/dbus/service/sambaBackend.py.unicode system-config-samba-1.2.67/src/scsamba/dbus/service/sambaBackend.py
--- system-config-samba-1.2.67/src/scsamba/dbus/service/sambaBackend.py.unicode	2008-11-13 16:17:19.000000000 +0100
+++ system-config-samba-1.2.67/src/scsamba/dbus/service/sambaBackend.py	2008-12-10 15:25:11.000000000 +0100
@@ -51,7 +51,7 @@ class SambaBackend (slip.dbus.service.Ob
     def readSmbConf (self):
         return self.backend.readSmbConf ()
 
-    @dbus.service.method (dbus_interface = dbus_service_name + ".Backend", in_signature = "s")
+    @dbus.service.method (dbus_interface = dbus_service_name + ".Backend", in_signature = "ay", byte_arrays = True)
     def writeSmbConf (self, contents):
         return self.backend.writeSmbConf (contents)
 


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-10/system-config-samba.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- system-config-samba.spec	9 Dec 2008 11:22:40 -0000	1.67
+++ system-config-samba.spec	10 Dec 2008 14:28:11 -0000	1.68
@@ -12,7 +12,7 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
 Version: 1.2.67
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPLv2+
 Group: System Environment/Base
@@ -22,6 +22,7 @@
 # package.
 Source0: %{name}-%{version}.tar.bz2
 Patch0: system-config-samba-1.2.67-dbus.patch
+Patch1: system-config-samba-1.2.67-unicode.patch
 BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
@@ -52,6 +53,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .dbus
+%patch1 -p1 -b .unicode
 
 %build
 make %{?_smp_mflags}
@@ -101,8 +103,12 @@
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Wed Dec 10 2008 Nils Philippsen <nils at redhat.com> - 1.2.67-3
+- write smb.conf in binary mode
+- use dbus.ByteArray for contents in writeSmbConf()
+
 * Tue Dec 09 2008 Nils Philippsen <nils at redhat.com> - 1.2.67-2
-- allow anyone to invoke dbus methods
+- allow anyone to invoke dbus methods (#475524)
 
 * Wed Nov 12 2008 Nils Philippsen <nils at redhat.com> - 1.2.67-1
 - use different defaults for PolicyKit authorizations (#470330)