Author: wiget Date: Wed Mar 10 15:23:59 2010 GMT Module: packages Tag: HEAD ---- Log message: - 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
---- Files affected: packages/samba: samba.spec (1.479 -> 1.480) , samba-disable-unused.patch (1.1 -> NONE) (REMOVED), samba-python.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/samba/samba.spec diff -u packages/samba/samba.spec:1.479 packages/samba/samba.spec:1.480 --- packages/samba/samba.spec:1.479 Sun Feb 28 18:19:52 2010 +++ packages/samba/samba.spec Wed Mar 10 16:23:53 2010 @@ -52,13 +52,13 @@ 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 @@ -75,8 +75,6 @@ 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 @@ -961,6 +959,26 @@ 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 @@ -1012,8 +1030,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html @@ -1035,6 +1051,9 @@ --with-acl-support \ --with-aio-support \ --with-automount \ + --with-cifsmount \ + --with-cifsumount \ + --with-cifsupcall \ --with-libsmbclient \ --with-lockdir=/var/lib/samba \ --with-pam \ @@ -1140,7 +1159,7 @@ > $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} @@ -1229,7 +1248,7 @@ %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" @@ -1301,9 +1320,9 @@ %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 @@ -1323,6 +1342,10 @@ %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 @@ -1458,6 +1481,7 @@ %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* @@ -1621,6 +1645,16 @@ %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) @@ -1659,6 +1693,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.480 2010/03/10 15:23:53 wiget +- 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 + Revision 1.479 2010/02/28 17:19:52 zawadaa - up to 3.4.6 - printing on 64bit Windows should works ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.479&r2=1.480&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
