[gentoo-commits] repo/gentoo:master commit in: profiles/, net-misc/asterisk/

[gentoo-commits] repo/gentoo:master commit in: profiles/, net-misc/asterisk/

[Sam James]

commit:     bd6a1ff0f23197c769b03a420338546523fbd19a
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Fri Jul 17 06:55:50 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 20:39:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6a1ff0

net-misc/asterisk: bring 11 branch in line with 13+16.

* Remove osplookup USE flag.
* Update initd and confd.
* asterisk account to use acct-{user,group}/asterisk.
* asterisk 11 won't compile with openssl-1.1, hard depend on openssl-1.0.
* Update copyright.
* Don't install deprecated tools (use sngrep intead).
* Remove no longer used osplookup local USE from metadata.xml
* Mask it (and associated net-misc/asterisk-g729-11*), since it's EOL
  (Requested by sam <AT> gentoo.org).
* Drop no longer used eutils and multilib eclasses.
* Fix formatting for calendar? *DEPEND.

Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...k-11.25.3.ebuild => asterisk-11.25.3-r1.ebuild} | 39 +++++++++-------------
 net-misc/asterisk/metadata.xml                     |  1 -
 profiles/package.mask                              |  7 ++++
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/net-misc/asterisk/asterisk-11.25.3.ebuild b/net-misc/asterisk/asterisk-11.25.3-r1.ebuild
similarity index 90%
rename from net-misc/asterisk/asterisk-11.25.3.ebuild
rename to net-misc/asterisk/asterisk-11.25.3-r1.ebuild
index dccee3d36f7..fa44fb9d427 100644
--- a/net-misc/asterisk/asterisk-11.25.3.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils linux-info multilib user systemd
+inherit autotools linux-info systemd
 
 MY_P="${PN}-${PV/_/-}"
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
+	mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE="
 	voicemail_storage_odbc
 	voicemail_storage_imap
 "
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
@@ -29,18 +29,22 @@ REQUIRED_USE="gtalk? ( xmpp )
 EPATCH_SUFFIX="patch"
 PATCHES=( "${WORKDIR}/asterisk-patchset" )
 
-CDEPEND="dev-db/sqlite:3
+CDEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
 	dev-libs/popt
 	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0= )
+	!libressl? ( =dev-libs/openssl-1.0*:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sys-libs/ncurses:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
 	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
+	calendar? (
+		dev-libs/iksemel
+		dev-libs/libical
+		net-libs/neon
+	)
 	caps? ( sys-libs/libcap )
 	cluster? ( sys-cluster/corosync )
 	curl? ( net-misc/curl )
@@ -58,7 +62,6 @@ CDEPEND="dev-db/sqlite:3
 	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
 	portaudio? ( media-libs/portaudio )
 	postgres? ( dev-db/postgresql:* )
 	radius? ( net-dialup/freeradius-client )
@@ -91,10 +94,6 @@ pkg_setup() {
 	have reported that this module dropped critical SIP packets in their deployments. You
 	may want to disable it if you see such problems."
 	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
 }
 
 src_prepare() {
@@ -181,7 +180,6 @@ src_configure() {
 	use_select lua			pbx_lua
 	use_select mysql		app_mysql cdr_mysql res_config_mysql
 	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
 	use_select oss			chan_oss
 	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
 	use_select radius		{cdr,cel}_radius
@@ -246,8 +244,8 @@ src_install() {
 	diropts -m 0750 -o asterisk -g asterisk
 	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
 
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
 
 	systemd_dounit "${FILESDIR}"/asterisk.service
 	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
@@ -265,13 +263,6 @@ src_install() {
 		dodoc doc/*.pdf
 	fi
 
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
 	# install logrotate snippet; bug #329281
 	#
 	insinto /etc/logrotate.d

diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 25d257dff35..d19226fb19d 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="http">Enable embedded web server</flag>
 		<flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
 		<flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
-		<flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag>
 		<flag name="pjproject">Enable support for pjproject (pjsip)</flag>
 		<flag name="samples">Install sample sound and configuration files (default: on)</flag>
 		<flag name="span">Enable support for the spandsp codec</flag>

diff --git a/profiles/package.mask b/profiles/package.mask
index 801e2684ed0..80620531085 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -44,6 +44,13 @@ dev-ruby/i18n:0.9
 dev-ruby/net-ssh:4
 dev-ruby/zeitwerk:1
 
+# Jaco Kroon <jaco@uls.co.za> (2020-07-19)
+# Asterisk 11 is EOL.  All users should migrate to asterisk 13.
+# Removal unspecified, will remain for the foreseeable future.  If you need
+# help migrating, contact jkroon in #gentoo-voip on freenode.
+=net-misc/asterisk-11*
+=net-misc/asterisk-g729-11*
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-07-19)
 # Unmaintained upstream and broken by ECM 5.72.0, masked for removal in 30 days.
 media-video/plasma-mediacenter