diff --git a/.git_info b/.git_info index 3b43553..45b5405 100644 --- a/.git_info +++ b/.git_info @@ -1,2 +1,2 @@ -wanpipe_linux: git ver 7d928f7 -wanpipe_common: git ver 4c0d4dc +wanpipe_linux: git ver 2e86683 +wanpipe_common: git ver bd0259e diff --git a/.router_version b/.router_version index 58bc4d9..b18fe58 100644 --- a/.router_version +++ b/.router_version @@ -1 +1 @@ -wanpipe-7.0.17 +wanpipe-7.0.18 diff --git a/ChangeLog b/ChangeLog index 6b62425..1d3831e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,12 +3,12 @@ WANPIPE TDM VOICE - IP/WAN Package ------------------------------------------------------------------------------ Author: Nenad Corbic -Copyright (c) 1995-2015 Sangoma Technologies Inc. +Copyright (c) 1995-2016 Sangoma Technologies Inc. For more info visit: http://wiki.sangoma.com ------------------------------------------------------------------------------ -* Fri Mar 17 2016 Nenad Corbic - 7.0.17 +* Fri Mar 17 2016 Nenad Corbic - 7.0.18 ================================================================== - Driver will start by default even though analog FXS/FXO module failed to configure. New config parameters: RM_FAIL_ON_MOD_ERROR=YES will revert this behaviour. diff --git a/Setup b/Setup index c217d9b..08f8c0d 100755 --- a/Setup +++ b/Setup @@ -7387,7 +7387,7 @@ KERNEL_UNAME=`uname -r` PKG_NAME=wanpipe DISTR_NAME="WANPIPE" PROD=wanrouter -PROD_VER=7.0.17 +PROD_VER=7.0.18 PROD_HOME=`pwd` META_CONF=$PROD_HOME/$PROD.rc WAN_INTR_DIR=$PROD_HOME/interfaces diff --git a/deb_control/wanpipe.deb b/deb_control/wanpipe.deb index 33a0619..59017aa 100644 --- a/deb_control/wanpipe.deb +++ b/deb_control/wanpipe.deb @@ -1,5 +1,5 @@ Package: wanpipe -Version: 7.0.17-0 +Version: 7.0.18-0 Section: networking Priority: optional Architecture: all diff --git a/patches/kdrivers/include/wanpipe_version.h b/patches/kdrivers/include/wanpipe_version.h index 18381a5..175de19 100644 --- a/patches/kdrivers/include/wanpipe_version.h +++ b/patches/kdrivers/include/wanpipe_version.h @@ -10,14 +10,14 @@ #define WANPIPE_COMPANY "Sangoma Technologies Inc" /********** LINUX **********/ -#define WANPIPE_VERSION "7.0.17" +#define WANPIPE_VERSION "7.0.18" #define WANPIPE_SUB_VERSION "0" #define WANPIPE_LITE_VERSION "1.1.1" #if defined(__LINUX__) #define WANPIPE_VERSION_MAJOR 7 #define WANPIPE_VERSION_MINOR 0 -#define WANPIPE_VERSION_MINOR1 17 +#define WANPIPE_VERSION_MINOR1 18 #define WANPIPE_VERSION_MINOR2 0 #endif diff --git a/rpmspec/wanpipe-mod.rpmspec b/rpmspec/wanpipe-mod.rpmspec index e75d856..a44c3c6 100644 --- a/rpmspec/wanpipe-mod.rpmspec +++ b/rpmspec/wanpipe-mod.rpmspec @@ -1,6 +1,6 @@ %define WANPIPE_VER wanpipe-modules %define name %{WANPIPE_VER} -%define version 7.0.17 +%define version 7.0.18 %define release 0 %define serial 1 %define MODULES_DIR /lib/modules @@ -59,7 +59,7 @@ fi %changelog -* Fri Mar 17 2016 Nenad Corbic - 7.0.17 +* Fri Mar 17 2016 Nenad Corbic - 7.0.18 ================================================================== - Driver will start by default even though analog FXS/FXO module failed to configure. New config parameters: RM_FAIL_ON_MOD_ERROR=YES will revert this behaviour. diff --git a/rpmspec/wanpipe-util.rpmspec b/rpmspec/wanpipe-util.rpmspec index 091039e..4a1946e 100644 --- a/rpmspec/wanpipe-util.rpmspec +++ b/rpmspec/wanpipe-util.rpmspec @@ -1,6 +1,6 @@ %define WANPIPE_VER wanpipe-util %define name %{WANPIPE_VER} -%define version 7.0.17 +%define version 7.0.18 %define release 0 %define serial 1 %define UTILS_DIR /usr/sbin @@ -229,7 +229,7 @@ chmod 755 /usr/local/sbin/setup-sangoma %changelog -* Fri Mar 17 2016 Nenad Corbic - 7.0.17 +* Fri Mar 17 2016 Nenad Corbic - 7.0.18 ================================================================== - Driver will start by default even though analog FXS/FXO module failed to configure. New config parameters: RM_FAIL_ON_MOD_ERROR=YES will revert this behaviour. diff --git a/rpmspec/wanpipe.rpmspec b/rpmspec/wanpipe.rpmspec index 47945c7..8e91236 100644 --- a/rpmspec/wanpipe.rpmspec +++ b/rpmspec/wanpipe.rpmspec @@ -1,7 +1,7 @@ %define KERNEL_VERSION %{?kern_ver} %define WANPIPE_VER wanpipe %define name %{WANPIPE_VER} -%define version 7.0.17 +%define version 7.0.18 %define release 0 %define serial 1 %define UTILS_DIR /usr/sbin @@ -246,7 +246,7 @@ chmod 755 /usr/local/sbin/setup-sangoma %changelog -* Fri Mar 17 2016 Nenad Corbic - 7.0.17 +* Fri Mar 17 2016 Nenad Corbic - 7.0.18 ================================================================== - Driver will start by default even though analog FXS/FXO module failed to configure. New config parameters: RM_FAIL_ON_MOD_ERROR=YES will revert this behaviour. diff --git a/samples/wanrouter b/samples/wanrouter index ec24894..4d92776 100644 --- a/samples/wanrouter +++ b/samples/wanrouter @@ -2231,7 +2231,7 @@ init_global_params() { if [ $OSYSTEM = "Linux" ]; then - ROUTER_VERSION=7.0.17 + ROUTER_VERSION=7.0.18 IFCONFIG_LIST=ifconfig MODULE_STAT=lsmod WAN_DRIVERS="wanpipe" diff --git a/util/wancfg_zaptel/A20x.pm b/util/wancfg_zaptel/A20x.pm index 5977882..14766ef 100755 --- a/util/wancfg_zaptel/A20x.pm +++ b/util/wancfg_zaptel/A20x.pm @@ -167,6 +167,10 @@ sub gen_wanpipe_conf{ my $hw_fax = $self->card->hw_fax; my $is_tdm_api = $self->is_tdm_api; my $tdm_voice_op_mode = "TDM_VOICE"; + my $rm_fake_polarity = $self->rm_fake_polarity; + my $rm_fake_polarity_threshold = $self->rm_fake_polarity_threshold; + my $rm_fake_polarity_cidtimer = $self->rm_fake_polarity_cidtimer; + my $rm_fake_polarity_cidtimeout = $self->rm_fake_polarity_cidtimeout; my $device_alpha = &get_alpha_from_num($device_no); @@ -199,10 +203,10 @@ sub gen_wanpipe_conf{ $wp_file =~ s/HWECMODE/$hwec_mode/g; $wp_file =~ s/HWDTMF/$hw_dtmf/g; $wp_file =~ s/HWFAX/$hw_fax/g; - $wp_file =~ s/RMFAKEPOLARITY/$self->rm_fake_polarity/g; - $wp_file =~ s/RMFAKETHRESHOLD/$self->rm_fake_polarity_threshold/g; - $wp_file =~ s/RMFAKECIDTIMER/$self->rm_fake_polarity_cidtimer/g; - $wp_file =~ s/RMFAKECIDTIMEOUT/$self->rm_fake_polarity_cidtimeout/g; + $wp_file =~ s/RMFAKEPOLARITY/$rm_fake_polarity/g; + $wp_file =~ s/RMFAKETHRES/$rm_fake_polarity_threshold/g; + $wp_file =~ s/RMFAKECIDTIMER/$rm_fake_polarity_cidtimer/g; + $wp_file =~ s/RMFAKECIDTIMEOUT/$rm_fake_polarity_cidtimeout/g; print FH $wp_file; close (FH); diff --git a/wanpipe.spec b/wanpipe.spec index f8bba37..f3e16da 100644 --- a/wanpipe.spec +++ b/wanpipe.spec @@ -25,7 +25,7 @@ # %define NAME wanpipe -%define VERSION 7.0.17 +%define VERSION 7.0.18 %define RELEASE 0 %define KVERSION %{?kernel} %define KSRC %{?ksrc} @@ -260,7 +260,7 @@ fi %changelog -* Fri Mar 17 2016 Nenad Corbic - 7.0.17 +* Fri Mar 17 2016 Nenad Corbic - 7.0.18 ================================================================== - Driver will start by default even though analog FXS/FXO module failed to configure. New config parameters: RM_FAIL_ON_MOD_ERROR=YES will revert this behaviour.