From nobody Sun Jun 09 15:47:37 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 4Vxzpd2SV0z5MMmQ; Sun, 09 Jun 2024 15:47:37 +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 4Vxzpd1jQSz4QxK; Sun, 9 Jun 2024 15:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717948057; 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=4SA9HZ4uRPMB/3neNT01NfcSitgyWo6YDEAokF4tAPw=; b=cHtw9GdF2lo9D2h/3FiN7KN+mlEB6mBT9x1tsrnM3aMP3wAxc1R8on8Nn/aasHwJAZXPM5 2EomGL3o1TSW/LRQbJmYlveWkNAy0UvIzhpOI1Rh/hnnsmtFSFeA7aPEnra1XRBKnJDv/i RaieFVRk/FySFLGzbhyB0Sn/zfUGyboDn2rIEV/EGJpYAgK0NLJbMB0AtnborfDff88cm2 7vpfNXwaxiwpG/5BFAjcosTwRO0kPSGDuQtoQY+CxwlrxQhcLKTz5n7ZjSNzTP07RnByBE KlLMd+DEz3ySr+C7e2LYbkm8QOlkrueD+tUdW4IQ4Ra5k2IQGVOaoCtR1edhZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717948057; a=rsa-sha256; cv=none; b=YK7HrtlYrpZQbfwbtS1iLS1XtckPkxTiS8cZBhchMQ56SV/c2d3KtvxoE2Qp4xFEMRH06F 1u+m58h33F/j9YTd6xpL6itoiS+8Zh2/Oh4iwOKPcnegLy0rd0pZO9qx6lNj7OJrBSATDA OmBuSROaHEX0q6Mn4kkPpkHxtwlUNorLZQ1XRNcMEZz3+zB9B1mDOmwkyFHVh5eXpMGgb0 xcoElsv/lsJLI7e3fp22aGySgCbSjzkc7xfCboBCfHzieH8ZNmBEHGqaMc0envNzFpz6SU 6tc7infzEPv8/ukldc9ijBCDLlE4onEpYYuSivCk/uXq/k+eUuA333jS2p/ygA== 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=1717948057; 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=4SA9HZ4uRPMB/3neNT01NfcSitgyWo6YDEAokF4tAPw=; b=XJd9ahGBqyAjjKlU7MMlUwMENTSmsgUczSN8aa+ZpqIHzbktUyxWksyp3l0BlpS5XHTNE6 NqGX0hNi7xexFm62rrRYU/1kEBjqUVeYMX3dB57TnivSD727urW2F2ysI+aR9vOSYABU6+ ckSG+Gl3GCqnPsBmMkdy7Oegtl5/zxjHh15vH1DSahOc9juG6fvKI+slf55ZQ8CZe1gYIe LydltZlNdFY47AqURmauUrsgKuoFZjRCQjmcajv2j+tosjzTzoQDqA+lD5LUMq9amwF9Ay fTSArIp7KLwlczpzukxgPkQaIi0apXrnMj9oclnafen+7aFTNKpbdVOk2UwDjA== 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 4Vxzpd1JXMzp1w; Sun, 9 Jun 2024 15:47:37 +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 459FlbsH039141; Sun, 9 Jun 2024 15:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459FlbqF039138; Sun, 9 Jun 2024 15:47:37 GMT (envelope-from git) Date: Sun, 9 Jun 2024 15:47:37 GMT Message-Id: <202406091547.459FlbqF039138@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 2c1a1c023aec - main - mail/dspam: fix configure with modern MariaDB 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c1a1c023aecd89feacdbeec17566b2629cfa1d0 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c1a1c023aecd89feacdbeec17566b2629cfa1d0 commit 2c1a1c023aecd89feacdbeec17566b2629cfa1d0 Author: Vladimir Druzenko AuthorDate: 2024-06-09 15:44:49 +0000 Commit: Vladimir Druzenko CommitDate: 2024-06-09 15:44:49 +0000 mail/dspam: fix configure with modern MariaDB 1) Configure fails with error message: checking for MySQL client version >= 5.0.0... no configure: error: Required version of libmysqlclient not found It check "mysql_get_client_info() > 5", but modern MariaDB return Connector/C's version 3.x instead of MariaDB version. How to get the correct version found here: https://github.com/pali/DBD-MariaDB/commit/9743bec52db5e8f1beb2b31e4a55d6ea1a4edcdd While here: 2) remove GNU_CONFIGURE_MANPREFIX 3) fix make check-plist if build with MYSQL option ON only: ===> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: @dir lib/%%DSPAM_OWNER%% PR: 279253 Approved by: danny@dannywarren.com (maintainer, timeout 17 days) --- mail/dspam/Makefile | 2 -- mail/dspam/files/patch-configure | 24 ++++++++++++++++++++++++ mail/dspam/pkg-plist | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 95b5e46d295f..c556d22cff05 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -76,7 +76,6 @@ MAKE_JOBS_UNSAFE= yes USES= perl5 libtool pathfix shebangfix USE_LDCONFIG= yes GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -272,7 +271,6 @@ CONFIGURE_ARGS+= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql PLIST_SUB+= MYSQL="" _DBDRV_COUNT:= ${_DBDRV_COUNT}o -IGNORE_WITH_MYSQL= 105m 106m 1011m . if ${PORT_OPTIONS:MMYSQL_COMPRESS} CONFIGURE_ARGS+= --enable-client-compression . endif diff --git a/mail/dspam/files/patch-configure b/mail/dspam/files/patch-configure new file mode 100644 index 000000000000..723a4801d900 --- /dev/null +++ b/mail/dspam/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig 2012-04-23 17:53:49 UTC ++++ configure +@@ -13614,6 +13614,13 @@ main () + { + + int is_ok = 0; ++#if defined(MARIADB_PACKAGE_VERSION) && defined(MARIADB_PACKAGE_VERSION_ID) && MARIADB_PACKAGE_VERSION_ID >= 30000 ++ size_t version; ++ if (mariadb_get_infov(NULL, MARIADB_CLIENT_VERSION_ID, &version) != 0) ++ version = mysql_get_client_version(); ++ if (version >= 100000) ++ is_ok = 1; ++#else + const char *info = mysql_get_client_info(); + char *i = strdup(info); + char *m = strtok(i, "."); +@@ -13621,6 +13628,7 @@ main () + if (atoi(m) >= 5) + is_ok = 1; + free (i); ++#endif + return is_ok ? 0 : 1; + + ; diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist index 6d193dc33166..0fd518e87269 100644 --- a/mail/dspam/pkg-plist +++ b/mail/dspam/pkg-plist @@ -214,6 +214,7 @@ libdata/pkgconfig/dspam.pc @(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/firstrun.txt.sample @(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/firstspam.txt.sample @(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/quarantinefull.txt.sample +@comment @dir lib/%%DSPAM_OWNER%% @dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%,%%DSPAM_HOME_MODE%%) %%DSPAM_HOME%% @dir(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%) %%LOG_DIR%% @dir(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%) %%RUN_DIR%%