rm contriborbase

- change key type from service to configuration [SME: 11367]

.gitignore

@@ -2,3 +2,4 @@
 *.log
 *spec-20*
 *.tar.xz
+*.bak

README.md

@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-backup smeserver
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-backup&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
+Show list of outstanding bugs:
+[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-backup&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-backup&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-backup&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-backup&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-backup&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-backup&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-backup&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
 And a list of outstanding Legacy bugs: (e-smith-backup) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-backup&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
 
 ## Description

contriborbase

@@ -1 +0,0 @@
-sme10

root/etc/e-smith/db/configuration/defaults/backup/type

@@ -1 +1 @@
-service
+configuration

root/etc/e-smith/db/configuration/defaults/backupwk/type

@@ -1 +1 @@
-service
+configuration

root/etc/e-smith/db/configuration/migrate/smeserver-backup

@@ -0,0 +1,5 @@
+{
+ foreach my $sservice (qw(backup backupwk)) {
+  $DB->set_prop($sservice, "type", "configuration") if  ${$sservice}{type} eq "service";
+  }
+}

root/etc/e-smith/templates/etc/dar/DailyBackup.dcf/10compression

@@ -2,5 +2,5 @@
     $level = $backupwk{Compression} || 0;
     $prog = $backupwk{CompressionProg} || 'gzip';
 
-    $OUT = ($level eq '0' or $prog eq 'none') ?  "#Compression off" : "--$prog=$level"
+    $OUT = ($level eq '0' or $prog eq 'none') ?  "#Compression off" : "-z$prog:$level"
 }

root/etc/e-smith/web/functions/backup

@@ -316,7 +316,7 @@ sub showInitial
 	$restore_state = 'idle';
     }
 
-    print $q->startform(
+    print $q->start_form(
 	    -method => 'POST',
 	    -action => $q->url (-absolute => 1)
 	),"\n";
@@ -377,7 +377,7 @@ sub showInitial
 	    -default => 'perform'
 	),"\n";
 
-    print $q->endform,"\n";
+    print $q->end_form,"\n";
 
     esmith::cgi::genFooter($fm);
 
@@ -572,7 +572,7 @@ sub TapeBackupConfig
 	$reminderAMPM = 'PM';
     }
 
-    print $q->startform(
+    print $q->start_form(
 	    -method => 'POST',
 	    -action => $q->url (-absolute => 1)
 	);
@@ -676,7 +676,7 @@ sub TapeBackupConfig
 	    -default => 'tape-configure'
 	);
 
-    print $q->endform;
+    print $q->end_form;
     print '</table>';
 
     esmith::cgi::genFooter($fm);
@@ -890,7 +890,7 @@ sub tapeRestore ()
 		-default => 'tape-restore'
 	    );
 
-	print $q->endform;
+	print $q->end_form;
 	esmith::cgi::genFooter($fm);
 }
 
@@ -1119,7 +1119,7 @@ sub WorkstnBackupConfig
     }
     else { print $fm->localise('WORKSTN_BACKUP_NOT_CONFIGURED'), '<br/>' }
 
-    print $q->startform(
+    print $q->start_form(
 	    -method => 'POST',
 	    -action => $q->url (-absolute => 1)
 	);
@@ -1158,7 +1158,7 @@ sub WorkstnBackupConfig
 	);
     print '</table>';
 
-    print $q->endform;
+    print $q->end_form;
 
     esmith::cgi::genFooter ($q);
     return;
@@ -1268,7 +1268,7 @@ sub WorkstnBackupConfig1
     }
 
 
-    print $q->startform(
+    print $q->start_form(
 	    -method => 'POST',
 	    -action => $q->url (-absolute => 1)
 	);
@@ -1486,7 +1486,7 @@ sub WorkstnBackupConfig1
 	);
     print '</table>';
 
-    print $q->endform;
+    print $q->end_form;
 
     esmith::cgi::genFooter ($q);
     return;
@@ -1924,7 +1924,7 @@ sub workstnVerify ()
 	    -default => 'workstn-verify'
 	);
 
-    print $q->endform;
+    print $q->end_form;
 
     esmith::cgi::genFooter ($q);
 }
@@ -2279,7 +2279,7 @@ sub workstnRestore ()
 	-default => 'workstn-restore'
     );
 
-    print $q->endform;
+    print $q->end_form;
 
     esmith::cgi::genFooter ($q);
 }
@@ -2480,7 +2480,7 @@ sub performWorkstnRestore
 
 	print $q->p ($q->b ($message));
 
-        print $q->startform(
+        print $q->start_form(
 	    -method => 'POST',
 	    -action => $q->url (-absolute => 1)
 	);
@@ -2502,7 +2502,7 @@ sub performWorkstnRestore
 	    -default => 'perform'
 	),"\n";
         print $q->end_table,"\n";
-	print $q->endform;
+	print $q->end_form;
 
 	esmith::cgi::genFooter ($q);
     }
@@ -2686,7 +2686,7 @@ sub workstnSelRestore()
 	    -default => 'workstn-sel-restore'
 	);
 
-    print $q->endform;
+    print $q->end_form;
 
 
     esmith::cgi::genFooter ($q);
@@ -2843,7 +2843,7 @@ sub performWorkstnSelRestore
 	    -value => $seldatebf
 	);
 
-    print $q->endform;
+    print $q->end_form;
 
     esmith::cgi::genFooter ($q);
 

smeserver-backup.spec

@@ -4,7 +4,7 @@ Summary: smeserver module to provide the backup panel
 %define name smeserver-backup
 Name: %{name}
 %define version 11.0.0
-%define release 4
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -32,6 +32,18 @@ Requires: smeserver-formmagick >= 1.4.0-12
 Requires: nfs-utils
 
 %changelog
+* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
+- change key type from service to configuration [SME: 11367]
+
+* Thu Nov 14 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
+- fix startform/endform to start_form/end_form [SME: 12773]
+
+* Thu Aug 15 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme
+- failure at pre-restore [SME: 12722]
+
+* Wed Apr 24 2024 Brian Read <brianr@koozali.org> 11.0.0-5.sme
+- Fix up compression parameter to dar due to change in format [SME: 12647]
+
 * Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-4.sme
 - Update createlinks to create smeserver-package-update event[SME: 12579]