Accepting request 298181 from home:michalsrb:branches:X11:XOrg
- u_syslog.patch, vnc.xinetd * Add logging to syslog. OBS-URL: https://build.opensuse.org/request/show/298181 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=56
This commit is contained in:
Git OBS Bridge
parent
bb690495b1
commit
3e10cb5fe2
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 20 12:10:10 UTC 2015 - msrb@suse.com
|
||||
|
||||
- u_syslog.patch, vnc.xinetd
|
||||
* Add logging to syslog.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 15 10:39:07 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -113,6 +113,7 @@ Patch10: u_tigervnc-build-with-xserver-1.17.patch
|
||||
Patch11: u_terminate_instead_of_ignoring_restart.patch
|
||||
# Require and build against gnutls 3.x
|
||||
Patch12: tigervnc-gnutls-3.4-required.patch
|
||||
Patch13: u_syslog.patch
|
||||
|
||||
%description
|
||||
TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing),
|
||||
@ -146,6 +147,7 @@ cp -r /usr/src/xserver/* unix/xserver/
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
|
||||
pushd unix/xserver
|
||||
patch -p1 < ../xserver116.patch
|
||||
|
||||
196
u_syslog.patch
Normal file
196
u_syslog.patch
Normal file
@ -0,0 +1,196 @@
|
||||
Author: Michal Srb <msrb@suse.com>
|
||||
Subject: Syslog logging
|
||||
Patch-Mainline: To be upstreamed
|
||||
|
||||
Index: tigervnc-1.4.1/common/rfb/CMakeLists.txt
|
||||
===================================================================
|
||||
--- tigervnc-1.4.1.orig/common/rfb/CMakeLists.txt
|
||||
+++ tigervnc-1.4.1/common/rfb/CMakeLists.txt
|
||||
@@ -29,6 +29,7 @@ set(RFB_SOURCES
|
||||
Logger.cxx
|
||||
Logger_file.cxx
|
||||
Logger_stdio.cxx
|
||||
+ Logger_syslog.cxx
|
||||
Password.cxx
|
||||
PixelBuffer.cxx
|
||||
PixelFormat.cxx
|
||||
Index: tigervnc-1.4.1/common/rfb/LogWriter.h
|
||||
===================================================================
|
||||
--- tigervnc-1.4.1.orig/common/rfb/LogWriter.h
|
||||
+++ tigervnc-1.4.1/common/rfb/LogWriter.h
|
||||
@@ -68,10 +68,15 @@ namespace rfb {
|
||||
}
|
||||
}
|
||||
|
||||
- DEF_LOGFUNCTION(error, 0)
|
||||
- DEF_LOGFUNCTION(status, 10)
|
||||
- DEF_LOGFUNCTION(info, 30)
|
||||
- DEF_LOGFUNCTION(debug, 100)
|
||||
+ static const int LEVEL_ERROR = 0;
|
||||
+ static const int LEVEL_STATUS = 10;
|
||||
+ static const int LEVEL_INFO = 30;
|
||||
+ static const int LEVEL_DEBUG = 100;
|
||||
+
|
||||
+ DEF_LOGFUNCTION(error, LEVEL_ERROR)
|
||||
+ DEF_LOGFUNCTION(status, LEVEL_STATUS)
|
||||
+ DEF_LOGFUNCTION(info, LEVEL_INFO)
|
||||
+ DEF_LOGFUNCTION(debug, LEVEL_DEBUG)
|
||||
|
||||
// -=- DIAGNOSTIC & HELPER ROUTINES
|
||||
|
||||
Index: tigervnc-1.4.1/common/rfb/Logger_syslog.cxx
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ tigervnc-1.4.1/common/rfb/Logger_syslog.cxx
|
||||
@@ -0,0 +1,65 @@
|
||||
+/* Copyright (C) 2015 TigerVNC
|
||||
+ *
|
||||
+ * This is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * This software is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this software; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
+ * USA.
|
||||
+ */
|
||||
+
|
||||
+// -=- Logger_syslog.cxx - Logger instance for a syslog
|
||||
+
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
+#include <syslog.h>
|
||||
+
|
||||
+#include <rfb/util.h>
|
||||
+#include <rfb/Logger_syslog.h>
|
||||
+#include <rfb/LogWriter.h>
|
||||
+#include <rfb/Threading.h>
|
||||
+
|
||||
+using namespace rfb;
|
||||
+
|
||||
+
|
||||
+Logger_Syslog::Logger_Syslog(const char* loggerName)
|
||||
+ : Logger(loggerName)
|
||||
+{
|
||||
+ openlog("Xvnc", LOG_CONS | LOG_PID, LOG_USER);
|
||||
+}
|
||||
+
|
||||
+Logger_Syslog::~Logger_Syslog()
|
||||
+{
|
||||
+ closelog();
|
||||
+}
|
||||
+
|
||||
+void Logger_Syslog::write(int level, const char *logname, const char *message)
|
||||
+{
|
||||
+ // Convert our priority level into syslog level
|
||||
+ int priority;
|
||||
+ if (level >= LogWriter::LEVEL_DEBUG) {
|
||||
+ priority = LOG_DEBUG;
|
||||
+ } else if (level >= LogWriter::LEVEL_INFO) {
|
||||
+ priority = LOG_INFO;
|
||||
+ } else if (level >= LogWriter::LEVEL_STATUS) {
|
||||
+ priority = LOG_NOTICE;
|
||||
+ } else {
|
||||
+ priority = LOG_ERR;
|
||||
+ }
|
||||
+
|
||||
+ syslog(priority, "%s: %s", logname, message);
|
||||
+}
|
||||
+
|
||||
+static Logger_Syslog logger("syslog");
|
||||
+
|
||||
+void rfb::initSyslogLogger() {
|
||||
+ logger.registerLogger();
|
||||
+}
|
||||
Index: tigervnc-1.4.1/common/rfb/Logger_syslog.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ tigervnc-1.4.1/common/rfb/Logger_syslog.h
|
||||
@@ -0,0 +1,40 @@
|
||||
+/* Copyright (C) 2015 TigerVNC
|
||||
+ *
|
||||
+ * This is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * This software is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this software; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
+ * USA.
|
||||
+ */
|
||||
+
|
||||
+// -=- Logger_syslog - log to syslog
|
||||
+
|
||||
+#ifndef __RFB_LOGGER_SYSLOG_H__
|
||||
+#define __RFB_LOGGER_SYSLOG_H__
|
||||
+
|
||||
+#include <time.h>
|
||||
+#include <rfb/Logger.h>
|
||||
+
|
||||
+namespace rfb {
|
||||
+
|
||||
+ class Logger_Syslog : public Logger {
|
||||
+ public:
|
||||
+ Logger_Syslog(const char* loggerName);
|
||||
+ virtual ~Logger_Syslog();
|
||||
+
|
||||
+ virtual void write(int level, const char *logname, const char *message);
|
||||
+ };
|
||||
+
|
||||
+ void initSyslogLogger();
|
||||
+};
|
||||
+
|
||||
+#endif
|
||||
Index: tigervnc-1.4.1/unix/xserver/hw/vnc/Xvnc.man
|
||||
===================================================================
|
||||
--- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/Xvnc.man
|
||||
+++ tigervnc-1.4.1/unix/xserver/hw/vnc/Xvnc.man
|
||||
@@ -274,11 +274,11 @@ stop non-SSH connections from any other
|
||||
.
|
||||
.TP
|
||||
.B \-Log \fIlogname\fP:\fIdest\fP:\fIlevel\fP
|
||||
-Configures the debug log settings. \fIdest\fP can currently be \fBstderr\fP or
|
||||
-\fBstdout\fP, and \fIlevel\fP is between 0 and 100, 100 meaning most verbose
|
||||
-output. \fIlogname\fP is usually \fB*\fP meaning all, but you can target a
|
||||
-specific source file if you know the name of its "LogWriter". Default is
|
||||
-\fB*:stderr:30\fP.
|
||||
+Configures the debug log settings. \fIdest\fP can currently be \fBstderr\fP,
|
||||
+\fBstdout\fP or \fBsyslog\fP, and \fIlevel\fP is between 0 and 100, 100 meaning
|
||||
+most verbose output. \fIlogname\fP is usually \fB*\fP meaning all, but you can
|
||||
+target a specific source file if you know the name of its "LogWriter". Default
|
||||
+is \fB*:stderr:30\fP.
|
||||
.
|
||||
.TP
|
||||
.B \-RemapKeys \fImapping
|
||||
Index: tigervnc-1.4.1/unix/xserver/hw/vnc/xvnc.cc
|
||||
===================================================================
|
||||
--- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/xvnc.cc
|
||||
+++ tigervnc-1.4.1/unix/xserver/hw/vnc/xvnc.cc
|
||||
@@ -34,6 +34,7 @@ from the X Consortium.
|
||||
|
||||
#include <rfb/Configuration.h>
|
||||
#include <rfb/Logger_stdio.h>
|
||||
+#include <rfb/Logger_syslog.h>
|
||||
#include <rfb/LogWriter.h>
|
||||
#include <network/TcpSocket.h>
|
||||
#include "vncExtInit.h"
|
||||
@@ -376,6 +377,7 @@ ddxProcessArgument(int argc, char *argv[
|
||||
vfbInitializePixmapDepths();
|
||||
firstTime = FALSE;
|
||||
rfb::initStdIOLoggers();
|
||||
+ rfb::initSyslogLogger();
|
||||
rfb::LogWriter::setLogParams("*:stderr:30");
|
||||
rfb::Configuration::enableServerParams();
|
||||
}
|
||||
@ -10,7 +10,7 @@ service vnc1
|
||||
wait = no
|
||||
user = nobody
|
||||
server = /usr/bin/Xvnc
|
||||
server_args = -noreset -inetd -once -query localhost -geometry 1024x768 -securitytypes none
|
||||
server_args = -noreset -inetd -once -query localhost -geometry 1024x768 -securitytypes none -log *:syslog:30
|
||||
disable = yes
|
||||
}
|
||||
# default: off
|
||||
@ -25,7 +25,7 @@ service vnc2
|
||||
wait = no
|
||||
user = nobody
|
||||
server = /usr/bin/Xvnc
|
||||
server_args = -noreset -inetd -once -query localhost -geometry 1280x1024 -securitytypes none
|
||||
server_args = -noreset -inetd -once -query localhost -geometry 1280x1024 -securitytypes none -log *:syslog:30
|
||||
disable = yes
|
||||
}
|
||||
# default: off
|
||||
@ -40,7 +40,7 @@ service vnc3
|
||||
wait = no
|
||||
user = nobody
|
||||
server = /usr/bin/Xvnc
|
||||
server_args = -noreset -inetd -once -query localhost -geometry 1600x1200 -securitytypes none
|
||||
server_args = -noreset -inetd -once -query localhost -geometry 1600x1200 -securitytypes none -log *:syslog:30
|
||||
disable = yes
|
||||
}
|
||||
# default: off
|
||||
|
||||
Loading…
Reference in New Issue
Block a user