File: 01_debian_4.0.patch

package info (click to toggle)
system-tools-backends 1.4.2-3
  • links: PTS
  • area: main
  • in suites: etch, etch-m68k
  • size: 4,740 kB
  • ctags: 252
  • sloc: perl: 28,142; sh: 9,064; makefile: 82
file content (692 lines) | stat: -rw-r--r-- 33,566 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
diff -PruN system-tools-backends-1.4.2.orig/disks-conf.in system-tools-backends-1.4.2/disks-conf.in
--- system-tools-backends-1.4.2.orig/disks-conf.in	2006-09-10 10:10:53.000000000 +0200
+++ system-tools-backends-1.4.2/disks-conf.in	2006-09-10 11:17:45.000000000 +0200
@@ -64,8 +64,8 @@
 $name = "disks";
 $version = "@VERSION@";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0",
-              "redhat-7.1", "mandrake-7.2", "debian-2.2", "debian-woody", "debian-sarge",
-	      "debian-3.1", "suse-7.0", "suse-9.1", "suse-1.0", "unitedlinux-1.0", 
+              "redhat-7.1", "mandrake-7.2", "debian-3.0", "debian-3.1", "debian-4.0",
+	      "debian-testing", "suse-7.0", "suse-9.1", "suse-1.0", "unitedlinux-1.0", 
 	      "turbolinux-7.0", "rpath");
 
 $description =<<"end_of_description;";
diff -PruN system-tools-backends-1.4.2.orig/display-conf.in system-tools-backends-1.4.2/display-conf.in
--- system-tools-backends-1.4.2.orig/display-conf.in	2006-09-10 10:10:53.000000000 +0200
+++ system-tools-backends-1.4.2/display-conf.in	2006-09-10 11:16:07.000000000 +0200
@@ -56,8 +56,6 @@
                 
                 mandrake-7.2 mandrake-8.0
                 
-                debian-2.2 debian-woody
-                
                 turbolinux-7.0);
 
 $description =<<"end_of_description;";
@@ -83,8 +81,6 @@
   'redhat-7.0'     => $standard_locations,
   'redhat-7.1'     => $standard_locations,
   'redhat-7.2'     => $standard_locations,
-  'debian-2.2'     => $standard_locations,
-  'debian-woody'   => $standard_locations,
   'mandrake-7.2'   => $standard_locations,
   'mandrake-8.0'   => $standard_locations,
   'suse-7.0'       => $standard_locations,
diff -PruN system-tools-backends-1.4.2.orig/internetsharing-conf.in system-tools-backends-1.4.2/internetsharing-conf.in
--- system-tools-backends-1.4.2.orig/internetsharing-conf.in	2006-09-10 10:10:53.000000000 +0200
+++ system-tools-backends-1.4.2/internetsharing-conf.in	2006-09-10 11:18:01.000000000 +0200
@@ -48,9 +48,7 @@
 $version = "@VERSION@";
 @platforms = ("redhat-7.0", "redhat-7.1", "redhat-7.2",
               
-              "mandrake-7.2",
-              
-              "debian-2.2", "debian-woody");
+              "mandrake-7.2");
 
 $description =<<"end_of_description;";
        Sets up firewall rules for a basic internet sharing (masq)
diff -PruN system-tools-backends-1.4.2.orig/ishare.pl.in system-tools-backends-1.4.2/ishare.pl.in
--- system-tools-backends-1.4.2.orig/ishare.pl.in	2006-09-10 10:10:53.000000000 +0200
+++ system-tools-backends-1.4.2/ishare.pl.in	2006-09-10 11:14:51.000000000 +0200
@@ -262,8 +262,6 @@
    "redhat-7.1"   => "mandrake-7.2",
    "redhat-7.2"   => "mandrake-7.2",
    "mandrake-7.2" => "mandrake-7.2",
-   "debian-2.2"   => "mandrake-7.2",
-   "debian-woody" => "mandrake-7.2"
    );
 
   my %dist_tables =
@@ -295,8 +293,6 @@
    "redhat-7.1"   => "mandrake-7.2",
    "redhat-7.2"   => "mandrake-7.2",
    "mandrake-7.2" => "mandrake-7.2",
-   "debian-2.2"   => "mandrake-7.2",
-   "debian-woody" => "mandrake-7.2"
    );
 
   my %dist_tables =
@@ -336,8 +332,6 @@
    "redhat-7.1"   => "mandrake-7.2",
    "redhat-7.2"   => "mandrake-7.2",
    "mandrake-7.2" => "mandrake-7.2",
-   "debian-2.2"   => "debian-2.2",
-   "debian-woody" => "debian-2.2"
    );
 
   my %dist_tables =
@@ -359,20 +353,6 @@
                                                               "[ \t]+", "[ \t]+" ],
               ]
                 },
-       "debian-2.2" =>
-       {
-         fn =>
-         {
-           DHCPD_CONF    => "/etc/dhcpd.conf",
-           DHCPD_SERVICE => "dhcp",
-         },
-         table =>
-             [
-              [ "installed",   \&gst_service_sysv_installed,  DHCPD_SERVICE ],
-              [ "configured",  \&gst_file_exists,             DHCPD_CONF    ],
-              [ "active",      \&gst_service_sysv_get_status, DHCPD_SERVICE ],
-              ]
-                },
        );
 
   my $dist = $dist_map {$gst_dist};
@@ -390,8 +370,6 @@
    "redhat-7.1"   => "mandrake-7.2",
    "redhat-7.2"   => "mandrake-7.2",
    "mandrake-7.2" => "mandrake-7.2",
-   "debian-2.2"   => "mandrake-7.2",
-   "debian-woody" => "mandrake-7.2"
    );
 
   my %dist_tables =
@@ -423,8 +401,6 @@
    "redhat-7.1"   => "mandrake-7.2",
    "redhat-7.2"   => "mandrake-7.2",
    "mandrake-7.2" => "mandrake-7.2",
-   "debian-2.2"   => "debian-2.2",
-   "debian-woody" => "debian-2.2"
    );
 
   my %dist_tables =
@@ -446,24 +422,6 @@
               [ "active",     \&gst_service_sysv_force_status,  [8, IPCHAINS_SERVICE] ],
               ]
                 },
-       "debian-2.2" =>
-       {
-         fn =>
-         {
-           IPCHAINS_CONF     => "/etc/network/ipchains",
-           IPCHAINS_SERVICE  => "setup-tools-ipchains",
-           PROC_FORWARD      => "/proc/sys/net/ipv4/ip_forward",
-           NETWORK_OPTIONS   => "/etc/network/options"
-         },
-         table =>
-             [
-              [ "active",     \&gst_replace_sh_bool,             NETWORK_OPTIONS, "ip_forward" ],          
-              [ "active",     \&gst_replace_line_first,          PROC_FORWARD ],
-              [ "active",     \&gst_service_sysv_install_script, IPCHAINS_SERVICE, "debian_ipchains" ],
-              [ "overwrite",  \&gst_ishare_ipchains_save,        IPCHAINS_CONF, "%interface%", "%landev%" ],
-              [ "active",     \&gst_service_sysv_force_status,   [5, IPCHAINS_SERVICE] ],
-              ]
-                },
        );
 
   my $dist = $dist_map {$gst_dist};
@@ -481,8 +439,6 @@
    "redhat-7.1"   => "mandrake-7.2",
    "redhat-7.2"   => "mandrake-7.2",
    "mandrake-7.2" => "mandrake-7.2",
-   "debian-2.2"   => "debian-2.2",
-   "debian-woody" => "debian-2.2"
    );
 
   my %dist_tables =
@@ -502,20 +458,6 @@
               [ "active",      \&gst_service_sysv_set_status, [65, DHCPD_SERVICE] ]
               ]
                 },
-       "debian-2.2" =>
-       {
-         fn =>
-         {
-           DHCPD_CONF    => "/etc/dhcpd.conf",
-           DHCPD_SERVICE => "dhcp",
-         },
-         table =>
-             [
-              [ "dev",         \&gst_ishare_dhcp_set_conf,    DHCPD_CONF, "%overwrite%", "%interface%" ],
-              [ "active",      \&gst_replace_sh_bool,         "/etc/init.d/dhcpd", "run_dhcpd", "1", "0" ],
-              [ "active",      \&gst_service_sysv_set_status, [20, DHCPD_SERVICE] ]
-              ]
-              },
        );
 
   my $dist = $dist_map {$gst_dist};
diff -PruN system-tools-backends-1.4.2.orig/memory-conf.in system-tools-backends-1.4.2/memory-conf.in
--- system-tools-backends-1.4.2.orig/memory-conf.in	2006-09-10 10:10:53.000000000 +0200
+++ system-tools-backends-1.4.2/memory-conf.in	2006-09-10 11:19:10.000000000 +0200
@@ -62,8 +62,6 @@
 
               "mandrake-7.2",
 
-              "debian-2.2", "debian-woody",
-              
               "suse-7.0", "turbolinux-7.0");
 
 $description =<<"end_of_description;";
diff -PruN system-tools-backends-1.4.2.orig/network-conf.in system-tools-backends-1.4.2/network-conf.in
--- system-tools-backends-1.4.2.orig/network-conf.in	2006-09-10 10:10:52.000000000 +0200
+++ system-tools-backends-1.4.2/network-conf.in	2006-09-10 10:49:56.000000000 +0200
@@ -68,7 +68,7 @@
               "mandrake-10.0", "mandrake-10.1","mandrake-10.2", "mandriva-2006.0", "mandriva-2006.1",
               "yoper-2.2",
               "blackpanther-4.0",
