From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 25 01:30:15 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D75751065694 for ; Mon, 25 Apr 2011 01:30:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5F5B28FC3C for ; Mon, 25 Apr 2011 01:30:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p3P1UBUU025068 for ; Mon, 25 Apr 2011 01:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3P1UBnQ025067; Mon, 25 Apr 2011 01:30:11 GMT (envelope-from gnats) Resent-Date: Mon, 25 Apr 2011 01:30:11 GMT Resent-Message-Id: <201104250130.p3P1UBnQ025067@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, "Douglas K. Rand" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 536E4106566C for ; Mon, 25 Apr 2011 01:29:47 +0000 (UTC) (envelope-from rand@newman.meridian-enviro.com) Received: from newman.meridian-enviro.com (newman.meridian-enviro.com [12.192.92.56]) by mx1.freebsd.org (Postfix) with ESMTP id F397A8FC08 for ; Mon, 25 Apr 2011 01:29:46 +0000 (UTC) Received: from newman.meridian-enviro.com (localhost [127.0.0.1]) by newman.meridian-enviro.com (8.13.6/8.13.6) with ESMTP id p3P1BcnP061166 for ; Sun, 24 Apr 2011 20:11:38 -0500 (CDT) (envelope-from rand@newman.meridian-enviro.com) Received: (from rand@localhost) by newman.meridian-enviro.com (8.13.6/8.13.6/Submit) id p3P1BcrI061165; Sun, 24 Apr 2011 20:11:38 -0500 (CDT) (envelope-from rand) Message-Id: <201104250111.p3P1BcrI061165@newman.meridian-enviro.com> Date: Sun, 24 Apr 2011 20:11:38 -0500 (CDT) From: "Douglas K. Rand" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/156629: [patch] sysutils/puppet patch to use PACKAGEROOT instead of PACKAGESITE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Douglas K. Rand" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2011 01:30:20 -0000 >Number: 156629 >Category: ports >Synopsis: [patch] sysutils/puppet patch to use PACKAGEROOT instead of PACKAGESITE >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: Mon Apr 25 01:30:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Douglas K. Rand >Release: FreeBSD 8.2-RELEASE amd64 >Organization: Meridian Environmental Technology >Environment: System: FreeBSD kermit.meridian-enviro.com 8.2-RELEASE FreeBSD 8.2-RELEASE #1: Fri Mar 11 18:14:49 CST 2011 rand@kermit.meridian-enviro.com:/usr/obj/usr/src/sys/SERVER amd64 >Description: We use our own local (and slightly modified) package site for use with puppet, and setting the PACKAGEROOT env for pkg_add works alot cleaner for us than PACKAGESITE. We get to push off to pkg_add the work of choosing arch and version. The patch lets you set source in a module to something like: http://packages.mydomain.com/ and pkg_add will automatically append, for example: /pub/FreeBSD/ports/amd64/packages-8.2-release/Latest/zsh.tbz to the source. This patch does not work if you leave the default PACKAGE_ORIGIN option enabled. >How-To-Repeat: I thought about patching the existing files/optpatch-package_origin to use pkg_add -r instead of pkg_add -f, but this seemed like a lower impact approach. >Fix: --- sysutils/puppet/Makefile 2011-04-10 11:11:49.000000000 -0500 +++ sysutils/puppet/Makefile 2011-04-21 20:22:55.000000000 -0500 @@ -40,7 +40,8 @@ puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8 OPTIONS= MONGREL "Run puppet server as a mongrel service" Off \ - PACKAGE_ORIGIN "Use port origin as package name" On + PACKAGE_ORIGIN "Use port origin as package name" On \ + PACKAGE_ROOT "Use PACKAGEROOT insted of PACKAGESITE" Off .include @@ -53,6 +54,14 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2 .endif +.if defined(WITH_PACKAGE_ROOT) +.if !defined(WITH_PACKAGE_ORIGIN) +EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_root +.else +BROKEN= "PACKAGE_ROOT option patch is incompatable with PACKAGE_ORIGIN patch." +.endif +.endif + .include post-patch: --- /dev/null 2011-04-21 20:34:09.000000000 -0500 +++ /local-project/jails/wiki/usr/ports/sysutils/puppet/files/optpatch-package_root 2011-04-21 20:23:42.000000000 -0500 @@ -0,0 +1,11 @@ +--- lib/puppet/provider/package/freebsd.rb-orig 2011-04-21 19:36:17.000000000 -0500 ++++ lib/puppet/provider/package/freebsd.rb 2011-04-21 20:09:50.000000000 -0500 +@@ -20,7 +20,7 @@ + + if @resource[:source] =~ /\/$/ + if @resource[:source] =~ /^(ftp|https?):/ +- Puppet::Util::Execution::withenv :PACKAGESITE => @resource[:source] do ++ Puppet::Util::Execution::withenv :PACKAGEROOT => @resource[:source] do + pkgadd "-r", @resource[:name] + end + else >Release-Note: >Audit-Trail: >Unformatted: