From nobody Sat Oct 1 07:13:25 2022 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 4Mfdc61Yv7z4cwM5; Sat, 1 Oct 2022 07:13:26 +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 4Mfdc60n70z3KRg; Sat, 1 Oct 2022 07:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664608406; 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=fj0QpfuAnpafxIjk6FThxXWl/u9RCsDFcgCOXqkqgng=; b=hrYg/qEh8lUnnMjdOAqs2k4dvF7DtJif5Uxr7EzZO56DSD68ng/BBq7V6FZ4YvXFVpg7Yy CCtJmFUPpsEPA2K+kF8tFsIyzt9zHKOL6U2y9F/AtBcsOm88notdhM06TaYXcthWVjXD4r SwUROE9P4kg+IOwuZ/RruCCQTfBPyzsxsbDdn2RLDNf+v/T+a5yQ3VdxUwNvUpfVjnHFD4 FoXRZhug2kxZk6HKc99xoHKA/YzTbaJr0yYOFGLflK0CVBtC6p+AUdcU+Y7+0y5QAaGqWx TZsLIflecgDPohZCzJOXc/5nP9VLipk1MDrBOAnTcA7VUbU2sUwsd6IfHxukjg== 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 4Mfdc56SvSzRyK; Sat, 1 Oct 2022 07:13:25 +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 2917DPl1077536; Sat, 1 Oct 2022 07:13:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2917DPgq077535; Sat, 1 Oct 2022 07:13:25 GMT (envelope-from git) Date: Sat, 1 Oct 2022 07:13:25 GMT Message-Id: <202210010713.2917DPgq077535@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 525e857368c8 - main - sysutils/e2fsprogs: revert bogus qsort_r() patch. 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 525e857368c8c2de355ca00b0c35008be6ee8a3c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664608406; 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=fj0QpfuAnpafxIjk6FThxXWl/u9RCsDFcgCOXqkqgng=; b=cBOpP8FWmalCERUr4KA8TOcnfIrgX1Vt2ekB/KywlKskYBNnyB5LYa5ZsAgoyWtCcO453d bHcuhSI0nuzWmTpgrA0Pa90E6m/Gp/3Tq45569vhHZaQiP4lcau5pcCOnXFbA446TnZoJI swrOhyiavVssV1x+ww3kW94rTdsT89w0od6y0Nrqxz22looC7H6YH3XVPyvCqj8260XSrb jdxUbGEBM56tLuo+L1R7z1NrXjzt1qZWUmzZqy3q8jC05GLdU04+/7Ibt+M0VaRAW1foAv GtREI+kNi50BK2TUg9bFVo9VsP87pnzA+y4t1QoZ5VXFrFDJCIvL7pN8JHAF9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664608406; a=rsa-sha256; cv=none; b=E9MRgWEtoKLx6dtySYR6cX3Zay8IQJT+QodKYV1zmRCzw7BfrGXT/jUfdThKqIlrDxqnPa kUY/S6/t8KVTuOdAAzQDk0rqIqhQEMV3HW7ii5U/RQYvEiPSiZtcr1EP0+2XaFcqUR5nxD 63Zat6C3JSx/DlGi/xO20JIBTrwFP8hgT/h7HOkKtE3LaJs/RXDCS4gM0MHkB60JLCZPmv ZKuFZ//RlcdajK4DuaPE1YfREv4Q4zp/XyA1pGtJrTfYcAjz2yTpIScFR/O6HXy2Tq7fOm Vt/P3ahSpg+Xlk9ZS5NrAjsxKiOofj/gHU0NqH8LVlGh4kCzWL6hmZv90eln9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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. 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. PR: 266227 --- sysutils/e2fsprogs/Makefile | 6 +++++- .../e2fsprogs/files/patch-lib_support_sort__r.h | 21 --------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 9a89d8de14f6..1205caa9179a 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -13,7 +13,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.46.5 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -142,6 +142,10 @@ USE_PERL5= build .include +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400072 +BROKEN= incompatible qsort_r() API. Upstream working on a autoconf-based fix. +.endif + .if ${PORT_OPTIONS:MNLS} . if empty(ICONV_LIB) libintl= ${LOCALBASE}/lib/libintl.a diff --git a/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h b/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h deleted file mode 100644 index dec89ce8ef9a..000000000000 --- a/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h +++ /dev/null @@ -1,21 +0,0 @@ ---- lib/support/sort_r.h.orig 2021-12-30 05:54:33 UTC -+++ lib/support/sort_r.h -@@ -25,7 +25,8 @@ void sort_r(void *base, size_t nel, size_t width, - #define _SORT_R_INLINE inline - - #if (defined __gnu_hurd__ || defined __GNU__ || \ -- defined __linux__ || defined __MINGW32__ || defined __GLIBC__) -+ defined __linux__ || defined __MINGW32__ || defined __GLIBC__ || \ -+ defined qsort_r) - # define _SORT_R_LINUX - #elif (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \ - defined __FreeBSD__ || defined __DragonFly__) -@@ -263,7 +264,7 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s - #if defined _SORT_R_LINUX - - typedef int(* __compar_d_fn_t)(const void *, const void *, void *); -- extern void qsort_r(void *base, size_t nel, size_t width, -+ extern void (qsort_r)(void *base, size_t nel, size_t width, - __compar_d_fn_t __compar, void *arg) - __attribute__((nonnull (1, 4))); -