-              "debian-2.2", "debian-3.0", "debian-sarge",
+              "debian-3.0", "debian-3.1", "debian-4.0", "debian-testing",
               "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.04",
               "suse-7.0", "suse-9.0", "suse-9.1",
               "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "rpath",
diff -PruN system-tools-backends-1.4.2.orig/network.pl.in system-tools-backends-1.4.2/network.pl.in
--- system-tools-backends-1.4.2.orig/network.pl.in	2006-09-10 10:10:52.000000000 +0200
+++ system-tools-backends-1.4.2/network.pl.in	2006-09-10 11:04:22.000000000 +0200
@@ -493,9 +493,10 @@
        "redhat-8.0"   => "redhat-6.2",
        "redhat-9"     => "redhat-6.2",
        "openna-1.0"   => "redhat-6.2",
-       "debian-2.2"   => "debian-2.2",
        "debian-3.0"   => "debian-2.2",
-       "debian-sarge" => "debian-2.2",
+       "debian-3.1"   => "debian-2.2",
+       "debian-4.0"   => "debian-2.2",       
+       "debian-testing" => "debian-2.2",
        "ubuntu-5.04"  => "debian-2.2",
        "ubuntu-5.10"  => "debian-2.2",
        "ubuntu-6.04"  => "debian-2.2",
@@ -1810,9 +1811,10 @@
           "blackpanther-4.0" => \&gst_network_rh62_get_file,
           "conectiva-9"  => \&gst_network_rh62_get_file,
           "conectiva-10" => \&gst_network_rh62_get_file,
-          "debian-2.2"   => \&gst_network_deb22_get_file,
-          "debian-3.0"   => \&gst_network_deb22_get_file,
-          "debian-sarge" => \&gst_network_deb22_get_file,
+          "debian-3.0"     => \&gst_network_deb22_get_file,
+          "debian-3.1"     => \&gst_network_deb22_get_file,
+          "debian-4.0"     => \&gst_network_deb22_get_file,
+          "debian-testing" => \&gst_network_deb22_get_file,
           "ubuntu-5.04" => \&gst_network_deb22_get_file,    
           "ubuntu-5.10" => \&gst_network_deb22_get_file,    
           "ubuntu-6.04" => \&gst_network_deb22_get_file,    
@@ -3930,9 +3932,10 @@
           "blackpanther-4.0" => "lo",
           "conectiva-9"  => "lo",
           "conectiva-10" => "lo",
-          "debian-2.2"   => "lo",
-          "debian-3.0"   => "lo",
-          "debian-sarge" => "lo",
+          "debian-3.0"     => "lo",
+          "debian-3.1"     => "lo",
+          "debian-4.0"     => "lo",
+          "debian-testing" => "lo",
           "ubuntu-5.04" => "lo",    
           "ubuntu-5.10" => "lo",    
           "ubuntu-6.04" => "lo",    
@@ -4095,9 +4098,10 @@
           "blackpanther-4.0" => "redhat-7.0",
           "conectiva-9"  => "redhat-7.0", 
           "conectiva-10" => "redhat-7.0", 
-          "debian-2.2"   => "debian-2.2",
-          "debian-3.0"   => "debian-2.2",
-          "debian-sarge" => "debian-2.2",
+          "debian-3.0"     => "debian-2.2",
+          "debian-3.1"     => "debian-2.2",
+          "debian-4.0"     => "debian-2.2",
+          "debian-testing" => "debian-2.2",
           "ubuntu-5.04" => "debian-2.2",
           "ubuntu-5.10" => "debian-2.2",
           "ubuntu-6.04" => "debian-2.2",
@@ -4516,9 +4520,10 @@
           "blackpanther-4.0" => "mandrake-9.0",
           "conectiva-9"  => "conectiva-9",
           "conectiva-10" => "conectiva-9",
-          "debian-2.2"   => "debian-2.2",
-          "debian-3.0"   => "debian-3.0",
-          "debian-sarge" => "debian-3.0",
+          "debian-3.0"     => "debian-3.0",
+          "debian-3.1"     => "debian-3.0",
+          "debian-4.0"     => "debian-3.0",
+          "debian-testing" => "debian-3.0",
           "ubuntu-5.04" => "debian-3.0",
           "ubuntu-5.10" => "debian-3.0",
           "ubuntu-6.04" => "debian-3.0",
@@ -4942,63 +4947,6 @@
       ]
     },
 
