Version bump. Robustness fixes for the MP3 support, the MySQL module has also recieved some love.

Package-Manager: portage-2.1.7.9/cvs/Linux x86_64

5 files changed, 179 insertions, 6 deletions

diff --git a/net-misc/asterisk-addons/ChangeLog b/net-misc/asterisk-addons/ChangeLog
index 9a674a114391..bbb24f60a2f5 100644
--- a/net-misc/asterisk-addons/ChangeLog
+++ b/net-misc/asterisk-addons/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk-addons
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.16 2009/09/11 16:39:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.17 2009/12/02 18:45:27 chainsaw Exp $
+
+*asterisk-addons-1.6.1.2 (02 Dec 2009)
+
+  02 Dec 2009; <chainsaw@gentoo.org> +asterisk-addons-1.6.1.2.ebuild,
+  +files/asterisk-addons-1.6.1.2-parallel-make.diff,
+  +files/asterisk-addons-1.6.1.2-uclibc.diff:
+  Version bump. Robustness fixes for the MP3 support, the MySQL module has
+  also recieved some love.
 
 *asterisk-addons-1.6.1.1 (11 Sep 2009)
 
diff --git a/net-misc/asterisk-addons/Manifest b/net-misc/asterisk-addons/Manifest
index d474f07e3be8..ced486e51c72 100644
--- a/net-misc/asterisk-addons/Manifest
+++ b/net-misc/asterisk-addons/Manifest
@@ -9,18 +9,22 @@ AUX asterisk-addons-1.2.3-gentoo-ooh323c.diff 1465 RMD160 b584cb11b208e6a384bdef
 AUX asterisk-addons-1.2.4-uclibc.diff 886 RMD160 2018dbe61d12279359dc98cea428feaa8f69b58b SHA1 fb7f54a8a8e51064bf1b50bfe4f0efbc46d5f557 SHA256 b8c0be41e6058e863cb89152319be9defd38b8b8975f64e43303f0efc968524e
 AUX asterisk-addons-1.6.1.1-parallel-make.diff 3287 RMD160 9aeca94c97020c67716934a448953e0ca7f06732 SHA1 900701c5bcd3b093b8095c8fd3758e5f31461601 SHA256 5ee95e76bd7eaf62948d3cc33e72834b09736a946868ab6791e1882b24ca00e3
 AUX asterisk-addons-1.6.1.1-uclibc.diff 1517 RMD160 cd176122569edc6087683ce61dc0af6122574557 SHA1 2db8a65dc19748d975cde45ee07f8f6c8b78cac1 SHA256 56d81855fc45ef845662f65e9b18d47754812fb2479d7e8764ea26202dcdd382
+AUX asterisk-addons-1.6.1.2-parallel-make.diff 3287 RMD160 2c6f1e4c344c929858aa42437210af55e7623c42 SHA1 1c6aae1e2c295b341e3dc65c301039138772f09b SHA256 e1afd1a3b2b39f983d214978942dd8995db672725cb23ce1182cc58a413092cf
+AUX asterisk-addons-1.6.1.2-uclibc.diff 1517 RMD160 0e67cf7f71ee517e113bc35fa6329987ef978712 SHA1 5da43941b98c6790e6d266c5f3314251367935b9 SHA256 9a2e76532669b5d7201e83f61713c81ce1a389304ab94ed1d2bec71654f0e2bf
 AUX sqlite-3.2.1-data-corruption.patch 6529 RMD160 06f79a07f5dfb12967ebc233544b0807ac8114af SHA1 73203e5145119b9ad070596271793ea36e0bd651 SHA256 7b42e48387045ab466a0d7f936099de0d1597b0cf593fb28705a46c1b6e76b81
 DIST asterisk-addons-1.2.9.tar.gz 762705 RMD160 329125af2567fe96255c5f70092a2d2196b7db81 SHA1 719b45b99e5cc622d5ddc2035bea9e31fd4a491e SHA256 13df280ca14e9573b3a72de4c1ac75424939add981337cfd1c73a99444f75dc4
 DIST asterisk-addons-1.6.1.1.tar.gz 866217 RMD160 7355d4875b66ca679d5410d18d30d89f0b589b9b SHA1 0f6daf777ec9f868e2cc14bc2930533f4a243117 SHA256 20812ab4953fa1e274df37b33a421aeb25c27030832dbaf7a0a7dd8a262b62a7
