samba-3.5.8-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3094 ec354946-7b23-47d6-9f5a-488ba84defc7

s/samba/samba-vl.spec

@@ -1,14 +1,11 @@
-%define tdb_version 1.1.2
-%define talloc_version 1.2.0
-%define samba_version 3.3.10
+%define tdb_version 1.2.9
+%define talloc_version 2.0.5
+%define samba_version 3.5.8
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-# samba 3.3.x serial build number. (tdb/talloc also use this release number)
-#
-# (注) samba/libtdb/libtalloc全てのバージョンが上がるときのみrelease numberを
-# 1にする
-#
-%define samba_release 13
+%define samba_release 1
+
+%define samba_source source3
 
 Summary: The Samba Suite of programs
 Summary(ja): Samba スイート
@@ -19,7 +16,7 @@ License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
-Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz
+Source: http://www.samba.org/samba/ftp/%{name}-%{version}.tar.gz
 
 # Vine specific replacement-files
 Source1: samba.log
@@ -47,10 +44,6 @@ 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
 Patch200: samba-3.2.5-inotify.patch
-Patch201: samba-3.2.8-nmbd_lmb_delay.patch
-
-# security fixes
-Patch1000: samba-3.3.10_CVE-2010-0547.patch
 
 Requires(pre): samba-common = %{version}-%{release}
 Requires: pam >= 0:0.64
@@ -59,20 +52,24 @@ Requires: krb5-libs, libacl, libattr
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(preun): /sbin/chkconfig, /sbin/service
+BuildRequires: net-tools
 BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel
 BuildRequires: krb5-devel, openldap-devel, openssl-devel, cups-devel
 BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel
+BuildRequires: libtalloc-devel, libtdb-devel
 
 %if %{?_dist_release}!="vl5"
 BuildRequires: libuuid-devel
 %endif
 
 # Working around perl dependency problem from docs
-%define __find_requires %{SOURCE999}
+%define __perl_requires %{SOURCE999}
 
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
+Packager:	tomop
+
 
 %description
 Samba is the suite of programs by which a lot of PC-related machines
@@ -143,6 +140,25 @@ module and some client tools. Winbind enables Linux to be a full member in
 Windows domains and to use Windows user and group accounts on Linux.
 
 
+%package winbind-krb5-locator
+Summary: Samba winbind krb5 locator
+Requires: samba-winbind-clients = %{samba_version}-%{release}
+Group: Applications/System
+
+%description winbind-krb5-locator
+The winbind krb5 locator is a plugin for the system kerberos library to allow
+the local kerberos library to use the same KDC as samba and winbind use
+
+
+%package winbind-clients
+Summary: Samba winbind clients
+Group: Applications/System
+
+%description winbind-clients
+The samba-winbind-clients package provides the NSS library and a PAM
+module necessary to communicate to the Winbind Daemon
+
+
 %package winbind-devel
 Summary: Developer tools for the winbind library
 Group: Development/Libraries
@@ -228,22 +244,6 @@ The samba-winbind package provides the winbind daemon, a NSS library, a PAM
 module and some client tools. Winbind enables Linux to be a full member in
 Windows domains and to use Windows user and group accounts on Linux.
 
-%package -n compat32-libtdb
-Summary: The TDB library
-Group: System Environment/Libraries
-Version: %{tdb_version}
-
-%description -n compat32-libtdb
-The TDB library from the Samba suite.
-
-%package -n compat32-libtalloc
-Summary: The talloc library
-Group: System Environment/Libraries
-Version: %{talloc_version}
-
-%description -n compat32-libtalloc
-The talloc library from the Samba suite.
-
 %endif
 
 %package -n libsmbclient-devel
@@ -263,56 +263,6 @@ libsmbclient-devel は Samba クライアントの機能を提供するライブ
 使ったアプリケーションを開発するためのファイルを提供します。
 
 
