--- rpms/e-smith-backup/sme9/e-smith-backup.spec 2013/07/05 23:27:42 1.6 +++ rpms/e-smith-backup/sme9/e-smith-backup.spec 2015/02/04 21:04:14 1.44 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.5 2013/07/05 23:24:49 wellsi Exp $ +# $Id: e-smith-backup.spec,v 1.43 2015/02/02 21:33:38 stephdl Exp $ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} %define version 2.4.0 -%define release 6 +%define release 43 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -15,6 +15,42 @@ Patch2: e-smith-backup-2.4.0-CIFS_UNC_Pa Patch3: e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch Patch4: e-smith-backup-2.4.0-workstation-backup-wol.patch Patch5: e-smith-backup-2.4.0-DesktopBackupCompression.patch +Patch6: e-smith-backup-2.4.0-workstation-backup-spaces.patch +Patch7: e-smith-backup-2.4.0-workstation-backup-ProcMounts.patch +Patch8: e-smith-backup-2.4.0-cifsmount-error.patch +Patch9: e-smith-backup-2.4.0-workstation-CreateCatalog.patch +Patch10: e-smith-backup-2.4.0-workstation-smbhost.patch +Patch11: e-smith-backup-2.4.0-workstation-removeTemp.patch +Patch12: e-smith-backup-2.4.0-workstation-DeleteEarly.patch +Patch13: e-smith-backup-2.4.0-BackupPanelText.patch +Patch14: e-smith-backup-2.4.0-workstation-report.patch +Patch15: e-smith-backup-2.4.0-workstation-SlowMounts.patch +Patch16: e-smith-backup-2.4.0-workstation-restoreList.patch +Patch17: e-smith-backup-2.4.0-workstation-selectiveRestore.patch +Patch18: e-smith-backup-2.4.0-workstation-setNumbering.patch +Patch19: e-smith-backup-2.4.0-workstation-backup-dar-whitespace.patch +Patch20: e-smith-backup-2.4.0-workstation-50exclude +Patch21: e-smith-backup-2.4.0-workstation-updateDarCatalog.patch +Patch22: e-smith-backup-2.4.0-workstation-nousb.patch +Patch23: e-smith-backup-2.4.0-workstation-noTempDir.patch +Patch24: e-smith-backup-2.4.0-workstation-Time.patch +Patch25: e-smith-backup-2.4.0-workstation-WolMail.patch +Patch26: e-smith-backup-2.4.0-workstation-newSet.patch +Patch27: e-smith-backup-2.4.0-workstation-selectiveRestoreK.patch +Patch28: e-smith-backup-2.4.0-30vfstype.patch +Patch29: e-smith-backup-2.4.0-moveConsoleBackup.patch +Patch30: e-smith-backup-2.4.0-workstation-updateDarCatalogSleep.patch +Patch31: e-smith-backup-2.4.0-workstation-PerlCritic.patch +Patch32: e-smith-backup-2.4.0-workstation-removeDOSendings.patch +Patch33: e-smith-backup-2.4.0-workstation-allowMounted1.patch +Patch34: e-smith-backup-2.4.0-workstation-allowMounted2.patch +Patch35: e-smith-backup-2.4.0-workstation-allowMounted3.patch +Patch36: e-smith-backup-2.4.0-workstation-asecu.patch +Patch37: e-smith-backup-2.4.0-workstation-mkdir.patch +Patch38: e-smith-backup-2.4.0-workstation-correctmount.patch +Patch39: e-smith-backup-2.4.0-dont_remove_apache_group.patch +Patch40: e-smith-backup-2.4.0.change_method_checkMount_to_findmnt.patch +Patch41: e-smith-backup-2.4.0-workstation-timeMismatch.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -23,7 +59,8 @@ 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(Crypt::PasswdMD5) +Requires: perl(Passwd::Unix) Requires: perl(POSIX) Requires: perl(Locale::gettext) Requires: perl(Digest::MD5) @@ -32,8 +69,129 @@ Requires: perl(esmith::I18N) Requires: dar Requires: cifs-utils Requires: e-smith-formmagick >= 1.4.0-12 +Requires: nfs-utils %changelog +* Wed Feb 4 2015 stephane de Labrusse 2.4.0-43.sme +- Workstation Backup, do not fail backup for mtime/ctime mismatch [SME: 8800] + +* Mon Feb 2 2015 stephane de Labrusse 2.4.0-42.sme +- Change the sub checkMount() to findmnt [SME: 8502] +- Ian Wells + +* Fri Jan 9 2015 stephane de Labrusse 2.4.0-40.sme +- Add requires nfs-utils [SME: 8479] +- the nfs service is neither started or allowed to start + +* Sun Nov 2 2014 Daniel Berteaud 2.4.0-38.sme +- Don't remove the apache group during restore [SME: 8549] + +* Sat Apr 26 2014 Ian Wells 2.4.0-37.sme +- Workstation Backup, fix regression in mounting backup share [SME: 8144] + +* Thu Apr 24 2014 Ian Wells 2.4.0-36.sme +- Workstation Backup, do not create folder in / [SME: 8347] + +* Wed Apr 23 2014 Ian Wells 2.4.0-35.sme +- Workstation Backup, suppress ctime error message on incremental backups [SME: 8346] + +* Sun Apr 20 2014 Ian Wells 2.4.0-34.sme +- Implement panel and restore for backup to mounted drive [SME: 8144] + +* Sun Apr 20 2014 Ian Wells 2.4.0-33.sme +- Implement verify workstation backup for mounted drive [SME: 8144] + +* Sat Apr 19 2014 Ian Wells 2.4.0-32.sme +- Allow workstation backup to mounted drive [SME: 8144] + +* Sat Mar 15 2014 Ian Wells 2.4.0-31.sme +- Update to the latest version of perform_restore [SME: 8259] +- Boostrap console should only offer restore if no password set. + +* Fri Mar 11 2014 Ian Wells 2.4.0-30.sme +- Delete items from dar catalog in descending order [SME: 8129] +- Minor non-functional updates based on PerlCritic and review comments + +* Thu Mar 10 2014 Ian Wells 2.4.0-29.sme +- Move console backup to e-smith-backup [SME: 3324] + +* Sun Feb 9 2014 Ian Wells 2.4.0-28.sme +- Workstation Backup, selective restore of deleted files [SME: 8200] +- Remove migrate fragment 30vfstype [SME: 8199] + +* Sat Feb 8 2014 Ian Wells 2.4.0-27.sme +- Workstation Backup, Don't delete old sets, only empty them. [SME: 8195] + +* Sat Feb 8 2014 Ian Wells 2.4.0-26.sme +- Workstation Backup, Mail and WOL now subroutines [SME: 8193] +- Workstation Backup, remove the need for a temporary directory, updated. [SME: 7767] + +* Wed Feb 5 2014 Ian Wells 2.4.0-25.sme +- Workstation Backup, backupname includes seconds. [SME: 8194] +- Simplification of the time routines. + +* Wed Feb 5 2014 Ian Wells 2.4.0-24.sme +- Workstation Backup, remove the need for a temporary directory. [SME: 7767] + +* Sun Feb 2 2014 Ian Wells 2.4.0-23.sme +- Allow configuration of workstation backup if no removable disk present [SME: 7815] + +* Sun Feb 2 2014 Ian Wells 2.4.0-22.sme +- Create simplified function for updating the DarCatalog [SME: 8129] + +* Fri Jan 3 2014 Ian Wells 2.4.0-21.sme +- Workstation Backup, do not exclude dar files by default + in line with console backup. [SME: 7523] + +* Wed Dec 18 2013 Ian Wells 2.4.0-20.sme +- Further refine the text in the Backup panel [SME: 7817] +- Workstation Backup, remove tabs and whitespace changes. + +* Thu Dec 12 2013 Ian Wells 2.4.0-19.sme +- Workstation Backup, count backup sets from 1 [SME: 8059] + Set numbering patch by Dave Liquorice + +* Thu Dec 12 2013 Ian Wells 2.4.0-18.sme +- Workstation Backup, fix selective restore by requesting array + of results from CGI.pm [SME: 8057] + +* Thu Dec 12 2013 Ian Wells 2.4.0-17.sme +- Workstation Backup, new method to show files being restored is needed + when using dar 2.4 [SME: 8058] + +* Tue Dec 02 2013 Ian Wells 2.4.0-16.sme +- Allow more time for cifs mounts before reporting errors [SME: 8034] + +* Sat Nov 30 2013 Ian Wells 2.4.0-15.sme +- Simplify the workstation backup report [SME: 7791] + +* Sat Nov 30 2013 Ian Wells 2.4.0-14.sme +- Update the text in the Backup panel [SME: 7817] + +* Sun Jul 14 2013 Ian Wells 2.4.0-13.sme +- Workstation Backup, add a choice to delete old backup before or after backup [SME: 7766] + +* Sun Jul 14 2013 Ian Wells 2.4.0-12.sme +- Workstation Backup, remove temporary directory on success [SME: 7765] +- Refactor directory tree creation and removal. + +* Sun Jul 14 2013 Ian Wells 2.4.0-11.sme +- Workstation Backup, inconsistent formatting of host share name in messages [SME: 7783] + +* Sun Jul 14 2013 Ian Wells 2.4.0-10.sme +- Workstation Backup, more reliable catalog creation [SME: 7786] + +* Sat Jul 13 2013 Ian Wells 2.4.0-9.sme +- Workstation Backup, report cifs mount errors [SME: 7769] + +* Sat Jul 13 2013 Ian Wells 2.4.0-8.sme +- Workstation Backup, do not access /proc/mounts [SME: 7785] +- Incremental backup fix [SME: 7763] + +* Sat Jul 13 2013 Ian Wells 2.4.0-7.sme +- Workstation Backup, allow spaces in the backup destination [SME: 7763] + Includes fix for disk usage broken with spaces. [SME: 7784] + * Fri Jul 5 2013 Ian Wells 2.4.0-6.sme - Desktop Backup, allow user setting of compression level [SME: 7744] @@ -1250,6 +1408,42 @@ e-smith server central backup administra %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%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 +%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 %build /sbin/e-smith/buildtests 10e-smith-backup