From nobody Mon Mar 27 08:04:21 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 4PlQM93rLhz41wg0; Mon, 27 Mar 2023 08:04:21 +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 4PlQM93KDRz47Wg; Mon, 27 Mar 2023 08:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904261; 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=F4mxbq+EhHudlRkwNtenja4UUqIR476KZ0IbotxRDig=; b=XRIyLTJhzwUhPmBSrq2fh/BC4Yjyv0nhkK5m/XLHCC05v3arSDnkqzT/kLvHy4WHOLrbBR S7VCiQ5hZrqu6W7fB5ae18ea6DSEcazZg83k3Ex0wh9K723/07DxrHCC6wx1KEGeTWM5CB BObWL6+NWiWEEugEVqOg870TyUGuBpEYxpq+wsRXBCmlFkAJEWeyC03zIn6SsVnoNVp1SQ RbpstCVm+2PzXO9q6p0hBx8VbTmD78r7MzNUeNVDQKmtHZgj+Km1vA8yDhwEH73H8zN5SI 0pKfZo4SbcOaa9p7dOYOHQzIe4J/bSJPdh40sPXOe1CV9xfK5hZuCu/VhxhZUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904261; 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=F4mxbq+EhHudlRkwNtenja4UUqIR476KZ0IbotxRDig=; b=h0krE2cMWzhD/81U4ayCgg084+1lSIt7ShqXWRQTI0dUQulTAzeensYNYbBeypeqJ6bpWd r9Q1xwylFwgU7b28nTKJNa5bqeF8tTKPU637LdNe/6w7nzcEl7TcjvT5g9fenPSZ+lpPjR FfUBlt27Mk7LSPHzkXnH0KZywDLv6/zTy4FSl+ieT7ZUM0J48dY4CBoSfDwhh1FIZded21 Khl4QeKMB+rhX09Yo85CW4p7wf8UXy7+UVk/NlApWPq5yhf3ENdr4hF5SqvuPAikRjySmF j5oLQr4wzBvoWmrOsXfeHSRDUZ/bkgRBWJO9GrceRuzY/zRDYSOWo3KwhLN/Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904261; a=rsa-sha256; cv=none; b=KgMag7c/lAd3OuxPy3KLEK96Wx4LAEkQX+m3T1BPOQLkhM1bqOlqsXojdp+CZPx66iP7Nk KWkXyESCgEkUXThyl2JNmyOePZ2ZJ4BRKP3NneROVRvsmmJHgazlK3CTiLDRRCoptk0E7b K/wDBbtGGdYP5sAlzWUuXf0uWQq1RgNAuRdvDIxex9Y3P0YHwYMJsCO56mL48zR6JY8SiM JvU6Cspot6apwTeaQ/4leEiE74hAmhtzsM76LAiyhdhQyLh0KApSUQX3rpvi4WJqCrjxvD Y501oI4F0455gOlQ0HGZimSmXCHHF5E3s3vFPiujyl9bfF/6SD2TRCGhxhNteA== 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 4PlQM92GV2z1CmQ; Mon, 27 Mar 2023 08:04:21 +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 32R84LGQ029048; Mon, 27 Mar 2023 08:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R84LOE029047; Mon, 27 Mar 2023 08:04:21 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:04:21 GMT Message-Id: <202303270804.32R84LOE029047@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Chris Rees Subject: git: 5ac399c45824 - main - www/mnogosearch: Fix with mysql-5.7 and above 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: crees X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ac399c458241f36f9bc62469f1ed4a6a88a74ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by crees: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ac399c458241f36f9bc62469f1ed4a6a88a74ed commit 5ac399c458241f36f9bc62469f1ed4a6a88a74ed Author: Konstantin Stroykovskiy AuthorDate: 2023-03-27 07:56:11 +0000 Commit: Chris Rees CommitDate: 2023-03-27 07:57:28 +0000 www/mnogosearch: Fix with mysql-5.7 and above Variable "storage_engine" is deprecated in mysql-server version 5.6. It is removed from mysql 5.7. New variable is "default_storage_engine". PR: ports/269365 --- www/mnogosearch/Makefile | 1 + www/mnogosearch/files/patch-src-sql-mysql-c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index ebb63c6cc1d0..7cc4e081bd57 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -1,5 +1,6 @@ PORTNAME= mnogosearch PORTVERSION= 3.4.1 +PORTREVISION= 1 CATEGORIES= www databases MASTER_SITES= http://www.mnogosearch.org/Download/ diff --git a/www/mnogosearch/files/patch-src-sql-mysql-c b/www/mnogosearch/files/patch-src-sql-mysql-c new file mode 100644 index 000000000000..a5864284aeb7 --- /dev/null +++ b/www/mnogosearch/files/patch-src-sql-mysql-c @@ -0,0 +1,11 @@ +--- src/sql-mysql.c.orig 2023-02-06 10:23:32.970179000 +0300 ++++ src/sql-mysql.c 2023-02-06 10:24:17.488815000 +0300 +@@ -206,7 +206,7 @@ + { + int myrc; + char qbuf[64]; +- udm_snprintf(qbuf, sizeof(qbuf), "SET storage_engine=%s", ++ udm_snprintf(qbuf, sizeof(qbuf), "SET default_storage_engine=%s", + storage_engine[0] ? storage_engine : "MyISAM"); + if ((myrc= mysql_query(&mydb->mysql, qbuf))) + {