rpms/samba/devel samba-3.2.0rc1-capget.diff, NONE, 1.1 .cvsignore, 1.47, 1.48 samba.spec, 1.151, 1.152 sources, 1.51, 1.52 samba-3.2.0pre2-roreloc.diff, 1.1, NONE samba-3.2.0pre3-join.diff, 1.1, NONE samba-3.2.0pre3-smbclient.diff, 1.1, NONE

[Guenther Deschner (gd)]

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11357

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.2.0rc1-capget.diff 
Removed Files:
	samba-3.2.0pre2-roreloc.diff samba-3.2.0pre3-join.diff 
	samba-3.2.0pre3-smbclient.diff 
Log Message:
Merge F9 to devel again.

Guenther


samba-3.2.0rc1-capget.diff:

--- NEW FILE samba-3.2.0rc1-capget.diff ---
 source/include/smb.h       |    3 +-
 source/lib/system.c        |    5 ++++
 source/smbd/oplock_linux.c |   48 +------------------------------------------
 3 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/source/include/smb.h b/source/include/smb.h
index d6b026d..38d9b7b 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1703,7 +1703,8 @@ minimum length == 18.
 
 enum smbd_capability {
     KERNEL_OPLOCK_CAPABILITY,
-    DMAPI_ACCESS_CAPABILITY
+    DMAPI_ACCESS_CAPABILITY,
+    LEASE_CAPABILITY
 };
 
 /* if a kernel does support oplocks then a structure of the following
diff --git a/source/lib/system.c b/source/lib/system.c
index fa50955..eabb6d6 100644
--- a/source/lib/system.c
+++ b/source/lib/system.c
@@ -733,6 +733,11 @@ static bool set_process_capability(enum smbd_capability capability,
 			cap_vals[num_cap_vals++] = CAP_MKNOD;
 #endif
 			break;
+		case LEASE_CAPABILITY:
+#ifdef CAP_LEASE
+			cap_vals[num_cap_vals++] = CAP_LEASE;
+#endif
+			break;
 	}
 
 	SMB_ASSERT(num_cap_vals <= ARRAY_SIZE(cap_vals));
diff --git a/source/smbd/oplock_linux.c b/source/smbd/oplock_linux.c
index fa7cb42..08df228 100644
--- a/source/smbd/oplock_linux.c
+++ b/source/smbd/oplock_linux.c
@@ -22,22 +22,6 @@
 
 #if HAVE_KERNEL_OPLOCKS_LINUX
 
-/* these can be removed when they are in glibc headers */
-struct  cap_user_header {
-	uint32 version;
-	int pid;
-} header;
-struct cap_user_data {
-	uint32 effective;
-	uint32 permitted;
-	uint32 inheritable;
-} data;
-
-extern int capget(struct cap_user_header * hdrp,
-		  struct cap_user_data * datap);
-extern int capset(struct cap_user_header * hdrp,
-		  const struct cap_user_data * datap);
-
 static SIG_ATOMIC_T signals_received;
 #define FD_PENDING_SIZE 100
 static SIG_ATOMIC_T fd_pending_array[FD_PENDING_SIZE];
@@ -75,40 +59,12 @@ static void signal_handler(int sig, siginfo_t *info, void *unused)
 	sys_select_signal(RT_SIGNAL_LEASE);
 }
 
