Hello community, here is the log from the commit of package cri-o for openSUSE:Factory checked in at 2018-03-16 10:44:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cri-o (Old) and /work/SRC/openSUSE:Factory/.cri-o.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cri-o" Fri Mar 16 10:44:23 2018 rev:6 rq:587563 version:1.9.10 Changes: -------- --- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes 2018-03-13 10:23:51.434160159 +0100 +++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-03-16 10:45:20.452170052 +0100 @@ -1,0 +2,14 @@ +Thu Mar 15 15:21:50 UTC 2018 - [email protected] + +- Require cni and cni-plugins to enable container networking. + feature#crio + +------------------------------------------------------------------- +Thu Mar 15 06:43:33 UTC 2018 - [email protected] + +- Update cri-o to v1.9.10: + * conmon: Avoid strlen in logging path + * conmon: Remove info logs + * container_exec: Fix terminal setting for exec + +------------------------------------------------------------------- Old: ---- cri-o-1.9.9.tar.xz New: ---- cri-o-1.9.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cri-o.spec ++++++ --- /var/tmp/diff_new_pack.4kDvK1/_old 2018-03-16 10:45:21.520131596 +0100 +++ /var/tmp/diff_new_pack.4kDvK1/_new 2018-03-16 10:45:21.524131452 +0100 @@ -31,7 +31,7 @@ %define name_source2 sysconfig.crio %define name_source3 crio.conf Name: cri-o -Version: 1.9.9 +Version: 1.9.10 Release: 0 Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: Apache-2.0 @@ -55,6 +55,8 @@ BuildRequires: libgpgme-devel BuildRequires: libseccomp-devel BuildRequires: golang(API) >= 1.8 +Requires: cni +Requires: cni-plugins Requires: iproute2 Requires: iptables Requires: libcontainers-common ++++++ _service ++++++ --- /var/tmp/diff_new_pack.4kDvK1/_old 2018-03-16 10:45:21.580129436 +0100 +++ /var/tmp/diff_new_pack.4kDvK1/_new 2018-03-16 10:45:21.580129436 +0100 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/kubernetes-incubator/cri-o</param> <param name="scm">git</param> -<param name="versionformat">1.9.9</param> -<param name="revision">v1.9.9</param> +<param name="versionformat">1.9.10</param> +<param name="revision">v1.9.10</param> </service> <service name="recompress" mode="disabled"> <param name="file">cri-o-*.tar</param> ++++++ cri-o-1.9.9.tar.xz -> cri-o-1.9.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.9.9/conmon/conmon.c new/cri-o-1.9.10/conmon/conmon.c --- old/cri-o-1.9.9/conmon/conmon.c 2018-03-08 10:50:58.000000000 +0100 +++ new/cri-o-1.9.10/conmon/conmon.c 2018-03-12 17:46:45.000000000 +0100 @@ -212,9 +212,6 @@ if (data == NULL) return 1; - if (len < 0) - len = strlen ((char *)data); - if (buf->iovcnt == WRITEV_BUFFER_N_IOV && writev_buffer_flush (fd, buf) < 0) return -1; @@ -336,7 +333,6 @@ * a timestamp. */ if ((opt_log_size_max > 0) && (bytes_written + bytes_to_be_written) > opt_log_size_max) { - ninfo("Creating new log file"); bytes_written = 0; /* Close the existing fd */ @@ -355,19 +351,19 @@ } /* Output the timestamp */ - if (writev_buffer_append_segment(fd, &bufv, tsbuf, -1) < 0) { + if (writev_buffer_append_segment(fd, &bufv, tsbuf, TSBUFLEN - 1) < 0) { nwarn("failed to write (timestamp, stream) to log"); goto next; } /* Output log tag for partial or newline */ if (partial) { - if (writev_buffer_append_segment(fd, &bufv, "P ", -1) < 0) { + if (writev_buffer_append_segment(fd, &bufv, "P ", 2) < 0) { nwarn("failed to write partial log tag"); goto next; } } else { - if (writev_buffer_append_segment(fd, &bufv, "F ", -1) < 0) { + if (writev_buffer_append_segment(fd, &bufv, "F ", 2) < 0) { nwarn("failed to write end log tag"); goto next; } @@ -381,7 +377,7 @@ /* Output a newline for partial */ if (partial) { - if (writev_buffer_append_segment(fd, &bufv, "\n", -1) < 0) { + if (writev_buffer_append_segment(fd, &bufv, "\n", 1) < 0) { nwarn("failed to write newline to log"); goto next; } @@ -398,8 +394,6 @@ nwarn("failed to flush buffer to log"); } - ninfo("Total bytes written: %"PRId64"", bytes_written); - return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.9.9/oci/oci.go new/cri-o-1.9.10/oci/oci.go --- old/cri-o-1.9.9/oci/oci.go 2018-03-08 10:50:58.000000000 +0100 +++ new/cri-o-1.9.10/oci/oci.go 2018-03-12 17:46:45.000000000 +0100 @@ -766,6 +766,9 @@ pspec := c.Spec().Process pspec.Args = cmd + // We need to default this to false else it will inherit terminal as true + // from the container. + pspec.Terminal = false if tty { pspec.Terminal = true } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.9.9/version/version.go new/cri-o-1.9.10/version/version.go --- old/cri-o-1.9.9/version/version.go 2018-03-08 10:50:58.000000000 +0100 +++ new/cri-o-1.9.10/version/version.go 2018-03-12 17:46:45.000000000 +0100 @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "1.9.9" +const Version = "1.9.10"
