--- rpms/smeserver-softethervpn-server/contribs10/smeserver-softethervpn-server.spec	2021/01/24 11:29:56	1.5
+++ rpms/smeserver-softethervpn-server/contribs10/smeserver-softethervpn-server.spec	2023/03/07 04:01:21	1.8
@@ -1,5 +1,5 @@
 %define version  4.34
-%define release 5
+%define release 8
 
 Name:           smeserver-softethervpn-server
 Version:        %{version}
@@ -14,11 +14,15 @@ Source0:        smeserver-softethervpn-s
 BuildRequires:  e-smith-devtools
 Requires:	smeserver-bridge-interface
 Requires:	softethervpn
+Requires:	e-smith-apache >= 2.6.0-14
 Conflicts: 	smeserver-openvpn-bridge
 AutoReqProv:    no
-Patch0:smeserver-softethervpn-server-4.34-Update-Createlinks-for-systemd.patch
-Patch1:smeserver-softethervpn-server-4.34-Patch-Service-File-for-SME10.patch
-Patch2:smeserver-softethervpn-server-4.34-Fix-vpnserver-path-in-service-file-override.patch
+Patch0: smeserver-softethervpn-server-4.34-Update-Createlinks-for-systemd.patch
+Patch1: smeserver-softethervpn-server-4.34-Patch-Service-File-for-SME10.patch
+Patch2: smeserver-softethervpn-server-4.34-Fix-vpnserver-path-in-service-file-override.patch
+Patch3: smeserver-softethervpn-server-4.34-Fix-Environment-in-service-file.patch
+Patch4: smeserver-softethervpn-server-4.34-bz11511.patch
+Patch5: smeserver-softethervpn-server-4.34-bz12334-bz12333.patch
 
 %description
 SoftEther VPN is one of the world's most powerful and easy-to-use multi-protocol VPN software. It runs on Windows, Linux, Mac, FreeBSD, and Solaris.
@@ -29,6 +33,11 @@ SoftEther VPN is one of the world's most
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf root/etc/e-smith/templates-custom
+%patch5 -p1
+rm -rf root/etc/e-smith/templates/etc/raddb/users
 
 %build
 # Build symlinks
@@ -51,6 +60,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 06 2023 Jean-Philippe Pialasse <tests@pialasse.com> 4.34-8.sme
+- update path for ldap/radius auth [SME: 12333]
+- backup the configuration and logs [SME: 12334]
+
+* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> %{version}-7.sme
+- move template custom to core for https access on local only [SME: 11511]
+
+* Mon Jan 25 2021 Brian Read <brianr@bjsystems.co.uk> %{version}-6.sme
+- Fix-Environment-in-service-file [SME: 11329]
+
 * Sun Jan 24 2021 Brian Read <brianr@bjsystems.co.uk> %{version}-5.sme
 - Fix-vpnserver-path-in-service-file-override [SME: 11326]