svn commit: r397086 - in head/net/foreman-proxy: . files

Wed Sep 16 21:07:57 UTC 2015

Author: mmoll
Date: Wed Sep 16 21:07:55 2015
New Revision: 397086
URL: https://svnweb.freebsd.org/changeset/ports/397086

Log:
  net/foreman-proxy: update to 1.9.1 and do minor cleanups

Deleted:
  head/net/foreman-proxy/files/patch-extra-migrate_settings.rb
Modified:
  head/net/foreman-proxy/Makefile
  head/net/foreman-proxy/distinfo
  head/net/foreman-proxy/pkg-plist

Modified: head/net/foreman-proxy/Makefile
==============================================================================

--- head/net/foreman-proxy/Makefile	Wed Sep 16 21:01:05 2015	(r397085)
+++ head/net/foreman-proxy/Makefile	Wed Sep 16 21:07:55 2015	(r397086)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	foreman-proxy
-PORTVERSION=	1.8.2
+PORTVERSION=	1.9.1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.theforeman.org/foreman-proxy/
 
@@ -23,7 +23,6 @@ PUPPET_DESC=	Depend on Puppet
 
 USES=		tar:bzip2
 USE_RUBY=	yes
-USE_RAKE=	yes
 USE_RC_SUBR=	foreman-proxy
 NO_BUILD=	yes
 NO_ARCH=	yes
@@ -44,7 +43,7 @@ SUB_LIST=	RUBY="${RUBY}" \
 
 PLIST_SUB=	${SUB_LIST} MKDIR="${MKDIR}"
 
-BMC_RUN_DEPENDS=	rubygem-rubyipmi>=0.7:${PORTSDIR}/sysutils/rubygem-rubyipmi
+BMC_RUN_DEPENDS=	rubygem-rubyipmi>=0.10.0:${PORTSDIR}/sysutils/rubygem-rubyipmi
 PUPPET_RUN_DEPENDS=	puppet:${PORTSDIR}/sysutils/puppet \
 			rubygem-ruby-augeas>=0.5:${PORTSDIR}/textproc/rubygem-ruby-augeas
 
@@ -68,7 +67,7 @@ do-install:
 	${LN} -s ${PREFIX}/etc/foreman-proxy ${STAGEDIR}${DATADIR}/config
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/smart-proxy \
 		${STAGEDIR}${PREFIX}/sbin/smart-proxy
