e-smith-base/sme10/e-smith-base-5.8.0-bz11415-dropDyndns.patch

diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks
--- e-smith-base-5.8.0.old/createlinks  2021-03-03 10:42:03.767000000 -0500
+++ e-smith-base-5.8.0/createlinks      2021-03-03 10:55:00.945000000 -0500
@@ -416,7 +416,7 @@
 $event = "ip-change";
 
 event_link("set-external-ip", $event, "03");
-event_link("update-dns", $event, "85");
+#event_link("update-dns", $event, "85");
 
 #--------------------------------------------------
 # actions for network-create event
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/DynDNS/status e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/DynDNS/status
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/DynDNS/status     2005-11-20 23:28:03.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/DynDNS/status 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-disabled
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/DynDNS/type e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/DynDNS/type
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/DynDNS/type       2005-11-20 23:28:03.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/DynDNS/type   1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-service
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/update-dns e-smith-base-5.8.0/root/etc/e-smith/events/actions/update-dns
--- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/update-dns   2005-11-20 23:28:05.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/update-dns       1969-12-31 19:00:00.000000000 -0500
@@ -1,52 +0,0 @@
-#!/usr/bin/perl -w
-
-#----------------------------------------------------------------------
-# copyright (C) 1999-2005 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#              
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#              
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-# Technical support for this program is available from Mitel Networks 
-# Please visit our web site www.mitel.com/sme/ for details.
-#----------------------------------------------------------------------
-
-package esmith;
-
-use strict;
-use Errno;
-use esmith::ConfigDB;
-
-my $c = esmith::ConfigDB->open_ro or die "Couldn't open config db";
-
-#------------------------------------------------------------
-# If using Dynamic DNS service, notify them of new IP address.
-#------------------------------------------------------------
-
-my $event = $ARGV [0];
-
-my $DynDNS = $c->get('DynDNS');
-exit 0 unless $DynDNS;
-
-my $status = $DynDNS->prop('status') || "disabled";
-my $service  = $DynDNS->prop('Service') || 'off';
-my $account  = $DynDNS->prop('Account');
-my $password  = $DynDNS->prop('Password');
-
-my $domain  = $c->get('DomainName')->value;
-
-exit 0 unless ($status eq "enabled" && $service ne "off");
-
-my $ipaddress = $c->get('ExternalIP') or die "Can't get External IP address";
-
-exec ("/sbin/e-smith/dynamic-dns/$service", $ipaddress->value, $account, $password, $domain)
diff -Nur e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm
--- e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm 2021-03-03 10:42:03.689000000 -0500
+++ e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm     2021-03-03 10:58:51.475000000 -0500
@@ -654,13 +654,13 @@
             $db->delete('GatewayIP');
             $db->set_value('ExternalDHCP', 'on');
             $db->set_value('DHCPClient', 'd');
-            goto DYNAMIC_DNS_SERVICE;
+            goto OTHER_PARAMETERS;#was DYNAMIC_DNS_SERVICE;
         }
 
         if ($choice eq  "4.")
         {
             $db->set_value('ExternalDHCP', 'off');
-            $db->set_prop('DynDNS', 'status', 'disabled');
+            #$db->set_prop('DynDNS', 'status', 'disabled');#dropped
             goto STATIC_IP;
         }
     }
@@ -682,7 +682,7 @@
 
     $db->set_value('DialupUserAccount', $choice || '');
 
-    goto DYNAMIC_DNS_SERVICE;
+    goto OTHER_PARAMETERS;# was DYNAMIC_DNS_SERVICE;
 }
 
 #------------------------------------------------------------
@@ -721,181 +721,7 @@
 
     $db->set_value('DialupUserPassword', $choice || '');
 
