[Pkg-voip-commits] [asterisk] 01/01: update patches for asterisk 11.9.0
Jeremy Lainé
sharky at moszumanska.debian.org
Mon Apr 28 12:23:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
sharky pushed a commit to branch master
in repository asterisk.
commit 314dc1d2564dcf4046f9550c2a9064ab478ba9a0
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date: Mon Apr 28 14:23:03 2014 +0200
update patches for asterisk 11.9.0
---
debian/changelog | 10 ++
debian/patches/dahdi_pri_event_removed | 155 -------------------
debian/patches/freeradius-client | 74 ---------
debian/patches/hyphen | 267 ---------------------------------
debian/patches/pjproject | 10 +-
debian/patches/series | 3 -
6 files changed, 15 insertions(+), 504 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 78d7ace..8b308b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+asterisk (1:11.9.0~dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ - Drop dahdi_pri_event_removed patch, fixed upstream.
+ - Drop freeradius-client patch, fixed upstream.
+ - Drop hyphen patch, fixed upstream.
+ - Update pjproject patch.
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org> Mon, 28 Apr 2014 14:20:49 +0200
+
asterisk (1:11.8.1~dfsg-1) unstable; urgency=high
* New upstream security release (Closes: #741313).
diff --git a/debian/patches/dahdi_pri_event_removed b/debian/patches/dahdi_pri_event_removed
deleted file mode 100644
index de83a41..0000000
--- a/debian/patches/dahdi_pri_event_removed
+++ /dev/null
@@ -1,155 +0,0 @@
-From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Date: Wed, 17 Jul 2013 16:56:14 +0000
-Subject: handle DAHDI_EVENT_REMOVED on a pri D-Channel
-Origin: http://svnview.digium.com/svn/asterisk?view=rev&rev=394552
-
-When a DAHDI device is removed at run-time it sends the event
-DAHDI_EVENT_REMOVED on each channel. This is intended to signal the
-userspace program to close the respective file handle, as the driver of
-the device will need all of them closed to properly clean-up.
-
-This event has long since been handled in chan_dahdi (chan_zap at the
-time). However the event that is sent on a D-Channel of a "PRI" (ISDN)
-span simply gets ignored.
-
-This commit adds handling for closing the file descriptor (and shutting
-down the span, while we're at it).
-
-It also adds a CLI command 'pri destroy span <N>' to destroy the span
-and its DAHDI channels.
-
-Review: https://reviewboard.asterisk.org/r/726/
-
-Trivial backport from trunk / 12.
-
----
- channels/chan_dahdi.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 97 insertions(+)
-
---- a/channels/chan_dahdi.c
-+++ b/channels/chan_dahdi.c
-@@ -3217,6 +3217,8 @@ static int sig_pri_tone_to_dahditone(enu
- #endif /* defined(HAVE_PRI) */
-
- #if defined(HAVE_PRI)
-+static int pri_destroy_dchan(struct sig_pri_span *pri);
-+
- static void my_handle_dchan_exception(struct sig_pri_span *pri, int index)
- {
- int x;
-@@ -3244,6 +3246,9 @@ static void my_handle_dchan_exception(st
- case DAHDI_EVENT_NOALARM:
- pri_event_noalarm(pri, index, 0);
- break;
-+ case DAHDI_EVENT_REMOVED:
-+ pri_destroy_dchan(pri);
-+ break;
- default:
- break;
- }
-@@ -14887,6 +14892,97 @@ static char *handle_pri_show_spans(struc
- #endif /* defined(HAVE_PRI) */
-
- #if defined(HAVE_PRI)
-+#define container_of(ptr, type, member) \
-+ ((type *)((char *)(ptr) - offsetof(type, member)))
-+/*!
-+ * \internal
-+ * \brief Destroy a D-Channel of a PRI span
-+ * \since 12
-+ *
-+ * \param pri the pri span
-+ *
-+ * \return TRUE if the span was valid and we attempted destroying.
-+ *
-+ * Shuts down a span and destroys its D-Channel. Further destruction
-+ * of the B-channels using dahdi_destroy_channel() would probably be required
-+ * for the B-Channels.
-+ */
-+static int pri_destroy_dchan(struct sig_pri_span *pri)
-+{
-+ int i;
-+ struct dahdi_pri* dahdi_pri;
-+
-+ if (!pri->master || (pri->master == AST_PTHREADT_NULL)) {
-+ return 0;
-+ }
-+ pthread_cancel(pri->master);
-+ pthread_join(pri->master, NULL);
-+
-+ /* The 'struct dahdi_pri' that contains our 'struct sig_pri_span' */
-+ dahdi_pri = container_of(pri, struct dahdi_pri, pri);
-+ for (i = 0; i < SIG_PRI_NUM_DCHANS; i++) {
-+ ast_debug(4, "closing pri_fd %d\n", i);
-+ dahdi_close_pri_fd(dahdi_pri, i);
-+ }
-+ pri->pri = NULL;
-+ ast_debug(1, "PRI span %d destroyed\n", pri->span);
-+ return 1;
-+}
-+
-+static char *handle_pri_destroy_span(struct ast_cli_entry *e, int cmd,
-+ struct ast_cli_args *a)
-+{
-+ int span;
-+ int i;
-+ int res;
-+
-+ switch (cmd) {
-+ case CLI_INIT:
-+ e->command = "pri destroy span";
-+ e->usage =
-+ "Usage: pri destroy span <span>\n"
-+ " Destorys D-channel of span and its B-channels.\n"
-+ " DON'T USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING.\n";
-+ return NULL;
-+ case CLI_GENERATE:
-+ return complete_span_4(a->line, a->word, a->pos, a->n);
-+ }
-+
-+ if (a->argc < 4) {
-+ return CLI_SHOWUSAGE;
-+ }
-+ res = sscanf(a->argv[3], "%30d", &span);
-+ if ((res != 1) || span < 1 || span > NUM_SPANS) {
-+ ast_cli(a->fd,
-+ "Invalid span '%s'. Should be a number from %d to %d\n",
-+ a->argv[3], 1, NUM_SPANS);
-+ return CLI_SUCCESS;
-+ }
-+ if (!pris[span - 1].pri.pri) {
-+ ast_cli(a->fd, "No PRI running on span %d\n", span);
-+ return CLI_SUCCESS;
-+ }
-+
-+ for (i = 0; i < pris[span - 1].pri.numchans; i++) {
-+ int channel;
-+ struct sig_pri_chan *pvt = pris[span - 1].pri.pvts[i];
-+
-+ if (!pvt) {
-+ continue;
-+ }
-+ channel = pvt->channel;
-+ ast_debug(2, "About to destroy B-channel %d.\n", channel);
-+ dahdi_destroy_channel_bynum(channel);
-+ }
-+ ast_debug(2, "About to destroy D-channel of span %d.\n", span);
-+ pri_destroy_dchan(&pris[span - 1].pri);
-+
-+ return CLI_SUCCESS;
-+}
-+
-+#endif /* defined(HAVE_PRI) */
-+
-+#if defined(HAVE_PRI)
- static char *handle_pri_show_span(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
- {
- int span;
-@@ -14992,6 +15088,7 @@ static struct ast_cli_entry dahdi_pri_cl
- AST_CLI_DEFINE(handle_pri_show_channels, "Displays PRI channel information"),
- AST_CLI_DEFINE(handle_pri_show_spans, "Displays PRI span information"),
- AST_CLI_DEFINE(handle_pri_show_span, "Displays PRI span information"),
-+ AST_CLI_DEFINE(handle_pri_destroy_span, "Destroy a PRI span"),
- AST_CLI_DEFINE(handle_pri_show_debug, "Displays current PRI debug settings"),
- AST_CLI_DEFINE(handle_pri_set_debug_file, "Sends PRI debug output to the specified file"),
- AST_CLI_DEFINE(handle_pri_version, "Displays libpri version"),
diff --git a/debian/patches/freeradius-client b/debian/patches/freeradius-client
deleted file mode 100644
index 19cdb2d..0000000
--- a/debian/patches/freeradius-client
+++ /dev/null
@@ -1,74 +0,0 @@
-Description: allows either libfreeradius-client or libradiusclient-ng
-Author: Daniel Pocock <daniel at pocock.com.au>
-Author: Jeremy Lainé <jeremy.laine at m4x.org>
-Bug: https://issues.asterisk.org/jira/browse/ASTERISK-22980
---- a/cdr/cdr_radius.c 2013-12-11 10:08:13.537159711 +0100
-+++ b/cdr/cdr_radius.c 2013-12-11 10:08:13.529159762 +0100
-@@ -36,7 +36,11 @@
-
- ASTERISK_FILE_VERSION(__FILE__, "$Revision: 328259 $")
-
-+#ifdef FREERADIUS_CLIENT
-+#include <freeradius-client.h>
-+#else
- #include <radiusclient-ng.h>
-+#endif
-
- #include "asterisk/channel.h"
- #include "asterisk/cdr.h"
-@@ -82,7 +86,11 @@
- static const char name[] = "radius";
- static const char cdr_config[] = "cdr.conf";
-
-+#ifdef FREERADIUS_CLIENT
-+static char radiuscfg[PATH_MAX] = "/etc/radiusclient/radiusclient.conf";
-+#else
- static char radiuscfg[PATH_MAX] = "/etc/radiusclient-ng/radiusclient.conf";
-+#endif
-
- static struct ast_flags global_flags = { RADIUS_FLAG_USEGMTIME | RADIUS_FLAG_LOGUNIQUEID | RADIUS_FLAG_LOGUSERFIELD };
-
---- a/cel/cel_radius.c 2013-12-11 10:08:13.537159711 +0100
-+++ b/cel/cel_radius.c 2013-12-11 10:08:13.529159762 +0100
-@@ -35,7 +35,11 @@
-
- ASTERISK_FILE_VERSION(__FILE__, "$Rev: 328259 $")
-
-+#ifdef FREERADIUS_CLIENT
-+#include <freeradius-client.h>
-+#else
- #include <radiusclient-ng.h>
-+#endif
-
- #include "asterisk/channel.h"
- #include "asterisk/cel.h"
-@@ -79,7 +83,11 @@
-
- static char *cel_config = "cel.conf";
-
-+#ifdef FREERADIUS_CLIENT
-+static char radiuscfg[PATH_MAX] = "/etc/radiusclient/radiusclient.conf";
-+#else
- static char radiuscfg[PATH_MAX] = "/etc/radiusclient-ng/radiusclient.conf";
-+#endif
-
- static struct ast_flags global_flags = { RADIUS_FLAG_USEGMTIME | RADIUS_FLAG_LOGUNIQUEID | RADIUS_FLAG_LOGUSERFIELD };
-
---- a/configure.ac 2013-12-11 10:08:13.537159711 +0100
-+++ b/configure.ac 2013-12-11 10:11:02.420053317 +0100
-@@ -2114,7 +2117,14 @@ fi
- # Some distributions (like SuSE) remove the 5.1 suffix.
- AST_EXT_LIB_CHECK([LUA], [lua], [luaL_openlib], [lua.h], [-lm])
-
--AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
-+# Accept either RADIUS client library, their APIs are fully compatible,
-+# just different header filenames and different SONAMEs
-+AST_EXT_LIB_CHECK([RADIUS], [freeradius-client], [rc_read_config], [freeradius-client.h])
-+if test "x${PBX_RADIUS}" = "x1"; then
-+ AC_DEFINE(FREERADIUS_CLIENT, [], [Use the FreeRADIUS-client library])
-+else
-+ AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
-+fi
-
- AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcfg])
- AST_EXT_LIB_CHECK([COROSYNC_CFG_STATE_TRACK], [cfg], [corosync_cfg_state_track], [corosync/cfg.h], [-lcfg])
diff --git a/debian/patches/hyphen b/debian/patches/hyphen
deleted file mode 100644
index eadc37f..0000000
--- a/debian/patches/hyphen
+++ /dev/null
@@ -1,267 +0,0 @@
-Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Description: hyphen/minus fixes in asterisk.8
-Bug: https://issues.asterisk.org/jira/browse/ASTERISK-23028
-
-groff considers '-' as hyphen and '\-' as minus.
---- a/doc/asterisk.8
-+++ b/doc/asterisk.8
-@@ -16,27 +16,27 @@ asterisk
- \fBasterisk\fR \kx
- .if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
- 'in \n(.iu+\nxu
--[\fB-BcdfFghiImnpqRtTvVW\fR] [\fB-C \fR\fIfile\fR] [\fB-e \fR\fImemory\fR] [\fB-G \fR\fIgroup\fR] [\fB-L \fR\fIloadaverage\fR] [\fB-M \fR\fIvalue\fR] [\fB-U \fR\fIuser\fR] [\fB-s \fR\fIsocket-file\fR]
--'in \n(.iu-\nxu
-+[\fB\-BcdfFghiImnpqRtTvVW\fR] [\fB\-C \fR\fIfile\fR] [\fB\-e \fR\fImemory\fR] [\fB\-G \fR\fIgroup\fR] [\fB\-L \fR\fIloadaverage\fR] [\fB\-M \fR\fIvalue\fR] [\fB\-U \fR\fIuser\fR] [\fB\-s \fR\fIsocket\-file\fR]
-+'in \n(.iu\-\nxu
- .ad b
- 'hy
- 'nh
- .fi
- .ad l
--\fBasterisk -r\fR \kx
-+\fBasterisk \-r\fR \kx
- .if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
- 'in \n(.iu+\nxu
--[\fB-v\fR] [\fB-d\fR] [\fB-x \fR\fIcommand\fR]
-+[\fB\-v\fR] [\fB\-d\fR] [\fB\-x \fR\fIcommand\fR]
- 'in \n(.iu-\nxu
- .ad b
- 'hy
- 'nh
- .fi
- .ad l
--\fBasterisk -R\fR \kx
-+\fBasterisk \-R\fR \kx
- .if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
- 'in \n(.iu+\nxu
--[\fB-v\fR] [\fB-d\fR] [\fB-x \fR\fIcommand\fR]
-+[\fB\-v\fR] [\fB\-d\fR] [\fB\-x \fR\fIcommand\fR]
- 'in \n(.iu-\nxu
- .ad b
- 'hy
-@@ -52,12 +52,12 @@ ISDN BRI and many more.
- .PP
- At start, Asterisk reads the /etc/asterisk/asterisk.conf main configuration
- file and locates the rest of the configuration files from the configuration
--in that file. The -C option specifies an alternate main configuration file.
-+in that file. The \-C option specifies an alternate main configuration file.
- Virtually all aspects of the operation of asterisk's configuration files
- can be found in the sample configuration files. The format for those files
- is generally beyond the scope of this man page.
- .PP
--When running with \fB-c\fR, \fB-r\fR or \fB-R\fR
-+When running with \fB\-c\fR, \fB\-r\fR or \fB\-R\fR
- options, Asterisk supplies a powerful command line, including command
- completion, which may be used to monitors its status, perform a variety
- of administrative actions and even explore the applications that are
-@@ -70,26 +70,26 @@ in the foreground). However running it w
- \*(T<\fB\-R\fR\*(T> connects to an existing Asterisk instance through
- a remote console.
- .TP
---B
-+\-B
- Force the background of the terminal to be black, in order for
- terminal colors to show up properly. Equivalent to
- \*(T<\fBforceblackbackground = yes\fR\*(T> in
- \*(T<\fIasterisk.conf\fR\*(T>. See also
- \*(T<\fB\-n\fR\*(T> and \*(T<\fB\-W\fR\*(T>.
- .TP
---C \fIfile\fR
-+\-C \fIfile\fR
- Use \*(T<\fIfile\fR\*(T> as master configuration file
- instead of the default, /etc/asterisk/asterisk.conf
- .TP
---c
-+\-c
- Provide a control console on the calling terminal. The
- console is similar to the remote console provided by
- \*(T<\fB\-r\fR\*(T>. Specifying this option implies
--\fB-f\fR and will cause asterisk to no longer
-+\fB\-f\fR and will cause asterisk to no longer
- fork or detach from the controlling terminal. Equivalent
- to \*(T<\fBconsole = yes\fR\*(T> in \*(T<\fIasterisk.conf\fR\*(T>.
- .TP
---d
-+\-d
- Enable extra debugging statements. This parameter may be used several
- times, and each increases the debug level. Equivalent to \*(T<\fBdebug = \fR\*(T>\fInum\fR
- in \*(T<\fIasterisk.conf\fR\*(T> to explicitly set the initian debug
-@@ -104,62 +104,62 @@ has decreased to under \fImemory\fR mega
- Equivalent to \*(T<\fBminmemfree = \fR\*(T>\fImemory\fR in
- \*(T<\fIasterisk.conf\fR\*(T>.
- .TP
---f
-+\-f
- Do not fork or detach from controlling terminal. Overrides any
--preceding specification of \fB-F\fR on the command line.
-+preceding specification of \fB\-F\fR on the command line.
- Equivalent to \*(T<\fBnofork = yes\fR\*(T> in \*(T<\fIasterisk.conf\fR\*(T>.
- See also \*(T<\fB\-c\fR\*(T>.
- .TP
---F
-+\-F
- Always fork and detach from controlling terminal. Overrides any
--preceding specification of \fB-f\fR on the command line.
-+preceding specification of \fB\-f\fR on the command line.
- May also be used to prevent \*(T<\fB\-d\fR\*(T> and \*(T<\fB\-v\fR\*(T> to imply
- no forking. Equivalent to \*(T<\fBalwaysfork = yes\fR\*(T> in \*(T<\fIasterisk.conf\fR\*(T>.
- .TP
---g
-+\-g
- Remove resource limit on core size, thus forcing Asterisk to dump
- core in the unlikely event of a segmentation fault or abort signal.
- \fBNOTE:\fR in some cases this may be incompatible
--with the \fB-U\fR or \fB-G\fR flags.
-+with the \fB\-U\fR or \fB\-G\fR flags.
- .TP
---G \fIgroup\fR
-+\-G \fIgroup\fR
- Run as group \fIgroup\fR instead of the
- calling group. \fBNOTE:\fR this requires substantial work
- to be sure that Asterisk's environment has permission to write
- the files required for its operation, including logs, its comm
- socket, the asterisk database, etc.
- .TP
---h
-+\-h
- Provide brief summary of command line arguments and terminate.
- .TP
---i
-+\-i
- Prompt user to intialize any encrypted private keys for IAX2
- secure authentication during startup.
- .TP
---I
-+\-I
- Enable internal timing if DAHDI timing is available.
- The default behaviour is that outbound packets are phase locked
- to inbound packets. Enabling this switch causes them to be
- locked to the internal DAHDI timer instead.
- .TP
---L \fIloadaverage\fR
-+\-L \fIloadaverage\fR
- Limits the maximum load average before rejecting new calls. This can
- be useful to prevent a system from being brought down by terminating
- too many simultaneous calls.
- .TP
---m
-+\-m
- Temporarily mutes output to the console and logs. To return to normal,
- use \fBlogger mute\fR.
- .TP
---M \fIvalue\fR
-+\-M \fIvalue\fR
- Limits the maximum number of calls to the specified value. This can
- be useful to prevent a system from being brought down by terminating
- too many simultaneous calls.
- .TP
---n
-+\-n
- Disable ANSI colors even on terminals capable of displaying them.
- .TP
---p
-+\-p
- If supported by the operating system (and executing as root),
- attempt to run with realtime priority for increased performance and
- responsiveness within the Asterisk process, at the expense of other
-@@ -170,77 +170,77 @@ Note: \fBastcanary\fR will run concurren
- running or is killed, \fBasterisk\fR will slow down to
- normal process priority, to avoid locking up the machine.
- .TP
---q
-+\-q
- Reduce default console output when running in conjunction with
--console mode (\fB-c\fR).
-+console mode (\fB\-c\fR).
- .TP
---r
-+\-r
- Instead of running a new Asterisk process, attempt to connect
- to a running Asterisk process and provide a console interface
- for controlling it.
- .TP
---R
--Much like \fB-r\fR. Instead of running a new Asterisk process, attempt to connect
-+\-R
-+Much like \fB\-r\fR. Instead of running a new Asterisk process, attempt to connect
- to a running Asterisk process and provide a console interface
- for controlling it. Additionally, if connection to the Asterisk
- process is lost, attempt to reconnect for as long as 30 seconds.
- .TP
---s \fIsocket file name\fR
--In combination with \fB-r\fR, connect directly to a specified
-+\-s \fIsocket file name\fR
-+In combination with \fB\-r\fR, connect directly to a specified
- Asterisk server socket.
- .TP
---t
-+\-t
- When recording files, write them first into a temporary holding directory,
- then move them into the final location when done.
- .TP
---T
-+\-T
- Add timestamp to all non-command related output going to the console
- when running with verbose and/or logging to the console.
- .TP
---U \fIuser\fR
-+\-U \fIuser\fR
- Run as user \fIuser\fR instead of the
- calling user. \fBNOTE:\fR this requires substantial work
- to be sure that Asterisk's environment has permission to write
- the files required for its operation, including logs, its comm
- socket, the asterisk database, etc.
- .TP
---v
-+\-v
- Increase the level of verboseness on the console. The more times
--\fB-v\fR is specified, the more verbose the output is.
--Specifying this option implies \fB-f\fR and will cause
-+\fB\-v\fR is specified, the more verbose the output is.
-+Specifying this option implies \fB\-f\fR and will cause
- asterisk to no longer fork or detach from the controlling terminal.
--This option may also be used in conjunction with \fB-r\fR
--and \fB-R\fR.
-+This option may also be used in conjunction with \fB\-r\fR
-+and \fB\-R\fR.
-
- Note: This always sets the verbose level in the asterisk process,
- even if it is running in the background. This will affect the size
- of your log files.
- .TP
---V
-+\-V
- Display version information and exit immediately.
- .TP
---W
-+\-W
- Display colored terminal text as if the background were white
- or otherwise light in color. Normally, terminal text is displayed
- as if the background were black or otherwise dark in color.
- .TP
---x \fIcommand\fR
-+\-x \fIcommand\fR
- Connect to a running Asterisk process and execute a command on
- a command line, passing any output through to standard out and
- then terminating when the command execution completes. Implies
--\fB-r\fR when \fB-R\fR is not explicitly
-+\fB\-r\fR when \fB\-R\fR is not explicitly
- supplied.
- .TP
---X
-+\-X
- Enables executing of includes via \fB#exec\fR directive.
- This can be useful if You want to do \fB#exec\fR inside
- \*(T<\fIasterisk.conf\fR\*(T>
- .SH EXAMPLES
- \fBasterisk\fR - Begin Asterisk as a daemon
- .PP
--\fBasterisk -vvvgc\fR - Run on controlling terminal
-+\fBasterisk \-vvvgc\fR - Run on controlling terminal
- .PP
--\fBasterisk -rx "core show channels"\fR - Display channels on running server
-+\fBasterisk \-rx "core show channels"\fR - Display channels on running server
- .SH BUGS
- Bug reports and feature requests may be filed at https://issues.asterisk.org
- .SH "SEE ALSO"
-
diff --git a/debian/patches/pjproject b/debian/patches/pjproject
index 87870ed..bafb86b 100644
--- a/debian/patches/pjproject
+++ b/debian/patches/pjproject
@@ -106,7 +106,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
<support_level>core</support_level>
***/
-@@ -52,9 +52,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 397604 $")
+@@ -52,9 +52,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 409565 $")
* here since it is used internally by pjlib. The only other option would be to modify pjlib... which won't happen. */
#undef bzero
#define bzero bzero
@@ -119,12 +119,12 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
#endif
#include "asterisk/stun.h"
-@@ -1801,7 +1801,7 @@ static int ast_rtp_new(struct ast_rtp_instance *instance,
- passwd = pj_str(rtp->local_passwd);
+@@ -1862,7 +1862,7 @@ static int ice_create(struct ast_rtp_instance *instance, struct ast_sockaddr *ad
/* Create an ICE session for ICE negotiation */
-- if (icesupport && pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_UNKNOWN, 2, &ast_rtp_ice_sess_cb, &ufrag, &passwd, &rtp->ice) == PJ_SUCCESS) {
-+ if (icesupport && pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_UNKNOWN, 2, &ast_rtp_ice_sess_cb, &ufrag, &passwd, NULL, &rtp->ice) == PJ_SUCCESS) {
+ if (pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_UNKNOWN, 2,
+- &ast_rtp_ice_sess_cb, &ufrag, &passwd, &rtp->ice) == PJ_SUCCESS) {
++ &ast_rtp_ice_sess_cb, &ufrag, &passwd, NULL, &rtp->ice) == PJ_SUCCESS) {
/* Make this available for the callbacks */
rtp->ice->user_data = rtp;
diff --git a/debian/patches/series b/debian/patches/series
index 78319a6..13ce368 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,12 +24,9 @@ astdatadir
pjproject
# Backport of dynamic generation of DAHDI channels:
-dahdi_pri_event_removed
dahdi_create_channels
-hyphen
reenable
-freeradius-client
ignore_failed_channels.patch
smsq_enable.patch
ASTERISK-23310.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git
More information about the Pkg-voip-commits
mailing list