From 4dc0b2028099406a587b057fd3fe932a47d1fcb2 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Sun, 15 Sep 2013 15:53:08 +0200 Subject: [PATCH] Move Spotlight UNIX domain socket to /netatalk/ --- config/.gitignore | 1 + config/Makefile.am | 7 ++++--- config/{dbus-session.conf => dbus-session.conf.tmpl} | 2 +- doc/manual/configuration.xml | 2 +- etc/netatalk/netatalk.c | 2 +- etc/spotlight/Makefile.am | 7 ++++++- etc/spotlight/slmod_sparql.c | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) rename config/{dbus-session.conf => dbus-session.conf.tmpl} (96%) diff --git a/config/.gitignore b/config/.gitignore index ec0b4097..f6ebd89c 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -2,3 +2,4 @@ Makefile Makefile.in *.o afp.conf +dbus-session.conf diff --git a/config/Makefile.am b/config/Makefile.am index 6225c165..aeb37a07 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -3,10 +3,10 @@ SUBDIRS = pam SUFFIXES = .tmpl . -TMPLFILES = afp.conf.tmpl -GENFILES = afp.conf +TMPLFILES = afp.conf.tmpl dbus-session.conf.tmpl +GENFILES = afp.conf dbus-session.conf CLEANFILES = $(GENFILES) -EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf netatalk-dbus.conf +EXTRA_DIST = $(TMPLFILES) extmap.conf netatalk-dbus.conf OVERWRITE_CONFIG = @OVERWRITE_CONFIG@ @@ -28,6 +28,7 @@ endif -e s@:ETCDIR:@${pkgconfdir}@ \ -e s@:COMPILED_BACKENDS:@"$(compiled_backends)"@ \ -e s@:DEFAULT_CNID_SCHEME:@$(DEFAULT_CNID_SCHEME)@ \ + -e s@:LOCALSTATEDIR:@"$(localstatedir)"@ \ <$< >$@ # diff --git a/config/dbus-session.conf b/config/dbus-session.conf.tmpl similarity index 96% rename from config/dbus-session.conf rename to config/dbus-session.conf.tmpl index e933380b..f84b9239 100644 --- a/config/dbus-session.conf +++ b/config/dbus-session.conf.tmpl @@ -8,7 +8,7 @@ the behavior of child processes. --> - unix:path=/tmp/spotlight.ipc + unix:path=:LOCALSTATEDIR:/netatalk/spotlight.ipc diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml index 51711ad3..f82de735 100644 --- a/doc/manual/configuration.xml +++ b/doc/manual/configuration.xml @@ -1579,7 +1579,7 @@ aclmode = passthrough PREFIX="/" export XDG_DATA_HOME="$PREFIX/var/netatalk/" export XDG_CACHE_HOME="$PREFIX/var/netatalk/" -export DBUS_SESSION_BUS_ADDRESS="unix:path=/tmp/spotlight.ipc" +export DBUS_SESSION_BUS_ADDRESS="unix:path=$PREFIX/var/netatalk/spotlight.ipc" # . .tracker_profile # diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c index 6923993e..0e5c6554 100644 --- a/etc/netatalk/netatalk.c +++ b/etc/netatalk/netatalk.c @@ -395,7 +395,7 @@ int main(int argc, char **argv) sigprocmask(SIG_SETMASK, &blocksigs, NULL); #ifdef HAVE_TRACKER - setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1); + 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); diff --git a/etc/spotlight/Makefile.am b/etc/spotlight/Makefile.am index 40cde734..7fd2721a 100644 --- a/etc/spotlight/Makefile.am +++ b/etc/spotlight/Makefile.am @@ -20,7 +20,12 @@ slmod_sparql_la_SOURCES = \ slmod_sparql_parser.y \ spotlight_rawquery_lexer.l -slmod_sparql_la_CFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE @TRACKER_CFLAGS@ @TRACKER_MINER_CFLAGS@ +slmod_sparql_la_CFLAGS = \ + -DDBUS_API_SUBJECT_TO_CHANGE \ + @TRACKER_CFLAGS@ \ + @TRACKER_MINER_CFLAGS@ \ + -D_PATH_STATEDIR='"$(localstatedir)/netatalk"' + slmod_sparql_la_LDFLAGS = -module -avoid-version @TRACKER_LIBS@ @TRACKER_MINER_LIBS@ srp_SOURCES = \ diff --git a/etc/spotlight/slmod_sparql.c b/etc/spotlight/slmod_sparql.c index 00ed90d6..099aa964 100644 --- a/etc/spotlight/slmod_sparql.c +++ b/etc/spotlight/slmod_sparql.c @@ -62,7 +62,7 @@ static int sl_mod_init(void *p) LOG(log_info, logtype_sl, "Initializing Spotlight module"); g_type_init(); - setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1); + setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "/spotlight.ipc", 1); setenv("TRACKER_SPARQL_BACKEND", "bus", 1); #ifdef DEBUG -- 2.39.2