pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kamailo: Add really kludgy locking patch



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Mar 16 19:55:25 2020 -0400
Changeset:	a1270dd002161fed6f9821acbd5c5a2a7267a6b7

Modified Files:
	kamailio/distinfo
	kamailio/patches/patch-src_Makefile.defs

Log Message:
kamailo: Add really kludgy locking patch

I fully expect this to go away, but this basically forces off the
pthread_mutexattr_setpshared code intended to deal with OpenSSL 1.1.
I am currently discussing the larger issue with upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a1270dd002161fed6f9821acbd5c5a2a7267a6b7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kamailio/distinfo                        | 2 +-
 kamailio/patches/patch-src_Makefile.defs | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs:
diff --git a/kamailio/distinfo b/kamailio/distinfo
index eda930d7d2..e75d1351f2 100644
--- a/kamailio/distinfo
+++ b/kamailio/distinfo
@@ -4,5 +4,5 @@ SHA1 (kamailio-5.3.3_src.tar.gz) = 89552042bf8cdc04ccf183fa86df4af699d70fbf
 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) = eacc2d36bf93b0a0d8a7f606434c4e90d4a17f29
+SHA1 (patch-src_Makefile.defs) = e3ceaa0e1ffd1520b5e64b59a9aba2867ad0e1ba
 SHA1 (patch-src_lib_srdb1_db__ut.c) = ecdc2d3185e9497127a4662794a8ec779cb20165
diff --git a/kamailio/patches/patch-src_Makefile.defs b/kamailio/patches/patch-src_Makefile.defs
index 7078713320..9077d1175a 100644
--- a/kamailio/patches/patch-src_Makefile.defs
+++ b/kamailio/patches/patch-src_Makefile.defs
@@ -7,9 +7,12 @@ Not yet filed upstream.
 
 --- src/Makefile.defs.orig	2020-03-16 14:17:27.000000000 +0000
 +++ src/Makefile.defs
-@@ -212,7 +212,7 @@ endif
+@@ -210,9 +210,9 @@ endif
  
- ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1)
+ 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


Home | Main Index | Thread Index | Old Index