Attachment 191876 Details for Bug 227006 – Patch to update py-google-compute-engine to version 2.7.6 generated using diff -u -r -N olddir newdir

[patch] Patch to update py-google-compute-engine to version 2.7.6 generated using diff -u -r -N olddir newdir

py-google-compute-engine-2.7.6.patch (text/plain), 8.53 KB, created by Helen Koike on 2018-03-27 17:53:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Helen Koike

Created: 2018-03-27 17:53:26 UTC

Size: 8.53 KB

patch

obsolete

>diff -ruN py-google-compute-engine-2.6.1/Makefile py-google-compute-engine-2.7.6/Makefile
>--- py-google-compute-engine-2.6.1/Makefile	2018-03-27 17:47:48.581948000 +0000
>+++ py-google-compute-engine-2.7.6/Makefile	2018-03-27 17:47:06.372315000 +0000
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	google-compute-engine
>-PORTVERSION=	2.6.1
>+PORTVERSION=	2.7.6
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-google-compute-engine-2.6.1/distinfo py-google-compute-engine-2.7.6/distinfo
>--- py-google-compute-engine-2.6.1/distinfo	2018-03-27 17:47:48.582023000 +0000
>+++ py-google-compute-engine-2.7.6/distinfo	2018-03-27 17:47:06.372380000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1506375280
>-SHA256 (google-compute-engine-2.6.1.tar.gz) = e1df14f755dfa8f165b7bde77b9ed0c18cc32c41a7eb4bf97bc73f0bb65e541f
>-SIZE (google-compute-engine-2.6.1.tar.gz) = 29562
>+TIMESTAMP = 1522049559
>+SHA256 (google-compute-engine-2.7.6.tar.gz) = 23c764f2fc72db5a0b81cb8f8029c4e5d152bd50faf1eb7322b4a4cff039d003
>+SIZE (google-compute-engine-2.7.6.tar.gz) = 40742
>diff -ruN py-google-compute-engine-2.6.1/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py py-google-compute-engine-2.7.6/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py
>--- py-google-compute-engine-2.6.1/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py	2018-03-27 17:47:48.582191000 +0000
>+++ py-google-compute-engine-2.7.6/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py	2018-03-27 17:47:06.372571000 +0000
>@@ -1,4 +1,4 @@
>---- 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.orig	2018-02-22 19:44:17 UTC
> +++ google_compute_engine/clock_skew/clock_skew_daemon.py
> @@ -59,9 +59,12 @@ class ClockSkewDaemon(object):
>        response: string, the metadata response with the new drift token value.
>diff -ruN py-google-compute-engine-2.6.1/files/patch-google__compute__engine_instance__setup_instance__config.py py-google-compute-engine-2.7.6/files/patch-google__compute__engine_instance__setup_instance__config.py
>--- py-google-compute-engine-2.6.1/files/patch-google__compute__engine_instance__setup_instance__config.py	2018-03-27 17:47:48.582256000 +0000
>+++ py-google-compute-engine-2.7.6/files/patch-google__compute__engine_instance__setup_instance__config.py	2018-03-27 17:47:06.372649000 +0000
>@@ -1,9 +1,9 @@
>---- google_compute_engine/instance_setup/instance_config.py.orig	2017-09-29 00:21:28 UTC
>+--- google_compute_engine/instance_setup/instance_config.py.orig	2018-02-22 19:44:17 UTC
> +++ google_compute_engine/instance_setup/instance_config.py
>-@@ -72,11 +72,11 @@ class InstanceConfig(config_manager.Conf
>-           'instance_id': '0',
>+@@ -73,11 +73,11 @@ class InstanceConfig(config_manager.Conf
>        },
>        'InstanceSetup': {
>+           'host_key_types': 'ecdsa,ed25519,rsa',
> -          'optimize_local_ssd': 'true',
> +          'optimize_local_ssd': 'false',
>            'network_enabled': 'true',
>diff -ruN py-google-compute-engine-2.6.1/files/patch-google__compute__engine_instance__setup_instance__setup.py py-google-compute-engine-2.7.6/files/patch-google__compute__engine_instance__setup_instance__setup.py
>--- py-google-compute-engine-2.6.1/files/patch-google__compute__engine_instance__setup_instance__setup.py	2018-03-27 17:47:48.582319000 +0000
>+++ py-google-compute-engine-2.7.6/files/patch-google__compute__engine_instance__setup_instance__setup.py	2018-03-27 17:47:06.372717000 +0000
>@@ -1,6 +1,6 @@
>---- google_compute_engine/instance_setup/instance_setup.py.orig	2017-09-14 18:08:49 UTC
>+--- google_compute_engine/instance_setup/instance_setup.py.orig	2018-02-22 19:44:17 UTC
> +++ google_compute_engine/instance_setup/instance_setup.py
>-@@ -146,12 +146,12 @@ class InstanceSetup(object):
>+@@ -147,12 +147,12 @@ class InstanceSetup(object):
>      # Instance setup systemd scripts block sshd from starting.
>      if os.path.exists(constants.LOCALBASE + '/bin/systemctl'):
>        return
>diff -ruN py-google-compute-engine-2.6.1/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py py-google-compute-engine-2.7.6/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py
>--- py-google-compute-engine-2.6.1/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py	2018-03-27 17:47:48.582385000 +0000
>+++ py-google-compute-engine-2.7.6/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py	2018-03-27 17:47:06.372786000 +0000
>@@ -1,6 +1,6 @@
>---- 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.orig	2018-02-22 19:44:17 UTC
> +++ google_compute_engine/ip_forwarding/ip_forwarding_daemon.py
>-@@ -137,20 +137,20 @@ class IpForwardingDaemon(object):
>+@@ -136,20 +136,20 @@ class IpForwardingDaemon(object):
>      Args:
>        result: dict, the metadata response with the new network interfaces.
>      """
>diff -ruN py-google-compute-engine-2.6.1/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py py-google-compute-engine-2.7.6/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py
>--- py-google-compute-engine-2.6.1/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py	2018-03-27 17:47:48.582470000 +0000
>+++ py-google-compute-engine-2.7.6/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py	2018-03-27 17:47:06.372846000 +0000
>@@ -1,4 +1,4 @@
>---- 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.orig	2018-02-22 19:44:17 UTC
> +++ google_compute_engine/ip_forwarding/ip_forwarding_utils.py
> @@ -17,6 +17,8 @@
>  
>diff -ruN py-google-compute-engine-2.6.1/files/patch-google__compute__engine_network__setup_network__setup.py py-google-compute-engine-2.7.6/files/patch-google__compute__engine_network__setup_network__setup.py
>--- py-google-compute-engine-2.6.1/files/patch-google__compute__engine_network__setup_network__setup.py	2018-03-27 17:47:48.583065000 +0000
>+++ py-google-compute-engine-2.7.6/files/patch-google__compute__engine_network__setup_network__setup.py	1970-01-01 00:00:00.000000000 +0000
>@@ -1,27 +0,0 @@
>---- google_compute_engine/network_setup/network_setup.py.orig	2017-09-29 00:21:28 UTC
>-+++ google_compute_engine/network_setup/network_setup.py
>-@@ -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):
>--      dhclient_command += ['-sf', self.dhclient_script]
>--    try:
>--      subprocess.check_call(dhclient_command + ['-x'] + interfaces)
>--      subprocess.check_call(dhclient_command + interfaces)
>--    except subprocess.CalledProcessError:
>--      self.logger.warning('Could not enable interfaces %s.', interfaces)
>-+      dhclient_conf = '/etc/dhclient.conf'
>-+      if os.path.exists(dhclient_conf):
>-+        subprocess.call('sed -i "" "/^script/d" ' + dhclient_conf, shell=True)
>-+      subprocess.call('echo \'script "%s";\' >> %s' % (self.dhclient_script, dhclient_conf), shell=True)
>-+    for interface in interfaces:
>-+      try:
>-+        subprocess.check_call(['ifconfig', interface, 'down', 'delete'])
>-+        # wait previous dhclient to exit
>-+        subprocess.check_call(['sleep', '3'])
>-+        subprocess.check_call(dhclient_command + [interface])
>-+      except subprocess.CalledProcessError:
>-+        self.logger.warning('Could not enable interface %s.', interface)
>- 
>-   def _EnableNetworkInterfaces(self, interfaces):
>-     """Enable the list of network interfaces.
>diff -ruN py-google-compute-engine-2.6.1/files/patch-setup.py py-google-compute-engine-2.7.6/files/patch-setup.py
>--- py-google-compute-engine-2.6.1/files/patch-setup.py	2018-03-27 17:47:48.582544000 +0000
>+++ py-google-compute-engine-2.7.6/files/patch-setup.py	2018-03-27 17:47:06.372917000 +0000
>@@ -1,10 +1,10 @@
>---- setup.py.orig	2017-09-14 18:08:49 UTC
>+--- setup.py.orig	2018-02-22 19:44:17 UTC
> +++ setup.py
>-@@ -30,7 +30,6 @@ setuptools.setup(
>+@@ -34,7 +34,6 @@ setuptools.setup(
>      long_description='Google Compute Engine guest environment.',
>      name='google-compute-engine',
>      packages=setuptools.find_packages(),
> -    scripts=glob.glob('scripts/*'),
>      url='https://github.com/GoogleCloudPlatform/compute-image-packages',
>-     version='2.6.1',
>+     version='2.7.6',
>      # Entry points create scripts in /usr/bin that call a function.

Flags:

helen.koike: maintainer-approval+

Actions: View | Diff

Attachments on bug 227006: 191876 | 191877