[ReviewBoard/f15] Resolves: rhbz#598463 - rb-site suggest that I use an unsafe temporary directory

[Stephen Gallagher]

commit 3c292a248ea3624c4cadbe7df09b7593b4fa8a0e
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Fri Jun 17 16:04:15 2011 -0400

    Resolves: rhbz#598463 - rb-site suggest that I use an unsafe temporary
    directory

 FED03-Change-default-cache-file-path.patch |   40 ++++++++++++++++++++++++++++
 ReviewBoard.spec                           |    7 ++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/FED03-Change-default-cache-file-path.patch b/FED03-Change-default-cache-file-path.patch
new file mode 100644
index 0000000..a4a96a0
--- /dev/null
+++ b/FED03-Change-default-cache-file-path.patch
@@ -0,0 +1,40 @@
+From 06ff349cab6d6597f7f38e9b5fbe7f6cc0b45457 Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh at redhat.com>
+Date: Fri, 17 Jun 2011 15:50:05 -0400
+Subject: [PATCH 3/3] Change default cache file path
+
+FHS requirement
+---
+ contrib/conf/settings_local.py.tmpl |    2 +-
+ reviewboard/cmdline/rbsite.py       |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/conf/settings_local.py.tmpl b/contrib/conf/settings_local.py.tmpl
+index a2773ffb9ba4ad0b44d1d0868e15db5a692ce1b4..3db98dc5d7d82065d36dc0c15f53058e383099f4 100644
+--- a/contrib/conf/settings_local.py.tmpl
++++ b/contrib/conf/settings_local.py.tmpl
+@@ -14,7 +14,7 @@ SECRET_KEY = '***********************************************'
+ # In most Installations, memcached is the best option. Development
+ # installations can get away with a file-based or local memory cache.
+ #
+-# CACHE_BACKEND = 'file:///tmp/reviewboard_cache?max_entries=5000'
++# CACHE_BACKEND = 'file:///var/cache/reviewboard/cache?max_entries=5000'
+ # CACHE_BACKEND = 'memcached://localhost:11211//'
+ CACHE_BACKEND = 'locmem:///'
+ 
+diff --git a/reviewboard/cmdline/rbsite.py b/reviewboard/cmdline/rbsite.py
+index 0d204a6ca1876746be78f5e35b39e37d8e906d2c..2fd1e7e8fec56cd62e2522f34fcbe28a59d04154 100755
+--- a/reviewboard/cmdline/rbsite.py
++++ b/reviewboard/cmdline/rbsite.py
+@@ -1386,7 +1386,7 @@ class InstallCommand(Command):
+                        is_visible_func=lambda: site.cache_type == "file")
+ 
+         ui.prompt_input(page, "Cache Directory",
+-                        site.cache_info or "/tmp/reviewboard_cache",
++                        site.cache_info or "/var/cache/reviewboard/cache",
+                         normalize_func=lambda value: "file://" + value,
+                         save_obj=site, save_var="cache_info")
+ 
+-- 
+1.7.5.4
+
diff --git a/ReviewBoard.spec b/ReviewBoard.spec
index 7cae3da..53a9495 100644
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@ -2,7 +2,7 @@
 
 Name:           ReviewBoard
 Version:        1.5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Web-based code review tool
 Group:          Applications/Internet
 License:        MIT
@@ -31,6 +31,7 @@ Requires:       python-dateutil
 
 Patch1001: FED01-Disable-ez_setup-when-installing-by-RPM.patch
 Patch1002: FED02-Notify-WSGI-users-that-config-changes-are-needed.patch
+Patch1003: FED03-Change-default-cache-file-path.patch
 
 %description
 Review Board is a powerful web-based code review tool that offers
@@ -85,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/webtests/*.py*
 
 %changelog
+* Fri Jun 17 2011 Stephen Gallagher <sgallagh at redhat.com> - 1.5.5-2
+- Resolves: rhbz#598463 - rb-site suggest that I use an unsafe temporary
+-                         directory
+
 * Wed Mar 30 2011 Stephen Gallagher <sgallagh at redhat.com> - 1.5.5-1
 - New upstream release 1.5.5
 - Added a Show SSH Public Key link in the Add/Change Repository page