--- rpms/e-smith-samba/sme8/e-smith-samba.spec 2007/12/14 18:43:45 1.7 +++ rpms/e-smith-samba/sme8/e-smith-samba.spec 2010/11/03 14:01:03 1.50 @@ -1,56 +1,186 @@ +# $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 1.14.0 -%define release 35 +%define version 2.2.0 +%define release 32 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch0: e-smith-samba-1.14.0-PrinterAddDelete.patch -Patch1: e-smith-samba-1.14.0-migrate.patch -Patch2: e-smith-samba-1.14.0-smbdSFlag.patch -Patch3: e-smith-samba-1.14.0-samba-check-password.patch -Patch4: e-smith-samba-1.14.0-samba-check-password.patch2 -Patch5: e-smith-samba-1.14.0-getlocalsid.patch -Patch6: e-smith-samba-1.14.0-SMBPorts.patch -Patch7: e-smith-samba-1.14.0-smb.conf.patch -Patch8: e-smith-samba-1.14.0-user_group_map.patch -Patch9: e-smith-samba-1.14.0-getlocalsid.patch2 -Patch10: e-smith-samba-1.14.0-samba-check-password.patch3 -Patch11: e-smith-samba-1.14.0-logondrive.patch -Patch12: e-smith-samba-1.14.0-tdbbackup.patch -Patch13: e-smith-samba-1.14.0-vfs_rework.patch -Patch14: e-smith-samba-1.14.0-workgroupnum.patch -Patch15: e-smith-samba-1.14.0-success.patch -Patch16: e-smith-samba-1.14.0-shadowcopy.patch -Patch17: e-smith-samba-1.14.0-shadowcopy.patch2 -Patch18: e-smith-samba-1.14.0-cscpolicy.patch -Patch19: e-smith-samba-1.14.0-ibayoplocks.patch -Patch20: e-smith-samba-1.14.0-setname.patch -Patch21: e-smith-samba-1.14.0-net_full_path.patch -Patch22: e-smith-samba-1.14.0-runit17.patch -Patch23: e-smith-samba-1.14.0-printerdrivershare.patch -Patch24: e-smith-samba-1.14.0-minlength.patch -Patch25: e-smith-samba-1.14.0-printer_tdb_delete.patch -Patch26: e-smith-samba-1.14.0-delete_smbpasswd.patch -Patch27: e-smith-samba-1.14.0-adminusers.patch -Patch28: e-smith-samba-1.14.0-RemovePrinterAdminTemplate.patch -Patch29: e-smith-samba-1.14.0-domaingroups.patch -Patch30: e-smith-samba-1.14.0-sambapam.patch +Patch1: e-smith-samba-2.2.0-sambaRole.patch +Patch2: e-smith-samba-2.2.0-migratefix.patch +Patch3: e-smith-samba-2.2.0-fixwarnings.patch +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 +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 BuildRequires: e-smith-devtools >= 1.13.1-03 Obsoletes: e-smith-regedit -Requires: e-smith-lib >= 1.16.0-10 -Requires: samba -Requires: samba-client -Requires: samba-common +Requires: e-smith-lib >= 2.2.0-2 +Requires: e-smith-formmagick >= 1.4.0-9 +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] + +* 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] + +* Sun Jan 31 2010 Stephen Noble 2.2.0-7.sme +- Set recyle bin permissions [SME: 1734] + +* Sat Dec 26 2009 Jonathan Martens 2.2.0-6.sme +- Add registry file to server-resources to allow windows 7 to + join Samba 3.x domains [SME: 5425] + +* Tue Jun 2 2009 Shad L. Lords 2.2.0-5.sme +- Fix warnings in template expansion [SME: 5309] + +* Sun Nov 23 2008 Shad L. Lords 2.2.0-4.sme +- Fix migrate fragments for samba [SME: 4777] + +* Tue Oct 28 2008 Shad L. Lords 2.2.0-3.sme +- Fix oslevel fragment for server roles [SME: 4730] + +* Mon Oct 13 2008 Shad L. Lords 2.2.0-2.sme +- Add patch to support multiple samba roles [SME: 4172] + +* Tue Oct 7 2008 Shad L. Lords 2.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Sun Aug 3 2008 Jonathan Martens 1.14.1-8 +- Fix oslevel template expansion. [SME: 4470] + +* Thu Apr 3 2008 Charlie Brady 1.14.1-7 +- Disable unix extensions. [SME: 4164] + +* Fri Mar 21 2008 Shad L. Lords 1.14.1-6 +- Hide normally hidden profile files [SME: 4082] + +* Thu Mar 13 2008 Shad L. Lords 1.14.1-5 +- Fix shadowcopy with < 2 ibays/users [SME: 3862] + +* Wed Feb 13 2008 Stephen Noble 1.14.1-4 +- Remove tags now in general [SME: 3925] + +* Wed Jan 09 2008 Stephen Noble 1.14.1-3 +- Allow browsable to be disabled per ibay [SME: 2966] + +* Sat Dec 15 2007 Shad L. Lords 1.14.1-2 +- Only create admin group if Domain Admins exists [SME: 3646] + +* Sat Dec 15 2007 Shad L. Lords 1.14.1-1 +- Roll new tarball and bump version for 3.0.25b version [SME: 3495] + +* Fri Dec 14 2007 Shad L. Lords 1.14.0-36 +- admin user no longer needed in 3.0.25 [SME: 3645] + * Fri Dec 14 2007 Shad L. Lords 1.14.0-35 - Expand smb.conf in group events to complete #33 [SME: 3495] - Add rid to groupmap command to fix 3.0.25b groupmap [SME: 3644] @@ -984,16 +1114,15 @@ Configuration files and templates for th %prep %setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 @@ -1008,13 +1137,8 @@ Configuration files and templates for th %patch21 -p1 %patch22 -p1 %patch23 -p1 -#%patch24 -p1 +%patch24 -p1 %patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 %build mkdir -p root/etc/e-smith/tests @@ -1096,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)