[Pkg-voip-commits] r5740 - in /asterisk/branches/rc/debian: ./ patches/ patches/bristuff/

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Fri May 16 00:18:11 UTC 2008


Author: tzafrir-guest
Date: Fri May 16 00:18:11 2008
New Revision: 5740

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5740
Log:
* New upstream release candidate: 1.4.20-RC3.
* Adjusted patches bristuff/xagi , bristuff/answer-before-say ,
  bristuff/ast-device-state-CID and allow-tilde-destdir .
* Dropped vpb patches and "samples" that were applied upstream.
* Fixed name of section in doc-base files.
* Tweaked debian/rules to allow an rc version and pretend it "crc".
  See README.Debian.'

Modified:
    asterisk/branches/rc/debian/README.Debian
    asterisk/branches/rc/debian/asterisk-config.doc-base.sip.conf
    asterisk/branches/rc/debian/asterisk-config.doc-base.zapata.conf
    asterisk/branches/rc/debian/changelog
    asterisk/branches/rc/debian/patches/allow-tilde-destdir
    asterisk/branches/rc/debian/patches/bristuff/answer-before-say
    asterisk/branches/rc/debian/patches/bristuff/ast-device-state-CID
    asterisk/branches/rc/debian/patches/bristuff/xagi
    asterisk/branches/rc/debian/patches/series
    asterisk/branches/rc/debian/rules

Modified: asterisk/branches/rc/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/README.Debian?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/README.Debian (original)
+++ asterisk/branches/rc/debian/README.Debian Fri May 16 00:18:11 2008
@@ -59,7 +59,7 @@
 
 
 Open Files Limit
-===============
+================
 Asterisk uses one file-handle (and sometimes more) per call. Hence if you 
 have many simultaneous calls, you often bump into the per-process limit 
 of 1024 file handles, and get the error: "Too man open files".
@@ -67,6 +67,12 @@
 To enlarge that limit, set: MAXFILES in /etc/default/zaptel.
 
 
+Version "crc"?
+==============
+Version string cannot sinply have an "rc", as rc > dfsg.
+Thus the 'rc' is prefixed with 'c'. Concider the RC a 'gamma' version. 
+
+
 Enjoy your PBX!
 
-Kilian Krause (for the pkg-voip team)
+The pkg-voip team

Modified: asterisk/branches/rc/debian/asterisk-config.doc-base.sip.conf
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/asterisk-config.doc-base.sip.conf?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/asterisk-config.doc-base.sip.conf (original)
+++ asterisk/branches/rc/debian/asterisk-config.doc-base.sip.conf Fri May 16 00:18:11 2008
@@ -4,7 +4,7 @@
 Abstract: A sample annotated sip.conf . This is the closest
  thing to a reference for sip.conf, the configuration of asterisk's 
  chan_sip.so
-Section: Comm
+Section: comm
 
 Format: text
 Files: /usr/share/doc/asterisk-config/examples/configs/sip.conf.sample.gz

Modified: asterisk/branches/rc/debian/asterisk-config.doc-base.zapata.conf
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/asterisk-config.doc-base.zapata.conf?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/asterisk-config.doc-base.zapata.conf (original)
+++ asterisk/branches/rc/debian/asterisk-config.doc-base.zapata.conf Fri May 16 00:18:11 2008
@@ -4,7 +4,7 @@
 Abstract: A sample annotated zapata.conf . This is the closest
  thing to a reference for zapata.conf, the configuration of asterisk's 
  chan_zap.so
-Section: Comm
+Section: comm
 
 Format: text
 Files: /usr/share/doc/asterisk-config/examples/configs/zapata.conf.sample.gz

