Bug#961811: baresip: diff for NMU version 0.6.1-1.1
Sebastian Ramacher
sramacher at debian.org
Fri Jul 17 06:40:30 BST 2020
Hi
On 2020-07-17 00:02:17 +0100, peter green wrote:
> (note: I am not the maintainer)
> Sebastian Ramacher wrote:
> > I've prepared an NMU for baresip (versioned as 0.6.1-1.1) and
> > uploaded it to DELAYED/2.
>
> While I have not tested, I am 99% sure your fix for make 4.3 will break the build with make 4.2 in testing.
>
> Since I wrote the post in response to your proposed gst-plugins-bad1.0 NMU I have done some more searching,
> and apparently the solution to this is to use a variable. https://lwn.net/Articles/826217/
>
> I applied that technique and was able to get succesful builds in both raspbian bullseye-staging and Debian
> sid. A debdiff of what I uploaded to raspbian is attatched.
Please feel free to cancel my NMU and upload your's instead.
Cheers
> diff -Nru baresip-0.6.1/debian/changelog baresip-0.6.1/debian/changelog
> --- baresip-0.6.1/debian/changelog 2019-02-18 12:30:38.000000000 +0000
> +++ baresip-0.6.1/debian/changelog 2020-07-16 19:44:03.000000000 +0000
> @@ -1,3 +1,16 @@
> +baresip (0.6.1-1+rpi1) bullseye-staging; urgency=medium
> +
> + * Raspbian upload based on Sebastian Ramacher's proposed NMU
> + [Sebastian Ramacher]
> + * debian/patches:
> + - Unbreak patch 1002 with make 4.3 (Closes: #961811)
> + - Apply upstream patch to fix build of selftest
> + [Peter Michael Green]
> + * Further adjust patch 1002 so it is compatible with both make 4.2 (bullseye)
> + and make 4.3 (sid)
> +
> + -- Peter Michael Green <plugwash at raspbian.org> Thu, 16 Jul 2020 19:44:03 +0000
> +
> baresip (0.6.1-1) unstable; urgency=medium
>
> [ upstream ]
> diff -Nru baresip-0.6.1/debian/patches/1002_system_header_locations.patch baresip-0.6.1/debian/patches/1002_system_header_locations.patch
> --- baresip-0.6.1/debian/patches/1002_system_header_locations.patch 2019-02-11 19:42:25.000000000 +0000
> +++ baresip-0.6.1/debian/patches/1002_system_header_locations.patch 2020-07-16 19:37:33.000000000 +0000
> @@ -14,15 +14,29 @@
> Last-Update: 2018-11-29
> ---
> This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
> ---- a/mk/modules.mk
> -+++ b/mk/modules.mk
> -@@ -67,46 +67,36 @@
> +Index: baresip-0.6.1/mk/modules.mk
> +===================================================================
> +--- baresip-0.6.1.orig/mk/modules.mk
> ++++ baresip-0.6.1/mk/modules.mk
> +@@ -59,6 +59,11 @@
> + # Default is enabled
> + MOD_AUTODETECT := 1
> +
> ++# GNU make 4.3 changes the escaping rules for the hash sign, the reccomended
> ++# way to maintain compatibility with both 4.2 and 4.3 is to use a variable
> ++# see https://lwn.net/Articles/810071/
> ++HASHINCLUDE:=\#include
> ++
> + ifneq ($(MOD_AUTODETECT),)
> +
> + USE_CONS := 1
> +@@ -67,46 +72,36 @@ USE_L16 := 1
>
> ifneq ($(OS),win32)
>
> -USE_ALSA := $(shell [ -f $(SYSROOT)/include/alsa/asoundlib.h ] || \
> - [ -f $(SYSROOT_ALT)/include/alsa/asoundlib.h ] && echo "yes")
> -+USE_ALSA := $(shell echo '\#include <alsa/asoundlib.h>' | \
> ++USE_ALSA := $(shell echo '$(HASHINCLUDE) <alsa/asoundlib.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> +USE_AMR := $(shell pkg-config --exists opencore-amrnb && echo "yes")
> +ifeq ($(USE_AMR),)
> @@ -39,9 +53,9 @@
> - [ -f $(SYSROOT)/include/$(MACHINE)/libavformat/avformat.h ] || \
> - [ -f $(SYSROOT_ALT)/include/libavformat/avformat.h ] && echo "yes")
> +endif
> -+USE_AVCODEC := $(shell echo '\#include <libavcodec/avcodec.h>' | \
> ++USE_AVCODEC := $(shell echo '$(HASHINCLUDE) <libavcodec/avcodec.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_AVFORMAT := $(shell echo '\#include <libavformat/avformat.h>' | \
> ++USE_AVFORMAT := $(shell echo '$(HASHINCLUDE) <libavformat/avformat.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> USE_AVAHI := $(shell pkg-config --exists avahi-client && echo "yes")
> -USE_BV32 := $(shell [ -f $(SYSROOT)/include/bv32/bv32.h ] || \
> @@ -69,26 +83,26 @@
> - [ -f $(SYSROOT)/include/gsm/gsm.h ] || \
> - [ -f $(SYSROOT)/local/include/gsm.h ] || \
> - [ -f $(SYSROOT)/local/include/gsm/gsm.h ] && echo "yes")
> -+USE_BV32 := $(shell echo '\#include <bv32/bv32.h' | \
> ++USE_BV32 := $(shell echo '$(HASHINCLUDE) <bv32/bv32.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_CAIRO := $(shell echo '\#include <cairo/cairo.h>' |\
> ++USE_CAIRO := $(shell echo '$(HASHINCLUDE) <cairo/cairo.h>' |\
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_DTLS := $(shell echo '\#include <openssl/dtls1.h>' | \
> ++USE_DTLS := $(shell echo '$(HASHINCLUDE) <openssl/dtls1.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_DTLS_SRTP := $(shell echo '\#include <openssl/srtp.h>' | \
> ++USE_DTLS_SRTP := $(shell echo '$(HASHINCLUDE) <openssl/srtp.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_G722 := $(shell echo '\#include <spandsp/g722.h>' | \
> ++USE_G722 := $(shell echo '$(HASHINCLUDE) <spandsp/g722.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_G722_1 := $(shell echo '\#include <g722_1.h>' | \
> ++USE_G722_1 := $(shell echo '$(HASHINCLUDE) <g722_1.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_G726 := $(shell echo '\#include <spandsp/g726.h>' | \
> ++USE_G726 := $(shell echo '$(HASHINCLUDE) <spandsp/g726.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_GSM := $(shell echo '\#include <gsm.h>' | \
> ++USE_GSM := $(shell echo '$(HASHINCLUDE) <gsm.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> USE_GST := $(shell pkg-config --exists gstreamer-0.10 && echo "yes")
> USE_GST1 := $(shell pkg-config --exists gstreamer-1.0 && echo "yes")
> USE_GST_VIDEO := \
> -@@ -117,100 +107,81 @@
> +@@ -117,100 +112,81 @@ USE_GST_VIDEO1 := $(shell pkg-config --e
> USE_GTK := $(shell pkg-config 'gtk+-2.0 >= 2.22' && \
> pkg-config 'glib-2.0 >= 2.32' && echo "yes")
> ifneq ($(USE_AVCODEC),)
> @@ -117,27 +131,27 @@
> -USE_PORTAUDIO := $(shell [ -f $(SYSROOT)/local/include/portaudio.h ] || \
> - [ -f $(SYSROOT)/include/portaudio.h ] || \
> - [ -f $(SYSROOT_ALT)/include/portaudio.h ] && echo "yes")
> -+USE_H265 := $(shell echo '\#include <x265.h>' | \
> ++USE_H265 := $(shell echo '$(HASHINCLUDE) <x265.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> +endif
> -+USE_ILBC := $(shell echo '\#include <iLBC_define.h>' | \
> ++USE_ILBC := $(shell echo '$(HASHINCLUDE) <iLBC_define.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_ISAC := $(shell echo '\#include <isac.h>' | \
> ++USE_ISAC := $(shell echo '$(HASHINCLUDE) <isac.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_JACK := $(shell echo '\#include <jack/jack.h>' | \
> ++USE_JACK := $(shell echo '$(HASHINCLUDE) <jack/jack.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_MPG123 := $(shell echo '\#include <mpg123.h>' | \
> ++USE_MPG123 := $(shell echo '$(HASHINCLUDE) <mpg123.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_OPUS := $(shell echo '\#include <opus/opus.h>' | \
> ++USE_OPUS := $(shell echo '$(HASHINCLUDE) <opus/opus.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_OSS := $(shell echo '\#include <soundcard.h>' | \
> ++USE_OSS := $(shell echo '$(HASHINCLUDE) <soundcard.h>' | \
> + $(CC) -E - >/dev/null 2>&1 || \
> -+ echo '\#include <linux/soundcard.h>' | $(CC) -E - >/dev/null 2>&1 || \
> -+ echo '\#include <sys/soundcard.h>' | $(CC) -E - >/dev/null 2>&1 && \
> ++ echo '$(HASHINCLUDE) <linux/soundcard.h>' | $(CC) -E - >/dev/null 2>&1 || \
> ++ echo '$(HASHINCLUDE) <sys/soundcard.h>' | $(CC) -E - >/dev/null 2>&1 && \
> + echo yes)
> -+USE_PLC := $(shell echo '\#include <spandsp/plc.h>' | \
> ++USE_PLC := $(shell echo '$(HASHINCLUDE) <spandsp/plc.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_PORTAUDIO := $(shell echo '\#include <portaudio.h>' | \
> ++USE_PORTAUDIO := $(shell echo '$(HASHINCLUDE) <portaudio.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> USE_PULSE := $(shell pkg-config --exists libpulse && echo "yes")
> -USE_SDL := $(shell [ -f $(SYSROOT)/include/SDL/SDL.h ] || \
> @@ -151,13 +165,13 @@
> - [ -f $(SYSROOT_ALT)/include/sndfile.h ] || \
> - [ -f $(SYSROOT_ALT)/usr/local/include/sndfile.h ] && echo "yes")
> -USE_STDIO := $(shell [ -f $(SYSROOT)/include/termios.h ] && echo "yes")
> -+USE_SDL := $(shell echo '\#include <SDL/SDL.h>' | \
> ++USE_SDL := $(shell echo '$(HASHINCLUDE) <SDL/SDL.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_SDL2 := $(shell echo '\#include <SDL2/SDL.h>' | \
> ++USE_SDL2 := $(shell echo '$(HASHINCLUDE) <SDL2/SDL.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_SNDFILE := $(shell echo '\#include <sndfile.h>' | \
> ++USE_SNDFILE := $(shell echo '$(HASHINCLUDE) <sndfile.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_STDIO := $(shell echo '\#include <termios.h>' | \
> ++USE_STDIO := $(shell echo '$(HASHINCLUDE) <termios.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> +HAVE_SPEEXDSP := $(shell pkg-config --exists speexdsp && echo "yes")
> +ifeq ($(HAVE_SPEEXDSP),)
> @@ -219,53 +233,55 @@
> - || [ -f $(SYSROOT)/include/OMX_Core.h ] \
> - || [ -f $(SYSROOT_ALT)/include/OMX_Core.h ] \
> - && echo "yes")
> -+USE_MPA := $(shell echo '\#include <twolame.h>' | \
> ++USE_MPA := $(shell echo '$(HASHINCLUDE) <twolame.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> +endif
> +endif
> -+USE_SPEEX_AEC := $(shell echo '\#include <speex/speex_echo.h>' | \
> ++USE_SPEEX_AEC := $(shell echo '$(HASHINCLUDE) <speex/speex_echo.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_SPEEX_PP := $(shell echo '\#include <speex_preprocess.h>' | \
> ++USE_SPEEX_PP := $(shell echo '$(HASHINCLUDE) <speex_preprocess.h>' | \
> + $(CC) -E - >/dev/null 2>&1 || \
> -+ echo '\#include <speex/speex_preprocess.h>' | \
> ++ echo '$(HASHINCLUDE) <speex/speex_preprocess.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && \
> + echo yes)
> -+USE_SYSLOG := $(shell echo '\#include <syslog.h>' | \
> ++USE_SYSLOG := $(shell echo '$(HASHINCLUDE) <syslog.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+HAVE_LIBMQTT := $(shell echo '\#include <mosquitto.h>' | \
> ++HAVE_LIBMQTT := $(shell echo '$(HASHINCLUDE) <mosquitto.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_V4L := $(shell echo '\#include <libv4l1.h>' | \
> ++USE_V4L := $(shell echo '$(HASHINCLUDE) <libv4l1.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+HAVE_LIBV4L2 := $(shell echo '\#include <libv4l2.h>' | \
> ++HAVE_LIBV4L2 := $(shell echo '$(HASHINCLUDE) <libv4l2.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_V4L2 := $(shell echo '\#include <linux/videodev2.h>' | \
> ++USE_V4L2 := $(shell echo '$(HASHINCLUDE) <linux/videodev2.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_X11 := $(shell echo '\#include <X11/Xlib.h>' | \
> ++USE_X11 := $(shell echo '$(HASHINCLUDE) <X11/Xlib.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_ZRTP := $(shell echo '\#include <libzrtp/zrtp.h>' | \
> ++USE_ZRTP := $(shell echo '$(HASHINCLUDE) <libzrtp/zrtp.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_VPX := $(shell echo '\#include <vpx/vp8.h>' | \
> ++USE_VPX := $(shell echo '$(HASHINCLUDE) <vpx/vp8.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_OMX_RPI := $(shell echo '\#include <bcm_host.h>' | \
> ++USE_OMX_RPI := $(shell echo '$(HASHINCLUDE) <bcm_host.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> -+USE_OMX_BELLAGIO := $(shell echo '\#include <OMX_Core.h>' | \
> ++USE_OMX_BELLAGIO := $(shell echo '$(HASHINCLUDE) <OMX_Core.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> else
> # Windows.
> # Accounts for mingw with Windows SDK (formerly known as Platform SDK)
> -@@ -242,7 +213,8 @@
> +@@ -242,7 +218,8 @@ endif
>
> endif
> ifeq ($(OS),linux)
> -USE_EVDEV := $(shell [ -f $(SYSROOT)/include/linux/input.h ] && echo "yes")
> -+USE_EVDEV := $(shell echo '\#include <linux/input.h>' | \
> ++USE_EVDEV := $(shell echo '$(HASHINCLUDE) <linux/input.h>' | \
> + $(CC) -E - >/dev/null 2>&1 && echo yes)
> MODULES += dtmfio
> endif
> ifeq ($(OS),win32)
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -44,16 +44,22 @@
> +Index: baresip-0.6.1/Makefile
> +===================================================================
> +--- baresip-0.6.1.orig/Makefile
> ++++ baresip-0.6.1/Makefile
> +@@ -44,16 +44,22 @@ include mk/modules.mk
> ifndef LIBREM_PATH
> LIBREM_PATH := $(shell [ -d ../rem ] && echo "../rem")
> endif
> @@ -290,9 +306,11 @@
> CXXFLAGS += $(EXTRA_CXXFLAGS)
>
> # XXX: common for C/C++
> ---- a/modules/amr/module.mk
> -+++ b/modules/amr/module.mk
> -@@ -8,6 +8,10 @@
> +Index: baresip-0.6.1/modules/amr/module.mk
> +===================================================================
> +--- baresip-0.6.1.orig/modules/amr/module.mk
> ++++ baresip-0.6.1/modules/amr/module.mk
> +@@ -8,6 +8,10 @@ MOD := amr
> $(MOD)_SRCS += amr.c sdp.c
>
>
> @@ -303,7 +321,7 @@
> ifneq ($(shell [ -d $(SYSROOT)/include/opencore-amrnb ] && echo 1 ),)
> $(MOD)_CFLAGS += -DAMR_NB=1 -I$(SYSROOT)/include/opencore-amrnb
> $(MOD)_LFLAGS += -lopencore-amrnb
> -@@ -27,8 +31,13 @@
> +@@ -27,8 +31,13 @@ endif
> endif
> endif
> endif
> @@ -317,7 +335,7 @@
> ifneq ($(shell [ -f $(SYSROOT_ALT)/include/opencore-amrwb/enc_if.h ] && \
> echo 1 ),)
> $(MOD)_CFLAGS += -DAMR_WB=1 -I$(SYSROOT_ALT)/include/opencore-amrwb
> -@@ -49,13 +58,19 @@
> +@@ -49,13 +58,19 @@ endif
> endif
> endif
> endif
> @@ -337,8 +355,10 @@
>
>
> $(MOD)_LFLAGS += -lm
> ---- a/modules/avcodec/module.mk
> -+++ b/modules/avcodec/module.mk
> +Index: baresip-0.6.1/modules/avcodec/module.mk
> +===================================================================
> +--- baresip-0.6.1.orig/modules/avcodec/module.mk
> ++++ baresip-0.6.1/modules/avcodec/module.mk
> @@ -4,9 +4,8 @@
> # Copyright (C) 2010 Creytiv.com
> #
> @@ -351,8 +371,10 @@
>
> MOD := avcodec
> $(MOD)_SRCS += avcodec.c h263.c encode.c decode.c
> ---- a/modules/amr/amr.c
> -+++ b/modules/amr/amr.c
> +Index: baresip-0.6.1/modules/amr/amr.c
> +===================================================================
> +--- baresip-0.6.1.orig/modules/amr/amr.c
> ++++ baresip-0.6.1/modules/amr/amr.c
> @@ -5,15 +5,15 @@
> */
> #include <stdlib.h>
> diff -Nru baresip-0.6.1/debian/patches/ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8.patch baresip-0.6.1/debian/patches/ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8.patch
> --- baresip-0.6.1/debian/patches/ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8.patch 1970-01-01 00:00:00.000000000 +0000
> +++ baresip-0.6.1/debian/patches/ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8.patch 2020-07-15 20:36:11.000000000 +0000
> @@ -0,0 +1,128 @@
> +From ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8 Mon Sep 17 00:00:00 2001
> +From: "Alfred E. Heggestad" <alfred.heggestad at gmail.com>
> +Date: Wed, 10 Apr 2019 14:10:21 +0200
> +Subject: [PATCH] test: copy uri_cmp source from libre
> +
> +---
> + test/sip/location.c | 104 +++++++++++++++++++++++++++++++++++++++++++-
> + 1 file changed, 103 insertions(+), 1 deletion(-)
> +
> +diff --git a/test/sip/location.c b/test/sip/location.c
> +index be2bd669..5266a08c 100644
> +--- a/test/sip/location.c
> ++++ b/test/sip/location.c
> +@@ -39,11 +39,113 @@ static void destructor_location(void *arg)
> + }
> +
> +
> ++static int param_handler(const struct pl *pname, const struct pl *pvalue,
> ++ void *arg)
> ++{
> ++ struct pl *other_params = arg;
> ++ struct pl other_pvalue = PL_INIT;
> ++ bool both;
> ++
> ++ if (0 == pl_strcmp(pname, "user"))
> ++ both = true;
> ++ else if (0 == pl_strcmp(pname, "ttl"))
> ++ both = true;
> ++ else if (0 == pl_strcmp(pname, "method"))
> ++ both = true;
> ++ else if (0 == pl_strcmp(pname, "maddr"))
> ++ both = true;
> ++ else if (0 == pl_strcmp(pname, "transport"))
> ++ both = true;
> ++ else
> ++ both = false;
> ++
> ++ if (uri_param_get(other_params, pname, &other_pvalue))
> ++ return both ? ENOENT : 0;
> ++
> ++ return pl_casecmp(pvalue, &other_pvalue);
> ++}
> ++
> ++
> ++static int header_handler(const struct pl *hname, const struct pl *hvalue,
> ++ void *arg)
> ++{
> ++ struct pl *other_headers = arg;
> ++ struct pl other_hvalue;
> ++ int err;
> ++
> ++ err = uri_header_get(other_headers, hname, &other_hvalue);
> ++ if (err)
> ++ return err;
> ++
> ++ return pl_casecmp(hvalue, &other_hvalue);
> ++}
> ++
> ++
> ++/**
> ++ * Compare two URIs - see RFC 3261 Section 19.1.4
> ++ *
> ++ * @param l Left-hand URI object
> ++ * @param r Right-hand URI object
> ++ *
> ++ * @return true if match, otherwise false
> ++ */
> ++static bool my_uri_cmp(const struct uri *l, const struct uri *r)
> ++{
> ++ int err;
> ++
> ++ if (!l || !r)
> ++ return false;
> ++
> ++ if (l == r)
> ++ return true;
> ++
> ++ /* A SIP and SIPS URI are never equivalent. */
> ++ if (pl_casecmp(&l->scheme, &r->scheme))
> ++ return false;
> ++
> ++ /* Comparison of the userinfo of SIP and SIPS URIs is case-sensitive */
> ++ if (pl_cmp(&l->user, &r->user))
> ++ return false;
> ++
> ++ if (pl_cmp(&l->password, &r->password))
> ++ return false;
> ++
> ++ if (pl_casecmp(&l->host, &r->host))
> ++ return false;
> ++ if (l->af != r->af)
> ++ return false;
> ++
> ++ if (l->port != r->port)
> ++ return false;
> ++
> ++ /* URI parameters */
> ++ err = uri_params_apply(&l->params, param_handler, (void *)&r->params);
> ++ if (err)
> ++ return false;
> ++ err = uri_params_apply(&r->params, param_handler, (void *)&l->params);
> ++ if (err)
> ++ return false;
> ++
> ++ /* URI headers */
> ++ err = uri_headers_apply(&l->headers, header_handler,
> ++ (void *)&r->headers);
> ++ if (err)
> ++ return false;
> ++ err = uri_headers_apply(&r->headers, header_handler,
> ++ (void *)&l->headers);
> ++ if (err)
> ++ return false;
> ++
> ++ /* Match */
> ++ return true;
> ++}
> ++
> ++
> + static bool cmp_handler(struct le *le, void *arg)
> + {
> + struct location *loc = le->data;
> +
> +- return uri_cmp(&loc->duri, arg);
> ++ return my_uri_cmp(&loc->duri, arg);
> + }
> +
> +
> diff -Nru baresip-0.6.1/debian/patches/series baresip-0.6.1/debian/patches/series
> --- baresip-0.6.1/debian/patches/series 2018-10-03 06:47:19.000000000 +0000
> +++ baresip-0.6.1/debian/patches/series 2020-07-15 20:37:45.000000000 +0000
> @@ -1,3 +1,4 @@
> 1001_gcc7_compat.patch
> 1002_system_header_locations.patch
> 2001_drop_libre_so_check.patch
> +ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8.patch
--
Sebastian Ramacher
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-voip-maintainers/attachments/20200717/5c3586eb/attachment-0001.sig>
More information about the Pkg-voip-maintainers
mailing list