From nobody Mon Jun 3 21:53:18 2024 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 4VtSCM0cL6z5LLQc; Mon, 03 Jun 2024 21:53:19 +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 4VtSCM062Jz4vl8; Mon, 3 Jun 2024 21:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717451599; 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=f3csVGkFccpenXkPW06QpVUHJQL0pbMivPu70KILN1U=; b=dRGtgZOvktwqzwTQz+b65s2rkW2JNXwSgtZcEnPgp1IigN09ggcKfVM41gp7khh3vOWFp8 vI09rFQwru+kQOLjkW9qvmXixtu8P153gHL1Gbt9LnAb9diMnf/oD8JzE8u0ufQpeahSnF qyb685celtHg6bWmJp3tayM6LWPHV7J/Xy4blppDnm5tdv5c/TZiLwJFjzndEFo8epb976 FvaTrsp+WT4UCDrDU/e2IwlQcJmC2tm7rs/91qtRs7AiBQS20on5SRuN8yzkE5PE7mUOwY VkLMIt8JTFpSk8CMEjbeD9FmI3MJ8zcMHoYfsrqY4+jhc0pRP5cYFxuj/VsYMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717451599; a=rsa-sha256; cv=none; b=Yc3wFkkpJQzrYdfhj9YWmP6qnicL17Cxj4E/mwoP6oLPoXzW2+cm5wGO0cEAa17Eyl9xqM ZWtTcKiMFUXwWBb9RETelG8v1pxL2S/aeLyd1j1oiykZ0ymGJMP3THbrFRNa/UZIfurUDv YFHEZwCKLMm0Dp6KxlpVa8PtSXvAMgwlsk9NpAKkcYD3LLHeM1gjl5dgyvHrpbZPmXAFPB fhPQfySp2GKPWWgQCHQTti9Ftvl+UG3H9zjDHFSe4HsRmBq7q5q/j/TTyJ7zgkKMYiQlFK JFKlD/I9x9KHweDgNP2QXd+IDUPTe+1ld1CJmkle3fD+et2WKMGkkYufOUE4aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717451599; 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=f3csVGkFccpenXkPW06QpVUHJQL0pbMivPu70KILN1U=; b=e39O+3UFd/0Ps5CLu/6STDjrFUqctPe2dTnBhmhuRQ2w+XpbZ8QF9/OahccsqjCDh2IVmM 3f1MsTtfPtUjycxk0qFGsYAqsFwr7FofMUCn+HCAHAVCnAnMHXfADDgeRSxg4v74EoIUiO Z3vMXaSC/ouKblWo08pvgBPcigkbJUxxY9LcpvbEANBTIh5mzRaMTJG40LSs6sf3EdrZm5 oGbUScBXdQipXtKZ9ilDyOohIraUtacKSZEeCdUqJuecNZX8lAFNWDoRioFH+S/eHpbUhA bdkcFRRjzJPql6SjiqxbwCSJkhnrhBHPBSuqfuK/1fgQ1OURdwwnqjyuVo0FgA== 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 4VtSCL6q8hzsMq; Mon, 3 Jun 2024 21:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 453LrItw024342; Mon, 3 Jun 2024 21:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 453LrIbZ024339; Mon, 3 Jun 2024 21:53:18 GMT (envelope-from git) Date: Mon, 3 Jun 2024 21:53:18 GMT Message-Id: <202406032153.453LrIbZ024339@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: 431a761bd7ba - main - databases/proxysql: Update to 2.6.3 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 431a761bd7bababcfba80828f6d62516c7ead13e Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=431a761bd7bababcfba80828f6d62516c7ead13e commit 431a761bd7bababcfba80828f6d62516c7ead13e Author: Ryan Steinmetz AuthorDate: 2024-06-03 21:52:17 +0000 Commit: Ryan Steinmetz CommitDate: 2024-06-03 21:52:17 +0000 databases/proxysql: Update to 2.6.3 - Mark i386 as BROKEN - Note fdescfs requirement/add patch to use fdescfs --- databases/proxysql/Makefile | 4 +++- databases/proxysql/distinfo | 6 +++--- .../files/patch-deps_sqlite3_sqlite3__pass__exts.patch | 11 +++++++++++ databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp | 11 +++++++++++ databases/proxysql/pkg-message | 10 ++++++++++ 5 files changed, 38 insertions(+), 4 deletions(-) diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile index c67986117e8e..f2ee6bdfe1ec 100644 --- a/databases/proxysql/Makefile +++ b/databases/proxysql/Makefile @@ -1,5 +1,5 @@ PORTNAME= proxysql -PORTVERSION= 2.6.2 +PORTVERSION= 2.6.3 CATEGORIES= databases MAINTAINER= zi@FreeBSD.org @@ -9,6 +9,8 @@ WWW= https://www.proxysql.com/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN_i386= configure: error: Unsupported pointer size: 0 + BUILD_DEPENDS= aclocal:devel/automake \ autoreconf:devel/autoconf \ bash:shells/bash \ diff --git a/databases/proxysql/distinfo b/databases/proxysql/distinfo index 835f10ae1ca2..70ace8cf6e3b 100644 --- a/databases/proxysql/distinfo +++ b/databases/proxysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712301882 -SHA256 (sysown-proxysql-2.6.2_GH0.tar.gz) = dc0bd1cf9261ba8277a94da4db9a5fe4d628d1b21c201424c783f715d0d394db -SIZE (sysown-proxysql-2.6.2_GH0.tar.gz) = 50030275 +TIMESTAMP = 1716221079 +SHA256 (sysown-proxysql-2.6.3_GH0.tar.gz) = 5f7e19b264f844f765e2cab6f04f51c1f53d600c82da1ec8e45bca2f472d1e55 +SIZE (sysown-proxysql-2.6.3_GH0.tar.gz) = 50064205 diff --git a/databases/proxysql/files/patch-deps_sqlite3_sqlite3__pass__exts.patch b/databases/proxysql/files/patch-deps_sqlite3_sqlite3__pass__exts.patch new file mode 100644 index 000000000000..6fd69e2b56a6 --- /dev/null +++ b/databases/proxysql/files/patch-deps_sqlite3_sqlite3__pass__exts.patch @@ -0,0 +1,11 @@ +--- deps/sqlite3/sqlite3_pass_exts.patch.orig 2024-06-03 21:25:24 UTC ++++ deps/sqlite3/sqlite3_pass_exts.patch +@@ -11,7 +11,7 @@ + +//////////////////////////////////////////////////////////////////////////////// + + + +// ctype.h +-+extern int toupper (int __c) __THROW; +++extern int toupper (int __c); + + + +// SHA256_crypt + +char * sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen); diff --git a/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp b/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp new file mode 100644 index 000000000000..deeac65cb508 --- /dev/null +++ b/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp @@ -0,0 +1,11 @@ +--- lib/ProxySQL_Admin.cpp.orig 2024-04-05 16:24:43 UTC ++++ lib/ProxySQL_Admin.cpp +@@ -9507,7 +9507,7 @@ void ProxySQL_Admin::p_update_metrics() { + * @return On success, the number of currently opened file descriptors, '-1' otherwise. + */ + int32_t get_open_fds() { +- DIR* dir = opendir("/proc/self/fd"); ++ DIR* dir = opendir("/dev/fd"); + if (dir == NULL) { + proxy_error("'opendir()' failed with error: '%d'\n", errno); + return -1; diff --git a/databases/proxysql/pkg-message b/databases/proxysql/pkg-message index f8af81593652..d7fdd1560919 100644 --- a/databases/proxysql/pkg-message +++ b/databases/proxysql/pkg-message @@ -1,6 +1,16 @@ [ { type: install message: <