From 09908697a40d01637f1eefdb7a0d5f3e27f30bbc Mon Sep 17 00:00:00 2001
From: John Crisp <jcrisp@safeandsoundit.co.uk>
Date: Wed, 9 Jul 2025 12:47:06 +0200
Subject: [PATCH] Fix hardcoded rp-pppoe.so location - thanks to Nestor

---
 .../etc/sysconfig/network-scripts/chat-ppp0/20LINUX_PLUGIN | 7 ++++++-
 .../templates/var/service/wan/pppoe.pppd.conf/plugin       | 7 ++++++-
 smeserver-base.spec                                        | 5 ++++-
 3 files changed, 16 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 root/etc/e-smith/templates/etc/sysconfig/network-scripts/chat-ppp0/20LINUX_PLUGIN

diff --git a/root/etc/e-smith/templates/etc/sysconfig/network-scripts/chat-ppp0/20LINUX_PLUGIN b/root/etc/e-smith/templates/etc/sysconfig/network-scripts/chat-ppp0/20LINUX_PLUGIN
old mode 100755
new mode 100644
index fdd6d86..5f3d5cf
--- a/root/etc/e-smith/templates/etc/sysconfig/network-scripts/chat-ppp0/20LINUX_PLUGIN
+++ b/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";
+}
\ No newline at end of file
diff --git a/root/etc/e-smith/templates/var/service/wan/pppoe.pppd.conf/plugin b/root/etc/e-smith/templates/var/service/wan/pppoe.pppd.conf/plugin
index e117ce2..789cb3b 100644
--- a/root/etc/e-smith/templates/var/service/wan/pppoe.pppd.conf/plugin
+++ b/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";
+}
\ No newline at end of file
diff --git a/smeserver-base.spec b/smeserver-base.spec
index d7308ff..69f991b 100644
--- a/smeserver-base.spec
+++ b/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 33
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -182,6 +182,9 @@ 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