Version bump, closes bug #268017 by Michael Higgins. Please note that this is another branch of Asterisk development, namely the 1.6.1.0 branch. Courtesy notice, chan_sccp2 is not currently compatible with this. Patches ported, old ebuild removed. Masked as before.

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

3 files changed, 42 insertions, 12 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 3133c9e4d825..98a8fcc33f17 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-misc/asterisk
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.200 2009/04/21 18:38:57 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.201 2009/05/11 13:56:42 chainsaw Exp $
+
+*asterisk-1.6.1.0 (11 May 2009)
+
+  11 May 2009; <chainsaw@gentoo.org> -asterisk-1.6.0.8.ebuild,
+  +asterisk-1.6.1.0.ebuild, +files/1.6.1/asterisk-1.6.1-gsm-pic.patch,
+  +files/1.6.1/asterisk-1.6.1-imap-kerberos.patch,
+  +files/1.6.1/asterisk-1.6.1-parallelmake.patch,
+  +files/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch,
+  +files/1.6.1/asterisk-1.6.1-uclibc.patch,
+  +files/1.6.1/asterisk-1.6.1-var_rundir.patch:
+  Version bump, closes bug #268017 by Michael Higgins. Please note that this
+  is another branch of Asterisk development, namely the 1.6.1.0 branch.
+  Courtesy notice, chan_sccp2 is not currently compatible with this. Patches
+  ported, old ebuild removed. Masked as before.
 
   21 Apr 2009; Raúl Porcel <armin76@gentoo.org> asterisk-1.2.32.ebuild:
   alpha/sparc stable wrt #237476
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index d194adbb3dce..cf08d77274d1 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.0/asterisk-1.0.5-uclibc-dns.diff 304 RMD160 6d58a0fdad04f5105c1b8f8bb3e2058b4f97f12f SHA1 5f7819a1e5f5b8f035146d5506bab83f4ecb6ae0 SHA256 e4de36e528b7d1a7941689d530d93f1ffd41a2f863a856e612e3637f78ea4890
 AUX 1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317 RMD160 f598d94a52cec83fefdafdce0694049c657e09e0 SHA1 fc0f4d990e386d39d43bac073f353421063186c9 SHA256 61daa70727418dbaf232fc5d1eaddd20a8505b943b8fb724a1b63170edfe88cc
 AUX 1.2.0/asterisk-1.2.21.1-h323-dumb-makefile.diff 1098 RMD160 c39cee5a6f420e6e63e30ac5e83aa9b78c1b12c8 SHA1 93087ecdcde11bd983d25acaac3723450abbc111 SHA256 86d0c8cd754754916c45d77d9c745d1688b3b7b54181ecb1d42a1934bdea7deb
@@ -18,15 +21,28 @@ AUX 1.6.0/asterisk-1.6.0.6-parallelmake.patch 4952 RMD160 d57a16f8c9c783acf83c1c
 AUX 1.6.0/asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch 726 RMD160 c1886f3462e175ef66ebcfaba626fc110a228301 SHA1 3f9443575c459bd2808472e7cb053c34cdc32f26 SHA256 ddced0af87ea654e5576ea1b95994ccd4ea8d535f7e55db1a1f0c5c495029923
 AUX 1.6.0/asterisk.confd 2204 RMD160 31bceebfa535e97cb2634e313678cc42186d4750 SHA1 748c623cea238cd9b322672d5ebcfe214a4f0463 SHA256 daec84c58e0ef6cbd71a6fc62cb83129b1bcffdfdd619ebbd62a642f0cd1eee7
 AUX 1.6.0/asterisk.rc6 5891 RMD160 55a2cd4c5d2e069c4cabb5e8864870467608197c SHA1 d8d2e39ed2aa658a008103dc9655255a78e5796c SHA256 d8dbe6d0d0cc8a17c641a02e248c77107d298684fe3bdbfd87324bbe26e35979
