pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
kamailio: Update to 5.8.6
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Mon May 12 18:03:00 2025 -0400
Changeset: a4718e4331647ef1af00dd6d42fadd2e17dd6126
Modified Files:
kamailio/Makefile
kamailio/distinfo
kamailio/patches/patch-src_Makefile.defs
kamailio/patches/patch-src_lib_srdb1_db__ut.c
Added Files:
kamailio/patches/patch-src_modules_influxdbc_ic.c
Log Message:
kamailio: Update to 5.8.6
Doesn't quite build, but I think it builds as well as it used to.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a4718e4331647ef1af00dd6d42fadd2e17dd6126
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
kamailio/Makefile | 2 +-
kamailio/distinfo | 11 +++---
kamailio/patches/patch-src_Makefile.defs | 24 +++---------
kamailio/patches/patch-src_lib_srdb1_db__ut.c | 45 ++++++++---------------
kamailio/patches/patch-src_modules_influxdbc_ic.c | 19 ++++++++++
5 files changed, 48 insertions(+), 53 deletions(-)
diffs:
diff --git a/kamailio/Makefile b/kamailio/Makefile
index 3641d44782..6e29bb704b 100644
--- a/kamailio/Makefile
+++ b/kamailio/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-VERSION= 5.3.3
+VERSION= 5.8.6
DISTNAME= kamailio-${VERSION}_src
PKGNAME= kamailio-${VERSION}
CATEGORIES= comms
diff --git a/kamailio/distinfo b/kamailio/distinfo
index c0be505be9..f10c207bf1 100644
--- a/kamailio/distinfo
+++ b/kamailio/distinfo
@@ -1,7 +1,8 @@
$NetBSD$
-RMD160 (kamailio-5.3.3_src.tar.gz) = f2d25772de8418f887a3977f35554ee6ca5b36bf
-SHA512 (kamailio-5.3.3_src.tar.gz) = 99c0216a32a0b70ad7608dd9967890107a47a0692a1305bca98cbcecbdca8fe1ac6a1377a1d09ea6f1e99ba011b0fe2bd69a8bf4c92113b249e608fa14f66e3d
-Size (kamailio-5.3.3_src.tar.gz) = 12447194 bytes
-SHA1 (patch-src_Makefile.defs) = e3ceaa0e1ffd1520b5e64b59a9aba2867ad0e1ba
-SHA1 (patch-src_lib_srdb1_db__ut.c) = ecdc2d3185e9497127a4662794a8ec779cb20165
+BLAKE2s (kamailio-5.8.6_src.tar.gz) = d459955dba8a71cdf80a7884a29f8eb5577eecd55571b6f59856327c44b160ba
+SHA512 (kamailio-5.8.6_src.tar.gz) = 94a62d8c0d9b343cf4767811e217be13a5cb09cb569f982e72bf3fbb7b917572ca3cc43a7438cd3691b52b0c1e2cf69e0864a5b6a12014da903eeada97397b1b
+Size (kamailio-5.8.6_src.tar.gz) = 13027900 bytes
+SHA1 (patch-src_Makefile.defs) = e0599a9f44542e90afe14ca66d0abf8bb85c7652
+SHA1 (patch-src_lib_srdb1_db__ut.c) = 7609f63d400dde7d1a1a47572be246ca993ca1d9
+SHA1 (patch-src_modules_influxdbc_ic.c) = 66cc21454bf61d62e2de5eadcd4a68e83b673302
diff --git a/kamailio/patches/patch-src_Makefile.defs b/kamailio/patches/patch-src_Makefile.defs
index 9077d1175a..5929a8d9a3 100644
--- a/kamailio/patches/patch-src_Makefile.defs
+++ b/kamailio/patches/patch-src_Makefile.defs
@@ -5,21 +5,9 @@ but Linux).
Not yet filed upstream.
---- src/Makefile.defs.orig 2020-03-16 14:17:27.000000000 +0000
+--- src/Makefile.defs.orig 2025-03-20 08:05:45.000000000 +0000
+++ src/Makefile.defs
-@@ -210,9 +210,9 @@ endif
-
- endif
-
--ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1)
-+ifeq ($(LIBSSL_SET_MUTEX_SHARED), 2)
- CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED
--LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions
-+LD_PMUTEX_OPTS = -pthread -rdynamic -Wl,-Bsymbolic-functions
- else
- CC_PMUTEX_OPTS =
- LD_PMUTEX_OPTS =
-@@ -443,15 +443,7 @@ endif
+@@ -454,15 +454,7 @@ endif
$(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>)
@@ -36,16 +24,16 @@ Not yet filed upstream.
# dirs
cfg_dir = etc/$(MAIN_NAME)/
-@@ -1821,7 +1813,7 @@ ifeq ($(YACC),)
+@@ -1835,7 +1827,7 @@ ifeq ($(YACC),)
endif
YACC_FLAGS=-d -b core/cfg
# on solaris add -lxnet (e.g. LIBS= -lxnet)
--LIBS= -ldl -lresolv
-+LIBS= -lresolv
+-LIBS= -ldl -lresolv -lm
++LIBS= -lresolv -lm
LIB_PREFIX:=lib
LIB_SUFFIX:=.so
-@@ -2042,6 +2034,7 @@ ifeq ($(OS), netbsd)
+@@ -2062,6 +2054,7 @@ ifeq ($(OS), netbsd)
ifneq ($(found_lock_method), yes)
C_DEFS+= -DUSE_SYSV_SEM # try pthread sems
found_lock_method=yes
diff --git a/kamailio/patches/patch-src_lib_srdb1_db__ut.c b/kamailio/patches/patch-src_lib_srdb1_db__ut.c
index 1f5d30359a..d2cb6cf02a 100644
--- a/kamailio/patches/patch-src_lib_srdb1_db__ut.c
+++ b/kamailio/patches/patch-src_lib_srdb1_db__ut.c
@@ -5,37 +5,24 @@ actually understanding and fixing properly for later.
Not yet reported upstream.
---- src/lib/srdb1/db_ut.c.orig 2019-11-14 11:38:09.000000000 +0000
+--- src/lib/srdb1/db_ut.c.orig 2025-03-20 08:05:45.000000000 +0000
+++ src/lib/srdb1/db_ut.c
-@@ -33,29 +33,8 @@
+@@ -33,6 +33,10 @@
#include "../../core/pvar.h"
#endif
--/**
-- * make strptime available
-- * use 600 for 'Single UNIX Specification, Version 3'
-- * _XOPEN_SOURCE creates conflict in swab definition in Solaris
-- */
--#ifndef __OS_solaris
-- #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */
-- #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect
-- * of the above define on
-- * features.h/unistd.h syscall() */
-- #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */
--#else
-- #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
--#endif
--
--#include <time.h>
--
--#ifndef __OS_solaris
-- #undef _XOPEN_SOURCE
-- #undef _XOPEN_SOURCE_EXTENDED
--#else /* solaris */
-- #undef _XOPEN_SOURCE_EXTENDED
--#endif
-+#define _NETBSD_SOURCE
++#if defined(__OS_netbsd)
+#include <sys/types.h>
-
- #include <limits.h>
- #include <errno.h>
++#endif
++
+ /**
+ * make strptime available
+ * use 600 for 'Single UNIX Specification, Version 3'
+@@ -45,6 +49,7 @@
+ * of the above define on
+ * features.h/unistd.h syscall() */
+ #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */
++#define _NETBSD_SOURCE
+ #else
+ #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
+ #endif
diff --git a/kamailio/patches/patch-src_modules_influxdbc_ic.c b/kamailio/patches/patch-src_modules_influxdbc_ic.c
new file mode 100644
index 0000000000..5f8edca910
--- /dev/null
+++ b/kamailio/patches/patch-src_modules_influxdbc_ic.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- src/modules/influxdbc/ic.c.orig 2025-05-12 21:48:07.116509675 +0000
++++ src/modules/influxdbc/ic.c
+@@ -18,13 +18,13 @@
+
+ Compile: cc ic.c -g -O3 -o ic
+ */
++#include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <ctype.h>
+ #include <math.h>
+ #include <string.h>
+-#include <sys/errno.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
Home |
Main Index |
Thread Index |
Old Index