From nobody Fri Jan 28 00:11:15 2022 X-Original-To: dev-commits-ports-branches@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 023A41974355; Fri, 28 Jan 2022 00:11:18 +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 4JlHtY10bGz51Ms; Fri, 28 Jan 2022 00:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643328677; 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=pHwZNLyEhbde0FobNkkChseHSBHbGAEsSlitqCV1wjc=; b=ntXf2bUrPmfe0nXBiE/KE6IdiiR9VF1eID0G6N108jXN4ZKP7AZRU73K1NYVncLbkGtTU3 0VHGJLmXQSnSe9CiOnVfDD28Wo5iWpCfYuelkQ4ze5ZPTWMCeYO7QcHlSIi88xZDKTw3oz S4wJFaofzmk4tCxj60b+vTPalL5z1hjYfZNrp3sv61hA2ETCxB5nAo+CUsMDtWxD14rfA4 BecsQY5xqUToZzzQsGks1QIx+seP+c0eHgHS8ym1bYZ6Y6ilH6kKWCvmOqFhVx2IglxMF/ l1Wb110fNUNI0cU3I5JOz0jThUVkORtrIme/fKEN3A3FiAZM0P4UqlWTHrUydw== 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 F223F203C6; Fri, 28 Jan 2022 00:11:15 +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 20S0BFBG027608; Fri, 28 Jan 2022 00:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20S0BFXM027607; Fri, 28 Jan 2022 00:11:15 GMT (envelope-from git) Date: Fri, 28 Jan 2022 00:11:15 GMT Message-Id: <202201280011.20S0BFXM027607@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: 69d35222fd84 - 2022Q1 - devel/e2fsprogs-libss: merge to sysutils/e2fsprogs List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 69d35222fd84c30922c302fb08873d371cea333e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643328677; 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=pHwZNLyEhbde0FobNkkChseHSBHbGAEsSlitqCV1wjc=; b=FbMdTzudL7SnsJ3TX+OzUnPkGkLHkxf5ECZBuZYsqkCN81yahQPN7Q4Or+qW8DhwSjr6tH GAp4XAkWhAKmQYRA78xqSuKt2BCva0eLc0J/BA2buW53GlSGe52MsUqlcHFmrJSADCag7H 8fVM1tHcrkPtEbOXhLaHOztiElbjSLd5M8Kq8lPriEs+j86+rw+s7l+ZGXNmRW47yFKBmh 8fM2dzLnDoyPGW6iiZzyWDQ+VH8ojG/ZFvrZ21F9xCnE7oFH5UXYt0kmnDEPlx4s8ivjFH s/Cqv8bLoDQlwt17ME6SFAmCrproNaLWfiSuCPZeKeU+aUcIpr2o0eMOInK6Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643328677; a=rsa-sha256; cv=none; b=td0tw4bFVYffs/uQLo+0pjiJB1aTPWliH53osXDKEjyzUNPh6QDmQA6WKiPRK0zlBlufyj sxj2SG/JvQi8YReYJMM4jR8bdSL5HLP7Ve9aQ1fFVZ5XMZsHeaGCj9sJ5E+v+Y7HdlvKZi k1IfM5+tLZI0o4zSMhWYzybawCDwRTK2DahhylenTxHl1tJhyuI630OOOVkY2BbbTWaw9V jDqAHvHMdFsp0eP026n86y2lmx74SGaLHeSNM+7zeGhP19cGBCD0ScsVlhKS8uHLL7kQ+i VzoJegSNmUHjCI0AlWkwwd9ZKdx8xXRt5DYkSxghh3lSeLYkLRiJzMs7NHwE7g== 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=69d35222fd84c30922c302fb08873d371cea333e commit 69d35222fd84c30922c302fb08873d371cea333e Author: Matthias Andree AuthorDate: 2022-01-16 12:09:14 +0000 Commit: Matthias Andree CommitDate: 2022-01-27 23:55:46 +0000 devel/e2fsprogs-libss: merge to sysutils/e2fsprogs This is to break dependency cycles between e2fsprogs-libss and e2fsprogs (see 254751 comment #18 for details), and to avoid creating yet another split-out port, then for e2fsprogs's libcom_err. Bump PORTREVISION of the four e2fsprogs consumers to flush out their e2fsprogs-libss dependency records. PR: 254751 Reported by: Felix Palmen PR: 261217 Reported by: tech-lists@zyxst.net Fixes: 8e6ae60 devel/e2fsprogs-libss: use local compile_et... Approved by: prior maintainer timeout (Ben Kaduk, 7 months) on 254751 (cherry picked from commit 29b349b2dba2a188140cb73fe451a9b9793178d4) --- MOVED | 1 + devel/Makefile | 1 - devel/e2fsprogs-libss/Makefile | 33 ---------------------- devel/e2fsprogs-libss/pkg-descr | 5 ---- devel/e2fsprogs-libss/pkg-plist | 11 -------- sysutils/e2fsprogs/Makefile | 7 +++-- .../e2fsprogs}/files/fix-ss_err.h.sed | 0 sysutils/e2fsprogs/files/unwanted | 13 --------- sysutils/e2fsprogs/pkg-plist | 13 +++++++++ sysutils/e2tools/Makefile | 2 +- sysutils/fusefs-ext2/Makefile | 2 +- sysutils/unetbootin/Makefile | 1 + sysutils/vzvol/Makefile | 2 +- 13 files changed, 22 insertions(+), 69 deletions(-) diff --git a/MOVED b/MOVED index 9ba71e670fb0..47c3b8db9d1b 100644 --- a/MOVED +++ b/MOVED @@ -16760,3 +16760,4 @@ astro/google-earth||2022-01-01|Has expired: Needs newer version to connect to se net/tramp||2022-01-01|Has expired: Not updated in 5 years and now part of Emacs archivers/p7zip-codec-rar||2022-01-01|Has expired: Unmaintained for years and has known vulnerabilities emulators/yuzu-qt5|emulators/yuzu|2022-01-20|Merged as QT5 port option +devel/e2fsprogs-libss||2022-01-27|Folded back into sysutils/e2fsprogs, which was the sole user diff --git a/devel/Makefile b/devel/Makefile index d5ac4d4b1745..9dfe2c923d77 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -546,7 +546,6 @@ SUBDIR += dxa65 SUBDIR += dyncall SUBDIR += e00compr - SUBDIR += e2fsprogs-libss SUBDIR += eastl SUBDIR += easyexif SUBDIR += easygit diff --git a/devel/e2fsprogs-libss/Makefile b/devel/e2fsprogs-libss/Makefile deleted file mode 100644 index 12d7d2a268bc..000000000000 --- a/devel/e2fsprogs-libss/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Created by: Ben Kaduk - -PORTREVISION= 1 -CATEGORIES= devel -PKGNAMESUFFIX= -libss - -MAINTAINER= kaduk-fbsd@mit.edu -COMMENT= Command-line interface parsing library from e2fsprogs - -LICENSE= MIT -LICENSE_FILE= ${INSTALL_WRKSRC}/ss.h - -OPTIONS_EXCLUDE= DOCS EXAMPLES IPV6 NLS -CONFIGURE_ARGS= --enable-elf-shlibs -MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -BUILD_WRKSRC= ${WRKSRC}/lib/ss -INSTALL_WRKSRC= ${WRKSRC}/lib/ss -FILESDIR= ${.CURDIR}/files - -PKGDIR= ${.CURDIR} - -pre-build: - (cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et ) - (cd ${WRKSRC}/lib/ss && _ET_DIR_OVERRIDE=../et ../et/compile_et ss_err.et && \ - ${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h) - -do-test: - (cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} all check ) - (cd ${WRKSRC}/lib/ss && ${DO_MAKE_BUILD} check ) - -.include "${MASTERDIR}/Makefile" diff --git a/devel/e2fsprogs-libss/pkg-descr b/devel/e2fsprogs-libss/pkg-descr deleted file mode 100644 index 0fa61ec926da..000000000000 --- a/devel/e2fsprogs-libss/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This package includes a tool that parses a command table to generate a -simple command-line interface parser, the include files needed to compile -and use it, and the libraries needed to run programs that use it. - -It was originally inspired by the Multics SubSystem library. diff --git a/devel/e2fsprogs-libss/pkg-plist b/devel/e2fsprogs-libss/pkg-plist deleted file mode 100644 index 751d29c5b0e4..000000000000 --- a/devel/e2fsprogs-libss/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/mk_cmds -include/ss/ss.h -include/ss/ss_err.h -lib/libss.so.2.0 -lib/libss.so -lib/libss.a -lib/libss.so.2 -libdata/pkgconfig/ss.pc -man/man1/mk_cmds.1.gz -share/ss/ct_c.awk -share/ss/ct_c.sed diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 65d21a34dc78..96e58249a265 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -14,7 +14,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.46.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -85,7 +85,6 @@ BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash BASH_CMD= ${LOCALBASE}/bin/bash LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid -LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind @@ -229,6 +228,8 @@ BROKEN= it was not tested on your system by the maintainer; you must run self-te pre-build: # fix up Makefile ordering for parallel builds cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et + cd ${WRKSRC}/lib/ss && _ET_DIR_OVERRIDE=../et ../et/compile_et ss_err.et \ + && ${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h cd ${WRKSRC}/lib/support && ${DO_MAKE_BUILD} prof_err.h .if ${PORT_OPTIONS:MPARALLELTESTS} @@ -350,7 +351,7 @@ post-install: # remove or relocate files installed by other ports already, or shadowing system files: cd ${STAGEDIR}${PREFIX} && \ ${XARGS} <${FILESDIR}/unwanted ${RM} && \ - ${RMDIR} include/e2fsprogs/blkid include/e2fsprogs/ss share/ss + ${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 ${MKDIR} ${STAGEDIR}${DATADIR}/et/ diff --git a/devel/e2fsprogs-libss/files/fix-ss_err.h.sed b/sysutils/e2fsprogs/files/fix-ss_err.h.sed similarity index 100% rename from devel/e2fsprogs-libss/files/fix-ss_err.h.sed rename to sysutils/e2fsprogs/files/fix-ss_err.h.sed diff --git a/sysutils/e2fsprogs/files/unwanted b/sysutils/e2fsprogs/files/unwanted index a49d88186c6c..693deb364915 100644 --- a/sysutils/e2fsprogs/files/unwanted +++ b/sysutils/e2fsprogs/files/unwanted @@ -1,21 +1,8 @@ -bin/mk_cmds include/e2fsprogs/blkid/blkid.h include/e2fsprogs/blkid/blkid_types.h -include/e2fsprogs/ss/ss.h -include/e2fsprogs/ss/ss_err.h lib/e2fsprogs/libblkid.a lib/e2fsprogs/libblkid.so lib/e2fsprogs/libblkid.so.1 lib/e2fsprogs/libblkid.so.1.0 -lib/e2fsprogs/libcom_err.a -lib/e2fsprogs/libss.a -lib/e2fsprogs/libss.so -lib/e2fsprogs/libss.so.2 -lib/e2fsprogs/libss.so.2.0 libdata/pkgconfig/blkid.pc -libdata/pkgconfig/ss.pc -man/man1/mk_cmds.1 -man/man3/com_err.3 man/man3/libblkid.3 -share/ss/ct_c.awk -share/ss/ct_c.sed diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist index 83a2baf4e486..c6eb8d74c70f 100644 --- a/sysutils/e2fsprogs/pkg-plist +++ b/sysutils/e2fsprogs/pkg-plist @@ -4,6 +4,7 @@ bin/chattr bin/e2fsprogs-compile_et %%FUSEFS%%bin/fuse2fs bin/lsattr +bin/mk_cmds etc/mke2fs.conf.dist include/e2fsprogs/com_err.h include/e2fsprogs/e2p/e2p.h @@ -19,6 +20,9 @@ include/e2fsprogs/ext2fs/ext3_extents.h include/e2fsprogs/ext2fs/hashmap.h include/e2fsprogs/ext2fs/qcow2.h include/e2fsprogs/ext2fs/tdb.h +include/e2fsprogs/ss/ss.h +include/e2fsprogs/ss/ss_err.h +lib/e2fsprogs/libcom_err.a lib/e2fsprogs/libcom_err.so lib/e2fsprogs/libcom_err.so.2 lib/e2fsprogs/libcom_err.so.2.1 @@ -30,13 +34,20 @@ lib/e2fsprogs/libext2fs.a lib/e2fsprogs/libext2fs.so lib/e2fsprogs/libext2fs.so.2 lib/e2fsprogs/libext2fs.so.2.4 +lib/e2fsprogs/libss.so.2.0 +lib/e2fsprogs/libss.so +lib/e2fsprogs/libss.a +lib/e2fsprogs/libss.so.2 libdata/pkgconfig/com_err.pc libdata/pkgconfig/e2p.pc libdata/pkgconfig/ext2fs.pc +libdata/pkgconfig/ss.pc man/man1/chattr.1.gz 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/man5/e2fsck.conf.5.gz man/man5/mke2fs.conf.5.gz man/man5/ext2.5.gz @@ -112,3 +123,5 @@ sbin/tune2fs %%NLS%%share/locale/uk/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo +share/ss/ct_c.awk +share/ss/ct_c.sed diff --git a/sysutils/e2tools/Makefile b/sysutils/e2tools/Makefile index 9e65cc69089b..7325bb027790 100644 --- a/sysutils/e2tools/Makefile +++ b/sysutils/e2tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= e2tools DISTVERSION= 0.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/sysutils/fusefs-ext2/Makefile b/sysutils/fusefs-ext2/Makefile index 407ad78e8ef6..124b7c470366 100644 --- a/sysutils/fusefs-ext2/Makefile +++ b/sysutils/fusefs-ext2/Makefile @@ -3,7 +3,7 @@ PORTNAME= fusefs-ext2 PORTVERSION= 0.0.10 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= ehaupt@FreeBSD.org diff --git a/sysutils/unetbootin/Makefile b/sysutils/unetbootin/Makefile index 9515de782991..70bb2cce05f5 100644 --- a/sysutils/unetbootin/Makefile +++ b/sysutils/unetbootin/Makefile @@ -2,6 +2,7 @@ PORTNAME= unetbootin PORTVERSION= 702 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-source-${PORTVERSION} diff --git a/sysutils/vzvol/Makefile b/sysutils/vzvol/Makefile index ef5f2cf1abd2..6db2a19904b3 100644 --- a/sysutils/vzvol/Makefile +++ b/sysutils/vzvol/Makefile @@ -1,7 +1,7 @@ PORTNAME= vzvol DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= rainbow@sanitylinux.org