Fix hardcoded rp-pppoe.so location - thanks to Nestor

- fix autorenew of self-signed certificate [SME: 12218]
  strips unsupported characters, use utf8 encoding

root/etc/e-smith/templates/etc/sysconfig/network-scripts/chat-ppp0/20LINUX_PLUGIN

@@ -1 +1,6 @@
-LINUX_PLUGIN=/usr/lib64/pppd/2.4.5/rp-pppoe.so
+{
+# Find Roaring Penguin pppoe plugin
+my ($plugin) = glob "/usr/lib*/pppd/*/rp-pppoe.so";
+$plugin ||= "pppoe_plugin_could_not_be_found";
+$OUT .= "LINUX_PLUGIN=$plugin\n";
+}

root/etc/e-smith/templates/home/e-smith/ssl.crt

@@ -2,6 +2,7 @@
     use constant KEYLIFEINDAYS => $modSSL{KeyLifeInDays} || 365;
     use esmith::ssl;
     use Date::Parse;
+    use utf8;
     use Cwd;
     use Net::IP qw(ip_is_ipv4 ip_is_ipv6);
     use esmith::Logger;
@@ -38,6 +39,7 @@
     $defaultCity = substr($defaultCity, 0, 128); 
     $defaultCompany = substr($defaultCompany, 0, 64); 
     $defaultDepartment = substr($defaultDepartment, 0, 64);
+    $defaultDepartment =~ s/[''"]//g;
     $email = substr($email, 0, 64);
     $commonName = substr($commonName, 0, 64);
 
@@ -54,16 +56,19 @@
         my $key_md5 = `openssl rsa -noout -modulus -in $key | openssl md5`;
 
         if ( ($ttl_days > 2) && ( "$crt_md5" eq "$key_md5" ) ) {
-            my $expected_issuer = 'C = '.$Country .
+            my $expected_issuer = 'C='.$Country .
-                              ', ST = '.$State;
+                              ', ST='.$State;
-            $expected_issuer .= ', L = ' . ($defaultCity ? $defaultCity : 'Default City');
+            $expected_issuer .= ', L=' . ($defaultCity ? $defaultCity : 'Default City');
-            $expected_issuer .= ', O = ' . ($defaultCompany ? $defaultCompany : 'Default Company Ltd');
+            $expected_issuer .= ', O=' . ($defaultCompany ? $defaultCompany : 'Default Company Ltd');
-            $expected_issuer .= ", OU = $defaultDepartment" if $defaultDepartment;
+            $expected_issuer .= ", OU=$defaultDepartment" if $defaultDepartment;
-            $expected_issuer .= ", CN = $commonName" .
+            $expected_issuer .= ", CN=$commonName" .
-                                  ", emailAddress = $email";
+                                  ", emailAddress=$email";
-            my $issuer = `openssl x509 -issuer -noout -in $crt`;
+            # format so we can compare with right encoding
+            my $issuer = `openssl x509 -issuer -nameopt dump_der -noout -in $crt`;
             chomp $issuer;
             $issuer =~ s/^issuer=//;
+            # we remove any "
+            $issuer =~ s/["]//g;
             my $signatureAlg = `openssl x509 -text -noout -in $crt | grep "Signature Algorithm" | head -1`;
             chomp $signatureAlg;
             $signatureAlg =~ s/^ *Signature Algorithm: //;

root/etc/e-smith/templates/var/service/wan/pppoe.pppd.conf/plugin

@@ -1 +1,6 @@
-plugin /usr/lib64/pppd/2.4.5/rp-pppoe.so
+{
+# Find Roaring Penguin pppoe plugin
+my ($plugin) = glob "/usr/lib*/pppd/*/rp-pppoe.so";
+$plugin ||= "pppoe_plugin_could_not_be_found";
+$OUT .= "plugin $plugin\n";
+}

smeserver-base.spec

@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - base module
 %define name smeserver-base
 Name: %{name}
 %define version 11.0.0
-%define release 32
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -182,6 +182,13 @@ fi
 
 
 %changelog
+* Wed Jul 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-34.sme
+- fix hardcoded rp-pppoe.so location - Thanks Nestor [SME: 13074]
+
+* Thu Jun 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-33.sme
+- fix autorenew of self-signed certificate [SME: 12218]
+  strips unsupported characters, use utf8 encoding
+
 * Thu Jun 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-32.sme
 - Replicate user accounts to samba Active Directory [SME: 12799]