summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/03-adjust-syslog-facility.diff62
-rw-r--r--debian/patches/05-dont_use_net_for_docs.diff9
2 files changed, 45 insertions, 26 deletions
diff --git a/debian/patches/03-adjust-syslog-facility.diff b/debian/patches/03-adjust-syslog-facility.diff
index 4856026d..8a02cce2 100644
--- a/debian/patches/03-adjust-syslog-facility.diff
+++ b/debian/patches/03-adjust-syslog-facility.diff
@@ -1,30 +1,18 @@
-change default syslog facility from LOG_LOCAL6 to LOG_DAEMON
+From: Reinhard Tartler <siretart@tauware.de>
+Date: Tue, 31 Mar 2009 21:43:58 +0200
+Subject: change default syslog facility from LOG_LOCAL6 to LOG_DAEMON
---- a/lib/common/Logging.cpp
-+++ b/lib/common/Logging.cpp
-@@ -411,7 +411,7 @@ bool Syslog::Log(Log::Level level, const
- return true;
- }
-
--Syslog::Syslog() : mFacility(LOG_LOCAL6)
-+Syslog::Syslog() : mFacility(LOG_DAEMON)
- {
- ::openlog("Box Backup", LOG_PID, mFacility);
- }
-@@ -454,8 +454,8 @@ int Syslog::GetNamedFacility(const std::
- #undef CASE_RETURN
-
- BOX_ERROR("Unknown log facility '" << rFacility << "', "
-- "using default LOCAL6");
-- return LOG_LOCAL6;
-+ "using default DAEMON");
-+ return LOG_DAEMON;
- }
-
- bool FileLogger::Log(Log::Level Level, const std::string& file, int line,
+---
+ docs/docbook/adminguide.xml | 6 ++++++
+ lib/bbstored/BackupStoreDaemon.cpp | 2 +-
+ lib/common/Logging.cpp | 6 +++---
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/docs/docbook/adminguide.xml b/docs/docbook/adminguide.xml
+index edb0a58..440c7d4 100644
--- a/docs/docbook/adminguide.xml
+++ b/docs/docbook/adminguide.xml
-@@ -286,6 +286,12 @@ local5.info /var
+@@ -286,6 +286,12 @@ local5.info /var/log/raidfile</programlisting>
<para><emphasis role="bold">Note:</emphasis> Separators must be tabs,
otherwise these entries will be ignored.</para>
@@ -37,6 +25,8 @@ change default syslog facility from LOG_LOCAL6 to LOG_DAEMON
<programlisting>touch /var/log/box
touch /var/log/raidfile</programlisting>
+diff --git a/lib/bbstored/BackupStoreDaemon.cpp b/lib/bbstored/BackupStoreDaemon.cpp
+index 8fddf12..37b0a6f 100644
--- a/lib/bbstored/BackupStoreDaemon.cpp
+++ b/lib/bbstored/BackupStoreDaemon.cpp
@@ -203,7 +203,7 @@ void BackupStoreDaemon::Run()
@@ -48,3 +38,27 @@ change default syslog facility from LOG_LOCAL6 to LOG_DAEMON
// Log that housekeeping started
BOX_INFO("Housekeeping process started");
// Ignore term and hup
+diff --git a/lib/common/Logging.cpp b/lib/common/Logging.cpp
+index 0928a4d..1cff176 100644
+--- a/lib/common/Logging.cpp
++++ b/lib/common/Logging.cpp
+@@ -411,7 +411,7 @@ bool Syslog::Log(Log::Level level, const std::string& file, int line,
+ return true;
+ }
+
+-Syslog::Syslog() : mFacility(LOG_LOCAL6)
++Syslog::Syslog() : mFacility(LOG_DAEMON)
+ {
+ ::openlog("Box Backup", LOG_PID, mFacility);
+ }
+@@ -454,8 +454,8 @@ int Syslog::GetNamedFacility(const std::string& rFacility)
+ #undef CASE_RETURN
+
+ BOX_ERROR("Unknown log facility '" << rFacility << "', "
+- "using default LOCAL6");
+- return LOG_LOCAL6;
++ "using default DAEMON");
++ return LOG_DAEMON;
+ }
+
+ bool FileLogger::Log(Log::Level Level, const std::string& file, int line,
diff --git a/debian/patches/05-dont_use_net_for_docs.diff b/debian/patches/05-dont_use_net_for_docs.diff
index 71cb6c25..47ac5652 100644
--- a/debian/patches/05-dont_use_net_for_docs.diff
+++ b/debian/patches/05-dont_use_net_for_docs.diff
@@ -1,10 +1,15 @@
+From: Reinhard Tartler <siretart@tauware.de>
+Date: Tue, 5 May 2009 07:34:03 +0200
+Subject: prevent xsltproc from accessing the internet
+Forwarded: no
+
=== modified file 'docs/Makefile'
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -10,7 +10,7 @@
-
+
all: docs
-
+
-DBPROC_COMMAND = xsltproc
+DBPROC_COMMAND = xsltproc --nonet
MKDIR_COMMAND = mkdir