[Pkg-voip-commits] r10594 - in /sflphone/trunk/debian: changelog patches/fix_tls.patch patches/pj_project_status.patch patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Fri Oct 31 05:11:32 2014
New Revision: 10594

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10594
Log:
ack NMU 1.4.1-0.1:

* New upstream release (closes: #759576, #741130)
  - fix_tls.patch: upstream patch to fix broken TLS support
  - pj_project_status.patch: fix pjproject regression

Added:
    sflphone/trunk/debian/patches/fix_tls.patch
    sflphone/trunk/debian/patches/pj_project_status.patch
Modified:
    sflphone/trunk/debian/changelog
    sflphone/trunk/debian/patches/series

Modified: sflphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/changelog?rev=10594&op=diff
==============================================================================
--- sflphone/trunk/debian/changelog	(original)
+++ sflphone/trunk/debian/changelog	Fri Oct 31 05:11:32 2014
@@ -1,15 +1,19 @@
-sflphone (1.4.0-1) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
-  * New upstream release
+sflphone (1.4.1-0.1) unstable; urgency=medium
+
+  [ Francois Marier ]
+  * Non-maintainer upload
+  * New upstream release (closes: #759576, #741130)
     - debian/rules +PJPROJECT_VERSION := 2.2.1
-  * Build-Depends: 
+    - add upstream patch to fix broken TLS support
+    - add patch to fix pjproject regression
+
+  [ Mark Purcell ]
+  * Build-Depends:
     - sflphone-daemon + libavformat-dev, libavcodec-dev, libswscale-dev,
     libavdevice-dev, libavutil-dev
     - sflphone-gnome + libclutter-gtk-1.0-dev
 
- -- Mark Purcell <msp at debian.org>  Sat, 19 Jul 2014 09:20:18 +1000
+ -- Francois Marier <francois at debian.org>  Sat, 18 Oct 2014 15:08:50 +1300
 
 sflphone (1.3.0-1) unstable; urgency=medium
 

Added: sflphone/trunk/debian/patches/fix_tls.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/patches/fix_tls.patch?rev=10594&op=file
==============================================================================
--- sflphone/trunk/debian/patches/fix_tls.patch	(added)
+++ sflphone/trunk/debian/patches/fix_tls.patch	Fri Oct 31 05:11:32 2014
@@ -0,0 +1,18 @@
+Author: Emmanuel Lepage Vallee <emmanuel.lepage at savoirfairelinux.com>
+Origin: upstream, commit:3f5f6828507b3219dd6323a98b78631e9e395c2f
+Last-Update: 2014-10-18
+Forwarded: not-needed
+Description: TLS: fix transport creation
+Bug: https://projects.savoirfairelinux.com/issues/55748
+
+--- a/daemon/src/sip/siptransport.cpp
++++ b/daemon/src/sip/siptransport.cpp
+@@ -254,7 +254,7 @@ SipTransport::createTlsListener(SIPAccount &account, pj_uint16_t family)
+ 
+     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);

Added: sflphone/trunk/debian/patches/pj_project_status.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/patches/pj_project_status.patch?rev=10594&op=file
==============================================================================
--- sflphone/trunk/debian/patches/pj_project_status.patch	(added)
+++ sflphone/trunk/debian/patches/pj_project_status.patch	Fri Oct 31 05:11:32 2014
@@ -0,0 +1,15 @@
+diff --git a/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c b/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
+index 66ae236..36d8bb4 100644
+--- a/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
++++ b/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
+@@ -33,9 +33,9 @@ PJ_DEF(pj_status_t)
+ pjmedia_codec_register_audio_codecs(pjmedia_endpt *endpt,
+                                     const pjmedia_audio_codec_config *c)
+ {
++    pj_status_t status;
+     pjmedia_audio_codec_config default_cfg;
+ #if PJMEDIA_HAS_PASSTHROUGH_CODECS
+-    pj_status_t status;
+ #endif
+ 
+     PJ_ASSERT_RETURN(endpt, PJ_EINVAL);

Modified: sflphone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/patches/series?rev=10594&op=diff
==============================================================================
--- sflphone/trunk/debian/patches/series	(original)
+++ sflphone/trunk/debian/patches/series	Fri Oct 31 05:11:32 2014
@@ -1 +1,3 @@
 02_target_s390.patch
+fix_tls.patch
+pj_project_status.patch