[Pkg-voip-commits] r5115 - in /asterisk/trunk/debian: changelog patches/bristuff/zapata-bri+euroisdn patches/fix-chan-iax2-segfault patches/series patches/tos-libcap
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Fri Dec 21 20:38:45 UTC 2007
Author: paravoid
Date: Fri Dec 21 20:38:45 2007
New Revision: 5115
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5115
Log:
New upstream release.
Removed:
asterisk/trunk/debian/patches/fix-chan-iax2-segfault
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/series
asterisk/trunk/debian/patches/tos-libcap
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5115&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Dec 21 20:38:45 2007
@@ -1,4 +1,4 @@
-asterisk (1:1.4.16~dfsg-1) UNRELEASED; urgency=low
+asterisk (1:1.4.16.2~dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
* New upstream release. (Closes: #457063) (Fixes CVE-2007-6430)
@@ -9,12 +9,11 @@
* Silence upstream's build sum warning but generate one on all modules so
that we can enable it at a later point.
* Make the init script's detection of a running daemon to be more precise.
- * Backport a chan_iax2 segfault fix from upstream, upstream issue #11602.
* Bump Standards-Version to 3.7.3, no changes needed.
* Remove modem.conf on upgrades from 1.2 (i.e. etch). (Closes: #454332)
* Ressurect long-forgotten logrotate script.
- -- Faidon Liambotis <paravoid at debian.org> Thu, 20 Dec 2007 10:48:51 +0200
+ -- Faidon Liambotis <paravoid at debian.org> Fri, 21 Dec 2007 22:38:03 +0200
asterisk (1:1.4.15~dfsg-1) unstable; urgency=low
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=5115&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Fri Dec 21 20:38:45 2007
@@ -1423,7 +1423,7 @@
/* Get the use_callingpres state */
pri->pvts[chanpos]->callingpres = e->ring.callingpres;
-@@ -8917,14 +9323,31 @@ static void *pri_dchannel(void *vpri)
+@@ -8917,17 +9323,34 @@ static void *pri_dchannel(void *vpri)
/* Set bearer and such */
pri_assign_bearer(crv, pri, pri->pvts[chanpos]);
c = zt_new(crv, AST_STATE_RESERVED, 0, SUB_REAL, law, e->ring.ctype);
@@ -1439,6 +1439,9 @@
+ }
+ zt_enable_ec(pri->pvts[chanpos]); /* XXX rethink */
}
+
+ ast_mutex_unlock(&pri->pvts[chanpos]->lock);
+
if (!ast_strlen_zero(e->ring.callingsubaddr)) {
pbx_builtin_setvar_helper(c, "CALLINGSUBADDR", e->ring.callingsubaddr);
}
@@ -1484,12 +1487,12 @@
+ if (c && (e->ring.lowlayercompat[0] > 0)) {
+ memcpy(c->lowlayercompat, e->ring.lowlayercompat, sizeof(c->lowlayercompat));
+ }
- ast_mutex_lock(&pri->lock);
if (c) {
char calledtonstr[10];
-@@ -8984,23 +9411,40 @@ static void *pri_dchannel(void *vpri)
- snprintf(calledtonstr, sizeof(calledtonstr)-1, "%d", e->ring.calledplan);
- pbx_builtin_setvar_helper(c, "CALLEDTON", calledtonstr);
+
+@@ -8984,26 +9411,43 @@ static void *pri_dchannel(void *vpri)
+ ast_mutex_lock(&pri->pvts[chanpos]->lock);
+ ast_mutex_lock(&pri->lock);
if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Accepting call from '%s' to '%s' on channel %d/%d, span %d\n",
- plancallingnum, pri->pvts[chanpos]->exten,
@@ -1514,6 +1517,9 @@
+ pbx_builtin_setvar_helper(c, "UUI", e->ring.useruserinfo);
+ }
} else {
+
+ ast_mutex_lock(&pri->lock);
+
ast_log(LOG_WARNING, "Unable to start PBX on channel %d/%d, span %d\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span);
- pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_SWITCH_CONGESTION);
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5115&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Fri Dec 21 20:38:45 2007
@@ -1,6 +1,3 @@
-# backported fixes from 1.4 branch
-fix-chan-iax2-segfault
-
# upstream fixes
debian-banner
silence-buildsum-warning
Modified: asterisk/trunk/debian/patches/tos-libcap
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/tos-libcap?rev=5115&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/tos-libcap (original)
+++ asterisk/trunk/debian/patches/tos-libcap Fri Dec 21 20:38:45 2007
@@ -492,29 +492,27 @@
CURSES_LIB!$CURSES_LIB$ac_delim
CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
CURSES_DIR!$CURSES_DIR$ac_delim
-@@ -34305,10 +34753,6 @@ PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
+@@ -34305,9 +34753,6 @@ PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
PWLIB_DIR!$PWLIB_DIR$ac_delim
PBX_PWLIB!$PBX_PWLIB$ac_delim
OPENH323_LIB!$OPENH323_LIB$ac_delim
-OPENH323_INCLUDE!$OPENH323_INCLUDE$ac_delim
-OPENH323_DIR!$OPENH323_DIR$ac_delim
-PBX_OPENH323!$PBX_OPENH323$ac_delim
--QT_LIB!$QT_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -34350,6 +34794,10 @@ _ACEOF
+@@ -34350,6 +34794,9 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+OPENH323_INCLUDE!$OPENH323_INCLUDE$ac_delim
+OPENH323_DIR!$OPENH323_DIR$ac_delim
+PBX_OPENH323!$PBX_OPENH323$ac_delim
-+QT_LIB!$QT_LIB$ac_delim
+ QT_LIB!$QT_LIB$ac_delim
QT_INCLUDE!$QT_INCLUDE$ac_delim
QT_DIR!$QT_DIR$ac_delim
- PBX_QT!$PBX_QT$ac_delim
-@@ -34443,12 +34891,53 @@ GTK_LIB!$GTK_LIB$ac_delim
+@@ -34443,6 +34891,47 @@ GTK_LIB!$GTK_LIB$ac_delim
PKGCONFIG!$PKGCONFIG$ac_delim
PBX_GTK2!$PBX_GTK2$ac_delim
GTK2_INCLUDE!$GTK2_INCLUDE$ac_delim
@@ -562,13 +560,6 @@
GTK2_LIB!$GTK2_LIB$ac_delim
CURL_CONFIG!$CURL_CONFIG$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -34466,8 +34955,8 @@ if test -n "$ac_eof"; then
fi
More information about the Pkg-voip-commits
mailing list