CVS commit: pkgsrc/databases

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Sep 28 16:46:34 UTC 2025

Modified Files:
        pkgsrc/databases/mysql80-client: Makefile.common distinfo
        pkgsrc/databases/mysql80-server: Makefile PLIST
Added Files:
        pkgsrc/databases/mysql80-client/patches:
            patch-plugin_x_tests_driver_connector_warning.h

Log Message:
mysql80-server: fix build, including on Linux

- use the bundled protobuf
- fix a compilation error in a plugin
- add dependency on libtirpc and rpcsvc-proto on Linux,
  the latter provides the "rpcgen" binary

Fixes (I hope!!) PR pkg/59670


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/mysql80-client/Makefile.common \
    pkgsrc/databases/mysql80-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_connector_warning.h
cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/mysql80-server/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mysql80-server/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql80-client/Makefile.common
diff -u pkgsrc/databases/mysql80-client/Makefile.common:1.15 pkgsrc/databases/mysql80-client/Makefile.common:1.16
--- pkgsrc/databases/mysql80-client/Makefile.common:1.15        Wed Aug 20 11:34:49 2025
+++ pkgsrc/databases/mysql80-client/Makefile.common     Sun Sep 28 16:46:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2025/08/20 11:34:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2025/09/28 16:46:33 bsiegert Exp $
 #
 # used by databases/mysql80-client/Makefile
 # used by databases/mysql80-server/Makefile
@@ -125,6 +125,10 @@ post-patch:
        ${ECHO} "#define alloca(sz) __builtin_alloca(sz)" > ${WRKSRC}/include/alloca.h
 .endif
 
+.if ${OPSYS} == "Linux"
+.include "../../devel/libtirpc/buildlink3.mk"
+.include "../../devel/rpcsvc-proto/buildlink3.mk"
+.endif
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
Index: pkgsrc/databases/mysql80-client/distinfo
diff -u pkgsrc/databases/mysql80-client/distinfo:1.15 pkgsrc/databases/mysql80-client/distinfo:1.16
--- pkgsrc/databases/mysql80-client/distinfo:1.15       Tue Dec 24 18:52:22 2024
+++ pkgsrc/databases/mysql80-client/distinfo    Sun Sep 28 16:46:33 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2024/12/24 18:52:22 adam Exp $
+$NetBSD: distinfo,v 1.16 2025/09/28 16:46:33 bsiegert Exp $
 
 BLAKE2s (mysql-boost-8.0.40.tar.gz) = 4fba24ee573376052daa912a055c62341c88dc5f8e6e769487dde4ebf49e6bb8
 SHA512 (mysql-boost-8.0.40.tar.gz) = fcece6e3c09dc4733767effb5c22a55e4add1c9f6b6b911e1eccdd0444f08dc5714b3c8b2a40c85a75a63ff117b6c9881904b6b4732b5ca9bef96de1cb2e284a
@@ -22,6 +22,7 @@ SHA1 (patch-libmysql_CMakeLists.txt) = 7
 SHA1 (patch-mysys_kqueue__timers.cc) = 837474b779c24dd0af67444c2adbcf07b73e0d36
 SHA1 (patch-mysys_stacktrace.cc) = 6792ceaae3c3b0d70bd8b6c848a128d50397e6f4
 SHA1 (patch-packaging_solaris_CMakeLists.txt) = 135c4aa07d9b20a9b56b8f1616821abfedb52ecb
+SHA1 (patch-plugin_x_tests_driver_connector_warning.h) = 80d4cbe93b853348f98c54d96892648063e1f9f5
 SHA1 (patch-router_CMakeLists.txt) = 9bfd1278c42070ada0606dfff34a66b8b95d0413
 SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h) = ade643148787438d6d6f1f7b2636bbd0af87d70f
 SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_internet.h) = 29e019236423aaa77b71b273d009404e4fbafe73

Index: pkgsrc/databases/mysql80-server/Makefile
diff -u pkgsrc/databases/mysql80-server/Makefile:1.36 pkgsrc/databases/mysql80-server/Makefile:1.37
--- pkgsrc/databases/mysql80-server/Makefile:1.36       Sun Aug 24 16:36:15 2025
+++ pkgsrc/databases/mysql80-server/Makefile    Sun Sep 28 16:46:33 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2025/08/24 16:36:15 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2025/09/28 16:46:33 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   6
+PKGREVISION=   7
 COMMENT=       MySQL 8, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*
@@ -9,8 +9,9 @@ CONFLICTS=      mysql3-server-[0-9]*
 .include "../../databases/mysql80-client/Makefile.common"
 
 CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
-CMAKE_CONFIGURE_ARGS+= -DWITH_PROTOBUF="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_PROTOBUF="bundled"
 MAKE_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/library_output_directory
+MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/library_output_directory
 # This is a hack for ${WRKSRC}/cmake/protobuf.cmake
 CMAKE_CONFIGURE_ARGS+= -DHOMEBREW_HOME=${PREFIX}
 
@@ -86,7 +87,7 @@ post-extract:
        ${CP} ${FILESDIR}/ffsll.cc ${WRKSRC}/sql/
        ${CHMOD} a-x ${WRKSRC}/mysql-test/std_data/datadir_tablespace_*
 
-.include "../../devel/protobuf/buildlink3.mk"
+#.include "../../devel/protobuf/buildlink3.mk"
 BUILDLINK_AUTO_DIRS.mysql-client=      no
 .include "../../databases/mysql80-client/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"

Index: pkgsrc/databases/mysql80-server/PLIST
diff -u pkgsrc/databases/mysql80-server/PLIST:1.4 pkgsrc/databases/mysql80-server/PLIST:1.5
--- pkgsrc/databases/mysql80-server/PLIST:1.4   Tue May 23 21:01:12 2023
+++ pkgsrc/databases/mysql80-server/PLIST       Sun Sep 28 16:46:33 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2023/05/23 21:01:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/09/28 16:46:33 bsiegert Exp $
 bin/comp_err
 bin/ibd2sdi
 bin/innochecksum
@@ -140,6 +140,8 @@ lib/mysql/plugin/test_udf_services.so
 lib/mysql/plugin/udf_example.so
 lib/mysql/plugin/validate_password.so
 lib/mysql/plugin/version_token.so
+lib/private/libprotobuf-lite.so.24.4.0
+lib/private/libprotobuf.so.24.4.0
 sbin/mysqld
 share/aclocal/mysql.m4
 share/mysql/install_rewriter.sql
@@ -147,3 +149,4 @@ share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/mysqld_multi.server
 share/mysql/uninstall_rewriter.sql
+@pkgdir lib/mysql/plugin/debug

Added files:

Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_connector_warning.h
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_connector_warning.h:1.1
--- /dev/null   Sun Sep 28 16:46:34 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_connector_warning.h     Sun Sep 28 16:46:33 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugin_x_tests_driver_connector_warning.h,v 1.1 2025/09/28 16:46:33 bsiegert Exp $
+
+Fix Linux builds -- uint32_t needs to be defined
+
+--- plugin/x/tests/driver/connector/warning.h.orig     2025-09-28 16:34:11.331862775 +0000
++++ plugin/x/tests/driver/connector/warning.h
+@@ -26,6 +26,7 @@
+ #ifndef PLUGIN_X_TESTS_DRIVER_CONNECTOR_WARNING_H_
+ #define PLUGIN_X_TESTS_DRIVER_CONNECTOR_WARNING_H_
+ 
++#include <cstdint>
+ #include <memory>
+ #include <ostream>
+ #include <string>