This patch updates yate to version 5.0.0.

Tested-by: Robert Högberg <robert.hogberg@gmail.com>
Signed-off-by: Robert Högberg <robert.hogberg@gmail.com>
[slachta@cesnet.cz: removed zaptel stuff because of zaptel package breakage]
[slachta@cesnet.cz: added more configure options]
Tested-by: Jiri Slachta <slachta@cesnet.cz>
Signed-off-by: Jiri Slachta <slachta@cesnet.cz>

diff --git a/net/yate/Makefile b/net/yate/Makefile
index 4024a2945d863b94add82759b18fccf623972a97..059b43271600eb3b95932952c2b4c482cdc20654 100644 (file)
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 # Copyright (C) 2006-2011 SMBPhone
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,15 +9,15 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/uclibc++.mk
 
-RELEASEVER:=3.2.0
+RELEASEVER:=5.0.0
 
 PKG_NAME:=yate
 PKG_VERSION:=$(RELEASEVER)-1
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate3/
-PKG_MD5SUM:=8ef5f0c420cb41ad2b5828fdba28c4ee
+PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate5/
+PKG_MD5SUM:=6113bce2b81b402431c61d1f777e09a6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 PKG_INSTALL:=1
@@ -40,6 +40,7 @@ endef
 
 define Package/$(PKG_NAME)/conffiles
 /etc/yate/yate.conf
+/etc/init.d/yate
 endef
 
 define Package/$(PKG_NAME)/Default/description
@@ -88,30 +89,49 @@ endef
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include $(if $(CONFIG_BIG_ENDIAN),-DBIGENDIAN,)
 
 CONFIGURE_ARGS+= \
+       --enable-strings \
+       --enable-poll \
+       --enable-inline \
+       --enable-atomics \
+       --disable-sse2 \
+       --enable-sctp \
+       --enable-resolver \
+       --enable-internalregex \
+       --disable-dahdi \
+       --disable-zaptel \
+       --disable-wpcard \
+       --disable-tdmcard \
+       --enable-wanpipe \
+       --enable-ilbc \
+       --enable-ilbc-webrtc \
+       --enable-isac-float \
+       --disable-isac-fixed \
+       --enable-rtti \
+       --with-libpq="$(STAGING_DIR)/usr" \
+       --with-mysql="$(STAGING_DIR)/usr" \
+       --without-wphwec \
+       --with-libgsm="$(STAGING_DIR)/usr/include/gsm" \
+       --with-libspeex="$(STAGING_DIR)/usr/include" \
+       --with-amrnb="$(STAGING_DIR)/usr" \
+       --with-spandsp="$(STAGING_DIR)/usr/include" \
+       --without-pwlib \
+       --without-openh323 \
+       --with-openssl="$(STAGING_DIR)/usr" \
+       --with-zlib="$(STAGING_DIR)/usr" \
        --without-libqt4 \
        --without-qtstatic \
-       --without-pwlib \
        --without-coredumper \
        --without-doxygen \
-       --without-kdoc \
-       --with-spandsp="$(STAGING_DIR)/usr/include" \
-       --with-libgsm="$(STAGING_DIR)/usr/include/gsm" \
-       --with-mysql="$(STAGING_DIR)/usr" \
-       --with-openssl="$(STAGING_DIR)/usr" \
-       --with-libpq="$(STAGING_DIR)/usr" \
-       --with-libspeex="$(STAGING_DIR)/usr/include/speex" \
-       --with-zaptel="$(STAGING_DIR)/usr/include" \
-       --with-zlib="$(STAGING_DIR)/usr"
+       --without-kdoc
 
 CONFIGURE_VARS+= \
-       CFLAGS="$$$$CFLAGS -nostdinc++" \
        LDFLAGS="$$$$LDFLAGS -nodefaultlibs" \
        LIBS="-lc -luClibc++ -lpthread -lresolv -ldl -lm -lc $(LIBGCC_S)"
 
 define Package/$(PKG_NAME)/install
        $(INSTALL_DIR) $(1)/usr/lib
        
-       for yatelib in "" sig mgcp jabber; do \
+       for yatelib in "" sig mgcp jabber script; do \
                $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib ;\
                $(LN) ./libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib/libyate$$$${yatelib}.so ;\
        done
@@ -119,7 +139,9 @@ define Package/$(PKG_NAME)/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yate $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/yate/yate.conf    $(1)/etc/$(PKG_NAME)/yate.conf
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/yate/yate.conf $(1)/etc/$(PKG_NAME)/yate.conf
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/yate.init $(1)/etc/init.d/yate
 endef
 
 define Package/$(PKG_NAME)-scripts-php/install
