--- rpms/smeserver-softethervpn-server/contribs10/smeserver-softethervpn-server.spec 2021/01/25 09:07:59 1.6 +++ rpms/smeserver-softethervpn-server/contribs10/smeserver-softethervpn-server.spec 2021/03/30 23:06:08 1.7 @@ -1,5 +1,5 @@ %define version 4.34 -%define release 6 +%define release 7 Name: smeserver-softethervpn-server Version: %{version} @@ -14,13 +14,14 @@ 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 -Patch3:smeserver-softethervpn-server-4.34-Fix-Environment-in-service-file.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 %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. @@ -31,6 +32,8 @@ SoftEther VPN is one of the world's most %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +rm -rf root/etc/e-smith/templates-custom %build # Build symlinks @@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 30 2021 Jean-Philippe Pialasse %{version}-7.sme +- move template custom to core for https access on local only [SME: 11511] + * Mon Jan 25 2021 Brian Read %{version}-6.sme - Fix-Environment-in-service-file [SME: 11329]