[Pkg-voip-commits] r5185 - in /asterisk/trunk/debian: changelog control patches/bristuff/ast-device-state-CID patches/series patches/tos-libcap rules

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Thu Feb 7 22:34:06 UTC 2008


Author: tzafrir-guest
Date: Thu Feb  7 22:34:06 2008
New Revision: 5185

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5185
Log:
* New upstream release: 1.4.18 .
* patch tos-libcap remeved: merged by upstream.
* Adjusted patch bristuff/ast-device-state-CID to Asterisk 1.4.18.

Removed:
    asterisk/trunk/debian/patches/tos-libcap
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control
    asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5185&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Feb  7 22:34:06 2008
@@ -1,4 +1,4 @@
-asterisk (1:1.4.17~dfsg-3) UNRELEASED; urgency=low
+asterisk (1:1.4.18~dfsg-1) UNRELEASED; urgency=low
 
   [ Faidon Liambotis ]
   * Update debian/copyright (packaging copyright, formatting etc.)
@@ -6,6 +6,7 @@
     been fixed.
 
   [ Tzafrir Cohen ]
+  * New upstream release.
   * Break bristuff BRI/EuroISDN patch:
   - zapata_num_spans - already accepted by upstream. Independent of libpri
     bristuff patch.
@@ -15,8 +16,10 @@
     Depends on some other bristuff patches, and adds another interface change.
   * patch use-libpri-bristuffed right next to zapata-bri+euroisdn, as
     zapata-bri+euroisdn depends on it to build.
