diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile index c67986117e8e..f2ee6bdfe1ec 100644 --- a/databases/proxysql/Makefile +++ b/databases/proxysql/Makefile @@ -1,78 +1,80 @@ PORTNAME= proxysql -PORTVERSION= 2.6.2 +PORTVERSION= 2.6.3 CATEGORIES= databases MAINTAINER= zi@FreeBSD.org COMMENT= High performance, high availability, protocol-aware proxy for MySQL 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 \ cmake:devel/cmake-core \ ${LOCALBASE}/bin/grep:textproc/gnugrep \ libgcrypt>0:security/libgcrypt \ libtoolize:devel/libtool \ e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \ gnutls>0:security/gnutls RUN_DEPENDS= libgcrypt>0:security/libgcrypt \ e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \ gnutls>0:security/gnutls 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 LDFLAGS+= -L${LOCALBASE}/lib BINARY_ALIAS= python3=${PYTHON_CMD} USE_RC_SUBR= ${PORTNAME} USERS= ${PORTNAME} GROUPS= ${PORTNAME} GH_ACCOUNT= sysown post-patch: @${REINPLACE_CMD} -e 's,/etc/,${ETCDIR}/,g' ${WRKSRC}/lib/ProxySQL_GloVars.cpp @${REINPLACE_CMD} \ -e 's|strftime(__buffer, 25, "%Y-%m-%d %H:%M:%S", __tm_info);|snprintf(__buffer, 3, "%s", "");|g' \ -e 's,"%s \[,"%s\[,g' \ -e '/__timer/d' \ -e '/__tm_info/d' \ ${WRKSRC}/include/proxysql_debug.h @${REINPLACE_CMD} \ -e 's,/var/lib,/var/db,g' \ -e '7s/^/errorlog="\/var\/log\/proxysql\/proxysql-error.log"\n\n/g' \ -e '7s/^/pid="\/var\/run\/${PORTNAME}\/${PORTNAME}.pid"\n/g' \ ${WRKSRC}/src/proxysql.cfg @${REINPLACE_CMD} \ -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 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/proxysql ${STAGEDIR}${LOCALBASE}/sbin post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/db/${PORTNAME} \ ${STAGEDIR}/var/run/${PORTNAME} \ ${STAGEDIR}${LOCALBASE}/etc/syslog.d \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \ ${STAGEDIR}/var/log/${PORTNAME} ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf \ ${STAGEDIR}${LOCALBASE}/etc/syslog.d ${INSTALL_DATA} ${FILESDIR}/proxysql.conf-newsyslog \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/proxysql.conf.sample ${INSTALL_DATA} ${WRKSRC}/src/proxysql.cfg \ ${STAGEDIR}${ETCDIR}/proxysql.cfg.sample .include 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,9 +1,19 @@ [ { type: install message: <