-	  "debian-2.2" =>
-	  {
-	    ifaces_get => \&gst_network_debian_ifaces_get_existing,
-	    fn =>
-	    {
-        INTERFACES  => "/etc/network/interfaces",
-        IFACE       => "#iface#",
-        CHAT        => "/etc/chatscripts/%section%",
-        PPP_OPTIONS => "/etc/ppp/peers/%section%",
-        PAP         => "/etc/ppp/pap-secrets",
-        CHAP        => "/etc/ppp/chap-secrets",
-        PUMP        => "/etc/pump.conf",
-        WVDIAL      => "/etc/wvdial.conf"
-      },
-	    table =>
-          [
-#           [ "user",               \&gst_parse_trivial,                  0 ], # not supported.
-           [ "dev",                \&gst_parse_trivial,                  IFACE ],
-           [ "bootproto",          \&gst_network_deb22_parse_bootproto,  [INTERFACES, IFACE]],
-           [ "auto",               \&gst_parse_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ],
-#           [ "name",               \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "name" ],
-           [ "address",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "address" ],
-           [ "netmask",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "netmask" ],
-           [ "broadcast",          \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "broadcast" ],
-           [ "network",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "network" ],
-           [ "gateway",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "gateway" ],
-           [ "essid",              \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "wireless[_-]essid" ],
-           [ "key_type",           \&gst_network_get_wep_key_type,       [ \&gst_parse_interfaces_option_str, INTERFACES, IFACE, "wireless[_-]key1?" ]],
-           [ "key",                \&gst_network_get_wep_key,            [ \&gst_parse_interfaces_option_str, INTERFACES, IFACE, "wireless[_-]key1?" ]],
-           [ "remote_address",     \&gst_network_debian_parse_remote_address, [INTERFACES, IFACE]],
-           [ "section",            \&gst_parse_interfaces_option_str,    [INTERFACES, IFACE], "provider" ],
-           [ "update_dns",         \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_kw, PPP_OPTIONS, "usepeerdns" ]],
-           [ "noauth",             \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_kw, PPP_OPTIONS, "noauth" ]],
-           [ "mtu",                \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_split_first_str, PPP_OPTIONS, "mtu", "[ \t]+" ]],
-           [ "mru",                \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_split_first_str, PPP_OPTIONS, "mru", "[ \t]+" ]],
-           [ "serial_port",        \&gst_network_check_type,            [IFACE, "modem", \&gst_network_get_ppp_options_re, PPP_OPTIONS, "^(/dev/[^ \t]+)" ]],
-           [ "serial_speed",       \&gst_network_check_type,            [IFACE, "modem", \&gst_network_get_ppp_options_re, PPP_OPTIONS, "^([0-9]+)" ]],
-           [ "login",              \&gst_network_check_type,            [IFACE, "modem", \&gst_network_get_ppp_options_re, PPP_OPTIONS, "^login \"?([^\"]*)\"?" ]],
-           [ "password",           \&gst_network_check_type,            [IFACE, "modem", \&gst_network_get_pap_passwd, PAP, "%login%" ]],
-           [ "password",           \&gst_network_check_type,            [IFACE, "modem", \&gst_network_get_pap_passwd, CHAP, "%login%" ]],
-           [ "ppp_options",        \&gst_network_check_type,            [IFACE, "modem", \&gst_network_get_ppp_options_unsup, PPP_OPTIONS ]],
-           [ "set_default_gw",     \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_kw, PPP_OPTIONS, "defaultroute" ]],
-           [ "debug",              \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_kw, PPP_OPTIONS, "debug" ]],
-           [ "persist",            \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_kw, PPP_OPTIONS, "persist" ]],
-           [ "serial_escapechars", \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_split_first_str, PPP_OPTIONS, "escape", "[ \t]+" ]],
-           [ "serial_hwctl",       \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_kw, PPP_OPTIONS, "crtscts" ]],
-           [ "external_line",      \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_chat, CHAT, "atd[^0-9]([0-9*#]*)[wW]" ]],
-           [ "phone_number",       \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_chat, CHAT, "atd.*[ptwW]([0-9, -]+)" ]],
-           [ "dial_command",       \&gst_network_check_type,            [IFACE, "modem", \&gst_parse_chat, CHAT, "(atd[tp])[0-9, -w]+" ]],
-           [ "volume",             \&gst_network_check_type,            [IFACE, "modem", \&gst_network_get_modem_volume, CHAT ]],
-#           [ "enabled",            \&gst_network_interface_active,       IFACE,
-#                                                                       \&gst_network_active_interfaces_get ],
-#           [ "enabled",            \&gst_parse_trivial,                  0 ]
-           ]
-    },
-
-    # Basicly the same as debian-2.2, but the "auto" option changes.
 	  "debian-3.0" =>
 	  {
 	    ifaces_get => \&gst_network_debian_ifaces_get_existing,
@@ -5354,9 +5302,10 @@
           "blackpanther-4.0" => "redhat-7.0",
  	  "conectiva-9"  => "redhat-7.0",
  	  "conectiva-10" => "redhat-7.0",
-          "debian-2.2"   => "debian-2.2",
-          "debian-3.0" => "debian-2.2",
-          "debian-sarge" => "debian-2.2",
+          "debian-3.0"     => "debian-2.2",
+          "debian-3.1"     => "debian-2.2",
+          "debian-4.0"     => "debian-2.2",
+          "debian-testing" => "debian-2.2",
           "ubuntu-5.04" => "debian-2.2",
           "ubuntu-5.10" => "debian-2.2",
           "ubuntu-6.04" => "debian-2.2",
@@ -5760,9 +5709,10 @@
           "blackpanther-4.0" => "mandrake-9.0",
           "conectiva-9"  => "conectiva-9",
           "conectiva-10" => "conectiva-9",
-          "debian-2.2"   => "debian-2.2",
-          "debian-3.0"   => "debian-3.0",
-          "debian-sarge" => "debian-3.0",
+          "debian-3.0"     => "debian-3.0",
+          "debian-3.1"     => "debian-3.0",
+          "debian-4.0"     => "debian-3.0",
+          "debian-testing" => "debian-3.0",
           "ubuntu-5.04" => "debian-3.0",
           "ubuntu-5.10" => "debian-3.0",
           "ubuntu-6.04" => "debian-3.0",
@@ -6154,57 +6104,6 @@
      ]
    },
 
