summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/asterisk')
-rw-r--r--net-misc/asterisk/ChangeLog7
-rw-r--r--net-misc/asterisk/asterisk-11.13.1.ebuild10
-rw-r--r--net-misc/asterisk/asterisk-12.6.1.ebuild10
3 files changed, 16 insertions, 11 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 0ad7fa35b731..b91745a4ba3d 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/asterisk
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.501 2014/10/21 16:13:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.502 2014/11/02 09:04:31 swift Exp $
+
+ 02 Nov 2014; Sven Vermeulen <swift@gentoo.org> asterisk-11.13.1.ebuild,
+ asterisk-12.6.1.ebuild:
+ Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+ #527698)
21 Oct 2014; Tony Vroon <chainsaw@gentoo.org> -asterisk-11.12.1.ebuild:
Remove vulnerable ebuilds now that stabilisation is complete. For security
diff --git a/net-misc/asterisk/asterisk-11.13.1.ebuild b/net-misc/asterisk/asterisk-11.13.1.ebuild
index d6b8fff935ac..5bd081c56ba1 100644
--- a/net-misc/asterisk/asterisk-11.13.1.ebuild
+++ b/net-misc/asterisk/asterisk-11.13.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.13.1.ebuild,v 1.3 2014/10/21 12:44:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.13.1.ebuild,v 1.4 2014/11/02 09:04:31 swift Exp $
EAPI=5
inherit autotools base eutils linux-info multilib user
@@ -30,7 +30,7 @@ REQUIRED_USE="gtalk? ( jabber )
EPATCH_SUFFIX="patch"
PATCHES=( "${WORKDIR}/asterisk-patchset" )
-RDEPEND="dev-db/sqlite:3
+CDEPEND="dev-db/sqlite:3
dev-libs/popt
dev-libs/libxml2
dev-libs/openssl
@@ -62,21 +62,21 @@ RDEPEND="dev-db/sqlite:3
portaudio? ( media-libs/portaudio )
postgres? ( dev-db/postgresql-base )
radius? ( net-dialup/radiusclient-ng )
- selinux? ( sec-policy/selinux-asterisk )
snmp? ( net-analyzer/net-snmp )
span? ( media-libs/spandsp )
speex? ( media-libs/speex )
srtp? ( net-libs/libsrtp )
vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
!net-libs/openh323
!net-libs/pjsip
voicemail_storage_imap? ( virtual/imap-c-client )
virtual/pkgconfig
"
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-asterisk )
syslog? ( virtual/logger )"
PDEPEND="net-misc/asterisk-core-sounds
diff --git a/net-misc/asterisk/asterisk-12.6.1.ebuild b/net-misc/asterisk/asterisk-12.6.1.ebuild
index 853e9ec3680d..0af6093632e6 100644
--- a/net-misc/asterisk/asterisk-12.6.1.ebuild
+++ b/net-misc/asterisk/asterisk-12.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-12.6.1.ebuild,v 1.1 2014/10/21 09:41:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-12.6.1.ebuild,v 1.2 2014/11/02 09:04:31 swift Exp $
EAPI=5
inherit autotools base eutils linux-info multilib user
@@ -30,7 +30,7 @@ REQUIRED_USE="gtalk? ( jabber )
EPATCH_SUFFIX="patch"
PATCHES=( "${WORKDIR}/asterisk-patchset" )
-RDEPEND="dev-db/sqlite:3
+CDEPEND="dev-db/sqlite:3
dev-libs/popt
dev-libs/jansson
dev-libs/libxml2
@@ -63,21 +63,21 @@ RDEPEND="dev-db/sqlite:3
portaudio? ( media-libs/portaudio )
postgres? ( dev-db/postgresql-base )
radius? ( net-dialup/radiusclient-ng )
- selinux? ( sec-policy/selinux-asterisk )
snmp? ( net-analyzer/net-snmp )
span? ( media-libs/spandsp )
speex? ( media-libs/speex )
srtp? ( net-libs/libsrtp )
vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
!net-libs/openh323
!net-libs/pjsip
voicemail_storage_imap? ( virtual/imap-c-client )
virtual/pkgconfig
"
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-asterisk )
syslog? ( virtual/logger )"
PDEPEND="net-misc/asterisk-core-sounds