--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2008/05/26 10:13:32 1.19 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2013/07/14 02:56:06 1.104 @@ -1,28 +1,80 @@ +# $Id: e-smith-backup.spec,v 1.103 2013/07/07 19:28:44 wellsi Exp $ + Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} -%define version 1.15.0 -%define release 16 +%define version 2.2.0 +%define release 72 Version: %{version} Release: %{release}%{?dist} License: Artistic Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch0: e-smith-backup-1.15.0-DarWorkstation.patch -Patch1: e-smith-backup-1.15.0-reformat.patch -Patch2: e-smith-backup-1.15.0-no_desktop_verify_restore.patch -Patch3: e-smith-backup-1.15.0-DarWorkstation.patch2 -Patch4: e-smith-backup-1.15.0-DarWorkstation.patch3 -Patch5: e-smith-backup-1.15.0-FixCompressionSetting.patch -Patch6: e-smith-backup-1.15.0-WrongRestoreLocationFix.patch -Patch7: e-smith-backup-1.15.0-rmLexDuplicates.patch -Patch8: e-smith-backup-1.15.0-tags2general.patch -Patch9: e-smith-backup-1.15.0-DarDesc.patch -Patch10: e-smith-backup-1.15.0-brFix.patch -Patch11: e-smith-backup-1.15.0-fixerrmsg.patch -Patch12: e-smith-backup-1.15.0-hours.patch -Patch13: e-smith-backup-1.15.0-add2general.patch -Patch14: e-smith-backup-1.15.0-FixDarExpandTemplate.patch +Patch1: e-smith-backup-2.2.0-localise_fix.patch +Patch2: e-smith-backup-2.2.0-fixPleaseConfigure.patch +Patch3: e-smith-backup-2.2.0-restore_list.patch +Patch4: e-smith-backup-2.2.0-timeout.patch +Patch5: e-smith-backup-2.2.0-smbfs.patch +Patch6: e-smith-backup-2.2.0-mount_verify.patch +Patch7: e-smith-backup-2.2.0-nocompressogg.patch +Patch8: e-smith-backup-2.2.0-verbose.patch +Patch9: e-smith-backup-2.2.0-email.patch +Patch10: e-smith-backup-2.2.0-mount_usb.patch +Patch11: e-smith-backup-2.2.0-verbose_panel.patch +Patch12: e-smith-backup-2.2.0-gzip.patch +Patch13: e-smith-backup-2.2.0-empty.patch +Patch14: e-smith-backup-2.2.0-spelling.patch +Patch15: e-smith-backup-2.2.0-password.patch +Patch16: e-smith-backup-2.2.0-fixCompressionLevelRange.patch +Patch17: e-smith-backup-2.2.0-fixReport.patch +Patch18: e-smith-backup-2.2.0-workstation_verify.patch +Patch19: e-smith-backup-2.2.0-many_daily_dar.patch +Patch20: e-smith-backup-2.2.0-CIFScredentials.patch +Patch21: e-smith-backup-2.2.0-CIFScredentials2.patch +Patch22: e-smith-backup-2.2.0-moreexcludes.patch +Patch23: e-smith-backup-2.2.0-fullSunday.patch +Patch24: e-smith-backup-2.2.0-once_a_day.patch +Patch25: e-smith-backup-2.2.0-perform_backup-hal.patch +Patch26: e-smith-backup-2.2.0-smbpasswd_not_last.patch +Patch27: e-smith-backup-2.2.0-create_mount.patch2 +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -41,6 +93,246 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* 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] + +* Wed Mar 17 2010 Jonathan Martens 2.2.0-32.sme +- Partly revert previous patch due to undesired side effects to smbpasswd [SME: 5857] + +* Wed Mar 17 2010 Jonathan Martens 2.2.0-31.sme +- Adjust backup routines for relocation of samba secrets.tdb file [SME: 5857] + +* Mon Feb 15 2010 Stephen Noble 2.2.0-30.sme +- Improved upgrade compatibility, remove .orig [SME: 4809] + +* Fri Feb 12 2010 Stephen Noble 2.2.0-29.sme +- fix mount point for verify [SME: 5765] + +* Tue Feb 9 2010 Stephen Noble 2.2.0-28.sme +- create mount point for verify [SME: 5765] + +* Sun Jan 31 2010 Stephen Noble 2.2.0-27.sme +- remove comment re smbpasswd being last [SME: 5600] + +* Sun Jan 31 2010 Stephen Noble 2.2.0-26.sme +- Fix mounting usb disks [SME: 4809] + +* Mon Jan 25 2010 Filippo Carletti 2.2.0-25.sme +- Don't backup more than once per day [SME: 5445] + +* Wed Nov 25 2009 Filippo Carletti 2.2.0-24.sme +- Fix full backup on Sunday diplayed as Everyday [SME: 5623] + +* Fri Nov 6 2009 Jonathan Martens 2.2.0-23.sme +- Add more excludes for compressed filetypes [SME: 4765] + +* Wed Aug 26 2009 Jonathan Martens 2.2.0-22.sme +Porting Jean-Paul Leclere changes in the SME Server 7 tree to SME Server 8: +- using credentials file for cifs mount [SME: 5442] +- workstation backup: add cifs credentials expand to bootstrap-console-save [SME: 5442] + +* Sun Jul 26 2009 Jean-Paul Leclere 2.2.0-21.sme +- workstation backup: allow many backups in the same day [SME: 5411] + +* Wed Jul 22 2009 Jean-Paul Leclere 2.2.0-20.sme +- workstation restore: all needed backups must be available before restore [SME: 5397] +- workstation verify: add option to check integrity of backups needed in a full restore [SME: 5405] +- minor fix in translation [SME: 5407] + +* Sun May 17 2009 Jonathan Martens 2.2.0-19.sme +- Fix DAR e-mail message with regards to incremental backups [SME: 4579] + +* Tue Dec 9 2008 Jonathan Martens 2.2.0-18.sme +- Fix discrepancy in maximum compression level [SME: 4841] + +* Wed Oct 29 2008 Shad L. Lords 2.2.0-17.sme +- Fix spelling mistakes in backup panel [SME: 4732] +- Hide password from manager panel [SME: 4734] + +* Tue Oct 28 2008 Shad L. Lords 2.2.0-16.sme +- Migrate smbfs to cifs to complete removal [SME: 4678] + +* Mon Oct 27 2008 Shad L. Lords 2.2.0-15.sme +- Fix compression to default to gzip [SME: 4630] +- Fix uninitialized values in backup [SME: 4720] + +* Sat Oct 25 2008 Stephen Noble 2.2.0-14.sme +- dar backup to be less verbose in panel [SME: 4719] + +* Sat Oct 25 2008 Stephen Noble 2.2.0-13.sme +- correct mounting for usb disks [SME: 4695] + +* Wed Oct 22 2008 Shad L. Lords 2.2.0-12.sme +- Fix from address on email [SME: 4702] + +* Tue Oct 21 2008 Shad L. Lords 2.2.0-11.sme +- Fix patch to remove orig file [SME: 4700] +- Patch dar backup to be less verbose [SME: 4699] + +* Tue Oct 21 2008 Stephen Noble 2.0.0-10.sme +- no compression for ogg media files [SME: 4677] + +* Tue Oct 21 2008 Stephen Noble 2.2.0-8.sme +- replace defined list of directories to backup [SME: 4676] + +* Mon Oct 20 2008 Shad L. Lords 2.2.0-7.sme +- Fix already mounted check [SME: 4688] + +* Mon Oct 20 2008 Shad L. Lords 2.2.0-6.sme +- Remove obsolete smbfs backup method [SME: 4678] + +* Mon Oct 20 2008 Shad L. Lords 2.2.0-5.sme +- Use perl routines for timeout checking [SME: 4660] + +* Thu Oct 16 2008 Shad L. Lords 2.2.0-4.sme +- Make dar use defined list of directories to backup [SME: 4676] + +* Thu Oct 16 2008 Jonathan Martens 2.2.0-3.sme +- Correct translation of CONFIGURATION_TO_BE_DONE to be proper English [SME: 4669] + +* Thu Oct 9 2008 Shad L. Lords 2.2.0-2.sme +- Fix localization strings in backup panel [SME: 4650] + +* Tue Oct 7 2008 Shad L. Lords 2.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Thu Aug 7 2008 Shad L. Lords 1.15.0-22 +- Localise status of workstation backup [SME: 4481] + +* Fri Aug 1 2008 Jonathan Martens 1.15.0-21 +- Fix too greedy removel of locale key CONFIGURE_TAPE_BACKUP [SME: 4469] + +* Sat Jul 26 2008 Shad L. Lords 1.15.0-20 +- Make full backups have priority over incremental [SME: 4395] + +* Sat Jul 26 2008 Shad L. Lords 1.15.0-19 +- Fix redirect to stderr on check tape cronjob [SME: 4458] + +* Sun Jul 7 2008 Jonathan Martens 1.15.0-18 +- Add common tags to e-smith-formmagick's general [SME: 4286] + +* Sat May 31 2008 Gavin Weight 1.15.0-17 +- Fix Dar manager to redirect correctly in system call. [SME: 4304] + * Mon May 26 2008 Gavin Weight 1.15.0-16 - Fix Dar to expand correctly. [SME: 4304] @@ -1026,7 +1318,6 @@ e-smith server central backup administra %prep %setup -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -1041,7 +1332,57 @@ e-smith server central backup administra %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 +%patch26 -p1 +%patch27 -p1 +%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 %build /sbin/e-smith/buildtests 10e-smith-backup