Revision bump for enhancements by Jaco Kroon in bugs #300832, #305265 & #328517....
authorTony Vroon <chainsaw@gentoo.org>
Mon, 19 Jul 2010 15:48:51 +0000 (15:48 +0000)
committerTony Vroon <chainsaw@gentoo.org>
Mon, 19 Jul 2010 15:48:51 +0000 (15:48 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

net-misc/asterisk/ChangeLog
net-misc/asterisk/Manifest
net-misc/asterisk/asterisk-1.6.2.9-r1.ebuild [new file with mode: 0644]
net-misc/asterisk/files/1.6.2/asterisk.initd [new file with mode: 0644]
net-misc/asterisk/files/1.6.2/call_data.txt [new file with mode: 0644]
net-misc/asterisk/files/1.6.2/find_call_ids.sh [new file with mode: 0644]
net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh [new file with mode: 0644]
net-misc/asterisk/files/1.6.2/sip_calc_auth [new file with mode: 0644]

index 936e339daea2a7904bb7268f0332ea6504012491..e3b1a41fd40337cbd6a22c4531f740372aff22fd 100644 (file)
@@ -1,6 +1,17 @@
 \# 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.262 2010/06/30 20:42:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.263 2010/07/19 15:48:51 chainsaw Exp $
+
+*asterisk-1.6.2.9-r1 (19 Jul 2010)
+
+  19 Jul 2010; <chainsaw@gentoo.org> +files/1.6.2/asterisk.initd,
+  +files/1.6.2/call_data.txt, +files/1.6.2/find_call_ids.sh,
+  +files/1.6.2/find_call_sip_trace.sh, +files/1.6.2/sip_calc_auth,
+  +asterisk-1.6.2.9-r1.ebuild:
+  Revision bump for enhancements by Jaco Kroon in bugs #300832, #305265 &
+  #328517. This improves the initscript and simplifies the ebuild.
+  Environmental variables for module overrides (which were a bad idea in the
+  first place) are no longer supported.
 
   30 Jun 2010; Justin Lecher <jlec@gentoo.org> asterisk-1.6.1.20.ebuild,
   asterisk-1.6.2.8.ebuild, asterisk-1.6.2.9.ebuild:
index e646355688458b63b909c26540ec55960f363bda..7c2db2c9e0842755d269a2d0c22392027cdf2162 100644 (file)
@@ -41,6 +41,11 @@ AUX 1.6.2/asterisk-1.6.2.8-gsm-pic.patch 2252 RMD160 f679cc186819f95b149f6bc52e8
 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
+AUX 1.6.2/asterisk.initd 6604 RMD160 a21972586bdd043a0a68380d46765b03616950f8 SHA1 433848ac74814e89b668e96fef043eef869d2d8f SHA256 30bcc997a12d454413b48ccb66838c857302c8fe8ad394db7f3fdb7822e84ab8
+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/find_call_sip_trace.sh 530 RMD160 a45c1710a159dd5e7f9dfba51e92981ebb2ab035 SHA1 1e221f910625ce47ad9c84937d8160fdeedb713d SHA256 6818f5cde5f99b7c9be35d20e2c84c61cf0d14f63aa1e3952d0dc91ecb93e3a4
+AUX 1.6.2/sip_calc_auth 493 RMD160 1813bd5aecbb60b38c20752050e6be44cca10f47 SHA1 139db5af00790f7b18e9a3e14948edc683e7e03f SHA256 18590fd24d6fa0b7392228695b764351ac9af25482e22247bf80471858a90c4c
 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
@@ -51,13 +56,14 @@ EBUILD asterisk-1.2.37.ebuild 10640 RMD160 93fb215b75297b8a0f732496652bcc98a6024
 EBUILD asterisk-1.2.40.ebuild 10645 RMD160 5e919275ef9a8999b57414b4f5a701cac583bc28 SHA1 74c7cff05a029a53099f39cbde8ea0e3c73a5b60 SHA256 372c64481e0cd910e858dc7976ee196515ca11f1294196768d51d30edab2a861
 EBUILD asterisk-1.6.1.20.ebuild 8340 RMD160 338197143bc455cb9781301a2143e5a6faa37cac SHA1 d3763e0195d32a878b6d1d99024257d850127ee7 SHA256 1599eb1ec8fa742bea3057bfd9c20dedb8c68fcfa1ecd75c34ade18aa3504364
 EBUILD asterisk-1.6.2.8.ebuild 8644 RMD160 9703624a52ea18ec2e113dbe6f87be9a47104b4f SHA1 194f842daf4b0a21ad2fe66fbe61053b6a7fca48 SHA256 5c7367107187f6067991e21b9e59f6b8f41c1aa585babfe4106b39a5546d4f88
+EBUILD asterisk-1.6.2.9-r1.ebuild 6441 RMD160 0f5981db906e4df22f97ce846b63764544b90159 SHA1 56646d702b2aadb375415392b02a1cc4f2440970 SHA256 b8bc0628a0a034298dbdebe6c88a1322c704f9d260ba9cdbf7c31db724e53645
 EBUILD asterisk-1.6.2.9.ebuild 8626 RMD160 a34e663260d4cdc6037dc39cc37b42c5f968d694 SHA1 420373b8e57f34caf71ae9a46f473ca144eaabc8 SHA256 5b228f4e7699893d51a8a06951b0829e50e033fd967fd0f2b4011916cd8f13fe
-MISC ChangeLog 59544 RMD160 64647e1b98b5a91ab088b5e9c1931cf8533ebbee SHA1 f3efe79479af9c6fba117af2cb26340fe59aeaf8 SHA256 e906a1c54042366ed366311902c0aa8237bbaccc63a26cd1a9caf9f92250a1b2
+MISC ChangeLog 60068 RMD160 dff99bac71cbc41ae31ce5e31c2a49f22f6b4295 SHA1 04e39087289d744987bf953edba61dd3eb2b3044 SHA256 56ed363f38d244ebb77c4b75777cbda789ff08323fab2c56efb5cf0045607845
 MISC metadata.xml 1194 RMD160 eb5bd4c2f4ca0a72b9c8240ca8b418b571a9fbc6 SHA1 9879daac2d99f61402611c074189d40e7b7686eb SHA256 5cc63816f6f4cbb85c45ceee1621eab11fc2f2b40be963af0c7d834dcbb7959d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwrrFUACgkQgAnW8HDreRZIJQCghc0BLwAONhtOwp/gS6j9IPQc
-gRsAoLwSuvyawi+moBXrSOL6sEFq1G4h
-=Q/CP
+iEYEARECAAYFAkxEc+cACgkQp5vW4rUFj5reVACdGv0CYgSFM6+rJTFDHzJglSyA
+5BIAn22UTgSkVBQhO97AIdDI89Fe6tku
+=JTWM
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.6.2.9-r1.ebuild b/net-misc/asterisk/asterisk-1.6.2.9-r1.ebuild
new file mode 100644 (file)
index 0000000..eccce28
--- /dev/null
@@ -0,0 +1,236 @@
+# 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.9-r1.ebuild,v 1.1 2010/07/19 15:48:51 chainsaw Exp $
+
+EAPI=3
+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/releases/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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
+       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 )
+       lua? ( dev-lang/lua )
+       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}
+       !<net-misc/asterisk-addons-1.6
+       !net-misc/asterisk-chan_unistim
+       !net-misc/zaptel"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+       "${FILESDIR}/1.6.2/${P}-gsm-pic.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"
+)
+
+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
+}
+
+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 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 lua) \
+               $(use_with misdn isdnnet) \
+               $(use_with misdn suppserv) \
+               $(use_with misdn) \
+               $(use_with newt) \
+               $(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"
+}
+
+src_compile() {
+       ASTLDFLAGS="${LDFLAGS}" emake || die "emake failed"
+}
+
+src_install() {
+       # setup directory structure
+       #
+       mkdir -p "${D}"usr/$(get_libdir)/pkgconfig
+
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       if use samples; then
+               emake DESTDIR="${D}" samples || die "emake samples failed"
+               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/*
+               rm -f  "${D}"var/lib/asterisk/sounds/demo-*
+               rm -f  "${D}"var/lib/asterisk/agi-bin/*
+               rm -f  "${D}"etc/asterisk/*
+       fi
+       rm -rf "${D}"var/spool/asterisk/voicemail/default
+
+       # 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.2/asterisk.initd 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
+               dodir /usr/src
+
+               ebegin "Copying sources into /usr/src"
+               cp -dPR "${S}" "${D}"/usr/src/${PF} || die "Unable to copy sources"
+               eend $?
+
+               ebegin "Cleaning source tree"
+               emake -C "${D}"/usr/src/${PF} clean &>/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
+
+       # 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"
+}
+
+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/files/1.6.2/asterisk.initd b/net-misc/asterisk/files/1.6.2/asterisk.initd
new file mode 100644 (file)
index 0000000..9462f49
--- /dev/null
@@ -0,0 +1,271 @@
+#!/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.initd,v 1.1 2010/07/19 15:48:50 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() {
+       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
+                       set +o pipefail
+                       result=$?
+               fi              
+
+               if [ $result -eq 0 ]; then
+                       logger -t asterisk_wrapper "Asterisk terminated normally"
+                       break
+               else
+                       if [ $result -gt 128 ]; then
+                               signal=$((result -  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 $(</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
+}
diff --git a/net-misc/asterisk/files/1.6.2/call_data.txt b/net-misc/asterisk/files/1.6.2/call_data.txt
new file mode 100644 (file)
index 0000000..ba9cbbb
--- /dev/null
@@ -0,0 +1,32 @@
+It's sometimes useful to look at SIP conversations in retrospect.  If you have
+a troublesome system, enable sip debug (in the CLI: sip set debug on), set up
+logger.conf to log it to some file and then you can use the two scripts here to
+extract the SIP converssations as seen by asterisk.
+
+find_call_ids.sh:
+
+This script will locate Call-ID values given an A and B number. Just invoke it with:
+
+find_call_ids.sh /path/to/log A-num B-num
+
+eg:
+
+find_call_ids.sh /var/log/asterisk/debug 102 105
+
+To find the Call-IDs for calls going from ext 102 to ext 105 (depends on your
+exact setup and the actual values being passed in the SIP INVITE packets)
+
+find_call_sip_trace.sh
+
+This script will extract a SIP conversation from the log for one or more
+Call-ID values.  Invoke with:
+
+find_call_sip_trace.sh /path/to/log Call-ID [...]
+
+Eg:
+
+find_call_sip_trace.sh /var/log/asterisk/debug 12341665haf434qgrq3@192.168.0.5 123123@192.168.0.3
+
+This will find the SIP packets for those two conversations from the log
+(interleaving the packets in the order asterisk output them - useful for
+analysing the two SIP legs of the same call).
diff --git a/net-misc/asterisk/files/1.6.2/find_call_ids.sh b/net-misc/asterisk/files/1.6.2/find_call_ids.sh
new file mode 100644 (file)
index 0000000..c4689bd
--- /dev/null
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+logfile=$1
+anum=$2
+bnum=$3
+
+function usage()
+{
+       echo "USAGE: $1 logfile anum bnum"
+       exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${anum}" ] || usage $0
+[ -n "${bnum}" ] || usage $0
+
+grep -B2 -P '^INVITE sip:'"${bnum}"'@.*\n(([^F].*|F[^r].*|Fr[^o].*|Fro[^m].*|From[^:]|From:.*<sip:'"${anum}"'@.*>.*)\r\n)+\r\n' "${logfile}" | awk '$4 ~ "^VERBOSE" { dt=$1" "$2" "$3 } $1=="Call-ID:" { if (cid != $2) { cid=$2; print dt" "cid; }}'
diff --git a/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
new file mode 100644 (file)
index 0000000..5b2e69e
--- /dev/null
@@ -0,0 +1,21 @@
+#! /bin/bash
+
+logfile=$1
+callid=$2
+
+function usage()
+{
+       echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
+       exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${callid}" ] || usage $0
+
+shift; shift;
+while [ $# -gt 0 ]; do
+       callid="${callid}|$1"
+       shift
+done
+
+dos2unix < "${logfile}" | grep -P '^.*\n<--- (SIP read|(Reliably )?(Ret|T)ransmitting) .*\n([^<\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^<\n].*)\n)*<-+>$|^.* chan_sip.c: (Reliably )?(Ret|T)ransmitting .*\n([^-\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^-\n].*)\n)*---$'
diff --git a/net-misc/asterisk/files/1.6.2/sip_calc_auth b/net-misc/asterisk/files/1.6.2/sip_calc_auth
new file mode 100644 (file)
index 0000000..3f050ad
--- /dev/null
@@ -0,0 +1,25 @@
+#! /bin/bash
+
+[ $# -lt 7 ] && echo "USAGE: $0 username realm password method uri algorithm nonce" && exit 1
+
+un=$1
+realm=$2
+pw=$3
+method=$4
+uri=$5
+alg=$6
+nonce=$7
+
+echo "Using $un@$realm (secret $pw) for method $method to $uri with nonce $nonce (alg=$alg)"
+
+a1=$un:$realm:$pw
+a2=$method:$uri
+ha1=$(echo -n "$a1" | openssl $alg)
+ha2=$(echo -n "$a2" | openssl $alg)
+resp=$(echo -n "$ha1:$nonce:$ha2" | openssl $alg)
+
+echo "a1=$a1"
+echo "a2=$a2"
+echo "ha1=$ha1"
+echo "ha2=$ha2"
+echo "resp=$resp"