Additional resilience against invalid (ao2) object references. FORTIFY_SOURCE fix now upstream. Modify permissions to suit a multi-daemon setup as per Jaco Kroon in bug #507894.

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

3 files changed, 29 insertions, 27 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index feeebbd7dfe3..a80d1e4b4c98 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,17 @@
 # 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.495 2014/09/20 17:55:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.496 2014/09/29 10:20:16 chainsaw Exp $
+
+*asterisk-11.13.0 (29 Sep 2014)
+
+  29 Sep 2014; Tony Vroon <chainsaw@gentoo.org> +asterisk-11.13.0.ebuild:
+  Additional resilience against invalid (ao2) object references. FORTIFY_SOURCE
+  fix now upstream. Modify permissions to suit a multi-daemon setup as per Jaco
+  Kroon in bug #507894.
+
+  22 Sep 2014; Tony Vroon <chainsaw@gentoo.org> -asterisk-11.10.2.ebuild:
+  Remove vulnerable ebuild for security bug #523216 as stabilisation is
+  complete. 1.8 branch not affected.
 
   20 Sep 2014; Agostino Sarubbo <ago@gentoo.org> asterisk-11.12.1.ebuild:
   Stable for x86, wrt bug #523216
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index b3a1bd77f5cc..6e44e6085aa0 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -16,34 +16,25 @@ AUX 1.8.0/find_call_ids.sh 1078 SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d13
 AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a WHIRLPOOL 8c30be245556b37dd45dd5ff5cf5c3141050f60c3e286631520f8114e167c6bd4f7930be21e57e93fd183ab65dfbd3b95b8e342808870979b67977f3ce189ebf
 DIST asterisk-1.8.28.2.tar.gz 29521616 SHA256 7b3d84a3403fce590377808eaa4b08b6320666ca0e37eba0ad578b66211b13c8 SHA512 e5c47215657060a5c7f358d709f2f136bd60ffd4bf336546119456a5f70d6c1446a9ac29980e6f8a8aff700d3e4b4b196570405d5427cd493fbdf08cd85d455b WHIRLPOOL 95dcfff716161e2ed35cd9bc294480d5fafb607bd2f636ec631f07127c5783656d97904fe8154dd949bb1c9ce135c7874ba9f27b4f16727003b8fbf712eb1d93
 DIST asterisk-1.8.29.0.tar.gz 29538404 SHA256 ab172919adfa94fcf211ea5e9b587aff61d0f507ff958219a9ab777d5cf8ebea SHA512 278acf4ce4046ad48e574e755158510f1855dfe468a116d70af85e6fa37ea80dbefaf8a3e1c810d016d51addd9c6f65cd11287fdc6b05f5f2cd714f58bdecd41 WHIRLPOOL 620d02811e991587b5064a31a1c1a63728a33ccc231a7c2844453b8b14c73ab2f962b9cc23173148bfccdf25a54b0e011cf47f212d071e0c0dc5040109777b04
-DIST asterisk-11.10.2.tar.gz 34846584 SHA256 c86975b00c81898b0500742a59f69e97bd970e657198f95b273ca2dc25431e9e SHA512 5b74902a36dc6abf69c641708442eb25e7ed35e3ef0958acc62db7dc77ee72e1d24c57503439d9bd65fca152268cd43b621e5cbc9aa5800d55619f4d82aad5fd WHIRLPOOL 5fa26f1f8eeba7d077fb83703015547a54cf7b69e5e4417738a109aa702499016a4f02733118d9212eaeadf97ffe375efd843ac7572a5839616250120cbdd4ae
 DIST asterisk-11.12.1.tar.gz 34862194 SHA256 4369a2827cfcf72b32b176206d09ecdfaa4f96e9c5f9306506305591fa61ee60 SHA512 1b899a37d9a8576b68a2832f691289f06a7452a5d198363d4b994a6f9d7b4e54e968a9aa628deeb05f8f723dfbf4a37a0ccc594db39c9e54fcf1b2c700d4a0c0 WHIRLPOOL 764a5e94c4ead54e2f31225137b9e4a8b0fbc05469781c5d4e3b052b1f824a03650fb44b969f96c7009b06a9134f230cb05990329eca07ae81efe0b70e8c5bf9
