Update to 15.14.0.

Changelog:
https://github.com/chef/chef/blob/master/CHANGELOG.md

5 files changed, 36 insertions, 79 deletions

diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index b201b8805ea7..ecd554688661 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chef
-PORTVERSION=	13.8.3
-PORTREVISION=	2
+PORTVERSION=	15.14.0
 CATEGORIES=	sysutils
 MASTER_SITES=	RG
 
@@ -14,33 +13,35 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable \
+		rubygem-bcrypt_pbkdf>=1.0.1<2:security/rubygem-bcrypt_pbkdf \
 		rubygem-bundler>=1.10:sysutils/rubygem-bundler \
-		rubygem-chef-config>=${PORTVERSION}:sysutils/rubygem-chef-config \
-		rubygem-chef-zero>=13.0:sysutils/rubygem-chef-zero \
+		rubygem-chef-config>=${PORTVERSION}<${PORTVERSION}_99:sysutils/rubygem-chef-config \
+		rubygem-chef-utils>=${PORTVERSION}<${PORTVERSION}_99:sysutils/rubygem-chef-utils \
+		rubygem-chef-zero>=14.0.11:sysutils/rubygem-chef-zero \
 		rubygem-diff-lcs>=1.2.4<2:textproc/rubygem-diff-lcs \
+		rubygem-ed25519>=1.2<2:security/rubygem-ed25519 \
 		rubygem-erubis>=2.7<3:www/rubygem-erubis \
+		rubygem-ffi>=1.9.25:devel/rubygem-ffi \
+		rubygem-ffi-libarchive>=1.0.3<2:devel/rubygem-ffi-libarchive \
 		rubygem-ffi-yajl>=2.2<3:devel/rubygem-ffi-yajl \
 		rubygem-highline1>=1.6.9<2:devel/rubygem-highline1 \
 		rubygem-iniparse>=1.4<2:devel/rubygem-iniparse \
-		rubygem-iso8601>=0.9.1<1:devel/rubygem-iso8601 \
-		rubygem-mixlib-archive>=0.4<1:devel/rubygem-mixlib-archive \
-		rubygem-mixlib-authentication>=1.4<2:devel/rubygem-mixlib-authentication \
-		rubygem-mixlib-cli>=1.7<2:devel/rubygem-mixlib-cli \
-		rubygem-mixlib-log>=1.3<2:devel/rubygem-mixlib-log \
-		rubygem-mixlib-shellout>=2.0<3:devel/rubygem-mixlib-shellout \
-		rubygem-net-sftp>=2.1.2<3:security/rubygem-net-sftp \
-		rubygem-net-ssh4>=2.9,2<5.0,2:security/rubygem-net-ssh4 \
+		rubygem-license-acceptance>=1.0.5:sysutils/rubygem-license-acceptance \
+		rubygem-mixlib-archive>=0.4<2:devel/rubygem-mixlib-archive \
+		rubygem-mixlib-authentication>=2.1<4:devel/rubygem-mixlib-authentication \
+		rubygem-mixlib-cli>=2.1.1<3:devel/rubygem-mixlib-cli \
+		rubygem-mixlib-log>=2.0.3<4:devel/rubygem-mixlib-log \
+		rubygem-mixlib-shellout>=3.0.3<4:devel/rubygem-mixlib-shellout \
+		rubygem-net-sftp>=2.1.2<4:security/rubygem-net-sftp \
+		rubygem-net-ssh>=4.2,2<7,2:security/rubygem-net-ssh \
 		rubygem-net-ssh-multi>=1.2.1<2:security/rubygem-net-ssh-multi \
-		rubygem-ohai>=13.0<14:sysutils/rubygem-ohai \
+		rubygem-ohai>=15.0<16:sysutils/rubygem-ohai \
 		rubygem-plist>=3.2<4:devel/rubygem-plist \
 		rubygem-proxifier>=1.0<2:net/rubygem-proxifier \
