Initial import

3 files changed, 79 insertions, 0 deletions

diff --git a/service-quasselcore/package.accept_keywords/20-quasselcore b/service-quasselcore/package.accept_keywords/20-quasselcore
new file mode 100644
index 0000000..335cb21
--- /dev/null
+++ b/service-quasselcore/package.accept_keywords/20-quasselcore
@@ -0,0 +1 @@
+net-irc/quassel
diff --git a/service-quasselcore/package.use/20-quasselcore b/service-quasselcore/package.use/20-quasselcore
new file mode 100644
index 0000000..fbab642
--- /dev/null
+++ b/service-quasselcore/package.use/20-quasselcore
@@ -0,0 +1,3 @@
+net-irc/quassel syslog postgres
+
+dev-qt/qtsql postgres
diff --git a/service-quasselcore/patches/net-irc/quassel/syslog-fixes.patch b/service-quasselcore/patches/net-irc/quassel/syslog-fixes.patch
new file mode 100644
index 0000000..d687355
--- /dev/null
+++ b/service-quasselcore/patches/net-irc/quassel/syslog-fixes.patch
@@ -0,0 +1,75 @@
+From 88ae37a3059f906e397aa49ee3b204e16f24ab87 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <vehk@vehk.de>
+Date: Fri, 11 Jan 2019 16:45:52 +0000
+Subject: [PATCH] logger: Make output to syslog nicer
+
+---
+ src/common/logger.cpp | 41 ++++++++++++++++++++++++-----------------
+ 1 file changed, 24 insertions(+), 17 deletions(-)
+
+diff --git a/src/common/logger.cpp b/src/common/logger.cpp
+index b37abc29c..697d090c1 100644
+--- a/src/common/logger.cpp
++++ b/src/common/logger.cpp
+@@ -106,6 +106,10 @@ void Logger::setup(bool keepMessages)
+ 
+ #ifdef HAVE_SYSLOG
+     _syslogEnabled = Quassel::isOptionSet("syslog");
++
++    // set up options, program name, and facility for later calls to syslog(3)
++    if (_syslogEnabled)
++        openlog("quasselcore", LOG_PID, LOG_USER);
+ #endif
+ 
+     _initialized = true;
+@@ -149,22 +153,25 @@ void Logger::handleMessage(LogLevel level, const QString& msg)
+ {
+     QString logString;
+ 
+-    switch (level) {
+-    case LogLevel::Debug:
+-        logString = "[Debug] ";
+-        break;
+-    case LogLevel::Info:
+-        logString = "[Info ] ";
+-        break;
+-    case LogLevel::Warning:
+-        logString = "[Warn ] ";
+-        break;
+-    case LogLevel::Error:
+-        logString = "[Error] ";
+-        break;
+-    case LogLevel::Fatal:
+-        logString = "[FATAL] ";
+-        break;
++    // Only add the log level to the message if we do not output to syslog
++    if (!_syslogEnabled) {
++        switch (level) {
++        case LogLevel::Debug:
++            logString = "[Debug] ";
++            break;
++        case LogLevel::Info:
++            logString = "[Info ] ";
++            break;
++        case LogLevel::Warning:
++            logString = "[Warn ] ";
++            break;
++        case LogLevel::Error:
++            logString = "[Error] ";
++            break;
++        case LogLevel::Fatal:
++            logString = "[FATAL] ";
++            break;
++        }
+     }
+ 
+     // Use signal connection to make this method thread-safe
+@@ -208,7 +215,7 @@ void Logger::outputMessage(const LogEntry& message)
+         case LogLevel::Fatal:
+             prio = LOG_CRIT;
+         }
+-        syslog(prio|LOG_USER, "%s", qPrintable(message.message));
++        syslog(prio, "%s", qPrintable(message.message));
+     }
+ #endif
+