@@ -205,11 +227,13 @@ $(eval $(call BuildPlugin,amrnbcodec,,AMR-NB Codec,@BROKEN)) # Missing amr-nb li
 $(eval $(call BuildPlugin,analog,server,Analog (e.g. POTS) Channel,))
 $(eval $(call BuildPlugin,analogdetect,server,Analog Data Detector,))
 $(eval $(call BuildPlugin,analyzer,,Test Call Generator and AQ Analyzer,))
+$(eval $(call BuildPlugin,cache,server,CNAM and LNP memory caches,))
 $(eval $(call BuildPlugin,callcounters,server,Count Active Call Legs,))
 $(eval $(call BuildPlugin,callfork,,Call Forker,))
 $(eval $(call BuildPlugin,callgen,,Call Generator,))
 $(eval $(call BuildPlugin,ccongestion,server,Accept Status from Installed Engine Monitors,))
 $(eval $(call BuildPlugin,cdrbuild,,Call Detail Record Builder,))
+$(eval $(call BuildPlugin,cdrcombine,,Call Detail Records per call instead of per call leg,))
 $(eval $(call BuildPlugin,cdrfile,,Call Detail Record to File,))
 $(eval $(call BuildPlugin,ciscosm,server,SS7 Support,))
 $(eval $(call BuildPlugin,clustering,server,Clustering Server Support,))
