Author: stefan
Date: Sun Dec 3 20:09:16 2006
New Revision: 90287
Added:
packages/cooker/zaptel/current/SOURCES/modprobe.conf
packages/cooker/zaptel/current/SOURCES/zaptel-1.4.0-beta2-russian_zonedata.diff
packages/cooker/zaptel/current/SOURCES/zaptel.init
packages/cooker/zaptel/current/SOURCES/zaptel.sysconfig
Removed:
packages/cooker/zaptel/current/SOURCES/modprobe.conf.bz2
packages/cooker/zaptel/current/SOURCES/zaptel-1.4.0-mdv.diff
packages/cooker/zaptel/current/SOURCES/zaptel.init.bz2
packages/cooker/zaptel/current/SOURCES/zaptel.sysconfig.bz2
Modified:
packages/cooker/zaptel/current/SPECS/zaptel.spec
Log:
- Changes by Roman Gorshunov <[EMAIL PROTECTED]>
- added russian tonezone patch
- added /etc/modprobe.d/zaptel.conf, /etc/rc.d/init.d/zaptel,
/ets/sysconfig/zaptel files to dkms
- added zaptranscode device to udev rules
- some other small fixes
Added: packages/cooker/zaptel/current/SOURCES/modprobe.conf
==============================================================================
--- (empty file)
+++ packages/cooker/zaptel/current/SOURCES/modprobe.conf Sun Dec 3
20:09:16 2006
@@ -0,0 +1,22 @@
+# automatically generated file; do not edit
+install pciradio /sbin/modprobe --ignore-install pciradio $CMDLINE_OPTS &&
/sbin/ztcfg
+install tor2 /sbin/modprobe --ignore-install tor2 $CMDLINE_OPTS && /sbin/ztcfg
+install torisa /sbin/modprobe --ignore-install torisa $CMDLINE_OPTS &&
/sbin/ztcfg
+install wcfxo /sbin/modprobe --ignore-install wcfxo $CMDLINE_OPTS &&
/sbin/ztcfg
+install wct1xxp /sbin/modprobe --ignore-install wct1xxp $CMDLINE_OPTS &&
/sbin/ztcfg
+install wct4xxp /sbin/modprobe --ignore-install wct4xxp $CMDLINE_OPTS &&
/sbin/ztcfg
+install wctdm /sbin/modprobe --ignore-install wctdm $CMDLINE_OPTS &&
/sbin/ztcfg
+install wctdm24xxp /sbin/modprobe --ignore-install wctdm24xxp $CMDLINE_OPTS &&
/sbin/ztcfg
+install wcte11xp /sbin/modprobe --ignore-install wcte11xp $CMDLINE_OPTS &&
/sbin/ztcfg
+install wcusb /sbin/modprobe --ignore-install wcusb $CMDLINE_OPTS &&
/sbin/ztcfg
+install zaptel /sbin/modprobe --ignore-install zaptel $CMDLINE_OPTS &&
/sbin/ztcfg
+install ztd-eth /sbin/modprobe --ignore-install ztd-eth $CMDLINE_OPTS &&
/sbin/ztcfg
+install ztd-loc /sbin/modprobe --ignore-install ztd-loc $CMDLINE_OPTS &&
/sbin/ztcfg
+install ztdummy /sbin/modprobe --ignore-install ztdummy $CMDLINE_OPTS &&
/sbin/ztcfg
+install ztdynamic /sbin/modprobe --ignore-install ztdynamic $CMDLINE_OPTS &&
/sbin/ztcfg
+install xpp /sbin/modprobe --ignore-install xpp $CMDLINE_OPTS && /sbin/ztcfg
+install xpd_fxo /sbin/modprobe --ignore-install xpd_fxo $CMDLINE_OPTS &&
/sbin/ztcfg
+install xpd_fxs /sbin/modprobe --ignore-install xpd_fxs $CMDLINE_OPTS &&
/sbin/ztcfg
+install xpp_usb /sbin/modprobe --ignore-install xpp_usb $CMDLINE_OPTS &&
/sbin/ztcfg
+alias wcfxs wctdm
+alias wct2xxp wct4xxp
Added:
packages/cooker/zaptel/current/SOURCES/zaptel-1.4.0-beta2-russian_zonedata.diff
==============================================================================
--- (empty file)
+++
packages/cooker/zaptel/current/SOURCES/zaptel-1.4.0-beta2-russian_zonedata.diff
Sun Dec 3 20:09:16 2006
@@ -0,0 +1,25 @@
+--- zonedata.c.mdk 2006-06-21 23:30:21.000000000 +0400
++++ zonedata.c 2006-12-01 19:01:54.000000000 +0300
+@@ -607,5 +607,22 @@
+ { ZT_TONE_STUTTER,
"!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425"
},
+ },
+ },
++ { 39, "ru", "Russian Federation", { 1000, 4000 },
++ {
++ /* References:
++ http://www.minsvyaz.ru/site.shtml?id=1806
++ http://www.aboutphone.info/lib/gost/45-223-2001.html */
++ { ZT_TONE_DIALTONE, "425" },
++ { ZT_TONE_BUSY, "425/350,0/350" },
++ { ZT_TONE_RINGTONE, "425/1000,0/4000" },
++ { ZT_TONE_CONGESTION, "425/175,0/175" },
++ { ZT_TONE_CALLWAIT, "425/200,0/5000" },
++ { ZT_TONE_DIALRECALL, "425" },
++ { ZT_TONE_RECORDTONE, "1400/400,0/15000" },
++ { ZT_TONE_INFO, "950/330,1440/330,1800/330,0/1000" },
++ /* STUTTER - not specified */
++ { ZT_TONE_STUTTER,
"!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425"
},
++ },
++ },
+ { -1 }
+ };
Added: packages/cooker/zaptel/current/SOURCES/zaptel.init
==============================================================================
--- (empty file)
+++ packages/cooker/zaptel/current/SOURCES/zaptel.init Sun Dec 3 20:09:16 2006
@@ -0,0 +1,115 @@
+#!/bin/sh
+#
+# zaptel This shell script takes care of loading and unloading \
+# Zapata Telephony interfaces
+# chkconfig: 2345 9 92
+# description: The zapata telephony drivers allow you to use your linux \
+# computer to accept incoming data and voice interfaces
+#
+# config: /etc/sysconfig/zaptel
+
+# Source function library.
+. /etc/rc.d/init.d/functions || exit 0
+
+[ -f /etc/sysconfig/zaptel ] && . /etc/sysconfig/zaptel
+ LOCKFILE=/var/lock/subsys/zaptel
+
+# Check that telephony is up.
+[ "${TELEPHONY}" = "yes" ] || exit 0
+
+
+
+
+
+[ -f /sbin/ztcfg ] || exit 0
+[ -f /etc/zaptel.conf ] || exit 0
+
+if [ "${DEBUG}" = "yes" ]; then
+ ARGS="debug=1"
+fi
+
+if [ -z "${MODULES}" ]; then
+ # Populate defaults if not present
+ MODULES="tor2 wct4xxp wct1xxp wcte11xp wcfxo wctdm wctdm24xxp"
+fi
+
+RMODULES=""
+# Reverse list for un-loading; don't change
+for x in $MODULES; do
+ RMODULES="$x $RMODULES"
+done
+
+
+
+
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+ start)
+ # Load drivers
+ rmmod wcusb >& /dev/null
+ rmmod wcfxsusb >& /dev/null
+ rmmod audio >& /dev/null
+ action "Loading zaptel framework: " modprobe zaptel
+ echo -n "Waiting for zap to come online..."
+ TMOUT=10 # max secs to wait
+ while [ ! -d /dev/zap ] ; do
+ sleep 1
+ TMOUT=`expr $TMOUT - 1`
+ if [ $TMOUT -eq 0 ] ; then
+ echo "Error: missing /dev/zap!"
+ exit 1
+ fi
+ done
+ echo "OK"
+ echo -n "Loading zaptel hardware modules:"
+ for x in $MODULES; do
+ eval localARGS="\$${x}_ARGS"
+ if modprobe ${x} ${ARGS} ${localARGS} >& /dev/null; then
+ echo -n " $x"
+ fi
+ done
+ echo
+ sleep 3
+ if [ ! -e /proc/zaptel/1 ]; then
+ echo "No functioning zap hardware found in /proc/zaptel,
loading ztdummy"
+ modprobe ztdummy >& /dev/null
+ fi
+ action "Running ztcfg: " /sbin/ztcfg
+ RETVAL=$?
+
+ [ $RETVAL -eq 0 ] && touch $LOCKFILE
+ ;;
+ stop)
+ # Unload drivers
+ echo -n "Unloading zaptel hardware drivers:"
+ for x in $RMODULES; do
+ if rmmod ${x} >& /dev/null; then
+ echo -n " $x"
+ fi
+ done
+ echo "."
+
+ action "Removing zaptel module: " rmmod zaptel
+ RETVAL=$?
+
+ [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
+ reload)
+ action "Reloading ztcfg: " /sbin/ztcfg
+ ;;
+ status)
+ status zaptel
+ ;;
+ *)
+ echo "Usage: zaptel {start|stop|restart|reload|status}"
+ exit 1
+esac
+
+exit $RETVAL
Added: packages/cooker/zaptel/current/SOURCES/zaptel.sysconfig
==============================================================================
--- (empty file)
+++ packages/cooker/zaptel/current/SOURCES/zaptel.sysconfig Sun Dec 3
20:09:16 2006
@@ -0,0 +1,33 @@
+TELEPHONY=yes
+#DEBUG=yes
+
+# Un-comment as per your requirements; modules to load/unload
+#Module Name Hardware
+MODULES="$MODULES tor2" # T400P - Quad Span T1 Card
+ # E400P - Quad Span E1 Card
+
+MODULES="$MODULES wct4xxp" # TE405P - Quad Span T1/E1 Card (5v version)
+ # TE410P - Quad Span T1/E1 Card (3.3v version)
+#wct4xxp_ARGS="t1e1override=15" # Additional parameters for TE4xxP
driver
+
+MODULES="$MODULES wct1xxp" # T100P - Single Span T1 Card
+ # E100P - Single Span E1 Card
+
+MODULES="$MODULES wcte11xp" # TE110P - Single Span T1/E1 Card
+
+MODULES="$MODULES wctdm24xxp" # TDM2400P - Modular FXS/FXO interface (1-24
ports)
+
+MODULES="$MODULES wcfxo" # X100P - Single port FXO interface
+ # X101P - Single port FXO interface
+
+MODULES="$MODULES wctdm" # TDM400P - Modular FXS/FXO interface (1-4
ports)
+#MODULES="$MODULES wcfxs" # either above or this
+
+MODULES="$MODULES wcusb" # S100U - Single port FXS USB Interface
+#MODULES="$MODULES wcfxsusb" # either above or this
+
+#MODULES="$MODULES torisa" # Old Tormenta1 ISA Card
+
+#MODULES="$MODULES ztdummy" # UHCI USB Zaptel Timing Only Interface
+
+#MODULES="$MODULES xpp_usb" # Xorcom Astribank Device
Modified: packages/cooker/zaptel/current/SPECS/zaptel.spec
==============================================================================
--- packages/cooker/zaptel/current/SPECS/zaptel.spec (original)
+++ packages/cooker/zaptel/current/SPECS/zaptel.spec Sun Dec 3 20:09:16 2006
@@ -1,11 +1,13 @@
%define version 1.4.0
%define beta_ver beta2
-%define release %mkrel 0.2.%{beta_ver}
+%define release %mkrel 0.3.%{beta_ver}
%define major 1
%define libname %mklibname tonezone %{major}
-%define progs fxotune fxstest hdlcgen hdlcstress hdlctest hdlcverify
makefw patgen patlooptest pattest timertest torisatool usbfxstest ztcfg ztdiag
ztmonitor ztspeed zttool
-# fxsdump hdlcstress hdlctest sethdlc ztcat ztcfg-dude ztprovision
+%define progs fxotune fxstest hdlcgen hdlcstress hdlctest hdlcverify
makefw patgen patlooptest pattest timertest torisatool usbfxstest ztcfg ztdiag
ztmonitor ztspeed zttool sethdlc-new zttest
+# Not building dew to errors:
+# o fxsdump
+# o ztcfg-dude
Summary: Zapata Telephony Interface Library and tools
Name: zaptel
@@ -15,10 +17,11 @@
Group: System/Libraries
URL: http://www.asterisk.org/
Source0:
http://ftp.digium.com/pub/zaptel/%{name}-%{version}-%{beta_ver}.tar.bz2
-Source1: zaptel.init.bz2
-Source2: zaptel.sysconfig.bz2
-Source3: modprobe.conf.bz2
+Source1: zaptel.init
+Source2: zaptel.sysconfig
+Source3: modprobe.conf
Patch0: zaptel-1.4.0-mdv.diff
+Patch1: zaptel-1.4.0-beta2-russian_zonedata.diff
BuildRequires: newt-devel
BuildRequires: libzap-devel >= 1.0.1
BuildConflicts: libtonezone-devel
@@ -66,23 +69,28 @@
Kernel drivers for the Zapata Telephony Interfaces:
-
o tor2 - T400P - Quad Span T1 Card
E400P - Quad Span E1 Card
+ o wcfxo - X100P/X101P - Single port FXO interface
+ o wctdm - TDM400P - Modular FXS/FXO interface (1-4 ports)
+ o zaptel - Zapata Telephony Interface
+ o torisa - Old Tormenta1 ISA Card
+ o ztdummy - UHCI USB Zaptel Timing Only Interface
+ o xpp_usb - XPP USB Driver
+ o xpd_fxo - XPP FXO Card Driver
+ o xpd_fxs - XPP FXS Card Driver
o wct4xxp - TE405P - Quad Span T1/E1 Card (5v version)
TE410P - Quad Span T1/E1 Card (3.3v version)
o wct1xxp - T100P - Single Span T1 Card
E100P - Single Span E1 Card
o wct11xp - TE110P - Single Span T1/E1 Card
- o wcte11xp - TE110P T1/PRI card Driver
- o wcfxo - X100P/X101P - Single port FXO interface
- o wctdm - TDM400P - Modular FXS/FXO interface (1-4 ports)
- o wcusb or wcfxsusb S100U - Single port FXS USB Interface
- o torisa - Old Tormenta1 ISA Card
- o ztdummy - UHCI USB Zaptel Timing Only Interface
o pciradio - PCI RADIO Card Zapata Telephony PCI Quad Radio
Interface driver
+ o ztdynamic - Zaptel Dynamic Span Support
o wctdm24xxp - TDM2400P TDM FXS/FXO Interface Driver
+ o zttranscode - Zaptel Transcoder Support
+ o ztd-eth, ztd-loc - Zaptel Dynamic TDMoE Support
+ o wcusb - Single port FXS USB Interface
%package tools
Summary: Various tools for the Zapata Telephony Interface
@@ -105,10 +113,11 @@
done
%patch0 -p0 -b .mdk
+%patch1 -p0 -b .mdk
-bzcat %{SOURCE1} > zaptel.init
-bzcat %{SOURCE2} > zaptel.sysconfig
-bzcat %{SOURCE3} > modprobe.conf
+cat %{SOURCE1} > zaptel.init
+cat %{SOURCE2} > zaptel.sysconfig
+cat %{SOURCE3} > modprobe.conf
%build
%configure
@@ -192,6 +201,7 @@
# zaptel devices with ownership/permissions for running as non-root
KERNEL=="zapctl", NAME="zap/ctl" OWNER="asterisk",
GROUP="asterisk", MODE="0660"
KERNEL=="zaptimer", NAME="zap/timer" OWNER="asterisk",
GROUP="asterisk", MODE="0660"
+KERNEL=="zaptranscode", NAME="zap/transcode" OWNER="asterisk",
GROUP="asterisk", MODE="0660"
KERNEL=="zapchannel", NAME="zap/channel" OWNER="asterisk",
GROUP="asterisk", MODE="0660"
KERNEL=="zappseudo", NAME="zap/pseudo" OWNER="asterisk",
GROUP="asterisk", MODE="0660"
KERNEL=="zap[0-9]*", NAME="zap/%n" OWNER="asterisk",
GROUP="asterisk", MODE="0660"
@@ -274,6 +284,10 @@
mv %{buildroot}%{_sbindir}/patgen %{buildroot}%{_sbindir}/%{name}-patgen
install -m0644 zaptel.conf.sample %{buildroot}%{_sysconfdir}/zaptel.conf
+install -m0755 zaptel.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zaptel
+install -m0644 zaptel.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/zaptel
+mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
+install -m0644 modprobe.conf %{buildroot}%{_sysconfdir}/modprobe.d/zaptel.conf
# install man pages
install -m0644 doc/fxotune.8 %{buildroot}%{_mandir}/man8/
@@ -292,11 +306,11 @@
dkms add -m %{name} -v %{version}-%{release} --rpm_safe_upgrade
dkms build -m %{name} -v %{version}-%{release} --rpm_safe_upgrade
dkms install -m %{name} -v %{version}-%{release} --rpm_safe_upgrade
--force
-#%%_post_service zaptel
+%_post_service zaptel
%preun -n dkms-%{name}
dkms remove -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all
-#%%_preun_service zaptel
+%_preun_service zaptel
%clean
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
@@ -314,10 +328,13 @@
%files -n dkms-%{name}
%defattr(-,root,root)
-%doc modprobe.conf README*
+%doc ChangeLog README*
%attr(0755,root,root) %{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc
%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/udev/rules.d/40-zaptel.rules
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/zaptel.conf
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/zaptel
+%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/zaptel
/usr/src/%{name}-%{version}-%{release}
%files tools
@@ -332,12 +349,16 @@
%attr(0755,root,root) %{_sbindir}/makefw
%attr(0755,root,root) %{_sbindir}/patlooptest
%attr(0755,root,root) %{_sbindir}/pattest
+# sethdlc-new
+%attr(0755,root,root) %{_sbindir}/sethdlc-new
%attr(0755,root,root) %{_sbindir}/timertest
%attr(0755,root,root) %{_sbindir}/torisatool
%attr(0755,root,root) %{_sbindir}/usbfxstest
#attr(0755,root,root) %{_sbindir}/wct4xxp-diag
%attr(0755,root,root) %{_sbindir}/zaptel-patgen
%attr(0755,root,root) %{_sbindir}/ztdiag
+# zttest
+%attr(0755,root,root) %{_sbindir}/zttest
%attr(0755,root,root) %{_sbindir}/ztmonitor
%attr(0755,root,root) %{_sbindir}/ztspeed
%attr(0755,root,root) %{_sbindir}/zttool
