Date: Wed, 22 Oct 2014 12:58:46 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371357 - in head/net/foreman-proxy: . files Message-ID: <201410221258.s9MCwk5E043268@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Oct 22 12:58:45 2014 New Revision: 371357 URL: https://svnweb.freebsd.org/changeset/ports/371357 QAT: https://qat.redports.org/buildarchive/r371357/ Log: - Update to 1.6.2 [1] - General cleanup maintainer timeout for [1] PR: 194244 [1] Submitted by: kvedulvi at kvedulv de [1] Sponsored by: Absolight Deleted: head/net/foreman-proxy/files/pkg-install.in 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 Oct 22 11:59:49 2014 (r371356) +++ head/net/foreman-proxy/Makefile Wed Oct 22 12:58:45 2014 (r371357) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= foreman-proxy -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.2 CATEGORIES= net MASTER_SITES= GH @@ -17,19 +17,19 @@ RUN_DEPENDS= rubygem-bundler_ext>=0.4:${ rubygem-sinatra>=1.4.3:${PORTSDIR}/www/rubygem-sinatra \ ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget -OPTIONS_DEFINE= BMC PUPPET +OPTIONS_DEFINE= BMC PUPPET BMC_DESC= Depend on rubyipmi for BMC support PUPPET_DESC= Depend on Puppet USE_GITHUB= yes GH_ACCOUNT= theforeman GH_PROJECT= smart-proxy -GH_COMMIT= 0330140 +GH_COMMIT= b53b4d0 USE_RUBY= yes USE_RAKE= yes USE_RC_SUBR= foreman-proxy NO_BUILD= yes -PKGINSTALL= ${WRKDIR}/pkg-install +NO_ARCH= yes FOREMAN_PROXY_USER?= foreman_proxy FOREMAN_PROXY_GROUP?= foreman_proxy @@ -39,28 +39,17 @@ FOREMAN_PROXY_RUNDIR?= /var/run/foreman- USERS= ${FOREMAN_PROXY_USER} GROUPS= ${FOREMAN_PROXY_GROUP} -SUB_FILES+= pkg-install -SUB_LIST+= RUBY="${RUBY}" \ +SUB_LIST= RUBY="${RUBY}" \ FOREMAN_PROXY_USER="${FOREMAN_PROXY_USER}" \ FOREMAN_PROXY_GROUP="${FOREMAN_PROXY_GROUP}" \ FOREMAN_PROXY_RUNDIR="${FOREMAN_PROXY_RUNDIR}" \ FOREMAN_PROXY_LOGDIR="${FOREMAN_PROXY_LOGDIR}" -PLIST_SUB+= ${SUB_LIST} \ - MKDIR="${MKDIR}" +PLIST_SUB= ${SUB_LIST} MKDIR="${MKDIR}" -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MBMC} -RUN_DEPENDS+= rubygem-rubyipmi>=0.7:${PORTSDIR}/sysutils/rubygem-rubyipmi -.endif - -.if ${PORT_OPTIONS:MPUPPET} -RUN_DEPENDS+= puppet:${PORTSDIR}/sysutils/puppet \ - rubygem-ruby-augeas>=0.5:${PORTSDIR}/textproc/rubygem-augeas -.endif - -.include <bsd.port.pre.mk> +BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.7:${PORTSDIR}/sysutils/rubygem-rubyipmi +PUPPET_RUN_DEPENDS= puppet:${PORTSDIR}/sysutils/puppet \ + rubygem-ruby-augeas>=0.5:${PORTSDIR}/textproc/rubygem-augeas post-patch: @${REINPLACE_CMD} \ @@ -77,30 +66,27 @@ post-patch: ${WRKSRC}/lib/proxy/http_downloads.rb do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d - @${MKDIR} ${STAGEDIR}${DATADIR}/extra - @${LN} -s ${PREFIX}/etc/foreman-proxy ${STAGEDIR}${DATADIR}/config - @${INSTALL_SCRIPT} ${WRKSRC}/bin/smart-proxy \ + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d + ${MKDIR} ${STAGEDIR}${DATADIR}/extra + ${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 \ VERSION bundler.d config.ru lib modules public views - @${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR} + ${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR} .endfor - @${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in + ${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in .for script in migrate_settings.rb query.rb ${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \ ${STAGEDIR}${DATADIR}/extra/${script} .endfor - ${INSTALL} ${COPY} -m 644 ${WRKSRC}/config/settings.yml.example \ + ${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \ ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample .for cfg in bmc chef dhcp dns puppet puppetca realm tftp - ${INSTALL} ${COPY} -m 644 ${WRKSRC}/config/settings.d/${cfg}.yml.example \ + ${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \ ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample .endfor - -post-install: - @${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \ + ${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \ ${STAGEDIR}${FOREMAN_PROXY_RUNDIR} - @${SH} ${PKGINSTALL} STAGEDIR=${STAGEDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/foreman-proxy/distinfo ============================================================================== --- head/net/foreman-proxy/distinfo Wed Oct 22 11:59:49 2014 (r371356) +++ head/net/foreman-proxy/distinfo Wed Oct 22 12:58:45 2014 (r371357) @@ -1,2 +1,2 @@ -SHA256 (foreman-proxy-1.6.0.tar.gz) = 0f3fc7da8794afe9c5d86807e064fd1dd8864ef5c16ff893411794cb62dc437f -SIZE (foreman-proxy-1.6.0.tar.gz) = 106572 +SHA256 (foreman-proxy-1.6.2.tar.gz) = 5dac214d0a3e1c5dda9d82ffb48a3c05efbb780f82fd35ee8a5f2c8335be3771 +SIZE (foreman-proxy-1.6.2.tar.gz) = 107543 Modified: head/net/foreman-proxy/pkg-plist ============================================================================== --- head/net/foreman-proxy/pkg-plist Wed Oct 22 11:59:49 2014 (r371356) +++ head/net/foreman-proxy/pkg-plist Wed Oct 22 12:58:45 2014 (r371357) @@ -44,6 +44,7 @@ sbin/smart-proxy %%DATADIR%%/lib/proxy/virsh.rb %%DATADIR%%/lib/proxy.rb %%DATADIR%%/lib/rack-patch.rb +%%DATADIR%%/lib/sinatra/ssl_client_verification.rb %%DATADIR%%/lib/sinatra/trusted_hosts.rb %%DATADIR%%/lib/sinatra-patch.rb %%DATADIR%%/lib/smart_proxy.rb @@ -129,33 +130,5 @@ sbin/smart-proxy %%DATADIR%%/views/dhcp/show.erb %%DATADIR%%/views/features/index.erb %%DATADIR%%/views/layout.erb -@dirrm %%DATADIR%%/views/features -@dirrm %%DATADIR%%/views/dhcp -@dirrm %%DATADIR%%/views -@dirrm %%DATADIR%%/public/css -@dirrm %%DATADIR%%/public -@dirrm %%DATADIR%%/modules/tftp -@dirrm %%DATADIR%%/modules/root -@dirrm %%DATADIR%%/modules/realm -@dirrm %%DATADIR%%/modules/puppetca -@dirrm %%DATADIR%%/modules/puppet_proxy -@dirrm %%DATADIR%%/modules/facts -@dirrm %%DATADIR%%/modules/dns/providers -@dirrm %%DATADIR%%/modules/dhcp/dhcp/record -@dirrm %%DATADIR%%/modules/dhcp/dhcp/providers -@dirrm %%DATADIR%%/modules/dhcp/dhcp -@dirrm %%DATADIR%%/modules/dhcp -@dirrm %%DATADIR%%/modules/dns -@dirrm %%DATADIR%%/modules/bmc -@dirrm %%DATADIR%%/modules/chef_proxy -@dirrm %%DATADIR%%/modules -@dirrm %%DATADIR%%/lib/proxy -@dirrm %%DATADIR%%/lib -@dirrm %%DATADIR%%/extra -@dirrm %%DATADIR%%/bundler.d -@dirrmtry %%DATADIR%% -@dirrmtry etc/foreman-proxy -@cwd / -@exec %%MKDIR%% -m 0700 %%FOREMAN_PROXY_LOGDIR%% %%FOREMAN_PROXY_RUNDIR%% -@unexec rmdir %%FOREMAN_PROXY_LOGDIR%% >/dev/null 2>&1 || : -@unexec rmdir %%FOREMAN_PROXY_RUNDIR%% >/dev/null 2>&1 || : +@dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_LOGDIR%% +@dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_RUNDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410221258.s9MCwk5E043268>