@@ -219,17 +243,22 @@ $(eval $(call BuildPlugin,dbpbx,server,PBX IVR and Multi-routing from Database,)
 $(eval $(call BuildPlugin,dbwave,server,Wav Media for DB Storage,+$(PKG_NAME)-mod-wavefile))
 $(eval $(call BuildPlugin,dumbchan,,Dummy Channel,))
 $(eval $(call BuildPlugin,enumroute,,ENUM Routing,))
+$(eval $(call BuildPlugin,eventlogs,server,Write events and alarms to log files,))
 $(eval $(call BuildPlugin,extmodule,,External Module Handler,))
 $(eval $(call BuildPlugin,faxchan,,Spandsp Fax Channel,+libspandsp))
 $(eval $(call BuildPlugin,filetransfer,,File Transfer Driver,))
 $(eval $(call BuildPlugin,gsmcodec,,GSM Codec,+libgsm))
+$(eval $(call BuildPlugin,gvoice,,Google Voice support,))
 $(eval $(call BuildPlugin,h323chan,,Open H.323 Channel,+libopenh323 @BROKEN)) # libopenh323 doesn't create package or stagin_dir includes or libs
 $(eval $(call BuildPlugin,heartbeat,server,Linux-HA compatible heartbeat,))
 $(eval $(call BuildPlugin,ilbccodec,,iLBC Codec,))
-$(eval $(call BuildPlugin,isupmangler,server,ISUP paramter mangling in a STP,))
+$(eval $(call BuildPlugin,ilbcwebrtc,,iLBC Codec from the WebRTC project,))
+$(eval $(call BuildPlugin,isaccodec,,internet Speech Audio Codec,))
+$(eval $(call BuildPlugin,isupmangler,sig,ISUP parameter mangling in a STP,))
 $(eval $(call BuildPlugin,jabberclient,client,Jabber Client,))
 $(eval $(call BuildPlugin,jabberserver,jabber,Jabber Server,))
 $(eval $(call BuildPlugin,jbfeatures,jabber,Jabber Server Features,))
+$(eval $(call BuildPlugin,javascript,,Routing using the embedded Javascript language,))
 $(eval $(call BuildPlugin,lateroute,server,Last Chance Routing,))
 $(eval $(call BuildPlugin,lksctp,server,SCTP sockets using linux kernel,@BROKEN)) # Missing libraries/header files
 $(eval $(call BuildPlugin,mgcpca,server,Media Gateway Control Protocol Agent,))
@@ -248,6 +277,7 @@ $(eval $(call BuildPlugin,pbxassist,server,Full featured PBX and IVR,))
 $(eval $(call BuildPlugin,pgsqldb,server,PostgrestSQL Backend DB,+libpq))
 $(eval $(call BuildPlugin,presence,server,Presence,))
 $(eval $(call BuildPlugin,regfile,server,Registration based on users in file,))
+$(eval $(call BuildPlugin,register,server,Call Detail Record to a database,))
 $(eval $(call BuildPlugin,queues,server,Call Distribution and Queues from Database,))
 $(eval $(call BuildPlugin,queuesnotify,server,Notify when queued call status changes,))
 $(eval $(call BuildPlugin,regexroute,,Regular Expression Based Routing,))
@@ -272,5 +302,4 @@ $(eval $(call BuildPlugin,ysipchan,,SIP Channel,))
 $(eval $(call BuildPlugin,ysockschan,,SOCKS Channel,))
 $(eval $(call BuildPlugin,ysnmpagent,server,SNMP Protocol Agent,,/usr/share/yate/data/NULL-TEAM-MIB.txt /usr/share/yate/data/snmp_mib.conf /usr/share/yate/data/YATE-MIB.txt))
 $(eval $(call BuildPlugin,ystunchan,,STUN Support,))
-$(eval $(call BuildPlugin,zapcard,server,Zaptel Card Signalling and Data Driver,+zaptel14-libtonezone))
 $(eval $(call BuildPlugin,zlibcompress,,Zlib Compression,+zlib))

diff --git a/net/yate/files/yate.init b/net/yate/files/yate.init
new file mode 100644 (file)
index 0000000..4fe8c58
--- /dev/null
+++ b/net/yate/files/yate.init
@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2013 OpenWrt.org
+START=50
+
+SERVICE_USE_PID=1
+
+YATE_BINARY="/usr/bin/yate"
+YATE_LOG_FILE=""
+YATE_OPTIONS="-d -s -p /var/run/yate.pid"
+
+start() {
+       if [ -n "$YATE_LOG_FILE" ]; then
+               YATE_OPTIONS="$YATE_OPTIONS -r -l $YATE_LOG_FILE"
+       fi
+
+       service_start $YATE_BINARY $YATE_OPTIONS
+}
+
+stop() {
+       service_stop $YATE_BINARY
+}
+
+reload() {
+       service_reload $YATE_BINARY
+}

diff --git a/net/yate/patches/100-add_dn_skipname_missing_from_many_libresolv.patch b/net/yate/patches/100-add_dn_skipname_missing_from_many_libresolv.patch
deleted file mode 100644 (file)
index bc61df0..0000000
--- a/net/yate/patches/100-add_dn_skipname_missing_from_many_libresolv.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- a/engine/Makefile.in
-+++ b/engine/Makefile.in
-@@ -31,8 +31,9 @@ CLSOBJS := TelEngine.o ObjList.o HashLis
- ENGOBJS := Configuration.o Message.o Engine.o Plugin.o
- TELOBJS := DataFormat.o Channel.o
- CLIOBJS := Client.o ClientLogic.o
-+MISCOBJS := dn_skipname.o
- 
--LIBOBJS := $(CLSOBJS) $(ENGOBJS) $(TELOBJS) $(CLIOBJS)
-+LIBOBJS := $(CLSOBJS) $(ENGOBJS) $(TELOBJS) $(CLIOBJS) $(MISCOBJS)
- CLEANS = $(LIBOBJS) core
- CCOMPILE = $(CC) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
- COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CPPFLAGS)
-@@ -109,6 +110,9 @@ String.o: @srcdir@/String.cpp $(MKDEPS)
- regex.o: @top_srcdir@/engine/regex/regex.c $(MKDEPS)
-       $(CCOMPILE) -DSTDC_HEADERS $(REGEX_INC) -c $<
- 
-+dn_skipname.o: @srcdir@/dn_skipname.c $(MKDEPS)
-+      $(CCOMPILE) -DSTDC_HEADERS -c $<
-+
- %.o: @srcdir@/%.cpp $(MKDEPS) $(EINC)
-       $(COMPILE) -c $<
- 
---- /dev/null
-+++ b/engine/dn_skipname.c
-@@ -0,0 +1,85 @@
-+/* Taken from patch by Natanael Copa for uClibc in message
-+  * http://lists.busybox.net/pipermail/uclibc/2009-September/042971.html
-+  * Turned into yate patch by Daniel Dickinson <openwrt@cshore.neomailbox.net>, Mar 11, 2011
-+*/
-+#include <sys/types.h>
-+#include <resolv.h>
-+
-+/* taken from OpenBSD source */
-+/*
-+ * Copyright (c) 1985, 1993
-+ *    The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ * -
-+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies, and that
-+ * the name of Digital Equipment Corporation not be used in advertising or
-+ * publicity pertaining to distribution of the document or software without
-+ * specific, written prior permission.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
-+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
-+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ */
-+
-+/*
-+ * Skip over a compressed domain name. Return the size or -1.
-+ */
-+int
-+__dn_skipname(const u_char *comp_dn, const u_char *eom)
-+{
-+      const u_char *cp;
-+      int n;
-+
-+      cp = comp_dn;
-+      while (cp < eom && (n = *cp++)) {
-+              /*
-+               * check for indirection
-+               */
-+              switch (n & INDIR_MASK) {
-+              case 0:                 /* normal case, n == len */
-+                      cp += n;
-+                      continue;
-+              case INDIR_MASK:        /* indirection */
-+                      cp++;
-+                      break;
-+              default:                /* illegal type */
-+                      return (-1);
-+              }
-+              break;
-+      }
-+      if (cp > eom)
-+              return (-1);
-+      return (cp - comp_dn);
-+}