[Pkg-voip-commits] r5012 - in /asterisk/trunk/debian/patches: bristuff/app-dial-R-noinband bristuff/ast-device-state-CID bristuff/configurable-AST_SYSTEM_NAME bristuff/uniqueid-10-channel-ops-uniqueid bristuff/zapata-bri+euroisdn bristuff/zapata-gsm make-clean-fixes
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Mon Dec 3 19:10:37 UTC 2007
Author: paravoid
Date: Mon Dec 3 19:10:37 2007
New Revision: 5012
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5012
Log:
Do a much needed quilt refresh on all patches, part 2 (actual changes, readable)
Modified:
asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband
asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME
asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/bristuff/zapata-gsm
asterisk/trunk/debian/patches/make-clean-fixes
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband?rev=5012&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband Mon Dec 3 19:10:37 2007
@@ -36,7 +36,7 @@
/* Turn off hold music, etc */
@@ -637,7 +641,7 @@ static struct ast_channel *wait_for_answ
/* Setup early media if appropriate */
- if (single)
+ if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
- if (!ast_test_flag(outgoing, OPT_RINGBACK))
+ if (!ast_test_flag(outgoing, OPT_RINGBACK | OPT_NOINBAND))
@@ -45,7 +45,7 @@
case AST_CONTROL_VIDUPDATE:
@@ -650,7 +654,7 @@ static struct ast_channel *wait_for_answ
ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name);
- if (single)
+ if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
- if (!ast_test_flag(outgoing, OPT_RINGBACK))
+ if (!ast_test_flag(outgoing, OPT_RINGBACK | OPT_NOINBAND))
Modified: asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-device-state-CID?rev=5012&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Mon Dec 3 19:10:37 2007
@@ -140,7 +140,7 @@
struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, char *uid)
@@ -3910,7 +3910,7 @@ void ast_set_callerid(struct ast_channel
- );
+ ast_channel_unlock(chan);
}
-int ast_setstate(struct ast_channel *chan, enum ast_channel_state state)
@@ -241,7 +241,7 @@
-static int cb_extensionstate(char *context, char* exten, int state, void *data);
+static int cb_extensionstate(char *context, char* exten, int state, void *data, char *cid_num, char *cid_name);
static int sip_devicestate(void *data);
- static int sip_poke_noanswer(void *data);
+ static int sip_poke_noanswer(const void *data);
static int sip_poke_peer(struct sip_peer *peer);
@@ -8422,7 +8422,7 @@ static void sip_peer_hold(struct sip_pvt
/*! \brief Callback for the devicestate notification (SUBSCRIBE) support subsystem
@@ -261,8 +261,8 @@
-static int statechange_queue(const char *dev, int state, void *ign)
+static int statechange_queue(const char *dev, int state, void *ign, char *cid_num, char *cid_name)
{
- /* Avoid potential for deadlocks by spawning a new thread to handle
- the event */
+ struct statechange *sc;
+
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -55,6 +55,7 @@
Modified: asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME?rev=5012&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME (original)
+++ asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME Mon Dec 3 19:10:37 2007
@@ -1,7 +1,7 @@
--- a/build_tools/make_defaults_h
+++ b/build_tools/make_defaults_h
@@ -17,6 +17,7 @@ cat << END
- #define AST_KEY_DIR "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
+ #define AST_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys"
#define AST_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
#define AST_TMP_DIR "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
+#define AST_SYSTEM_NAME "asterisk"
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid?rev=5012&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Mon Dec 3 19:10:37 2007
@@ -129,8 +129,8 @@
ast_copy_string(name, chan->name, sizeof(name));
-@@ -3034,7 +3044,7 @@ int ast_set_write_format(struct ast_chan
- &chan->writetrans, 1);
+@@ -3079,7 +3089,7 @@ char *ast_channel_reason2str(int reason)
+ }
}
-struct ast_channel *__ast_request_and_dial(const char *type, int format, void *data, int timeout, int *outstate, const char *cid_num, const char *cid_name, struct outgoing_helper *oh)
Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=5012&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Mon Dec 3 19:10:37 2007
@@ -2278,8 +2278,8 @@
+
myfd = open(argv[4], O_CREAT|O_WRONLY, 0600);
if (myfd < 0) {
- ast_cli(fd, "Unable to open '%s' for writing\n", argv[4]);
- return RESULT_SUCCESS;
+ ast_cli(fd, "Unable to open '%s' for writing\n", argv[4]);
+ return RESULT_SUCCESS;
}
-
- ast_mutex_lock(&pridebugfdlock);
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5012&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Mon Dec 3 19:10:37 2007
@@ -19,13 +19,13 @@
#define SIG_SFWINK (0x0100000 | ZT_SIG_SF)
#define SIG_SF_FEATD (0x0200000 | ZT_SIG_SF)
@@ -235,6 +239,8 @@ static int matchdigittimeout = 3000;
- static char defaultcic[64] = "";
- static char defaultozz[64] = "";
+ /*! \brief Protect the interface list (of zt_pvt's) */
+ AST_MUTEX_DEFINE_STATIC(iflock);
+static char gsm_modem_pin[20];
+static char gsm_modem_exten[AST_MAX_EXTENSION];
- static char progzone[10] = "";
+ static int ifcount = 0;
@@ -250,7 +256,7 @@ static int restart_monitor(void);
Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=5012&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Mon Dec 3 19:10:37 2007
@@ -7,13 +7,13 @@
+++ b/Makefile
@@ -379,7 +379,6 @@ dist-clean: distclean
- distclean: clean
+ distclean: $(SUBDIRS_DIST_CLEAN) clean
@$(MAKE) -C menuselect dist-clean
- @$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status
-@@ -389,6 +388,10 @@ distclean: clean
+@@ -389,6 +388,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) clean
rm -rf doc/api
rm -f build_tools/menuselect-deps
More information about the Pkg-voip-commits
mailing list