--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/05/06 17:00:15 1.64 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2014/02/02 16:17:53 1.116 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.63 2010/03/17 18:53:06 snetram Exp $ +# $Id: e-smith-backup.spec,v 1.115 2014/01/15 02:06:56 wellsi Exp $ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} %define version 2.2.0 -%define release 33 +%define release 83 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -40,6 +40,51 @@ Patch27: e-smith-backup-2.2.0-create_mou Patch28: e-smith-backup-2.2.0-nolowercase.patch Patch29: e-smith-backup-2.2.0-adjust-for-samba-tdb-locations.patch Patch30: e-smith-backup-2.2.0-workstation-To-field.patch +Patch31: e-smith-backup-2.2.0-ServerNameEmail.patch +Patch32: e-smith-backup-2.2.0-fix-leading-slash-removal.patch +Patch33: e-smith-backup-2.2.0-secrets_tdb.patch +Patch34: e-smith-backup-2.2.0-local_USB.patch +Patch35: e-smith-backup-2.2.0-smbpassword2smbpasswd.patch +Patch36: e-smith-backup-2.2.0-stripSpaces.patch +Patch37: e-smith-backup-2.2.0-DesktopBackupTextUpdate.patch +Patch38: e-smith-backup-2.2.0-restore_list_smbpasswd.patch +Patch39: e-smith-backup-2.2.0-remove-relocate_samba_file.patch +Patch40: e-smith-backup-2.2.0-workstation_tmpdir.patch +Patch41: e-smith-backup-2.2.0-workstation_failure.patch +Patch42: e-smith-backup-2.2.0-diskusage.patch +Patch43: e-smith-backup-2.2.0-removeCaseConversion.patch +Patch44: e-smith-backup-2.2.0-CheckDarReturnCode.patch +Patch45: e-smith-backup-2.2.0-fix-x-of-y-strings.patch +Patch46: e-smith-backup-2.2.0-backup-and-restore-textual-changes.patch +Patch47: e-smith-backup-2.2.0-localize-backup-share-target-vfst.patch +Patch48: e-smith-backup-2.2.0-RemoveEOL.patch +Patch49: e-smith-backup-2.2.0-workstationTERM.patch +Patch50: e-smith-backup-2.2.0-modifiedFiles.patch +Patch51: e-smith-backup-2.2.0-bareword-TERM.patch +Patch52: e-smith-backup-2.2.0-templateEmails.patch +Patch53: e-smith-backup-2.2.0-deleteIndexHtm.patch +Patch54: e-smith-backup-2.2.0-SelectiveBackup.patch +Patch55: e-smith-backup-2.2.0-catalog.patch +Patch56: e-smith-backup-2.2.0-FullDay.patch +Patch57: e-smith-backup-2.2.0-workstation-backup-dar.patch +Patch58: e-smith-backup-2.2.0-workstation-backup-wol.patch +Patch59: e-smith-backup-2.2.0-DesktopBackupCompression.patch +Patch60: e-smith-backup-2.2.0-workstation-backup-spaces.patch +Patch61: e-smith-backup-2.2.0-workstation-removeTemp.patch +Patch62: e-smith-backup-2.2.0-workstation-DeleteEarly.patch +Patch63: e-smith-backup-2.2.0-workstation-backup-spaces-inc.patch +Patch64: e-smith-backup-2.2.0-cifsmount-error.patch +Patch65: e-smith-backup-2.2.0-workstation-DeleteEarly2.patch +Patch66: e-smith-backup-2.2.0-workstation-backup-df.patch +Patch67: e-smith-backup-2.2.0-workstation-backup-smbhost.patch +Patch68: e-smith-backup-2.2.0-workstation-restoreList.patch +Patch69: e-smith-backup-2.2.0-workstation-selectiveRestore.patch +Patch70: e-smith-backup-2.2.0-workstation-setNumbering.patch +Patch71: e-smith-backup-2.2.0-workstation-timeMismatch.patch +Patch72: e-smith-backup-2.2.0-workstation-removeSet0.patch +Patch73: e-smith-backup-2.2.0-workstation-backup-spaces-catalog.patch +Patch74: e-smith-backup-2.2.0-workstation-asecu.patch +Patch75: e-smith-backup-2.2.0-dont_remove_apache_group.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -48,7 +93,7 @@ Requires: e-smith-base Requires: e-smith-lib >= 1.15.1-19 Requires: perl(Quota) Requires: perl(Unix::PasswdFile) -Requires: perl(Unix::GroupFile) +Requires: perl(Passwd::Unix) Requires: perl(POSIX) Requires: perl(Locale::gettext) Requires: perl(Digest::MD5) @@ -58,6 +103,164 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* Sun Feb 2 2014 Daniel Berteaud 2.2.0-83.sme +- Don't remove the apache group during restore [SME: 7932] + +* Tue Jan 14 2014 Ian Wells 2.2.0-82.sme +- Workstation Backup, suppress ctime error message on incremental backups [SME: 8133] + +* Sat Jan 11 2014 Ian Wells 2.2.0-81.sme +- Workstation Backup, update last patch to check error code [SME: 8124] + +* Fri Jan 10 2014 Ian Wells 2.2.0-80.sme +- Workstation Backup, ensure that the pathname passed to dar_manager is quoted [SME: 8124] + +* Fri Jan 3 2014 Ian Wells 2.2.0-79.sme +- Workstation Backup, count backup sets from 1 and + delete the obsolete set0 when it goes out of scope [SME: 7811] + +* Sun Dec 21 2013 Ian Wells 2.2.0-78.sme +- Workstation Backup, do not fail backup for mtime/ctime mismatch [SME: 8076] +- Remove Workstation Backup Set numbering patch [SME: 7811] + +* Wed Dec 11 2013 Ian Wells 2.2.0-77.sme +- Workstation Backup, count backup sets from 1 [SME: 7811] + Set numbering patch by Dave Liquorice + +* Wed Dec 11 2013 Ian Wells 2.2.0-76.sme +- Workstation Backup, fix selective restore by requesting array + of results from CGI.pm [SME: 7762] + +* Wed Dec 11 2013 Ian Wells 2.2.0-75.sme +- Workstation Backup, new method to show files being restored is needed + when using dar 2.4 [SME: 8036] + +* Sat Jul 13 2013 Ian Wells 2.2.0-74.sme +- Workstation Backup, inconsistent formatting of host share name in messages + by Dave Liquorice [SME: 7775] + +* Sat Jul 13 2013 Ian Wells 2.2.0-73.sme +- Workstation Backup, disk usage now works for destinations with spaces [SME: 7782] + +* Sat Jul 13 2013 Ian Wells 2.2.0-72.sme +- Workstation Backup, DeleteEarly no longer uses temporary directory [SME: 6811] + +* Sun Jul 7 2013 Ian Wells 2.2.0-71.sme +- Workstation Backup, report cifs mount errors [SME: 7768] + +* Sun Jul 7 2013 Ian Wells 2.2.0-70.sme +- Workstation Backup, fix incremental backups with spaces [SME: 7159] + +* Sat Jul 6 2013 Ian Wells 2.2.0-69.sme +- Correct previous patch, there are two locations where the directory is deleted [SME: 5931] + +* Sat Jul 6 2013 Ian Wells 2.2.0-68.sme +- Workstation Backup, remove only machine specific temporary sub-directory [SME: 5931] + +* Sat Jul 6 2013 Ian Wells 2.2.0-67.sme +- Workstation Backup, add a choice to delete old backup before or after backup [SME: 6811] + +* Sat Jul 6 2013 Ian Wells 2.2.0-66.sme +- Workstation Backup, remove temporary directory on success [SME: 5931] +- Refactor directory tree creation and removal. + +* Sat Jul 6 2013 Ian Wells 2.2.0-65.sme +- Workstation Backup, be compatible with USB drives that have spaces in their label [SME: 7159] + +* Tue Jul 02 2013 Ian Wells 2.2.0-64.sme +- Desktop Backup, allow user setting of compression level [SME: 7723] + +* Tue Jul 02 2013 Ian Wells 2.2.0-63.sme +- Use Wake on LAN before starting Backup with DAR, by Dave Liquorice [SME: 4578] + +* Thu May 09 2013 chris burnat 2.2.0-62.sme +- Add second sleep to fix MS Vista issues, patch by Terry Fage [SME: 7034] + +* Sun Jul 08 2012 Ian Wells 2.2.0-61.sme +- Allow full backup to occur on Sunday [SME: 6876] + +* Mon Apr 9 2012 Jonathan Martens 2.2.0-60 +- Prevent selective restore timeout by creating dar catalog after backup [SME: 6052] + +* Sun Mar 04 2012 Ian Wells 2.2.0-59.sme +- Fix selective restore in modern browsers[SME: 6645] + +* Sun Jan 15 2012 Ian Wells 2.2.0-58.sme +- Remove default index.htm from Primary ibay before restore [SME: 6760] + +* Thu Dec 29 2011 Ian Wells 2.2.0-57.sme +- Additional email addresses for Workstation Backups [SME: 6783] + +* Tue Jul 19 2011 Jonathan Martens 2.2.0-56.sme +- Fix bareword TERM error introduced by 2.2.0-54 [SME: 6692] + +* Tue Jun 14 2011 Ian Wells 2.2.0-55.sme +- Do not make backup fail when due to a modified file, by Filippo Carletti [SME: 6569] + +* Sun Jun 12 2011 Ian Wells 2.2.0-54.sme +- Change kill -9 to Kill TERM [SME: 6564] +- Remove backup.orig file + +* Sun May 29 2011 Ian Wells 2.2.0-53.sme +- Remove EOL from volume labels [SME: 6605] + +* Mon Mar 21 2011 Jonathan Martens 2.2.0-52 +- Reverting previous changeset as it did more than it was supposed to do [SME: 6578] + +* Mon Mar 21 2011 Jonathan Martens 2.2.0-51 +- Fix html p entry [SME: 6578] + +* Sun Mar 20 2011 Jonathan Martens 2.2.0-50 +- Localize dropdown box of backup destination type [SME: 6575] + +* Fri Mar 18 2011 Jonathan Martens 2.2.0-49 +- Fix strings referencing USB media [SME: 5955] + +* Mon Mar 14 2011 Jonathan Martens 2.2.0-48 +- Fix strings representing sequences [SME: 5961] + +* Fri Mar 11 2011 Ian Wells 2.2.0-47.sme +- Backup to Workstation does not handle full remote disc gracefully, by Filippo Carletti [SME: 6355] + +* Sun Nov 21 2010 Jonathan Martens 2.2.0-46 +- Do not convert case of SmbShare on database migration [SME: 6387] + +* Sat Oct 10 2010 Ian Wells 2.2.0-45.sme +- Include disk usage in Workstation Backup email [SME: 6143] + +* Mon Jul 19 2010 Ian Wells 2.2.0-44.sme +- Indicate failure in Subject line of Workstation Backup [SME: 6121] + +* Fri Jul 9 2010 Ian Wells 2.2.0-43.sme +- Only define Workstation Backup temporary directory once [SME: 5930] + +* Fri Jul 9 2010 Ian Wells 2.2.0-42.sme +- Remove relocate_samba_file and all references to /etc/smbpasswd [SME: 6073] + +* Thu Jul 8 2010 Ian Wells 2.2.0-41.sme +- Remove /etc/smbpasswd from restore_list [SME: 6071] + +* Tue Jun 22 2010 Ian Wells 2.2.0-40.sme +- Update backup instructions in server-manager [SME: 6078] + +* Mon Jun 14 2010 Ian Wells 2.2.0-39.sme +- Strip spaces from Workstation Backup hostname [SME: 6060] + +* Mon Jun 14 2010 Jonathan Martens 2.2.0-38.sme +- Fix error causing restore to report failed where it was complete [SME: 6062] + +* Mon Jun 7 2010 Filippo Carletti 2.2.0-37.sme +- Check if local USB disk is mounted in backup panel [SME: 6033] + +* Thu May 13 2010 Filippo Carletti 2.2.0-36.sme +- Revert patch from 2.2.0-31: secrets.tdb still in /etc/samba [SME: 5857] + +* Tue May 11 2010 Jonathan Martens 2.2.0-35.sme +- Fix removal of leading slash in storage location [SME: 5928] + +* Thu May 9 2010 Ian Wells 2.2.0-34.sme +- Add system name in Workstation Backups email [SME: 5706] + * Thu May 6 2010 Ian Wells 2.2.0-33.sme - To: field missing from header in Workstation Backups email [SME: 5924] @@ -1194,6 +1397,51 @@ e-smith server central backup administra %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%patch47 -p1 +%patch48 -p1 +%patch49 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 +%patch69 -p1 +%patch70 -p1 +%patch71 -p1 +%patch72 -p1 +%patch73 -p1 +%patch74 -p1 +%patch75 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup