Attachment 218025 Details for Bug 249393 – kamailio.diff

[patch] kamailio.diff

kamailio.diff (text/plain), 4.36 KB, created by Dmitry Wagin on 2020-09-17 13:57:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2020-09-17 13:57:07 UTC

Size: 4.36 KB

patch

obsolete

>Index: net/kamailio/Makefile
>===================================================================
>--- net/kamailio/Makefile	(revision 548623)
>+++ net/kamailio/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kamailio
>-PORTVERSION=	5.4.0
>+PORTVERSION=	5.4.1
> CATEGORIES=	net
> MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
> DISTNAME=	${PORTNAME}-${PORTVERSION}_src
>@@ -126,7 +126,7 @@
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} '563s|run_target = $$(run_prefix)/$$(run_dir)|run_target = ${KAMAILIO_RUNDIR}|' \
>+	${REINPLACE_CMD} '565s|run_target = $$(run_prefix)/$$(run_dir)|run_target = ${KAMAILIO_RUNDIR}|' \
> 		${WRKSRC}/src/Makefile.defs
> 
> post-patch-DOCS-off:
>Index: net/kamailio/distinfo
>===================================================================
>--- net/kamailio/distinfo	(revision 548623)
>+++ net/kamailio/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1597605362
>-SHA256 (kamailio-5.4.0_src.tar.gz) = 9ee22d566a7b6f60eaf283e95ee6633046dc87117be03b6cf2bc27293087718b
>-SIZE (kamailio-5.4.0_src.tar.gz) = 12586462
>+TIMESTAMP = 1599259759
>+SHA256 (kamailio-5.4.1_src.tar.gz) = 2a970e2edbc6989429dd52d9a45dad4b891901867c3b267734c67e87e3706bc3
>+SIZE (kamailio-5.4.1_src.tar.gz) = 12608802
>Index: net/kamailio/files/extra-patch-atomic-amd64
>===================================================================
>--- net/kamailio/files/extra-patch-atomic-amd64	(revision 548623)
>+++ net/kamailio/files/extra-patch-atomic-amd64	(nonexistent)
>@@ -1,11 +0,0 @@
>---- atomic/atomic_native.h.orig	2015-09-06 19:01:51 UTC
>-+++ atomic/atomic_native.h
>-@@ -46,6 +46,8 @@
>- #ifndef __atomic_native
>- #define __atomic_native
>- 
>-+#define CC_GCC_LIKE_ASM	1
>-+#define __CPU_x86_64	1
>- #ifdef CC_GCC_LIKE_ASM
>- 
>- #if defined __CPU_i386 || defined __CPU_x86_64
>
>Property changes on: net/kamailio/files/extra-patch-atomic-amd64
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/kamailio/files/extra-patch-atomic-i386
>===================================================================
>--- net/kamailio/files/extra-patch-atomic-i386	(revision 548623)
>+++ net/kamailio/files/extra-patch-atomic-i386	(nonexistent)
>@@ -1,11 +0,0 @@
>---- atomic/atomic_native.h.orig	2015-09-06 19:01:51 UTC
>-+++ atomic/atomic_native.h
>-@@ -46,6 +46,8 @@
>- #ifndef __atomic_native
>- #define __atomic_native
>- 
>-+#define CC_GCC_LIKE_ASM	1
>-+#define __CPU_i386	1
>- #ifdef CC_GCC_LIKE_ASM
>- 
>- #if defined __CPU_i386 || defined __CPU_x86_64
>
>Property changes on: net/kamailio/files/extra-patch-atomic-i386
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/kamailio/files/patch-src_Makefile.defs
>===================================================================
>--- net/kamailio/files/patch-src_Makefile.defs	(revision 548623)
>+++ net/kamailio/files/patch-src_Makefile.defs	(working copy)
>@@ -1,4 +1,4 @@
>---- src/Makefile.defs.orig	2020-07-29 10:22:39 UTC
>+--- src/Makefile.defs.orig	2020-09-01 08:11:08 UTC
> +++ src/Makefile.defs
> @@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}")
>  
>@@ -16,9 +16,9 @@
> -	CC_NAME=gcc
> +	CC_NAME=clang
>  	RPAREN=)
>- 	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\
>+ 	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version 2>/dev/null|head -n 1|\
>  				sed  -e 's/([^$(RPAREN)]*)//g' \
>-@@ -456,7 +456,7 @@ LIBDIR ?=
>+@@ -458,7 +458,7 @@ LIBDIR ?=
>  ifeq ($(LIBDIR),)
>  ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
>  ifeq ($(ARCHBSZ),64b)
>@@ -27,18 +27,3 @@
>  else
>  	LIBDIR = lib
>  endif
>-@@ -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)

Flags:

dmitry.wagin: maintainer-approval+

Actions: View | Diff

Attachments on bug 249393: 218025