From nobody Sun Jul 06 13:24:50 2025 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 4bZp4z0jRZz61THm; Sun, 06 Jul 2025 13:24:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bZp4y4Ng5z3JKT; Sun, 06 Jul 2025 13:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751808290; 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=PtFQgSWlVSrQF4rNGo/3iYBCKlokeBLSYiTl60IHJKo=; b=uE61nuaY6BzynTx2UL1mg/bhFc01fJMJn1DFRPert9RBYWPp+SfExQ/A4/e6o9qykKDDLD hxOhUPyfv/RKfzboSXdn/ZjY1iOb6GKBUJKI47SwnYlBBv6u0tn0EFYHJFNEUFpJRobYZX kgVGj4XYgdITg+YdfdRBSME7AmVUKmIq9WVTBX5+3A0g9Cr7sUdFeNpG/LOFHsUMNdI30p WEb10J4/6LaQkzG/hMrzpLRxvZ2jNCcEJeTOzpcNj2ImqMXGfhuVKEb+t9TBxfcw0qxzID 7nfzekinYkWV2yOSnvKLk4fudKXdaBSKtNHJe8g6uQr6FChCGteqDGImYHgXAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751808290; 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=PtFQgSWlVSrQF4rNGo/3iYBCKlokeBLSYiTl60IHJKo=; b=Lp0pa/SI/qkxcnVpQQGHkDTJNBnXVWGZOSRnVqVFH/W475ktvkk+fBb95b/dmC7bFCVmPI XeJMSkqMIFqAjYp6XWzm9yOta8MEkGvoDNolsBP5RknVSekz13pSR3bICmn6zVSJxN7RP0 s9J9XAADzuUz27rYrdH/qeWOavoJFWPiqmIazTZRaSCLcw77tOtnUpPKGIi1pAEQB7CiRu V8ccvWXmbLCqPG3EMqdxDq4ZYfkE/O63x42ZUAG/FpdfRn9+ndkSE4CJ2OvUSVIC2Zse8u cKhWSyxX8CFXB4CAtBBvoVUsu549Pa33uqSffdn9KCTyqupsj2NtnQ0JQvnlrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751808290; a=rsa-sha256; cv=none; b=oVQSXeoh2f8XTNmN806Z+pwjPMzQPs/o9iaWnLnraW4u6wi1TULwIUFvUKHWTAyhLba2SM AZ+dcgNhSa4LjiC3alEjUsMhWqDodvu6akHpCYs9umJ+XX6Ebhyp2yg/zKQ69dUTdB12xd 5u3d4GRZ7qjUAy/lo6H4LQcaAeK6/iK+t0YiFgvrb1+IVwvDFMniCZjlz5aOwrExfcEWfC NGPPmtQnOv4AAhpacaTl5+rY3AH8bKl13pPGeY/7VDC+Y7VtlxBddHOO5hfcXEYMH0U7QW LK4eb96OCxWwvh3PZ6ihNbnBsZ1PPRtiWCTKW3DYmmzn4uXsHc9AfgikviAq2A== 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 4bZp4y3sW5z1M3H; Sun, 06 Jul 2025 13:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 566DOovA019742; Sun, 6 Jul 2025 13:24:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566DOoWl019739; Sun, 6 Jul 2025 13:24:50 GMT (envelope-from git) Date: Sun, 6 Jul 2025 13:24:50 GMT Message-Id: <202507061324.566DOoWl019739@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 274c3c4c81a1 - 2025Q3 - filesystems/e2fsprogs*: do not install findfs 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2025Q3 X-Git-Reftype: branch X-Git-Commit: 274c3c4c81a1fcc28375ab37933be07593d833cf Auto-Submitted: auto-generated The branch 2025Q3 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=274c3c4c81a1fcc28375ab37933be07593d833cf commit 274c3c4c81a1fcc28375ab37933be07593d833cf Author: Matthias Andree AuthorDate: 2025-07-06 12:24:34 +0000 Commit: Matthias Andree CommitDate: 2025-07-06 13:22:09 +0000 filesystems/e2fsprogs*: do not install findfs Which will conflict with util-linux, and seems to identify itself as tune2fs. (cherry picked from commit cfd7d5319a08fdbfb233930ade490dbd1127a77c) --- filesystems/e2fsprogs-core/Makefile | 4 +++- filesystems/e2fsprogs-core/pkg-plist | 2 -- filesystems/e2fsprogs/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile index 74fc7d58dc0f..3635f56a551c 100644 --- a/filesystems/e2fsprogs-core/Makefile +++ b/filesystems/e2fsprogs-core/Makefile @@ -1,6 +1,6 @@ PORTNAME= e2fsprogs PORTVERSION= 1.47.2 -PORTREVISION?= 3 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile! +PORTREVISION?= 4 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile! CATEGORIES?= filesystems sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -317,6 +317,7 @@ post-install: .endif # remove or relocate files installed by other ports already, or shadowing system files: ${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et + ${RM} ${STAGEDIR}${PREFIX}/sbin/findfs ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/share/man/man1/e2fsprogs-compile_et.1 ${MKDIR} ${STAGEDIR}${DATADIR}/et/ ${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/ @@ -325,6 +326,7 @@ post-install: ${MV} -f ${STAGEDIR}${PREFIX}/share/man/man3/com_err.3 \ ${STAGEDIR}${PREFIX}/share/man/man3/e2fsprogs-com_err.3 ${RM} ${STAGEDIR}${PREFIX}/share/man/man3/libblkid.3 + ${RM} ${STAGEDIR}${PREFIX}/share/man/man8/findfs.8 # # the next line closes .if ${MASTERDIR} == ${.CURDIR} diff --git a/filesystems/e2fsprogs-core/pkg-plist b/filesystems/e2fsprogs-core/pkg-plist index aa62bd55cd74..9968e202315e 100644 --- a/filesystems/e2fsprogs-core/pkg-plist +++ b/filesystems/e2fsprogs-core/pkg-plist @@ -59,7 +59,6 @@ share/man/man8/e2image.8.gz share/man/man8/e2label.8.gz share/man/man8/e2mmpstatus.8.gz share/man/man8/e2undo.8.gz -share/man/man8/findfs.8.gz share/man/man8/mke2fs.8.gz share/man/man8/mklost+found.8.gz share/man/man8/resize2fs.8.gz @@ -82,7 +81,6 @@ sbin/e2image sbin/e2label sbin/e2mmpstatus sbin/e2undo -sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 diff --git a/filesystems/e2fsprogs/Makefile b/filesystems/e2fsprogs/Makefile index 21f6e3e86452..b54a99e70fad 100644 --- a/filesystems/e2fsprogs/Makefile +++ b/filesystems/e2fsprogs/Makefile @@ -1,7 +1,7 @@ PORTNAME= e2fsprogs CATEGORIES= filesystems sysutils PORTVERSION= 1.47.2 -PORTREVISION= 3 +PORTREVISION= 4 BUILD_DEPENDS= e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:filesystems/e2fsprogs-core RUN_DEPENDS= ${BUILD_DEPENDS} DISTFILES= # empty