From nobody Sun Apr 30 18:18:57 2023 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 4Q8ZNf0kMJz487Rp; Sun, 30 Apr 2023 18:18:58 +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 4Q8ZNd6xY8z3pBQ; Sun, 30 Apr 2023 18:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682878738; 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=PIHUhVEyxzSSH3/PLL0IatdF1c/cpc99Az9k2mrocxs=; b=Mb4aX/0F5SRDp9aD0+y3+mhrdZ4PUS/vHXQSeVhqUb3+rD3gq9RriQ+2ykNqekp2EX1jdc PP694TzIoHccOWAHnoTVDXlr1oCdM4avF38+/GotoMK/A66h1wafwY1NHCH4jmq5VWbm6S B9Ofw86t3udvgwXS4TZdq+D8p8gABY9x2ZIvMhgXAkWWzszS9U+/zOEV1Hj2PkT1wDLQ/i ZyQBhOGXCgoyNL6bxzRlbfwIv+MFUMd+ZkpySZf/kUaR2Ry4vQBXki3eAhJmWVoIKr8cql B9gqx+u8UuhG0vhzaedqe8hJVH3t1B3HJ9l0WJGnQpvLjvau0a88Q76cPtbn/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682878738; 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=PIHUhVEyxzSSH3/PLL0IatdF1c/cpc99Az9k2mrocxs=; b=qjf+x4yL4KdN5LTVCA12katH2AGHCJHOiny1bG5VOK55zD86H+fLzp8XVMeYHstgyS6vAj Fb+yvotCcPxihVWbhZ/e2toAblbko0NuKFwcQFeFF4bEuqmJE1mRB+YwyHDsRoXIqmpF9I ZUKQDvyaxt60RYtwxhslcEDvkcCh0+onFILHJCbtsoYH2dmFtm7jXeRxN/41Uvs7f0xavv n3zstM+c6CZg1n6DsBSxpwZd1YB3LM7I1xFtZkJWJFPbl73RaC8J4YH6mbgcc8TQh3nDBb Lk/wYqZSm8bGTLcMeqoY86EdQUhRXv+khI6qfc7BcT+tWtmKL//vR2fyF7Ly1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682878738; a=rsa-sha256; cv=none; b=GBghVeycaFmE1sB4YaK/VuW/jdewPl1Ll436dSWQG7YTbxCQc2V2uPLHw4wK2mWjxr2Z6K 7FXNrzc/xKYIjrbXVmvZDJdbO2FTHaW3VqsR+IKDDoHNC4iEnxoQOdbfH4vHwcSAEenezO W6WrMujlt5MDKHjZwlWOhNDxMRgemPrbR/zeBBGT9fd9QMM8YoalzH2ct85aoELxOkWBFB JKfRyal2L7vK6Y7tqEBSC/jkbUnLrX3s8PFMQqK0iaHqnsM6okx8rdc/TfVFUVuxMaRlkW WWM3VNGht4GkukWiujnik5+AyfYCiX+e5nyBIRSkOc51QVY9SrJC9saMS14yzg== 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 4Q8ZNd605FzYrq; Sun, 30 Apr 2023 18:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33UIIvU6094436; Sun, 30 Apr 2023 18:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UIIv37094435; Sun, 30 Apr 2023 18:18:57 GMT (envelope-from git) Date: Sun, 30 Apr 2023 18:18:57 GMT Message-Id: <202304301818.33UIIv37094435@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 567557abbfc0 - main - databases/mysql80-server: fix a issue with protobuf 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 567557abbfc0a4deec492983ffc01da78c62bae4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=567557abbfc0a4deec492983ffc01da78c62bae4 commit 567557abbfc0a4deec492983ffc01da78c62bae4 Author: Toshimichi Masubuchi AuthorDate: 2023-04-30 18:13:17 +0000 Commit: Jochen Neumeister CommitDate: 2023-04-30 18:18:32 +0000 databases/mysql80-server: fix a issue with protobuf PR: 270289 Reported by: Ting-Wei Lan Sponsored by: Netzkommune GmbH --- databases/mysql80-client/Makefile | 2 +- databases/mysql80-server/Makefile | 4 ++-- databases/mysql80-server/pkg-plist | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index 0e2bf0f3d677..f11a0fe23d6d 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -1,5 +1,5 @@ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 8f2791aeda28..876d9757d1a3 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mysql PORTVERSION= 8.0.32 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server @@ -32,7 +32,6 @@ LIB_DEPENDS+= libcurl.so:ftp/curl \ libicutu.so:devel/icu \ liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ - libprotobuf.so:devel/protobuf \ libfido2.so:security/libfido2 \ libhidapi.so:comms/hidapi \ ${LIB_DEPENDS_${ARCH}} @@ -66,6 +65,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="${INFO_PATH}" \ -DINSTALL_LIBDIR="lib/mysql" \ + -DINSTALL_PRIV_LIBDIR="lib/mysql/private" \ -DINSTALL_MANDIR="share/man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist index be1487f667f9..15aa026bbb80 100644 --- a/databases/mysql80-server/pkg-plist +++ b/databases/mysql80-server/pkg-plist @@ -175,8 +175,9 @@ lib/mysql/plugin/keyring_udf.so lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so -@comment lib/private/libprotobuf-lite.so.3.19.4 -@comment lib/private/libprotobuf.so.3.19.4 +lib/mysql/private/libprotobuf-lite.so.3.19.4 +lib/mysql/private/libprotobuf.so.3.19.4 +lib/mysql/libprotobuf-lite.so.3.19.4 libexec/mysqld share/man/man1/ibd2sdi.1.gz share/man/man1/innochecksum.1.gz @@ -196,7 +197,6 @@ share/man/man1/mysqldumpslow.1.gz share/man/man1/mysqlrouter_passwd.1.gz share/man/man1/mysqlrouter_plugin_info.1.gz share/man/man1/mysqlrouter.1.gz -lib/mysql/libprotobuf-lite.so.3.19.4 share/man/man8/mysqld.8.gz %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml