From: Jiri Slachta Date: Tue, 14 May 2013 13:34:58 +0000 (+0200) Subject: Move asterisk-chan-sccp-b to asterisk-1.8.x-chan-sccp-b directory. X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=fe27b0ee64f4424ba6b99cde8abefd031ab23bb8;p=feed%2Ftelephony.git Move asterisk-chan-sccp-b to asterisk-1.8.x-chan-sccp-b directory. Signed-off-by: Jiri Slachta --- diff --git a/asterisk-1.8.x-chan-sccp-b/Makefile b/asterisk-1.8.x-chan-sccp-b/Makefile new file mode 100644 index 0000000..406c59e --- /dev/null +++ b/asterisk-1.8.x-chan-sccp-b/Makefile @@ -0,0 +1,59 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=asterisk18-chan-sccp-b +PKG_REV=3004 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/trunk +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_PROTO:=svn + +include $(INCLUDE_DIR)/package.mk + +define Package/asterisk18-chan-sccp-b + SUBMENU:=Telephony + SECTION:=net + CATEGORY:=Network + TITLE:=SCCP channel provider for asterisk + URL:=http://chan-sccp-b.net.sourceforge.net/ + MAINTAINER:=Hans Zandbelt + DEPENDS:=+asterisk18 +libltdl +endef + +define Package/asterisk18-chan-sccp-b/description + SCCP channel provider for asterisk. It delivers extended functionality for SCCP phones over chan_skinny delivered + by asterisk by default. +endef + +CONFIGURE_ARGS += \ + --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8 + +define Build/Compile + $(MAKE) -C "$(PKG_BUILD_DIR)" \ + CFLAGS="$(CFLAGS) -DLOW_MEMORY" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Package/asterisk18-chan-sccp-b/conffiles +/etc/asterisk/sccp.conf +endef + +define Package/asterisk18-chan-sccp-b/install + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_BIN) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ +endef + +$(eval $(call BuildPackage,asterisk18-chan-sccp-b)) diff --git a/asterisk-1.8.x-chan-sccp-b/files/sccp.openwrt.conf b/asterisk-1.8.x-chan-sccp-b/files/sccp.openwrt.conf new file mode 100644 index 0000000..c59f4cd --- /dev/null +++ b/asterisk-1.8.x-chan-sccp-b/files/sccp.openwrt.conf @@ -0,0 +1,89 @@ +[general] +servername = Openwrt +keepalive = 60 +debug = core +context = default +dateformat = D/M/Y +bindaddr = 192.168.1.1 +port = 2000 +disallow=all +allow=ulaw +allow=alaw +allow=gsm +firstdigittimeout = 16 +digittimeout = 6 +autoanswer_ring_time = 1 +musicclass=default +language=en +deny=0.0.0.0/0.0.0.0 +permit=192.168.1.0/255.255.255.0 +protocolversion=17 + +hotline_enabled=yes +hotline_context=default +hotline_extension=111 + +[SEP001122334455] +type = device +description = Phone Number One +devicetype = 7940 +button = line, 111 +button = line, 113@01:shared +button = speeddial,Phone 2 Line 1, 112, 112@hint + +[SEP00a1a2a3a4a5] +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 + +[111] +id = 1000 +type = line +pin = 1234 +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 +label = Phone 2 Line 1 +description = Line 112 +mailbox = 10112 +cid_name = Phone 2 CID +cid_num = 112 +accountcode=79112 +callgroup=1 +pickupgroup=1 +context = default +incominglimit = 2 +vmnum = 600 +trnsfvm = 1000 + +[113] +id = 1002 +type = line +pin = 1234 +label = SharedLine 1 +description = Line 113 +mailbox = 10113 +cid_name = Shared +cid_num = 113 +accountcode=79113 +incominglimit = 2 +vmnum = 600 +trnsfvm = 1000 + diff --git a/asterisk-1.8.x-chan-sccp-b/patches/200-register-file-version.patch b/asterisk-1.8.x-chan-sccp-b/patches/200-register-file-version.patch new file mode 100644 index 0000000..81ca9d3 --- /dev/null +++ b/asterisk-1.8.x-chan-sccp-b/patches/200-register-file-version.patch @@ -0,0 +1,19 @@ +--- a/src/chan_sccp.h ++++ b/src/chan_sccp.h +@@ -127,15 +127,7 @@ extern "C" { + # define CHECK_LEAKS() + # endif + +-# define SCCP_FILE_VERSION(file, version) \ +- static void __attribute__((constructor)) __register_file_version(void) \ +- { \ +- pbx_register_file_version(file, version); \ +- } \ +- static void __attribute__((destructor)) __unregister_file_version(void) \ +- { \ +- pbx_unregister_file_version(file); \ +- } ++# define SCCP_FILE_VERSION(file, version) + + # define DEV_ID_LOG(x) x ? x->id : "SCCP" + diff --git a/asterisk-1.8.x-chan-sccp-b/patches/300-stdarg.patch b/asterisk-1.8.x-chan-sccp-b/patches/300-stdarg.patch new file mode 100644 index 0000000..be91ed7 --- /dev/null +++ b/asterisk-1.8.x-chan-sccp-b/patches/300-stdarg.patch @@ -0,0 +1,10 @@ +--- a/src/chan_sccp.h ++++ b/src/chan_sccp.h +@@ -32,6 +32,7 @@ extern "C" { + #include "common.h" + #include + #include "asterisk/compiler.h" ++#include + #include "asterisk/lock.h" + #include "asterisk/abstract_jb.h" + diff --git a/asterisk-chan-sccp-b/Makefile b/asterisk-chan-sccp-b/Makefile deleted file mode 100644 index 406c59e..0000000 --- a/asterisk-chan-sccp-b/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=asterisk18-chan-sccp-b -PKG_REV=3004 -PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/trunk -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_PROTO:=svn - -include $(INCLUDE_DIR)/package.mk - -define Package/asterisk18-chan-sccp-b - SUBMENU:=Telephony - SECTION:=net - CATEGORY:=Network - TITLE:=SCCP channel provider for asterisk - URL:=http://chan-sccp-b.net.sourceforge.net/ - MAINTAINER:=Hans Zandbelt - DEPENDS:=+asterisk18 +libltdl -endef - -define Package/asterisk18-chan-sccp-b/description - SCCP channel provider for asterisk. It delivers extended functionality for SCCP phones over chan_skinny delivered - by asterisk by default. -endef - -CONFIGURE_ARGS += \ - --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8 - -define Build/Compile - $(MAKE) -C "$(PKG_BUILD_DIR)" \ - CFLAGS="$(CFLAGS) -DLOW_MEMORY" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef - -define Package/asterisk18-chan-sccp-b/conffiles -/etc/asterisk/sccp.conf -endef - -define Package/asterisk18-chan-sccp-b/install - $(INSTALL_DIR) $(1)/etc/asterisk - $(INSTALL_BIN) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf - $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules - $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ -endef - -$(eval $(call BuildPackage,asterisk18-chan-sccp-b)) diff --git a/asterisk-chan-sccp-b/files/sccp.openwrt.conf b/asterisk-chan-sccp-b/files/sccp.openwrt.conf deleted file mode 100644 index c59f4cd..0000000 --- a/asterisk-chan-sccp-b/files/sccp.openwrt.conf +++ /dev/null @@ -1,89 +0,0 @@ -[general] -servername = Openwrt -keepalive = 60 -debug = core -context = default -dateformat = D/M/Y -bindaddr = 192.168.1.1 -port = 2000 -disallow=all -allow=ulaw -allow=alaw -allow=gsm -firstdigittimeout = 16 -digittimeout = 6 -autoanswer_ring_time = 1 -musicclass=default -language=en -deny=0.0.0.0/0.0.0.0 -permit=192.168.1.0/255.255.255.0 -protocolversion=17 - -hotline_enabled=yes -hotline_context=default -hotline_extension=111 - -[SEP001122334455] -type = device -description = Phone Number One -devicetype = 7940 -button = line, 111 -button = line, 113@01:shared -button = speeddial,Phone 2 Line 1, 112, 112@hint - -[SEP00a1a2a3a4a5] -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 - -[111] -id = 1000 -type = line -pin = 1234 -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 -label = Phone 2 Line 1 -description = Line 112 -mailbox = 10112 -cid_name = Phone 2 CID -cid_num = 112 -accountcode=79112 -callgroup=1 -pickupgroup=1 -context = default -incominglimit = 2 -vmnum = 600 -trnsfvm = 1000 - -[113] -id = 1002 -type = line -pin = 1234 -label = SharedLine 1 -description = Line 113 -mailbox = 10113 -cid_name = Shared -cid_num = 113 -accountcode=79113 -incominglimit = 2 -vmnum = 600 -trnsfvm = 1000 - diff --git a/asterisk-chan-sccp-b/patches/200-register-file-version.patch b/asterisk-chan-sccp-b/patches/200-register-file-version.patch deleted file mode 100644 index 81ca9d3..0000000 --- a/asterisk-chan-sccp-b/patches/200-register-file-version.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/chan_sccp.h -+++ b/src/chan_sccp.h -@@ -127,15 +127,7 @@ extern "C" { - # define CHECK_LEAKS() - # endif - --# define SCCP_FILE_VERSION(file, version) \ -- static void __attribute__((constructor)) __register_file_version(void) \ -- { \ -- pbx_register_file_version(file, version); \ -- } \ -- static void __attribute__((destructor)) __unregister_file_version(void) \ -- { \ -- pbx_unregister_file_version(file); \ -- } -+# define SCCP_FILE_VERSION(file, version) - - # define DEV_ID_LOG(x) x ? x->id : "SCCP" - diff --git a/asterisk-chan-sccp-b/patches/300-stdarg.patch b/asterisk-chan-sccp-b/patches/300-stdarg.patch deleted file mode 100644 index be91ed7..0000000 --- a/asterisk-chan-sccp-b/patches/300-stdarg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/chan_sccp.h -+++ b/src/chan_sccp.h -@@ -32,6 +32,7 @@ extern "C" { - #include "common.h" - #include - #include "asterisk/compiler.h" -+#include - #include "asterisk/lock.h" - #include "asterisk/abstract_jb.h" -