From owner-svn-ports-head@FreeBSD.ORG Tue Jan 8 00:35:22 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 415E8C6; Tue, 8 Jan 2013 00:35:22 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 324AEFA7; Tue, 8 Jan 2013 00:35:22 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r080ZMHQ045069; Tue, 8 Jan 2013 00:35:22 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r080ZKjK045060; Tue, 8 Jan 2013 00:35:20 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201301080035.r080ZKjK045060@svn.freebsd.org> From: Jason Helfman Date: Tue, 8 Jan 2013 00:35:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310059 - in head: devel/rubygem-highline devel/rubygem-mixlib-authentication security/rubygem-net-ssh sysutils/rubygem-chef sysutils/rubygem-chef/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2013 00:35:22 -0000 Author: jgh Date: Tue Jan 8 00:35:19 2013 New Revision: 310059 URL: http://svnweb.freebsd.org/changeset/ports/310059 Log: - update security/rubygem-net-ssh to 2.2.2,2 [1] - update devel/rubygem-mixlib-authentication to 1.3.0 [2] - update devel/rubygem-highline to 1.6.15 [3] - update sysutils/rubygem-chef to 10.16.4 [4] PR: 171010 [1] PR: 173646 [2] PR: 173647 [3] PR: 171005 [4] Submitted by: nickdewing@gmail.com [1,4] Submitted by: maintainer, renchap@cocoa-x.com [2,4], renchap@cocoa-x.com [3] Modified: head/devel/rubygem-highline/Makefile head/devel/rubygem-highline/distinfo head/devel/rubygem-mixlib-authentication/Makefile head/devel/rubygem-mixlib-authentication/distinfo head/security/rubygem-net-ssh/Makefile head/security/rubygem-net-ssh/distinfo head/sysutils/rubygem-chef/Makefile head/sysutils/rubygem-chef/distinfo head/sysutils/rubygem-chef/files/chef_client.in Modified: head/devel/rubygem-highline/Makefile ============================================================================== --- head/devel/rubygem-highline/Makefile Tue Jan 8 00:05:16 2013 (r310058) +++ head/devel/rubygem-highline/Makefile Tue Jan 8 00:35:19 2013 (r310059) @@ -1,17 +1,13 @@ -# New ports collection makefile for: rubygem-highline -# Date created: 4 October 2007 -# Whom: Philip M. Gollucci -# +# Created by: Philip M. Gollucci # $FreeBSD$ -# PORTNAME= highline -PORTVERSION= 1.6.2 +PORTVERSION= 1.6.15 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org -COMMENT= A high-level IO library for command-line interfaces +COMMENT= High-level IO library for command-line interfaces USE_RUBY= yes USE_RUBYGEMS= yes Modified: head/devel/rubygem-highline/distinfo ============================================================================== --- head/devel/rubygem-highline/distinfo Tue Jan 8 00:05:16 2013 (r310058) +++ head/devel/rubygem-highline/distinfo Tue Jan 8 00:35:19 2013 (r310059) @@ -1,2 +1,2 @@ -SHA256 (rubygem/highline-1.6.2.gem) = 96d503686df39c2426597c6af4695a0ecac8fe9294174ccda33638701654f52b -SIZE (rubygem/highline-1.6.2.gem) = 56320 +SHA256 (rubygem/highline-1.6.15.gem) = a1925472c2395c897354e66334891b9347887886181a6e5b6a55a44dfda39cc6 +SIZE (rubygem/highline-1.6.15.gem) = 218624 Modified: head/devel/rubygem-mixlib-authentication/Makefile ============================================================================== --- head/devel/rubygem-mixlib-authentication/Makefile Tue Jan 8 00:05:16 2013 (r310058) +++ head/devel/rubygem-mixlib-authentication/Makefile Tue Jan 8 00:35:19 2013 (r310059) @@ -6,7 +6,7 @@ # PORTNAME= mixlib-authentication -PORTVERSION= 1.1.4 +PORTVERSION= 1.3.0 CATEGORIES= devel rubygems MASTER_SITES= RG Modified: head/devel/rubygem-mixlib-authentication/distinfo ============================================================================== --- head/devel/rubygem-mixlib-authentication/distinfo Tue Jan 8 00:05:16 2013 (r310058) +++ head/devel/rubygem-mixlib-authentication/distinfo Tue Jan 8 00:35:19 2013 (r310059) @@ -1,2 +1,2 @@ -SHA256 (rubygem/mixlib-authentication-1.1.4.gem) = 6684362ac2b42e58c73f6982aea1d459d0ea57bfc64364679ac51aeb41b1420a -SIZE (rubygem/mixlib-authentication-1.1.4.gem) = 17920 +SHA256 (rubygem/mixlib-authentication-1.3.0.gem) = ef0bb04f4d4e7cc7fab1f63a9ce08c5a1d1ebca70303db1eaf5ab3a16e2cb7b0 +SIZE (rubygem/mixlib-authentication-1.3.0.gem) = 19456 Modified: head/security/rubygem-net-ssh/Makefile ============================================================================== --- head/security/rubygem-net-ssh/Makefile Tue Jan 8 00:05:16 2013 (r310058) +++ head/security/rubygem-net-ssh/Makefile Tue Jan 8 00:35:19 2013 (r310059) @@ -1,13 +1,10 @@ -# New ports collection makefile for: rubygem-net-ssh -# Date created: 14 January 2006 -# Whom: Roderick van Domburg -# +# Created by: Roderick van Domburg # $FreeBSD$ # # Remeber to check sysutils/rubygem-chef PORTNAME= net-ssh -PORTVERSION= 2.1.4 +PORTVERSION= 2.2.2 PORTEPOCH= 2 CATEGORIES= security rubygems MASTER_SITES= RG @@ -15,15 +12,20 @@ MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Non-interactive SSH processing -OPTIONS= PROMPT_PASSPHRASES "Prompt for passphrases on keys" On +OPTIONS_DEFINE= PROMPT_PASSPHRASES +PROMPT_PASSPHRASES_DESC= Prompt for passphrases on keys OPTIONSFILE?= ${PORT_DBDIR}/rubygem-${PORTNAME}/options +OPTIONS_DEFAULT= PROMPT_PASSPHRASES + # to get RUBY_SITEARCHLIBDIR USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -.if !defined(WITHOUT_PROMPT_PASSPHRASES) +.include + +.if ${PORT_OPTIONS:MPROMPT_PASSPHRASES} RUN_DEPENDS+= rubygem-ruby-termios>=0:${PORTSDIR}/comms/rubygem-ruby-termios .endif Modified: head/security/rubygem-net-ssh/distinfo ============================================================================== --- head/security/rubygem-net-ssh/distinfo Tue Jan 8 00:05:16 2013 (r310058) +++ head/security/rubygem-net-ssh/distinfo Tue Jan 8 00:35:19 2013 (r310059) @@ -1,2 +1,2 @@ -SHA256 (rubygem/net-ssh-2.1.4.gem) = d73091fa095c8df5adc12e5c3fd5bc097ac05780a5c4565f8f86e8859967dc89 -SIZE (rubygem/net-ssh-2.1.4.gem) = 132096 +SHA256 (rubygem/net-ssh-2.2.2.gem) = 211cf80d5d5805ca59723708a3cdfe43fa4dc30e5f86177a108f8cc2cd623487 +SIZE (rubygem/net-ssh-2.2.2.gem) = 133120 Modified: head/sysutils/rubygem-chef/Makefile ============================================================================== --- head/sysutils/rubygem-chef/Makefile Tue Jan 8 00:05:16 2013 (r310058) +++ head/sysutils/rubygem-chef/Makefile Tue Jan 8 00:35:19 2013 (r310059) @@ -1,34 +1,31 @@ -# Ports collection makefile for: rubygem-chef -# Date created: 19 Mar 2010 -# Whom: Renaud Chaput -# +# Created by: Renaud Chaput # $FreeBSD$ -# PORTNAME= chef -PORTVERSION= 0.10.8 -PORTREVISION= 1 +PORTVERSION= 10.16.4 CATEGORIES= sysutils MASTER_SITES= RG MAINTAINER= renchap@cocoa-x.com COMMENT= A systems integration framework. Client part -RUN_DEPENDS= rubygem-mixlib-log>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-log \ - rubygem-mixlib-config>=1.1.2:${PORTSDIR}/devel/rubygem-mixlib-config \ - rubygem-mixlib-cli>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-cli \ - rubygem-mixlib-authentication>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-authentication \ +RUN_DEPENDS= rubygem-bunny>=0.6.0:${PORTSDIR}/net/rubygem-bunny \ + rubygem-erubis>=0:${PORTSDIR}/www/rubygem-erubis \ + rubygem-highline>=1.6.9:${PORTSDIR}/devel/rubygem-highline \ rubygem-json>=1.4.4:${PORTSDIR}/devel/rubygem-json146 \ - rubygem-uuidtools>=0:${PORTSDIR}/devel/rubygem-uuidtools \ - rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline \ + rubygem-mixlib-authentication>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-authentication \ + rubygem-mixlib-cli>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-cli \ + rubygem-mixlib-config>=1.1.2:${PORTSDIR}/devel/rubygem-mixlib-config \ + rubygem-mixlib-log>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-log \ + rubygem-mixlib-shellout>=1.0.0:${PORTSDIR}/devel/rubygem-mixlib-shellout \ rubygem-moneta>=0:${PORTSDIR}/devel/rubygem-moneta \ - rubygem-erubis>=0:${PORTSDIR}/www/rubygem-erubis \ - rubygem-rest-client>=1.0.4:${PORTSDIR}/www/rubygem-rest-client \ - rubygem-bunny>=0.6.0:${PORTSDIR}/net/rubygem-bunny \ - rubygem-ohai>=0.6.0:${PORTSDIR}/sysutils/rubygem-ohai \ - rubygem-net-ssh>=2.1.3:${PORTSDIR}/security/rubygem-net-ssh \ + rubygem-net-ssh>=2.2.2:${PORTSDIR}/security/rubygem-net-ssh \ rubygem-net-ssh-multi>=1.1.0:${PORTSDIR}/security/rubygem-net-ssh-multi \ - rubygem-treetop>=1.4.9:${PORTSDIR}/devel/rubygem-treetop + rubygem-ohai>=0.6.0:${PORTSDIR}/sysutils/rubygem-ohai \ + rubygem-rest-client>=1.0.4:${PORTSDIR}/www/rubygem-rest-client \ + rubygem-treetop>=1.4.9:${PORTSDIR}/devel/rubygem-treetop \ + rubygem-uuidtools>=0:${PORTSDIR}/devel/rubygem-uuidtools \ + rubygem-yajl-ruby>=1.1.0:${PORTSDIR}/devel/rubygem-yajl-ruby USE_RUBY= yes USE_RUBYGEMS= yes @@ -40,7 +37,22 @@ PLIST_FILES= bin/chef-client \ bin/shef \ bin/knife +MAN1= knife.1 knife-bootstrap.1 knife-client.1 knife-configure.1 knife-cookbook.1 \ + knife-cookbook-site.1 knife-data-bag.1 knife-environment.1 knife-exec.1 \ + knife-index.1 knife-node.1 knife-role.1 knife-search.1 knife-ssh.1 knife-status.1 \ + knife-tag.1 shef.1 +MAN8= chef-client.8 chef-solo.8 + SUB_LIST= RUBY=${RUBY} USE_RC_SUBR= chef_client +post-install: +.if !defined(NO_INSTALL_MANPAGES) +.for n in 1 8 +.for f in ${MAN${n}} + ${INSTALL_DATA} ${PREFIX}/${GEM_LIB_DIR}/distro/common/man/man${n}/${f} ${PREFIX}/man/man${n} +.endfor +.endfor +.endif + .include Modified: head/sysutils/rubygem-chef/distinfo ============================================================================== --- head/sysutils/rubygem-chef/distinfo Tue Jan 8 00:05:16 2013 (r310058) +++ head/sysutils/rubygem-chef/distinfo Tue Jan 8 00:35:19 2013 (r310059) @@ -1,2 +1,2 @@ -SHA256 (rubygem/chef-0.10.8.gem) = 0a1ea2ee4b22a2933d2ab60164fec21b41425abb6bb4d36e558ae91c857e1a0c -SIZE (rubygem/chef-0.10.8.gem) = 381952 +SHA256 (rubygem/chef-10.16.4.gem) = 42424ddbcbed716ffc1863d033a1e4f5446b3922f5cd31280423f9779f54bd7f +SIZE (rubygem/chef-10.16.4.gem) = 811008 Modified: head/sysutils/rubygem-chef/files/chef_client.in ============================================================================== --- head/sysutils/rubygem-chef/files/chef_client.in Tue Jan 8 00:05:16 2013 (r310058) +++ head/sysutils/rubygem-chef/files/chef_client.in Tue Jan 8 00:35:19 2013 (r310059) @@ -25,7 +25,14 @@ load_rc_config $name : ${chef_client_splay="0"} : ${chef_client_logfile="/var/log/chef-client.log"} : ${chef_client_loglevel="info"} -: ${chef_client_pidfile="/var/run/chef-client.pid"} + +if [ -f "$chef_client_configfile" ] + then + pidfile=`awk '/^[ \t]*pid_file[ \t]+/ { print $2 }' ${chef_client_configfile}` + : ${chef_client_pidfile=$pidfile} + else + : ${chef_client_pidfile="/var/run/chef-client.pid"} +fi if [ -n "$chef_client_nodename" ] then