-.for file in CHANGELOG Contributors Gemfile LICENSE README Rakefile \
+.for file in CHANGELOG Contributors Gemfile LICENSE README.md \
 	VERSION bundler.d config.ru lib modules public views
 	${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
 .endfor
@@ -77,6 +76,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \
 		${STAGEDIR}${DATADIR}/extra/${script}
 .endfor
+	${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

Modified: head/net/foreman-proxy/distinfo
==============================================================================
--- head/net/foreman-proxy/distinfo	Wed Sep 16 21:01:05 2015	(r397085)
+++ head/net/foreman-proxy/distinfo	Wed Sep 16 21:07:55 2015	(r397086)
@@ -1,2 +1,2 @@
-SHA256 (foreman-proxy-1.8.2.tar.bz2) = 9e7f79189a48f2e7ffdf2af38da0de77dae8fe9deb553146a4de51cf07f99044
-SIZE (foreman-proxy-1.8.2.tar.bz2) = 102091
+SHA256 (foreman-proxy-1.9.1.tar.bz2) = b398bc87f77c98f25cf4c565d7e91b466538e17aff2fbe685181e25cd65081f0
+SIZE (foreman-proxy-1.9.1.tar.bz2) = 109252

Modified: head/net/foreman-proxy/pkg-plist
==============================================================================
--- head/net/foreman-proxy/pkg-plist	Wed Sep 16 21:01:05 2015	(r397085)
+++ head/net/foreman-proxy/pkg-plist	Wed Sep 16 21:07:55 2015	(r397086)
@@ -1,53 +1,54 @@
+ at sample %%ETCDIR%%/settings.d/bmc.yml.sample
+ at sample %%ETCDIR%%/settings.d/dhcp.yml.sample
+ at sample %%ETCDIR%%/settings.d/dns.yml.sample
+ at sample %%ETCDIR%%/settings.d/facts.yml.sample
+ at sample %%ETCDIR%%/settings.d/puppet.yml.sample
+ at sample %%ETCDIR%%/settings.d/puppetca.yml.sample
+ at sample %%ETCDIR%%/settings.d/realm.yml.sample
+ at sample %%ETCDIR%%/settings.d/templates.yml.sample
+ at sample %%ETCDIR%%/settings.d/tftp.yml.sample
+ at sample %%ETCDIR%%/settings.yml.sample
 sbin/smart-proxy
- at sample etc/foreman-proxy/settings.yml.sample
- at sample etc/foreman-proxy/settings.d/bmc.yml.sample
- at sample etc/foreman-proxy/settings.d/dhcp.yml.sample
- at sample etc/foreman-proxy/settings.d/dns.yml.sample
- at sample etc/foreman-proxy/settings.d/facts.yml.sample
- at sample etc/foreman-proxy/settings.d/puppet.yml.sample
- at sample etc/foreman-proxy/settings.d/puppetca.yml.sample
- at sample etc/foreman-proxy/settings.d/realm.yml.sample
- at sample etc/foreman-proxy/settings.d/templates.yml.sample
- at sample etc/foreman-proxy/settings.d/tftp.yml.sample
 %%DATADIR%%/CHANGELOG
 %%DATADIR%%/Contributors
 %%DATADIR%%/Gemfile
 %%DATADIR%%/Gemfile.in
 %%DATADIR%%/LICENSE
-%%DATADIR%%/README
-%%DATADIR%%/Rakefile
+%%DATADIR%%/README.md
 %%DATADIR%%/VERSION
 %%DATADIR%%/bundler.d/bmc.rb
 %%DATADIR%%/bundler.d/development.rb
 %%DATADIR%%/bundler.d/krb5.rb
 %%DATADIR%%/bundler.d/puppet.rb
 %%DATADIR%%/bundler.d/test.rb
+%%DATADIR%%/bundler.d/windows.rb
 %%DATADIR%%/config
 %%DATADIR%%/config.ru
 %%DATADIR%%/extra/migrate_settings.rb
+%%DATADIR%%/extra/migrations/20150327000000_migrate_monolithic_config.rb
 %%DATADIR%%/extra/query.rb
 %%DATADIR%%/lib/bundler_helper.rb
 %%DATADIR%%/lib/checks.rb
 %%DATADIR%%/lib/daemon.rb
 %%DATADIR%%/lib/poodles-fix.rb
-%%DATADIR%%/lib/proxy/file_lock.rb
+%%DATADIR%%/lib/proxy.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/kerberos.rb
 %%DATADIR%%/lib/proxy/log.rb
 %%DATADIR%%/lib/proxy/plugin.rb
 %%DATADIR%%/lib/proxy/request.rb
+%%DATADIR%%/lib/proxy/settings.rb
 %%DATADIR%%/lib/proxy/settings/global.rb
 %%DATADIR%%/lib/proxy/settings/plugin.rb
-%%DATADIR%%/lib/proxy/settings.rb
 %%DATADIR%%/lib/proxy/util.rb
 %%DATADIR%%/lib/proxy/validations.rb
 %%DATADIR%%/lib/proxy/virsh.rb
-%%DATADIR%%/lib/proxy.rb
 %%DATADIR%%/lib/rack-patch.rb
-%%DATADIR%%/lib/sinatra/authorization.rb
 %%DATADIR%%/lib/sinatra-patch.rb
+%%DATADIR%%/lib/sinatra/authorization.rb
 %%DATADIR%%/lib/smart_proxy.rb
 %%DATADIR%%/lib/smart_proxy_for_testing.rb
 %%DATADIR%%/modules/bmc/base.rb
@@ -57,6 +58,7 @@ sbin/smart-proxy
 %%DATADIR%%/modules/bmc/http_config.ru
 %%DATADIR%%/modules/bmc/ipmi.rb
 %%DATADIR%%/modules/bmc/shell.rb
+%%DATADIR%%/modules/dhcp/dhcp.rb
 %%DATADIR%%/modules/dhcp/dhcp_api.rb
 %%DATADIR%%/modules/dhcp/dhcp_plugin.rb
 %%DATADIR%%/modules/dhcp/http_config.ru
@@ -66,12 +68,11 @@ sbin/smart-proxy
 %%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/lease.rb
 %%DATADIR%%/modules/dhcp/record/reservation.rb
-%%DATADIR%%/modules/dhcp/record.rb
 %%DATADIR%%/modules/dhcp/server.rb
 %%DATADIR%%/modules/dhcp/subnet.rb
-%%DATADIR%%/modules/dhcp/dhcp.rb
 %%DATADIR%%/modules/dns/dns.rb
 %%DATADIR%%/modules/dns/dns_api.rb
 %%DATADIR%%/modules/dns/dns_plugin.rb
@@ -88,12 +89,14 @@ 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/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_cache.rb
