From nobody Wed Aug 17 17:51:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M7Fv63SQDz4Ynr2; Wed, 17 Aug 2022 17:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M7Fv62tr4z41yK; Wed, 17 Aug 2022 17:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660758690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9Pbk+/yHQcf19a7jfBcNT6/fn0+yKD111j1RuHpRBs=; b=xD01rhp9LPKsDGbGiuRZ1bya8C/OXVwANvvGRicpciImuXr9BheOcAUA1vkGKwQOl1ZCig eGEbGy6nB7CtxPlILuguyYAqMokSFAGhyCzoHlFDfhgrsIvZVG5tMvtIdOdQMMhIMMq4vP zj0qbGA3njtK8okCWYSpACY9h1E0wZIq62pPswx2NDnXF1iMLz7VJESAc0QRNzdRQD5n9M 7ptXhqKhkfFMiYsRPJuaM7rVCXywfDPR1yNwIeFN9sRFr8wBFF5HQcbUXAtJ+VUmtan3a+ QqPOoMokC3ROhK00pqtZPIcZWXN3nDQT/8/Tpy92u6N0SXmxGgwpO0Z2PIxE6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M7Fv61xVszy2B; Wed, 17 Aug 2022 17:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27HHpUVb024001; Wed, 17 Aug 2022 17:51:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27HHpUCu024000; Wed, 17 Aug 2022 17:51:30 GMT (envelope-from git) Date: Wed, 17 Aug 2022 17:51:30 GMT Message-Id: <202208171751.27HHpUCu024000@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 327c682e4676 - main - security/openvpn-auth-ldap: Fix crash/update MAINTAINER/bump PORTREVISION List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 327c682e46761e2a9c06507dafb8fac49f564ce6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660758690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9Pbk+/yHQcf19a7jfBcNT6/fn0+yKD111j1RuHpRBs=; b=Ity2RnS6xHanrfdGaNczOk9cq7vroHM/yKBvr5I2J+FJFru4O1GCwFJfICFG7xFy4qaDaV nSR9XmpA9Q/l+4pFVWxaZcJX3JJcq1Pq25iohC+TwAz0p9eITMQ3vu7U+egjSWfjWlsm69 BI5eOz6/pDNh5Hfm99+rqDBebKrSy3wD1hCgrSLZpbvVQ8ie3C4jfioP6luMn6lqDQUReU 95YuuJa6NZuNpnsudbYDlV/qcluF6bT3KdGi4KNZBhlADKv8aW2m9kO73wy698/IckJfml MAiL6LBk5du/Xze+Ved+r9aDvw66OHu2cStL4sIKiJae8hIRhYraE0x+7rMqKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660758690; a=rsa-sha256; cv=none; b=JR8GR7MQnziQ1cGE5jeEZ6O6Rt0QpchHYiKodwD70KzGw7RmzozoRODM5YoqmflEWS5R80 IR5FLg9lQRRruYywcrxQAEtN3cff9xUTfavQJ0zjwmjTA1xuD3sfE5BqAZwOHyITI+3x+P /U8No3q48I42o68ObABQtlCEhepPTcpEPcls7R/RP1BZfq5JSpMclbBsmvNP/16kI/NVZz Rfm+vtv14nsiEo8ksH75URJyVqu5zkLs3vYyMLRF2Q7trItG6agK8hqiH/lERaGPoLgyFT 7C5hbjLDqw56e5U3PyT+LpfPOKgpJRKlZ7lmUTF+lESEie1uoRBHCqU9Zm/YSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=327c682e46761e2a9c06507dafb8fac49f564ce6 commit 327c682e46761e2a9c06507dafb8fac49f564ce6 Author: Ryan Steinmetz AuthorDate: 2022-08-17 17:49:46 +0000 Commit: Ryan Steinmetz CommitDate: 2022-08-17 17:51:13 +0000 security/openvpn-auth-ldap: Fix crash/update MAINTAINER/bump PORTREVISION Approved by: mandree@ (maintainer) --- security/openvpn-auth-ldap/Makefile | 4 ++-- .../openvpn-auth-ldap/files/patch-src_auth-ldap.m | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile index da959b439e44..5266a44d142e 100644 --- a/security/openvpn-auth-ldap/Makefile +++ b/security/openvpn-auth-ldap/Makefile @@ -1,10 +1,10 @@ PORTNAME= openvpn-auth-ldap PORTVERSION= 2.0.4 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= auth-ldap- CATEGORIES= security net-vpn -MAINTAINER= mandree@FreeBSD.org +MAINTAINER= zi@FreeBSD.org COMMENT= LDAP authentication plugin for OpenVPN LICENSE= BSD3CLAUSE diff --git a/security/openvpn-auth-ldap/files/patch-src_auth-ldap.m b/security/openvpn-auth-ldap/files/patch-src_auth-ldap.m index 80e8c794b66e..d811948af304 100644 --- a/security/openvpn-auth-ldap/files/patch-src_auth-ldap.m +++ b/security/openvpn-auth-ldap/files/patch-src_auth-ldap.m @@ -1,8 +1,8 @@ Fix crash on close if there is no ctx. ---- src/auth-ldap.m.orig 2012-08-15 13:55:46 UTC +--- src/auth-ldap.m.orig 2018-07-26 20:17:21 UTC +++ src/auth-ldap.m -@@ -245,6 +245,9 @@ OPENVPN_EXPORT void +@@ -247,6 +247,9 @@ OPENVPN_EXPORT void { ldap_ctx *ctx = handle; @@ -12,3 +12,20 @@ Fix crash on close if there is no ctx. /* Clean up the configuration file */ [ctx->config release]; +@@ -545,7 +548,6 @@ openvpn_plugin_func_v1(openvpn_plugin_ha + pool = [[TRAutoreleasePool alloc] init]; + + username = get_env("username", envp); +- TRString *userName=[[TRString alloc]initWithCString: username]; + password = get_env("password", envp); + remoteAddress = get_env("ifconfig_pool_remote_ip", envp); + +@@ -556,6 +558,8 @@ openvpn_plugin_func_v1(openvpn_plugin_ha + goto cleanup; + } + ++ TRString *userName=[[TRString alloc]initWithCString: username]; ++ + /* Create an LDAP connection */ + if (!(ldap = connect_ldap(ctx->config))) { + [TRLog error: "LDAP connect failed."];