Update to 1.5.0.

This commit is contained in:
Maxim Sobolev 2003-04-04 10:40:24 +00:00
parent cdcb44c618
commit f9788f8b94
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=78160
18 changed files with 46 additions and 198 deletions

View file

@ -6,10 +6,10 @@
#
PORTNAME= b2bua
PORTVERSION= 1.4.0
PORTREVISION= 1
PORTVERSION= 1.5.0
CATEGORIES= net
MASTER_SITES= http://www.vovida.org/downloads/b2bua/
MASTER_SITES= http://www.vovida.org/downloads/sip/${PORTVERSION}/
DISTNAME= sip-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
COMMENT= A back-to-back (B2B) SIP user agent
@ -18,11 +18,10 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
USE_GMAKE= yes
ALL_TARGET= b2bua
CFLAGS+= -I${LOCALBASE}/include/libxml2 \
-I${LOCALBASE}/include/libxml2/libxml \
-I${LOCALBASE}/include -Wno-deprecated
CFLAGS+= -Wno-deprecated
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" \
PTHREAD_LIBNAME="${PTHREAD_LIBNAME}"
PTHREAD_LIBNAME="${PTHREAD_LIBNAME}" \
VOCAL_USE_SYSTEM_LIBXML=true
.if !exists(/usr/include/getopt.h)
LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
@ -33,7 +32,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sip/b2b/bin.nodebug.FreeBSD.i386/b2bua \
${PREFIX}/bin
${MKDIR} ${DOCSDIR}
.for file in README HOWTO b2bdesign.pdf Doc/B2BUA.pdf
.for file in LICENSE HOWTO HOWTO.PROV b2bdesign.pdf
${INSTALL_DATA} ${WRKSRC}/sip/b2b/${file} ${DOCSDIR}
.endfor
${INSTALL_DATA} ${WRKSRC}/sip/b2b/b2bConfig.xml \

View file

@ -1 +1 @@
MD5 (b2bua-1.4.0.tar.gz) = 741616e24f10f4122aef96ebc4658fdf
MD5 (sip-1.5.0.tar.gz) = 56bc9c1bfacc672f4f3f42870aacd828

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- build/Makefile.osarch 2003/01/18 02:21:44 1.1
+++ build/Makefile.osarch 2003/01/18 02:22:24
@@ -18,6 +18,8 @@
ifeq ($(OSTYPE),FreeBSD)
+ CXXFLAGS += -D_REENTRANT -D_THREAD_SAFE
+ CFLAGS += -D_REENTRANT -D_THREAD_SAFE
USE_LIBGETOPT = 1
USE_R_WRAPPER = 1

View file

@ -1,34 +1,9 @@
$FreeBSD$
--- build/Makefile.pkg.orig Thu Apr 25 23:18:34 2002
+++ build/Makefile.pkg Sun Jan 19 17:28:26 2003
@@ -415,13 +415,13 @@
cd $(ROOT)/proxies/fs/cpl;$(MAKE)
LIBXML_INCLUDEDIRS := $(ROOT)/contrib/libxml2.$(OS_ARCH)
-LIBXML_LIBDIRS := $(ROOT)/contrib/libxml2.$(OS_ARCH)/.libs
+LIBXML_LIBDIRS := $(LOCALBASE)/lib
ifeq ($(OSTYPE),Linux)
LIBXML_LIBNAME :=
endif
ifeq ($(OSTYPE),FreeBSD)
- LIBXML_LDLIBS_LAST := $(LD_STATIC) -lxml $(LD_DYNAMIC)
+ LIBXML_LDLIBS_LAST := -lxml2
endif
ifeq ($(OSTYPE),Linux)
@@ -435,7 +435,7 @@
LIBXML_DEPENDS := $(ROOT)/contrib/libxml2.$(OS_ARCH)/.libs/libxml.a
$(LIBXML_DEPENDS):
- cd $(ROOT)/contrib ;$(MAKE) libxml
+# cd $(ROOT)/contrib ;$(MAKE) libxml
ENUM_INCLUDEDIRS := $(ROOT)/contrib/enum.$(OS_ARCH)/include
#ENUM_LIBDIRS := $(ROOT)/contrib/enum.$(OS_ARCH)/lib /usr/local/bind-8.2.2p7/src/lib
@@ -627,8 +627,8 @@
--- build/Makefile.pkg.orig Thu Apr 3 00:35:44 2003
+++ build/Makefile.pkg Fri Apr 4 13:06:17 2003
@@ -585,8 +585,8 @@
ifneq ($(OSTYPE),FreeBSD)
PTHREAD_LIBNAME := pthread
else

