[Pkg-voip-commits] r7329 - in /asterisk/trunk/debian: asterisk.docs changelog control patches/app-osplookup-osptk-3.4 patches/astvarrundir patches/disable-appdocs patches/pubkey_jnctn patches/safe_asterisk-nobg patches/series patches/silence-buildsum-warning rules watch
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Wed Jun 3 22:43:36 UTC 2009
Author: paravoid
Date: Wed Jun 3 22:43:36 2009
New Revision: 7329
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7329
Log:
* New upstream release.
- Drop patches astvarrundir, pubkey_jnctn; merged upstream (finally!).
- Adapt patch safe_asterisk-nobg.
* Switch to downloads.asterisk.org instead of downloads.digium.com.
* Add depends on libxml2-dev for the new XML documentation but temporarily
comment out its installation.
* Remove Conflicts/Replaces with asterisk-classic, asterisk-bristuff,
asterisk-chan-capi (<< 1.1.1-1~), since those are pre-lenny.
* Revert upstream's r190830 that ported app_osplookup to OSP Toolkit 3.5;
the API is not backwards compatible and Debian still has 3.4.2.
Added:
asterisk/trunk/debian/patches/app-osplookup-osptk-3.4
asterisk/trunk/debian/patches/disable-appdocs
Removed:
asterisk/trunk/debian/patches/astvarrundir
asterisk/trunk/debian/patches/pubkey_jnctn
asterisk/trunk/debian/patches/silence-buildsum-warning
Modified:
asterisk/trunk/debian/asterisk.docs
asterisk/trunk/debian/changelog
asterisk/trunk/debian/control
asterisk/trunk/debian/patches/safe_asterisk-nobg
asterisk/trunk/debian/patches/series
asterisk/trunk/debian/rules
asterisk/trunk/debian/watch
Modified: asterisk/trunk/debian/asterisk.docs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.docs?rev=7329&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.docs (original)
+++ asterisk/trunk/debian/asterisk.docs Wed Jun 3 22:43:36 2009
@@ -3,5 +3,3 @@
CREDITS
UPGRADE.txt
CHANGES
-asterisk-1.6.1.0-summary.html
-asterisk-1.6.1.0-summary.txt
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7329&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Wed Jun 3 22:43:36 2009
@@ -1,11 +1,23 @@
-asterisk (1:1.6.1.0~dfsg-2) UNRELEASED; urgency=low
+asterisk (1:1.6.2.0~dfsg~beta2-1) UNRELEASED; urgency=low
* NOT RELEASED YET
[ Tzafrir Cohen ]
* Patch safe_asterisk_bashism: fixes that bashism (Closes: #530047).
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Sat, 23 May 2009 18:50:54 +0300
+ [ Faidon Liambotis ]
+ * New upstream release.
+ - Drop patches astvarrundir, pubkey_jnctn; merged upstream (finally!).
+ - Adapt patch safe_asterisk-nobg.
+ * Switch to downloads.asterisk.org instead of downloads.digium.com.
+ * Add depends on libxml2-dev for the new XML documentation but temporarily
+ comment out its installation.
+ * Remove Conflicts/Replaces with asterisk-classic, asterisk-bristuff,
+ asterisk-chan-capi (<< 1.1.1-1~), since those are pre-lenny.
+ * Revert upstream's r190830 that ported app_osplookup to OSP Toolkit 3.5;
+ the API is not backwards compatible and Debian still has 3.4.2.
+
+ -- Faidon Liambotis <paravoid at debian.org> Thu, 04 Jun 2009 01:41:50 +0300
asterisk (1:1.6.1.0~dfsg-1) unstable; urgency=low
Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=7329&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Wed Jun 3 22:43:36 2009
@@ -24,6 +24,7 @@
graphviz,
libcurl4-openssl-dev | libcurl-dev,
doxygen,
+ libxml2-dev,
gsfonts,
libpopt-dev,
libopenh323-dev (>= 1.17.4),
@@ -51,8 +52,6 @@
Architecture: any
Section: comm
Depends: ${shlibs:Depends}, asterisk-config (= ${source:Version}) | asterisk-config-custom, adduser, asterisk-sounds-main, dahdi
-Conflicts: asterisk-classic, asterisk-bristuff, asterisk-chan-capi (<< 1.1.1-1~)
-Replaces: asterisk-classic, asterisk-bristuff
Provides: asterisk-1.6.1
Suggests: ekiga, ohphone, twinkle, kphone, asterisk-doc, asterisk-dev, asterisk-h323
Description: Open Source Private Branch Exchange (PBX)
Added: asterisk/trunk/debian/patches/app-osplookup-osptk-3.4
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/app-osplookup-osptk-3.4?rev=7329&op=file
==============================================================================
--- asterisk/trunk/debian/patches/app-osplookup-osptk-3.4 (added)
+++ asterisk/trunk/debian/patches/app-osplookup-osptk-3.4 Wed Jun 3 22:43:36 2009
@@ -1,0 +1,763 @@
+This is upstream's r190830 reverted (but with r196072 applied).
+
+Upstream ported app_osplookup to OSP Toolkit 3.5; however, 3.5 broke API and
+Debian at the time of this writing still has 3.4.2.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- a/apps/app_osplookup.c
++++ b/apps/app_osplookup.c
+@@ -35,7 +35,7 @@
+
+ #include "asterisk.h"
+
+-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 190985 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 178870 $")
+
+ #include <osp/osp.h>
+ #include <osp/osputils.h>
+@@ -144,7 +144,7 @@ struct osp_provider {
+ /* Call ID */
+ struct osp_callid {
+ unsigned char buf[OSPC_CALLID_MAXSIZE]; /* Call ID string */
+- unsigned int len; /* Call ID length */
++ unsigned int len; /* Call ID length */
+ };
+
+ /* OSP Application In/Output Results */
+@@ -182,26 +182,25 @@ static int osp_create_provider(
+ struct ast_config* cfg,
+ const char* provider)
+ {
+- int res = 0;
+- struct ast_variable* v;
++ int res;
++ unsigned int t, i, j;
+ struct osp_provider* p;
++ struct ast_variable* v;
+ OSPTPRIVATEKEY privatekey;
+- OSPT_CERT localcert;
+- OSPT_CERT cacerts[OSP_MAX_CERTS];
+- const OSPT_CERT* pcacerts[OSP_MAX_CERTS];
++ OSPTCERT localcert;
+ const char* psrvpoints[OSP_MAX_SRVS];
+- int t, i, j, error = OSPC_ERR_NO_ERROR;
++ OSPTCERT cacerts[OSP_MAX_CERTS];
++ const OSPTCERT* pcacerts[OSP_MAX_CERTS];
++ int error = OSPC_ERR_NO_ERROR;
+
+ if (!(p = ast_calloc(1, sizeof(*p)))) {
+ ast_log(LOG_ERROR, "Out of memory\n");
+ return -1;
+ }
+
+- /* ast_calloc has set 0 in p */
+ ast_copy_string(p->name, provider, sizeof(p->name));
+ snprintf(p->privatekey, sizeof(p->privatekey), "%s/%s-privatekey.pem", ast_config_AST_KEY_DIR, provider);
+ snprintf(p->localcert, sizeof(p->localcert), "%s/%s-localcert.pem", ast_config_AST_KEY_DIR, provider);
+- snprintf(p->cacerts[0], sizeof(p->cacerts[0]), "%s/%s-cacert_0.pem", ast_config_AST_KEY_DIR, provider);
+ p->maxconnections = OSP_DEF_MAXCONNECTIONS;
+ p->retrydelay = OSP_DEF_RETRYDELAY;
+ p->retrylimit = OSP_DEF_RETRYLIMIT;
+@@ -355,24 +354,24 @@ static int osp_create_provider(
+ }
+
+ error = OSPPProviderNew(
+- p->spcount,
+- psrvpoints,
+- NULL,
+- OSP_AUDIT_URL,
+- &privatekey,
+- &localcert,
+- p->cacount,
+- pcacerts,
+- OSP_LOCAL_VALIDATION,
+- OSP_SSL_LIFETIME,
+- p->maxconnections,
+- OSP_HTTP_PERSISTENCE,
+- p->retrydelay,
+- p->retrylimit,
+- p->timeout,
+- OSP_CUSTOMER_ID,
+- OSP_DEVICE_ID,
+- &p->handle);
++ p->spcount,
++ psrvpoints,
++ NULL,
++ OSP_AUDIT_URL,
++ &privatekey,
++ &localcert,
++ p->cacount,
++ pcacerts,
++ OSP_LOCAL_VALIDATION,
++ OSP_SSL_LIFETIME,
++ p->maxconnections,
++ OSP_HTTP_PERSISTENCE,
++ p->retrydelay,
++ p->retrylimit,
++ p->timeout,
++ OSP_CUSTOMER_ID,
++ OSP_DEVICE_ID,
++ &p->handle);
+ if (error != OSPC_ERR_NO_ERROR) {
+ ast_log(LOG_WARNING, "OSP: Unable to create provider '%s', error '%d'\n", provider, error);
+ ast_free(p);
+@@ -525,26 +524,26 @@ static int osp_validate_token(
+ osp_convert_address(source, src, sizeof(src));
+ osp_convert_address(destination, dst, sizeof(dst));
+ error = OSPPTransactionValidateAuthorisation(
+- transaction,
+- src,
+- dst,
+- NULL,
+- NULL,
+- calling ? calling : "",
+- OSPC_NFORMAT_E164,
+- called,
+- OSPC_NFORMAT_E164,
+- 0,
+- NULL,
+- tokenlen,
+- (char*)tokenstr,
+- &authorised,
+- timelimit,
+- &dummy,
+- NULL,
+- osp_tokenformat);
++ transaction,
++ src,
++ dst,
++ NULL,
++ NULL,
++ calling ? calling : "",
++ OSPC_E164,
++ called,
++ OSPC_E164,
++ 0,
++ NULL,
++ tokenlen,
++ (char*)tokenstr,
++ &authorised,
++ timelimit,
++ &dummy,
++ NULL,
++ osp_tokenformat);
+ if (error != OSPC_ERR_NO_ERROR) {
+- ast_debug(1, "OSP: Unable to validate inbound token, error '%d'\n", error);
++ ast_debug(1, "OSP: Unable to validate inbound token\n");
+ res = -1;
+ } else if (authorised) {
+ ast_debug(1, "OSP: Authorised\n");
+@@ -595,12 +594,12 @@ static int osp_check_destination(
+ char* destination,
+ unsigned int tokenlen,
+ const char* token,
+- OSPEFAILREASON* reason,
++ enum OSPEFAILREASON* reason,
+ struct osp_result* result)
+ {
+ int res;
+- OSPE_DEST_OSPENABLED enabled;
+- OSPE_DEST_PROTOCOL protocol;
++ OSPE_DEST_OSP_ENABLED enabled;
++ OSPE_DEST_PROT protocol;
+ int error;
+
+ if (strlen(destination) <= 2) {
+@@ -615,7 +614,7 @@ static int osp_check_destination(
+ return -1;
+ }
+
+- if (enabled == OSPC_DOSP_FALSE) {
++ if (enabled == OSPE_OSP_FALSE) {
+ result->token[0] = '\0';
+ } else {
+ ast_base64encode(result->token, (const unsigned char*)token, tokenlen, sizeof(result->token) - 1);
+@@ -638,45 +637,45 @@ static int osp_check_destination(
+ /* Strip leading and trailing brackets */
+ destination[strlen(destination) - 1] = '\0';
+ switch(protocol) {
+- case OSPC_DPROT_Q931:
+- ast_debug(1, "OSP: protocol '%s'\n", OSP_PROT_H323);
+- ast_copy_string(result->tech, OSP_TECH_H323, sizeof(result->tech));
+- ast_copy_string(result->dest, destination + 1, sizeof(result->dest));
+- ast_copy_string(result->called, called, sizeof(result->called));
+- ast_copy_string(result->calling, calling, sizeof(result->calling));
+- break;
+- case OSPC_DPROT_SIP:
+- ast_debug(1, "OSP: protocol '%s'\n", OSP_PROT_SIP);
+- ast_copy_string(result->tech, OSP_TECH_SIP, sizeof(result->tech));
+- ast_copy_string(result->dest, destination + 1, sizeof(result->dest));
+- ast_copy_string(result->called, called, sizeof(result->called));
+- ast_copy_string(result->calling, calling, sizeof(result->calling));
+- break;
+- case OSPC_DPROT_IAX:
+- ast_debug(1, "OSP: protocol '%s'\n", OSP_PROT_IAX);
+- ast_copy_string(result->tech, OSP_TECH_IAX, sizeof(result->tech));
+- ast_copy_string(result->dest, destination + 1, sizeof(result->dest));
+- ast_copy_string(result->called, called, sizeof(result->called));
+- ast_copy_string(result->calling, calling, sizeof(result->calling));
+- break;
+- case OSPC_DPROT_UNDEFINED:
+- case OSPC_DPROT_UNKNOWN:
+- ast_debug(1, "OSP: unknown/undefined protocol '%d'\n", protocol);
+- ast_debug(1, "OSP: use default protocol '%s'\n", provider->defaultprotocol);
+-
+- ast_copy_string(result->tech, provider->defaultprotocol, sizeof(result->tech));
+- ast_copy_string(result->dest, destination + 1, sizeof(result->dest));
+- ast_copy_string(result->called, called, sizeof(result->called));
+- ast_copy_string(result->calling, calling, sizeof(result->calling));
+- break;
+- case OSPC_DPROT_LRQ:
+- default:
+- ast_log(LOG_WARNING, "OSP: unsupported protocol '%d'\n", protocol);
+- *reason = OSPC_FAIL_PROTOCOL_ERROR;
+- result->token[0] = '\0';
+- result->networkid[0] = '\0';
+- res = 0;
+- break;
++ case OSPE_DEST_PROT_H323_SETUP:
++ ast_debug(1, "OSP: protocol '%s'\n", OSP_PROT_H323);
++ ast_copy_string(result->tech, OSP_TECH_H323, sizeof(result->tech));
++ ast_copy_string(result->dest, destination + 1, sizeof(result->dest));
++ ast_copy_string(result->called, called, sizeof(result->called));
++ ast_copy_string(result->calling, calling, sizeof(result->calling));
++ break;
++ case OSPE_DEST_PROT_SIP:
++ ast_debug(1, "OSP: protocol '%s'\n", OSP_PROT_SIP);
++ ast_copy_string(result->tech, OSP_TECH_SIP, sizeof(result->tech));
++ ast_copy_string(result->dest, destination + 1, sizeof(result->dest));
++ ast_copy_string(result->called, called, sizeof(result->called));
++ ast_copy_string(result->calling, calling, sizeof(result->calling));
++ break;
++ case OSPE_DEST_PROT_IAX:
++ ast_debug(1, "OSP: protocol '%s'\n", OSP_PROT_IAX);
++ ast_copy_string(result->tech, OSP_TECH_IAX, sizeof(result->tech));
++ ast_copy_string(result->dest, destination + 1, sizeof(result->dest));
++ ast_copy_string(result->called, called, sizeof(result->called));
++ ast_copy_string(result->calling, calling, sizeof(result->calling));
++ break;
++ case OSPE_DEST_PROT_UNDEFINED:
++ case OSPE_DEST_PROT_UNKNOWN:
++ ast_debug(1, "OSP: unknown/undefined protocol '%d'\n", protocol);
++ ast_debug(1, "OSP: use default protocol '%s'\n", provider->defaultprotocol);
++
++ ast_copy_string(result->tech, provider->defaultprotocol, sizeof(result->tech));
++ ast_copy_string(result->dest, destination + 1, sizeof(result->dest));
++ ast_copy_string(result->called, called, sizeof(result->called));
++ ast_copy_string(result->calling, calling, sizeof(result->calling));
++ break;
++ case OSPE_DEST_PROT_H323_LRQ:
++ default:
++ ast_log(LOG_WARNING, "OSP: unsupported protocol '%d'\n", protocol);
++ *reason = OSPC_FAIL_PROTOCOL_ERROR;
++ result->token[0] = '\0';
++ result->networkid[0] = '\0';
++ res = 0;
++ break;
+ }
+
+ return res;
+@@ -687,10 +686,10 @@ static int osp_check_destination(
+ * \param cause Asterisk hangup cause
+ * \return OSP TC code
+ */
+-static OSPEFAILREASON asterisk2osp(
++static enum OSPEFAILREASON asterisk2osp(
+ int cause)
+ {
+- return (OSPEFAILREASON)cause;
++ return (enum OSPEFAILREASON)cause;
+ }
+
+ /*!
+@@ -726,32 +725,32 @@ static int osp_auth(
+ }
+
+ switch (p->authpolicy) {
+- case OSP_AUTH_NO:
+- res = 1;
+- break;
+- case OSP_AUTH_EXCLUSIVE:
+- if (ast_strlen_zero(token)) {
+- res = 0;
+- } else if ((res = osp_create_transaction(provider, transaction, sizeof(dest), dest)) <= 0) {
+- ast_debug(1, "OSP: Unable to generate transaction handle\n");
+- *transaction = OSP_INVALID_HANDLE;
+- res = 0;
+- } else if((res = osp_validate_token(*transaction, source, dest, calling, called, token, timelimit)) <= 0) {
+- OSPPTransactionRecordFailure(*transaction, OSPC_FAIL_CALL_REJECTED);
+- }
+- break;
+- case OSP_AUTH_YES:
+- default:
+- if (ast_strlen_zero(token)) {
++ case OSP_AUTH_NO:
+ res = 1;
+- } else if ((res = osp_create_transaction(provider, transaction, sizeof(dest), dest)) <= 0) {
+- ast_debug(1, "OSP: Unable to generate transaction handle\n");
+- *transaction = OSP_INVALID_HANDLE;
+- res = 0;
+- } else if((res = osp_validate_token(*transaction, source, dest, calling, called, token, timelimit)) <= 0) {
+- OSPPTransactionRecordFailure(*transaction, OSPC_FAIL_CALL_REJECTED);
+- }
+- break;
++ break;
++ case OSP_AUTH_EXCLUSIVE:
++ if (ast_strlen_zero(token)) {
++ res = 0;
++ } else if ((res = osp_create_transaction(provider, transaction, sizeof(dest), dest)) <= 0) {
++ ast_debug(1, "OSP: Unable to generate transaction handle\n");
++ *transaction = OSP_INVALID_HANDLE;
++ res = 0;
++ } else if((res = osp_validate_token(*transaction, source, dest, calling, called, token, timelimit)) <= 0) {
++ OSPPTransactionRecordFailure(*transaction, OSPC_FAIL_CALL_REJECTED);
++ }
++ break;
++ case OSP_AUTH_YES:
++ default:
++ if (ast_strlen_zero(token)) {
++ res = 1;
++ } else if ((res = osp_create_transaction(provider, transaction, sizeof(dest), dest)) <= 0) {
++ ast_debug(1, "OSP: Unable to generate transaction handle\n");
++ *transaction = OSP_INVALID_HANDLE;
++ res = 0;
++ } else if((res = osp_validate_token(*transaction, source, dest, calling, called, token, timelimit)) <= 0) {
++ OSPPTransactionRecordFailure(*transaction, OSPC_FAIL_CALL_REJECTED);
++ }
++ break;
+ }
+
+ return res;
+@@ -824,15 +823,15 @@ static int osp_create_callid(
+
+ callid->len = sizeof(callid->buf);
+ switch (type) {
+- case OSP_CALLID_H323:
+- res = osp_create_uuid(callid->buf, &callid->len);
+- break;
+- case OSP_CALLID_SIP:
+- case OSP_CALLID_IAX:
+- res = 0;
+- default:
+- res = -1;
+- break;
++ case OSP_CALLID_H323:
++ res = osp_create_uuid(callid->buf, &callid->len);
++ break;
++ case OSP_CALLID_SIP:
++ case OSP_CALLID_IAX:
++ res = 0;
++ default:
++ res = -1;
++ break;
+ }
+
+ if ((res != 1) && (callid->len != 0)) {
+@@ -874,9 +873,9 @@ static int osp_lookup(
+ unsigned int i, type;
+ struct osp_callid callid;
+ unsigned int callidnum;
+- OSPT_CALL_ID* callids[OSP_CALLID_MAXNUM];
++ OSPTCALLID* callids[OSP_CALLID_MAXNUM];
+ unsigned int dummy = 0;
+- OSPEFAILREASON reason;
++ enum OSPEFAILREASON reason;
+ int error;
+
+ result->outhandle = OSP_INVALID_HANDLE;
+@@ -920,27 +919,27 @@ static int osp_lookup(
+ osp_convert_address(srcdev, dev, sizeof(dev));
+ result->numresults = OSP_DEF_DESTINATIONS;
+ error = OSPPTransactionRequestAuthorisation(
+- result->outhandle,
+- src,
+- dev,
+- calling ? calling : "",
+- OSPC_NFORMAT_E164,
+- called,
+- OSPC_NFORMAT_E164,
+- NULL,
+- callidnum,
+- callids,
+- NULL,
+- &result->numresults,
+- &dummy,
+- NULL);
++ result->outhandle,
++ src,
++ dev,
++ calling ? calling : "",
++ OSPC_E164,
++ called,
++ OSPC_E164,
++ NULL,
++ callidnum,
++ callids,
++ NULL,
++ &result->numresults,
++ &dummy,
++ NULL);
+
+ for (i = 0; i < callidnum; i++) {
+ OSPPCallIdDelete(&callids[i]);
+ }
+
+ if (error != OSPC_ERR_NO_ERROR) {
+- ast_debug(1, "OSP: Unable to request authorization, error '%d'\n", error);
++ ast_debug(1, "OSP: Unable to request authorization\n");
+ result->numresults = 0;
+ if (result->inhandle != OSP_INVALID_HANDLE) {
+ OSPPTransactionRecordFailure(result->inhandle, OSPC_FAIL_NORMAL_UNSPECIFIED);
+@@ -959,25 +958,25 @@ static int osp_lookup(
+ result->outcallid.len = sizeof(result->outcallid.buf);
+ tokenlen = sizeof(token);
+ error = OSPPTransactionGetFirstDestination(
+- result->outhandle,
+- 0,
+- NULL,
+- NULL,
+- &result->outtimelimit,
+- &result->outcallid.len,
+- result->outcallid.buf,
+- sizeof(callednum),
+- callednum,
+- sizeof(callingnum),
+- callingnum,
+- sizeof(destination),
+- destination,
+- 0,
+- NULL,
+- &tokenlen,
+- token);
++ result->outhandle,
++ 0,
++ NULL,
++ NULL,
++ &result->outtimelimit,
++ &result->outcallid.len,
++ result->outcallid.buf,
++ sizeof(callednum),
++ callednum,
++ sizeof(callingnum),
++ callingnum,
++ sizeof(destination),
++ destination,
++ 0,
++ NULL,
++ &tokenlen,
++ token);
+ if (error != OSPC_ERR_NO_ERROR) {
+- ast_debug(1, "OSP: Unable to get first route, error '%d'\n", error);
++ ast_debug(1, "OSP: Unable to get first route\n");
+ result->numresults = 0;
+ result->outtimelimit = OSP_DEF_TIMELIMIT;
+ if (result->inhandle != OSP_INVALID_HANDLE) {
+@@ -1012,24 +1011,24 @@ static int osp_lookup(
+ result->outcallid.len = sizeof(result->outcallid.buf);
+ tokenlen = sizeof(token);
+ error = OSPPTransactionGetNextDestination(
+- result->outhandle,
+- reason,
+- 0,
+- NULL,
+- NULL,
+- &result->outtimelimit,
+- &result->outcallid.len,
+- result->outcallid.buf,
+- sizeof(callednum),
+- callednum,
+- sizeof(callingnum),
+- callingnum,
+- sizeof(destination),
+- destination,
+- 0,
+- NULL,
+- &tokenlen,
+- token);
++ result->outhandle,
++ reason,
++ 0,
++ NULL,
++ NULL,
++ &result->outtimelimit,
++ &result->outcallid.len,
++ result->outcallid.buf,
++ sizeof(callednum),
++ callednum,
++ sizeof(callingnum),
++ callingnum,
++ sizeof(destination),
++ destination,
++ 0,
++ NULL,
++ &tokenlen,
++ token);
+ if (error == OSPC_ERR_NO_ERROR) {
+ result->numresults--;
+ result->outtimelimit = osp_choose_timelimit(result->intimelimit, result->outtimelimit);
+@@ -1083,7 +1082,7 @@ static int osp_next(
+ char destination[OSP_NORSTR_SIZE];
+ unsigned int tokenlen;
+ char token[OSP_TOKSTR_SIZE];
+- OSPEFAILREASON reason;
++ enum OSPEFAILREASON reason;
+ int error;
+
+ result->tech[0] = '\0';
+@@ -1123,24 +1122,24 @@ static int osp_next(
+ result->outcallid.len = sizeof(result->outcallid.buf);
+ tokenlen = sizeof(token);
+ error = OSPPTransactionGetNextDestination(
+- result->outhandle,
+- reason,
+- 0,
+- NULL,
+- NULL,
+- &result->outtimelimit,
+- &result->outcallid.len,
+- result->outcallid.buf,
+- sizeof(callednum),
+- callednum,
+- sizeof(callingnum),
+- callingnum,
+- sizeof(destination),
+- destination,
+- 0,
+- NULL,
+- &tokenlen,
+- token);
++ result->outhandle,
++ reason,
++ 0,
++ NULL,
++ NULL,
++ &result->outtimelimit,
++ &result->outcallid.len,
++ result->outcallid.buf,
++ sizeof(callednum),
++ callednum,
++ sizeof(callingnum),
++ callingnum,
++ sizeof(destination),
++ destination,
++ 0,
++ NULL,
++ &tokenlen,
++ token);
+ if (error == OSPC_ERR_NO_ERROR) {
+ result->numresults--;
+ result->outtimelimit = osp_choose_timelimit(result->intimelimit, result->outtimelimit);
+@@ -1194,12 +1193,12 @@ static int osp_finish(
+ int recorded,
+ int cause,
+ time_t start,
+- time_t connect,
++ time_t connect_time,
+ time_t end,
+ unsigned int release)
+ {
+ int res;
+- OSPEFAILREASON reason;
++ enum OSPEFAILREASON reason;
+ time_t alert = 0;
+ unsigned isPddInfoPresent = 0;
+ unsigned pdd = 0;
+@@ -1216,22 +1215,22 @@ static int osp_finish(
+ }
+
+ error = OSPPTransactionReportUsage(
+- handle,
+- difftime(end, connect),
+- start,
+- end,
+- alert,
+- connect,
+- isPddInfoPresent,
+- pdd,
+- release,
+- NULL,
+- -1,
+- -1,
+- -1,
+- -1,
+- &dummy,
+- NULL);
++ handle,
++ difftime(end, connect_time),
++ start,
++ end,
++ alert,
++ connect_time,
++ isPddInfoPresent,
++ pdd,
++ release,
++ (unsigned char*)"",
++ 0,
++ 0,
++ 0,
++ 0,
++ &dummy,
++ NULL);
+ if (error == OSPC_ERR_NO_ERROR) {
+ ast_debug(1, "OSP: Usage reported\n");
+ res = 1;
+@@ -1254,7 +1253,7 @@ static int osp_finish(
+ */
+ static int ospauth_exec(
+ struct ast_channel* chan,
+- void* data)
++ const void* data)
+ {
+ int res;
+ const char* provider = OSP_DEF_PROVIDER;
+@@ -1334,14 +1333,14 @@ static int ospauth_exec(
+ */
+ static int osplookup_exec(
+ struct ast_channel* chan,
+- void* data)
++ const void* data)
+ {
+ int res, cres;
+ const char* provider = OSP_DEF_PROVIDER;
+ struct varshead* headp;
+ struct ast_var_t* current;
+ const char* srcdev = "";
+- const char* snetid = "";
++ const char* netid = "";
+ char buffer[OSP_TOKSTR_SIZE];
+ unsigned int callidtypes = OSP_CALLID_UNDEFINED;
+ struct osp_result result;
+@@ -1400,14 +1399,14 @@ static int osplookup_exec(
+ result.intimelimit = OSP_DEF_TIMELIMIT;
+ }
+ } else if (!strcasecmp(ast_var_name(current), "OSPINNETWORKID")) {
+- snetid = ast_var_value(current);
++ netid = ast_var_value(current);
+ } else if (!strcasecmp(ast_var_name(current), "OSPPEERIP")) {
+ srcdev = ast_var_value(current);
+ }
+ }
+ ast_debug(1, "OSPLookup: OSPINHANDLE '%d'\n", result.inhandle);
+ ast_debug(1, "OSPLookup: OSPINTIMELIMIT '%d'\n", result.intimelimit);
+- ast_debug(1, "OSPLookup: OSPINNETWORKID '%s'\n", snetid);
++ ast_debug(1, "OSPLookup: OSPINNETWORKID '%s'\n", netid);
+ ast_debug(1, "OSPLookup: source device '%s'\n", srcdev);
+
+ if ((cres = ast_autoservice_start(chan)) < 0) {
+@@ -1502,7 +1501,7 @@ static int osplookup_exec(
+ */
+ static int ospnext_exec(
+ struct ast_channel* chan,
+- void* data)
++ const void* data)
+ {
+ int res;
+ const char* provider = OSP_DEF_PROVIDER;
+@@ -1656,7 +1655,7 @@ static int ospnext_exec(
+ */
+ static int ospfinished_exec(
+ struct ast_channel* chan,
+- void* data)
++ const void* data)
+ {
+ int res = 1;
+ int cause = 0;
+@@ -1665,7 +1664,7 @@ static int ospfinished_exec(
+ int inhandle = OSP_INVALID_HANDLE;
+ int outhandle = OSP_INVALID_HANDLE;
+ int recorded = 0;
+- time_t start, connect, end;
++ time_t start, connect_time, end;
+ unsigned int release;
+ char buffer[OSP_INTSTR_SIZE];
+ const char* status;
+@@ -1714,34 +1713,34 @@ static int ospfinished_exec(
+
+ if (chan->cdr) {
+ start = chan->cdr->start.tv_sec;
+- connect = chan->cdr->answer.tv_sec;
+- if (connect) {
++ connect_time = chan->cdr->answer.tv_sec;
++ if (connect_time) {
+ end = time(NULL);
+ } else {
+- end = connect;
++ end = connect_time;
+ }
+ } else {
+ start = 0;
+- connect = 0;
++ connect_time = 0;
+ end = 0;
+ }
+ ast_debug(1, "OSPFinish: start '%ld'\n", start);
+- ast_debug(1, "OSPFinish: connect '%ld'\n", connect);
++ ast_debug(1, "OSPFinish: connect '%ld'\n", connect_time);
+ ast_debug(1, "OSPFinish: end '%ld'\n", end);
+
+ release = ast_check_hangup(chan) ? 0 : 1;
+
+- if (osp_finish(outhandle, recorded, cause, start, connect, end, release) <= 0) {
++ if (osp_finish(outhandle, recorded, cause, start, connect_time, end, release) <= 0) {
+ ast_debug(1, "OSPFinish: Unable to report usage for outbound call\n");
+ }
+ switch (cause) {
+- case AST_CAUSE_NORMAL_CLEARING:
+- break;
+- default:
+- cause = AST_CAUSE_NO_ROUTE_DESTINATION;
+- break;
++ case AST_CAUSE_NORMAL_CLEARING:
++ break;
++ default:
++ cause = AST_CAUSE_NO_ROUTE_DESTINATION;
++ break;
+ }
+- if (osp_finish(inhandle, recorded, cause, start, connect, end, release) <= 0) {
++ if (osp_finish(inhandle, recorded, cause, start, connect_time, end, release) <= 0) {
+ ast_debug(1, "OSPFinish: Unable to report usage for inbound call\n");
+ }
+ snprintf(buffer, sizeof(buffer), "%d", OSP_INVALID_HANDLE);
+@@ -1885,16 +1884,16 @@ static char *handle_cli_osp_show(struct
+ provider = a->argv[2];
+ if (!provider) {
+ switch (osp_tokenformat) {
+- case TOKEN_ALGO_BOTH:
+- tokenalgo = "Both";
+- break;
+- case TOKEN_ALGO_UNSIGNED:
+- tokenalgo = "Unsigned";
+- break;
+- case TOKEN_ALGO_SIGNED:
+- default:
+- tokenalgo = "Signed";
+- break;
++ case TOKEN_ALGO_BOTH:
++ tokenalgo = "Both";
++ break;
++ case TOKEN_ALGO_UNSIGNED:
++ tokenalgo = "Unsigned";
++ break;
++ case TOKEN_ALGO_SIGNED:
++ default:
++ tokenalgo = "Signed";
++ break;
+ }
+ ast_cli(a->fd, "OSP: %s %s %s\n",
+ osp_initialized ? "Initialized" : "Uninitialized", osp_hardware ? "Accelerated" : "Normal", tokenalgo);
+@@ -1935,7 +1934,7 @@ static char *handle_cli_osp_show(struct
+ ast_cli(a->fd, "Unable to find OSP provider '%s'\n", provider);
+ } else {
+ ast_cli(a->fd, "No OSP providers configured\n");
+- }
++ }
+ }
+ return CLI_SUCCESS;
+ }
+@@ -2043,4 +2042,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MO
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+-);
++ );
Added: asterisk/trunk/debian/patches/disable-appdocs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/disable-appdocs?rev=7329&op=file
==============================================================================
--- asterisk/trunk/debian/patches/disable-appdocs (added)
+++ asterisk/trunk/debian/patches/disable-appdocs Wed Jun 3 22:43:36 2009
@@ -1,0 +1,27 @@
+Disable application docs for now, it needs some integration with Debian
+packages (along with some needed Makefile changes...)
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- a/Makefile
++++ b/Makefile
+@@ -358,7 +358,7 @@ all: _all
+ @echo " + $(mK) install +"
+ @echo " +-------------------------------------------+"
+
+-_all: cleantest makeopts $(SUBDIRS) doc/core-en_US.xml
++_all: cleantest makeopts $(SUBDIRS)
+
+ makeopts: configure
+ @echo "****"
+@@ -575,8 +575,8 @@ bininstall: _all installdirs $(SUBDIRS_I
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
+ mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+- $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTVARLIBDIR)/documentation
++# $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
++# $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTVARLIBDIR)/documentation
+ $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+ $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+ $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
Modified: asterisk/trunk/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-nobg?rev=7329&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-nobg Wed Jun 3 22:43:36 2009
@@ -12,15 +12,15 @@
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
-@@ -15,6 +15,7 @@ DUMPDROP=/tmp
- SLEEPSECS=4
+@@ -18,6 +18,7 @@ SLEEPSECS=4
ASTSBINDIR=__ASTERISK_SBIN_DIR__
- ASTPIDFILE=__ASTERISK_VARRUN_DIR__/asterisk.pid
+ ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
+ ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
+BACKGROUND=0
# comment this line out to have this script _not_ kill all mpg123 processes when
# asterisk exits
-@@ -179,4 +180,8 @@ run_asterisk()
+@@ -207,4 +208,8 @@ run_asterisk()
done
}
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=7329&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Wed Jun 3 22:43:36 2009
@@ -3,19 +3,19 @@
debian-banner
hack-multiple-app-voicemail
-astvarrundir
make-clean-fixes
+disable-appdocs
safe_asterisk-config
safe_asterisk-nobg
safe_asterisk_bashism
+
+app-osplookup-osptk-3.4
+
# Remed-out for now. Should be fixed later on:
#h323-no-deps-on-asterisk
#h323-workaround-openh323-segfault
astgenkey-security
-
-### new features
-pubkey_jnctn
# bugfixes on top of everything
disable_moh
Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=7329&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Wed Jun 3 22:43:36 2009
@@ -45,11 +45,11 @@
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
DEB_SRC_VERSION:=$(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/-[0-9.]*$$//')
-UPVERSION:=$(shell echo $(DEB_SRC_VERSION) | sed -e 's/[.~]dfsg//' -e 's/~\(rc[0-9]\)/-\1/')
+UPVERSION:=$(shell echo $(DEB_SRC_VERSION) | sed -e 's/[.~]dfsg//' -e 's/~\(\(rc\|beta\)[0-9]\)/-\1/')
FILENAME := asterisk_$(DEB_SRC_VERSION).orig.tar.gz
UPFILENAME := asterisk_$(UPVERSION).orig.tar.gz
-URL := http://downloads.digium.com/pub/asterisk/releases/asterisk-$(UPVERSION).tar.gz
+URL := http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$(UPVERSION).tar.gz
# make sure we have 'fetch' . We need to have either wget or fetch
# on the system. However it is generally not a good idea to actually
Modified: asterisk/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/watch?rev=7329&op=diff
==============================================================================
--- asterisk/trunk/debian/watch (original)
+++ asterisk/trunk/debian/watch Wed Jun 3 22:43:36 2009
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/\~dfsg//,downloadurlmangle=s/.*ref=// \
- http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-([0-9.]*).tar.gz debian svn-upgrade
+ http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-([0-9.]*).tar.gz debian svn-upgrade
More information about the Pkg-voip-commits
mailing list