+DIST asterisk-11.13.0.tar.gz 34966835 SHA256 8c99d4d1008a2ba5e8f727c538fc53430ee15263b75b8acc8b338d182359b65e SHA512 7b159677aa9c534fc8ab7f04546004f4245c2dc80e8bbbd07a3223cf2237c250e907202cb7e352fb9f7c4ff59c22f1889c47e9c4adbf540b1bfdeaf4d80ec4a4 WHIRLPOOL 2b3e9fddc1ea0ea05af2bf07e64368b411b07c0a433d6d76127c0dc7ec41468531fac1b7ed5aa2ba8d4eea50787d2f315beb632383cacd4988abd90b1b938749
 DIST asterisk-12.5.1.tar.gz 56708899 SHA256 e9ed82e6573d7a38892e61bd99d06e40dc93b6e82ec14077f085a07b5cf55651 SHA512 33d82921c1c1c4648bac943c55be148feddf1119e2eff9aa8c832607387222a7aa9624f240bf2161f0a0bc62a79c81cc5b03c82e98256c9969547517c0a89bc3 WHIRLPOOL 7ca710e155e6e0f095d6ffb89a6842fb2b453a3dd581cc46b5ea2e1e03c8a5d7288d32aff79e44848206e3af154dabc78ade84b576eee9839f7cf32d0fc16ed3
 DIST gentoo-asterisk-patchset-1.20.tar.bz2 30799 SHA256 0dec59f2fd19da61eec5b157ca458d2cbe4e77c43e0db62c6e4a58ed51557f9b SHA512 62ae929570129f4046b773a76c763840711771b859aedf7e5c2b1937b34b5a9005230c27ef4fa2f3c7094979206ec4b890c1b6459d18cfae1620b2d7a49fe15d WHIRLPOOL eeaf23f6dfe3b3b2141c9c57e312b8a1c943e78efd5b6ad2e3fdecd9aad68f02e87d0333a7289b20541e2fbecf7afc5b87b1b566db32767323bba8d680313e75
-DIST gentoo-asterisk-patchset-3.11.tar.bz2 6319 SHA256 7f11dc8a8d07c8985fa5ddf6b075f14c91268305aa992f609c6c575d656a6f59 SHA512 ec36b8c3e1b20269da17685127a15d7a701cf81c94d38aab272e2a55eba6caa9df1d5dff059427cfdab494c436f827ccf638634c370b34544677f4c4ce995149 WHIRLPOOL 168ff24881d8fa9002a8a68b37379f69efa42002afb22a8545169ebf351796e623ea345f097ca8a42ec4b9ca6e87f63c9ac114010730f034b6147f8e549c9d92
 DIST gentoo-asterisk-patchset-3.12.tar.bz2 6968 SHA256 6319bedec8709b7d4c14f7546dc92669902916a17548ca4613476e744f4c0d08 SHA512 647dad1b5ef2212e65d6e98c1a1de6571f74c21ed510b2e86b46e84e33a9c7466b08abb0920fbcbce961822682e3a9f8cec83ad137be26ee286911650a3c980d WHIRLPOOL 661a15e1b0ee963c714f86558002178f6783fc906670100377c3cdfa7c352f4aed2669241a78689d12b06297f27d623bbeaa33d4b9bf3256bc4eb340ee312334
+DIST gentoo-asterisk-patchset-3.13.tar.bz2 6321 SHA256 2eb19760f2b2917ff651296a3ab6332e2f087abfa4127d7e3b15d079b65cdf98 SHA512 b0d4f23fe09426dedfc67d2b022388e6c931fa38842ed5436beb3ff4033ce5b83e95d7513bbe3d1def0a98806450713c75b32b7a9211160b12767a8e49f14dde WHIRLPOOL 6e1117a2cad8646551acab72c5436030483fee550bcbfaa6b36745a80896503ce7b20e9c36ee81789331f2b086cf71bc3f213d288d90a189befe4c6a07b9876b
 EBUILD asterisk-1.8.28.2.ebuild 9211 SHA256 2332e7c712fd88d8029646f9c074902205d90cde6cd021a78eb70a4d21555aed SHA512 b9005bfe7905dbfe4ec36d8b3bb750f18c99df0d3a7ac886ee1f27d91776e1fe1925a814d92c9f562031cdd3b4aa47847ebe43a369ffb80fb0efa22422231a30 WHIRLPOOL daca7ffb4a93a84c2ce6a23ae1338e9cfc8f03fa4472d75046b31d63e4ae4920d8e95d825e92a358a75dfdf3b9ba17eba757fbcbc9b5bf87aef747e9a60ed34f
 EBUILD asterisk-1.8.29.0.ebuild 9213 SHA256 006c698aa190f38918c1d3129b73448c1ef83f509e40fc40389e867ea967e6d6 SHA512 e83bb18a859b3151520fb437d8c1939a12ea01c88249808173880e7f0a7495c620cc1a97716b90f5ae4b03bff0e68dc69d1f27f6d7c34bf0fe5267e3c68a02a4 WHIRLPOOL 44e6f31f89a8244a33d44b1275d77dbb5ab73dbc70d76520eb4bda0c9108c60927ed2959d3defaec23130cca1e09153b5cb60f9b95842389990ec6bfb6bfad6a
