--- rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11374-pptp2vpn.patch	2021/03/03 20:18:12	1.1
+++ rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11374-pptp2vpn.patch	2021/03/03 20:21:28	1.2
@@ -23,162 +23,6 @@ diff -Nur e-smith-base-5.8.0.old/root/et
 +++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/vpn/type	2021-03-03 13:25:50.502000000 -0500
 @@ -0,0 +1 @@
 +configuration
-diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/locale/en/etc/e-smith/web/functions/remoteaccess e-smith-base-5.8.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/remoteaccess
---- e-smith-base-5.8.0.old/root/etc/e-smith/locale/en/etc/e-smith/web/functions/remoteaccess	2016-02-04 18:14:13.000000000 -0500
-+++ e-smith-base-5.8.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/remoteaccess	2021-03-03 15:12:34.138000000 -0500
-@@ -48,8 +48,8 @@
- 	<trans>Number of PPTP clients</trans>
-     </entry>
-      <entry>
--       <base>NUMBER_OF_PPTP_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE</base>
--       <trans>The number of pptp clients is greater than the number of reserved IP for DHCP. You should take a smaller number.</trans>
-+       <base>NUMBER_OF_VPN_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE</base>
-+       <trans>The number of VPN clients is greater than the number of reserved IP for DHCP. You should take a smaller number.</trans>
-     </entry>
-     <entry>
-         <base>LABEL_SSH_PORT</base>
-@@ -124,6 +124,15 @@
- 	</trans>
-     </entry>
-     <entry>
-+        <base>DESC_VPN</base>
-+        <trans><![CDATA[ <hr class="sectionbar" /><h2>VPN Settings</h2>
-+            You can allow VPN access to your server.
-+            You should leave this feature disabled by setting the value
-+            to the number 0 unless you require VPN access.
-+            ]]>
-+        </trans>
-+    </entry>
-+    <entry>
- 	<base>VALUE_ZERO_OR_POSITIVE</base>
- 	<trans>Value must be zero or a positive integer</trans>
-     </entry>
-@@ -243,4 +252,8 @@
- 	<base>LABEL_IPSECRW_RESET</base>
- 	<trans>Reset digital certificates</trans>
-     </entry>
-+    <entry>
-+        <base>DESC_IPSEC_VPN_UNAVAILABLE</base>
-+        <trans>IPSEC VPN is not installed. Please install the contrib if you need VPN access.</trans>
-+    </entry>
- </lexicon>  
-diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/locale/en-au/etc/e-smith/web/functions/remoteaccess e-smith-base-5.8.0/root/etc/e-smith/locale/en-au/etc/e-smith/web/functions/remoteaccess
---- e-smith-base-5.8.0.old/root/etc/e-smith/locale/en-au/etc/e-smith/web/functions/remoteaccess	2016-02-04 18:14:13.000000000 -0500
-+++ e-smith-base-5.8.0/root/etc/e-smith/locale/en-au/etc/e-smith/web/functions/remoteaccess	2021-03-03 15:12:34.138000000 -0500
-@@ -48,8 +48,8 @@
- 	<trans>Number of PPTP clients</trans>
-     </entry>
-      <entry>
--       <base>NUMBER_OF_PPTP_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE</base>
--       <trans>The number of pptp clients is greater than the number of reserved IP for DHCP. You should take a smaller number.</trans>
-+       <base>NUMBER_OF_VPN_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE</base>
-+       <trans>The number of VPN clients is greater than the number of reserved IP for DHCP. You should take a smaller number.</trans>
-     </entry>
-     <entry>
-         <base>LABEL_SSH_PORT</base>
-@@ -124,6 +124,15 @@
- 	</trans>
-     </entry>
-     <entry>
-+        <base>DESC_VPN</base>
-+        <trans><![CDATA[ <hr class="sectionbar" /><h2>VPN Settings</h2>
-+            You can allow VPN access to your server.
-+            You should leave this feature disabled by setting the value
-+            to the number 0 unless you require VPN access.
-+            ]]>
-+        </trans>
-+    </entry>
-+    <entry>
- 	<base>VALUE_ZERO_OR_POSITIVE</base>
- 	<trans>Value must be zero or a positive integer</trans>
-     </entry>
-@@ -243,4 +252,8 @@
- 	<base>LABEL_IPSECRW_RESET</base>
- 	<trans>Reset digital certificates</trans>
-     </entry>
-+    <entry>
-+        <base>DESC_IPSEC_VPN_UNAVAILABLE</base>
-+        <trans>IPSEC VPN is not installed. Please install the contrib if you need VPN access.</trans>
-+    </entry>
- </lexicon>  
-diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/locale/en-gb/etc/e-smith/web/functions/remoteaccess e-smith-base-5.8.0/root/etc/e-smith/locale/en-gb/etc/e-smith/web/functions/remoteaccess
---- e-smith-base-5.8.0.old/root/etc/e-smith/locale/en-gb/etc/e-smith/web/functions/remoteaccess	2016-02-04 18:14:13.000000000 -0500
-+++ e-smith-base-5.8.0/root/etc/e-smith/locale/en-gb/etc/e-smith/web/functions/remoteaccess	2021-03-03 15:12:34.138000000 -0500
-@@ -48,8 +48,8 @@
- 	<trans>Number of PPTP clients</trans>
-     </entry>
-      <entry>
--       <base>NUMBER_OF_PPTP_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE</base>
--       <trans>The number of pptp clients is greater than the number of reserved IP for DHCP. You should take a smaller number.</trans>
-+       <base>NUMBER_OF_VPN_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE</base>
-+       <trans>The number of VPN clients is greater than the number of reserved IP for DHCP. You should take a smaller number.</trans>
-     </entry>
-     <entry>
-         <base>LABEL_SSH_PORT</base>
-@@ -124,6 +124,15 @@
- 	</trans>
-     </entry>
-     <entry>
-+        <base>DESC_VPN</base>
-+        <trans><![CDATA[ <hr class="sectionbar" /><h2>VPN Settings</h2>
-+            You can allow VPN access to your server.
-+            You should leave this feature disabled by setting the value
-+            to the number 0 unless you require VPN access.
-+            ]]>
-+        </trans>
-+    </entry>
-+    <entry>
- 	<base>VALUE_ZERO_OR_POSITIVE</base>
- 	<trans>Value must be zero or a positive integer</trans>
-     </entry>
-@@ -243,4 +252,8 @@
- 	<base>LABEL_IPSECRW_RESET</base>
- 	<trans>Reset digital certificates</trans>
-     </entry>
-+    <entry>
-+        <base>DESC_IPSEC_VPN_UNAVAILABLE</base>
-+        <trans>IPSEC VPN is not installed. Please install the contrib if you need VPN access.</trans>
-+    </entry>
- </lexicon>  
-diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/locale/en-nz/etc/e-smith/web/functions/remoteaccess e-smith-base-5.8.0/root/etc/e-smith/locale/en-nz/etc/e-smith/web/functions/remoteaccess
---- e-smith-base-5.8.0.old/root/etc/e-smith/locale/en-nz/etc/e-smith/web/functions/remoteaccess	2016-02-04 18:14:13.000000000 -0500
-+++ e-smith-base-5.8.0/root/etc/e-smith/locale/en-nz/etc/e-smith/web/functions/remoteaccess	2021-03-03 15:12:34.138000000 -0500
-@@ -48,8 +48,8 @@
- 	<trans>Number of PPTP clients</trans>
-     </entry>
-      <entry>
--       <base>NUMBER_OF_PPTP_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE</base>
--       <trans>The number of pptp clients is greater than the number of reserved IP for DHCP. You should take a smaller number.</trans>
-+       <base>NUMBER_OF_VPN_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE</base>
-+       <trans>The number of VPN clients is greater than the number of reserved IP for DHCP. You should take a smaller number.</trans>
-     </entry>
-     <entry>
-         <base>LABEL_SSH_PORT</base>
-@@ -124,6 +124,15 @@
- 	</trans>
-     </entry>
-     <entry>
-+        <base>DESC_VPN</base>
-+        <trans><![CDATA[ <hr class="sectionbar" /><h2>VPN Settings</h2>
-+            You can allow VPN access to your server.
-+            You should leave this feature disabled by setting the value
-+            to the number 0 unless you require VPN access.
-+            ]]>
-+        </trans>
-+    </entry>
-+    <entry>
- 	<base>VALUE_ZERO_OR_POSITIVE</base>
- 	<trans>Value must be zero or a positive integer</trans>
-     </entry>
-@@ -243,4 +252,8 @@
- 	<base>LABEL_IPSECRW_RESET</base>
- 	<trans>Reset digital certificates</trans>
-     </entry>
-+    <entry>
-+        <base>DESC_IPSEC_VPN_UNAVAILABLE</base>
-+        <trans>IPSEC VPN is not installed. Please install the contrib if you need VPN access.</trans>
-+    </entry>
- </lexicon>  
 diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess e-smith-base-5.8.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess
 --- e-smith-base-5.8.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess	2016-02-04 18:14:13.000000000 -0500
 +++ e-smith-base-5.8.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess	2021-03-03 15:12:34.138000000 -0500