Merge lp:~nalimilan/ubuntu/lucid/gnome-system-tools/shares-services into lp:ubuntu/lucid/gnome-system-tools

[Milan Bouchet-Valat]

This is a hack we need to fix bug 574046 in Lucid, and maybe in Maverick if we don't get real Upstart support. It's pretty Ubuntu-specific, but I think it's as reliable as the previous solution (which using SysV scripts). ATM shares-admin is completely broken in Lucid, so it would be a nice improvement.

I've not updated the Debian changelog since I think we should simply keep this patch in the repo, and make a SRU with this AND the new upstream version, when someone finds the time to. No need to do two different SRUs.

[Martin Pitt (pitti)]

Thanks Milan! Indeed this is a hack and not quite a proper solution for upstream, but it will do nicely as a distro specific change to fix this bug in stable releases.

review: Approve

=== added file 'debian/patches/91_shares_services_detection.patch'
--- debian/patches/91_shares_services_detection.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/91_shares_services_detection.patch	2010-05-26 14:25:43 +0000
@@ -0,0 +1,66 @@
+Index: shares-services/src/shares/shares-tool.c
+===================================================================
+--- shares-services.orig/src/shares/shares-tool.c	2010-05-26 15:55:30.000000000 +0200
++++ shares-services/src/shares/shares-tool.c	2010-05-26 15:55:39.000000000 +0200
+@@ -62,9 +62,6 @@
+ 	tool->smb_config = oobs_smb_config_get ();
+ 	gst_tool_add_configuration_object (gst_tool, tool->smb_config, TRUE);
+ 
+-	tool->services_config = oobs_services_config_get ();
+-	gst_tool_add_configuration_object (gst_tool, tool->services_config, TRUE);
+-
+ 	tool->hosts_config = oobs_hosts_config_get ();
+ 	gst_tool_add_configuration_object (gst_tool, tool->hosts_config, TRUE);
+ 
+@@ -256,30 +253,19 @@
+ 	gst_shares_tool_update_services_availability (shares_tool);
+ }
+ 
++/* Services detection is very rough:
++ * since Upstart jobs are not supported (yet?), we fall back on checking
++ * that files are present, which means packages are installed.
++ * Anyway, the only right way to do this would be checking that
++ * the package is present, e.g. using PackageKit. */
+ static void
+ gst_shares_tool_update_services_availability (GstSharesTool *tool)
+ {
+-	OobsList *services;
+-	OobsListIter iter;
+-	GObject *service;
+-	gboolean valid;
+-	GstServiceRole role;
+-
+-	services = oobs_services_config_get_services (OOBS_SERVICES_CONFIG (tool->services_config));
+-	valid = oobs_list_get_iter_first (services, &iter);
++        if (g_file_test ("/usr/sbin/smbd", G_FILE_TEST_EXISTS))
++        	tool->smb_available = TRUE;
+ 
+-	while (valid) {
+-		service = oobs_list_get (services, &iter);
+-		role = gst_service_get_role (OOBS_SERVICE (service));
+-
+-		if (role == GST_ROLE_FILE_SERVER_SMB)
+-			tool->smb_available = TRUE;
+-		else if (role == GST_ROLE_FILE_SERVER_NFS)
+-			tool->nfs_available = TRUE;
+-
+-		g_object_unref (service);
+-		valid = oobs_list_iter_next (services, &iter);
+-	}
++        if (g_file_test ("/usr/sbin/rpc.nfsd", G_FILE_TEST_EXISTS))
++		tool->nfs_available = TRUE;
+ }
+ 
+ GstSharesTool*
+Index: shares-services/src/shares/shares-tool.h
+===================================================================
+--- shares-services.orig/src/shares/shares-tool.h	2010-05-26 15:46:31.000000000 +0200
++++ shares-services/src/shares/shares-tool.h	2010-05-26 15:55:39.000000000 +0200
+@@ -44,7 +44,6 @@
+ 	OobsObject *smb_config;
+ 
+ 	/* read only */
+-	OobsObject *services_config;
+ 	OobsObject *hosts_config;
+ 	OobsObject *users_config;
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-02-06 14:51:47 +0000
+++ debian/patches/series	2010-05-26 14:25:43 +0000
@@ -8,3 +8,5 @@
 81_gst-packages-shares-admin.patch
 82_gst-packages-time-admin.patch
 90_relibtoolize.patch
+91_shares_services_detection.patch
+