-EBUILD asterisk-11.10.2.ebuild 9457 SHA256 6ad05ef0b56a00fd36c37e41ccc11f68afa2d200852352c1859ef06c3b2e998d SHA512 165562fbf39d3c301bf75eca594b28dfcedbd635b2a2801401c3a4648777f8a5ace4d7ead981f4ba377517e763a98f618057e12b511df0fb96ee83a52aa7f42f WHIRLPOOL 36bc3e745e9265da5a90b5bd6a2e6559bcd5ff4cb95dd1a83038afa557b1c2880e4d576896070237087fca2fe30945141f431dd83bae0fa82c9e142cd94dcd24
 EBUILD asterisk-11.12.1.ebuild 9451 SHA256 f6e0de17d3d904fe23503f292ff7730aed9f78e4415dec9755a47bc006d32d4c SHA512 22324f991f2f5a7d9f71272f4ab6d117378e07942a8f743810cc186478c6865f36b55a5bc03783982db2adeda39f6bf36240a4b3c156fe59bf73c8c0c3034602 WHIRLPOOL 33a25202c04c2c9e23358aa4227885c18eef19e0b2afb6e84c3e28dd939d0c1159e9c72068b175884e482e67e921bdcf7e0a2cee452a40e3100f4e5ad754f4b6
+EBUILD asterisk-11.13.0.ebuild 9484 SHA256 66d642d3f8a9e2d563126bc3aef9075cd7e952ca3737c0a5875697206084492e SHA512 b47b8c1a9c5a2ab5aab920fa4d39613ac7a943a0f0b2cf4abc8d694ff80e8ddebae39be7ba6576bc914dc2baf4838656c2ad234f809d7720a576a12f2ff96f7f WHIRLPOOL 24832f202119b8cc3e882081dca407f8009dfe0434bddcb754d8dce0dc475e766184a4b02a450db387b46c88d5c72f68d0ff4a5e342e7d062cd104bf7a4cac1e
 EBUILD asterisk-12.5.1.ebuild 9534 SHA256 421b283375bcffd34666a2808b5eccd240515b6347ea7a930263f2213c74ee92 SHA512 eae7f53472606d7b19e64c1330791777cfe1d48166a45f1090eab63baf24ee8829d1b3d94e2d5036279bc8db2e4647a529eac440a4dcaf3d2f683edfad25812b WHIRLPOOL 9dd159ce23f348c795c439b379678b8cade2f77c8ef5958c5d522522e01a092932f0bbca8927563627d663f941d3dc7cc565e344273e73a3d6f74ef4442c1f6c
-MISC ChangeLog 18846 SHA256 704c953495a64a373881e3e5507e311a4f71f72031c58ae0e7db26b1ad27dba3 SHA512 e88de3c34e6d1a0199093b3cdcee7fc2f4723c99d10746fb8d4b2904f79bf9bd15ea219ec0e5b27e376fe4e7f9c40435614a0969c4aa559e5ed7cc1cc89fc568 WHIRLPOOL 754d228bcfea9251074d23329ed00b4d0f55dc4c3dbb3eac17ee39b8d84eb6b17057fa61d795abc7d0022868a93926213c6f4b858e7bdd038fa115478c1d425b
+MISC ChangeLog 19327 SHA256 ad82eaaa7fc420e7e2c22614f3680a82659d363f78b3f4bab69dbd28dc92b40e SHA512 676a54af9e371bdbb7190761638a477da649496c4b3c3cd462c48d882a7a0a59d68311efcfac2d8035f8d86db6b6691cd6e18b32c70da458903856c63b7c506a WHIRLPOOL f3109b91bca5c0cb33923a69257662cd26fba7708b462f5d6efc0f988c2a7340d156d5c4eab5e8776d6c42aa10063e8ece96d139ba8a14f28cbe4f148e34f706
 MISC ChangeLog-2012 113409 SHA256 6beb419f0c2e63641c73f2c14bd0c3a6a319c65bca8be526aa441fac2104fc9c SHA512 08c037acd578b9c3c387a80e45e80a68c4da84e63fced30215f22ec14eb6e223348d8e7d68f4decdf8a2d8cd0933b3f7fa3adddf7cd80bb407498b3e2868d917 WHIRLPOOL be0f2192531f7477545ccc0f10d9a50f36228e8d8d0e2773ccce3799c2d1b5e1b7be70d96502f759c7c878f88efd83122fc9230374c40c8963fe0bc7ff014b87
