rpms/samba/devel nmb.init,1.2,1.3 samba.spec,1.177,1.178

[Simo Sorce]

Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5094

Modified Files:
	nmb.init samba.spec 
Log Message:
* Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.3.1-0.32
- Fix nmbd init script nmbd reload was causing smbd not nmbd to reload the
  configuration
- Fix upstream bug 6224, nmbd was waiting 5+ minutes before running elections on
  startup, causing your own machine not to show up in the network for 5 minutes
  if it was the only client in that workgroup (fix committed upstream)



Index: nmb.init
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/nmb.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nmb.init	25 Jun 2007 13:51:51 -0000	1.2
+++ nmb.init	26 Mar 2009 20:26:58 -0000	1.3
@@ -64,7 +64,7 @@
 
 reload() {
         echo -n $"Reloading smb.conf file: "
-	killproc smbd -HUP
+	killproc nmbd -HUP
 	RETVAL=$?
 	echo
 	return $RETVAL


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- samba.spec	12 Mar 2009 16:12:57 -0000	1.177
+++ samba.spec	26 Mar 2009 20:26:58 -0000	1.178
@@ -1,3 +1,5 @@
+%define main_release 32
+%define samba_version 3.3.1
 %define main_release 31
 %define samba_version 3.3.2
 %define tdb_version 1.1.2
@@ -46,6 +48,7 @@
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
+Patch201: samba-3.2.8-nmbd_lmb_delay.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -250,6 +253,7 @@
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
+%patch201 -p1 -b .nmbd_lmb_delay
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -879,6 +883,13 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.3.1-0.32
+- Fix nmbd init script nmbd reload was causing smbd not nmbd to reload the
+  configuration
+- Fix upstream bug 6224, nmbd was waiting 5+ minutes before running elections on
+  startup, causing your own machine not to show up in the network for 5 minutes
+  if it was the only client in that workgroup (fix committed upstream)
+
 * Thu Mar 12 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.2-0.31
 - Update to 3.3.2
 - resolves: #489547