commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-09-24 16:12:11
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.4249 (New)
Package is "conmon"
Thu Sep 24 16:12:11 2020 rev:17 rq:835753 version:2.0.21
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-08-28
21:17:04.216199233 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.4249/conmon.changes 2020-09-24
16:12:22.420786376 +0200
@@ -1,0 +2,15 @@
+Mon Sep 21 07:06:04 UTC 2020 - dmuel...@suse.com
+
+- Update to version 2.0.21:
+ * bump to v2.0.21
+ * protect against kill(-1)
+ * Makefile: enable debuginfo generation
+ * Remove go.sum file and add go.mod
+ * Fail if conmon config could not be written
+ * nix: remove double definition for e2fsprogs
+ * Speedup static build by utilizing CI cache on `/nix` folder
+ * Fix nix build for failing e2fsprogs tests
+ * test: fix CI
+ * Use Podman for building
+
+---
Old:
conmon-2.0.20.tar.xz
New:
_servicedata
conmon-2.0.21.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.EGKAQl/_old 2020-09-24 16:12:24.104788060 +0200
+++ /var/tmp/diff_new_pack.EGKAQl/_new 2020-09-24 16:12:24.108788065 +0200
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.20
+Version:2.0.21
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.EGKAQl/_old 2020-09-24 16:12:24.132788088 +0200
+++ /var/tmp/diff_new_pack.EGKAQl/_new 2020-09-24 16:12:24.132788088 +0200
@@ -2,8 +2,10 @@
https://github.com/containers/conmon
git
-2.0.20
-v2.0.20
+@PARENT_TAG@
+[v]?([^\+]+)(.*)
+v2.0.21
+enable
conmon-*.tar
++ _servicedata ++
https://github.com/containers/conmon
35a2fa83022e56e18af7e6a865ba5d7165fa2a4a++
conmon-2.0.20.tar.xz -> conmon-2.0.21.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.20/.cirrus.yml
new/conmon-2.0.21/.cirrus.yml
--- old/conmon-2.0.20/.cirrus.yml 2020-07-28 15:57:21.0 +0200
+++ new/conmon-2.0.21/.cirrus.yml 2020-09-08 22:33:37.0 +0200
@@ -9,6 +9,7 @@
ENVLIB: ".bash_profile"
GOPATH: "/var/tmp/go"
PATH: "${PATH}:${GOPATH}"
+IMAGE_PROJECT: "libpod-218412"
CRIO_REPO: "https://github.com/cri-o/cri-o.git";
CRIO_SLUG: "github.com/cri-o/cri-o"
CONMON_SLUG: "github.com/containers/conmon"
@@ -19,29 +20,14 @@
CIRRUS_SHELL: "/bin/bash"
# Save a little typing (path relative to $CIRRUS_WORKING_DIR)
SCRIPT_BASE: "./contrib/cirrus"
-PACKER_BASE: "./contrib/cirrus/packer"
# Spoof self as travis, as cirrus has the same test issues as travis does
TRAVIS: "true"
+FEDORA_CONTAINER_FQIN: "registry.fedoraproject.org/fedora:32"
+PRIOR_FEDORA_CONTAINER_FQIN: "registry.fedoraproject.org/fedora:31"
-
- Image names to test with
-###
-FEDORA_CACHE_IMAGE_NAME: 'fedora-29-conmon-75ea13be'
-FEDORA_CONTAINER_FQIN: 'registry.fedoraproject.org/fedora:29'
-PRIOR_FEDORA_CONTAINER_FQIN: 'registry.fedoraproject.org/fedora:28'
-
-
- Variables for composing new cache-images (used in PR testing) from
- base-images (pre-existing in GCE)
-
-# CSV of cache-image names to build (see $PACKER_BASE/libpod_images.json)
-PACKER_BUILDS: "fedora-29"
-# Version of packer to use
-PACKER_VER: "1.3.5"
-# Manually produced base-image names (see $SCRIPT_BASE/README.md)
-FEDORA_BASE_IMAGE: "fedora-cloud-base-29-1-2-1547237869"
-# Special image w/ nested-libvirt + tools for creating new cache and base
images
-IMAGE_BUILDER_CACHE_IMAGE_NAME: "image-builder-image-1547237869"
+# VM Images are maintained in the libpod repo.
+_BUILT_IMAGE_SUFFIX: "podman-6530021898584064"
+FEDORA_CACHE_IMAGE_NAME: "fedora-32-${_BUILT_IMAGE_SUFFIX}"
Credentials and other secret-sauces, decrypted at runtime when
authorized.
@@ -58,36 +44,18 @@
# and storage.
gcp_credentials:
ENCRYPTED[13e51806369f650e6ccc326338deeb3c24052fc0a7be29beef2b96da551aed3200abbb6c6406a936bb4388fb2758405c]
-# Default compute settings unless overridden within tasks (below)
-gce_instance: {"image_project": "conmon-222014", "zone": "us-central1-f",
"cpu": 4, "memory": "16Gb", "disk": 200, "image_name":
"no-image-specified-in-task"}
+# Default VM to use unless set or modified by task
+gce_instance:
+image_project: "${IMAGE_PROJECT}"
+zone: "us-central1-c" # Required
commit conmon for openSUSE:Factory
Hello community, here is the log from the commit of package conmon for openSUSE:Factory checked in at 2020-08-28 21:16:00 Comparing /work/SRC/openSUSE:Factory/conmon (Old) and /work/SRC/openSUSE:Factory/.conmon.new.3399 (New) Package is "conmon" Fri Aug 28 21:16:00 2020 rev:16 rq:830232 version:2.0.20 Changes: --- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-07-30 09:59:43.407204998 +0200 +++ /work/SRC/openSUSE:Factory/.conmon.new.3399/conmon.changes 2020-08-28 21:17:04.216199233 +0200 @@ -4 +4 @@ -- Update to v2.0.20 +- Update to v2.0.20 (bsc#1175821) Other differences: --
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-07-30 09:58:51
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.3592 (New)
Package is "conmon"
Thu Jul 30 09:58:51 2020 rev:15 rq:823376 version:2.0.20
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-06-11
14:37:11.556001056 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.3592/conmon.changes 2020-07-30
09:59:43.407204998 +0200
@@ -1,0 +2,20 @@
+Wed Jul 29 10:20:58 UTC 2020 - Sascha Grunert
+
+- Update to v2.0.20
+ - journald: fix logging container name
+ - container logging: Implement none driver - "off", "null" or
+"none" all work.
+ - ctrl: warn if we fail to unlink
+ - Drop fsync calls
+ - Reap PIDs before running exit command
+ - Fix log path parsing
+ - Add --sync option to prevent conmon from double forking
+ - Add --no-sync-log option to instruct conmon to not sync the
+logs of the containers upon shutting down. This feature fixes a
+regression where we unconditionally dropped the log sync. It is
+possible the container logs could be corrupted on a sudden
+power-off. If you need container logs to remain in consistent
+state after a sudden shutdown, please update from v2.0.19 to
+v2.0.20
+
+---
Old:
conmon-2.0.17.tar.xz
New:
conmon-2.0.20.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.dq1JXl/_old 2020-07-30 09:59:44.311205809 +0200
+++ /var/tmp/diff_new_pack.dq1JXl/_new 2020-07-30 09:59:44.311205809 +0200
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.17
+Version:2.0.20
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.dq1JXl/_old 2020-07-30 09:59:44.339205835 +0200
+++ /var/tmp/diff_new_pack.dq1JXl/_new 2020-07-30 09:59:44.343205838 +0200
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.17
-v2.0.17
+2.0.20
+v2.0.20
conmon-*.tar
++ conmon-2.0.17.tar.xz -> conmon-2.0.20.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.17/.cirrus.yml
new/conmon-2.0.20/.cirrus.yml
--- old/conmon-2.0.17/.cirrus.yml 2020-05-26 17:29:46.0 +0200
+++ new/conmon-2.0.20/.cirrus.yml 2020-07-28 15:57:21.0 +0200
@@ -230,12 +230,18 @@
- 'config'
- 'fmt'
gce_instance:
-image_name: "${FEDORA_BASE_IMAGE}"
-cpu: 4
-memory: 4
+image_name: "${FEDORA_CACHE_IMAGE_NAME}"
+cpu: 8
+memory: 12
disk: 200
-script:
-- dnf install -y podman make git gcc
-- make containerized
+script: |
+set -ex
+setenforce 0
+growpart /dev/sda 1 || true
+resize2fs /dev/sda1 || true
+yum -y install podman
+mkdir -p /nix
+podman run --rm --privileged -ti -v /:/mnt nixos/nix cp -rfT /nix
/mnt/nix
+podman run --rm --privileged -ti -v /nix:/nix -v ${PWD}:${PWD} -w
${PWD} nixos/nix nix --print-build-logs --option cores 8 --option max-jobs 8
build --file nix/
binaries_artifacts:
-path: "bin/conmon"
+path: "result/bin/conmon"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.17/Makefile new/conmon-2.0.20/Makefile
--- old/conmon-2.0.17/Makefile 2020-05-26 17:29:46.0 +0200
+++ new/conmon-2.0.20/Makefile 2020-07-28 15:57:21.0 +0200
@@ -45,24 +45,18 @@
override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd) -D
USE_JOURNALD=0
endif
-define DOCKERFILE
- FROM alpine:latest
- RUN apk add --update --no-cache bash make git gcc pkgconf libc-dev
glib-dev glib-static
- COPY . /go/src/$(PROJECT)
- WORKDIR /go/src/$(PROJECT)
- RUN make static
-endef
-export DOCKERFILE
-
-containerized: bin
- $(eval PODMAN ?= $(if $(shell podman -v),podman,docker))
- echo "$$DOCKERFILE" | $(PODMAN) build --force-rm -t conmon-build -f - .
- CTR=`$(PODMAN) create conmon-build` \
- && $(PODMAN) cp $$CTR:/go/src/$(PROJECT)/bin/conmon bin/conmon \
- && $(PODMAN) rm $$CTR
+# Update nix/nixpkgs.json its latest stable commit
+.PHONY: nixpkgs
+nixpkgs:
+ @nix run -f channel:nixos-20.03 nix-prefetch-git -c nix-prefetch-git \
+ --no-deepClone https://github.com/nixos/nixpkgs >
nix/nixpkgs.json
+# Build statically linked binary
+.PHONY: static
static:
- $(MAKE) git-vars bin/conmon PKG_CONFIG='$(PKG_CONFIG)
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-06-11 14:37:11
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.3606 (New)
Package is "conmon"
Thu Jun 11 14:37:11 2020 rev:14 rq:809897 version:2.0.17
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-05-20
18:37:01.576175875 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.3606/conmon.changes 2020-06-11
14:37:11.556001056 +0200
@@ -1,0 +2,6 @@
+Wed May 27 06:55:07 UTC 2020 - Sascha Grunert
+
+- Update to v2.0.17
+ - Add option to delay execution of exit command
+
+---
Old:
conmon-2.0.16.tar.xz
New:
conmon-2.0.17.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.S69SNb/_old 2020-06-11 14:37:12.104002650 +0200
+++ /var/tmp/diff_new_pack.S69SNb/_new 2020-06-11 14:37:12.108002662 +0200
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.16
+Version:2.0.17
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.S69SNb/_old 2020-06-11 14:37:12.132002731 +0200
+++ /var/tmp/diff_new_pack.S69SNb/_new 2020-06-11 14:37:12.132002731 +0200
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.16
-v2.0.16
+2.0.17
+v2.0.17
conmon-*.tar
++ conmon-2.0.16.tar.xz -> conmon-2.0.17.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.16/VERSION new/conmon-2.0.17/VERSION
--- old/conmon-2.0.16/VERSION 2020-05-12 22:25:09.0 +0200
+++ new/conmon-2.0.17/VERSION 2020-05-26 17:29:46.0 +0200
@@ -1 +1 @@
-2.0.16
+2.0.17
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.16/src/cli.c new/conmon-2.0.17/src/cli.c
--- old/conmon-2.0.16/src/cli.c 2020-05-12 22:25:09.0 +0200
+++ new/conmon-2.0.17/src/cli.c 2020-05-26 17:29:46.0 +0200
@@ -42,6 +42,7 @@
gboolean opt_no_new_keyring = FALSE;
char *opt_exit_command = NULL;
gchar **opt_exit_args = NULL;
+int opt_exit_delay = 0;
gboolean opt_replace_listen_pid = FALSE;
char *opt_log_level = NULL;
char *opt_log_tag = NULL;
@@ -77,6 +78,7 @@
{"exit-dir", 0, 0, G_OPTION_ARG_STRING, &opt_exit_dir, "Path to the
directory where exit files are written", NULL},
{"exit-command", 0, 0, G_OPTION_ARG_STRING, &opt_exit_command,
"Path to the program to execute when the container terminates its
execution", NULL},
+ {"exit-delay", 0, 0, G_OPTION_ARG_INT, &opt_exit_delay, "Delay before
invoking the exit command (in seconds)", NULL},
{"exit-command-arg", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_exit_args,
"Additional arg to pass to the exit command. Can be specified
multiple times", NULL},
{"log-path", 'l', 0, G_OPTION_ARG_STRING_ARRAY, &opt_log_path, "Log
file path", NULL},
@@ -151,6 +153,10 @@
nexit("Exec process spec path not provided. Use
--exec-process-spec");
}
+ if (opt_exit_delay < 0) {
+ nexit("Delay before invoking exit command must be greater than
or equal to 0");
+ }
+
// TODO FIXME I removed default_pid_file here. shouldn't
opt_container_pid_file be cleaned up?
if (opt_container_pid_file == NULL)
opt_container_pid_file = g_strdup_printf("%s/pidfile-%s", cwd,
opt_cid);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.16/src/cli.h new/conmon-2.0.17/src/cli.h
--- old/conmon-2.0.16/src/cli.h 2020-05-12 22:25:09.0 +0200
+++ new/conmon-2.0.17/src/cli.h 2020-05-26 17:29:46.0 +0200
@@ -35,6 +35,7 @@
extern gboolean opt_no_new_keyring;
extern char *opt_exit_command;
extern gchar **opt_exit_args;
+extern int opt_exit_delay;
extern gboolean opt_replace_listen_pid;
extern char *opt_log_level;
extern char *opt_log_tag;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.16/src/ctr_exit.c
new/conmon-2.0.17/src/ctr_exit.c
--- old/conmon-2.0.16/src/ctr_exit.c2020-05-12 22:25:09.0 +0200
+++ new/conmon-2.0.17/src/ctr_exit.c2020-05-26 17:29:46.0 +0200
@@ -1,7 +1,7 @@
#define _GNU_SOURCE
#include "ctr_exit.h"
-#include "cli.h" // opt_exit_command
+#include "cli.h" // opt_exit_command, opt_exit_delay
#include "utils.h"
#include "parent_pipe_fd.h"
#include "globals.h"
@@ -176,6 +176,11 @@
args[n_args + 1] = opt_exit_args[n_args];
args[n_args + 1] = NULL;
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-05-20 18:36:57
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.2738 (New)
Package is "conmon"
Wed May 20 18:36:57 2020 rev:13 rq:807000 version:2.0.16
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-04-05
20:53:08.809159749 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.2738/conmon.changes 2020-05-20
18:37:01.576175875 +0200
@@ -1,0 +2,6 @@
+Mon May 18 07:38:30 UTC 2020 - Sascha Grunert
+
+- Update to v2.0.16
+ - tty: flush pending data when fd is ready
+
+---
Old:
conmon-2.0.15.tar.xz
New:
conmon-2.0.16.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.AvSaLv/_old 2020-05-20 18:37:02.312177418 +0200
+++ /var/tmp/diff_new_pack.AvSaLv/_new 2020-05-20 18:37:02.312177418 +0200
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.15
+Version:2.0.16
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.AvSaLv/_old 2020-05-20 18:37:02.340177477 +0200
+++ /var/tmp/diff_new_pack.AvSaLv/_new 2020-05-20 18:37:02.340177477 +0200
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.15
-v2.0.15
+2.0.16
+v2.0.16
conmon-*.tar
++ conmon-2.0.15.tar.xz -> conmon-2.0.16.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.15/Makefile new/conmon-2.0.16/Makefile
--- old/conmon-2.0.15/Makefile 2020-04-02 19:58:32.0 +0200
+++ new/conmon-2.0.16/Makefile 2020-05-12 22:25:09.0 +0200
@@ -65,7 +65,7 @@
$(MAKE) git-vars bin/conmon PKG_CONFIG='$(PKG_CONFIG) --static'
CFLAGS='-static' LDFLAGS='$(LDFLAGS) -s -w -static' LIBS='$(LIBS)'
bin/conmon: $(OBJS) | bin
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
%.o: %.c $(HEADERS)
$(CC) $(CFLAGS) -o $@ -c $<
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.15/SECURITY.md
new/conmon-2.0.16/SECURITY.md
--- old/conmon-2.0.15/SECURITY.md 1970-01-01 01:00:00.0 +0100
+++ new/conmon-2.0.16/SECURITY.md 2020-05-12 22:25:09.0 +0200
@@ -0,0 +1,3 @@
+## Security and Disclosure Information Policy for the conmon Project
+
+The conmon Project follows the [Security and Disclosure Information
Policy](https://github.com/containers/common/blob/master/SECURITY.md) for the
Containers Projects.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.15/VERSION new/conmon-2.0.16/VERSION
--- old/conmon-2.0.15/VERSION 2020-04-02 19:58:32.0 +0200
+++ new/conmon-2.0.16/VERSION 2020-05-12 22:25:09.0 +0200
@@ -1 +1 @@
-2.0.15
+2.0.16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.15/install.md new/conmon-2.0.16/install.md
--- old/conmon-2.0.15/install.md2020-04-02 19:58:32.0 +0200
+++ new/conmon-2.0.16/install.md2020-05-12 22:25:09.0 +0200
@@ -37,6 +37,20 @@
make
```
+## Install with Ansible
+
+An [Ansible Role](https://github.com/alvistack/ansible-role-conmon) is also
available to automate the above steps:
+
+``` bash
+sudo su -
+mkdir -p ~/.ansible/roles
+cd ~/.ansible/roles
+git clone https://github.com/alvistack/ansible-role-conmon.git conmon
+cd ~/.ansible/roles/conmon
+pip3 install --upgrade --ignore-installed --requirement requirements.txt
+molecule converge
+molecule verify
+```
## Install to the directory you want:
There are three options for installation, depending on your environment. Each
can have the PREFIX overridden. The PREFIX defaults to `/usr/local` for most
Linux distributions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.15/src/conn_sock.c
new/conmon-2.0.16/src/conn_sock.c
--- old/conmon-2.0.15/src/conn_sock.c 2020-04-02 19:58:32.0 +0200
+++ new/conmon-2.0.16/src/conn_sock.c 2020-05-12 22:25:09.0 +0200
@@ -180,8 +180,7 @@
/* Not everything was written to stdin, let's wait for the fd to be
ready. */
if (sock->remaining)
- g_unix_fd_add(masterfd_stdin, G_IO_OUT, masterfd_write_cb,
NULL);
-
+ schedule_master_stdin_write();
return G_SOURCE_CONTINUE;
}
@@ -240,7 +239,7 @@
static void sock_try_write_to_masterfd_stdin(struct conn_sock_s *sock)
{
- if (!sock->remaining)
+
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-04-05 20:53:04
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.3248 (New)
Package is "conmon"
Sun Apr 5 20:53:04 2020 rev:12 rq:791225 version:2.0.15
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-03-25
23:45:55.504045192 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.3248/conmon.changes 2020-04-05
20:53:08.809159749 +0200
@@ -1,0 +2,11 @@
+Fri Apr 3 14:33:46 UTC 2020 - Ralf Haferkamp
+
+- Enable support for journald logging (bsc#1162432)
+
+---
+Fri Apr 3 07:22:43 UTC 2020 - Sascha Grunert
+
+- Update to v2.0.15
+ - store status while waiting for pid
+
+---
Old:
conmon-2.0.14.tar.xz
New:
conmon-2.0.15.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.eyJLBK/_old 2020-04-05 20:53:09.437160350 +0200
+++ /var/tmp/diff_new_pack.eyJLBK/_new 2020-04-05 20:53:09.437160350 +0200
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.14
+Version:2.0.15
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
@@ -25,6 +25,7 @@
URL:https://github.com/containers/conmon
Source0:%{name}-%{version}.tar.xz
BuildRequires: glib2-devel
+BuildRequires: pkgconfig(libsystemd)
%description
Conmon is a monitoring program and communication tool between a
++ _service ++
--- /var/tmp/diff_new_pack.eyJLBK/_old 2020-04-05 20:53:09.469160381 +0200
+++ /var/tmp/diff_new_pack.eyJLBK/_new 2020-04-05 20:53:09.469160381 +0200
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.14
-v2.0.14
+2.0.15
+v2.0.15
conmon-*.tar
++ conmon-2.0.14.tar.xz -> conmon-2.0.15.tar.xz ++
3830 lines of diff (skipped)
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-03-25 23:44:47
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.3160 (New)
Package is "conmon"
Wed Mar 25 23:44:47 2020 rev:11 rq:788098 version:2.0.14
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-03-19
19:49:09.056144337 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.3160/conmon.changes 2020-03-25
23:45:55.504045192 +0100
@@ -1,0 +2,9 @@
+Wed Mar 25 08:55:06 UTC 2020 - Sascha Grunert
+
+- Update to v2.0.14
+ - drop usage of splice(2)
+ - avoid hanging on stdin
+ - stdio: sometimes quit main loop after io is done
+ - ignore sigpipe
+
+---
Old:
conmon-2.0.12.tar.xz
New:
conmon-2.0.14.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.Cn9jgI/_old 2020-03-25 23:45:57.508045848 +0100
+++ /var/tmp/diff_new_pack.Cn9jgI/_new 2020-03-25 23:45:57.532045855 +0100
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.12
+Version:2.0.14
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.Cn9jgI/_old 2020-03-25 23:45:57.608045880 +0100
+++ /var/tmp/diff_new_pack.Cn9jgI/_new 2020-03-25 23:45:57.608045880 +0100
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.12
-v2.0.12
+2.0.14
+v2.0.14
conmon-*.tar
++ conmon-2.0.12.tar.xz -> conmon-2.0.14.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.12/.dir-locals.el
new/conmon-2.0.14/.dir-locals.el
--- old/conmon-2.0.12/.dir-locals.el1970-01-01 01:00:00.0 +0100
+++ new/conmon-2.0.14/.dir-locals.el2020-03-20 16:44:25.0 +0100
@@ -0,0 +1,3 @@
+((c-mode . ((fill-column . 109)
+(c-basic-offset . 8)
+(indent-tabs-mode t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.12/VERSION new/conmon-2.0.14/VERSION
--- old/conmon-2.0.12/VERSION 2020-03-16 17:55:00.0 +0100
+++ new/conmon-2.0.14/VERSION 2020-03-20 16:44:25.0 +0100
@@ -1 +1 @@
-2.0.12
+2.0.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.12/src/conmon.c
new/conmon-2.0.14/src/conmon.c
--- old/conmon-2.0.12/src/conmon.c 2020-03-16 17:55:00.0 +0100
+++ new/conmon-2.0.14/src/conmon.c 2020-03-20 16:44:25.0 +0100
@@ -284,8 +284,12 @@
/* Used for attach */
struct conn_sock_s {
int fd;
+ gboolean data_ready;
gboolean readable;
gboolean writable;
+ size_t remaining;
+ size_t off;
+ char buf[CONN_SOCK_BUF_SIZE];
};
GPtrArray *conn_socks = NULL;
@@ -489,12 +493,28 @@
return G_SOURCE_REMOVE;
}
+ /* End of input */
if (read_eof || (has_hup && !has_input)) {
- /* End of input */
- if (pipe == STDOUT_PIPE)
+ /* There exists a case that the process has already exited
+* and we know about it (because we checked our child processes)
+* but we needed to run the main_loop to catch all the rest of
the output
+* (specifically, when we are exec, but not terminal)
+* In this case, after both the stderr and stdout pipes have
closed
+* we should quit the loop. Otherwise, conmon will hang forever
+* waiting for container_exit_cb that will never be called.
+*/
+ if (pipe == STDOUT_PIPE) {
masterfd_stdout = -1;
- if (pipe == STDERR_PIPE)
+ if (container_status >= 0 && masterfd_stderr < 0) {
+ g_main_loop_quit(main_loop);
+ }
+ }
+ if (pipe == STDERR_PIPE) {
masterfd_stderr = -1;
+ if (container_status >= 0 && masterfd_stdout < 0) {
+ g_main_loop_quit(main_loop);
+ }
+ }
close(fd);
return G_SOURCE_REMOVE;
@@ -667,39 +687,8 @@
return ret;
}
-static gboolean conn_sock_cb(int fd, GIOCondition condition, gpointer
user_data)
+static gboolean terminate_conn_sock(struct conn_sock_s *sock)
{
- struct conn_sock_s *sock = (struct conn_sock_s *)user_data;
- ssize_t num_read = 0;
-
- if ((condition & G_IO_IN) != 0) {
- num_
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-03-19 19:45:22
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.3160 (New)
Package is "conmon"
Thu Mar 19 19:45:22 2020 rev:10 rq:785869 version:2.0.12
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-03-08
22:24:01.532073320 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.3160/conmon.changes 2020-03-19
19:49:09.056144337 +0100
@@ -1,0 +2,6 @@
+Tue Mar 17 10:10:44 UTC 2020 - Ralf Haferkamp
+
+- Update to v2.0.12
+ - oom: fix potential race between verification steps
+
+---
Old:
conmon-2.0.11.tar.xz
New:
conmon-2.0.12.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.rBRQrr/_old 2020-03-19 19:49:09.832144785 +0100
+++ /var/tmp/diff_new_pack.rBRQrr/_new 2020-03-19 19:49:09.836144788 +0100
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.11
+Version:2.0.12
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.rBRQrr/_old 2020-03-19 19:49:09.912144831 +0100
+++ /var/tmp/diff_new_pack.rBRQrr/_new 2020-03-19 19:49:09.912144831 +0100
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.11
-v2.0.11
+2.0.12
+v2.0.12
conmon-*.tar
++ conmon-2.0.11.tar.xz -> conmon-2.0.12.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.11/VERSION new/conmon-2.0.12/VERSION
--- old/conmon-2.0.11/VERSION 2020-03-04 19:07:40.0 +0100
+++ new/conmon-2.0.12/VERSION 2020-03-16 17:55:00.0 +0100
@@ -1 +1 @@
-2.0.11
+2.0.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.11/src/conmon.c
new/conmon-2.0.12/src/conmon.c
--- old/conmon-2.0.11/src/conmon.c 2020-03-04 19:07:40.0 +0100
+++ new/conmon-2.0.12/src/conmon.c 2020-03-16 17:55:00.0 +0100
@@ -541,6 +541,7 @@
char *cgroup_event_control_path = (char *)user_data;
uint64_t event_count;
ssize_t num_read = 0;
+ gboolean cgroup_removed = FALSE;
if ((condition & G_IO_IN) == 0) {
/* End of input */
@@ -550,6 +551,20 @@
return G_SOURCE_REMOVE;
}
+ /* Attempt to read the container's cgroup path.
+* if the cgroup.memory_control file does not exist,
+* we know one of the events on this fd was a cgroup removal
+*/
+ if (access(cgroup_event_control_path, F_OK) < 0) {
+ ndebugf("Memory cgroup removal event received");
+ cgroup_removed = TRUE;
+ }
+
+ /* there are three cases we need to worry about:
+* oom kill happened (1 event)
+* cgroup was removed (1 event)
+* oom kill happened and cgroup was removed (2 events)
+*/
num_read = read(fd, &event_count, sizeof(uint64_t));
if (num_read < 0) {
nwarn("Failed to read oom event from eventfd");
@@ -570,23 +585,17 @@
ndebugf("Memory cgroup event count: %ld", (long)event_count);
if (event_count == 0) {
- nwarn("Unexpected event count (zero)");
+ nwarn("Unexpected event count (zero) when reading for oom
event");
return G_SOURCE_CONTINUE;
}
- /* attempt to read the container's cgroup path.
-* if we can't, the cgroup has probably been cleaned up.
-* In all likelihood, this means we received an event on the eventfd
-* because the memory.oom_control file was removed, not because of an
OOM
+
+ /* if there's only one event, and the cgroup was removed
+* we know the event was for a cgroup removal, not an OOM kill
*/
- if (access(cgroup_event_control_path, F_OK) < 0) {
- ndebugf("Memory cgroup removal event received");
- /* if event_count == 1, we know the only event triggered was a
cgroup removal
-* if it was greater than 1, we know the cgroup oomed, and then
was cleaned up.
-*/
- if (event_count == 1)
- return G_SOURCE_CONTINUE;
- }
+ if (event_count == 1 && cgroup_removed)
+ return G_SOURCE_CONTINUE;
+ /* we catch the two other cases here, both of which are OOM kill events
*/
ninfo("OOM event received");
write_oom_files();
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-03-08 22:23:44
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.26092 (New)
Package is "conmon"
Sun Mar 8 22:23:44 2020 rev:9 rq:781862 version:2.0.11
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-02-21
16:40:28.817807938 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.26092/conmon.changes 2020-03-08
22:24:01.532073320 +0100
@@ -1,0 +2,11 @@
+Thu Mar 5 08:06:24 UTC 2020 - Sascha Grunert
+
+- Update to v2.0.11
+ - log: reject --log-tag with k8s-file
+ - chmod std files pipes
+ - adjust score to -1000 to prevent conmon from ever being OOM
+killed
+ - container OOM: verify cgroup hasn't been cleaned up before
+reporting OOM
+
+---
Old:
conmon-2.0.10.tar.xz
New:
conmon-2.0.11.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.8SUZcB/_old 2020-03-08 22:24:02.296073791 +0100
+++ /var/tmp/diff_new_pack.8SUZcB/_new 2020-03-08 22:24:02.300073794 +0100
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.10
+Version:2.0.11
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.8SUZcB/_old 2020-03-08 22:24:02.336073816 +0100
+++ /var/tmp/diff_new_pack.8SUZcB/_new 2020-03-08 22:24:02.336073816 +0100
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.10
-v2.0.10
+2.0.11
+v2.0.11
conmon-*.tar
++ conmon-2.0.10.tar.xz -> conmon-2.0.11.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.10/.cirrus.yml
new/conmon-2.0.11/.cirrus.yml
--- old/conmon-2.0.10/.cirrus.yml 2020-01-07 22:53:52.0 +0100
+++ new/conmon-2.0.11/.cirrus.yml 2020-03-04 19:07:40.0 +0100
@@ -7,15 +7,19 @@
# File to update in home-dir with task-specific env. var values
ENVLIB: ".bash_profile"
+GOPATH: "/var/tmp/go"
+PATH: "${PATH}:${GOPATH}"
+CRIO_REPO: "https://github.com/cri-o/cri-o.git";
+CRIO_SLUG: "github.com/cri-o/cri-o"
+CONMON_SLUG: "github.com/containers/conmon"
+
# Overrides default location (/tmp/cirrus) for repo clone (will become
$SRC)
-CIRRUS_WORKING_DIR: "/tmp/conmon"
+CIRRUS_WORKING_DIR: "${GOPATH}/src/${CONMON_SLUG}"
# Required so $ENVLIB gets loaded and /bin/sh is not used
CIRRUS_SHELL: "/bin/bash"
# Save a little typing (path relative to $CIRRUS_WORKING_DIR)
SCRIPT_BASE: "./contrib/cirrus"
PACKER_BASE: "./contrib/cirrus/packer"
-CRIO_REPO: "https://github.com/cri-o/cri-o.git";
-CRIO_SLUG: "github.com/cri-o/cri-o"
# Spoof self as travis, as cirrus has the same test issues as travis does
TRAVIS: "true"
@@ -63,10 +67,11 @@
# Every *_task runs in parallel in separate VMs. The name prefix only for
reference
# in WebUI, and will be followed by matrix details. This task runs the
integration
# testing for every platform
-integration_task:
+cri-o_integration_task:
depends_on:
- 'config'
+- 'fmt'
gce_instance:
# Generate multiple parallel tasks, covering all possible
@@ -81,6 +86,20 @@
TEST_USERNS: 1
setup_environment_script: '$SCRIPT_BASE/setup_environment.sh'
+integration_test_script: '$SCRIPT_BASE/cri-o_test.sh'
+
+# this task runs the conmon integration tests
+integration_task:
+
+depends_on:
+- 'config'
+- 'fmt'
+
+gce_instance:
+matrix:
+# Images are generated separately, from build_images_task (below)
+image_name: "${FEDORA_CACHE_IMAGE_NAME}"
+
integration_test_script: '$SCRIPT_BASE/integration_test.sh'
@@ -108,8 +127,6 @@
# Verify calls to bin/config were saved
config_task:
-env:
-GOSRC: $CIRRUS_WORKING_DIR
# Runs within Cirrus's "community cluster"
container:
matrix:
@@ -121,12 +138,30 @@
memory: 12
script:
-- dnf install -y make glib2-devel git gcc rpm-build golang
+- dnf install -y make glib2-devel git gcc golang
- cd $CIRRUS_WORKING_DIR
- GO111MODULE=on go mod init github.com/containers/conmon
- make config
- ./hack/tree_status.sh
+# Verify code was fmt'ed properly
+fmt_task:
+# Runs within Cirrus's "community cluster"
+container:
+matrix:
+ # fedora:28 doesn't have go mod by default
+ # and we should only need one check to make sure
+ # config changes were synced
commit conmon for openSUSE:Factory
Hello community, here is the log from the commit of package conmon for openSUSE:Factory checked in at 2020-02-21 16:39:58 Comparing /work/SRC/openSUSE:Factory/conmon (Old) and /work/SRC/openSUSE:Factory/.conmon.new.26092 (New) Package is "conmon" Fri Feb 21 16:39:58 2020 rev:8 rq:777933 version:2.0.10 Changes: --- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-02-03 11:12:00.645805279 +0100 +++ /work/SRC/openSUSE:Factory/.conmon.new.26092/conmon.changes 2020-02-21 16:40:28.817807938 +0100 @@ -2 +2 @@ -Tue Jan 28 07:37:26 UTC 2020 - Sascha Grunert +Fri Feb 21 09:22:06 UTC 2020 - Ralf Haferkamp @@ -4 +4,2 @@ -- Update to v2.0.10: +- Update to v2.0.10 (bsc#1160460, bsc#1164390, jsc#ECO-1048, + jsc#SLE-11485, jsc#SLE-11331): Other differences: --
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-02-03 11:11:49
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.26092 (New)
Package is "conmon"
Mon Feb 3 11:11:49 2020 rev:7 rq:768391 version:2.0.10
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-01-13
22:16:09.134368722 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.26092/conmon.changes 2020-02-03
11:12:00.645805279 +0100
@@ -1,0 +2,6 @@
+Tue Jan 28 07:37:26 UTC 2020 - Sascha Grunert
+
+- Update to v2.0.10:
+ - journal logging: write to /dev/null instead of -1
+
+---
Old:
conmon-2.0.9.tar.xz
New:
conmon-2.0.10.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.bz5E75/_old 2020-02-03 11:12:01.921805924 +0100
+++ /var/tmp/diff_new_pack.bz5E75/_new 2020-02-03 11:12:01.925805926 +0100
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.9
+Version:2.0.10
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.bz5E75/_old 2020-02-03 11:12:01.953805940 +0100
+++ /var/tmp/diff_new_pack.bz5E75/_new 2020-02-03 11:12:01.953805940 +0100
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.9
-v2.0.9
+2.0.10
+v2.0.10
conmon-*.tar
++ conmon-2.0.9.tar.xz -> conmon-2.0.10.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.9/VERSION new/conmon-2.0.10/VERSION
--- old/conmon-2.0.9/VERSION2020-01-06 18:51:59.0 +0100
+++ new/conmon-2.0.10/VERSION 2020-01-07 22:53:52.0 +0100
@@ -1 +1 @@
-2.0.9
+2.0.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.9/src/ctr_logging.c
new/conmon-2.0.10/src/ctr_logging.c
--- old/conmon-2.0.9/src/ctr_logging.c 2020-01-06 18:51:59.0 +0100
+++ new/conmon-2.0.10/src/ctr_logging.c 2020-01-07 22:53:52.0 +0100
@@ -167,6 +167,13 @@
*/
int write_journald(int pipe, char *buf, ssize_t buflen)
{
+ /* When using writev_buffer_append_segment, we should never approach
the number of
+* entries necessary to flush the buffer. Therefore, the fd passed in
is for /dev/null
+*/
+ _cleanup_close_ int dev_null = open("/dev/null", O_WRONLY | O_CLOEXEC);
+ if (dev_null < 0)
+ pexit("Failed to open /dev/null");
+
/* Since we know the priority values for the journal (6 being log info
and 3 being log err
* we can set it statically here. This will also save on runtime, at
the expense of needing
* to be changed if this convention is changed.
@@ -188,35 +195,32 @@
char tmp_line_end = buf[line_len];
buf[line_len] = '\0';
- /* When using writev_buffer_append_segment here, we should
never approach the number of
-* entries necessary to flush the buffer. Therefore, the fd
passed in is -1.
-*/
_cleanup_free_ char *message = g_strdup_printf("MESSAGE=%s",
buf);
- if (writev_buffer_append_segment(-1, &bufv, message, line_len +
MESSAGE_EQ_LEN) < 0)
+ if (writev_buffer_append_segment(dev_null, &bufv, message,
line_len + MESSAGE_EQ_LEN) < 0)
return -1;
/* Restore state of the buffer */
buf[line_len] = tmp_line_end;
- if (writev_buffer_append_segment(-1, &bufv, container_id_full,
cuuid_len + CID_FULL_EQ_LEN) < 0)
+ if (writev_buffer_append_segment(dev_null, &bufv,
container_id_full, cuuid_len + CID_FULL_EQ_LEN) < 0)
return -1;
- if (writev_buffer_append_segment(-1, &bufv, message_priority,
PRIORITY_EQ_LEN) < 0)
+ if (writev_buffer_append_segment(dev_null, &bufv,
message_priority, PRIORITY_EQ_LEN) < 0)
return -1;
- if (writev_buffer_append_segment(-1, &bufv, container_id,
TRUNC_ID_LEN + CID_EQ_LEN) < 0)
+ if (writev_buffer_append_segment(dev_null, &bufv, container_id,
TRUNC_ID_LEN + CID_EQ_LEN) < 0)
return -1;
- if (container_tag && writev_buffer_append_segment(-1, &bufv,
container_tag, container_tag_len) < 0)
+ if (container_tag && writev_buffer_append_segment(dev_null,
&bufv, container_tag, container_tag_len) < 0)
return -1;
/* only print the name if we have a name to print */
-
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2020-01-13 22:15:32
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.6675 (New)
Package is "conmon"
Mon Jan 13 22:15:32 2020 rev:6 rq:761593 version:2.0.9
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2019-11-18
20:05:34.393738046 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.6675/conmon.changes 2020-01-13
22:16:09.134368722 +0100
@@ -1,0 +2,39 @@
+Tue Jan 7 12:20:08 UTC 2020 - Sascha Grunert
+
+- Add TimedOutMessage to config to share with go code
+- Fix format string to limit the size of the string to 10
+ characters
+
+---
+Mon Dec 16 08:41:54 UTC 2019 - Sascha Grunert
+
+- Persist oom files on cgroup v2
+- Revert the check for the OOM counter on cgroups v1 before
+ writing OOM file
+
+---
+Fri Dec 13 08:23:04 UTC 2019 - Sascha Grunert
+
+- Add --persist-dir flag to allow important container files to be
+ written to a persistent directory
+- Check OOM counter on cgroups v1 before writing OOM file
+- Use splice(2) to copy from stdin
+
+---
+Thu Dec 12 11:37:19 UTC 2019 - Sascha Grunert
+
+- Kill the process group on timeout
+
+---
+Wed Dec 11 07:39:29 UTC 2019 - Sascha Grunert
+
+- Add --persist-dir to allow callers to specify a directory that
+ conmon should mirror certain important files that should persist
+ reboots (right now, just the container exit file)
+
+---
+Mon Dec 9 17:34:49 UTC 2019 - Sascha Grunert
+
+- Fix tight loop on OOM
+
+---
Old:
conmon-2.0.3.tar.xz
New:
conmon-2.0.9.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.fbCaVe/_old 2020-01-13 22:16:10.662369430 +0100
+++ /var/tmp/diff_new_pack.fbCaVe/_new 2020-01-13 22:16:10.674369436 +0100
@@ -1,7 +1,7 @@
#
# spec file for package conmon
#
-# Copyright (c) 2019 SUSE LLC.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.3
+Version:2.0.9
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.fbCaVe/_old 2020-01-13 22:16:10.734369464 +0100
+++ /var/tmp/diff_new_pack.fbCaVe/_new 2020-01-13 22:16:10.734369464 +0100
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.3
-v2.0.3
+2.0.9
+v2.0.9
conmon-*.tar
++ conmon-2.0.3.tar.xz -> conmon-2.0.9.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.3/VERSION new/conmon-2.0.9/VERSION
--- old/conmon-2.0.3/VERSION2019-11-11 16:16:23.0 +0100
+++ new/conmon-2.0.9/VERSION2020-01-06 18:51:59.0 +0100
@@ -1 +1 @@
-2.0.3
+2.0.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.3/cmd/conmon-config/conmon-config.go
new/conmon-2.0.9/cmd/conmon-config/conmon-config.go
--- old/conmon-2.0.3/cmd/conmon-config/conmon-config.go 2019-11-11
16:16:23.0 +0100
+++ new/conmon-2.0.9/cmd/conmon-config/conmon-config.go 2020-01-06
18:51:59.0 +0100
@@ -18,18 +18,20 @@
#define DEFAULT_SOCKET_PATH "%s"
#define WIN_RESIZE_EVENT %d
#define REOPEN_LOGS_EVENT %d
+#define TIMED_OUT_MESSAGE "%s"
#endif // CONFIG_H
`
if err := ioutil.WriteFile("config.h", []byte(fmt.Sprintf(
- output,
- config.BufSize,
- config.BufSize,
- config.ConnSockBufSize,
- config.ContainerAttachSocketDir,
- config.WinResizeEvent,
- config.ReopenLogsEvent)),
+ output,
+ config.BufSize,
+ config.BufSize,
+ config.ConnSockBufSize,
+ config.ContainerAttachSocketDir,
+ config.WinResizeEvent,
+ config.ReopenLogsEvent,
+ config.TimedOutMessage)),
0644); err != nil {
- fmt.Errorf(err.Error())
+ fmt.Errorf(err.Error())
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2019-11-18 20:04:56
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.26869 (New)
Package is "conmon"
Mon Nov 18 20:04:56 2019 rev:5 rq:748702 version:2.0.3
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2019-11-06
13:47:44.959612878 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.26869/conmon.changes 2019-11-18
20:05:34.393738046 +0100
@@ -1,0 +2,6 @@
+Thu Nov 14 14:25:29 UTC 2019 - Sascha Grunert
+
+- Add log level trace
+- Separate handling of log reopen events and terminal resize events
+
+---
Old:
conmon-2.0.2.tar.xz
New:
conmon-2.0.3.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.WVtch0/_old 2019-11-18 20:05:36.257737109 +0100
+++ /var/tmp/diff_new_pack.WVtch0/_new 2019-11-18 20:05:36.261737108 +0100
@@ -1,7 +1,7 @@
#
# spec file for package conmon
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,12 @@
Name: conmon
-Version:2.0.2
+Version:2.0.3
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
Group: System/Management
-Url:https://github.com/containers/conmon
+URL:https://github.com/containers/conmon
Source0:%{name}-%{version}.tar.xz
BuildRequires: glib2-devel
++ _service ++
--- /var/tmp/diff_new_pack.WVtch0/_old 2019-11-18 20:05:36.281737098 +0100
+++ /var/tmp/diff_new_pack.WVtch0/_new 2019-11-18 20:05:36.281737098 +0100
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.2
-v2.0.2
+2.0.3
+v2.0.3
conmon-*.tar
++ conmon-2.0.2.tar.xz -> conmon-2.0.3.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.2/VERSION new/conmon-2.0.3/VERSION
--- old/conmon-2.0.2/VERSION2019-10-10 14:41:45.0 +0200
+++ new/conmon-2.0.3/VERSION2019-11-11 16:16:23.0 +0100
@@ -1 +1 @@
-2.0.2
+2.0.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.2/cmd/conmon-config/conmon-config.go
new/conmon-2.0.3/cmd/conmon-config/conmon-config.go
--- old/conmon-2.0.2/cmd/conmon-config/conmon-config.go 2019-10-10
14:41:45.0 +0200
+++ new/conmon-2.0.3/cmd/conmon-config/conmon-config.go 2019-11-11
16:16:23.0 +0100
@@ -16,10 +16,20 @@
#define STDIO_BUF_SIZE %d
#define CONN_SOCK_BUF_SIZE %d
#define DEFAULT_SOCKET_PATH "%s"
+#define WIN_RESIZE_EVENT %d
+#define REOPEN_LOGS_EVENT %d
#endif // CONFIG_H
`
- if err := ioutil.WriteFile("config.h", []byte(fmt.Sprintf(output,
config.BufSize, config.BufSize, config.ConnSockBufSize,
config.ContainerAttachSocketDir)), 0644); err != nil {
- fmt.Errorf(err.Error())
+ if err := ioutil.WriteFile("config.h", []byte(fmt.Sprintf(
+ output,
+ config.BufSize,
+ config.BufSize,
+ config.ConnSockBufSize,
+ config.ContainerAttachSocketDir,
+ config.WinResizeEvent,
+ config.ReopenLogsEvent)),
+ 0644); err != nil {
+ fmt.Errorf(err.Error())
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.2/runner/config/config.go
new/conmon-2.0.3/runner/config/config.go
--- old/conmon-2.0.2/runner/config/config.go2019-10-10 14:41:45.0
+0200
+++ new/conmon-2.0.3/runner/config/config.go2019-11-11 16:16:23.0
+0100
@@ -6,4 +6,11 @@
// ConnSockBufSize is the size of the socket used for
// to attach to the container
ConnSockBufSize = 32768
+ // WinResizeEvent is the event code the caller program will
+ // send along the ctrl fd to signal conmon to resize
+ // the pty window
+ WinResizeEvent = 1
+ // ReopenLogsEvent is the event code the caller program will
+ // send along the ctrl fd to signal conmon to reopen the log files
+ ReopenLogsEvent = 2
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.2/src/config.h
new/conmon-2.0.3/src/config.h
--- old/conmon-2.0.2/src/config.h 2019-10-10 14:41:45.0 +0200
+++ new/conmon-2.0.3/src/config.h
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2019-11-06 13:47:40
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.2990 (New)
Package is "conmon"
Wed Nov 6 13:47:40 2019 rev:4 rq:744428 version:2.0.2
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2019-09-25
00:56:45.257904095 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.2990/conmon.changes 2019-11-06
13:47:44.959612878 +0100
@@ -1,0 +2,6 @@
+Tue Oct 29 09:03:03 UTC 2019 - Sascha Grunert
+
+- Add CONN_SOCK_BUF_SIZE to config
+- Fix bug to close the sync pipe before exit command
+
+---
Old:
conmon-2.0.1.tar.xz
New:
conmon-2.0.2.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.dJsKWH/_old 2019-11-06 13:47:45.915613914 +0100
+++ /var/tmp/diff_new_pack.dJsKWH/_new 2019-11-06 13:47:45.919613919 +0100
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.1
+Version:2.0.2
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.dJsKWH/_old 2019-11-06 13:47:45.947613949 +0100
+++ /var/tmp/diff_new_pack.dJsKWH/_new 2019-11-06 13:47:45.947613949 +0100
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.1
-v2.0.1
+2.0.2
+v2.0.2
conmon-*.tar
++ conmon-2.0.1.tar.xz -> conmon-2.0.2.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.1/.cirrus.yml new/conmon-2.0.2/.cirrus.yml
--- old/conmon-2.0.1/.cirrus.yml2019-09-13 17:34:08.0 +0200
+++ new/conmon-2.0.2/.cirrus.yml2019-10-10 14:41:45.0 +0200
@@ -54,7 +54,7 @@
# and storage.
gcp_credentials:
ENCRYPTED[13e51806369f650e6ccc326338deeb3c24052fc0a7be29beef2b96da551aed3200abbb6c6406a936bb4388fb2758405c]
-# Default compute settings unless overriden within tasks (below)
+# Default compute settings unless overridden within tasks (below)
gce_instance: {"image_project": "conmon-222014", "zone": "us-central1-f",
"cpu": 4, "memory": "16Gb", "disk": 200, "image_name":
"no-image-specified-in-task"}
# Default timeout for each task
@@ -72,7 +72,7 @@
# Generate multiple parallel tasks, covering all possible
# 'matrix' combinations.
matrix:
-# Images are generated separetly, from build_images_task (below)
+# Images are generated separately, from build_images_task (below)
image_name: "${FEDORA_CACHE_IMAGE_NAME}"
env:
@@ -128,7 +128,7 @@
- ./hack/tree_status.sh
# Test building of new cache-images for future PR testing, in this PR.
-# Output images will be stored only for a very short time, then automaticly
deleted.
+# Output images will be stored only for a very short time, then automatically
deleted.
test_cache_images_task:
only_if: >-
@@ -188,3 +188,18 @@
setup_environment_script: '$SCRIPT_BASE/setup_environment.sh'
cache_images_script: '$SCRIPT_BASE/build_vm_images.sh'
+
+# Build the static binary
+static_binary_task:
+depends_on:
+- 'config'
+gce_instance:
+image_name: "${FEDORA_BASE_IMAGE}"
+cpu: 4
+memory: 4
+disk: 200
+script:
+- dnf install -y podman make git gcc
+- make containerized
+binaries_artifacts:
+path: "bin/conmon"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.1/VERSION new/conmon-2.0.2/VERSION
--- old/conmon-2.0.1/VERSION2019-09-13 17:34:08.0 +0200
+++ new/conmon-2.0.2/VERSION2019-10-10 14:41:45.0 +0200
@@ -1 +1 @@
-2.0.1
+2.0.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.1/cmd/conmon-config/conmon-config.go
new/conmon-2.0.2/cmd/conmon-config/conmon-config.go
--- old/conmon-2.0.1/cmd/conmon-config/conmon-config.go 2019-09-13
17:34:08.0 +0200
+++ new/conmon-2.0.2/cmd/conmon-config/conmon-config.go 2019-10-10
14:41:45.0 +0200
@@ -14,11 +14,12 @@
#define BUF_SIZE %d
#define STDIO_BUF_SIZE %d
+#define CONN_SOCK_BUF_SIZE %d
#define DEFAULT_SOCKET_PATH "%s"
#endif // CONFIG_H
`
- if err := ioutil.WriteFile("config.h", []byte(fmt.Sprintf(output,
config.BufSize, config.BufSize, config.ContainerAttachSocketDir)), 0644); err
!= nil {
+ if err := ioutil.WriteFile("config.h", []byte(fmt.Sprintf(output,
config.BufSize, config.BufSize, config.ConnSockBufSize,
config.ContainerAttachSocketDir)), 0644); err != nil {
fmt.Erro
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2019-09-25 00:56:41
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.7948 (New)
Package is "conmon"
Wed Sep 25 00:56:41 2019 rev:3 rq:731418 version:2.0.1
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2019-08-27
15:50:33.419769100 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.7948/conmon.changes 2019-09-25
00:56:45.257904095 +0200
@@ -1,0 +2,5 @@
+Mon Sep 16 16:59:28 UTC 2019 - Sascha Grunert
+
+- Set masterfd_stdout before registering ctrl_cb
+
+---
Old:
conmon-2.0.0.tar.xz
New:
conmon-2.0.1.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.h8J4cp/_old 2019-09-25 00:56:45.797904174 +0200
+++ /var/tmp/diff_new_pack.h8J4cp/_new 2019-09-25 00:56:45.801904174 +0200
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.0
+Version:2.0.1
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.h8J4cp/_old 2019-09-25 00:56:45.837904180 +0200
+++ /var/tmp/diff_new_pack.h8J4cp/_new 2019-09-25 00:56:45.837904180 +0200
@@ -2,8 +2,8 @@
https://github.com/containers/conmon
git
-2.0.0
-v2.0.0
+2.0.1
+v2.0.1
conmon-*.tar
++ conmon-2.0.0.tar.xz -> conmon-2.0.1.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.0/Makefile new/conmon-2.0.1/Makefile
--- old/conmon-2.0.0/Makefile 2019-08-09 16:53:57.0 +0200
+++ new/conmon-2.0.1/Makefile 2019-09-13 17:34:08.0 +0200
@@ -43,6 +43,25 @@
override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd) -D
USE_JOURNALD=0
endif
+define DOCKERFILE
+ FROM alpine:latest
+ RUN apk add --update --no-cache bash make git gcc pkgconf libc-dev
glib-dev glib-static
+ COPY . /go/src/$(PROJECT)
+ WORKDIR /go/src/$(PROJECT)
+ RUN make static
+endef
+export DOCKERFILE
+
+containerized: bin
+ $(eval PODMAN ?= $(if $(shell podman -v),podman,docker))
+ echo "$$DOCKERFILE" | $(PODMAN) build --force-rm -t conmon-build -f - .
+ CTR=`$(PODMAN) create conmon-build` \
+ && $(PODMAN) cp $$CTR:/go/src/$(PROJECT)/bin/conmon bin/conmon \
+ && $(PODMAN) rm $$CTR
+
+static:
+ $(MAKE) git-vars bin/conmon PKG_CONFIG='$(PKG_CONFIG) --static'
CFLAGS='-static' LDFLAGS='$(LDFLAGS) -s -w -static' LIBS='$(LIBS)'
+
bin/conmon: src/conmon.o src/cmsg.o src/ctr_logging.o src/utils.o | bin
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -66,8 +85,7 @@
.PHONY: clean
clean:
- rm -f bin/conmon src/*.o
- rmdir bin
+ rm -rf bin/ src/*.o
.PHONY: install install.bin install.crio install.podman podman crio
install: install.bin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.0/VERSION new/conmon-2.0.1/VERSION
--- old/conmon-2.0.0/VERSION2019-08-09 16:53:57.0 +0200
+++ new/conmon-2.0.1/VERSION2019-09-13 17:34:08.0 +0200
@@ -1 +1 @@
-2.0.0
+2.0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.0/src/conmon.c
new/conmon-2.0.1/src/conmon.c
--- old/conmon-2.0.0/src/conmon.c 2019-08-09 16:53:57.0 +0200
+++ new/conmon-2.0.1/src/conmon.c 2019-09-13 17:34:08.0 +0200
@@ -116,7 +116,7 @@
{"version", 0, 0, G_OPTION_ARG_NONE, &opt_version, "Print the version
and exit", NULL},
{"syslog", 0, 0, G_OPTION_ARG_NONE, &opt_syslog, "Log to syslog (use
with cgroupfs cgroup manager)", NULL},
{"log-level", 0, 0, G_OPTION_ARG_STRING, &opt_log_level, "Print debug
logs based on log level", NULL},
- {NULL}};
+ {NULL, 0, 0, 0, NULL, NULL, NULL}};
#define CGROUP_ROOT "/sys/fs/cgroup"
#define OOM_SCORE "-999"
@@ -676,7 +676,7 @@
ws.ws_col = width;
ret = ioctl(masterfd_stdout, TIOCSWINSZ, &ws);
if (ret == -1) {
- nwarn("Failed to set process pty terminal size");
+ pwarn("Failed to set process pty terminal size");
}
}
@@ -795,6 +795,11 @@
masterfd_stdin = console.fd;
masterfd_stdout = console.fd;
+ /* now that we've set masterfd_stdout, we can register the ctrl_cb
+* if we didn't set it here, we'd risk attempting to run ioctl on
+* a negative fd, and fail to resize the window */
+ g_unix_fd_add(terminal_ctrl_fd, G_IO_IN, ctrl_cb, NULL);
+
/* Clean up everything */
close(connfd
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2019-08-27 15:50:32
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.7948 (New)
Package is "conmon"
Tue Aug 27 15:50:32 2019 rev:2 rq:726052 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2019-08-22
10:50:48.977712416 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.7948/conmon.changes 2019-08-27
15:50:33.419769100 +0200
@@ -1,0 +2,6 @@
+Sat Aug 24 04:10:04 UTC 2019 - Jan Engelhardt
+
+- Upstream has an actual description, use it instead of just
+ duplicating the summary again.
+
+---
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.MbUeSd/_old 2019-08-27 15:50:33.939768973 +0200
+++ /var/tmp/diff_new_pack.MbUeSd/_new 2019-08-27 15:50:33.947768971 +0200
@@ -12,9 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: conmon
Version: 2.0.0
Release: 0
@@ -26,7 +27,9 @@
BuildRequires: glib2-devel
%description
-%{summary}
+Conmon is a monitoring program and communication tool between a
+container manager (like podman or CRI-O) and an OCI runtime (like
+runc or crun) for a single container.
%prep
%setup -q
commit conmon for openSUSE:Factory
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2019-08-22 10:50:46
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.22127 (New)
Package is "conmon"
Thu Aug 22 10:50:46 2019 rev:1 rq:724530 version:2.0.0
Changes:
New Changes file:
--- /dev/null 2019-08-07 02:59:15.679220339 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.22127/conmon.changes 2019-08-22
10:50:48.977712416 +0200
@@ -0,0 +1,13 @@
+---
+Fri Aug 16 11:48:30 UTC 2019 - Sascha Grunert
+
+- Use `%make_build` macro instead of `%{__make}`
+- Use `%make_install` macro instead of `%{__make} install`
+- Use `%{_bindir}` macro instead of `%{_usr}/bin`
+- Change `PREFIX` to not contain `%{buildroot}` and use the
+ `$DESTDIR` variable
+
+---
+Mon Aug 12 06:41:41 UTC 2019 - Sascha Grunert
+
+- Initial release v2.0.0
New:
_service
conmon-2.0.0.tar.xz
conmon.changes
conmon.spec
Other differences:
--
++ conmon.spec ++
#
# spec file for package conmon
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: conmon
Version: 2.0.0
Release: 0
Summary: An OCI container runtime monitor
License: Apache-2.0
Group: System/Management
Url: https://github.com/containers/conmon
Source0: %{name}-%{version}.tar.xz
BuildRequires: glib2-devel
%description
%{summary}
%prep
%setup -q
%build
%make_build
%install
%make_install PREFIX=%{_prefix}
%files
%license LICENSE
%doc README.md
%{_bindir}/%{name}
%changelog
++ _service ++
https://github.com/containers/conmon
git
2.0.0
v2.0.0
conmon-*.tar
xz
conmon
