modifying package: asterisk-1.6.1.2 20090801 -> 20090805

asterisk/asterisk.patch

@@ -1,6 +1,6 @@
 Index: Makefile
 --- Makefile.orig	2009-02-24 21:44:50 +0100
-+++ Makefile	2009-05-04 12:48:53 +0200
++++ Makefile	2009-08-05 20:40:23 +0200
 @@ -122,42 +122,20 @@
  
  # Define standard directories for various platforms
@@ -72,13 +72,13 @@ Index: Makefile
  	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
  	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 Index: apps/app_backticks.c
---- /dev/null	2009-05-04 12:48:56 +0200
-+++ apps/app_backticks.c	2009-05-04 12:48:53 +0200
+--- /dev/null	2009-08-05 20:40:27 +0200
++++ apps/app_backticks.c	2009-08-05 20:40:23 +0200
 @@ -0,0 +1,129 @@
 +
 +#include "asterisk.h"
 +
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.49 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.50 $")
 +
 +#include <stdio.h> 
 +#include <asterisk/file.h>
@@ -206,7 +206,7 @@ Index: apps/app_backticks.c
 +
 Index: apps/app_meetme.c
 --- apps/app_meetme.c.orig	2009-03-03 00:39:56 +0100
-+++ apps/app_meetme.c	2009-05-04 12:48:53 +0200
++++ apps/app_meetme.c	2009-08-05 20:40:23 +0200
 @@ -163,6 +163,7 @@
  	CONFFLAG_DURATION_LIMIT = (1 << 30),
  	/*! Do not write any audio to this channel until the state is up. */
@@ -254,7 +254,7 @@ Index: apps/app_meetme.c
  	ast_mutex_lock(&conf->playlock);
 Index: build_tools/make_defaults_h
 --- build_tools/make_defaults_h.orig	2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h	2009-05-04 12:48:53 +0200
++++ build_tools/make_defaults_h	2009-08-05 20:40:23 +0200
 @@ -17,7 +17,7 @@
  #define DEFAULT_PID        "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
  
@@ -266,7 +266,7 @@ Index: build_tools/make_defaults_h
  #define DEFAULT_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
 Index: cdr/cdr_custom.c
 --- cdr/cdr_custom.c.orig	2008-11-20 19:23:03 +0100
-+++ cdr/cdr_custom.c	2009-05-04 12:48:53 +0200
++++ cdr/cdr_custom.c	2009-08-05 20:40:23 +0200
 @@ -78,7 +78,7 @@
  					ast_log(LOG_WARNING, "Format string too long, will be truncated, at line %d\n", var->lineno);
  				ast_copy_string(format, var->value, sizeof(format) - 1);
@@ -278,7 +278,7 @@ Index: cdr/cdr_custom.c
  					break;
 Index: cdr/cdr_sqlite3_custom.c
 --- cdr/cdr_sqlite3_custom.c.orig	2009-03-02 18:19:41 +0100
-+++ cdr/cdr_sqlite3_custom.c	2009-05-04 12:48:53 +0200
++++ cdr/cdr_sqlite3_custom.c	2009-08-05 20:40:23 +0200
 @@ -322,7 +322,7 @@
  		return AST_MODULE_LOAD_DECLINE;
  
