From owner-svn-ports-all@freebsd.org Sun Aug 5 21:46:16 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39F6F105FA40; Sun, 5 Aug 2018 21:46:16 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E47FF799C2; Sun, 5 Aug 2018 21:46:15 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A885623DDD; Sun, 5 Aug 2018 21:46:15 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w75LkFVn090385; Sun, 5 Aug 2018 21:46:15 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w75LkEvn090381; Sun, 5 Aug 2018 21:46:14 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201808052146.w75LkEvn090381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Sun, 5 Aug 2018 21:46:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r476477 - in branches/2018Q3/net/cloud-init: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: zi X-SVN-Commit-Paths: in branches/2018Q3/net/cloud-init: . files X-SVN-Commit-Revision: 476477 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Aug 2018 21:46:16 -0000 Author: zi Date: Sun Aug 5 21:46:14 2018 New Revision: 476477 URL: https://svnweb.freebsd.org/changeset/ports/476477 Log: MFH: r476024 - Update to 18.3 - Take MAINTAINERship Approved by: ports-secteam (with hat) Added: branches/2018Q3/net/cloud-init/files/patch-cloudinit_netinfo.py - copied unchanged from r476024, head/net/cloud-init/files/patch-cloudinit_netinfo.py branches/2018Q3/net/cloud-init/pkg-plist - copied unchanged from r476024, head/net/cloud-init/pkg-plist Modified: branches/2018Q3/net/cloud-init/Makefile branches/2018Q3/net/cloud-init/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/net/cloud-init/Makefile ============================================================================== --- branches/2018Q3/net/cloud-init/Makefile Sun Aug 5 21:34:57 2018 (r476476) +++ branches/2018Q3/net/cloud-init/Makefile Sun Aug 5 21:46:14 2018 (r476477) @@ -1,13 +1,12 @@ # $FreeBSD$ PORTNAME= cloud-init -PORTVERSION= 0.7.6 -PORTREVISION= 1 +PORTVERSION= 18.3 CATEGORIES= net python MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= zi@FreeBSD.org COMMENT= Init scripts for use on cloud images LICENSE= GPLv3 @@ -15,24 +14,24 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dmidecode>0:sysutils/dmidecode \ sudo>0:security/sudo \ - gpart>0:sysutils/gpart \ ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} ETCDIR= ${PREFIX}/etc/cloud USES= python:2.7 shebangfix SHEBANG_FILES= tools/validate-yaml.py tools/read-dependencies \ - tools/read-version tools/hacking.py + tools/read-version USE_PYTHON= autoplist distutils PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd" @@ -44,6 +43,6 @@ post-patch: @${RM} ${WRKSRC}/sysvinit/freebsd/cloudinit.orig post-build: - @cd ${WRKSRC} && ${MV} config/cloud.cfg-freebsd config/cloud.cfg + @cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg .include Modified: branches/2018Q3/net/cloud-init/distinfo ============================================================================== --- branches/2018Q3/net/cloud-init/distinfo Sun Aug 5 21:34:57 2018 (r476476) +++ branches/2018Q3/net/cloud-init/distinfo Sun Aug 5 21:46:14 2018 (r476477) @@ -1,2 +1,3 @@ -SHA256 (cloud-init-0.7.6.tar.gz) = 9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 -SIZE (cloud-init-0.7.6.tar.gz) = 515670 +TIMESTAMP = 1533065272 +SHA256 (cloud-init-18.3.tar.gz) = ba93bffc6bd5ba6117e4f3c59a677d7af3e1621b7482aec4c6ceab9b7b223228 +SIZE (cloud-init-18.3.tar.gz) = 915723 Copied: branches/2018Q3/net/cloud-init/files/patch-cloudinit_netinfo.py (from r476024, head/net/cloud-init/files/patch-cloudinit_netinfo.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/net/cloud-init/files/patch-cloudinit_netinfo.py Sun Aug 5 21:46:14 2018 (r476477, copy of r476024, head/net/cloud-init/files/patch-cloudinit_netinfo.py) @@ -0,0 +1,16 @@ +--- cloudinit/netinfo.py.orig 2018-07-31 21:06:07 UTC ++++ cloudinit/netinfo.py +@@ -138,9 +138,10 @@ def _netdev_info_ifconfig(ifconfig_data) + elif toks[i].startswith("scope:"): + devs[curdev]['ipv6'][-1]['scope6'] = toks[i].lstrip("scope:") + elif toks[i] == "scopeid": +- res = re.match(r'.*<(\S+)>', toks[i + 1]) +- if res: +- devs[curdev]['ipv6'][-1]['scope6'] = res.group(1) ++ if toks[i + 1] == "0x1": ++ devs[curdev]['ipv6']['scope6'] = "Global" ++ elif toks[i + 1] == "0x2": ++ devs[curdev]['ipv6']['scope6'] = "Link" + return devs + + Copied: branches/2018Q3/net/cloud-init/pkg-plist (from r476024, head/net/cloud-init/pkg-plist) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/net/cloud-init/pkg-plist Sun Aug 5 21:46:14 2018 (r476477, copy of r476024, head/net/cloud-init/pkg-plist) @@ -0,0 +1,4 @@ +@comment @dir /etc/bash_completion.d +@comment @dir /%%ETCDIR%%/cloud.cfg.d +@comment @dir /%%ETCDIR%%/templates +@comment @dir /%%ETCDIR%%