+MISC asterisk-11.13.0.ebuild.orig 9453 SHA256 6a4883cc56bfe609fcb3c2fcd188a6c7652b9c4173caed2d9f5c7300cd537b6b SHA512 b9671f50cc774b64be674cf5fed38d670821bc84f599fc3ac4c61704bca8be19caf178f62c1d4381140f0090f5280e639a30011d99a683573564d0ab83023644 WHIRLPOOL ae4905202362dab846e8e7b134173d6b4556f9438f7d84b33cc807a2dda111b6bc0d14e208c58a5117f1f9a38e7ee880ad7e988c07da79518ea2133a4387c8df
 MISC metadata.xml 1183 SHA256 f92828f92cf3e0ce3581e031e3ecdc26336481db45fe6ea7b91e79fc3e58032c SHA512 9b00df0793f68988b4b7b2da778b05cd183e663a96c92b5f96ac1e09ba34a96a5155deb0639638e499701e5cf76de6cc6736f757a48608c2accf14e3ff633c14 WHIRLPOOL d5e4bd47714fa34285733f9c3ed2dff0fa65f33daeda7276428e7eaf0cd44ef59351f67f590ecab38305e77b9c3683c368ad764f323f3d9891b3414600aa4211
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUHb+DAAoJELp701BxlEWf478QALO6qg1G4KwX2h7S7LG758ao
-bFxwe1epbB4RWr9xeuPD0QbtuQyT3ugte2Lxub/FaOLPgQ0L2poOeqmFGllAgRUx
-gqZ0bbyQ8AysUYmqw5qDuo647Fzm6cnZ2OHQHBTakG1aNTugi3ksMIDZm5+FDfTa
-ddrBLRIydS7lbS8fxDZTH7/DqVSOSUX4CCx1EYKJhdUMDgz3YYM/JkT5LbHywNXK
-yrkCCdscObscuXDfnHRPYAxxGGi7CeScMWyB+YXDAVoz7u05+icBOJ/bmC7br4KX
-g1AaSueWSmcGO6ODVFB6QYH/8BaZeucWtwJQ4jvXazXyCEWnZSdDdxb/2+Dj3C+M
-ZudJWDQwx3/2HeynTao/EN/BHofMxpTd6g2RcXl1a44jxIdBcTKcgpGG2aNeIQUb
-MTYTVB7QMPuelECprzURoelM4kpUyy2PZyGmDqhglY+rjuMJKhDYUnyytddnMiDn
-4eyYDN21c/PdakI3KZw56y95E24uHwHBI+d7LZIXqOTplGpmvK0cIG2lk43k8iNo
-R7oZp1GON4cl5VHN2MgDqiNF8ryME1BnS1JSBwJng3IE8YMm4TcMb5Ly6u3k/0Tf
-dahbbXPLB5DOZmkM0ebc7SHk4XOgBlhxNt+6QVoMQY5MEaJS4EVOo5TA2mOKSxrv
-Dj9Hb2Xm18MTbLOgZ3hG
-=7wHA
+iEYEAREIAAYFAlQpMm8ACgkQp5vW4rUFj5pbwQCgnR/K8DjLSz0zdePICte+5UkU
+n5gAn1IP6xm43woBmRrOr4VKvld8CZzo
+=5zcP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-11.10.2.ebuild b/net-misc/asterisk/asterisk-11.13.0.ebuild
index 89157b545064..3078c8da14d5 100644
--- a/net-misc/asterisk/asterisk-11.10.2.ebuild
+++ b/net-misc/asterisk/asterisk-11.13.0.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.10.2.ebuild,v 1.4 2014/09/18 10:29:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.13.0.ebuild,v 1.1 2014/09/29 10:20:16 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib user
@@ -10,10 +10,10 @@ 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.11.tar.bz2"
+	 mirror://gentoo/gentoo-asterisk-patchset-3.13.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
@@ -77,8 +77,7 @@ DEPEND="${RDEPEND}
 "
 
 RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )
-"
+	syslog? ( virtual/logger )"
 
 PDEPEND="net-misc/asterisk-core-sounds
 	net-misc/asterisk-extra-sounds
@@ -220,12 +219,14 @@ src_install() {
 		insinto /etc/radiusclient-ng/
 		doins contrib/dictionary.digium
 	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
 	if use samples; then
 		emake DESTDIR="${D}" samples
 		for conffile in "${D}"etc/asterisk/*.*
 		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
+			chown root:root $conffile
+			chmod 0644 $conffile
 		done
 		einfo "Sample files have been installed"
 	else
@@ -238,8 +239,7 @@ src_install() {
 	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
 
 	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
+	diropts -m 0770 -o asterisk asterisk
 	keepdir /var/lib/asterisk
 	keepdir /var/spool/asterisk
 	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}