- 3.5.0

- added vfs-catia and vfs-scannedonly subpackages
- removed python.patch (applied upstream)
- removed disable-unused.patch (fixed upstream)
- explicit enable cifs tools

Changed files:
    samba-disable-unused.patch -> 1.2
    samba-python.patch -> 1.2
    samba.spec -> 1.480

diff --git a/samba-disable-unused.patch b/samba-disable-unused.patch
deleted file mode 100644 (file)
index e73f56c..0000000
--- a/samba-disable-unused.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- samba-3.4.5/source4/torture/rpc/spoolss.c~ 2010-01-18 12:38:09.000000000 +0100
-+++ samba-3.4.5/source4/torture/rpc/spoolss.c  2010-01-26 17:03:53.363835346 +0100
-@@ -2087,6 +2087,7 @@
-       return true;
- }
- 
-+#if 0
- bool test_printer_keys(struct torture_context *tctx,
-                      struct dcerpc_pipe *p,
-                      struct policy_handle *handle)
-@@ -2144,6 +2145,7 @@
- 
-       return true;
- }
-+#endif
- 
- bool torture_rpc_spoolss(struct torture_context *torture)
- {

diff --git a/samba-python.patch b/samba-python.patch
deleted file mode 100644 (file)
index ada1694..0000000
--- a/samba-python.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-disable python bindings
-
-based on:
-- http://gitweb.samba.org/?p=samba.git;a=commitdiff_plain;h=e349e2c54117c528b9d194f356399c57e2a04b56
-- http://gitweb.samba.org/?p=samba.git;a=commitdiff_plain;h=0d33b0bfca668ef573499a3c2904f1fb071ec7b9
-- http://gitweb.samba.org/?p=samba.git;a=commitdiff_plain;h=ebb79e27dcea6e0b8215b878c9d42bcc9dd960e7
-
---- a/source3/samba4.mk
-+++ b/source3/samba4.mk
-@@ -124,7 +124,7 @@ tallocsrcdir := $(samba4srcdir)/../lib/talloc
- comsrcdir := $(samba4srcdir)/lib/com
- override ASN1C = bin/asn1_compile4
- override ET_COMPILER = bin/compile_et4
--include $(samba4srcdir)/build/make/python.mk
-+#include $(samba4srcdir)/build/make/python.mk
- include samba4-data.mk
- include $(samba4srcdir)/static_deps.mk
- 
-@@ -165,10 +165,17 @@ clean::
- proto:: $(PROTO_HEADERS)
- modules:: $(PLUGINS)
- 
--pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
-+#pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
- 
--all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 bin/wbinfo4 pythonmods setup plugins
-+all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 bin/wbinfo4 setup plugins
- torture:: bin/smbtorture4
-+
-+#
-+## This is a fake rule to stop any python being invoked as currently the
-+## build system is broken in source3 with python. JRA.
-+#
-+installpython:: bin/smbtorture4
-+
- everything:: $(patsubst %,%4,$(BINARIES))
- setup:
-       @ln -sf ../source4/setup setup
---- a/source3/samba4.m4
---- b/source3/samba4.m4
-@@ -90,7 +90,6 @@
-       [],[m4_include(../lib/tevent/samba.m4)]
- )
- 
--SMB_INCLUDE_MK(../lib/tevent/python.mk) 
- 
- SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = $LDB_REQUIRED_VERSION,
-       [

diff --git a/samba.spec b/samba.spec
index 28976b24791ba91fdc3414133cf32a47898ed581..1eba7f3e64fcd319c3ec67b38a568144abdaf1b5 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -51,13 +51,13 @@ Summary(tr.UTF-8):  SMB sunucusu
 Summary(uk.UTF-8):     SMB клієнт та сервер
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:          samba
-Version:       3.4.6
+Version:       3.5.0
 Release:       1
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
 Source0:       http://www.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz
-# Source0-md5: 1090ea7e85b0b915c7e3c427d6457e36
+# Source0-md5: 05e389aff7d3de16561006b35332a881
 Source1:       smb.init
 Source2:       %{name}.pamd
 Source3:       swat.inetd
@@ -74,8 +74,6 @@ Patch1:               %{name}-c++-nofail.patch
 Patch2:                %{name}-pthread.patch
 Patch3:                %{name}-nscd.patch
 Patch4:                %{name}-lprng-no-dot-printers.patch
-Patch5:                %{name}-python.patch
-Patch6:                %{name}-disable-unused.patch
 URL:           http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -960,6 +958,26 @@ Moduł vfs do samby implementujący skaning antywirusowy w czasie
 dostępu do plików korzystając z oprogramowania antywirusowego Trend
 (które musi być zainstalowane, aby wykorzystać ten moduł).
 
+%package vfs-catia
+Summary:       VFS module to fix Catia CAD filenames
+Group:         Networking/Daemons
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description vfs-catia
+The Catia CAD package commonly creates filenames that use characters that are
+illegal in CIFS filenames. The vfs_catia VFS module implements a fixed
+character mapping so that these files can be shared with CIFS clients.
+
+%package vfs-scannedonly
+Summary:       Anti-virus solution as VFS module
+Group:         Networking/Daemons
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description vfs-scannedonly
+The vfs_scannedonly VFS module ensures that only files that have been scanned
+for viruses are visible and accessible to the end user. If non-scanned files
+are found an anti-virus scanning daemon is notified.
+
 %package -n openldap-schema-samba
 Summary:       Samba LDAP schema
 Summary(pl.UTF-8):     Schemat LDAP dla samby
@@ -1011,8 +1029,6 @@ Samba Module for Python.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
 
@@ -1034,6 +1050,9 @@ cd source3
        --with-acl-support \
        --with-aio-support \
        --with-automount \
+       --with-cifsmount \
+       --with-cifsumount \
+       --with-cifsupcall \
        --with-libsmbclient \
        --with-lockdir=/var/lib/samba \
        --with-pam \
@@ -1139,7 +1158,7 @@ ln -s %{_bindir}/smbspool $RPM_BUILD_ROOT%{cups_serverbin}/backend/smb
 > $RPM_BUILD_ROOT/etc/security/blacklist.samba
 
 # unneeded
-rm -r $RPM_BUILD_ROOT%{_datadir}/swat/using_samba
+#rm -r $RPM_BUILD_ROOT%{_datadir}/swat/using_samba
 
 # tests
 %if %{with merged_build}
@@ -1228,7 +1247,7 @@ EOF
 %attr(755,root,root) %{_sbindir}/smbd
 %attr(755,root,root) %{_sbindir}/mksmbpasswd.sh
 %if %{with merged_build}
-%attr(755,root,root) %{_bindir}/ad2oLschema4
+#%attr(755,root,root) %{_bindir}/ad2oLschema4
 %attr(755,root,root) %{_bindir}/oLschema2ldif4
 %attr(755,root,root) %{_bindir}/reg*
 # "This utility disabled until rewritten"
@@ -1300,9 +1319,9 @@ EOF
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/winbindd
 %attr(755,root,root) %{_bindir}/wbinfo
-%if %{with merged_build}
-%attr(755,root,root) %{_bindir}/wbinfo4
-%endif
+#%if %{with merged_build}
+#%attr(755,root,root) %{_bindir}/wbinfo4
+#%endif
 %attr(755,root,root) /%{_lib}/security/pam_winbind*
 %attr(755,root,root) /%{_lib}/libnss_winbind*
 %attr(754,root,root) /etc/rc.d/init.d/winbind
@@ -1322,6 +1341,10 @@ EOF
 %attr(755,root,root) %{_bindir}/net4
 %attr(755,root,root) %{_bindir}/nmblookup4
 %attr(755,root,root) %{_bindir}/smbclient4
+%attr(755,root,root) %{_bindir}/mount.cifs4
+%attr(755,root,root) %{_bindir}/umount.cifs4
+%attr(755,root,root) %{_bindir}/setnttoken4
+%attr(755,root,root) %{_bindir}/smbtorture4
 %attr(755,root,root) %{_sbindir}/cifs.upcall
 %{_mandir}/man8/cifs.upcall.8*
 %endif
@@ -1457,6 +1480,7 @@ EOF
 %attr(755,root,root) %{_bindir}/tdbbackup4
 %attr(755,root,root) %{_bindir}/tdbdump4
 %attr(755,root,root) %{_bindir}/tdbtool4
+%attr(755,root,root) %{_bindir}/tdbtorture4
 %endif
 %attr(755,root,root) %{_libdir}/libtdb.so.*
 %{_mandir}/man8/tdbbackup.8*
@@ -1620,6 +1644,16 @@ EOF
 %attr(755,root,root) %{_vfsdir}/vscan-trend.so
 %endif
 
+%files vfs-catia
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_vfsdir}/catia.so
+%{_mandir}/man8/vfs_catia.8*
+
+%files vfs-scannedonly
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_vfsdir}/scannedonly.so
+%{_mandir}/man8/vfs_scannedonly.8*
+
 %if %{with ldap}
 %files -n openldap-schema-samba
 %defattr(644,root,root,755)