e-smith-hosts/sme8/e-smith-hosts-1.14.0-rmDuplicates.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-hosts-1.14.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries mezzanine_patched_e-smith-hosts-1.14.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries
--- e-smith-hosts-1.14.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries    2008-02-10 11:06:14.000000000 +1100
+++ mezzanine_patched_e-smith-hosts-1.14.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries  2008-02-10 11:04:20.000000000 +1100
@@ -2,18 +2,12 @@
     <!-- vim: ft=xml
     -->
     <entry>
-        <base>FORM_TITLE</base>
+        <base>Hostnames and addresses</base>
         <trans>
             Hostnames and addresses
         </trans>
     </entry>
     <entry>
-        <base>OPERATION_STATUS_REPORT</base>
-        <trans>
-            Operation status report
-        </trans>
-    </entry>
-    <entry>
         <base>UNABLE_TO_OPEN_CONFIGDB</base>
         <trans>Unable to open configuration database</trans>
     </entry>
@@ -35,28 +29,12 @@
         </trans>
     </entry>
     <entry>
-        <base>NAME</base>
-        <trans>
-            Hostname
-        </trans>
-    </entry>
-    <entry>
         <base>HOSTNAME</base>
         <trans>
             Hostname
         </trans>
     </entry>
     <entry>
-        <base>ACTION</base>
-        <trans>Action</trans>
-    </entry>
-    <entry>
-        <base>Location</base>
-        <trans>
-            LOCATION
-        </trans>
-    </entry>
-    <entry>
         <base>LOCAL_IP</base>
         <trans>
             Local IP
@@ -75,18 +53,6 @@
         </trans>
     </entry>
     <entry>
-        <base>MODIFY</base>
-        <trans>
-            Modify
-        </trans>
-    </entry>
-    <entry>
-        <base>REMOVE</base>
-        <trans>
-            Remove
-        </trans>
-    </entry>
-    <entry>
         <base>CURRENT_HOSTNAMES_FOR_DOMAIN</base>
         <trans>
             Current list of hostnames for {$domain}.
@@ -123,12 +89,6 @@
             Create a new hostname for this server</trans>
     </entry>
     <entry>
-        <base>CREATE</base>
-        <trans>
-            Create
-        </trans>
-    </entry>
-    <entry>
         <base>HOSTNAME_VALIDATION_ERROR</base>
         <trans>
             Error: unexpected characters in host name: 
@@ -234,19 +194,6 @@
         </trans>
     </entry>
     <entry>
-        <base>HOSTNAME_LABEL</base>
-        <trans>
-            Hostname
-        </trans>
-    </entry>
-    <entry>
-        <base>HOSTNAME_DESCRIPTION</base>
-        <trans>
-            The hostname must contain only letters, numbers, and
-            hyphens, and must start with a letter or number. 
-        </trans>
-    </entry>
-    <entry>
         <base>DOMAIN</base>
         <trans>
             Domain
@@ -279,30 +226,6 @@
         </trans>
     </entry>
     <entry>
-        <base>HOSTTYPE</base>
-        <trans>
-            Location
-        </trans>
-    </entry>
-    <entry>
-        <base>ADD</base>
-        <trans>
-            Add
-        </trans>
-    </entry>
-    <entry>
-        <base>SAVE</base>
-        <trans>
-            Save
-        </trans>
-    </entry>
-    <entry>
-        <base>OPERATION_STATUS_REPORT</base>
-        <trans>
-            Operation status report
-        </trans>
-    </entry>
-    <entry>
         <base>LOCATION</base>
         <trans>
             Location
@@ -326,56 +249,11 @@
         </trans>
     </entry>
     <entry>
-        <base>NEXT</base>
-        <trans>
-            Next
-        </trans>
-    </entry>
-    <entry>
-        <base>SELF</base>
-        <trans>
-            Self
-        </trans>
-    </entry>
-    <entry>
-        <base>REMOTE</base>
-        <trans>
-            Remote
-        </trans>
-    </entry>
-    <entry>
-        <base>LOCAL</base>
-        <trans>
-            Local
-        </trans>
-    </entry>
-    <entry>
         <base>NO_HOSTS_FOR_THIS_DOMAIN</base>
         <trans>
             There are no hosts for this domain.
         </trans>
     </entry>
-
-    <entry>
-        <base>Configuration</base>
-        <trans>Configuration</trans>
-    </entry>
-    <entry>
-        <base>Hostnames and addresses</base>
-        <trans>Hostnames and addresses</trans>
-    </entry>
-    <entry>
-        <base>NO</base>
-        <trans>No</trans>
-    </entry>
-    <entry>
-        <base>YES</base>
-        <trans>Yes</trans>
-    </entry>
-    <entry>
-        <base>IP_ADDR</base>
-        <trans>IP Address</trans>
-    </entry>
     <entry>
         <base>ADDR_IN_DHCP_RANGE</base>
         <trans>Address is inside the DHCP assigned dynamic range</trans>
@@ -401,8 +279,4 @@
         <trans>Error: This IP address is not on any of our local
             networks.</trans>
     </entry>
-    <entry>
-        <base>COMMENT</base>
-        <trans>Comment</trans>
-    </entry>
 </lexicon>
diff -Nur -x '*.orig' -x '*.rej' e-smith-hosts-1.14.0/root/etc/e-smith/web/functions/hostentries mezzanine_patched_e-smith-hosts-1.14.0/root/etc/e-smith/web/functions/hostentries
--- e-smith-hosts-1.14.0/root/etc/e-smith/web/functions/hostentries     2008-02-10 11:06:14.000000000 +1100
+++ mezzanine_patched_e-smith-hosts-1.14.0/root/etc/e-smith/web/functions/hostentries   2008-02-10 10:58:22.000000000 +1100
@@ -78,7 +78,7 @@
 
 
 __DATA__
-<form title="FORM_TITLE" header="/etc/e-smith/web/common/head.tmpl"
+<form title="Hostnames and addresses" header="/etc/e-smith/web/common/head.tmpl"
     footer="/etc/e-smith/web/common/foot.tmpl">
     <page name="First" pre-event="print_status_message()">
         <subroutine src="print_hosts_tables()" />
@@ -123,7 +123,7 @@
     <page name="Remote" pre-event="turn_off_buttons()" post-event="goto_confirm()">
         <description>REMOTE_PAGE_DESCRIPTION</description>
         <field type="text" id="global_ip" validation="ip_number">
-            <label>IP_ADDR</label>
+            <label>IP_ADDRESS</label>
         </field>
         <subroutine src="print_button('NEXT')" />
     </page>
diff -Nur -x '*.orig' -x '*.rej' e-smith-hosts-1.14.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm mezzanine_patched_e-smith-hosts-1.14.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm
--- e-smith-hosts-1.14.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm    2008-02-10 11:06:14.000000000 +1100
+++ mezzanine_patched_e-smith-hosts-1.14.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm  2008-02-10 10:50:02.000000000 +1100
@@ -267,7 +267,7 @@
     my $fm = shift;
 
     print qq(<tr><td colspan=2>) . $fm->localise('HOSTNAME_DESCRIPTION') . qq(</td></tr>);
-    print qq(<tr><td class="sme-noborders-label">) . $fm->localise('HOSTNAME_LABEL') . qq(</td>\n);
+    print qq(<tr><td class="sme-noborders-label">) . $fm->localise('HOSTNAME') . qq(</td>\n);
 
     my $h = $fm->{cgi}->param('name');
 