+DIST asterisk-addons-1.6.1.2.tar.gz 864764 RMD160 93569c78267dc6b929c253181a2cec366b8bf424 SHA1 fd068d9f7c64b3c3d24194f496c7c5743f6eeea9 SHA256 0a078d26e7e9d68f7948efd40fc6ec2e98347249b637e7a65517c17ca6d19beb
 DIST sqlite-3.2.1.tar.gz 1351842 RMD160 3b4cfc1fca27d4df369220d15eb5e28777bd99da SHA1 df9b8a28bb64a29df8b2411b6b8b746b04d742eb SHA256 daba70d5d7666ff8091a7a9322a1a2d88889043d50e136ed7d3e726d751001a7
 EBUILD asterisk-addons-1.2.9.ebuild 4316 RMD160 0dae2f36a0bd8d81a77eea21bd1d25ec9f73bfcd SHA1 ff3e907908295f43cf628141fe6ab2b18af6b9ac SHA256 ee3c5491c637f09f090b785f6520178944c88ced0f2aa32393d3e83ea8ac61d3
 EBUILD asterisk-addons-1.6.1.1.ebuild 1063 RMD160 56a1bc9e7feccde1c03ed27c6a95b31c61f6b0f9 SHA1 19e264a1031fb8e99b51d02efe7dd14dd8eba325 SHA256 4f63e3d11f86c19401b5fa3ddf3301efc6bc5fefe90e96521687faf0dac67cbe
-MISC ChangeLog 3898 RMD160 4b5828eda502aae1625af2500841220552259b75 SHA1 e590965f60ee71a01c585f5d263c5411e3507f58 SHA256 beac9068b347af50b3b8b0410b6f954f3583f23412dd11ce866a52bcc901a0eb
+EBUILD asterisk-addons-1.6.1.2.ebuild 1064 RMD160 e4e49e52cbf88a87434b0cd725cc565c801b60e4 SHA1 4878c5d3bee72bb0bd3975f76823d2fdc616b2b7 SHA256 b05591321f646068cbbf678e5b3a62ed75fabd2ba9115e74559e368a020c7afc
+MISC ChangeLog 4210 RMD160 05012d89fc8e6f0bca5e79d10475d050a56f075e SHA1 6761a1fd1d814148071471c816ead169f46a7ee4 SHA256 43d8ff0816f8868ab6a2cf5395d04039992772f883b47d5af06a95b906d7ba9d
 MISC metadata.xml 347 RMD160 500132e360b39cc8f2a4c2763e242d700df81467 SHA1 dbbf70e51895671da71c708ed95f4d049adea12b SHA256 ecf7b68234022ca3ad594155e153417bf2d9aae54c18ff067ccc8f4db0e4e19a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkqqfaAACgkQp5vW4rUFj5pyvgCfT/fZ8WyIt1a2Q+sY3rj2B7IB
