Date: Friday, January 6, 2023 @ 15:56:09
Author: spupykin
Revision: 1378639
opensips: clean up
Modified:
opensips/trunk/PKGBUILD
Deleted:
opensips/trunk/openldap-2.5.patch
--------------------+
PKGBUILD | 4 ---
openldap-2.5.patch | 57 ---------------------------------------------------
2 files changed, 61 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-06 15:55:18 UTC (rev 1378638)
+++ PKGBUILD 2023-01-06 15:56:09 UTC (rev 1378639)
@@ -27,10 +27,6 @@
sha256sums=('54d5a24adbba0affc3c0f2cc7a5c8793d7c6cb9bf2df45ab665f260f20ccba89'
'c2fec4be085b108db10834fa9832e98d696c2de6408f85f96cf89c13bf6be819')
-prepare() {
- cd "$srcdir"/$pkgname-$pkgver/
-}
-
_modules="db_http db_mysql db_postgres db_unixodbc h350 httpd ldap presence
presence_xml proto_tls tls_mgm tls_openssl tm rr"
build() {
Deleted: openldap-2.5.patch
===================================================================
--- openldap-2.5.patch 2023-01-06 15:55:18 UTC (rev 1378638)
+++ openldap-2.5.patch 2023-01-06 15:56:09 UTC (rev 1378639)
@@ -1,57 +0,0 @@
-diff -upr opensips-3.1.2.orig/modules/ldap/ldap_api_fn.c
opensips-3.1.2/modules/ldap/ldap_api_fn.c
---- opensips-3.1.2.orig/modules/ldap/ldap_api_fn.c 2021-05-06
17:40:16.000000000 +0300
-+++ opensips-3.1.2/modules/ldap/ldap_api_fn.c 2021-11-13 22:51:36.709798951
+0200
-@@ -118,7 +118,7 @@ struct ld_conn* get_ldap_connection(stru
- return NULL;
- }
-
-- if (ldap_connect(lds->name, NULL) < 0) {
-+ if (opensips_ldap_connect(lds->name, NULL) < 0) {
- LM_ERR("failed to create new ldap connection!\n");
- return NULL;
- }
-diff -upr opensips-3.1.2.orig/modules/ldap/ldap_connect.c
opensips-3.1.2/modules/ldap/ldap_connect.c
---- opensips-3.1.2.orig/modules/ldap/ldap_connect.c 2021-05-06
17:40:16.000000000 +0300
-+++ opensips-3.1.2/modules/ldap/ldap_connect.c 2021-11-13 22:51:36.709798951
+0200
-@@ -113,7 +113,7 @@ error:
- }
-
-
--int ldap_connect(char* _ld_name, struct ld_conn* conn)
-+int opensips_ldap_connect(char* _ld_name, struct ld_conn* conn)
- {
- int rc;
- int ldap_proto_version;
-@@ -411,7 +411,7 @@ int ldap_reconnect(char* _ld_name, struc
- return -1;
- }
-
-- if ((rc = ldap_connect(_ld_name, conn)) != 0)
-+ if ((rc = opensips_ldap_connect(_ld_name, conn)) != 0)
- {
- LM_ERR("[%s]: reconnect failed\n",
- _ld_name);
-diff -upr opensips-3.1.2.orig/modules/ldap/ldap_connect.h
opensips-3.1.2/modules/ldap/ldap_connect.h
---- opensips-3.1.2.orig/modules/ldap/ldap_connect.h 2021-05-06
17:40:16.000000000 +0300
-+++ opensips-3.1.2/modules/ldap/ldap_connect.h 2021-11-13 22:51:38.336506198
+0200
-@@ -43,7 +43,7 @@
- /* forward declaration for this structure */
- struct ld_conn;
-
--extern int ldap_connect(char* _ld_name, struct ld_conn* conn);
-+extern int opensips_ldap_connect(char* _ld_name, struct ld_conn* conn);
- extern int ldap_disconnect(char* _ld_name, struct ld_conn* conn);
- extern int ldap_reconnect(char* _ld_name, struct ld_conn* conn);
- extern int ldap_get_vendor_version(char** _version);
-diff -upr opensips-3.1.2.orig/modules/ldap/ldap_mod.c
opensips-3.1.2/modules/ldap/ldap_mod.c
---- opensips-3.1.2.orig/modules/ldap/ldap_mod.c 2021-05-06
17:40:16.000000000 +0300
-+++ opensips-3.1.2/modules/ldap/ldap_mod.c 2021-11-13 22:51:36.709798951
+0200
-@@ -186,7 +186,7 @@ static int child_init(int rank)
- }
-
- /* won't check for null in get_ld_session since it's barely
been initialized */
-- if (ldap_connect(ld_name, &get_ld_session(ld_name)->conn_s) !=
0)
-+ if (opensips_ldap_connect(ld_name,
&get_ld_session(ld_name)->conn_s) != 0)
- {
- LM_ERR("[%s]: failed to connect to LDAP host(s)\n",
ld_name);
- ldap_disconnect(ld_name, NULL);
