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

[slowfranklin at users.sourceforge.net]

Revision: 23830
          http://sourceforge.net/p/gar/code/23830
Author:   slowfranklin
Date:     2014-07-03 20:23:37 +0000 (Thu, 03 Jul 2014)
Log Message:
-----------
netatalk/trunk: Update to 3.1.3

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

Added Paths:
-----------
    csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus-start-by-default.patch

Modified: csw/mgar/pkg/netatalk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netatalk/trunk/Makefile	2014-07-03 16:53:05 UTC (rev 23829)
+++ csw/mgar/pkg/netatalk/trunk/Makefile	2014-07-03 20:23:37 UTC (rev 23830)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = netatalk
-VERSION = 3.1.2
+VERSION = 3.1.3
 GARTYPE = v2
 
 DESCRIPTION = Open Source AFP fileserver
@@ -53,11 +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-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
-PATCHFILES += 0003-Spotlight-spotlight-expr-false-broke-the-default-Spo.patch
+PATCHFILES += 0001-Disable-dbus-start-by-default.patch
 
 PRESERVECONF += $(sysconfdir)/afp.conf
 PRESERVECONF += $(sysconfdir)/extmap.conf

Modified: csw/mgar/pkg/netatalk/trunk/checksums
===================================================================
--- csw/mgar/pkg/netatalk/trunk/checksums	2014-07-03 16:53:05 UTC (rev 23829)
+++ csw/mgar/pkg/netatalk/trunk/checksums	2014-07-03 20:23:37 UTC (rev 23830)
@@ -1 +1 @@
-aa981b3b33092300ec1a20518ca05689  netatalk-3.1.2.tar.gz
+9413985a991334cd9aea44388fc4eb4a  netatalk-3.1.3.tar.gz

Added: csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus-start-by-default.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus-start-by-default.patch	                        (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus-start-by-default.patch	2014-07-03 20:23:37 UTC (rev 23830)
@@ -0,0 +1,25 @@
+From 1aa56c80e9e1393f15d080228e66b0c5f90fa9c1 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Thu, 3 Jul 2014 22:21:29 +0200
+Subject: [PATCH] Disable dbus start by default
+
+---
+ etc/netatalk/netatalk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c
+index 3a470d0..d1cba32 100644
+--- a/etc/netatalk/netatalk.c
++++ b/etc/netatalk/netatalk.c
+@@ -418,7 +418,7 @@ int main(int argc, char **argv)
+         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)) {
++        if (atalk_iniparser_getboolean(obj.iniconfig, INISEC_GLOBAL, "start dbus", 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) {
+-- 
+2.0.0
+

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