From: Timothy Redaelli Date: Tue, 28 Nov 2006 13:41:48 +0000 (+0000) Subject: Removed -lssl from LIBS if compiled with USE=-ssl wrt bug #155333. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d636656f4fc2962fa0461f5df1f605cb060481b;p=gentoo.git Removed -lssl from LIBS if compiled with USE=-ssl wrt bug #155333. Installed asterisk.h in /usr/include/asterisk to make plugins compile. Added codec_gsm.so to QA_TEXTRELS_x86 and QA_EXECSTACK_x86 to make asterisk compile with FEATURES=stricter. Added CC=$(tc-getCC) to make it compile with cross-distcc. Package-Manager: portage-2.1.2_rc1-r4 --- diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog index 4b9498e0eea1..36ae33281a6a 100644 --- a/net-misc/asterisk/ChangeLog +++ b/net-misc/asterisk/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/asterisk # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.137 2006/11/23 20:36:14 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.138 2006/11/28 13:41:48 drizzt Exp $ + + 28 Nov 2006; Timothy Redaelli + asterisk-1.2.12.1.ebuild, asterisk-1.2.13.ebuild, + asterisk-1.2.13-r1.ebuild: + Removed -lssl from LIBS if compiled with USE=-ssl wrt bug #155333. Installed + asterisk.h in /usr/include/asterisk to make plugins compile. Added + codec_gsm.so to QA_TEXTRELS_x86 and QA_EXECSTACK_x86 to make asterisk + compile with FEATURES=stricter. Added CC=$(tc-getCC) to make it compile with + cross-distcc. 23 Nov 2006; Francesco Riosa asterisk-1.0.11_p1.ebuild, asterisk-1.0.12.ebuild, asterisk-1.2.12.1.ebuild, asterisk-1.2.13.ebuild: diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index d9d432e853e2..3c255deb5551 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-CVE-2006-1827.patch 422 RMD160 e025a6c976e9ee081e1379953b2ccbe86049a751 SHA1 5e95bd4e35827479aa008196b36c0ffd60a3cf52 SHA256 fa601a359aae0692d6166cd3625fd3415e50fcccc85c58ab37e6374d2575364d MD5 6e50e3012b488f05338d1ce3694f3082 files/1.0.0/asterisk-1.0-CVE-2006-1827.patch 422 RMD160 e025a6c976e9ee081e1379953b2ccbe86049a751 files/1.0.0/asterisk-1.0-CVE-2006-1827.patch 422 @@ -145,22 +148,22 @@ EBUILD asterisk-1.0.12.ebuild 14792 RMD160 09c2d0ecb3e7d0a9e80d15339c03334d6f34e MD5 88188d1516adeec15cde167645f7a43a asterisk-1.0.12.ebuild 14792 RMD160 09c2d0ecb3e7d0a9e80d15339c03334d6f34eb61 asterisk-1.0.12.ebuild 14792 SHA256 e77a540edf118c4b39575433670fe40c54af44bff70ab2a42bd2185dd7625bf6 asterisk-1.0.12.ebuild 14792 -EBUILD asterisk-1.2.12.1.ebuild 12713 RMD160 9f8e2b95c24b95e557492c63d439a0877810c44a SHA1 6ba17cc3e5eae5855bb43c8c86bc5abdf9d0d6c4 SHA256 ceb2fc6c83c0972ca40941f59cf42b28501ec549a841191e296400bf66360130 -MD5 7e93749d2c3c14bd8820f9ff0bd7b8b4 asterisk-1.2.12.1.ebuild 12713 -RMD160 9f8e2b95c24b95e557492c63d439a0877810c44a asterisk-1.2.12.1.ebuild 12713 -SHA256 ceb2fc6c83c0972ca40941f59cf42b28501ec549a841191e296400bf66360130 asterisk-1.2.12.1.ebuild 12713 -EBUILD asterisk-1.2.13-r1.ebuild 12074 RMD160 92aab75d46849d2963c845244a62b2198854b433 SHA1 77f6f72a416055f561e71fd375f39730aece0f7f SHA256 47bd653ab18387c99a8d29ee4c5f6860f0d66bced09180b8762c1931bc162d45 -MD5 ec64f1aac305defc34c8b8b4a9c94c83 asterisk-1.2.13-r1.ebuild 12074 -RMD160 92aab75d46849d2963c845244a62b2198854b433 asterisk-1.2.13-r1.ebuild 12074 -SHA256 47bd653ab18387c99a8d29ee4c5f6860f0d66bced09180b8762c1931bc162d45 asterisk-1.2.13-r1.ebuild 12074 -EBUILD asterisk-1.2.13.ebuild 12224 RMD160 a87364fe90efd59be006b01c6a45cf3169ad19f5 SHA1 aa7b38f409309d6e97e32adc49bdd99420cb7ff8 SHA256 66650ba4d811c6f3b1d8260f60ae594a919162b41a1f66732af13d6705040560 -MD5 ebfd36a23a52cb8b165241e56a9bc2c0 asterisk-1.2.13.ebuild 12224 -RMD160 a87364fe90efd59be006b01c6a45cf3169ad19f5 asterisk-1.2.13.ebuild 12224 -SHA256 66650ba4d811c6f3b1d8260f60ae594a919162b41a1f66732af13d6705040560 asterisk-1.2.13.ebuild 12224 -MISC ChangeLog 27111 RMD160 0b7346b32b2e0e2ed7ebebe4814ae456ad344866 SHA1 78d1974a59eda0775780d5cfbf1fddc4d9f4e9ec SHA256 b4fa7f6a020a8820d0b340eb306155295437dd5c46407d2107d49c3d3348225a -MD5 43860b64199ef86e7c15ea881dee652f ChangeLog 27111 -RMD160 0b7346b32b2e0e2ed7ebebe4814ae456ad344866 ChangeLog 27111 -SHA256 b4fa7f6a020a8820d0b340eb306155295437dd5c46407d2107d49c3d3348225a ChangeLog 27111 +EBUILD asterisk-1.2.12.1.ebuild 12713 RMD160 9bec1e7a75d18ed92d515593b6509ac8207f3e68 SHA1 945213359a27ac6dcea796a9e9bd908be7723f66 SHA256 13fc0e448dc8a819daaf4a4c9539afc94b11bf0a6de300f48bd9efd1e1b6ed9e +MD5 302da4d553be8862933336f808a53934 asterisk-1.2.12.1.ebuild 12713 +RMD160 9bec1e7a75d18ed92d515593b6509ac8207f3e68 asterisk-1.2.12.1.ebuild 12713 +SHA256 13fc0e448dc8a819daaf4a4c9539afc94b11bf0a6de300f48bd9efd1e1b6ed9e asterisk-1.2.12.1.ebuild 12713 +EBUILD asterisk-1.2.13-r1.ebuild 12370 RMD160 a14e5bee64d04afc7f20d522b9296d38b2da7b7b SHA1 65b07c25d53ceff75298fc443d3032ea9fad345d SHA256 e101fc86e32af3b70e3ed839ad2a13f6188f672ba04e2e799579f60a7595f9d0 +MD5 1bc25d581d773674620c15a15aacba49 asterisk-1.2.13-r1.ebuild 12370 +RMD160 a14e5bee64d04afc7f20d522b9296d38b2da7b7b asterisk-1.2.13-r1.ebuild 12370 +SHA256 e101fc86e32af3b70e3ed839ad2a13f6188f672ba04e2e799579f60a7595f9d0 asterisk-1.2.13-r1.ebuild 12370 +EBUILD asterisk-1.2.13.ebuild 12224 RMD160 68c6001ec4889401b6f71d3e2d849d015fff8f78 SHA1 db912d5b6f2ee29005e1ce67dfe9e4f25b295d47 SHA256 7e06bd672cfe0d089afde76d716d4d3bf5eb3c65716aba94901cebf78590ae52 +MD5 9abe65075e7b47f09e5af37cda53ec7c asterisk-1.2.13.ebuild 12224 +RMD160 68c6001ec4889401b6f71d3e2d849d015fff8f78 asterisk-1.2.13.ebuild 12224 +SHA256 7e06bd672cfe0d089afde76d716d4d3bf5eb3c65716aba94901cebf78590ae52 asterisk-1.2.13.ebuild 12224 +MISC ChangeLog 27562 RMD160 d9073542e26aa0220503ef2c6094bff5acc70bb5 SHA1 43f97923c2195d0e971959aab9403f6ee561cd73 SHA256 c7a4353949be7f42522c3ff38a16dafe22681ef6b6657d49aa5060fe52e44a78 +MD5 ccca583c446e1b0bf35437fc8a5c850b ChangeLog 27562 +RMD160 d9073542e26aa0220503ef2c6094bff5acc70bb5 ChangeLog 27562 +SHA256 c7a4353949be7f42522c3ff38a16dafe22681ef6b6657d49aa5060fe52e44a78 ChangeLog 27562 MISC metadata.xml 384 RMD160 f5de78add5676233b8e0b9e111eab08970443582 SHA1 0441844fb3a715d6979e6c548147ada23d73fec2 SHA256 674224368cb2be6f72655cd67ee19d4d2d0f3425d560aff22b698269e0adc6d8 MD5 488aea6fbdb7537394cc049b0ff9e5d5 metadata.xml 384 RMD160 f5de78add5676233b8e0b9e111eab08970443582 metadata.xml 384 @@ -180,3 +183,10 @@ SHA256 63571a9178e245b14ca367735b833b0d1700e4e2595c3d7694df7e0d5bd3fe9f files/di MD5 041ef49546f5e16e3bd5fd5ff0719f70 files/digest-asterisk-1.2.13-r1 1376 RMD160 782b59125ab61b4e40f284bbf830bd1fe10b1d47 files/digest-asterisk-1.2.13-r1 1376 SHA256 63571a9178e245b14ca367735b833b0d1700e4e2595c3d7694df7e0d5bd3fe9f files/digest-asterisk-1.2.13-r1 1376 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFbDynGDyatLGpTbYRAqPNAJ0bxZs61kWU2cRXEw078RV55wBA4gCeKYiL +dXK0XUCxm90yxjkrRiVHOlQ= +=mhAS +-----END PGP SIGNATURE----- diff --git a/net-misc/asterisk/asterisk-1.2.12.1.ebuild b/net-misc/asterisk/asterisk-1.2.12.1.ebuild index a07558aceb26..bfd3e0c15d0d 100644 --- a/net-misc/asterisk/asterisk-1.2.12.1.ebuild +++ b/net-misc/asterisk/asterisk-1.2.12.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.12.1.ebuild,v 1.7 2006/11/23 20:36:14 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.12.1.ebuild,v 1.8 2006/11/28 13:41:48 drizzt Exp $ inherit eutils multilib @@ -413,7 +413,6 @@ src_install() { ${D}/usr/share/doc/${PF}/{conf/misdn.conf,configs/misdn.conf.sample.gz,README.misdn.gz} rm -f ${D}/usr/include/asterisk/chan_capi{,_app}.h \ ${D}/usr/share/doc/${PF}/{conf/capi.conf,configs/capi.conf.sample.gz} - } pkg_preinst() { diff --git a/net-misc/asterisk/asterisk-1.2.13-r1.ebuild b/net-misc/asterisk/asterisk-1.2.13-r1.ebuild index 42c049963e2d..937597681353 100644 --- a/net-misc/asterisk/asterisk-1.2.13-r1.ebuild +++ b/net-misc/asterisk/asterisk-1.2.13-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.13-r1.ebuild,v 1.3 2006/11/14 07:51:25 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.13-r1.ebuild,v 1.4 2006/11/28 13:41:48 drizzt Exp $ -inherit eutils multilib +inherit eutils multilib toolchain-funcs IUSE="alsa bri curl debug doc gtk genericjb h323 hardened lowmem mmx \ nosamples odbc osp postgres pri speex sqlite ssl ukcid zaptel \ @@ -62,6 +62,9 @@ DEPEND="${RDEPEND} #asterisk uses special mpg123 functions and does not work with mpeg321, bug #42703 PDEPEND="|| ( media-sound/mpg123 net-misc/asterisk-addons )" +QA_TEXTRELS_x86="usr/lib/asterisk/modules/codec_gsm.so" +QA_EXECSTACK_x86="usr/lib/asterisk/modules/codec_gsm.so" + # # List of modules to ignore during scan (because they have been removed in 1.2.x) # @@ -219,8 +222,8 @@ src_unpack() { if ! use ssl; then einfo "Disabling crypto support" - sed -i -e "s:^#\(NOCRYPTO=yes\):\1:" \ - Makefile + sed -i -e 's:^#\(NOCRYPTO=yes\):\1:' \ + -e '/^LIBS+=-lssl/d' Makefile || die fi # @@ -280,6 +283,7 @@ src_compile() { einfo "Building Asterisk..." make \ + CC=$(tc-getCC) \ NOTRACE=1 \ OPTIMIZE="${CFLAGS}" \ PWLIBDIR=/usr/share/pwlib \ @@ -384,6 +388,10 @@ src_install() { # install asterisk-updater dosbin "${FILESDIR}"/1.2.0/asterisk-updater + # install asterisk.h, a lot of external modules need this + insinto /usr/include/asterisk + doins include/asterisk.h + # make sure misdn/capi stuff is not installed, provided by asterisk-chan_.. rm -f "${D}"/etc/asterisk/misdn.conf "${D}"/usr/lib/asterisk/modules/chan_misdn.so \ "${D}"/usr/share/doc/${PF}/{conf/misdn.conf,configs/misdn.conf.sample.gz,README.misdn.gz} diff --git a/net-misc/asterisk/asterisk-1.2.13.ebuild b/net-misc/asterisk/asterisk-1.2.13.ebuild index 1b2c4035754a..91d71c090afc 100644 --- a/net-misc/asterisk/asterisk-1.2.13.ebuild +++ b/net-misc/asterisk/asterisk-1.2.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.13.ebuild,v 1.4 2006/11/23 20:36:14 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.13.ebuild,v 1.5 2006/11/28 13:41:48 drizzt Exp $ inherit eutils multilib @@ -397,7 +397,6 @@ src_install() { ${D}/usr/share/doc/${PF}/{conf/misdn.conf,configs/misdn.conf.sample.gz,README.misdn.gz} rm -f ${D}/usr/include/asterisk/chan_capi{,_app}.h \ ${D}/usr/share/doc/${PF}/{conf/capi.conf,configs/capi.conf.sample.gz} - } pkg_preinst() {