View file

@ -1,10 +1,10 @@
$FreeBSD$
--- build/Makefile.pre 2003/01/18 02:20:43 1.1
+++ build/Makefile.pre 2003/01/18 02:20:51
@@ -81,7 +81,7 @@
# defaults should you want to.
--- build/Makefile.pre.orig Thu Apr 3 00:35:44 2003
+++ build/Makefile.pre Fri Apr 4 13:06:17 2003
@@ -83,7 +83,7 @@
# please see Makefile.tools for more information.
VOCAL_TOOLCHAIN_TYPE := gnu
-VOCAL_COMPILE_TYPE := debug

View file

@ -1,8 +1,8 @@
$FreeBSD$
--- contrib/Makefile 2002/12/18 08:31:42 1.1
+++ contrib/Makefile 2002/12/18 08:32:44
--- contrib/Makefile.orig Thu Feb 20 06:22:29 2003
+++ contrib/Makefile Fri Apr 4 13:06:17 2003
@@ -26,7 +26,7 @@
INSTALL = install

View file

@ -0,0 +1,18 @@
$FreeBSD$
--- contrib/Makefile.pkg.orig Sat Feb 1 02:15:57 2003
+++ contrib/Makefile.pkg Fri Apr 4 13:06:17 2003
@@ -49,9 +49,9 @@
# libxml
ifeq ($(VOCAL_USE_SYSTEM_LIBXML),true)
- LIBXML_INCLUDEDIRS := /usr/local/include/libxml2 /usr/local/include/libxml2/libxml /usr/local/include
- LIBXML_LIBDIRS := /usr/local/lib
- LIBXML_LDLIBS_LAST := -lxml
+ LIBXML_INCLUDEDIRS := ${LOCALBASE}/include/libxml2 ${LOCALBASE}/include/libxml2/libxml ${LOCALBASE}/include
+ LIBXML_LIBDIRS := ${LOCALBASE}/lib
+ LIBXML_LDLIBS_LAST := -lxml2
else
LIBXML_INCLUDEDIRS := $(ROOT)/contrib/libxml2.$(OS_ARCH) $(ROOT)/contrib/libxml2.$(OS_ARCH)/include/libxml $(ROOT)/contrib/libxml2.$(OS_ARCH)/include
LIBXML_LIBDIRS := $(ROOT)/contrib/libxml2.$(OS_ARCH)/.libs

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- radius/RadiusAttribute.cxx.orig Sat Sep 22 05:16:51 2001
+++ radius/RadiusAttribute.cxx Sun Jan 19 01:35:01 2003
@@ -52,6 +52,8 @@
static const char* const RadiusAttribute_cxx_Version =
"$Id: RadiusAttribute.cxx,v 1.11 2001/09/22 02:16:51 sprajpat Exp $";
+#include <sys/types.h>
+#include <sys/socket.h>
#include <netinet/in.h>
#include <cstdio>

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- radius/RadiusMessage.cxx.orig Thu Nov 8 00:43:39 2001
+++ radius/RadiusMessage.cxx Sun Jan 19 01:35:13 2003
@@ -52,6 +52,8 @@
static const char* const RadiusMessage_cxx_Version =
"$Id: RadiusMessage.cxx,v 1.10 2001/11/07 22:43:39 chok Exp $";
+#include <sys/types.h>
+#include <sys/socket.h>
#include <netinet/in.h>
#include <time.h>

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- radius/test/Makefile 2003/01/19 13:26:53 1.1
+++ radius/test/Makefile 2003/01/19 13:27:00
@@ -5,7 +5,7 @@
include $(BUILD)/Makefile.pre
-PACKAGES += RADIUS UTIL PTHREAD
+PACKAGES += RADIUS UTIL PTHREAD LIBCEXT
TESTPROGRAMS = \
radiusTest.cxx \

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- radius/test/radiusClient.cxx 2003/01/18 20:10:53 1.1
+++ radius/test/radiusClient.cxx 2003/01/18 20:11:19
@@ -52,6 +52,8 @@
#include <cstdio>
+#include <netinet/in.h>
+
#include "cpLog.h"
#include "UdpStack.hxx"
#include "TimeFunc.hxx"

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- radius/test/radiusServer.cxx 2003/01/18 20:14:02 1.1
+++ radius/test/radiusServer.cxx 2003/01/18 20:14:31
@@ -52,6 +52,8 @@
#include <cstdio>
+#include <netinet/in.h>
+
#include "cpLog.h"
#include "UdpStack.hxx"
#include "TimeFunc.hxx"

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- sip/b2b/AAATransceiver.cxx 2003/01/18 06:18:49 1.1
+++ sip/b2b/AAATransceiver.cxx 2003/01/18 06:19:07
@@ -52,6 +52,7 @@
static const char* const AAATransceiver_cxx_Version =
"$Id: AAATransceiver.cxx,v 1.1 2003/01/18 06:18:49 root Exp root $";
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>