-
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 29 Jan 2008 05:34:48 +0200
+  * patch tos-libcap remeved: merged by upstream.
+  * Adjusted patch bristuff/ast-device-state-CID to Asterisk 1.4.18.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Fri,  8 Feb 2008 00:31:56 +0200
 
 asterisk (1:1.4.17~dfsg-2) unstable; urgency=low
 

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=5185&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Thu Feb  7 22:34:06 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-1), libvpb-dev, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-openssl-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp-dev, libc-client2007-dev | libc-client-dev, libcap-dev
+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-1), zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp9-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/ast-device-state-CID
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-device-state-CID?rev=5185&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Thu Feb  7 22:34:06 2008
@@ -1,6 +1,8 @@
---- a/include/asterisk/devicestate.h
-+++ b/include/asterisk/devicestate.h
-@@ -47,7 +47,7 @@ extern "C" {
+Index: asterisk-1.4.18~dfsg/include/asterisk/devicestate.h
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/include/asterisk/devicestate.h	2007-02-13 22:56:50.000000000 +0200
++++ asterisk-1.4.18~dfsg/include/asterisk/devicestate.h	2008-02-07 23:25:42.000000000 +0200
+@@ -47,7 +47,7 @@
  #define AST_DEVICE_ONHOLD	8
  
  /*! \brief Devicestate watcher call back */
@@ -9,7 +11,7 @@
  
  /*!  \brief Devicestate provider call back */
  typedef int (*ast_devstate_prov_cb_type)(const char *data);
-@@ -92,7 +92,7 @@ int ast_device_state_changed(const char 
+@@ -92,7 +92,7 @@
   * callbacks for the changed extensions
   * Returns 0 on success, -1 on failure
   */
@@ -18,9 +20,11 @@
  
  /*! \brief Registers a device state change callback 
   * \param callback Callback
---- a/main/devicestate.c
-+++ b/main/devicestate.c
-@@ -78,6 +78,8 @@ static AST_LIST_HEAD_STATIC(devstate_cbs
+Index: asterisk-1.4.18~dfsg/main/devicestate.c
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/main/devicestate.c	2008-01-05 04:09:19.000000000 +0200
++++ asterisk-1.4.18~dfsg/main/devicestate.c	2008-02-08 00:18:48.000000000 +0200
+@@ -78,6 +78,8 @@
  
  struct state_change {
  	AST_LIST_ENTRY(state_change) list;
@@ -29,7 +33,7 @@
  	char device[1];
  };
  
-@@ -277,7 +279,7 @@ void ast_devstate_del(ast_devstate_cb_ty
+@@ -277,7 +279,7 @@
  /*! \brief Notify callback watchers of change, and notify PBX core for hint updates
  	Normally executed within a separate thread
  */
@@ -38,7 +42,7 @@
  {
  	int state;
  	struct devstate_cb *devcb;
-@@ -288,13 +290,13 @@ static void do_state_change(const char *
+@@ -288,13 +290,13 @@
  
  	AST_LIST_LOCK(&devstate_cbs);
  	AST_LIST_TRAVERSE(&devstate_cbs, devcb, list)
@@ -50,12 +54,12 @@
 +	ast_hint_state_changed(device, cid_num, cid_name);
  }
  
--static int __ast_device_state_changed_literal(char *buf)
-+static int __ast_device_state_changed_literal(char *buf, char *cid_num, char *cid_name)
+-static int __ast_device_state_changed_literal(char *buf, int norecurse)
++static int __ast_device_state_changed_literal(char *buf, int norecurse, char *cid_num, char *cid_name)
  {
  	char *device;
  	struct state_change *change;
-@@ -312,10 +314,16 @@ static int __ast_device_state_changed_li
+@@ -308,10 +310,16 @@
  	if (change_thread == AST_PTHREADT_NULL || !(change = ast_calloc(1, sizeof(*change) + strlen(device)))) {
  		/* we could not allocate a change struct, or */
  		/* there is no background thread, so process the change now */
@@ -73,7 +77,14 @@
  		AST_LIST_LOCK(&state_changes);
  		AST_LIST_INSERT_TAIL(&state_changes, change, list);
  		if (AST_LIST_FIRST(&state_changes) == change)
-@@ -327,11 +335,17 @@ static int __ast_device_state_changed_li
+@@ -329,17 +337,23 @@
+ 	 */
+ 	if (!norecurse && (tmp = strrchr(device, '-'))) {
+ 		*tmp = '\0';
+-		__ast_device_state_changed_literal(device, 1);
++		__ast_device_state_changed_literal(device, 1, cid_num, cid_name);
+ 	}
+ 	
  	return 1;
  }
  
@@ -84,25 +95,25 @@
 +	char *buf2 = NULL;
 +	char *buf3 = NULL;
  	buf = ast_strdupa(dev);
--	return __ast_device_state_changed_literal(buf);
+-	return __ast_device_state_changed_literal(buf, 0);
 +	if (cid_num)
 +	    buf2 = ast_strdupa(cid_num);
 +	if (cid_name)
 +	    buf3 = ast_strdupa(cid_name);
-+	return __ast_device_state_changed_literal(buf, buf2, buf3);
++	return __ast_device_state_changed_literal(buf, 0, buf2, buf3);
  }
  
  /*! \brief Accept change notification, add it to change queue */
-@@ -343,7 +357,7 @@ int ast_device_state_changed(const char 
+@@ -351,7 +365,7 @@
  	va_start(ap, fmt);
  	vsnprintf(buf, sizeof(buf), fmt, ap);
  	va_end(ap);
--	return __ast_device_state_changed_literal(buf);
-+	return __ast_device_state_changed_literal(buf, NULL, NULL);
+-	return __ast_device_state_changed_literal(buf, 0);
++	return __ast_device_state_changed_literal(buf, 0, NULL, NULL);
  }
  
  /*! \brief Go through the dev state change queue and update changes in the dev state thread */
-@@ -358,7 +372,7 @@ static void *do_devstate_changes(void *d
+@@ -366,7 +380,7 @@
  		if (cur) {
  			/* we got an entry, so unlock the list while we process it */
  			AST_LIST_UNLOCK(&state_changes);
@@ -111,9 +122,11 @@
  			free(cur);
  			AST_LIST_LOCK(&state_changes);
  		} else {
---- a/include/asterisk/channel.h
-+++ b/include/asterisk/channel.h
-@@ -591,8 +591,13 @@ int ast_channel_datastore_remove(struct 
+Index: asterisk-1.4.18~dfsg/include/asterisk/channel.h
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/include/asterisk/channel.h	2008-02-07 23:16:59.000000000 +0200
++++ asterisk-1.4.18~dfsg/include/asterisk/channel.h	2008-02-08 00:16:10.000000000 +0200
+@@ -593,8 +593,13 @@
  /*! \brief Find a datastore on a channel */
  struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const struct ast_datastore_info *info, char *uid);
  
@@ -128,9 +141,11 @@
  
  /*! \brief Create a channel structure 
      \return Returns NULL on failure to allocate.
---- a/main/channel.c
-+++ b/main/channel.c
-@@ -1277,7 +1277,7 @@ void ast_channel_free(struct ast_channel
+Index: asterisk-1.4.18~dfsg/main/channel.c
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/main/channel.c	2008-02-07 23:16:59.000000000 +0200
++++ asterisk-1.4.18~dfsg/main/channel.c	2008-02-08 00:16:10.000000000 +0200
+@@ -1255,7 +1255,7 @@
  	free(chan);
  	AST_LIST_UNLOCK(&channels);
  
@@ -139,7 +154,7 @@
  }
  
  struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, char *uid)
-@@ -3941,7 +3941,7 @@ void ast_set_callerid(struct ast_channel
+@@ -3606,7 +3606,7 @@
  	ast_channel_unlock(chan);
  }
  
@@ -148,7 +163,7 @@
  {
  	int oldstate = chan->_state;
  
-@@ -3949,7 +3949,7 @@ int ast_setstate(struct ast_channel *cha
+@@ -3614,7 +3614,7 @@
  		return 0;
  
  	chan->_state = state;
@@ -157,7 +172,7 @@
  	/* setstate used to conditionally report Newchannel; this is no more */
  	manager_event(EVENT_FLAG_CALL,
  		      "Newstate",
-@@ -3966,6 +3966,11 @@ int ast_setstate(struct ast_channel *cha
+@@ -3631,6 +3631,11 @@
  	return 0;
  }
  
@@ -169,9 +184,11 @@
  /*! \brief Find bridged channel */
  struct ast_channel *ast_bridged_channel(struct ast_channel *chan)
  {
---- a/include/asterisk/pbx.h
-+++ b/include/asterisk/pbx.h
-@@ -63,7 +63,7 @@ struct ast_ignorepat;
+Index: asterisk-1.4.18~dfsg/include/asterisk/pbx.h
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/include/asterisk/pbx.h	2007-12-21 18:37:47.000000000 +0200
++++ asterisk-1.4.18~dfsg/include/asterisk/pbx.h	2008-02-08 00:16:10.000000000 +0200
+@@ -63,7 +63,7 @@
  struct ast_sw;
  
  /*! \brief Typedef for devicestate and hint callbacks */
@@ -180,7 +197,7 @@
  
  /*! \brief Data structure associated with a custom dialplan function */
  struct ast_custom_function {
-@@ -875,7 +875,7 @@ int ast_func_read(struct ast_channel *ch
+@@ -875,7 +875,7 @@
   */
  int ast_func_write(struct ast_channel *chan, char *function, const char *value);
  
@@ -189,9 +206,11 @@
  
  #if defined(__cplusplus) || defined(c_plusplus)
  }
---- a/main/pbx.c
-+++ b/main/pbx.c
-@@ -2011,7 +2011,7 @@ int ast_extension_state(struct ast_chann
+Index: asterisk-1.4.18~dfsg/main/pbx.c
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/main/pbx.c	2008-02-07 23:16:59.000000000 +0200
++++ asterisk-1.4.18~dfsg/main/pbx.c	2008-02-08 00:16:10.000000000 +0200
+@@ -2011,7 +2011,7 @@
  	return ast_extension_state2(e);    		/* Check all devices in the hint */
  }
  
@@ -200,7 +219,7 @@
  {
  	struct ast_hint *hint;
  
-@@ -2042,11 +2042,11 @@ void ast_hint_state_changed(const char *
+@@ -2042,11 +2042,11 @@
  
  		/* For general callbacks */
  		for (cblist = statecbs; cblist; cblist = cblist->next)
@@ -214,7 +233,7 @@
  
  		hint->laststate = state;	/* record we saw the change */
  	}
-@@ -2241,7 +2241,7 @@ static int ast_remove_hint(struct ast_ex
+@@ -2241,7 +2241,7 @@
  				/* Notify with -1 and remove all callbacks */
  				cbprev = cblist;
  				cblist = cblist->next;
@@ -223,7 +242,7 @@
  				free(cbprev);
  	    		}
  	    		hint->callbacks = NULL;
-@@ -4008,7 +4008,7 @@ void ast_merge_contexts_and_delete(struc
+@@ -4008,7 +4008,7 @@
  			while (thiscb) {
  				prevcb = thiscb;
  				thiscb = thiscb->next;
@@ -232,9 +251,11 @@
  				free(prevcb);
  	    		}
  		} else {
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -1338,7 +1338,7 @@ static void ast_quiet_chan(struct ast_ch
+Index: asterisk-1.4.18~dfsg/channels/chan_sip.c
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/channels/chan_sip.c	2008-02-07 23:16:59.000000000 +0200
++++ asterisk-1.4.18~dfsg/channels/chan_sip.c	2008-02-07 23:50:49.000000000 +0200
+@@ -1341,7 +1341,7 @@
  static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target);
  
  /*--- Device monitoring and Device/extension state handling */
@@ -243,7 +264,7 @@
  static int sip_devicestate(void *data);
  static int sip_poke_noanswer(const void *data);
  static int sip_poke_peer(struct sip_peer *peer);
-@@ -8459,7 +8459,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8463,7 +8463,7 @@
  /*! \brief Callback for the devicestate notification (SUBSCRIBE) support subsystem
  \note	If you add an "hint" priority to the extension in the dial plan,
  	you will get notifications on device state changes */
@@ -252,19 +273,32 @@
  {
  	struct sip_pvt *p = data;
  
---- a/apps/app_queue.c
-+++ b/apps/app_queue.c
-@@ -690,7 +690,7 @@ static void *device_state_thread(void *d
+@@ -12636,7 +12636,7 @@
+ 					if (ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE)) {
+ 						/* Ready to send the next state we have on queue */
+ 						ast_clear_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
+-						cb_extensionstate((char *)p->context, (char *)p->exten, p->laststate, (void *) p);
++						cb_extensionstate((char *)p->context, (char *)p->exten, p->laststate, (void *) p, NULL, NULL);
+ 					}
+ 				}
+ 			} else if (sipmethod == SIP_REGISTER) 
+Index: asterisk-1.4.18~dfsg/apps/app_queue.c
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/apps/app_queue.c	2008-02-07 23:16:59.000000000 +0200
++++ asterisk-1.4.18~dfsg/apps/app_queue.c	2008-02-07 23:25:42.000000000 +0200
+@@ -697,7 +697,7 @@
  	return NULL;
  }
- 
+ /*! \brief Producer of the statechange queue */
 -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)
  {
  	struct statechange *sc;
  
---- a/include/asterisk/manager.h
-+++ b/include/asterisk/manager.h
+Index: asterisk-1.4.18~dfsg/include/asterisk/manager.h
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/include/asterisk/manager.h	2007-04-06 23:58:43.000000000 +0300
++++ asterisk-1.4.18~dfsg/include/asterisk/manager.h	2008-02-07 23:25:42.000000000 +0200
 @@ -55,6 +55,7 @@
  #define EVENT_FLAG_AGENT		(1 << 5) /* Ability to read/set agent info */
  #define EVENT_FLAG_USER                 (1 << 6) /* Ability to read/set user info */
@@ -273,9 +307,11 @@
  
  /* Export manager structures */
  #define AST_MAX_MANHEADERS 128
---- a/main/manager.c
-+++ b/main/manager.c
-@@ -129,6 +129,7 @@ static struct permalias {
+Index: asterisk-1.4.18~dfsg/main/manager.c
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/main/manager.c	2008-02-07 23:16:59.000000000 +0200
++++ asterisk-1.4.18~dfsg/main/manager.c	2008-02-08 00:16:10.000000000 +0200
+@@ -129,6 +129,7 @@
  	{ EVENT_FLAG_AGENT, "agent" },
  	{ EVENT_FLAG_USER, "user" },
  	{ EVENT_FLAG_CONFIG, "config" },
@@ -283,7 +319,7 @@
  	{ -1, "all" },
  	{ 0, "none" },
  };
-@@ -2538,10 +2539,12 @@ int ast_manager_unregister(char *action)
+@@ -2538,10 +2539,12 @@
  	return 0;
  }
  
@@ -298,9 +334,11 @@
  	return 0;
  }
  
---- a/apps/app_devstate.c
-+++ b/apps/app_devstate.c
-@@ -50,7 +50,7 @@ static struct ast_cli_entry  cli_dev_sta
+Index: asterisk-1.4.18~dfsg/apps/app_devstate.c
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/apps/app_devstate.c	2008-02-07 23:16:59.000000000 +0200
++++ asterisk-1.4.18~dfsg/apps/app_devstate.c	2008-02-07 23:25:42.000000000 +0200
+@@ -50,7 +50,7 @@
  static int devstate_cli(int fd, int argc, char *argv[])
  {
      char devName[128];
@@ -309,7 +347,7 @@
          return RESULT_SHOWUSAGE;
  
      if (ast_db_put("DEVSTATES", argv[1], argv[2]))
-@@ -58,7 +58,15 @@ static int devstate_cli(int fd, int argc
+@@ -58,7 +58,15 @@
          ast_log(LOG_DEBUG, "ast_db_put failed\n");
      }
      snprintf(devName, sizeof(devName), "DS/%s", argv[1]);
@@ -326,7 +364,7 @@
      return RESULT_SUCCESS;
  }
  
-@@ -93,7 +101,7 @@ static int devstate_exec(struct ast_chan
+@@ -93,7 +101,7 @@
      }
  
      snprintf(devName, sizeof(devName), "DS/%s", device);
@@ -335,7 +373,7 @@
  
      ast_module_user_remove(u);
      return 0;
-@@ -150,6 +158,8 @@ static int action_devstate(struct manses
+@@ -150,6 +158,8 @@
          const char *devstate = astman_get_header(m, "Devstate");
          const char *value = astman_get_header(m, "Value");
  	const char *id = astman_get_header(m,"ActionID");
@@ -344,7 +382,7 @@
  	char devName[128];
  	char idText[256] = "";
  
-@@ -166,7 +176,7 @@ static int action_devstate(struct manses
+@@ -166,7 +176,7 @@
  
          if (!ast_db_put("DEVSTATES", devstate, (char *)value)) {
  	    snprintf(devName, sizeof(devName), "DS/%s", devstate);
@@ -353,9 +391,11 @@
  	    astman_append(s, "Response: Success\r\n%s\r\n", idText);
  	} else {
  	    ast_log(LOG_DEBUG, "ast_db_put failed\n");
---- a/res/res_esel.c
-+++ b/res/res_esel.c
-@@ -51,6 +51,8 @@ typedef struct esel_extension_state {
+Index: asterisk-1.4.18~dfsg/res/res_esel.c
+===================================================================
+--- asterisk-1.4.18~dfsg.orig/res/res_esel.c	2008-02-07 23:16:59.000000000 +0200
++++ asterisk-1.4.18~dfsg/res/res_esel.c	2008-02-07 23:25:42.000000000 +0200
+@@ -51,6 +51,8 @@
      char context[AST_MAX_EXTENSION];
      char exten[AST_MAX_EXTENSION];
      int state;
@@ -364,7 +404,7 @@
      char devstate[AST_MAX_EXTENSION];
      struct esel_extension_state *next;
      struct esel_extension_state *prev;
-@@ -93,7 +95,7 @@ typedef struct esel_pvt {
+@@ -93,7 +95,7 @@
  
  static struct esel_pvt *donkeys = NULL;
  
@@ -373,7 +413,7 @@
  	struct esel_extension_state *exstate = NULL;
  
  	exstate = malloc(sizeof(struct esel_extension_state));
-@@ -115,6 +117,8 @@ static int esel_queue_extension_state(st
+@@ -115,6 +117,8 @@
  	}
  	ast_copy_string(exstate->exten, exten, sizeof(exstate->exten));
  	ast_copy_string(exstate->context, context, sizeof(exstate->context));
@@ -382,7 +422,7 @@
  	exstate->state = state;
  	if (!queue->head) {
  		/* Empty queue */
-@@ -161,7 +165,7 @@ static void esel_export_to_remote(struct
+@@ -161,7 +165,7 @@
      char msg[1024];
      int sent = 0;
      memset(msg, 0x0, sizeof(msg));
@@ -391,7 +431,7 @@
      sent = send(esel->sockfd, msg, strlen(msg), 0);
      if (sent == -1) {
  	esel->connected = 0;
-@@ -250,13 +254,13 @@ static void *do_esel_thread(void *data) 
+@@ -250,13 +254,13 @@
      return NULL;
  }
  

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5185&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Thu Feb  7 22:34:06 2008
@@ -2,7 +2,6 @@
 debian-banner
 silence-buildsum-warning
 configure-libc-client
-hack-multiple-app-voicemail
 astvarrundir
 make-clean-fixes
 safe_asterisk-config
@@ -13,7 +12,6 @@
 # new features
 pubkey_jnctn
 func_devstate
-tos-libcap
 
 # for chan_vpb
 vpb-driver-4.2.18

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=5185&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Thu Feb  7 22:34:06 2008
@@ -79,7 +79,6 @@
 		--infodir=\$${prefix}/share/info \
 		--with-cap \
 		--with-gsm \
-		--with-imap=/usr/include \
 		--with-pwlib=/usr/share/pwlib/include/ \
 		--with-h323=/usr/share/openh323/ 
 




More information about the Pkg-voip-commits mailing list