-    goto DYNAMIC_DNS_SERVICE;
-}
-
-#------------------------------------------------------------
-DYNAMIC_DNS_SERVICE:
-#------------------------------------------------------------
-goto OTHER_PARAMETERS unless (-d "/sbin/e-smith/dynamic-dns");
-
-{
-    unless (opendir (DIR, "/sbin/e-smith/dynamic-dns"))
-    {
-        warn gettext("Cannot read directory"),
-            " /sbin/e-smith/dynamic-dns", "\n";
-        $db->set_prop('DynDNS', 'status', 'disabled');
-        goto OTHER_PARAMETERS;
-
-    }
-    my @scripts = grep (!/^(\.\.?|custom)$/, readdir (DIR));
-    closedir (DIR);
-
-    foreach my $script (@scripts)
-    {
-        # Grab description from script contents
-    }
-
-    my $currentnumber;
-
-    my $status = $db->get_prop('DynDNS', 'status') || "disabled";
-    my $service = $db->get_prop('DynDNS', 'Service');
-    if ($status eq "disabled")
-    {
-        $service = "off";
-        $currentnumber = "1.";
-    }
-    else
-    {
-        if ($service eq 'yi')
-        {
-            $currentnumber = "2.";
-        }
-
-        if ($service eq 'dyndns')
-        {
-            $currentnumber = "3.";
-        }
-
-        if ($service eq 'dyndns.org')
-        {
-            $currentnumber = "4.";
-        }
-
-        if ($service eq 'tzo')
-        {
-            $currentnumber = "5.";
-        }
-
-        if ($service eq 'custom')
-        {
-            $currentnumber = "6.";
-        }
-    }
-
-    my @args = (
-                "1.", gettext("Do not use a dynamic DNS service"),
-                "2.", "www.yi.org"     . " - " . gettext("free service"),
-                "3.", "www.dyndns.com" . " - " . gettext("commercial service"),
-                "4.", "www.dyndns.org" . " - " . gettext("free service"),
-                "5.", "www.tzo.com"    . " - " . gettext("commercial service"),
-                "6.", gettext("custom DynDNS service"),
-               );
-
-    ($rc, $choice) = $console->menu_page
-        (
-         title   => gettext("Select dynamic DNS service"),
-        default => $currentnumber,
-         text    =>
-         gettext("Please specify whether you wish to subscribe to a dynamic DNS service. Such services allow you to have a domain name without a static IP address, and are available from various organizations for free or for a reasonable charge. A notification must be sent to the dynamic DNS service whenever your IP address changes. Your server can automatically do this for some dynamic DNS services.") .
-         "\n\n" .
-         gettext("Choose which dynamic DNS service you would like to use."),
-         argsref => \@args
-        );
-
-    goto SERVER_GATEWAY_DEDICATED unless ($rc == 0);
-
-    if ($choice eq  "1.")
-    {
-        $db->set_prop('DynDNS', 'status', 'disabled');
-        goto OTHER_PARAMETERS;
-    }
-    $db->set_prop('DynDNS', 'status', 'enabled');
-    if ($choice eq  "2.")
-    {
-        $db->set_prop('DynDNS', 'Service', 'yi');
-        goto DYNAMIC_DNS_ACCOUNT;
-    }
-
-    if ($choice eq  "3.")
-    {
-        $db->set_prop('DynDNS', 'Service', 'dyndns');
-        goto DYNAMIC_DNS_ACCOUNT;
-    }
-
-    if ($choice eq  "4.")
-    {
-        $db->set_prop('DynDNS', 'Service', 'dyndns.org');
-        goto DYNAMIC_DNS_ACCOUNT;
-    }
-
-    if ($choice eq  "5.")
-    {
-        $db->set_prop('DynDNS', 'Service', 'tzo');
-        goto DYNAMIC_DNS_ACCOUNT;
-    }
-
-    if ($choice eq  "6.")
-    {
-        $db->set_prop('DynDNS', 'Service', 'custom');
-        goto DYNAMIC_DNS_ACCOUNT;
-    }
-}
-
-#------------------------------------------------------------
-DYNAMIC_DNS_ACCOUNT:
-#------------------------------------------------------------
-
-{
-    my $account = $db->get_prop('DynDNS', 'Account') || '';
-    my $service = $db->get_prop('DynDNS', 'Service');
-    ($rc, $choice) = $console->input_page
-        (
-         title => gettext("Select dynamic DNS account"),
-         text  => gettext("Please enter the account name for your dynamic DNS service"),
-         value   => $account
-        );
-
-    goto DYNAMIC_DNS_SERVICE unless ($rc == 0);
-
-    if ($choice)
-    {
-        $db->set_prop('DynDNS', 'Account', $choice);
-    }
-    else
-    {
-        $db->set_prop('DynDNS', 'Account', '');
-    }
-
-    goto DYNAMIC_DNS_PASSWORD;
-}
-
-#------------------------------------------------------------
-DYNAMIC_DNS_PASSWORD:
-#------------------------------------------------------------
-
-{
-    my $account = $db->get_prop('DynDNS', 'Account');
-    my $password = $db->get_prop('DynDNS', 'Password') || '';
-    ($rc, $choice) = $console->input_page
-        (
-         title => gettext("Select dynamic DNS password"),
-         text  => gettext("Please enter the password for your dynamic DNS service"),
-         value   => $password
-        );
-
-    goto DYNAMIC_DNS_ACCOUNT unless ($rc == 0);
-
-    if ($choice)
-    {
-        $db->set_prop('DynDNS', 'Password', $choice);
-    }
-    else
-    {
-        $db->set_prop('DynDNS', 'Password', '');
-    }
-
-    goto OTHER_PARAMETERS;
+    goto OTHER_PARAMETERS;# was DYNAMIC_DNS_SERVICE;
 }
 
 #------------------------------------------------------------
