From owner-svn-ports-head@FreeBSD.ORG Sat Feb 8 11:40:36 2014 Return-Path: Delivered-To: svn-ports-head@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 0E633E93; Sat, 8 Feb 2014 11:40:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 D497D142A; Sat, 8 Feb 2014 11:40:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s18BeZbm056195; Sat, 8 Feb 2014 11:40:35 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s18BeZqp056192; Sat, 8 Feb 2014 11:40:35 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201402081140.s18BeZqp056192@svn.freebsd.org> From: Martin Matuska Date: Sat, 8 Feb 2014 11:40:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343322 - in head/net/foreman-proxy: . 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.17 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: Sat, 08 Feb 2014 11:40:36 -0000 Author: mm Date: Sat Feb 8 11:40:34 2014 New Revision: 343322 URL: http://svnweb.freebsd.org/changeset/ports/343322 QAT: https://qat.redports.org/buildarchive/r343322/ Log: Update foreman-proxy to 1.4.0 Modified: head/net/foreman-proxy/Makefile head/net/foreman-proxy/distinfo head/net/foreman-proxy/files/patch-lib-proxy-tftp.rb Modified: head/net/foreman-proxy/Makefile ============================================================================== --- head/net/foreman-proxy/Makefile Sat Feb 8 11:38:17 2014 (r343321) +++ head/net/foreman-proxy/Makefile Sat Feb 8 11:40:34 2014 (r343322) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= foreman-proxy -DISTVERSION= 1.4.0-RC2 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= net MASTER_SITES= GH @@ -22,7 +21,7 @@ PUPPET_DESC= Depend on Puppet USE_GITHUB= yes GH_ACCOUNT= theforeman GH_PROJECT= smart-proxy -GH_COMMIT= 255c9bf +GH_COMMIT= ae165b9 USE_RUBY= yes USE_RAKE= yes USE_RC_SUBR= foreman-proxy Modified: head/net/foreman-proxy/distinfo ============================================================================== --- head/net/foreman-proxy/distinfo Sat Feb 8 11:38:17 2014 (r343321) +++ head/net/foreman-proxy/distinfo Sat Feb 8 11:40:34 2014 (r343322) @@ -1,2 +1,2 @@ -SHA256 (foreman-proxy-1.4.0-RC2.tar.gz) = bbe0f3be114b8fb406e79fdd845690ad69d83915ccd1513fbc3deb71b894343a -SIZE (foreman-proxy-1.4.0-RC2.tar.gz) = 84992 +SHA256 (foreman-proxy-1.4.0.tar.gz) = 082a6800eaafa38647b5b849be1c96602ec8cd1f1d3c00aa46db6d1f917481df +SIZE (foreman-proxy-1.4.0.tar.gz) = 85030 Modified: head/net/foreman-proxy/files/patch-lib-proxy-tftp.rb ============================================================================== --- head/net/foreman-proxy/files/patch-lib-proxy-tftp.rb Sat Feb 8 11:38:17 2014 (r343321) +++ head/net/foreman-proxy/files/patch-lib-proxy-tftp.rb Sat Feb 8 11:40:34 2014 (r343322) @@ -1,11 +1,14 @@ ---- lib/proxy/tftp.rb.orig 2014-01-29 00:26:35.629061321 +0100 -+++ lib/proxy/tftp.rb 2014-01-29 00:28:05.669054835 +0100 -@@ -104,7 +104,7 @@ +--- lib/proxy/tftp.rb.orig 2014-01-29 11:01:36.000000000 +0100 ++++ lib/proxy/tftp.rb 2014-02-08 12:38:15.087475784 +0100 +@@ -105,8 +105,9 @@ # as the dst might contain another sub directory FileUtils.mkdir_p destination.parent -- cmd = "wget --timeout=10 --tries=3 --no-check-certificate -nv -c #{src} -O \"#{destination}\"" +- wget = which("wget") +- cmd = "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c #{src} -O \"#{destination}\"" ++ # wget = which("wget") ++ # cmd = "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c #{src} -O \"#{destination}\"" + cmd = "/usr/bin/fetch --timeout=10 --no-verify-hostname --no-verify-peer -a -m -q -o \"#{destination}\" #{src}" - Proxy::Util::CommandTask.new(cmd) + CommandTask.new(cmd) end end