-%package -n libtdb
-Summary: The TDB library
-Group: System Environment/Libraries
-Version: %{tdb_version}
-
-%description -n libtdb
-The TDB library from the Samba suite.
-
-
-%package -n tdb-tools
-Summary: The TDB tools
-Group: Applications/System
-Version: %{tdb_version}
-Requires: libtdb = %{tdb_version}-%{release}
-
-%description -n tdb-tools
-Some TDB tools from the Samba suite.
-
-
-%package -n libtdb-devel
-Summary: Developer tools for the TDB library
-Group: Development/Libraries
-Version: %{tdb_version}
-Requires: libtdb = %{tdb_version}-%{release}
-
-%description -n libtdb-devel
-The libtdb-devel package contains the header files and libraries needed to
-develop programs that link against the TDB library in the Samba suite.
-
-
-%package -n libtalloc
-Summary: The talloc library
-Group: System Environment/Libraries
-Version: %{talloc_version}
-
-%description -n libtalloc
-The talloc library from the Samba suite.
-
-
-%package -n libtalloc-devel
-Summary: Developer tools for the talloc library
-Group: Development/Libraries
-Version: %{talloc_version}
-Requires: libtalloc = %{talloc_version}-%{release}
-
-%description -n libtalloc-devel
-The libtalloc-devel package contains the header files and libraries needed to
-develop programs that link against the talloc library in the Samba suite.
-
-
 %prep
 %setup -q
 
@@ -335,14 +285,11 @@ cp %{SOURCE11} packaging/Vine/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
-#%patch201 -p1 -b .nmbd_lmb_delay
 
-# security fixes
-%patch1000 -p1 -b .CVE-2010-0547
 
-mv source/VERSION source/VERSION.orig
-sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION
-cd source
+mv %samba_source/VERSION %samba_source/VERSION.orig
+sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
+cd %samba_source
 script/mkversion.sh
 cd ..
 
@@ -351,7 +298,7 @@ rm -fr examples/LDAP/smbldap-tools-*/
 
 
 %build
-cd source
+cd %samba_source
 sh autogen.sh
 %ifarch i386 sparc
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -385,32 +332,32 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \
 	--with-mandir=%{_mandir} \
 	--with-privatedir=/var/lib/samba/private \
 	--with-logfilebase=/var/log/samba \
-	--with-libdir=%{_libdir}/samba \
+	--with-libdir=%{_libdir} \
 	--with-modulesdir=%{_libdir}/samba \
 	--with-configdir=%{_sysconfdir}/samba \
 	--with-pammodulesdir=%{_lib}/security \
 	--with-swatdir=%{_datadir}/swat \
-	--with-shared-modules=idmap_ad,idmap_rid \
-	--with-cifsupcall \
-	--disable-fam
-
-#	--with-cluster-support \
-#	--with-aio-support \
+	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
+    --with-cluster-support=auto \
+    --with-libtalloc=no \
+    --enable-external-libtalloc=yes \
+    --with-libtdb=no
+#    --enable-external-libtdb=yes \
+#    --with-aio-support \
 
 
-make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" \
-	proto
+make pch
 
-make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/source/bin \
-	CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
-	all nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
+make LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/%samba_source/bin \
+	%{?_smp_mflags} \
+	all ../nsswitch/libnss_wins.so modules \
+	test_pam_modules test_nss_modules test_shlibs
 
-make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/source/bin \
-	CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
+make LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/%samba_source/bin \
+	%{?_smp_mflags} \
 	-C lib/netapi/examples
 
-make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
-	debug2html smbfilter bin/cifs.upcall
+make debug2html smbfilter
 
 ## there scripts are no work, and nomore nesessary
 #( cd client ; gcc -o mount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c )
@@ -439,7 +386,7 @@ mkdir -p $RPM_BUILD_ROOT/var/run/winbindd
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/samba
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
-cd source
+cd %samba_source
 
 %makeinstall \
 	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
@@ -448,7 +395,7 @@ cd source
 	DATADIR=$RPM_BUILD_ROOT%{_datadir} \
 	LOCKDIR=$RPM_BUILD_ROOT/var/lib/samba \
 	PRIVATEDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