@@ -1566,7 +1392,7 @@
 
     $db->set_value('DialupConnWeekend', $gettext2policy{$choice});
 
-    goto DYNAMIC_DNS_SERVICE;
+    goto OTHER_PARAMETERS;# was DYNAMIC_DNS_SERVICE;
 }
 
 
1	jpp	1.1	diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks
2			--- e-smith-base-5.8.0.old/createlinks 2021-03-03 10:42:03.767000000 -0500
3			+++ e-smith-base-5.8.0/createlinks 2021-03-03 10:55:00.945000000 -0500
4			@@ -416,7 +416,7 @@
5			$event = "ip-change";
6
7			event_link("set-external-ip", $event, "03");
8			-event_link("update-dns", $event, "85");
9			+#event_link("update-dns", $event, "85");
10
11			#--------------------------------------------------
12			# actions for network-create event
13			diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/DynDNS/status e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/DynDNS/status
14			--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/DynDNS/status 2005-11-20 23:28:03.000000000 -0500
15			+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/DynDNS/status 1969-12-31 19:00:00.000000000 -0500
16			@@ -1 +0,0 @@
17			-disabled
18			diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/DynDNS/type e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/DynDNS/type
19			--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/DynDNS/type 2005-11-20 23:28:03.000000000 -0500
20			+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/DynDNS/type 1969-12-31 19:00:00.000000000 -0500
21			@@ -1 +0,0 @@
22			-service
23			diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/update-dns e-smith-base-5.8.0/root/etc/e-smith/events/actions/update-dns
24			--- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/update-dns 2005-11-20 23:28:05.000000000 -0500
25			+++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/update-dns 1969-12-31 19:00:00.000000000 -0500
26			@@ -1,52 +0,0 @@
27			-#!/usr/bin/perl -w
28			-
29			-#----------------------------------------------------------------------
30			-# copyright (C) 1999-2005 Mitel Networks Corporation
31			-#
32			-# This program is free software; you can redistribute it and/or modify
33			-# it under the terms of the GNU General Public License as published by
34			-# the Free Software Foundation; either version 2 of the License, or
35			-# (at your option) any later version.
36			-#
37			-# This program is distributed in the hope that it will be useful,
38			-# but WITHOUT ANY WARRANTY; without even the implied warranty of
39			-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
40			-# GNU General Public License for more details.
41			-#
42			-# You should have received a copy of the GNU General Public License
43			-# along with this program; if not, write to the Free Software
44			-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
45			-#
46			-# Technical support for this program is available from Mitel Networks
47			-# Please visit our web site www.mitel.com/sme/ for details.
48			-#----------------------------------------------------------------------
49			-
50			-package esmith;
51			-
52			-use strict;
53			-use Errno;
54			-use esmith::ConfigDB;
55			-
56			-my $c = esmith::ConfigDB->open_ro or die "Couldn't open config db";
57			-
58			-#------------------------------------------------------------
59			-# If using Dynamic DNS service, notify them of new IP address.
60			-#------------------------------------------------------------
61			-
62			-my $event = $ARGV [0];
63			-
64			-my $DynDNS = $c->get('DynDNS');
65			-exit 0 unless $DynDNS;
66			-
67			-my $status = $DynDNS->prop('status') \|\| "disabled";
68			-my $service = $DynDNS->prop('Service') \|\| 'off';
69			-my $account = $DynDNS->prop('Account');
70			-my $password = $DynDNS->prop('Password');
71			-
72			-my $domain = $c->get('DomainName')->value;
73			-
74			-exit 0 unless ($status eq "enabled" && $service ne "off");
75			-
76			-my $ipaddress = $c->get('ExternalIP') or die "Can't get External IP address";
77			-
78			-exec ("/sbin/e-smith/dynamic-dns/$service", $ipaddress->value, $account, $password, $domain)
79			diff -Nur e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm
80			--- e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm 2021-03-03 10:42:03.689000000 -0500
81			+++ e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm 2021-03-03 10:58:51.475000000 -0500
82			@@ -654,13 +654,13 @@
83			$db->delete('GatewayIP');
84			$db->set_value('ExternalDHCP', 'on');
85			$db->set_value('DHCPClient', 'd');
86			- goto DYNAMIC_DNS_SERVICE;
87			+ goto OTHER_PARAMETERS;#was DYNAMIC_DNS_SERVICE;
88			}
89
90			if ($choice eq "4.")
91			{
92			$db->set_value('ExternalDHCP', 'off');
93			- $db->set_prop('DynDNS', 'status', 'disabled');
94			+ #$db->set_prop('DynDNS', 'status', 'disabled');#dropped
95			goto STATIC_IP;
96			}
97			}
98			@@ -682,7 +682,7 @@
99
100			$db->set_value('DialupUserAccount', $choice \|\| '');
101
102			- goto DYNAMIC_DNS_SERVICE;
103			+ goto OTHER_PARAMETERS;# was DYNAMIC_DNS_SERVICE;
104			}
105
106			#------------------------------------------------------------
107			@@ -721,181 +721,7 @@
108
109			$db->set_value('DialupUserPassword', $choice \|\| '');
110
111			- goto DYNAMIC_DNS_SERVICE;
112			-}
113			-
114			-#------------------------------------------------------------
115			-DYNAMIC_DNS_SERVICE:
116			-#------------------------------------------------------------
117			-goto OTHER_PARAMETERS unless (-d "/sbin/e-smith/dynamic-dns");
118			-
119			-{
120			- unless (opendir (DIR, "/sbin/e-smith/dynamic-dns"))
121			- {
122			- warn gettext("Cannot read directory"),
123			- " /sbin/e-smith/dynamic-dns", "\n";
124			- $db->set_prop('DynDNS', 'status', 'disabled');
125			- goto OTHER_PARAMETERS;
126			-
127			- }
128			- my @scripts = grep (!/^(\.\.?\|custom)$/, readdir (DIR));
129			- closedir (DIR);
130			-
131			- foreach my $script (@scripts)
132			- {
133			- # Grab description from script contents
134			- }
135			-
136			- my $currentnumber;
137			-
138			- my $status = $db->get_prop('DynDNS', 'status') \|\| "disabled";
139			- my $service = $db->get_prop('DynDNS', 'Service');
140			- if ($status eq "disabled")
141			- {
142			- $service = "off";
143			- $currentnumber = "1.";
144			- }
145			- else
146			- {
147			- if ($service eq 'yi')
148			- {
149			- $currentnumber = "2.";
150			- }
151			-
152			- if ($service eq 'dyndns')
153			- {
154			- $currentnumber = "3.";
155			- }
156			-
157			- if ($service eq 'dyndns.org')
158			- {
159			- $currentnumber = "4.";
160			- }
161			-
162			- if ($service eq 'tzo')
163			- {
164			- $currentnumber = "5.";
165			- }
166			-
167			- if ($service eq 'custom')
168			- {
169			- $currentnumber = "6.";
170			- }
171			- }
172			-
173			- my @args = (
174			- "1.", gettext("Do not use a dynamic DNS service"),
175			- "2.", "www.yi.org" . " - " . gettext("free service"),
176			- "3.", "www.dyndns.com" . " - " . gettext("commercial service"),
177			- "4.", "www.dyndns.org" . " - " . gettext("free service"),
178			- "5.", "www.tzo.com" . " - " . gettext("commercial service"),
179			- "6.", gettext("custom DynDNS service"),
180			- );
181			-
182			- ($rc, $choice) = $console->menu_page
183			- (
184			- title => gettext("Select dynamic DNS service"),
185			- default => $currentnumber,
186			- text =>
187			- gettext("Please specify whether you wish to subscribe to a dynamic DNS service. Such services allow you to have a domain name without a static IP address, and are available from various organizations for free or for a reasonable charge. A notification must be sent to the dynamic DNS service whenever your IP address changes. Your server can automatically do this for some dynamic DNS services.") .
188			- "\n\n" .
189			- gettext("Choose which dynamic DNS service you would like to use."),
190			- argsref => \@args
191			- );
192			-
193			- goto SERVER_GATEWAY_DEDICATED unless ($rc == 0);
194			-
195			- if ($choice eq "1.")
196			- {
197			- $db->set_prop('DynDNS', 'status', 'disabled');
198			- goto OTHER_PARAMETERS;
199			- }
200			- $db->set_prop('DynDNS', 'status', 'enabled');
201			- if ($choice eq "2.")
202			- {
203			- $db->set_prop('DynDNS', 'Service', 'yi');
204			- goto DYNAMIC_DNS_ACCOUNT;
205			- }
206			-
207			- if ($choice eq "3.")
208			- {
209			- $db->set_prop('DynDNS', 'Service', 'dyndns');
210			- goto DYNAMIC_DNS_ACCOUNT;
211			- }
212			-
213			- if ($choice eq "4.")
214			- {
215			- $db->set_prop('DynDNS', 'Service', 'dyndns.org');
216			- goto DYNAMIC_DNS_ACCOUNT;
217			- }
218			-
219			- if ($choice eq "5.")
220			- {
221			- $db->set_prop('DynDNS', 'Service', 'tzo');
222			- goto DYNAMIC_DNS_ACCOUNT;
223			- }
224			-
225			- if ($choice eq "6.")
226			- {
227			- $db->set_prop('DynDNS', 'Service', 'custom');
228			- goto DYNAMIC_DNS_ACCOUNT;
229			- }
230			-}
231			-
232			-#------------------------------------------------------------
233			-DYNAMIC_DNS_ACCOUNT:
234			-#------------------------------------------------------------
235			-
236			-{
237			- my $account = $db->get_prop('DynDNS', 'Account') \|\| '';
238			- my $service = $db->get_prop('DynDNS', 'Service');
239			- ($rc, $choice) = $console->input_page
240			- (
241			- title => gettext("Select dynamic DNS account"),
242			- text => gettext("Please enter the account name for your dynamic DNS service"),
243			- value => $account
244			- );
245			-
246			- goto DYNAMIC_DNS_SERVICE unless ($rc == 0);
247			-
248			- if ($choice)
249			- {
250			- $db->set_prop('DynDNS', 'Account', $choice);
251			- }
252			- else
253			- {
254			- $db->set_prop('DynDNS', 'Account', '');
255			- }
256			-
257			- goto DYNAMIC_DNS_PASSWORD;
258			-}
259			-
260			-#------------------------------------------------------------
261			-DYNAMIC_DNS_PASSWORD:
262			-#------------------------------------------------------------
263			-
264			-{
265			- my $account = $db->get_prop('DynDNS', 'Account');
266			- my $password = $db->get_prop('DynDNS', 'Password') \|\| '';
267			- ($rc, $choice) = $console->input_page
268			- (
269			- title => gettext("Select dynamic DNS password"),
270			- text => gettext("Please enter the password for your dynamic DNS service"),
271			- value => $password
272			- );
273			-
274			- goto DYNAMIC_DNS_ACCOUNT unless ($rc == 0);
275			-
276			- if ($choice)
277			- {
278			- $db->set_prop('DynDNS', 'Password', $choice);
279			- }
280			- else
281			- {
282			- $db->set_prop('DynDNS', 'Password', '');
283			- }
284			-
285			- goto OTHER_PARAMETERS;
286			+ goto OTHER_PARAMETERS;# was DYNAMIC_DNS_SERVICE;
287			}
288
289			#------------------------------------------------------------
290			@@ -1566,7 +1392,7 @@
291
292			$db->set_value('DialupConnWeekend', $gettext2policy{$choice});
293
294			- goto DYNAMIC_DNS_SERVICE;
295			+ goto OTHER_PARAMETERS;# was DYNAMIC_DNS_SERVICE;
296			}
297
298