svn commit: r455073 - in head/sysutils/py-google-compute-engine: . files
Richard Gallamore
ultima at FreeBSD.org
Tue Nov 28 20:24:53 UTC 2017
Author: ultima
Date: Tue Nov 28 20:24:51 2017
New Revision: 455073
URL: https://svnweb.freebsd.org/changeset/ports/455073
Log:
* Updated to 2.6.1
* Removed obsolete patch files
PR: 222608
Submitted by: Helen Koike (maintainer)
Added:
head/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample (contents, props changed)
head/sysutils/py-google-compute-engine/pkg-plist (contents, props changed)
Deleted:
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__daemon.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__utils.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_boto__config.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_compute__auth.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_config__manager.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__utils.py
Modified:
head/sysutils/py-google-compute-engine/Makefile
head/sysutils/py-google-compute-engine/distinfo
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__setup.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py
head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__setup_network__setup.py
head/sysutils/py-google-compute-engine/files/patch-setup.py
Modified: head/sysutils/py-google-compute-engine/Makefile
==============================================================================
--- head/sysutils/py-google-compute-engine/Makefile Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/Makefile Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= google-compute-engine
-PORTVERSION= 2.4.1
-PORTREVISION= 2
+PORTVERSION= 2.6.1
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -33,14 +32,8 @@ NO_ARCH= yes
SUB_LIST= PYTHON_CMD="${PYTHON_CMD}"
REINPLACE_ARGS= -i ''
-post-patch:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
- ${WRKSRC}/google_compute_engine/accounts/accounts_utils.py \
- ${WRKSRC}/google_compute_engine/boto/boto_config.py \
- ${WRKSRC}/google_compute_engine/boto/compute_auth.py \
- ${WRKSRC}/google_compute_engine/config_manager.py \
- ${WRKSRC}/google_compute_engine/instance_setup/instance_config.py \
- ${WRKSRC}/google_compute_engine/metadata_scripts/script_executor.py \
- ${WRKSRC}/google_compute_engine/network_setup/network_setup.py
+post-install:
+ ${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \
+ ${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample
.include <bsd.port.mk>
Modified: head/sysutils/py-google-compute-engine/distinfo
==============================================================================
--- head/sysutils/py-google-compute-engine/distinfo Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/distinfo Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501403910
-SHA256 (google-compute-engine-2.4.1.tar.gz) = d1709420ade5e7b8318b73c8ae245382cfe362e0f9b5236d3a28c0459a6d8d49
-SIZE (google-compute-engine-2.4.1.tar.gz) = 28626
+TIMESTAMP = 1506375280
+SHA256 (google-compute-engine-2.6.1.tar.gz) = e1df14f755dfa8f165b7bde77b9ed0c18cc32c41a7eb4bf97bc73f0bb65e541f
+SIZE (google-compute-engine-2.6.1.tar.gz) = 29562
Added: head/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample Tue Nov 28 20:24:51 2017 (r455073)
@@ -0,0 +1,5 @@
+[Accounts]
+useradd_cmd = pw useradd {user} -m
+userdel_cmd = pw userdel {user} -r
+usermod_cmd = pw usermod {user} -G {groups}
+groupadd_cmd = pw groupadd {group}
Modified: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py
==============================================================================
--- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,17 +1,6 @@
-BSD doesn't have hwclock, use ntpdate instead
-
---- google_compute_engine/clock_skew/clock_skew_daemon.py.orig 2017-07-18 16:43:14 UTC
+--- google_compute_engine/clock_skew/clock_skew_daemon.py.orig 2017-09-14 18:08:49 UTC
+++ google_compute_engine/clock_skew/clock_skew_daemon.py
-@@ -24,7 +24,7 @@ from google_compute_engine import file_u
- from google_compute_engine import logger
- from google_compute_engine import metadata_watcher
-
--LOCKFILE = '/var/lock/google_clock_skew.lock'
-+LOCKFILE = '/var/spool/lock/google_clock_skew.lock'
-
-
- class ClockSkewDaemon(object):
-@@ -58,9 +58,12 @@ class ClockSkewDaemon(object):
+@@ -59,9 +59,12 @@ class ClockSkewDaemon(object):
response: string, the metadata response with the new drift token value.
"""
self.logger.info('Clock drift token has changed: %s.', response)
Modified: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py
==============================================================================
--- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,39 +1,6 @@
-This patch fixes the paths and disable optimization scripts used only on Linux.
-The variables won't be needed to be fixed in further versions
-See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440
-
---- google_compute_engine/instance_setup/instance_config.py.orig 2017-07-23 07:12:16 UTC
+--- google_compute_engine/instance_setup/instance_config.py.orig 2017-09-29 00:21:28 UTC
+++ google_compute_engine/instance_setup/instance_config.py
-@@ -16,8 +16,8 @@
- """A library used to set up the instance's default configurations file.
-
- Note that the configurations in
--/etc/default/instance_configs.cfg.template override the values set in
--/etc/default/instance_configs.cfg. The system instance_configs.cfg may be
-+%%PREFIX%%/etc/instance_configs.cfg.template override the values set in
-+%%PREFIX%%/etc/instance_configs.cfg. The system instance_configs.cfg may be
- overridden during package upgrade.
- """
-
-@@ -32,7 +32,7 @@ from google_compute_engine.compat import
- class InstanceConfig(config_manager.ConfigManager):
- """Creates a defaults config file for instance configuration."""
-
-- instance_config = '/etc/default/instance_configs.cfg'
-+ instance_config = '%%PREFIX%%/etc/instance_configs.cfg'
- instance_config_distro = '%s.distro' % instance_config
- instance_config_template = '%s.template' % instance_config
- instance_config_script = os.path.abspath(__file__)
-@@ -40,7 +40,7 @@ class InstanceConfig(config_manager.Conf
- 'This file is automatically created at boot time by the %s script. Do '
- 'not edit this file directly. If you need to add items to this file, '
- 'create or edit %s instead and then run '
-- '/usr/bin/google_instance_setup.')
-+ '%%PREFIX%%/bin/google_instance_setup.')
- instance_config_options = {
- 'Accounts': {
- 'deprovision_remove': 'false',
-@@ -55,11 +55,11 @@ class InstanceConfig(config_manager.Conf
+@@ -72,11 +72,11 @@ class InstanceConfig(config_manager.Conf
'instance_id': '0',
},
'InstanceSetup': {
Modified: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__setup.py
==============================================================================
--- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__setup.py Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__setup.py Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,15 +1,8 @@
-This patch fixes paths to rc scripts
-The PREFIX fix won't be necessary anymore in further versions
-See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440
-
---- google_compute_engine/instance_setup/instance_setup.py.orig 2017-07-18 16:43:14 UTC
+--- google_compute_engine/instance_setup/instance_setup.py.orig 2017-09-14 18:08:49 UTC
+++ google_compute_engine/instance_setup/instance_setup.py
-@@ -143,14 +143,14 @@ class InstanceSetup(object):
- """Initialize the SSH daemon."""
- # Exit as early as possible.
+@@ -146,12 +146,12 @@ class InstanceSetup(object):
# Instance setup systemd scripts block sshd from starting.
-- if os.path.exists('/bin/systemctl'):
-+ if os.path.exists('%%PREFIX%%/bin/systemctl'):
+ if os.path.exists(constants.LOCALBASE + '/bin/systemctl'):
return
- elif (os.path.exists('/etc/init.d/ssh') or
- os.path.exists('/etc/init/ssh.conf')):
Modified: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py
==============================================================================
--- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,18 +1,6 @@
-This patch depends on the follow PR from the upsteram project
-https://github.com/GoogleCloudPlatform/compute-image-packages/pull/442
-
---- google_compute_engine/ip_forwarding/ip_forwarding_daemon.py.orig 2017-07-18 16:43:14 UTC
+--- google_compute_engine/ip_forwarding/ip_forwarding_daemon.py.orig 2017-09-14 18:08:49 UTC
+++ google_compute_engine/ip_forwarding/ip_forwarding_daemon.py
-@@ -38,7 +38,7 @@ from google_compute_engine import networ
-
- from google_compute_engine.ip_forwarding import ip_forwarding_utils
-
--LOCKFILE = '/var/lock/google_ip_forwarding.lock'
-+LOCKFILE = '/var/spool/lock/google_ip_forwarding.lock'
-
-
- class IpForwardingDaemon(object):
-@@ -131,18 +131,18 @@ class IpForwardingDaemon(object):
+@@ -137,20 +137,20 @@ class IpForwardingDaemon(object):
Args:
result: dict, the metadata response with the new network interfaces.
"""
@@ -25,6 +13,8 @@ https://github.com/GoogleCloudPlatform/compute-image-p
ip_addresses.extend(network_interface.get('forwardedIps', []))
if self.ip_aliases:
ip_addresses.extend(network_interface.get('ipAliases', []))
+ if self.target_instance_ips:
+ ip_addresses.extend(network_interface.get('targetInstanceIps', []))
- self._HandleForwardedIps(ip_addresses, interface)
else:
message = 'Network interface not found for MAC address: %s.'
Modified: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py
==============================================================================
--- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,7 +1,4 @@
-This patch depends on the follow PR from the upsteram project
-https://github.com/GoogleCloudPlatform/compute-image-packages/pull/442
-
---- google_compute_engine/ip_forwarding/ip_forwarding_utils.py.orig 2017-07-18 16:43:14 UTC
+--- google_compute_engine/ip_forwarding/ip_forwarding_utils.py.orig 2017-09-14 18:08:49 UTC
+++ google_compute_engine/ip_forwarding/ip_forwarding_utils.py
@@ -17,6 +17,8 @@
Modified: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__setup_network__setup.py
==============================================================================
--- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__setup_network__setup.py Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__setup_network__setup.py Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,17 +1,6 @@
-dhclient works a bit different in BSD compared to Linux, this patch adapts its usage.
-
---- google_compute_engine/network_setup/network_setup.py.orig 2017-07-23 07:12:16 UTC
+--- google_compute_engine/network_setup/network_setup.py.orig 2017-09-29 00:21:28 UTC
+++ google_compute_engine/network_setup/network_setup.py
-@@ -74,7 +74,7 @@ class NetworkSetup(object):
- Args:
- interfaces: list of string, the output device names enable.
- """
-- interface_path = '/etc/sysconfig/network-scripts'
-+ interface_path = '%%PREFIX%%/etc/sysconfig/network-scripts'
- for interface in interfaces:
- interface_config = os.path.join(interface_path, 'ifcfg-%s' % interface)
- if os.path.exists(interface_config):
-@@ -106,12 +106,18 @@ class NetworkSetup(object):
+@@ -107,12 +107,18 @@ class NetworkSetup(object):
self.logger.info('Enabling the Ethernet interfaces %s.', interfaces)
dhclient_command = ['dhclient']
if os.path.exists(self.dhclient_script):
@@ -36,12 +25,3 @@ dhclient works a bit different in BSD compared to Linu
def _EnableNetworkInterfaces(self, interfaces):
"""Enable the list of network interfaces.
-@@ -130,7 +136,7 @@ class NetworkSetup(object):
- except subprocess.CalledProcessError:
- self.logger.warning('Could not enable Ethernet interfaces.')
- else:
-- if os.path.exists('/etc/sysconfig/network-scripts'):
-+ if os.path.exists('%%PREFIX%%/etc/sysconfig/network-scripts'):
- self._DisableNetworkManager(interfaces)
- self._ConfigureNetwork(interfaces)
-
Modified: head/sysutils/py-google-compute-engine/files/patch-setup.py
==============================================================================
--- head/sysutils/py-google-compute-engine/files/patch-setup.py Tue Nov 28 20:24:27 2017 (r455072)
+++ head/sysutils/py-google-compute-engine/files/patch-setup.py Tue Nov 28 20:24:51 2017 (r455073)
@@ -1,4 +1,4 @@
---- setup.py.orig 2017-07-18 16:43:14 UTC
+--- setup.py.orig 2017-09-14 18:08:49 UTC
+++ setup.py
@@ -30,7 +30,6 @@ setuptools.setup(
long_description='Google Compute Engine guest environment.',
@@ -6,5 +6,5 @@
packages=setuptools.find_packages(),
- scripts=glob.glob('scripts/*'),
url='https://github.com/GoogleCloudPlatform/compute-image-packages',
- version='2.4.1',
+ version='2.6.1',
# Entry points create scripts in /usr/bin that call a function.
Added: head/sysutils/py-google-compute-engine/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/py-google-compute-engine/pkg-plist Tue Nov 28 20:24:51 2017 (r455073)
@@ -0,0 +1 @@
+ at sample etc/instance_configs.cfg.distro.sample
More information about the svn-ports-all
mailing list