rpms/samba/F-11 .cvsignore, 1.68, 1.69 samba.spec, 1.199, 1.200 sources, 1.72, 1.73 samba-3.4.5-cifs_upcall.patch, 1.1, NONE samba-3.4.5-pdbedit.patch, 1.1, NONE

[Guenther Deschner]

Author: gd

Update of /cvs/pkgs/rpms/samba/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20212

Modified Files:
	.cvsignore samba.spec sources 
Removed Files:
	samba-3.4.5-cifs_upcall.patch samba-3.4.5-pdbedit.patch 
Log Message:
Update to 3.4.6

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	19 Jan 2010 10:29:45 -0000	1.68
+++ .cvsignore	24 Feb 2010 12:45:27 -0000	1.69
@@ -1 +1 @@
-samba-3.4.5.tar.gz
+samba-3.4.6.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/samba.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- samba.spec	17 Feb 2010 11:59:25 -0000	1.199
+++ samba.spec	24 Feb 2010 12:45:30 -0000	1.200
@@ -1,5 +1,5 @@
-%define main_release 48
-%define samba_version 3.4.5
+%define main_release 49
+%define samba_version 3.4.6
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 %define pre_release %nil
@@ -47,9 +47,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # 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.4.5-pdbedit.patch
 Patch202: samba-3.4.5-CVE-2009-3297-mount_cifs.patch
-Patch203: samba-3.4.5-cifs_upcall.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -260,9 +258,7 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
-%patch201 -p1 -b .pdbedit
 %patch202 -p1 -b .CVE-2009-3297-mount_cifs
-%patch203 -p1 -b .cifs_upcall
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -889,6 +885,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Feb 24 2010 Guenther Deschner <gdeschner at redhat.com> - 3.4.6-0.49
+- Update to 3.4.6
+
 * Wed Feb 17 2010 Guenther Deschner <gdeschner at redhat.com> - 3.4.5-0.48
 - Fix crash in cifs.upcall
 - resolves: #565446


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	19 Jan 2010 10:29:45 -0000	1.72
+++ sources	24 Feb 2010 12:45:31 -0000	1.73
@@ -1 +1 @@
-8e8a484782f2b7716b6c6bd9a7d2bf71  samba-3.4.5.tar.gz
+1090ea7e85b0b915c7e3c427d6457e36  samba-3.4.6.tar.gz


--- samba-3.4.5-cifs_upcall.patch DELETED ---


--- samba-3.4.5-pdbedit.patch DELETED ---