diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 20:42:11 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-16 22:49:56 -0400 |
| commit | 9da5a4e7ad3b097ebdec98b1e393f1aab079def5 (patch) | |
| tree | 345c4238128fbd635d2b90bbce5b6bb2729d45cf /debian | |
| parent | 3d41f38641b5f1a44bfda5da2979abb826b0010a (diff) | |
refresh patches
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/03-adjust-syslog-facility.diff | 28 | ||||
| -rw-r--r-- | debian/patches/06-gcc_4.4_fixes.diff | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 14 insertions, 32 deletions
diff --git a/debian/patches/03-adjust-syslog-facility.diff b/debian/patches/03-adjust-syslog-facility.diff index e4ed2fe0..4856026d 100644 --- a/debian/patches/03-adjust-syslog-facility.diff +++ b/debian/patches/03-adjust-syslog-facility.diff @@ -1,19 +1,8 @@ change default syslog facility from LOG_LOCAL6 to LOG_DAEMON ---- a/bin/bbstored/BackupStoreDaemon.cpp -+++ b/bin/bbstored/BackupStoreDaemon.cpp -@@ -203,7 +203,7 @@ void BackupStoreDaemon::Run() - SetProcessTitle("housekeeping, idle"); - whichSocket = 1; - // Change the log name -- ::openlog("bbstored/hk", LOG_PID, LOG_LOCAL6); -+ ::openlog("bbstored/hk", LOG_PID, LOG_DAEMON); - // Log that housekeeping started - BOX_INFO("Housekeeping process started"); - // Ignore term and hup --- a/lib/common/Logging.cpp +++ b/lib/common/Logging.cpp -@@ -442,7 +442,7 @@ bool Syslog::Log(Log::Level level, const +@@ -411,7 +411,7 @@ bool Syslog::Log(Log::Level level, const return true; } @@ -22,7 +11,7 @@ change default syslog facility from LOG_LOCAL6 to LOG_DAEMON { ::openlog("Box Backup", LOG_PID, mFacility); } -@@ -480,8 +480,8 @@ int Syslog::GetNamedFacility(const std:: +@@ -454,8 +454,8 @@ int Syslog::GetNamedFacility(const std:: #undef CASE_RETURN BOX_ERROR("Unknown log facility '" << rFacility << "', " @@ -32,7 +21,7 @@ change default syslog facility from LOG_LOCAL6 to LOG_DAEMON + return LOG_DAEMON; } - bool FileLogger::Log(Log::Level Level, const std::string& rFile, + bool FileLogger::Log(Log::Level Level, const std::string& file, int line, --- a/docs/docbook/adminguide.xml +++ b/docs/docbook/adminguide.xml @@ -286,6 +286,12 @@ local5.info /var @@ -48,3 +37,14 @@ change default syslog facility from LOG_LOCAL6 to LOG_DAEMON <programlisting>touch /var/log/box touch /var/log/raidfile</programlisting> +--- a/lib/bbstored/BackupStoreDaemon.cpp ++++ b/lib/bbstored/BackupStoreDaemon.cpp +@@ -203,7 +203,7 @@ void BackupStoreDaemon::Run() + SetProcessTitle("housekeeping, idle"); + whichSocket = 1; + // Change the log name +- ::openlog("bbstored/hk", LOG_PID, LOG_LOCAL6); ++ ::openlog("bbstored/hk", LOG_PID, LOG_DAEMON); + // Log that housekeeping started + BOX_INFO("Housekeeping process started"); + // Ignore term and hup diff --git a/debian/patches/06-gcc_4.4_fixes.diff b/debian/patches/06-gcc_4.4_fixes.diff deleted file mode 100644 index 46ec64cf..00000000 --- a/debian/patches/06-gcc_4.4_fixes.diff +++ /dev/null @@ -1,17 +0,0 @@ -references: - -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526152 -https://bugs.launchpad.net/bugs/371809 - -Impact: FTBFS with gcc 4.4 - -=== modified file 'lib/server/ServerControl.cpp' ---- a/lib/server/ServerControl.cpp -+++ b/lib/server/ServerControl.cpp -@@ -1,5 +1,6 @@ - #include "Box.h" - -+#include <stdio.h> - #include <errno.h> - #include <stdio.h> - diff --git a/debian/patches/series b/debian/patches/series index ab768cfb..f52e7b08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 03-adjust-syslog-facility.diff 05-dont_use_net_for_docs.diff -06-gcc_4.4_fixes.diff |