New commits:
commit d7e382c615283cc7e59e70b077fa516bf25e02c3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
VERSION: 0.13-5
commit 0410bd67c4d48493bba05f41865cd10880967598
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>
amanda: Added missing guru signature file
commit 2079feb41519f386c14329f431ecbfabea627a23
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gurus.gpg: Added my key (0x6B750C1F)
(Binary conflict, copied from test)
commit c3e1f94071dee5cb75d18e67279b56a2bb440974
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>
star: Updated to 1.15a84, SECURITY_PATCH++, Bug 13957
commit c20feb7ab2801cc7d0b5ea62f791b0b027974380
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>
if is_depends_enabled $SPELL lzma-utils; then
patch -p1 < $SPELL_DIRECTORY/tar_lzma.diff
-fi
+fi &&
+
+# The following patch is for bug 13957 and is probably included in 1.19
+cd $SOURCE_DIRECTORY/src &&
+patch -p0 < $SPELL_DIRECTORY/contains_dot_dot.diff &&
+cd $SOURCE_DIRECTORY
diff --git a/archive/tar/contains_dot_dot.diff
b/archive/tar/contains_dot_dot.diff
new file mode 100644
index 0000000..c457c10
--- /dev/null
+++ b/archive/tar/contains_dot_dot.diff
@@ -0,0 +1,15 @@
+--- names.c 2007/06/27 13:30:15 1.63
++++ names.c 2007/08/12 08:25:00 1.64
+@@ -1012,11 +1012,10 @@
+ if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
+ return 1;
+
+- do
++ while (! ISSLASH (*p))
+ {
+ if (! *p++)
+ return 0;
+ }
+- while (! ISSLASH (*p));
+ }
+ }
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/gurus.gpg b/gurus.gpg
index 0959e20..d639f58 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
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 b3f8c05..8474bc0 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,10 @@
+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
+
2007-08-09 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 1.4.10
SECURITY_PATCH++
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");
[SM-Commit] GIT changes to stable-0.13 grimoire by Eric Sandall (d7e382c615283cc7e59e70b077fa516bf25e02c3),
Eric Sandall, 09/26/2007