[Pkg-voip-commits] r10143 - in /asterisk/branches/experimental/debian: changelog patches/bzero patches/pjproject patches/series rules
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Fri Apr 19 14:52:09 UTC 2013
Author: tzafrir
Date: Fri Apr 19 14:52:09 2013
New Revision: 10143
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10143
Log:
pjproject is now optional - backport from trunk
* Patch pjproject: make pjproject optional.
* Patch bzero: Simplify applying the above, and fix an interface
stupidity inflicted by pjproject.
* get-orig-source: remove res/pjproject from the source tarball.
Added:
asterisk/branches/experimental/debian/patches/bzero
asterisk/branches/experimental/debian/patches/pjproject
Modified:
asterisk/branches/experimental/debian/changelog
asterisk/branches/experimental/debian/patches/series
asterisk/branches/experimental/debian/rules
Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=10143&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Fri Apr 19 14:52:09 2013
@@ -1,4 +1,4 @@
-asterisk (1:11.2.1~dfsg-1) UNRELEASED; urgency=low
+asterisk (1:11.4.0~rc1~dfsg-1) UNRELEASED; urgency=low
[ Faidon Liambotis ]
* New major upstream release.
@@ -21,6 +21,10 @@
* Convert rules to dh.
- Patch astdatadir: set datadir in /usr/share/asterisk instead of
using an environment variable.
+ * Patch pjproject: make pjproject optional.
+ - Patch bzero: Simplify applying the above, and fix an interface
+ stupidity inflicted by pjproject.
+ - get-orig-source: remove res/pjproject from the source tarball.
[ David Sarmiento ]
* Re-enabled pjproject
Added: asterisk/branches/experimental/debian/patches/bzero
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/bzero?rev=10143&op=file
==============================================================================
--- asterisk/branches/experimental/debian/patches/bzero (added)
+++ asterisk/branches/experimental/debian/patches/bzero Fri Apr 19 14:52:09 2013
@@ -1,0 +1,58 @@
+From 84eae85d72f4e5369e2d1e996062bfe1a7b6ad80 Mon Sep 17 00:00:00 2001
+From: Jason Parker <jparker at digium.com>
+Date: Thu, 28 Feb 2013 21:21:50 +0000
+Subject: [PATCH] Don't undefine bzero()/bcopy().
+
+This was causing build failures against external libraries that happened to use
+them, unless silly hacks were added to the modules that used those headers.
+
+Review: https://reviewboard.asterisk.org/r/2359/
+
+Backporting to 11, as pjproject has changed.
+
+Origin: http://svnview.digium.com/svn/asterisk?view=rev&rev=382292
+---
+ include/asterisk.h | 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;
+ struct ast_str;
+ struct ast_sched_context;
+
+-#ifdef bzero
+-#undef bzero
+-#endif
+-
+-#ifdef bcopy
+-#undef bcopy
+-#endif
+-
+-#define bzero 0x__dont_use_bzero__use_memset_instead""
+-#define bcopy 0x__dont_use_bcopy__use_memmove_instead()
+-
+ /* 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$")
+ #include <openssl/bio.h>
+ #endif
+
+-/* Asterisk discourages the use of bzero in favor of memset, in fact if you try to use bzero it will tell you to use memset. As a result bzero has to be undefined
+- * 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
+ #include "pjlib.h"
+ #include "pjlib-util.h"
+ #include "pjnath.h"
+--
+1.7.10.4
+
Added: asterisk/branches/experimental/debian/patches/pjproject
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/pjproject?rev=10143&op=file
==============================================================================
--- asterisk/branches/experimental/debian/patches/pjproject (added)
+++ asterisk/branches/experimental/debian/patches/pjproject Fri Apr 19 14:52:09 2013
@@ -1,0 +1,430 @@
+From 5d584d0d83c063006ba1b731046d309123b7409c Mon Sep 17 00:00:00 2001
+From: Jason Parker <jparker at digium.com>
+Date: Tue, 12 Mar 2013 19:08:59 +0000
+Origin: http://svnview.digium.com/svn/asterisk?view=rev&rev=382900
+Subject: Switch to using external pjproject libraries.
+
+ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
+
+(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@
+ OSPTK=@PBX_OSPTK@
+ OSS=@PBX_OSS@
+ PGSQL=@PBX_PGSQL@
++PJPROJECT=@PBX_PJPROJECT@
+ 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
+ AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
+ AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
+ AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
++AST_EXT_LIB_SETUP([PJPROJECT], [PJPROJECT], [pjproject])
+ 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
+ fi
+ fi
+
++AST_PKG_CONFIG_CHECK([PJPROJECT], [libpjproject])
++
+ 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
+@@ -551,6 +551,9 @@
+ /* Define to indicate presence of the pg_encoding_to_char API. */
+ #undef HAVE_PGSQL_pg_encoding_to_char
+
++/* Define if your system has the PJPROJECT libraries. */
++#undef HAVE_PJPROJECT
++
+ /* 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@
+ PGSQL_INCLUDE=@PGSQL_INCLUDE@
+ PGSQL_LIB=@PGSQL_LIB@
+
++PJPROJECT_INCLUDE=@PJPROJECT_INCLUDE@
++PJPROJECT_LIB=@PJPROJECT_LIB@
++
+ POPT_INCLUDE=@POPT_INCLUDE@
+ POPT_LIB=@POPT_LIB@
+
+--- a/res/Makefile
++++ b/res/Makefile
+@@ -67,26 +67,4 @@ endif
+ ael/pval.o: ael/pval.c
+
+ clean::
+- @if [ -f pjproject/build.mak ]; then $(MAKE) -C pjproject realclean; fi
+ rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i
+-
+-dist-clean::
+- rm -f pjproject/build.mak
+-
+-pjproject/build.mak: pjproject/aconfigure
+- (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec)
+-
+-ifneq ($(findstring $(MAKECMDGOALS),all),)
+--include pjproject/build.mak
+-endif
+-
+-.PHONY: FORCE
+-FORCE:
+-
+-$(PJ_LIB_FILES): FORCE
+- $(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
+-
+-res_rtp_asterisk.o: $(PJ_LIB_FILES)
+-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
+@@ -29,6 +29,7 @@
+ */
+
+ /*** MODULEINFO
++ <use type="external">pjproject</use>
+ <support_level>core</support_level>
+ ***/
+
+@@ -46,9 +47,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+ #include <openssl/bio.h>
+ #endif
+
+-#include "pjlib.h"
+-#include "pjlib-util.h"
+-#include "pjnath.h"
++#ifdef HAVE_PJPROJECT
++#include <pjlib.h>
++#include <pjlib-util.h>
++#include <pjnath.h>
++#endif
+
+ #include "asterisk/stun.h"
+ #include "asterisk/pbx.h"
+@@ -129,6 +132,7 @@ static int nochecksums;
+ #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. */
++#ifdef HAVE_PJPROJECT
+ static int icesupport = DEFAULT_ICESUPPORT;
+ static struct sockaddr_in stunaddr;
+ static pj_str_t turnaddr;
+@@ -153,6 +157,7 @@ static pj_thread_t *thread;
+
+ /*! \brief Notification that the ICE/TURN worker thread should stop */
+ static int worker_terminate;
++#endif
+
+ #define FLAG_3389_WARNING (1 << 0)
+ #define FLAG_NAT_ACTIVE (3 << 1)
+@@ -250,12 +255,14 @@ struct ast_rtp {
+
+ struct rtp_red *red;
+
++ ast_mutex_t lock; /*!< Lock for synchronization purposes */
++ ast_cond_t cond; /*!< Condition for signaling */
++
++#ifdef HAVE_PJPROJECT
+ pj_ice_sess *ice; /*!< ICE session */
+ pj_turn_sock *turn_rtp; /*!< RTP TURN relay */
+ pj_turn_sock *turn_rtcp; /*!< RTCP TURN relay */
+- ast_mutex_t lock; /*!< Lock for synchronization purposes */
+ pj_turn_state_t turn_state; /*!< Current state of the TURN relay session */
+- ast_cond_t cond; /*!< Condition for signaling */
+ 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 {
+
+ struct ao2_container *local_candidates; /*!< The local ICE candidates */
+ struct ao2_container *remote_candidates; /*!< The remote ICE candidates */
++#endif
+
+ #ifdef HAVE_OPENSSL_SRTP
+ SSL_CTX *ssl_ctx; /*!< SSL context */
+@@ -394,6 +402,22 @@ static int ast_rtp_activate(struct ast_r
+
+ 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);
+
++/*! \brief Helper function which updates an ast_sockaddr with the candidate used for the component */
++static void update_address_with_ice_candidate(struct ast_rtp *rtp, int component, struct ast_sockaddr *cand_address)
++{
++#ifdef HAVE_PJPROJECT
++ char address[PJ_INET6_ADDRSTRLEN];
++
++ if (!rtp->ice || (component < 1) || !rtp->ice->comp[component - 1].valid_check) {
++ return;
++ }
++
++ ast_sockaddr_parse(cand_address, pj_sockaddr_print(&rtp->ice->comp[component - 1].valid_check->rcand->addr, address, sizeof(address), 0), 0);
++ ast_sockaddr_set_port(cand_address, pj_sockaddr_get_port(&rtp->ice->comp[component - 1].valid_check->rcand->addr));
++#endif
++}
++
++#ifdef HAVE_PJPROJECT
+ /*! \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
+ return;
+ }
+
+-/*! \brief Helper function which updates an ast_sockaddr with the candidate used for the component */
+-static void update_address_with_ice_candidate(struct ast_rtp *rtp, int component, struct ast_sockaddr *cand_address)
+-{
+- char address[PJ_INET6_ADDRSTRLEN];
+-
+- if (!rtp->ice || (component < 1) || !rtp->ice->comp[component - 1].valid_check) {
+- return;
+- }
+-
+- ast_sockaddr_parse(cand_address, pj_sockaddr_print(&rtp->ice->comp[component - 1].valid_check->rcand->addr, address, sizeof(address), 0), 0);
+- ast_sockaddr_set_port(cand_address, pj_sockaddr_get_port(&rtp->ice->comp[component - 1].valid_check->rcand->addr));
+-}
+-
+ 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
+ .get_local_candidates = ast_rtp_ice_get_local_candidates,
+ .ice_lite = ast_rtp_ice_lite,
+ };
++#endif
+
+ #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
+ .stop = ast_rtp_stop,
+ .qos = ast_rtp_qos_set,
+ .sendcng = ast_rtp_sendcng,
++#ifdef HAVE_PJPROJECT
+ .ice = &ast_rtp_ice,
++#endif
+ #ifdef HAVE_OPENSSL_SRTP
+ .dtls = &ast_rtp_dtls,
+ .activate = ast_rtp_activate,
+ #endif
+ };
+
++#ifdef HAVE_PJPROJECT
+ 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)
+
+ return 0;
+ }
++#endif
+
+ static inline int rtp_debug_test_addr(struct ast_sockaddr *addr)
+ {
+@@ -1449,6 +1465,7 @@ static int __rtp_recvfrom(struct ast_rtp
+ }
+ #endif
+
++#ifdef HAVE_PJPROJECT
+ 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
+ }
+ rtp->passthrough = 0;
+ }
++#endif
+
+ 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
+ return -1;
+ }
+
++#ifdef HAVE_PJPROJECT
+ if (rtp->ice) {
+ pj_thread_register_check();
+
+@@ -1513,6 +1532,7 @@ static int __rtp_sendto(struct ast_rtp_i
+ return 0;
+ }
+ }
++#endif
+
+ 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
+ return (info->packets == 0);
+ }
+
++#ifdef HAVE_PJPROJECT
+ 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
+ }
+ }
+ }
++#endif
+
+ 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
+ {
+ struct ast_rtp *rtp = NULL;
+ int x, startplace;
++#ifdef HAVE_PJPROJECT
+ pj_stun_config stun_config;
+ pj_str_t ufrag, passwd;
++#endif
+
+ /* 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
+ }
+ }
+
++#ifdef HAVE_PJPROJECT
+ 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
+ ast_rtp_instance_set_data(instance, rtp);
+
+ /* 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) {
+ /* Make this available for the callbacks */
+ rtp->ice->user_data = rtp;
+
+ /* Add all of the available candidates to the ICE session */
+ rtp_add_candidates_to_ice(instance, rtp, addr, x, COMPONENT_RTP, TRANSPORT_SOCKET_RTP, &ast_rtp_turn_rtp_sock_cb, &rtp->turn_rtp);
+ }
++#endif
+
+ /* Record any information we may need */
+ rtp->sched = sched;
+@@ -1821,6 +1847,7 @@ static int ast_rtp_destroy(struct ast_rt
+ ast_free(rtp->red);
+ }
+
++#ifdef HAVE_PJPROJECT
+ pj_thread_register_check();
+
+ /* Destroy the ICE session if being used */
+@@ -1848,6 +1875,7 @@ static int ast_rtp_destroy(struct ast_rt
+ if (rtp->remote_candidates) {
+ ao2_ref(rtp->remote_candidates, -1);
+ }
++#endif
+
+ #ifdef HAVE_OPENSSL_SRTP
+ /* Destroy the SSL context if present */
+@@ -3872,10 +3900,12 @@ static void ast_rtp_prop_set(struct ast_
+ ast_debug(1, "Setup RTCP on RTP instance '%p'\n", instance);
+ rtp->rtcp->schedid = -1;
+
++#ifdef HAVE_PJPROJECT
+ if (rtp->ice) {
+ rtp_add_candidates_to_ice(instance, rtp, &rtp->rtcp->us, ast_sockaddr_port(&rtp->rtcp->us), COMPONENT_RTCP, TRANSPORT_SOCKET_RTCP,
+ &ast_rtp_turn_rtcp_sock_cb, &rtp->turn_rtcp);
+ }
++#endif
+
+ return;
+ } else {
+@@ -4352,12 +4382,14 @@ static int rtp_reload(int reload)
+ * the pool this will cause a small memory leak.
+ */
+
++#ifdef HAVE_PJPROJECT
+ icesupport = DEFAULT_ICESUPPORT;
+ turnport = DEFAULT_TURN_PORT;
+ memset(&stunaddr, 0, sizeof(stunaddr));
+ turnaddr = pj_str(NULL);
+ turnusername = pj_str(NULL);
+ turnpassword = pj_str(NULL);
++#endif
+
+ if (cfg) {
+ if ((s = ast_variable_retrieve(cfg, "general", "rtpstart"))) {
+@@ -4408,6 +4440,7 @@ static int rtp_reload(int reload)
+ DEFAULT_LEARNING_MIN_SEQUENTIAL);
+ }
+ }
++#ifdef HAVE_PJPROJECT
+ if ((s = ast_variable_retrieve(cfg, "general", "icesupport"))) {
+ icesupport = ast_true(s);
+ }
+@@ -4435,6 +4468,7 @@ static int rtp_reload(int reload)
+ if ((s = ast_variable_retrieve(cfg, "general", "turnpassword"))) {
+ pj_strdup2(pool, &turnpassword, s);
+ }
++#endif
+ ast_config_destroy(cfg);
+ }
+ if (rtpstart >= rtpend) {
+@@ -4454,6 +4488,7 @@ static int reload_module(void)
+
+ static int load_module(void)
+ {
++#ifdef HAVE_PJPROJECT
+ pj_lock_t *lock;
+
+ pj_log_set_level(0);
+@@ -4501,23 +4536,28 @@ static int load_module(void)
+ pj_shutdown();
+ return AST_MODULE_LOAD_DECLINE;
+ }
++#endif
+
+ if (ast_rtp_engine_register(&asterisk_rtp_engine)) {
++#ifdef HAVE_PJPROJECT
+ worker_terminate = 1;
+ pj_thread_join(thread);
+ pj_thread_destroy(thread);
+ pj_caching_pool_destroy(&cachingpool);
+ pj_shutdown();
++#endif
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ if (ast_cli_register_multiple(cli_rtp, ARRAY_LEN(cli_rtp))) {
++#ifdef HAVE_PJPROJECT
+ worker_terminate = 1;
+ pj_thread_join(thread);
+ pj_thread_destroy(thread);
+ ast_rtp_engine_unregister(&asterisk_rtp_engine);
+ pj_caching_pool_destroy(&cachingpool);
+ pj_shutdown();
++#endif
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+@@ -4531,6 +4571,7 @@ static int unload_module(void)
+ ast_rtp_engine_unregister(&asterisk_rtp_engine);
+ ast_cli_unregister_multiple(cli_rtp, ARRAY_LEN(cli_rtp));
+
++#ifdef HAVE_PJPROJECT
+ worker_terminate = 1;
+
+ pj_thread_register_check();
+@@ -4540,6 +4581,7 @@ static int unload_module(void)
+
+ pj_caching_pool_destroy(&cachingpool);
+ pj_shutdown();
++#endif
+
+ return 0;
+ }
Modified: asterisk/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/series?rev=10143&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/series (original)
+++ asterisk/branches/experimental/debian/patches/series Fri Apr 19 14:52:09 2013
@@ -21,3 +21,5 @@
ilbc_disable
astdatadir
+bzero
+pjproject
Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=10143&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Fri Apr 19 14:52:09 2013
@@ -181,6 +181,7 @@
@rm -rf $(TMP_TARBALL_TOP)/doc/Asterisk-Admin-Guide/
@rm -rf $(TMP_TARBALL_TOP)/doc/Asterisk-Admin-Guide.pdf
@rm -rf $(TMP_TARBALL_TOP)/codecs/ilbc
+ @rm -rf $(TMP_TARBALL_TOP)/res/pjproject
# While we're at it: remove some generated files that will become
# invalid:
@rm -rf $(TMP_TARBALL_TOP)/*/.makeopts
More information about the Pkg-voip-commits
mailing list