--- rpms/e-smith-samba/sme8/e-smith-samba.spec 2010/03/17 17:39:47 1.33 +++ rpms/e-smith-samba/sme8/e-smith-samba.spec 2010/11/03 14:01:03 1.50 @@ -1,10 +1,10 @@ -# $Id: e-smith-samba.spec,v 1.32 2010/03/17 17:35:11 snetram Exp $ +# $Id: e-smith-samba.spec,v 1.49 2010/11/02 19:49:18 slords Exp $ Summary: e-smith specific Samba configuration files and templates %define name e-smith-samba Name: %{name} %define version 2.2.0 -%define release 13 +%define release 32 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -20,6 +20,21 @@ Patch7: e-smith-samba-2.2.0-profilev2.pa 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 +Patch20: e-smith-samba-2.2.0-fix_limited_anon_access.patch +Patch21: e-smith-samba-2.2.0-fix_modify.patch +Patch22: e-smith-samba-2.2.0-enable-cpu.patch +Patch23: e-smith-samba-2.2.0-ldap-auth.patch +Patch24: e-smith-samba-2.2.0-remove-domains.patch +Patch25: e-smith-samba-2.2.0-better-ldap.patch Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -27,13 +42,77 @@ 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 +* Wed Nov 3 2010 Shad L. Lords 2.2.0-30.sme +- Fix a typo in create-machine-account [SME: 6321] + +* Tue Nov 2 2010 Shad L. Lords 2.2.0-29.sme +- Clean up old domain entries when using ldap [SME: 6322] + +* Mon Nov 1 2010 Shad L. Lords 2.2.0-28.sme +- Auth against ldap if it is master [SME: 6321] + +* Mon Nov 1 2010 Shad L. Lords 2.2.0-27.sme +- Change the way groups are modified on samba3x [SME: 6314] + +* Wed Oct 27 2010 Shad L. Lords 2.2.0-26.sme +- Change the way groups are modified on samba3x [SME: 6314] + +* Thu Oct 14 2010 Daniel Berteaud 2.2.0-25.sme +- Fix anonymous access [SME: 6254] + +* Fri Oct 8 2010 Shad L. Lords 2.2.0-24.sme +- Fix moving secrets.tdb file [SME: 6057] + +* 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] @@ -1045,6 +1124,21 @@ Configuration files and templates for th %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 %build mkdir -p root/etc/e-smith/tests @@ -1126,6 +1220,11 @@ then /bin/chown admin.root /etc/samba/smbpasswd fi chown -R smelog.smelog /var/log/{smbd,nmbd} +# Move back secrets.tdb to private dir +if [ -f /var/lib/samba/private/secrets.tdb ] +then + mv -f /var/lib/samba/private/secrets.tdb /etc/samba +fi %files -f %{name}-%{version}-filelist %defattr(-,root,root)