From: Tony Vroon Date: Wed, 26 Oct 2011 09:04:56 +0000 (+0000) Subject: Patch by Erik Wallin to restore PRI symbols solves lack of working BRI PTMP signallin... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ecb5bbc8f47f457b7246ff44a6c1196b5613b65e;p=gentoo.git Patch by Erik Wallin to restore PRI symbols solves lack of working BRI PTMP signalling in DAHDI. Closes bug #388179 by Felix Tiede. Package-Manager: portage-2.1.10.31/cvs/Linux x86_64 --- diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog index ef51216fc4f5..329544a7d1a4 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.355 2011/10/21 17:04:03 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.356 2011/10/26 09:04:56 chainsaw Exp $ + +*asterisk-1.8.7.1-r1 (26 Oct 2011) + + 26 Oct 2011; Tony Vroon +asterisk-1.8.7.1-r1.ebuild: + Patch by Erik Wallin to restore PRI symbols solves lack of working BRI PTMP + signalling in DAHDI. Closes bug #388179 by Felix Tiede. 21 Oct 2011; Tony Vroon -asterisk-1.8.6.0.ebuild: Purge vulnerable ebuilds for security bug #387453 now that stabling has diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 4ddc7308f395..efc214792087 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.6.0/asterisk.confd 2204 RMD160 31bceebfa535e97cb2634e313678cc42186d4750 SHA1 748c623cea238cd9b322672d5ebcfe214a4f0463 SHA256 daec84c58e0ef6cbd71a6fc62cb83129b1bcffdfdd619ebbd62a642f0cd1eee7 AUX 1.6.2/asterisk.initd2 6658 RMD160 b694da109e746e9a9e642ffa7f1d278f03543cea SHA1 63443d3066d4c47228fe1d852420d571ae6f8800 SHA256 f6fd2c229e61c12360b1d289a631f6a0a6f8638e7c6f6add6040ad988170bf70 AUX 1.6.2/asterisk.initd3 6658 RMD160 adabbacaff55cc49077a919fb23eb6f8e3a2c076 SHA1 a256b7af478a4d83c19a89b23d79a4f832f1fb5a SHA256 ba737b5eadd4a5ff8653e30b54959c1d25a8a68699b8ce9adc9afe09da8b4110 @@ -10,6 +13,15 @@ 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.7.1.tar.gz 28557326 RMD160 e69d6f6c555f52b8c6bd16428c9e64a22988e736 SHA1 c29671daaca5725b4f4257a972c2fe88effbc16e SHA256 46a713113705f9c747f19b5c5bfd31ee2ebd7db221eb9aa4ca8c817d531f95f3 DIST gentoo-asterisk-patchset-1.4.tar.bz2 31078 RMD160 3e24de735eb1754951708cd23e73ad125b9f626b SHA1 ed725bceb74ca1cf961a2e97fe12e89eb66b1719 SHA256 315a3878d3c591030b73d9796e0264f924ef5bde51ee682dc011974bf91b6630 +DIST gentoo-asterisk-patchset-1.5.tar.bz2 32182 RMD160 38081074d9814b8d3bc7130c37debf34f19a53c5 SHA1 8d3a5bda76ed1d32feda1e109e8affc75ffd7917 SHA256 458f03fef712166fc5e983f24fa6a53befbb1910d1e63cc7e79a3c83872f39ab +EBUILD asterisk-1.8.7.1-r1.ebuild 14426 RMD160 c20d9e317692e83f0a5985ec631dacccf977cf03 SHA1 22f6ec06d74858039dacd74dbd99714d2e5e7ea0 SHA256 f7a50dddd72af95d9153be25e2a6b31a9af0688a62c75d0596148def5193732c EBUILD asterisk-1.8.7.1.ebuild 14423 RMD160 ac4edbba788830ab10237d3f4a3ab743aee7bd70 SHA1 127e0deff4a40acd49b5adf6e247977efc7f507b SHA256 220eba22c0217d08b69efe0c715b417996b20eda7c509142544b7f69ba3d47aa -MISC ChangeLog 89614 RMD160 bce14f814155660ed28cae593ec5889257d5b0cd SHA1 64772658c4b54468f8341f6f8fa6b6d1f7287ef1 SHA256 5e1abed307a708752a2ce9d8a27b303f57f223a9562a7cf9273162ca4898dbdc +MISC ChangeLog 89864 RMD160 491ca28724227dbf8f06b1a60938ed573a16d78b SHA1 d0d7334dede8bcaeb429eb98c07892986cf0c00b SHA256 e22570b98b40819140b1694dc0721610fd1a5257a456f9ec62fa19d47cd21c44 MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk6nzUoACgkQp5vW4rUFj5r+/wCfYXig6bU4sKjgiZE9wSdQWDj8 +XiMAnR5x7cS+c1TPThoSLRzDY+omnMCH +=M5SF +-----END PGP SIGNATURE----- diff --git a/net-misc/asterisk/asterisk-1.8.7.1-r1.ebuild b/net-misc/asterisk/asterisk-1.8.7.1-r1.ebuild new file mode 100644 index 000000000000..3d4dcf7f213f --- /dev/null +++ b/net-misc/asterisk/asterisk-1.8.7.1-r1.ebuild @@ -0,0 +1,431 @@ +# 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.1-r1.ebuild,v 1.1 2011/10/26 09:04:56 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.5.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk 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 ) + 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 + menuselect/menuselect --disable chan_ooh323 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 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 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/*.* + 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 +}