+AUX 1.6.1/asterisk-1.6.1-gsm-pic.patch 1990 RMD160 6e17a76a70938f8d371b7e6efe44d70d2b622cd3 SHA1 c5a3c2ae1af31e60a45a6069c00f432dcafaf1a7 SHA256 c0b774b95f785fb35e1cbc44945fc4debeeb3e338ec49501a7ac64a87307e4df
+AUX 1.6.1/asterisk-1.6.1-imap-kerberos.patch 747 RMD160 eacde011d0037b2214819954e620d4904f851bdc SHA1 694058c71a566d0cf8c2ecfc2c28b6991c4697f0 SHA256 d61f31a8a0460a4c102c7c4dd14fcee5cae87dc7cdd68b6e50f42d05f927f580
+AUX 1.6.1/asterisk-1.6.1-parallelmake.patch 4814 RMD160 ecc9c6386c8af707d7353b33f91b78658bf8e2e9 SHA1 6899f6a09a29ec23b7ac7e0c734124d3c55ceeba SHA256 917f04a8e5430fe33f65a8cf9a1830851cde73634b17f87bd84fc2dbebb14a68
+AUX 1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch 726 RMD160 c1886f3462e175ef66ebcfaba626fc110a228301 SHA1 3f9443575c459bd2808472e7cb053c34cdc32f26 SHA256 ddced0af87ea654e5576ea1b95994ccd4ea8d535f7e55db1a1f0c5c495029923
+AUX 1.6.1/asterisk-1.6.1-uclibc.patch 373 RMD160 08f18dd2af3736497995ebcbea84939ae4c4cc98 SHA1 b10884d4b9123800f62b4aabac5a93b1a110e3da SHA256 b6fe54def0ab3f90058c2ed7bd288dd21c96aaf88b9028f12d223fb31d7e41c5
+AUX 1.6.1/asterisk-1.6.1-var_rundir.patch 441 RMD160 55869a82a01be38e80da9a31faac6d2d03f0fc58 SHA1 5bf2a8ed9778623f611330fcc4ea75c50f642680 SHA256 f75156feb6a6e421fc83e2d518b4b9204e4ae11e802440576a54de226ffd8064
 DIST asterisk-1.2.27-patches-1.0.tar.bz2 6653 RMD160 18f1d7fc4497466050ed4f517ff5732eb448ff2e SHA1 2aecd3e91cde38dbb0fd591e8a49db221f44b94e SHA256 a4da0570fca2df3c508f072be62722879956fe8c454027fbb8dafb7a6095384c
 DIST asterisk-1.2.31.1.tar.gz 10632376 RMD160 b38d7204bd24fcc70e02659f16c6506f9ec5a3df SHA1 aea8f0a8a3ffb2c150b4c719a3671c4049cb03ab SHA256 7962e10aeed737db040a5dbfaf6cab6db2cd7f0cb0a4e985fdb7321431f2cee4
 DIST asterisk-1.2.32.tar.gz 10636564 RMD160 2d83e006e5f4e8f03862d188525df665396d1074 SHA1 6e35e57939f0e895dd320a9637dd8c9050889b5d SHA256 0019c23bb888a7c8d5a034174f1700a1608883770ec48d6cb69dfae9aee12652
-DIST asterisk-1.6.0.8.tar.gz 13214910 RMD160 09b528180385921ca95458dfa44baecc42b09b63 SHA1 980a3897aed5924d7459641df526dcdb4163e732 SHA256 68ed043a3981bab6a7afe02a709ec657eb72fb6ce3b960d297ef8a5c7e2c8dc9
 DIST asterisk-1.6.0.9.tar.gz 13198345 RMD160 37de351cd87874ffeb790e432126f0ee3803d8ad SHA1 876b598c3ffec104c388c9bff9c11f264c49030d SHA256 ee7c1da586041a53884cd82b4411fe48ec585c1cd181fc42afce3f93d293e6fe
+DIST asterisk-1.6.1.0.tar.gz 13627016 RMD160 2fd9fc82a3f9cf23bbe2ed974b008a7a5bfdd570 SHA1 cd976cf05ba4c4b53b50e7af69fd6d684f070f86 SHA256 37b97603d19a9b403f59e3a8a5246cea10871b74d5f3ba8614345610e4d2cab8
 DIST bristuff-0.3.0-PRE-1y-w.tar.gz 300178 RMD160 9edbfa43547f29da345deea9b7787d46b2d6dc20 SHA1 1b875154712adae915289531e6ee54a4159243d7 SHA256 ad13304dd3fc30e06e2d6b4643d58434aaa37eda926d8c1bf20b86e10c96cf59
 EBUILD asterisk-1.2.31.1.ebuild 11809 RMD160 e07642f266dd340afd216be517ab53c05d21d18e SHA1 079aecf9aa5ed0488810684f6ecb6fac14f25a9d SHA256 b0fdfc45867fe79763cd98913d246eb18f85f5ba772d2a9240fe06f415913acc
 EBUILD asterisk-1.2.32.ebuild 10956 RMD160 745a36f62ff8b0f084ae3c64dcd586a99a7f30ec SHA1 77231b0b6549d74231ab132640bb72cc44aa2016 SHA256 7d71ea825c7d7845b67be9db109ce882301b1d886287313929f82621a4605404
