[Pkg-voip-commits] [resiprocate] 01/05: Merge tag 'upstream/1.9.6'
Daniel Pocock
pocock at moszumanska.debian.org
Fri Dec 5 14:45:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
pocock pushed a commit to branch debian-wheezy-backports
in repository resiprocate.
commit 7d6beb104efd2faf73f34f51aa7075dbbe8f1c69
Author: Daniel Pocock <daniel at pocock.pro>
Date: Thu Apr 10 10:03:33 2014 +0200
Merge tag 'upstream/1.9.6'
Upstream version 1.9.6
---
configure | 20 ++++++++++----------
configure.ac | 2 +-
repro/Makefile.am | 1 +
repro/Makefile.in | 2 +-
repro/RequestContext.cxx | 14 +++-----------
repro/ResponseContext.cxx | 4 +---
repro/reprocmd/Makefile.am | 1 -
repro/reprocmd/Makefile.in | 2 +-
resip/recon/ConversationManager.cxx | 7 +++++--
resip/recon/MOHParkServer/Makefile.am | 1 +
resip/recon/MOHParkServer/Makefile.in | 2 +-
resip/recon/Makefile.am | 3 +++
resip/recon/Makefile.in | 4 ++--
resip/recon/test/Makefile.am | 2 ++
resip/recon/test/Makefile.in | 5 +++--
resiprocate.spec | 4 ++--
16 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/configure b/configure
index a23c0bd..8321d76 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for resiprocate 1.9.5.
+# Generated by GNU Autoconf 2.69 for resiprocate 1.9.6.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='resiprocate'
PACKAGE_TARNAME='resiprocate'
-PACKAGE_VERSION='1.9.5'
-PACKAGE_STRING='resiprocate 1.9.5'
+PACKAGE_VERSION='1.9.6'
+PACKAGE_STRING='resiprocate 1.9.6'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1394,7 +1394,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures resiprocate 1.9.5 to adapt to many kinds of systems.
+\`configure' configures resiprocate 1.9.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1464,7 +1464,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of resiprocate 1.9.5:";;
+ short | recursive ) echo "Configuration of resiprocate 1.9.6:";;
esac
cat <<\_ACEOF
@@ -1600,7 +1600,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-resiprocate configure 1.9.5
+resiprocate configure 1.9.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2143,7 +2143,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by resiprocate $as_me 1.9.5, which was
+It was created by resiprocate $as_me 1.9.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2971,7 +2971,7 @@ fi
# Define the identity of the package.
PACKAGE='resiprocate'
- VERSION='1.9.5'
+ VERSION='1.9.6'
cat >>confdefs.h <<_ACEOF
@@ -17677,7 +17677,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by resiprocate $as_me 1.9.5, which was
+This file was extended by resiprocate $as_me 1.9.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17743,7 +17743,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-resiprocate config.status 1.9.5
+resiprocate config.status 1.9.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 63c9b57..1ed555c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT(resiprocate,1.9.5)
+AC_INIT(resiprocate,1.9.6)
AC_CONFIG_SRCDIR(repro/repro.cxx)
SO_RELEASE=`echo $PACKAGE_VERSION | cut -f1,2 -d.`
diff --git a/repro/Makefile.am b/repro/Makefile.am
index 58677d3..f209221 100644
--- a/repro/Makefile.am
+++ b/repro/Makefile.am
@@ -48,6 +48,7 @@ librepro_la_LIBADD = -ldb_cxx
librepro_la_LIBADD += ../resip/dum/libdum.la
librepro_la_LIBADD += ../resip/stack/libresip.la
librepro_la_LIBADD += ../rutil/librutil.la
+librepro_la_LIBADD += -ldl
librepro_la_SOURCES = \
RouteStore.cxx \
diff --git a/repro/Makefile.in b/repro/Makefile.in
index 0689a52..15d5f54 100644
--- a/repro/Makefile.in
+++ b/repro/Makefile.in
@@ -431,7 +431,7 @@ lib_LTLIBRARIES = librepro.la
@BUILD_REPRO_DSO_PLUGINS_TRUE at librepro_la_CXXFLAGS = -DREPRO_DSO_PLUGIN_DIR_DEFAULT='"@reproplugindir@"'
librepro_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
librepro_la_LIBADD = -ldb_cxx ../resip/dum/libdum.la \
- ../resip/stack/libresip.la ../rutil/librutil.la \
+ ../resip/stack/libresip.la ../rutil/librutil.la -ldl \
$(am__append_4) $(am__append_5)
librepro_la_SOURCES = RouteStore.cxx UserStore.cxx ConfigStore.cxx \
AclStore.cxx StaticRegStore.cxx FilterStore.cxx SiloStore.cxx \
diff --git a/repro/RequestContext.cxx b/repro/RequestContext.cxx
index 6a70046..d15f06e 100644
--- a/repro/RequestContext.cxx
+++ b/repro/RequestContext.cxx
@@ -271,17 +271,9 @@ RequestContext::processRequestInviteTransaction(SipMessage* msg, bool original)
InfoLog(<<"Got an ACK within an INVITE transaction, but our "
"response was a 2xx. Someone didn't change their tid "
"like they were supposed to...");
- if(
- (
- msg->exists(h_Routes) &&
- !msg->header(h_Routes).empty()
- )
- ||
- (
- !getProxy().isMyUri(msg->header(h_RequestLine).uri()) &&
- (msg->header(h_From).isWellFormed() && getProxy().isMyUri(msg->header(h_From).uri()))
- )
- )
+ if((msg->exists(h_Routes) && !msg->header(h_Routes).empty()) || // If ACK/200 has a Route header OR
+ (!getProxy().isMyUri(msg->header(h_RequestLine).uri()) && // RequestUri is not us and From Uri is our domain
+ (msg->header(h_From).isWellFormed() && getProxy().isMyUri(msg->header(h_From).uri()))))
{
forwardAck200(*msg);
}
diff --git a/repro/ResponseContext.cxx b/repro/ResponseContext.cxx
index e7d8ee2..1592901 100644
--- a/repro/ResponseContext.cxx
+++ b/repro/ResponseContext.cxx
@@ -900,11 +900,9 @@ ResponseContext::sendRequest(resip::SipMessage& request)
if (request.exists(h_ProxyAuthorizations))
{
Auths &authHeaders = request.header(h_ProxyAuthorizations);
- Data realm = mRequestContext.getDigestRealm();
-
for (Auths::iterator i = authHeaders.begin(); i != authHeaders.end(); )
{
- if(i->exists(p_realm) && isEqualNoCase(i->param(p_realm), realm))
+ if(i->exists(p_realm) && mRequestContext.getProxy().isMyDomain(i->param(p_realm)))
{
i = authHeaders.erase(i);
}
diff --git a/repro/reprocmd/Makefile.am b/repro/reprocmd/Makefile.am
index 7a2bf0c..f62645b 100644
--- a/repro/reprocmd/Makefile.am
+++ b/repro/reprocmd/Makefile.am
@@ -14,7 +14,6 @@ reprocmd_LDADD += ../../resip/stack/libresip.la
reprocmd_LDADD += ../../rutil/librutil.la
#reprocmd_LDADD += ../contrib/ares/libares.a
#reprocmd_LDADD += -L../contrib/ares -lares
-reprocmd_LDADD += @LIBRADIUS_LIBADD@
reprocmd_LDADD += @LIBPTHREAD_LIBADD@
##############################################################################
diff --git a/repro/reprocmd/Makefile.in b/repro/reprocmd/Makefile.in
index af83689..ff5049d 100644
--- a/repro/reprocmd/Makefile.in
+++ b/repro/reprocmd/Makefile.in
@@ -245,7 +245,7 @@ reprocmd_SOURCES = reprocmd.cpp
#reprocmd_LDADD += -L../contrib/ares -lares
reprocmd_LDADD = ../librepro.la ../../resip/dum/libdum.la \
../../resip/stack/libresip.la ../../rutil/librutil.la \
- @LIBRADIUS_LIBADD@ @LIBPTHREAD_LIBADD@ $(am__empty)
+ @LIBPTHREAD_LIBADD@ $(am__empty)
all: all-am
.SUFFIXES:
diff --git a/resip/recon/ConversationManager.cxx b/resip/recon/ConversationManager.cxx
index 34398a4..e95d49c 100644
--- a/resip/recon/ConversationManager.cxx
+++ b/resip/recon/ConversationManager.cxx
@@ -596,8 +596,11 @@ ConversationManager::buildSessionCapabilities(const resip::Data& ipaddress, unsi
sdpcodec->getEncodingName(mimeSubType);
//mimeSubType.toUpper();
- SdpContents::Session::Codec codec(mimeSubType.data(), sdpcodec->getSampleRate());
- codec.payloadType() = sdpcodec->getCodecPayloadFormat();
+ SdpContents::Session::Codec codec(mimeSubType.data(), sdpcodec->getCodecPayloadFormat(), sdpcodec->getSampleRate());
+ if(sdpcodec->getNumChannels() > 1)
+ {
+ codec.encodingParameters() = Data(sdpcodec->getNumChannels());
+ }
// Check for telephone-event and add fmtp manually
if(mimeSubType.compareTo("telephone-event", UtlString::ignoreCase) == 0)
diff --git a/resip/recon/MOHParkServer/Makefile.am b/resip/recon/MOHParkServer/Makefile.am
index bfb935f..95a981f 100644
--- a/resip/recon/MOHParkServer/Makefile.am
+++ b/resip/recon/MOHParkServer/Makefile.am
@@ -20,6 +20,7 @@ LDADD += ../../../reTurn/client/libreTurnClient.la
LDADD += ../../../resip/dum/libdum.la
LDADD += ../../../resip/stack/libresip.la
LDADD += ../../../rutil/librutil.la
+LDADD += -lsipXport
LDADD += $(LIBSSL_LIBADD) @LIBPTHREAD_LIBADD@
sbin_PROGRAMS = MOHParkServer
diff --git a/resip/recon/MOHParkServer/Makefile.in b/resip/recon/MOHParkServer/Makefile.in
index 7957ffe..38f013e 100644
--- a/resip/recon/MOHParkServer/Makefile.in
+++ b/resip/recon/MOHParkServer/Makefile.in
@@ -259,7 +259,7 @@ EXTRA_DIST = ca.pem doc *.vcproj *.vcxproj *.vcxproj.filters \
LDADD = ../librecon.la ../../../reflow/libreflow.la \
../../../reTurn/client/libreTurnClient.la \
../../../resip/dum/libdum.la ../../../resip/stack/libresip.la \
- ../../../rutil/librutil.la $(LIBSSL_LIBADD) \
+ ../../../rutil/librutil.la -lsipXport $(LIBSSL_LIBADD) \
@LIBPTHREAD_LIBADD@ $(am__empty)
MOHParkServer_SOURCES = \
AppSubsystem.cxx \
diff --git a/resip/recon/Makefile.am b/resip/recon/Makefile.am
index d6f222e..446b273 100644
--- a/resip/recon/Makefile.am
+++ b/resip/recon/Makefile.am
@@ -19,6 +19,9 @@ librecon_la_LIBADD += ../dum/libdum.la
librecon_la_LIBADD += ../stack/libresip.la
librecon_la_LIBADD += ../../rutil/librutil.la
librecon_la_LIBADD += -lsipXmediaProcessing
+librecon_la_LIBADD += -lsipXmedia
+librecon_la_LIBADD += -lsipXsdp
+librecon_la_LIBADD += -lsipXport
librecon_la_LIBADD += @LIBSSL_LIBADD@ -lsrtp
librecon_la_LIBADD += @LIBPTHREAD_LIBADD@
librecon_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
diff --git a/resip/recon/Makefile.in b/resip/recon/Makefile.in
index 22a16d3..f647acf 100644
--- a/resip/recon/Makefile.in
+++ b/resip/recon/Makefile.in
@@ -327,8 +327,8 @@ lib_LTLIBRARIES = librecon.la
librecon_la_LIBADD = ../../reflow/libreflow.la \
../../reTurn/client/libreTurnClient.la ../dum/libdum.la \
../stack/libresip.la ../../rutil/librutil.la \
- -lsipXmediaProcessing @LIBSSL_LIBADD@ -lsrtp \
- @LIBPTHREAD_LIBADD@ $(am__empty)
+ -lsipXmediaProcessing -lsipXmedia -lsipXsdp -lsipXport \
+ @LIBSSL_LIBADD@ -lsrtp @LIBPTHREAD_LIBADD@
librecon_la_LDFLAGS = @LIBTOOL_VERSION_RELEASE@ -export-dynamic
librecon_la_SOURCES = BridgeMixer.cxx \
Conversation.cxx \
diff --git a/resip/recon/test/Makefile.am b/resip/recon/test/Makefile.am
index da88783..112292b 100644
--- a/resip/recon/test/Makefile.am
+++ b/resip/recon/test/Makefile.am
@@ -33,6 +33,8 @@ check_PROGRAMS = \
testUA_SOURCES = testUA.cxx playback_prompt.h record_prompt.h
sdpTests_SOURCES = sdpTests.cxx
unitTests_SOURCES = unitTests.cxx
+testUA_LDADD = -lsipXport
+testUA_LDADD += $(LDADD)
diff --git a/resip/recon/test/Makefile.in b/resip/recon/test/Makefile.in
index 00ff044..baa2219 100644
--- a/resip/recon/test/Makefile.in
+++ b/resip/recon/test/Makefile.in
@@ -79,10 +79,10 @@ sdpTests_DEPENDENCIES = ../librecon.la ../../../reflow/libreflow.la \
../../../rutil/librutil.la $(am__DEPENDENCIES_1)
am_testUA_OBJECTS = testUA.$(OBJEXT)
testUA_OBJECTS = $(am_testUA_OBJECTS)
-testUA_LDADD = $(LDADD)
-testUA_DEPENDENCIES = ../librecon.la ../../../reflow/libreflow.la \
+am__DEPENDENCIES_2 = ../librecon.la ../../../reflow/libreflow.la \
../../dum/libdum.la ../../stack/libresip.la \
../../../rutil/librutil.la $(am__DEPENDENCIES_1)
+testUA_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_unitTests_OBJECTS = unitTests.$(OBJEXT)
unitTests_OBJECTS = $(am_unitTests_OBJECTS)
unitTests_LDADD = $(LDADD)
@@ -278,6 +278,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/resip/recon
testUA_SOURCES = testUA.cxx playback_prompt.h record_prompt.h
sdpTests_SOURCES = sdpTests.cxx
unitTests_SOURCES = unitTests.cxx
+testUA_LDADD = -lsipXport $(LDADD)
all: all-am
.SUFFIXES:
diff --git a/resiprocate.spec b/resiprocate.spec
index 7d04b92..6d54388 100644
--- a/resiprocate.spec
+++ b/resiprocate.spec
@@ -1,5 +1,5 @@
Name: resiprocate
-Version: 1.9.5
+Version: 1.9.6
Release: 1%{?dist}
Summary: SIP and TURN stacks, with SIP proxy and TURN server implementations
License: VSL
@@ -367,7 +367,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/presSvr
%changelog
-* Sat Nov 24 2012 Daniel Pocock <daniel at pocock.com.au> - 1.9.5-1
+* Sat Nov 24 2012 Daniel Pocock <daniel at pocock.com.au> - 1.9.6-1
- Produce multiple packages for stack/libs, daemons, sipdialer
- Initial build based on autotools
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/resiprocate.git
More information about the Pkg-voip-commits
mailing list