rpms/samba/devel samba-3.2.5-inotify.patch, NONE, 1.1 samba.spec, 1.163, 1.164 samba-3.0.13-smbclient.patch, 1.1, NONE samba-3.0.21pre1-smbspool.patch, 1.1, NONE samba-3.0.23-logfiles.patch, 1.2, NONE samba-3.0.25rc1-inotifiy.patch, 1.1, NONE samba-3.0.8-non-ascii-domain.patch, 1.1, NONE samba-3.2.0pre1-winbindd-padding.patch, 1.1, NONE

[Simo Sorce]

Author: simo

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

Modified Files:
	samba.spec 
Added Files:
	samba-3.2.5-inotify.patch 
Removed Files:
	samba-3.0.13-smbclient.patch samba-3.0.21pre1-smbspool.patch 
	samba-3.0.23-logfiles.patch samba-3.0.25rc1-inotifiy.patch 
	samba-3.0.8-non-ascii-domain.patch 
	samba-3.2.0pre1-winbindd-padding.patch 
Log Message:
Remove unused patches and fix the one we still want to carry on


samba-3.2.5-inotify.patch:

--- NEW FILE samba-3.2.5-inotify.patch ---
=== modified file 'source/smbd/notify_inotify.c'
--- source/smbd/notify_inotify.c	2007-03-09 12:07:58 +0000
+++ source/smbd/notify_inotify.c	2007-04-10 16:27:47 +0000
@@ -66,6 +66,7 @@
 	struct sys_notify_context *ctx;
 	int fd;
 	struct inotify_watch_context *watches;
+	bool broken_inotify;	/* Late stop for broken system */
 };
 
 struct inotify_watch_context {
@@ -229,8 +230,16 @@
 	  filenames, and thus can't know how much to allocate
 	  otherwise
 	*/
-	if (ioctl(in->fd, FIONREAD, &bufsize) != 0 || 
-	    bufsize == 0) {
+
+	if ((ioctl(in->fd, FIONREAD, &bufsize) != 0) && (errno == EACCES)) {
+		/*
+		 * Workaround for broken system (SELinux policy bug fixed since long but it is always better not to loop on EACCES)
+		 */
+		TALLOC_FREE(fde);
+		in->broken_inotify = True;
+		return;
+	}
+	if (bufsize == 0) {
 		DEBUG(0,("No data on inotify fd?!\n"));
 		return;
 	}
@@ -281,6 +290,7 @@
 	}
 	in->ctx = ctx;
 	in->watches = NULL;
+	in->broken_inotify = False;
 
 	ctx->private_data = in;
 	talloc_set_destructor(in, inotify_destructor);
@@ -375,6 +385,10 @@
 
 	in = talloc_get_type(ctx->private_data, struct inotify_private);
 
+	if (in->broken_inotify) {
+		return NT_STATUS_OK;
+	}
+
 	mask = inotify_map(e);
 	if (mask == 0) {
 		/* this filter can't be handled by inotify */



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- samba.spec	27 Nov 2008 15:11:48 -0000	1.163
+++ samba.spec	27 Nov 2008 21:19:30 -0000	1.164
@@ -1,11 +1,11 @@
-%define main_release 23
+%define main_release 24
 %define samba_version 3.2.5
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
 %define samba_release 0.%{main_release}%{?dist}
 
-Summary: The Samba Suite of programs
+Summary: Server and Client software to interoperate with Windows machines
 Name: samba
 Epoch: 0
 Version: 3.2.5
@@ -38,14 +38,10 @@
 
 # generic patches
 Patch102: samba-3.2.0pre1-pipedir.patch
-#Patch103: samba-3.0.23-logfiles.patch
 Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
-#Patch108: samba-3.0.8-non-ascii-domain.patch
-Patch110: samba-3.0.21pre1-smbspool.patch
-Patch111: samba-3.0.13-smbclient.patch
-Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch200: samba-3.2.5-inotify.patch
 Patch201: samba-3.2.4-build.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -249,10 +245,7 @@
 #%patch103 -p1 -b .logfiles
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
-#%patch108 -p1 -b .non-ascii-domain
-#%patch110 -p1 -b .smbspool # FIXME: does not apply
-#%patch111 -p1 -b .smbclient # FIXME: does not apply
-#%patch200 -p0 -b .inotify # FIXME: does not compile
+%patch200 -p0 -b .inotify
 %patch201 -p1 -b .build
 
 mv source/VERSION source/VERSION.orig


--- samba-3.0.13-smbclient.patch DELETED ---


--- samba-3.0.21pre1-smbspool.patch DELETED ---


--- samba-3.0.23-logfiles.patch DELETED ---


--- samba-3.0.25rc1-inotifiy.patch DELETED ---


--- samba-3.0.8-non-ascii-domain.patch DELETED ---


--- samba-3.2.0pre1-winbindd-padding.patch DELETED ---