From nobody Tue Jan 18 19:03:44 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 1089A195733C; Tue, 18 Jan 2022 19:03:45 +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 4JddTr6w3mz4g4R; Tue, 18 Jan 2022 19:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642532625; 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=4PRxNJJ9R5uVAI7tZEvJmKiM3c4aNl2GJBgc+evjB8k=; b=VOurxh336AiQUqTSp0kXKLUjmNGRQKekNnG8BVoiZNi6qo+esBQltLUdmH6ClEY3Yw4SO2 k5COqk5h9wgh3oTkJdFiXj71YcfUV6rMJhswvSyEuDFinGPgZR52n5UeedemB7zA4Tv82c 3sF/CF6OAKtO8tkQM+Gxj1b24gOTaZSUEWKzfBAyIa2h1FpkmxPC90RMH3gpRpsew+L0jn 5h0gRWpJ7q3XTAbPI/fFtE966O3kIBL6PQMh8B9G6r0Vm2IceAVfp+NMB0yJiJ5pAwOR5S W5gs2eeMHVFP4+oJsW6Yv0fv4tCeYYRhE1uzQ4WxtN3R7zTZTol7hwAWy+XA3A== 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 CD06826A3F; Tue, 18 Jan 2022 19:03:44 +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 20IJ3iMI059416; Tue, 18 Jan 2022 19:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20IJ3iKA059415; Tue, 18 Jan 2022 19:03:44 GMT (envelope-from git) Date: Tue, 18 Jan 2022 19:03:44 GMT Message-Id: <202201181903.20IJ3iKA059415@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: cee87a1eefc8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: cee87a1eefc85598a47f07fed7052b118e2992b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642532625; 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=4PRxNJJ9R5uVAI7tZEvJmKiM3c4aNl2GJBgc+evjB8k=; b=QiM+JMwg+TVM7FjWhzJ++CZ1cyTB6sXSkQ18NVFRngLvNbPQ4XPiQneaux9QgDULb3x8gB xMcXHL8N8kZ+9EH3bxIiR//H2rtoUZaMdpiE5p9Cf4kefNHXuwRbDSzuaDhSc0O6ijeZZ3 y7DJfl5tMIzKGqFlEHmd4dS5sziGKZB/SIpQz5QyMcpr4z+ozgf3L7B8C94RPyrNH+y17P m25+tOCoR5gFqdIYU1KKAtMqz71+Ubza5c16Fnou4Ly96CpCzivyZLLxyF0Tm3KTl5fZDC jb8b1JlnErzVDvEEG6k2+2GfoIFpw2FouDk4BQzd3cFr/PQKweGgMfGblcCDiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642532625; a=rsa-sha256; cv=none; b=BxHBRgmHxN13sw2J4nv0KQB9AK8SCYJedcsd11WfO9+WIWYG3U4H1i+tGwn6Z8qbSxgL6M TrhzqhqMNvXlBb6I2roP7WxmLZO4nBabCjvMj0pBdKXz0uq4qAC8acEIgf4X0LQeluw1Tk hCjlY6IsAlk0FkY1peTJ1uxMB8V67qOa2XUeX5HHn2N7UZGgQk9tysXO+QhRLJJTcDhiTd h/y68JLk0I9hlfr3KFLU+cjrGWmUAj8/Te8FaG06Z+K+p/v6ZjxhhvaZ8jSLodZA6uCeUY UTWnp/UiBFKxmGW8YaTZI20wjkzJvwYtWRXkOfGt8DCqP+DeBwQj6ObhhTBVng== 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=cee87a1eefc85598a47f07fed7052b118e2992b1 commit cee87a1eefc85598a47f07fed7052b118e2992b1 Author: Matthias Andree AuthorDate: 2022-01-18 19:01:55 +0000 Commit: Matthias Andree CommitDate: 2022-01-18 19:03:32 +0000 sysutils/e2fsprogs: resolve krb5 conflict with man3/com_err.3.gz PR: 254751 Reported by: Felix Palmen --- 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 45e9ef9ed007..e73c4b14d5de 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} @@ -355,11 +355,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