Control: tags 961811 + patch Control: tags 961811 + pending Dear maintainer,
I've prepared an NMU for baresip (versioned as 0.6.1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru baresip-0.6.1/debian/changelog baresip-0.6.1/debian/changelog
--- baresip-0.6.1/debian/changelog 2019-02-18 13:30:38.000000000 +0100
+++ baresip-0.6.1/debian/changelog 2020-07-15 22:37:51.000000000 +0200
@@ -1,3 +1,12 @@
+baresip (0.6.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches:
+ - Unbreak patch 1002 with make 4.3 (Closes: #961811)
+ - Apply upstream patch to fix build of selftest
+
+ -- Sebastian Ramacher <sramac...@debian.org> Wed, 15 Jul 2020 22:37:51 +0200
+
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 20:42:25.000000000 +0100
+++ baresip-0.6.1/debian/patches/1002_system_header_locations.patch 2020-07-15 22:33:05.000000000 +0200
@@ -22,7 +22,7 @@
-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 '#include <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 +39,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 '#include <libavcodec/avcodec.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_AVFORMAT := $(shell echo '\#include <libavformat/avformat.h>' | \
++USE_AVFORMAT := $(shell echo '#include <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,21 +69,21 @@
- [ -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 '#include <bv32/bv32.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_CAIRO := $(shell echo '\#include <cairo/cairo.h>' |\
++USE_CAIRO := $(shell echo '#include <cairo/cairo.h>' |\
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_DTLS := $(shell echo '\#include <openssl/dtls1.h>' | \
++USE_DTLS := $(shell echo '#include <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 '#include <openssl/srtp.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_G722 := $(shell echo '\#include <spandsp/g722.h>' | \
++USE_G722 := $(shell echo '#include <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 '#include <g722_1.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_G726 := $(shell echo '\#include <spandsp/g726.h>' | \
++USE_G726 := $(shell echo '#include <spandsp/g726.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_GSM := $(shell echo '\#include <gsm.h>' | \
++USE_GSM := $(shell echo '#include <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")
@@ -117,27 +117,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 '#include <x265.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
+endif
-+USE_ILBC := $(shell echo '\#include <iLBC_define.h>' | \
++USE_ILBC := $(shell echo '#include <iLBC_define.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_ISAC := $(shell echo '\#include <isac.h>' | \
++USE_ISAC := $(shell echo '#include <isac.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_JACK := $(shell echo '\#include <jack/jack.h>' | \
++USE_JACK := $(shell echo '#include <jack/jack.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_MPG123 := $(shell echo '\#include <mpg123.h>' | \
++USE_MPG123 := $(shell echo '#include <mpg123.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_OPUS := $(shell echo '\#include <opus/opus.h>' | \
++USE_OPUS := $(shell echo '#include <opus/opus.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_OSS := $(shell echo '\#include <soundcard.h>' | \
++USE_OSS := $(shell echo '#include <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 '#include <linux/soundcard.h>' | $(CC) -E - >/dev/null 2>&1 || \
++ echo '#include <sys/soundcard.h>' | $(CC) -E - >/dev/null 2>&1 && \
+ echo yes)
-+USE_PLC := $(shell echo '\#include <spandsp/plc.h>' | \
++USE_PLC := $(shell echo '#include <spandsp/plc.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_PORTAUDIO := $(shell echo '\#include <portaudio.h>' | \
++USE_PORTAUDIO := $(shell echo '#include <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 +151,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 '#include <SDL/SDL.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_SDL2 := $(shell echo '\#include <SDL2/SDL.h>' | \
++USE_SDL2 := $(shell echo '#include <SDL2/SDL.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_SNDFILE := $(shell echo '\#include <sndfile.h>' | \
++USE_SNDFILE := $(shell echo '#include <sndfile.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_STDIO := $(shell echo '\#include <termios.h>' | \
++USE_STDIO := $(shell echo '#include <termios.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
+HAVE_SPEEXDSP := $(shell pkg-config --exists speexdsp && echo "yes")
+ifeq ($(HAVE_SPEEXDSP),)
@@ -219,36 +219,36 @@
- || [ -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 '#include <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 '#include <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 '#include <speex_preprocess.h>' | \
+ $(CC) -E - >/dev/null 2>&1 || \
-+ echo '\#include <speex/speex_preprocess.h>' | \
++ echo '#include <speex/speex_preprocess.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && \
+ echo yes)
-+USE_SYSLOG := $(shell echo '\#include <syslog.h>' | \
++USE_SYSLOG := $(shell echo '#include <syslog.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+HAVE_LIBMQTT := $(shell echo '\#include <mosquitto.h>' | \
++HAVE_LIBMQTT := $(shell echo '#include <mosquitto.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_V4L := $(shell echo '\#include <libv4l1.h>' | \
++USE_V4L := $(shell echo '#include <libv4l1.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+HAVE_LIBV4L2 := $(shell echo '\#include <libv4l2.h>' | \
++HAVE_LIBV4L2 := $(shell echo '#include <libv4l2.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_V4L2 := $(shell echo '\#include <linux/videodev2.h>' | \
++USE_V4L2 := $(shell echo '#include <linux/videodev2.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_X11 := $(shell echo '\#include <X11/Xlib.h>' | \
++USE_X11 := $(shell echo '#include <X11/Xlib.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_ZRTP := $(shell echo '\#include <libzrtp/zrtp.h>' | \
++USE_ZRTP := $(shell echo '#include <libzrtp/zrtp.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
-+USE_VPX := $(shell echo '\#include <vpx/vp8.h>' | \
++USE_VPX := $(shell echo '#include <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 '#include <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 '#include <OMX_Core.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
else
# Windows.
@@ -258,7 +258,7 @@
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 '#include <linux/input.h>' | \
+ $(CC) -E - >/dev/null 2>&1 && echo yes)
MODULES += dtmfio
endif
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 01:00:00.000000000 +0100
+++ baresip-0.6.1/debian/patches/ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8.patch 2020-07-15 22:36:11.000000000 +0200
@@ -0,0 +1,128 @@
+From ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8 Mon Sep 17 00:00:00 2001
+From: "Alfred E. Heggestad" <alfred.hegges...@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 08:47:19.000000000 +0200
+++ baresip-0.6.1/debian/patches/series 2020-07-15 22:37:45.000000000 +0200
@@ -1,3 +1,4 @@
1001_gcc7_compat.patch
1002_system_header_locations.patch
2001_drop_libre_so_check.patch
+ac61c58a1e90a88d81a3aa3b2cf3c950ee6d9bd8.patch
signature.asc
Description: PGP signature
