* Sat May 01 2010 Simo Sorce <ssorce@redhat.com> - 3.5.2-60

- Fix segfault bug #586511

.cvsignore

@@ -1 +1 @@
-samba-3.5.0rc2.tar.gz
+samba-3.5.2.tar.gz

branch

@@ -0,0 +1 @@
+F-13

samba-3.5.2-smbclient-segfault.patch

@@ -0,0 +1,22 @@
+diff -uPr samba-3.5.2.orig/source3/libsmb/cliconnect.c samba-3.5.2/source3/libsmb/cliconnect.c
+--- samba-3.5.2.orig/source3/libsmb/cliconnect.c	2010-04-01 09:26:22.000000000 -0400
++++ samba-3.5.2/source3/libsmb/cliconnect.c	2010-05-01 14:05:58.171965275 -0400
+@@ -1320,6 +1320,8 @@
+ 	char *tmp = NULL;
+ 	uint8_t *bytes;
+ 
++	*psmbreq = NULL;
++
+ 	req = tevent_req_create(mem_ctx, &state, struct cli_tcon_andx_state);
+ 	if (req == NULL) {
+ 		return NULL;
+@@ -1455,6 +1457,9 @@
+ 	if (req == NULL) {
+ 		return NULL;
+ 	}
++	if (subreq == NULL) {
++		return req;
++	}
+ 	status = cli_smb_req_send(subreq);
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		tevent_req_nterror(req, status);

samba.spec

@@ -1,9 +1,9 @@
-%define main_release 54
-%define samba_version 3.5.0
-%define tdb_version 1.1.7
+%define main_release 60
+%define samba_version 3.5.2
+%define tdb_version 1.2.1
 %define talloc_version 2.0.1
-#%define pre_release %nil
-%define pre_release rc2
+#%define pre_release rc3
+%define pre_release %nil
 
 %define samba_release %{main_release}%{pre_release}%{?dist}
 
@@ -37,7 +37,7 @@ Source999: filter-requires-samba.sh
 
 # upstream patches.  Applied first so that they'll break our patches rather
 # than the other way around
-# (none right now)
+Patch01: samba-3.5.2-smbclient-segfault.patch
 
 # generic patches
 Patch102: samba-3.2.0pre1-pipedir.patch
@@ -83,15 +83,6 @@ The samba-client package provides some SMB/CIFS clients to complement
 the built-in SMB/CIFS filesystem in Linux. These clients allow access
 of SMB/CIFS shares and printing to SMB/CIFS printers.
 
-%package -n cifs-utils
-Summary: Helper programs for mounting shares using the in-kernel CIFS client
-Group: Applications/System
-Requires: samba-common = %{epoch}:%{samba_version}-%{release}
-
-%description -n cifs-utils
-The cifs-utils package contains helper programs for mounting shares
-using the in-kernel Linux CIFS client.
-
 %package common
 Summary: Files used by both Samba servers and clients
 Requires: libtdb >= 0:%{tdb_version}
@@ -203,7 +194,7 @@ cp %{SOURCE10} packaging/Fedora/
 cp %{SOURCE11} packaging/Fedora/
 
 # Upstream patches
-#(none)
+%patch01 -p1 -b .smbclient_segfault
 # generic patches
 %patch102 -p1 -b .pipedir
 #%patch103 -p1 -b .logfiles
@@ -262,7 +253,6 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \
     --with-pammodulesdir=%{_lib}/security \
     --with-swatdir=%{_datadir}/swat \
     --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
-    --with-cifsupcall \
     --with-cluster-support=auto \
     --with-libtalloc=no \
     --enable-external-libtalloc=yes \
@@ -281,7 +271,7 @@ make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%sam
     %{?_smp_mflags} \
     -C lib/netapi/examples
 
-make  debug2html smbfilter bin/cifs.upcall
+make  debug2html smbfilter
 
 
 %install
@@ -370,7 +360,6 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
-install -m755 $RPM_BUILD_ROOT/usr/sbin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
 
 install -m 755 %samba_source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
@@ -388,10 +377,11 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/testprns.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmount.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/umount.cifs.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{u,}mount.cifs.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{u,}cifs.upcall.8*
 
-# why are these getting installed in the wrong place?
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
+rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.upcall
 
 #Rename ldb tools, as samba3 has an old copy of ldb.
 mv -f $RPM_BUILD_ROOT%{_bindir}/ldbadd $RPM_BUILD_ROOT%{_bindir}/ldb3add
@@ -538,13 +528,6 @@ exit 0
 %{_mandir}/man1/sharesec.1*
 %{_mandir}/man8/smbspool.8*
 
-%files -n cifs-utils
-%defattr(-,root,root)
-/sbin/mount.cifs
-%{_sbindir}/cifs.upcall
-%{_mandir}/man8/mount.cifs.8*
-%{_mandir}/man8/cifs.upcall.8*
-
 %files common
 %defattr(-,root,root)
 %attr(755,root,root) /%{_lib}/security/pam_smbpass.so
@@ -667,6 +650,25 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Sat May 01 2010 Simo Sorce <ssorce@redhat.com> - 3.5.2-60
+- Fix segfault bug #586511
+
+* Wed Apr 07 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.2-59
+- Update to 3.5.2
+
+* Mon Mar 08 2010 Simo Sorce <ssorce@redhat.com> - 3.5.1-58
+- Security update to 3.5.1
+- Fixes CVE-2010-0728
+
+* Mon Mar 08 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0-57
+- Remove cifs.upcall and mount.cifs entirely
+
+* Wed Mar 03 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0-56
+- Update to 3.5.0
+
+* Mon Feb 22 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0rc3-55
+- Update to 3.5.0rc3
+
 * Tue Jan 26 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0rc2-54
 - Update to 3.5.0rc2
 

sources

@@ -1 +1 @@
-74f94afeacbff0e9975593e02d91219f  samba-3.5.0rc2.tar.gz
+6f8cf649207ccd8c2c17e28c335f4e9d  samba-3.5.2.tar.gz