[Pkg-voip-commits] [libexosip2] 03/04: Imported Debian patch 4.1.0-2
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 11:43:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository libexosip2.
commit 2d103bef6921e1fda04670d07ca079d4dd348eef
Merge: bd4e35d 5309911
Author: Mark Purcell <msp at debian.org>
Date: Wed Jun 25 22:01:01 2014 +1000
Imported Debian patch 4.1.0-2
AUTHORS | 2 +-
ChangeLog | 70 +-
LICENSE.OpenSSL | 137 +
Makefile.am | 4 +-
Makefile.in | 135 +-
README | 28 +-
aclocal.m4 | 2366 +++++---
configure | 3277 +++++++----
configure.in => configure.ac | 21 +-
debian/changelog | 52 +
debian/control | 15 +-
debian/copyright | 176 +-
...{libexosip2-7.install => libexosip2-11.install} | 0
debian/libexosip2-11.lintian-overrides | 2 +
...ibexosip2-7.manpages => libexosip2-11.manpages} | 0
.../manpages/{sip_reg-3.6.0.1 => sip_reg-4.1.0.1} | 10 +-
debian/patches/series | 1 -
debian/patches/spelling-error-in-binary.patch | 22 +-
debian/patches/spelling-error-in-manpage.patch | 130 +-
debian/patches/variable.diff | 14 -
debian/rules | 8 +-
config.h.in => exosip-config.h.in | 5 +-
help/Makefile.in | 60 +-
help/doxygen/DoxyFile | 2 +-
help/doxygen/Makefile.in | 49 +-
help/doxygen/doxygen.dox.in | 10 +-
help/doxygen/ht0-initialize.dox | 374 +-
help/doxygen/ht1-callcontrol.dox | 135 +-
help/doxygen/ht2-registration.dox | 118 +-
include/Makefile.in | 60 +-
include/eXosip2/Makefile.in | 64 +-
include/eXosip2/eX_call.h | 105 +-
include/eXosip2/eX_message.h | 33 +-
include/eXosip2/eX_options.h | 33 +-
include/eXosip2/eX_publish.h | 32 +-
include/eXosip2/eX_refer.h | 28 +-
include/eXosip2/eX_register.h | 39 +-
include/eXosip2/eX_setup.h | 206 +-
include/eXosip2/eX_subscribe.h | 89 +-
include/eXosip2/eXosip.h | 195 +-
platform/Makefile.am | 2 +-
platform/Makefile.in | 62 +-
platform/vsnet/Makefile.am | 2 +-
platform/vsnet/Makefile.in | 51 +-
platform/vsnet/eXosip.sln | 64 +-
platform/vsnet/eXosip.vcproj | 399 --
platform/vsnet/eXosip.vcxproj | 288 +
platform/vsnet/libcares.vcxproj | 223 +
platform/wince/Makefile.am | 2 -
platform/wince/Makefile.in | 364 --
platform/wince/eXosip2.def | 70 -
platform/wince/eXosip2.vcproj | 1027 ----
platform/wince/sip_reg.vcproj | 710 ---
scripts/Makefile.in | 49 +-
scripts/config.guess | 397 +-
scripts/config.sub | 229 +-
scripts/depcomp | 190 +-
scripts/ltmain.sh | 4016 ++++++++-----
src/Makefile.am | 1 -
src/Makefile.in | 69 +-
src/eXcall_api.c | 2806 +++++----
src/eXconf.c | 1887 +++---
src/eXinsubscription_api.c | 1176 ++--
src/eXmessage_api.c | 262 +-
src/eXoptions_api.c | 246 +-
src/eXosip.c | 2639 +++++----
src/eXosip2.h | 982 ++--
src/eXpublish_api.c | 291 +-
src/eXrefer_api.c | 78 +-
src/eXregister_api.c | 627 +-
src/eXsubscription_api.c | 934 ++-
src/eXtl.c | 27 -
src/eXtl_dtls.c | 1904 +++----
src/eXtl_tcp.c | 2778 ++++-----
src/eXtl_tls.c | 5466 +++++++++---------
src/eXtl_udp.c | 1554 ++---
src/eXtransport.c | 163 +-
src/eXtransport.h | 66 +-
src/eXutils.c | 5994 ++++++++++----------
src/inet_ntop.c | 272 +-
src/inet_ntop.h | 19 +-
src/jauth.c | 1829 +++---
src/jcall.c | 168 +-
src/jcallback.c | 3013 +++++-----
src/jdialog.c | 377 +-
src/jevents.c | 681 +--
src/jnotify.c | 246 +-
src/jpipe.c | 373 +-
src/jpipe.h | 43 +-
src/jpublish.c | 167 +-
src/jreg.c | 294 +-
src/jrequest.c | 2063 ++++---
src/jresponse.c | 787 ++-
src/jsubscribe.c | 216 +-
src/milenage.c | 305 +-
src/milenage.h | 10 +-
src/misc.c | 492 +-
src/rijndael.c | 1145 ++--
src/rijndael.h | 4 +-
src/sdp_offans.c | 508 +-
src/udp.c | 4055 +++++++------
tools/Makefile.in | 56 +-
tools/sip_reg.c | 477 +-
103 files changed, 32448 insertions(+), 31354 deletions(-)
diff --cc debian/changelog
index fd62ca5,0000000..16fc044
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,177 -1,0 +1,229 @@@
++libexosip2 (4.1.0-2) unstable; urgency=low
++
++ * Upload to unstable - coordinated through debian-release
++ * Fix "missing license in debian/copyright" - updated (Closes: #736244)
++
++ -- Mark Purcell <msp at debian.org> Wed, 25 Jun 2014 22:01:01 +1000
++
++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
++ * Add dh_auto_build all - Fixes "FTBFS: dh_install:" (Closes: #718163)
++
++ -- Mark Purcell <msp at debian.org> Sun, 04 Aug 2013 10:37:55 +1000
++
++libexosip2 (4.0.0-3) unstable; urgency=low
++
++ * Upload to unstable
++ * Fix "Dependency on libosip2-dev most likely needs to be versioned"
++ Added versioned Depends: (Closes: #700776)
++
++ -- Mark Purcell <msp at debian.org> Mon, 13 May 2013 20:22:48 +1000
++
++libexosip2 (4.0.0-2) experimental; urgency=low
++
++ * Update manpage to sip_reg-4.0.0(1)
++
++ -- Mark Purcell <msp at debian.org> Wed, 26 Dec 2012 11:14:49 +1100
++
++libexosip2 (4.0.0-1) experimental; urgency=low
++
++ * New upstream release
++ * NEW package libexosip2-10 - match soname
++ * Fix vcs-field-not-canonical
++ * Refresh spelling-error-in-manpage.patch
++ * Refresh spelling-error-in-binary.patch
++
++ -- Mark Purcell <msp at debian.org> Tue, 25 Dec 2012 10:44:53 +1100
++
+libexosip2 (3.6.0-4) unstable; urgency=low
+
+ * wheezey polish
+ * Update Standards-Version: 3.9.3
+ * Fix variable.diff quilt-patch-missing-description
+ * Fix spelling-error-in-binary usr/bin/sip_reg-3.6.0 recieved received
+ * Fix libexosip2-dev extended-description-is-probably-too-short
+ * Fix spelling-error-in-manpage
+ * debian/compat -> 9 - multiarch & hardening
+
+ -- Mark Purcell <msp at debian.org> Sun, 24 Jun 2012 20:42:02 +1000
+
+libexosip2 (3.6.0-3) unstable; urgency=low
+
+ * Added variable.diff patch from pinotree - thks
+ - Fixes libexosip2: FTBFS on hurd-i386: (Closes: #661321)
+
+ -- Mark Purcell <msp at debian.org> Sun, 26 Feb 2012 21:37:34 +1100
+
+libexosip2 (3.6.0-2) unstable; urgency=low
+
+ * Upload to unstable - debian-release endorsed
+ * Added --with autotools_dev
+ * Fix "[libexosip2] "OSIP" completely uppercase in short description"
+ Updated debian/control - note upstream uppercase X (Closes: #644864)
+
+ -- Mark Purcell <msp at debian.org> Sun, 26 Feb 2012 08:06:14 +1100
+
+libexosip2 (3.6.0-1) experimental; urgency=low
+
+ * New upstream release
+ - NEW package libeXosip2-7 - soname bump
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Switch to dh
+ * Update to Standards Version 3.9.2
+ * Fix "Getting rid of unneeded *.la / emptying dependency_libs"
+ debian/rules sed -i (Closes: #633180)
+ * Fix "[libexosip2-4] typo "establishement" in extended description"
+ Updated debian/control (Closes: #583519)
+ * Drop binary-control-field-duplicates-source
+ * cleanup debian/watch - debian-watch-contains-dh_make-template
+ * Update debian/copyright GPL2 - copyright-refers-to-symlink-license
+
+ -- Mark Purcell <msp at debian.org> Sat, 08 Oct 2011 15:20:31 +1100
+
+libexosip2 (3.5.0-1) experimental; urgency=low
+
+ * New upstream release
+
+ [ Kilian Krause ]
+ * Remove -N from wget args in get-orig-source target as -O is already
+ used.
+
+ [ Mark Purcell ]
+ * NEW package libexosip2-6 - soname bump
+ * Include html docs in -dev package
+ * Build-Depends: libosip2-dev (>= 3.5)
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Jan 2011 15:37:37 +1000
+
+libexosip2 (3.3.0-1) unstable; urgency=low
+
+ * New upstream release
+ - libosip2 transition
+
+ -- Mark Purcell <msp at debian.org> Sat, 07 Mar 2009 11:51:53 +1100
+
+libexosip2 (3.2.0-1) experimental; urgency=low
+
+ * New upstream release
+
+ [ Patrick Matthäi ]
+ * Bumped to Standards-Version 3.8.0.
+
+ [ Mark Purcell ]
+ * export DH_ALWAYS_EXCLUDE := eXosip2_license.3.gz
+ * Ship debian/manpages/* - Fix binary-without-manpage
+ * Build-Depends: libosip2-dev (>= 3.2)
+
+ -- Mark Purcell <msp at debian.org> Sat, 15 Nov 2008 22:32:45 +1100
+
+libexosip2 (3.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Remove Conflicts:/ Replaces: as libexosip2-5 (>> 3.0) does not
+ exist in etch/ lenny/ sid
+ * Build-Depends:/ Depends: libosip2-dev (>= 3.1)
+
+ -- Mark Purcell <msp at debian.org> Tue, 22 Apr 2008 19:39:04 +1000
+
+libexosip2 (3.0.3-3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 30 Sep 2007 12:03:30 +0100
+
+libexosip2 (3.0.3-2-2) unstable; urgency=high
+
+ [ Kilian Krause ]
+ * Build-Conflicts with libssl-dev to make sure it's not included in
+ libexosip.pc (Closes: #442964)
+ * Set high urgency due to fixing RC bug
+ * Add versioned depends on cdbs >= 0.4.39 due to use of DEB_UPSTREAM_VERSION
+ * Add Homepage field as added in dpkg-dev 1.14.6.
+
+ [ Rene Mayorga ]
+ * Remove help/doxygen/doc in clean target to fix rebuild
+ (Closes: #442632)
+ * Added missing manpage for /usr/bin/sip_reg-3.0.3-2
+ * Bump Standards-Version to 3.7.2
+ * debian/compat set to 5
+ * debian/control
+ + debhelper versioned raised to 5
+ + Added myself to uploaders
+
+ -- Kilian Krause <kilian at debian.org> Sat, 22 Sep 2007 12:08:47 +0200
+
+libexosip2 (3.0.3-2-1) unstable; urgency=low
+
+ * New upstream release
+ * linda: debhelper.mk needs Build-Depends: (>= 4.1.0)
+ * Bump build-Depends: libosip2-dev (>= 3.0.3-2-1)
+ * Conflicts: libexosip2-5 (>> 3.0) missed soname bump
+ * Set --program-suffix=-$(DEB_UPSTREAM_VERSION) allow libs pkgs to coexist
+ * Set DoxyFile SHOW_DIRECTORIES=NO
+ - manpages with wrong filename (Closes: #413302)
+ * Add DEB_DH_ALWAYS_EXCLUDE := eXosip2_license.3.gz
+ - lintian: extra-license-file
+
+ -- Mark Purcell <msp at debian.org> Sat, 01 Sep 2007 00:40:23 +0100
+
+libexosip2 (3.0.3-1) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * New upstream release
+ * debian/control:
+ - New upstream version 3.0.0 requires libosip2-dev (>= 3.0.0) to fix FTBFS
+ - Use new binary:Version stanza for binNMU safety.
+ Requires dpkg-dev (>= 1.13.19)
+ * debian/libexosip2-5.install:
+ Remove eXosip_addidentity.sh as no longer provided by upstream.
+
+ -- Mark Purcell <msp at debian.org> Sun, 19 Aug 2007 12:07:38 +0100
+
+libexosip2 (2.2.3-2) unstable; urgency=low
+
+ * libexosip2-dev Depends: libosip2-dev
+ - Fixes: missing dependency on libosip2-dev (Closes: #393637)
+
+ -- Mark Purcell <msp at debian.org> Sat, 9 Dec 2006 13:06:51 +0000
+
+libexosip2 (2.2.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 4 May 2006 17:07:35 +0100
+
+libexosip2 (2.2.2-3) unstable; urgency=low
+
+ * debian/control: Add libosip2-dev to build-deps.
+
+ -- Kilian Krause <kilian at debian.org> Mon, 17 Apr 2006 10:36:48 +0000
+
+libexosip2 (2.2.2-2) unstable; urgency=low
+
+ * Update debian/copyright for src/inet_ntop.c which isn't GPL
+ * Initial release. (Closes: #346515: ITP: libexosip2 -- eXtended OSIP
+ library - Debian Bug report logs)
+
+ -- Mark Purcell <msp at debian.org> Mon, 17 Apr 2006 10:16:51 +0100
+
+libexosip2 (2.2.2-1) unstable; urgency=low
+
+ * Initial release Closes: #346515
+
+ -- Mark Purcell <msp at debian.org> Sat, 1 Apr 2006 07:58:30 +0100
+
diff --cc debian/control
index 0984e8e,0000000..9851a18
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,35 -1,0 +1,36 @@@
+Source: libexosip2
+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 (>= 3.6), 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.3
++Standards-Version: 3.9.5
+Homepage: http://savannah.gnu.org/projects/exosip/
- Vcs-Svn: svn://svn.debian.org/pkg-voip/libexosip2/trunk/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libexosip2/?op=log
++Vcs-Svn: svn://anonscm.debian.org/pkg-voip/libexosip2/trunk/
++Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/libexosip2/trunk/
+
+Package: libexosip2-dev
+Section: libdevel
+Architecture: any
- Depends: ${misc:Depends}, libexosip2-7 (= ${binary:Version}), libosip2-dev
++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
+ telephony applications (endpoints or conference server) but might be
+ also useful for any application that wish to establish sessions like
+ multi-player games.
+ .
+ Development files for the eXtended osip library
+
- Package: libexosip2-7
++Package: libexosip2-11
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: eXtended osip library
+ Hides the complexity of using the SIP protocol for multimedia
+ session establishment. This protocol is mainly to be used by VoIP
+ telephony applications (endpoints or conference server) but might be
+ also useful for any application that wish to establish sessions like
+ multi-player games.
diff --cc debian/copyright
index 4af69a0,0000000..7faba9f
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,34 -1,0 +1,188 @@@
+This package was debianized by Mark Purcell <msp at debian.org> on
+Sat, 1 Apr 2006 07:58:30 +0100.
+
+It was downloaded from http://savannah.nongnu.org/projects/eXosip
+
- Copyright Holder: Copyright (C) 2002,2003,2004,2005 Aymeric MOIZARD - jack at atosc.org
++Copyright (C) 2001-2012 Aymeric MOIZARD amoizard at antisip.com
+
+License:
+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
++ eXosip is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ eXosip is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
++ In addition, as a special exception, the copyright holders give
++ permission to link the code of portions of this program with the
++ OpenSSL library under certain conditions as described in each
++ individual source file, and distribute linked combinations
++ including the two.
++ You must obey the GNU General Public License in all respects
++ for all of the code used other than OpenSSL. If you modify
++ file(s) with this exception, you may extend this exception to your
++ version of the file(s), but you are not obligated to do so. If you
++ do not wish to do so, delete this exception statement from your
++ version. If you delete this exception statement from all source
++ files in the program, then also delete it here.
++
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
- src/inet_ntop.c
++tools/sip_reg.c:
++ * SIP Registration Agent -- by ww at styx.org
++ *
++ * This program is Free Software, released under the GNU General
++ * Public License v2.0 http://www.gnu.org/licenses/gpl
+
++src/inet_ntop.c:
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * 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.]
++ */
diff --cc debian/libexosip2-11.install
index 00c8fc1,0000000..00c8fc1
mode 100644,000000..100644
--- a/debian/libexosip2-11.install
+++ b/debian/libexosip2-11.install
diff --cc debian/libexosip2-11.lintian-overrides
index 0000000,0000000..2e8c849
new file mode 100644
--- /dev/null
+++ b/debian/libexosip2-11.lintian-overrides
@@@ -1,0 -1,0 +1,2 @@@
++# Upstream provides LICENSE.OpenSSL - included in debian/copyright
++possible-gpl-code-linked-with-openssl
diff --cc debian/libexosip2-11.manpages
index 2fb19fb,0000000..2fb19fb
mode 100644,000000..100644
--- a/debian/libexosip2-11.manpages
+++ b/debian/libexosip2-11.manpages
diff --cc debian/manpages/sip_reg-4.1.0.1
index 6df3f13,0000000..4c14d8e
mode 100644,000000..100644
--- a/debian/manpages/sip_reg-4.1.0.1
+++ b/debian/manpages/sip_reg-4.1.0.1
@@@ -1,47 -1,0 +1,47 @@@
- .TH "sip_reg-3.3.0" "1" "Sep 17 2007" "Debian Project" ""
++.TH "sip_reg-4.0.0" "1" "Sep 17 2007" "Debian Project" ""
+.SH "NAME"
+.LP
- sip_reg\-3.3.0 \- SIP Registration Agent
++sip_reg\-4.0.0 \- SIP Registration Agent
+.SH "SYNTAX"
+.LP
- sip_reg\-3.3.0 [\fIrequired_options\fP] [\fIoptional_options\fP]
++sip_reg\-4.0.0 [\fIrequired_options\fP] [\fIoptional_options\fP]
+.SH "DESCRIPTION"
+.LP
+This program will register to a SIP proxy using the contact supplied on the command line. This is useful if, for some reason your SIP client cannot register to the proxy itself.
+For example, if your SIP client registers to Proxy A, but you want to be able to receive calls that arrive at Proxy B, you can use this program to register the client's contact information to Proxy B
+.SH "OPTIONS"
+.LP
+.TP
+\fBRequired Options\fR
+.TP
+\fB\-r\fR \fB\-\-proxy\fR <\fIsip:proxyhost[:port]\fP>
+.TP
+\fB\-u\fR \fB\-\-from\fR <\fIsip:user at host[:port]\fP>
+.TP
+.br
+.br
+\fBOptional Options\fR
+.TP
+\fB\-c\fR \fB\-\-contact\fR sip:user at host[:port]
+.TP
+\fB\-d\fR \fB\-\-debug\fR log to stderr and do not fork
+.TP
+\fB\-e\fR \fB\-\-expiry\fR number (default 3600)
+.TP
- \fB\-f\fR \fB\-\-firewallip\fR Firewall IP address
++\fB\-f\fR \fB\-\-firewallip\fR Firewall IP address N.N.N.N
+.TP
- \fB\-l\fR \fB\-\-localip\fR Force local IP address
++\fB\-l\fR \fB\-\-localip\fR Force local IP address N.N.N.N
+.TP
+\fB\-p\fR \fB\-\-port\fR Port number (default 5060)
+.TP
+\fB\-U\fR \fB\-\-username\fR authentication username
+.TP
+\fB\-P\fR \fB\-\-password\fR authentication password
+.TP
+\fB\-h\fR \fB\-\-help\fR Display Usage help
+.SH "AUTHORS"
+.LP
+This manual page was written by Rene Mayorga <rmayorga at debian.org.sv> for the \fBDebian\fR system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version.
+.SH "SEE ALSO"
+.LP
+eXosip.h(3)
diff --cc debian/patches/series
index d2df776,0000000..265d9b5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+spelling-error-in-manpage.patch
+spelling-error-in-binary.patch
- variable.diff
diff --cc debian/patches/spelling-error-in-binary.patch
index 6999a4f,0000000..aeec73d
mode 100644,000000..100644
--- a/debian/patches/spelling-error-in-binary.patch
+++ b/debian/patches/spelling-error-in-binary.patch
@@@ -1,16 -1,0 +1,16 @@@
+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-3.6.0/tools/sip_reg.c
++Index: libexosip2-4.1.0/tools/sip_reg.c
+===================================================================
- --- libexosip2-3.6.0.orig/tools/sip_reg.c 2010-01-07 01:57:57.000000000 +1100
- +++ libexosip2-3.6.0/tools/sip_reg.c 2012-06-24 20:15:56.000000000 +1000
- @@ -373,7 +373,7 @@
- break;
- default:
- syslog_wrapper(LOG_DEBUG,
- - "recieved unknown eXosip event (type, did, cid) = (%d, %d, %d)",
- + "received unknown eXosip event (type, did, cid) = (%d, %d, %d)",
- event->type, event->did, event->cid);
++--- 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:
++- syslog_wrapper (LOG_DEBUG, "recieved unknown eXosip event (type, did, cid) = (%d, %d, %d)", event->type, event->did, event->cid);
+++ syslog_wrapper (LOG_DEBUG, "received unknown eXosip event (type, did, cid) = (%d, %d, %d)", event->type, event->did, event->cid);
+
- }
++ }
++ eXosip_event_free (event);
diff --cc debian/patches/spelling-error-in-manpage.patch
index ab4891c,0000000..72de638
mode 100644,000000..100644
--- a/debian/patches/spelling-error-in-manpage.patch
+++ b/debian/patches/spelling-error-in-manpage.patch
@@@ -1,105 -1,0 +1,147 @@@
+Description: spelling-error-in-manpage
+Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-manpage.html
+
- Index: libexosip2-3.6.0/ChangeLog
++Index: libexosip2-4.1.0/ChangeLog
+===================================================================
- --- libexosip2-3.6.0.orig/ChangeLog 2011-10-06 01:35:05.000000000 +1100
- +++ libexosip2-3.6.0/ChangeLog 2012-06-24 20:23:56.000000000 +1000
- @@ -1,5 +1,5 @@
++--- 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)
+- * use optionnal c-ares DNS library for non blocking DNS access
++ * use optional c-ares DNS library for non blocking DNS access
+ as well as improvments over DNS operation such as NAPTR and
+ SRV records.
+ * again, so many minor change/fix/improvments, sorry for not
- @@ -15,7 +15,7 @@
++@@ -49,7 +49,7 @@
+ eXosip2 (3.4.0)
+ * modification to allow using "windows certificate store" for TLS.
+ * handle keep alive for TCP/TLS.
+- * fix when receiving additionnal CRLF on reliable transport.
++ * fix when receiving additional CRLF on reliable transport.
+ * 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-3.6.0/help/doxygen/doxygen.dox.in
++Index: libexosip2-4.1.0/help/doxygen/doxygen.dox.in
+===================================================================
- --- libexosip2-3.6.0.orig/help/doxygen/doxygen.dox.in 2010-01-07 01:57:57.000000000 +1100
- +++ libexosip2-3.6.0/help/doxygen/doxygen.dox.in 2012-06-24 20:25:42.000000000 +1000
++--- 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.
+ * It is an effort to create a simple (telephony is never
+- * simple) and powerfull protocol for next generation
++ * simple) and powerful protocol for next generation
+ * telephony systems.
+ *
+ * @section what_features SIP features
+ *
+ * SIP is not just about telephony. It's much more
+ * that what you expect from phones. SIP means mobility,
+- * video, textual call informations, file exchange,
++ * video, textual call information, file exchange,
+ * instant messaging, presence support and much more!
+ *
+ * @section what_freesoftware eXosip2 is free software
- Index: libexosip2-3.6.0/include/eXosip2/eX_setup.h
++Index: libexosip2-4.1.0/include/eXosip2/eX_setup.h
+===================================================================
- --- libexosip2-3.6.0.orig/include/eXosip2/eX_setup.h 2011-09-28 09:56:28.000000000 +1000
- +++ libexosip2-3.6.0/include/eXosip2/eX_setup.h 2012-06-24 20:22:04.000000000 +1000
- @@ -60,7 +60,7 @@
- int eXosip_init (void);
++--- 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);
+
+ /**
+- * Release ressource used by the eXtented oSIP library.
++ * Release resource used by the eXtented oSIP library.
+ *
++ * @param excontext eXosip_t instance.
+ */
- void eXosip_quit (void);
- @@ -219,7 +219,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-3.6.0/include/eXosip2/eXosip.h
++Index: libexosip2-4.1.0/include/eXosip2/eXosip.h
+===================================================================
- --- libexosip2-3.6.0.orig/include/eXosip2/eXosip.h 2011-04-28 23:45:33.000000000 +1000
- +++ libexosip2-3.6.0/include/eXosip2/eXosip.h 2012-06-24 20:23:21.000000000 +1000
- @@ -361,7 +361,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 @@
+ };
+
+ /**
+- * Free ressource in an eXosip event.
++ * Free resource in an eXosip event.
+ *
+ * @param je event to work on.
+ */
- Index: libexosip2-3.6.0/src/eXcall_api.c
++Index: libexosip2-4.1.0/src/eXcall_api.c
+===================================================================
- --- libexosip2-3.6.0.orig/src/eXcall_api.c 2011-09-28 09:56:28.000000000 +1000
- +++ libexosip2-3.6.0/src/eXcall_api.c 2012-06-24 20:21:08.000000000 +1000
- @@ -1377,7 +1377,7 @@
- osip_free(exp_h->element);
- exp_h->element = osip_strdup(min_se_h->element);
++--- 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);
+
- - /* rebuild session-expires with new value/same paramters */
- + /* rebuild session-expires with new value/same parameters */
- osip_free(exp->hvalue);
- exp->hvalue = NULL;
- osip_content_disposition_to_str(exp_h, &exp->hvalue);
- Index: libexosip2-3.6.0/src/eXosip2.h
++- /* rebuild session-expires with new value/same paramters */
+++ /* rebuild session-expires with new value/same parameters */
++ 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-3.6.0.orig/src/eXosip2.h 2011-10-06 01:27:09.000000000 +1100
- +++ libexosip2-3.6.0/src/eXosip2.h 2012-06-24 20:24:48.000000000 +1000
- @@ -480,7 +480,7 @@
- /**
- * Prepare addrinfo for socket binding and resolv hostname
- *
- - * @param addrinfo informations about the connections
- + * @param addrinfo information about the connections
- * @param hostname hostname to resolv.
- * @param service port number or "sip" SRV record if service=0
- */
++--- 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
+++*/
diff --cc debian/rules
index 89cd2b4,0000000..a9e9bf4
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,22 -1,0 +1,22 @@@
+#!/usr/bin/make -f
+
+# Grab the version from the changelog, up to the first -
+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)
+
+override_dh_auto_build:
- dh_auto_build -- doxygen
++ dh_auto_build -- all doxygen
+
+override_dh_install:
+ dh_install --list-missing
+ # Drop content of dependency_libs to avoid having to recompile exiv2
+ # 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libexosip2.git
More information about the Pkg-voip-commits
mailing list