svn commit: r246669 - projects/portbuild/qmanager
Mark Linimon
linimon at FreeBSD.org
Mon Feb 11 12:55:25 UTC 2013
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
More information about the svn-src-projects
mailing list