Date: Fri, 20 Mar 2026 19:55:43 +0000 From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f4758fd11061 - main - databases/proxysql: Bump PORTREVISION Message-ID: <69bda63f.45265.7fcb2d78@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4758fd11061ef9bb72a5aecc270ce7d5331e998 commit f4758fd11061ef9bb72a5aecc270ce7d5331e998 Author: Ryan Steinmetz <zi@FreeBSD.org> AuthorDate: 2026-03-20 19:55:20 +0000 Commit: Ryan Steinmetz <zi@FreeBSD.org> CommitDate: 2026-03-20 19:55:20 +0000 databases/proxysql: Bump PORTREVISION - Remove remaining unneeded patches for 3.0.6 update --- databases/proxysql/Makefile | 1 + .../proxysql/files/patch-include_PgSQL__Thread.h | 14 -------------- .../proxysql/files/patch-include_proxysql__utils.h | 22 ---------------------- .../proxysql/files/patch-lib_ProxySQL__Admin.cpp | 13 ------------- 4 files changed, 1 insertion(+), 49 deletions(-) diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile index 43db4dc4235f..ece744a43237 100644 --- a/databases/proxysql/Makefile +++ b/databases/proxysql/Makefile @@ -1,6 +1,7 @@ PORTNAME= proxysql PORTVERSION= 3.0.6 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= zi@FreeBSD.org diff --git a/databases/proxysql/files/patch-include_PgSQL__Thread.h b/databases/proxysql/files/patch-include_PgSQL__Thread.h deleted file mode 100644 index bf8e37a2bded..000000000000 --- a/databases/proxysql/files/patch-include_PgSQL__Thread.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/PgSQL_Thread.h.orig 2025-11-08 01:19:28 UTC -+++ include/PgSQL_Thread.h -@@ -212,10 +212,10 @@ class __attribute__((aligned(64))) PgSQL_Thread : publ - //PtrArray* mysql_sessions; - PtrArray* mirror_queue_mysql_sessions; - PtrArray* mirror_queue_mysql_sessions_cache; -+ CopyCmdMatcher *copy_cmd_matcher; - #ifdef IDLE_THREADS - PtrArray* idle_mysql_sessions; - PtrArray* resume_mysql_sessions; -- CopyCmdMatcher *copy_cmd_matcher; - pgsql_conn_exchange_t myexchange; - #endif // IDLE_THREADS - diff --git a/databases/proxysql/files/patch-include_proxysql__utils.h b/databases/proxysql/files/patch-include_proxysql__utils.h deleted file mode 100644 index da6d62c21cf7..000000000000 --- a/databases/proxysql/files/patch-include_proxysql__utils.h +++ /dev/null @@ -1,22 +0,0 @@ ---- include/proxysql_utils.h.orig 2025-11-08 01:40:32 UTC -+++ include/proxysql_utils.h -@@ -25,19 +25,11 @@ - #define ETIME ETIMEDOUT - #endif - --#ifdef CXX17 - template<class...> struct conjunction : std::true_type { }; --template<class B1> struct std::conjunction<B1> : B1 { }; --template<class B1, class... Bn> --struct std::conjunction<B1, Bn...> -- : std::conditional<bool(B1::value), std::conjunction<Bn...>, B1>::type {}; --#else --template<class...> struct conjunction : std::true_type { }; - template<class B1> struct conjunction<B1> : B1 { }; - template<class B1, class... Bn> - struct conjunction<B1, Bn...> - : std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {}; --#endif // CXX17 - /** - * @brief Stores the result of formatting the first parameter with the provided - * arguments, into the std::string reference provided in the second parameter. diff --git a/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp b/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp deleted file mode 100644 index 6ccc4d2821e3..000000000000 --- a/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/ProxySQL_Admin.cpp.orig 2026-03-18 17:48:48 UTC -+++ lib/ProxySQL_Admin.cpp -@@ -2726,8 +2726,10 @@ ProxySQL_Admin::ProxySQL_Admin() : - // processlist configuration - variables.mysql_processlist.show_extended = 0; - variables.pgsql_processlist.show_extended = 0; -+#ifdef IDLE_THREADS - variables.mysql_processlist.show_idle_session = true; - variables.pgsql_processlist.show_idle_session = true; -+#endif - variables.mysql_processlist.max_query_length = PROCESSLIST_MAX_QUERY_LEN_DEFAULT; - variables.pgsql_processlist.max_query_length = PROCESSLIST_MAX_QUERY_LEN_DEFAULT; -home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bda63f.45265.7fcb2d78>