More fixes for /var/cache/abrt -> /var/spool/abrt conversion1.1.3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

10 files changed, 35 insertions, 25 deletions

diff --git a/abrt.spec b/abrt.spec
index 61b01e6e..2f1b8b18 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -16,7 +16,7 @@
 
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 1.1.2
+Version: 1.1.3
 Release: %{?pkg_release}
 License: GPLv2+
 Group: Applications/System
@@ -253,9 +253,11 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir}
 install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd
+# /var/cache/%{name} is to be removed in 1.3.x timeframe
 mkdir -p $RPM_BUILD_ROOT/var/cache/%{name}
 mkdir -p $RPM_BUILD_ROOT/var/cache/%{name}-di
 mkdir -p $RPM_BUILD_ROOT/var/run/%{name}
+mkdir -p $RPM_BUILD_ROOT/var/spool/%{name}
 
 desktop-file-install \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -317,6 +319,7 @@ fi
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf
 %{_initrddir}/%{name}d
 %dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/%{name}
+%dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name}
 %dir /var/run/%{name}
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
@@ -457,6 +460,13 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Fri May 21 2010 Denys Vlasenko <dvlasenk@redhat.com> 1.1.3-1
+- More fixes for /var/cache/abrt -> /var/spool/abrt conversion
+
+* Fri May 21 2010 Jiri Moskovcak <jmoskovc@redhat.com> 1.1.2-3
+- fixed spec file to create /var/spool/abrt rhbz#593670
+- updated init script to reflect the pid file renaming
+
 * Wed May 19 2010 Jiri Moskovcak <jmoskovc@redhat.com> 1.1.2-1
 - updated translation
 - obsolete gnome-python2-bugbuddy rhbz#579748 (jmoskovc@redhat.com)
diff --git a/configure.ac b/configure.ac
index 6f82e01f..3cbe9e5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([abrt], [1.1.2], [crash-catcher@fedorahosted.org])
+AC_INIT([abrt], [1.1.3], [crash-catcher@fedorahosted.org])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
diff --git a/doc/DESIGN b/doc/DESIGN
index ff950b51..df006f96 100644
--- a/doc/DESIGN
+++ b/doc/DESIGN
@@ -47,25 +47,25 @@ it to achieve design goals.
 Since currently we do not know how to dump oops on demand,
 we can only poll for it. There is a small daemon which polls
 kernel message buffer and dumps oopses when it sees them.
