diff -Nru resiprocate-1.9.5/configure resiprocate-1.9.6/configure --- resiprocate-1.9.5/configure 2014-03-26 14:43:01.000000000 +0000 +++ resiprocate-1.9.6/configure 2014-04-10 07:51:57.000000000 +0000 @@ -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 @@ # 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 @@ # 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 @@ 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 @@ 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 @@ 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 @@ # Define the identity of the package. PACKAGE='resiprocate' - VERSION='1.9.5' + VERSION='1.9.6' cat >>confdefs.h <<_ACEOF @@ -17677,7 +17677,7 @@ # 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 @@ 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 -Nru resiprocate-1.9.5/configure.ac resiprocate-1.9.6/configure.ac --- resiprocate-1.9.5/configure.ac 2014-03-26 14:42:37.000000000 +0000 +++ resiprocate-1.9.6/configure.ac 2014-04-10 07:51:33.000000000 +0000 @@ -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 -Nru resiprocate-1.9.5/debian/changelog resiprocate-1.9.6/debian/changelog --- resiprocate-1.9.5/debian/changelog 2014-03-27 09:12:56.000000000 +0000 +++ resiprocate-1.9.6/debian/changelog 2014-04-10 08:04:58.000000000 +0000 @@ -1,3 +1,9 @@ +resiprocate (1.9.6-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Pocock Thu, 10 Apr 2014 10:04:36 +0200 + resiprocate (1.9.5-2) unstable; urgency=high * Fix/suppress lintian issues diff -Nru resiprocate-1.9.5/debian/conf/repro.config resiprocate-1.9.6/debian/conf/repro.config --- resiprocate-1.9.5/debian/conf/repro.config 2014-03-24 14:57:27.000000000 +0000 +++ resiprocate-1.9.6/debian/conf/repro.config 2014-03-31 07:11:45.000000000 +0000 @@ -236,7 +236,7 @@ # The default is determined at build time depending upon the # target environment and the installation prefix passed to # the configure script -#PluginDirectory /usr/lib/repro/plugins +#PluginDirectory = /usr/lib/repro/plugins # List of plugins to load (comma-separated list) # These are the names of the plugins and not the full filenames diff -Nru resiprocate-1.9.5/debian/patches/01-testUA-sipXtapi resiprocate-1.9.6/debian/patches/01-testUA-sipXtapi --- resiprocate-1.9.5/debian/patches/01-testUA-sipXtapi 2014-03-26 14:48:15.000000000 +0000 +++ resiprocate-1.9.6/debian/patches/01-testUA-sipXtapi 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ ---- 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 -Nru resiprocate-1.9.5/debian/patches/02-MOHParkServer-sipXtapi resiprocate-1.9.6/debian/patches/02-MOHParkServer-sipXtapi --- resiprocate-1.9.5/debian/patches/02-MOHParkServer-sipXtapi 2014-03-26 14:48:15.000000000 +0000 +++ resiprocate-1.9.6/debian/patches/02-MOHParkServer-sipXtapi 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- 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 -Nru resiprocate-1.9.5/debian/patches/series resiprocate-1.9.6/debian/patches/series --- resiprocate-1.9.5/debian/patches/series 2014-03-26 14:48:15.000000000 +0000 +++ resiprocate-1.9.6/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -01-testUA-sipXtapi -02-MOHParkServer-sipXtapi diff -Nru resiprocate-1.9.5/repro/Makefile.am resiprocate-1.9.6/repro/Makefile.am --- resiprocate-1.9.5/repro/Makefile.am 2014-03-26 14:40:44.000000000 +0000 +++ resiprocate-1.9.6/repro/Makefile.am 2014-04-10 07:51:33.000000000 +0000 @@ -48,6 +48,7 @@ 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 -Nru resiprocate-1.9.5/repro/Makefile.in resiprocate-1.9.6/repro/Makefile.in --- resiprocate-1.9.5/repro/Makefile.in 2014-03-26 14:43:03.000000000 +0000 +++ resiprocate-1.9.6/repro/Makefile.in 2014-04-10 07:51:58.000000000 +0000 @@ -431,7 +431,7 @@ @BUILD_REPRO_DSO_PLUGINS_TRUE@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 -Nru resiprocate-1.9.5/repro/reprocmd/Makefile.am resiprocate-1.9.6/repro/reprocmd/Makefile.am --- resiprocate-1.9.5/repro/reprocmd/Makefile.am 2014-03-26 14:40:40.000000000 +0000 +++ resiprocate-1.9.6/repro/reprocmd/Makefile.am 2014-04-10 07:51:32.000000000 +0000 @@ -14,7 +14,6 @@ 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 -Nru resiprocate-1.9.5/repro/reprocmd/Makefile.in resiprocate-1.9.6/repro/reprocmd/Makefile.in --- resiprocate-1.9.5/repro/reprocmd/Makefile.in 2014-03-26 14:43:04.000000000 +0000 +++ resiprocate-1.9.6/repro/reprocmd/Makefile.in 2014-04-10 07:51:59.000000000 +0000 @@ -245,7 +245,7 @@ #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 -Nru resiprocate-1.9.5/repro/RequestContext.cxx resiprocate-1.9.6/repro/RequestContext.cxx --- resiprocate-1.9.5/repro/RequestContext.cxx 2014-03-26 14:40:43.000000000 +0000 +++ resiprocate-1.9.6/repro/RequestContext.cxx 2014-04-10 07:51:32.000000000 +0000 @@ -271,17 +271,9 @@ 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 -Nru resiprocate-1.9.5/repro/ResponseContext.cxx resiprocate-1.9.6/repro/ResponseContext.cxx --- resiprocate-1.9.5/repro/ResponseContext.cxx 2014-03-26 14:40:43.000000000 +0000 +++ resiprocate-1.9.6/repro/ResponseContext.cxx 2014-04-10 07:51:32.000000000 +0000 @@ -900,11 +900,9 @@ 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 -Nru resiprocate-1.9.5/resip/recon/ConversationManager.cxx resiprocate-1.9.6/resip/recon/ConversationManager.cxx --- resiprocate-1.9.5/resip/recon/ConversationManager.cxx 2014-03-26 14:41:18.000000000 +0000 +++ resiprocate-1.9.6/resip/recon/ConversationManager.cxx 2014-04-10 07:50:09.000000000 +0000 @@ -596,8 +596,11 @@ 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 -Nru resiprocate-1.9.5/resip/recon/Makefile.am resiprocate-1.9.6/resip/recon/Makefile.am --- resiprocate-1.9.5/resip/recon/Makefile.am 2014-03-26 14:41:18.000000000 +0000 +++ resiprocate-1.9.6/resip/recon/Makefile.am 2014-04-10 07:50:09.000000000 +0000 @@ -19,6 +19,9 @@ 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 -Nru resiprocate-1.9.5/resip/recon/Makefile.in resiprocate-1.9.6/resip/recon/Makefile.in --- resiprocate-1.9.5/resip/recon/Makefile.in 2014-03-26 14:43:04.000000000 +0000 +++ resiprocate-1.9.6/resip/recon/Makefile.in 2014-04-10 07:51:59.000000000 +0000 @@ -327,8 +327,8 @@ 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 -Nru resiprocate-1.9.5/resip/recon/MOHParkServer/Makefile.am resiprocate-1.9.6/resip/recon/MOHParkServer/Makefile.am --- resiprocate-1.9.5/resip/recon/MOHParkServer/Makefile.am 2014-03-26 14:41:16.000000000 +0000 +++ resiprocate-1.9.6/resip/recon/MOHParkServer/Makefile.am 2014-04-10 07:50:08.000000000 +0000 @@ -20,6 +20,7 @@ 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 -Nru resiprocate-1.9.5/resip/recon/MOHParkServer/Makefile.in resiprocate-1.9.6/resip/recon/MOHParkServer/Makefile.in --- resiprocate-1.9.5/resip/recon/MOHParkServer/Makefile.in 2014-03-26 14:43:04.000000000 +0000 +++ resiprocate-1.9.6/resip/recon/MOHParkServer/Makefile.in 2014-04-10 07:51:59.000000000 +0000 @@ -259,7 +259,7 @@ 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 -Nru resiprocate-1.9.5/resip/recon/test/Makefile.am resiprocate-1.9.6/resip/recon/test/Makefile.am --- resiprocate-1.9.5/resip/recon/test/Makefile.am 2014-03-26 14:41:13.000000000 +0000 +++ resiprocate-1.9.6/resip/recon/test/Makefile.am 2014-04-10 07:50:08.000000000 +0000 @@ -33,6 +33,8 @@ 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 -Nru resiprocate-1.9.5/resip/recon/test/Makefile.in resiprocate-1.9.6/resip/recon/test/Makefile.in --- resiprocate-1.9.5/resip/recon/test/Makefile.in 2014-03-26 14:43:05.000000000 +0000 +++ resiprocate-1.9.6/resip/recon/test/Makefile.in 2014-04-10 07:51:59.000000000 +0000 @@ -79,10 +79,10 @@ ../../../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 @@ 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 -Nru resiprocate-1.9.5/resiprocate.spec resiprocate-1.9.6/resiprocate.spec --- resiprocate-1.9.5/resiprocate.spec 2014-03-26 14:43:14.000000000 +0000 +++ resiprocate-1.9.6/resiprocate.spec 2014-04-10 07:52:07.000000000 +0000 @@ -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 @@ %{_sbindir}/presSvr %changelog -* Sat Nov 24 2012 Daniel Pocock - 1.9.5-1 +* Sat Nov 24 2012 Daniel Pocock - 1.9.6-1 - Produce multiple packages for stack/libs, daemons, sipdialer - Initial build based on autotools