Modified: asterisk/branches/rc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/changelog?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/changelog (original)
+++ asterisk/branches/rc/debian/changelog Fri May 16 00:18:11 2008
@@ -1,14 +1,21 @@
-asterisk (1:1.4.19.1~dfsg-2) UNRELEASED; urgency=low
+asterisk (1:1.4.20~crc3.dfsg-1) UNRELEASED; urgency=low
 
   [ Victor Seva ]
   * Patch sample files pointing now to the correct doc files. (Closes: #475681)
   * Added support for armel, thanks to Riku Voipio. (Closes: #477389)
 
   [ Tzafrir Cohen ]
+  * New upstream release candidate.
   * Provide /usr/include/asterisk.h as well (through a symlink).
   * Remove {,} bashism from debian/rules (Closes: #478361). 
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 29 Apr 2008 01:57:43 +0300
+  * Adjusted patches bristuff/xagi , bristuff/answer-before-say ,
+    bristuff/ast-device-state-CID and allow-tilde-destdir .
+  * Dropped vpb patches and "samples" that were applied upstream.
+  * Fixed name of section in doc-base files.
+  * Tweaked debian/rules to allow an rc version and pretend it "crc". See 
+    README.Debian.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Fri, 16 May 2008 03:11:00 +0300
 
 asterisk (1:1.4.19.1~dfsg-1) unstable; urgency=low
 

Modified: asterisk/branches/rc/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/patches/allow-tilde-destdir?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/patches/allow-tilde-destdir (original)
+++ asterisk/branches/rc/debian/patches/allow-tilde-destdir Fri May 16 00:18:11 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/branches/rc/debian/patches/bristuff/answer-before-say
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/patches/bristuff/answer-before-say?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/patches/bristuff/answer-before-say (original)
+++ asterisk/branches/rc/debian/patches/bristuff/answer-before-say Fri May 16 00:18:11 2008
@@ -4,15 +4,15 @@
 --- a/main/pbx.c
 +++ b/main/pbx.c
 @@ -6074,6 +6074,9 @@ static int pbx_builtin_saynumber(struct 
- 			return -1;
  		}
  	}
+ 
 +	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/branches/rc/debian/patches/bristuff/ast-device-state-CID
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/patches/bristuff/ast-device-state-CID?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/branches/rc/debian/patches/bristuff/ast-device-state-CID Fri May 16 00:18:11 2008
@@ -1,5 +1,5 @@
---- a/include/asterisk/devicestate.h
-+++ b/include/asterisk/devicestate.h
+--- asterisk-1.4.20~crc3.dfsg.orig/include/asterisk/devicestate.h
++++ asterisk-1.4.20~crc3.dfsg/include/asterisk/devicestate.h
 @@ -47,7 +47,7 @@ extern "C" {
  #define AST_DEVICE_ONHOLD	8
  
@@ -18,8 +18,8 @@
  
  /*! \brief Registers a device state change callback 
   * \param callback Callback
---- a/main/devicestate.c
-+++ b/main/devicestate.c
+--- asterisk-1.4.20~crc3.dfsg.orig/main/devicestate.c
++++ asterisk-1.4.20~crc3.dfsg/main/devicestate.c
 @@ -78,6 +78,8 @@ static AST_LIST_HEAD_STATIC(devstate_cbs
  
  struct state_change {
@@ -118,8 +118,8 @@
  			free(cur);
  			AST_LIST_LOCK(&state_changes);
  		} else {
---- a/include/asterisk/channel.h
-+++ b/include/asterisk/channel.h
+--- asterisk-1.4.20~crc3.dfsg.orig/include/asterisk/channel.h
++++ asterisk-1.4.20~crc3.dfsg/include/asterisk/channel.h
 @@ -608,8 +608,13 @@ int ast_channel_datastore_remove(struct 
  /*! \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);
@@ -135,8 +135,8 @@
  
  /*! \brief Create a channel structure 
      \return Returns NULL on failure to allocate.
---- a/main/channel.c
-+++ b/main/channel.c
+--- asterisk-1.4.20~crc3.dfsg.orig/main/channel.c
++++ asterisk-1.4.20~crc3.dfsg/main/channel.c
 @@ -1261,7 +1261,7 @@ void ast_channel_free(struct ast_channel
  	free(chan);
  	AST_LIST_UNLOCK(&channels);
@@ -146,7 +146,7 @@
  }
  
  struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, char *uid)
-@@ -3634,7 +3634,7 @@ void ast_set_callerid(struct ast_channel
+@@ -3658,7 +3658,7 @@ void ast_set_callerid(struct ast_channel
  	ast_channel_unlock(chan);
  }
  
@@ -155,7 +155,7 @@
  {
  	int oldstate = chan->_state;
  
-@@ -3642,7 +3642,7 @@ int ast_setstate(struct ast_channel *cha
+@@ -3666,7 +3666,7 @@ int ast_setstate(struct ast_channel *cha
  		return 0;
  
  	chan->_state = state;
@@ -164,7 +164,7 @@
  	/* setstate used to conditionally report Newchannel; this is no more */
  	manager_event(EVENT_FLAG_CALL,
  		      "Newstate",
-@@ -3659,6 +3659,11 @@ int ast_setstate(struct ast_channel *cha
+@@ -3683,6 +3683,11 @@ int ast_setstate(struct ast_channel *cha
  	return 0;
  }
  
@@ -176,8 +176,8 @@
  /*! \brief Find bridged channel */
  struct ast_channel *ast_bridged_channel(struct ast_channel *chan)
  {
---- a/include/asterisk/pbx.h
-+++ b/include/asterisk/pbx.h
+--- asterisk-1.4.20~crc3.dfsg.orig/include/asterisk/pbx.h
++++ asterisk-1.4.20~crc3.dfsg/include/asterisk/pbx.h
 @@ -63,7 +63,7 @@ struct ast_ignorepat;
  struct ast_sw;
  
@@ -196,8 +196,8 @@
  
  #if defined(__cplusplus) || defined(c_plusplus)
  }
---- a/main/pbx.c
-+++ b/main/pbx.c
+--- asterisk-1.4.20~crc3.dfsg.orig/main/pbx.c
++++ asterisk-1.4.20~crc3.dfsg/main/pbx.c
 @@ -2022,7 +2022,7 @@ int ast_extension_state(struct ast_chann
  	return ast_extension_state2(e);    		/* Check all devices in the hint */
  }
@@ -230,7 +230,7 @@
  				free(cbprev);
  	    		}
  	    		hint->callbacks = NULL;
-@@ -4019,7 +4019,7 @@ void ast_merge_contexts_and_delete(struc
+@@ -4021,7 +4021,7 @@ void ast_merge_contexts_and_delete(struc
  			while (thiscb) {
  				prevcb = thiscb;
  				thiscb = thiscb->next;
@@ -239,8 +239,8 @@
  				free(prevcb);
  	    		}
  		} else {
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
+--- asterisk-1.4.20~crc3.dfsg.orig/channels/chan_sip.c
++++ asterisk-1.4.20~crc3.dfsg/channels/chan_sip.c
 @@ -1342,7 +1342,7 @@ static void ast_quiet_chan(struct ast_ch
  static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target);
  
@@ -250,7 +250,7 @@
  static int sip_devicestate(void *data);
  static int sip_poke_noanswer(const void *data);
  static int sip_poke_peer(struct sip_peer *peer);
-@@ -8538,7 +8538,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8593,7 +8593,7 @@ static void sip_peer_hold(struct sip_pvt
  /*! \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 */
@@ -259,7 +259,7 @@
  {
  	struct sip_pvt *p = data;
  
-@@ -12709,7 +12709,7 @@ static void handle_response(struct sip_p
+@@ -12783,7 +12783,7 @@ static void handle_response(struct sip_p
  					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);
@@ -268,8 +268,17 @@
  					}
  				}
  			} else if (sipmethod == SIP_REGISTER) 
---- a/apps/app_queue.c
-+++ b/apps/app_queue.c
+@@ -13036,7 +13036,7 @@ static void handle_response(struct sip_p
+ 					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_BYE)
+--- asterisk-1.4.20~crc3.dfsg.orig/apps/app_queue.c
++++ asterisk-1.4.20~crc3.dfsg/apps/app_queue.c
 @@ -721,7 +721,7 @@ static void *device_state_thread(void *d
  	return NULL;
  }
@@ -279,8 +288,8 @@
  {
  	struct statechange *sc;
  
---- a/include/asterisk/manager.h
-+++ b/include/asterisk/manager.h
+--- asterisk-1.4.20~crc3.dfsg.orig/include/asterisk/manager.h
++++ asterisk-1.4.20~crc3.dfsg/include/asterisk/manager.h
 @@ -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 */
@@ -289,8 +298,8 @@
  
  /* Export manager structures */
  #define AST_MAX_MANHEADERS 128
---- a/main/manager.c
-+++ b/main/manager.c
+--- asterisk-1.4.20~crc3.dfsg.orig/main/manager.c
++++ asterisk-1.4.20~crc3.dfsg/main/manager.c
 @@ -129,6 +129,7 @@ static struct permalias {
  	{ EVENT_FLAG_AGENT, "agent" },
  	{ EVENT_FLAG_USER, "user" },
@@ -299,7 +308,7 @@
  	{ -1, "all" },
  	{ 0, "none" },
  };
-@@ -2538,10 +2539,12 @@ int ast_manager_unregister(char *action)
+@@ -2551,10 +2552,12 @@ int ast_manager_unregister(char *action)
  	return 0;
  }
  
@@ -314,8 +323,8 @@
  	return 0;
  }
  
---- a/apps/app_devstate.c
-+++ b/apps/app_devstate.c
+--- asterisk-1.4.20~crc3.dfsg.orig/apps/app_devstate.c
++++ asterisk-1.4.20~crc3.dfsg/apps/app_devstate.c
 @@ -50,7 +50,7 @@ static struct ast_cli_entry  cli_dev_sta
  static int devstate_cli(int fd, int argc, char *argv[])
  {
@@ -369,8 +378,8 @@
  	    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
+--- asterisk-1.4.20~crc3.dfsg.orig/res/res_esel.c
++++ asterisk-1.4.20~crc3.dfsg/res/res_esel.c
 @@ -51,6 +51,8 @@ typedef struct esel_extension_state {
      char context[AST_MAX_EXTENSION];
      char exten[AST_MAX_EXTENSION];

Modified: asterisk/branches/rc/debian/patches/bristuff/xagi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/patches/bristuff/xagi?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/patches/bristuff/xagi (original)
+++ asterisk/branches/rc/debian/patches/bristuff/xagi Fri May 16 00:18:11 2008
@@ -316,9 +316,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) {
@@ -337,8 +337,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/branches/rc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/patches/series?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/patches/series (original)
+++ asterisk/branches/rc/debian/patches/series Fri May 16 00:18:11 2008
@@ -14,11 +14,6 @@
 # new features
 pubkey_jnctn
 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
@@ -96,8 +91,5 @@
 astgenkey-security
 apptest_sleep
 
-# pointing to wrong doc files ( solved upstream rev 114649 )
-samples
-
 # adding armel support
 armel_support

Modified: asterisk/branches/rc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/rc/debian/rules?rev=5740&op=diff
==============================================================================
--- asterisk/branches/rc/debian/rules (original)
+++ asterisk/branches/rc/debian/rules Fri May 16 00:18:11 2008
@@ -40,11 +40,18 @@
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-
-FILENAME := asterisk_$(UPVERSION)~dfsg.orig.tar.gz
-UPFILENAME := asterisk_$(UPVERSION).orig.tar.gz
-URL := http://ftp2.digium.com/pub/asterisk/releases/asterisk-$(UPVERSION).tar.gz
+# FIXME: make this variable empty when there's no RC:
+RC_NUM:=$(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/.*~crc\([0-9]\+\)\.dfsg.*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~crc[0-9]*//' -e 's/.dfsg$$//')
+ifneq (,$(RC_NUM))
+RC_LOCAL_STR=crc$(RC_NUM).
+RC_ORIG_STR=.crc$(RC_NUM)
+RC_UP_STR:=-rc$(RC_NUM)
+endif
+
+FILENAME := asterisk_$(UPVERSION)~$(RC_LOCAL_STR)dfsg.orig.tar.gz
+UPFILENAME := asterisk_$(UPVERSION)$(RC_ORIG_STR).orig.tar.gz
+URL := http://ftp2.digium.com/pub/asterisk/releases/asterisk-$(UPVERSION)$(RC_UP_STR).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
@@ -214,8 +221,11 @@
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
-
-TMP_TARBALL_TOP=../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)
+ifneq (,$(RC_NUM))
+	@@echo "RC string:               $(RC_UP_STR)"
+endif
+
+TMP_TARBALL_TOP=../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)$(RC_UP_STR)
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@ -227,10 +237,6 @@
 	tar xfz ../$(UPFILENAME) 
 	@@rm -f  $(TMP_TARBALL_TOP)/sounds/fpm-*.mp3
 	@@rm -f  $(TMP_TARBALL_TOP)/sounds/asterisk-moh-freeplay-wav.tar.gz
-	@@rm -rf $(TMP_TARBALL_TOP)/codecs/ilbc/*
-	@@printf "all:\nclean:\n.PHONY: all clean\n" > \
-		$(TMP_TARBALL_TOP)/codecs/ilbc/Makefile
-	@@rm -f  $(TMP_TARBALL_TOP)/codecs/codec_ilbc.c
 	@@rm -rf $(TMP_TARBALL_TOP)/contrib/firmware/
 	@@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
 	tar cfz ../$(FILENAME) *




More information about the Pkg-voip-commits mailing list