Update gentooify patch to find smbpasswd so users are accurate.

Package-Manager: portage-2.1.2_pre1

3 files changed, 30 insertions, 10 deletions

diff --git a/app-admin/system-config-samba/ChangeLog b/app-admin/system-config-samba/ChangeLog
index 67daa366eefb..960055e0d14d 100644
--- a/app-admin/system-config-samba/ChangeLog
+++ b/app-admin/system-config-samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/system-config-samba
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-samba/ChangeLog,v 1.2 2006/09/05 21:56:16 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-samba/ChangeLog,v 1.3 2006/09/22 04:39:59 dberkholz Exp $
+
+  22 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  files/1.2.35-gentooify.patch:
+  Update gentooify patch to find smbpasswd so users are accurate.
 
   05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   system-config-samba-1.2.35.ebuild:
diff --git a/app-admin/system-config-samba/Manifest b/app-admin/system-config-samba/Manifest
index 9da2cb16f23c..931fb6ea8440 100644
--- a/app-admin/system-config-samba/Manifest
+++ b/app-admin/system-config-samba/Manifest
@@ -1,16 +1,16 @@
-AUX 1.2.35-gentooify.patch 1166 RMD160 4b58e13a44d775d77e01f96219b8f0b33e9ee883 SHA1 da4ae7d070b129c0fa4df243b95debc5fba84b2b SHA256 9f27eac1b7e2319a3c3fa7df38fb5a53ef2d26fd9520a78b93a3b313a0523e0b
-MD5 2934513d7cd06898ae75168431a00eaa files/1.2.35-gentooify.patch 1166
-RMD160 4b58e13a44d775d77e01f96219b8f0b33e9ee883 files/1.2.35-gentooify.patch 1166
-SHA256 9f27eac1b7e2319a3c3fa7df38fb5a53ef2d26fd9520a78b93a3b313a0523e0b files/1.2.35-gentooify.patch 1166
+AUX 1.2.35-gentooify.patch 1759 RMD160 24f4e28cde960605fa160b7e6865a00cd92f6014 SHA1 f1e485fd86280411c0660c4fbb9d8921071dd64a SHA256 b24851a7e4e5074894810a02f2f56411020667bfe24bc10d2baffaa173477350
+MD5 37cdc635b013cda839055a104c6beb62 files/1.2.35-gentooify.patch 1759
+RMD160 24f4e28cde960605fa160b7e6865a00cd92f6014 files/1.2.35-gentooify.patch 1759
+SHA256 b24851a7e4e5074894810a02f2f56411020667bfe24bc10d2baffaa173477350 files/1.2.35-gentooify.patch 1759
 DIST system-config-samba-1.2.35-1.1.src.rpm 188958 RMD160 2f3c3fe3a2d1177194d731f35f2879aa825c4958 SHA1 cc936e966e9ee9d59a3e5485ec8633c8c1a33bf1 SHA256 b9e3e7f305917046d6e35761b60825087b997986200485cbd91ab7bb2f76bc8a
 EBUILD system-config-samba-1.2.35.ebuild 1101 RMD160 832b636ebf4c3e1f67661cd7b037d831d414f283 SHA1 e0c020cca2c0ff71215af69621ff6d7cf04471ad SHA256 35eda6a3091b5d89ece1ccb3da31e7a1339bb54f328f2a7d5ddb77c35ec0af75
 MD5 48fd11216e105f491fd9cbed19f8a9fa system-config-samba-1.2.35.ebuild 1101
 RMD160 832b636ebf4c3e1f67661cd7b037d831d414f283 system-config-samba-1.2.35.ebuild 1101
 SHA256 35eda6a3091b5d89ece1ccb3da31e7a1339bb54f328f2a7d5ddb77c35ec0af75 system-config-samba-1.2.35.ebuild 1101
-MISC ChangeLog 579 RMD160 5b28f9958bd677799f4345ea5c0b9e2590f908f1 SHA1 1f787ce0a8b873afdb84c507b5dbaff47e05dfc7 SHA256 8b941139901059387742ad0098e3c48d3cf814c0d76fdc5ee23aaddb58958675
-MD5 3f630cd84e6930ba5dd2ad36ad6b1ffd ChangeLog 579
-RMD160 5b28f9958bd677799f4345ea5c0b9e2590f908f1 ChangeLog 579
-SHA256 8b941139901059387742ad0098e3c48d3cf814c0d76fdc5ee23aaddb58958675 ChangeLog 579
+MISC ChangeLog 733 RMD160 e471dcf25dd63b474c6318066b338f0b68549770 SHA1 a75345a99967e7dadf9811f7005147ca2ab2c5e5 SHA256 8ea842c1c979e1722fc48b815d11b8af13ee124e804d6741c7efb6d808b18793
+MD5 bfafdcaf36b50f1b85965168b812fe52 ChangeLog 733
+RMD160 e471dcf25dd63b474c6318066b338f0b68549770 ChangeLog 733
+SHA256 8ea842c1c979e1722fc48b815d11b8af13ee124e804d6741c7efb6d808b18793 ChangeLog 733
 MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
 MD5 4f7fe0eacb3ba0ef618e04831e4a7517 metadata.xml 252
 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 metadata.xml 252
diff --git a/app-admin/system-config-samba/files/1.2.35-gentooify.patch b/app-admin/system-config-samba/files/1.2.35-gentooify.patch
index 2efbae1063c1..b2b77ee96d4c 100644
--- a/app-admin/system-config-samba/files/1.2.35-gentooify.patch
+++ b/app-admin/system-config-samba/files/1.2.35-gentooify.patch
@@ -4,7 +4,7 @@ RCS file: /usr/local/CVS/redhat-config-samba/src/sambaBackend.py,v
 retrieving revision 1.14
 diff -u -b -B -r1.14 sambaBackend.py
 --- src/sambaBackend.py	4 Mar 2004 23:55:01 -0000	1.14
-+++ src/sambaBackend.py	4 Sep 2006 17:34:12 -0000
++++ src/sambaBackend.py	22 Sep 2006 04:35:54 -0000
 @@ -31,7 +31,7 @@
  class SambaBackend:
  
@@ -33,3 +33,19 @@ diff -u -b -B -r1.14 sambaBackend.py
 +        fd = os.popen('/etc/init.d/samba restart')
          lines = fd.readlines()
          fd.close()
+Index: src/sambaUserData.py
+===================================================================
+RCS file: /usr/local/CVS/redhat-config-samba/src/sambaUserData.py,v
+retrieving revision 1.31
+diff -u -b -B -r1.31 sambaUserData.py
+--- src/sambaUserData.py	1 Apr 2005 15:35:37 -0000	1.31
++++ src/sambaUserData.py	22 Sep 2006 04:35:54 -0000
+@@ -42,7 +42,7 @@
+ 
+     def readSmbPasswdFile(self):
+         #Let's check to see if smbpasswd exists
+-        path = '/etc/samba/smbpasswd'
++        path = '/var/lib/samba/private/smbpasswd'
+         list = []
+ 
+         if os.access(path, os.F_OK) == 1: