# 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.362 2011/12/12 18:36:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.363 2011/12/17 20:07:52 chainsaw Exp $
+
+*asterisk-1.8.8.0 (17 Dec 2011)
+
+ 17 Dec 2011; Tony Vroon <chainsaw@gentoo.org> +files/1.8.0/asterisk.initd2,
+ -files/1.6.2/asterisk.initd2, -files/1.6.2/asterisk.initd3,
+ +asterisk-1.8.8.0.ebuild:
+ Version bump on the 1.8 branch; primarily a bugfix release. Patch by Jaco
+ Kroon addresses bug #394459 by Agostino "ago" Sarubbo.
12 Dec 2011; Agostino Sarubbo <ago@gentoo.org> asterisk-1.8.7.2.ebuild:
Stable for AMD64, wrt security bug #394095
+-----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
AUX 1.6.2/asterisk.logrotate3 436 RMD160 06a98d2a908464a951e3386a2681f5829dcb0220 SHA1 31331f8fabc643f722a1c12cee0557e0268019ea SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26
AUX 1.6.2/call_data.txt 1120 RMD160 cee46a6b1e11b19cd0f9ce78e550373f480731b0 SHA1 fd9520418c36cfc740043bfab51f39e22eb07313 SHA256 24a5b8dab0f46ffff6dddc50d4ab8d498ec90bc2a0977249f65471b3f0948a0b
AUX 1.6.2/find_call_ids.sh 446 RMD160 e3e46295e7a4b7fdc2364c5ddfbe76290311a6fd SHA1 a1fd3e1a62e93c2cf41e9eb50ed0b95b6c666ba8 SHA256 742289cc719fbf0f119e05516b20da3fef78908f5dd08f56eaa49abe10104e77
AUX 1.6.2/sip_calc_auth 493 RMD160 1813bd5aecbb60b38c20752050e6be44cca10f47 SHA1 139db5af00790f7b18e9a3e14948edc683e7e03f SHA256 18590fd24d6fa0b7392228695b764351ac9af25482e22247bf80471858a90c4c
AUX 1.8.0/asterisk.confd 2203 RMD160 00d92671d00ff495d1651ec064fec8c790f94f6c SHA1 3da25f263e8bdeda7130ed03f9aced379591875f SHA256 32f60bc5ff42edb1ecda236f6e87d67fd723533658bd1efb6085e87736536969
AUX 1.8.0/asterisk.initd 6511 RMD160 183128f493953a1dc9241e2966398c6e5f3e1365 SHA1 13ff4c28dc86d5bd534b43b2b08763f8ec19baa1 SHA256 88028e2c8cf78414725697c2121bbb861a18869f7675d4b814fcb8fecfe71586
+AUX 1.8.0/asterisk.initd2 6522 RMD160 7c472eff7ee817dd3d8b3d228f66b27f2341fb91 SHA1 aa30a4b18e0952f68263493f25947caeff6aa514 SHA256 77db24b411744ea7897c3609c116315b3c71c24281012eea4f79f996df58e747
DIST asterisk-1.8.7.1.tar.gz 28557326 RMD160 e69d6f6c555f52b8c6bd16428c9e64a22988e736 SHA1 c29671daaca5725b4f4257a972c2fe88effbc16e SHA256 46a713113705f9c747f19b5c5bfd31ee2ebd7db221eb9aa4ca8c817d531f95f3
DIST asterisk-1.8.7.2.tar.gz 28870981 RMD160 14bde4270f62852ce4d7dec5028af9824341e98b SHA1 55eb86a453ba8f0ae81ac36c26b145c5b67499b3 SHA256 5d7d3e35051d39c6a5551196a40955542fda331eea82c95cba528b7e2366a448
+DIST asterisk-1.8.8.0.tar.gz 24787461 RMD160 16d4954f9411af1bb5117929ee39dc9584cebb1b SHA1 3ed3d1dc24d76d381cbe65c7bbacd8d634a6dea8 SHA256 57541b45953dbc28ed2c4615032ac18ab1489bf2373f5cfe42d8d2fab737f801
DIST asterisk-10.0.0-rc3.tar.gz 24711837 RMD160 c3023205fc772b3ff0d023eb1349771605fb5fcc SHA1 253a143398e5dbcecbff5fbf5b90419222d58f74 SHA256 515d8c6008d089c6fad76bc973083ee9c8980fdecdf0511325477a900b647ea9
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
+DIST gentoo-asterisk-patchset-1.7.tar.bz2 30115 RMD160 78a9a74f0346339d63badec8e6cb001135eedde9 SHA1 81b5cfea40616d047baf866c741738f0a8037f36 SHA256 0eff0193130f5a08a0e04cc1c4ab52c535dfeea21d9894a3461b143f40c8add2
DIST gentoo-asterisk-patchset-2.0.tar.bz2 6125 RMD160 75fa8bf76e11ee12025ed3f38ab06998a752ad59 SHA1 f38a963c8d479a248b151f089fe172a701d6b505 SHA256 b02fb7e7e1d281a653fd98d7389a0a1777376398572c06ecb912fe7ed0b6c9e2
EBUILD asterisk-1.8.7.1.ebuild 14423 RMD160 ac4edbba788830ab10237d3f4a3ab743aee7bd70 SHA1 127e0deff4a40acd49b5adf6e247977efc7f507b SHA256 220eba22c0217d08b69efe0c715b417996b20eda7c509142544b7f69ba3d47aa
EBUILD asterisk-1.8.7.2.ebuild 8432 RMD160 12df101f0d6034ad8de4df44a1cc99b2e6dea4b1 SHA1 5ddee1d6b4c3aa7e7ef1ecb696abced0ed709bc2 SHA256 b899a7a15bb7f5de42da0fd28545de36c4e390e85b343f57025a77474f92f221
+EBUILD asterisk-1.8.8.0.ebuild 8439 RMD160 19c4397764ff0f71a8d6e17722535db977fddfe6 SHA1 e7090968b820cc762eae245a65c80592c2cc36e2 SHA256 b494eca7d22701de93ab939d1b23f543f56178c2640c8cf792bccdd4b38de7c0
EBUILD asterisk-10.0.0_rc3.ebuild 8519 RMD160 d0b13fd2903e9a060ac98e6cd70f59c3253b9e50 SHA1 e7983695195ee509f326ebfa1ec6da7fc1e171b4 SHA256 8733d16d1d3a983634c47bfa79a2863dcabd3f0c45418a8aa1fbf8a6549fd4e4
-MISC ChangeLog 91765 RMD160 c3a31718250cf74cc548027ad5f5d347e4c8141c SHA1 5a24a891d2106355bb13ffb5b210000a2d7f9a6a SHA256 c420418cbdc5b5376621ac1958b366802abb1bb4c76a0866afc9f40dfa8618b5
+MISC ChangeLog 92105 RMD160 7169f7f4831da5cede67c127fd97fcb5d449defc SHA1 881a845c3ac0b220899706d60ead318d2e4ebb69 SHA256 51a22f1177287763d66aea57ecad1f001f4b1fecbd89f479b29d3da3e49d480c
MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk7s9rMACgkQp5vW4rUFj5r7VwCfQni7ryC1sVn1haAEZGwXWOLo
+iQoAn0wFLtpBSaSRCgoQaxprBzqV1cEt
+=ZXxn
+-----END PGP SIGNATURE-----
--- /dev/null
+# 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.8.0.ebuild,v 1.1 2011/12/17 20:07:52 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.7.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 sqlite sqlite3 srtp static syslog usb vorbis"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+RDEPEND="dev-libs/popt
+ dev-libs/libxml2
+ dev-libs/openssl
+ 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 )
+ 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 )
+ 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-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-ssl \
+ --with-z \
+ $(use_with caps cap) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with portaudio)
+
+ # 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
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+ menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+ menuselect/menuselect --enable func_aes menuselect.makeopts
+ menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ menuselect/menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ use_select ais res_ais
+ use_select alsa chan_alsa
+ use_select bluetooth chan_mobile
+ use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ use_select curl func_curl res_config_curl res_curl
+ use_select dahdi app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+ use_select freetds {cdr,cel}_tds
+ use_select gtalk chan_gtalk
+ use_select http res_http_post
+ use_select iconv func_iconv
+ use_select jabber res_jabber
+ use_select jingle chan_jingle
+ use_select ldap res_config_ldap
+ use_select lua pbx_lua
+ use_select mysql app_mysql cdr_mysql res_config_mysql
+ use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ use_select osplookup app_osplookup
+ use_select oss chan_oss
+ use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ use_select radius {cdr,cel}_radius
+ use_select snmp res_snmp
+ use_select span res_fax_spandsp
+ use_select speex {codec,func}_speex
+ use_select sqlite cdr_sqlite
+ use_select sqlite3 {cdr,cel}_sqlite3_custom
+ use_select srtp res_srtp
+ use_select syslog cdr_syslog
+ use_select usb chan_usbradio
+ use_select vorbis format_ogg_vorbis
+}
+
+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.initd2 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
+}
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.6.2/asterisk.initd3,v 1.1 2010/12/02 13:37:30 chainsaw Exp $
-
-opts="${opts} forcestop reload"
-
-depend() {
- need net
- use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
- if [ -z "`pidof asterisk`" ]; then
- return 1
- else
- PID="`cat /var/run/asterisk/asterisk.pid`"
- for x in `pidof asterisk`; do
- if [ "${x}" = "${PID}" ]; then
- return 0
- fi
- done
- fi
-
- return 1
-}
-
-asterisk_run_loop() {
- logger -t asterisk_wrapper "Initializing asterisk wrapper"
-
- local OPTS ARGS MSG NICE=""
- local result=0 signal=0
-
- # default options
- OPTS="-f" # don't fork / detach breaks wrapper script...
-
- # filter (redundant) arguments
- ARGS="`echo "${@}" | sed -e "s:-c\|-f::g"`"
-
- # mangle yes/no options
- ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
-
- if [ -n "${ASTERISK_CORE_SIZE}" ] &&
- [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
- ulimit -c ${ASTERISK_CORE_SIZE}
-
- if [ -n "${ASTERISK_CORE_DIR}" ] && \
- [ ! -d "${ASTERISK_CORE_DIR}" ]
- then
- mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
- if [ -n "${ASTERISK_USER}" ]; then
- chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
- fi
- fi
- ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
- cd "${ASTERISK_CORE_DIR}"
- echo " Core dump size : ${ASTERISK_CORE_SIZE}"
- echo " Core dump location : ${ASTERISK_CORE_DIR}"
- fi
-
- if [ -n "${ASTERISK_MAX_FD}" ]; then
- ulimit -n ${ASTERISK_MAX_FD}
- echo " Max open filedescriptors : ${ASTERISK_MAX_FD}"
- fi
-
- if [ -n "${ASTERISK_NICE}" ]; then
- echo " Nice level : ${ASTERISK_NICE}"
- NICE="nice -n ${ASTERISK_NICE} --"
- fi
-
- if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
- if [ -x /usr/sbin/sendmail ]; then
- echo " Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
- else
- echo " Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
- unset ASTERISK_NOTIFY_EMAIL
- fi
- fi
-
- if [ -n "${ASTERISK_TTY}" ]; then
- for x in ${ASTERISK_TTY} \
- /dev/tty${ASTERISK_TTY} \
- /dev/vc/${ASTERISK_TTY}
- do
- if [ -c "${x}" ]; then
- TTY="${x}"
- fi
- done
- [ -n "${TTY}" ] && \
- echo " Messages are sent to : ${TTY}"
- fi
-
- if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
- echo " Starting Asterisk console : ${ASTERISK_CONSOLE}"
- OPTS="${OPTS} -c"
- fi
-
- OPTS="${OPTS} ${ARGS}"
-
- trap "rm /var/run/asterisk/wrapper_loop.pid" EXIT
- cut -f4 -d' ' < /proc/self/stat > /var/run/asterisk/wrapper_loop.pid
-
- while :; do
- if [ -n "${TTY}" ]; then
- /usr/bin/stty -F ${TTY} sane
- ${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
- result=$?
- else
- set -o pipefail
- ${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null | logger -t asterisk_wrapper
- result=$?
- set +o pipefail
- fi
-
- if [ $result -eq 0 ]; then
- logger -t asterisk_wrapper "Asterisk terminated normally"
- break
- else
- if [ $result -gt 128 ]; then
- signal=`expr $signal - 128`
- MSG="Asterisk terminated with Signal: $signal"
-
- CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
-
- local CORE_DUMPED=0
- if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
- mv "${ASTERISK_CORE_DIR}/core" \
- "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
- CORE_DUMPED=1
-
- elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
- mv "${ASTERISK_CORE_DIR}/core.${PID}" \
- "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
- CORE_DUMPED=1
-
- fi
-
- [ $CORE_DUMPED -eq 1 ] && \
- MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
- else
- MSG="Asterisk terminated with return code: $result"
- fi
-
- # kill left-over tasks
- for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
- kill -9 `pidof ${X}`;
- done
- fi
-
- [ -n "${TTY}" ] \
- && echo "${MSG}" >${TTY} \
- || logger -t asterisk_wrapper "${MSG}"
-
-
- if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
- [ -x /usr/sbin/sendmail ]; then
- echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
- /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
- fi
- sleep 5
- logger -t asterisk_wrapper "Restarting Asterisk..."
- done
- return 0
-}
-
-start() {
- local OPTS USER GROUP PID
- local tmp x
-
- if [ -n "${ASTERISK_NICE}" ]; then
- if [ ${ASTERISK_NICE} -ge -20 ] && \
- [ ${ASTERISK_NICE} -le 19 ]; then
- OPTS="--nicelevel ${ASTERISK_NICE}"
- else
- eerror "Nice value must be between -20 and 19"
- return 1
- fi
- fi
-
- if [ -n "${ASTERISK_USER}" ]; then
- USER=`echo $ASTERISK_USER | sed 's/:.*//'`
- GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
- if [ -n "${USER}" ]; then
- ASTERISK_OPTS="${ASTERISK_OPTS} -U ${USER}"
- fi
- if [ -n "${GROUP}" ]; then
- ASTERISK_OPTS="${ASTERISK_OPTS} -G ${GROUP}"
- GROUP=":${GROUP}" # make it look nice...
- fi
- for element in `find /var/{log,run}/asterisk`; do
- if [ `stat -c %U $element` != "${USER}" ]; then
- ewarn "${USER} is not the owner of $element, fixing."
- chown -R ${USER} /var/{log,run}/asterisk
- chmod -R u+r /var/{log,run}/asterisk
- chmod u+x /var/{log,run}/asterisk
- fi;
- done;
- ebegin "Starting asterisk PBX (as ${USER}${GROUP})"
- else
- ebegin "Starting asterisk PBX (as root)"
- fi
-
- if [ "`echo ${ASTERISK_WRAPPER} | tr '[:upper:]' '[:lower:]'`" != "yes" ]; then
- start-stop-daemon --start --exec /usr/sbin/asterisk \
- ${OPTS} -- ${ASTERISK_OPTS}
- result=$?
- else
- asterisk_run_loop ${ASTERISK_OPTS} 2>/dev/null &
- result=$?
- fi
-
- if [ $result -eq 0 ]; then
- # 2 seconds should be enough for asterisk to start
- sleep 2
- is_running
- result=$?
- fi
-
- eend $result
-}
-
-forcestop() {
- ebegin "Stopping asterisk PBX"
- start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
- eend $?
-}
-
-stop() {
- if ! is_running; then
- eerror "Asterisk is not running!"
- return 0
- fi
-
- if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
- ebegin "Killing wrapper script"
- kill `cat /var/run/asterisk/wrapper_loop.pid`
- eend $?
- fi
-
- ebegin "Stopping asterisk PBX gracefully"
- /usr/sbin/asterisk -r -x "core stop gracefully" &>/dev/null
- # Now we have to wait until asterisk has _really_ stopped.
- sleep 1
- if is_running; then
- einfon "Waiting for asterisk to shutdown ."
- local cnt=0
- while is_running; do
- cnt=`expr $cnt + 1`
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- return
- fi
- sleep 2
- echo -n "."
- done
- echo
- fi
- eend 0
-}
-
-reload() {
- if is_running; then
- ebegin "Forcing asterisk to reload configuration"
- /usr/sbin/asterisk -r -x "reload" &>/dev/null
- eend $?
- else
- eerror "Asterisk is not running!"
- fi
-}
#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.6.2/asterisk.initd2,v 1.1 2010/08/20 23:12:53 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.initd2,v 1.1 2011/12/17 20:07:52 chainsaw Exp $
-opts="${opts} forcestop reload"
+extra_started_commands="forcestop reload"
depend() {
need net
}
asterisk_run_loop() {
- logger -t asterisk_wrapper "Initializing asterisk wrapper"
-
- local OPTS ARGS MSG NICE=""
local result=0 signal=0
- # default options
- OPTS="-f" # don't fork / detach breaks wrapper script...
-
- # filter (redundant) arguments
- ARGS="`echo "${@}" | sed -e "s:-c\|-f::g"`"
-
- # mangle yes/no options
- ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
-
- if [ -n "${ASTERISK_CORE_SIZE}" ] &&
- [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
- ulimit -c ${ASTERISK_CORE_SIZE}
-
- if [ -n "${ASTERISK_CORE_DIR}" ] && \
- [ ! -d "${ASTERISK_CORE_DIR}" ]
- then
- mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
- if [ -n "${ASTERISK_USER}" ]; then
- chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
- fi
- fi
- ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
- cd "${ASTERISK_CORE_DIR}"
- echo " Core dump size : ${ASTERISK_CORE_SIZE}"
- echo " Core dump location : ${ASTERISK_CORE_DIR}"
- fi
-
- if [ -n "${ASTERISK_MAX_FD}" ]; then
- ulimit -n ${ASTERISK_MAX_FD}
- echo " Max open filedescriptors : ${ASTERISK_MAX_FD}"
- fi
-
- if [ -n "${ASTERISK_NICE}" ]; then
- echo " Nice level : ${ASTERISK_NICE}"
- NICE="nice -n ${ASTERISK_NICE} --"
- fi
-
- if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
- if [ -x /usr/sbin/sendmail ]; then
- echo " Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
- else
- echo " Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
- unset ASTERISK_NOTIFY_EMAIL
- fi
- fi
-
- if [ -n "${ASTERISK_TTY}" ]; then
- for x in ${ASTERISK_TTY} \
- /dev/tty${ASTERISK_TTY} \
- /dev/vc/${ASTERISK_TTY}
- do
- if [ -c "${x}" ]; then
- TTY="${x}"
- fi
- done
- [ -n "${TTY}" ] && \
- echo " Messages are sent to : ${TTY}"
- fi
-
- if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
- echo " Starting Asterisk console : ${ASTERISK_CONSOLE}"
- OPTS="${OPTS} -c"
- fi
-
- OPTS="${OPTS} ${ARGS}"
+ echo "Initializing asterisk wrapper"
+ OPTS="$*"
trap "rm /var/run/asterisk/wrapper_loop.pid" EXIT
cut -f4 -d' ' < /proc/self/stat > /var/run/asterisk/wrapper_loop.pid
result=$?
else
set -o pipefail
- ${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null | logger -t asterisk_wrapper
- set +o pipefail
+ ${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
result=$?
+ set +o pipefail
fi
if [ $result -eq 0 ]; then
- logger -t asterisk_wrapper "Asterisk terminated normally"
+ echo "Asterisk terminated normally"
break
else
if [ $result -gt 128 ]; then
- signal=`expr $signal - 128`
+ signal=`expr $result - 128`
MSG="Asterisk terminated with Signal: $signal"
CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
[ -n "${TTY}" ] \
&& echo "${MSG}" >${TTY} \
- || logger -t asterisk_wrapper "${MSG}"
+ || echo "${MSG}"
if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
/usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
fi
- sleep 5
- logger -t asterisk_wrapper "Restarting Asterisk..."
+ sleep "${ASTERISK_RESTART_DELAY}"
+ echo "Restarting Asterisk..."
done
return 0
}
start() {
- local OPTS USER GROUP PID
+ local OPTS USER GROUP PID NICE=""
local tmp x
+ local OPTS ARGS
+
+ ebegin "Starting asterisk PBX"
+
+ eindent
+
+ # filter (redundant) arguments
+ OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
+
+ # default options
+ OPTS="${OPTS} -f" # don't fork / detach breaks wrapper script...
+
+ # mangle yes/no options
+ ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
+
+ ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
+ [ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+ if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+ [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+ ulimit -c ${ASTERISK_CORE_SIZE}
+
+ if [ -n "${ASTERISK_CORE_DIR}" ] && \
+ [ ! -d "${ASTERISK_CORE_DIR}" ]
+ then
+ mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+ if [ -n "${ASTERISK_USER}" ]; then
+ chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+ fi
+ fi
+ ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+ cd "${ASTERISK_CORE_DIR}"
+ einfo "Core dump size : ${ASTERISK_CORE_SIZE}"
+ einfo "Core dump location : ${ASTERISK_CORE_DIR}"
+
+ OPTS="${OPTS} -g"
+ fi
+
+ if [ -n "${ASTERISK_MAX_FD}" ]; then
+ ulimit -n ${ASTERISK_MAX_FD}
+ einfo "Max open filedescriptors : ${ASTERISK_MAX_FD}"
+ fi
+
if [ -n "${ASTERISK_NICE}" ]; then
if [ ${ASTERISK_NICE} -ge -20 ] && \
[ ${ASTERISK_NICE} -le 19 ]; then
- OPTS="--nicelevel ${ASTERISK_NICE}"
+ einfo "Nice level : ${ASTERISK_NICE}"
+ NICE="nice -n ${ASTERISK_NICE} --"
else
eerror "Nice value must be between -20 and 19"
return 1
fi
fi
+ if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+ if [ -x /usr/sbin/sendmail ]; then
+ einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+ else
+ ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+ unset ASTERISK_NOTIFY_EMAIL
+ fi
+ fi
+
+ if [ -n "${ASTERISK_TTY}" ]; then
+ for x in ${ASTERISK_TTY} \
+ /dev/tty${ASTERISK_TTY} \
+ /dev/vc/${ASTERISK_TTY}
+ do
+ if [ -c "${x}" ]; then
+ TTY="${x}"
+ fi
+ done
+ [ -n "${TTY}" ] && \
+ einfo "Messages are sent to : ${TTY}"
+ fi
+
+ if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+ einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+ OPTS="${OPTS} -c"
+ fi
+
if [ -n "${ASTERISK_USER}" ]; then
USER=`echo $ASTERISK_USER | sed 's/:.*//'`
GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
if [ -n "${USER}" ]; then
- ASTERISK_OPTS="${ASTERISK_OPTS} -U ${USER}"
+ OPTS="${OPTS} -U ${USER}"
fi
if [ -n "${GROUP}" ]; then
- ASTERISK_OPTS="${ASTERISK_OPTS} -G ${GROUP}"
+ OPTS="${OPTS} -G ${GROUP}"
GROUP=":${GROUP}" # make it look nice...
fi
for element in `find /var/{log,run}/asterisk`; do
chmod u+x /var/{log,run}/asterisk
fi;
done;
- ebegin "Starting asterisk PBX (as ${USER}${GROUP})"
+ einfo "Starting asterisk as : ${USER}${GROUP}"
else
- ebegin "Starting asterisk PBX (as root)"
+ ewarn "Starting asterisk as root is not recommended."
fi
- if [ "`echo ${ASTERISK_WRAPPER} | tr '[:upper:]' '[:lower:]'`" != "yes" ]; then
- start-stop-daemon --start --exec /usr/sbin/asterisk \
- ${OPTS} -- ${ASTERISK_OPTS}
- result=$?
- else
- asterisk_run_loop ${ASTERISK_OPTS} 2>/dev/null &
- result=$?
- fi
+ asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
+ result=$?
if [ $result -eq 0 ]; then
# 2 seconds should be enough for asterisk to start
result=$?
fi
+ eoutdent
eend $result
}
reload() {
if is_running; then
ebegin "Forcing asterisk to reload configuration"
- /usr/sbin/asterisk -r -x "reload" &>/dev/null
+ /usr/sbin/asterisk -r -x "module reload" &>/dev/null
eend $?
else
eerror "Asterisk is not running!"
projects / gentoo.git / commitdiff