[Pkg-voip-commits] r5799 - in /asterisk/trunk/debian: changelog patches/allow-tilde-destdir patches/bristuff/answer-before-say patches/bristuff/xagi patches/samples patches/series patches/vpb-driver-4.2.18 patches/vpb-handle-nocards patches/vpb_no_cards
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Mon May 26 01:09:36 UTC 2008
Author: paravoid
Date: Mon May 26 01:09:36 2008
New Revision: 5799
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5799
Log:
* New upstream version.
- Dropped patches samples, vpb-driver-4.2.18, vpb_no_cards, incorporated
by upstream.
Removed:
asterisk/trunk/debian/patches/samples
asterisk/trunk/debian/patches/vpb-driver-4.2.18
asterisk/trunk/debian/patches/vpb_no_cards
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/allow-tilde-destdir
asterisk/trunk/debian/patches/bristuff/answer-before-say
asterisk/trunk/debian/patches/bristuff/xagi
asterisk/trunk/debian/patches/series
asterisk/trunk/debian/patches/vpb-handle-nocards
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5799&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon May 26 01:09:36 2008
@@ -1,8 +1,4 @@
-asterisk (1:1.4.19.2~dfsg-1) UNRELEASED; urgency=low
-
- [ Lionel Elie Mamane ]
- * New upstream version.
- - Fix IAX performance issues introduced by security fix in 1.4.19.1
+asterisk (1:1.4.20~dfsg-1) UNRELEASED; urgency=low
[ Victor Seva ]
* Patch sample files pointing now to the correct doc files. (Closes: #475681)
@@ -16,6 +12,10 @@
* Remove {,} bashism from debian/rules (Closes: #478361).
[ Faidon Liambotis ]
+ * New upstream version.
+ - Fix IAX performance issues introduced by security fix in 1.4.19.1
+ - Dropped patches samples, vpb-driver-4.2.18, vpb_no_cards, incorporated
+ by upstream.
* Update to bristuff-0.4.0-RC1:
- Revert API changes to res_agi (xagi).
- Revert API changes to ast_sendtext() (ast-send-message).
@@ -35,7 +35,7 @@
* Conflict with asterisk-chan-capi << 1.1.1-1 which we broke with an ABI
change :( (Closes: #472379).
- -- Faidon Liambotis <paravoid at debian.org> Mon, 26 May 2008 03:43:38 +0300
+ -- Faidon Liambotis <paravoid at debian.org> Mon, 26 May 2008 04:08:57 +0300
asterisk (1:1.4.19.1~dfsg-1) unstable; urgency=low
Modified: asterisk/trunk/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/allow-tilde-destdir?rev=5799&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/allow-tilde-destdir (original)
+++ asterisk/trunk/debian/patches/allow-tilde-destdir Mon May 26 01:09:36 2008
@@ -14,8 +14,8 @@
@exit 1
endif
--install: badshell datafiles bininstall $(SUBDIRS_INSTALL)
-+install: datafiles bininstall $(SUBDIRS_INSTALL)
+-install: badshell datafiles bininstall
++install: datafiles bininstall
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
Modified: asterisk/trunk/debian/patches/bristuff/answer-before-say
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/answer-before-say?rev=5799&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/answer-before-say (original)
+++ asterisk/trunk/debian/patches/bristuff/answer-before-say Mon May 26 01:09:36 2008
@@ -10,9 +10,9 @@
+ if (chan->_state != AST_STATE_UP) {
+ ast_answer(chan);
+ }
- return ast_say_number(chan, atoi(tmp), "", chan->language, options);
- }
+ if (ast_say_number(chan, atoi(tmp), "", chan->language, options)) {
+ ast_log(LOG_WARNING, "We were unable to say the number %s, is it too large?\n", tmp);
@@ -6081,8 +6084,12 @@ static int pbx_builtin_saydigits(struct
{
int res = 0;
Modified: asterisk/trunk/debian/patches/bristuff/xagi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/xagi?rev=5799&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/xagi (original)
+++ asterisk/trunk/debian/patches/bristuff/xagi Mon May 26 01:09:36 2008
@@ -224,9 +224,9 @@
char *stringp;
AGI agi;
@@ -2047,12 +2124,13 @@ static int agi_exec_full(struct ast_chan
- }
}
#endif
+ ast_replace_sigchld();
- res = launch_script(argv[0], argv, fds, enhanced ? &efd : NULL, &pid);
+ res = launch_script(argv[0], argv, fds, enhanced ? &efd : NULL, (enhanced == 2) ? &efd2 : NULL, &pid);
if (res == AGI_RESULT_SUCCESS || res == AGI_RESULT_SUCCESS_FAST) {
@@ -244,8 +244,8 @@
close(efd);
+ if (efd2 > -1)
+ close(efd2);
- ast_unreplace_sigchld();
}
+ ast_unreplace_sigchld();
ast_module_user_remove(u);
@@ -2110,6 +2190,35 @@ static int eagi_exec(struct ast_channel
return res;
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5799&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon May 26 01:09:36 2008
@@ -13,7 +13,6 @@
astgenkey-security
apptest_sleep
-samples
armel_support
### new features
@@ -21,9 +20,7 @@
func_devstate
# for chan_vpb
-vpb-driver-4.2.18
vpb-handle-nocards
-vpb_no_cards
# for chan_misdn (even though it's not enabled yet)
misdn_FOP
Modified: asterisk/trunk/debian/patches/vpb-handle-nocards
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/vpb-handle-nocards?rev=5799&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/vpb-handle-nocards (original)
+++ asterisk/trunk/debian/patches/vpb-handle-nocards Mon May 26 01:09:36 2008
@@ -6,29 +6,29 @@
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
-@@ -2883,7 +2883,13 @@ static enum ast_module_load_result load_
- v = ast_variable_browse(cfg, "general");
- while (v){
- if (strcasecmp(v->name, "cards") == 0) {
-- ast_log(LOG_NOTICE,"VPB Driver configured to use [%d] cards\n",atoi(v->value));
-+ if (atoi(v->value) == 0) {
-+ ast_log(LOG_ERROR,"VPB Driver not configured\n");
-+ error = AST_MODULE_LOAD_DECLINE;
-+ goto done;
-+ } else {
-+ ast_log(LOG_NOTICE,"VPB Driver configured to use [%d] cards\n",atoi(v->value));
-+ }
- }
- else if (strcasecmp(v->name, "indication") == 0) {
- use_ast_ind = 1;
+@@ -2739,7 +2739,13 @@ static enum ast_module_load_result load_
+ v = ast_variable_browse(cfg, "general");
+ while (v){
+ if (strcasecmp(v->name, "cards") == 0) {
+- ast_log(LOG_NOTICE, "VPB Driver configured to use [%d] cards\n", atoi(v->value));
++ if (atoi(v->value) == 0) {
++ ast_log(LOG_ERROR,"VPB Driver not configured\n");
++ error = AST_MODULE_LOAD_DECLINE;
++ goto done;
++ } else {
++ ast_log(LOG_NOTICE,"VPB Driver configured to use [%d] cards\n", atoi(v->value));
++ }
+ } else if (strcasecmp(v->name, "indication") == 0) {
+ use_ast_ind = 1;
+ ast_log(LOG_NOTICE, "VPB driver using Asterisk Indication functions!\n");
--- a/configs/vpb.conf.sample
+++ b/configs/vpb.conf.sample
-@@ -8,7 +8,7 @@
- ;
- ; Total number of Voicetronix cards in this machine
- ;
--cards=1
-+cards=0
+@@ -57,7 +57,7 @@
+ type = v12pci
+ ;type = v6pci
+ ;type = v4pci
+-cards = 1
++cards = 0
- ;
- ; Which indication functions to use
+ [interfaces]
+
More information about the Pkg-voip-commits
mailing list