--- /dev/null
+#
+# Copyright (C) 2016 - 2017 OpenWrt.org
+# Copyright (C) 2016 Cesnet, z.s.p.o.
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=chan-sccp
+PKG_VERSION:=v4.3.0-20171123
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=ed272e974897f075573a358d169e5c77889f5905
+PKG_SOURCE_PROTO:=git
+
+PKG_FIXUP:=autoreconf
+
+PKG_LICENSE:=GPL-1.0
+PKG_LICENSE_FILES:=COPYING LICENSE
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
+
+PKG_INSTALL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+# musl and glibc include their own iconv, but uclibc does not
+ifneq ($(CONFIG_USE_UCLIBC),)
+TARGET_CPPFLAGS+= \
+ -I$(STAGING_DIR)/usr/lib/libiconv-full/include
+TARGET_LDFLAGS+= \
+ -L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv
+endif
+
+define Package/chan-sccp/Default
+ SUBMENU:=Telephony
+ SECTION:=net
+ CATEGORY:=Network
+ TITLE:=SCCP channel support
+ URL:=https://github.com/chan-sccp/chan-sccp
+ DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl
+ PKG_BUILD_DEPENDS:=libiconv
+endef
+
+define Package/asterisk13-chan-sccp
+$(call Package/chan-sccp/Default)
+ DEPENDS+= asterisk13
+ VARIANT:=asterisk13
+ CONFLICTS:=asterisk13-chan-skinny
+endef
+
+define Package/description/Default
+Replacement for the SCCP channel driver (chan_skinny) in Asterisk.
+Extended features include shared lines, presence / BLF, customizable
+feature buttons and custom device state.
+endef
+
+Package/asterisk13-chan-sccp/description = $(Package/description/Default)
+
+CONFIGURE_ARGS += \
+ --disable-debug \
+ --enable-advanced-functions \
+ --enable-conference \
+ --enable-video
+
+ifeq ($(BUILD_VARIANT),asterisk13)
+ CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-13
+endif
+
+define Package/conffiles/Default
+/etc/asterisk/sccp.conf
+/etc/asterisk/extconfig.conf.sccp_sample
+/etc/asterisk/res_config_sqlite3.conf.sccp_sample
+/etc/asterisk/sccp_sqlite3.sql
+/etc/asterisk/sccp.conf.realtime_sample
+endef
+
+Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
+
+define Build/Prepare
+ $(call Build/Prepare/Default)
+ifeq ($(BUILD_VARIANT),asterisk13)
+ $(SED) 's|asterisk/iostream.h|asterisk/iostream.404|' \
+ $(PKG_BUILD_DIR)/autoconf/asterisk.m4
+endif
+endef
+
+define Package/Install/Default
+ $(INSTALL_DIR) $(1)/etc/asterisk
+ $(CP) ./files/sccp.conf $(1)/etc/asterisk/sccp.conf
+ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/
+ $(INSTALL_DATA) ./files/extconfig.conf.sccp_sample $(1)/etc/asterisk/extconfig.conf.sccp_sample
+ $(INSTALL_DATA) ./files/res_config_sqlite3.conf.sccp_sample $(1)/etc/asterisk/res_config_sqlite3.conf.sccp_sample
+ $(INSTALL_DATA) ./files/sccp_sqlite3.sql $(1)/etc/asterisk/sccp_sqlite3.sql
+ $(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample
+endef
+
+Package/asterisk13-chan-sccp/install = $(Package/Install/Default)
+
+$(eval $(call BuildPackage,asterisk13-chan-sccp))
--- /dev/null
+[settings]
+sccpdevice => sqlite3,asterisk,sccpdeviceconfig
+sccpline => sqlite3,asterisk,sccpline
--- /dev/null
+[asterisk]
+dbfile => /usr/lib/asterisk/realtime.sqlite3
+debug=yes
+requirements=warn
+;batch=1000
--- /dev/null
+[general]
+servername = Openwrt
+keepalive = 60
+debug = core
+context = default
+dateformat = D/M/Y
+bindaddr = ::
+port = 2000
+disallow = all
+allow = ulaw
+allow = alaw
+allow = gsm
+firstdigittimeout = 16
+digittimeout = 6
+autoanswer_ring_time = 1
+transfer_on_hangup = off
+musicclass = default
+language = en
+deny = 0.0.0.0/0.0.0.0
+permit = internal
+dndFeature = on
+echocancel = off
+silencesuppression = off
+
+hotline_enabled = yes
+hotline_context = default
+hotline_extension = 111
+
+[SEP001122334455]
+type = device
+description = Phone Number One
+devicetype = 7970
+#addon = 7915, 7915
+button = line, 111
+button = line, 113@01:shared
+button = speeddial,Phone 2 Line 1, 112, 112@hint
+deny = 0.0.0.0/0.0.0.0
+permit = internal
+disallow = all
+#allow = g722
+#allow = g729
+allow = ulaw
+allow = alaw
+allow = gsm
+directrtp = on
+
+[SEP00A1B2C3D4E5]
+type = device
+description = Phone Number Two
+devicetype = 7960
+button = line, 112
+button = line, 113@01:shared
+button = speeddial,Phone 1 Line 1, 111, 111@hint
+directrtp = on
+
+[111]
+id = 1000
+type = line
+pin = 1234
+context = default
+label = Phone 1 Line 1
+description = Line 111
+mailbox = 10111
+cid_name = Phone 1 CID
+cid_num = 111
+accountcode=79111
+callgroup=1
+pickupgroup=1
+context = default
+incominglimit = 2
+vmnum = 600
+trnsfvm = 1000
+
+[112]
+id = 1001
+type = line
+pin = 1234
+context = default
+label = Phone 2 Line 1
+description = Line 112
+mailbox = 10112
+cid_name = Phone 2 CID
+cid_num = 112
+accountcode=79112
+callgroup=1,2
+pickupgroup=1,2
+context = default
+incominglimit = 4
+vmnum = 600
+trnsfvm = 1000
+
+[113]
+id = 1002
+type = line
+pin = 5522
+context = default
+label = SharedLine 1
+description = Line 113
+mailbox = 10113
+cid_name = Shared
+cid_num = 113
+accountcode=79113
+incominglimit = 2
+callgroup=2
+pickupgroup=2
+vmnum = 600
+trnsfvm = 1000
+dnd = silent
--- /dev/null
+[general]
+servername = Openwrt
+keepalive = 60
+debug = core
+context = default
+dateformat = D/M/Y
+bindaddr = ::
+port = 2000
+disallow = all
+allow = ulaw
+allow = alaw
+allow = g729
+firstdigittimeout = 16
+digittimeout = 6
+autoanswer_ring_time = 1
+transfer_on_hangup = off
+musicclass = default
+language = en
+deny = 0.0.0.0/0.0.0.0
+permit = internal
+dndFeature = on
+echocancel = off
+silencesuppression = off
+
+hotline_enabled = yes
+hotline_context = default
+hotline_extension = 111
+
+devicetable = sccpdevice
+linetable = sccpline
--- /dev/null
+/*
+ * this is for users how like to sepatet device and button configuration
+ * You have to change the table names to:
+ *
+ * sccpdevices -> sccpdeviceconfig
+ * sccplines -> sccpline
+*/
+
+PRAGMA auto_vacuum=2;
+--
+-- Table with line-configuration
+--
+CREATE TABLE sccpdevice (
+ type varchar(45) DEFAULT NULL,
+ addon varchar(45) DEFAULT NULL,
+ description varchar(45) DEFAULT NULL,
+ tzoffset varchar(5) DEFAULT NULL,
+ transfer varchar(5) DEFAULT 'on',
+ cfwdall varchar(5) DEFAULT 'on',
+ cfwdbusy varchar(5) DEFAULT 'on',
+ imageversion varchar(45) DEFAULT NULL,
+ deny varchar(45) DEFAULT NULL,
+ permit varchar(45) DEFAULT NULL,
+ dndFeature varchar(5) DEFAULT 'on',
+ directrtp varchar(3) DEFAULT 'off',
+ earlyrtp varchar(8) DEFAULT 'off',
+ mwilamp varchar(5) DEFAULT 'on',
+ mwioncall varchar(5) DEFAULT 'off',
+ pickupexten varchar(5) DEFAULT 'on',
+ pickupcontext varchar(100) DEFAULT '',
+ pickupmodeanswer varchar(5) DEFAULT 'on',
+ private varchar(5) DEFAULT 'off',
+ privacy varchar(100) DEFAULT 'full',
+ nat varchar(4) DEFAULT 'auto',
+ softkeyset varchar(100) DEFAULT '',
+ audio_tos varchar(11) DEFAULT NULL,
+ audio_cos varchar(1) DEFAULT NULL,
+ video_tos varchar(11) DEFAULT NULL,
+ video_cos varchar(1) DEFAULT NULL,
+ conf_allow varchar(3) DEFAULT 'on',
+ conf_play_general_announce varchar(3) DEFAULT 'on',
+ conf_play_part_announce varchar(3) DEFAULT 'on',
+ conf_mute_on_entry varchar(3) DEFAULT 'off',
+ conf_music_on_hold_class varchar(80) DEFAULT 'default',
+ conf_show_conflist varchar(3) DEFAULT 'on',
+ backgroundImage varchar(255) DEFAULT '',
+ ringtone varchar(255) DEFAULT '',
+ setvar varchar(100) DEFAULT NULL,
+ disallow varchar(255) DEFAULT NULL,
+ allow varchar(255) DEFAULT NULL,
+ name varchar(15) NOT NULL DEFAULT '',
+ PRIMARY KEY (name)
+);
+
+--
+-- Table with device-configuration
+--
+CREATE TABLE sccpline (
+ id varchar(4) DEFAULT NULL,
+ pin varchar(45) DEFAULT NULL,
+ label varchar(45) DEFAULT NULL,
+ description varchar(45) DEFAULT NULL,
+ context varchar(45) DEFAULT NULL,
+ incominglimit varchar(45) DEFAULT NULL,
+ transfer varchar(45) DEFAULT NULL,
+ mailbox varchar(45) DEFAULT NULL,
+ vmnum varchar(45) DEFAULT NULL,
+ cid_name varchar(45) DEFAULT NULL,
+ cid_num varchar(45) DEFAULT NULL,
+ trnsfvm varchar(45) DEFAULT NULL,
+ secondary_dialtone_digits varchar(45) DEFAULT NULL,
+ secondary_dialtone_tone varchar(45) DEFAULT NULL,
+ musicclass varchar(45) DEFAULT NULL,
+ language varchar(45) DEFAULT NULL,
+ accountcode varchar(45) DEFAULT NULL,
+ echocancel varchar(45) DEFAULT NULL,
+ silencesuppression varchar(45) DEFAULT NULL,
+ callgroup varchar(45) DEFAULT NULL,
+ pickupgroup varchar(45) DEFAULT NULL,
+ namedcallgroup varchar(45) DEFAULT NULL,
+ namedpickupgroup varchar(45) DEFAULT NULL,
+ dnd varchar(7) DEFAULT 'reject',
+ amaflags varchar(45) DEFAULT NULL,
+ defaultSubscriptionId_number varchar(5) DEFAULT NULL,
+ setvar varchar(50) DEFAULT NULL,
+ name varchar(45) NOT NULL DEFAULT '',
+ PRIMARY KEY (name)
+);
+
+CREATE TABLE buttontype (
+ type varchar(9) DEFAULT NULL,
+ PRIMARY KEY (type)
+);
+
+INSERT INTO buttontype (type) VALUES ('line');
+INSERT INTO buttontype (type) VALUES ('speeddial');
+INSERT INTO buttontype (type) VALUES ('service');
+INSERT INTO buttontype (type) VALUES ('feature');
+INSERT INTO buttontype (type) VALUES ('empty');
+--
+-- Table with button-configuration for device
+--
+CREATE TABLE buttonconfig (
+ device varchar(15) NOT NULL DEFAULT '',
+ instance tinyint(4) NOT NULL DEFAULT '0',
+ type varchar(9),
+ name varchar(36) DEFAULT NULL,
+ options varchar(100) DEFAULT NULL,
+ PRIMARY KEY (device,instance),
+ FOREIGN KEY (device) REFERENCES sccpdevice (device),
+ FOREIGN KEY (type) REFERENCES buttontype (type)
+);
+
+--
+-- View for merging device and button configuration
+--
+CREATE VIEW sccpdeviceconfig AS
+ SELECT sccpdevice.*,
+ group_concat(buttonconfig.type||","||buttonconfig.name||","||buttonconfig.options,";") as button
+ FROM buttonconfig, sccpdevice
+ WHERE buttonconfig.device=sccpdevice.name
+ GROUP BY sccpdevice.name
+ ORDER BY sccpdevice.name, buttonconfig.instance;
--- /dev/null
+--- a/autoconf/extra.m4
++++ b/autoconf/extra.m4
+@@ -491,17 +491,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+ ], SUPPORTED_CFLAGS)
+ ])
+ AC_SUBST([strip_binaries])
+- ], [
+- CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g' -e 's/[^|\ ]\-g[$|\ ]//g'`"
+- optimize_flag="-O0"
+- case "${CC}" in
+- *gcc*)
+- AX_CHECK_COMPILE_FLAG(-Og, [
+- optimize_flag="-Og"
+- ])
+- ;;
+- esac
+- CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} "
+ ])
+
+ AS_IF([test "X${enable_debug}" == "Xyes"], [
+++ /dev/null
-#
-# Copyright (C) 2016 - 2017 OpenWrt.org
-# Copyright (C) 2016 Cesnet, z.s.p.o.
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=chan-sccp-b
-PKG_VERSION:=v4.3.0-20170814
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=016fee3a96b09d5404757f7b178af2e349e55bcc
-PKG_SOURCE_PROTO:=git
-
-PKG_FIXUP:=autoreconf
-
-PKG_LICENSE:=GPL-1.0
-PKG_LICENSE_FILES:=COPYING LICENSE
-PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
-
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-# musl and glibc include their own iconv, but uclibc does not
-ifneq ($(CONFIG_USE_UCLIBC),)
-TARGET_CPPFLAGS+= \
- -I$(STAGING_DIR)/usr/lib/libiconv-full/include
-TARGET_LDFLAGS+= \
- -L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv
-endif
-
-define Package/chan-sccp-b/Default
- SUBMENU:=Telephony
- SECTION:=net
- CATEGORY:=Network
- TITLE:=SCCP channel provider support
- URL:=http://chan-sccp-b.sourceforge.net/
- DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl
- PKG_BUILD_DEPENDS:=libiconv
-endef
-
-define Package/asterisk13-chan-sccp-b
-$(call Package/chan-sccp-b/Default)
- DEPENDS+= asterisk13
- VARIANT:=asterisk13
- CONFLICTS:=asterisk13-chan-skinny
-endef
-
-define Package/description/Default
- SCCP channel provider for asterisk. It delivers extended functionality for SCCP phones over chan_skinny delivered
- by asterisk by default.
-endef
-
-Package/asterisk13-chan-sccp-b/description = $(Package/description/Default)
-
-CONFIGURE_ARGS += \
- --disable-debug \
- --enable-advanced-functions \
- --enable-conference \
- --enable-video
-
-ifeq ($(BUILD_VARIANT),asterisk13)
- CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-13
-endif
-
-define Package/conffiles/Default
-/etc/asterisk/sccp.conf
-/etc/asterisk/extconfig.conf.sccp_sample
-/etc/asterisk/res_config_sqlite3.conf.sccp_sample
-/etc/asterisk/sccp_sqlite3.sql
-/etc/asterisk/sccp.conf.realtime_sample
-endef
-
-Package/asterisk13-chan-sccp-b/conffiles = $(Package/conffiles/Default)
-
-define Package/Install/Default
- $(INSTALL_DIR) $(1)/etc/asterisk
- $(CP) ./files/sccp.conf $(1)/etc/asterisk/sccp.conf
- $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/
- $(INSTALL_DATA) ./files/extconfig.conf.sccp_sample $(1)/etc/asterisk/extconfig.conf.sccp_sample
- $(INSTALL_DATA) ./files/res_config_sqlite3.conf.sccp_sample $(1)/etc/asterisk/res_config_sqlite3.conf.sccp_sample
- $(INSTALL_DATA) ./files/sccp_sqlite3.sql $(1)/etc/asterisk/sccp_sqlite3.sql
- $(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample
-endef
-
-Package/asterisk13-chan-sccp-b/install = $(Package/Install/Default)
-
-$(eval $(call BuildPackage,asterisk13-chan-sccp-b))
+++ /dev/null
-[settings]
-sccpdevice => sqlite3,asterisk,sccpdeviceconfig
-sccpline => sqlite3,asterisk,sccpline
+++ /dev/null
-[asterisk]
-dbfile => /usr/lib/asterisk/realtime.sqlite3
-debug=yes
-requirements=warn
-;batch=1000
+++ /dev/null
-[general]
-servername = Openwrt
-keepalive = 60
-debug = core
-context = default
-dateformat = D/M/Y
-bindaddr = ::
-port = 2000
-disallow = all
-allow = ulaw
-allow = alaw
-allow = gsm
-firstdigittimeout = 16
-digittimeout = 6
-autoanswer_ring_time = 1
-transfer_on_hangup = off
-musicclass = default
-language = en
-deny = 0.0.0.0/0.0.0.0
-permit = internal
-dndFeature = on
-echocancel = off
-silencesuppression = off
-
-hotline_enabled = yes
-hotline_context = default
-hotline_extension = 111
-
-[SEP001122334455]
-type = device
-description = Phone Number One
-devicetype = 7970
-#addon = 7915, 7915
-button = line, 111
-button = line, 113@01:shared
-button = speeddial,Phone 2 Line 1, 112, 112@hint
-deny = 0.0.0.0/0.0.0.0
-permit = internal
-disallow = all
-#allow = g722
-#allow = g729
-allow = ulaw
-allow = alaw
-allow = gsm
-directrtp = on
-
-[SEP00A1B2C3D4E5]
-type = device
-description = Phone Number Two
-devicetype = 7960
-button = line, 112
-button = line, 113@01:shared
-button = speeddial,Phone 1 Line 1, 111, 111@hint
-directrtp = on
-
-[111]
-id = 1000
-type = line
-pin = 1234
-context = default
-label = Phone 1 Line 1
-description = Line 111
-mailbox = 10111
-cid_name = Phone 1 CID
-cid_num = 111
-accountcode=79111
-callgroup=1
-pickupgroup=1
-context = default
-incominglimit = 2
-vmnum = 600
-trnsfvm = 1000
-
-[112]
-id = 1001
-type = line
-pin = 1234
-context = default
-label = Phone 2 Line 1
-description = Line 112
-mailbox = 10112
-cid_name = Phone 2 CID
-cid_num = 112
-accountcode=79112
-callgroup=1,2
-pickupgroup=1,2
-context = default
-incominglimit = 4
-vmnum = 600
-trnsfvm = 1000
-
-[113]
-id = 1002
-type = line
-pin = 5522
-context = default
-label = SharedLine 1
-description = Line 113
-mailbox = 10113
-cid_name = Shared
-cid_num = 113
-accountcode=79113
-incominglimit = 2
-callgroup=2
-pickupgroup=2
-vmnum = 600
-trnsfvm = 1000
-dnd = silent
+++ /dev/null
-[general]
-servername = Openwrt
-keepalive = 60
-debug = core
-context = default
-dateformat = D/M/Y
-bindaddr = ::
-port = 2000
-disallow = all
-allow = ulaw
-allow = alaw
-allow = g729
-firstdigittimeout = 16
-digittimeout = 6
-autoanswer_ring_time = 1
-transfer_on_hangup = off
-musicclass = default
-language = en
-deny = 0.0.0.0/0.0.0.0
-permit = internal
-dndFeature = on
-echocancel = off
-silencesuppression = off
-
-hotline_enabled = yes
-hotline_context = default
-hotline_extension = 111
-
-devicetable = sccpdevice
-linetable = sccpline
+++ /dev/null
-/*
- * this is for users how like to sepatet device and button configuration
- * You have to change the table names to:
- *
- * sccpdevices -> sccpdeviceconfig
- * sccplines -> sccpline
-*/
-
-PRAGMA auto_vacuum=2;
---
--- Table with line-configuration
---
-CREATE TABLE sccpdevice (
- type varchar(45) DEFAULT NULL,
- addon varchar(45) DEFAULT NULL,
- description varchar(45) DEFAULT NULL,
- tzoffset varchar(5) DEFAULT NULL,
- transfer varchar(5) DEFAULT 'on',
- cfwdall varchar(5) DEFAULT 'on',
- cfwdbusy varchar(5) DEFAULT 'on',
- imageversion varchar(45) DEFAULT NULL,
- deny varchar(45) DEFAULT NULL,
- permit varchar(45) DEFAULT NULL,
- dndFeature varchar(5) DEFAULT 'on',
- directrtp varchar(3) DEFAULT 'off',
- earlyrtp varchar(8) DEFAULT 'off',
- mwilamp varchar(5) DEFAULT 'on',
- mwioncall varchar(5) DEFAULT 'off',
- pickupexten varchar(5) DEFAULT 'on',
- pickupcontext varchar(100) DEFAULT '',
- pickupmodeanswer varchar(5) DEFAULT 'on',
- private varchar(5) DEFAULT 'off',
- privacy varchar(100) DEFAULT 'full',
- nat varchar(4) DEFAULT 'auto',
- softkeyset varchar(100) DEFAULT '',
- audio_tos varchar(11) DEFAULT NULL,
- audio_cos varchar(1) DEFAULT NULL,
- video_tos varchar(11) DEFAULT NULL,
- video_cos varchar(1) DEFAULT NULL,
- conf_allow varchar(3) DEFAULT 'on',
- conf_play_general_announce varchar(3) DEFAULT 'on',
- conf_play_part_announce varchar(3) DEFAULT 'on',
- conf_mute_on_entry varchar(3) DEFAULT 'off',
- conf_music_on_hold_class varchar(80) DEFAULT 'default',
- conf_show_conflist varchar(3) DEFAULT 'on',
- backgroundImage varchar(255) DEFAULT '',
- ringtone varchar(255) DEFAULT '',
- setvar varchar(100) DEFAULT NULL,
- disallow varchar(255) DEFAULT NULL,
- allow varchar(255) DEFAULT NULL,
- name varchar(15) NOT NULL DEFAULT '',
- PRIMARY KEY (name)
-);
-
---
--- Table with device-configuration
---
-CREATE TABLE sccpline (
- id varchar(4) DEFAULT NULL,
- pin varchar(45) DEFAULT NULL,
- label varchar(45) DEFAULT NULL,
- description varchar(45) DEFAULT NULL,
- context varchar(45) DEFAULT NULL,
- incominglimit varchar(45) DEFAULT NULL,
- transfer varchar(45) DEFAULT NULL,
- mailbox varchar(45) DEFAULT NULL,
- vmnum varchar(45) DEFAULT NULL,
- cid_name varchar(45) DEFAULT NULL,
- cid_num varchar(45) DEFAULT NULL,
- trnsfvm varchar(45) DEFAULT NULL,
- secondary_dialtone_digits varchar(45) DEFAULT NULL,
- secondary_dialtone_tone varchar(45) DEFAULT NULL,
- musicclass varchar(45) DEFAULT NULL,
- language varchar(45) DEFAULT NULL,
- accountcode varchar(45) DEFAULT NULL,
- echocancel varchar(45) DEFAULT NULL,
- silencesuppression varchar(45) DEFAULT NULL,
- callgroup varchar(45) DEFAULT NULL,
- pickupgroup varchar(45) DEFAULT NULL,
- namedcallgroup varchar(45) DEFAULT NULL,
- namedpickupgroup varchar(45) DEFAULT NULL,
- dnd varchar(7) DEFAULT 'reject',
- amaflags varchar(45) DEFAULT NULL,
- defaultSubscriptionId_number varchar(5) DEFAULT NULL,
- setvar varchar(50) DEFAULT NULL,
- name varchar(45) NOT NULL DEFAULT '',
- PRIMARY KEY (name)
-);
-
-CREATE TABLE buttontype (
- type varchar(9) DEFAULT NULL,
- PRIMARY KEY (type)
-);
-
-INSERT INTO buttontype (type) VALUES ('line');
-INSERT INTO buttontype (type) VALUES ('speeddial');
-INSERT INTO buttontype (type) VALUES ('service');
-INSERT INTO buttontype (type) VALUES ('feature');
-INSERT INTO buttontype (type) VALUES ('empty');
---
--- Table with button-configuration for device
---
-CREATE TABLE buttonconfig (
- device varchar(15) NOT NULL DEFAULT '',
- instance tinyint(4) NOT NULL DEFAULT '0',
- type varchar(9),
- name varchar(36) DEFAULT NULL,
- options varchar(100) DEFAULT NULL,
- PRIMARY KEY (device,instance),
- FOREIGN KEY (device) REFERENCES sccpdevice (device),
- FOREIGN KEY (type) REFERENCES buttontype (type)
-);
-
---
--- View for merging device and button configuration
---
-CREATE VIEW sccpdeviceconfig AS
- SELECT sccpdevice.*,
- group_concat(buttonconfig.type||","||buttonconfig.name||","||buttonconfig.options,";") as button
- FROM buttonconfig, sccpdevice
- WHERE buttonconfig.device=sccpdevice.name
- GROUP BY sccpdevice.name
- ORDER BY sccpdevice.name, buttonconfig.instance;
+++ /dev/null
---- a/autoconf/extra.m4
-+++ b/autoconf/extra.m4
-@@ -472,17 +472,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
- ])
- CPPFLAGS_saved="${CPPFLAGS_saved} -D_FORTIFY_SOURCE=2"
- GDB_FLAGS=""
-- ], [
-- CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g' -e 's/[^|\ ]\-g[$|\ ]//g'`"
-- optimize_flag="-O0"
-- case "${CC}" in
-- *gcc*)
-- AX_CHECK_COMPILE_FLAG(-Og, [
-- optimize_flag="-Og"
-- ])
-- ;;
-- esac
-- CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} "
- ])
-
- AS_IF([test "X${enable_debug}" == "Xyes"], [
projects / feed / telephony.git / commitdiff