diff options
Diffstat (limited to 'app-admin/gnome-system-tools/files/gnome-system-tools-1.0.2-ntp.patch')
| -rw-r--r-- | app-admin/gnome-system-tools/files/gnome-system-tools-1.0.2-ntp.patch | 256 |
1 files changed, 256 insertions, 0 deletions
diff --git a/app-admin/gnome-system-tools/files/gnome-system-tools-1.0.2-ntp.patch b/app-admin/gnome-system-tools/files/gnome-system-tools-1.0.2-ntp.patch new file mode 100644 index 000000000000..366e494d6ac0 --- /dev/null +++ b/app-admin/gnome-system-tools/files/gnome-system-tools-1.0.2-ntp.patch @@ -0,0 +1,256 @@ +diff -ur gnome-system-tools-1.0.2/backends/parse.pl.in gnome-system-tools-1.0.2-patched/backends/parse.pl.in +--- gnome-system-tools-1.0.2/backends/parse.pl.in 2004-12-06 18:58:53.000000000 +0800 ++++ gnome-system-tools-1.0.2-patched/backends/parse.pl.in 2004-12-19 11:18:06.247737712 +0800 +@@ -398,6 +398,22 @@ + } + + return \@res; ++} ++ ++sub gst_parse_split_all_array_with_pos ++{ ++ my ($file, $key, $pos, $re, $sep, $line_read_proc) = @_; ++ my ($arr, @s, @ret, $i); ++ ++ $arr = &gst_parse_split_all ($file, $key, $re, $line_read_proc); ++ ++ foreach $i (@$arr) ++ { ++ @s = split ($sep, $i); ++ push @ret, @s[0]; ++ } ++ ++ return \@ret; + } + + # Same, but for $all = 0. (ie nameserver 10.0.0.1) +diff -ur gnome-system-tools-1.0.2/backends/time-conf.in gnome-system-tools-1.0.2-patched/backends/time-conf.in +--- gnome-system-tools-1.0.2/backends/time-conf.in 2004-08-29 19:50:08.000000000 +0800 ++++ gnome-system-tools-1.0.2-patched/backends/time-conf.in 2004-12-19 11:20:17.968713080 +0800 +@@ -407,6 +407,73 @@ + return 0; + } + ++sub time_replace_ntp_servers ++{ ++ my ($file, $key, $re, $value) = @_; ++ my ($fd, @line, @res); ++ my ($buff, $i); ++ my ($pre_space, $post_comment); ++ my ($line_key, $val, $rest); ++ my ($n, $ret); ++ ++ &gst_report_enter (); ++ &gst_report ("replace_split", $key, $file); ++ ++ $buff = &gst_file_buffer_load ($file); ++ ++ foreach $i (@$buff) ++ { ++ $pre_space = $post_comment = ""; ++ ++ chomp $i; ++ ++ $pre_space = $1 if $i =~ s/^([ \t]+)//; ++ $post_comment = $1 if $i =~ s/([ \t]*\#.*)//; ++ ++ if ($i ne "") ++ { ++ @line = split ($re, $i, 3); ++ $line_key = shift (@line); ++ $val = shift (@line); ++ $rest = shift (@line); ++ ++ # found the key? ++ if ($line_key eq $key) ++ { ++ $n = 0; ++ ++ while (@$value[$n] && (@$value[$n] ne $val)) ++ { ++ $n++; ++ } ++ ++ if (@$value[$n] ne $val) ++ { ++ $i = ""; ++ next; ++ } ++ ++ delete @$value[$n]; ++ chomp $val; ++ $i = &set_value ($key, $val, $re) . " " . $rest; ++ } ++ } ++ ++ $i = $pre_space . $i . $post_comment . "\n"; ++ } ++ ++ foreach $i (@$value) ++ { ++# print "$key $i\n"; ++ push (@$buff, &set_value ($key, $i, $re) . "\n") if ($i ne ""); ++ } ++ ++ &gst_file_buffer_clean ($buff); ++ $ret = &gst_file_buffer_save ($buff, $file); ++ &gst_report_leave (); ++ return $ret; ++} ++ + sub conf_set + { + my $values_hash = $_[0]; +@@ -498,7 +565,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_all_array_with_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_get_status, "xntpd" ], + [ "ntpinstalled", \&gst_service_sysv_installed, "xntpd" ], + ] +@@ -516,7 +583,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_all_array_with_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_get_status, "ntpd" ], + [ "ntpinstalled", \&gst_service_sysv_installed, "ntpd" ], + ] +@@ -534,7 +601,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_first_array_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_get_status, "ntpd" ], + [ "ntpinstalled", \&gst_service_sysv_installed, "ntp" ], + ] +@@ -552,7 +619,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_all_array_with_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_get_status, "ntpd" ], + [ "ntpinstalled", \&gst_service_list_any_installed, [ "ntp-simple", "ntp-refclock" ] ], + ] +@@ -570,7 +637,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_all_array_with_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_get_status, "xntpd" ], + [ "ntpinstalled", \&gst_service_sysv_installed, "xntpd" ], + ] +@@ -588,7 +655,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_all_array_with_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_get_status, "xntpd" ], + [ "ntpinstalled", \&gst_service_installed, "xntpd" ], + ] +@@ -606,7 +673,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_all_array_with_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_get_status, "ntpd" ], + [ "ntpinstalled", \&gst_service_sysv_installed, "ntpd" ], + ] +@@ -624,7 +691,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_all_array_with_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_gentoo_get_status, "ntpd" ], + [ "ntpinstalled", \&gst_service_installed, "ntpd" ], + ] +@@ -642,7 +709,7 @@ + [ + [ "local_time", \&time_get_local_time ], + [ "timezone", \&time_get_rh62_zone, [LOCAL_TIME, ZONEINFO] ], +- [ "sync", \&gst_parse_split_all_hash_comment, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&gst_parse_split_all_array_with_pos, NTP_CONF, "server", 0, "[ \t]+", "[ \t]+" ], + [ "sync_active", \&gst_service_rcng_get_status, "ntpd" ], + [ "ntpinstalled", \&gst_service_installed, "ntpd" ], + ] +@@ -726,7 +793,7 @@ + [ + [ "timezone", \&time_set_rh62_zone, [LOCAL_TIME, ZONEINFO] ], + [ "local_time", \&time_set_local_time ], +- [ "sync", \&gst_replace_join_all, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&time_replace_ntp_servers, NTP_CONF, "server", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_set_status, 90, "xntpd", "%sync_active%" ], + ] + }, +@@ -743,7 +810,7 @@ + [ + [ "timezone", \&time_set_rh62_zone, [LOCAL_TIME, ZONEINFO] ], + [ "local_time", \&time_set_local_time ], +- [ "sync", \&gst_replace_join_all, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&time_replace_ntp_servers, NTP_CONF, "server", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_set_status, 90, "ntpd", "%sync_active%" ], + ] + }, +@@ -760,7 +827,7 @@ + [ + [ "timezone", \&time_set_rh62_zone, [LOCAL_TIME, ZONEINFO] ], + [ "local_time", \&time_set_local_time ], +- [ "sync", \&gst_replace_join_all, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&time_replace_ntp_servers, NTP_CONF, "server", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_set_status, 23, "ntp", "%sync_active%" ], + ] + }, +@@ -777,7 +844,7 @@ + [ + [ "timezone", \&time_set_rh62_zone, [LOCAL_TIME, ZONEINFO] ], + [ "local_time", \&time_set_local_time ], +- [ "sync", \&gst_replace_join_all, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&time_replace_ntp_servers, NTP_CONF, "server", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_set_status, 23, "ntp-simple", "%sync_active%" ], + ] + }, +@@ -794,7 +861,7 @@ + [ + [ "timezone", \&time_set_rh62_zone, [LOCAL_TIME, ZONEINFO] ], + [ "local_time", \&time_set_local_time ], +- [ "sync", \&gst_replace_join_all, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&time_replace_ntp_servers, NTP_CONF, "server", "[ \t]+" ], + [ "sync_active", \&gst_service_sysv_set_status, 90, "xntpd", "%sync_active%" ], + ] + }, +@@ -811,7 +878,7 @@ + [ + [ "timezone", \&time_set_rh62_zone, [LOCAL_TIME, ZONEINFO] ], + [ "local_time", \&time_set_local_time ], +- [ "sync", \&gst_replace_join_all, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&time_replace_ntp_servers, NTP_CONF, "server", "[ \t]+" ], + [ "sync_active", \&gst_service_suse_set_status, "xntpd" ], + ] + }, +@@ -844,7 +911,7 @@ + [ + [ "timezone", \&time_set_rh62_zone, [LOCAL_TIME, ZONEINFO] ], + [ "local_time", \&time_set_local_time ], +- [ "sync", \&gst_replace_join_all, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&time_replace_ntp_servers, NTP_CONF, "server", "[ \t]+" ], + [ "sync_active", \&gst_service_gentoo_set_status, "ntpd", 1, "%sync_active%" ], + ] + }, +@@ -861,7 +928,7 @@ + [ + [ "timezone", \&time_set_rh62_zone, [LOCAL_TIME, ZONEINFO] ], + [ "local_time", \&time_set_local_time ], +- [ "sync", \&gst_replace_join_all, NTP_CONF, "server", "[ \t]+" ], ++ [ "sync", \&time_replace_ntp_servers, NTP_CONF, "server", "[ \t]+" ], + [ "sync_active", \&gst_service_rcng_set_status, "ntpd", "%sync_active%" ], + ] + }, |