From owner-svn-ports-all@freebsd.org Mon May 13 11:16:32 2019 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 7B81A158C1EB; Mon, 13 May 2019 11:16:32 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2461975194; Mon, 13 May 2019 11:16:32 +0000 (UTC) (envelope-from swills@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 C939690FB; Mon, 13 May 2019 11:16:31 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4DBGV49013386; Mon, 13 May 2019 11:16:31 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4DBGUEU013378; Mon, 13 May 2019 11:16:30 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201905131116.x4DBGUEU013378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 13 May 2019 11:16:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r501552 - in branches/2019Q2/sysutils/py-google-compute-engine: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2019Q2/sysutils/py-google-compute-engine: . files X-SVN-Commit-Revision: 501552 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2461975194 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 13 May 2019 11:16:32 -0000 Author: swills Date: Mon May 13 11:16:29 2019 New Revision: 501552 URL: https://svnweb.freebsd.org/changeset/ports/501552 Log: MFH: r498656 r499790 r501547 Patch to add missing config and take the maintainership Two new variables was added to instance_config.cfg file in version 2.8.13 to allow the addition and removal of users from groups. I am also taking over the maintainership of this packages as previously discussed with Helen. Bump PORTREVISION. PR: 236500 Submitted by: Lucas Kanashiro Approved by: Helen Koike (maintainer) sysutils/py-google-compute-engine: update to 20190416 [1] This fixes a python3 runtime issue [1] While here, pull in missing dependency in python3 case [2] PR: 237505 [1] PR: 237203 [2] Submitted by: Lucas Kanashiro (maintainer) [1] Submitted by: Miroslav Lachman <000.fbsd@quip.cz> [2] Approved by: Lucas Kanashiro (maintainer) [2] sysutils/py-google-compute-engine: fix daemons in python 2.7 case PR: 237845 Reviewed by: koobs Approved by: implicit (portmgr, python, jfi blanket) Approved by: ports-secteam (implicit) Modified: branches/2019Q2/sysutils/py-google-compute-engine/Makefile branches/2019Q2/sysutils/py-google-compute-engine/distinfo branches/2019Q2/sysutils/py-google-compute-engine/files/google_accounts_daemon.in branches/2019Q2/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in branches/2019Q2/sysutils/py-google-compute-engine/files/google_instance_setup.in branches/2019Q2/sysutils/py-google-compute-engine/files/google_network_daemon.in branches/2019Q2/sysutils/py-google-compute-engine/files/google_startup.in branches/2019Q2/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/sysutils/py-google-compute-engine/Makefile ============================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/Makefile Mon May 13 10:57:29 2019 (r501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/Makefile Mon May 13 11:16:29 2019 (r501552) @@ -2,10 +2,11 @@ PORTNAME= google-compute-engine DISTVERSION= 2.8.13 +PORTREVISION= 4 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= helen.koike@collabora.com +MAINTAINER= lucas.kanashiro@collabora.com COMMENT= Guest Environment for Google Compute Engine LICENSE= APACHE20 @@ -17,24 +18,29 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-bo google_oslogin_control:sysutils/google-compute-engine-oslogin \ sudo:security/sudo +.if ${FLAVOR:Upy36:Mpy3*} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} +.endif + USES= python shebangfix USE_PYTHON= autoplist concurrent distutils +WRKSRC_SUBDIR= packages/python-google-compute-engine + NO_ARCH= yes -SHEBANG_FILES= scripts/google_set_multiqueue scripts/google_optimize_local_ssd +SHEBANG_FILES= ../google-compute-engine/src/usr/bin/google_optimize_local_ssd \ + ../google-compute-engine/src/usr/bin/google_set_multiqueue USE_GITHUB= yes GH_ACCOUNT= GoogleCloudPlatform GH_PROJECT= compute-image-packages -GH_TAGNAME= 20190124 +GH_TAGNAME= 20190416 -USE_RC_SUBR= google_instance_setup \ - google_accounts_daemon \ - google_clock_skew_daemon \ - google_network_daemon \ - google_startup +USE_RC_SUBR= google_accounts_daemon google_clock_skew_daemon \ + google_instance_setup google_network_daemon google_startup -SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" +SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" \ + PYTHON_VER="${PYTHON_VER}" REINPLACE_ARGS= -i '' post-install: Modified: branches/2019Q2/sysutils/py-google-compute-engine/distinfo ============================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/distinfo Mon May 13 10:57:29 2019 (r501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/distinfo Mon May 13 11:16:29 2019 (r501552) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551668922 -SHA256 (GoogleCloudPlatform-compute-image-packages-2.8.13-20190124_GH0.tar.gz) = 09637f951245729c66eb5b7b9ed49bead31349b29829baf5c8a4e5d45405a2f4 -SIZE (GoogleCloudPlatform-compute-image-packages-2.8.13-20190124_GH0.tar.gz) = 126211 +TIMESTAMP = 1556025006 +SHA256 (GoogleCloudPlatform-compute-image-packages-2.8.13-20190416_GH0.tar.gz) = cef65af726b7c32db9035266804e0393b54196fabd1007026554bae2d9540de4 +SIZE (GoogleCloudPlatform-compute-image-packages-2.8.13-20190416_GH0.tar.gz) = 130216 Modified: branches/2019Q2/sysutils/py-google-compute-engine/files/google_accounts_daemon.in ============================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_accounts_daemon.in Mon May 13 10:57:29 2019 (r501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_accounts_daemon.in Mon May 13 11:16:29 2019 (r501552) @@ -24,7 +24,7 @@ load_rc_config "${name}" : ${google_accounts_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_accounts_daemon_start" Modified: branches/2019Q2/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in ============================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in Mon May 13 10:57:29 2019 (r501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in Mon May 13 11:16:29 2019 (r501552) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_clock_skew_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_clock_skew_daemon_start" Modified: branches/2019Q2/sysutils/py-google-compute-engine/files/google_instance_setup.in ============================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_instance_setup.in Mon May 13 10:57:29 2019 (r501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_instance_setup.in Mon May 13 11:16:29 2019 (r501552) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_instance_setup_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid run_rc_command "$1" Modified: branches/2019Q2/sysutils/py-google-compute-engine/files/google_network_daemon.in ============================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_network_daemon.in Mon May 13 10:57:29 2019 (r501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_network_daemon.in Mon May 13 11:16:29 2019 (r501552) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_network_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_network_daemon_start" Modified: branches/2019Q2/sysutils/py-google-compute-engine/files/google_startup.in ============================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_startup.in Mon May 13 10:57:29 2019 (r501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_startup.in Mon May 13 11:16:29 2019 (r501552) @@ -24,7 +24,7 @@ load_rc_config "${name}" : ${google_startup_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/google_metadata_script_runner +command=%%PREFIX%%/bin/google_metadata_script_runner-%%PYTHON_VER%% command_startup_args="--script-type startup" command_shutdown_args="--script-type shutdown" pidfile=/var/run/${name}.pid Modified: branches/2019Q2/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample ============================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample Mon May 13 10:57:29 2019 (r501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample Mon May 13 11:16:29 2019 (r501552) @@ -1,4 +1,6 @@ [Accounts] +gpasswd_add_cmd = pw groupmod {group} -m {user} +gpasswd_remove_cmd = pw groupmod {group} -d {user} useradd_cmd = pw useradd {user} -m userdel_cmd = pw userdel {user} -r usermod_cmd = pw usermod {user} -G {groups}