-   "debian-2.2" =>
-	  {
-      iface_set    => \&gst_network_rh62_interface_activate, # They use the same ifup/ifdown cmds.
-      iface_delete => \&gst_network_deb22_interface_delete,
-      ifaces_get   => \&gst_network_debian_ifaces_get_existing,
-	    fn =>
-	    {
-        INTERFACES  => "/etc/network/interfaces",
-        IFACE       => "#iface#",
-        CHAT        => "/etc/chatscripts/%section%",
-        PPP_OPTIONS => "/etc/ppp/peers/%section%",
-        PAP         => "/etc/ppp/pap-secrets",
-        CHAP        => "/etc/ppp/chap-secrets",
-        PUMP        => "/etc/pump.conf"
-      },
-	    table =>
-          [
-# not sup  [ "user",               \&gst_parse_sh_bool, IFCFG, USERCTL ],
-           [ "_always_",           \&gst_network_deb22_replace_bootproto,  [INTERFACES, IFACE]],
-           [ "bootproto",          \&gst_network_deb22_replace_bootproto,  [INTERFACES, IFACE]],
-           [ "auto",               \&gst_replace_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ],
-           [ "name",               \&gst_replace_interfaces_option_str,    [INTERFACES, IFACE], "name" ],
-           [ "address",            \&gst_replace_interfaces_option_str,    [INTERFACES, IFACE], "address" ],
-           [ "netmask",            \&gst_replace_interfaces_option_str,    [INTERFACES, IFACE], "netmask" ],
-           [ "broadcast",          \&gst_replace_interfaces_option_str,    [INTERFACES, IFACE], "broadcast" ],
-           [ "network",            \&gst_replace_interfaces_option_str,    [INTERFACES, IFACE], "network" ],
-           [ "gateway",            \&gst_replace_interfaces_option_str,    [INTERFACES, IFACE], "gateway" ],
-           [ "section",            \&gst_replace_interfaces_option_str,    [INTERFACES, IFACE], "provider" ],
-           [ "update_dns",         \&gst_network_pump_set_nodns,           PUMP, "%dev%", "%bootproto%" ],
-           [ "update_dns",         \&gst_replace_kw,                       PPP_OPTIONS, "usepeerdns" ],
-# not sup  [ "dns1",               \&gst_replace_sh,                       IFCFG,       DNS1 ],
-# not sup  [ "dns2",               \&gst_replace_sh,                       IFCFG, DNS2 ],
-           [ "noauth",             \&gst_replace_kw,                       PPP_OPTIONS, "noauth" ],
-           [ "mtu",                \&gst_replace_join_first_str,           PPP_OPTIONS, "mtu", "[ \t]+" ],
-           [ "mru",                \&gst_replace_join_first_str,           PPP_OPTIONS, "mru", "[ \t]+" ],
-           [ "remote_address",     \&gst_network_debian_replace_remote_address, [INTERFACES, IFACE]],
-           [ "login",              \&gst_replace_join_first_str,           PPP_OPTIONS, "user", "[ \t]+" ],
-           [ "serial_port",        \&gst_network_set_ppp_options_re,       PPP_OPTIONS, "^(/dev/[^ \t]+)" ],
-           [ "serial_speed",       \&gst_network_set_ppp_options_re,       PPP_OPTIONS, "^([0-9]+)" ],
-           [ "section",            \&gst_network_set_ppp_options_connect,  PPP_OPTIONS ],
-           [ "ppp_options",        \&gst_network_set_ppp_options_unsup,    PPP_OPTIONS ],
-           [ "set_default_gw",     \&gst_replace_kw,                       PPP_OPTIONS, "defaultroute" ],
-           [ "debug",              \&gst_replace_kw,                       PPP_OPTIONS, "debug" ],
-           [ "persist",            \&gst_replace_kw,                       PPP_OPTIONS, "persist" ],
-           [ "serial_escapechars", \&gst_replace_join_first_str,           PPP_OPTIONS, "escape", "[ \t]+" ],
-           [ "serial_hwctl",       \&gst_replace_kw,                       PPP_OPTIONS, "crtscts" ],
-           [ "phone_number",       \&gst_replace_chat,                     CHAT, "^atd[^0-9]*([0-9, -]+)" ],
-           ]
-             },
-
-    # Basicly the same as debian-2.2, but the "auto" option changes.
     "debian-3.0" =>
 	  {
       iface_set    => \&gst_network_rh62_interface_activate, # They use the same ifup/ifdown cmds.
diff -PruN system-tools-backends-1.4.2.orig/platform.pl.in system-tools-backends-1.4.2/platform.pl.in
--- system-tools-backends-1.4.2.orig/platform.pl.in	2006-09-10 10:10:52.000000000 +0200
+++ system-tools-backends-1.4.2/platform.pl.in	2006-09-10 10:48:17.000000000 +0200
@@ -38,9 +38,10 @@
 
 
 $PLATFORM_INFO = {
-  "debian-2.2"      => "Debian GNU/Linux 2.2 Potato",
   "debian-3.0"      => "Debian GNU/Linux 3.0 Woody",
-  "debian-sarge"    => "Debian GNU/Linux Sarge",
+  "debian-3.1"      => "Debian GNU/Linux 3.1 Sarge",
+  "debian-4.0"      => "Debian GNU/Linux 4.0 Etch",
+  "debian-testing"  => "Debian GNU/Linux testing/unstable",
   "ubuntu-5.04"     => "Ubuntu GNU/Linux Hoary",
   "ubuntu-5.10"     => "Ubuntu GNU/Linux Breezy",
   "ubuntu-6.04"     => "Ubuntu GNU/Linux Dapper",
@@ -127,8 +128,7 @@
 {
   my ($ver, $i);
   my %vermap =
-      ("testing/unstable" => "sarge",
-       "3.1"              => "sarge");
+      ("testing/unstable" => "testing");
 
   open DEBIAN, "$gst_prefix/etc/debian_version" or return -1;
   chomp ($ver = <DEBIAN>);
diff -PruN system-tools-backends-1.4.2.orig/print-conf.in system-tools-backends-1.4.2/print-conf.in
--- system-tools-backends-1.4.2.orig/print-conf.in	2006-09-10 10:10:52.000000000 +0200
+++ system-tools-backends-1.4.2/print-conf.in	2006-09-10 10:53:13.000000000 +0200
@@ -62,7 +62,7 @@
 
 $name = "print";
 $version = "@VERSION@";
-@platforms = ("redhat-7.0", "redhat-7.1", "debian-woody", "turbolinux-7.0");
+@platforms = ("redhat-7.0", "redhat-7.1", "debian-3.0", "turbolinux-7.0");
 
 $description =<<"end_of_description;";
        Configures the lpr subsystem.
diff -PruN system-tools-backends-1.4.2.orig/print.pl.in system-tools-backends-1.4.2/print.pl.in
--- system-tools-backends-1.4.2.orig/print.pl.in	2006-09-10 10:10:53.000000000 +0200
+++ system-tools-backends-1.4.2/print.pl.in	2006-09-10 11:15:14.000000000 +0200
@@ -145,8 +145,6 @@
 	  "redhat-7.0" => "redhat-7.0",
 	  "redhat-7.1" => "redhat-7.1",
 	  "openna-1.0" => "redhat-7.0",
-    "debian-2.2" => "redhat-7.0",
-		"debian-woody" => "redhat-7.0"
   );
 
   my %dist_tables =
@@ -246,8 +244,6 @@
 	  "redhat-7.0" => "redhat-7.0",
 	  "redhat-7.1" => "redhat-7.1",
 	  "openna-1.0" => "redhat-7.0",
-    "debian-2.2" => "redhat-7.0",
-		"debian-woody" => "redhat-7.0"
   );
 
   my %dist_tables =
diff -PruN system-tools-backends-1.4.2.orig/service.pl.in system-tools-backends-1.4.2/service.pl.in
--- system-tools-backends-1.4.2.orig/service.pl.in	2006-09-10 10:10:52.000000000 +0200
+++ system-tools-backends-1.4.2/service.pl.in	2006-09-10 11:06:35.000000000 +0200
@@ -78,9 +78,10 @@
        "conectiva-9"  => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "conectiva-10" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
 
-       "debian-2.2"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "debian-3.0"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
-       "debian-sarge" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "debian-3.1"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "debian-4.0"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "debian-testing" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "ubuntu-5.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "ubuntu-5.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "ubuntu-6.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
@@ -148,9 +149,10 @@
        "conectiva-9"    => [3, 5],
        "conectiva-10"   => [3, 5],
 
-       "debian-2.2"     => [2, 3],
        "debian-3.0"     => [2, 3],
-       "debian-sarge"   => [2, 3],
+       "debian-3.1"     => [2, 3],
+       "debian-4.0"     => [2, 3],
+       "debian-testing" => [2, 3],
        "ubuntu-5.04"    => [2, 3],
        "ubuntu-5.10"    => [2, 3],
        "ubuntu-6.04"    => [2, 3],
@@ -217,9 +219,10 @@
      "conectiva-9"    => "redhat-5.2",
      "conectiva-10"   => "redhat-5.2",
      
-     "debian-2.2"     => "debian-2.2",
      "debian-3.0"     => "debian-2.2",
-     "debian-sarge"   => "debian-2.2",
+     "debian-3.1"     => "debian-2.2",
+     "debian-4.0"     => "debian-2.2",
+     "debian-testing" => "debian-2.2",
      "ubuntu-5.04"    => "debian-2.2",
      "ubuntu-5.10"    => "debian-2.2",
      "ubuntu-6.04"    => "debian-2.2",
@@ -1691,9 +1694,10 @@
   my ($service) = @_;
   my %dist_map =
       (
-       "debian-2.2"   => \&gst_service_debian_get_status,
        "debian-3.0"   => \&gst_service_debian_get_status,
-       "debian-sarge" => \&gst_service_debian_get_status,
+       "debian-3.1"   => \&gst_service_debian_get_status,
+       "debian-4.0"   => \&gst_service_debian_get_status,
+       "debian-testing" => \&gst_service_debian_get_status,
        "ubuntu-5.04"  => \&gst_service_debian_get_status,
        "ubuntu-5.10"  => \&gst_service_debian_get_status,
        "ubuntu-6.04"  => \&gst_service_debian_get_status,
diff -PruN system-tools-backends-1.4.2.orig/services-conf.in system-tools-backends-1.4.2/services-conf.in
--- system-tools-backends-1.4.2.orig/services-conf.in	2006-09-10 10:10:52.000000000 +0200
+++ system-tools-backends-1.4.2/services-conf.in	2006-09-10 10:53:47.000000000 +0200
@@ -49,7 +49,7 @@
               "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1", "mandrake-9.2",
               "mandrake-10.0", "mandrake-10.1",
               
-              "debian-2.2", "debian-3.0", "debian-sarge",
+              "debian-3.0", "debian-3.1", "debian-4.0", "debian-testing",
 
               "suse-7.0", "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "rpath",
               "pld-1.0", "pld-1.1", "pld-1.99",
diff -PruN system-tools-backends-1.4.2.orig/shares-conf.in system-tools-backends-1.4.2/shares-conf.in
--- system-tools-backends-1.4.2.orig/shares-conf.in	2006-09-10 10:10:53.000000000 +0200
+++ system-tools-backends-1.4.2/shares-conf.in	2006-09-10 11:12:03.000000000 +0200
@@ -67,7 +67,7 @@
               "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1", "mandrake-9.2",
               "mandrake-10.0", "mandrake-10.1",
               "blackpanther-4.0",
-              "debian-2.2", "debian-3.0", "debian-sarge",
+              "debian-3.0", "debian-3.1", "debian-4.0", "debian-testing",
               "suse-7.0", "suse-9.0",
               "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3",
               "pld-1.0", "pld-1.1", "pld-1.99",
@@ -534,9 +534,10 @@
      "blackpanther-4.0" => "redhat-6.2",
      "conectiva-9"  => "redhat-6.2", 
      "conectiva-10" => "redhat-6.2", 
-     "debian-2.2"   => "debian-2.2",
-     "debian-3.0"   => "debian-2.2",
-     "debian-sarge" => "debian-2.2",
+     "debian-3.0"     => "debian-2.2",
+     "debian-3.1"     => "debian-2.2",
+     "debian-4.0"     => "debian-2.2",
+     "debian-testing" => "debian-2.2",
      "suse-7.0"     => "redhat-6.2",
      "suse-9.0"     => "suse-9.0",
      "suse-9.1"     => "suse-9.0",
diff -PruN system-tools-backends-1.4.2.orig/time-conf.in system-tools-backends-1.4.2/time-conf.in
--- system-tools-backends-1.4.2.orig/time-conf.in	2006-09-10 10:10:53.000000000 +0200
+++ system-tools-backends-1.4.2/time-conf.in	2006-09-10 11:10:02.000000000 +0200
@@ -66,7 +66,7 @@
               "openna-1.0",
               "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1", "mandrake-9.2",
               "mandrake-10.0", "mandrake-10.1",
-              "debian-2.2", "debian-3.0", "debian-sarge",
+              "debian-3.0", "debian-3.1", "debian-4.0", "debian-testing",
               "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0",
               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
               "gentoo", "vlos-1.2", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "rpath",
@@ -556,9 +556,10 @@
    "mandrake-10.0"   => "redhat-7.0",
    "mandrake-10.1"   => "redhat-7.0",
 
-   "debian-2.2"      => "debian-2.2",
    "debian-3.0"      => "debian-3.0",
-   "debian-sarge"    => "debian-3.0",
+   "debian-3.1"      => "debian-3.0",
+   "debian-4.0"      => "debian-3.0",
+   "debian-testing"  => "debian-3.0",
 
    "suse-7.0"        => "suse-7.0",
    "suse-9.0"        => "suse-9.0",
@@ -566,13 +567,13 @@
 
    "turbolinux-7.0"  => "redhat-7.0",
    
-   "slackware-8.0.0" => "debian-2.2",
-   "slackware-8.1"   => "debian-2.2",
-   "slackware-9.0.0" => "debian-2.2",
-   "slackware-9.1.0" => "debian-2.2",
-   "slackware-10.0.0" => "debian-2.2",
-   "slackware-10.1.0" => "debian-2.2",
-   "slackware-10.2.0" => "debian-2.2",
+   "slackware-8.0.0" => "slackware",
+   "slackware-8.1"   => "slackware",
+   "slackware-9.0.0" => "slackware",
+   "slackware-9.1.0" => "slackware",
+   "slackware-10.0.0" => "slackware",
+   "slackware-10.1.0" => "slackware",
+   "slackware-10.2.0" => "slackware",
 
    "gentoo"          => "gentoo",
    "vlos-1.2"        => "gentoo",
@@ -632,7 +633,7 @@
               ]
                 },
        
