From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 4 11:10:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E5B3AE4 for ; Tue, 4 Mar 2014 11:10:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2EA84259 for ; Tue, 4 Mar 2014 11:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s24BA1wL086348 for ; Tue, 4 Mar 2014 11:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s24BA1eo086347; Tue, 4 Mar 2014 11:10:01 GMT (envelope-from gnats) Resent-Date: Tue, 4 Mar 2014 11:10:01 GMT Resent-Message-Id: <201403041110.s24BA1eo086347@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bartek Rutkowski Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C116A09 for ; Tue, 4 Mar 2014 11:03:10 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EC6F020B for ; Tue, 4 Mar 2014 11:03:09 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s24B39gq096407 for ; Tue, 4 Mar 2014 11:03:09 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s24B390N096406; Tue, 4 Mar 2014 11:03:09 GMT (envelope-from nobody) Message-Id: <201403041103.s24B390N096406@cgiserv.freebsd.org> Date: Tue, 4 Mar 2014 11:03:09 GMT From: Bartek Rutkowski To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/187253: [PORT-UPDATE] sysutils/mcollective 2.2.1 -> 2.4.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 11:10:01 -0000 >Number: 187253 >Category: ports >Synopsis: [PORT-UPDATE] sysutils/mcollective 2.2.1 -> 2.4.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 04 11:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Bartek Rutkowski >Release: 10.0-R >Organization: Pixeware LTD >Environment: FreeBSD ports-dev-10 10.0-RC4 FreeBSD 10.0-RC4 #0 r260130: Tue Dec 31 17:10:01 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: This is update to sysutils/mcollective port containing: * version update to latest 2.4.1 * added staging support The logs from redports build are here: https://redports.org/buildarchive/20140304105600-14780/ >How-To-Repeat: Use the patch, test the port and package, commit. >Fix: Patch attached. Patch attached with submission follows: diff -ruN mcollective.orig/Makefile mcollective/Makefile --- mcollective.orig/Makefile 2014-03-03 15:53:15.731488557 +0000 +++ mcollective/Makefile 2014-03-03 16:09:04.428617941 +0000 @@ -2,10 +2,9 @@ # $FreeBSD: head/sysutils/mcollective/Makefile 327772 2013-09-20 23:05:58Z bapt $ PORTNAME= mcollective -PORTVERSION= 2.2.4 +PORTVERSION= 2.4.1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/${PORTNAME}/ -EXTRACT_SUFX= .tgz MAINTAINER= swills@FreeBSD.org COMMENT= A modern scalable datacenter orchestration framework @@ -25,7 +24,6 @@ SUB_LIST+= RUBY=${RUBY} -NO_STAGE= yes do-patch: @${REINPLACE_CMD} -e "s|/etc/mcollective|${ETCDIR}|" \ ${WRKSRC}/bin/mcollectived \ @@ -39,22 +37,22 @@ ${WRKSRC}/etc/client.cfg.dist do-install: - @(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${RUBY_SITELIBDIR}) - ${MKDIR} ${DATADIR} - @(cd ${WRKSRC}/plugins/mcollective && ${COPYTREE_SHARE} \* ${DATADIR}) + @(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_SITELIBDIR}) + ${MKDIR} ${STAGEDIR}${DATADIR} + @(cd ${WRKSRC}/plugins/mcollective && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) .for script in ${SCRIPTS} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${script} ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${script} ${STAGEDIR}${PREFIX}/bin/ .endfor - ${INSTALL_SCRIPT} ${WRKSRC}/bin/mcollectived ${PREFIX}/sbin/mcollectived + ${INSTALL_SCRIPT} ${WRKSRC}/bin/mcollectived ${STAGEDIR}${PREFIX}/sbin/mcollectived - ${MKDIR} ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/client.cfg.dist ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/server.cfg.dist ${ETCDIR} + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/client.cfg.dist ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/server.cfg.dist ${STAGEDIR}${ETCDIR} .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) .endif .include diff -ruN mcollective.orig/distinfo mcollective/distinfo --- mcollective.orig/distinfo 2014-03-03 15:53:15.749347252 +0000 +++ mcollective/distinfo 2014-03-03 15:53:30.911860364 +0000 @@ -1,2 +1,2 @@ -SHA256 (mcollective-2.2.4.tgz) = 43829a96ce03d5af0d0a8171f468606b6474e4d339ce9e39588cd333cb2a9aad -SIZE (mcollective-2.2.4.tgz) = 1153163 +SHA256 (mcollective-2.4.1.tar.gz) = 9bb1d06116829d811aed6ac1ca4929743b61fb356aac9942b383ab0524524cb9 +SIZE (mcollective-2.4.1.tar.gz) = 897599 diff -ruN mcollective.orig/pkg-plist mcollective/pkg-plist --- mcollective.orig/pkg-plist 2014-03-03 15:53:15.749347252 +0000 +++ mcollective/pkg-plist 2014-03-03 15:53:30.911860364 +0000 @@ -5,8 +5,11 @@ %%DATADIR%%/agent/rpcutil.ddl %%DATADIR%%/agent/rpcutil.rb %%DATADIR%%/aggregate/average.rb +%%DATADIR%%/aggregate/average.ddl %%DATADIR%%/aggregate/sum.rb +%%DATADIR%%/aggregate/sum.ddl %%DATADIR%%/aggregate/summary.rb +%%DATADIR%%/aggregate/summary.ddl %%DATADIR%%/application/completion.rb %%DATADIR%%/application/facts.rb %%DATADIR%%/application/find.rb @@ -17,7 +20,6 @@ %%DATADIR%%/application/rpc.rb %%DATADIR%%/audit/logfile.rb %%DATADIR%%/connector/activemq.rb -%%DATADIR%%/connector/stomp.rb %%DATADIR%%/connector/rabbitmq.rb %%DATADIR%%/data/agent_data.ddl %%DATADIR%%/data/agent_data.rb @@ -27,9 +29,12 @@ %%DATADIR%%/discovery/flatfile.rb %%DATADIR%%/discovery/mc.ddl %%DATADIR%%/discovery/mc.rb +%%DATADIR%%/discovery/stdin.ddl +%%DATADIR%%/discovery/stdin.rb %%DATADIR%%/facts/yaml_facts.rb %%DATADIR%%/pluginpackager/debpackage_packager.rb %%DATADIR%%/pluginpackager/ospackage_packager.rb +%%DATADIR%%/pluginpackager/modulepackage_packager.rb %%DATADIR%%/pluginpackager/rpmpackage_packager.rb %%DATADIR%%/pluginpackager/templates/debian/Makefile.erb %%DATADIR%%/pluginpackager/templates/debian/changelog.erb @@ -38,6 +43,9 @@ %%DATADIR%%/pluginpackager/templates/debian/copyright.erb %%DATADIR%%/pluginpackager/templates/debian/rules.erb %%DATADIR%%/pluginpackager/templates/redhat/rpm_spec.erb +%%DATADIR%%/pluginpackager/templates/module/_manifest.pp.erb +%%DATADIR%%/pluginpackager/templates/module/Modulefile.erb +%%DATADIR%%/pluginpackager/templates/module/README.md.erb %%DATADIR%%/registration/agentlist.rb %%DATADIR%%/security/aes_security.rb %%DATADIR%%/security/psk.rb @@ -47,12 +55,10 @@ %%DATADIR%%/validator/ipv4address_validator.ddl %%DATADIR%%/validator/shellsafe_validator.rb %%DATADIR%%/validator/ipv6address_validator.ddl -%%DATADIR%%/validator/any_validator.ddl %%DATADIR%%/validator/shellsafe_validator.ddl %%DATADIR%%/validator/length_validator.rb %%DATADIR%%/validator/ipv4address_validator.rb %%DATADIR%%/validator/ipv6address_validator.rb -%%DATADIR%%/validator/any_validator.rb %%DATADIR%%/validator/length_validator.ddl %%DATADIR%%/validator/regex_validator.rb %%DATADIR%%/validator/regex_validator.ddl @@ -152,9 +158,14 @@ %%PORTDOCS%%%%DOCSDIR%%/String.html %%PORTDOCS%%%%DOCSDIR%%/Symbol.html %%PORTDOCS%%%%DOCSDIR%%/created.rid +%%PORTDOCS%%%%DOCSDIR%%/doc/created_rid.html %%PORTDOCS%%%%DOCSDIR%%/etc/ssl/PLACEHOLDER.html %%PORTDOCS%%%%DOCSDIR%%/etc/ssl/clients/PLACEHOLDER.html +%%PORTDOCS%%%%DOCSDIR%%/etc/client_cfg_dist.html +%%PORTDOCS%%%%DOCSDIR%%/etc/server_cfg_dist.html +%%PORTDOCS%%%%DOCSDIR%%/etc/facts_yaml_dist.html %%PORTDOCS%%%%DOCSDIR%%/images/add.png +%%PORTDOCS%%%%DOCSDIR%%/images/arrow_up.png %%PORTDOCS%%%%DOCSDIR%%/images/brick.png %%PORTDOCS%%%%DOCSDIR%%/images/brick_link.png %%PORTDOCS%%%%DOCSDIR%%/images/bug.png @@ -187,6 +198,8 @@ %%PORTDOCS%%%%DOCSDIR%%/js/searcher.js %%PORTDOCS%%%%DOCSDIR%%/rdoc.css %%PORTDOCS%%%%DOCSDIR%%/table_of_contents.html +%%PORTDOCS%%%%DOCSDIR%%/mcollective_init.html +%%PORTDOCS%%%%DOCSDIR%%/GetoptLong.html %%RUBY_SITELIBDIR%%/mcollective.rb %%RUBY_SITELIBDIR%%/mcollective/agent.rb %%RUBY_SITELIBDIR%%/mcollective/agents.rb @@ -262,8 +275,6 @@ %%RUBY_SITELIBDIR%%/mcollective/util.rb %%RUBY_SITELIBDIR%%/mcollective/validator.rb %%RUBY_SITELIBDIR%%/mcollective/vendor.rb -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/.gitignore -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/.travis.yml %%RUBY_SITELIBDIR%%/mcollective/vendor/json/CHANGES %%RUBY_SITELIBDIR%%/mcollective/vendor/json/COPYING %%RUBY_SITELIBDIR%%/mcollective/vendor/json/COPYING-json-jruby @@ -274,51 +285,11 @@ %%RUBY_SITELIBDIR%%/mcollective/vendor/json/Rakefile %%RUBY_SITELIBDIR%%/mcollective/vendor/json/TODO %%RUBY_SITELIBDIR%%/mcollective/vendor/json/VERSION -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/.keep -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data/.keep -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/generator2_benchmark.rb -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/generator_benchmark.rb -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/ohai.json -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/ohai.ruby -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/parser2_benchmark.rb -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/parser_benchmark.rb %%RUBY_SITELIBDIR%%/mcollective/vendor/json/bin/edit_json.rb %%RUBY_SITELIBDIR%%/mcollective/vendor/json/bin/prettify_json.rb %%RUBY_SITELIBDIR%%/mcollective/vendor/json/data/example.json %%RUBY_SITELIBDIR%%/mcollective/vendor/json/data/index.html %%RUBY_SITELIBDIR%%/mcollective/vendor/json/data/prototype.js -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/diagrams/.keep %%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/generator/extconf.rb %%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/generator/generator.c %%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/generator/generator.h @@ -360,7 +331,6 @@ %%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/common.rb %%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/editor.rb %%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/ext.rb -%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/ext/.keep %%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/json.xpm %%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/pure.rb %%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/pure/generator.rb @@ -432,6 +402,7 @@ @dirrm %%DATADIR%%/discovery @dirrm %%DATADIR%%/facts @dirrm %%DATADIR%%/pluginpackager/templates/redhat +@dirrm %%DATADIR%%/pluginpackager/templates/module @dirrm %%DATADIR%%/pluginpackager/templates/debian @dirrm %%DATADIR%%/pluginpackager/templates @dirrm %%DATADIR%%/pluginpackager @@ -453,9 +424,6 @@ @dirrm %%RUBY_SITELIBDIR%%/mcollective/registration @dirrm %%RUBY_SITELIBDIR%%/mcollective/rpc @dirrm %%RUBY_SITELIBDIR%%/mcollective/security -@dirrm %%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data -@dirrm %%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18 -@dirrm %%RUBY_SITELIBDIR%%/mcollective/vendor/json/benchmarks @dirrm %%RUBY_SITELIBDIR%%/mcollective/vendor/json/bin @dirrm %%RUBY_SITELIBDIR%%/mcollective/vendor/json/data @dirrm %%RUBY_SITELIBDIR%%/mcollective/vendor/json/diagrams @@ -499,6 +467,7 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%%/MCollective %%PORTDOCS%%@dirrm %%DOCSDIR%%/etc/ssl/clients %%PORTDOCS%%@dirrm %%DOCSDIR%%/etc/ssl +%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc %%PORTDOCS%%@dirrm %%DOCSDIR%%/etc %%PORTDOCS%%@dirrm %%DOCSDIR%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%%/js >Release-Note: >Audit-Trail: >Unformatted: