New commits:
commit 64e4c83cd080e6676880a54398e7e7deabb8d6cc
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>
asterisk: added zaptel as optional_depends
commit cbb3a7520d59bee43a9ffdaacbc3f9362880e5c3
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>
zaptel: updated to 1.4.5.1, rework of DETAILS, BUILD and INSTALL
commit 3db733c6dfa824ff4c9b83124a6bdda292d8c13b
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>
asterisk: updated to 1.4.11 and applied upstream patch. SECURITY_PATCH++
commit be7454b7255551daa4ba9c209feac59f1769cf19
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>
asterisk.gpg: Added two upstream keys to the keyring.
Key 1FFB181A was signed by 2 of the 6 already existing upstream keys,
key 8D0CAA72 was signed by 4 of the 6 already existing upstream keys.
diff --git a/asterisk.gpg b/asterisk.gpg
index fec1099..641c035 100644
Binary files a/asterisk.gpg and b/asterisk.gpg differ
diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index 21f9cae..c268a44 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -48,6 +48,11 @@ optional_depends "libpri"
\
"--without-pri" \
"to use your ISDN card with asterisk" &&
+optional_depends "zaptel" \
+ "--with-zaptel" \
+ "--without-zaptel" \
+ "to build drivers for various telephone cards" &&
+
optional_depends "iksemel" \
"--with-iksemel" \
"--without-iksemel" \
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index 4adfe5d..e9eb996 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,5 +1,5 @@
SPELL=asterisk
- VERSION=1.4.10
+ VERSION=1.4.11
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
DOCS="$DOCS UPGRADE.txt BUGS CREDITS"
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
LICENSE[0]=GPL2
KEYWORDS="telephony"
SHORT="Asterisk PBX"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index d7de29f..672ce3b 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,11 @@
+2007-08-25 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 1.4.11
+ SECURITY_PATCH++, Bug #13959
+ * patches/1.4r80750_app_voicemail.c: added patch file to fix a
+ possible crash in IMAP voicemail
+ * PRE_BUILD: apply the patch mentioned above
+ * DEPENDS: added zaptel as optional_depends
+
2007-08-11 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DEPENDS: added iksemel as optional dependency
diff --git a/telephony/asterisk/PRE_BUILD b/telephony/asterisk/PRE_BUILD
index 785fa29..b1b6d27 100755
--- a/telephony/asterisk/PRE_BUILD
+++ b/telephony/asterisk/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+# This patch will be included in 1.4.12 when it is released:
+patch -p2 < $SCRIPT_DIRECTORY/patches/1.4r80750_app_voicemail.c &&
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/patches/1.4r80750_app_voicemail.c
b/telephony/asterisk/patches/1.4r80750_app_voicemail.c
new file mode 100644
index 0000000..25c0efb
--- /dev/null
+++ b/telephony/asterisk/patches/1.4r80750_app_voicemail.c
@@ -0,0 +1,11 @@
+--- branches/1.4/apps/app_voicemail.c 2007/08/24 15:49:37 80749
++++ branches/1.4/apps/app_voicemail.c 2007/08/24 15:51:03 80750
+@@ -4421,7 +4421,7 @@
+ mail_fetchstructure
(vms->mailstream,vms->msgArray[vms->curmsg],&body);
+
+ /* We have the body, now we extract the file name of the first
attachment. */
+- if (body->nested.part->next &&
body->nested.part->next->body.parameter->value) {
++ if (body->nested.part && body->nested.part->next &&
body->nested.part->next->body.parameter->value) {
+ attachedfilefmt =
ast_strdupa(body->nested.part->next->body.parameter->value);
+ } else {
+ ast_log(LOG_ERROR, "There is no file attached to this IMAP
message.\n");
diff --git a/telephony/zaptel/BUILD b/telephony/zaptel/BUILD
index 5ce3e93..1d37397 100755
--- a/telephony/zaptel/BUILD
+++ b/telephony/zaptel/BUILD
@@ -1,7 +1,12 @@
-default_build &&
+OPTS="$OPTS --build=${BUILD}"