summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2009-09-11 16:39:52 +0000
committerTony Vroon <chainsaw@gentoo.org>2009-09-11 16:39:52 +0000
commitf51b3e028f98c1a1afd6c2cc1b5d38d8b730f451 (patch)
tree8fd9e3a5b280c6532b9c04bebcef53a7ad9f2727 /net-misc/asterisk-addons
parentarm/ia64/m68k/s390/sh/sparc stable wrt #283079 (diff)
downloadhistorical-f51b3e028f98c1a1afd6c2cc1b5d38d8b730f451.tar.gz
historical-f51b3e028f98c1a1afd6c2cc1b5d38d8b730f451.tar.bz2
historical-f51b3e028f98c1a1afd6c2cc1b5d38d8b730f451.zip
Version bump, closes bug #267366 by Cédric Caron.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'net-misc/asterisk-addons')
-rw-r--r--net-misc/asterisk-addons/ChangeLog9
-rw-r--r--net-misc/asterisk-addons/Manifest12
-rw-r--r--net-misc/asterisk-addons/asterisk-addons-1.6.1.1.ebuild44
-rw-r--r--net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-parallel-make.diff62
-rw-r--r--net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-uclibc.diff55
5 files changed, 177 insertions, 5 deletions
diff --git a/net-misc/asterisk-addons/ChangeLog b/net-misc/asterisk-addons/ChangeLog
index 747cd77d0cf8..9a674a114391 100644
--- a/net-misc/asterisk-addons/ChangeLog
+++ b/net-misc/asterisk-addons/ChangeLog
@@ -1,6 +1,13 @@
# 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.15 2009/05/01 15:43:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.16 2009/09/11 16:39:52 chainsaw Exp $
+
+*asterisk-addons-1.6.1.1 (11 Sep 2009)
+
+ 11 Sep 2009; <chainsaw@gentoo.org> +asterisk-addons-1.6.1.1.ebuild,
+ +files/asterisk-addons-1.6.1.1-parallel-make.diff,
+ +files/asterisk-addons-1.6.1.1-uclibc.diff:
+ Version bump, closes bug #267366 by Cédric Caron.
*asterisk-addons-1.2.9 (01 May 2009)
diff --git a/net-misc/asterisk-addons/Manifest b/net-misc/asterisk-addons/Manifest
index 182256ebb98a..815d763af40d 100644
--- a/net-misc/asterisk-addons/Manifest
+++ b/net-misc/asterisk-addons/Manifest
@@ -7,16 +7,20 @@ AUX asterisk-addons-1.2.2-gentoo-format_mp3.diff 313 RMD160 f07093884500619c6d4c
AUX asterisk-addons-1.2.2-uclibc.diff 569 RMD160 015f80c0efc2fda1b7b7c324f5c94cc90a00494b SHA1 68c380c38f3e7622bc9120e39afc8e34d4aa3cd2 SHA256 bb0a5f2963b88c654091f0fdd2edd1c5f3d29e5173d2d1d1b457046923386a63
AUX asterisk-addons-1.2.3-gentoo-ooh323c.diff 1465 RMD160 b584cb11b208e6a384bdefa47219d0425ded3357 SHA1 3c531e0ffa330e15298249eab7d0319ef0acdcd0 SHA256 2d661f6d051326d9cdb48bb02c08f27de6c0c001cfffae0afeaf5ca5672e2a47
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 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 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
-MISC ChangeLog 3635 RMD160 92a140ce62791b00d018919ba3d80c818e9df5e0 SHA1 a53086abcce28262e027857e6c1378ab0ad852ef SHA256 6d2178380bc6d2e2e69300d7218e4cb89a142fde0d8f500c5a59095b5d817691
+EBUILD asterisk-addons-1.6.1.1.ebuild 1065 RMD160 781c5a0a07cee5e793376f09edaffbf089808106 SHA1 635c6e1720442cd72b7b216fa0811f7a0a7eb554 SHA256 163da204a063e8910140d27e41e2ed60415c7061d0677c72dc6e853c3033dbf3
+MISC ChangeLog 3898 RMD160 4b5828eda502aae1625af2500841220552259b75 SHA1 e590965f60ee71a01c585f5d263c5411e3507f58 SHA256 beac9068b347af50b3b8b0410b6f954f3583f23412dd11ce866a52bcc901a0eb
MISC metadata.xml 347 RMD160 500132e360b39cc8f2a4c2763e242d700df81467 SHA1 dbbf70e51895671da71c708ed95f4d049adea12b SHA256 ecf7b68234022ca3ad594155e153417bf2d9aae54c18ff067ccc8f4db0e4e19a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkn7GLYACgkQp5vW4rUFj5qKxwCdEd94yM904itU/a2B4tgZWoZB
-D5MAoLA5LfIa+POtvl2eqrNFkir39/cb
-=nC/Q
+iEYEARECAAYFAkqqfSMACgkQp5vW4rUFj5q9LgCgiKzD/aGuTueT+QfdacD4jKrg
+o7QAn3hMX23tEiF4RPahJr8EhqOXSwNH
+=Vxni
-----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk-addons/asterisk-addons-1.6.1.1.ebuild b/net-misc/asterisk-addons/asterisk-addons-1.6.1.1.ebuild
new file mode 100644
index 000000000000..74e292824661
--- /dev/null
+++ b/net-misc/asterisk-addons/asterisk-addons-1.6.1.1.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.1.ebuild,v 1.1 2009/09/11 16:39:52 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.6"
+
+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.1-parallel-make.diff b/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-parallel-make.diff
new file mode 100644
index 000000000000..6f2b5ec89ec1
--- /dev/null
+++ b/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-parallel-make.diff
@@ -0,0 +1,62 @@
+diff -uNr asterisk-addons-1.6.1.1.ORIG/Makefile asterisk-addons-1.6.1.1/Makefile
+--- asterisk-addons-1.6.1.1.ORIG/Makefile 2009-09-11 17:28:37.000000000 +0100
++++ asterisk-addons-1.6.1.1/Makefile 2009-09-11 17:30:41.000000000 +0100
+@@ -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.1-uclibc.diff b/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-uclibc.diff
new file mode 100644
index 000000000000..836fffa11587
--- /dev/null
+++ b/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-uclibc.diff
@@ -0,0 +1,55 @@
+diff -uNr asterisk-addons-1.6.1.1.ORIG/cdr/cdr_addon_mysql.c asterisk-addons-1.6.1.1/cdr/cdr_addon_mysql.c
+--- asterisk-addons-1.6.1.1.ORIG/cdr/cdr_addon_mysql.c 2009-09-11 17:14:31.000000000 +0100
++++ asterisk-addons-1.6.1.1/cdr/cdr_addon_mysql.c 2009-09-11 17:16:18.000000000 +0100
+@@ -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.1.ORIG/res/res_config_mysql.c asterisk-addons-1.6.1.1/res/res_config_mysql.c
+--- asterisk-addons-1.6.1.1.ORIG/res/res_config_mysql.c 2009-09-11 17:14:31.000000000 +0100
++++ asterisk-addons-1.6.1.1/res/res_config_mysql.c 2009-09-11 17:18:27.000000000 +0100
+@@ -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>