@@ -1,7 +1,7 @@

 Summary:        Calico networking for CNI

 Name:           calico-cni

 Version:        1.11.2

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/projectcalico/cni-plugin

 Source0:        %{name}-%{version}.tar.gz

@@ -13,7 +13,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 BuildRequires:  git

 BuildRequires:  glide

-BuildRequires:  go = 1.9.4

+BuildRequires:  go = 1.9.7

 Requires:       cni

 %define debug_package %{nil}

@@ -59,6 +59,8 @@ install -vpm 0755 -t %{buildroot}/usr/share/calico-cni/k8s/ k8s-install/scripts/

 /usr/share/calico-cni/k8s/calico.conf.default

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 1.11.2-3

+-   Build using go 1.9.7

 *   Mon Sep 24 2018 Tapas Kundu <tkundu@vmware.com> 1.11.2-2

 -   Build using go version 1.9

 *   Fri May 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.11.2-1

@@ -1,7 +1,7 @@

 Summary:       confd is a lightweight configuration management tool

 Name:          calico-confd

 Version:       0.14.0

-Release:       2%{?dist}

+Release:       3%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       MIT

@@ -9,7 +9,7 @@ URL:           https://github.com/kelseyhightower/confd/releases

 Source0:       %{name}-%{version}.tar.gz

 Distribution:  Photon

 BuildRequires: glide

-BuildRequires: go = 1.9.4

+BuildRequires: go = 1.9.7

 %define sha1 calico-confd=1ee7b4f992737f28a970dfeeb35faa35d1601a92

 %description

@@ -35,6 +35,8 @@ install -vpm 0755 -t %{buildroot}%{_bindir}/ bin/confd

 %{_bindir}/confd

 %changelog

+*    Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 0.14.0-3

+-    Build using go 1.9.7

 *    Mon Sep 24 2018 Tapas Kundu <tkundu@vmware.com> 0.14.0-2

 -    Build using go version 1.9

 *    Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.14.0-1

@@ -1,7 +1,7 @@

 Summary:       Docker libnetwork plugin for Calico

 Name:          calico-libnetwork

 Version:       1.1.0

-Release:       2%{?dist}

+Release:       3%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       Apache-2.0

@@ -10,7 +10,7 @@ Source0:       %{name}-%{version}.tar.gz

 Distribution:  Photon

 BuildRequires: git

 BuildRequires: glide

-BuildRequires: go = 1.9.4

+BuildRequires: go = 1.9.7

 %define sha1 calico-libnetwork=bed540d714a7b2e0d0138556894541109dc7b792

 %define debug_package %{nil}

@@ -39,6 +39,8 @@ install -vpm 0755 -t %{buildroot}/usr/share/calico/docker/ dist/libnetwork-plugi

 /usr/share/calico/docker/libnetwork-plugin

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 1.1.0-3

+-   Build using go 1.9.7

 *    Mon Sep 24 2018 Tapas Kundu <tkundu@vmware.com> 1.1.0-2

 -    Build using go version 1.9

 *    Fri Aug 18 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.1.0-1

@@ -1,7 +1,7 @@

 Summary:        Calico node and documentation for project calico.

 Name:           calico

 Version:        2.6.7

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        Apache-2.0

 URL:            https://github.com/projectcalico/calico

 Source0:        %{name}-%{version}.tar.gz

@@ -11,7 +11,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 BuildRequires:  git

 BuildRequires:  glide

-BuildRequires:  go = 1.9.4

+BuildRequires:  go = 1.9.7

 BuildRequires:  make

 %description

