New version with new maintainer, updated rc script and improved README file.
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/py-buildbot/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 15 Nov 2010 19:46:07 -0000 1.10 +++ Makefile 18 Apr 2011 20:35:11 -0000 @@ -1,39 +1,44 @@ # $OpenBSD: Makefile,v 1.10 2010/11/15 19:46:07 espie Exp $ -COMMENT = system to automate the compile/test cycle +COMMENT = system to automate the compile/test cycle -MODPY_EGG_VERSION = 0.8.2 -DISTNAME = buildbot-${MODPY_EGG_VERSION} -PKGNAME = py-${DISTNAME} -REVISION = 0 +MODPY_EGG_VERSION = 0.8.3p1 +DISTNAME = buildbot-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME:S/p/./} -CATEGORIES = devel +CATEGORIES = devel -HOMEPAGE = http://buildbot.net/ +HOMEPAGE = http://buildbot.net/ -MAINTAINER = Will Maier <wcma...@openbsd.org> +MAINTAINER = Piotr Sikora <piotr.sik...@frickle.com> # 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 - -MODPY_SETUPTOOLS = Yes -MODPY_BADEGGS = buildbot - -RUN_DEPENDS = devel/py-twisted/core \ - devel/py-twisted/conch \ - devel/py-twisted/mail \ - devel/py-twisted/web \ - devel/py-twisted/words \ - www/py-jinja2 \ - ${MODPY_JSON} -REGRESS_DEPENDS = ${RUN_DEPENDS} +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes + +MASTER_SITES = http://buildbot.googlecode.com/files/ + +MODULES = lang/python + +MODPY_SETUPTOOLS = Yes +MODPY_BADEGGS = buildbot + +RUN_DEPENDS = devel/py-twisted/core \ + devel/py-twisted/conch \ + devel/py-twisted/mail \ + devel/py-twisted/web \ + devel/py-twisted/words \ + www/py-jinja2 \ + ${MODPY_JSON} + +REGRESS_DEPENDS = ${RUN_DEPENDS} \ + devel/py-mock + +HOMEDIR = /var/buildbot + +SUBST_VARS += HOMEDIR post-configure: @cd ${WRKSRC}/docs && makeinfo --no-split --html buildbot Index: distinfo =================================================================== RCS file: /cvs/ports/devel/py-buildbot/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 7 Nov 2010 17:17:42 -0000 1.6 +++ distinfo 18 Apr 2011 20:35:11 -0000 @@ -1,5 +1,5 @@ -MD5 (buildbot-0.8.2.tar.gz) = o3f3m45ZwpiRiG65gNyHAw== -RMD160 (buildbot-0.8.2.tar.gz) = E5o+czDOFyMw/at9tSXU2HF0Buc= -SHA1 (buildbot-0.8.2.tar.gz) = gosPApita2xnt92Xib5vusbH4p8= -SHA256 (buildbot-0.8.2.tar.gz) = RY5VPjphWLhIH+mfarRwnKkfc6JNtTwkiVoGViGCkEM= -SIZE (buildbot-0.8.2.tar.gz) = 4054183 +MD5 (buildbot-0.8.3p1.tar.gz) = kZq2YJC8rdErTbMZhRHpSw== +RMD160 (buildbot-0.8.3p1.tar.gz) = c35IY8Nx0+nTAGNWSuYuNetwqFY= +SHA1 (buildbot-0.8.3p1.tar.gz) = ewwtOnwqzGbDyV/HqSrLK8JidAk= +SHA256 (buildbot-0.8.3p1.tar.gz) = CknTWnVSSlTbu4dXMP33q9i5bK4WCvBFe09SObH++jc= +SIZE (buildbot-0.8.3p1.tar.gz) = 4068355 Index: patches/patch-buildbot_process_builder_py =================================================================== RCS file: patches/patch-buildbot_process_builder_py diff -N patches/patch-buildbot_process_builder_py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-buildbot_process_builder_py 18 Apr 2011 20:35:11 -0000 @@ -0,0 +1,14 @@ +Backported from upstream: ef106f36ec8fd1bf2be36da5b6db754c36e2c122 +--- buildbot/process/builder.py.orig ++++ buildbot/process/builder.py +@@ -472,8 +472,8 @@ class Builder(pb.Referenceable, service.MultiService): + diffs.append('logHorizon changed from %s to %s' % (self.logHorizon, setup['logHorizon'])) + if setup['eventHorizon'] != self.eventHorizon: + diffs.append('eventHorizon changed from %s to %s' % (self.eventHorizon, setup['eventHorizon'])) +- if setup['category'] != self.category: +- diffs.append('category changed from %r to %r' % (self.category, setup['category'])) ++ if setup.get('category', None) != self.category: ++ diffs.append('category changed from %r to %r' % (self.category, setup.get('category', None))) + + return diffs + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/py-buildbot/pkg/PLIST,v retrieving revision 1.7 diff -u -r1.7 PLIST --- pkg/PLIST 8 Nov 2010 01:20:06 -0000 1.7 +++ pkg/PLIST 18 Apr 2011 20:35:12 -0000 @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.7 2010/11/08 01:20:06 fgsch Exp $ +@newgroup _buildbot:673 +@newuser _buildbot:673:_buildbot:daemon:Buildbot daemon:${HOMEDIR}:/sbin/nologin bin/buildbot lib/python${MODPY_VERSION}/site-packages/buildbot/ lib/python${MODPY_VERSION}/site-packages/buildbot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ @@ -24,8 +26,8 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/changes/bonsaipoller.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/changes/changes.py lib/python${MODPY_VERSION}/site-packages/buildbot/changes/changes.pyc -lib/python${MODPY_VERSION}/site-packages/buildbot/changes/freshcvs.py -lib/python${MODPY_VERSION}/site-packages/buildbot/changes/freshcvs.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/changes/gerritchangesource.py +lib/python${MODPY_VERSION}/site-packages/buildbot/changes/gerritchangesource.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/changes/gitpoller.py lib/python${MODPY_VERSION}/site-packages/buildbot/changes/gitpoller.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/changes/hgbuildbot.py @@ -101,6 +103,8 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/manhole.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/master.py lib/python${MODPY_VERSION}/site-packages/buildbot/master.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/pbmanager.py +lib/python${MODPY_VERSION}/site-packages/buildbot/pbmanager.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/pbutil.py lib/python${MODPY_VERSION}/site-packages/buildbot/pbutil.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/process/ @@ -174,6 +178,8 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/status/persistent_queue.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/status/progress.py lib/python${MODPY_VERSION}/site-packages/buildbot/status/progress.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/status/status_gerrit.py +lib/python${MODPY_VERSION}/site-packages/buildbot/status/status_gerrit.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/status/status_push.py lib/python${MODPY_VERSION}/site-packages/buildbot/status/status_push.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/status/tinderbox.py @@ -300,6 +306,8 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/steps/python_twisted.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/steps/shell.py lib/python${MODPY_VERSION}/site-packages/buildbot/steps/shell.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/steps/slave.py +lib/python${MODPY_VERSION}/site-packages/buildbot/steps/slave.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/steps/source.py lib/python${MODPY_VERSION}/site-packages/buildbot/steps/source.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/steps/subunit.py @@ -320,6 +328,8 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/test/fake/fakedb.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/fake/state.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/fake/state.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/fake/web.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/fake/web.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/regressions/ lib/python${MODPY_VERSION}/site-packages/buildbot/test/regressions/__init__.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/regressions/__init__.pyc @@ -338,8 +348,18 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/ lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/__init__.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_base.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_base.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_bonsaipoller.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_bonsaipoller.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_gerritchangesource.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_gerritchangesource.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_gitpoller.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_gitpoller.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_mail_CVSMaildirSource.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_mail_CVSMaildirSource.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_pb.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_changes_pb.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_contrib_buildbot_cvs_mail.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_contrib_buildbot_cvs_mail.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_db_connector.py @@ -350,12 +370,12 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_db_schema_master.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_db_util.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_db_util.pyc -lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_gitpoller.py -lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_gitpoller.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_master_cleanshutdown.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_master_cleanshutdown.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_oldpaths.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_oldpaths.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_pbmanager.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_pbmanager.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_persistent_queue.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_persistent_queue.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_process_base.py @@ -364,6 +384,8 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_process_buildstep.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_process_properties.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_process_properties.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_repo_parse_download.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_repo_parse_download.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_schedulers_basic_Scheduler.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_schedulers_basic_Scheduler.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_schedulers_filter.py @@ -374,6 +396,8 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_source_repourl.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_builder.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_builder.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_builder_LogFileProducer.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_builder_LogFileProducer.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_mail_MailNotifier.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_mail_MailNotifier.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_web_authz_Authz.py @@ -384,6 +408,8 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_web_change_hooks_github.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_web_links.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_status_web_links.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_steps_slave.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_steps_slave.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_steps_transfer.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_steps_transfer.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/unit/test_util.py @@ -399,10 +425,12 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/ lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/__init__.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/changesource.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/changesource.pyc +lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/pbmanager.py +lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/pbmanager.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/threads.py lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/threads.pyc -lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/web.py -lib/python${MODPY_VERSION}/site-packages/buildbot/test/util/web.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/util/ lib/python${MODPY_VERSION}/site-packages/buildbot/util/__init__.py lib/python${MODPY_VERSION}/site-packages/buildbot/util/__init__.pyc @@ -414,6 +442,7 @@ lib/python${MODPY_VERSION}/site-packages/buildbot/util/loop.pyc lib/python${MODPY_VERSION}/site-packages/buildbot/util/monkeypatches.py lib/python${MODPY_VERSION}/site-packages/buildbot/util/monkeypatches.pyc +share/doc/pkg-readmes/${FULLPKGNAME} share/doc/py-buildbot/ share/doc/py-buildbot/README share/doc/py-buildbot/buildbot.html @@ -435,7 +464,6 @@ share/doc/py-buildbot/contrib/git_buildbot.py share/doc/py-buildbot/contrib/github_buildbot.py share/doc/py-buildbot/contrib/googlecode_atom.py -share/doc/py-buildbot/contrib/hg_buildbot.py share/doc/py-buildbot/contrib/init-scripts/ share/doc/py-buildbot/contrib/init-scripts/buildmaster.default share/doc/py-buildbot/contrib/init-scripts/buildmaster.init.sh @@ -475,4 +503,10 @@ share/doc/py-buildbot/images/status.png share/examples/py-buildbot/ share/examples/py-buildbot/hello.cfg +share/examples/py-buildbot/repo_gerrit.cfg share/examples/py-buildbot/twisted_master.cfg +@rcscript ${RCDIR}/buildbot +@mode 700 +@owner _buildbot +@group _buildbot +@sample ${HOMEDIR}/ Index: pkg/README =================================================================== RCS file: pkg/README diff -N pkg/README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/README 18 Apr 2011 20:35:12 -0000 @@ -0,0 +1,19 @@ +$OpenBSD: README-server,v 1.4 2011/02/09 10:53:12 pea Exp $ + +Using Buildbot in an OpenBSD environment +========================================== + +On OpenBSD, the buildbot package has an associated _buildot user for +running the server. The default master directory is expected to be +found in /var/buildbot. Before being run for the first time, the +master directory must be initialized. This is done as follows: + + # su - _buildbot + $ usr/local/bin/buildbot create-master /var/buildbot + +The next step is to create a /var/buildbot/master.cfg configuration +file that fits your needs. Please refer to the buildbot documentation +on how to do so. + +Once all of this is done, the buildot can be run through the rc.d(8) +daemon control framework. Index: pkg/buildbot.rc =================================================================== RCS file: pkg/buildbot.rc diff -N pkg/buildbot.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/buildbot.rc 18 Apr 2011 20:35:12 -0000 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# $OpenBSD$ + +daemon="${TRUEPREFIX}/bin/buildbot" +daemon_flags="${HOMEDIR}" +daemon_user="_buildbot" + +. /etc/rc.d/rc.subr + +pexp="${MODPY_BIN} ${daemon} start ${daemon_flags}" + +rc_pre() { + [ -f ${HOMEDIR}/master.cfg ] || (echo missing configuration file: ${HOMEDIR}/master.cfg; exit 1); +} + +rc_start() { + ${rcexec} "${daemon} start ${daemon_flags}" +} + +rc_reload() { + ${rcexec} "${daemon} reconfig ${daemon_flags}" +} + +rc_stop() { + ${rcexec} "${daemon} stop ${daemon_flags}" +} + +rc_cmd $1