From nobody Mon Apr 3 14:16:00 2023 X-Original-To: apache@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 4PqtGz3z4xz42nWP; Mon, 3 Apr 2023 14:16:11 +0000 (UTC) (envelope-from brnrd@freebsd.org) Received: from smtp-out02.qsp.nl (smtp-out02.qsp.nl [193.254.214.166]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4PqtGz14hKz43tl; Mon, 3 Apr 2023 14:16:11 +0000 (UTC) (envelope-from brnrd@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtp.brnrd.eu (5921114a.static.cust.trined.nl [89.33.17.74]) by smtp02.qsp.nl (Postfix) with ESMTPSA id 0952CD401; Mon, 3 Apr 2023 16:16:01 +0200 (CEST) Received: from mail.bachfreund.nl (php.brnrd.eu [172.17.2.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.brnrd.eu (Postfix) with ESMTPSA id 4PqtGn0mJ9zhL; Mon, 3 Apr 2023 14:16:01 +0000 (UTC) List-Id: Support of apache-related ports List-Archive: https://lists.freebsd.org/archives/freebsd-apache List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-apache@freebsd.org MIME-Version: 1.0 Date: Mon, 03 Apr 2023 14:16:00 +0000 From: Bernard Spil To: Dima Panov Cc: apache@freebsd.org, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: f473a726dba2 - main - devel/apr1: Update to 1.7.3 In-Reply-To: References: <202304011545.331FjsQ3036275@gitrepo.freebsd.org> <181ffa75-a634-3923-ba03-c5709e7031e4@FreeBSD.org> <15feca74-3f94-6b20-415f-e62676db7961@FreeBSD.org> <2922671eef163a5c73c46fbfb833df24@freebsd.org> Message-ID: <02ec9776bd8d1af677d11ae8f246d4a6@freebsd.org> X-Sender: brnrd@freebsd.org Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PqtGz14hKz43tl X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12315, ipnet:193.254.214.0/23, country:NL] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 2023-04-03 08:33, Dima Panov wrote: > Moin-moin! > > > Just updated and patched percona57 port to provide HAVE_TYPE_MY_BOOL > instead of additional patching of apr1 > > https://cgit.FreeBSD.org/ports/commit/?id=b8ee7dca2268e33df41571463fbe8a3537550f8f > > > On 02.04.2023 14:07, Bernard Spil wrote: >> On 2023-04-02 12:58, Dima Panov wrote: >>> Moin-moin! >>> >>> Oh, sorry, wrong jail. >>> >>> Error exists with not mysql8 but percona57, which have defined >>> typedef char my_bool; >>> >>> >>> >>> On 02.04.2023 13:49, Dima Panov wrote: >>>> >>>> >>>> On 01.04.2023 18:45, Bernard Spil wrote: >>>>> The branch main has been updated by brnrd: >>>>> >>>>> URL: >>>>> https://cgit.FreeBSD.org/ports/commit/?id=f473a726dba249ec936d340b8b1167ce5996bd30 >>>>> >>>>> commit f473a726dba249ec936d340b8b1167ce5996bd30 >>>>> Author:     Bernard Spil >>>>> AuthorDate: 2023-04-01 15:42:03 +0000 >>>>> Commit:     Bernard Spil >>>>> CommitDate: 2023-04-01 15:42:03 +0000 >>>>> >>>>>      devel/apr1: Update to 1.7.3 >>>>>       * Update APR-util to 1.6.3 >>>>>       * Fix build with MySQL 8 [2] >>>>>       * databases/db5 is depreacated since 2022-06-30 [3] >>>>>       * Switch default BDB to 18 >>>>>      PR:             269857, 230538 [2], 261523 [3] >>>>>      Submitted by:   ngie >>>>>      With hat:       apache >>>> >>>>> diff --git a/devel/apr1/files/patch-PR59332 >>>>> b/devel/apr1/files/patch-PR59332 >>>>> new file mode 100644 >>>>> index 000000000000..781d41e852dd >>>>> --- /dev/null >>>>> +++ b/devel/apr1/files/patch-PR59332 >>>>> @@ -0,0 +1,18 @@ >>>>> +See https://bz.apache.org/bugzilla/show_bug.cgi?id=59332 >>>>> + >>>>> +Also reported in PR230538 devel/apr1 fails with mysql80-client >>>>> + >>>>> +--- apr-util-1.6.3/dbd/apr_dbd_mysql.c.orig    2023-01-27 13:32:52 >>>>> UTC >>>>> ++++ apr-util-1.6.3/dbd/apr_dbd_mysql.c >>>>> +@@ -44,6 +44,11 @@ >>>>> + #include >>>>> + #endif >>>>> + >>>>> ++#if !defined(HAVE_TYPE_MY_BOOL) && !defined(LIBMARIADB) >>>>> ++#include >>>>> ++typedef bool my_bool; >>>>> ++#endif >>>>> ++ >>>>> + #include "apr_strings.h" >>>>> + #include "apr_lib.h" >>>>> + #include "apr_buckets.h" >>>> >>>> Mysql8 defines it as char instead. >>>> >>>> dbd/apr_dbd_mysql.c:49:14: error: typedef redefinition with >>>> different types ('bool' vs 'char') >>>> typedef bool my_bool; >>>>               ^ >>>> /usr/local/include/mysql/mysql.h:49:14: note: previous definition is >>>> here >>>> typedef char my_bool; >>>>               ^ >>>> dbd/apr_dbd_mysql.c:1271:5: warning: call to undeclared function >>>> 'my_init'; ISO C99 and later do not support implicit function >>>> declarations [-Wimplicit-function-declaration] >>>>      my_init(); >>>>      ^ >>>> 1 warning and 1 error generated. >>>> >> >> This patch allows us to move the default MySQL implementation on >> FreeBSD from unsupported/EoL MySQL 5.7 to MySQL 8. It's a right mess, >> MariaDB also defines my_bool as char hence the !defined(LIBMARIADB). >> >> Apparently Percona still supports a 5.7 variant. Please provide a >> patch that fixes Percona and does NOT break MySQL 8, MariaDB 10.x so >> we can amend the existing patch. >> >> With kind regards, Bernard Spil (with hat apache) Thanks! Still more issues with APR that need fixing :'(