aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Angelacos <nangel@alpinelinux.org>2022-05-01 21:26:50 +0000
committeralice <alice@ayaya.dev>2022-05-12 01:44:32 +0000
commitc374f612c2a12fba567f4c4edb5f7f579bbebc12 (patch)
tree07519807b6a16f38188b4a2bd98903a0ef33c0a7
parenta12b0bc6e41114aa0c874256d4308e14288ba872 (diff)
downloadaports-c374f612c2a12fba567f4c4edb5f7f579bbebc12.tar.gz
aports-c374f612c2a12fba567f4c4edb5f7f579bbebc12.tar.bz2
aports-c374f612c2a12fba567f4c4edb5f7f579bbebc12.tar.xz
main/kamailio: upgrade to 5.5.4
Note that upstream made a change that should fix the openldap symbol conflict
-rw-r--r--main/kamailio/APKBUILD8
-rw-r--r--main/kamailio/fix-openldap-2.5-symbol-conflict.patch46
2 files changed, 3 insertions, 51 deletions
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 29f874cebc..cffe515bf3 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -4,8 +4,8 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=kamailio
-pkgver=5.5.2
-pkgrel=2
+pkgver=5.5.4
+pkgrel=0
# If building from a git snapshot, specify the gitcommit
# If building a proper release, leave gitcommit blank or commented
@@ -33,7 +33,6 @@ makedepends="bison flex freeradius-client-dev expat-dev
# These are in testing / community - can't enable for kamailio in main
# librdkafka-dev dnssec-tools-dev
source="kamailio-${pkgver}$_suffix.tar.gz::https://github.com/kamailio/kamailio/archive/$_gitcommit.tar.gz
- fix-openldap-2.5-symbol-conflict.patch
kamailio.initd
"
@@ -556,7 +555,6 @@ sipdump() {
}
sha512sums="
-5f887453c9c00acff855505d9b567c200242791686aeacb2477065136d5edcfc76c4cab55078d36e6b76294246343c412dd9959219f1eff57ffe239550de7a37 kamailio-5.5.2.tar.gz
-50d055c62fc9ba2248b5883e316d5f91930ef74906314cc9d2e3379168f0967173e5474c9915c81edb1174035f33f7fa570e80d99c9bd27aa9ef38c0b155a76c fix-openldap-2.5-symbol-conflict.patch
+b9d0894f674683d0e10b97fd3301a3e76ea34529086eaeb5c949d17d49f611b2c160c22fb87be673996a3129c259231832d1943216759df79f16617c4beace33 kamailio-5.5.4.tar.gz
0c87bfb78481568c03e603049eb8597a90d24ae2941fc81694181b2326fa9db89fbddaaa3cf08c7bc2f5fa0e7ffac4cf4e2d010d08c4faa6cf6df98593432539 kamailio.initd
"
diff --git a/main/kamailio/fix-openldap-2.5-symbol-conflict.patch b/main/kamailio/fix-openldap-2.5-symbol-conflict.patch
deleted file mode 100644
index 766616f31b..0000000000
--- a/main/kamailio/fix-openldap-2.5-symbol-conflict.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sun, 31 Oct 2021 21:23:35 +0100
-Subject: [PATCH] Fix symbol conflict with OpenLDAP 2.5+
-
- In file included from ldap_connect.c:34:
- ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'
- 34 | extern int ldap_connect(char *_ld_name);
- | ^~~~~~~~~~~~
- In file included from ldap_connect.c:32:
- /usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' was here
- 1555 | ldap_connect( LDAP *ld );
- | ^~~~~~~~~~~~
-
---- a/src/modules/ldap/ldap_connect.c
-+++ b/src/modules/ldap/ldap_connect.c
-@@ -185,7 +185,7 @@
- return 0;
- }
-
--int ldap_connect(char *_ld_name)
-+int kam_ldap_connect(char *_ld_name)
- {
- return ldap_connect_ex(_ld_name, L_DBG);
- }
---- a/src/modules/ldap/ldap_connect.h
-+++ b/src/modules/ldap/ldap_connect.h
-@@ -31,7 +31,7 @@
- #include "../../core/str.h"
- #include "../../core/dprint.h"
-
--extern int ldap_connect(char *_ld_name);
-+extern int kam_ldap_connect(char *_ld_name);
- extern int ldap_disconnect(char *_ld_name);
- extern int ldap_reconnect(char *_ld_name);
- extern int ldap_get_vendor_version(char **_version);
---- a/src/modules/ldap/ldap_mod.c
-+++ b/src/modules/ldap/ldap_mod.c
-@@ -167,7 +167,7 @@
- return -1;
- }
-
-- if(ldap_connect(ld_name) != 0) {
-+ if(kam_ldap_connect(ld_name) != 0) {
- LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name);
- ldap_disconnect(ld_name);
- return -1;