Install the provided radius dictionary, closes bug #383911 by Oleg Gawriloff. Close...

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

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 051ac03de4a9f137edebb85ca7454210498ce5ad..b6a7f09d07479d450de39067131af91f58b06d6a 100644 (file)
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,14 @@
 # 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.348 2011/10/11 15:22:21 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.349 2011/10/12 09:25:53 chainsaw Exp $
+
+*asterisk-1.8.7.0-r1 (12 Oct 2011)
+
+  12 Oct 2011; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.8.7.0_rc2.ebuild,
+  +asterisk-1.8.7.0-r1.ebuild:
+  Install the provided radius dictionary, closes bug #383911 by Oleg Gawriloff.
+  Close manager file descriptors once, not twice as per Jaco Kroon in bug
+  #386633. Remove release candidate now that the final release is available.
 
   11 Oct 2011; Tony Vroon <chainsaw@gentoo.org> metadata.xml:
   Drop now unused h323 local USE-flag description.

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 48d0bc551d926cec607d1c72ecffbbe04f4db7f0..308a12109b8259a951045ccb29693503d8f9b567 100644 (file)
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -13,21 +13,21 @@ AUX 1.8.0/asterisk.confd 2203 RMD160 00d92671d00ff495d1651ec064fec8c790f94f6c SH
 AUX 1.8.0/asterisk.initd 6511 RMD160 183128f493953a1dc9241e2966398c6e5f3e1365 SHA1 13ff4c28dc86d5bd534b43b2b08763f8ec19baa1 SHA256 88028e2c8cf78414725697c2121bbb861a18869f7675d4b814fcb8fecfe71586
 DIST asterisk-1.8.5.0.tar.gz 27417584 RMD160 c841993f914bd150696b9163a1cc1d1828f45e4a SHA1 9e29581deea773c2537f5c01a43823211688412a SHA256 5c4601c0dab2c94a3dc37cab5d55af8eab67765a31eb8aed7321dd98e7c62a46
 DIST asterisk-1.8.6.0.tar.gz 27753713 RMD160 687a3668f2fd6e1005d32b85ab33250832049a21 SHA1 65f1a43b0ed7b3df4536cc63e5e79f631f302eff SHA256 dd6a489a8d89a147a18e5b7ee74eb44835459a7bd14786b8a114f3052066636b
-DIST asterisk-1.8.7.0-rc2.tar.gz 27812714 RMD160 b3385ca0d75edfb5112d39892b43b899fd545a75 SHA1 133c285fc6db8f4ae4cfbb293d3a4f37a7b73f9b SHA256 ab40404460f3ef8a9c6eed88d0b3d56d4f4ad902447446de0bdcf7f7f146c021
 DIST asterisk-1.8.7.0.tar.gz 27828568 RMD160 84b7e2f49e1dc78c32649cc0786e6fea1bd2c9b5 SHA1 e28ad2f52a227acc7ec6d6952f3fd41baecd6292 SHA256 645e0f53982bef36ded2108e11fbd508fc6beb2704e5c6c434f7ba8369ec8ce8
 DIST gentoo-asterisk-patchset-1.1.tar.bz2 11344 RMD160 b4bf8aefd32a1a3359f5056c4df0d86818ec68c1 SHA1 65e8d104d270438f104022e9782033e525577430 SHA256 41d9939d02db41d82140008a31945bb95c346bed6b451166b2d28974ed9d6fe8
 DIST gentoo-asterisk-patchset-1.2.tar.bz2 10624 RMD160 749a14b673d9df07f36f4aebcf9fdd85ff69b579 SHA1 607d28d62f77d5b4b17c0cc436b45b7a1aa196e1 SHA256 591618545dc20f08faf57bacca9457c18cc845bd38e3e6cfe403b2802efeeb44
 DIST gentoo-asterisk-patchset-1.3.tar.bz2 31009 RMD160 662690c0e07e3f5c6df9f67833db5b33e5877c89 SHA1 291ae0b75c15d6a745691749190944167685c381 SHA256 2bf6d123f5179e98954bbba70d5fc568be3c66cafdb541be7d587fc685b13980