-EBUILD asterisk-1.6.0.8.ebuild 12064 RMD160 6c03e210d56525988e5ecd758377a2ad177904eb SHA1 a84ad70dc7c6cc64c439f2dc2522387e000c3ca4 SHA256 6f9370100087188b4d4ccf0a9c487bdb851d424d8cc2703f761474e625fb863d
 EBUILD asterisk-1.6.0.9.ebuild 12064 RMD160 c1292e25a56347465a0bb89715d244bdb1ecc888 SHA1 746732bda70075be6679ab51ba100a87ea22ef06 SHA256 7c92e237ec5aaca1114de62fcc30564bcc178d54369f4773415b0c0bd8332c16
-MISC ChangeLog 41522 RMD160 225c9ba38b7645497c65468e68d0afc65517ec96 SHA1 9eb64cdac3569258c9cefc50007a094af4cc87e9 SHA256 5637ecdfcde029913edd1263709b3647dc8eb836d4b93767451af521286d075d
+EBUILD asterisk-1.6.1.0.ebuild 12058 RMD160 3b4a9ac79f571983519d760f55beeed93ebe6cba SHA1 f1aa0e09f5c290059e194f3647d4bdf484cb8e40 SHA256 16a33feb73b0fbdb79c07273031c97f6d148bde797bbbd977f4cede311c10985
+MISC ChangeLog 42222 RMD160 d3f62d970351210bd6ecae85e35f7ad8a117be4e SHA1 4d4427ae5efd021535c78dccf68550b0413d7eee SHA256 6c01550ce567609fc1bd046bda976be29a3462220a68cd247e230f8e80a5ddd0
 MISC metadata.xml 1248 RMD160 3dc4417124d1cbc49566798212a75464aa0eaa78 SHA1 bef2f778e9f63e295eeec8127d5e0bd5353efd61 SHA256 25bab15816cd5b3e69899b26a059c8f5abb098692dc16fd78280bf225cc245a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoILoMACgkQp5vW4rUFj5q8egCfQH9Rsw1sF2G525iYDa0LTkYM
+EJ0AoKHSaBL2waPU9r2PntAedIcjM7WH
+=Y4qv
+-----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.6.0.8.ebuild b/net-misc/asterisk/asterisk-1.6.1.0.ebuild
index 29ab60e7b9be..0c28530ea30e 100644
--- a/net-misc/asterisk/asterisk-1.6.0.8.ebuild
+++ b/net-misc/asterisk/asterisk-1.6.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.0.8.ebuild,v 1.1 2009/04/03 15:16:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.0.ebuild,v 1.1 2009/05/11 13:56:42 chainsaw Exp $
 
 EAPI=1
 inherit eutils autotools
@@ -155,36 +155,36 @@ src_unpack() {
 	#
 	# put pid file(s) into /var/run/asterisk
 	#
-	epatch "${FILESDIR}"/1.6.0/${PN}-1.6.0-var_rundir.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-var_rundir.patch || die "patch failed"
 
 	#
 	# fix gsm codec cflags (e.g. i586 core epias) and disable
 	# assembler optimizations
 	#
-	epatch "${FILESDIR}"/1.6.0/${PN}-1.6.0-gsm-pic.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-gsm-pic.patch || die "patch failed"
 
 	#
 	# add missing LIBS for uclibc
 	#
-	epatch "${FILESDIR}"/1.6.0/${PN}-1.6.0-uclibc.patch  || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-uclibc.patch  || die "patch failed"
 
 	#
 	# try to tame the custom build system a little so make likes it better
 	# patch credit: Diego E. 'Flameeyes' Pettenò <flameeyes@entoo.org>
 	#
-	epatch "${FILESDIR}"/1.6.0/asterisk-1.6.0.6-parallelmake.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/asterisk-1.6.1-parallelmake.patch || die "patch failed"
 
 	#
 	# do not try to pass libraries in ldflags but use libs properly
 	# keeps NET-SNMP configure test from failing horribly on --as-needed
 	# http://bugs.digium.com/view.php?id=14671
 	#
-	epatch "${FILESDIR}"/1.6.0/asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch || die "patch failed"
 
 	#
 	# link UW-IMAP with Kerberos5 if necessary
 	#
-	epatch "${FILESDIR}"/1.6.0/asterisk-1.6.0.6-imap-kerberos.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/asterisk-1.6.1-imap-kerberos.patch || die "patch failed"
 
 	AT_M4DIR=autoconf eautoreconf