SF.net SVN: gar:[23762] csw/mgar/pkg/netatalk/trunk

[slowfranklin at users.sourceforge.net]

Revision: 23762
          http://sourceforge.net/p/gar/code/23762
Author:   slowfranklin
Date:     2014-06-04 19:33:17 +0000 (Wed, 04 Jun 2014)
Log Message:
-----------
netatalk/trunk: Put back patch to disable dbus autostart

Modified Paths:
--------------
    csw/mgar/pkg/netatalk/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus-and-Tracker-autostart.patch

Removed Paths:
-------------
    csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus.patch

Modified: csw/mgar/pkg/netatalk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netatalk/trunk/Makefile	2014-06-04 18:43:13 UTC (rev 23761)
+++ csw/mgar/pkg/netatalk/trunk/Makefile	2014-06-04 19:33:17 UTC (rev 23762)
@@ -53,7 +53,7 @@
 
 PATCHFILES += 0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch
 PATCHFILES += 0004-Ensure-gsettings-is-called-from-opt-csw-bin.patch
-# PATCHFILES += 0001-Disable-dbus.patch
+PATCHFILES += 0001-Disable-dbus-and-Tracker-autostart.patch
 # will be in 3.1.3:
 PATCHFILES += 0001-Spotlight-SPARQL-query-optimisations.patch
 PATCHFILES += 0002-Spotlight-new-options-for-controlling-query-behaviou.patch

Added: csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus-and-Tracker-autostart.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus-and-Tracker-autostart.patch	                        (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus-and-Tracker-autostart.patch	2014-06-04 19:33:17 UTC (rev 23762)
@@ -0,0 +1,51 @@
+From 6e2404a5a98b110fd061aa2c6f27686869e156bd Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Wed, 4 Jun 2014 21:30:20 +0200
+Subject: [PATCH] Disable dbus and Tracker autostart
+
+---
+ etc/netatalk/netatalk.c | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
+
+diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c
+index 3a470d0..70d25de 100644
+--- a/etc/netatalk/netatalk.c
++++ b/etc/netatalk/netatalk.c
+@@ -411,34 +411,6 @@ int main(int argc, char **argv)
+     sigdelset(&blocksigs, SIGHUP);
+     sigprocmask(SIG_SETMASK, &blocksigs, NULL);
+ 
+-#ifdef HAVE_TRACKER
+-    if (obj.options.flags & OPTION_SPOTLIGHT) {
+-        setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "spotlight.ipc", 1);
+-        setenv("XDG_DATA_HOME", _PATH_STATEDIR, 0);
+-        setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0);
+-        setenv("TRACKER_USE_LOG_FILES", "1", 0);
+-
+-        if (atalk_iniparser_getboolean(obj.iniconfig, INISEC_GLOBAL, "start dbus", 1)) {
+-            dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH);
+-            LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path);
+-            if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == NETATALK_SRV_ERROR) {
+-                LOG(log_error, logtype_default, "Error starting '%s'", dbus_path);
+-                netatalk_exit(EXITERR_CONF);
+-            }
+-
+-            /* Allow dbus some time to start up */
+-            sleep(1);
+-        }
+-
+-        set_sl_volumes();
+-
+-        if (atalk_iniparser_getboolean(obj.iniconfig, INISEC_GLOBAL, "start tracker", 1)) {
+-            system(TRACKER_PREFIX "/bin/tracker-control -s");
+-        }
+-    }
+-#endif
+-
+-
+     /* run the event loop */
+     ret = event_base_dispatch(base);
+ 
+-- 
+1.8.4.1
+

Deleted: csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus.patch	2014-06-04 18:43:13 UTC (rev 23761)
+++ csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus.patch	2014-06-04 19:33:17 UTC (rev 23762)
@@ -1,48 +0,0 @@
-From 0e56bd27a2801a7d7df210262adb2ec61e6dc03f Mon Sep 17 00:00:00 2001
-From: Ralph Boehme <sloowfranklin at gmail.com>
-Date: Sun, 18 May 2014 07:02:00 +0200
-Subject: [PATCH] Disable dbus
-
----
- etc/netatalk/netatalk.c | 13 +------------
- 1 file changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c
-index 640d386..a0e6f80 100644
---- a/etc/netatalk/netatalk.c
-+++ b/etc/netatalk/netatalk.c
-@@ -411,22 +411,12 @@ int main(int argc, char **argv)
-     sigdelset(&blocksigs, SIGHUP);
-     sigprocmask(SIG_SETMASK, &blocksigs, NULL);
- 
--#ifdef HAVE_TRACKER
-     if (obj.options.flags & OPTION_SPOTLIGHT) {
-+#ifdef HAVE_TRACKER
-         setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "spotlight.ipc", 1);
-         setenv("XDG_DATA_HOME", _PATH_STATEDIR, 0);
-         setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0);
-         setenv("TRACKER_USE_LOG_FILES", "1", 0);
--
--        dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH);
--        LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path);
--        if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == NETATALK_SRV_ERROR) {
--            LOG(log_error, logtype_default, "Error starting '%s'", dbus_path);
--            netatalk_exit(EXITERR_CONF);
--        }
--
--        /* Allow dbus some time to start up */
--        sleep(1);
- #endif
- 
- #ifdef HAVE_TRACKER_SPARQL
-@@ -437,7 +427,6 @@ int main(int argc, char **argv)
-         setenv("TRACKER_LANGUAGE_STOPWORDS_DIR", TRACKER_PREFIX "/share/tracker/languages", 0);
- #endif
-         set_sl_volumes();
--        system(TRACKER_PREFIX "/bin/tracker-control -s");
- #endif
-     }
- 
--- 
-1.8.4.1
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.