commit 2652cfe9db7871203a1aabd2a298d5184df9d1c7
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Dec 2 14:11:12 2014 -0500
Remove patches related to out-of-tree slice backend
- Update to latest upstream
.gitignore | 2 +-
0001-remove-third-party-dependency-on-Godeps.patch | 97 +++++-------
flannel-slice-type.patch | 155 --------------------
flannel-vxlan-subnetfix.patch | 12 --
flannel.spec | 14 +-
sources | 2 +-
6 files changed, 49 insertions(+), 233 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28e2cf8..7d1a984 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/flannel-071d778.tar.gz
+/flannel-a7b435a.tar.gz
diff --git a/0001-remove-third-party-dependency-on-Godeps.patch
b/0001-remove-third-party-dependency-on-Godeps.patch
index e2c0eb4..d87c577 100644
--- a/0001-remove-third-party-dependency-on-Godeps.patch
+++ b/0001-remove-third-party-dependency-on-Godeps.patch
@@ -1,24 +1,6 @@
-From e9097f81f65a1596ab79989de0e0ae8d0d031012 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup(a)redhat.com>
-Date: Wed, 19 Nov 2014 14:18:08 +0100
-Subject: [PATCH] remove third party dependency on Godeps
-
----
- backend/udp/cproxy.go | 2 +-
- backend/udp/udp.go | 4 ++--
- backend/vxlan/device.go | 6 +++---
- backend/vxlan/vxlan.go | 4 ++--
- main.go | 4 ++--
- pkg/ip/iface.go | 2 +-
- subnet/registry.go | 4 ++--
- subnet/subnet.go | 4 ++--
- subnet/subnet_test.go | 2 +-
- 9 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/backend/udp/cproxy.go b/backend/udp/cproxy.go
-index 062d277..f1cce26 100644
---- a/backend/udp/cproxy.go
-+++ b/backend/udp/cproxy.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go
+---
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go 2014-12-02
13:44:51.378412184 -0500
@@ -9,7 +9,7 @@ import (
"reflect"
"unsafe"
@@ -28,10 +10,9 @@ index 062d277..f1cce26 100644
"github.com/coreos/flannel/pkg/ip"
)
-diff --git a/backend/udp/udp.go b/backend/udp/udp.go
-index 90f8617..782f7d3 100644
---- a/backend/udp/udp.go
-+++ b/backend/udp/udp.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go 2014-12-02
13:44:51.378412184 -0500
@@ -9,8 +9,8 @@ import (
"sync"
"syscall"
@@ -43,10 +24,9 @@ index 90f8617..782f7d3 100644
"github.com/coreos/flannel/backend"
"github.com/coreos/flannel/pkg/ip"
-diff --git a/backend/vxlan/device.go b/backend/vxlan/device.go
-index a15b067..9764189 100644
---- a/backend/vxlan/device.go
-+++ b/backend/vxlan/device.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go
+---
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go 2014-12-02
13:44:51.378412184 -0500
@@ -7,9 +7,9 @@ import (
"syscall"
"time"
@@ -60,10 +40,9 @@ index a15b067..9764189 100644
"github.com/coreos/flannel/pkg/ip"
)
-diff --git a/backend/vxlan/vxlan.go b/backend/vxlan/vxlan.go
-index b47eea2..4a878ce 100644
---- a/backend/vxlan/vxlan.go
-+++ b/backend/vxlan/vxlan.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go
+---
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go 2014-12-02
13:44:51.379412195 -0500
@@ -6,8 +6,8 @@ import (
"net"
"sync"
@@ -75,10 +54,9 @@ index b47eea2..4a878ce 100644
"github.com/coreos/flannel/backend"
"github.com/coreos/flannel/subnet"
-diff --git a/main.go b/main.go
-index 5f81923..0955fc7 100644
---- a/main.go
-+++ b/main.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go 2014-12-02
13:44:51.379412195 -0500
@@ -12,8 +12,8 @@ import (
"syscall"
"time"
@@ -90,10 +68,9 @@ index 5f81923..0955fc7 100644
"github.com/coreos/flannel/backend"
"github.com/coreos/flannel/pkg/ip"
-diff --git a/pkg/ip/iface.go b/pkg/ip/iface.go
-index 077feec..dee69a6 100644
---- a/pkg/ip/iface.go
-+++ b/pkg/ip/iface.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go 2014-12-02
13:44:51.380412206 -0500
@@ -5,7 +5,7 @@ import (
"net"
"syscall"
@@ -103,10 +80,21 @@ index 077feec..dee69a6 100644
)
func GetIfaceIP4Addr(iface *net.Interface) (net.IP, error) {
-diff --git a/subnet/registry.go b/subnet/registry.go
-index 8c6797e..ccfee74 100644
---- a/subnet/registry.go
-+++ b/subnet/registry.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go.orig 2014-12-02
13:46:27.648471327 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go 2014-12-02
13:46:35.830561345 -0500
+@@ -3,7 +3,7 @@ package ip
+ import (
+ "bytes"
+ "fmt"
+- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
++ log "github.com/golang/glog"
+ "os/exec"
+ "regexp"
+ "strconv"
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go 2014-12-02
13:44:51.380412206 -0500
@@ -5,8 +5,8 @@ import (
"sync"
"time"
@@ -118,10 +106,9 @@ index 8c6797e..ccfee74 100644
)
type subnetRegistry interface {
-diff --git a/subnet/subnet.go b/subnet/subnet.go
-index 465952f..1208dfd 100644
---- a/subnet/subnet.go
-+++ b/subnet/subnet.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go 2014-12-02
13:44:51.381412217 -0500
@@ -9,8 +9,8 @@ import (
"strconv"
"time"
@@ -133,11 +120,10 @@ index 465952f..1208dfd 100644
"github.com/coreos/flannel/pkg/ip"
"github.com/coreos/flannel/pkg/task"
-diff --git a/subnet/subnet_test.go b/subnet/subnet_test.go
-index 803fdc7..2ee58d5 100644
---- a/subnet/subnet_test.go
-+++ b/subnet/subnet_test.go
-@@ -5,7 +5,7 @@ import (
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go.orig
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go
+---
flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go.orig 2014-11-27
13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go 2014-12-02
13:44:51.381412217 -0500
+@@ -6,7 +6,7 @@ import (
"testing"
"time"
@@ -146,6 +132,3 @@ index 803fdc7..2ee58d5 100644
"github.com/coreos/flannel/pkg/ip"
)
---
-1.9.3
-
diff --git a/flannel.spec b/flannel.spec
index a3cbcb4..3eed850 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -4,12 +4,12 @@
%global project coreos
%global repo flannel
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 071d7786cfae6a9ef6f8b83a60858d34aa8f8749
+%global commit a7b435a9205335db25372bde8c1ff4e522ed3bc7
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: flannel
Version: 0.1.0
-Release: 7.git%{shortcommit}%{?dist}
+Release: 8.git%{shortcommit}%{?dist}
Summary: Etcd address management agent for overlay networks
License: ASL 2.0
URL: https://%{import_path}
@@ -18,9 +18,7 @@ Source1: flanneld.service
Source2: flanneld.sysconf
ExclusiveArch: %{ix86} x86_64 %{arm}
-Patch0: flannel-slice-type.patch
-Patch1: flannel-vxlan-subnetfix.patch
-Patch2: 0001-remove-third-party-dependency-on-Godeps.patch
+Patch0: 0001-remove-third-party-dependency-on-Godeps.patch
BuildRequires: golang >= 1.2.7
BuildRequires: golang-cover
@@ -75,8 +73,6 @@ building other packages which use %{project}/%{repo}.
%prep
%setup -q -n %{repo}-%{commit}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
rm -rf Godeps
@@ -122,6 +118,10 @@ cp -pav {backend,pkg,subnet}
%{buildroot}/%{gopath}/src/%{import_path}/
%{gopath}/src/%{import_path}/
%changelog
+* Tue Dec 2 2014 John W. Linville <linville(a)redhat.com> - 0.1.0-8.gita7b435a
+- Remove patches related to out-of-tree slice backend
+- Update to latest upstream
+
* Thu Nov 20 2014 jchaloup <jchaloup(a)redhat.com> - 0.1.0-7.git071d778
- Removing deps on Godeps and adding deps on golang-github packages
- Removing wait-online service and changing Type of flannel.service from simple to
notify
diff --git a/sources b/sources
index 8c351cc..bf928c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5dedc1a99e8531ef6a7bd968f89f8f6 flannel-071d778.tar.gz
+c0607a068952ae51cb6d53a72ce62d21 flannel-a7b435a.tar.gz