From nobody Thu Oct 17 03:04:54 2024 X-Original-To: dev-commits-ports-branches@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 4XTXkZ3Bc8z5ZNXv; Thu, 17 Oct 2024 03:04:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTXkZ2Ssgz4jf0; Thu, 17 Oct 2024 03:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729134294; 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=euFW++ftjqqLj1P4pV9Y/wLKouoSISxp9sfmmmRWr3M=; b=ArIj4i5/JnjaTkFqfaP//0tu1YtqzC459lsX1GAhffZ75I56EycogtIrGcoZw2I5gcqK5V 8XfoZCOa0QyfyVnBXnarkaeEOxLK4XQUtHPYloPwzhH+iiz69EQ2NoOfDQlaWW5UH/hSQ6 xeR1uNaB53sjgeoJRcWYNde0T1SdRQU/xWvRcFpnujwcvq7ucWS1jI+5gQVTMGIcGvKGQW Lg7Rv7BCoQ/Xt8NEEf+xa4c7t3/ktKA61L4bFu8OK63/m3STWMQVg0oyeZHrsRGdC3YqJ0 PNkYKjZVNoy8zrNdsBgIaKNpw+1o25E8i03GIm30vyiIDDhdz4awEGydEQ9qBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729134294; 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=euFW++ftjqqLj1P4pV9Y/wLKouoSISxp9sfmmmRWr3M=; b=Sf93H0ShZPnIvDVqR5JSaXJNgElca+NcC3t1YABkVF2GvBdCUeR0uKodnY0VZ+x18orQ4i aui7i05A19Cvmu+5iOOQo4fsEjQMM6x1b/OkwLbs2oFqweVRJ3Y7HAp9/M9zbCoPf52r9i YVoQt+850UvZg99bDGsJ/T+cVzBTINvt22VCgzRengHd0ZxvL0xuvCA4CnX261M61bB7JX JvDkUs6Bxiu8Cy62KvcRYvyxOTGEvIHbycZBYBbBeNu4/kc+yeOs6ikcplq7g8wcSP8jOK 5YgLNxhPxEhVBiOb4IA4fBJDfMkQA2lpLsrsBAQeQPiO+FKIA+2WCBrrZQk4Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729134294; a=rsa-sha256; cv=none; b=jT8HGA55i4w3W8O17am405xk9QrAZ4hTcSZLkt6oj8tmey9/IRNZo9MkeLG++dLgcEWiVb F9OVhE1/1N0rLMFrzHgEmvoV6LRduAGabrEA1981TC37SIze/cAgGrWjw5SSSH06LoIdBj FUWT8gq4J8ojADZgDKe6bjERK7u7+01ipdGA6aAh81KYi9JdP0bucDR89q6P5NCd4JetFG qCNYlpU3pUdM3MDgqJO1g+YVgusVU3yHBZlCEKflQftjPjfq3T/CubXHaZCWa50jPFB9l+ iZry0egdlcgwOi/S2V/IQpOH8K0AlU2xNHHYasJO05F0RHmE6HnBVuPnfAG3DQ== 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 4XTXkZ23TMzY17; Thu, 17 Oct 2024 03:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49H34suG060400; Thu, 17 Oct 2024 03:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49H34shl060397; Thu, 17 Oct 2024 03:04:54 GMT (envelope-from git) Date: Thu, 17 Oct 2024 03:04:54 GMT Message-Id: <202410170304.49H34shl060397@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 53512da87bad - 2024Q4 - irc/anope: Fix MySQL database support with MariaDB List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 53512da87badf30dcd7de0f324a6b0147f76b2ed Auto-Submitted: auto-generated The branch 2024Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=53512da87badf30dcd7de0f324a6b0147f76b2ed commit 53512da87badf30dcd7de0f324a6b0147f76b2ed Author: Rafael Grether AuthorDate: 2024-10-17 02:55:33 +0000 Commit: Vladimir Druzenko CommitDate: 2024-10-17 03:04:47 +0000 irc/anope: Fix MySQL database support with MariaDB PR: 273370 MFH: 2024Q4 (cherry picked from commit cc7b3f0d0ba13ff5308cf513edde09f8b22b549f) --- irc/anope/Makefile | 2 ++ irc/anope/files/patch-modules_extra_m__mysql.cpp | 10 ---------- irc/anope/pkg-descr | 20 +++++++------------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/irc/anope/Makefile b/irc/anope/Makefile index 23e17bb08300..0e96f36eb73c 100644 --- a/irc/anope/Makefile +++ b/irc/anope/Makefile @@ -1,5 +1,6 @@ PORTNAME= anope DISTVERSION= 2.0.16 +PORTREVISION= 1 CATEGORIES= irc MAINTAINER= devnull@apt322.org @@ -31,6 +32,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LDAP_USES= ldap MYSQL_USES= mysql +MYSQL_CMAKE_ON= -DEXTRA_LIBS:STRING="${LOCALBASE}/lib/mysql/" NLS_USES= gettext diff --git a/irc/anope/files/patch-modules_extra_m__mysql.cpp b/irc/anope/files/patch-modules_extra_m__mysql.cpp deleted file mode 100644 index 0b44204ae072..000000000000 --- a/irc/anope/files/patch-modules_extra_m__mysql.cpp +++ /dev/null @@ -1,10 +0,0 @@ -Detection of "libmysqlclient" library is broken, so remove this check ---- modules/extra/m_mysql.cpp.orig 2015-04-23 14:25:58 UTC -+++ modules/extra/m_mysql.cpp -@@ -1,6 +1,3 @@ --/* RequiredLibraries: mysqlclient */ --/* RequiredWindowsLibraries: libmysql */ -- - #include "module.h" - #include "modules/sql.h" - #define NO_CLIENT_LONG_LONG diff --git a/irc/anope/pkg-descr b/irc/anope/pkg-descr index 0d937e200782..4198327d4db1 100644 --- a/irc/anope/pkg-descr +++ b/irc/anope/pkg-descr @@ -4,19 +4,13 @@ administrators to manage their network with powerful tools. Anope currently works with: - Bahamut 1.4.27 or later (including 1.8) - - Charybdis 1.0 or later - - DreamForge 4.6.7 - - Hybrid 7 or later - - InspIRCd 1.0 or later (including 3.x) - - Plexus 2.0 or later (including 3.0) - - PTlink 6.15 or later - - RageIRCd 2.0 beta-6 or later - - Ratbox 2.0.6 or later - - ShadowIRCd 4.0 beta 7 or later - - Solid IRCd 3.4.6 or later - - UltimateIRCd 2.8.2 or later (including 3.0) - - UnrealIRCd 3.1.1 or later (including 6.x) - - ViagraIRCd 1.3 or later + - Charybdis 3.4 or later + - ircd-hybrid 8.2.23 or later + - InspIRCd 1.2 or later + - ngIRCd 19.2 or later + - Plexus 3 or later + - Ratbox 3 or later + - UnrealIRCd 3.2 or later Anope could also work with some of the daemons derived by the ones listed above, but there's no support for them if they work or don't work.