grembo updated this revision to Diff 26742.
grembo added a comment.
Update to 0.9.5, including missing files and fixing pending upstream.
Use PORTVERSION in dependencies (as all parts of buildbot need
to get updated at the same time.
REPOSITORY
rP FreeBSD ports repository
CHANGES SINCE LAST UPDATE
https://reviews.freebsd.org/D10162?vs=26724&id=26742
REVISION DETAIL
https://reviews.freebsd.org/D10162
AFFECTED FILES
devel/buildbot-console-view/Makefile
devel/buildbot-console-view/distinfo
devel/buildbot-pkg/Makefile
devel/buildbot-pkg/distinfo
devel/buildbot-waterfall-view/Makefile
devel/buildbot-waterfall-view/distinfo
devel/buildbot-worker/Makefile
devel/buildbot-worker/distinfo
devel/buildbot-www/Makefile
devel/buildbot-www/distinfo
devel/buildbot/Makefile
devel/buildbot/distinfo
devel/buildbot/files/patch-buildbot-secrets
devel/buildbot/files/patch-setup.py
EMAIL PREFERENCES
https://reviews.freebsd.org/settings/panel/emailpreferences/
To: grembo, freebsd-python-list, rodrigc
Cc: mat
diff --git a/devel/buildbot-www/distinfo b/devel/buildbot-www/distinfo
--- a/devel/buildbot-www/distinfo
+++ b/devel/buildbot-www/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488902698
-SHA256 (buildbot-www-0.9.4.tar.gz) = eb2f48aabee5e840aa8a4fce1f95f2fe4e2ae98045f9465d275ee5e263ae04b3
-SIZE (buildbot-www-0.9.4.tar.gz) = 691706
+TIMESTAMP = 1490709814
+SHA256 (buildbot-www-0.9.5.tar.gz) = 42c07fea15c352f3e4bf778d148715eeb76141b55519de1358cf06ad73d233d9
+SIZE (buildbot-www-0.9.5.tar.gz) = 691886
diff --git a/devel/buildbot-www/Makefile b/devel/buildbot-www/Makefile
--- a/devel/buildbot-www/Makefile
+++ b/devel/buildbot-www/Makefile
@@ -2,24 +2,24 @@
# $FreeBSD$
PORTNAME= buildbot-www
-PORTVERSION= 0.9.4
+PORTVERSION= 0.9.5
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
MAINTAINER= gre...@freebsd.org
COMMENT= Continuous Integration Framework (WWW)
LICENSE= GPLv2
-MY_DEPENDS= buildbot>=0.9.4:devel/buildbot \
- buildbot-pkg>=0.9.4:devel/buildbot-pkg \
+MY_DEPENDS= buildbot>=${PORTVERSION}:devel/buildbot \
+ buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg \
${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock
BUILD_DEPENDS= ${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS} \
- buildbot-console-view>=0.9.4:devel/buildbot-console-view \
- buildbot-waterfall-view>=0.9.4:devel/buildbot-waterfall-view
+ buildbot-console-view>=${PORTVERSION}:devel/buildbot-console-view \
+ buildbot-waterfall-view>=${PORTVERSION}:devel/buildbot-waterfall-view
TEST_DEPENDS= trial:devel/py-twisted \
- buildbot-worker>=0.9.4:devel/buildbot-worker \
+ buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
diff --git a/devel/buildbot-worker/distinfo b/devel/buildbot-worker/distinfo
--- a/devel/buildbot-worker/distinfo
+++ b/devel/buildbot-worker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488896679
-SHA256 (buildbot-worker-0.9.4.tar.gz) = 129e0d3fa9ee34f0f227487b6d1645820d2d4853099a1b0aed56587d3acab965
-SIZE (buildbot-worker-0.9.4.tar.gz) = 100889
+TIMESTAMP = 1490709812
+SHA256 (buildbot-worker-0.9.5.tar.gz) = be89dbbd64ac4d10c8b43ea0fd8378803170247493c8ae023a4e8732aa9287aa
+SIZE (buildbot-worker-0.9.5.tar.gz) = 94674
diff --git a/devel/buildbot-worker/Makefile b/devel/buildbot-worker/Makefile
--- a/devel/buildbot-worker/Makefile
+++ b/devel/buildbot-worker/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= buildbot-worker
-PORTVERSION= 0.9.4
-PORTREVISION= 3
+PORTVERSION= 0.9.5
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
diff --git a/devel/buildbot-waterfall-view/distinfo b/devel/buildbot-waterfall-view/distinfo
--- a/devel/buildbot-waterfall-view/distinfo
+++ b/devel/buildbot-waterfall-view/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488906879
-SHA256 (buildbot-waterfall-view-0.9.4.tar.gz) = 4e8e8d85a77a95fb6ec6e9b0eaa4a774f80cbc6f3a6568f8525d4c90f336b69f
-SIZE (buildbot-waterfall-view-0.9.4.tar.gz) = 705483
+TIMESTAMP = 1490709811
+SHA256 (buildbot-waterfall-view-0.9.5.tar.gz) = f398fceed508b885f5260bfe3d0e28da327c3d25103874fe0a971f949a21c884
+SIZE (buildbot-waterfall-view-0.9.5.tar.gz) = 705508
diff --git a/devel/buildbot-waterfall-view/Makefile b/devel/buildbot-waterfall-view/Makefile
--- a/devel/buildbot-waterfall-view/Makefile
+++ b/devel/buildbot-waterfall-view/Makefile
@@ -2,20 +2,20 @@
# $FreeBSD$
PORTNAME= buildbot-waterfall-view
-PORTVERSION= 0.9.4
+PORTVERSION= 0.9.5
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
MAINTAINER= gre...@freebsd.org
COMMENT= Continuous Integration Framework (Waterfall View)
LICENSE= GPLv2
-MY_DEPENDS= buildbot-pkg>=0.9.4:devel/buildbot-pkg
+MY_DEPENDS= buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
BUILD_DEPENDS= ${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS}
TEST_DEPENDS= trial:devel/py-twisted \
- buildbot-worker>=0.9.4:devel/buildbot-worker \
+ buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
diff --git a/devel/buildbot-pkg/distinfo b/devel/buildbot-pkg/distinfo
--- a/devel/buildbot-pkg/distinfo
+++ b/devel/buildbot-pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488904370
-SHA256 (buildbot-pkg-0.9.4.tar.gz) = 968f252f0700fbbcc6cac9f3fcf66d06bd577db5bf793fb3d7c84158f4f64325
-SIZE (buildbot-pkg-0.9.4.tar.gz) = 3830
+TIMESTAMP = 1490709810
+SHA256 (buildbot-pkg-0.9.5.tar.gz) = 21566eff98d76792c39e237ea437fd8ba9abdb6e05e95aeb3de91b460127f1f6
+SIZE (buildbot-pkg-0.9.5.tar.gz) = 3867
diff --git a/devel/buildbot-pkg/Makefile b/devel/buildbot-pkg/Makefile
--- a/devel/buildbot-pkg/Makefile
+++ b/devel/buildbot-pkg/Makefile
@@ -2,20 +2,20 @@
# $FreeBSD$
PORTNAME= buildbot-pkg
-PORTVERSION= 0.9.4
+PORTVERSION= 0.9.5
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
MAINTAINER= gre...@freebsd.org
COMMENT= Continuous Integration Framework (packaging)
LICENSE= GPLv2
-MY_DEPENDS= buildbot>=0.9.4:devel/buildbot
+MY_DEPENDS= buildbot>=${PORTVERSION}:devel/buildbot
BUILD_DEPENDS= ${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS}
TEST_DEPENDS= trial:devel/py-twisted \
- buildbot-worker>=0.9.4:devel/buildbot-worker \
+ buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
diff --git a/devel/buildbot-console-view/distinfo b/devel/buildbot-console-view/distinfo
--- a/devel/buildbot-console-view/distinfo
+++ b/devel/buildbot-console-view/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488906561
-SHA256 (buildbot-console-view-0.9.4.tar.gz) = 16d1ab8801439d50d712883ab155530840588d4d77ab600299ead0ef23da5bf0
-SIZE (buildbot-console-view-0.9.4.tar.gz) = 631510
+TIMESTAMP = 1490709809
+SHA256 (buildbot-console-view-0.9.5.tar.gz) = 0b0ecc2dda50975837d0c55f6154f5829fb69618aa87b5e1994fb75212dfd5e8
+SIZE (buildbot-console-view-0.9.5.tar.gz) = 631548
diff --git a/devel/buildbot-console-view/Makefile b/devel/buildbot-console-view/Makefile
--- a/devel/buildbot-console-view/Makefile
+++ b/devel/buildbot-console-view/Makefile
@@ -2,20 +2,20 @@
# $FreeBSD$
PORTNAME= buildbot-console-view
-PORTVERSION= 0.9.4
+PORTVERSION= 0.9.5
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
MAINTAINER= gre...@freebsd.org
COMMENT= Continuous Integration Framework (Console View)
LICENSE= GPLv2
-MY_DEPENDS= buildbot-pkg>=0.9.4:devel/buildbot-pkg
+MY_DEPENDS= buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
BUILD_DEPENDS= ${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS}
TEST_DEPENDS= trial:devel/py-twisted \
- buildbot-worker>=0.9.4:devel/buildbot-worker \
+ buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
diff --git a/devel/buildbot/files/patch-setup.py b/devel/buildbot/files/patch-setup.py
new file mode 100644
--- /dev/null
+++ b/devel/buildbot/files/patch-setup.py
@@ -0,0 +1,18 @@
+--- 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.
diff --git a/devel/buildbot/files/patch-buildbot-secrets b/devel/buildbot/files/patch-buildbot-secrets
new file mode 100644
--- /dev/null
+++ b/devel/buildbot/files/patch-buildbot-secrets
@@ -0,0 +1,214 @@
+diff -rNu buildbot/secrets.orig/providers/__init__.py buildbot/secrets/providers/__init__.py
+--- buildbot/secrets.orig/providers/__init__.py 1970-01-01 01:00:00.000000000 +0100
++++ buildbot/secrets/providers/__init__.py 2017-03-28 21:52:03.947803965 +0200
+@@ -0,0 +1,14 @@
++# This file is part of Buildbot. Buildbot is free software: you can
++# redistribute it and/or modify it under the terms of the GNU General Public
++# License as published by the Free Software Foundation, version 2.
++#
++# This program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
++# details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 51
++# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Copyright Buildbot Team Members
+diff -rNu buildbot/secrets.orig/providers/base.py buildbot/secrets/providers/base.py
+--- buildbot/secrets.orig/providers/base.py 1970-01-01 01:00:00.000000000 +0100
++++ buildbot/secrets/providers/base.py 2017-03-28 21:52:03.947803965 +0200
+@@ -0,0 +1,35 @@
++# This file is part of Buildbot. Buildbot is free software: you can
++# redistribute it and/or modify it under the terms of the GNU General Public
++# License as published by the Free Software Foundation, version 2.
++#
++# This program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
++# details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 51
++# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Copyright Buildbot Team Members
++"""
++secret provider interface
++"""
++from __future__ import absolute_import
++from __future__ import print_function
++
++import abc
++
++from buildbot.util.service import BuildbotService
++
++
++class SecretProviderBase(BuildbotService):
++ """
++ Secret provider base
++ """
++
++ @abc.abstractmethod
++ def get(self, *args, **kwargs):
++ """
++ this should be an abstract method
++ """
+diff -rNu buildbot/secrets.orig/providers/file.py buildbot/secrets/providers/file.py
+--- buildbot/secrets.orig/providers/file.py 1970-01-01 01:00:00.000000000 +0100
++++ buildbot/secrets/providers/file.py 2017-03-28 21:52:03.947803965 +0200
+@@ -0,0 +1,82 @@
++# This file is part of Buildbot. Buildbot is free software: you can
++# redistribute it and/or modify it under the terms of the GNU General Public
++# License as published by the Free Software Foundation, version 2.
++#
++# This program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
++# details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 51
++# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Copyright Buildbot Team Members
++"""
++file based provider
++"""
++from __future__ import absolute_import
++from __future__ import print_function
++
++import os
++import stat
++
++from buildbot import config
++from buildbot.secrets.providers.base import SecretProviderBase
++
++
++class SecretInAFile(SecretProviderBase):
++ """
++ secret is stored in a separate file under the given directory name
++ """
++ name = "SecretInAFile"
++
++ def checkFileIsReadOnly(self, dirname, secretfile):
++ filepath = os.path.join(dirname, secretfile)
++ obs_stat = stat.S_IMODE(os.stat(filepath).st_mode)
++ if (obs_stat & 0o77) != 0 and os.name == "posix":
++ config.error("Permissions %s on file %s are too open."
++ " It is required that your secret files are NOT"
++ " accessible by others!" % (oct(obs_stat),
++ secretfile))
++
++ def checkSecretDirectoryIsAvailableAndReadable(self, dirname, suffixes):
++ if not os.access(dirname, os.F_OK):
++ config.error("directory %s does not exists" % dirname)
++ for secretfile in os.listdir(dirname):
++ for suffix in suffixes:
++ if secretfile.endswith(suffix):
++ self.checkFileIsReadOnly(dirname, secretfile)
++
++ def loadSecrets(self, dirname, suffixes):
++ secrets = {}
++ for secretfile in os.listdir(dirname):
++ secretvalue = None
++ for suffix in suffixes:
++ if secretfile.endswith(suffix):
++ with open(os.path.join(dirname, secretfile)) as source:
++ secretvalue = source.read()
++ if suffix:
++ secretfile = secretfile[:-len(suffix)]
++ secrets[secretfile] = secretvalue
++ return secrets
++
++ def checkConfig(self, dirname, suffixes=None):
++ self._dirname = dirname
++ if suffixes is None:
++ suffixes = [""]
++ self.checkSecretDirectoryIsAvailableAndReadable(dirname,
++ suffixes=suffixes)
++
++ def reconfigService(self, dirname, suffixes=None):
++ self._dirname = dirname
++ self.secrets = {}
++ if suffixes is None:
++ suffixes = [""]
++ self.secrets = self.loadSecrets(self._dirname, suffixes=suffixes)
++
++ def get(self, entry):
++ """
++ get the value from the file identified by 'entry'
++ """
++ return self.secrets.get(entry)
+diff -rNu buildbot/secrets.orig/providers/vault.py buildbot/secrets/providers/vault.py
+--- buildbot/secrets.orig/providers/vault.py 1970-01-01 01:00:00.000000000 +0100
++++ buildbot/secrets/providers/vault.py 2017-03-28 21:52:03.947803965 +0200
+@@ -0,0 +1,67 @@
++# This file is part of Buildbot. Buildbot is free software: you can
++# redistribute it and/or modify it under the terms of the GNU General Public
++# License as published by the Free Software Foundation, version 2.
++#
++# This program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
++# details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 51
++# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Copyright Buildbot Team Members
++"""
++vault based providers
++"""
++
++from __future__ import absolute_import
++from __future__ import print_function
++
++from twisted.internet import defer
++
++from buildbot import config
++from buildbot.secrets.providers.base import SecretProviderBase
++from buildbot.util import httpclientservice
++
++
++class HashiCorpVaultSecretProvider(SecretProviderBase):
++ """
++ basic provider where each secret is stored in Vault
++ """
++
++ name = 'SecretInVault'
++
++ def checkConfig(self, vaultServer=None, vaultToken=None, secretsmount=None):
++ if not isinstance(vaultServer, str):
++ config.error("vaultServer must be a string while it is %s" % (type(vaultServer,)))
++ if not isinstance(vaultToken, str):
++ config.error("vaultToken must be a string while it is %s" % (type(vaultToken,)))
++
++ @defer.inlineCallbacks
++ def reconfigService(self, vaultServer=None, vaultToken=None, secretsmount=None):
++ if secretsmount is None:
++ self.secretsmount = "secret"
++ else:
++ self.secretsmount = secretsmount
++ self.vaultServer = vaultServer
++ self.vaultToken = vaultToken
++ if vaultServer.endswith('/'):
++ vaultServer = vaultServer[:-1]
++ self._http = yield httpclientservice.HTTPClientService.getService(
++ self.master, self.vaultServer, headers={'X-Vault-Token': self.vaultToken})
++
++ @defer.inlineCallbacks
++ def get(self, entry):
++ """
++ get the value from vault secret backend
++ """
++ path = self.secretsmount + '/' + entry
++ proj = yield self._http.get('/v1/{0}'.format(path))
++ code = yield proj.code
++ if code != 200:
++ raise KeyError("The key %s does not exist in Vault provider: request"
++ " return code:%d." % (entry, code))
++ json = yield proj.json()
++ defer.returnValue(json.get(u'data', {}).get('value'))
diff --git a/devel/buildbot/distinfo b/devel/buildbot/distinfo
--- a/devel/buildbot/distinfo
+++ b/devel/buildbot/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1488903232
-SHA256 (buildbot-0.9.4.tar.gz) = 068161cd9ada10b87f40117c768a37ce796ebf5e7bf08f224f4c7ded88cd7472
-SIZE (buildbot-0.9.4.tar.gz) = 3020851
-SHA256 (buildbot-www-0.9.4.tar.gz) = eb2f48aabee5e840aa8a4fce1f95f2fe4e2ae98045f9465d275ee5e263ae04b3
-SIZE (buildbot-www-0.9.4.tar.gz) = 691706
+TIMESTAMP = 1490709808
+SHA256 (buildbot-0.9.5.tar.gz) = c6408c5abe78f17e92750e1e462d4cfc8a79558dcc7354ea4dea2058ed282587
+SIZE (buildbot-0.9.5.tar.gz) = 3071500
diff --git a/devel/buildbot/Makefile b/devel/buildbot/Makefile
--- a/devel/buildbot/Makefile
+++ b/devel/buildbot/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= buildbot
-PORTVERSION= 0.9.4
+PORTVERSION= 0.9.5
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
@@ -17,13 +17,14 @@
${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
+ ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4 \
${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt \
${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
TEST_DEPENDS= trial:devel/py-twisted \
- buildbot-worker>=0.9.4:devel/buildbot-worker \
+ 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
_______________________________________________
freebsd-python@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
