Regression fix by Jaco Kroon closes bug #374195. If you set DAHDI channel variables from your dial plan and this stopped working in 1.6.2.19; this is for you.

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

3 files changed, 239 insertions, 5 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 9fa9cc6ee5c5..38e653899781 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.330 2011/07/04 14:59:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.331 2011/07/06 09:13:18 chainsaw Exp $
+
+*asterisk-1.6.2.19-r2 (06 Jul 2011)
+
+  06 Jul 2011; Tony Vroon <chainsaw@gentoo.org> +asterisk-1.6.2.19-r2.ebuild:
+  Regression fix by Jaco Kroon closes bug #374195. If you set DAHDI channel
+  variables from your dial plan and this stopped working in 1.6.2.19; this is
+  for you.
 
 *asterisk-1.8.4.4-r1 (04 Jul 2011)
 *asterisk-1.6.2.19-r1 (04 Jul 2011)
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index f59098669fe5..428c49a29bf8 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -15,15 +15,17 @@ DIST asterisk-1.8.4.4.tar.gz 27326189 RMD160 c95cab1b24547f1abd229dcf323cc7ed0b0
 DIST gentoo-asterisk-patchset-0.1.tar.bz2 5394 RMD160 bfd546101c77f6e6989c406bfb202e592f9d16fd SHA1 e49b7784f987e027d833fbe8e0773acb1ef78521 SHA256 07c1bc6a29bda4fa98e7d1eb436d2e6eafc13263b774a0ff41698e523fa59a97
 DIST gentoo-asterisk-patchset-0.5.tar.bz2 6790 RMD160 ce738a36248b974d707ef748314e160acccd6ddb SHA1 4b6ae9e6e1529237fe4fe5d313440be741921d8e SHA256 258cbc3b81019b99bfe4b12888ed181ab142ca6d21ad61eae3d032c3617a7a79
 DIST gentoo-asterisk-patchset-0.6.tar.bz2 5115 RMD160 becb32155e126933d3e04aa1ffe6e822f7aed152 SHA1 0d7aa220afa66d88dc54da95de41e221afce4d9a SHA256 8367b43024725b257c9abfe518f09bc9c531727dff73782a5f839c369c54fb92
+DIST gentoo-asterisk-patchset-0.7.tar.bz2 6278 RMD160 048a7810c2b8e4ba1613adfd438fd8727e3db210 SHA1 6e0c17b703ea367fb6cf94456c4766ebfd4159fb SHA256 4be86e7500e9e1a2ceefa93df8b6c1bf9ce0fecacfee279241da1c681f365001
 EBUILD asterisk-1.6.2.18.2.ebuild 5823 RMD160 b7e7cf1d93d72661ca507cf0dae717ef348302d5 SHA1 85c8c98fc1da48d2d1437b5b83e87b31474fbfca SHA256 0b7af62d8a7056926e39733a78e391566f21c28c63a59e26f0459d386dde106b
 EBUILD asterisk-1.6.2.19-r1.ebuild 5828 RMD160 d3b67c872da7f9ae149f8cd9d8966c165a079e3d SHA1 4c1b7c925c72c40788ebf666f730898910580ab4 SHA256 483e0247f51aff216ad12f1bb8c556b053012cc241ec30f29c7c8ab5f9f7bba4
+EBUILD asterisk-1.6.2.19-r2.ebuild 5828 RMD160 70d8188d88d2269e19567797211a626d3bfea8cc SHA1 9dd8be33d74955e5beef90a86cd268d397e46ca2 SHA256 c046df182c099451102d61bd095af7b3f5b01c093afd36c7ab1932bd8c05f01f
 EBUILD asterisk-1.8.4.4-r1.ebuild 14632 RMD160 0492acdd869b59f3c6f1a0efb7e9168d24b2231e SHA1 8c68dec416669bc0d5f9675288743294d30538cd SHA256 99c30aec8a536d63e192d5949828e77050ad3a8a7c2777e77a3106c887e476a3
