Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2016-06-23 13:36:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containerd" Changes: -------- --- /work/SRC/openSUSE:Factory/containerd/containerd.changes 2016-05-04 08:20:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2016-06-23 13:36:06.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 17 14:42:43 UTC 2016 - asa...@suse.de + +* Update to containerd v0.2.2. +* Includes updates to the out-of-tree patches. + +------------------------------------------------------------------- Old: ---- containerd-0.2.1.tar.xz New: ---- containerd-0.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerd.spec ++++++ --- /var/tmp/diff_new_pack.m7Lenu/_old 2016-06-23 13:36:07.000000000 +0200 +++ /var/tmp/diff_new_pack.m7Lenu/_new 2016-06-23 13:36:07.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define go_arches %ix86 x86_64 aarch64 %ifarch %go_arches @@ -25,15 +26,15 @@ %define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed -static-libgo -ldl" %endif -%define version_unconverted 0.2.1 +%define version_unconverted 0.2.2 Name: containerd -Version: 0.2.1 +Version: 0.2.2 Release: 0 -License: Apache-2.0 Summary: Standalone OCI Container Daemon -Url: https://containerd.tools +License: Apache-2.0 Group: System/Management +Url: https://containerd.tools Source: %{name}-%{version}.tar.xz Source1: %{name}.service Source2: %{name}.socket @@ -134,3 +135,5 @@ %files ctr %{_sbindir}/%{name}-%{client} + +%changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.m7Lenu/_old 2016-06-23 13:36:08.000000000 +0200 +++ /var/tmp/diff_new_pack.m7Lenu/_new 2016-06-23 13:36:08.000000000 +0200 @@ -3,8 +3,8 @@ <param name="url">https://github.com/docker/containerd.git</param> <param name="scm">git</param> <param name="filename">containerd</param> - <param name="versionformat">0.2.1</param> - <param name="revision">v0.2.1</param> + <param name="versionformat">0.2.2</param> + <param name="revision">v0.2.2</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled"> ++++++ containerd-0.2.1.tar.xz -> containerd-0.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containerd-0.2.1/api/grpc/server/server_linux.go new/containerd-0.2.2/api/grpc/server/server_linux.go --- old/containerd-0.2.1/api/grpc/server/server_linux.go 2016-04-29 10:59:28.000000000 +0200 +++ new/containerd-0.2.2/api/grpc/server/server_linux.go 2016-06-17 16:39:42.000000000 +0200 @@ -142,6 +142,7 @@ Failcnt: memSt.KernelUsage.Failcnt, Limit: memSt.KernelUsage.Limit, }, + Stats: memSt.Stats, } blkSt := lcSt.CgroupStats.BlkioStats pbSt.CgroupStats.BlkioStats = &types.BlkioStats{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containerd-0.2.1/version.go new/containerd-0.2.2/version.go --- old/containerd-0.2.1/version.go 2016-04-29 10:59:28.000000000 +0200 +++ new/containerd-0.2.2/version.go 2016-06-17 16:39:42.000000000 +0200 @@ -1,5 +1,5 @@ package containerd -const Version = "0.1.0" +const Version = "0.2.2" var GitCommit = "" ++++++ socket-activation-01-vendor.patch ++++++ --- /var/tmp/diff_new_pack.m7Lenu/_old 2016-06-23 13:36:08.000000000 +0200 +++ /var/tmp/diff_new_pack.m7Lenu/_new 2016-06-23 13:36:08.000000000 +0200 @@ -79,11 +79,11 @@ create mode 100644 vendor/src/golang.org/x/net/proxy/proxy.go create mode 100644 vendor/src/golang.org/x/net/proxy/socks5.go -diff --git a/hack/vendor.sh b/hack/vendor.sh -index 6848552..31c7df2 100755 ---- a/hack/vendor.sh -+++ b/hack/vendor.sh -@@ -9,7 +9,7 @@ clone git github.com/cloudfoundry/gosigar 3ed7c74352dae6dc00bdc8c74045375352e3ec +Index: containerd-0.2.2/hack/vendor.sh +=================================================================== +--- containerd-0.2.2.orig/hack/vendor.sh ++++ containerd-0.2.2/hack/vendor.sh +@@ -9,7 +9,7 @@ clone git github.com/cloudfoundry/gosiga clone git github.com/codegangsta/cli 9fec0fad02befc9209347cc6d620e68e1b45f74d clone git github.com/coreos/go-systemd 7b2428fec40033549c68f54e26e89e7ca9a9ce31 clone git github.com/cyberdelia/go-metrics-graphite 7e54b5c2aa6eaff4286c44129c3def899dff528c @@ -92,7 +92,7 @@ clone git github.com/docker/go-units 5d2041e26a699eaca682e2ea41c8f891e1060444 clone git github.com/godbus/dbus e2cf28118e66a6a63db46cf6088a35d2054d3bb0 clone git github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998 -@@ -28,4 +28,8 @@ clone git github.com/seccomp/libseccomp-golang 1b506fc7c24eec5a3693cdcbed40d9c22 +@@ -28,4 +28,8 @@ clone git github.com/seccomp/libseccomp- clone git github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3 clone git github.com/go-check/check a625211d932a2a643d0d17352095f03fb7774663 https://github.com/cpuguy83/check.git @@ -101,18 +101,16 @@ +clone git github.com/Microsoft/go-winio v0.3.2 + clean -diff --git a/vendor/src/github.com/Microsoft/go-winio/.gitignore b/vendor/src/github.com/Microsoft/go-winio/.gitignore -new file mode 100644 -index 0000000..b883f1f +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/.gitignore +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/.gitignore ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/.gitignore @@ -0,0 +1 @@ +*.exe -diff --git a/vendor/src/github.com/Microsoft/go-winio/LICENSE b/vendor/src/github.com/Microsoft/go-winio/LICENSE -new file mode 100644 -index 0000000..b8b569d +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/LICENSE +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/LICENSE ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + @@ -136,11 +134,10 @@ +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + -diff --git a/vendor/src/github.com/Microsoft/go-winio/README.md b/vendor/src/github.com/Microsoft/go-winio/README.md -new file mode 100644 -index 0000000..478862a +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/README.md +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/README.md ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/README.md @@ -0,0 +1,15 @@ +# go-winio + @@ -157,11 +154,10 @@ + +Thanks to natefinch for the inspiration for this library. See https://github.com/natefinch/npipe +for another named pipe implementation. -diff --git a/vendor/src/github.com/Microsoft/go-winio/archive/tar/LICENSE b/vendor/src/github.com/Microsoft/go-winio/archive/tar/LICENSE -new file mode 100644 -index 0000000..7448756 +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/archive/tar/LICENSE +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/archive/tar/LICENSE ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/archive/tar/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2012 The Go Authors. All rights reserved. + @@ -190,11 +186,10 @@ +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -diff --git a/vendor/src/github.com/Microsoft/go-winio/backup.go b/vendor/src/github.com/Microsoft/go-winio/backup.go -new file mode 100644 -index 0000000..8649351 +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/backup.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/backup.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/backup.go @@ -0,0 +1,266 @@ +package winio + @@ -462,11 +457,10 @@ + } + return os.NewFile(uintptr(h), path), nil +} -diff --git a/vendor/src/github.com/Microsoft/go-winio/file.go b/vendor/src/github.com/Microsoft/go-winio/file.go -new file mode 100644 -index 0000000..fd16f00 +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/file.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/file.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/file.go @@ -0,0 +1,219 @@ +package winio + @@ -687,11 +681,10 @@ + f.writeDeadline = t + return nil +} -diff --git a/vendor/src/github.com/Microsoft/go-winio/fileinfo.go b/vendor/src/github.com/Microsoft/go-winio/fileinfo.go -new file mode 100644 -index 0000000..d5acb72 +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/fileinfo.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/fileinfo.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/fileinfo.go @@ -0,0 +1,54 @@ +package winio + @@ -747,11 +740,10 @@ + } + return fileID, nil +} -diff --git a/vendor/src/github.com/Microsoft/go-winio/pipe.go b/vendor/src/github.com/Microsoft/go-winio/pipe.go -new file mode 100644 -index 0000000..82db283 +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/pipe.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/pipe.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/pipe.go @@ -0,0 +1,398 @@ +package winio + @@ -1151,11 +1143,10 @@ +func (l *win32PipeListener) Addr() net.Addr { + return pipeAddress(l.path) +} -diff --git a/vendor/src/github.com/Microsoft/go-winio/privilege.go b/vendor/src/github.com/Microsoft/go-winio/privilege.go -new file mode 100644 -index 0000000..81f9af7 +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/privilege.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/privilege.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/privilege.go @@ -0,0 +1,150 @@ +package winio + @@ -1307,11 +1298,10 @@ + } + syscall.Close(h) +} -diff --git a/vendor/src/github.com/Microsoft/go-winio/reparse.go b/vendor/src/github.com/Microsoft/go-winio/reparse.go -new file mode 100644 -index 0000000..fc1ee4d +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/reparse.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/reparse.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/reparse.go @@ -0,0 +1,128 @@ +package winio + @@ -1441,11 +1431,10 @@ + binary.Write(&b, binary.LittleEndian, target16) + return b.Bytes() +} -diff --git a/vendor/src/github.com/Microsoft/go-winio/sd.go b/vendor/src/github.com/Microsoft/go-winio/sd.go -new file mode 100644 -index 0000000..60ab56c +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/sd.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/sd.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/sd.go @@ -0,0 +1,96 @@ +package winio + @@ -1543,20 +1532,18 @@ + defer localFree(uintptr(unsafe.Pointer(sddl))) + return syscall.UTF16ToString((*[0xffff]uint16)(unsafe.Pointer(sddl))[:]), nil +} -diff --git a/vendor/src/github.com/Microsoft/go-winio/syscall.go b/vendor/src/github.com/Microsoft/go-winio/syscall.go -new file mode 100644 -index 0000000..96fdff7 +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/syscall.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/syscall.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/syscall.go @@ -0,0 +1,3 @@ +package winio + +//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall.go file.go pipe.go sd.go fileinfo.go privilege.go backup.go -diff --git a/vendor/src/github.com/Microsoft/go-winio/zsyscall.go b/vendor/src/github.com/Microsoft/go-winio/zsyscall.go -new file mode 100644 -index 0000000..74b6e97 +Index: containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/zsyscall.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/Microsoft/go-winio/zsyscall.go ++++ containerd-0.2.2/vendor/src/github.com/Microsoft/go-winio/zsyscall.go @@ -0,0 +1,492 @@ +// MACHINE GENERATED BY 'go generate' COMMAND; DO NOT EDIT + @@ -2050,11 +2037,10 @@ + } + return +} -diff --git a/vendor/src/github.com/coreos/go-systemd/activation/files.go b/vendor/src/github.com/coreos/go-systemd/activation/files.go -new file mode 100644 -index 0000000..c8e85fc +Index: containerd-0.2.2/vendor/src/github.com/coreos/go-systemd/activation/files.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/coreos/go-systemd/activation/files.go ++++ containerd-0.2.2/vendor/src/github.com/coreos/go-systemd/activation/files.go @@ -0,0 +1,52 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -2108,11 +2094,10 @@ + + return files +} -diff --git a/vendor/src/github.com/coreos/go-systemd/activation/listeners.go b/vendor/src/github.com/coreos/go-systemd/activation/listeners.go -new file mode 100644 -index 0000000..df27c29 +Index: containerd-0.2.2/vendor/src/github.com/coreos/go-systemd/activation/listeners.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/coreos/go-systemd/activation/listeners.go ++++ containerd-0.2.2/vendor/src/github.com/coreos/go-systemd/activation/listeners.go @@ -0,0 +1,62 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -2176,11 +2161,10 @@ + + return listeners, err +} -diff --git a/vendor/src/github.com/coreos/go-systemd/activation/packetconns.go b/vendor/src/github.com/coreos/go-systemd/activation/packetconns.go -new file mode 100644 -index 0000000..48b2ca0 +Index: containerd-0.2.2/vendor/src/github.com/coreos/go-systemd/activation/packetconns.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/coreos/go-systemd/activation/packetconns.go ++++ containerd-0.2.2/vendor/src/github.com/coreos/go-systemd/activation/packetconns.go @@ -0,0 +1,37 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -2219,11 +2203,10 @@ + } + return conns, nil +} -diff --git a/vendor/src/github.com/docker/docker/pkg/listeners/listeners_unix.go b/vendor/src/github.com/docker/docker/pkg/listeners/listeners_unix.go -new file mode 100644 -index 0000000..fddd3a8 +Index: containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/listeners/listeners_unix.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/docker/pkg/listeners/listeners_unix.go ++++ containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/listeners/listeners_unix.go @@ -0,0 +1,94 @@ +// +build !windows + @@ -2319,11 +2302,10 @@ + } + return []net.Listener{listeners[fdOffset]}, nil +} -diff --git a/vendor/src/github.com/docker/docker/pkg/listeners/listeners_windows.go b/vendor/src/github.com/docker/docker/pkg/listeners/listeners_windows.go -new file mode 100644 -index 0000000..5b5a470 +Index: containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/listeners/listeners_windows.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/docker/pkg/listeners/listeners_windows.go ++++ containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/listeners/listeners_windows.go @@ -0,0 +1,54 @@ +package listeners + @@ -2379,10 +2361,10 @@ + + return ls, nil +} -diff --git a/vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go b/vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go -index 061e220..ef596f3 100644 ---- a/vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go -+++ b/vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go +Index: containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go +=================================================================== +--- containerd-0.2.2.orig/vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go ++++ containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go @@ -1,11 +1,14 @@ package system @@ -2421,7 +2403,7 @@ } // Unmount is a platform-specific helper function to call -@@ -58,3 +62,12 @@ func CommandLineToArgv(commandLine string) ([]string, error) { +@@ -58,3 +62,12 @@ func CommandLineToArgv(commandLine strin return newArgs, nil } @@ -2434,10 +2416,10 @@ + // APIs. + return ntuserApiset.Load() == nil +} -diff --git a/vendor/src/github.com/docker/docker/pkg/system/umask.go b/vendor/src/github.com/docker/docker/pkg/system/umask.go -index c670fcd..3d0146b 100644 ---- a/vendor/src/github.com/docker/docker/pkg/system/umask.go -+++ b/vendor/src/github.com/docker/docker/pkg/system/umask.go +Index: containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/system/umask.go +=================================================================== +--- containerd-0.2.2.orig/vendor/src/github.com/docker/docker/pkg/system/umask.go ++++ containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/system/umask.go @@ -7,7 +7,7 @@ import ( ) @@ -2447,10 +2429,10 @@ func Umask(newmask int) (oldmask int, err error) { return syscall.Umask(newmask), nil } -diff --git a/vendor/src/github.com/docker/docker/pkg/term/term.go b/vendor/src/github.com/docker/docker/pkg/term/term.go -index 11ed209..eaa0322 100644 ---- a/vendor/src/github.com/docker/docker/pkg/term/term.go -+++ b/vendor/src/github.com/docker/docker/pkg/term/term.go +Index: containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/term/term.go +=================================================================== +--- containerd-0.2.2.orig/vendor/src/github.com/docker/docker/pkg/term/term.go ++++ containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/term/term.go @@ -27,8 +27,6 @@ type State struct { type Winsize struct { Height uint16 @@ -2460,10 +2442,10 @@ } // StdStreams returns the standard streams (stdin, stdout, stedrr). -diff --git a/vendor/src/github.com/docker/docker/pkg/term/term_windows.go b/vendor/src/github.com/docker/docker/pkg/term/term_windows.go -index 3101c80..cd21b5f 100644 ---- a/vendor/src/github.com/docker/docker/pkg/term/term_windows.go -+++ b/vendor/src/github.com/docker/docker/pkg/term/term_windows.go +Index: containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/term/term_windows.go +=================================================================== +--- containerd-0.2.2.orig/vendor/src/github.com/docker/docker/pkg/term/term_windows.go ++++ containerd-0.2.2/vendor/src/github.com/docker/docker/pkg/term/term_windows.go @@ -23,14 +23,13 @@ type State struct { type Winsize struct { Height uint16 @@ -2480,7 +2462,7 @@ ) // usingNativeConsole is true if we are using the Windows native console -@@ -58,21 +57,13 @@ func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) { +@@ -58,21 +57,13 @@ func StdStreams() (stdIn io.ReadCloser, // console which supports ANSI emulation, or fall-back to the golang emulator // (github.com/azure/go-ansiterm). func useNativeConsole() bool { @@ -2503,7 +2485,7 @@ // Get the console modes. If this fails, we can't use the native console state, err := getNativeConsole() if err != nil { -@@ -146,8 +137,14 @@ func probeNativeConsole(state State) error { +@@ -146,8 +137,14 @@ func probeNativeConsole(state State) err // enableNativeConsole turns on native console mode func enableNativeConsole(state State) error { @@ -2520,7 +2502,7 @@ } if err := winterm.SetConsoleMode(uintptr(state.inHandle), state.inMode|enableVirtualTerminalInput); err != nil { -@@ -187,8 +184,7 @@ func GetWinsize(fd uintptr) (*Winsize, error) { +@@ -187,8 +184,7 @@ func GetWinsize(fd uintptr) (*Winsize, e winsize := &Winsize{ Width: uint16(info.Window.Right - info.Window.Left + 1), Height: uint16(info.Window.Bottom - info.Window.Top + 1), @@ -2530,11 +2512,10 @@ return winsize, nil } -diff --git a/vendor/src/github.com/docker/go-connections/LICENSE b/vendor/src/github.com/docker/go-connections/LICENSE -new file mode 100644 -index 0000000..b55b37b +Index: containerd-0.2.2/vendor/src/github.com/docker/go-connections/LICENSE +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/go-connections/LICENSE ++++ containerd-0.2.2/vendor/src/github.com/docker/go-connections/LICENSE @@ -0,0 +1,191 @@ + + Apache License @@ -2727,14 +2708,10 @@ + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -diff --git a/vendor/src/github.com/docker/go-connections/sockets/README.md b/vendor/src/github.com/docker/go-connections/sockets/README.md -new file mode 100644 -index 0000000..e69de29 -diff --git a/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go b/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go -new file mode 100644 -index 0000000..3395e40 +Index: containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go ++++ containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go @@ -0,0 +1,89 @@ +package sockets + @@ -2825,11 +2802,10 @@ +func (e *timeoutError) Error() string { return "i/o timeout" } +func (e *timeoutError) Timeout() bool { return true } +func (e *timeoutError) Temporary() bool { return true } -diff --git a/vendor/src/github.com/docker/go-connections/sockets/proxy.go b/vendor/src/github.com/docker/go-connections/sockets/proxy.go -new file mode 100644 -index 0000000..98e9a1d +Index: containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/proxy.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/go-connections/sockets/proxy.go ++++ containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/proxy.go @@ -0,0 +1,51 @@ +package sockets + @@ -2882,11 +2858,10 @@ + + return perHost, nil +} -diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets.go b/vendor/src/github.com/docker/go-connections/sockets/sockets.go -new file mode 100644 -index 0000000..1739cec +Index: containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/sockets.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/go-connections/sockets/sockets.go ++++ containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/sockets.go @@ -0,0 +1,42 @@ +// Package sockets provides helper functions to create and configure Unix or TCP sockets. +package sockets @@ -2930,11 +2905,10 @@ + } + return nil +} -diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go b/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go -new file mode 100644 -index 0000000..b255ac9 +Index: containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go ++++ containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go @@ -0,0 +1,15 @@ +// +build !windows + @@ -2951,11 +2925,10 @@ +func DialPipe(_ string, _ time.Duration) (net.Conn, error) { + return nil, syscall.EAFNOSUPPORT +} -diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go b/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go -new file mode 100644 -index 0000000..1f3540b +Index: containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go ++++ containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go @@ -0,0 +1,13 @@ +package sockets + @@ -2970,11 +2943,10 @@ +func DialPipe(addr string, timeout time.Duration) (net.Conn, error) { + return winio.DialPipe(addr, &timeout) +} -diff --git a/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go b/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go -new file mode 100644 -index 0000000..8a82727 +Index: containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go ++++ containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go @@ -0,0 +1,22 @@ +// Package sockets provides helper functions to create and configure Unix or TCP sockets. +package sockets @@ -2998,11 +2970,10 @@ + } + return l, nil +} -diff --git a/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go b/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go -new file mode 100644 -index 0000000..d162734 +Index: containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go +=================================================================== --- /dev/null -+++ b/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go ++++ containerd-0.2.2/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go @@ -0,0 +1,80 @@ +// +build linux freebsd solaris + @@ -3084,11 +3055,10 @@ + } + return -1, fmt.Errorf("Group %s not found", nameOrGid) +} -diff --git a/vendor/src/golang.org/x/net/proxy/direct.go b/vendor/src/golang.org/x/net/proxy/direct.go -new file mode 100644 -index 0000000..4c5ad88 +Index: containerd-0.2.2/vendor/src/golang.org/x/net/proxy/direct.go +=================================================================== --- /dev/null -+++ b/vendor/src/golang.org/x/net/proxy/direct.go ++++ containerd-0.2.2/vendor/src/golang.org/x/net/proxy/direct.go @@ -0,0 +1,18 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style @@ -3108,11 +3078,10 @@ +func (direct) Dial(network, addr string) (net.Conn, error) { + return net.Dial(network, addr) +} -diff --git a/vendor/src/golang.org/x/net/proxy/per_host.go b/vendor/src/golang.org/x/net/proxy/per_host.go -new file mode 100644 -index 0000000..f540b19 +Index: containerd-0.2.2/vendor/src/golang.org/x/net/proxy/per_host.go +=================================================================== --- /dev/null -+++ b/vendor/src/golang.org/x/net/proxy/per_host.go ++++ containerd-0.2.2/vendor/src/golang.org/x/net/proxy/per_host.go @@ -0,0 +1,140 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style @@ -3254,11 +3223,10 @@ + } + p.bypassHosts = append(p.bypassHosts, host) +} -diff --git a/vendor/src/golang.org/x/net/proxy/proxy.go b/vendor/src/golang.org/x/net/proxy/proxy.go -new file mode 100644 -index 0000000..78a8b7b +Index: containerd-0.2.2/vendor/src/golang.org/x/net/proxy/proxy.go +=================================================================== --- /dev/null -+++ b/vendor/src/golang.org/x/net/proxy/proxy.go ++++ containerd-0.2.2/vendor/src/golang.org/x/net/proxy/proxy.go @@ -0,0 +1,94 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style @@ -3354,11 +3322,10 @@ + + return nil, errors.New("proxy: unknown scheme: " + u.Scheme) +} -diff --git a/vendor/src/golang.org/x/net/proxy/socks5.go b/vendor/src/golang.org/x/net/proxy/socks5.go -new file mode 100644 -index 0000000..9b96282 +Index: containerd-0.2.2/vendor/src/golang.org/x/net/proxy/socks5.go +=================================================================== --- /dev/null -+++ b/vendor/src/golang.org/x/net/proxy/socks5.go ++++ containerd-0.2.2/vendor/src/golang.org/x/net/proxy/socks5.go @@ -0,0 +1,210 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style @@ -3570,6 +3537,3 @@ + closeConn = nil + return conn, nil +} --- -2.8.1 - ++++++ socket-activation-02-daemon.patch ++++++ --- /var/tmp/diff_new_pack.m7Lenu/_old 2016-06-23 13:36:08.000000000 +0200 +++ /var/tmp/diff_new_pack.m7Lenu/_new 2016-06-23 13:36:08.000000000 +0200 @@ -15,10 +15,10 @@ containerd/main_linux.go | 3 +-- 2 files changed, 19 insertions(+), 10 deletions(-) -diff --git a/containerd/main.go b/containerd/main.go -index becc181..e39e1cb 100644 ---- a/containerd/main.go -+++ b/containerd/main.go +Index: containerd-0.2.2/containerd/main.go +=================================================================== +--- containerd-0.2.2.orig/containerd/main.go ++++ containerd-0.2.2/containerd/main.go @@ -2,9 +2,9 @@ package main import ( @@ -47,7 +47,7 @@ }, cli.StringFlag{ Name: "runtime,r", -@@ -127,7 +128,13 @@ func daemon(context *cli.Context) error { +@@ -120,7 +121,13 @@ func daemon(context *cli.Context) error if err := sv.Start(); err != nil { return err } @@ -62,7 +62,7 @@ if err != nil { return err } -@@ -146,14 +153,17 @@ func daemon(context *cli.Context) error { +@@ -139,14 +146,17 @@ func daemon(context *cli.Context) error return nil } @@ -85,10 +85,10 @@ s := grpc.NewServer() types.RegisterAPIServer(s, server.NewServer(sv)) go func() { -diff --git a/containerd/main_linux.go b/containerd/main_linux.go -index 8ee74a2..02922c2 100644 ---- a/containerd/main_linux.go -+++ b/containerd/main_linux.go +Index: containerd-0.2.2/containerd/main_linux.go +=================================================================== +--- containerd-0.2.2.orig/containerd/main_linux.go ++++ containerd-0.2.2/containerd/main_linux.go @@ -20,8 +20,7 @@ import ( const ( @@ -99,6 +99,3 @@ ) func appendPlatformFlags() { --- -2.8.1 - ++++++ socket-activation-03-ctr.patch ++++++ --- /var/tmp/diff_new_pack.m7Lenu/_old 2016-06-23 13:36:08.000000000 +0200 +++ /var/tmp/diff_new_pack.m7Lenu/_new 2016-06-23 13:36:08.000000000 +0200 @@ -12,10 +12,10 @@ ctr/main.go | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) -diff --git a/ctr/container.go b/ctr/container.go -index ab44606..b488f9c 100644 ---- a/ctr/container.go -+++ b/ctr/container.go +Index: containerd-0.2.2/ctr/container.go +=================================================================== +--- containerd-0.2.2.orig/ctr/container.go ++++ containerd-0.2.2/ctr/container.go @@ -26,15 +26,22 @@ import ( // TODO: parse flags and pass opts @@ -41,10 +41,10 @@ if err != nil { fatal(err.Error(), 1) } -diff --git a/ctr/main.go b/ctr/main.go -index 3fe6396..06910ca 100644 ---- a/ctr/main.go -+++ b/ctr/main.go +Index: containerd-0.2.2/ctr/main.go +=================================================================== +--- containerd-0.2.2.orig/ctr/main.go ++++ containerd-0.2.2/ctr/main.go @@ -41,8 +41,8 @@ func main() { }, cli.StringFlag{ @@ -56,6 +56,3 @@ }, cli.DurationFlag{ Name: "conn-timeout", --- -2.8.1 -
