From nobody Sat Oct 01 10:45:56 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 4MfkKJ6h0Tz4dpL1; Sat, 1 Oct 2022 10:45:56 +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 4MfkKJ69ltz3ZsT; Sat, 1 Oct 2022 10:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664621156; 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=smugwxVeQe8ur8L21BSiWELuy5W2NdAMvcCF43lfe+w=; b=hZUt1clrojmObs5QhDxaGHF22ondKlu8zLG/tWjJF8NldpuszXPdgywrocZuh9zVAm9xLS 4EeHdL3QJ6IlL9z3iVUy7C1NNKStSdp7sAex0DqMyNFhZjYY/SRM8RJ3YdTb53MpjcDPTk pacODBMFEUUnALrakfPTSfP1jiSYj2JWqdT6NsktFI7mc/3wRnSS+lwSg2voiS4KpVnAQe wdhigZM2+OuhRdALAw8VQSJvoP4vxC6mj3oV6enQsq9hbt2kC8u7p4LuUB3J2aZpW5+YHg 4oNYyEnQoAlAG5/2Hy6xSVI4lGWmAgTBvD2krZCjv7on4Doq5CRCqPscfw1Hjw== 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 4MfkKJ58V4zW3x; Sat, 1 Oct 2022 10:45:56 +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 291Ajuu9038179; Sat, 1 Oct 2022 10:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291Ajubb038178; Sat, 1 Oct 2022 10:45:56 GMT (envelope-from git) Date: Sat, 1 Oct 2022 10:45:56 GMT Message-Id: <202210011045.291Ajubb038178@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: 5db803a6f269 - main - sysutils/e2fsprogs: misc/e2fsprogs-libblkid: fixes 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 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: 5db803a6f26956fb47a211c29e34a0e5ccd82286 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664621156; 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=smugwxVeQe8ur8L21BSiWELuy5W2NdAMvcCF43lfe+w=; b=fbMs17BOM3JEKpX8AzBudwUUbHFGgIac9dE3oV1JOTXxrS/VW9lsVYO9XQyZGLR8qa4Hi9 VYwBCKsq2prrdBKBcwqUGCkOw6k/e+64BPyU930nvw2OH6Y1p6F8AjspXXvtpte9xPTalC Iva+T/hx2VLWpSKLYmzCfLopDgwfx1zkirap7RFNhpYUfaQSgjF26qWIirh0JiXJc/8LCA ms6vtE45CA0hBgTwL3QS9q9YE8YE1TwAYYcqf6YSyic7lyoADdRhjldPiCSeMhNOYjT8KW f7C76AKku3Q03WJZGG8BymL0/v6zMNhnrnGppyJEMF2K2RprzcuPimBiDiS8yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664621156; a=rsa-sha256; cv=none; b=pXOi7WCsICVeyF24RQTRQ/CSNKrO6GD5RKObHbEVLJ8KNm6mwaWTyldQOc3K+NJ7zsWUyL IeuZ777nnlU0Wgo2xhNvq1VugOGiVfyVvqCEogyvaBBZlHyzFRLblQUEwjlh4q2FiOjwCo qAFYw8siA5Ll6oaIbC/8KouQTdvLgut1roJ3F6A4p7r65w5iZxE2g6iDSoB5vPo4jWVNyn xRTqqwiPMxsQ90ah+2ZeviGgJfJ1JZKUM3TeyEdlBJgMe9qqEUArpmrTKD9JR/0Q2ACFHT 1ZBxo3icl1aVpJIpu+Zo802Ll4X/bZTd+BJvlw1uTkP9XxQmHFOkQN+fP0BXsQ== 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=5db803a6f26956fb47a211c29e34a0e5ccd82286 commit 5db803a6f26956fb47a211c29e34a0e5ccd82286 Author: Matthias Andree AuthorDate: 2022-10-01 10:40:13 +0000 Commit: Matthias Andree CommitDate: 2022-10-01 10:45:34 +0000 sysutils/e2fsprogs: misc/e2fsprogs-libblkid: fixes - for libblkid, fix a buffer size when parsing device names to make room for a trailing '\0' character from sscanf(). (This was a long-standing bug in our local patch.) - patch out qsort_r redeclarations from the sort_r library that are incompatible with FreeBSD since it aligned with GNU qsort_r() API - remove FreeBSD 14-CURRENT BROKEN= tag. Related to: PR: 266227 --- misc/e2fsprogs-libblkid/Makefile | 2 +- sysutils/e2fsprogs/Makefile | 6 +----- sysutils/e2fsprogs/files/patch-lib_blkid_devname.c | 4 ++-- .../e2fsprogs/files/patch-lib_support_sort__r.h | 24 ++++++++++++++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/misc/e2fsprogs-libblkid/Makefile b/misc/e2fsprogs-libblkid/Makefile index 5380a8921476..8dfd267d7a05 100644 --- a/misc/e2fsprogs-libblkid/Makefile +++ b/misc/e2fsprogs-libblkid/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc devel PKGNAMESUFFIX= -libblkid diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 31381058a529..87a1e2cb7836 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -13,7 +13,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.46.5 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -142,10 +142,6 @@ USE_PERL5= build .include -.if ${MASTERDIR} == ${.CURDIR} && ${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_blkid_devname.c b/sysutils/e2fsprogs/files/patch-lib_blkid_devname.c index 220b03b9ba72..9a59112ed239 100644 --- a/sysutils/e2fsprogs/files/patch-lib_blkid_devname.c +++ b/sysutils/e2fsprogs/files/patch-lib_blkid_devname.c @@ -58,7 +58,7 @@ + } + } + char *str = buf; -+ while (line = strsep(&str, "\n")) { ++ while ((line = strsep(&str, "\n"))) { +#endif /* __FreeBSD__ */ last = which; which ^= 1; @@ -70,7 +70,7 @@ continue; devs[which] = makedev(ma, mi); +#else -+ char type[5]; ++ char type[6]; + int dummy; + if (sscanf(line, "%*d %5s %128[^ ] %lld %d", diff --git a/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h b/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h new file mode 100644 index 000000000000..499a385bc1a3 --- /dev/null +++ b/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h @@ -0,0 +1,24 @@ +--- lib/support/sort_r.h.orig 2021-12-30 05:54:33 UTC ++++ lib/support/sort_r.h +@@ -234,10 +234,6 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s + + #if defined _SORT_R_BSD + +- /* Ensure qsort_r is defined */ +- extern void qsort_r(void *base, size_t nel, size_t width, void *thunk, +- int (*compar)(void *_thunk, +- const void *_a, const void *_b)); + + #endif + +@@ -262,10 +258,6 @@ 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, +- __compar_d_fn_t __compar, void *arg) +- __attribute__((nonnull (1, 4))); + + #endif +