[Pkg-voip-commits] r1155 - in asterisk-chan-capi/trunk/debian: . patches

Kilian Krause kilian at costa.debian.org
Wed Jan 11 18:52:40 UTC 2006 

Author: kilian
Date: 2006-01-11 18:52:39 +0000 (Wed, 11 Jan 2006)
New Revision: 1155

Modified:
   asterisk-chan-capi/trunk/debian/changelog
   asterisk-chan-capi/trunk/debian/patches/01_debian-patch.dpatch
   asterisk-chan-capi/trunk/debian/patches/02_kernel_post_2.6.10_fix.dpatch
   asterisk-chan-capi/trunk/debian/rules
   asterisk-chan-capi/trunk/debian/watch
Log:
imported Lionel's proposed patch.


Modified: asterisk-chan-capi/trunk/debian/changelog
===================================================================
--- asterisk-chan-capi/trunk/debian/changelog	2006-01-11 17:03:06 UTC (rev 1154)
+++ asterisk-chan-capi/trunk/debian/changelog	2006-01-11 18:52:39 UTC (rev 1155)
@@ -1,7 +1,8 @@
-asterisk-chan-capi (0.3.5-12) UNRELEASED; urgency=low
+asterisk-chan-capi (0.6.3-1) UNRELEASED; urgency=low
 
   [ Kilian Krause ]
   * Exclude s390 from arches, as there's no libcapi20-dev there.
+  * New upstream release. (Closes: #329251, #328914, #315430, #340875, #345556)
 
   [ Mark Purcell ]
   * Update debian/watch

Modified: asterisk-chan-capi/trunk/debian/patches/01_debian-patch.dpatch
===================================================================
--- asterisk-chan-capi/trunk/debian/patches/01_debian-patch.dpatch	2006-01-11 17:03:06 UTC (rev 1154)
+++ asterisk-chan-capi/trunk/debian/patches/01_debian-patch.dpatch	2006-01-11 18:52:39 UTC (rev 1155)
@@ -5,13 +5,13 @@
 ## DP: New patch generated from asterisk-chan-capi 0.3.5-9 diff.gz
 
 @DPATCH@
-
---- asterisk-chan-capi-0.3.5.orig/Makefile
-+++ asterisk-chan-capi-0.3.5/Makefile
-@@ -20,14 +20,24 @@
+diff -urNad asterisk-chan-capi-0.6.3~/Makefile asterisk-chan-capi-0.6.3/Makefile
+--- asterisk-chan-capi-0.6.3~/Makefile	2005-12-27 20:48:51.000000000 +0100
++++ asterisk-chan-capi-0.6.3/Makefile	2006-01-08 23:34:10.000000000 +0100
+@@ -46,7 +46,17 @@
+ MODULES_DIR=$(INSTALL_PREFIX)/usr/pkg/lib/asterisk/modules
+ endif
  
- MODULES_DIR=$(INSTALL_PREFIX)/usr/lib/asterisk/modules
- 
 +OSARCH=$(shell uname -s)
 +
 +ifeq ($(strip $(PROC)),)
@@ -26,25 +26,29 @@
  
  DEBUG=-g #-pg
  INCLUDE=-I$(ASTERISK_HEADER_DIR)
- CFLAGS=-pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
+@@ -60,9 +70,9 @@
+ endif
+ CFLAGS=-pipe -fPIC -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS+=$(OPTIMIZE)
 -CFLAGS+=-O6
 +CFLAGS+=-O2 -fPIC
  CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
 -CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 +CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi)
  
- # uncomment the following line if you really never ever want early b3 connects,
- # you can also configure it in the dialstring, this is just for performance
---- asterisk-chan-capi-0.3.5.orig/chan_capi.c
-+++ asterisk-chan-capi-0.3.5/chan_capi.c
-@@ -20,7 +20,6 @@
+ CFLAGS+=-DASTERISKVERSION=\"$(ASTERISKVERSION)\"
+ 
+diff -urNad asterisk-chan-capi-0.6.3~/chan_capi.c asterisk-chan-capi-0.6.3/chan_capi.c
+--- asterisk-chan-capi-0.6.3~/chan_capi.c	2006-01-07 15:44:32.000000000 +0100
++++ asterisk-chan-capi-0.6.3/chan_capi.c	2006-01-08 23:29:48.000000000 +0100
+@@ -29,7 +29,6 @@
  #include <asterisk/pbx.h>
  #include <asterisk/config.h>
  #include <asterisk/options.h>
 -#include <asterisk/features.h>
  #include <asterisk/utils.h>
  #include <asterisk/cli.h>
- #include <sys/time.h>
+ #include <asterisk/causes.h>
 @@ -1597,7 +1596,7 @@
  					p->i->calledPartyIsISDN = 1;
  					// ast_log(LOG_NOTICE,"I S D N\n");

