Attachment 217454 Details for Bug 248850 – kamailio.diff

[patch] kamailio.diff

kamailio.diff (text/plain), 3.95 KB, created by Dmitry Wagin on 2020-08-23 13:15:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2020-08-23 13:15:30 UTC

Size: 3.95 KB

patch

obsolete

>Index: net/kamailio/Makefile
>===================================================================
>--- net/kamailio/Makefile	(revision 545130)
>+++ net/kamailio/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kamailio
>-PORTVERSION=	5.3.5
>+PORTVERSION=	5.4.0
> CATEGORIES=	net
> MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
> DISTNAME=	${PORTNAME}-${PORTVERSION}_src
>Index: net/kamailio/distinfo
>===================================================================
>--- net/kamailio/distinfo	(revision 545130)
>+++ net/kamailio/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1593173267
>-SHA256 (kamailio-5.3.5_src.tar.gz) = 5e192a03a936a5a51f3b8363dfa5b15d350c3590cc7548609156b554bc6d0e94
>-SIZE (kamailio-5.3.5_src.tar.gz) = 12480234
>+TIMESTAMP = 1597605362
>+SHA256 (kamailio-5.4.0_src.tar.gz) = 9ee22d566a7b6f60eaf283e95ee6633046dc87117be03b6cf2bc27293087718b
>+SIZE (kamailio-5.4.0_src.tar.gz) = 12586462
>Index: net/kamailio/files/kamailio.in
>===================================================================
>--- net/kamailio/files/kamailio.in	(revision 545130)
>+++ net/kamailio/files/kamailio.in	(working copy)
>@@ -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
>Index: net/kamailio/files/patch-src_Makefile.defs
>===================================================================
>--- net/kamailio/files/patch-src_Makefile.defs	(revision 545130)
>+++ net/kamailio/files/patch-src_Makefile.defs	(working copy)
>@@ -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)
>Index: net/kamailio/files/patch-src_modules_websocket_ws__frame.c
>===================================================================
>--- net/kamailio/files/patch-src_modules_websocket_ws__frame.c	(revision 545130)
>+++ net/kamailio/files/patch-src_modules_websocket_ws__frame.c	(working copy)
>@@ -5,7 +5,7 @@
>  #include "utf8_decode.h"
>  #else
> -#include <unistr.h>
>-+/* #include <unistr.h> */
>++//#include <unistr.h>
>  #endif
>  
>  #include "../../core/events.h"
>Index: net/kamailio/pkg-plist
>===================================================================
>--- net/kamailio/pkg-plist	(revision 545130)
>+++ net/kamailio/pkg-plist	(working copy)
>@@ -319,6 +319,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.print
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.print_lib
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.pv
>+%%PORTDOCS%%%%DOCSDIR%%/modules/README.pv_headers
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.qos
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.ratelimit
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.rr
>@@ -426,8 +427,6 @@
> lib/kamailio/libprint.so.1
> lib/kamailio/libsrdb1.so
> lib/kamailio/libsrdb1.so.1
>-lib/kamailio/libsrutils.so
>-lib/kamailio/libsrutils.so.1
> lib/kamailio/libtrie.so
> lib/kamailio/libtrie.so.1
> lib/kamailio/modules/acc_diameter.so
>@@ -477,6 +476,7 @@
> lib/kamailio/modules/print.so
> lib/kamailio/modules/print_lib.so
> lib/kamailio/modules/pv.so
>+lib/kamailio/modules/pv_headers.so
> lib/kamailio/modules/qos.so
> lib/kamailio/modules/ratelimit.so
> lib/kamailio/modules/rr.so

Flags:

dmitry.wagin: maintainer-approval+

Actions: View | Diff

Attachments on bug 248850: 217454 | 217489