[Pkg-voip-commits] r5857 - in /asterisk/trunk/debian: changelog control patches/armel_support patches/bristuff/zapata-bri+euroisdn patches/bristuff/zapata-gsm patches/series
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Thu Jun 12 21:26:27 UTC 2008
Author: tzafrir-guest
Date: Thu Jun 12 21:26:27 2008
New Revision: 5857
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5857
Log:
* New upstream release.
* bison no longer needed to build Asterisk (Since 1.4.0).
* Patch armel_support applied upstream.
* Patches bristuff/zapata-gsm and bristuff/zapata-bri+euroisdn adjusted to
chan_zap changes (conf became a pointer in mkintf).
Removed:
asterisk/trunk/debian/patches/armel_support
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/control
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/bristuff/zapata-gsm
asterisk/trunk/debian/patches/series
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5857&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Jun 12 21:26:27 2008
@@ -1,3 +1,13 @@
+asterisk (1:1.4.21~dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * bison no longer needed to build Asterisk (Since 1.4.0).
+ * Patch armel_support applied upstream.
+ * Patches bristuff/zapata-gsm and bristuff/zapata-bri+euroisdn adjusted to
+ chan_zap changes (conf became a pointer in mkintf).
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Thu, 12 Jun 2008 21:30:40 +0300
+
asterisk (1:1.4.20~dfsg-1) unstable; urgency=low
[ Victor Seva ]
Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=5857&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Thu Jun 12 21:26:27 2008
@@ -3,7 +3,7 @@
Section: comm
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 5), quilt, zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4.1), libvpb-dev, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, libspeexdsp-dev, graphviz, libcurl4-openssl-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp-dev, libc-client2007-dev, libcap-dev
+Build-Depends: debhelper (>= 5), quilt, zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4.1), libvpb-dev, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, libspeexdsp-dev, graphviz, libcurl4-openssl-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp-dev, libc-client2007-dev, libcap-dev
Standards-Version: 3.7.3
Homepage: http://www.asterisk.org/
Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk/trunk/
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=5857&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Jun 12 21:26:27 2008
@@ -565,46 +565,46 @@
destroy_zt_pvt(&tmp);
return NULL;
}
-+ if ((pris[span].localdialplan) && (pris[span].localdialplan != conf.pri.localdialplan)) {
++ if ((pris[span].localdialplan) && (pris[span].localdialplan != conf->pri.localdialplan)) {
+ ast_log(LOG_ERROR, "Span %d is already a %s local dialing plan\n", span + 1, dialplan2str(pris[span].localdialplan));
+ destroy_zt_pvt(&tmp);
+ return NULL;
+ }
- if (pris[span].minunused && (pris[span].minunused != conf.pri.minunused)) {
- ast_log(LOG_ERROR, "Span %d already has minunused of %d.\n", span + 1, conf.pri.minunused);
+ if (pris[span].minunused && (pris[span].minunused != conf->pri.minunused)) {
+ ast_log(LOG_ERROR, "Span %d already has minunused of %d.\n", span + 1, conf->pri.minunused);
destroy_zt_pvt(&tmp);
@@ -7331,6 +7475,11 @@ static struct zt_pvt *mkintf(int channel
return NULL;
}
- pris[span].nodetype = conf.pri.nodetype;
-+
-+ if (conf.pri.nodetype == BRI_NETWORK_PTMP) {
+ pris[span].nodetype = conf->pri.nodetype;
++
++ if (conf->pri.nodetype == BRI_NETWORK_PTMP) {
+ pris[span].dchanavail[0] = DCHAN_AVAILABLE;
+ pri_find_dchan(&pris[span]);
+ }
pris[span].switchtype = myswitchtype;
- pris[span].nsf = conf.pri.nsf;
- pris[span].dialplan = conf.pri.dialplan;
+ pris[span].nsf = conf->pri.nsf;
+ pris[span].dialplan = conf->pri.dialplan;
@@ -7339,9 +7488,13 @@ static struct zt_pvt *mkintf(int channel
- pris[span].minunused = conf.pri.minunused;
- pris[span].minidle = conf.pri.minidle;
- pris[span].overlapdial = conf.pri.overlapdial;
-+ pris[span].usercid = conf.pri.usercid;
+ pris[span].minunused = conf->pri.minunused;
+ pris[span].minidle = conf->pri.minidle;
+ pris[span].overlapdial = conf->pri.overlapdial;
++ pris[span].usercid = conf->pri.usercid;
+ pris[span].suspended_calls = NULL;
- pris[span].facilityenable = conf.pri.facilityenable;
- ast_copy_string(pris[span].idledial, conf.pri.idledial, sizeof(pris[span].idledial));
- ast_copy_string(pris[span].idleext, conf.pri.idleext, sizeof(pris[span].idleext));
-+ ast_copy_string(pris[span].nocid, conf.pri.nocid, sizeof(pris[span].nocid));
-+ ast_copy_string(pris[span].withheldcid, conf.pri.withheldcid, sizeof(pris[span].withheldcid));
- ast_copy_string(pris[span].internationalprefix, conf.pri.internationalprefix, sizeof(pris[span].internationalprefix));
- ast_copy_string(pris[span].nationalprefix, conf.pri.nationalprefix, sizeof(pris[span].nationalprefix));
- ast_copy_string(pris[span].localprefix, conf.pri.localprefix, sizeof(pris[span].localprefix));
+ pris[span].facilityenable = conf->pri.facilityenable;
+ ast_copy_string(pris[span].idledial, conf->pri.idledial, sizeof(pris[span].idledial));
+ ast_copy_string(pris[span].idleext, conf->pri.idleext, sizeof(pris[span].idleext));
++ ast_copy_string(pris[span].nocid, conf->pri.nocid, sizeof(pris[span].nocid));
++ ast_copy_string(pris[span].withheldcid, conf->pri.withheldcid, sizeof(pris[span].withheldcid));
+ ast_copy_string(pris[span].internationalprefix, conf->pri.internationalprefix, sizeof(pris[span].internationalprefix));
+ ast_copy_string(pris[span].nationalprefix, conf->pri.nationalprefix, sizeof(pris[span].nationalprefix));
+ ast_copy_string(pris[span].localprefix, conf->pri.localprefix, sizeof(pris[span].localprefix));
@@ -7483,6 +7636,7 @@ static struct zt_pvt *mkintf(int channel
- tmp->restrictcid = conf.chan.restrictcid;
- tmp->use_callingpres = conf.chan.use_callingpres;
- tmp->priindication_oob = conf.chan.priindication_oob;
-+ tmp->pritransfer = conf.chan.pritransfer;
- tmp->priexclusive = conf.chan.priexclusive;
+ tmp->restrictcid = conf->chan.restrictcid;
+ tmp->use_callingpres = conf->chan.use_callingpres;
+ tmp->priindication_oob = conf->chan.priindication_oob;
++ tmp->pritransfer = conf->chan.pritransfer;
+ tmp->priexclusive = conf->chan.priexclusive;
if (tmp->usedistinctiveringdetection) {
if (!tmp->use_callerid) {
@@ -7765,7 +7919,7 @@ static int pri_find_empty_chan(struct zt
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5857&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Thu Jun 12 21:26:27 2008
@@ -173,7 +173,7 @@
+static void *gsm_dchannel(void *vgsm);
+#endif
+
- static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pri *pri, int reloading)
+ static struct zt_pvt *mkintf(int channel, const struct zt_chan_conf *conf, struct zt_pri *pri, int reloading)
{
/* Make a zt_pvt structure for this interface (or CRV if "pri" is specified) */
@@ -7530,6 +7595,37 @@ static struct zt_pvt *mkintf(int channel
@@ -181,7 +181,7 @@
}
#endif
+#ifdef HAVE_GSMAT
-+ if (conf.chan.sig == SIG_GSM) {
++ if (conf->chan.sig == SIG_GSM) {
+ struct zt_bufferinfo bi;
+ ast_mutex_init(&tmp->gsm.lock);
+ strncpy(tmp->gsm.pin, gsm_modem_pin, sizeof(tmp->gsm.pin) - 1);
@@ -212,8 +212,8 @@
+ }
+#endif
} else {
- conf.chan.sig = tmp->sig;
- conf.chan.radio = tmp->radio;
+ conf->chan.sig = tmp->sig;
+ conf->chan.radio = tmp->radio;
@@ -7819,6 +7915,12 @@ static inline int available(struct zt_pv
return 1;
}
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5857&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Thu Jun 12 21:26:27 2008
@@ -13,7 +13,6 @@
astgenkey-security
apptest_sleep
-armel_support
### new features
pubkey_jnctn
More information about the Pkg-voip-commits
mailing list