[Pkg-voip-commits] r10303 - in /asterisk/branches/experimental/debian: changelog patches/allow-tilde-destdir patches/bzero patches/pjproject patches/safe_asterisk-config patches/safe_asterisk-nobg
msp at alioth.debian.org
msp at alioth.debian.org
Sat Sep 28 04:12:38 UTC 2013
Author: msp
Date: Sat Sep 28 04:12:36 2013
New Revision: 10303
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10303
Log:
Refresh debian/patches for asterisk/11.5.1
Modified:
asterisk/branches/experimental/debian/changelog
asterisk/branches/experimental/debian/patches/allow-tilde-destdir
asterisk/branches/experimental/debian/patches/bzero
asterisk/branches/experimental/debian/patches/pjproject
asterisk/branches/experimental/debian/patches/safe_asterisk-config
asterisk/branches/experimental/debian/patches/safe_asterisk-nobg
Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=10303&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Sat Sep 28 04:12:36 2013
@@ -1,4 +1,4 @@
-asterisk (1:11.4.0~dfsg-1) UNRELEASED; urgency=low
+asterisk (1:11.5.1~dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
@@ -50,8 +50,9 @@
[ Mark Purcell ]
* Update debian/watch for 11.x series
-
- -- Mark Purcell <msp at debian.org> Sun, 16 Jun 2013 21:19:01 +1000
+ * Refresh debian/patches for asterisk/11.5.1
+
+ -- Mark Purcell <msp at debian.org> Sat, 28 Sep 2013 13:40:36 +1000
asterisk (1:1.8.13.0~dfsg-1) unstable; urgency=high
Modified: asterisk/branches/experimental/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/allow-tilde-destdir?rev=10303&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/allow-tilde-destdir (original)
+++ asterisk/branches/experimental/debian/patches/allow-tilde-destdir Sat Sep 28 04:12:36 2013
@@ -12,9 +12,11 @@
This patch relaxes this test just for cases where the ~ is followed by a '/',
which should catch most cases.
---- a/Makefile
-+++ b/Makefile
-@@ -608,7 +608,7 @@ oldmodcheck:
+Index: asterisk-11.5.1~dfsg/Makefile
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/Makefile 2013-04-16 03:23:19.000000000 +1000
++++ asterisk-11.5.1~dfsg/Makefile 2013-09-28 13:45:46.000000000 +1000
+@@ -596,7 +596,7 @@
fi
badshell:
Modified: asterisk/branches/experimental/debian/patches/bzero
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/bzero?rev=10303&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/bzero (original)
+++ asterisk/branches/experimental/debian/patches/bzero Sat Sep 28 04:12:36 2013
@@ -16,11 +16,11 @@
res/res_rtp_asterisk.c | 4 ----
2 files changed, 15 deletions(-)
-diff --git a/include/asterisk.h b/include/asterisk.h
-index a25f291..e99bdee 100644
---- a/include/asterisk.h
-+++ b/include/asterisk.h
-@@ -213,17 +213,6 @@ struct ast_variable;
+Index: asterisk-11.5.1~dfsg/include/asterisk.h
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/include/asterisk.h 2012-01-31 08:21:16.000000000 +1100
++++ asterisk-11.5.1~dfsg/include/asterisk.h 2013-09-28 13:46:40.000000000 +1000
+@@ -213,17 +213,6 @@
struct ast_str;
struct ast_sched_context;
@@ -38,11 +38,11 @@
/* Some handy macros for turning a preprocessor token into (effectively) a quoted string */
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
-diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
-index 4450a51..05ebf0a 100644
---- a/res/res_rtp_asterisk.c
-+++ b/res/res_rtp_asterisk.c
-@@ -46,10 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+Index: asterisk-11.5.1~dfsg/res/res_rtp_asterisk.c
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/res/res_rtp_asterisk.c 2013-05-09 14:10:27.000000000 +1000
++++ asterisk-11.5.1~dfsg/res/res_rtp_asterisk.c 2013-09-28 13:46:40.000000000 +1000
+@@ -47,10 +47,6 @@
#include <openssl/bio.h>
#endif
@@ -53,6 +53,3 @@
#include "pjlib.h"
#include "pjlib-util.h"
#include "pjnath.h"
---
-1.7.10.4
-
Modified: asterisk/branches/experimental/debian/patches/pjproject
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/pjproject?rev=10303&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/pjproject (original)
+++ asterisk/branches/experimental/debian/patches/pjproject Sat Sep 28 04:12:36 2013
@@ -8,9 +8,11 @@
(With minor backport adjustments for branch 11)
---- a/build_tools/menuselect-deps.in
-+++ b/build_tools/menuselect-deps.in
-@@ -43,6 +43,7 @@ OPENH323=@PBX_OPENH323@
+Index: asterisk-11.5.1~dfsg/build_tools/menuselect-deps.in
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/build_tools/menuselect-deps.in 2013-04-12 05:59:35.000000000 +1000
++++ asterisk-11.5.1~dfsg/build_tools/menuselect-deps.in 2013-09-28 13:47:41.000000000 +1000
+@@ -43,6 +43,7 @@
OSPTK=@PBX_OSPTK@
OSS=@PBX_OSS@
PGSQL=@PBX_PGSQL@
@@ -18,9 +20,11 @@
POPT=@PBX_POPT@
PORTAUDIO=@PBX_PORTAUDIO@
PRI=@PBX_PRI@
---- a/configure.ac
-+++ b/configure.ac
-@@ -425,6 +425,7 @@ AST_EXT_LIB_SETUP([OPENR2], [MFR2], [ope
+Index: asterisk-11.5.1~dfsg/configure.ac
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/configure.ac 2013-09-28 13:47:41.000000000 +1000
++++ asterisk-11.5.1~dfsg/configure.ac 2013-09-28 13:47:41.000000000 +1000
+@@ -425,6 +425,7 @@
AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
@@ -28,7 +32,7 @@
AST_EXT_LIB_SETUP([POPT], [popt], [popt])
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
-@@ -1994,6 +1995,8 @@ if test "${PG_CONFIG}" != No; then
+@@ -1996,6 +1997,8 @@
fi
fi
@@ -37,8 +41,10 @@
AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])
---- a/include/asterisk/autoconfig.h.in
-+++ b/include/asterisk/autoconfig.h.in
+Index: asterisk-11.5.1~dfsg/include/asterisk/autoconfig.h.in
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/include/asterisk/autoconfig.h.in 2013-05-15 22:39:55.000000000 +1000
++++ asterisk-11.5.1~dfsg/include/asterisk/autoconfig.h.in 2013-09-28 13:47:41.000000000 +1000
@@ -551,6 +551,9 @@
/* Define to indicate presence of the pg_encoding_to_char API. */
#undef HAVE_PGSQL_pg_encoding_to_char
@@ -49,9 +55,11 @@
/* Define to 1 if your system defines IP_PKTINFO. */
#undef HAVE_PKTINFO
---- a/makeopts.in
-+++ b/makeopts.in
-@@ -214,6 +214,9 @@ OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@
+Index: asterisk-11.5.1~dfsg/makeopts.in
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/makeopts.in 2013-04-12 05:59:35.000000000 +1000
++++ asterisk-11.5.1~dfsg/makeopts.in 2013-09-28 13:47:41.000000000 +1000
+@@ -214,6 +214,9 @@
PGSQL_INCLUDE=@PGSQL_INCLUDE@
PGSQL_LIB=@PGSQL_LIB@
@@ -61,9 +69,11 @@
POPT_INCLUDE=@POPT_INCLUDE@
POPT_LIB=@POPT_LIB@
---- a/res/Makefile
-+++ b/res/Makefile
-@@ -67,26 +67,4 @@ endif
+Index: asterisk-11.5.1~dfsg/res/Makefile
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/res/Makefile 2013-02-05 06:50:52.000000000 +1100
++++ asterisk-11.5.1~dfsg/res/Makefile 2013-09-28 13:47:41.000000000 +1000
+@@ -67,26 +67,4 @@
ael/pval.o: ael/pval.c
clean::
@@ -90,17 +100,19 @@
-res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
-res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
-res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
---- a/res/res_rtp_asterisk.c
-+++ b/res/res_rtp_asterisk.c
+Index: asterisk-11.5.1~dfsg/res/res_rtp_asterisk.c
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/res/res_rtp_asterisk.c 2013-09-28 13:47:41.000000000 +1000
++++ asterisk-11.5.1~dfsg/res/res_rtp_asterisk.c 2013-09-28 13:47:41.000000000 +1000
@@ -29,6 +29,7 @@
*/
/*** MODULEINFO
-+ <use type="external">pjproject</use>
++ <use type="external">pjproject</use>
+ <depend>uuid</depend>
<support_level>core</support_level>
***/
-
-@@ -46,9 +47,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -47,9 +48,11 @@
#include <openssl/bio.h>
#endif
@@ -115,7 +127,7 @@
#include "asterisk/stun.h"
#include "asterisk/pbx.h"
-@@ -129,6 +132,7 @@ static int nochecksums;
+@@ -130,6 +133,7 @@
#endif
static int strictrtp = DEFAULT_STRICT_RTP; /*< Only accept RTP frames from a defined source. If we receive an indication of a changing source, enter learning mode. */
static int learning_min_sequential = DEFAULT_LEARNING_MIN_SEQUENTIAL; /*< Number of sequential RTP frames needed from a single source during learning mode to accept new source. */
@@ -123,7 +135,7 @@
static int icesupport = DEFAULT_ICESUPPORT;
static struct sockaddr_in stunaddr;
static pj_str_t turnaddr;
-@@ -153,6 +157,7 @@ static pj_thread_t *thread;
+@@ -154,6 +158,7 @@
/*! \brief Notification that the ICE/TURN worker thread should stop */
static int worker_terminate;
@@ -131,7 +143,7 @@
#define FLAG_3389_WARNING (1 << 0)
#define FLAG_NAT_ACTIVE (3 << 1)
-@@ -250,12 +255,14 @@ struct ast_rtp {
+@@ -251,12 +256,14 @@
struct rtp_red *red;
@@ -148,7 +160,7 @@
unsigned int passthrough:1; /*!< Bit to indicate that the received packet should be passed through */
unsigned int ice_started:1; /*!< Bit to indicate ICE connectivity checks have started */
-@@ -267,6 +274,7 @@ struct ast_rtp {
+@@ -268,6 +275,7 @@
struct ao2_container *local_candidates; /*!< The local ICE candidates */
struct ao2_container *remote_candidates; /*!< The remote ICE candidates */
@@ -156,7 +168,7 @@
#ifdef HAVE_OPENSSL_SRTP
SSL_CTX *ssl_ctx; /*!< SSL context */
-@@ -394,6 +402,22 @@ static int ast_rtp_activate(struct ast_r
+@@ -395,6 +403,22 @@
static int __rtp_sendto(struct ast_rtp_instance *instance, void *buf, size_t size, int flags, struct ast_sockaddr *sa, int rtcp, int *ice, int use_srtp);
@@ -179,7 +191,7 @@
/*! \brief Destructor for locally created ICE candidates */
static void ast_rtp_ice_candidate_destroy(void *obj)
{
-@@ -476,19 +500,6 @@ static void pj_thread_register_check(voi
+@@ -477,19 +501,6 @@
return;
}
@@ -199,7 +211,7 @@
static void ast_rtp_ice_start(struct ast_rtp_instance *instance)
{
struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
-@@ -692,6 +703,7 @@ static struct ast_rtp_engine_ice ast_rtp
+@@ -693,6 +704,7 @@
.get_local_candidates = ast_rtp_ice_get_local_candidates,
.ice_lite = ast_rtp_ice_lite,
};
@@ -207,7 +219,7 @@
#ifdef HAVE_OPENSSL_SRTP
static void dtls_info_callback(const SSL *ssl, int where, int ret)
-@@ -1019,13 +1031,16 @@ static struct ast_rtp_engine asterisk_rt
+@@ -1020,13 +1032,16 @@
.stop = ast_rtp_stop,
.qos = ast_rtp_qos_set,
.sendcng = ast_rtp_sendcng,
@@ -224,7 +236,7 @@
static void rtp_learning_seq_init(struct rtp_learning_info *info, uint16_t seq);
static void ast_rtp_on_ice_complete(pj_ice_sess *ice, pj_status_t status)
-@@ -1195,6 +1210,7 @@ static int ice_worker_thread(void *data)
+@@ -1196,6 +1211,7 @@
return 0;
}
@@ -232,7 +244,7 @@
static inline int rtp_debug_test_addr(struct ast_sockaddr *addr)
{
-@@ -1449,6 +1465,7 @@ static int __rtp_recvfrom(struct ast_rtp
+@@ -1450,6 +1466,7 @@
}
#endif
@@ -240,7 +252,7 @@
if (rtp->ice) {
pj_str_t combined = pj_str(ast_sockaddr_stringify(sa));
pj_sockaddr address;
-@@ -1474,6 +1491,7 @@ static int __rtp_recvfrom(struct ast_rtp
+@@ -1475,6 +1492,7 @@
}
rtp->passthrough = 0;
}
@@ -248,7 +260,7 @@
if ((*in & 0xC0) && res_srtp && srtp && res_srtp->unprotect(srtp, buf, &len, rtcp) < 0) {
return -1;
-@@ -1505,6 +1523,7 @@ static int __rtp_sendto(struct ast_rtp_i
+@@ -1506,6 +1524,7 @@
return -1;
}
@@ -256,7 +268,7 @@
if (rtp->ice) {
pj_thread_register_check();
-@@ -1513,6 +1532,7 @@ static int __rtp_sendto(struct ast_rtp_i
+@@ -1514,6 +1533,7 @@
return 0;
}
}
@@ -264,7 +276,7 @@
return ast_sendto(rtcp ? rtp->rtcp->s : rtp->s, temp, len, flags, sa);
}
-@@ -1630,6 +1650,7 @@ static int rtp_learning_rtp_seq_update(s
+@@ -1631,6 +1651,7 @@
return (info->packets == 0);
}
@@ -272,7 +284,7 @@
static void rtp_add_candidates_to_ice(struct ast_rtp_instance *instance, struct ast_rtp *rtp, struct ast_sockaddr *addr, int port, int component,
int transport, const pj_turn_sock_cb *turn_cb, pj_turn_sock **turn_sock)
{
-@@ -1694,6 +1715,7 @@ static void rtp_add_candidates_to_ice(st
+@@ -1695,6 +1716,7 @@
}
}
}
@@ -280,7 +292,7 @@
static int ast_rtp_new(struct ast_rtp_instance *instance,
struct ast_sched_context *sched, struct ast_sockaddr *addr,
-@@ -1701,8 +1723,10 @@ static int ast_rtp_new(struct ast_rtp_in
+@@ -1702,8 +1724,10 @@
{
struct ast_rtp *rtp = NULL;
int x, startplace;
@@ -291,7 +303,7 @@
/* Create a new RTP structure to hold all of our data */
if (!(rtp = ast_calloc(1, sizeof(*rtp)))) {
-@@ -1760,6 +1784,7 @@ static int ast_rtp_new(struct ast_rtp_in
+@@ -1761,6 +1785,7 @@
}
}
@@ -299,7 +311,7 @@
pj_thread_register_check();
pj_stun_config_init(&stun_config, &cachingpool.factory, 0, ioqueue, timerheap);
-@@ -1772,13 +1797,14 @@ static int ast_rtp_new(struct ast_rtp_in
+@@ -1773,13 +1798,14 @@
ast_rtp_instance_set_data(instance, rtp);
/* Create an ICE session for ICE negotiation */
@@ -315,7 +327,7 @@
/* Record any information we may need */
rtp->sched = sched;
-@@ -1821,6 +1847,7 @@ static int ast_rtp_destroy(struct ast_rt
+@@ -1822,6 +1848,7 @@
ast_free(rtp->red);
}
@@ -323,7 +335,7 @@
pj_thread_register_check();
/* Destroy the ICE session if being used */
-@@ -1848,6 +1875,7 @@ static int ast_rtp_destroy(struct ast_rt
+@@ -1849,6 +1876,7 @@
if (rtp->remote_candidates) {
ao2_ref(rtp->remote_candidates, -1);
}
@@ -331,7 +343,7 @@
#ifdef HAVE_OPENSSL_SRTP
/* Destroy the SSL context if present */
-@@ -3872,10 +3900,12 @@ static void ast_rtp_prop_set(struct ast_
+@@ -3875,10 +3903,12 @@
ast_debug(1, "Setup RTCP on RTP instance '%p'\n", instance);
rtp->rtcp->schedid = -1;
@@ -344,7 +356,7 @@
return;
} else {
-@@ -4352,12 +4382,14 @@ static int rtp_reload(int reload)
+@@ -4356,12 +4386,14 @@
* the pool this will cause a small memory leak.
*/
@@ -359,7 +371,7 @@
if (cfg) {
if ((s = ast_variable_retrieve(cfg, "general", "rtpstart"))) {
-@@ -4408,6 +4440,7 @@ static int rtp_reload(int reload)
+@@ -4412,6 +4444,7 @@
DEFAULT_LEARNING_MIN_SEQUENTIAL);
}
}
@@ -367,7 +379,7 @@
if ((s = ast_variable_retrieve(cfg, "general", "icesupport"))) {
icesupport = ast_true(s);
}
-@@ -4435,6 +4468,7 @@ static int rtp_reload(int reload)
+@@ -4439,6 +4472,7 @@
if ((s = ast_variable_retrieve(cfg, "general", "turnpassword"))) {
pj_strdup2(pool, &turnpassword, s);
}
@@ -375,7 +387,7 @@
ast_config_destroy(cfg);
}
if (rtpstart >= rtpend) {
-@@ -4454,6 +4488,7 @@ static int reload_module(void)
+@@ -4458,6 +4492,7 @@
static int load_module(void)
{
@@ -383,7 +395,7 @@
pj_lock_t *lock;
pj_log_set_level(0);
-@@ -4501,23 +4536,28 @@ static int load_module(void)
+@@ -4505,23 +4540,28 @@
pj_shutdown();
return AST_MODULE_LOAD_DECLINE;
}
@@ -412,7 +424,7 @@
return AST_MODULE_LOAD_DECLINE;
}
-@@ -4531,6 +4571,7 @@ static int unload_module(void)
+@@ -4535,6 +4575,7 @@
ast_rtp_engine_unregister(&asterisk_rtp_engine);
ast_cli_unregister_multiple(cli_rtp, ARRAY_LEN(cli_rtp));
@@ -420,7 +432,7 @@
worker_terminate = 1;
pj_thread_register_check();
-@@ -4540,6 +4581,7 @@ static int unload_module(void)
+@@ -4544,6 +4585,7 @@
pj_caching_pool_destroy(&cachingpool);
pj_shutdown();
Modified: asterisk/branches/experimental/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/safe_asterisk-config?rev=10303&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/safe_asterisk-config (original)
+++ asterisk/branches/experimental/debian/patches/safe_asterisk-config Sat Sep 28 04:12:36 2013
@@ -4,9 +4,11 @@
Bug-Debian: http://bugs.debian.org/381786
Last-Update: 2010-02-14
---- a/contrib/scripts/safe_asterisk
-+++ b/contrib/scripts/safe_asterisk
-@@ -107,7 +107,7 @@ ulimit -c unlimited
+Index: asterisk-11.5.1~dfsg/contrib/scripts/safe_asterisk
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/contrib/scripts/safe_asterisk 2013-01-22 07:40:13.000000000 +1100
++++ asterisk-11.5.1~dfsg/contrib/scripts/safe_asterisk 2013-09-28 13:46:04.000000000 +1000
+@@ -109,7 +109,7 @@
# Don't fork when running "safely"
#
ASTARGS=""
@@ -15,7 +17,7 @@
if test -c /dev/tty${TTY} ; then
TTY=tty${TTY}
elif test -c /dev/vc/${TTY} ; then
-@@ -147,7 +147,7 @@ run_asterisk()
+@@ -159,7 +159,7 @@
{
while :; do
Modified: asterisk/branches/experimental/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/safe_asterisk-nobg?rev=10303&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/branches/experimental/debian/patches/safe_asterisk-nobg Sat Sep 28 04:12:36 2013
@@ -10,9 +10,11 @@
Needs more work from me to not change behavior for users but only for the
init script. After that, it can safely go upstream.
---- a/contrib/scripts/safe_asterisk
-+++ b/contrib/scripts/safe_asterisk
-@@ -22,6 +22,7 @@ DUMPDROP=${DUMPDROP:-/tmp}
+Index: asterisk-11.5.1~dfsg/contrib/scripts/safe_asterisk
+===================================================================
+--- asterisk-11.5.1~dfsg.orig/contrib/scripts/safe_asterisk 2013-09-28 13:46:21.000000000 +1000
++++ asterisk-11.5.1~dfsg/contrib/scripts/safe_asterisk 2013-09-28 13:46:22.000000000 +1000
+@@ -18,6 +18,7 @@
RUNDIR=${RUNDIR:-/tmp}
SLEEPSECS=4
ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
@@ -20,7 +22,7 @@
# comment this line out to have this script _not_ kill all mpg123 processes when
# asterisk exits
-@@ -215,4 +216,8 @@ run_asterisk()
+@@ -211,4 +212,8 @@
done
}
More information about the Pkg-voip-commits
mailing list