From 7e327505fec11626b02e1814c2d06e9888da5690 Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Tue, 4 Oct 2011 09:59:12 +0000 Subject: [PATCH] This contains major fixes to res_timing_timerfd that hopefully prevent deadlocks. Distro patchset unchanged. Package-Manager: portage-2.1.10.20/cvs/Linux x86_64 --- net-misc/asterisk/ChangeLog | 8 +- net-misc/asterisk/Manifest | 10 +- net-misc/asterisk/asterisk-1.8.7.0.ebuild | 432 ++++++++++++++++++++++ 3 files changed, 445 insertions(+), 5 deletions(-) create mode 100644 net-misc/asterisk/asterisk-1.8.7.0.ebuild diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog index 1bfa211aca5a..686cffbfe294 100644 --- a/net-misc/asterisk/ChangeLog +++ b/net-misc/asterisk/ChangeLog @@ -1,6 +1,12 @@ # 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.345 2011/09/22 13:06:16 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.346 2011/10/04 09:59:12 chainsaw Exp $ + +*asterisk-1.8.7.0 (04 Oct 2011) + + 04 Oct 2011; Tony Vroon +asterisk-1.8.7.0.ebuild: + This contains major fixes to res_timing_timerfd that hopefully prevent + deadlocks. Distro patchset unchanged. *asterisk-1.8.7.0_rc2 (22 Sep 2011) diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index b38b6b6620fa..b44b1f7732eb 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -14,18 +14,20 @@ AUX 1.8.0/asterisk.initd 6511 RMD160 183128f493953a1dc9241e2966398c6e5f3e1365 SH 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 EBUILD asterisk-1.8.5.0-r3.ebuild 14574 RMD160 167f9de584619a145a41b48853c8974f9aaa30ed SHA1 55bf9a6f034c0e1992f1079b24221a97f45bba00 SHA256 0d698934dacb0c694dd3540e9c0d502b7c5793eb6a29f04f740df8064eb5829b EBUILD asterisk-1.8.6.0.ebuild 14461 RMD160 ac806afbf18a4abaa223b6a644085a461a97ce12 SHA1 bb71f4999b08bf50012da25fb1b8fdbc7f532ea9 SHA256 9d4764be14fea8c0de761ce7b815a51e6e66bb6d261162044d5cf7a100691cc7 +EBUILD asterisk-1.8.7.0.ebuild 14461 RMD160 ae8fb45548a13658dd6ed3c5a35380f99efce850 SHA1 8592ab5b99c66af1eae3519985ab75e2a5b3f402 SHA256 d96e6ee3fcfe56c7c017595d1085db6ee86a4a8e22a1efd04a02af092de03b37 EBUILD asterisk-1.8.7.0_rc2.ebuild 14465 RMD160 539c578ec8c1c64994b6945d6e5b061f6521e66f SHA1 2843602fee9bc0873af7447aef69411052f9d011 SHA256 7a25dcdb01fe9f28fbdcd229aac18c4456cb45fac14cc8f8262786f4ad2c73af -MISC ChangeLog 87411 RMD160 e2136e64a074c3b816a82ae6d6e70381ae4e1c0f SHA1 bc3214208807af2cb38dfc4dbad46a20793ff01a SHA256 45ddfb6600be7d513c30e1d70fdaa7a177b4a524b42cb52d619fe7b1a04d55b7 +MISC ChangeLog 87632 RMD160 981964d89e5d7b123452859eccdb0a7f7cf42fcb SHA1 62eab1b3848b64756b5e7d314db471f8f9b7df71 SHA256 dc4bf679e7056c90f0b637dea4eab3748053fe52787c6199feb54a3dc3e3dd0b MISC metadata.xml 1104 RMD160 5b90405c685bc1c0ee173b3024afab5bc849bf40 SHA1 bf76dd265acf32efba9e4e8189ae154a4b9ebd40 SHA256 17e96f326cd60399fb217025567ae4c80f1b9b12418f1bf5b41c8fa4c49598ec -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk57MtMACgkQp5vW4rUFj5qXHwCeLIVlOAZTLvnTUt8bMkNTvdGF -KwkAniw8SAwLxKzbJQTgWHpeN2KYkZ9Z -=K2Uq +iEYEARECAAYFAk6K2P0ACgkQp5vW4rUFj5pj7QCgr3M9kDzwLXwgAvVmSTwtA/zZ +zGEAnjkwdthdb8l9BCtefA/7KDfZoEDF +=Zd1U -----END PGP SIGNATURE----- diff --git a/net-misc/asterisk/asterisk-1.8.7.0.ebuild b/net-misc/asterisk/asterisk-1.8.7.0.ebuild new file mode 100644 index 000000000000..b78826fda364 --- /dev/null +++ b/net-misc/asterisk/asterisk-1.8.7.0.ebuild @@ -0,0 +1,432 @@ +# 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.ebuild,v 1.1 2011/10/04 09:59:12 chainsaw Exp $ + +EAPI=4 +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/${MY_P}.tar.gz + mirror://gentoo/gentoo-asterisk-patchset-1.3.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk h323 http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis" + +EPATCH_SUFFIX="patch" +PATCHES=( "${WORKDIR}/asterisk-patchset" ) + +RDEPEND="dev-libs/popt + dev-libs/libxml2 + ais? ( sys-cluster/openais ) + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez ) + calendar? ( net-libs/neon + dev-libs/libical + dev-libs/iksemel ) + caps? ( sys-libs/libcap ) + curl? ( net-misc/curl ) + dahdi? ( >=net-libs/libpri-1.4.12_beta2 + net-misc/dahdi-tools ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + h323? ( net-libs/openh323 ) + http? ( dev-libs/gmime:2.4 ) + iconv? ( virtual/libiconv ) + jabber? ( dev-libs/iksemel ) + jingle? ( dev-libs/iksemel ) + ldap? ( net-nds/openldap ) + lua? ( dev-lang/lua ) + mysql? ( dev-db/mysql ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + osplookup? ( net-libs/osptoolkit + dev-libs/openssl ) + portaudio? ( media-libs/portaudio ) + 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:0 ) + sqlite3? ( dev-db/sqlite:3 ) + srtp? ( net-libs/libsrtp ) + ssl? ( dev-libs/openssl ) + usb? ( dev-libs/libusb + media-libs/alsa-lib ) + vorbis? ( media-libs/libvorbis )" + +DEPEND="${RDEPEND} + !net-libs/openh323" + +RDEPEND="${RDEPEND} + syslog? ( virtual/logger )" + +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 caps cap) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with portaudio) \ + $(use_with ssl crypto) \ + $(use_with ssl) + + # + # 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 + + # Compile menuselect binary for optional components + emake menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + menuselect/menuselect --disable chan_misdn menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + menuselect/menuselect --enable smsq menuselect.makeopts + menuselect/menuselect --enable streamplayer menuselect.makeopts + menuselect/menuselect --enable aelparse menuselect.makeopts + menuselect/menuselect --enable astman menuselect.makeopts + + # The others are based on USE-flag settings + if use ais; then + menuselect/menuselect --enable res_ais menuselect.makeopts + else + menuselect/menuselect --disable res_ais menuselect.makeopts + fi + if use alsa; then + menuselect/menuselect --enable chan_alsa menuselect.makeopts + else + menuselect/menuselect --disable chan_alsa menuselect.makeopts + fi + if use bluetooth; then + menuselect/menuselect --enable chan_mobile menuselect.makeopts + else + menuselect/menuselect --disable chan_mobile menuselect.makeopts + fi + if use calendar; then + menuselect/menuselect --enable res_calendar menuselect.makeopts + menuselect/menuselect --enable res_calendar_caldav menuselect.makeopts + menuselect/menuselect --enable res_calendar_ews menuselect.makeopts + menuselect/menuselect --enable res_calendar_exchange menuselect.makeopts + menuselect/menuselect --enable res_calendar_icalendar menuselect.makeopts + else + menuselect/menuselect --disable res_calendar menuselect.makeopts + menuselect/menuselect --disable res_calendar_caldav menuselect.makeopts + menuselect/menuselect --disable res_calendar_ews menuselect.makeopts + menuselect/menuselect --disable res_calendar_exchange menuselect.makeopts + menuselect/menuselect --disable res_calendar_icalendar menuselect.makeopts + fi + if use curl; then + menuselect/menuselect --enable func_curl menuselect.makeopts + menuselect/menuselect --enable res_config_curl menuselect.makeopts + menuselect/menuselect --enable res_curl menuselect.makeopts + else + menuselect/menuselect --disable func_curl menuselect.makeopts + menuselect/menuselect --disable res_config_curl menuselect.makeopts + menuselect/menuselect --disable res_curl menuselect.makeopts + fi + if use dahdi; then + menuselect/menuselect --enable app_dahdibarge menuselect.makeopts + menuselect/menuselect --enable app_dahdiras menuselect.makeopts + menuselect/menuselect --enable chan_dahdi menuselect.makeopts + menuselect/menuselect --enable codec_dahdi menuselect.makeopts + menuselect/menuselect --enable res_timing_dahdi menuselect.makeopts + else + menuselect/menuselect --disable app_dahdibarge menuselect.makeopts + menuselect/menuselect --disable app_dahdiras menuselect.makeopts + menuselect/menuselect --disable chan_dahdi menuselect.makeopts + menuselect/menuselect --disable codec_dahdi menuselect.makeopts + menuselect/menuselect --disable res_timing_dahdi menuselect.makeopts + fi + if use freetds; then + menuselect/menuselect --enable cdr_tds menuselect.makeopts + menuselect/menuselect --enable cel_tds menuselect.makeopts + else + menuselect/menuselect --disable cdr_tds menuselect.makeopts + menuselect/menuselect --disable cel_tds menuselect.makeopts + fi + if use gtalk; then + menuselect/menuselect --enable chan_gtalk menuselect.makeopts + else + menuselect/menuselect --disable chan_gtalk menuselect.makeopts + fi + if use h323; then + menuselect/menuselect --enable chan_ooh323 menuselect.makeopts + else + menuselect/menuselect --disable chan_ooh323 menuselect.makeopts + fi + if use http; then + menuselect/menuselect --enable res_http_post menuselect.makeopts + else + menuselect/menuselect --disable res_http_post menuselect.makeopts + fi + if use iconv; then + menuselect/menuselect --enable func_iconv menuselect.makeopts + else + menuselect/menuselect --disable func_iconv menuselect.makeopts + fi + if use jabber; then + menuselect/menuselect --enable res_jabber menuselect.makeopts + else + menuselect/menuselect --disable res_jabber menuselect.makeopts + fi + if use jingle; then + menuselect/menuselect --enable chan_jingle menuselect.makeopts + else + menuselect/menuselect --disable chan_jingle menuselect.makeopts + fi + if use ldap; then + menuselect/menuselect --enable res_config_ldap menuselect.makeopts + else + menuselect/menuselect --disable res_config_ldap menuselect.makeopts + fi + if use lua; then + menuselect/menuselect --enable pbx_lua menuselect.makeopts + else + menuselect/menuselect --disable pbx_lua menuselect.makeopts + fi + if use mysql; then + menuselect/menuselect --enable app_mysql menuselect.makeopts + menuselect/menuselect --enable cdr_mysql menuselect.makeopts + menuselect/menuselect --enable res_config_mysql menuselect.makeopts + else + menuselect/menuselect --disable app_mysql menuselect.makeopts + menuselect/menuselect --disable cdr_mysql menuselect.makeopts + menuselect/menuselect --disable res_config_mysql menuselect.makeopts + fi + if use odbc; then + menuselect/menuselect --enable cdr_adaptive_odbc menuselect.makeopts + menuselect/menuselect --enable cdr_odbc menuselect.makeopts + menuselect/menuselect --enable cel_odbc menuselect.makeopts + menuselect/menuselect --enable func_odbc menuselect.makeopts + menuselect/menuselect --enable res_config_odbc menuselect.makeopts + menuselect/menuselect --enable res_odbc menuselect.makeopts + else + menuselect/menuselect --disable cdr_adaptive_odbc menuselect.makeopts + menuselect/menuselect --disable cdr_odbc menuselect.makeopts + menuselect/menuselect --disable cel_odbc menuselect.makeopts + menuselect/menuselect --disable func_odbc menuselect.makeopts + menuselect/menuselect --disable res_config_odbc menuselect.makeopts + menuselect/menuselect --disable res_odbc menuselect.makeopts + fi + if use osplookup; then + menuselect/menuselect --enable app_osplookup menuselect.makeopts + else + menuselect/menuselect --disable app_osplookup menuselect.makeopts + fi + if use oss; then + menuselect/menuselect --enable chan_oss menuselect.makeopts + else + menuselect/menuselect --disable chan_oss menuselect.makeopts + fi + if use postgres; then + menuselect/menuselect --enable cdr_pgsql menuselect.makeopts + menuselect/menuselect --enable cel_pgsql menuselect.makeopts + menuselect/menuselect --enable res_config_pgsql menuselect.makeopts + else + menuselect/menuselect --disable cdr_pgsql menuselect.makeopts + menuselect/menuselect --disable cel_pgsql menuselect.makeopts + menuselect/menuselect --disable res_config_pgsql menuselect.makeopts + fi + if use radius; then + menuselect/menuselect --enable cdr_radius menuselect.makeopts + menuselect/menuselect --enable cel_radius menuselect.makeopts + else + menuselect/menuselect --disable cdr_radius menuselect.makeopts + menuselect/menuselect --disable cel_radius menuselect.makeopts + fi + if use snmp; then + menuselect/menuselect --enable res_snmp menuselect.makeopts + else + menuselect/menuselect --disable res_snmp menuselect.makeopts + fi + if use span; then + menuselect/menuselect --enable res_fax_spandsp menuselect.makeopts + else + menuselect/menuselect --disable res_fax_spandsp menuselect.makeopts + fi + if use speex; then + menuselect/menuselect --enable codec_speex menuselect.makeopts + menuselect/menuselect --enable func_speex menuselect.makeopts + else + menuselect/menuselect --disable codec_speex menuselect.makeopts + menuselect/menuselect --disable func_speex menuselect.makeopts + fi + if use sqlite; then + menuselect/menuselect --enable cdr_sqlite menuselect.makeopts + else + menuselect/menuselect --disable cdr_sqlite menuselect.makeopts + fi + if use sqlite3; then + menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts + menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts + else + menuselect/menuselect --disable cdr_sqlite3_custom menuselect.makeopts + menuselect/menuselect --disable cel_sqlite3_custom menuselect.makeopts + fi + if use srtp; then + menuselect/menuselect --enable res_srtp menuselect.makeopts + else + menuselect/menuselect --disable res_srtp menuselect.makeopts + fi + if use syslog; then + menuselect/menuselect --enable cdr_syslog menuselect.makeopts + else + menuselect/menuselect --disable cdr_syslog menuselect.makeopts + fi + if use usb; then + menuselect/menuselect --enable chan_usbradio menuselect.makeopts + else + menuselect/menuselect --disable chan_usbradio menuselect.makeopts + fi + if use vorbis; then + menuselect/menuselect --enable format_ogg_vorbis menuselect.makeopts + else + menuselect/menuselect --disable format_ogg_vorbis menuselect.makeopts + fi +} + +src_compile() { + ASTLDFLAGS="${LDFLAGS}" emake +} + +src_install() { + mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die + emake DESTDIR="${D}" installdirs + emake DESTDIR="${D}" install + + if use samples; then + emake DESTDIR="${D}" samples + 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/* || die + rm -f "${D}"var/lib/asterisk/sounds/demo-* || die + rm -f "${D}"var/lib/asterisk/agi-bin/* || die + rm -f "${D}"etc/asterisk/* || die + fi + rm -rf "${D}"var/spool/asterisk/voicemail/default || die + + # 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.8.0/asterisk.initd asterisk + newconfd "${FILESDIR}"/1.8.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 + 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" + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk +} + +pkg_postinst() { + # + # Announcements, warnings, reminders... + # + einfo "Asterisk has been installed" + echo + 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" + echo + elog "http://www.automated.it/guidetoasterisk.htm" + echo + elog "Gentoo VoIP IRC Channel:" + elog "#gentoo-voip @ irc.freenode.net" + echo + echo + elog "1.6 -> 1.8 changes that you may care about:" + elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt" + elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2" +} + +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 +} -- 2.26.2