[Pkg-voip-commits] r10697 - in /ptlib/branches/ptlib2.10-luyten/debian: changelog copyright patches/no-sslv3 patches/series

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Fri Nov  6 17:39:06 2015
New Revision: 10697

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10697
Log:
* patches/no-sslv3: Fix FTBFS with recent libssl library without SSL v3 support
* Update debian/copyright file, thanks Scott Kitterman

Added:
    ptlib/branches/ptlib2.10-luyten/debian/patches/no-sslv3
Modified:
    ptlib/branches/ptlib2.10-luyten/debian/changelog
    ptlib/branches/ptlib2.10-luyten/debian/copyright
    ptlib/branches/ptlib2.10-luyten/debian/patches/series

Modified: ptlib/branches/ptlib2.10-luyten/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib2.10-luyten/debian/changelog?rev=10697&op=diff
==============================================================================
--- ptlib/branches/ptlib2.10-luyten/debian/changelog	(original)
+++ ptlib/branches/ptlib2.10-luyten/debian/changelog	Fri Nov  6 17:39:06 2015
@@ -1,3 +1,10 @@
+ptlib (2.10.11~dfsg-2) unstable; urgency=low
+
+  * patches/no-sslv3: Fix FTBFS with recent libssl library without SSL v3 support
+  * Update debian/copyright file, thanks Scott Kitterman
+
+ -- Eugen Dedu <eugen.dedu at univ-fcomte.fr>  Fri, 6 Nov 2015 18:35:49 +0200
+
 ptlib (2.10.11~dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: ptlib/branches/ptlib2.10-luyten/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib2.10-luyten/debian/copyright?rev=10697&op=diff
==============================================================================
--- ptlib/branches/ptlib2.10-luyten/debian/copyright	(original)
+++ ptlib/branches/ptlib2.10-luyten/debian/copyright	Fri Nov  6 17:39:06 2015
@@ -7,16 +7,15 @@
 Heavily modified by
 	Santiago Garcia Mantinan <manty at debian.org>
 Further modified by
-        Tim Johann <t1m at phrogstar.de>
-        and
-        Kilian Krause <kk at verfaction.de>
+    Tim Johann <t1m at phrogstar.de>
+    Kilian Krause <kk at verfaction.de>
 Currently mantained by
+    Eugen Dedu <eugen.dedu at univ-fcomte.fr>
 	Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-        and    Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
 
 The sources were downloaded from:
 
-    http://ftp.gnome.org/pub/gnome/sources/ptlib/2.6/
+    http://ftp.gnome.org/pub/gnome/sources/ptlib/2.10/
 
 Copyright:
 
@@ -24,6 +23,30 @@
 Copyright (c) 2001-2005 Post Increment
 Copyright (c) 1984, 1989, 1990, 1993 Free Software Foundation, Inc.
 
+Copyright (c) 2009-2011 Vox Lucida Pty. Ltd.
+	include/ptlib/wxstring.h
+	include/ptclib/vcard.h
+	ptlib.dxy
+	samples/strtest/main.cxx
+	samples/httptest/httptest.cxx
+	samples/vcard/vcard_test.cxx
+	samples/url/url_test.cxx
+	src/ptclib/vcard.cxx
+	tools/svn_getrev/svn_getrev.cpp
+Copyright (c) 2005-2006 Indranet Technologies Ltd.
+	samples/safetest/overview.cxx
+	samples/safetest/main.cxx
+	samples/ptimer/main.h
+	samples/ptimer/Makefile
+	samples/ptimer/main.cxx
+	samples/StringTest/main.h
+	samples/StringTest/Makefile
+	samples/StringTest/main.cxx
+	samples/xmppconsole/Makefile
+	samples/md5/encrypt.cxx
+	samples/md5/Makefile
+Copyright (c) 2007 Derek J Smithies, Indranet Technologies Ltd
+	samples/emailtest/Makefile
 Copyright (c) 2004 Reitek S.p.A.
 	src/ptlib/common/notifier_ext.cxx
 	include/ptclib/psasl.h

Added: ptlib/branches/ptlib2.10-luyten/debian/patches/no-sslv3
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib2.10-luyten/debian/patches/no-sslv3?rev=10697&op=file
==============================================================================
--- ptlib/branches/ptlib2.10-luyten/debian/patches/no-sslv3	(added)
+++ ptlib/branches/ptlib2.10-luyten/debian/patches/no-sslv3	Fri Nov  6 17:39:06 2015
@@ -0,0 +1,15 @@
+--- ptlib-2.10.10~dfsg.orig/src/ptclib/pssl.cxx	2015-11-06 18:02:56.367543788 +0100
++++ ptlib-2.10.10~dfsg/src/ptclib/pssl.cxx	2015-11-06 18:04:10.719376101 +0100
+@@ -805,9 +805,12 @@
+   SSL_METHOD * meth;
+ 
+   switch (method) {
++#ifndef OPENSSL_NO_SSL3
++    // fall through to SSLv23_method if unsupported
+     case SSLv3:
+       meth = SSLv3_method();
+       break;
++#endif
+     case TLSv1:
+       meth = TLSv1_method(); 
+       break;

Modified: ptlib/branches/ptlib2.10-luyten/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib2.10-luyten/debian/patches/series?rev=10697&op=diff
==============================================================================
--- ptlib/branches/ptlib2.10-luyten/debian/patches/series	(original)
+++ ptlib/branches/ptlib2.10-luyten/debian/patches/series	Fri Nov  6 17:39:06 2015
@@ -2,3 +2,4 @@
 bison-fix
 ppc64el-arm64-mips64.diff
 gcc-5_support
+no-sslv3