--- a/patches/system-tools-backends-04-network.diff Fri Dec 14 14:11:53 2007 +0000
+++ b/patches/system-tools-backends-04-network.diff Fri Dec 14 14:29:31 2007 +0000
@@ -1,6 +1,5 @@
-diff -u system-tools-backends-1.4.2/network-conf.in-orig system-tools-backends-1.4.2/network-conf.in
---- system-tools-backends-1.4.2/network-conf.in-orig 2006-01-02 23:32:33.000000000 +0800
-+++ system-tools-backends-1.4.2/network-conf.in 2007-11-14 16:37:01.774181000 +0800
+--- system-tools-backends-1.4.2.orig/network-conf.in Mon Jan 2 23:32:33 2006
++++ system-tools-backends-1.4.2/network-conf.in Fri Dec 14 16:00:43 2007
@@ -77,7 +77,8 @@
"vine-3.0", "vine-3.1",
"ark",
@@ -11,9 +10,8 @@
$description =<<"end_of_description;";
Configures all network parameters and interfaces.
-diff -u system-tools-backends-1.4.2/network.pl.in-orig system-tools-backends-1.4.2/network.pl.in
---- system-tools-backends-1.4.2/network.pl.in-orig 2006-01-02 23:50:54.000000000 +0800
-+++ system-tools-backends-1.4.2/network.pl.in 2007-11-15 16:23:10.258029000 +0800
+--- system-tools-backends-1.4.2.orig/network.pl.in Mon Jan 2 23:50:54 2006
++++ system-tools-backends-1.4.2/network.pl.in Fri Dec 14 21:26:55 2007
@@ -28,8 +28,10 @@
use Socket;
@@ -491,7 +489,7 @@
}
# set of functions for enabling an interface
-@@ -138,39 +592,81 @@
+@@ -138,23 +592,39 @@
if ($essid)
{
@@ -543,6 +541,7 @@
}
}
+@@ -161,17 +631,43 @@
sub gst_network_enable_iface
{
my ($hash, $dev, $command_ifconfig) = @_;
@@ -562,7 +561,7 @@
{
- if (&gst_file_locate_tool ("dhclient3"))
+ if ($$tool{"system"} eq "SunOS")
-+ {
+ {
+
+ &gst_file_run ("ifconfig $dev plumb"); # XXX - inet6???
+ if (&gst_network_get_interface_type($dev) eq "wireless" ) {
@@ -584,9 +583,10 @@
+ &gst_file_run ("cp -p $resolv_conf $SYSCONFDIR/inet/gnome-system-tools/resolv.conf.$dev.bak");
+ }
+ elsif (&gst_file_locate_tool ("dhclient3"))
- {
++ {
$command = "dhclient3 -pf /var/run/dhclient.$dev.pid $dev";
}
+ elsif (&gst_file_locate_tool ("dhclient"))
@@ -189,11 +685,36 @@
$command .= " $dev";
$command .= " $address" if ($address);
@@ -695,7 +695,7 @@
return $types_cache{$dev};
}
-@@ -895,12 +1439,73 @@
+@@ -895,6 +1439,66 @@
return \%ifaces;
}
@@ -762,6 +762,7 @@
sub gst_network_interfaces_get_info
{
my (%ifaces);
+@@ -901,6 +1505,7 @@
$ifaces = &gst_network_linux_interfaces_get_info if ($$tool{"system"} eq "Linux");
$ifaces = &gst_network_freebsd_interfaces_get_info if ($$tool{"system"} eq "FreeBSD");
@@ -1268,7 +1269,37 @@
"address" => "127.0.0.1",
"netmask" => "255.0.0.0",
"broadcast" => "127.255.255.255",
-@@ -4101,6 +5047,8 @@
+@@ -4021,16 +4967,27 @@
+ {
+ my ($statichost, $hostname, $old_hostname, $lo_ip) = @_;
+ my $i;
++ my ($plat) = $$tool{"system"};
+
+ if (exists $$statichost{$lo_ip})
+ {
+ my $localhost = $$statichost{$lo_ip};
+ &gst_network_statichost_remove_alias ($localhost, $old_hostname) if ($old_hostname);
+- &gst_network_statichost_add_alias ($localhost, $hostname);
++ if ($plat ne "SunOS")
++ {
++ &gst_network_statichost_add_alias ($localhost, $hostname);
++ }
+ }
+ else
+ {
+- $$statichost{$lo_ip} = [ ("localhost", "localhost.localdomain", $hostname) ];
++ if ($plat eq "SunOS")
++ {
++ $$statichost{$lo_ip} = [ ("localhost", "localhost.localdomain") ];
++ }
++ else
++ {
++ $$statichost{$lo_ip} = [ ("localhost", "localhost.localdomain", $hostname) ];
++ }
+ }
+ }
+
+@@ -4101,6 +5058,8 @@
"ubuntu-5.04" => "debian-2.2",
"ubuntu-5.10" => "debian-2.2",
"ubuntu-6.04" => "debian-2.2",
@@ -1277,7 +1308,7 @@
"suse-7.0" => "suse-7.0",
"suse-9.0" => "suse-9.0",
"suse-9.1" => "suse-9.0",
-@@ -4479,6 +5427,79 @@
+@@ -4479,6 +5438,79 @@
[ "gatewaydev", \&gst_network_get_gateway_dev_from_address, "%interface%", "%gateway%" ],
]
},
@@ -1357,7 +1388,7 @@
);
my $dist = $dist_map{$gst_dist};
-@@ -4522,6 +5543,8 @@
+@@ -4522,6 +5554,8 @@
"ubuntu-5.04" => "debian-3.0",
"ubuntu-5.10" => "debian-3.0",
"ubuntu-6.04" => "debian-3.0",
@@ -1366,7 +1397,7 @@
"suse-7.0" => "suse-7.0",
"suse-9.0" => "suse-9.0",
"suse-9.1" => "suse-9.0",
-@@ -5318,7 +6341,115 @@
+@@ -5318,7 +6352,115 @@
[ "persist", \&gst_network_get_freebsd5_ppp_persist, [ STARTIF, IFACE ]],
]
},
@@ -1483,7 +1514,7 @@
my $dist = $dist_map{$gst_dist};
return %{$dist_tables{$dist}} if $dist;
-@@ -5360,6 +6491,8 @@
+@@ -5360,6 +6502,8 @@
"ubuntu-5.04" => "debian-2.2",
"ubuntu-5.10" => "debian-2.2",
"ubuntu-6.04" => "debian-2.2",
@@ -1492,7 +1523,7 @@
"suse-7.0" => "suse-7.0",
"suse-9.0" => "suse-9.0",
"suse-9.1" => "suse-9.0",
-@@ -5723,7 +6856,69 @@
+@@ -5723,7 +6867,69 @@
[ "gateway", \&gst_replace_sh, RC_CONF, "defaultrouter" ],
[ "interface", \&gst_network_interfaces_set, OLD_HASH ]
]
@@ -1563,7 +1594,7 @@
);
my $dist = $dist_map{$gst_dist};
-@@ -5766,6 +6961,8 @@
+@@ -5766,6 +6972,8 @@
"ubuntu-5.04" => "debian-3.0",
"ubuntu-5.10" => "debian-3.0",
"ubuntu-6.04" => "debian-3.0",
@@ -1572,7 +1603,7 @@
"suse-7.0" => "suse-7.0",
"suse-9.0" => "suse-9.0",
"suse-9.1" => "suse-9.0",
-@@ -6522,7 +7719,109 @@
+@@ -6522,7 +7730,109 @@
[ "dial_command", \&gst_network_replace_pppconf_dial_command, [ PPPCONF, STARTIF, IFACE ]],
[ "volume", \&gst_network_replace_pppconf_volume, [ PPPCONF, STARTIF, IFACE ]],
]