-       "debian-2.2" =>
+       "slackware" =>
        {
          fn =>
          {
@@ -809,9 +810,10 @@
    "mandrake-10.0"   => "redhat-7.0",
    "mandrake-10.1"   => "redhat-7.0",
 
-   "debian-2.2"      => "debian-2.2",
    "debian-3.0"      => "debian-3.0",
-   "debian-sarge"    => "debian-3.0",
+   "debian-3.1"      => "debian-3.0",
+   "debian-4.0"      => "debian-3.0",
+   "debian-testing"  => "debian-3.0",
 
    "suse-7.0"        => "suse-7.0",
    "suse-9.0"        => "suse-9.0",
@@ -819,12 +821,12 @@
 
    "turbolinux-7.0"  => "redhat-7.0",
    
-   "slackware-8.0.0" => "debian-2.2",
-   "slackware-9.0.0" => "debian-2.2",
-   "slackware-9.1.0" => "debian-2.2",
-   "slackware-10.0.0" => "debian-2.2",
-   "slackware-10.1.0" => "debian-2.2",
-   "slackware-10.2.0" => "debian-2.2",
+   "slackware-8.0.0" => "slackware",
+   "slackware-9.0.0" => "slackware",
+   "slackware-9.1.0" => "slackware",
+   "slackware-10.0.0" => "slackware",
+   "slackware-10.1.0" => "slackware",
+   "slackware-10.2.0" => "slackware",
 
    "gentoo"          => "gentoo",
    "vlos-1.2"        => "gentoo",
@@ -881,7 +883,7 @@
               ]
                 },
 
