* Sun Oct 05 2025 Brian Read <brianr@koozali.org> 0.2-21.sme

- Add UTF8 and avoid potential DB caching problems [SME: 13209]

contriborbase

@@ -1 +0,0 @@
-contribs10

createlinks

@@ -2,21 +2,6 @@
 
 use esmith::Build::CreateLinks  qw(:all);
 
-# Start and stop links - SME9
-
-#service_link_enhanced("backuppc", "S98", "7");
-#service_link_enhanced("backuppc", "K10", "6");
-#service_link_enhanced("backuppc", "K10", "0");
-#service_link_enhanced("backuppc", "K10", "1");
-
-#service_link_enhanced("httpd-bkpc", "S86", "7");
-#service_link_enhanced("httpd-bkpc", "K15", "6");
-#service_link_enhanced("httpd-bkpc", "K15", "0");
-#service_link_enhanced("httpd-bkpc", "K15", "1");
-
-#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-bkpc');
-#safe_symlink("/var/service/httpd-bkpc" , 'root/service/httpd-bkpc');
-
 # Panel links
 
 panel_link("backuppc", 'manager');
@@ -43,6 +28,8 @@ $event = 'smeserver-BackupPC-update'; #Must match rpm name
 #action specific to this package
      event_link("backuppc-checkupgrade", $event, "20");
      event_link("backuppc-genkey", $event, "10");
+     event_link("navigation2-conf", $event, "80");
+     event_link("routes2-conf", $event, "80");
      event_link("backuppc-checkupgrade", "post-upgrade", "91");
      event_link("backuppc-genkey", "post-upgrade", "90");
 #services we need to restart

root/etc/e-smith/events/actions/backuppc-checkupgrade

@@ -8,6 +8,7 @@ if [ -e /etc/BackupPC/config.pl ]; then
 
 	# Update paths
 	sed -i 's|/opt/backuppc/files|/var/lib/BackupPC|' /etc/BackupPC/config.pl
+	sed -i 's|/var/run/BackupPC|/run/BackupPC|' /etc/BackupPC/config.pl
 	sed -i 's|/usr/local/BackupPC|/usr/share/BackupPC|' /etc/BackupPC/config.pl
 	sed -i 's|/opt/backuppc/cgi-bin|/usr/share/BackupPC/sbin|' /etc/BackupPC/config.pl
 	sed -i 's|/opt/backuppc/images|/usr/share/BackupPC/html|' /etc/BackupPC/config.pl

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28BackupPCProxyPass

@@ -22,6 +22,7 @@
     <Location /BackupPC>
         SSLRequireSSL on
         Require ip $localAccess $externalSSLAccess
+        Header set Content-Security-Policy  "script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'
     </Location>
 
 HERE

root/usr/share/smanager/lib/SrvMngr/Controller/Backuppc.pm

@@ -18,8 +18,8 @@ use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session ip_number_or_blank);
 
 use Quota;
-use esmith::ConfigDB;
-use esmith::AccountsDB;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 
 use esmith::util;
 use File::Basename;
@@ -28,23 +28,22 @@ use File::Path qw(make_path remove_tree);
 
 use esmith::Backup;
 use esmith::BackupHistoryDB;
-use esmith::util;
 use esmith::lockfile;
 
 use constant DEBUG => $ENV{MOJO_SMANAGER_DEBUG} || 0;
 
-our $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
-our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+my $cdb;
+my $adb;
 
 sub main {
 
     my $c = shift;
     $c->app->log->info($c->log_req);
 
-    #my $modul = get_backuppc( $c );
+	$cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
   
     my $url = "https://".$c->session->{'SystemName'}.".".$c->session->{"DomainName"}."/BackupPC";
-    #my $url = 'https://sme10.thereadclan.me.uk/BackupPC';
     $c->stash(url => $url );
     $c->render(template => 'backuppc');
 
@@ -53,52 +52,24 @@ sub main {
 
 sub get_backuppc {
 
-    my ($c) = @_;
-
-  my $tx             = $c->tx;
-  my $req            = $tx->req;
-
-#	3 env variables for durep.cgi
-    #$ENV{'SCRIPT_NAME'} = 'durep';
-    #$ENV{'REQUEST_METHOD'}  = $req->method;
-    #$ENV{'QUERY_STRING'} = $req->url->query->to_string;
-
-    my $res = `https:////sme10.thereadclan.me.uk//BackupPC`; 
-    
+	my ($c) = @_;
+	my $tx             = $c->tx;
+	my $req            = $tx->req; 
     my $res = `/usr/share/BackupPC/sbin/BackupPC_Admin`; #
-    my $step = 0; my $out;
+    my $step = 0; 
+    my $out;
     my @lines = split /\n/, $res;
 	# remove except 'body'
     foreach my $line (@lines) {
-	if ( $line =~ m|<body>| ) {
-	    $step = 1;
-	} elsif ( $line =~ m|</body>| ) {
-	    $step = 2;
-	} elsif ( $step == 1 ) {
-	    $out .= $line;
+		if ( $line =~ m|<body>| ) {
+			$step = 1;
+		} elsif ( $line =~ m|</body>| ) {
+			$step = 2;
+		} elsif ( $step == 1 ) {
+			$out .= $line;
+		}
 	}
-    }
     return $out;
 }
 
-#sub main {
-
-#    my $c = shift;
-#    $c->app->log->info($c->log_req); 
-
-#	BEGIN
-#	{
-#		$ENV {'PATH'} = '/bin:/usr/bin:/sbin';
-#		$ENV {'SHELL'} = '/bin/bash';
-#		delete $ENV {'ENV'};
-#	}
-
-
-    #$c = $c->redirect_to("https://".$ENV {'HTTP_X_FORWARDED_HOST'}."/BackupPC");
-#   $c = $c->redirect_to("https://sme10.thereadclan.me.uk//BackupPC");
-  
-#}
-
-
 1;
-

smeserver-BackupPC.spec

@@ -4,7 +4,7 @@
 
 Name: smeserver-BackupPC
 Version: 0.2
-Release: 18%{?dist}
+Release: 21%{?dist}
 Summary: BackupPC integration into SME server
 
 Group: Applications/System
@@ -52,6 +52,17 @@ This package contains specific configuration for SME server
 #----------------------------------------------------
 
 %changelog
+* Sun Oct 05 2025 Brian Read <brianr@koozali.org> 0.2-21.sme
+- Add UTF8 and avoid potential DB caching problems [SME: 13209]
+
+* Wed Sep 24 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.2-20.sme
+- relaxed CSP
+
+* Tue Sep 23 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.2-19.sme
+- fix /run/BackupPC instead of /var prevents service start
+- fix smanager2 display
+- add navigation2-conf and routes2-conf action
+
 * Tue Sep 23 2025 Brian Read <brianr@koozali.org> 0.2-18.sme
 - Change $config to config in layout file(s) [SME: 13171]