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

[slowfranklin at users.sourceforge.net]

Revision: 23574
          http://sourceforge.net/p/gar/code/23574
Author:   slowfranklin
Date:     2014-05-08 05:26:47 +0000 (Thu, 08 May 2014)
Log Message:
-----------
netatalk/trunk: Update Tracker deps and add upstream patch

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

Added Paths:
-----------
    csw/mgar/pkg/netatalk/trunk/files/33dd614058f32bbe3c88734654228d8715f2403e.patch

Modified: csw/mgar/pkg/netatalk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netatalk/trunk/Makefile	2014-05-07 16:22:40 UTC (rev 23573)
+++ csw/mgar/pkg/netatalk/trunk/Makefile	2014-05-08 05:26:47 UTC (rev 23574)
@@ -31,6 +31,7 @@
 BUILD_DEP_PKGS += CSWlibtracker-dev
 BUILD_DEP_PKGS += CSWlibssl-dev
 BUILD_DEP_PKGS += CSWopenldap-dev
+BUILD_DEP_PKGS += CSWlibpcre-dev
 
 RUNTIME_DEP_PKGS += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS += CSWlibgcrypt11
@@ -41,8 +42,8 @@
 RUNTIME_DEP_PKGS += CSWlibdbus-glib1-2
 RUNTIME_DEP_PKGS += CSWlibiconv2
 RUNTIME_DEP_PKGS += CSWbdb48
-RUNTIME_DEP_PKGS += CSWlibtracker-sparql0-16-0
-RUNTIME_DEP_PKGS += CSWlibtracker-miner0-16-0
+RUNTIME_DEP_PKGS += CSWlibtracker-sparql1-0-0
+RUNTIME_DEP_PKGS += CSWlibtracker-miner1-0-0
 RUNTIME_DEP_PKGS += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS += CSWlibgcc-s1
 RUNTIME_DEP_PKGS += CSWlibldap2-4-2
@@ -53,6 +54,8 @@
 
 PATCHFILES += 0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch
 PATCHFILES += 0004-Ensure-gsettings-is-called-from-opt-csw-bin.patch
+# will be in 3.1.2:
+PATCHFILES += 33dd614058f32bbe3c88734654228d8715f2403e.patch
 
 REINPLACEMENTS += manifest1
 REINPLACE_MATCH_manifest1 = network/netatalk
@@ -76,7 +79,7 @@
 CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/run/netatalk
 CONFIGURE_ARGS += --enable-krbV-uam
 CONFIGURE_ARGS += --with-tracker-prefix=/opt/csw
-CONFIGURE_ARGS += --with-tracker-pkgconfig-version=0.16
+CONFIGURE_ARGS += --with-tracker-pkgconfig-version=1.0
 CONFIGURE_ARGS += --with-ssl-dir=/opt/csw
 CONFIGURE_ARGS += --with-ldap=/opt/csw
 # compiling with MySQL on opencsw is a major pita atm :)

Added: csw/mgar/pkg/netatalk/trunk/files/33dd614058f32bbe3c88734654228d8715f2403e.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/33dd614058f32bbe3c88734654228d8715f2403e.patch	                        (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/33dd614058f32bbe3c88734654228d8715f2403e.patch	2014-05-08 05:26:47 UTC (rev 23574)
@@ -0,0 +1,73 @@
+From 33dd614058f32bbe3c88734654228d8715f2403e Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <rb at sernet.de>
+Date: Tue, 22 Apr 2014 16:25:34 +0200
+Subject: [PATCH] Remove tracker miner code
+
+tracker_miner_manager_new_full() was reported to be potentially
+locking up for an unknown reason.
+
+As we diddn't use the miner anyway for other reasons (see comment in
+the code), simply #ifdef 0 the whole code.
+---
+ etc/spotlight/slmod_sparql.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/etc/spotlight/slmod_sparql.c b/etc/spotlight/slmod_sparql.c
+index 11b1dac..e59db5a 100644
+--- a/etc/spotlight/slmod_sparql.c
++++ b/etc/spotlight/slmod_sparql.c
+@@ -34,7 +34,9 @@
+ #define MAX_SL_RESULTS 20
+ 
+ static TrackerSparqlConnection *connection;
++#if 0
+ static TrackerMinerManager *manager;
++#endif
+ 
+ static char *tracker_to_unix_path(const char *uri)
+ {
+@@ -73,7 +75,9 @@ static int sl_mod_init(void *p)
+ 
+     become_root();
+     connection = tracker_sparql_connection_get(NULL, &error);
++#if 0 /* this may hang, so disable it as we don't use the miner anyway  */
+     manager = tracker_miner_manager_new_full(FALSE, &error);
++#endif
+     unbecome_root();
+ 
+     if (!connection) {
+@@ -83,11 +87,13 @@ static int sl_mod_init(void *p)
+         EC_FAIL;
+     }
+ 
++#if 0
+     if (!manager) {
+         LOG(log_error, logtype_sl, "Couldn't connect to Tracker miner");
+         g_clear_error(&error);
+         EC_FAIL;
+     }
++#endif
+ 
+ EC_CLEANUP:
+     EC_EXIT;
+@@ -387,6 +393,7 @@ static int sl_mod_index_file(const void *p)
+      */
+     return 0;
+ 
++#if 0
+ #ifdef HAVE_TRACKER_MINER
+     EC_INIT;
+     const char *f = p;
+@@ -414,7 +421,8 @@ static int sl_mod_index_file(const void *p)
+     EC_EXIT;
+ #else
+     return 0;
+-#endif
++#endif /* HAVE_TRACKER_MINER */
++#endif /* 0 */
+ }
+ 
+ struct sl_module_export sl_mod = {
+-- 
+1.9.1
+

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