From nobody Thu May 26 08:47:18 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 D49351B44DD8; Thu, 26 May 2022 08:47: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 4L81lV5Rjqz4kwM; Thu, 26 May 2022 08:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653554838; 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=sB+nts3BW/l+hO15+IUtNBu+Kub01YYhZlPN4fgrbv0=; b=CdLDD2dEPT48ScBkYudwo+S2heoQdsdkU5c9GsZv+C02eYnu4sIX5QOHbb7c6ab/SYecSO T4QPx0Jie6iu3oJQ//LFVZBeRMQBewuHEa6d3Dd37YKcwk6B5lbQhn5b1vhWMPUN6mfxwz 25i9eRDv3nKmXKIOCYpxQBOV5cVh5mPgbJKzq1ZaHGM6pXQHa4X5jAch3ZJXjpki6IXaa6 WU7m9SGsPbN28NviDup/P7WrjtUOsAfMjgObcVZb9xdyefyi6+DzzOZa3JcGPaBbOpvqDA JNPZRZqWSW4inpd9MWFE91HicF/VEg3AKUdRyr2hwcAUrjwGSBanLoTwas6Hmw== 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 974B62C06; Thu, 26 May 2022 08:47:18 +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 24Q8lIed035337; Thu, 26 May 2022 08:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24Q8lIan035336; Thu, 26 May 2022 08:47:18 GMT (envelope-from git) Date: Thu, 26 May 2022 08:47:18 GMT Message-Id: <202205260847.24Q8lIan035336@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 2633fefb6d4a - main - sysutils/fusefs-ntfs: add CRYPTO and EXTRAS options to the port 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2633fefb6d4aa613e8b8c14fc3cedcc55c0d95bf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653554838; 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=sB+nts3BW/l+hO15+IUtNBu+Kub01YYhZlPN4fgrbv0=; b=Naf5HJlLpME4e1ZFMGtzsb5hZoCEnxt9tNSYAH2SKPywC3jNWyGRVJifZpEiEv9EnAUbTo fGQRiOeoi5jQfO/31/XyaVpAkpgtxwsn2iGkR6MLisDjCZO8ou7xhPQ3n+DMr8D4N09BRr 2Qn2PUNrnaQmcRSgWRNg7eczJIuXA5aV+VVwwHjujdbWp1yCjU7npasVc1gprwDy5xSFCJ fnG9mExRPY/PDJh38zaKR2mppDL0LDa8YdoD9EZRHG9xtO33t+cCh4DFUdM7CMPl6Qjm/u WZnZKQ3sHtRyYkSsctN5MY0HxzCgzqzCu7/prd4RZ9lFmvIZwqaXARugKLQw+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653554838; a=rsa-sha256; cv=none; b=QDHOojOg6LuRrKhKnANeP2wvhZJMH03/hi7UrgzV94YJGRCEsaZRoVQP4GiA6N4JF4lJX+ fKbnwZuTxmjrAnotOgYQaN46mhm1Goy9p6TH+yWJbUvIJPPBKddpg3ZbZjaRmaoSPMzZu5 HvsJCx8IAwL8d7uRPe63kFNWX1TpXSW6VQKjxGop2uJG3ChBE3+7ImmNxKgvl6FVFgNmY+ X/l6GovFTjkzJoAEX4Uuy6eQMSnG5q489UY+AxWELwJ1TY5kCyqZsM77raW5Fo0TitSFBG UwEEpGsVxjIWc3fQtH1jvlL+mBOVjO3SjBNY4Cx1FZnnbZTgJaKMe0zuVRBF8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=2633fefb6d4aa613e8b8c14fc3cedcc55c0d95bf commit 2633fefb6d4aa613e8b8c14fc3cedcc55c0d95bf Author: Alexey Dokuchaev AuthorDate: 2022-05-26 08:46:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-05-26 08:46:44 +0000 sysutils/fusefs-ntfs: add CRYPTO and EXTRAS options to the port This gives users more flexibility and alleviates the need of ad hoc patching of `ntfsprogs/Makefile.in'. Enable extra programs by default as they pull no additional dependencies while making up for a more featureful package. --- sysutils/fusefs-ntfs/Makefile | 16 ++++++++++++-- .../fusefs-ntfs/files/patch-ntfsprogs__Makefile.in | 25 ---------------------- sysutils/fusefs-ntfs/pkg-plist | 8 +++++-- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index d029b406c992..8c38543297b7 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -22,10 +22,22 @@ CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \ --disable-mtab --with-fuse=external --disable-ldconfig INSTALL_TARGET= install-strip -OPTIONS_DEFINE= LOCK UBLIO DOCS -OPTIONS_DEFAULT=LOCK UBLIO +OPTIONS_DEFINE= CRYPTO DOCS EXTRAS LOCK UBLIO +OPTIONS_DEFAULT=EXTRAS LOCK UBLIO +OPTIONS_SUB= yes + +CRYPTO_DESC= Enable crypto-related code and utilities +CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgnutls.so:security/gnutls \ + libgpg-error.so:security/libgpg-error +CRYPTO_CONFIGURE_ON= --enable-crypto + +EXTRAS_DESC= Build and install extra NTFS utilities +EXTRAS_CONFIGURE_ON= --enable-extras + LOCK_DESC= Lock the device when mounting (avoids access) LOCK_CFLAGS= -DUSE_LOCK + UBLIO_DESC= Enable user space cache for improved speed UBLIO_EXTRA_PATCHES= ${FILESDIR}/extra-patch-ublio UBLIO_LIB_DEPENDS= libublio.so:devel/libublio diff --git a/sysutils/fusefs-ntfs/files/patch-ntfsprogs__Makefile.in b/sysutils/fusefs-ntfs/files/patch-ntfsprogs__Makefile.in deleted file mode 100644 index 88a6d8fb2f74..000000000000 --- a/sysutils/fusefs-ntfs/files/patch-ntfsprogs__Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ ---- ntfsprogs/Makefile.in.orig 2017-03-23 09:43:00 UTC -+++ ntfsprogs/Makefile.in -@@ -87,7 +87,9 @@ target_triplet = @target@ - @ENABLE_NTFSPROGS_TRUE@sbin_PROGRAMS = mkntfs$(EXEEXT) \ - @ENABLE_NTFSPROGS_TRUE@ ntfslabel$(EXEEXT) \ - @ENABLE_NTFSPROGS_TRUE@ ntfsundelete$(EXEEXT) \ -+@ENABLE_NTFSPROGS_TRUE@ ntfsusermap$(EXEEXT) \ - @ENABLE_NTFSPROGS_TRUE@ ntfsresize$(EXEEXT) ntfsclone$(EXEEXT) \ -+@ENABLE_NTFSPROGS_TRUE@ ntfsrecover$(EXEEXT) \ - @ENABLE_NTFSPROGS_TRUE@ ntfscp$(EXEEXT) - @ENABLE_CRYPTO_TRUE@@ENABLE_NTFSPROGS_TRUE@am__append_1 = ntfsdecrypt - @ENABLE_EXTRAS_TRUE@@ENABLE_NTFSPROGS_TRUE@am__append_2 = $(EXTRA_PROGRAM_NAMES) -@@ -1424,12 +1426,8 @@ uninstall-man: uninstall-man8 - # mkfs.ntfs[.8] hard link - - @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@install-exec-hook: --@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d $(DESTDIR)/sbin --@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@ $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs - - @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@install-data-hook: --@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d $(DESTDIR)$(man8dir) --@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@ $(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8 - - @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@uninstall-local: - @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@ $(RM) -f $(DESTDIR)/sbin/mkfs.ntfs diff --git a/sysutils/fusefs-ntfs/pkg-plist b/sysutils/fusefs-ntfs/pkg-plist index a7971bf9953e..426ae30d2910 100644 --- a/sysutils/fusefs-ntfs/pkg-plist +++ b/sysutils/fusefs-ntfs/pkg-plist @@ -4,9 +4,15 @@ bin/ntfs-3g.probe bin/ntfscat bin/ntfscluster bin/ntfscmp +%%CRYPTO%%bin/ntfsdecrypt bin/ntfsfix bin/ntfsinfo bin/ntfsls +%%EXTRAS%%bin/ntfsrecover +%%EXTRAS%%bin/ntfssecaudit +%%EXTRAS%%bin/ntfstruncate +%%EXTRAS%%bin/ntfsusermap +%%EXTRAS%%bin/ntfswipe include/ntfs-3g/acls.h include/ntfs-3g/attrib.h include/ntfs-3g/attrlist.h @@ -77,10 +83,8 @@ sbin/mkntfs sbin/ntfsclone sbin/ntfscp sbin/ntfslabel -sbin/ntfsrecover sbin/ntfsresize sbin/ntfsundelete -sbin/ntfsusermap %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD @dir lib/ntfs-3g