This is an automated email from the git hooks/post-receive script. tiber-guest pushed a commit to branch master in repository vdr-plugin-vdrmanager.
commit 56038e627ec4ff428503f4d7a969034e874ee777 Author: etobi <[email protected]> Date: Sat Feb 14 00:28:58 2015 +0100 Imported Upstream version 0.12+git20150213 --- .gitignore | 10 ---------- .settings/de.loskutov.anyedit.AnyEditTools.prefs | 16 ---------------- .settings/language.settings.xml | 11 ----------- .settings/org.eclipse.ltk.core.refactoring.prefs | 2 -- helpers.cpp | 2 +- serversock.cpp | 3 ++- vdrmanager.cpp | 4 ++-- 7 files changed, 5 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0368644..0000000 --- a/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/clientsock.o -/compressor.o -/handler.o -/helpers.o -/libvdr-vdrmanager.so -/select.o -/serversock.o -/sock.o -/vdrmanager.o -/vdrmanagerthread.o diff --git a/.settings/de.loskutov.anyedit.AnyEditTools.prefs b/.settings/de.loskutov.anyedit.AnyEditTools.prefs deleted file mode 100644 index 09266be..0000000 --- a/.settings/de.loskutov.anyedit.AnyEditTools.prefs +++ /dev/null @@ -1,16 +0,0 @@ -activeContentFilterList=*.makefile,makefile,*.Makefile,Makefile,Makefile.*,*.mk,MANIFEST.MF -addNewLine=true -convertActionOnSaave=AnyEdit.CnvrtTabToSpaces -eclipse.preferences.version=1 -ignoreBlankLinesWhenTrimming=false -inActiveContentFilterList= -javaTabWidthForJava=true -org.eclipse.jdt.ui.editor.tab.width=2 -projectPropsEnabled=false -removeTrailingSpaces=true -replaceAllSpaces=false -replaceAllTabs=false -saveAndAddLine=false -saveAndConvert=false -saveAndTrim=true -useModulo4Tabs=false diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml deleted file mode 100644 index 11a2c83..0000000 --- a/.settings/language.settings.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project> - <configuration id="cdt.managedbuild.toolchain.gnu.base.189548183" name="Default"> - <extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> - <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> - <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(gcc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/> - <provider-reference id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" ref="shared-provider"/> - <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> - </extension> - </configuration> -</project> diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64..0000000 --- a/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/helpers.cpp b/helpers.cpp index c6d819d..cc9dedb 100644 --- a/helpers.cpp +++ b/helpers.cpp @@ -694,7 +694,7 @@ string cHelpers::ToText(cRecording * recording) { result += MapSpecialChars(event->Title()); #endif } else { - result += recording->Name(); + result += MapSpecialChars(recording->Name()); } result += ":"; diff --git a/serversock.cpp b/serversock.cpp index e118b0b..0cd9f1f 100644 --- a/serversock.cpp +++ b/serversock.cpp @@ -87,7 +87,7 @@ bool cVdrmanagerServerSocket::Create(int port, const char * password, bool force SSL_load_error_strings(); SSL_library_init(); - const SSL_METHOD * method = SSLv23_server_method(); + SSL_METHOD * method = (SSL_METHOD *)SSLv23_server_method(); sslCtx = SSL_CTX_new(method); if (sslCtx == NULL) { long errorCode = ERR_get_error(); @@ -96,6 +96,7 @@ bool cVdrmanagerServerSocket::Create(int port, const char * password, bool force Close(); return false; } + SSL_CTX_set_options(sslCtx, SSL_OP_NO_SSLv3); /* set the local certificate from CertFile */ SSL_CTX_use_certificate_file(sslCtx, certFile, SSL_FILETYPE_PEM); diff --git a/vdrmanager.cpp b/vdrmanager.cpp index 10dc2b5..de1fbe3 100644 --- a/vdrmanager.cpp +++ b/vdrmanager.cpp @@ -35,8 +35,8 @@ #endif #define VDRMANAGER_ARGS VDRMANAGER_ARGS_COMMON VDRMANAGER_ARGS_SSL VDRMANAGER_ARGS_COMPRESS -static const char *VERSION = "0.12"; -static const char *DESCRIPTION = "VDR-Manager support plugin"; +static const char *VERSION = "0.13"; +static const char *DESCRIPTION = "VDR-Manager plugin"; class cVdrManager: public cPlugin { private: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-vdrmanager.git _______________________________________________ pkg-vdr-dvb-changes mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-vdr-dvb-changes
