From nobody Tue May 21 07:19:00 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 4Vk5QY0rcKz5LX65; Tue, 21 May 2024 07:19:01 +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 4Vk5QX5VD3z4VQJ; Tue, 21 May 2024 07:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716275940; 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=Zvg4zA4Wx0+snAvV3XMiVH+kWo/dixgw9uOajQv/x2o=; b=MeNBIR1rQFOtlACyvjkgvC2Oa7UPsWdwR8sV2DHLZzsN/Z2CFOgJyVZ5lxvqnYDbhre2hj 5oVDW5urCDk3IfU/dew3h/J1v7ztcaAqfAq9AJvAZ8hYSrSChQWtLWFIWYssFc7duOYyaC YfuC4CLxebMb3xWEKWYWueasjMg0/VCtCZWpNSRMjQWhCi5Hl1FtcrCUXfY9OLhkaDpeag 5bPGQB5q/ADbCIkB34OzHcJ3BpbvnFVLexFH85IdfFT6+GAJT2FFTN6rrc4Ha2kN4/Tatw N3YTR3ibGDQnzGID1pO73UGYAwhhjHtBoGXddsJTFjac77Tr18r9td3X8LZdLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716275940; a=rsa-sha256; cv=none; b=oAyS0K0NM8cJUa6sbbpJ6Iy/ek+gw6W7KuFRQ+kfRtyupVxLiD6yzwsT88ySCN3Txf1n35 WoxnqPS2ff0IQirC99tTiMX4MSvPpv3KXUpjK1RReUqL5HQa44+RH20jfCsrL4hPG0bUT/ 2wDTTiLFY37m3jxUqbr9nbOy7e/aIrRTtPwA1sgB00g9d+lIBGhepqUgKrq0eljXqi8r+Z olEzv/j0o3Y0gIwasm6+4cHzcc0THNuv6IjHC53xlhexFsbGZJMzj3f+I7f7NXQIihI8K3 ANZNqgNiFMOah6RJsddQoHe3A+79shECIqrId1sLcd2AqSK9/deYcUqHy3ODhQ== 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=1716275940; 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=Zvg4zA4Wx0+snAvV3XMiVH+kWo/dixgw9uOajQv/x2o=; b=tlPmeIOAuK81apq7YpAw3RDpWxNcf7wkJGa5RaJKGd97LmY39+T1Tf15qOJ2CgpLrR6BKC S+/mzjw5m4hdqnMbb+M2Wo5P2wQwO/owRHJWlMKfChN4YuO7FXHUIIiU/7tzKr5qEMGuaW rAuBuinl5XxzIeUgBiTOZsgT1nigiGRFBS5l17ZA3fTPt72+Otfq60uN43wTDCS6EwT7F6 JNrWL7TAeT/OuCd118LlfqQ5lKwi1t9l2F5mqdKHNVNMpDGKZRvvg5RWVH725MgNfdjRm5 iHHaeECtLUHgYluti8h+0vFgJn86ze99ZHtvmPOYvg99CAQmB3gdKYwZgTFoIQ== 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 4Vk5QX5676z1C1H; Tue, 21 May 2024 07:19:00 +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 44L7J0wR040591; Tue, 21 May 2024 07:19:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44L7J0Yn040588; Tue, 21 May 2024 07:19:00 GMT (envelope-from git) Date: Tue, 21 May 2024 07:19:00 GMT Message-Id: <202405210719.44L7J0Yn040588@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: cdd175214874 - main - databases/mysqltcl: fix build with 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: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdd1752148745b583a6ffcc92955e994c07e0adb Auto-Submitted: auto-generated The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdd1752148745b583a6ffcc92955e994c07e0adb commit cdd1752148745b583a6ffcc92955e994c07e0adb Author: Pietro Cerutti AuthorDate: 2024-05-21 07:16:38 +0000 Commit: Pietro Cerutti CommitDate: 2024-05-21 07:18:58 +0000 databases/mysqltcl: fix build with MariaDB PR: 277922 (exp-run) Reported by: antoine --- databases/mysqltcl/Makefile | 2 +- databases/mysqltcl/files/patch-generic_mysqltcl.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/databases/mysqltcl/Makefile b/databases/mysqltcl/Makefile index 17651078864a..2bf79124cd61 100644 --- a/databases/mysqltcl/Makefile +++ b/databases/mysqltcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= mysqltcl PORTVERSION= 3.052 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases tcl MASTER_SITES= http://www.xdobry.de/mysqltcl/ diff --git a/databases/mysqltcl/files/patch-generic_mysqltcl.c b/databases/mysqltcl/files/patch-generic_mysqltcl.c index 477c951daee7..9c0da226b27b 100644 --- a/databases/mysqltcl/files/patch-generic_mysqltcl.c +++ b/databases/mysqltcl/files/patch-generic_mysqltcl.c @@ -1,6 +1,14 @@ ---- generic/mysqltcl.c.orig 2024-01-26 14:58:40 UTC +--- generic/mysqltcl.c.orig 2012-10-24 20:26:34 UTC +++ generic/mysqltcl.c -@@ -911,7 +911,7 @@ static int Mysqltcl_Connect(ClientData clientData, Tcl +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + #define MYSQL_SMALL_SIZE TCL_RESULT_SIZE /* Smaller buffer size. */ + #define MYSQL_NAME_LEN 80 /* Max. database name length. */ +@@ -911,7 +912,7 @@ static int Mysqltcl_Connect(ClientData clientData, Tcl #if (MYSQL_VERSION_ID>=32350) if(mysql_options_reconnect) {