-       "debian-2.2" =>
+       "slackware" =>
        {
          fn =>
          {
diff -PruN system-tools-backends-1.4.2.orig/users-conf.in system-tools-backends-1.4.2/users-conf.in
--- system-tools-backends-1.4.2.orig/users-conf.in	2006-09-10 10:10:52.000000000 +0200
+++ system-tools-backends-1.4.2/users-conf.in	2006-09-10 10:52:36.000000000 +0200
@@ -73,7 +73,7 @@
               "openna-1.0",
               "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1", "mandrake-9.2",
               "mandrake-10.0", "mandrake-10.1",
-              "debian-2.2", "debian-3.0", "debian-sarge",
+              "debian-3.0", "debian-3.1", "debian-4.0", "debian-testing",
               "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0",
               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
               "freebsd-4", "freebsd-5", "freebsd-6",
@@ -359,9 +359,10 @@
   'fedora-2'        => $rh_logindefs_defaults,
   'fedora-3'        => $rh_logindefs_defaults,
   'rpath'           => $rh_logindefs_defaults,
-  'debian-2.2'      => $rh_logindefs_defaults,
   'debian-3.0'      => $rh_logindefs_defaults,
-  'debian-sarge'    => $rh_logindefs_defaults,
+  'debian-3.1'      => $rh_logindefs_defaults,
+  'debian-4.0'      => $rh_logindefs_defaults,
+  'debian-testing'  => $rh_logindefs_defaults,
   'vine-3.0'        => $rh_logindefs_defaults,
   'vine-3.1'        => $rh_logindefs_defaults,
   'gentoo'	        => $gentoo_logindefs_defaults,