Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (64e4c83cd080e6676880a54398e7e7deabb8d6cc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Martin Spitzbarth <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (64e4c83cd080e6676880a54398e7e7deabb8d6cc)
  • Date: Sat, 25 Aug 2007 11:15:45 -0500

GIT changes to master grimoire by Martin Spitzbarth <m.spitzbarth AT gmx.de>:

asterisk.gpg |binary
telephony/asterisk/DEPENDS | 5 +
telephony/asterisk/DETAILS | 4 -
telephony/asterisk/HISTORY | 8 ++
telephony/asterisk/PRE_BUILD | 2
telephony/asterisk/patches/1.4r80750_app_voicemail.c | 11 +++
telephony/zaptel/BUILD | 17 +++--
telephony/zaptel/DEPENDS | 5 +
telephony/zaptel/DETAILS | 62
++++++++++++++-----
telephony/zaptel/HISTORY | 9 ++
telephony/zaptel/INSTALL | 11 +--
11 files changed, 104 insertions(+), 30 deletions(-)

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}"

-local EXE &&
-local BINS="torisatool makefw ztmonitor ztspeed zttool zttest fxotune" &&
-for EXE in $BINS; do
- make $EXE
-done
+[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ $OPTS &&
+
+make KVERS=$(get_kernel_version)
diff --git a/telephony/zaptel/DEPENDS b/telephony/zaptel/DEPENDS
index 5699a66..6b57a77 100755
--- a/telephony/zaptel/DEPENDS
+++ b/telephony/zaptel/DEPENDS
@@ -1,6 +1,11 @@
depends newt &&
depends libpri &&

+optional_depends "libusb" \
+ "--with-usb" \
+ "--without-usb" \
+ "if you have USB telephony hardware" &&
+
# check that the required CRC-CCITT builtin/module is there
# should be redone with config subdepends once linux has them #13716
. $GRIMOIRE/FUNCTIONS &&
diff --git a/telephony/zaptel/DETAILS b/telephony/zaptel/DETAILS
index a454d2a..d4baee1 100755
--- a/telephony/zaptel/DETAILS
+++ b/telephony/zaptel/DETAILS
@@ -1,24 +1,56 @@
SPELL=zaptel
- VERSION=1.4.2.1
+ VERSION=1.4.5.1
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://ftp.digium.com/pub/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:5bf426ba1e5411b557b69d6a2d68b8581b20cd736e3db616fde76daea3e34fe66d9aa598f49d73e5b03f5ec40bb0b584c1f73b22edfda42f07bf243435afbe78
+ SOURCE_URL[0]=http://downloads.digium.com/pub/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_URL[1]=http://ftp2.digium.com/pub/$SPELL/$SOURCE
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+ SOURCE_GPG=asterisk.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
LICENSE[0]=GPL
SHORT="Telephony Interface Driver"
cat << EOF
-supported cards :-
-T400P - Quad Span T1 Card
-E400P - Quad Span E1 Card
-TE405P - Quad Span T1/E1 Card (5v version)
-TE410P - Quad Span T1/E1 Card (3.3v version)
-T100P - Single Span T1 Card
-E100P - Single Span E1 Card
-TE110P - Single Span T1/E1 Card
-X100P - Single port FXO interface
-X101P - Single port FXO interface
-TDM400P - Modular FXS/FXO interface (1-4 ports)
-S100U - Single port FXS USB Interface
+Zaptel is a short for ZAPata TELephony. It provides drivers for
+telephony cards.
+
+The following hardware is supported:
+
+Digital Cards:
+
+- wct4xxp:
+ - Digium newer quad-span T1/E1/J1 cards: Wildcard TE420P/TE410P/TE405P
+ - Digium newer dual-span T1/E1/J1 cards: Wildcard TE220P/TE210P/TE205P
+- wcte12xp: Digium Wildcard TE120P and the TE122P single-span T1/E1/J1
+ card
+- wcte11xp: Digium Wildcard TE110P T1/E1/J1
+- wct1xxp:
+ - Wildcard T100P (old single-span T1)
+ - Wildcard E100P (old single-span E1)
+- tor2: Tormenta quad-span T1/E1 card from the Zapata Telephony project
+- torisa: The old dual-span ISA T1 card from Zapata Telephony
+
+
+Analog Cards:
+
+- wctdm24xxp:
+ - Digium TDM2400P card: up to 24 analog ports
+ - Digium TDM800P card: up to 8 analog ports
+- wctdm: Digium TDM400P card: up to 4 analog ports
+- xpp: Xorcom Astribank: a USB connected unit of up to 32 ports
+ (also BRI)
+- wcfxo: X100P, similar and clones. A simple single-port FXO card
+- wcusb: Digium S100U: A simple single-port USB FXS unit
+
+
+Other Drivers:
+
+- pciradio: Zapata Telephony PCI Quad Radio Interface
+- wctc4xxp: Digium hardware transcoder cards (also need zttranscode)
+- ztd-eth: TDM over Ethernet (TDMoE) driver. Requires ztdynamic
+- ztd-loc: Mirror a local span. Requires ztdynamic
+- ztdummy: A dummy driver that only provides a zaptel timing source.
EOF
diff --git a/telephony/zaptel/HISTORY b/telephony/zaptel/HISTORY
index fde4cd7..aafddb6 100644
--- a/telephony/zaptel/HISTORY
+++ b/telephony/zaptel/HISTORY
@@ -1,3 +1,12 @@
+2007-08-25 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 1.4.5.1
+ converted to upstream signature checking
+ fixed SOURCE_URL and added a mirror
+ Updated long description
+ * DEPENDS: added libusb as optional_depends
+ * BUILD, INSTALL: removed extra treatment of binaries as it
+ is already handled in the Makefile
+
2007-06-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 1.4.2.1
* BUILD: use default_build
diff --git a/telephony/zaptel/INSTALL b/telephony/zaptel/INSTALL
index f5a0a54..3619879 100755
--- a/telephony/zaptel/INSTALL
+++ b/telephony/zaptel/INSTALL
@@ -1,8 +1,5 @@
-default_install
&&
-install -m 644 zaptel.sysconfig $INSTALL_ROOT/etc/sysconfig/zaptel
&&
+make_single
&&
+make KVERS=$(get_kernel_version) install
&&
+make_normal
&&

-local EXE &&
-local BINS="torisatool makefw ztmonitor ztspeed zttest fxotune" &&
-for EXE in $BINS; do
- install -m 544 $EXE $INSTALL_ROOT/sbin
-done
+install -m 644 zaptel.sysconfig $INSTALL_ROOT/etc/sysconfig/zaptel



  • [SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (64e4c83cd080e6676880a54398e7e7deabb8d6cc), Martin Spitzbarth, 08/25/2007

Archive powered by MHonArc 2.6.24.

Top of Page