Modified: asterisk-chan-capi/trunk/debian/patches/02_kernel_post_2.6.10_fix.dpatch
===================================================================
--- asterisk-chan-capi/trunk/debian/patches/02_kernel_post_2.6.10_fix.dpatch	2006-01-11 17:03:06 UTC (rev 1154)
+++ asterisk-chan-capi/trunk/debian/patches/02_kernel_post_2.6.10_fix.dpatch	2006-01-11 18:52:39 UTC (rev 1155)
@@ -3,33 +3,29 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix new kernel fd handling since 2.6.10-rc5
-## DP: thanks goes to Martin Jess <debian-bugs at fhloston.org>
+## DP: updated by Lionel Elie Mamane <lionel at mamane.lu>
 
 @DPATCH@
-diff -urNad asterisk-chan-capi-0.3.5/chan_capi.c /tmp/dpep.2c0i5Q/asterisk-chan-capi-0.3.5/chan_capi.c
---- asterisk-chan-capi-0.3.5/chan_capi.c	2005-05-21 14:10:03.092504993 +0200
-+++ /tmp/dpep.2c0i5Q/asterisk-chan-capi-0.3.5/chan_capi.c	2005-05-21 14:11:19.724490764 +0200
-@@ -639,6 +639,7 @@
- 	char buffer[AST_MAX_EXTENSION];
- 	char called[AST_MAX_EXTENSION],calling[AST_MAX_EXTENSION];
- 	char bchaninfo[3];
-+        long flags;
+diff -urNad asterisk-chan-capi-0.6.3~/chan_capi.c asterisk-chan-capi-0.6.3/chan_capi.c
+--- asterisk-chan-capi-0.6.3~/chan_capi.c	2006-01-09 00:00:44.000000000 +0100
++++ asterisk-chan-capi-0.6.3/chan_capi.c	2006-01-09 00:08:31.000000000 +0100
+@@ -1467,6 +1467,7 @@
+ 	struct ast_channel *tmp;
+ 	int fmt;
+ 	int fds[2];
++	long flags;
+ 
+ 	tmp = ast_channel_alloc(0);
  	
- 	_cmsg CMSG;
- 	MESSAGE_EXCHANGE_ERROR  error;
-@@ -683,10 +684,14 @@
- 	if (pipe(fds) == 0) {
- 	    ast_mutex_lock(&pipelock);
- 	    i->fd = fds[0];
-+            flags = fcntl(i->fd,F_GETFL);
-+            fcntl(i->fd,F_SETFL,flags | O_SYNC | O_DIRECT);
- 	    p = malloc(sizeof(struct capi_pipe));
- 	    memset(p, 0, sizeof(struct capi_pipe));
- 	    p->fd = fds[1];
--	    c->fds[0] = fds[1];
-+            flags = fcntl(i->fd,F_GETFL);
-+            fcntl(p->fd,F_SETFL,flags | O_SYNC | O_DIRECT);
-+            c->fds[0] = i->fd;
- 	    p->PLCI = -1;
- 	    p->i = i;
- 	    p->c = c;
+@@ -1493,7 +1494,11 @@
+ 	}
+ 
+ 	i->fd = fds[0];
++	flags = fcntl(i->fd,F_GETFL);
++	fcntl(i->fd,F_SETFL,flags | O_SYNC | O_DIRECT);
+ 	i->fd2 = fds[1];
++	flags = fcntl(i->fd2,F_GETFL);
++	fcntl(i->fd2,F_SETFL,flags | O_SYNC | O_DIRECT);
+ 	
+ 	tmp->fds[0] = i->fd;
+ 	if (i->smoother != NULL) {

Modified: asterisk-chan-capi/trunk/debian/rules
===================================================================
--- asterisk-chan-capi/trunk/debian/rules	2006-01-11 17:03:06 UTC (rev 1154)
+++ asterisk-chan-capi/trunk/debian/rules	2006-01-11 18:52:39 UTC (rev 1155)
@@ -60,7 +60,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/chan-capi.
-	$(MAKE) config install INSTALL_PREFIX=$(CURDIR)/debian/asterisk-chan-capi
+	$(MAKE) install_config install INSTALL_PREFIX=$(CURDIR)/debian/asterisk-chan-capi
 
 
 # Build architecture-independent files here.

Modified: asterisk-chan-capi/trunk/debian/watch
===================================================================
--- asterisk-chan-capi/trunk/debian/watch	2006-01-11 17:03:06 UTC (rev 1154)
+++ asterisk-chan-capi/trunk/debian/watch	2006-01-11 18:52:39 UTC (rev 1155)
@@ -3,4 +3,4 @@
 # to check for upstream updates and more.
 # Site		Directory		Pattern			Version	Script
 version=2
-http://www.junghanns.net/downloads/	chan_capi.(.*)\.tar\.gz	debian	svn-upgrade
+http://prdownloads.sourceforge.net/chan-capi/	chan_capi-cm-(.*)\.tar\.gz	debian	svn-upgrade

More information about the Pkg-voip-commits mailing list