-		rubygem-rspec-core>=3.5<4:devel/rubygem-rspec-core \
-		rubygem-rspec-expectations>=3.5<4:devel/rubygem-rspec-expectations \
-		rubygem-rspec_junit_formatter>=0.2<1:devel/rubygem-rspec_junit_formatter \
-		rubygem-rspec-mocks>=3.5<4:devel/rubygem-rspec-mocks \
-		rubygem-serverspec>=2.7<3:sysutils/rubygem-serverspec \
-		rubygem-specinfra>=2.10<3:sysutils/rubygem-specinfra \
 		rubygem-syslog-logger>=1.6<2:sysutils/rubygem-syslog-logger \
+		rubygem-train-core>=3.2.28<4:net/rubygem-train-core \
+		rubygem-train-winrm>=0.2.5:net/rubygem-train-winrm \
+		rubygem-tty-screen>=0.6<1:devel/rubygem-tty-screen \
 		rubygem-uuidtools>=2.1.5<2.2:devel/rubygem-uuidtools
 
 USES=		gem shebangfix
@@ -59,8 +60,8 @@ post-patch:
 	@${REINPLACE_CMD} -e '1d' ${WRKSRC}/spec/data/apt/chef-integration-test*/debian/rules
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/distro/common/man/man1/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/distro/common/man/man8/*.8 ${STAGEDIR}${MANPREFIX}/man/man8/
+#	${INSTALL_MAN} ${WRKSRC}/distro/common/man/man1/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+#	${INSTALL_MAN} ${WRKSRC}/distro/common/man/man8/*.8 ${STAGEDIR}${MANPREFIX}/man/man8/
 	${MKDIR} ${STAGEDIR}/var/chef
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-chef/distinfo b/sysutils/rubygem-chef/distinfo
index 8908f4fa7aaf..ca27ec00524b 100644
--- a/sysutils/rubygem-chef/distinfo
+++ b/sysutils/rubygem-chef/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520527388
-SHA256 (rubygem/chef-13.8.3.gem) = bd77347c9bf2d27dfdd867af66469799d20ac688bb1671251ccfe37bf0c4151c
-SIZE (rubygem/chef-13.8.3.gem) = 1979904
+TIMESTAMP = 1608420003
+SHA256 (rubygem/chef-15.14.0.gem) = 0e256b75bac2dddb5b1f68df5bfbefd7ba6c6b69d9f76df491feb3a37dd39c10
+SIZE (rubygem/chef-15.14.0.gem) = 1807360
diff --git a/sysutils/rubygem-chef/files/patch-chef.gemspec b/sysutils/rubygem-chef/files/patch-chef.gemspec
new file mode 100644
index 000000000000..ebcca66080e4
--- /dev/null
+++ b/sysutils/rubygem-chef/files/patch-chef.gemspec
@@ -0,0 +1,11 @@
+--- chef.gemspec.orig	2020-12-19 23:33:16 UTC
++++ chef.gemspec
+@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<chef-utils>.freeze, ["= 15.14.0"])
+       s.add_runtime_dependency(%q<train-core>.freeze, ["~> 3.2", ">= 3.2.28"])
+       s.add_runtime_dependency(%q<train-winrm>.freeze, [">= 0.2.5"])
+-      s.add_runtime_dependency(%q<license-acceptance>.freeze, ["~> 1.0", ">= 1.0.5"])
++      s.add_runtime_dependency(%q<license-acceptance>.freeze, ["~> 2.0", ">= 1.0.5"])
+       s.add_runtime_dependency(%q<mixlib-cli>.freeze, [">= 2.1.1", "< 3.0"])
+       s.add_runtime_dependency(%q<mixlib-log>.freeze, [">= 2.0.3", "< 4.0"])
+       s.add_runtime_dependency(%q<mixlib-authentication>.freeze, [">= 2.1", "< 4"])
diff --git a/sysutils/rubygem-chef/files/patch-gemspec b/sysutils/rubygem-chef/files/patch-gemspec
deleted file mode 100644
index 423111ac8dec..000000000000
--- a/sysutils/rubygem-chef/files/patch-gemspec
+++ /dev/null
@@ -1,16 +0,0 @@
---- chef.gemspec.orig	2017-12-09 23:16:54 UTC
-+++ chef.gemspec
-@@ -42,11 +42,11 @@ Gem::Specification.new do |s|
-       s.add_runtime_dependency(%q<plist>.freeze, ["~> 3.2"])
-       s.add_runtime_dependency(%q<iniparse>.freeze, ["~> 1.4"])
-       s.add_runtime_dependency(%q<addressable>.freeze, [">= 0"])
--      s.add_runtime_dependency(%q<iso8601>.freeze, ["~> 0.9.1"])
-+      s.add_runtime_dependency(%q<iso8601>.freeze, ["~> 0.9", ">= 0.9.1"])
-       s.add_runtime_dependency(%q<rspec-core>.freeze, ["~> 3.5"])
-       s.add_runtime_dependency(%q<rspec-expectations>.freeze, ["~> 3.5"])
-       s.add_runtime_dependency(%q<rspec-mocks>.freeze, ["~> 3.5"])
--      s.add_runtime_dependency(%q<rspec_junit_formatter>.freeze, ["~> 0.2.0"])
-+      s.add_runtime_dependency(%q<rspec_junit_formatter>.freeze, ["~> 0.2"])
-       s.add_runtime_dependency(%q<serverspec>.freeze, ["~> 2.7"])
-       s.add_runtime_dependency(%q<specinfra>.freeze, ["~> 2.10"])
-       s.add_runtime_dependency(%q<syslog-logger>.freeze, ["~> 1.6"])
diff --git a/sysutils/rubygem-chef/pkg-plist b/sysutils/rubygem-chef/pkg-plist
index d7624d0d425f..1740eb7010c4 100644
--- a/sysutils/rubygem-chef/pkg-plist
+++ b/sysutils/rubygem-chef/pkg-plist
@@ -1,41 +1,2 @@
-bin/chef-apply
-bin/chef-client
-bin/chef-shell
-bin/chef-solo
 bin/knife
-man/man1/chef-shell.1.gz
-man/man1/knife-bootstrap.1.gz
-man/man1/knife-client.1.gz
-man/man1/knife-configure.1.gz
-man/man1/knife-cookbook-site.1.gz
-man/man1/knife-cookbook.1.gz
-man/man1/knife-data-bag.1.gz
-man/man1/knife-delete.1.gz
-man/man1/knife-deps.1.gz
-man/man1/knife-diff.1.gz
-man/man1/knife-download.1.gz
-man/man1/knife-edit.1.gz
-man/man1/knife-environment.1.gz
-man/man1/knife-exec.1.gz
-man/man1/knife-index-rebuild.1.gz
-man/man1/knife-list.1.gz
-man/man1/knife-node.1.gz
-man/man1/knife-raw.1.gz
-man/man1/knife-recipe-list.1.gz
-man/man1/knife-role.1.gz
-man/man1/knife-search.1.gz
-man/man1/knife-serve.1.gz
-man/man1/knife-show.1.gz
-man/man1/knife-ssh.1.gz
-man/man1/knife-ssl-check.1.gz
-man/man1/knife-ssl-fetch.1.gz
-man/man1/knife-status.1.gz
-man/man1/knife-tag.1.gz
-man/man1/knife-upload.1.gz
-man/man1/knife-user.1.gz
-man/man1/knife-xargs.1.gz
-man/man1/knife.1.gz
-man/man8/chef-apply.8.gz
-man/man8/chef-client.8.gz
-man/man8/chef-solo.8.gz
 @dir /var/chef