smani pushed to sflphone (master). "Add patch to fix incorrect conditional in SipTransport::createTlsListener"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri May 15 15:47:48 UTC 2015


From 83e60c11e3c9a4b9ad9588975ec446d68004ca6b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Fri, 15 May 2015 17:47:15 +0200
Subject: Add patch to fix incorrect conditional in
 SipTransport::createTlsListener


diff --git a/sflphone.spec b/sflphone.spec
index a832210..2a4047b 100644
--- a/sflphone.spec
+++ b/sflphone.spec
@@ -1,6 +1,6 @@
 Name:           sflphone
 Version:        1.4.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        SIP/IAX2 compatible enterprise-class software phone
 
 License:        GPLv3+
@@ -23,6 +23,8 @@ Patch4:         sflphone_novideo.patch
 Patch5:         sflphone_gcc5.patch
 # Install sflphoned in libexecdir
 Patch6:         sflphone_sflphoned-dir.patch
+# Fix incorrect conditional in SipTransport::createTlsListener
+Patch7:         sflphone_tls.patch
 
 # Because of pjproject arm endianness detection issues
 %if 0%{?fedora} < 22
@@ -175,6 +177,7 @@ This package includes the development files for the KDE client.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # Unbundle bundled libraries
 %if 0%{?fedora} >= 22
@@ -313,6 +316,9 @@ fi
 
 
 %changelog
+* Fri May 15 2015 Sandro Mani <manisandro at gmail.com> - 1.4.1-10
+- Add patch to fix incorrect conditional in SipTransport::createTlsListener
+
 * Wed May 06 2015 Sandro Mani <manisandro at gmail.com> - 1.4.1-9
 - Install sflphoned in /usr/libexec
 - Rename sflphone-libs -> sflphone-daemon
diff --git a/sflphone_tls.patch b/sflphone_tls.patch
new file mode 100644
index 0000000..2fbe526
--- /dev/null
+++ b/sflphone_tls.patch
@@ -0,0 +1,12 @@
+diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp
+--- sflphone-1.4.1/daemon/src/sip/siptransport.cpp	2014-09-19 18:09:33.000000000 +0200
++++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp	2015-05-15 16:31:17.575239534 +0200
+@@ -254,7 +254,7 @@ SipTransport::createTlsListener(SIPAccou
+ 
+     listeningAddress.setPort(account.getTlsListenerPort());
+ 
+-    RETURN_IF_FAIL(not listeningAddress, nullptr, "Could not determine IP address for this transport");
++    RETURN_IF_FAIL(listeningAddress, nullptr, "Could not determine IP address for this transport");
+ 
+     DEBUG("Creating Listener on %s...", listeningAddress.toString(true).c_str());
+     DEBUG("CRT file : %s", account.getTlsSetting()->ca_list_file.ptr);
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/sflphone.git/commit/?h=master&id=83e60c11e3c9a4b9ad9588975ec446d68004ca6b


More information about the scm-commits mailing list