--- rpms/e-smith-samba/sme8/e-smith-samba.spec 2010/09/23 15:39:18 1.39 +++ rpms/e-smith-samba/sme8/e-smith-samba.spec 2013/03/18 04:09:16 1.74 @@ -1,10 +1,10 @@ -# $Id: e-smith-samba.spec,v 1.38 2010/07/08 19:12:07 slords Exp $ +# $Id: e-smith-samba.spec,v 1.73 2013/02/13 05:04:07 wellsi Exp $ Summary: e-smith specific Samba configuration files and templates %define name e-smith-samba Name: %{name} %define version 2.2.0 -%define release 19 +%define release 52 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -25,6 +25,28 @@ Patch12: e-smith-samba-2.2.0-private_dir 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 +Patch26: e-smith-samba-2.2.0-store_ldap_pw.patch +Patch27: e-smith-samba-2.2.0-usergroup-mapping.patch +Patch28: e-smith-samba-2.2.0-fixe_create_machine_accounts.patch +Patch29: e-smith-samba-2.2.0-force_uid_gid.patch +Patch30: e-smith-samba-2.2.0-migrate_machine_uid.patch +Patch31: e-smith-samba-2.2.0-create_samba_data_in_event.patch +Patch32: e-smith-samba-2.2.0-FixVFS_ExcludeSyntax.patch +Patch34: e-smith-samba-2.2.0-fix-separator.patch +Patch35: e-smith-samba-2.2.0-tdbbackup12.patch +Patch36: e-smith-samba-2.2.0-samba_audit.patch +Patch37: e-smith-samba-2.2.0-samba_audit_log.patch +Patch38: e-smith-samba-2.2.0-WaitForNetwork.patch Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -41,10 +63,118 @@ 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 +# Obsolete SerNet packages +Obsoletes: libsmbclient0 +Obsoletes: libwbclient0 +Obsoletes: samba3 +Obsoletes: samba3-cifsmount +Obsoletes: samba3-client +Obsoletes: samba3-doc +Obsoletes: samba3-utils +Obsoletes: samba3-winbind +Requires: /usr/bin/tdbbackup12 AutoReqProv: no %changelog +* Tue Feb 12 2013 Ian Wells 2.2.0-52.sme +- Add ability to configure waiting for network Win7 registry option [SME: 7332] + +* Tue Feb 12 2013 Ian Wells 2.2.0-51.sme +- Remove samba_audit specific loglotate configuration [SME: 7335] + +* Mon Jan 21 2013 Ian Wells 2.2.0-50.sme +- Enable smb auditing per ibay [SME: 6176] + +* Thu Jan 17 2013 Shad L. Lords 2.2.0-49.sme +- Update dependency to /usr/bin/tdbbackup12 [SME: 7210] + +* Sun Jan 29 2012 Ian Wells 2.2.0-48.sme +- Obsolete only SerNet samba packages [SME: 6772] + +* Sat Jan 21 2012 Ian Wells 2.2.0-47.sme +- Obsolete SerNet samba packages, again [SME: 6772] + +* Fri Dec 23 2011 Jonathan Martens 2.2.0-46.sme +- Obsolete SerNet samba packages [SME: 6772] + +* Thu Mar 17 2011 Jonathan Martens 2.2.0-45.sme +- Revert directory requirement from 2.2.0-43 [SME: 6571] + +* Thu Mar 17 2011 Jonathan Martens 2.2.0-44.sme +- Revert changes made in 2.2.0-42 [SME: 6432] + +* Tue Mar 15 2011 Jonathan Martens 2.2.0-43.sme +- Fix separator in general smb.conf section for recycle:exclude* [SME: 6571] + +* Tue Mar 15 2011 Jonathan Martens 2.2.0-42.sme +- recycle:exclude_dir should contain directories [SME: 6432] + +* Sat Mar 12 2011 Gavin Weight 2.2.0-41.sme +- Fix Recycle Bin VFS Excludes syntax. [SME: 6432] + +* Tue Nov 30 2010 Daniel Berteaud 2.2.0-40.sme +- Create samba account during event for machine [SME: 6418] + +* Tue Nov 30 2010 Daniel Berteaud 2.2.0-39.sme +- Migrate existing machine uid in the DB (patch from Shad Lords) [SME: 6415] + +* Tue Nov 30 2010 Daniel Berteaud 2.2.0-38.sme +- Force uid/gid on machine accounts creation [SME: 6415] + +* Wed Nov 10 2010 Daniel Berteaud 2.2.0-37.sme +- Fix create-machine-accounts script [SME: 6358] + +* Fri Nov 5 2010 Shad L. Lords 2.2.0-36.sme +- Call samba-group-mapping after user events too [SME: 6339] + +* Wed Nov 3 2010 Shad L. Lords 2.2.0-35.sme +- Fix cpu critical patch missing ' [SME: 6330] + +* Wed Nov 3 2010 Daniel Berteaud 2.2.0-34.sme +- rename store-ldap-passwd and link it in other events [SME: 6332] + +* Wed Nov 3 2010 Daniel Berteaud 2.2.0-33.sme +- Store the ldap admin pw early in the bootstrap-ldap-save event [SME: 6332] + +* Wed Nov 3 2010 Shad L. Lords 2.2.0-32.sme +- Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330] + +* Tue Nov 2 2010 Shad L. Lords 2.2.0-31.sme +- Always use cpu, do unix if ldap{Auth} is disabled [SME: 6321] + +* Tue Nov 2 2010 Daniel Berteaud 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] @@ -1080,6 +1210,28 @@ Configuration files and templates for th %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 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 %build mkdir -p root/etc/e-smith/tests @@ -1142,6 +1294,9 @@ then rmdir /home/netlogon || echo "Couldn't rmdir /home/netlogon" fi +# Remove logrotate configuration for samba_audit +rm -f /etc/logrotate.d/samba_audit + # Revert to canonical place for smb.conf if [ -f /etc/smb.conf ] then @@ -1162,7 +1317,10 @@ then 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 || : +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)