Index: branches/2019Q2/sysutils/py-google-compute-engine/Makefile =================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/Makefile (revision 501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/Makefile (revision 501552) @@ -1,49 +1,55 @@ # $FreeBSD$ 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 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ 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: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${STAGEDIR}/etc ${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \ ${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample ${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \ ${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample ${INSTALL_DATA} ${FILESDIR}/google_set_hostname \ ${STAGEDIR}/etc/dhclient-exit-hooks .include Index: branches/2019Q2/sysutils/py-google-compute-engine/distinfo =================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/distinfo (revision 501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/distinfo (revision 501552) @@ -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 Index: branches/2019Q2/sysutils/py-google-compute-engine/files/google_accounts_daemon.in =================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_accounts_daemon.in (revision 501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_accounts_daemon.in (revision 501552) @@ -1,37 +1,37 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: google_accounts_daemon # BEFORE: LOGIN # REQUIRE: NETWORKING syslogd google_instance_setup google_network_daemon # KEYWORD: shutdown # # google_accounts_daemon_enable (bool): Set to NO by default. # Set it to YES to enable google_accounts_daemon. # . /etc/rc.subr # Required to execute scripts export PATH=%%LOCALBASE%%/bin:$PATH name="google_accounts_daemon" rcvar="google_accounts_daemon_enable" 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" google_accounts_daemon_start() { check_startmsgs && echo "Starting ${name}." daemon -p ${pidfile} -t ${name} ${command} } run_rc_command "$1" Index: 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 (revision 501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in (revision 501552) @@ -1,34 +1,34 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: google_clock_skew_daemon # BEFORE: LOGIN # REQUIRE: NETWORKING syslogd ntpd google_instance_setup google_network_daemon # KEYWORD: shutdown # # google_clock_skew_daemon_enable (bool): Set to NO by default. # Set it to YES to enable google_clock_skew_daemon. # . /etc/rc.subr name="google_clock_skew_daemon" rcvar="google_clock_skew_daemon_enable" 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" google_clock_skew_daemon_start() { check_startmsgs && echo "Starting ${name}." daemon -p ${pidfile} -t ${name} ${command} } run_rc_command "$1" Index: branches/2019Q2/sysutils/py-google-compute-engine/files/google_instance_setup.in =================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_instance_setup.in (revision 501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_instance_setup.in (revision 501552) @@ -1,27 +1,27 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: google_instance_setup # BEFORE: LOGIN # REQUIRE: NETWORKING syslogd # # google_instance_setup_enable (bool): Set to NO by default. # Set it to YES to enable google_instance_setup. # . /etc/rc.subr name="google_instance_setup" rcvar="google_instance_setup_enable" stop_cmd=":" 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" Index: branches/2019Q2/sysutils/py-google-compute-engine/files/google_network_daemon.in =================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_network_daemon.in (revision 501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_network_daemon.in (revision 501552) @@ -1,34 +1,34 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: google_network_daemon # BEFORE: LOGIN # REQUIRE: NETWORKING syslogd google_instance_setup google_network_daemon # KEYWORD: shutdown # # google_network_daemon_enable (bool): Set to NO by default. # Set it to YES to enable google_network_daemon. # . /etc/rc.subr name="google_network_daemon" rcvar="google_network_daemon_enable" 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" google_network_daemon_start() { check_startmsgs && echo "Starting ${name}." daemon -p ${pidfile} -t ${name} ${command} } run_rc_command "$1" Index: branches/2019Q2/sysutils/py-google-compute-engine/files/google_startup.in =================================================================== --- branches/2019Q2/sysutils/py-google-compute-engine/files/google_startup.in (revision 501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/google_startup.in (revision 501552) @@ -1,45 +1,45 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: google_startup # BEFORE: LOGIN # REQUIRE: NETWORKING syslogd google_instance_setup google_network_daemon # KEYWORD: shutdown # # google_startup_enable (bool): Set to NO by default. # Set it to YES to enable google_startup. # . /etc/rc.subr # Required to execute gsutil export PATH=%%LOCALBASE%%/bin:$PATH name="google_startup" rcvar="google_startup_enable" 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 start_cmd="google_startup_start" stop_cmd="google_startup_stop" google_startup_start() { ${command} ${command_startup_args} } google_startup_stop() { echo "Stopping ${name}." ${command} ${command_shutdown_args} } run_rc_command "$1" Index: 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 (revision 501551) +++ branches/2019Q2/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample (revision 501552) @@ -1,12 +1,14 @@ [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} groupadd_cmd = pw groupadd {group} [MetadataScripts] default_shell = /bin/sh [InstanceSetup] set_multiqueue = false optimize_local_ssd = false Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 501551) +++ branches/2019Q2 (revision 501552) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r498656,499790,501547