Hi again,
This diff updates py-buildslave to 0.8.3p1, and adds
a _buildslave user as well as a rc.d startup script.
Tweaked from a diff by Piotr Sikora again
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-buildslave/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 30 Nov 2010 10:59:01 -0000 1.1.1.1
+++ Makefile 16 Apr 2011 12:31:40 -0000
@@ -1,34 +1,37 @@
# $OpenBSD: Makefile,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
-COMMENT= buildslave implementation for the buildot system
+COMMENT = buildslave implementation for the buildot system
-MODPY_EGG_VERSION= 0.8.2
-DISTNAME= buildbot-slave-${MODPY_EGG_VERSION}
-PKGNAME= py-buildslave-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION = 0.8.3
+DISTNAME = buildbot-slave-${MODPY_EGG_VERSION}
+PKGNAME = py-buildslave-${MODPY_EGG_VERSION}
-CATEGORIES= devel
+CATEGORIES = devel
-HOMEPAGE= http://buildbot.net/
+HOMEPAGE = http://buildbot.net/
-MAINTAINER= Eric Faurot <e...@openbsd.org>
+MAINTAINER = Eric Faurot <e...@openbsd.org>
# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=buildbot/}
-
-MODULES= lang/python
-
-RUN_DEPENDS= devel/py-twisted/core \
- devel/py-twisted/conch \
- devel/py-twisted/mail \
- devel/py-twisted/web \
- devel/py-twisted/words
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
-REGRESS_DEPENDS= ${RUN_DEPENDS}
+MASTER_SITES = http://buildbot.googlecode.com/files/
+
+MODULES = lang/python
+
+MODPY_SETUPTOOLS = Yes
+
+RUN_DEPENDS = devel/py-twisted/core
+
+REGRESS_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-mock
+
+HOMEDIR = /var/buildslave
+
+SUBST_VARS += HOMEDIR
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-buildslave
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-buildslave/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 30 Nov 2010 10:59:01 -0000 1.1.1.1
+++ distinfo 16 Apr 2011 12:31:40 -0000
@@ -1,5 +1,5 @@
-MD5 (buildbot-slave-0.8.2.tar.gz) = p2v8E4BiEilYJcldaJWrTg==
-RMD160 (buildbot-slave-0.8.2.tar.gz) = E4wsBdd/kVkN5lL6rmcEX86HPXU=
-SHA1 (buildbot-slave-0.8.2.tar.gz) = V0nJ4iugM2sjn9tt/go5J4V5Iwo=
-SHA256 (buildbot-slave-0.8.2.tar.gz) =
e97Lli8r2HfhsGvDNiiUnhVAAQY06s/DePaPDbQH+wc=
-SIZE (buildbot-slave-0.8.2.tar.gz) = 79997
+MD5 (buildbot-slave-0.8.3.tar.gz) = y52dDC2SXlG7PI1iCD13pw==
+RMD160 (buildbot-slave-0.8.3.tar.gz) = 1Vas02TpjYZ3xIRykhGUfDCHhw8=
+SHA1 (buildbot-slave-0.8.3.tar.gz) = 9C0prA09Yw8nfxPjkpZXirsdFqw=
+SHA256 (buildbot-slave-0.8.3.tar.gz) =
4Ng8WJRJW4LAtwJIBlPqcS5SiPZEoPBmEJnma6ZO1Ww=
+SIZE (buildbot-slave-0.8.3.tar.gz) = 86438
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 30 Nov 2010 10:59:01 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
---- setup.py.orig Fri Oct 29 02:33:35 2010
-+++ setup.py Tue Nov 30 11:03:13 2010
-@@ -93,11 +93,7 @@ setup_args = {
- if sys.platform == "win32":
- setup_args['zip_safe'] = False
-
--try:
-- # If setuptools is installed, then we'll add setuptools-specific arguments
-- # to the setup args.
-- import setuptools #@UnusedImport
--except ImportError:
-+if True:
- setup_args['scripts'] = [
- 'bin/buildslave'
- ]
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-buildslave/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 30 Nov 2010 10:59:01 -0000 1.1.1.1
+++ pkg/PLIST 16 Apr 2011 12:31:40 -0000
@@ -1,6 +1,13 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
+@newgroup _buildslave:674
+@newuser _buildslave:674:_buildslave:daemon:Buildslave
daemon:${HOMEDIR}:/sbin/nologin
bin/buildslave
-lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/buildslave/
lib/python${MODPY_VERSION}/site-packages/buildslave/VERSION
lib/python${MODPY_VERSION}/site-packages/buildslave/__init__.py
@@ -20,6 +27,8 @@
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/cvs.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/darcs.py
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/darcs.pyc
+lib/python${MODPY_VERSION}/site-packages/buildslave/commands/fs.py
+lib/python${MODPY_VERSION}/site-packages/buildslave/commands/fs.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/git.py
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/git.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/hg.py
@@ -28,6 +37,8 @@
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/p4.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/registry.py
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/registry.pyc
+lib/python${MODPY_VERSION}/site-packages/buildslave/commands/repo.py
+lib/python${MODPY_VERSION}/site-packages/buildslave/commands/repo.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/shell.py
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/shell.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/commands/svn.py
@@ -82,6 +93,8 @@
lib/python${MODPY_VERSION}/site-packages/buildslave/test/unit/test_commands_cvs.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/test/unit/test_commands_darcs.py
lib/python${MODPY_VERSION}/site-packages/buildslave/test/unit/test_commands_darcs.pyc
+lib/python${MODPY_VERSION}/site-packages/buildslave/test/unit/test_commands_fs.py
+lib/python${MODPY_VERSION}/site-packages/buildslave/test/unit/test_commands_fs.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/test/unit/test_commands_git.py
lib/python${MODPY_VERSION}/site-packages/buildslave/test/unit/test_commands_git.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/test/unit/test_commands_hg.py
@@ -113,5 +126,11 @@
lib/python${MODPY_VERSION}/site-packages/buildslave/test/util/sourcecommand.pyc
lib/python${MODPY_VERSION}/site-packages/buildslave/util.py
lib/python${MODPY_VERSION}/site-packages/buildslave/util.pyc
+share/doc/pkg-readmes/py-buildslave-${MODPY_EGG_VERSION}
share/doc/py-buildslave/
share/doc/py-buildslave/README
+@rcscript ${RCDIR}/buildslave
+@mode 700
+@owner _buildslave
+@group _buildslave
+@sample ${HOMEDIR}/
Index: pkg/README
===================================================================
RCS file: pkg/README
diff -N pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README 16 Apr 2011 12:31:40 -0000
@@ -0,0 +1,4 @@
+To initialize new Buildbot slave run:
+
+ sudo -u _buildslave ${PREFIX}/bin/buildslave \
+ create-slave ${HOMEDIR} <master> <name> <passwd>
Index: pkg/buildslave.rc
===================================================================
RCS file: pkg/buildslave.rc
diff -N pkg/buildslave.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/buildslave.rc 16 Apr 2011 12:31:40 -0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/bin/buildslave"
+daemon_flags="${HOMEDIR}"
+daemon_user="_buildslave"
+
+. /etc/rc.d/rc.subr
+
+pexp="${MODPY_BIN} ${daemon} start ${daemon_flags}"
+
+rc_reload=NO
+
+rc_start() {
+ ${rcexec} "${daemon} start ${daemon_flags}"
+}
+
+rc_stop() {
+ ${rcexec} "${daemon} stop ${daemon_flags}"
+}
+
+rc_cmd $1