-	LIBDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
+	LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
 	MODULESDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
 	CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
 	PAMMODULESDIR=$RPM_BUILD_ROOT/%{_lib}/security \
@@ -463,7 +410,7 @@ cd ..
 
 # Install other stuff
 install -m644 packaging/Vine/smb.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m755 %samba_source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
 install -m644 packaging/Vine/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
 install -m755 packaging/Vine/smbprint $RPM_BUILD_ROOT%{_bindir}
 install -m755 packaging/Vine/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
@@ -479,41 +426,27 @@ install -m644 examples/LDAP/samba.schema $RPM_BUILD_ROOT%{_sysconfdir}/openldap/
 
 # winbind
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
-install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
+install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
 ln -sf /%{_lib}/libnss_winbind.so.2  $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so
-install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2
+install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2
 ln -sf /%{_lib}/libnss_wins.so.2  $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so
 
+# winbind krb5 locator
+#mkdir -p $RPM_BUILD_ROOT%{_libdir}/krb5/plugins/libkrb5
+install -d -m 0755 %{buildroot}%{_libdir}/krb5/plugins/libkrb5
+install -m 755 source3/bin/winbind_krb5_locator.so $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
+
 # libraries {
 mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
 
-# talloc
-cd source/lib/talloc
-# just to get the correct .pc file generated
-./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../../..
-install -m 644 source/lib/talloc/talloc.pc $build_libdir/pkgconfig/
-
-# tdb
-cd source/lib/tdb
-# just to get the correct .pc file generated
-./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../../..
-install -m 644 source/lib/tdb/tdb.pc $build_libdir/pkgconfig/
-
 # make install puts libraries in the wrong place
 # (but at least gets the versioning right now)
 
-list="smbclient smbsharemodes netapi talloc tdb wbclient"
-build_libdir="$RPM_BUILD_ROOT%{_libdir}"
+list="smbclient smbsharemodes netapi wbclient"
 for i in $list; do
-	cp -P $build_libdir/samba/lib$i.so* $build_libdir/
-	install -m 644 source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
-	rm -f $build_libdir/samba/lib$i.so* $build_libdir/samba/lib$i.a || true
+    install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
 done
 
-install -m 644 source/lib/talloc/talloc.pc $build_libdir/pkgconfig/
-install -m 644 source/lib/tdb/tdb.pc $build_libdir/pkgconfig/
 
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/
 
@@ -524,14 +457,12 @@ 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 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 
-install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
+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}
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/samba.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/samba.ico
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo.png
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/logo-small.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo-small.png
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/samba.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/samba.ico
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo.png
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/logo-small.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo-small.png
 
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
@@ -543,6 +474,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/{u,}mount.cifs.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{u,}cifs.upcall.8*
+
+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
@@ -558,9 +494,21 @@ mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbmodify.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbsearch.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3search.1
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbrename.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3rename.1
 
-# why are these getting installed in the wrong place?
-rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
-
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.*
+#rm -f $RPM_BUILD_ROOT%{_includedir}/talloc.h
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
+#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/talloc.pc
+
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so.*
+#rm -f $RPM_BUILD_ROOT%{_includedir}/tdb.h
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so
+#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc
+rm -f $RPM_BUILD_ROOT%{_bindir}/tdbbackup
+rm -f $RPM_BUILD_ROOT%{_bindir}/tdbdump
+rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtool
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -601,121 +549,6 @@ fi
 %post common
 /sbin/ldconfig
 