@@ -50,6 +50,8 @@ sed -i 's/. startup.env/source \/startup.env/g' %{buildroot}/usr/share/calico/do

 /usr/share/calico/docker/fs/*

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 2.6.7-3

+-   Build using go 1.9.7

 *   Mon Sep 24 2018 Tapas Kundu <tkundu@vmware.com> 2.6.7-2

 -   Build using go version 1.9

 *   Fri May 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.6.7-1

@@ -4,7 +4,7 @@

 Summary:        Docker

 Name:           docker

 Version:        17.06.0

-Release:        7%{?dist}

+Release:        8%{?dist}

 License:        ASL 2.0

 URL:            http://docs.docker.com

 Group:          Applications/File

@@ -39,7 +39,7 @@ BuildRequires:  libltdl-devel

 BuildRequires:  libgcc-devel

 BuildRequires:  glibc-devel

 BuildRequires:  unzip

-BuildRequires:  go = 1.9.4

+BuildRequires:  go = 1.9.7

 BuildRequires:  sed

 BuildRequires:  cmake

 BuildRequires:  findutils

@@ -225,6 +225,8 @@ rm -rf %{buildroot}/*

 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 17.06.0-8

+-   Build using go 1.9.7

 *   Tue Sep 25 2018 Tapas Kundu <tkundu@vmware.com> 17.06.0-7

 -   Use go 1.9 rather than latest go toolchain

 *   Thu Sep 20 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 17.06.0-6

@@ -4,7 +4,7 @@

 Summary:        Docker

 Name:           docker

 Version:        18.06.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        ASL 2.0

 URL:            http://docs.docker.com

 Group:          Applications/File

@@ -26,7 +26,7 @@ BuildRequires:  libltdl-devel

 BuildRequires:  libgcc-devel

 BuildRequires:  glibc-devel

 BuildRequires:  unzip

-BuildRequires:  go = 1.10.4

+BuildRequires:  go = 1.10.7

 BuildRequires:  sed

 BuildRequires:  cmake

 BuildRequires:  findutils

@@ -216,5 +216,7 @@ rm -rf %{buildroot}/*

 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 18.06.1-2

+-   Build using go 1.10.7

 *   Mon Jan 17 2019 Bo Gan <ganb@vmware.com> 18.06.1-1

 -   Update to 18.06.1-ce

@@ -1,7 +1,7 @@

 Summary:        Vendor Package Management for Goland

 Name:           glide

 Version:        0.13.1

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        MIT

 URL:            https://github.com/Masterminds/glide

 Source0:        %{name}-%{version}.tar.gz

@@ -10,7 +10,7 @@ Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

 BuildRequires:  git

-BuildRequires:  go = 1.9.4

+BuildRequires:  go = 1.9.7

 BuildRequires:  perl

 %description

@@ -43,6 +43,8 @@ popd

 %{_bindir}/glide

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 0.13.1-4

+-   Build using go 1.9.7

 *   Fri Nov 23 2018 Ashwin H <ashwinh@vmware.com> 0.13.1-3

 -   Fix %check

 *   Mon Sep 24 2018 Tapas Kundu <tkundu@vmware.com> 0.13.1-2

deleted file mode 100644

@@ -1,124 +0,0 @@

-From c941e27e70c3e06e1011d2dd71d72a7a06a9bcbc Mon Sep 17 00:00:00 2001

-From: Ian Lance Taylor <iant@golang.org>

-Date: Thu, 15 Feb 2018 15:57:13 -0800

-Subject: [PATCH] cmd/go: restrict meta imports to valid schemes

-

-Before this change, when using -insecure, we permitted any meta import

-repo root as long as it contained "://". When not using -insecure, we

-restrict meta import repo roots to be valid URLs. People may depend on

-that somehow, so permit meta import repo roots to be invalid URLs, but

-require them to have valid schemes per RFC 3986.

-

-Fixes #23867

-

-Change-Id: Iac666dfc75ac321bf8639dda5b0dba7c8840922d

-Reviewed-on: https://go-review.googlesource.com/94603

-Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

- src/cmd/go/internal/get/vcs.go      | 34 +++++++++++++++++++++++++++--

- src/cmd/go/internal/get/vcs_test.go | 43 +++++++++++++++++++++++++++++++++++++

- 2 files changed, 75 insertions(+), 2 deletions(-)

-

-diff --git a/src/cmd/go/internal/get/vcs.go b/src/cmd/go/internal/get/vcs.go

-index ee6b16a1369..dced0ed8db5 100644

-+++ b/src/cmd/go/internal/get/vcs.go

-@@ -809,8 +809,8 @@ func repoRootForImportDynamic(importPath string, security web.SecurityMode) (*re

- 		}

- 	}

- 

--	if !strings.Contains(mmi.RepoRoot, "://") {

--		return nil, fmt.Errorf("%s: invalid repo root %q; no scheme", urlStr, mmi.RepoRoot)

-+	if err := validateRepoRootScheme(mmi.RepoRoot); err != nil {

-+		return nil, fmt.Errorf("%s: invalid repo root %q: %v", urlStr, mmi.RepoRoot, err)

- 	}

- 	rr := &repoRoot{

- 		vcs:      vcsByCmd(mmi.VCS),

-@@ -824,6 +824,36 @@ func repoRootForImportDynamic(importPath string, security web.SecurityMode) (*re

- 	return rr, nil

- }

- 

-+// validateRepoRootScheme returns an error if repoRoot does not seem

-+// to have a valid URL scheme. At this point we permit things that

-+// aren't valid URLs, although later, if not using -insecure, we will

-+// restrict repoRoots to be valid URLs. This is only because we've

-+// historically permitted them, and people may depend on that.

-+func validateRepoRootScheme(repoRoot string) error {

-+	end := strings.Index(repoRoot, "://")

-+	if end <= 0 {

-+		return errors.New("no scheme")

-+	}

-+

-+	// RFC 3986 section 3.1.

-+	for i := 0; i < end; i++ {

-+		c := repoRoot[i]

-+		switch {

-+		case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z':

-+			// OK.

-+		case '0' <= c && c <= '9' || c == '+' || c == '-' || c == '.':

-+			// OK except at start.

-+			if i == 0 {

-+				return errors.New("invalid scheme")

-+			}

-+		default:

-+			return errors.New("invalid scheme")

-+		}

-+	}

-+

-+	return nil

-+}

-+

- var fetchGroup singleflight.Group

- var (

- 	fetchCacheMu sync.Mutex

-diff --git a/src/cmd/go/internal/get/vcs_test.go b/src/cmd/go/internal/get/vcs_test.go

-index 2cb611fabd8..ece78b563ce 100644

-+++ b/src/cmd/go/internal/get/vcs_test.go

-@@ -416,3 +416,46 @@ func TestMatchGoImport(t *testing.T) {

- 		}

- 	}

- }

-+

-+func TestValidateRepoRootScheme(t *testing.T) {

-+	tests := []struct {

-+		root string

-+		err  string

-+	}{

-+		{

-+			root: "",

-+			err:  "no scheme",

-+		},

-+		{

-+			root: "http://",

-+			err:  "",

-+		},

-+		{

-+			root: "a://",

-+			err:  "",

-+		},

-+		{

-+			root: "a#://",

-+			err:  "invalid scheme",

-+		},

-+		{

-+			root: "-config://",

-+			err:  "invalid scheme",

-+		},

-+	}

-+

-+	for _, test := range tests {

-+		err := validateRepoRootScheme(test.root)

-+		if err == nil {

-+			if test.err != "" {

-+				t.Errorf("validateRepoRootScheme(%q) = nil, want %q", test.root, test.err)

-+			}

-+		} else if test.err == "" {

-+			if err != nil {

-+				t.Errorf("validateRepoRootScheme(%q) = %q, want nil", test.root, test.err)

-+			}

-+		} else if err.Error() != test.err {

-+			t.Errorf("validateRepoRootScheme(%q) = %q, want %q", test.root, err, test.err)

-+		}

-+	}

-+}

@@ -12,15 +12,15 @@

 Summary:        Go

 Name:           go

-Version:        1.10.4

-Release:        2%{?dist}

+Version:        1.10.7

+Release:        1%{?dist}

 License:        BSD

 URL:            https://golang.org

 Group:          System Environment/Security

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://dl.google.com/go/%{name}%{version}.src.tar.gz

-%define sha1    go=adcd9d0bbbc764fa4ff20c08eb4a5a527fa95d96

+%define sha1    go=d083beabcd3c47b36a93ee7067664d0b1733843f

 Requires:       glibc

 %define ExtraBuildRequires go

@@ -110,6 +110,8 @@ rm -rf %{buildroot}/*

 %{_bindir}/*

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 1.10.7-1

+-   Update to 1.10.7

 *   Mon Oct 29 2018 Alexey Makhalov <amakhalov@vmware.com> 1.10.4-2

 -   Use ExtraBuildRequires

 *   Mon Sep 24 2018 Tapas Kundu <tkundu@vmware.com> 1.10.4-1

@@ -13,17 +13,15 @@

 Summary:        Go

 Name:           go

-Version:        1.9.4

-Release:        3%{?dist}

+Version:        1.9.7

+Release:        1%{?dist}

 License:        BSD

 URL:            https://golang.org

 Group:          System Environment/Security

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://dl.google.com/go/%{name}%{version}.src.tar.gz

-%define sha1    go=12b0ecee83525cd594f4fbf30380d4832e06f189

-Patch0:         go_imports_fix.patch

-Patch1:         CVE-2018-7187.patch

+%define sha1    go=388bb51899059e979b81473998f4e955c2af99ca

 Requires:       glibc

 # to avoid cyclic dependency use prebuilt publish go rpm

 %define ExtraBuildRequires go

@@ -33,8 +31,6 @@ Go is an open source programming language that makes it easy to build simple, re

 %prep

 %setup -qn %{name}

-%patch0 -p1

-%patch1 -p1

 %build

 export GOHOSTOS=linux

@@ -116,6 +112,8 @@ rm -rf %{buildroot}/*

 %{_bindir}/*

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 1.9.7-1

+-   Update to 1.9.7

 *   Wed Oct 24 2018 Alexey Makhalov <amakhalov@vmware.com> 1.9.4-3

 -   Use extra build requires

 *   Mon Apr 02 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.9.4-2

deleted file mode 100644

@@ -1,11 +0,0 @@

-+++ b/src/go/internal/gcimporter/exportdata.go	2016-03-31 15:54:24.274398819 -0700

-@@ -57,7 +57,7 @@ func FindExportData(r *bufio.Reader) (hdr string, err error) {

- 		}

- 

- 		// First entry should be __.PKGDEF.

--		if name != "__.PKGDEF" {

-+		if name != "__.PKGDEF" && name != "__.PKGDEF/"  {

- 			err = fmt.Errorf("go archive is missing __.PKGDEF")

- 			return

- 		}

@@ -1,7 +1,7 @@

 Summary:       BGP implementation in Go

 Name:          gobgp

 Version:       1.33

-Release:       1%{?dist}

+Release:       2%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       Apache-2.0

@@ -12,7 +12,7 @@ Source1:       golang-dep-0.3.0.tar.gz

 %define sha1 golang-dep-0.3.0=e5e9952227930fe1e8632edc03d690bffc3e1132

 Distribution:  Photon

 BuildRequires: git

-BuildRequires: go = 1.9.4

+BuildRequires: go = 1.9.7

 %define debug_package %{nil}

 %description

@@ -48,6 +48,8 @@ install ${GOPATH}/src/github.com/osrg/gobgp/dist/gobgpd %{buildroot}%{_bindir}/

 %doc LICENSE README.md

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 1.33-2

+-   Build using go 1.9.7

 *    Mon Sep 24 2018 Tapas Kundu <tkundu@vmware.com> 1.33-1

 -    Updated to 1.33 and Build using go version 1.9

 *    Mon Sep 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.23-1

@@ -1,6 +1,6 @@

 Name:           influxdb

 Version:        1.6.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 Summary:        InfluxDB is an open source time series database

 License:        MIT

 URL:            https://influxdata.com

@@ -87,7 +87,7 @@ Source39:       yamux.tar.gz

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Group:          Applications/Database

-BuildRequires:  go = 1.9.4

+BuildRequires:  go = 1.9.7

 BuildRequires:  git

 BuildRequires:  systemd

 Requires:       systemd

@@ -223,6 +223,8 @@ fi

 %exclude %{_bindir}/test_client

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 1.6.0-3

+-   Build using go 1.9.7

 *   Thu Oct 25 2018 Ajay Kaher <akaher@vmware.com> 1.6.0-2

 -   Fix for aarch64

 *   Wed Aug 1 2018 Keerthana K <keerthanak@vmware.com> 1.6.0-1

@@ -8,7 +8,7 @@

 Summary:        Kubernetes cluster management

 Name:           kubernetes

 Version:        1.10.7

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz

 Source0:        kubernetes-%{version}.tar.gz

@@ -19,7 +19,7 @@ Patch0:         k8s-1.10-vke.patch

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

-BuildRequires:  go = 1.9.4

+BuildRequires:  go = 1.9.7

 BuildRequires:  rsync

 BuildRequires:  which

 Requires:       cni

@@ -224,6 +224,8 @@ fi

 %endif

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 1.10.7-3

+-   Build using go 1.9.7

 *   Wed Oct 10 2018 Ajay Kaher <akaher@vmware.com> 1.10.7-2

 -   For aarch64 excluded drawin/arm64 and windows/arm64

 *   Wed Aug 29 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.10.7-1

@@ -8,7 +8,7 @@

 Summary:        Kubernetes cluster management

 Name:           kubernetes

 Version:        1.9.10

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz

 Source0:        kubernetes-v%{version}.tar.gz

@@ -19,7 +19,7 @@ Patch0:         k8s-1.9-vke.patch

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

-BuildRequires:  go = 1.9.4

+BuildRequires:  go = 1.9.7

 BuildRequires:  rsync

 BuildRequires:  which

 Requires:       cni

@@ -192,6 +192,8 @@ fi

 %{_bindir}/pause-%{archname}

 %changelog

+*   Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 1.9.10-2

+-   Build using go 1.9.7

 *   Wed Aug 29 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.9.10-1

 -   Update to k8s version 1.9.10 with VKE patch (fbdcc5c)

 *   Thu May 03 2018 Xiaolin Li <xiaolinl@vmware.com> 1.9.6-1