net/foreman-proxy: update to 1.10.0

8 files changed, 72 insertions, 46 deletions

diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index b7e4f2eaf6e3..7a8e6fdaf448 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	foreman-proxy
-PORTVERSION=	1.9.1
+PORTVERSION=	1.10.0
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.theforeman.org/foreman-proxy/
 
@@ -59,7 +59,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/config/settings.d/*.yml.example \
-		${WRKSRC}/lib/proxy/http_downloads.rb
+		${WRKSRC}/lib/proxy/http_download.rb
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d
@@ -79,7 +79,8 @@ do-install:
 	${CP} -r ${WRKSRC}/extra/migrations ${STAGEDIR}${DATADIR}/extra
 	${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
-.for cfg in bmc dhcp dns facts puppet puppetca realm templates tftp
+.for cfg in bmc dhcp dns dns_dnscmd dns_nsupdate_gss dns_nsupdate dns_virsh \
+	facts puppet puppetca realm templates tftp
 	${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample
 .endfor
diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo
index 49b462216db3..4cf9f79be361 100644
--- a/net/foreman-proxy/distinfo
+++ b/net/foreman-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (foreman-proxy-1.9.1.tar.bz2) = b398bc87f77c98f25cf4c565d7e91b466538e17aff2fbe685181e25cd65081f0
-SIZE (foreman-proxy-1.9.1.tar.bz2) = 109252
+SHA256 (foreman-proxy-1.10.0.tar.bz2) = 73fbfd058249cd59103fcad7335ff8e0323b577ba92d945d01b3d8327a2819a0
+SIZE (foreman-proxy-1.10.0.tar.bz2) = 116535
diff --git a/net/foreman-proxy/files/patch-config-settings.d-dns.yml.example b/net/foreman-proxy/files/patch-config-settings.d-dns.yml.example
deleted file mode 100644
index 3a8d0f8ae6eb..000000000000
--- a/net/foreman-proxy/files/patch-config-settings.d-dns.yml.example
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/settings.d/dns.yml.example.orig	2014-09-27 09:03:53.820489863 +0200
-+++ config/settings.d/dns.yml.example	2014-09-27 09:06:50.266460447 +0200
-@@ -6,12 +6,12 @@
- #   virsh
- #   dnscmd
- #:dns_provider: nsupdate
--#:dns_key: /etc/rndc.key
-+#:dns_key: %%LOCALBASE%%/etc/namedb/rndc.key
- # use this setting if you are managing a dns server which is not localhost though this proxy
- #:dns_server: dns.domain.com
- # use this setting if you want to override default TTL setting (86400)
- #:dns_ttl: 86400
- # use dns_tsig_* for GSS-TSIG updates using Kerberos.  Required for Windows MS DNS with
- # Secure Dynamic Updates, or BIND as used in FreeIPA.  Set dns_provider to nsupdate_gss.
--#:dns_tsig_keytab: /usr/share/foreman-proxy/dns.keytab
-+#:dns_tsig_keytab: %%PREFIX%%/share/foreman-proxy/dns.keytab
- #:dns_tsig_principal: DNS/host.example.com@EXAMPLE.COM
diff --git a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example b/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example
new file mode 100644
index 000000000000..323fcf701edf
--- /dev/null
+++ b/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example
@@ -0,0 +1,10 @@
+--- config/settings.d/dns_nsupdate.yml.example.orig	2015-12-24 23:16:48 UTC
++++ config/settings.d/dns_nsupdate.yml.example
+@@ -3,6 +3,6 @@
+ # Configuration file for 'nsupdate' dns provider
+ #
+ 
+-#:dns_key: /etc/rndc.key
++#:dns_key: %%LOCALBASE%%/etc/namedb/rndc.key
+ # use this setting if you are managing a dns server which is not localhost though this proxy
+ #:dns_server: dns.domain.com
diff --git a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example b/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example
new file mode 100644
index 000000000000..917b5a9714c7
--- /dev/null
+++ b/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example
@@ -0,0 +1,9 @@
+--- config/settings.d/dns_nsupdate_gss.yml.example.orig	2015-12-24 23:18:07 UTC
++++ config/settings.d/dns_nsupdate_gss.yml.example
+@@ -7,5 +7,5 @@
+ #:dns_server: dns.domain.com
+ # use dns_tsig_* for GSS-TSIG updates using Kerberos.  Required for Windows MS DNS with
+ # Secure Dynamic Updates, or BIND as used in FreeIPA.  Set dns_provider to nsupdate_gss.
+-#:dns_tsig_keytab: /usr/share/foreman-proxy/dns.keytab
++#:dns_tsig_keytab: %%PREFIX%%/share/foreman-proxy/dns.keytab
+ #:dns_tsig_principal: DNS/host.example.com@EXAMPLE.COM
diff --git a/net/foreman-proxy/files/patch-lib-proxy-http_downloads.rb b/net/foreman-proxy/files/patch-lib-proxy-http_downloads.rb
deleted file mode 100644
index 9a0d20518111..000000000000
--- a/net/foreman-proxy/files/patch-lib-proxy-http_downloads.rb
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/proxy/http_downloads.rb.orig	2014-09-27 09:21:12.321398953 +0200
-+++ lib/proxy/http_downloads.rb	2014-09-27 09:21:39.710436545 +0200
-@@ -31,8 +31,8 @@
-     end
- 
-     def command(src, dst)
--      wget = which("wget")
-+      wget = "%%LOCALBASE%%/bin/wget"
-       "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c \"#{escape_for_shell(src.to_s)}\" -O \"#{escape_for_shell(dst.to_s)}\""
-     end
-   end
--end
-\ No newline at end of file
-+end
diff --git a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
new file mode 100644
index 000000000000..75553d989f69
--- /dev/null
+++ b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
@@ -0,0 +1,11 @@
+--- lib/proxy/http_download.rb.orig	2015-12-24 23:13:02 UTC
++++ lib/proxy/http_download.rb
+@@ -6,7 +6,7 @@ module Proxy
+ 
+     def initialize(src, dst)
+       @dst = dst
+-      wget = which("wget")
++      wget = "%%LOCALBASE%%/bin/wget"
+       super("#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c \"#{escape_for_shell(src.to_s)}\" -O \"#{escape_for_shell(dst.to_s)}\"")
+     end
+ 
diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
index c60673f3a75f..dbcd0bafaaa9 100644
--- a/net/foreman-proxy/pkg-plist
+++ b/net/foreman-proxy/pkg-plist
@@ -1,6 +1,10 @@
 @sample %%ETCDIR%%/settings.d/bmc.yml.sample
 @sample %%ETCDIR%%/settings.d/dhcp.yml.sample
 @sample %%ETCDIR%%/settings.d/dns.yml.sample
+@sample %%ETCDIR%%/settings.d/dns_dnscmd.yml.sample
+@sample %%ETCDIR%%/settings.d/dns_nsupdate.yml.sample
+@sample %%ETCDIR%%/settings.d/dns_nsupdate_gss.yml.sample
+@sample %%ETCDIR%%/settings.d/dns_virsh.yml.sample
 @sample %%ETCDIR%%/settings.d/facts.yml.sample
 @sample %%ETCDIR%%/settings.d/puppet.yml.sample
 @sample %%ETCDIR%%/settings.d/puppetca.yml.sample
@@ -26,19 +30,27 @@ sbin/smart-proxy
 %%DATADIR%%/config.ru
 %%DATADIR%%/extra/migrate_settings.rb
 %%DATADIR%%/extra/migrations/20150327000000_migrate_monolithic_config.rb
+%%DATADIR%%/extra/migrations/20150611000000_migrate_dns_settings.rb
 %%DATADIR%%/extra/query.rb
 %%DATADIR%%/lib/bundler_helper.rb
 %%DATADIR%%/lib/checks.rb
 %%DATADIR%%/lib/daemon.rb
+%%DATADIR%%/lib/launcher.rb
 %%DATADIR%%/lib/poodles-fix.rb
 %%DATADIR%%/lib/proxy.rb
+%%DATADIR%%/lib/proxy/dependency_injection.rb
 %%DATADIR%%/lib/proxy/error.rb
 %%DATADIR%%/lib/proxy/file_lock.rb
 %%DATADIR%%/lib/proxy/helpers.rb
-%%DATADIR%%/lib/proxy/http_downloads.rb
+%%DATADIR%%/lib/proxy/http_download.rb
 %%DATADIR%%/lib/proxy/kerberos.rb
 %%DATADIR%%/lib/proxy/log.rb
+%%DATADIR%%/lib/proxy/memory_store.rb
+%%DATADIR%%/lib/proxy/pluggable.rb
 %%DATADIR%%/lib/proxy/plugin.rb
+%%DATADIR%%/lib/proxy/plugin_validators.rb
+%%DATADIR%%/lib/proxy/provider.rb
+%%DATADIR%%/lib/proxy/provider_factory.rb
 %%DATADIR%%/lib/proxy/request.rb
 %%DATADIR%%/lib/proxy/settings.rb
 %%DATADIR%%/lib/proxy/settings/global.rb
@@ -65,22 +77,31 @@ sbin/smart-proxy
 %%DATADIR%%/modules/dhcp/monkey_patch_subnet.rb
 %%DATADIR%%/modules/dhcp/monkey_patches.rb
 %%DATADIR%%/modules/dhcp/providers/server/isc.rb
-%%DATADIR%%/modules/dhcp/providers/server/ms.rb
 %%DATADIR%%/modules/dhcp/providers/server/native_ms.rb
 %%DATADIR%%/modules/dhcp/providers/server/virsh.rb
 %%DATADIR%%/modules/dhcp/record.rb
+%%DATADIR%%/modules/dhcp/record/deleted_reservation.rb
 %%DATADIR%%/modules/dhcp/record/lease.rb
 %%DATADIR%%/modules/dhcp/record/reservation.rb
 %%DATADIR%%/modules/dhcp/server.rb
 %%DATADIR%%/modules/dhcp/subnet.rb
+%%DATADIR%%/modules/dhcp/subnet_service.rb
 %%DATADIR%%/modules/dns/dns.rb
 %%DATADIR%%/modules/dns/dns_api.rb
 %%DATADIR%%/modules/dns/dns_plugin.rb
 %%DATADIR%%/modules/dns/http_config.ru
-%%DATADIR%%/modules/dns/providers/dnscmd.rb
-%%DATADIR%%/modules/dns/providers/nsupdate.rb
-%%DATADIR%%/modules/dns/providers/nsupdate_gss.rb
-%%DATADIR%%/modules/dns/providers/virsh.rb
+%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd.rb
+%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd_main.rb
+%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd_plugin.rb
+%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate.rb
+%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss.rb
+%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss_main.rb
+%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss_plugin.rb
+%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_main.rb
+%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_plugin.rb
+%%DATADIR%%/modules/dns_virsh/dns_virsh.rb
+%%DATADIR%%/modules/dns_virsh/dns_virsh_main.rb
+%%DATADIR%%/modules/dns_virsh/dns_virsh_plugin.rb
 %%DATADIR%%/modules/facts/facts.rb
 %%DATADIR%%/modules/facts/facts_api.rb
 %%DATADIR%%/modules/facts/facts_plugin.rb
@@ -89,23 +110,28 @@ sbin/smart-proxy
 %%DATADIR%%/modules/puppet_proxy/class_scanner.rb
 %%DATADIR%%/modules/puppet_proxy/class_scanner_base.rb
 %%DATADIR%%/modules/puppet_proxy/class_scanner_eparser.rb
-%%DATADIR%%/modules/puppet_proxy/class_scanner_factory.rb
-%%DATADIR%%/modules/puppet_proxy/config_reader.rb
 %%DATADIR%%/modules/puppet_proxy/customrun.rb
+%%DATADIR%%/modules/puppet_proxy/dependency_injection/container.rb
+%%DATADIR%%/modules/puppet_proxy/dependency_injection/dependencies.rb
 %%DATADIR%%/modules/puppet_proxy/environment.rb
 %%DATADIR%%/modules/puppet_proxy/http_config.ru
 %%DATADIR%%/modules/puppet_proxy/initializer.rb
 %%DATADIR%%/modules/puppet_proxy/mcollective.rb
-%%DATADIR%%/modules/puppet_proxy/memory_store.rb
 %%DATADIR%%/modules/puppet_proxy/puppet.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_api.rb
+%%DATADIR%%/modules/puppet_proxy/puppet_api_v2_environments_retriever.rb
+%%DATADIR%%/modules/puppet_proxy/puppet_api_v3_environments_retriever.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_cache.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_class.rb
+%%DATADIR%%/modules/puppet_proxy/puppet_config.rb
+%%DATADIR%%/modules/puppet_proxy/puppet_config_environments_retriever.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_ssh.rb
 %%DATADIR%%/modules/puppet_proxy/puppetrun.rb
 %%DATADIR%%/modules/puppet_proxy/runner.rb
+%%DATADIR%%/modules/puppet_proxy/runtime_configuration.rb
 %%DATADIR%%/modules/puppet_proxy/salt.rb
+%%DATADIR%%/modules/puppet_proxy/ssl_configuration_validator.rb
 %%DATADIR%%/modules/puppetca/http_config.ru
 %%DATADIR%%/modules/puppetca/puppetca.rb
 %%DATADIR%%/modules/puppetca/puppetca_api.rb
@@ -121,8 +147,8 @@ sbin/smart-proxy
 %%DATADIR%%/modules/root/root.rb
 %%DATADIR%%/modules/root/root_api.rb
 %%DATADIR%%/modules/root/root_plugin.rb
-%%DATADIR%%/modules/templates/handler.rb
 %%DATADIR%%/modules/templates/http_config.ru
+%%DATADIR%%/modules/templates/template_proxy_request.rb
 %%DATADIR%%/modules/templates/templates.rb
 %%DATADIR%%/modules/templates/templates_api.rb
 %%DATADIR%%/modules/templates/templates_plugin.rb