net-misc/asterisk-1.6.0.2: version bump

svn path=/trunk/; revision=735

4 files changed, 25 insertions, 7 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 4b1afb4..0320fd2 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2006/02/22 02:08:04 hd_brummy Exp $
 
+  02 Dec 2008; Rambaldi <rambaldi@xs4all.nl>
+  +files/1.6/asterisk-1.6.0.2-sentinel.patch, ++, -asterisk-1.6.0.ebuild:
+  net-misc/asterisk-1.6.0.2: version bump
+
   15 Oct 2008; Rambaldi <rambaldi@xs4all.nl> ++, -asterisk-1.4.22.ebuild:
   net-misc/asterisk-1.4.22: added dahdi support
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index c641f2a..c8bdf04 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -11,11 +11,12 @@ AUX 1.6/asterisk-1.6.0-configure-gentoo.diff 749 RMD160 d09ab8eeb40105b06246bbbb
 AUX 1.6/asterisk-1.6.0-gsm-pic.patch 1990 RMD160 6e17a76a70938f8d371b7e6efe44d70d2b622cd3 SHA1 c5a3c2ae1af31e60a45a6069c00f432dcafaf1a7 SHA256 c0b774b95f785fb35e1cbc44945fc4debeeb3e338ec49501a7ac64a87307e4df
 AUX 1.6/asterisk-1.6.0-uclibc.patch 373 RMD160 08f18dd2af3736497995ebcbea84939ae4c4cc98 SHA1 b10884d4b9123800f62b4aabac5a93b1a110e3da SHA256 b6fe54def0ab3f90058c2ed7bd288dd21c96aaf88b9028f12d223fb31d7e41c5
 AUX 1.6/asterisk-1.6.0-var_rundir.patch 441 RMD160 55869a82a01be38e80da9a31faac6d2d03f0fc58 SHA1 5bf2a8ed9778623f611330fcc4ea75c50f642680 SHA256 f75156feb6a6e421fc83e2d518b4b9204e4ae11e802440576a54de226ffd8064
+AUX 1.6/asterisk-1.6.0.2-sentinel.patch 537 RMD160 50f7c4f4aad4f4852715e5189892930a69071911 SHA1 343e6159741506552502dfc0dac41b6fd63faf42 SHA256 1657e3f74768cf6514d7dd154d583f9a1a3e48ca2c244a13318a2e7dbaf380fa
 DIST asterisk-1.4.21.2.tar.gz 11528693 RMD160 938c618d17aeef45a17d2fbe5293fbc13c4efe0d SHA1 8c0dcf57f69ce27929f7836081316a2695eb76fa SHA256 27c3bb0e47c6f762c0ce701cd97b5f23fd3424984523bf353593b77a696ea8b5
 DIST asterisk-1.4.22.tar.gz 11598693 RMD160 4699c6963089fd196836f7f86f9827edc13c4397 SHA1 598d7fdf075a4e6154bc8910d3ed3995f39c9f23 SHA256 7a6d80ed8de3a1bfd7f2c3442ec5eb1da3eeaff6ace1a3c04578848181eee79a
-DIST asterisk-1.6.0.tar.gz 13199481 RMD160 891bb54751965333e6a87de925e33d4c6da76095 SHA1 c96717d8cbb70b538b7b9183a76fd69c39543acc SHA256 742e91f3e69a7686c7c3c31b368d5e1c0b64a73afd5415e6753a7a02aa79ff93
+DIST asterisk-1.6.0.2.tar.gz 13240121 RMD160 1c6461e0555edfd08803764e39fb052c6125a2cd SHA1 7d7c63f5c8ad17cc7dfd1bdd0fd27eea4fcef2c1 SHA256 dcff8ab68a64728452fd1ffc80e884789ea30edf0526ff9ececa626ad88036e8
 EBUILD asterisk-1.4.21.2.ebuild 11269 RMD160 151426a64bfc64315f89ccd8d8617d86b6a7b254 SHA1 a549e825fb0b2a540c4228994539b9f981445844 SHA256 c648f2557d7a90dcfbb0b97bfbc23808f10f41a7450566b1ae7fc161b0a01eee
 EBUILD asterisk-1.4.22-r1.ebuild 11747 RMD160 81921f9c9d1149024c0393e3fa940867c84c6176 SHA1 94550298aa862f77cc8ea969d2094082f2cc154a SHA256 c91658e9a49b247d65c75322a47dc7440f937daaec112c73715b7fc5ae174f5c