-MISC ChangeLog 83434 RMD160 362fa789983364663a077affa49bff4d10d32ad3 SHA1 067372cb4690927c6b23ce63f2aa43d5969c4680 SHA256 a05ce97307e4f80b15f008584279affce1bc308dc203bfabd62a49bd82e2b1dc
+MISC ChangeLog 83715 RMD160 2e1215ce2592aa909fbaec820c600fa485ba3891 SHA1 9acfd5f552b1a7d096f0d1be02aba1d721a70ac8 SHA256 7061328c8756f44ae4215d8771edc0bc0ad4c1a540749cdc687051c30ee80605
 MISC metadata.xml 1104 RMD160 5b90405c685bc1c0ee173b3024afab5bc849bf40 SHA1 bf76dd265acf32efba9e4e8189ae154a4b9ebd40 SHA256 17e96f326cd60399fb217025567ae4c80f1b9b12418f1bf5b41c8fa4c49598ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4R1VkACgkQp5vW4rUFj5pD6wCgltB6RAaVjC1OUN4499NaCXZj
-ZXUAn3cbvvaohz+Vjitl6YQORoeag2ym
-=RFhk
+iEYEARECAAYFAk4UJyUACgkQp5vW4rUFj5oWjACeOulxVHKTXrISM1S0kvPJ/Fyc
+4tAAn0zjGUkejRrmoG2L6JIsqHjbLtaH
+=hT78
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.6.2.19-r2.ebuild b/net-misc/asterisk/asterisk-1.6.2.19-r2.ebuild
new file mode 100644
index 000000000000..42fe20435ef0
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.6.2.19-r2.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.19-r2.ebuild,v 1.1 2011/07/06 09:13:18 chainsaw Exp $
+
+EAPI=3
+inherit autotools base eutils linux-info multilib
+
+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-0.7.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa +caps dahdi doc freetds iconv jabber ldap lua newt +samples oss postgres radius snmp span speex ssl sqlite vorbis"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+RDEPEND="sys-libs/ncurses
+	dev-libs/popt
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	caps? ( sys-libs/libcap )
+	dahdi? ( >=net-libs/libpri-1.4.7
+		>=net-misc/dahdi-tools-2.4.1 )
+	freetds? ( dev-db/freetds )
+	iconv? ( virtual/libiconv )
+	jabber? ( dev-libs/iksemel )
+	ldap?	( net-nds/openldap )
+	lua? ( dev-lang/lua )
+	newt? ( dev-libs/newt )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	!<net-misc/asterisk-addons-1.6
+	!net-misc/asterisk-chan_unistim
+	!net-misc/zaptel"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	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() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		$(use_with alsa asound) \
+		$(use_with caps cap) \
+		$(use_with dahdi pri) \
+		$(use_with dahdi tonezone) \
+		$(use_with dahdi) \
+		$(use_with freetds tds) \
+		$(use_with iconv) \
+		$(use_with jabber iksemel) \
+		$(use_with lua) \
+		$(use_with newt) \
+		$(use_with oss) \
+		$(use_with postgres) \
+		$(use_with radius) \
+		$(use_with snmp netsnmp) \
+		$(use_with span spandsp) \
+		$(use_with speex) \
+		$(use_with speex speexdsp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl crypto) \
+		$(use_with ssl) \
+		$(use_with vorbis ogg) \
+		$(use_with vorbis) || die "econf failed"
+
+	#
+	# blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound).
+	#
+	>"${S}"/sounds/sounds.xml
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake || die "emake failed"
+}
+
+src_install() {
+	# setup directory structure
+	#
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use samples; then
+		emake DESTDIR="${D}" samples || die "emake samples failed"
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/*
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-*
+		rm -f  "${D}"var/lib/asterisk/agi-bin/*
+		rm -f  "${D}"etc/asterisk/*
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/run/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.6.2/asterisk.initd3 asterisk
+	newconfd "${FILESDIR}"/1.6.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+		dodoc doc/PEERING
+		dodoc doc/CODING-GUIDELINES
+		dodoc doc/tex/*.pdf
+	fi
+
+	# install snmp mib files
+	#
+	if use snmp
+	then
+		insinto /usr/share/snmp/mibs/
+		doins doc/digium-mib.txt doc/asterisk-mib.txt
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.6.2/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.6.2/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	einfo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	einfo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	einfo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}