diff options
| -rw-r--r-- | abrt.spec | 24 | ||||
| -rw-r--r-- | src/daemon/Daemon.cpp | 6 | ||||
| -rw-r--r-- | src/daemon/Makefile.am | 8 | ||||
| -rw-r--r-- | src/daemon/abrt-handle-crashdump.c | 7 | ||||
| -rw-r--r-- | src/daemon/abrt_event.conf | 2 | ||||
| -rw-r--r-- | src/hooks/Makefile.am | 1 | ||||
| -rw-r--r-- | src/plugins/Makefile.am | 26 |
7 files changed, 32 insertions, 42 deletions
@@ -349,7 +349,7 @@ fi %{_sbindir}/abrt-server %{_bindir}/abrt-handle-upload %{_bindir}/abrt-handle-crashdump -%{_libexecdir}/abrt-action-save-package-data +%{_bindir}/abrt-action-save-package-data %config(noreplace) %{_sysconfdir}/%{name}/abrt.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt_event.conf %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys @@ -416,9 +416,9 @@ fi %dir %{_localstatedir}/cache/abrt-di %{_libdir}/%{name}/libCCpp.so* %{_libexecdir}/abrt-hook-ccpp -%{_libexecdir}/abrt-action-analyze-c -%{_libexecdir}/abrt-action-install-debuginfo.py* -%{_libexecdir}/abrt-action-generate-backtrace +%{_bindir}/abrt-action-analyze-c +%{_bindir}/abrt-action-install-debuginfo.py* +%{_bindir}/abrt-action-generate-backtrace %files addon-kerneloops %defattr(-,root,root,-) @@ -428,48 +428,48 @@ fi %{_mandir}/man7/abrt-KerneloopsScanner.7.gz %{_libdir}/%{name}/KerneloopsReporter.glade %{_mandir}/man7/abrt-KerneloopsReporter.7.gz -%{_libexecdir}/abrt-action-analyze-oops -%{_libexecdir}/abrt-action-kerneloops +%{_bindir}/abrt-action-analyze-oops +%{_bindir}/abrt-action-kerneloops %files plugin-logger %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf %{_libdir}/%{name}/Logger.glade %{_mandir}/man7/abrt-Logger.7.gz -%{_libexecdir}/abrt-action-print +%{_bindir}/abrt-action-print %files plugin-mailx %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Mailx.conf %{_libdir}/%{name}/Mailx.glade %{_mandir}/man7/abrt-Mailx.7.gz -%{_libexecdir}/abrt-action-mailx +%{_bindir}/abrt-action-mailx %files plugin-bugzilla %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf %{_libdir}/%{name}/Bugzilla.glade %{_mandir}/man7/abrt-Bugzilla.7.gz -%{_libexecdir}/abrt-action-bugzilla +%{_bindir}/abrt-action-bugzilla %files plugin-rhtsupport %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/RHTSupport.conf %{_libdir}/%{name}/RHTSupport.glade # {_mandir}/man7/abrt-RHTSupport.7.gz -%{_libexecdir}/abrt-action-rhtsupport +%{_bindir}/abrt-action-rhtsupport %files plugin-reportuploader %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Upload.conf %{_libdir}/%{name}/Upload.glade %{_mandir}/man7/abrt-Upload.7.gz -%{_libexecdir}/abrt-action-upload +%{_bindir}/abrt-action-upload %files addon-python %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Python.conf -%{_libexecdir}/abrt-action-analyze-python +%{_bindir}/abrt-action-analyze-python %{python_site}/*.py* %{python_site}/abrt.pth diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index a181da15..c01ea75a 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -726,13 +726,9 @@ int main(int argc, char** argv) * (I saw it set only DBUS_STARTER_ADDRESS and DBUS_STARTER_BUS_TYPE). * In this case, set something sane: */ - /* Need to add LIBEXEC_DIR to PATH, because otherwise abrt-action-* - * are not found by exec() - */ const char *env_path = getenv("PATH"); if (!env_path || !env_path[0]) - env_path = "/usr/sbin:/usr/bin:/sbin:/bin"; - putenv(xasprintf("PATH=%s:%s", LIBEXEC_DIR, env_path)); + putenv((char*)"PATH=/usr/sbin:/usr/bin:/sbin:/bin"); putenv(xasprintf("ABRT_VERBOSE=%u", g_verbose)); diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 319352e0..584b4e3e 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -1,12 +1,12 @@ bin_SCRIPTS = \ abrt-handle-upload -libexec_PROGRAMS = \ - abrt-action-save-package-data bin_PROGRAMS = \ - abrt-handle-crashdump + abrt-handle-crashdump \ + abrt-action-save-package-data -sbin_PROGRAMS = abrtd \ +sbin_PROGRAMS = \ + abrtd \ abrt-server abrtd_SOURCES = \ diff --git a/src/daemon/abrt-handle-crashdump.c b/src/daemon/abrt-handle-crashdump.c index de809c17..737de408 100644 --- a/src/daemon/abrt-handle-crashdump.c +++ b/src/daemon/abrt-handle-crashdump.c @@ -87,13 +87,6 @@ int main(int argc, char **argv) /* -e EVENT: run event */ - /* Need to add LIBEXEC_DIR to PATH, because otherwise abrt-action-* - * are not found by exec() - */ - const char *env_path = getenv("PATH"); - if (!env_path) env_path = ""; - putenv(xasprintf("PATH=%s%s%s", LIBEXEC_DIR, (!env_path[0] ? "" : ":"), env_path)); - struct run_event_state *run_state = new_run_event_state(); run_state->logging_callback = do_log; int r = run_event_on_dir_name(run_state, dump_dir_name ? dump_dir_name : ".", event); diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf index a91460fe..bee79647 100644 --- a/src/daemon/abrt_event.conf +++ b/src/daemon/abrt_event.conf @@ -52,7 +52,7 @@ EVENT=analyze analyzer=CCpp backtrace= abrt-action-generate-backtrace # Same as "analyze", but executed when user requests "refresh" in GUI #EVENT=reanalyze analyzer=CCpp trim-debuginfo-cache /var/cache/abrt-di 4096m EVENT=reanalyze analyzer=CCpp abrt-action-install-debuginfo.py "--core=$DUMP_DIR/coredump" "--tmpdir=/var/run/abrt/$$-$RANDOM" --cache=/var/cache/abrt-di -EVENT=reanalyze analyzer=CCpp abrt-action-generate-backtrace +EVENT=reanalyze analyzer=CCpp abrt-action-generate-backtrace EVENT=report analyzer=Kerneloops abrt-action-kerneloops EVENT=report_Bugzilla analyzer=CCpp abrt-action-bugzilla -c /etc/abrt/plugins/Bugzilla.conf diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am index fe2644a6..34cd942e 100644 --- a/src/hooks/Makefile.am +++ b/src/hooks/Makefile.am @@ -1,4 +1,5 @@ libexec_PROGRAMS = abrt-hook-ccpp + bin_PROGRAMS = dumpoops # abrt-hook-ccpp diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index eee328e0..c960e66e 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -1,8 +1,20 @@ pluginslibdir = $(PLUGINS_LIB_DIR) -libexec_SCRIPTS = \ +bin_SCRIPTS = \ abrt-action-install-debuginfo.py +bin_PROGRAMS = \ + abrt-action-analyze-c \ + abrt-action-analyze-python \ + abrt-action-analyze-oops \ + abrt-action-generate-backtrace \ + abrt-action-bugzilla \ + abrt-action-rhtsupport \ + abrt-action-kerneloops \ + abrt-action-upload \ + abrt-action-mailx \ + abrt-action-print + pluginslib_LTLIBRARIES = \ libCCpp.la \ libKerneloopsScanner.la @@ -78,18 +90,6 @@ libKerneloopsScanner_la_LDFLAGS = \ -avoid-version \ $(GLIB_LIBS) -libexec_PROGRAMS = \ - abrt-action-analyze-c \ - abrt-action-analyze-python \ - abrt-action-analyze-oops \ - abrt-action-generate-backtrace \ - abrt-action-bugzilla \ - abrt-action-rhtsupport \ - abrt-action-kerneloops \ - abrt-action-upload \ - abrt-action-mailx \ - abrt-action-print - abrt_action_analyze_c_SOURCES = \ abrt-action-analyze-c.c abrt_action_analyze_c_CPPFLAGS = \ |