-# This script must be run always on installs or upgrades
-# it checks if a previous installation have created files
-# under /var/cache/samba and move them in that case as the
-# new package wants them to be under /var/lib/samba for
-# FHS compliance
-#
-# - we must stop the dameon if running and restart it
-#   after the script if it was
-# - we do not overwrite newer files
-# - even if /etc/init.d/smb is in samba and not
-#   samba-common we need to stop smbd/nmbd, if they
-#   are running, here as well, or we will mess up
-#   shared (between winbindd and smbd/nmbd) tdbs
-
-OLDPATH="/var/cache/samba"
-NEWPATH="/var/lib/samba"
-
-eval ls $OLDPATH/*.tdb >/dev/null 2>&1
-if [ $? = 0 ]; then
-    eval testparm -s 2>/dev/null |grep "lock dir" >/dev/null
-    if [ $? = 0 ]; then 
-	echo "Warning: lock dir explicitly set. Not moving tdb files to new default location"
-    else
-
-	#Stop daemons before we move the files around
-
-	#this is what condrestart checks as well
-	if [ -f /var/lock/subsys/winbindd ]; then
-		/sbin/service winbind stop >/dev/null 2>&1 || :
-		# Use a dirty trick to fool condrestart later
-		touch /var/lock/subsys/winbindd
-	fi
-
-	if [ -f /var/lock/subsys/smb ]; then
-		/sbin/service smb stop >/dev/null 2>&1 || :
-		# We need to stop smbd here as we are moving also smbd owned files
-		# but we can't restart it until the new server is installed.
-		# Use a dirty trick to fool condrestart later
-		touch /var/lock/subsys/smb
-	fi
-
-	if [ -f /var/lock/subsys/nmb ]; then
-		/sbin/service nmb stop >/dev/null 2>&1 || :
-		# We need to stop smbd here as we are moving also smbd owned files
-		# but we can't restart it until the new server is installed.
-		# Use a dirty trick to fool condrestart later
-		touch /var/lock/subsys/nmb
-	fi
-
-	eval ls $NEWPATH/*.tdb >/dev/null 2>&1
-	if [ $? = 0 ]; then
-		#something strange here, lets backup this stuff and avoid just wiping it
-
-		mkdir $NEWPATH.pkgbkp
-		mv -f $NEWPATH/*.tdb $NEWPATH.pkgbkp/ >/dev/null 2>&1
-		mv -f $NEWPATH/*.dat $NEWPATH.pkgbkp/ >/dev/null 2>&1
-		mv -f $NEWPATH/perfmon $NEWPATH.pkgbkp/ >/dev/null 2>&1
-		mv -f $NEWPATH/printing $NEWPATH.pkgbkp/ >/dev/null 2>&1
-	fi
-
-	mv -f $OLDPATH/*.tdb $NEWPATH/ >/dev/null 2>&1
-	mv -f $OLDPATH/*.dat $NEWPATH/ >/dev/null 2>&1
-	mv -f $OLDPATH/perfmon $NEWPATH/ >/dev/null 2>&1
-	mv -f $OLDPATH/printing $NEWPATH/ >/dev/null 2>&1
-
-    fi
-fi
-
-# We also moved private files from /etc/samba to
-# /var/lib/samba/private so we need to migrate these as well
-
-#secrets.tdb
-if [ -f %{_sysconfdir}/samba/secrets.tdb ]; then
-	eval testparm -s 2>/dev/null |grep "private dir" >/dev/null
-	if [ $? = 0 ]; then
-		echo "Warning: private dir explicitly set. Not moving secrets.tdb to new default location"
-	else
-		if [ -f /var/lib/samba/private/secrets.tdb ]; then
-			mv -f /var/lib/samba/private/secrets.tdb /var/lib/samba/private/secrets.tdb.old
-		fi
-		mv -f %{_sysconfdir}/samba/secrets.tdb /var/lib/samba/private/secrets.tdb
-	fi
-fi
-
-#smbpasswd
-if [ -f %{_sysconfdir}/samba/smbpasswd ]; then
-	eval testparm -s 2>/dev/null |grep "smb passwd file" >/dev/null
-	if [ $? = 0 ]; then
-		echo "Warning: smbpasswd file location explicitly set. Not moving smbpasswd to new default location"
-	else
-		if [ -f /var/lib/samba/private/smbpasswd ]; then
-			mv -f /var/lib/samba/private/smbpasswd /var/lib/samba/private/smbpasswd.old
-		fi
-		mv -f %{_sysconfdir}/samba/smbpasswd /var/lib/samba/private/smbpasswd
-	fi
-fi
-
-#passdb.tdb
-if [ -f %{_sysconfdir}/samba/passdb.tdb ]; then
-	eval testparm -s 2>/dev/null |grep "private dir" >/dev/null || testparm -s 2>/dev/null |grep -P "^\s*passdb\s*backend\s*=.*tdbsam:/etc/samba/passdb.tdb.*"
-	if [ $? = 0 ]; then
-		echo "Warning: passdb.tdb location explicitly set. Not moving passdb.tdb to new default location"
-	else
-		if [ -f /var/lib/samba/private/passdb.tdb ]; then
-			mv -f /var/lib/samba/private/passdb.tdb /var/lib/samba/private/passdb.tdb.old
-		fi
-		mv -f %{_sysconfdir}/samba/passdb.tdb /var/lib/samba/private/passdb.tdb
-	fi
-fi
-
-#remove schannel_store if existing, it is not info we need to keep across restarts
-if [ -f %{_sysconfdir}/samba/schannel_store.tdb ]; then
-	rm -f %{_sysconfdir}/samba/schannel_store.tdb
-fi
-
 %preun winbind
 if [ $1 = 0 ] ; then
     /sbin/service winbind stop >/dev/null 2>&1 || :
@@ -733,17 +566,15 @@ exit 0
 %postun -n libsmbclient
 /sbin/ldconfig
 
-%post -n libtdb
-/sbin/ldconfig
+%if %build_compat32
 
-%postun -n libtdb
+%post -n compat32-libsmbclient
 /sbin/ldconfig
 
-%post -n libtalloc
+%postun -n compat32-libsmbclient
 /sbin/ldconfig
 
-%postun -n libtalloc
-/sbin/ldconfig
+%endif
 
 %files
 %defattr(-,root,root)
@@ -782,9 +613,6 @@ exit 0
 
 %files client
 %defattr(-,root,root)
-/sbin/mount.cifs
-/sbin/umount.cifs
-%{_sbindir}/cifs.upcall
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
 %{_bindir}/findsmb
@@ -806,9 +634,6 @@ exit 0
 %{_mandir}/man1/smbget.1*
 %{_mandir}/man1/sharesec.1*
 %{_mandir}/man8/smbspool.8*
-%{_mandir}/man8/mount.cifs.8*
-%{_mandir}/man8/umount.cifs.8*
-%{_mandir}/man8/cifs.upcall.8*
 
 %files common
 %defattr(-,root,root)
@@ -817,8 +642,6 @@ exit 0
 %{_libdir}/samba/lowcase.dat
 %{_libdir}/samba/upcase.dat
 %{_libdir}/samba/valid.dat
-%{_libdir}/libnss_wins.so
-/%{_lib}/libnss_wins.so.2
 %{_libdir}/libnetapi.so
 %attr(755,root,root) %{_libdir}/libnetapi.so.*
 %{_includedir}/netapi.h
@@ -863,19 +686,17 @@ exit 0
 %{_mandir}/man8/smbpasswd.8*
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/net.8*
+%{_datadir}/locale/*/LC_MESSAGES/net.mo
 