-/****************************************************************************
- Try to gain a linux capability.
-****************************************************************************/
-
-static void set_capability(unsigned capability)
-{
-#ifndef _LINUX_CAPABILITY_VERSION
-#define _LINUX_CAPABILITY_VERSION 0x19980330
-#endif
-	header.version = _LINUX_CAPABILITY_VERSION;
-	header.pid = 0;
-
-	if (capget(&header, &data) == -1) {
-		DEBUG(3,("Unable to get kernel capabilities (%s)\n",
-			 strerror(errno)));
-		return;
-	}
-
-	if (0 == (data.effective & (1<<capability))) {
-		data.effective |= (1<<capability);
-
-		if (capset(&header, &data) == -1) {
-			DEBUG(3,("Unable to set %d capability (%s)\n", 
-				 capability, strerror(errno)));
-		}
-	}
-}
-
 /*
  * public function to get linux lease capability. Needed by some VFS modules (eg. gpfs.c)
  */
 void linux_set_lease_capability(void)
 {
-	set_capability(CAP_LEASE);
+	set_effective_capability(LEASE_CAPABILITY);
 }
 
 /* 
@@ -136,7 +92,7 @@ int linux_setlease(int fd, int leasetype)
 
 	ret = fcntl(fd, F_SETLEASE, leasetype);
 	if (ret == -1 && errno == EACCES) {
-		set_capability(CAP_LEASE);
+		set_effective_capability(LEASE_CAPABILITY);
 		ret = fcntl(fd, F_SETLEASE, leasetype);
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	25 Apr 2008 19:15:19 -0000	1.47
+++ .cvsignore	26 May 2008 16:31:07 -0000	1.48
@@ -1 +1 @@
-samba-3.2.0pre3.tar.gz
+samba-3.2.0rc1.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- samba.spec	16 May 2008 11:05:08 -0000	1.151
+++ samba.spec	26 May 2008 16:31:07 -0000	1.152
@@ -1,5 +1,5 @@
-%define main_release 11
-%define samba_version 3.2.0pre3
+%define main_release 13
+%define samba_version 3.2.0rc1
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -7,13 +7,13 @@
 Name: samba
 Epoch: 0
 Version: 3.2.0
-Release: 1.pre3.%{main_release}%{?dist}
+Release: 1.rc1.%{main_release}%{?dist}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 #TAG: change for non-pre
-Source: http://download.samba.org/samba/ftp/pre/%{name}-%{version}pre3.tar.gz
+Source: http://download.samba.org/samba/ftp/rc/%{name}-%{version}rc1.tar.gz
 #Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz
 
 # Red Hat specific replacement-files
@@ -46,9 +46,7 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch207: samba-3.2.0pre2-roreloc.diff
-Patch208: samba-3.2.0pre3-smbclient.diff
-Patch209: samba-3.2.0pre3-join.diff
+Patch220: samba-3.2.0rc1-capget.diff
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -252,12 +250,10 @@
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 #%patch108 -p1 -b .non-ascii-domain
-%patch110 -p1 -b .smbspool
+#%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
-%patch207 -p1 -b .roreloc
-%patch208 -p1 -b .smbclient
-%patch209 -p1 -b .join
+%patch220 -p1 -b .capget
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION
@@ -434,9 +430,9 @@
 ln -s libtalloc.so.1 $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libtdb.so $RPM_BUILD_ROOT%{_libdir}/samba/libtdb.a || true
-install -m 755 source/bin/libtdb.so $RPM_BUILD_ROOT%{_libdir}/libtdb.so.0
+install -m 755 source/bin/libtdb.so $RPM_BUILD_ROOT%{_libdir}/libtdb.so.1
 install -m 644 source/lib/tdb/tdb.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc
-ln -s libtdb.so.0 $RPM_BUILD_ROOT%{_libdir}/libtdb.so
+ln -s libtdb.so.1 $RPM_BUILD_ROOT%{_libdir}/libtdb.so
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libwbclient.so $RPM_BUILD_ROOT%{_libdir}/samba/libwbclient.a || true
 install -m 755 source/bin/libwbclient.so $RPM_BUILD_ROOT%{_libdir}/libwbclient.so.0
@@ -852,6 +848,13 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Fri May 23 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.0-1.pre3.13
+- Update to 3.2.0rc1
+
+* Wed May 21 2008 Simo Sorce <ssorce at redhat.com> - 3.2.0-1.pre3.12
+- impossit made iimpossible to print against Vista and XP SP3 as servers
+- resolves: #439154
+
 * Thu May 15 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.0-1.pre3.11
 - Add "net ads join createcomputer=ou1/ou2/ou3" fix (BZO #5465)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	25 Apr 2008 19:15:20 -0000	1.51
+++ sources	26 May 2008 16:31:07 -0000	1.52
@@ -1 +1 @@
-b8d013bdb8f65f494778ffcb50cf0215  samba-3.2.0pre3.tar.gz
+df46b81d4921136af3aaade65c054d31  samba-3.2.0rc1.tar.gz


--- samba-3.2.0pre2-roreloc.diff DELETED ---


--- samba-3.2.0pre3-join.diff DELETED ---


--- samba-3.2.0pre3-smbclient.diff DELETED ---