diff options
| author | Steve Wills <swills@FreeBSD.org> | 2020-09-04 12:44:57 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2020-09-04 12:44:57 +0000 |
| commit | a2ca5b6fbe2aab96d277a5b3e9a2d165cc83f9f9 (patch) | |
| tree | 887d69a34e1ec969ffeaec77b7f9b8205634b3ef /net/kamailio/files | |
| parent | biology/mapm3: Reformat patches. (diff) | |
net/kamailio: Update to 5.4.0
PR: 248850
Submitted by: Dmitry Wagin <dmitry.wagin@ya.ru> (maintainer)
Diffstat (limited to 'net/kamailio/files')
| -rw-r--r-- | net/kamailio/files/kamailio.in | 2 | ||||
| -rw-r--r-- | net/kamailio/files/patch-src_Makefile.defs | 26 | ||||
| -rw-r--r-- | net/kamailio/files/patch-src_modules_websocket_ws__frame.c | 2 |
3 files changed, 18 insertions, 12 deletions
diff --git a/net/kamailio/files/kamailio.in b/net/kamailio/files/kamailio.in index 7fbbeab8fbad..8b202e880fee 100644 --- a/net/kamailio/files/kamailio.in +++ b/net/kamailio/files/kamailio.in @@ -3,7 +3,7 @@ # $FreeBSD: net/kamailio/files/kamailio.in # # PROVIDE: kamailio -# REQUIRE: LOGIN +# REQUIRE: NETWORKING SERVERS DAEMON # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable this service diff --git a/net/kamailio/files/patch-src_Makefile.defs b/net/kamailio/files/patch-src_Makefile.defs index 0ae9cb50204f..32033cd14e4f 100644 --- a/net/kamailio/files/patch-src_Makefile.defs +++ b/net/kamailio/files/patch-src_Makefile.defs @@ -1,4 +1,4 @@ ---- src/Makefile.defs.orig 2020-05-06 13:20:45 UTC +--- src/Makefile.defs.orig 2020-07-29 10:22:39 UTC +++ src/Makefile.defs @@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}") @@ -27,12 +27,18 @@ else LIBDIR = lib endif -@@ -1830,7 +1830,7 @@ ifeq ($(YACC),) - endif - YACC_FLAGS=-d -b core/cfg - # on solaris add -lxnet (e.g. LIBS= -lxnet) --LIBS= -ldl -lresolv -+LIBS= - LIB_PREFIX:=lib - LIB_SUFFIX:=.so - +@@ -1979,12 +1979,11 @@ ifeq ($(OS), freebsd) + ifeq ($(RAW_SOCKS), yes) + C_DEFS+= -DUSE_RAW_SOCKS + endif ++ LIBS= -lm # resolv and dlopen is in libc + ifneq ($(found_lock_method), yes) + C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems + found_lock_method=yes +- LIBS+= -pthread #dlopen is in libc +- else +- LIBS= #dlopen is in libc ++ LIBS+= -pthread + endif + # check for ver >= 4.1 + ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) diff --git a/net/kamailio/files/patch-src_modules_websocket_ws__frame.c b/net/kamailio/files/patch-src_modules_websocket_ws__frame.c index 2d44cf2da71a..d941aabb6176 100644 --- a/net/kamailio/files/patch-src_modules_websocket_ws__frame.c +++ b/net/kamailio/files/patch-src_modules_websocket_ws__frame.c @@ -5,7 +5,7 @@ #include "utf8_decode.h" #else -#include <unistr.h> -+/* #include <unistr.h> */ ++//#include <unistr.h> #endif #include "../../core/events.h" |