From nobody Sun Jan 23 19:33:16 2022 X-Original-To: dev-commits-ports-all@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 59F841971C1E; Sun, 23 Jan 2022 19:33:21 +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 4Jhjvh34Pnz3RJr; Sun, 23 Jan 2022 19:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642966401; 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=QfBIZ1lTLqzVW2FRcicyAErbEo5HvicJOY8Fot6ygPA=; b=yNDtXa+NKmNaKHeynB3xIZlvBppTxnAvov5InzPnTGkGmkXaJM78/epevthsaNfVZtwIPf IN+Y9fb9DDY843Gd0WOlaHuwS2MO20u6TCgFQLICoI2XphSyNKnaNUmRn3svcDMo8JF5a3 t829DPbvAxkPZxb51ZWYHUyJJOG9UvQ/qcxcLgSI94k7YGdkRYsYrbZElGYp0LVyUkyml7 bcxzIWACJOVA9/wPtceeeJXrsZ5vkoBK5TnFklj0IGNNDtS0D57WXuI5CrmNiCG7owiaBE sSq7Km1340fGquQ/QO8R/XR67brZwDh1CLUSFJFmXfzxkIjaEotoPqc3OiMd5w== 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 318C5410; Sun, 23 Jan 2022 19:33:16 +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 20NJXGOQ034608; Sun, 23 Jan 2022 19:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NJXG3B034607; Sun, 23 Jan 2022 19:33:16 GMT (envelope-from git) Date: Sun, 23 Jan 2022 19:33:16 GMT Message-Id: <202201231933.20NJXG3B034607@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: b2bd4ad8c484 - main - ftp/pure-ftpd: Fix SIGSEGV with PostgeSQL backend List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2bd4ad8c484a613957005212289963a6b249445 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642966401; 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=QfBIZ1lTLqzVW2FRcicyAErbEo5HvicJOY8Fot6ygPA=; b=dmjPMYnyi2tcarF6T5oruKLwws/UgD1vLDsazbC74fRtYIofWuXs5GZ9vfNY1XA3Wgs+mR Yk6C6gEjZx4sj5Bv79qnej9TTpbA1KB2lpIjniNdZQHPtuejN1JOzK6NZKPg7/XQyr+0Py YGM/QUEL94rtvq/aSe1MuHFjS4kaD+js+z6jqqJNHILveEzBQKdvXd8GG+BxF53Es5MrqB IZYxVRA7DxAo+fWn2NZSzZqFbTXISL2xL3kdHcqhaISyn1TGRmngJxPcVT3MDs2KJi/diI BRIpq8kaV3eA7AxFegAms9VpabvtUlFxL0WWfdqGthgRYpIBZ7rLiv07y5GLuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642966401; a=rsa-sha256; cv=none; b=kvUEtAmflJiFyPK1U+E9pPR9iRd6t2zJ6i3H/WC1K+gtnqGrz+7n/SKWAA63TombaH59zM UelSgQ2kaGbjasx+1d9r34ndc5M8nmQDWHisz0V3mP/qx96YQUeIw+CSjhIJJX2EiZRCpX Ve9JV+FwhiEql67eDka6lRwu1LyTod3mYumBxPWPste500oEpRsxD2pHhhNTIW6BWNanOE ildzqf9FRWzaq0WoWvCcrapxZTdygj31msaMq7sf5r28UvZjwpfI1air6CE9pt1xKyNxvN FO7jJfJVEt69+fSoaFzEh6hTOcoCbQbnXdEovVx7j9+WrW+DftWSDrhfvyv/Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2bd4ad8c484a613957005212289963a6b249445 commit b2bd4ad8c484a613957005212289963a6b249445 Author: Po-Chuan Hsieh AuthorDate: 2022-01-23 18:26:38 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-23 19:09:47 +0000 ftp/pure-ftpd: Fix SIGSEGV with PostgeSQL backend - Bump PORTREVISION for package change PR: 261358 Reported by: Artyom Davidov Obtained from: https://github.com/jedisct1/pure-ftpd/commit/c3f0f3c91d86939e6fabf5f65c6c6fc964e6032e --- ftp/pure-ftpd/Makefile | 1 + ftp/pure-ftpd/files/patch-src-log_pgsql.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index 560d2b6b215b..ef8908ca1aca 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -2,6 +2,7 @@ PORTNAME= pure-ftpd PORTVERSION= 1.0.50 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= https://github.com/jedisct1/pure-ftpd/releases/download/${PORTVERSION}/ \ https://download.pureftpd.org/pub/pure-ftpd/releases/ diff --git a/ftp/pure-ftpd/files/patch-src-log_pgsql.c b/ftp/pure-ftpd/files/patch-src-log_pgsql.c new file mode 100644 index 000000000000..b8b6a3b9ae92 --- /dev/null +++ b/ftp/pure-ftpd/files/patch-src-log_pgsql.c @@ -0,0 +1,29 @@ +Obtained from: https://github.com/jedisct1/pure-ftpd/commit/c3f0f3c91d86939e6fabf5f65c6c6fc964e6032e + +--- src/log_pgsql.c.orig 2021-11-23 21:36:05 UTC ++++ src/log_pgsql.c +@@ -278,7 +278,6 @@ static int pw_pgsql_connect(PGconn ** const id_sql_ser + *id_sql_server = NULL; + + if ((escaped_server = pw_pgsql_escape_conninfo(server)) == NULL || +- (escaped_port = pw_pgsql_escape_conninfo(port)) == NULL || + (escaped_db = pw_pgsql_escape_conninfo(db)) == NULL || + (escaped_user = pw_pgsql_escape_conninfo(user)) == NULL || + (escaped_pw = pw_pgsql_escape_conninfo(pw)) == NULL) { +@@ -296,7 +295,7 @@ static int pw_pgsql_connect(PGconn ** const id_sql_ser + } + if (SNCHECK(snprintf(conninfo, sizeof_conninfo, + PGSQL_CONNECT_FMTSTRING, +- escaped_server, escaped_port, escaped_db, ++ escaped_server, port, escaped_db, + escaped_user, escaped_pw), sizeof_conninfo)) { + goto bye; + } +@@ -314,7 +313,6 @@ static int pw_pgsql_connect(PGconn ** const id_sql_ser + bye: + free(conninfo); + free(escaped_server); +- free(escaped_port); + free(escaped_db); + free(escaped_user); + free(escaped_pw);