-PhkAnAwC4SFr5j/6Zzlut4rmTGzVYvnd
-=U+iC
+iEYEARECAAYFAksWtWoACgkQp5vW4rUFj5pPQACeK311v1W/LzGCUhdHfExjN4rj
+pz8AoIB/Wa+mL+ZU5aQSwEd/8og2dofF
+=uA7I
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild b/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild
new file mode 100644
index 000000000000..fb0568a12eed
--- /dev/null
+++ b/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild,v 1.1 2009/12/02 18:45:27 chainsaw Exp $
+
+inherit eutils
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.digium.com/pub/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="bluetooth elibc_uclibc mysql"
+
+RDEPEND=">=net-misc/asterisk-1.6.1.11"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-parallel-make.diff"
+
+	# forward-ported patch from jaervosz for uclibc
+	if use elibc_uclibc; then
+		epatch "${FILESDIR}/${P}-uclibc.diff"
+	fi
+}
+
+src_compile() {
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		$(use_with bluetooth) \
+		$(use_with mysql mysqlclient) \
+		|| die "Failed to configure"
+
+	emake || die "Failed to compile"
+}
+
+src_install() {
+	dodoc configs/*
+	emake DESTDIR="${D}" install || die "Failed to install"
+}
diff --git a/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-parallel-make.diff b/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-parallel-make.diff
new file mode 100644
index 000000000000..d93bc257e9c4
--- /dev/null
+++ b/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-parallel-make.diff
@@ -0,0 +1,62 @@
+diff -uNr asterisk-addons-1.6.1.2.ORIG/Makefile asterisk-addons-1.6.1.2/Makefile
+--- asterisk-addons-1.6.1.2.ORIG/Makefile	2009-12-02 18:32:26.000000000 +0000
++++ asterisk-addons-1.6.1.2/Makefile	2009-12-02 18:33:00.000000000 +0000
+@@ -136,8 +136,8 @@
+ 	@echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+ 
+ $(MOD_SUBDIRS_MENUSELECT_TREE):
+-	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
+-	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
++	+@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
++	+@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
+ 
+ makeopts.embed_rules: menuselect.makeopts
+ 	@echo "Generating embedded module rules ..."
+@@ -149,10 +149,10 @@
+ $(SUBDIRS): makeopts.embed_rules
+ 
+ $(MOD_SUBDIRS):
+-	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
++	+@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
+ 
+ $(OTHER_SUBDIRS):
+-	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
++	+@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
+ 
+ config.status: configure
+ 	@./configure
+@@ -269,27 +269,27 @@
+ MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+ 
+ menuselect/menuselect: menuselect/makeopts
+-	$(MAKE_MENUSELECT) menuselect
++	+$(MAKE_MENUSELECT) menuselect
+ 
+ menuselect/cmenuselect: menuselect/makeopts
+-	$(MAKE_MENUSELECT) cmenuselect
++	+$(MAKE_MENUSELECT) cmenuselect
+ 
+ menuselect/gmenuselect: menuselect/makeopts
+-	$(MAKE_MENUSELECT) gmenuselect
++	+$(MAKE_MENUSELECT) gmenuselect
+ 
+ menuselect/nmenuselect: menuselect/makeopts
+-	$(MAKE_MENUSELECT) nmenuselect
++	+$(MAKE_MENUSELECT) nmenuselect
+ 
+ menuselect/makeopts: makeopts
+-	$(MAKE_MENUSELECT) makeopts
++	+$(MAKE_MENUSELECT) makeopts
+ 
+ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) configure
+ 	@echo "Generating input for menuselect ..."
+ 	@echo "<?xml version=\"1.0\"?>" > $@
+ 	@echo >> $@
+ 	@echo "<menu name=\"Asterisk-addons Module Selection\">" >> $@
+-	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+-	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
++	+@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
++	+@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+ 	@echo "</menu>" >> $@
+ 
+ .PHONY: menuselect clean dist-clean distclean all cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
diff --git a/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-uclibc.diff b/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-uclibc.diff
new file mode 100644
index 000000000000..205aba701b61
--- /dev/null
+++ b/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-uclibc.diff
@@ -0,0 +1,55 @@
+diff -uNr asterisk-addons-1.6.1.2.ORIG/cdr/cdr_addon_mysql.c asterisk-addons-1.6.1.2/cdr/cdr_addon_mysql.c
+--- asterisk-addons-1.6.1.2.ORIG/cdr/cdr_addon_mysql.c	2009-12-02 18:35:01.000000000 +0000
++++ asterisk-addons-1.6.1.2/cdr/cdr_addon_mysql.c	2009-12-02 18:36:00.000000000 +0000
+@@ -29,6 +29,13 @@
+ 
+ #include <asterisk.h>
+ 
++#include <stdio.h>
++#include <string.h>
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <time.h>
++
+ #include <sys/types.h>
+ #include <asterisk/config.h>
+ #include <asterisk/options.h>
+@@ -40,13 +47,6 @@
+ #include <asterisk/strings.h>
+ #include <asterisk/linkedlists.h>
+ 
+-#include <stdio.h>
+-#include <string.h>
+-
+-#include <stdlib.h>
+-#include <unistd.h>
+-#include <time.h>
+-
+ #include <mysql/mysql.h>
+ #include <mysql/errmsg.h>
+ 
+diff -uNr asterisk-addons-1.6.1.2.ORIG/res/res_config_mysql.c asterisk-addons-1.6.1.2/res/res_config_mysql.c
+--- asterisk-addons-1.6.1.2.ORIG/res/res_config_mysql.c	2009-12-02 18:35:01.000000000 +0000
++++ asterisk-addons-1.6.1.2/res/res_config_mysql.c	2009-12-02 18:36:00.000000000 +0000
+@@ -44,6 +44,9 @@
+ 
+ #include <asterisk.h>
+ 
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ #include <asterisk/channel.h>
+ #include <asterisk/logger.h>
+ #include <asterisk/config.h>
+@@ -53,10 +56,6 @@
+ #include <asterisk/cli.h>
+ #include <asterisk/utils.h>
+ #include <asterisk/threadstorage.h>
+-#include <stdlib.h>
+-#include <stdio.h>
+-#include <string.h>
+-#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>