-%doc README COPYING Manifest 
+%doc README COPYING Manifest
 %doc WHATSNEW.txt Roadmap
 
 %files winbind
+%defattr(-,root,root)
 %{_bindir}/ntlm_auth
 %{_bindir}/wbinfo
-%{_libdir}/libnss_winbind.so
-%attr(755,root,root) %{_libdir}/libwbclient.so.*
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info
-/%{_lib}/libnss_winbind.so.2
-/%{_lib}/security/pam_winbind.so
 %{_sbindir}/winbindd
 %dir /var/run/winbindd
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
@@ -883,27 +704,45 @@ exit 0
 %{_initrddir}/winbind
 %{_mandir}/man1/ntlm_auth.1*
 %{_mandir}/man1/wbinfo.1*
-%{_mandir}/man7/winbind_krb5_locator.7*
+%{_mandir}/man5/pam_winbind.conf.5*
 %{_mandir}/man8/pam_winbind.8*
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/idmap_*.8*
 %{_datadir}/locale/*/LC_MESSAGES/pam_winbind.mo
 
+%files winbind-krb5-locator
+%{_mandir}/man7/winbind_krb5_locator.7*
+%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
+
+%files winbind-clients
+%defattr(-,root,root)
+%{_libdir}/libnss_winbind.so
+/%{_lib}/libnss_winbind.so.2
+%{_libdir}/libnss_wins.so
+/%{_lib}/libnss_wins.so.2
+/%{_lib}/security/pam_winbind.so
+%attr(755,root,root) %{_libdir}/libwbclient.so.*
+
 %files winbind-devel
+%defattr(-,root,root)
 %{_includedir}/wbclient.h
+%{_includedir}/wbc_async.h
 %{_libdir}/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 
 %files doc
+%defattr(-,root,root)
 %doc docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf
 %doc docs/Samba3-HOWTO.pdf
 %doc docs/htmldocs
 
 %files -n libsmbclient
+%defattr(-,root,root)
 %attr(755,root,root) %{_libdir}/libsmbclient.so.*
 %attr(755,root,root) %{_libdir}/libsmbsharemodes.so.*
 
 %files -n libsmbclient-devel
+%defattr(-,root,root)
 %{_includedir}/libsmbclient.h
 %{_includedir}/smb_share_modes.h
 %{_libdir}/libsmbclient.so
@@ -912,31 +751,8 @@ exit 0
 %{_libdir}/pkgconfig/smbsharemodes.pc
 %{_mandir}/man7/libsmbclient.7*
 
-%files -n libtalloc
-%attr(755,root,root) %{_libdir}/libtalloc.so.*
-
-%files -n libtalloc-devel
-%{_includedir}/talloc.h
-%{_libdir}/libtalloc.so
-%{_libdir}/pkgconfig/talloc.pc
-
-%files -n libtdb
-%attr(755,root,root) %{_libdir}/libtdb.so.*
-
-%files -n libtdb-devel
-%{_includedir}/tdb.h
-%{_libdir}/libtdb.so
-%{_libdir}/pkgconfig/tdb.pc
-
-%files -n tdb-tools
-%{_bindir}/tdbbackup
-%{_bindir}/tdbdump
-%{_bindir}/tdbtool
-%{_mandir}/man8/tdbbackup.8*
-%{_mandir}/man8/tdbdump.8*
-%{_mandir}/man8/tdbtool.8*
-
 %files domainjoin-gui
+%defattr(-,root,root)
 %{_sbindir}/netdomjoin-gui
 %dir %{_datadir}/pixmaps/samba
 %{_datadir}/pixmaps/samba/samba.ico
@@ -952,15 +768,16 @@ exit 0
 %attr(755,root,root) %{_libdir}/libsmbclient.so.*
 %attr(755,root,root) %{_libdir}/libsmbsharemodes.so.*
 
-%files -n compat32-libtalloc
-%attr(755,root,root) %{_libdir}/libtalloc.so.*
-
-%files -n compat32-libtdb
-%attr(755,root,root) %{_libdir}/libtdb.so.*
-
 %endif
 
 %changelog
+* Thu Mar 24 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.8-1
+- new upstream release.
+- updated patches.
+- added subpackages 'winbind-krb5-locator' and 'winbind-client'.
+- dropped tdb and talloc subpackages became independent packages.
+- dropped {,u}mount.cifs were included in cifs-utils.
+
 * Sat Oct 02 2010 Shu KONNO <owa@bg.wakwak.com> 3.3.10-13
 - rebuilt with rpm-4.8.1 for pkg-config
 - changed spec file name as vine style