diff options
author | 2005-12-21 22:28:48 +0000 | |
---|---|---|
committer | 2005-12-21 22:28:48 +0000 | |
commit | 9a675d24390dcc14f56872a15feb8ed3732d836d (patch) | |
tree | 3697207f875edb16d31e687ea7d58c84d2a2c696 /net-misc | |
parent | Added .metadata directory for possible use in the nwn ebuild. (diff) | |
download | historical-9a675d24390dcc14f56872a15feb8ed3732d836d.tar.gz historical-9a675d24390dcc14f56872a15feb8ed3732d836d.tar.bz2 historical-9a675d24390dcc14f56872a15feb8ed3732d836d.zip |
Add asterisk-1.2.x patch for 0.6.0.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'net-misc')
4 files changed, 57 insertions, 5 deletions
diff --git a/net-misc/asterisk-chan_capi-cm/ChangeLog b/net-misc/asterisk-chan_capi-cm/ChangeLog index 112338d2e3fc..d17d9296e63c 100644 --- a/net-misc/asterisk-chan_capi-cm/ChangeLog +++ b/net-misc/asterisk-chan_capi-cm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/asterisk-chan_capi-cm # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/ChangeLog,v 1.13 2005/12/21 22:21:41 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/ChangeLog,v 1.14 2005/12/21 22:28:48 stkn Exp $ + + 22 Dec 2005; Stefan Knoblich <stkn@gentoo.org> + +files/chan_capi-cm-0.6.0-asterisk-1.2.diff, + asterisk-chan_capi-cm-0.6.0.ebuild: + Add asterisk-1.2.x patch for 0.6.0. 22 Dec 2005; Stefan Knoblich <stkn@gentoo.org> files/chan_capi-cm-0.6.1-asterisk-1.2.diff, diff --git a/net-misc/asterisk-chan_capi-cm/Manifest b/net-misc/asterisk-chan_capi-cm/Manifest index 6be152c55bc4..eaea839e4ae7 100644 --- a/net-misc/asterisk-chan_capi-cm/Manifest +++ b/net-misc/asterisk-chan_capi-cm/Manifest @@ -1,8 +1,8 @@ -MD5 2e6cf8e8dab2c81acaf0565db6f12118 asterisk-chan_capi-cm-0.6.0.ebuild 1579 +MD5 abf20d8250387f3a0eb6c2a6bc6f7791 asterisk-chan_capi-cm-0.6.0.ebuild 1579 MD5 0280c5431b2bc4f09e3d249d25b1010e asterisk-chan_capi-cm-0.5.4.ebuild 1594 MD5 56c38e32af5d204847de2d9a87b72351 asterisk-chan_capi-cm-0.5.3.ebuild 1588 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217 -MD5 350ca88f1178bd7720b8468455c65de6 ChangeLog 2262 +MD5 0bd378f4c8e5e9f9085f6c2bb9fb5666 ChangeLog 2435 MD5 d9a3e1125a6c821c5f7347b1fb2a8a58 asterisk-chan_capi-cm-0.6.1.ebuild 1576 MD5 20866dceae16bdac07ffa8b6f8aa2986 files/chan_capi-0.3.5-gentoo.diff 1113 MD5 e38626bf14b300bea371ed7dbe17003a files/digest-asterisk-chan_capi-cm-0.6.0 67 @@ -12,3 +12,4 @@ MD5 b6cdcca8eb6385e9b89fd26ee3da46b8 files/digest-asterisk-chan_capi-cm-0.6.1 69 MD5 7e64c5311ef2ac1051df45fb82b2aed6 files/digest-asterisk-chan_capi-cm-0.5.3 69 MD5 49f69b06231dd6ef79fe070882426dab files/chan_capi-0.6.0-gentoo.diff 1296 MD5 64c14671ea1e3ec12d9b448934fd4ff4 files/chan_capi-cm-0.6.1-asterisk-1.2.diff 865 +MD5 f638c698d5aacae0f9263923c1cde20d files/chan_capi-cm-0.6.0-asterisk-1.2.diff 1152 diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild index cdd7e3c1480f..7b095cd200b0 100644 --- a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild +++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild,v 1.2 2005/12/21 21:09:00 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild,v 1.3 2005/12/21 22:28:48 stkn Exp $ IUSE="" @@ -31,7 +31,7 @@ src_unpack() { # put system includes before asterisk ones, use ast_mutex_init instead # of ast_pthread_mutex_init if has_version ">=net-misc/asterisk-1.1.0"; then - epatch ${FILESDIR}/chan_capi-cm-0.6.1-asterisk-1.2.diff + epatch ${FILESDIR}/chan_capi-cm-0.6.0-asterisk-1.2.diff fi } diff --git a/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.0-asterisk-1.2.diff b/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.0-asterisk-1.2.diff new file mode 100644 index 000000000000..3a44d3b34319 --- /dev/null +++ b/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.0-asterisk-1.2.diff @@ -0,0 +1,46 @@ +--- chan_capi-cm-0.6/chan_capi.c.orig 2005-09-20 18:40:15 +0000 ++++ chan_capi-cm-0.6/chan_capi.c 2005-12-21 22:56:57 +0000 +@@ -18,6 +18,17 @@ + + #include "config.h" + ++#include <sys/time.h> ++#include <sys/signal.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <string.h> ++#include <ctype.h> ++#include <errno.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <sys/types.h> ++ + #include <asterisk/lock.h> + #include <asterisk/frame.h> + #include <asterisk/channel.h> +@@ -33,16 +44,6 @@ + #include <asterisk/utils.h> + #include <asterisk/cli.h> + #include <asterisk/causes.h> +-#include <sys/time.h> +-#include <sys/signal.h> +-#include <stdlib.h> +-#include <stdio.h> +-#include <string.h> +-#include <ctype.h> +-#include <errno.h> +-#include <unistd.h> +-#include <fcntl.h> +-#include <sys/types.h> + #include <asterisk/dsp.h> + #include "xlaw.h" + #include "chan_capi20.h" +@@ -4011,7 +4012,7 @@ + } + memset(tmp, 0, sizeof(struct ast_capi_pvt)); + +- ast_pthread_mutex_init(&(tmp->lock),NULL); ++ ast_mutex_init(&(tmp->lock)); + + strncpy(tmp->name, conf->name, sizeof(tmp->name) - 1); + strncpy(tmp->context, conf->context, sizeof(tmp->context) - 1); |