Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (fdbeb8c32123382e56fbf70d740c50e33fbd9d72)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (fdbeb8c32123382e56fbf70d740c50e33fbd9d72)
  • Date: Tue, 22 Dec 2009 00:20:29 -0600

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

telephony/asterisk/CONFIGURE | 6 +-
telephony/asterisk/DEPENDS | 96
+++++++++++++++++++++++++++++++++----
telephony/asterisk/DETAILS | 10 +--
telephony/asterisk/HISTORY | 13 +++++
telephony/asterisk/INSTALL | 9 ++-
telephony/asterisk/PRE_BUILD | 5 -
telephony/asterisk/init.d/asterisk | 18 ++----
7 files changed, 123 insertions(+), 34 deletions(-)

New commits:
commit fdbeb8c32123382e56fbf70d740c50e33fbd9d72
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

telephony/asterisk: update to 1.6.1.11

This is a big jump forward update that resulted in a lot of changes. It
works for me, but the spell could still use some improving. For example,
I wanted to get custom build tweaking via make menuconfig working in
BUILD, but I had issues of getting the input/output properly passed back
and forth. I don't have a lot of spare time to work on this, so I'm
pushing it out for other devs to pick up where I've left off. However,
it does work for me, so it's at least usable even if not perfect. :)

I'm pushing the gpg key update as a separate commit, since the asterisk
developers seem to deem publishing their key fingerprints (or even just
the IDs) unnecessary. As a result, I can't properly verify the
trustworthiness of the keys the release was signed with. However, there
was a sha1 hash of the release in the same location as the source and
gpg signature, and I did verify the downloaded source against both the
gpg signature with not-so-trustworthy keys and the sha1 hash.

diff --git a/telephony/asterisk/CONFIGURE b/telephony/asterisk/CONFIGURE
index 65bb2b6..8081870 100755
--- a/telephony/asterisk/CONFIGURE
+++ b/telephony/asterisk/CONFIGURE
@@ -1,3 +1,7 @@
config_query ASTERISK_DOXYGEN \
"Build doxygen source code documentation (takes a long time)?" \
- "n"
+ "n" &&
+
+config_query ASTERISK_CONFIGS \
+ "Install sample configs (will be placed in a configs/ dir)?" \
+ "y"
diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index 1d8f976..c04e00d 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -1,34 +1,86 @@
depends "g++" &&
-depends "ncurses" &&
depends "openssl" &&
depends "zlib" &&
-depends "mpg123" &&

if [[ ${ASTERISK_DOXYGEN} == "y" ]]
then
depends "doxygen"
fi &&

-optional_depends "asterisk-sounds" \
- "" \
- "" \
- "for additional sounds" &&
+optional_depends "curl" \
+ "--with-curl" \
+ "--without-curl" \
+ "enable curl support" &&
+
+optional_depends "lua" \
+ "--with-lua" \
+ "--without-lua" \
+ "enable lua support" &&
+
+optional_depends "libusb" \
+ "--with-usb" \
+ "--without-usb" \
+ "enable libusb support" &&
+
+optional_depends "sdl" \
+ "--with-sdl" \
+ "--without-sdl" \
+ "enable sdl support" &&
+
+optional_depends "sdl_image" \
+ "--with-SDL_image" \
+ "--without-SDL_image" \
+ "enable sdl_image support" &&
+
+optional_depends "popt" \
+ "--with-popt" \
+ "--without-popt" \
+ "enable popt (command-line parsing) support" &&
+
+
+message "Sound Driver Options (calls from console):" &&

optional_depends "alsa-lib" \
"--with-asound" \
"--without-asound" \
- "for making calls from the asterisk console" &&
+ "use alsa for console calls" &&
+
+optional_depends "oss" \
+ "--with-oss" \
+ "--without-oss" \
+ "use oss for console calls" &&
+
+optional_depends "jack" \
+ "--with-jack" \
+ "--without-jack" \
+ "use jack for console calls" &&
+
+
+message "Codex and Format Options:" &&

optional_depends "speex" \
"--with-speex" \
"--without-speex" \
"support for the speex codec" &&

+optional_depends "libogg" \
+ "--with-ogg" \
+ "--without-ogg" \
+ "support for the ogg container format" &&
+
optional_depends "libvorbis" \
"--with-vorbis" \
"--without-vorbis" \
"support for the ogg-vorbis codec" &&

+
+message "Storage Backend (database) Options:" &&
+
+optional_depends "ODBC-MGR" \
+ "--with-odbc" \
+ "--without-odbc" \
+ "for ODBC interface as database backend" &&
+
optional_depends "postgresql" \
"--with-postgres" \
"--without-postgres" \
@@ -39,6 +91,19 @@ optional_depends "sqlite"
\
"--without-sqlite" \
"for sqlite as database backend" &&

+optional_depends "openldap" \
+ "--with-ldap" \
+ "--without-ldap" \
+ "for openldap as database backend" &&
+
+optional_depends "C-CLIENT" \
+ "--with-imap" \
+ "--without-imap" \
+ "for imap storage of voicemail" &&
+
+
+message "Core Driver Options:" &&
+
optional_depends "net-snmp" \
"--with-netsnmp" \
"--without-netsnmp" \
@@ -57,9 +122,22 @@ optional_depends "zaptel"
\
optional_depends "iksemel" \
"--with-iksemel" \
"--without-iksemel" \
- "to build the VERY EXPERIMENTAL Asterisk Jabber Interface"
&&
+ "to build the Asterisk Jabber/XMPP Interface" &&
+
+
+message "Interface Options:" &&
+
+optional_depends "gtk+2" \
+ "--with-gtk2" \
+ "--without-gtk2" \
+ "enable gtk+2 support" &&
+
+optional_depends "ncurses" \
+ "--with-ncurses" \
+ "--without-ncurses" \
+ "to build the management console" &&

optional_depends "newt" \
"--with-newt" \
"--without-newt" \
- "to build the manger interface client \"astman\""
+ "to build the manager interface client \"astman\""
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index 4a1acb5..0c2735d 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,12 +1,12 @@
SPELL=asterisk
- VERSION=1.4.21.2
+ VERSION=1.6.1.11
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://downloads.digium.com/pub/${SPELL}/releases/${SOURCE}
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+
SOURCE_URL[0]=http://downloads.asterisk.org/pub/telephony/${SPELL}/releases/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL}.asc
- SOURCE_URL[1]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE}
- SOURCE2_URL[1]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE2}
+ SOURCE_URL[1]=http://downloads.digium.com/pub/${SPELL}/releases/${SOURCE}
+ SOURCE2_URL[1]=http://downloads.digium.com/pub/${SPELL}/releases/${SOURCE2}
SOURCE_GPG=asterisk.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
DOCS="README* CHAN* doc* LICENSE COPYING configs"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index 5d7f034..4031265 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,16 @@
+2009-12-21 Justin Boffemmyer <flux AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.1.11, updated source urls
+ * DEPENDS: removed mpg123 (support for it was dropped upstream) and
+ added missing depends
+ * CONFIGURE: ask to install sample configs (but put them in a custom
+ directory instead of overwriting any installed configs)
+ * PRE_BUILD: removed, not needed
+ * INSTALL: optionally install (via cp) sample configs
+ * init.d/asterisk: streamlined the code, and made the lock file paths
+ more robust (/var/lock/subsys is not guaranteed to exist, but
+ /var/lock is via smgl-fhs, so make the lock file /var/lock/asterisk
+ instead)
+
2008-07-25 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 1.4.21.2
SECURITY_PATCH++, fixes bug 14604 (CVE-2008-3263, CVE-2008-3264)
diff --git a/telephony/asterisk/INSTALL b/telephony/asterisk/INSTALL
index e13825e..f8a907a 100755
--- a/telephony/asterisk/INSTALL
+++ b/telephony/asterisk/INSTALL
@@ -1,3 +1,8 @@
-make_single &&
make install &&
-make_normal
+mkdir -p "$INSTALL_ROOT"/var/lib/asterisk/firmware/iax &&
+
+if [[ "$ASTERISK_CONFIGS" == y ]]
+then
+ mkdir -p "$INSTALL_ROOT"/etc/asterisk/samples &&
+ cp configs/* "$INSTALL_ROOT"/etc/asterisk/samples/
+fi
diff --git a/telephony/asterisk/PRE_BUILD b/telephony/asterisk/PRE_BUILD
deleted file mode 100755
index 785fa29..0000000
--- a/telephony/asterisk/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-sed -i -e "s|/usr/bin/awk|/bin/awk|" main/editline/makelist &&
-sed -i -e "s/OVERWRITE=y/OVERWRITE=n/" Makefile
-
diff --git a/telephony/asterisk/init.d/asterisk
b/telephony/asterisk/init.d/asterisk
index 6778090..563361d 100755
--- a/telephony/asterisk/init.d/asterisk
+++ b/telephony/asterisk/init.d/asterisk
@@ -1,27 +1,21 @@
#!/bin/bash

-PROGRAM=/bin/false
+PROGRAM=/usr/sbin/asterisk
RUNLEVEL=3

. /etc/init.d/smgl_init

-required_executable /usr/sbin/asterisk
-
start()
{
echo "Starting Asterisk"
/usr/sbin/asterisk
- evaluate_retval
- x=$?
- [ ${x} -eq 0 ] && touch /var/lock/subsys/asterisk
+ evaluate_retval && touch /var/lock/asterisk
}

stop()
{
echo "Shutting down Asterisk"
- killproc asterisk
- x=$?
- [ ${x} -eq 0 ] && rm -f /var/lock/subsys/asterisk
+ killproc asterisk && rm -f /var/lock/asterisk
}

restart()
@@ -33,14 +27,14 @@ restart()
reload()
{
echo "reloading Asterisk"
- /usr/sbin/asterisk -rx 'reload' > /dev/null 2> /dev/null
+ /usr/sbin/asterisk -rx 'reload' > /dev/null 2>&1
evaluate_retval
}

status()
{
- if [[ -f /var/lock/subsys/asterisk ]]; then
- statusproc asterisk
+ if [[ -f /var/lock/asterisk ]]; then
+ statusproc asterisk
else
echo "Asterisk is not loaded"
fi



  • [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (fdbeb8c32123382e56fbf70d740c50e33fbd9d72), Justin Boffemmyer, 12/22/2009

Archive powered by MHonArc 2.6.24.

Top of Page