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

[slowfranklin at users.sourceforge.net]

Revision: 23627
          http://sourceforge.net/p/gar/code/23627
Author:   slowfranklin
Date:     2014-05-17 10:50:08 +0000 (Sat, 17 May 2014)
Log Message:
-----------
Start and manage Tracker stuff via SMF

Modified Paths:
--------------
    csw/mgar/pkg/netatalk/trunk/Makefile
    csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall
    csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove

Added Paths:
-----------
    csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch
    csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml
    csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml

Modified: csw/mgar/pkg/netatalk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netatalk/trunk/Makefile	2014-05-16 14:22:13 UTC (rev 23626)
+++ csw/mgar/pkg/netatalk/trunk/Makefile	2014-05-17 10:50:08 UTC (rev 23627)
@@ -34,7 +34,7 @@
 BUILD_DEP_PKGS += CSWlibpcre-dev
 
 RUNTIME_DEP_PKGS += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS += CSWlibgcrypt11
+RUNTIME_DEP_PKGS += CSWlibgcrypt20
 RUNTIME_DEP_PKGS += CSWperl
 RUNTIME_DEP_PKGS += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS += CSWlibkrb5-3
@@ -53,6 +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 += 0006-Disable-Tracker-autostart.patch
 # will be in 3.1.2:
 PATCHFILES += 33dd614058f32bbe3c88734654228d8715f2403e.patch
 
@@ -86,6 +87,8 @@
 
 # Path to XML dtd
 CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml
+CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-tracker-miner-fs.xml
+CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-tracker-extract.xml
 CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/bin/afppasswd
 CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_pam.so
 CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_passwd.so
@@ -97,4 +100,6 @@
 	ginstall -d -m 755 $(DESTDIR)/var/opt/csw/svc/manifest/network
 	ginstall -m 444 $(WORKSRC)/distrib/initscripts/netatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/
 	mv $(DESTDIR)/var/opt/csw/svc/manifest/network/netatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/cswnetatalk.xml
+	ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-extract.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/
+	ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-miner-fs.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch	                        (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch	2014-05-17 10:50:08 UTC (rev 23627)
@@ -0,0 +1,24 @@
+From 7c7fc8caad4ff92b63962ed35f342a28e2c79398 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Sat, 17 May 2014 09:56:50 +0200
+Subject: [PATCH] Disable Tracker autostart
+
+---
+ etc/netatalk/netatalk.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c
+index 4cdc466..1a304d1 100644
+--- a/etc/netatalk/netatalk.c
++++ b/etc/netatalk/netatalk.c
+@@ -419,7 +419,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
+ 
+     /* run the event loop */
+-- 
+1.8.4.1
+

Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall	2014-05-16 14:22:13 UTC (rev 23626)
+++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall	2014-05-17 10:50:08 UTC (rev 23627)
@@ -1,2 +1,5 @@
 #!/bin/sh
 chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk.xml > /dev/null 2>&1
+
+chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-tracker-extract.xml > /dev/null 2>&1
+chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-tracker-miner-fs.xml > /dev/null 2>&1

Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove	2014-05-16 14:22:13 UTC (rev 23626)
+++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove	2014-05-17 10:50:08 UTC (rev 23627)
@@ -1,2 +1,4 @@
 #!/bin/sh
 chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk
+chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk-tracker-extract
+chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk-tracker-miner-fs

Added: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml
===================================================================
(Binary files differ)

Index: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml	2014-05-16 14:22:13 UTC (rev 23626)
+++ csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml	2014-05-17 10:50:08 UTC (rev 23627)

Property changes on: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml
===================================================================
(Binary files differ)

Index: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml	2014-05-16 14:22:13 UTC (rev 23626)
+++ csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml	2014-05-17 10:50:08 UTC (rev 23627)

Property changes on: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.