rpms/samba/devel samba-3.2.4-build.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 samba.spec, 1.161, 1.162 sources, 1.57, 1.58

[Guenther Deschner]

Author: gd

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

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.2.4-build.patch 
Log Message:
- Update to 3.2.4
- resolves: #456889
- move cifs.upcall to /usr/sbin

Guenther


samba-3.2.4-build.patch:

--- NEW FILE samba-3.2.4-build.patch ---
commit 1f44b4aaa5f700827ee2ab272ae4b59e559b094b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 5 14:01:45 2008 +0200

    build: don't install the cifs.upcall binary twice.
    
    Guenther

diff --git a/source/Makefile.in b/source/Makefile.in
index 8b46ab6..b67cfe8 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -178,7 +178,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
 
 # Note that all executable programs now provide for an optional executable suffix.
 
-SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
+SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
 
 ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Aug 2008 17:36:42 -0000	1.53
+++ .cvsignore	18 Sep 2008 16:07:23 -0000	1.54
@@ -1 +1 @@
-samba-3.2.3.tar.gz
+samba-3.2.4.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- samba.spec	27 Aug 2008 17:36:42 -0000	1.161
+++ samba.spec	18 Sep 2008 16:07:23 -0000	1.162
@@ -1,5 +1,5 @@
-%define main_release 21
-%define samba_version 3.2.3
+%define main_release 22
+%define samba_version 3.2.4
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.3
+Version: 3.2.4
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -46,6 +46,7 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch201: samba-3.2.4-build.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -252,6 +253,7 @@
 #%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
+%patch201 -p1 -b .build
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -430,7 +432,6 @@
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
 install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
-install -m755 source/bin/cifs.upcall $RPM_BUILD_ROOT/sbin/cifs.upcall
 
 install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
@@ -451,7 +452,6 @@
 
 # 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
 
 
 %clean
@@ -676,7 +676,7 @@
 %defattr(-,root,root)
 /sbin/mount.cifs
 /sbin/umount.cifs
-/sbin/cifs.upcall
+%{_sbindir}/cifs.upcall
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
 %{_bindir}/findsmb
@@ -830,6 +830,11 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Sep 18 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.4-0.22
+- Update to 3.2.4
+- resolves: #456889
+- move cifs.upcall to /usr/sbin
+
 * Wed Aug 27 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.3-0.21
 - Security fix for CVE-2008-3789
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	27 Aug 2008 17:36:42 -0000	1.57
+++ sources	18 Sep 2008 16:07:23 -0000	1.58
@@ -1 +1 @@
-c1630a57ac0ec24bc364c6d11c93ec35  samba-3.2.3.tar.gz
+7870a6bb3a025c6081cd56688acd494a  samba-3.2.4.tar.gz