1	diff -Nur -x '.orig' -x '.rej' e-smith-hosts-1.14.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries mezzanine_patched_e-smith-hosts-1.14.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries
2	--- e-smith-hosts-1.14.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries 2008-02-10 11:06:14.000000000 +1100
3	+++ mezzanine_patched_e-smith-hosts-1.14.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries 2008-02-10 11:04:20.000000000 +1100
4	@@ -2,18 +2,12 @@
5	<!-- vim: ft=xml
6	-->
7	<entry>
8	- <base>FORM_TITLE</base>
9	+ <base>Hostnames and addresses</base>
10	<trans>
11	Hostnames and addresses
12	</trans>
13	</entry>
14	<entry>
15	- <base>OPERATION_STATUS_REPORT</base>
16	- <trans>
17	- Operation status report
18	- </trans>
19	- </entry>
20	- <entry>
21	<base>UNABLE_TO_OPEN_CONFIGDB</base>
22	<trans>Unable to open configuration database</trans>
23	</entry>
24	@@ -35,28 +29,12 @@
25	</trans>
26	</entry>
27	<entry>
28	- <base>NAME</base>
29	- <trans>
30	- Hostname
31	- </trans>
32	- </entry>
33	- <entry>
34	<base>HOSTNAME</base>
35	<trans>
36	Hostname
37	</trans>
38	</entry>
39	<entry>
40	- <base>ACTION</base>
41	- <trans>Action</trans>
42	- </entry>
43	- <entry>
44	- <base>Location</base>
45	- <trans>
46	- LOCATION
47	- </trans>
48	- </entry>
49	- <entry>
50	<base>LOCAL_IP</base>
51	<trans>
52	Local IP
53	@@ -75,18 +53,6 @@
54	</trans>
55	</entry>
56	<entry>
57	- <base>MODIFY</base>
58	- <trans>
59	- Modify
60	- </trans>
61	- </entry>
62	- <entry>
63	- <base>REMOVE</base>
64	- <trans>
65	- Remove
66	- </trans>
67	- </entry>
68	- <entry>
69	<base>CURRENT_HOSTNAMES_FOR_DOMAIN</base>
70	<trans>
71	Current list of hostnames for {$domain}.
72	@@ -123,12 +89,6 @@
73	Create a new hostname for this server</trans>
74	</entry>
75	<entry>
76	- <base>CREATE</base>
77	- <trans>
78	- Create
79	- </trans>
80	- </entry>
81	- <entry>
82	<base>HOSTNAME_VALIDATION_ERROR</base>
83	<trans>
84	Error: unexpected characters in host name:
85	@@ -234,19 +194,6 @@
86	</trans>
87	</entry>
88	<entry>
89	- <base>HOSTNAME_LABEL</base>
90	- <trans>
91	- Hostname
92	- </trans>
93	- </entry>
94	- <entry>
95	- <base>HOSTNAME_DESCRIPTION</base>
96	- <trans>
97	- The hostname must contain only letters, numbers, and
98	- hyphens, and must start with a letter or number.
99	- </trans>
100	- </entry>
101	- <entry>
102	<base>DOMAIN</base>
103	<trans>
104	Domain
105	@@ -279,30 +226,6 @@
106	</trans>
107	</entry>
108	<entry>
109	- <base>HOSTTYPE</base>
110	- <trans>
111	- Location
112	- </trans>
113	- </entry>
114	- <entry>
115	- <base>ADD</base>
116	- <trans>
117	- Add
118	- </trans>
119	- </entry>
120	- <entry>
121	- <base>SAVE</base>
122	- <trans>
123	- Save
124	- </trans>
125	- </entry>
126	- <entry>
127	- <base>OPERATION_STATUS_REPORT</base>
128	- <trans>
129	- Operation status report
130	- </trans>
131	- </entry>
132	- <entry>
133	<base>LOCATION</base>
134	<trans>
135	Location
136	@@ -326,56 +249,11 @@
137	</trans>
138	</entry>
139	<entry>
140	- <base>NEXT</base>
141	- <trans>
142	- Next
143	- </trans>
144	- </entry>
145	- <entry>
146	- <base>SELF</base>
147	- <trans>
148	- Self
149	- </trans>
150	- </entry>
151	- <entry>
152	- <base>REMOTE</base>
153	- <trans>
154	- Remote
155	- </trans>
156	- </entry>
157	- <entry>
158	- <base>LOCAL</base>
159	- <trans>
160	- Local
161	- </trans>
162	- </entry>
163	- <entry>
164	<base>NO_HOSTS_FOR_THIS_DOMAIN</base>
165	<trans>
166	There are no hosts for this domain.
167	</trans>
168	</entry>
169	-
170	- <entry>
171	- <base>Configuration</base>
172	- <trans>Configuration</trans>
173	- </entry>
174	- <entry>
175	- <base>Hostnames and addresses</base>
176	- <trans>Hostnames and addresses</trans>
177	- </entry>
178	- <entry>
179	- <base>NO</base>
180	- <trans>No</trans>
181	- </entry>
182	- <entry>
183	- <base>YES</base>
184	- <trans>Yes</trans>
185	- </entry>
186	- <entry>
187	- <base>IP_ADDR</base>
188	- <trans>IP Address</trans>
189	- </entry>
190	<entry>
191	<base>ADDR_IN_DHCP_RANGE</base>
192	<trans>Address is inside the DHCP assigned dynamic range</trans>
193	@@ -401,8 +279,4 @@
194	<trans>Error: This IP address is not on any of our local
195	networks.</trans>
196	</entry>
197	- <entry>
198	- <base>COMMENT</base>
199	- <trans>Comment</trans>
200	- </entry>
201	</lexicon>
202	diff -Nur -x '.orig' -x '.rej' e-smith-hosts-1.14.0/root/etc/e-smith/web/functions/hostentries mezzanine_patched_e-smith-hosts-1.14.0/root/etc/e-smith/web/functions/hostentries
203	--- e-smith-hosts-1.14.0/root/etc/e-smith/web/functions/hostentries 2008-02-10 11:06:14.000000000 +1100
204	+++ mezzanine_patched_e-smith-hosts-1.14.0/root/etc/e-smith/web/functions/hostentries 2008-02-10 10:58:22.000000000 +1100
205	@@ -78,7 +78,7 @@
206
207
208	__DATA__
209	-<form title="FORM_TITLE" header="/etc/e-smith/web/common/head.tmpl"
210	+<form title="Hostnames and addresses" header="/etc/e-smith/web/common/head.tmpl"
211	footer="/etc/e-smith/web/common/foot.tmpl">
212	<page name="First" pre-event="print_status_message()">
213	<subroutine src="print_hosts_tables()" />
214	@@ -123,7 +123,7 @@
215	<page name="Remote" pre-event="turn_off_buttons()" post-event="goto_confirm()">
216	<description>REMOTE_PAGE_DESCRIPTION</description>
217	<field type="text" id="global_ip" validation="ip_number">
218	- <label>IP_ADDR</label>
219	+ <label>IP_ADDRESS</label>
220	</field>
221	<subroutine src="print_button('NEXT')" />
222	</page>
223	diff -Nur -x '.orig' -x '.rej' e-smith-hosts-1.14.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm mezzanine_patched_e-smith-hosts-1.14.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm
224	--- e-smith-hosts-1.14.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm 2008-02-10 11:06:14.000000000 +1100
225	+++ mezzanine_patched_e-smith-hosts-1.14.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm 2008-02-10 10:50:02.000000000 +1100
226	@@ -267,7 +267,7 @@
227	my $fm = shift;
228
229	print qq(<tr><td colspan=2>) . $fm->localise('HOSTNAME_DESCRIPTION') . qq(</td></tr>);
230	- print qq(<tr><td class="sme-noborders-label">) . $fm->localise('HOSTNAME_LABEL') . qq(</td>\n);
231	+ print qq(<tr><td class="sme-noborders-label">) . $fm->localise('HOSTNAME') . qq(</td>\n);
232
233	my $h = $fm->{cgi}->param('name');
234