From owner-svn-ports-all@freebsd.org Wed Jul 22 14:20:58 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4EA4237DF30; Wed, 22 Jul 2020 14:20:58 +0000 (UTC) (envelope-from danfe@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BBd161R8Sz4G84; Wed, 22 Jul 2020 14:20:58 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1584B8D90; Wed, 22 Jul 2020 14:20:58 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06MEKvDW007959; Wed, 22 Jul 2020 14:20:57 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06MEKv1r007958; Wed, 22 Jul 2020 14:20:57 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202007221420.06MEKv1r007958@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 22 Jul 2020 14:20:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542858 - in head/mail/dspam: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/mail/dspam: . files X-SVN-Commit-Revision: 542858 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2020 14:20:58 -0000 Author: danfe Date: Wed Jul 22 14:20:57 2020 New Revision: 542858 URL: https://svnweb.freebsd.org/changeset/ports/542858 Log: Unbreak the build against MariaDB and MySQL 8.0 (the latter replaced my_bool with C99 bool, while earlier versions used typedef to char). PR: 243035 Added: head/mail/dspam/files/patch-src_mysql__drv.c (contents, props changed) Modified: head/mail/dspam/Makefile Modified: head/mail/dspam/Makefile ============================================================================== --- head/mail/dspam/Makefile Wed Jul 22 14:00:59 2020 (r542857) +++ head/mail/dspam/Makefile Wed Jul 22 14:20:57 2020 (r542858) @@ -470,6 +470,8 @@ post-patch: @${REINPLACE_CMD} -e "s^%%PERL%%^${PERL}^" \ ${WRKSRC}/src/tools/dspam_train.in \ ${WRKSRC}/src/tools/dspam_notify.in + @${TEST} ${MYSQL_FLAVOUR} == mariadb && ${REINPLACE_CMD} -e \ + 's,&& defined(CR_ERROR_FIRST),,' ${WRKSRC}/configure || : pre-configure: .if ${PORT_OPTIONS:MVIRT_USERS} && !( ${PORT_OPTIONS:MMYSQL} || \ Added: head/mail/dspam/files/patch-src_mysql__drv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dspam/files/patch-src_mysql__drv.c Wed Jul 22 14:20:57 2020 (r542858) @@ -0,0 +1,14 @@ +--- src/mysql_drv.c.orig 2012-04-11 18:48:33 UTC ++++ src/mysql_drv.c +@@ -3461,7 +3461,11 @@ MYSQL *_mysql_drv_connect (DSPAM_CTX *CTX, const char + snprintf(attrib, sizeof(attrib), "%sReconnect", prefix); + if (_ds_match_attribute(CTX->config->attributes, attrib, "true")) + { ++# if MYSQL_VERSION_ID < 80000 || defined(MARIADB_VERSION_ID) + my_bool reconnect = 1; ++# else ++ bool reconnect = 1; ++# endif + mysql_options(dbh, MYSQL_OPT_RECONNECT, &reconnect); + } + #endif