From nobody Mon Apr 1 16:19:12 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 4V7bmw2yT2z5GKjq; Mon, 1 Apr 2024 16:19:12 +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 4V7bmw2STwz4WZ2; Mon, 1 Apr 2024 16:19:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711988352; 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=tkVUyyjhvT9tk6wPx/IoZ3akjBesqKHDmsaWlHbgmUI=; b=EvhbmBlqcGpNR5lztCb0SFHQI9BZxquxsWV+4BqVbtJc7fqAFt6ucRDqcI8EsSM9h9aYp2 yQFU0He8b/D6EKlg7hXjw2oeOHnYbl4IdEs7eOAWsf8dPeeABGWv7JjNq7P7wVBTtM6x9h Bsw2IJhV2QcXmxf0lnpk+hX2zynwH2TrobU6BZPwNZ2NMjHN65KY8lce9Cm4OlXZQPx1Oq hz8ha1dVfkIA55tuIJLP7BGILextUS/ThQ50yLKbGkVbJov2L188BaNUdgW03nYOF8mXWr Q7EMDbNKaPfSmanfG8ayuhmkz/ElVWmKSv/thbigjWvPxmLABXWXRWZp1y5+jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711988352; a=rsa-sha256; cv=none; b=NMgmYV6GC377AqwKW6GP8Xd/MTETxu22nLo8MgOBX+WwxKp5rLjNCMT288CP4YuAi6y27R 5I8d/L7Uh1OpQrVzzdJxh7i2t1+HberIfwZbJXun9j0W49Bx9TnS03J5a1rrP533QvQttF geouSgR9izGxb1rzre1z2s8+9YojxNh44NEJHpmbmk1/FkPYYUZpGKEN7UY0T+TyZSzVOH xbuSaFhO7JvmJSCBZr49JV8I4tUnKGc+1EV5K6H2RzpG+usBMP8uHsE6B33UVYW21Q/4Ns ZL6ahpCjx772HZtXBmykfvFispOsOsRPk8WsmBP7Dmy+XWsMS8LT/hCKxnFroQ== 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=1711988352; 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=tkVUyyjhvT9tk6wPx/IoZ3akjBesqKHDmsaWlHbgmUI=; b=f5QQHU7qOkDy0p/LVZc3OHDl1OQHLN1BGVZnD97bMrFqmlp36TvQHuzbqOrVv+A2q7IKFK G3pXQ4GRvj5uoRAxmDTdIXaDf13IsYBkWnMAIAsm7jtxSDwUBIzVAWroLw7cD+C8Ao9YJu xJUGAOmGw4b0+PzqOAJDNPmBhDDlycpVfSMxxbcqffL2cd8GC9YiHGn5RLbFhgM3bJg5rm rTQj0RpkJZwvDDPQjbhLDxh7XywkJibh1Rhnp2LGt5eWaA5Bq43rotvnTfzt/I3Em2Q+R4 yORSQPRu8GIE4fYHHQgrarTrKzp+dPACvQGxPZ++mM488KNg0p2fEtsr7l/vmw== 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 4V7bmw1xm3z1RSr; Mon, 1 Apr 2024 16:19:12 +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 431GJChV021673; Mon, 1 Apr 2024 16:19:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431GJCG0021670; Mon, 1 Apr 2024 16:19:12 GMT (envelope-from git) Date: Mon, 1 Apr 2024 16:19:12 GMT Message-Id: <202404011619.431GJCG0021670@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: 639c8e2e6338 - main - databases/proxysql: Various Improvements 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: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 639c8e2e6338063decfaf2f52191c56c7db103c6 Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=639c8e2e6338063decfaf2f52191c56c7db103c6 commit 639c8e2e6338063decfaf2f52191c56c7db103c6 Author: Ryan Steinmetz AuthorDate: 2024-04-01 16:09:29 +0000 Commit: Ryan Steinmetz CommitDate: 2024-04-01 16:09:29 +0000 databases/proxysql: Various Improvements - Resolve 14.x build issue - Do not force use of admin socket - Fix RESTAPI support - Bump PORTREVISION --- databases/proxysql/Makefile | 7 +++---- .../proxysql/files/patch-lib_ProxySQL__RESTAPI__Server.cpp | 11 +++++++++++ databases/proxysql/files/proxysql.in | 3 +-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile index b611737d97d8..c3d62bb928f0 100644 --- a/databases/proxysql/Makefile +++ b/databases/proxysql/Makefile @@ -1,5 +1,6 @@ PORTNAME= proxysql PORTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= zi@FreeBSD.org @@ -22,17 +23,14 @@ RUN_DEPENDS= libgcrypt>0:security/libgcrypt \ e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \ gnutls>0:security/gnutls -USES= compiler:gcc-c++11-lib gmake libtool perl5 python:build shebangfix +USES= compiler:c++11-lang gmake libtool perl5 python:build shebangfix USE_PERL5= build USE_GCC= yes MAKE_ENV= GIT_VERSION=${PORTVERSION} USE_GITHUB= yes ALL_TARGET= build_deps default SHEBANG_FILES= deps/libssl/verify-bio_st-match.sh -MAKE_JOBS_UNSAFE=yes LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -fPIC -CXXFLAGS+= -fPIC BINARY_ALIAS= python3=${PYTHON_CMD} USE_RC_SUBR= ${PORTNAME} @@ -58,6 +56,7 @@ post-patch: -e 's,grep,${LOCALBASE}/bin/grep,g' \ -e 's,ln -fsT,ln -fs,' \ -e 's,PROXYSQLCLICKHOUSE=1 ,,g' \ + -e 's,--enable-fastopen=false ,--enable-fastopen=false --enable-shared=no ,g' \ ${WRKSRC}/Makefile ${WRKSRC}/deps/Makefile \ ${WRKSRC}/lib/Makefile ${WRKSRC}/src/Makefile diff --git a/databases/proxysql/files/patch-lib_ProxySQL__RESTAPI__Server.cpp b/databases/proxysql/files/patch-lib_ProxySQL__RESTAPI__Server.cpp new file mode 100644 index 000000000000..72ae22c8e798 --- /dev/null +++ b/databases/proxysql/files/patch-lib_ProxySQL__RESTAPI__Server.cpp @@ -0,0 +1,11 @@ +--- lib/ProxySQL_RESTAPI_Server.cpp.orig 2024-04-01 15:50:50 UTC ++++ lib/ProxySQL_RESTAPI_Server.cpp +@@ -346,7 +346,7 @@ ProxySQL_RESTAPI_Server::ProxySQL_RESTAPI_Server( + // NOTE: Right now ProxySQL is using the simplest mode of 'libhttpserver' for serving 'REST' queries, + // in the current mode concurrency on serving requests is low, and throughput is directly related with + // the time required to execute the target script, since each of the calls are blocking. +- ws = std::unique_ptr(new webserver(create_webserver(p))); ++ ws = std::unique_ptr(new webserver(create_webserver(p).start_method(http::http_utils::start_method_T::THREAD_PER_CONNECTION))); + // NOTE: Enable for benchmarking purposes. In this mode each request will be served by it's own thread. + // ws = std::unique_ptr(new webserver(create_webserver(p).start_method(http::http_utils::start_method_T::THREAD_PER_CONNECTION))); + auto sr = new sync_resource(); diff --git a/databases/proxysql/files/proxysql.in b/databases/proxysql/files/proxysql.in index 781d5b4bdf1f..3e6b805315ee 100644 --- a/databases/proxysql/files/proxysql.in +++ b/databases/proxysql/files/proxysql.in @@ -29,7 +29,6 @@ load_rc_config $name : ${proxysql_user:="proxysql"} : ${proxysql_group:="proxysql"} : ${proxysql_config:="%%ETCDIR%%/proxysql.cfg"} -: ${proxysql_socket:="/var/run/proxysql/proxysql.sock"} : ${proxysql_datadir:="/var/db/proxysql"} : ${proxysql_args:=""} : ${proxysql_restart_delay:="10"} @@ -40,7 +39,7 @@ command="/usr/sbin/daemon" proxysql_command="%%PREFIX%%/sbin/proxysql" command_args="-rP ${pidfile} -S -R ${proxysql_restart_delay} \ -T ${name} ${proxysql_command} \ - -f -c ${proxysql_config} -S ${proxysql_socket} \ + -f -c ${proxysql_config} \ -D ${proxysql_datadir} \ --no-version-check ${proxysql_args}" required_files="${proxysql_config}"