--- rpms/e-smith-samba/sme8/e-smith-samba.spec 2010/01/31 10:00:15 1.26 +++ rpms/e-smith-samba/sme8/e-smith-samba.spec 2010/10/02 11:29:21 1.43 @@ -1,10 +1,10 @@ -# $Id: e-smith-samba.spec,v 1.25 2010/01/31 09:49:34 snetram Exp $ +# $Id: e-smith-samba.spec,v 1.42 2010/10/02 10:55:33 vip-ire Exp $ Summary: e-smith specific Samba configuration files and templates %define name e-smith-samba Name: %{name} %define version 2.2.0 -%define release 8 +%define release 23 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -16,6 +16,19 @@ Patch3: e-smith-samba-2.2.0-fixwarnings. Patch4: e-smith-samba-2.2.0-win7samba.patch Patch5: e-smith-samba-2.2.0-recylebin_perms.patch Patch6: e-smith-samba-2.2.0-enable-bind-interfaces.patch +Patch7: e-smith-samba-2.2.0-profilev2.patch +Patch8: e-smith-samba-2.2.0-refactor-profilev2.patch +Patch9: e-smith-samba-2.2.0-quote-manually.patch +Patch10: e-smith-samba-2.2.0-fail-silently-on-non-existent-folder.patch +Patch11: e-smith-samba-2.2.0-tdb_backup.patch +Patch12: e-smith-samba-2.2.0-private_dir.patch +Patch13: e-smith-samba-2.2.0-backup-all-tdb-files.patch +Patch14: e-smith-samba-2.2.0-strongkey.patch +Patch15: e-smith-samba-2.2.0-slapd_support.patch +Patch16: e-smith-samba-2.2.0-lanman_password_as_an_option.patch +Patch17: e-smith-samba-2.2.0-anonymous_acls.patch +Patch18: e-smith-samba-2.2.0-add_sambasid_to_sensible_attrs.patch +Patch19: e-smith-samba-2.2.0-samba_attr_no_output.patch Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -23,12 +36,66 @@ BuildRequires: e-smith-devtools >= 1.13. Obsoletes: e-smith-regedit Requires: e-smith-lib >= 2.2.0-2 Requires: e-smith-formmagick >= 1.4.0-9 -Requires: samba >= 3.0.25b -Requires: samba-client >= 3.0.25b -Requires: samba-common >= 3.0.25b +Requires: samba3x >= 3.3.8 +Requires: samba3x-client >= 3.3.8 +Requires: samba3x-common >= 3.3.8 +Obsoletes: samba <= 3.1.0 +Obsoletes: samba-client <= 3.1.0 +Obsoletes: samba-common <= 3.1.0 +Obsoletes: samba = 3.4.3-1.1.el5.sme +Obsoletes: samba-client = 3.4.3-1.1.el5.sme +Obsoletes: samba-common = 3.4.3-1.1.el5.sme +Requires: /usr/bin/tdbbackup AutoReqProv: no %changelog +* Sat Oct 2 2010 Daniel Berteaud 2.2.0-23.sme +- Empty output when listing sensible attribtues SME: 6254] + +* Sat Oct 2 2010 Daniel Berteaud 2.2.0-22.sme +- Add sambaSID to the list of sensible attributes [SME: 6254] + +* Sat Oct 2 2010 Daniel Berteaud 2.2.0-21.sme +- Deny access to some attributes for anonymous users [SME: 6254] + +* Thu Sep 23 2010 Daniel Berteaud 2.2.0-20.sme +- povide an option to enable lanman passwords [SME: 6229] + +* Thu Sep 23 2010 Daniel Berteaud 2.2.0-19.sme +- Add slapd support [SME: 6228] + +* Wed Jul 08 2010 Shad L. Lords 2.2.0-18.sme +- Remove require strong key part of regedit file [SME: 6119] + +* Wed Jun 23 2010 Shad L. Lords 2.2.0-17.sme +- Use samba3x package for windows 7 compatibility [SME: 5964] + +* Mon Jun 14 2010 Federico Simoncelli 2.2.0-16.sme +- Backup all the tdb files (thanks Daniel) [SME: 5856] +- Post scriptlet fix [SME: 6057] + +* Tue Mar 30 2010 Filippo Carletti 2.2.0-15.sme +- Explicitly declare samba private dir [SME: 5857] + +* Fri Mar 26 2010 Filippo Carletti 2.2.0-14.sme +- Fix tdb file paths to backup in run script [SME: 5856] + +* Wed Mar 17 2010 Jonathan Martens 2.2.0-13.sme +- Add dependency /usr/bin/tdbbackup [SME: 5851] + +* Sat Mar 6 2010 Jonathan Martens 2.2.0-12.sme +- Add missing comma in previous patch [SME: 5821] +- Silently skip non-existent profile folder [SME: 5821] + +* Sat Mar 6 2010 Jonathan Martens 2.2.0-11.sme +- Properly quote the profile folders manually [SME: 5821] + +* Sat Mar 6 2010 Jonathan Martens 2.2.0-10.sme +- Rework V2 profile patch to fix error on user-delete event [SME: 5821] + +* Sun Feb 7 2010 Shad L. Lords 2.2.0-9.sme +- Create/remove V2 profile directories [SME: 3666] + * Sun Jan 31 2010 Jonathan Martens 2.2.0-8.sme - Enable bindinterfaces by default [SME: 3325] @@ -1020,6 +1087,19 @@ Configuration files and templates for th %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 %build mkdir -p root/etc/e-smith/tests @@ -1101,6 +1181,8 @@ then /bin/chown admin.root /etc/samba/smbpasswd fi chown -R smelog.smelog /var/log/{smbd,nmbd} +# Move back secrets.tdb to private dir +[ -f /var/lib/samba/private/secrets.tdb ] && mv -f /var/lib/samba/private/secrets.tdb /etc/samba || : %files -f %{name}-%{version}-filelist %defattr(-,root,root)