View file

@ -1,16 +0,0 @@
$FreeBSD$
--- sip/b2b/AAATransceiver.hxx 2003/01/18 23:09:49 1.1
+++ sip/b2b/AAATransceiver.hxx 2003/01/18 23:10:07
@@ -61,8 +61,9 @@
#include "VThread.hxx"
#include "AAAEvent.hxx"
#include "RadiusMessage.hxx"
+#include "UdpStack.hxx"
-class UdpStack;
+//class UdpStack;
using Vocal::Fifo;

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- sip/b2b/Makefile 2002/12/18 17:03:43 1.1
+++ sip/b2b/Makefile 2002/12/18 17:49:16
@@ -19,6 +19,8 @@
PACKAGES += PROXYBASE RADIUS SIP SDP2 PTHREAD UTIL LIBXML
endif
+PACKAGES += LIBCEXT
+
INCDIRS += $(ROOT)/sip/b2b $(ROOT)//sip/b2b/controlState \
$(ROOT)//sip/b2b/uaState

View file

@ -1,13 +1,14 @@
$FreeBSD$
--- util/threads/VSemaphore.hxx 2003/01/19 14:09:49 1.1
+++ util/threads/VSemaphore.hxx 2003/01/19 14:10:16
@@ -59,6 +59,7 @@
--- util/threads/VSemaphore.hxx.orig Tue Jun 25 20:01:25 2002
+++ util/threads/VSemaphore.hxx Fri Apr 4 13:06:17 2003
@@ -54,7 +54,7 @@
static const char* const VSemaphore_hxx_version =
"$Id: VSemaphore.hxx,v 1.4 2002/06/25 17:01:25 bko Exp $";
-#ifdef WIN32
+#if defined(WIN32) || defined(__FreeBSD__)
#include <pthread.h>
#endif
#if defined( __linux__ ) || defined(__FreeBSD__) || defined (WIN32)
+#include <pthread.h>
#include <semaphore.h>
#else
#include <synch.h>

View file

@ -1,18 +0,0 @@
$FreeBSD$
--- util/threads/vthread-linux.cxx 2003/01/31 09:50:14 1.1
+++ util/threads/vthread-linux.cxx 2003/01/31 09:52:19
@@ -191,6 +191,12 @@
pthread_attr_setscope(&myAttributes, PTHREAD_SCOPE_SYSTEM);
#endif
+#if defined (__FreeBSD__)
+ // Default FreeBSD thread stack size (64KB) is not sufficient for the
+ // b2bua bloatware
+ pthread_attr_setstacksize (&myAttributes, 1024*1024);
+#endif
+
// spawn the thread
return ( pthread_create( &myId, &myAttributes, startFunc, startArgs ) );
}

View file

@ -1,7 +1,7 @@
bin/b2bua
etc/b2bConfig.xml.sample
share/doc/b2bua/B2BUA.pdf
share/doc/b2bua/HOWTO
share/doc/b2bua/README
share/doc/b2bua/HOWTO.PROV
share/doc/b2bua/LICENSE
share/doc/b2bua/b2bdesign.pdf
@dirrm share/doc/b2bua