@@ -288,9 +288,9 @@ Index: cdr/cdr_sqlite3_custom.c
  	res = sqlite3_open(filename, &db);
  	if (res != SQLITE_OK) {
  		ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
-Index: chan_capi-1.1.2/Makefile
---- chan_capi-1.1.2/Makefile.orig	2009-01-17 18:36:50 +0100
-+++ chan_capi-1.1.2/Makefile	2009-05-04 12:48:53 +0200
+Index: chan_capi-1.1.3/Makefile
+--- chan_capi-1.1.3/Makefile.orig	2009-07-23 16:11:08 +0200
++++ chan_capi-1.1.3/Makefile	2009-08-05 20:40:23 +0200
 @@ -90,6 +90,9 @@
  CFLAGS+=-O6
  CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
@@ -301,9 +301,9 @@ Index: chan_capi-1.1.2/Makefile
  
  LIBS=-ldl -lpthread -lm
  CC=gcc
-Index: chan_capi-1.1.2/chan_capi20.h
---- chan_capi-1.1.2/chan_capi20.h.orig	2005-09-20 20:33:40 +0200
-+++ chan_capi-1.1.2/chan_capi20.h	2009-05-04 12:48:53 +0200
+Index: chan_capi-1.1.3/chan_capi20.h
+--- chan_capi-1.1.3/chan_capi20.h.orig	2005-09-20 20:33:40 +0200
++++ chan_capi-1.1.3/chan_capi20.h	2009-08-05 20:40:23 +0200
 @@ -8,6 +8,8 @@
  
  #undef CAPI_OS_HINT
@@ -322,9 +322,22 @@ Index: chan_capi-1.1.2/chan_capi20.h
  #ifndef HEADER_CID
  #define HEADER_CID(x) ((x)->adr.adrNCCI)
  #endif
-Index: chan_capi-1.1.2/libcapi20/capi20.c
---- chan_capi-1.1.2/libcapi20/capi20.c.orig	2008-12-31 17:29:36 +0100
-+++ chan_capi-1.1.2/libcapi20/capi20.c	2009-05-04 12:48:53 +0200
+Index: chan_capi-1.1.3/chan_capi_utils.c
+--- chan_capi-1.1.3/chan_capi_utils.c.orig	2009-07-23 16:11:08 +0200
++++ chan_capi-1.1.3/chan_capi_utils.c	2009-08-05 20:41:26 +0200
+@@ -1087,6 +1087,9 @@
+ {
+ 	MESSAGE_EXCHANGE_ERROR error;
+ 	int waitcount = 50;
++#ifndef CAPI_MANUFACTURER_LEN
++#define CAPI_MANUFACTURER_LEN 64
++#endif
+ 	unsigned char manbuf[CAPI_MANUFACTURER_LEN];
+ 	_cmsg CMSG;
+ 
+Index: chan_capi-1.1.3/libcapi20/capi20.c
+--- chan_capi-1.1.3/libcapi20/capi20.c.orig	2009-07-23 16:11:08 +0200
++++ chan_capi-1.1.3/libcapi20/capi20.c	2009-08-05 20:40:23 +0200
 @@ -19,8 +19,10 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -336,7 +349,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
   
  #include <sys/socket.h>
  #include <netinet/in.h>
-@@ -46,17 +48,23 @@
+@@ -48,17 +50,23 @@
  
  #define SEND_BUFSIZ		(128+2048)
  
@@ -360,7 +373,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  static int tracelevel;
  static char *tracefile;
  
-@@ -75,17 +83,21 @@
+@@ -77,17 +85,21 @@
  #define RCAPI_AUTH_USER_REQ                     CAPICMD(0xff, 0x00)
  #define RCAPI_AUTH_USER_CONF                    CAPICMD(0xff, 0x01)
  
@@ -382,7 +395,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  
  static unsigned char get_byte(unsigned char **p)
  {
-@@ -93,10 +105,12 @@
+@@ -95,10 +107,12 @@
  	return((unsigned char)*(*p - 1));
  }
   
@@ -395,7 +408,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  
  static unsigned short get_netword(unsigned char **p)
  {
-@@ -142,6 +156,7 @@
+@@ -144,6 +158,7 @@
   * read config file
   */
  
@@ -403,7 +416,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  static int read_config(void)
  {
  	FILE *fp = NULL;
-@@ -195,11 +210,13 @@
+@@ -197,11 +212,13 @@
  	fclose(fp);
  	return(1);
  }
@@ -417,7 +430,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  static int open_socket(void)
  {
  	int fd;
-@@ -223,6 +240,7 @@
+@@ -225,6 +242,7 @@
  	close(fd);
  	return(-1);
  }
@@ -425,8 +438,8 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  
  static int socket_read(int fd, unsigned char *buf, int l)
  {
-@@ -316,6 +334,8 @@
- 	if (capi_fd >= 0)
+@@ -326,6 +344,8 @@
+ 	if (likely(capi_fd >= 0))
  		return CapiNoError;
  
 +#if 0
@@ -434,7 +447,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	/*----- open managment link -----*/
  	if (read_config() && (remote_capi)) {
  		capi_fd = open_socket();
-@@ -335,6 +355,8 @@
+@@ -345,6 +365,8 @@
  	if (ioctl(capi_fd, CAPI_INSTALLED, 0) == 0)
  		return CapiNoError;
  
@@ -443,7 +456,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	return CapiRegNotInstalled;
  }
  
-@@ -409,6 +431,7 @@
+@@ -419,6 +441,7 @@
  	unsigned char *bufferstart;
  };
  
@@ -451,7 +464,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  static struct applinfo *alloc_buffers(
  	unsigned MaxB3Connection,
  	unsigned MaxB3Blks,
-@@ -447,6 +470,7 @@
+@@ -457,6 +480,7 @@
  	ap->lastfree->next = 0;
  	return ap;
  }
@@ -459,7 +472,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  
  static void free_buffers(struct applinfo *ap)
  {
-@@ -564,14 +588,17 @@
+@@ -574,14 +598,17 @@
  	unsigned MaxSizeB3,
  	unsigned *ApplID)
  {
@@ -477,7 +490,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	if ((!remote_capi) || ((remote_capi) && ((fd = open_socket()) < 0))) {
  	    if ((fd = open(capidevname, O_RDWR|O_NONBLOCK, 0666)) < 0 && 
  		     (errno == ENOENT)) {
-@@ -609,6 +636,8 @@
+@@ -619,6 +646,8 @@
  			close(fd);
  			return(errcode);
  		}
@@ -486,7 +499,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	} else if ((applid = ioctl(fd, CAPI_REGISTER, &ioctl_data)) < 0) {
  		if (errno == EIO) {
  			if (ioctl(fd, CAPI_GET_ERRCODE, &ioctl_data) < 0) {
-@@ -654,6 +683,7 @@
+@@ -664,6 +693,7 @@
  		    applid = alloc_applid(fd);
  		} // end old driver compatibility
  	}
@@ -494,7 +507,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	if (remember_applid(applid, fd) < 0) {
  		close(fd);
  		return CapiRegOSResourceErr;
-@@ -664,6 +694,7 @@
+@@ -674,6 +704,7 @@
  		return CapiRegOSResourceErr;
  	}
  	*ApplID = applid;
@@ -502,7 +515,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	return CapiNoError;
  }
  
-@@ -772,11 +803,15 @@
+@@ -782,11 +813,15 @@
  	                ret = CapiIllAppNr;
  	                break;
  	            case EIO:
@@ -518,7 +531,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	                break;
  	          default:
  	                ret = CapiMsgOSResourceErr;
-@@ -830,7 +865,7 @@
+@@ -840,7 +875,7 @@
  				rcvbuf[15] = (data >> 24) & 0xff;
  			} else {
  				u_int64_t data;
@@ -527,7 +540,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  				if (CAPIMSG_LEN(rcvbuf) < 30) {
  					/*
  					 * grr, 64bit arch, but no data64 included,
-@@ -887,6 +922,9 @@
+@@ -897,6 +932,9 @@
  {
  	if (capi20_isinstalled() != CapiNoError)
  		return 0;
@@ -537,7 +550,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  
  	if (remote_capi) {
  		unsigned char buf[100];
-@@ -899,15 +937,19 @@
+@@ -909,15 +947,19 @@
  		return Buf;
  	}
  
@@ -557,7 +570,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  }
  
  unsigned char *
-@@ -922,16 +964,20 @@
+@@ -932,16 +974,20 @@
  		set_rcapicmd_header(&p, 14, RCAPI_GET_VERSION_REQ, Ctrl);
  		if(!(remote_command(capi_fd, buf, 14, RCAPI_GET_VERSION_CONF)))
  			return 0;
@@ -579,7 +592,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  }
  
  unsigned char * 
-@@ -940,6 +986,10 @@
+@@ -950,6 +996,10 @@
  	if (capi20_isinstalled() != CapiNoError)
  		return 0;
  
@@ -590,7 +603,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	if (remote_capi) {
  		unsigned char buf[100];
  		unsigned char *p = buf;
-@@ -951,15 +1001,19 @@
+@@ -961,15 +1011,19 @@
  		return Buf;
  	}
  
@@ -610,7 +623,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  }
  
  unsigned
-@@ -975,11 +1029,14 @@
+@@ -985,11 +1039,14 @@
  		if(!(remote_command(capi_fd, buf, 14, RCAPI_GET_PROFILE_CONF)))
  			return CapiMsgOSResourceErr;
  		if(*(unsigned short *)buf == CapiNoError) {
@@ -626,7 +639,7 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  	ioctl_data.contr = Ctrl;
  
  	if (ioctl(capi_fd, CAPI_GET_PROFILE, &ioctl_data) < 0) {
-@@ -996,6 +1053,7 @@
+@@ -1006,6 +1063,7 @@
  			sizeof(ioctl_data.profile.ncontroller));
  	}
  	return CapiNoError;
@@ -634,9 +647,9 @@ Index: chan_capi-1.1.2/libcapi20/capi20.c
  }
  /*
   * functions added to the CAPI2.0 spec
-Index: chan_capi-1.1.2/libcapi20/convert.c
---- chan_capi-1.1.2/libcapi20/convert.c.orig	2008-03-13 12:02:41 +0100
-+++ chan_capi-1.1.2/libcapi20/convert.c	2009-05-04 12:48:53 +0200
+Index: chan_capi-1.1.3/libcapi20/convert.c
+--- chan_capi-1.1.3/libcapi20/convert.c.orig	2009-07-23 16:11:08 +0200
++++ chan_capi-1.1.3/libcapi20/convert.c	2009-08-05 20:40:23 +0200
 @@ -11,7 +11,14 @@
  #include <stddef.h>
  #include <time.h>
@@ -654,7 +667,7 @@ Index: chan_capi-1.1.2/libcapi20/convert.c
  
 Index: channels/console_video.h
 --- channels/console_video.h.orig	2008-06-30 17:45:15 +0200
-+++ channels/console_video.h	2009-05-04 12:48:53 +0200
++++ channels/console_video.h	2009-08-05 20:40:23 +0200
 @@ -28,10 +28,7 @@
  		"console {device}"
  #else
@@ -669,7 +682,7 @@ Index: channels/console_video.h
  	"console {videodevice|videocodec"	\
 Index: configure
 --- configure.orig	2009-03-19 19:14:55 +0100
-+++ configure	2009-05-04 12:48:53 +0200
++++ configure	2009-08-05 20:40:23 +0200
 @@ -4053,12 +4053,6 @@
  	# note- does not work on FreeBSD
  
@@ -685,7 +698,7 @@ Index: configure
  cat >>confdefs.h <<\_ACEOF
 Index: main/Makefile
 --- main/Makefile.orig	2009-04-09 07:16:25 +0200
-+++ main/Makefile	2009-05-04 12:48:53 +0200
++++ main/Makefile	2009-08-05 20:40:23 +0200
 @@ -72,10 +72,7 @@
  endif
  
@@ -700,7 +713,7 @@ Index: main/Makefile
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
 Index: main/file.c
 --- main/file.c.orig	2009-04-15 22:20:23 +0200
-+++ main/file.c	2009-05-04 12:48:53 +0200
++++ main/file.c	2009-08-05 20:40:23 +0200
 @@ -248,7 +248,7 @@
  	char *fn = NULL;
  
@@ -712,7 +725,7 @@ Index: main/file.c
  		if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
 Index: main/tcptls.c
 --- main/tcptls.c.orig	2009-03-09 22:22:42 +0100
-+++ main/tcptls.c	2009-05-04 12:48:53 +0200
++++ main/tcptls.c	2009-08-05 20:40:23 +0200
 @@ -314,6 +314,7 @@
  	if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
  		if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
@@ -722,8 +735,8 @@ Index: main/tcptls.c
  
  	ast_verb(0, "SSL certificate ok\n");
 Index: menuselect-tree
---- menuselect-tree.orig	2009-04-27 21:45:53 +0200
-+++ menuselect-tree	2009-05-04 12:48:53 +0200
+--- menuselect-tree.orig	2009-07-27 23:05:03 +0200
++++ menuselect-tree	2009-08-05 20:40:23 +0200
 @@ -148,6 +148,8 @@
  </member>
  <member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
@@ -754,7 +767,7 @@ Index: menuselect-tree
  		</member>
 Index: res/res_http_post.c
 --- res/res_http_post.c.orig	2009-01-14 00:14:29 +0100
-+++ res/res_http_post.c	2009-05-04 12:48:53 +0200
++++ res/res_http_post.c	2009-08-05 20:40:23 +0200
 @@ -119,14 +119,8 @@
  		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
  		return;
@@ -774,7 +787,7 @@ Index: res/res_http_post.c
  
 Index: sounds/sounds.xml
 --- sounds/sounds.xml.orig	2008-10-09 22:01:38 +0200
-+++ sounds/sounds.xml	2009-05-04 12:48:53 +0200
++++ sounds/sounds.xml	2009-08-05 20:40:23 +0200
 @@ -4,9 +4,9 @@
  		<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
  		</member>

asterisk/asterisk.spec

@@ -28,7 +28,7 @@
 %define       V_asterisk_sounds_core_en  1.4.15
 %define       V_asterisk_sounds_core_de  current
 %define       V_asterisk_sounds_extra_en 1.4.9
-%define       V_chan_capi                1.1.2
+%define       V_chan_capi                1.1.3
 
 #   package information
 Name:         asterisk
@@ -41,7 +41,7 @@ Class:        BASE
 Group:        VoIP
 License:      GPL
 Version:      %{V_opkg}
-Release:      20090801
+Release:      20090805
 
 #   package options
 %option       with_dahdi   no