--- a/ChangeLog	Tue Apr 18 12:25:55 2006 +0000
+++ b/ChangeLog	Tue Apr 18 13:00:02 2006 +0000
@@ -14,6 +14,16 @@
 
 2006-04-18  Padraig O'Briain <[email protected]>
 
+	* patches/system-tools-backends-02-common.diff: Update patch to
+	service.pl.in: Add -H parameter to call to svcs in 
+	gst_service_smf_get_services_list.
+	Update gst_service_smf_get_service_info to specify role
+	MTA for svc:/network/smtp and role PRINTER_SERVICE for
+	svc:/application/print/server.
+
+	* patches/system-tools-backends-05-services.diff: Update to
+	avoid unexpected tag message for longname in debug output.
+
 	* at-poke.spec: Add reference to patch at-poke-01-crash.diff
 	* at-poke-01-crash.diff: Patch to fix bug 6413890.
 
@@ -404,7 +414,7 @@
 2006-03-20  Padraig O'Briain <[email protected]>
 
 	* patches/system-tools-backends-02-common.diff: Remove
-	-a command line options from some svcs commands in service.pl./in 
+	-a command line options from some svcs commands in service.pl.n 
 	as it gives an error
 	* patches/system-tools-backends-07-time.diff: Update time_get_sunos_zone
 	in tome-conf.in to get the timezone from /etc/default/init.

--- a/patches/system-tools-backends-02-common.diff	Tue Apr 18 12:25:55 2006 +0000
+++ b/patches/system-tools-backends-02-common.diff	Tue Apr 18 13:00:02 2006 +0000
@@ -83,8 +83,8 @@
  
  sub gst_platform_get_system
 diff -ru /var/tmp/clean/system-tools-backends-1.4.2/service.pl.in system-tools-backends-1.4.2/service.pl.in
---- /var/tmp/clean/system-tools-backends-1.4.2/service.pl.in	2006-01-02 15:42:19.000000000 +0000
-+++ system-tools-backends-1.4.2/service.pl.in	2006-03-13 10:14:56.155005000 +0000
+--- /usr/tmp/clean/system-tools-backends-1.4.2/service.pl.in	2006-01-02 15:42:19.000000000 +0000
++++ system-tools-backends-1.4.2/service.pl.in	2006-04-18 10:49:44.023608000 +0100
 @@ -85,6 +85,9 @@
         "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"],
@@ -131,7 +131,7 @@
       "freebsd-5"  => {"rc" => "GRAPHICAL" },
       "slackware-9.1.0" => {"4" => "GRAPHICAL" }
      );
-@@ -797,6 +815,152 @@
+@@ -797,6 +815,154 @@
    return \%ret;
  }
  
@@ -242,6 +242,8 @@
 +    $role = "FILE_SERVER" if ($service =~ /^network\/nfs/);
 +    $role = "DYNAMIC_DNS" if ($service =~ /^network\/dns/);
 +    $role = "SYSTEM_LOGGER" if ($service =~ /^system\/system-log/);
++    $role = "MTA" if ($service =~ /^network\/smtp/);
++    $role = "PRINTER_SERVICE" if ($service =~ /^application\/print\/server/);
 +  }
 +
 +  $hash{"role"} = $role;
