diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03-adjust-syslog-facility.diff | 50 | ||||
| -rw-r--r-- | debian/patches/05-dont_use_net_for_docs.diff | 12 | ||||
| -rw-r--r-- | debian/patches/06-fixup-bbstored-certs.diff | 35 | ||||
| -rw-r--r-- | debian/patches/07-fix-ftbfs-signed-char.diff | 11 | ||||
| -rw-r--r-- | debian/patches/series | 4 |
5 files changed, 112 insertions, 0 deletions
diff --git a/debian/patches/03-adjust-syslog-facility.diff b/debian/patches/03-adjust-syslog-facility.diff new file mode 100644 index 00000000..4856026d --- /dev/null +++ b/debian/patches/03-adjust-syslog-facility.diff @@ -0,0 +1,50 @@ +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, +--- a/docs/docbook/adminguide.xml ++++ b/docs/docbook/adminguide.xml +@@ -286,6 +286,12 @@ local5.info /var + <para><emphasis role="bold">Note:</emphasis> Separators must be tabs, + otherwise these entries will be ignored.</para> + ++ <para><emphasis role="bold">Note2:</emphasis> The packaged ++ debian and ubuntu versions of boxbackup do not log to local6, ++ but to the more standard 'daemon' facility. This means you ++ should not have anything to do to your syslog configuration, ++ since it is configured to be logged by default.</para> ++ + <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/05-dont_use_net_for_docs.diff b/debian/patches/05-dont_use_net_for_docs.diff new file mode 100644 index 00000000..71cb6c25 --- /dev/null +++ b/debian/patches/05-dont_use_net_for_docs.diff @@ -0,0 +1,12 @@ +=== 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 + CP_COMMAND = cp + PERL_COMMAND = perl diff --git a/debian/patches/06-fixup-bbstored-certs.diff b/debian/patches/06-fixup-bbstored-certs.diff new file mode 100644 index 00000000..f752bd2c --- /dev/null +++ b/debian/patches/06-fixup-bbstored-certs.diff @@ -0,0 +1,35 @@ +From: Reinhard Tartler <siretart@tauware.de> +Subject: Fixup bbstored for newer openssl + +It appears that modern openssl versions slightly changed the formatting +for printing the common name of a certificate. + +I've also dropped the check against filename because I cound't get the +filename to match against my local files - the check didn't appear too +useful to me. + + +--- a/bin/bbstored/bbstored-certs.in ++++ b/bin/bbstored/bbstored-certs.in +@@ -171,12 +171,6 @@ sub cmd_sign + + my $acc = $1; + +- # check against filename +- if(!($csr =~ m/(\A|\/)([A-Fa-f0-9]+)-/) || $2 ne $acc) +- { +- die "Certificate request filename does not match name in certificate ($common_name)" +- } +- + print <<__E; + + This certificate is for backup account +@@ -288,7 +282,7 @@ sub get_csr_common_name + my $subject; + while(<CSRTEXT>) + { +- $subject = $1 if m/Subject:.+?CN=([-\.\w]+)/ ++ $subject = $1 if m/Subject:.+?CN\s?=\s?([-\.\w]+)/ + } + close CSRTEXT; + diff --git a/debian/patches/07-fix-ftbfs-signed-char.diff b/debian/patches/07-fix-ftbfs-signed-char.diff new file mode 100644 index 00000000..559fb314 --- /dev/null +++ b/debian/patches/07-fix-ftbfs-signed-char.diff @@ -0,0 +1,11 @@ +--- a/lib/httpserver/cdecode.cpp ++++ b/lib/httpserver/cdecode.cpp +@@ -12,7 +12,7 @@ extern "C" + + int base64_decode_value(char value_in) + { +- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; ++ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; + static const char decoding_size = sizeof(decoding); + value_in -= 43; + if (value_in < 0 || value_in > decoding_size) return -1; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..a03c1985 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +03-adjust-syslog-facility.diff +05-dont_use_net_for_docs.diff +06-fixup-bbstored-certs.diff +07-fix-ftbfs-signed-char.diff |