-EBUILD asterisk-1.6.0.ebuild 11057 RMD160 b352f8077b0a947d1065fc691592413582b5ef60 SHA1 8a92bef75ad981315166d016f72fbfff4f7650a6 SHA256 d973def41e8e4031388f68887c51af3d385d06a7da1b0155f11a07b82cf25777
-MISC ChangeLog 5679 RMD160 9bf88a97588aa69e08a46bc9438330c9ceeb0608 SHA1 c9b081eebfbb7c328cd1831ee8ac5d9d4bc7fb86 SHA256 dc6ddf0442b21af02e85aab1c556b0f26a14d13ec8471d534c4ef2320e79ebec
+EBUILD asterisk-1.6.0.2.ebuild 11215 RMD160 1c2102472084579d1756b6d2ece2ec15d93f9211 SHA1 03c8436ed048ba4301d61898dcb79702f1823964 SHA256 6e0fe727840a4a25badb8b3ba9f56fb619c4bfe6fbfc2464f4f32b1ffd26e454
+MISC ChangeLog 5841 RMD160 b04d31bf6409d4508faf44c999601fe31e445312 SHA1 d358a85998cf066c46a6ef14af84775eca77eabc SHA256 10f3c51ef1e2b39b46e2a228868e64d8aae73ad9560f3fc93e1fe14cedbb2528
 MISC metadata.xml 139 RMD160 c84b2b78f85074cc5c7d26cb757d91c8384fa16a SHA1 00e3ae2ead875413d94aeafa5279646740c2c21d SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed
diff --git a/net-misc/asterisk/asterisk-1.6.0.ebuild b/net-misc/asterisk/asterisk-1.6.0.2.ebuild
index e8922bb..002b534 100644
--- a/net-misc/asterisk/asterisk-1.6.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.6.0.2.ebuild
@@ -157,18 +157,18 @@ src_unpack() {
 	#
 	# put pid file(s) into /var/run/asterisk
 	#
-	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-var_rundir.patch
+	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-var_rundir.patch || die "patch failed"
 
 	#
 	# fix gsm codec cflags (e.g. i586 core epias) and disable
 	# assembler optimizations (on non-mmx / non-x86 or x86 PIC systems)
 	#
-	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-gsm-pic.patch
+	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-gsm-pic.patch || die "patch failed"
 
 	#
 	# add missing LIBS for uclibc
 	#
-	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-uclibc.patch
+	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-uclibc.patch  || die "patch failed"
 
 	if use x86 && use mmx ; then
 		if use pic ; then
@@ -184,7 +184,8 @@ src_unpack() {
 	# fix imap check in configure
 	# (TODO: patch configure.ac & run eautoreconf ?)
 	#
-	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-configure-gentoo.diff
+	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-configure-gentoo.diff || die "patch failed"
+	epatch "${FILESDIR}"/1.6/${P}-sentinel.patch || die "patch failed" 
 
 	# parse modules list
 	if [[ -n "${ASTERISK_MODULES}" ]]; then
diff --git a/net-misc/asterisk/files/1.6/asterisk-1.6.0.2-sentinel.patch b/net-misc/asterisk/files/1.6/asterisk-1.6.0.2-sentinel.patch
new file mode 100644
index 0000000..4df6cca
--- /dev/null
+++ b/net-misc/asterisk/files/1.6/asterisk-1.6.0.2-sentinel.patch
@@ -0,0 +1,12 @@
+--- main/manager.c.org	2008-12-02 21:59:45.000000000 +0100
++++ main/manager.c	2008-12-02 22:03:42.000000000 +0100
+@@ -1729,7 +1729,8 @@
+ 
+ 	if (varname[strlen(varname) - 1] == ')') {
+ 		if (!c) {
+-			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL);
++			//c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL);
++			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/manager");
+ 			if (c) {
+ 				ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
+ 				ast_channel_free(c);