+DIST gentoo-asterisk-patchset-1.4.tar.bz2 31078 RMD160 3e24de735eb1754951708cd23e73ad125b9f626b SHA1 ed725bceb74ca1cf961a2e97fe12e89eb66b1719 SHA256 315a3878d3c591030b73d9796e0264f924ef5bde51ee682dc011974bf91b6630
 EBUILD asterisk-1.8.5.0-r3.ebuild 14445 RMD160 cca622af8028e63a713a7f348fe20dfa43b1bd57 SHA1 ca2a2cb18deb3297f6762ef09e182db18b654292 SHA256 29e012a50c295baa0bacf81bdf08dea731493bff77e334eed429aa3de24c21b4
 EBUILD asterisk-1.8.6.0.ebuild 14332 RMD160 fa6cbc36d3679458e4ebda8a2eb2b3c62e239dc4 SHA1 35556b0c684f57bed4d08fcecf975e80c614a3fc SHA256 6f117ef1228648365c4ffb2b0210558f03e3719106ac170e4eaee589ac54f214
+EBUILD asterisk-1.8.7.0-r1.ebuild 14426 RMD160 96587424396f425ef8b693864eb2d00509b4104e SHA1 db6cf12809b180f94ca1aa84e76f308df121a7d0 SHA256 5728247d05b9f9944a595684cc9b62c7069c26699038d045131f3b8d7c201b41
 EBUILD asterisk-1.8.7.0.ebuild 14332 RMD160 aebd2b6d8fc9f847a9e5974c1824be7bf51f337e SHA1 b4821313d1c2337c43e95e447e56ca6d626b5750 SHA256 887d10f52667a4535faf646757085ce0f17607439a4ec2a1e30f129ec3b1eafe
-EBUILD asterisk-1.8.7.0_rc2.ebuild 14336 RMD160 ed98e8ece3575af5a4035b72ede2bd6f20876951 SHA1 9c47af94188f9e5570a169ea42377e8b2cf451bf SHA256 30c2cae5e1a4ebe20762ce9cc1b2b8f29e53b05fc993b88f132326d32822c09c
-MISC ChangeLog 88020 RMD160 d986038005e01c4c1202a6cee3eb7931b5846179 SHA1 3a78c6063a7dd9e0c251dce210a83d410ec321e2 SHA256 fb76f9f969223913db857a77a49eb851a6db6e3484b23535bfa4bfd680e416c8
+MISC ChangeLog 88397 RMD160 b53bacc0bda703e45d6d02dbd9db0c7002b000f8 SHA1 f59fd2bf29fde44c8d446d5f8b76be29fffb0425 SHA256 925377aa0b82ac381e6bea397b6d268c73365472f60be1f73dd6c6a228a668f2
 MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6UXzwACgkQp5vW4rUFj5oJvgCcDbco+rsBwc0ToI51ws6AldiX
-EPYAmgMs0A28ShOgvN2z6uSEaidswy1m
-=k93K
+iEYEARECAAYFAk6VXTAACgkQp5vW4rUFj5qVcgCeIZXOKbWDWem9CLZfKUuY29UO
+haoAn24NW78a0q5tODBh8Jh00CGH4ECs
+=pww3
 -----END PGP SIGNATURE-----

diff --git a/net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild b/net-misc/asterisk/asterisk-1.8.7.0-r1.ebuild
similarity index 98%
rename from net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild
rename to net-misc/asterisk/asterisk-1.8.7.0-r1.ebuild
index e8dae4f9d222672a10e5b3ec51eea739e35079e4..55599a1f433ef1da2b6d92c0d7fba83133311272 100644 (file)
--- a/net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.8.7.0_rc2.ebuild,v 1.2 2011/10/11 15:20:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.7.0-r1.ebuild,v 1.1 2011/10/12 09:25:53 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -10,7 +10,7 @@ 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/${MY_P}.tar.gz
-        mirror://gentoo/gentoo-asterisk-patchset-1.3.tar.bz2"
+        mirror://gentoo/gentoo-asterisk-patchset-1.4.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -325,6 +325,10 @@ src_install() {
        emake DESTDIR="${D}" installdirs
        emake DESTDIR="${D}" install
 
+       if use radius; then
+               insinto /etc/radiusclient-ng/
+               doins contrib/dictionary.digium
+       fi
        if use samples; then
                emake DESTDIR="${D}" samples
                for conffile in "${D}"etc/asterisk/*.*