From nobody Fri Jan 28 00:11:17 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 53AC519742E5; Fri, 28 Jan 2022 00:11:20 +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 4JlHtZ44gcz51N1; Fri, 28 Jan 2022 00:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643328679; 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=t29SjrdWF9Hw1Ie6D/OIdrs7HmvJYI4RoTxmNznh+84=; b=MMrHPhSrgRjPwDjTgheHLiowCJfS+YK++fa1OcghyESspFJsOuUXT5qrtBqdyVpmzL82C8 HXOZ49lHNYZ2h4+IBRM6r9G6hfa0pnVTXePTbVkeRAL1h0AAjWoZea5RQrzj5XPUUwUA+v c3szXDISa5nusktCeEUqV03vNDLi4OK8WIFYUfOv2aZktUggTyYMMJlM6ajOoRNRtuwvpR Fj4qx7dmCOuFxOBVpPfJ+18IYxjzW8Fz54P1zJJuf6EXcXplUFsCXEZznp8tU33R4M5Ght AkZkBuWEPSXZRz3o7eHLevxj+Dtk+oBF1IKCdyHlYnqDx6IbzeqnEo23BBzXqg== 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 4CEC720237; Fri, 28 Jan 2022 00:11:17 +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 20S0BHFg027632; Fri, 28 Jan 2022 00:11:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20S0BHrJ027631; Fri, 28 Jan 2022 00:11:17 GMT (envelope-from git) Date: Fri, 28 Jan 2022 00:11:17 GMT Message-Id: <202201280011.20S0BHrJ027631@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: 85c96d2be272 - 2022Q1 - sysutils/e2fsprogs: resolve krb5 conflict with man3/com_err.3.gz 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 85c96d2be272fbb91f714b2241d694db90505004 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643328679; 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=t29SjrdWF9Hw1Ie6D/OIdrs7HmvJYI4RoTxmNznh+84=; b=mjXhw3YH1FYYM3VuqGl425ulZsvqOFKr/hlvMv9Y9IUxuGzWOmbhDy5zrkICaexBTWpioA Iw7LOxTelImuMHeK+hxFXJrIn/skuqEoGrsQgSzCZrGDlr5KdRHLNgrsd5O8WrnGm/AKlO xfRWsIz6Cmj4zB1WssugpJlQs4b+elYE221bSXMTcxErehjezgb7oJvChvbkg4lQnFfvHs fEdcEWxnMk9zQ2anUzYVsJTa7pBS3k77zRUtIrvujeOTizeD7rQnjGBalzBu2tHe1nwlv7 wVusQ5orVXhD9sdQn52ZbIxdcxI4bQyYyjsamrmHoEphkLNsFOiscQOP2mt39Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643328679; a=rsa-sha256; cv=none; b=LaPynSnttTvlS4yG3YpddZU8kBlCVeW0JpWknqpVzgnJpIGrhzZMy61i+vl+FOovg6y0gc slrr/MoUC/w8XLGMjAwtVMz64hGfkwYVtMPJ39UMM70ly2z73TQse/EJDSo9kltFR0TOyz ZHyBWA7fktp0bA40rymm7nNBYCLPHbUyzizo3rFU1z75gKdBJW6/AdYjnbcEnh7Z6y4SKk 7qZVjAQG7gz0FwSg7trSH4vclJQtrWiJyRI6VHqQqY2ENP/U8b61R1eT4gPqE0bT/KZ7Fd h9CBJ5apV7D6ETEMmqmZ/0t7IxSKHpFZPYeXLiiSy+GyfY5PY4/CAO2WLnBS4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=85c96d2be272fbb91f714b2241d694db90505004 commit 85c96d2be272fbb91f714b2241d694db90505004 Author: Matthias Andree AuthorDate: 2022-01-18 19:01:55 +0000 Commit: Matthias Andree CommitDate: 2022-01-27 23:55:51 +0000 sysutils/e2fsprogs: resolve krb5 conflict with man3/com_err.3.gz PR: 254751 Reported by: Felix Palmen (cherry picked from commit cee87a1eefc85598a47f07fed7052b118e2992b1) --- sysutils/e2fsprogs/Makefile | 6 ++++-- sysutils/e2fsprogs/files/patch-lib_et_com__err.3 | 11 +++++++++++ sysutils/e2fsprogs/pkg-plist | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 96e58249a265..0f61ac9657f3 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -14,7 +14,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.46.4 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -353,11 +353,13 @@ post-install: ${XARGS} <${FILESDIR}/unwanted ${RM} && \ ${RMDIR} include/e2fsprogs/blkid ${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et - ${MV} ${STAGEDIR}${PREFIX}/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/man/man1/e2fsprogs-compile_et.1 + ${MV} ${STAGEDIR}${MANPREFIX}/man/man1/compile_et.1 ${STAGEDIR}${MANPREFIX}/man/man1/e2fsprogs-compile_et.1 ${MKDIR} ${STAGEDIR}${DATADIR}/et/ ${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/ ${REINPLACE_CMD} -e 's}^DIR=.*$$}DIR=${DATADIR}/et}' -i '' ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et ${RMDIR} ${STAGEDIR}${PREFIX}/share/et + ${MV} -f ${STAGEDIR}${MANPREFIX}/man/man3/com_err.3 \ + ${STAGEDIR}${MANPREFIX}/man/man3/e2fsprogs-com_err.3 # # the next line closes .if ${MASTERDIR} == ${.CURDIR} diff --git a/sysutils/e2fsprogs/files/patch-lib_et_com__err.3 b/sysutils/e2fsprogs/files/patch-lib_et_com__err.3 new file mode 100644 index 000000000000..bc3b522f46ea --- /dev/null +++ b/sysutils/e2fsprogs/files/patch-lib_et_com__err.3 @@ -0,0 +1,11 @@ +--- lib/et/com_err.3.orig 2021-08-19 02:53:01 UTC ++++ lib/et/com_err.3 +@@ -18,6 +18,8 @@ proc = reset_com_err_hook (); + void initialize_XXXX_error_table (); + .fi + .SH DESCRIPTION ++This is the manual page for com_err as bundled with the e2fsprogs package. ++.P + .I Com_err + displays an error message on the standard error stream + .I stderr diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist index c6eb8d74c70f..a0e5ddf05f4f 100644 --- a/sysutils/e2fsprogs/pkg-plist +++ b/sysutils/e2fsprogs/pkg-plist @@ -47,7 +47,7 @@ man/man1/e2fsprogs-compile_et.1.gz %%FUSEFS%%man/man1/fuse2fs.1.gz man/man1/lsattr.1.gz man/man1/mk_cmds.1.gz -man/man3/com_err.3.gz +man/man3/e2fsprogs-com_err.3.gz man/man5/e2fsck.conf.5.gz man/man5/mke2fs.conf.5.gz man/man5/ext2.5.gz