[Pkg-voip-commits] r10396 - in /libexosip2/trunk/debian: ./ manpages/ patches/
msp at alioth.debian.org
msp at alioth.debian.org
Mon Jan 20 10:48:55 UTC 2014
Author: msp
Date: Mon Jan 20 10:48:55 2014
New Revision: 10396
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10396
Log:
* New upstream release
* NEW package libexosip2-11 - match soname
* Fix "use dh-autoreconf instead of autotools-dev to fix FTBFS on
ppc64el" patch from ~logan (Closes: #735950)
* Fix "Upstream license exception required to enable linking with SSL"
Upstream exception added to debian/copyright (Closes: #688868)
* Add Build-Depends: libssl-dev
* quilt refresh
* Fix further spelling-error-in-manpage.patch
Added:
libexosip2/trunk/debian/libexosip2-11.install
- copied unchanged from r10395, libexosip2/trunk/debian/libexosip2-10.install
libexosip2/trunk/debian/libexosip2-11.lintian-overrides
libexosip2/trunk/debian/libexosip2-11.manpages
- copied unchanged from r10395, libexosip2/trunk/debian/libexosip2-10.manpages
libexosip2/trunk/debian/manpages/sip_reg-4.1.0.1
- copied unchanged from r10395, libexosip2/trunk/debian/manpages/sip_reg-4.0.0.1
Removed:
libexosip2/trunk/debian/libexosip2-10.install
libexosip2/trunk/debian/libexosip2-10.manpages
libexosip2/trunk/debian/manpages/sip_reg-4.0.0.1
Modified:
libexosip2/trunk/debian/changelog
libexosip2/trunk/debian/control
libexosip2/trunk/debian/copyright
libexosip2/trunk/debian/patches/spelling-error-in-binary.patch
libexosip2/trunk/debian/patches/spelling-error-in-manpage.patch
libexosip2/trunk/debian/rules
Modified: libexosip2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/changelog?rev=10396&op=diff
==============================================================================
--- libexosip2/trunk/debian/changelog (original)
+++ libexosip2/trunk/debian/changelog Mon Jan 20 10:48:55 2014
@@ -1,3 +1,17 @@
+libexosip2 (4.1.0-1) experimental; urgency=low
+
+ * New upstream release
+ * NEW package libexosip2-11 - match soname
+ * Fix "use dh-autoreconf instead of autotools-dev to fix FTBFS on
+ ppc64el" patch from ~logan (Closes: #735950)
+ * Fix "Upstream license exception required to enable linking with SSL"
+ Upstream exception added to debian/copyright (Closes: #688868)
+ * Add Build-Depends: libssl-dev
+ * quilt refresh
+ * Fix further spelling-error-in-manpage.patch
+
+ -- Mark Purcell <msp at debian.org> Mon, 20 Jan 2014 21:48:15 +1100
+
libexosip2 (4.0.0-4) unstable; urgency=low
* Standards-Version -> 3.9.4
Modified: libexosip2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/control?rev=10396&op=diff
==============================================================================
--- libexosip2/trunk/debian/control (original)
+++ libexosip2/trunk/debian/control Mon Jan 20 10:48:55 2014
@@ -2,10 +2,11 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Rene Mayorga <rmayorga at debian.org.sv>
-Build-Depends: debhelper (>= 9), autotools-dev, libncurses5-dev, libosip2-dev (>= 4), dpkg-dev (>= 1.13.19), doxygen
-Build-Conflicts: libssl-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.13.19), doxygen, pkg-config,
+ libosip2-dev (>= 4.1),
+ libncurses5-dev, libssl-dev
Section: libs
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://savannah.gnu.org/projects/exosip/
Vcs-Svn: svn://anonscm.debian.org/pkg-voip/libexosip2/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/libexosip2/trunk/
@@ -13,7 +14,7 @@
Package: libexosip2-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libexosip2-10 (= ${binary:Version}), libosip2-dev (>= 4)
+Depends: ${misc:Depends}, libexosip2-11 (= ${binary:Version}), libosip2-dev (>= 4.1)
Description: eXtended osip library development files
Hides the complexity of using the SIP protocol for multimedia
session establishment. This protocol is mainly to be used by VoIP
@@ -23,7 +24,7 @@
.
Development files for the eXtended osip library
-Package: libexosip2-10
+Package: libexosip2-11
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Modified: libexosip2/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/copyright?rev=10396&op=diff
==============================================================================
--- libexosip2/trunk/debian/copyright (original)
+++ libexosip2/trunk/debian/copyright Mon Jan 20 10:48:55 2014
@@ -32,3 +32,140 @@
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
+Certain source files in this program permit linking with the OpenSSL
+library (http://www.openssl.org), which otherwise wouldn't be allowed
+under the GPL. For purposes of identifying OpenSSL, most source files
+giving this permission limit it to versions of OpenSSL having a license
+identical to that listed in this file (LICENSE.OpenSSL). It is not
+necessary for the copyright years to match between this file and the
+OpenSSL version in question. However, note that because this file is
+an extension of the license statements of these source files, this file
+may not be changed except with permission from all copyright holders
+of source files in this program which reference this file.
+
+
+ LICENSE ISSUES
+ ==============
+
+ The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+ the OpenSSL License and the original SSLeay license apply to the toolkit.
+ See below for the actual license texts. Actually both licenses are BSD-style
+ Open Source licenses. In case of any license issues related to OpenSSL
+ please contact openssl-core at openssl.org.
+
+ OpenSSL License
+ ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com). This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay at cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to. The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh at cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * "This product includes cryptographic software written by
+ * Eric Young (eay at cryptsoft.com)"
+ * The word 'cryptographic' can be left out if the rouines from the library
+ * being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ * the apps directory (application code) you must include an acknowledgement:
+ * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed. i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
Added: libexosip2/trunk/debian/libexosip2-11.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/libexosip2-11.lintian-overrides?rev=10396&op=file
==============================================================================
--- libexosip2/trunk/debian/libexosip2-11.lintian-overrides (added)
+++ libexosip2/trunk/debian/libexosip2-11.lintian-overrides Mon Jan 20 10:48:55 2014
@@ -0,0 +1,2 @@
+# Upstream provides LICENSE.OpenSSL - included in debian/copyright
+possible-gpl-code-linked-with-openssl
Modified: libexosip2/trunk/debian/patches/spelling-error-in-binary.patch
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/patches/spelling-error-in-binary.patch?rev=10396&op=diff
==============================================================================
--- libexosip2/trunk/debian/patches/spelling-error-in-binary.patch (original)
+++ libexosip2/trunk/debian/patches/spelling-error-in-binary.patch Mon Jan 20 10:48:55 2014
@@ -1,11 +1,11 @@
Description: spelling-error-in-binary usr/bin/sip_reg-3.6.0 recieved received
Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html
-Index: libexosip2-4.0.0/tools/sip_reg.c
+Index: libexosip2-4.1.0/tools/sip_reg.c
===================================================================
---- libexosip2-4.0.0.orig/tools/sip_reg.c 2012-11-16 04:51:44.000000000 +1100
-+++ libexosip2-4.0.0/tools/sip_reg.c 2012-12-25 10:38:32.000000000 +1100
-@@ -368,7 +368,7 @@
+--- libexosip2-4.1.0.orig/tools/sip_reg.c 2014-01-07 05:30:21.000000000 +1100
++++ libexosip2-4.1.0/tools/sip_reg.c 2014-01-20 21:22:50.992386370 +1100
+@@ -361,7 +361,7 @@
regparam.auth = 1;
break;
default:
Modified: libexosip2/trunk/debian/patches/spelling-error-in-manpage.patch
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/patches/spelling-error-in-manpage.patch?rev=10396&op=diff
==============================================================================
--- libexosip2/trunk/debian/patches/spelling-error-in-manpage.patch (original)
+++ libexosip2/trunk/debian/patches/spelling-error-in-manpage.patch Mon Jan 20 10:48:55 2014
@@ -1,11 +1,28 @@
Description: spelling-error-in-manpage
Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-manpage.html
-Index: libexosip2-4.0.0/ChangeLog
+Index: libexosip2-4.1.0/ChangeLog
===================================================================
---- libexosip2-4.0.0.orig/ChangeLog 2012-12-11 04:02:25.000000000 +1100
-+++ libexosip2-4.0.0/ChangeLog 2012-12-25 10:33:41.000000000 +1100
-@@ -11,7 +11,7 @@
+--- libexosip2-4.1.0.orig/ChangeLog 2013-12-19 05:25:28.000000000 +1100
++++ libexosip2-4.1.0/ChangeLog 2014-01-20 21:45:03.738808874 +1100
+@@ -14,7 +14,7 @@
+ * minor expires for REGISTER improvments.
+ * copy call-info over SUBSCRIBE refresh.
+ * allow more TLS error if verification is disabled.
+- * fix if NO NAPTR is availble.
++ * fix if NO NAPTR is available.
+ * add support for Windows Phone 8.
+ * fix to use cache for TCP and TLS.
+ * fix possible leaks on implementation errors.
+@@ -26,14 +26,14 @@
+ * update to latest osip // test time compensation for android.
+ * use ephemaral port in standard TCP and TLS version.
+ * return tid number so that we can match the response event.
+- * use system independant time for osip_gettimeofday on unix platform.
++ * use system independent time for osip_gettimeofday on unix platform.
+ * major API update: several "struct eXosip_t" can be
+ handled at the same time. This can be used to have several
+ transport layer running at the same time.
* many tiny other change.
eXosip2 (3.6.0)
@@ -14,7 +31,7 @@
as well as improvments over DNS operation such as NAPTR and
SRV records.
* again, so many minor change/fix/improvments, sorry for not
-@@ -27,7 +27,7 @@
+@@ -49,7 +49,7 @@
eXosip2 (3.4.0)
* modification to allow using "windows certificate store" for TLS.
* handle keep alive for TCP/TLS.
@@ -23,10 +40,10 @@
* modification to allow non-blocking socket for reliable transport. (TLS/TCP)
* fix tag issue with application where tag is missing.
* fix compilation for mingw
-Index: libexosip2-4.0.0/help/doxygen/doxygen.dox.in
+Index: libexosip2-4.1.0/help/doxygen/doxygen.dox.in
===================================================================
---- libexosip2-4.0.0.orig/help/doxygen/doxygen.dox.in 2012-11-16 00:57:18.000000000 +1100
-+++ libexosip2-4.0.0/help/doxygen/doxygen.dox.in 2012-12-25 10:33:41.000000000 +1100
+--- libexosip2-4.1.0.orig/help/doxygen/doxygen.dox.in 2012-11-16 00:57:18.000000000 +1100
++++ libexosip2-4.1.0/help/doxygen/doxygen.dox.in 2014-01-20 21:43:46.260065372 +1100
@@ -40,14 +40,14 @@
*
* SIP is an IP telephony protocol made by the IETF.
@@ -44,11 +61,11 @@
* instant messaging, presence support and much more!
*
* @section what_freesoftware eXosip2 is free software
-Index: libexosip2-4.0.0/include/eXosip2/eX_setup.h
+Index: libexosip2-4.1.0/include/eXosip2/eX_setup.h
===================================================================
---- libexosip2-4.0.0.orig/include/eXosip2/eX_setup.h 2012-12-11 01:58:35.000000000 +1100
-+++ libexosip2-4.0.0/include/eXosip2/eX_setup.h 2012-12-25 10:33:41.000000000 +1100
-@@ -68,7 +68,7 @@
+--- libexosip2-4.1.0.orig/include/eXosip2/eX_setup.h 2014-01-07 05:30:21.000000000 +1100
++++ libexosip2-4.1.0/include/eXosip2/eX_setup.h 2014-01-20 21:45:36.778272992 +1100
+@@ -81,7 +81,7 @@
int eXosip_init (struct eXosip_t *excontext);
/**
@@ -57,20 +74,36 @@
*
* @param excontext eXosip_t instance.
*/
-@@ -272,7 +272,7 @@
- /**
- * Use IPv6 instead of IPv4.
+@@ -290,13 +290,13 @@
+ * Use IPv6 instead of IPv4. (global setting)
+ *
+ * DEPRECATED: you MUST use EXOSIP_OPT_ENABLE_IPV6 to configure each
+- * eXosip_t independantly.
++ * eXosip_t independently.
+ *
+ * **THIS CODE DOES NOTHING, REPLACE WITH**
+ *
+ * eXosip_set_option(excontext, EXOSIP_OPT_ENABLE_IPV6, &val);
*
- * @param ipv6_enable This paramter should be set to 1 to enable IPv6 mode.
+ * @param ipv6_enable This parameter should be set to 1 to enable IPv6 mode.
*/
void eXosip_enable_ipv6 (int ipv6_enable);
-Index: libexosip2-4.0.0/include/eXosip2/eXosip.h
+Index: libexosip2-4.1.0/include/eXosip2/eXosip.h
===================================================================
---- libexosip2-4.0.0.orig/include/eXosip2/eXosip.h 2012-11-16 01:59:44.000000000 +1100
-+++ libexosip2-4.0.0/include/eXosip2/eXosip.h 2012-12-25 10:33:41.000000000 +1100
-@@ -378,7 +378,7 @@
+--- libexosip2-4.1.0.orig/include/eXosip2/eXosip.h 2014-01-07 05:30:21.000000000 +1100
++++ libexosip2-4.1.0/include/eXosip2/eXosip.h 2014-01-20 21:44:02.259805919 +1100
+@@ -135,7 +135,7 @@
+ * Retry with credentials upon reception of 401/407.
+ * Retry with Contact header upon reception of 3xx request.
+ *
+- * Usefull & required when eXosip_automatic_action() can't do the automatic action:
++ * Useful & required when eXosip_automatic_action() can't do the automatic action:
+ * 1/ if you receive a 401 or 407 for BYE (event EXOSIP_CALL_MESSAGE_REQUESTFAILURE).
+ * 2/ if you receive 401 or 407 for any sip request outside of dialog (EXOSIP_MESSAGE_REQUESTFAILURE)
+ *
+@@ -391,7 +391,7 @@
};
/**
@@ -79,11 +112,11 @@
*
* @param je event to work on.
*/
-Index: libexosip2-4.0.0/src/eXcall_api.c
+Index: libexosip2-4.1.0/src/eXcall_api.c
===================================================================
---- libexosip2-4.0.0.orig/src/eXcall_api.c 2012-11-18 00:56:53.000000000 +1100
-+++ libexosip2-4.0.0/src/eXcall_api.c 2012-12-25 10:34:46.000000000 +1100
-@@ -1292,7 +1292,7 @@
+--- libexosip2-4.1.0.orig/src/eXcall_api.c 2014-01-07 05:30:21.000000000 +1100
++++ libexosip2-4.1.0/src/eXcall_api.c 2014-01-20 21:43:46.264065307 +1100
+@@ -1308,7 +1308,7 @@
osip_free (exp_h->element);
exp_h->element = osip_strdup (min_se_h->element);
@@ -92,3 +125,23 @@
osip_free (exp->hvalue);
exp->hvalue = NULL;
osip_content_disposition_to_str (exp_h, &exp->hvalue);
+Index: libexosip2-4.1.0/help/doxygen/ht0-initialize.dox
+===================================================================
+--- libexosip2-4.1.0.orig/help/doxygen/ht0-initialize.dox 2012-12-11 01:47:12.000000000 +1100
++++ libexosip2-4.1.0/help/doxygen/ht0-initialize.dox 2014-01-20 21:46:08.741754522 +1100
+@@ -260,7 +260,7 @@
+
+ If NAPTR is not set for the service you used which happens in many
+ case, SRV record or normal DNS will be used as a fallback. It should
+-not slow too much the procedure. However, it is still usefull in
++not slow too much the procedure. However, it is still useful in
+ some case to disable NAPTR because there still exist a few DNS server
+ that remains silent when sending NAPTR request. In that very specific
+ use-case, this may lead to very slow fallback to normal DNS...
+@@ -396,4 +396,4 @@
+ }
+ ~~~~~~~
+
+-*/
+\ No newline at end of file
++*/
Modified: libexosip2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/rules?rev=10396&op=diff
==============================================================================
--- libexosip2/trunk/debian/rules (original)
+++ libexosip2/trunk/debian/rules Mon Jan 20 10:48:55 2014
@@ -4,7 +4,7 @@
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
%:
- dh $@ --parallel --with autotools_dev
+ dh $@ --parallel --with autoreconf
override_dh_auto_configure:
dh_auto_configure -- --disable-josua --program-suffix=-$(DEB_UPSTREAM_VERSION)
@@ -18,5 +18,5 @@
# if the path of the libs that appear there changes
sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
-get-orig-source:
- uscan --force-download
+override_dh_autoreconf:
+ dh_autoreconf ./autogen.sh
More information about the Pkg-voip-commits
mailing list