From 269f9e0daf7a54e0f2116c0e2173e763a3575556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 25 Nov 2016 09:21:27 +0100 Subject: Do not fail to build if litesql is not there --- src/main.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 019dff0..488032d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,7 +12,9 @@ #include #include -#include +#ifdef USE_DATABASE +# include +#endif // A flag set by the SIGINT signal handler. static std::atomic stop(false); @@ -83,11 +85,14 @@ int main(int ac, char** av) if (hostname.empty()) return config_help("hostname"); + +#ifdef USE_DATABASE try { - open_database(); - } catch (const litesql::DatabaseError&) { - return 1; - } + open_database(); + } catch (const litesql::DatabaseError&) { + return 1; + } +#endif // Block the signals we want to manage. They will be unblocked only during // the epoll_pwait or ppoll calls. This avoids some race conditions, -- cgit v1.2.3 From 98278421211052a7cb2e1c7380618b85b57b90c6 Mon Sep 17 00:00:00 2001 From: Vinilox Date: Fri, 31 Mar 2017 14:40:17 +0200 Subject: =?UTF-8?q?Fix=20typo=20in=20CHANGELOG.rst=20biboumi=20=E2=86=92?= =?UTF-8?q?=20botan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 349a9c3..152eb01 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Version 4.1 - 2017-03-21 ======================== - - Works with biboumi 2.x, as well as biboumi 1.11.x + - Works with botan 2.x, as well as botan 1.11.x Version 4.0 - 2016-11-09 ======================== -- cgit v1.2.3 From 9db89eb8b0daada627f1c5b934e5407d37888371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Wed, 26 Apr 2017 20:56:01 +0200 Subject: Release version 4.2 --- CHANGELOG.rst | 5 +++++ CMakeLists.txt | 2 +- packaging/biboumi.spec.cmake | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 152eb01..8a2c55d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,8 @@ +Version 4.2 - 2017-04-26 +======================== + + - Fix a build issue when LiteSQL is absent from the system + Version 4.1 - 2017-03-21 ======================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 9575cbd..be11e64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project(biboumi) set(${PROJECT_NAME}_VERSION_MAJOR 4) -set(${PROJECT_NAME}_VERSION_MINOR 1) +set(${PROJECT_NAME}_VERSION_MINOR 2) set(${PROJECT_NAME}_VERSION_SUFFIX "") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -pedantic -Wall -Wextra") diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index c180180..8c34bd6 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -59,6 +59,9 @@ make check %{?_smp_mflags} %changelog +* Wed Apr 26 2017 Le Coz Florent - 4.2-1 +- Fix a build issue when LiteSQL is absent from the system + * Tue Mar 21 2017 Le Coz Florent - 4.1-1 - Update to 4.1 sources: compatibility with botan 2.0 -- cgit v1.2.3 From 25d46924bc2edd079d4d996d1d76d702d724341e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 2 May 2017 14:46:03 +0200 Subject: Fix a segmentation fault when connecting to a server without a port fix #3260 --- CHANGELOG.rst | 6 ++++++ CMakeLists.txt | 2 +- packaging/biboumi.spec.cmake | 4 ++++ src/irc/irc_client.cpp | 5 +++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8a2c55d..911dfa3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,9 @@ +Version 4.3 - 2017-05-02 +======================== + + - Fix a segmentation fault that occured when trying to connect to an IRC + server without any port configured. + Version 4.2 - 2017-04-26 ======================== diff --git a/CMakeLists.txt b/CMakeLists.txt index be11e64..ca5aa97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project(biboumi) set(${PROJECT_NAME}_VERSION_MAJOR 4) -set(${PROJECT_NAME}_VERSION_MINOR 2) +set(${PROJECT_NAME}_VERSION_MINOR 3) set(${PROJECT_NAME}_VERSION_SUFFIX "") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -pedantic -Wall -Wextra") diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index 8c34bd6..e4a1d3b 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -59,6 +59,10 @@ make check %{?_smp_mflags} %changelog +* Wed May 2 2017 Le Coz Florent - 4.3-1 +- Fix a segmentation fault that occured when trying to connect + to an IRC server without any port configured. + * Wed Apr 26 2017 Le Coz Florent - 4.2-1 - Fix a build issue when LiteSQL is absent from the system diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp index b0d3a47..de6b089 100644 --- a/src/irc/irc_client.cpp +++ b/src/irc/irc_client.cpp @@ -182,6 +182,11 @@ void IrcClient::start() { if (this->is_connecting() || this->is_connected()) return; + if (this->ports_to_try.empty()) + { + this->bridge.send_xmpp_message(this->hostname, "", "Can not connect to IRC server: no port specified."); + return; + } std::string port; bool tls; std::tie(port, tls) = this->ports_to_try.top(); -- cgit v1.2.3