-The dump is written into /var/cache/abrt/DIR.
-After this, daemon spawns "abrt-process -d /var/cache/abrt/DIR"
+The dump is written into /var/spool/abrt/DIR.
+After this, daemon spawns "abrt-process -d /var/spool/abrt/DIR"
 which processes it according to configuration in /etc/abrt/*.conf.
 
 In order to catch binary crashes, we install a handler for it
 in /proc/sys/kernel/core_pattern (by setting it to
-"|/usr/libexec/abrt-hook-ccpp /var/cache/abrt %p %s %u").
-When process dumps core, the dump is written into /var/cache/abrt/DIR.
-After this, abrt-hook-ccpp spawns "abrt-process -d /var/cache/abrt/DIR"
+"|/usr/libexec/abrt-hook-ccpp /var/spool/abrt %p %s %u").
+When process dumps core, the dump is written into /var/spool/abrt/DIR.
+After this, abrt-hook-ccpp spawns "abrt-process -d /var/spool/abrt/DIR"
 and terminates.
 
 When python program crashes, it invokes internel python subroutine
 which dumps crash info into ~/abrt/cache/DIR.
-[this is a tentative plan, currently we dump in /var/cache/abrt/DIR]
+[this is a tentative plan, currently we dump in /var/spool/abrt/DIR]
 After this, it spawns "abrt-process -d ~/abrt/cache/DIR"
 and terminates.
 
-[Problem: dumping to /var/cache/abrt/DIR needs world-writable
-/var/cache/abrt and allows user to go way over his
+[Problem: dumping to /var/spool/abrt/DIR needs world-writable
+/var/spool/abrt and allows user to go way over his
 disk quota. Dumping to ~/abrt/cache/DIR makes it difficult
 to present a list of all crashes which happened on the machine -
 for example, root-owned processes cannot even access user data
@@ -88,7 +88,7 @@ The key dbus calls served by abrt-process are:
      of crashes for given uid
      v[N]["executable"/"uid"/"kernel"/"backtrace"][N] = "contents"
 [see above the problem with producing this list]
-- CreateReport(UUID): starts creating a report for /var/cache/abrt/DIR with this UUID.
+- CreateReport(UUID): starts creating a report for /var/spool/abrt/DIR with this UUID.
      Returns job id (uint64).
      After it returns, when report creation thread has finished,
      JobDone(client_dbus_ID,UUID) dbus signal is emitted.
@@ -101,7 +101,7 @@ The key dbus calls served by abrt-process are:
 - Report(map_crash_data_t (map_vector_string_t)):
      "Please report this crash": calls Report() of all registered reporter plugins
      Returns report_status_t (map_vector_string_t) - the status of each call
-- DeleteDebugDump(UUID): delete corresponding /var/cache/abrt/DIR. Returns bool
+- DeleteDebugDump(UUID): delete corresponding /var/spool/abrt/DIR. Returns bool
 
 
 	Development plan
diff --git a/doc/IMPLEMENTATION b/doc/IMPLEMENTATION
index 62ad5786..72f12c72 100644
--- a/doc/IMPLEMENTATION
+++ b/doc/IMPLEMENTATION
@@ -8,7 +8,7 @@ the coredump of crashing app:
 * helper source code: http://git.fedorahosted.org/git/abrt.git?p=abrt.git;a=blob_plain;f=src/Hooks/abrt-hook-python.cpp
 the code responsible for this:
 
-    #define CORE_PATTERN            "|/usr/libexec/abrt-hook-ccpp" "/var/cache/abrt" %p %s %u"
+    #define CORE_PATTERN            "|/usr/libexec/abrt-hook-ccpp" "/var/spool/abrt" %p %s %u"
     ofstream fOutCorePattern;
     fOutCorePattern.open(CORE_PATTERN_IFACE);
     if (fOutCorePattern.is_open())
@@ -33,7 +33,7 @@ cmdline:
     char path[sizeof("/proc/%u/cmdline") + sizeof(int)*3];
     sprintf(path, "/proc/%u/cmdline", (int)pid);
 
-both is saved to file in /var/cache/abrt/ccpp-<time>-<pid> readable
+both is saved to file in /var/spool/abrt/ccpp-<time>-<pid> readable
 only by owner the crashed process:
     int fd = open(pPath, O_WRONLY | O_TRUNC | O_CREAT, 0666);
     if(fd){
@@ -82,7 +82,7 @@ abrt-debuginfo-install is a shell script using elfutils to get build-ids from co
     - gdb is run with the same privileges as the crashed app (setregid, setreuid)
     d) BT is saved to same directory where the coredump is
 
-Once the backtrace is processed all data from the /var/cache/abrt/ccpp-<time>-<pid> is sent
+Once the backtrace is processed all data from the /var/spool/abrt/ccpp-<time>-<pid> is sent
 over dbus to the client and then user can edit the backtrace. When user is happy about
 the report and command the client (gui, tui) to send the it, the client sends the data back
 to the daemon calling the Report(data) method over the dbus. The actual reporting is done by
diff --git a/examples/not_oops2.test b/examples/not_oops2.test
index 5293fc1f..da0f35c1 100644
--- a/examples/not_oops2.test
+++ b/examples/not_oops2.test
@@ -41,7 +41,7 @@ Jan 12 19:08:41 kids1 kernel: EIP: [<f88dec25>] radeon_cp_init_ring_buffer+0x90/
 Jan 12 19:08:41 kids1 kernel: ---[ end trace 81e3cf9431f7af0c ]---
 Nov  9 15:43:47 abrtd: Activating plugin: KerneloopsScanner
 Nov  9 15:43:47 abrtd: Scanning syslog...
-Nov  9 15:43:47 abrtd: Locked '/var/cache/abrt/kerneloops-1257777827-1.lock'
-Nov  9 15:43:47 abrtd: UnLocked '/var/cache/abrt/kerneloops-1257777827-1.lock'
+Nov  9 15:43:47 abrtd: Locked '/var/spool/abrt/kerneloops-1257777827-1.lock'
+Nov  9 15:43:47 abrtd: UnLocked '/var/spool/abrt/kerneloops-1257777827-1.lock'
 Nov  9 15:43:47 abrt: Kerneloops: Reported 1 kernel oopses to Abrt
 Nov  9 15:43:47 This file should not be treated as containing an oops because of the line above
diff --git a/lib/Plugins/SQLite3.conf b/lib/Plugins/SQLite3.conf
index 2053642f..a7617a90 100644
--- a/lib/Plugins/SQLite3.conf
+++ b/lib/Plugins/SQLite3.conf
@@ -1,4 +1,4 @@
 # Configuration file for database plugin SQLite3
 
 # DB path
-DBPath = /var/cache/abrt/abrt-db
+DBPath = /var/spool/abrt/abrt-db
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index f3ecb5f4..70a6e980 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -47,7 +47,7 @@ using namespace std;
 
 /* Daemon initializes, then sits in glib main loop, waiting for events.
  * Events can be:
- * - inotify: something new appeared under /var/cache/abrt
+ * - inotify: something new appeared under /var/spool/abrt
  * - DBus: dbus message arrived
  * - signal: we got SIGTERM or SIGINT
  *
@@ -55,7 +55,7 @@ using namespace std;
  * - GetCrashInfos(): returns a vector_map_crash_data_t (vector_map_vector_string_t)
  *      of crashes for given uid
  *      v[N]["executable"/"uid"/"kernel"/"backtrace"][N] = "contents"
- * - StartJob(crash_id,force): starts creating a report for /var/cache/abrt/DIR with this UID:UUID.
+ * - StartJob(crash_id,force): starts creating a report for /var/spool/abrt/DIR with this UID:UUID.
  *      Returns job id (uint64).
  *      After thread returns, when report creation thread has finished,
  *      JobDone() dbus signal is emitted.
@@ -64,7 +64,7 @@ using namespace std;
  *      "Please report this crash": calls Report() of all registered reporter plugins.
  *      Returns report_status_t (map_vector_string_t) - the status of each call.
  *      2nd parameter is the contents of user's abrt.conf.
- * - DeleteDebugDump(crash_id): delete it from DB and delete corresponding /var/cache/abrt/DIR
+ * - DeleteDebugDump(crash_id): delete it from DB and delete corresponding /var/spool/abrt/DIR
  * - GetPluginsInfo(): returns map_map_string_t
  *      map["plugin"] = { "Name": "plugin", "Enabled": "yes" ... }
  * - GetPluginSettings(PluginName): returns map_plugin_settings_t (map_string_t)
@@ -75,7 +75,7 @@ using namespace std;
  * - SetSettings(map_abrt_settings_t): returns void
  *
  * DBus signals we emit:
- * - Crash(progname, crash_id, uid) - a new crash occurred (new /var/cache/abrt/DIR is found)
+ * - Crash(progname, crash_id, uid) - a new crash occurred (new /var/spool/abrt/DIR is found)
  * - JobDone(client_dbus_ID) - see StartJob above.
  *      Sent as unicast to the client which did StartJob.
  * - Warning(msg)
diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install
index 9b9d63f1..3a236b59 100755
--- a/src/Daemon/abrt-debuginfo-install
+++ b/src/Daemon/abrt-debuginfo-install
@@ -333,7 +333,7 @@ $debug && echo "Downloading rpms to $tempdir"
 
 echo "Getting list of build IDs"
 # Observed errors:
-# eu-unstrip: /var/cache/abrt/ccpp-1256301004-2754/coredump: Callback returned failure
+# eu-unstrip: /var/spool/abrt/ccpp-1256301004-2754/coredump: Callback returned failure
 eu_unstrip_OUT=`eu-unstrip "--core=$core" -n 2>eu_unstrip.ERR`
 err=$?
 printf "%s\neu-unstrip exitcode:%s\n" "$eu_unstrip_OUT" $err >eu_unstrip.OUT
diff --git a/src/Hooks/abrt-hook-ccpp.cpp b/src/Hooks/abrt-hook-ccpp.cpp
index 951bea9d..aca64385 100644
--- a/src/Hooks/abrt-hook-ccpp.cpp
+++ b/src/Hooks/abrt-hook-ccpp.cpp
@@ -147,7 +147,7 @@ int main(int argc, char** argv)
 
         char path[PATH_MAX];
 
-        /* Check /var/cache/abrt/last-ccpp marker, do not dump repeated crashes
+        /* Check /var/spool/abrt/last-ccpp marker, do not dump repeated crashes
          * if they happen too often. Else, write new marker value.
          */
         snprintf(path, sizeof(path), "%s/last-ccpp", dddir);
diff --git a/src/Hooks/abrt-hook-python.cpp b/src/Hooks/abrt-hook-python.cpp
index 972f1176..27a02134 100644
--- a/src/Hooks/abrt-hook-python.cpp
+++ b/src/Hooks/abrt-hook-python.cpp
@@ -1,5 +1,5 @@
 /*
-    abrt-hook-python.cpp - writes data to the /var/cache/abrt directory
+    abrt-hook-python.cpp - writes data to the /var/spool/abrt directory
     with SUID bit
 
     Copyright (C) 2009  RedHat inc.