From nobody Sat Oct 01 09:50:17 2022 X-Original-To: dev-commits-ports-main@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 4Mfj590f8Dz4djBs; Sat, 1 Oct 2022 09:50:21 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mfj5870B8z3WtZ; Sat, 1 Oct 2022 09:50:20 +0000 (UTC) (envelope-from mandree@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664617821; 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: in-reply-to:in-reply-to:references:references; bh=vrbACrvViYTdEBLjPcoQdUJm5XslHiWf+qmN4JuR/1A=; b=DMfOhvL5G0v0lBIwTwfy24a/kXhM/yVPet0JY5Mnb7REGpJUD+93kzZrRfUak2rphefjjr gja6nMmQiJYVTzaUkZrfRYSxMrRzgLEYjKO9aL/3M/gxz0K1uFDnWIeGsZtqA5gzRdBaoe x6ZvCItw824140RUuvO13g2SWyI0/SQ3ZuHs1VXUlyZx+6uwJNWF/Ld5hJa5cNhnj8Tff0 zWsm/T2+hI5uz95/ClHOtVeubzrsro1yeSMEbH0Qk6GCo0W9mHIFoSK9Id/GTJWxLOsqBw UEOi414Y4lM7Lg58+uY8wxJWwil+541hxa1daSO2IjJwAy7QukCBKNqO50L9uQ== Received: from mandree.no-ip.org (p54a03871.dip0.t-ipconnect.de [84.160.56.113]) (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) (Authenticated sender: mandree/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Mfj58571cz16W5; Sat, 1 Oct 2022 09:50:20 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from [127.0.0.1] (localhost [127.0.0.1]) by ryzen.an3e.de (Postfix) with ESMTP id EDA1B8F1A8D; Sat, 1 Oct 2022 11:50:17 +0200 (CEST) Message-ID: Date: Sat, 1 Oct 2022 11:50:17 +0200 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: git: 525e857368c8 - main - sysutils/e2fsprogs: revert bogus qsort_r() patch. To: d@delphij.net, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202210010713.2917DPgq077535@gitrepo.freebsd.org> Content-Language: en-US, de-DE, en-GB, fr-FR, nl-NL From: Matthias Andree Organization: FreeBSD - The Power to Serve In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664617821; 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: in-reply-to:in-reply-to:references:references; bh=vrbACrvViYTdEBLjPcoQdUJm5XslHiWf+qmN4JuR/1A=; b=ZKqJPW1cq9LcpyuyrMlQMRueagU1RdJXsbxVBAGITJSXbfBtV5VgJNu2fNk285c76R6mO3 7pqrahJx+LCPEHhNcj7+ILyTlDX2hNo07UkNotgrKvuLj7pIYROYdI97QaL/6nm7CcqVcL YgBjNhMKypbwwgecUIoAY99mD6uNsG3aMC0ZE8fcK2RzrZV6tzw58lI35eR9kaSnr47R5n MT3Lxf93la4qw4d7Dl8xv0BqUSh+nWLOye7mjgCOeqEm3IQI/f42u5f8+ZyqEu3iiY7b5b swwb4wuGXA9HPlir8AbYRoKBgnwcXC9Av1BIwUkSQAZX9jx7e39uty+CAWhEvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664617821; a=rsa-sha256; cv=none; b=fdqvDHtMUApEno7OnH0lEaThQsgcSF252apsvei2VXeUZAkmSC2xH4Wvf3V1l7VvhrGUKg cMqMyJw6HMp9ktgbzb0+A6lZ6yuVRWQWTuhuVruT2z9OGb90N3xPC/17nhBA5WblaXrGpX t6o3wdkhnk5drLnC0N0lmIbccbgSZF2PlNXlmfpTZ6zCZctrlJrkfT34oR6dWhmzHhVfdP 1OjXUl3V38dIJHZX2YzxVzsUblzgcgNo7pDNmjX2EbBfxcNr3G3WAlh9zkmoKMzM19Qh1B BqGQtvRUOJQwgZaOhBDabprIXrDvZISWPvqSOjp9cNT8Ime0RtIKOEID9oHEIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Am 01.10.22 um 10:30 schrieb Xin Li: > First of all, thanks for connecting me with the upstream developer. Thanks for going in so much detail with him. > On 10/1/22 00:13, Matthias Andree wrote: >> The branch main has been updated by mandree: >> >> URL: >> https://cgit.FreeBSD.org/ports/commit/?id=525e857368c8c2de355ca00b0c35008be6ee8a3c >> >> commit 525e857368c8c2de355ca00b0c35008be6ee8a3c >> Author:     Matthias Andree >> AuthorDate: 2022-10-01 07:10:08 +0000 >> Commit:     Matthias Andree >> CommitDate: 2022-10-01 07:13:09 +0000 >> >>      sysutils/e2fsprogs: revert bogus qsort_r() patch. > > Which part of it was bogus? Xin, Applying it was, in spite of the discussion and better approaches in the pipeline -- and the patch that got committed here also is not the one that got into sort_r. Look, it's not as if FreeBSD 14-CURRENT were datacenter production ready, and -CURRENT isn't Tier #1 for ports either. It does not matter if it breaks for a few days. > > It was a working fix, and the goal was to ensure that the upcoming > 2022Q4 branch will be working with -CURRENT, by the way. Well, we can MFH the fix any time. > >>      delphij@ and the upstream maintainer were working on a >> autoconf-based >>      solution, and this patch was not approved.  Remove it and mark >>      port BROKEN on systems that changed qsort_r() for the GNU-like API. > > I think I have made it pretty clear in our discussion with upstream > maintainer that the current versions of e2fsprogs are NOT really using > qsort_r at all, and it is always using sort_r_simple. > > sort_r_simple is platform independent, there is no compelling to leave > the port broken just because the sort_r author decided it was a good > idea to redefine qsort_r (the maintainer also accepted my proposal to > change qsort_r to (qsort_r) earlier this week: > https://github.com/noporpoise/sort_r/blob/master/sort_r.h . > > So based on the reasons above, my change shouldn't even affect the > resulting binary. Then the proper fix is to remove the unused ballast if it is getting in the way. (Having to parenthesize a function name is an abomination I have not seen in 32 years of dealing with C and C++ code.) > > And it's my believe that -CURRENT users deserves better treatment than > marking a "trunk" port broken like this, just because a better > solution is being worked on by the upstream.  The ports patching > mechanism exists for a reason, and we can do better than this. I am compiling 14-CURRENT from Git as we speak so I have a test bed. But this takes a while, even with a 8-core 16-thread CPU. > > This has unnecessarily broke all ports that uses sysutils/e2fsprogs as > MASTERDIR, which includes misc/e2fsprogs-libuuid, which do not > necessarily use sort_r.h, please fix or revert. > Oops. I will fix that first. Regards, Matthias