Attachment #186141 for bug #220564




# $FreeBSD$

PORTNAME=	buildbot
PORTVERSION=	0.9.10
PORTREVISION=	1
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP


		${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications \
		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \
		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
		${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
TEST_DEPENDS=	trial:devel/py-twisted \
		buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3
		${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests

USE_RC_SUBR=	buildbot
USES=		python:-2.7

Lines 1-3 Link Here

(-)devel/buildbot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1490709808	1	TIMESTAMP = 1504051787
2	SHA256 (buildbot-0.9.5.tar.gz) = c6408c5abe78f17e92750e1e462d4cfc8a79558dcc7354ea4dea2058ed282587	2	SHA256 (buildbot-0.9.10.tar.gz) = 8c5ed75f3f16f4ff0f2c9e3f9b091acb5e6e1c0ef68ffa8f687a55413a833143
3	SIZE (buildbot-0.9.5.tar.gz) = 3071500	3	SIZE (buildbot-0.9.10.tar.gz) = 3112750




--- buildbot/scripts/sample.cfg~	2017-01-11 14:05:29.000000000 +0100
+++ buildbot/scripts/sample.cfg	2017-03-07 18:01:36.617128988 +0100
@@ -10,6 +10,9 @@
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
+####### DON'T SEND USAGE DATA TO BUILDBOT.NET
+c['buildbotNetUsageData'] = None
+
 ####### WORKERS
 
 # The 'workers' list defines the set of recognized workers. Each element is




--- setup.py~	2017-03-28 21:19:34.000000000 +0000
+++ setup.py	2017-03-28 21:19:39.875072000 +0000
@@ -180,6 +180,7 @@
         "buildbot.schedulers",
         "buildbot.scripts",
         "buildbot.secrets",
+        "buildbot.secrets.providers",
         "buildbot.statistics",
         "buildbot.statistics.storage_backends",
         "buildbot.status",
@@ -453,7 +453,6 @@
     'txaio ' + txaio_ver,
     'autobahn ' + autobahn_ver,
     'PyJWT',
-    'distro'
 ]
 
 # Unit test dependencies.

Lines 2-8 Link Here

(-)devel/buildbot-console-view/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= buildbot-console-view	4	PORTNAME= buildbot-console-view
5	PORTVERSION= 0.9.5	5	PORTVERSION= 0.9.10
6	CATEGORIES= devel python	6	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8		8
Lines 19-25 Link Here
19	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \	19	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
20	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \	20	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
21	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \	21	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
22	${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests	22	${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
23		23
24	USES= python:-2.7	24	USES= python:-2.7
25	USE_PYTHON= autoplist distutils	25	USE_PYTHON= autoplist distutils

Lines 1-3 Link Here

(-)devel/buildbot-console-view/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1490709809	1	TIMESTAMP = 1504051930
2	SHA256 (buildbot-console-view-0.9.5.tar.gz) = 0b0ecc2dda50975837d0c55f6154f5829fb69618aa87b5e1994fb75212dfd5e8	2	SHA256 (buildbot-console-view-0.9.10.tar.gz) = ca62780a7405df761fa2d80019890c8b25d79f6b716df26fbc4ce257a21f762e
3	SIZE (buildbot-console-view-0.9.5.tar.gz) = 631548	3	SIZE (buildbot-console-view-0.9.10.tar.gz) = 640908

Lines 2-8 Link Here

(-)devel/buildbot-pkg/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= buildbot-pkg	4	PORTNAME= buildbot-pkg
5	PORTVERSION= 0.9.5	5	PORTVERSION= 0.9.10
6	CATEGORIES= devel python	6	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8		8
Lines 19-25 Link Here
19	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \	19	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
20	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \	20	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
21	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \	21	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
22	${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests	22	${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
23		23
24	USES= python:-2.7	24	USES= python:-2.7
25	USE_PYTHON= autoplist distutils	25	USE_PYTHON= autoplist distutils

Lines 1-3 Link Here

(-)devel/buildbot-pkg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1490709810	1	TIMESTAMP = 1504051931
2	SHA256 (buildbot-pkg-0.9.5.tar.gz) = 21566eff98d76792c39e237ea437fd8ba9abdb6e05e95aeb3de91b460127f1f6	2	SHA256 (buildbot-pkg-0.9.10.tar.gz) = 6eecdde02f98be469ec9fde47c55fe64ca04eec764a4729be2ff4faa892532d8
3	SIZE (buildbot-pkg-0.9.5.tar.gz) = 3867	3	SIZE (buildbot-pkg-0.9.10.tar.gz) = 4422

Lines 2-8 Link Here

(-)devel/buildbot-waterfall-view/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= buildbot-waterfall-view	4	PORTNAME= buildbot-waterfall-view
5	PORTVERSION= 0.9.5	5	PORTVERSION= 0.9.10
6	CATEGORIES= devel python	6	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8		8
Lines 19-25 Link Here
19	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \	19	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
20	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \	20	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
21	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \	21	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
22	${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests	22	${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
23		23
24	USES= python:-2.7	24	USES= python:-2.7
25	USE_PYTHON= autoplist distutils	25	USE_PYTHON= autoplist distutils

Lines 1-3 Link Here

(-)devel/buildbot-waterfall-view/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1490709811	1	TIMESTAMP = 1504051937
2	SHA256 (buildbot-waterfall-view-0.9.5.tar.gz) = f398fceed508b885f5260bfe3d0e28da327c3d25103874fe0a971f949a21c884	2	SHA256 (buildbot-waterfall-view-0.9.10.tar.gz) = c2768391d7eb92e550afe4210e3cba7b69b34a7c9a27d333582f2a04b0f8b030
3	SIZE (buildbot-waterfall-view-0.9.5.tar.gz) = 705508	3	SIZE (buildbot-waterfall-view-0.9.10.tar.gz) = 714260

Lines 2-9 Link Here

(-)devel/buildbot-worker/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= buildbot-worker	4	PORTNAME= buildbot-worker
5	PORTVERSION= 0.9.5	5	PORTVERSION= 0.9.10
6	PORTREVISION= 1
7	CATEGORIES= devel python	6	CATEGORIES= devel python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
9		8

Lines 1-3 Link Here

(-)devel/buildbot-worker/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1490709812	1	TIMESTAMP = 1504051939
2	SHA256 (buildbot-worker-0.9.5.tar.gz) = be89dbbd64ac4d10c8b43ea0fd8378803170247493c8ae023a4e8732aa9287aa	2	SHA256 (buildbot-worker-0.9.10.tar.gz) = 1793631d74629cd73bc0df1fadf28fb34d87e63aa72cba82058122bde165a824
3	SIZE (buildbot-worker-0.9.5.tar.gz) = 94674	3	SIZE (buildbot-worker-0.9.10.tar.gz) = 99028




# $FreeBSD$

PORTNAME=	buildbot-www
PORTVERSION=	0.9.10
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP


BUILD_DEPENDS=	${MY_DEPENDS}
RUN_DEPENDS=	${MY_DEPENDS} \
		buildbot-console-view>=${PORTVERSION}:devel/buildbot-console-view \
		buildbot-waterfall-view>=${PORTVERSION}:devel/buildbot-waterfall-view \
		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity
TEST_DEPENDS=	trial:devel/py-twisted \
		buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
		${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
		${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests

USES=		python:-2.7
USE_PYTHON=	autoplist distutils

Lines 1-3 Link Here

(-)devel/buildbot-www/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1490709814	1	TIMESTAMP = 1504051917
2	SHA256 (buildbot-www-0.9.5.tar.gz) = 42c07fea15c352f3e4bf778d148715eeb76141b55519de1358cf06ad73d233d9	2	SHA256 (buildbot-www-0.9.10.tar.gz) = 9083516d702feefb8b61dd6cb351a54163f3b2d4f34b14071f77f2f550de9bf6
3	SIZE (buildbot-www-0.9.5.tar.gz) = 691886	3	SIZE (buildbot-www-0.9.10.tar.gz) = 693452

Return to bug 220564

Lines 2-9 Link Here

(-)devel/buildbot/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= buildbot	4	PORTNAME= buildbot
5	PORTVERSION= 0.9.5	5	PORTVERSION= 0.9.10
6	PORTREVISION= 1
7	CATEGORIES= devel python	6	CATEGORIES= devel python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
9		8
Lines 23-34 Link Here
23	${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications \	22	${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications \
24	${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \	23	${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \
25	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \	24	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \
26	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3	25	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
		26	${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
27	TEST_DEPENDS= trial:devel/py-twisted \	27	TEST_DEPENDS= trial:devel/py-twisted \
28	buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \	28	buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
29	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \	29	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
30	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \	30	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3
31	${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests
32		31
33	USE_RC_SUBR= buildbot	32	USE_RC_SUBR= buildbot
34	USES= python:-2.7	33	USES= python:-2.7

Lines 1-12 Link Here

(-)devel/buildbot/files/patch-buildbot-scripts-sample.cfg (-12 lines)
1	--- buildbot/scripts/sample.cfg~ 2017-01-11 14:05:29.000000000 +0100
2	+++ buildbot/scripts/sample.cfg 2017-03-07 18:01:36.617128988 +0100
3	@@ -10,6 +10,9 @@
4	# a shorter alias to save typing.
5	c = BuildmasterConfig = {}
6
7	+####### DON'T SEND USAGE DATA TO BUILDBOT.NET
8	+c['buildbotNetUsageData'] = None
9	+
10	####### WORKERS
11
12	# The 'workers' list defines the set of recognized workers. Each element is

Lines 1-18 Link Here

(-)devel/buildbot/files/patch-setup.py (-18 lines)
1	--- setup.py~ 2017-03-28 21:19:34.000000000 +0000
2	+++ setup.py 2017-03-28 21:19:39.875072000 +0000
3	@@ -180,6 +180,7 @@
4	"buildbot.schedulers",
5	"buildbot.scripts",
6	"buildbot.secrets",
7	+ "buildbot.secrets.providers",
8	"buildbot.statistics",
9	"buildbot.statistics.storage_backends",
10	"buildbot.status",
11	@@ -453,7 +453,6 @@
12	'txaio ' + txaio_ver,
13	'autobahn ' + autobahn_ver,
14	'PyJWT',
15	- 'distro'
16	]
17
18	# Unit test dependencies.

Lines 2-8 Link Here

(-)devel/buildbot-www/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= buildbot-www	4	PORTNAME= buildbot-www
5	PORTVERSION= 0.9.5	5	PORTVERSION= 0.9.10
6	CATEGORIES= devel python	6	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8		8
Lines 17-29 Link Here
17	BUILD_DEPENDS= ${MY_DEPENDS}	17	BUILD_DEPENDS= ${MY_DEPENDS}
18	RUN_DEPENDS= ${MY_DEPENDS} \	18	RUN_DEPENDS= ${MY_DEPENDS} \
19	buildbot-console-view>=${PORTVERSION}:devel/buildbot-console-view \	19	buildbot-console-view>=${PORTVERSION}:devel/buildbot-console-view \
20	buildbot-waterfall-view>=${PORTVERSION}:devel/buildbot-waterfall-view	20	buildbot-waterfall-view>=${PORTVERSION}:devel/buildbot-waterfall-view \
		21	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity
21	TEST_DEPENDS= trial:devel/py-twisted \	22	TEST_DEPENDS= trial:devel/py-twisted \
22	buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \	23	buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
23	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \	24	${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
24	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \	25	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
25	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \	26	${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
26	${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests
27		27
28	USES= python:-2.7	28	USES= python:-2.7
29	USE_PYTHON= autoplist distutils	29	USE_PYTHON= autoplist distutils