@@ -252,7 +254,7 @@
 +sub gst_service_smf_get_services_list
 +{
 +  my @list;
-+  local *SVCS=gst_file_run_pipe_read("svcs -a");
++  local *SVCS=gst_file_run_pipe_read("svcs -H -a");
 +  while (<SVCS>) {
 +    next if (/svc:\/milestone/);
 +    if (/^.*\s*.*\s*svc:\/(.*):.*/) {
@@ -284,7 +286,7 @@
  # these functions get a list of the services that run on a gentoo init
  sub gst_service_gentoo_get_service_status
  {
-@@ -1163,6 +1327,10 @@
+@@ -1163,6 +1329,10 @@
    {
      return "suse";
    }
@@ -295,7 +297,7 @@
    else
    {
      return "sysv";
-@@ -1180,6 +1348,8 @@
+@@ -1180,6 +1350,8 @@
    return &gst_service_rcng_get_services ()   if ($type eq "rcng");
    return &gst_service_suse_get_services ()   if ($type eq "suse");
    return &gst_service_archlinux_get_services() if ($type eq "archlinux");
@@ -304,7 +306,7 @@
    return undef;
  }
  
-@@ -1199,7 +1369,7 @@
+@@ -1199,7 +1371,7 @@
  {
      my ($type) = &gst_get_init_type ();
  
@@ -313,7 +315,7 @@
      return "rc"      if ($type eq "rcng");
      return "rc"      if ($type eq "archlinux");
      return &gst_service_sysv_get_default_runlevel ();
-@@ -1585,6 +1755,7 @@
+@@ -1585,6 +1757,7 @@
    &gst_service_rcng_set_services   ($services, $runlevel) if ($type eq "rcng");
    &gst_service_suse_set_services   ($services, $runlevel) if ($type eq "suse");
    &gst_service_archlinux_set_services ($services, $runlevel) if ($type eq "archlinux");
@@ -321,7 +323,7 @@
  }
  
  sub gst_service_set_conf
-@@ -1632,6 +1803,47 @@
+@@ -1632,6 +1805,47 @@
    return undef;
  }
  
@@ -369,7 +371,7 @@
  sub gst_service_redhat_get_status
  {
    my ($service) = @_;
-@@ -1697,6 +1909,9 @@
+@@ -1697,6 +1911,9 @@
         "ubuntu-5.04"  => \&gst_service_debian_get_status,
         "ubuntu-5.10"  => \&gst_service_debian_get_status,
         "ubuntu-6.04"  => \&gst_service_debian_get_status,
@@ -379,7 +381,7 @@
                
         "redhat-5.2"   => \&gst_service_redhat_get_status,
         "redhat-6.0"   => \&gst_service_redhat_get_status,
-@@ -1909,6 +2124,7 @@
+@@ -1909,6 +2126,7 @@
         "rcng"    => \&gst_service_rcng_run_script,
         "suse"    => \&gst_service_sysv_run_initd_script,
         "archlinux" => \&gst_service_archlinux_run_script,
@@ -387,7 +389,7 @@
        );
  
    $type = &gst_get_init_type ();
-@@ -1964,6 +2180,14 @@
+@@ -1964,6 +2182,14 @@
    return 0;
  }
  
@@ -402,7 +404,7 @@
  sub gst_service_installed
  {
    my ($service) = @_;
-@@ -1975,6 +2199,8 @@
+@@ -1975,6 +2201,8 @@
    return &gst_service_gentoo_installed ($service) if ($type eq "gentoo");
    return &gst_service_rcng_installed ($service) if ($type eq "rcng");
    return &gst_service_rcng_installed ($service) if ($type eq "archlinux");
@@ -411,7 +413,7 @@
    return 0;
  }
  
-@@ -2013,6 +2239,21 @@
+@@ -2013,6 +2241,21 @@
    }
  }
  

--- a/patches/system-tools-backends-05-services.diff	Tue Apr 18 12:25:55 2006 +0000
+++ b/patches/system-tools-backends-05-services.diff	Tue Apr 18 13:00:02 2006 +0000
@@ -1,6 +1,5 @@
-diff -ru /var/tmp/clean/system-tools-backends-1.4.2/services-conf.in system-tools-backends-1.4.2/services-conf.in
---- /var/tmp/clean/system-tools-backends-1.4.2/services-conf.in	2006-01-02 15:32:34.000000000 +0000
-+++ system-tools-backends-1.4.2/services-conf.in	2006-03-13 10:14:56.155294000 +0000
+--- /usr/tmp/clean/system-tools-backends-1.4.2/services-conf.in	2006-01-02 15:32:34.000000000 +0000
++++ system-tools-backends-1.4.2/services-conf.in	2006-04-18 13:48:12.871683000 +0100
 @@ -51,6 +51,7 @@
                
                "debian-2.2", "debian-3.0", "debian-sarge",
@@ -9,7 +8,23 @@
                "suse-7.0", "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "rpath",
                "pld-1.0", "pld-1.1", "pld-1.99",
                "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
-@@ -260,6 +261,7 @@
+@@ -91,6 +92,7 @@
+   {
+     if ($elem eq "runlevels") { $runlevel = &xml_parse_runlevel_list (shift @$tree)}
+     elsif ($elem eq "services") { push @$services, &xml_parse_service_list (shift @$tree); }
++    elsif ($elem eq "longname") { shift @$tree; }
+     else { &gst_report ("xml_unexp_tag", $elem); shift @$tree; }
+   }
+ 
+@@ -173,6 +175,7 @@
+     elsif ($elem eq "role") { shift @$tree }
+     elsif ($elem eq "runlevels") { push @$runlevels, &xml_parse_runlevels (shift @$tree); }
+     elsif ($elem eq "script") { $$hash{"script"} = &gst_xml_get_pcdata (shift @$tree); }
++    elsif ($elem eq "longname") { shift @$tree; }
+     else { &gst_report ("xml_unexp_tag", $elem); shift @$tree; }
+   }
+   
+@@ -260,6 +263,7 @@
  sub xml_print_runlevels
  {
    my ($h, $default) = @_;