From 71112fceec7d85b96e01ce05ab91f0e794928420 Mon Sep 17 00:00:00 2001 From: Mike Gardiner <obz@gentoo.org> Date: Sun, 19 Dec 2004 04:33:18 +0000 Subject: Applied the 'don't mangle my server lines' patch, see bug #71235 and upstream --- app-admin/gnome-system-tools/ChangeLog | 9 +- app-admin/gnome-system-tools/Manifest | 28 +-- .../files/digest-gnome-system-tools-1.0.2-r1 | 1 + .../files/gnome-system-tools-1.0.2-ntp.patch | 256 +++++++++++++++++++++ .../gnome-system-tools-1.0.2-r1.ebuild | 43 ++++ 5 files changed, 319 insertions(+), 18 deletions(-) create mode 100644 app-admin/gnome-system-tools/files/digest-gnome-system-tools-1.0.2-r1 create mode 100644 app-admin/gnome-system-tools/files/gnome-system-tools-1.0.2-ntp.patch create mode 100644 app-admin/gnome-system-tools/gnome-system-tools-1.0.2-r1.ebuild (limited to 'app-admin') diff --git a/app-admin/gnome-system-tools/ChangeLog b/app-admin/gnome-system-tools/ChangeLog index 54b24eaff0b5..2dc0460b47ad 100644 --- a/app-admin/gnome-system-tools/ChangeLog +++ b/app-admin/gnome-system-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/gnome-system-tools # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.20 2004/12/11 10:43:34 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.21 2004/12/19 04:33:18 obz Exp $ + +*gnome-system-tools-1.0.2-r1 (19 Dec 2004) + + 19 Dec 2004; Mike Gardiner <obz@gentoo.org> + +files/gnome-system-tools-1.0.2-ntp.patch, + +gnome-system-tools-1.0.2-r1.ebuild: + Applied the 'don't mangle my server lines' patch, see bug #71235 and upstream 11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-system-tools-1.0.0.ebuild: diff --git a/app-admin/gnome-system-tools/Manifest b/app-admin/gnome-system-tools/Manifest index a8f92a6851fa..927bd551e096 100644 --- a/app-admin/gnome-system-tools/Manifest +++ b/app-admin/gnome-system-tools/Manifest @@ -1,23 +1,17 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 51664d171ce5d68485dcf62a1354c9a9 gnome-system-tools-1.0.2.ebuild 912 +MD5 4754b63dd47c26445c678627e71f4c3a gnome-system-tools-1.0.2-r1.ebuild 1018 +MD5 7c0d6624a03ec8fcbf69ee497b15eed5 gnome-system-tools-0.33.0.ebuild 731 MD5 b310414058ce19d4be4af4fac7bfba25 gnome-system-tools-1.0.0.ebuild 911 -MD5 119a799025923ff7481bbda1dcd3161f ChangeLog 2786 MD5 f4fa045b8ea0e756c9de8bfe64244615 gnome-system-tools-0.92.0.ebuild 881 -MD5 0a88c243b3c32fba10c58cda47411101 metadata.xml 592 -MD5 7c0d6624a03ec8fcbf69ee497b15eed5 gnome-system-tools-0.33.0.ebuild 731 +MD5 34d046afa9b8bdc3f3006f45d0c52de4 .gnome-system-tools-1.0.2-r1.ebuild.swp 12288 +MD5 51664d171ce5d68485dcf62a1354c9a9 gnome-system-tools-1.0.2.ebuild 912 MD5 985cc77b34068d3c8a11a6886d24419d gnome-system-tools-0.34.0-r1.ebuild 904 +MD5 119a799025923ff7481bbda1dcd3161f ChangeLog 2786 +MD5 0a88c243b3c32fba10c58cda47411101 metadata.xml 592 +MD5 b19810539e97be86cb285492ef7ccc7e files/digest-gnome-system-tools-0.33.0 79 +MD5 9511de777cfc95a4044ee4a201e595cc files/digest-gnome-system-tools-0.92.0 79 MD5 059a3d1a89445a1ff4fdf30964148ca8 files/gnome-system-tools-0.34.0-fix-nopasswd-auth.patch 3545 -MD5 82eb0b595d025b134b71d03a793adfc8 files/digest-gnome-system-tools-1.0.0 78 MD5 deb1440d16f3601aecdc1811cc3f6667 files/digest-gnome-system-tools-0.34.0-r1 79 +MD5 82eb0b595d025b134b71d03a793adfc8 files/digest-gnome-system-tools-1.0.0 78 MD5 791a751973698f6f84222f0ab66c0dd5 files/digest-gnome-system-tools-1.0.2 78 -MD5 b19810539e97be86cb285492ef7ccc7e files/digest-gnome-system-tools-0.33.0 79 -MD5 9511de777cfc95a4044ee4a201e595cc files/digest-gnome-system-tools-0.92.0 79 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBus9eugEuf3OQ0akRAtpKAJ9njVJtu90Rgb2FWBkJayuRZ2Xk4wCeIgqG -EJmyhqG+d2V8IntdpYF0Hk8= -=byCe ------END PGP SIGNATURE----- +MD5 791a751973698f6f84222f0ab66c0dd5 files/digest-gnome-system-tools-1.0.2-r1 78 +MD5 d260438372974645549ff9e1490cc855 files/gnome-system-tools-1.0.2-ntp.patch 11173 diff --git a/app-admin/gnome-system-tools/files/digest-gnome-system-tools-1.0.2-r1 b/app-admin/gnome-system-tools/files/digest-gnome-system-tools-1.0.2-r1 new file mode 100644 index 000000000000..560520aa7868 --- /dev/null +++ b/app-admin/gnome-system-tools/files/digest-gnome-system-tools-1.0.2-r1 @@ -0,0 +1 @@ +MD5 674611d3fb195fde940223821cfa6dda gnome-system-tools-1.0.2.tar.bz2 2766787 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%" ], + ] + }, diff --git a/app-admin/gnome-system-tools/gnome-system-tools-1.0.2-r1.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-1.0.2-r1.ebuild new file mode 100644 index 000000000000..d15f2c094ab2 --- /dev/null +++ b/app-admin/gnome-system-tools/gnome-system-tools-1.0.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-1.0.2-r1.ebuild,v 1.1 2004/12/19 04:33:18 obz Exp $ + +inherit gnome2 eutils + +DESCRIPTION="Tools aimed to make easy the administration of UNIX systems" +HOMEPAGE="http://www.gnome.org/projects/gst/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~alpha" +IUSE="" + +RDEPEND="net-misc/openssh + sys-apps/shadow + >=x11-libs/gtk+-2.4 + >=gnome-base/libgnomeui-1.109 + >=gnome-base/libglade-1.99.5 + >=gnome-base/gconf-2.2 + >=dev-libs/libxml2-2.4.12" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.29" + +DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO" + +USE_DESTDIR="1" + +# --enable-disks is not supported for Gentoo at the moment. +G2CONF="${G2CONF} --enable-boot --enable-services" + +src_unpack() { + + unpack ${A} + # Patch to fix space mangling in ntp.conf, this + # has been fixed in g-s-t CVS, so we don't need + # it after this revision. bug #71235. + # <obz@gentoo.org> + epatch ${FILESDIR}/${P}-ntp.patch + +} -- cgit v1.2.3-65-gdbad