summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Knoblich <stkn@gentoo.org>2005-12-20 21:11:53 +0000
committerStefan Knoblich <stkn@gentoo.org>2005-12-20 21:11:53 +0000
commit0dd3fcbd028f7e0cfb2825a32da5ab9b2d53ee03 (patch)
tree11c0cb04d865f33ab8a4b43e3a3917bed82f6ae7 /net-misc/asterisk
parentTesting the libstdc++ virtual before marking it stable. Then we can remove i... (diff)
downloadgentoo-2-0dd3fcbd028f7e0cfb2825a32da5ab9b2d53ee03.tar.gz
gentoo-2-0dd3fcbd028f7e0cfb2825a32da5ab9b2d53ee03.tar.bz2
gentoo-2-0dd3fcbd028f7e0cfb2825a32da5ab9b2d53ee03.zip
Fixed to compile on uclibc systems, added capi to use deps of initscript.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-misc/asterisk')
-rw-r--r--net-misc/asterisk/ChangeLog8
-rw-r--r--net-misc/asterisk/asterisk-1.2.1.ebuild3
-rw-r--r--net-misc/asterisk/files/1.0.0/asterisk.rc6.sec4
-rw-r--r--net-misc/asterisk/files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff11
4 files changed, 22 insertions, 4 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 94e42789b0a5..af10663bfa90 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,12 @@
# 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.97 2005/12/17 17:45:00 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.98 2005/12/20 21:11:53 stkn Exp $
+
+ 20 Dec 2005; Stefan Knoblich <stkn@gentoo.org>
+ +files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff,
+ files/1.0.0/asterisk.rc6.sec, asterisk-1.2.1.ebuild:
+ Fixed to compile on uclibc where getloadavg is not available,
+ added capi to use dependencies of the initscript.
*asterisk-1.2.1 (17 Dec 2005)
diff --git a/net-misc/asterisk/asterisk-1.2.1.ebuild b/net-misc/asterisk/asterisk-1.2.1.ebuild
index a32b6a654db6..0a74796f45ce 100644
--- a/net-misc/asterisk/asterisk-1.2.1.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.1.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.2.1.ebuild,v 1.1 2005/12/17 17:45:00 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.1.ebuild,v 1.2 2005/12/20 21:11:53 stkn Exp $
inherit eutils
@@ -139,6 +139,7 @@ src_unpack() {
if use elibc_uclibc; then
einfo "Patching asterisk for uclibc..."
epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
+ epatch ${FILESDIR}/1.2.0/${PN}-1.2.1-uclibc-getloadavg.diff
fi
#
diff --git a/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec b/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec
index a91af5de85eb..5e29792351ff 100644
--- a/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec
+++ b/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec
@@ -1,11 +1,11 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec,v 1.4 2005/08/24 21:13:56 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec,v 1.5 2005/12/20 21:11:53 stkn Exp $
depend() {
need net
- use zaptel mysql postgresql
+ use zaptel mysql postgresql capi
}
start() {
diff --git a/net-misc/asterisk/files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff b/net-misc/asterisk/files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff
new file mode 100644
index 000000000000..370ccc970923
--- /dev/null
+++ b/net-misc/asterisk/files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff
@@ -0,0 +1,11 @@
+--- asterisk-1.2.1/include/asterisk/compat.h.orig 2005-12-20 23:04:56 +0000
++++ asterisk-1.2.1/include/asterisk/compat.h 2005-12-20 23:05:19 +0000
+@@ -74,7 +74,7 @@
+ #define HAVE_VASPRINTF
+ #define HAVE_STRTOQ
+
+-#ifdef _BSD_SOURCE
++#if defined(_BSD_SOURCE) && !defined(__UCLIBC__)
+ #define HAVE_GETLOADAVG
+ #endif
+