From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:55:25 2013 Return-Path: Delivered-To: svn-src-projects@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 E0EC9F17; Mon, 11 Feb 2013 12:55:25 +0000 (UTC) (envelope-from linimon@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 D34B873B; Mon, 11 Feb 2013 12:55:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCtPwm097178; Mon, 11 Feb 2013 12:55:25 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCtPBh097174; Mon, 11 Feb 2013 12:55:25 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111255.r1BCtPBh097174@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:55:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246669 - projects/portbuild/qmanager X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2013 12:55:25 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:55:24 2013 New Revision: 246669 URL: http://svnweb.freebsd.org/changeset/base/246669 Log: Move lib/ to admin/lib, for privilege separation. While here, carefully note why this is being done; move from /var/portbuild to /a/portbuild as the default; and delete unneccesary uses of ${pbd}. Modified: projects/portbuild/qmanager/dumpdb.py projects/portbuild/qmanager/packagebuild projects/portbuild/qmanager/qclient projects/portbuild/qmanager/qmanager.py Modified: projects/portbuild/qmanager/dumpdb.py ============================================================================== --- projects/portbuild/qmanager/dumpdb.py Mon Feb 11 12:50:50 2013 (r246668) +++ projects/portbuild/qmanager/dumpdb.py Mon Feb 11 12:55:24 2013 (r246669) @@ -5,11 +5,9 @@ import sys, os, threading, socket, Queue pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" -pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) from signal import * from sys import exc_info Modified: projects/portbuild/qmanager/packagebuild ============================================================================== --- projects/portbuild/qmanager/packagebuild Mon Feb 11 12:50:50 2013 (r246668) +++ projects/portbuild/qmanager/packagebuild Mon Feb 11 12:55:24 2013 (r246669) @@ -36,11 +36,11 @@ import os import sys pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_DATA') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) from qmanagerclient import * from freebsd_config import * @@ -444,6 +444,8 @@ class worker(threading.Thread): self.setDaemon(True) + # NOTE 20130211: only use ${pbc}/scripts here, *not* ${pbc}/admin/scripts, + # for privilege separation purposes. def run(self): pkg = self.job Modified: projects/portbuild/qmanager/qclient ============================================================================== --- projects/portbuild/qmanager/qclient Mon Feb 11 12:50:50 2013 (r246668) +++ projects/portbuild/qmanager/qclient Mon Feb 11 12:55:24 2013 (r246669) @@ -10,11 +10,9 @@ import socket, os, sys from optparse import OptionParser pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" -pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) from qmanagerclient import * from freebsd_config import * Modified: projects/portbuild/qmanager/qmanager.py ============================================================================== --- projects/portbuild/qmanager/qmanager.py Mon Feb 11 12:50:50 2013 (r246668) +++ projects/portbuild/qmanager/qmanager.py Mon Feb 11 12:55:24 2013 (r246669) @@ -53,11 +53,9 @@ import os import sys pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" -pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) import socket, threading, time, Queue