From: Tony Vroon Date: Fri, 25 Jun 2010 15:14:09 +0000 (+0000) Subject: New upstream version. A DTMF crasher has been fixed, several off-by-one errors have... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4c4bc9737096bce7cba46a746e45ac4340dcfef2;p=gentoo.git New upstream version. A DTMF crasher has been fixed, several off-by-one errors have been addressed. Also the build system has seen some improvements. With thanks to Oliver Jacksch for a rebased patch, closes bug #324657. Research by Jaco Kroon closes bug #325231 by Kerin Millar. Cleaned up old ebuilds. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog index 8c9c2e07acd9..c03583896724 100644 --- a/net-misc/asterisk/ChangeLog +++ b/net-misc/asterisk/ChangeLog @@ -1,6 +1,19 @@ -# ChangeLog for net-misc/asterisk +\# ChangeLog for net-misc/asterisk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.260 2010/06/17 20:56:41 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.261 2010/06/25 15:14:09 chainsaw Exp $ + +*asterisk-1.6.2.9 (25 Jun 2010) + + 25 Jun 2010; Tony Vroon -asterisk-1.6.1.18.ebuild, + -asterisk-1.6.1.19.ebuild, asterisk-1.6.1.20.ebuild, + -asterisk-1.6.2.6.ebuild, -asterisk-1.6.2.7.ebuild, + asterisk-1.6.2.8.ebuild, +asterisk-1.6.2.9.ebuild, + +files/1.6.2/asterisk-1.6.2.9-gsm-pic.patch: + New upstream version. A DTMF crasher has been fixed, several off-by-one + errors have been addressed. Also the build system has seen some + improvements. With thanks to Oliver Jacksch for a rebased patch, closes + bug #324657. Research by Jaco Kroon closes bug #325231 by Kerin Millar. + Cleaned up old ebuilds. 17 Jun 2010; Patrick Lauer asterisk-1.2.37.ebuild, asterisk-1.2.40.ebuild, asterisk-1.6.1.18.ebuild, diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 74b678cef1ab..0c52fb1b8f40 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 @@ -37,22 +40,24 @@ AUX 1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch 547 RMD160 e45a2804c3d23dee AUX 1.6.2/asterisk-1.6.2.8-gsm-pic.patch 2252 RMD160 f679cc186819f95b149f6bc52e885b26741426e3 SHA1 d5b468a3f6cb586e6e4e3742cdaa56a0f9dbfef3 SHA256 16aa6b6c8ecf65b81a2edfa01cc68dc1e7f2d40a3d08c42282cbf305e0b3b3d1 AUX 1.6.2/asterisk-1.6.2.8-inband-indications.patch 468 RMD160 590c9271486fa08c6408d68eea332ab8a7fa76a7 SHA1 f586944eade3d1e9f21705ac27c11e90bb9edff6 SHA256 ddfe757f4810964b8d48e7363068763fbf313db14e4f9205d926dc34b1a86ba6 AUX 1.6.2/asterisk-1.6.2.8-pri-missing-keyword.patch 547 RMD160 30deeb63ae09c316d5ada7597939adc8861a40d8 SHA1 722efddb5dde9238c0ee11cbfb58da25a5a2c95a SHA256 e3b98ee06015b062929613f41e430a93e571cf0920393f4480ebce256dd1e7fc +AUX 1.6.2/asterisk-1.6.2.9-gsm-pic.patch 2423 RMD160 9eee96d54d9613c2e565d1983479b26762913e0e SHA1 c61479f1ee1f6ac113dae4dbf68222034990f6be SHA256 9cd951f984189f1dc93f9ecde1409f07c53644ef22091d668f55c0bb7122bc0c DIST asterisk-1.2.27-patches-1.0.tar.bz2 6653 RMD160 18f1d7fc4497466050ed4f517ff5732eb448ff2e SHA1 2aecd3e91cde38dbb0fd591e8a49db221f44b94e SHA256 a4da0570fca2df3c508f072be62722879956fe8c454027fbb8dafb7a6095384c DIST asterisk-1.2.37.tar.gz 29899629 RMD160 1de7ff96d3b1fd8d89f3ef7b3bb9e35bedccfb33 SHA1 c9a3c4684e021f62b4d19f6e0c8fc11f64db19d6 SHA256 9f3ec67efe0e4d45434621cd358e8e7d64e1b05df04d66e2390c9420acd2aeaa DIST asterisk-1.2.40.tar.gz 29903514 RMD160 dc3da60756c82c98a055e49b068eb6760a01948e SHA1 4b4b794e858a3436bc35bdd2f4edf824c2885b68 SHA256 61dc745b12f6dc2998404e77747a964db56df8efae84a666c4ccddf016c9c06d -DIST asterisk-1.6.1.18.tar.gz 23585542 RMD160 ca6647cce5a176526ba1cb9dcb0e1e227986b268 SHA1 99871bc2257185437c22b7f0e44a09c356ffe027 SHA256 f3dab39190c7c938099e8961eb9917d5cf15570180dc0e613e7bb2562a621e5b -DIST asterisk-1.6.1.19.tar.gz 23600478 RMD160 df5ba06911f76cc54646c516c65c5e4ec4692f3d SHA1 a97f8f37b768fef88bc73ee066a0743978672a87 SHA256 a0a3f0c0d6eed2f7ca40474d67ea1ec40a0146f086966b369911ae8a9884646f DIST asterisk-1.6.1.20.tar.gz 23601410 RMD160 ccb504292e9d5e93d79456ede212b1697e3c213e SHA1 7d92f9de5ed6de10e34c8e6039f91b45884e46f8 SHA256 12b4a1290569d03fd53c8794ceba7b8cf7b385731d33695018bb5fe26370391b -DIST asterisk-1.6.2.6.tar.gz 23265995 RMD160 35c724b968a00abdc5bbb07e63ec9004872cdef8 SHA1 93c25c30fbe2003955362d9ce173367ecc6e5b49 SHA256 2c724a53c40d12fc37100c1daa8312fd99eee26920907e3094c7c2b7d0e7eb61 -DIST asterisk-1.6.2.7.tar.gz 23283195 RMD160 d3298a22679c93e565e9f8f371d4abb158a0ee73 SHA1 da14520b918ae7ab5a8b47d8f3a4e7fd95f66ab3 SHA256 217f5fecd2a032c39f401ccdeb8fcdc31a94b44a504d1c567807a527bfacf117 DIST asterisk-1.6.2.8.tar.gz 23565401 RMD160 4d49c0e664ca89b4178857022be48f3d07bd503a SHA1 7dd7823f0698ff509509fe6e29e8d9bdb9e85570 SHA256 115418e02b77335e9c1dd439852d7373d37150b587eadfca2cefc8b2b1c9d76d +DIST asterisk-1.6.2.9.tar.gz 23607389 RMD160 caf52be71536a642373cdd14c0f55f489ef1856b SHA1 2f735f640a55a4b5ded7be183946dabb3002d531 SHA256 109a8f29bd08844d9310435fb944908e6ada60e36917f2a3ed800c266a08bc1c EBUILD asterisk-1.2.37.ebuild 10640 RMD160 93fb215b75297b8a0f732496652bcc98a60241ef SHA1 0c8e2a9f3a65c3f268a98f5970f41b8de96f4b30 SHA256 ea9fc6a68c209280841b5f130d448414ad6308582db7ac14931a35437f831b88 EBUILD asterisk-1.2.40.ebuild 10645 RMD160 5e919275ef9a8999b57414b4f5a701cac583bc28 SHA1 74c7cff05a029a53099f39cbde8ea0e3c73a5b60 SHA256 372c64481e0cd910e858dc7976ee196515ca11f1294196768d51d30edab2a861 -EBUILD asterisk-1.6.1.18.ebuild 10479 RMD160 2e7c86cfdb9679151762f3a32b427a6c888352b8 SHA1 9fde685ed7730bc7b57536a6e010ed9fbb726134 SHA256 475112fb68a51081ff8d6f44cf707c873b04dd85f121337e77c15c088ccf573f -EBUILD asterisk-1.6.1.19.ebuild 8264 RMD160 6a2fa5e7c95462fec1fd4f6fb287893d56bb1ea8 SHA1 539f3cbc23709d1967eae7dd62fd179304088900 SHA256 4772f70db64c48618cdaf3077b351dc31d8b62128026699c59d02595ff6121f4 -EBUILD asterisk-1.6.1.20.ebuild 8322 RMD160 b6b44ba4647c99bc194d312c9bf0e6c42ec43194 SHA1 51e919aa11bcdf9eaf12f90b3d1cdb2ce09ad9a4 SHA256 2330d6331f2fab8ea5e0c1c48659340ed61d83e968dd6033e2ddf2141ee04b36 -EBUILD asterisk-1.6.2.6.ebuild 9211 RMD160 e69656a72be5e9576f976e2f072d2bf8affa36e3 SHA1 efef04f2db78e91a0da5293dbb8313ca71851ebc SHA256 f7533e8c15b530d34519a63dbf58bb775c683b2885cda7fe9680029e01c78a8c -EBUILD asterisk-1.6.2.7.ebuild 8531 RMD160 fa5d4455f870521e6b8e479893a0cd2fcae332e8 SHA1 8e2b1da767d05fd27ef7ea8d8fe056273ad9f85f SHA256 20dfea934553d6934eb5bc7770e39788067ade57a2d890a6cd587a12a2b790df -EBUILD asterisk-1.6.2.8.ebuild 8626 RMD160 c6279471abd4579704f28b13fb100afc2be817c6 SHA1 7a856b237021a81e179bf747b0dc74d5eb784013 SHA256 12875341a7cbace10a5dc82ab65e51e4ed185135145638fa1be6ef9e89f1b61a -MISC ChangeLog 58754 RMD160 53ea432ac8e1dde0d9617c593594edd7044b4d21 SHA1 ea2724d7987ae569d5eb2a548e9a4e8b61417d2c SHA256 9bf144c78dce427caa5a59a95bd0f34c70285570806457b0f90a41975b4a7790 +EBUILD asterisk-1.6.1.20.ebuild 8325 RMD160 a0f2dc5f4fb01df7360828a0ba5b34ad5645b366 SHA1 1f519ab3ae4907f75e8b180e8798f4f26365e52e SHA256 e97bb14e30be1026d709c52e3c8e7dcb5ed4909ea656b7597d8b22806a0bd0e8 +EBUILD asterisk-1.6.2.8.ebuild 8629 RMD160 7b63984fb5e276f446e57ca8bb2f5b5535a991bf SHA1 1b166b9090101d9d884fe27e64f7ed58baf4799d SHA256 fda301ae139c430534b6b42b1f6c6a7b82d77163942fb7246d41331d564e1d38 +EBUILD asterisk-1.6.2.9.ebuild 8611 RMD160 d245d62cf01aad12f04243005c65a5172f8dfbde SHA1 eb9eeb9aba1c5f464986810049bc2d8c4d7e4e58 SHA256 5feb319d5b79c848910e8df188a9120442f5bd84b8de5e63c1e04fd1083dfcb0 +MISC ChangeLog 59388 RMD160 2c8a517a6fe90cd1e19ae67da3fd692d2668ae4b SHA1 2d56af4ec8c94c767c71a6178daa84d52c6eb3a2 SHA256 813da80062695fdb76de5da78d748192e013ed326dd5dd9c2350544c92cc006f MISC metadata.xml 1194 RMD160 eb5bd4c2f4ca0a72b9c8240ca8b418b571a9fbc6 SHA1 9879daac2d99f61402611c074189d40e7b7686eb SHA256 5cc63816f6f4cbb85c45ceee1621eab11fc2f2b40be963af0c7d834dcbb7959d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwkx8YACgkQp5vW4rUFj5rkZgCggvep4nzOo6jucRt2yZ9XyJg1 +sgsAoLcn9r0Jbv3/YNeq5HMDV35yS/PZ +=ajJO +-----END PGP SIGNATURE----- diff --git a/net-misc/asterisk/asterisk-1.6.1.18.ebuild b/net-misc/asterisk/asterisk-1.6.1.18.ebuild deleted file mode 100644 index 0ae811143b4c..000000000000 --- a/net-misc/asterisk/asterisk-1.6.1.18.ebuild +++ /dev/null @@ -1,412 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.18.ebuild,v 1.2 2010/06/17 20:56:41 patrick Exp $ - -EAPI=1 -inherit eutils autotools - -MY_P="${PN}-${PV/_/-}" - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://downloads.digium.com/pub/telephony/asterisk/releases/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="alsa +caps curl dahdi debug freetds iconv jabber ldap keepsrc misdn newt nosamples odbc oss postgres radius snmp span speex ssl sqlite static vorbis" - -RDEPEND="sys-libs/ncurses - dev-libs/popt - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - caps? ( sys-libs/libcap ) - curl? ( net-misc/curl ) - dahdi? ( >=net-libs/libpri-1.4.7 - net-misc/dahdi-tools ) - freetds? ( dev-db/freetds ) - iconv? ( virtual/libiconv ) - jabber? ( dev-libs/iksemel ) - ldap? ( net-nds/openldap ) - misdn? ( net-dialup/misdnuser ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - 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 ) - ssl? ( dev-libs/openssl ) - vorbis? ( media-libs/libvorbis )" - -DEPEND="${RDEPEND} - ! insecure=port,invite" - ewarn "asterisk.conf: please familiarise yourself with [compat]" - ewarn "extensions.conf: use comma instead of pipe as a separator" - ewarn "- Please read "${ROOT}"usr/share/doc/${PF}/UPGRADE.txt.bz2 after the installation!" - echo - waitaftermsg=1 - fi - - if [[ $waitaftermsg -eq 1 ]]; then - einfo "Press Ctrl+C to abort" - echo - ebeep 10 - fi - - # - # Regular checks - # - einfo "Running some pre-flight checks..." - echo - - if [[ -n "${ASTERISK_MODULES}" ]] ; then - ewarn "You are overriding ASTERISK_MODULES. We will assume you know what you are doing. There is no support for this option, try without if you see breakage." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # - # put pid file(s) into /var/run/asterisk - # - 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.1/${PN}-1.6.1-gsm-pic.patch || die "patch failed" - - # - # add missing LIBS for uclibc - # - epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-uclibc.patch || die "patch failed" - - # - # make sure FXO ports are usable immediately, without requiring an inbound call first - # https://issues.asterisk.org/view.php?id=14577 - # - epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1.6-fxsks-hookstate.patch || die "patch failed" - - # - # add special playback with fax detection - # Code by NewMan telecom, patch scavenged - # by Cory Coager - # http://bugs.gentoo.org/show_bug.cgi?id=298328 - # - epatch "${FILESDIR}"/1.6.2/${PN}-1.6.2.2-nv-faxdetect.patch - - AT_M4DIR=autoconf eautoreconf - - # parse modules list - if [[ -n "${ASTERISK_MODULES}" ]]; then - local x modules="$(get_available_modules)" - - einfo "Custom list of modules specified, checking..." - - use debug && { - einfo "Available modules: ${modules}" - einfo " Selected modules: ${ASTERISK_MODULES}" - } - - for x in ${ASTERISK_MODULES}; do - if [[ "${x}" = "-*" ]]; then - MODULES_LIST="" - else - if has ${x} ${modules} - then - MODULES_LIST="${MODULES_LIST} ${x}" - else - eerror "Unknown module: ${x}" - fi - fi - done - - export MODULES_LIST - fi -} - -src_compile() { - # - # start with configure - # - econf \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - $(use_with alsa asound) \ - $(use_with caps cap) \ - $(use_with curl) \ - $(use_with dahdi pri) \ - $(use_with dahdi tonezone) \ - $(use_with dahdi) \ - $(use_with freetds tds) \ - $(use_with iconv) \ - $(use_with jabber iksemel) \ - $(use_with misdn isdnnet) \ - $(use_with misdn suppserv) \ - $(use_with misdn) \ - $(use_with newt) \ - $(use_with odbc) \ - $(use_with oss) \ - $(use_with postgres) \ - $(use_with radius) \ - $(use_with snmp netsnmp) \ - $(use_with span spandsp) \ - $(use_with speex) \ - $(use_with speex speexdsp) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl crypto) \ - $(use_with ssl) \ - $(use_with vorbis ogg) \ - $(use_with vorbis) || die "econf failed" - - # - # custom module filter - # run menuselect to evaluate the list of modules - # and rewrite the list afterwards - # - if [[ -n "${MODULES_LIST}" ]] - then - local mod category tmp_list failed_list - - ### - # run menuselect - - emake menuselect.makeopts || die "emake menuselect.makeopts failed" - - ### - # get list of modules with failed dependencies - - failed_list="$(awk -F= '/^MENUSELECT_DEPSFAILED=/{ print $3 }' menuselect.makeopts)" - - ### - # traverse our list of modules - - for category in app cdr codec format func pbx res; do - tmp_list="" - - # search list of modules for matching ones first... - for mod in ${MODULES_LIST}; do - # module is from current category? - if [[ "${mod/%_*}" = "${category}" ]] - then - # check menuselect thinks the dependencies are met - if has ${mod} ${failed_list} - then - eerror "${mod}: dependencies required to build this module are not met, NOT BUILDING!" - else - tmp_list="${tmp_list} ${mod}" - fi - fi - done - - use debug && echo "${category} tmp: ${tmp_list}" - - # replace the module list for $category with our custom one - if [[ -n "${tmp_list}" ]] - then - category="$(echo ${category} | tr '[:lower:]' '[:upper:]')" - sed -i -e "s:^\(MENUSELECT_${category}S?\):\1=${tmp_list}:" \ - menuselect.makeopts || die "failed to set list of ${category} applications" - fi - done - fi - - ASTLDFLAGS="${LDFLAGS}" emake || die "emake failed" -} - -src_install() { - # setup directory structure - # - mkdir -p "${D}"usr/lib/pkgconfig - - emake DESTDIR="${D}" install || die "emake install failed" - emake DESTDIR="${D}" samples || die "emake samples failed" - - # remove installed sample files if nosamples flag is set - if use nosamples; then - einfo "Skipping installation of sample files..." - rm -f "${D}"var/lib/asterisk/mohmp3/* - rm -f "${D}"var/lib/asterisk/sounds/demo-* - rm -f "${D}"var/lib/asterisk/agi-bin/* - else - einfo "Sample files have been installed" - fi - rm -rf "${D}"var/spool/asterisk/voicemail/default - - # move sample configuration files to doc directory - if is_ast10update || is_ast12update || is_ast14update; then - einfo "Updating from old (pre-1.6) asterisk version, new configuration files have been installed" - einfo "into "${ROOT}"etc/asterisk, use etc-update or dispatch-conf to update them" - fi - - einfo "Configuration samples have been moved to: "${ROOT}"/usr/share/doc/${PF}/conf" - insinto /usr/share/doc/${PF}/conf - doins "${D}"etc/asterisk/*.conf* - - cd "${D}" - for conffile in etc/asterisk/*.* - do - fowners asterisk:asterisk $conffile - fperms 0660 $conffile - done - cd "${S}" - - # 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.6.1/asterisk.initd3 asterisk - newconfd "${FILESDIR}"/1.6.0/asterisk.confd asterisk - - # some people like to keep the sources around for custom patching - # copy the whole source tree to /usr/src/asterisk-${PVF} and run make clean there - if use keepsrc - then - einfo "keepsrc useflag enabled, copying source..." - dodir /usr/src - - cp -dPR "${S}" "${D}"/usr/src/${PF} || die "copying source tree failed" - - ebegin "running make clean..." - emake -C "${D}"/usr/src/${PF} clean >/dev/null || die "make clean failed" - eend $? - - einfo "Source files have been saved to "${ROOT}"usr/src/${PF}" - fi - - # install the upgrade documentation - # - dodoc README UPGRADE* BUGS CREDITS - - # install snmp mib files - # - if use snmp - then - insinto /usr/share/snmp/mibs/ - doins doc/digium-mib.txt doc/asterisk-mib.txt - fi -} - -pkg_preinst() { - enewgroup asterisk - enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout" -} - -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 - - # - # Warning about 1.x -> 1.6 changes... - # - if is_ast10update || is_ast12update || is_ast14update; then - ewarn "" - ewarn "- Please read "${ROOT}"usr/share/doc/${PF}/UPGRADE.txt.bz2 before continuing" - ewarn "" - fi -} - -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 -} diff --git a/net-misc/asterisk/asterisk-1.6.1.19.ebuild b/net-misc/asterisk/asterisk-1.6.1.19.ebuild deleted file mode 100644 index 017342f843cc..000000000000 --- a/net-misc/asterisk/asterisk-1.6.1.19.ebuild +++ /dev/null @@ -1,318 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.19.ebuild,v 1.2 2010/06/17 20:56:41 patrick Exp $ - -EAPI=3 -inherit autotools base eutils linux-info - -MY_P="${PN}-${PV/_/-}" - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://downloads.digium.com/pub/telephony/asterisk/releases/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="alsa +caps curl dahdi debug freetds iconv jabber ldap keepsrc misdn newt +samples oss postgres radius snmp span speex ssl sqlite static vorbis" - -RDEPEND="sys-libs/ncurses - dev-libs/popt - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - caps? ( sys-libs/libcap ) - curl? ( net-misc/curl ) - dahdi? ( >=net-libs/libpri-1.4.7 - net-misc/dahdi-tools ) - freetds? ( dev-db/freetds ) - iconv? ( virtual/libiconv ) - jabber? ( dev-libs/iksemel ) - ldap? ( net-nds/openldap ) - misdn? ( net-dialup/misdnuser ) - newt? ( dev-libs/newt ) - 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 ) - ssl? ( dev-libs/openssl ) - vorbis? ( media-libs/libvorbis )" - -DEPEND="${RDEPEND} - !/dev/null || die "Unable to clean sources" - eend $? - - einfo "Clean sources are available in "${ROOT}"usr/src/${PF}" - fi - - # install the upgrade documentation - # - dodoc README UPGRADE* BUGS CREDITS - - # install snmp mib files - # - if use snmp - then - insinto /usr/share/snmp/mibs/ - doins doc/digium-mib.txt doc/asterisk-mib.txt - fi -} - -pkg_preinst() { - enewgroup asterisk - enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout" -} - -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 -} - -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 -} diff --git a/net-misc/asterisk/asterisk-1.6.1.20.ebuild b/net-misc/asterisk/asterisk-1.6.1.20.ebuild index f11f40e146f2..0df1b85084ce 100644 --- a/net-misc/asterisk/asterisk-1.6.1.20.ebuild +++ b/net-misc/asterisk/asterisk-1.6.1.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.20.ebuild,v 1.2 2010/06/17 20:56:41 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.20.ebuild,v 1.3 2010/06/25 15:14:09 chainsaw Exp $ EAPI=3 inherit autotools base eutils linux-info @@ -9,7 +9,7 @@ MY_P="${PN}-${PV/_/-}" DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://downloads.digium.com/pub/telephony/asterisk/releases/${MY_P}.tar.gz" +SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/net-misc/asterisk/asterisk-1.6.2.6.ebuild b/net-misc/asterisk/asterisk-1.6.2.6.ebuild deleted file mode 100644 index de5319b4d9ec..000000000000 --- a/net-misc/asterisk/asterisk-1.6.2.6.ebuild +++ /dev/null @@ -1,350 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.6.ebuild,v 1.2 2010/06/17 20:56:41 patrick Exp $ - -EAPI=1 -inherit eutils autotools linux-info - -MY_P="${PN}-${PV/_/-}" - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://downloads.digium.com/pub/telephony/asterisk/releases/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="alsa +caps curl dahdi debug freetds iconv jabber ldap keepsrc misdn newt nosamples oss postgres radius snmp span speex ssl sqlite static vorbis" - -RDEPEND="sys-libs/ncurses - dev-libs/popt - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - caps? ( sys-libs/libcap ) - curl? ( net-misc/curl ) - dahdi? ( >=net-libs/libpri-1.4.7 - net-misc/dahdi-tools ) - freetds? ( dev-db/freetds ) - iconv? ( virtual/libiconv ) - jabber? ( dev-libs/iksemel ) - ldap? ( net-nds/openldap ) - misdn? ( net-dialup/misdnuser ) - newt? ( dev-libs/newt ) - 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 ) - ssl? ( dev-libs/openssl ) - vorbis? ( media-libs/libvorbis )" - -DEPEND="${RDEPEND} - !/dev/null || die "Unable to clean sources" - eend $? - - einfo "Clean sources are available in "${ROOT}"usr/src/${PF}" - fi - - # install the upgrade documentation - # - dodoc README UPGRADE* BUGS CREDITS - - # install snmp mib files - # - if use snmp - then - insinto /usr/share/snmp/mibs/ - doins doc/digium-mib.txt doc/asterisk-mib.txt - fi -} - -pkg_preinst() { - enewgroup asterisk - enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout" -} - -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 -> 1.6.2 changes that you may care about:" - elog "canreinvite -> directmedia (sip.conf)" - elog "extensive T.38 (fax) changes" - 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 -} diff --git a/net-misc/asterisk/asterisk-1.6.2.8.ebuild b/net-misc/asterisk/asterisk-1.6.2.8.ebuild index 9f2a837e6894..4e308cce0569 100644 --- a/net-misc/asterisk/asterisk-1.6.2.8.ebuild +++ b/net-misc/asterisk/asterisk-1.6.2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.8.ebuild,v 1.2 2010/06/17 20:56:41 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.8.ebuild,v 1.3 2010/06/25 15:14:09 chainsaw Exp $ EAPI=3 inherit autotools base eutils linux-info @@ -9,7 +9,7 @@ MY_P="${PN}-${PV/_/-}" DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://downloads.digium.com/pub/telephony/asterisk/releases/${MY_P}.tar.gz" +SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/net-misc/asterisk/asterisk-1.6.2.7.ebuild b/net-misc/asterisk/asterisk-1.6.2.9.ebuild similarity index 92% rename from net-misc/asterisk/asterisk-1.6.2.7.ebuild rename to net-misc/asterisk/asterisk-1.6.2.9.ebuild index 3e2e8eca5705..c3f5c8706ea1 100644 --- a/net-misc/asterisk/asterisk-1.6.2.7.ebuild +++ b/net-misc/asterisk/asterisk-1.6.2.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.7.ebuild,v 1.2 2010/06/17 20:56:41 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.9.ebuild,v 1.1 2010/06/25 15:14:09 chainsaw Exp $ EAPI=3 inherit autotools base eutils linux-info @@ -9,12 +9,12 @@ MY_P="${PN}-${PV/_/-}" DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://downloads.digium.com/pub/telephony/asterisk/releases/${MY_P}.tar.gz" +SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa +caps curl dahdi debug freetds iconv jabber ldap keepsrc misdn newt +samples oss postgres radius snmp span speex ssl sqlite static vorbis" +IUSE="alsa +caps curl dahdi debug freetds iconv jabber ldap lua keepsrc misdn newt +samples oss postgres radius snmp span speex ssl sqlite static vorbis" RDEPEND="sys-libs/ncurses dev-libs/popt @@ -28,6 +28,7 @@ RDEPEND="sys-libs/ncurses iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) + lua? ( dev-lang/lua ) misdn? ( net-dialup/misdnuser ) newt? ( dev-libs/newt ) postgres? ( dev-db/postgresql-base ) @@ -48,7 +49,8 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/1.6.2/${P}-gsm-pic.patch" - "${FILESDIR}/1.6.2/${P}-pri-missing-keyword.patch" + "${FILESDIR}/1.6.2/${PN}-1.6.2.8-pri-missing-keyword.patch" + "${FILESDIR}/1.6.2/${PN}-1.6.2.8-inband-indications.patch" "${FILESDIR}/1.6.1/${PN}-1.6.1-uclibc.patch" "${FILESDIR}/1.6.1/${PN}-1.6.1.6-fxsks-hookstate.patch" "${FILESDIR}/1.6.2/${PN}-1.6.2.2-nv-faxdetect.patch" @@ -74,9 +76,9 @@ pkg_setup() { ewarn "You are overriding ASTERISK_MODULES. We will assume you know what you are doing. There is no support for this option, try without if you see breakage." fi CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is a module written for a single SIP client talking to a - remote server. It is not able to track multiple remote SIP clients registering with - a local server. Critical SIP packets may be dropped." + 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 # parse modules list @@ -128,6 +130,7 @@ src_configure() { $(use_with freetds tds) \ $(use_with iconv) \ $(use_with jabber iksemel) \ + $(use_with lua) \ $(use_with misdn isdnnet) \ $(use_with misdn suppserv) \ $(use_with misdn) \ @@ -213,8 +216,8 @@ src_install() { emake DESTDIR="${D}" samples || die "emake samples failed" for conffile in "${D}"etc/asterisk/*.* do - fowners asterisk:asterisk $conffile - fperms 0660 $conffile + chown asterisk:asterisk $conffile + chmod 0660 $conffile done einfo "Sample files have been installed" else diff --git a/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.9-gsm-pic.patch b/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.9-gsm-pic.patch new file mode 100644 index 000000000000..df85382f0df0 --- /dev/null +++ b/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.9-gsm-pic.patch @@ -0,0 +1,64 @@ +diff -uNr asterisk-1.6.2.9.ORIG/codecs/gsm/Makefile asterisk-1.6.2.9/codecs/gsm/Makefile +--- asterisk-1.6.2.9.ORIG/codecs/gsm/Makefile 2010-03-09 21:39:20.000000000 +0100 ++++ asterisk-1.6.2.9/codecs/gsm/Makefile 2010-03-09 21:39:20.000000000 +0100 +@@ -37,30 +37,6 @@ + ######### ppro's, etc, as well as the AMD K6 and K7. The compile will + ######### probably require gcc. + +-ifeq (,$(findstring $(OSARCH),Darwin SunOS)) +- ifeq (,$(strip $(findstring $(PROC) ,"x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips "))) +- ifeq (,$(strip $(findstring $(shell uname -m) ,"ppc ppc64 alpha armv4l s390 "))) +- OPTIMIZE+=-march=$(PROC) +- endif +- endif +-else +- ifneq (,$(findstring $(OSARCH),Darwin)) +- ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6) +- # Snow Leopard reports i386, even though it's really x86_64 +- OPTIMIZE+=-mtune=native +- endif +- endif +-endif +- +-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. +-#This works for even old (2.96) versions of gcc and provides a small boost either way. +-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. +-#So we go lowest common available by gcc and go a step down, still a step up from +-#the default as we now have a better instruction set to work with. - Belgarath +-ifeq ($(PROC),ultrasparc) +-OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 +-endif +- + PG = + #PG = -g -pg + ######### Profiling flags. If you don't know what that means, leave it blank. +@@ -215,11 +191,9 @@ + # XXX Keep a space after each findstring argument + # XXX should merge with GSM_OBJECTS + ifeq ($(OSARCH),linux-gnu) +-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 )) +-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips )) +-GSM_SOURCES+= $(SRC)/k6opt.s +-endif +-endif ++ ifneq ($(K6OPT),) ++ GSM_SOURCES+= $(SRC)/k6opt.s ++ endif + endif + + TOAST_SOURCES = $(SRC)/toast.c \ +@@ -267,11 +241,9 @@ + $(SRC)/table.o + + ifeq ($(OSARCH),linux-gnu) +-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc )) +-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips )) +-GSM_OBJECTS+= $(SRC)/k6opt.o +-endif +-endif ++ ifneq ($(K6OPT),) ++ GSM_OBJECTS+= $(SRC)/k6opt.o ++ endif + endif + + TOAST_OBJECTS = $(SRC)/toast.o \