Added fix for compiling res_perl with bri enabled

Package-Manager: portage-2.0.51.19

4 files changed, 51 insertions, 22 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index ab03e21ddcda..566a12b12cfd 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.43 2005/03/27 22:53:10 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.44 2005/03/28 19:52:15 stkn Exp $
+
+  28 Mar 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff, asterisk-1.0.7.ebuild:
+  Added fix for compiling res_perl with bri enabled.
 
   27 Mar 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.7.ebuild:
   Fixed and re-enabled res_perl support, perl modules are now installed into
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 3282944a94aa..34227c19b19a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,33 +1,34 @@
-MD5 826cd5967bbe700e13c61d2e586da539 ChangeLog 7753
-MD5 b551ce4bb8eb4a03cb0e551c279ab02c asterisk-0.9.0.ebuild 3161
-MD5 6201814863e121c6cae9a8209b0b9a27 asterisk-1.0.0.ebuild 3394
 MD5 c870e11d5cfc72f46a1290e769a491cc asterisk-1.0.1.ebuild 5576
-MD5 465f444622b40abb34bbb311b571ed24 asterisk-1.0.2.ebuild 5585
-MD5 0a9506b97103f05fdd15df48db9b3506 asterisk-1.0.3-r1.ebuild 5865
-MD5 9af7f719e9db949d2d7870e01cd6faa1 asterisk-1.0.3.ebuild 5845
-MD5 867bae5d74f56337feec21310c14ecca asterisk-1.0.5-r1.ebuild 7170
+MD5 c710e6acc627e96377bc67bf01a5181c asterisk-1.0.7.ebuild 9429
 MD5 c7b911a01a3bd822055a9ec010dfbae1 asterisk-1.0.5.ebuild 6314
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 836a6bbe8f125659a9e0e8236d2f1684 asterisk-1.0.6.ebuild 8614
-MD5 81cdd77e4cbc44d4b074a0eecf7b81d5 asterisk-1.0.7.ebuild 9341
+MD5 9af7f719e9db949d2d7870e01cd6faa1 asterisk-1.0.3.ebuild 5845
+MD5 867bae5d74f56337feec21310c14ecca asterisk-1.0.5-r1.ebuild 7170
+MD5 0a9506b97103f05fdd15df48db9b3506 asterisk-1.0.3-r1.ebuild 5865
+MD5 6201814863e121c6cae9a8209b0b9a27 asterisk-1.0.0.ebuild 3394
+MD5 fa4af61b2b225c0d99bb9ae0e1e76dec ChangeLog 7930
 MD5 d7a0d59fff2e991e7b091341893ec554 digest-asterisk-1.0.7 210
-MD5 0243bdde80a5b8433cf93c306458dfd8 files/digest-asterisk-0.9.0 67
+MD5 b551ce4bb8eb4a03cb0e551c279ab02c asterisk-0.9.0.ebuild 3161
+MD5 465f444622b40abb34bbb311b571ed24 asterisk-1.0.2.ebuild 5585
+MD5 836a6bbe8f125659a9e0e8236d2f1684 asterisk-1.0.6.ebuild 8614
+MD5 4fa7ca8f47238dee3484dae5fb8f294c files/digest-asterisk-1.0.3-r1 213
 MD5 1bb1cf45f134eeae6adcc7dc17b6b5db files/digest-asterisk-1.0.0 141
+MD5 0243bdde80a5b8433cf93c306458dfd8 files/digest-asterisk-0.9.0 67
 MD5 b97c969a083704e6f8c8c9b07d56db3b files/digest-asterisk-1.0.1 213
+MD5 d7a0d59fff2e991e7b091341893ec554 files/digest-asterisk-1.0.7 210
 MD5 5474694f8ec88752718f88d84e587468 files/digest-asterisk-1.0.2 213
+MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6 210
 MD5 4fa7ca8f47238dee3484dae5fb8f294c files/digest-asterisk-1.0.3 213
-MD5 4fa7ca8f47238dee3484dae5fb8f294c files/digest-asterisk-1.0.3-r1 213
-MD5 08f910cf85384f1d08c01a439cb3634e files/digest-asterisk-1.0.5 213
 MD5 bfa11ecbbe1f5f9ecc73e121855fcf48 files/digest-asterisk-1.0.5-r1 213
-MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6 210
-MD5 d7a0d59fff2e991e7b091341893ec554 files/digest-asterisk-1.0.7 210
-MD5 5b7ebf09c4c7988bd16cadaaad08d8f6 files/0.9.0/asterisk.confd 290
-MD5 da4846c3843d6f94b278c687d3b2ad21 files/0.9.0/asterisk.rc6 465
-MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
+MD5 08f910cf85384f1d08c01a439cb3634e files/digest-asterisk-1.0.5 213
+MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
 MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
+MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
 MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
-MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
-MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
-MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
 MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
 MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
+MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
+MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
+MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
+MD5 5b7ebf09c4c7988bd16cadaaad08d8f6 files/0.9.0/asterisk.confd 290
+MD5 da4846c3843d6f94b278c687d3b2ad21 files/0.9.0/asterisk.rc6 465
diff --git a/net-misc/asterisk/asterisk-1.0.7.ebuild b/net-misc/asterisk/asterisk-1.0.7.ebuild
index bde75b5df7de..24c4b609df6e 100644
--- a/net-misc/asterisk/asterisk-1.0.7.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.7.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/asterisk-1.0.7.ebuild,v 1.2 2005/03/27 22:53:10 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7.ebuild,v 1.3 2005/03/28 19:52:15 stkn Exp $
 
 IUSE="alsa doc gtk mmx mysql pri zaptel uclibc debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
 
@@ -138,6 +138,10 @@ src_unpack() {
 			-e "s:\$(ASTLIBDIR)/modules/res_musiconhold.so::" \
 			res_perl/Makefile
 
+		if use bri; then
+			epatch ${FILESDIR}/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff
+		fi
+
 		cd ${S}
 	fi
 
diff --git a/net-misc/asterisk/files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff b/net-misc/asterisk/files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff
new file mode 100644
index 000000000000..5001809d2b7f
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff
@@ -0,0 +1,20 @@
+--- asterisk-addons-1.0.7/res_perl/AstAPIBase.c.orig	2005-03-28 21:38:28.998238136 +0200
++++ asterisk-addons-1.0.7/res_perl/AstAPIBase.c	2005-03-28 21:40:41.375113792 +0200
+@@ -704,7 +704,7 @@
+ struct ast_channel *asterisk_request_and_dial(char *type,char *data,int format,char *callerid, int timeout) {
+ 	int reason;
+ 	struct ast_channel *chan;
+-	chan = ast_request_and_dial(type,AST_FORMAT_ULAW, data, timeout, &reason,callerid);
++	chan = ast_request_and_dial(type,AST_FORMAT_ULAW, data, timeout, &reason, 0, callerid, NULL);
+ 	return chan;
+ }
+ 
+@@ -743,7 +743,7 @@
+ 
+ struct ast_channel *asterisk_request(int format,char *type,char *data,char *callerid) {
+ 	struct ast_channel *chan=NULL;
+-	chan = ast_request(type, format, data);
++	chan = ast_request(type, format, data, NULL);
+ 	if (callerid && strlen(callerid))
+ 		ast_set_callerid(chan, callerid, 1);
+