commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2023-12-18 22:55:24
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.9037 (New)
Package is "conmon"
Mon Dec 18 22:55:24 2023 rev:33 rq:1133812 version:2.1.9
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2023-10-01
21:21:53.983762793 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.9037/conmon.changes 2023-12-18
22:55:25.922488818 +0100
@@ -1,0 +2,22 @@
+Mon Dec 18 09:02:52 UTC 2023 - Dan Äermák
+
+- Add fix-incorrect-free-in-conn_sock.patch
+ This fixes a regression in 2.1.9
+ (https://github.com/containers/conmon/issues/475 and
+ https://github.com/containers/conmon/issues/477)
+
+---
+Fri Dec 15 09:54:35 UTC 2023 - Dan Äermák
+
+- New upstream release 2.1.9
+
+ ### Bug fixes
+ * fix some issues flagged by SAST scan
+ * src: fix write after end of buffer
+ * src: open all files with O_CLOEXEC
+ * oom-score: restore oom score before running exit command
+ ### Features
+ * Forward more messages on the sd-notify socket
+ * logging: -l passthrough accepts TTYs
+
+---
Old:
conmon-2.1.8.tar.xz
New:
conmon-2.1.9.tar.xz
fix-incorrect-free-in-conn_sock.patch
BETA DEBUG BEGIN:
New:
- Add fix-incorrect-free-in-conn_sock.patch
This fixes a regression in 2.1.9
BETA DEBUG END:
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.D2oANB/_old 2023-12-18 22:55:27.074531008 +0100
+++ /var/tmp/diff_new_pack.D2oANB/_new 2023-12-18 22:55:27.074531008 +0100
@@ -17,13 +17,14 @@
Name: conmon
-Version:2.1.8
+Version:2.1.9
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
+Patch0:
https://github.com/containers/conmon/pull/476.patch#./fix-incorrect-free-in-conn_sock.patch
BuildRequires: pkgconfig
BuildRequires: golang(API) >= 1.20
BuildRequires: pkgconfig(glib-2.0)
++ _service ++
--- /var/tmp/diff_new_pack.D2oANB/_old 2023-12-18 22:55:27.106532181 +0100
+++ /var/tmp/diff_new_pack.D2oANB/_new 2023-12-18 22:55:27.106532181 +0100
@@ -1,17 +1,17 @@
-
+
https://github.com/containers/conmon
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.1.8
+v2.1.9
disable
-
+
conmon-*.tar
xz
-
+
conmon
++ conmon-2.1.8.tar.xz -> conmon-2.1.9.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.8/.cirrus.yml new/conmon-2.1.9/.cirrus.yml
--- old/conmon-2.1.8/.cirrus.yml2023-08-24 16:12:18.0 +0200
+++ new/conmon-2.1.9/.cirrus.yml2023-12-14 13:24:13.0 +0100
@@ -20,11 +20,11 @@
Cache-image names to test with (double-quotes around names are
critical)
-FEDORA_NAME: "fedora-38"
-PRIOR_FEDORA_NAME: "fedora-37"
+FEDORA_NAME: "fedora-39Ã"
+PRIOR_FEDORA_NAME: "fedora-38"
# VM Image built in containers/automation_images
-IMAGE_SUFFIX: "c20230809t143240z-f38f37d13"
+IMAGE_SUFFIX: "c20231004t194547z-f39f38d13"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
# Container FQIN's
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.8/.github/workflows/integration.yml
new/conmon-2.1.9/.github/workflows/integration.yml
--- old/conmon-2.1.8/.github/workflows/integration.yml 2023-08-24
16:12:18.0 +0200
+++ new/conmon-2.1.9/.github/workflows/integration.yml 2023-12-14
13:24:13.0 +0100
@@ -47,7 +47,7 @@
run: |
cd $(go env GOPATH)/src/github.com/cri-o/cri-o
make all test-binaries
- # skip seccomp tests because they have permission denied issues in a
container
- sudo -E test/test_runner.sh $(ls test/ | grep bats | grep -v seccomp)
+ # skip seccomp tests because they have permission denied issues in a
container and accept signed image as they don't use conmon
+ sudo -E test/test_runner.sh $(ls test/ | grep bats | grep -E -v
seccomp\|image\|policy)
env:
JOBS: '2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.8/README.md new/conmon-2.1.9/README.md
--- old/conmon-2.1.8/README.md 2023-08-24 16:12:18.0 +0200
+++ new/conmon-2.1.9/README.md 2023-12-14 13:24:13.0 +0100
@@ -91,7 +91,7 @@
It
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2023-10-01 21:21:47
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.28202 (New)
Package is "conmon"
Sun Oct 1 21:21:47 2023 rev:32 rq:1114247 version:2.1.8
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2023-09-10
13:09:17.324536169 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.28202/conmon.changes 2023-10-01
21:21:53.983762793 +0200
@@ -1,0 +2,6 @@
+Thu Sep 28 16:02:58 UTC 2023 - Valentin Lefebvre
+
+- go 1.19 EOL, swith to go >= 1.20
+ * [bsc#1215806]
+
+---
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.TYQQcQ/_old 2023-10-01 21:21:55.163805491 +0200
+++ /var/tmp/diff_new_pack.TYQQcQ/_new 2023-10-01 21:21:55.167805636 +0200
@@ -25,7 +25,7 @@
URL:https://github.com/containers/conmon
Source0:%{name}-%{version}.tar.xz
BuildRequires: pkgconfig
-BuildRequires: golang(API) = 1.19
+BuildRequires: golang(API) >= 1.20
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsystemd)
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package conmon for openSUSE:Factory checked in at 2023-09-10 13:09:11 Comparing /work/SRC/openSUSE:Factory/conmon (Old) and /work/SRC/openSUSE:Factory/.conmon.new.1766 (New) Package is "conmon" Sun Sep 10 13:09:11 2023 rev:31 rq:1109240 version:2.1.8 Changes: --- /work/SRC/openSUSE:Factory/conmon/conmon.changes2023-07-06 18:28:25.059051728 +0200 +++ /work/SRC/openSUSE:Factory/.conmon.new.1766/conmon.changes 2023-09-10 13:09:17.324536169 +0200 @@ -1,0 +2,16 @@ +Wed Sep 6 05:41:47 UTC 2023 - Danish Prakash + +- Update to version 2.1.8: + * stdio: ignore EIO for terminals + * ensure console socket buffers are properly sized + * conmon: drop return after pexit() + * ctrl: make accept4 failures fatal + * logging: avoid opening /dev/null for each write + * oom: restore old OOM score + * Use default umask 0022 + * cli: log parsing errors to stderr + * Changes to build conmon for riscv64 + * Changes to build conmon for ppc64le + * Fix close_other_fds on FreeBSD + +--- Old: conmon-2.1.7.tar.xz New: conmon-2.1.8.tar.xz Other differences: -- ++ conmon.spec ++ --- /var/tmp/diff_new_pack.EJE8Z8/_old 2023-09-10 13:09:18.740586760 +0200 +++ /var/tmp/diff_new_pack.EJE8Z8/_new 2023-09-10 13:09:18.740586760 +0200 @@ -1,7 +1,7 @@ # # spec file for package conmon # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 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.1.7 +Version:2.1.8 Release:0 Summary:An OCI container runtime monitor License:Apache-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.EJE8Z8/_old 2023-09-10 13:09:18.768587760 +0200 +++ /var/tmp/diff_new_pack.EJE8Z8/_new 2023-09-10 13:09:18.768587760 +0200 @@ -4,7 +4,7 @@ git @PARENT_TAG@ [v]?([^\+]+)(.*) -v2.1.7 +v2.1.8 disable ++ conmon-2.1.7.tar.xz -> conmon-2.1.8.tar.xz ++ 2527 lines of diff (skipped)
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package conmon for openSUSE:Factory checked in at 2023-07-06 18:28:14 Comparing /work/SRC/openSUSE:Factory/conmon (Old) and /work/SRC/openSUSE:Factory/.conmon.new.23466 (New) Package is "conmon" Thu Jul 6 18:28:14 2023 rev:30 rq:1096887 version:2.1.7 Changes: --- /work/SRC/openSUSE:Factory/conmon/conmon.changes2023-03-17 17:02:52.261242992 +0100 +++ /work/SRC/openSUSE:Factory/.conmon.new.23466/conmon.changes 2023-07-06 18:28:25.059051728 +0200 @@ -9 +9 @@ -cgroup: Stumble on if we can't set up oom handling +cgroup: Stumble on if we can't set up oom handling (bsc#1208737) Other differences: --
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package conmon for openSUSE:Factory checked in at 2022-12-12 17:38:15 Comparing /work/SRC/openSUSE:Factory/conmon (Old) and /work/SRC/openSUSE:Factory/.conmon.new.1835 (New) Package is "conmon" Mon Dec 12 17:38:15 2022 rev:28 rq:1042402 version:2.1.5 Changes: --- /work/SRC/openSUSE:Factory/conmon/conmon.changes2022-11-24 12:22:43.569105728 +0100 +++ /work/SRC/openSUSE:Factory/.conmon.new.1835/conmon.changes 2022-12-12 17:39:54.669244064 +0100 @@ -4 +4 @@ -- New upstream release 2.1.5: +- Update to version 2.1.5: @@ -6 +6,6 @@ - Bug Fixes + * don't leak syslog_identifier + * logging: do not read more that the buf size + * logging: fix error handling + * Makefile: Fix install for FreeBSD + * signal: Track changes to get_signal_descriptor in the FreeBSD version + * Packit: initial enablement @@ -8,3 +13 @@ -don't leak syslog_identifier -logging: do not read more that the buf size -logging: fix error handling +- Update to version 2.1.4: @@ -12,11 +15 @@ - Misc - -Makefile: Fix install for FreeBSD -signal: Track changes to get_signal_descriptor in the FreeBSD version -Packit: initial enablement - -- New upstream release 2.1.4: - - Bug fixes - -Fix a bug where conmon crashed when it got a SIGCHLD + * Fix a bug where conmon crashed when it got a SIGCHLD Other differences: --
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2022-11-24 12:22:33
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.1597 (New)
Package is "conmon"
Thu Nov 24 12:22:33 2022 rev:27 rq:1037630 version:2.1.5
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2022-11-07
13:51:22.483694723 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.1597/conmon.changes 2022-11-24
12:22:43.569105728 +0100
@@ -1,0 +2,23 @@
+Wed Nov 23 14:43:15 UTC 2022 - Dan Äermák
+
+- New upstream release 2.1.5:
+
+ Bug Fixes
+
+don't leak syslog_identifier
+logging: do not read more that the buf size
+logging: fix error handling
+
+ Misc
+
+Makefile: Fix install for FreeBSD
+signal: Track changes to get_signal_descriptor in the FreeBSD version
+Packit: initial enablement
+
+- New upstream release 2.1.4:
+
+ Bug fixes
+
+Fix a bug where conmon crashed when it got a SIGCHLD
+
+---
Old:
conmon-2.1.3.tar.xz
New:
conmon-2.1.5.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.zjCkgK/_old 2022-11-24 12:22:43.965108245 +0100
+++ /var/tmp/diff_new_pack.zjCkgK/_new 2022-11-24 12:22:43.969108270 +0100
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.1.3
+Version:2.1.5
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
@@ -25,7 +25,7 @@
URL:https://github.com/containers/conmon
Source0:%{name}-%{version}.tar.xz
# https://github.com/containers/conmon/pull/364
-Patch1: 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch
+Patch1:
%{URL}/pull/364.patch#./0001-Fix-tools-Makefile-with-GNU-make-4.4.patch
BuildRequires: pkgconfig
BuildRequires: golang(API) = 1.18
BuildRequires: pkgconfig(glib-2.0)
++ 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch ++
--- /var/tmp/diff_new_pack.zjCkgK/_old 2022-11-24 12:22:43.997108448 +0100
+++ /var/tmp/diff_new_pack.zjCkgK/_new 2022-11-24 12:22:44.001108473 +0100
@@ -15,7 +15,7 @@
1 file changed, 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
-index 25783ae..0211016 100644
+index 25783aef..0211016a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,3 @@
@@ -24,7 +24,4 @@
GO := go
BUILDDIR := build
---
-2.38.0
-
++ _service ++
--- /var/tmp/diff_new_pack.zjCkgK/_old 2022-11-24 12:22:44.025108626 +0100
+++ /var/tmp/diff_new_pack.zjCkgK/_new 2022-11-24 12:22:44.025108626 +0100
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.1.3
+v2.1.5
disable
++ conmon-2.1.3.tar.xz -> conmon-2.1.5.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.3/.cirrus.yml new/conmon-2.1.5/.cirrus.yml
--- old/conmon-2.1.3/.cirrus.yml2022-07-25 22:08:22.0 +0200
+++ new/conmon-2.1.5/.cirrus.yml2022-11-04 19:06:31.0 +0100
@@ -164,3 +164,25 @@
binaries_artifacts:
path: "bin/conmon"
+
+# This task is critical. It updates the "last-used by" timestamp stored
+# in metadata for all VM images. This mechanism functions in tandem with
+# an out-of-band pruning operation to remove disused VM images.
+meta_task:
+name: "VM img. keepalive"
+alias: meta
+container:
+cpu: 2
+memory: 2
+image: quay.io/libpod/imgts:latest
+env:
+# Space-separated list of images used by this repository state
+IMGNAMES: >-
+${FEDORA_CACHE_IMAGE_NAME}
+BUILDID: "${CIRRUS_BUILD_ID}"
+REPOREF: "${CIRRUS_REPO_NAME}"
+GCPJSON:
ENCRYPTED[08de2c74178470b1bc85a107e9962f06dbd11d33c7adf024d3e48ae4399ca5383f9d3ad0e2fd65c3ce12750dd6ef8803]
+GCPNAME:
ENCRYPTED[561ce33a9357e5b8e3fb54739c3af31730c0c3b736792f16a67026a8544379d83ff3c27d6fea1c7797a6ae49b6e58115]
+GCPPROJECT: libpod-218412
+clone_script: mkdir -p $CIRRUS_WORKING_DIR
+script: /usr/local/bin/entrypoint.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.3/.gitignore new/conmon-2.1.5/.gitignore
--- old/conmon-2.1.3/.gitignore 2022-07-25 22:08:22.0 +0200
+++ new/conmon-2.1.5/.gitignore 1970-01-01 01:00:00.0 +0100
@@ -1,58 +0,0 @@
-# Prerequisites
-*.d
-
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-
-# Linker output
-*.ilk
-*.map
-*.exp
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-/bin/conmon
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2022-11-07 13:51:20
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.1597 (New)
Package is "conmon"
Mon Nov 7 13:51:20 2022 rev:26 rq:1033914 version:2.1.3
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2022-08-23
14:26:01.815144713 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.1597/conmon.changes 2022-11-07
13:51:22.483694723 +0100
@@ -1,0 +2,6 @@
+Fri Nov 4 14:35:09 UTC 2022 - Fabian Vogt
+
+- Add patch to fix build with make >= 4.4:
+ * 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch
+
+---
New:
0001-Fix-tools-Makefile-with-GNU-make-4.4.patch
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.ipyMFz/_old 2022-11-07 13:51:22.943697309 +0100
+++ /var/tmp/diff_new_pack.ipyMFz/_new 2022-11-07 13:51:22.943697309 +0100
@@ -24,6 +24,8 @@
Group: System/Management
URL:https://github.com/containers/conmon
Source0:%{name}-%{version}.tar.xz
+# https://github.com/containers/conmon/pull/364
+Patch1: 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch
BuildRequires: pkgconfig
BuildRequires: golang(API) = 1.18
BuildRequires: pkgconfig(glib-2.0)
@@ -36,7 +38,7 @@
runc or crun) for a single container.
%prep
-%setup -q
+%autosetup -p1
%build
%make_build
++ 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch ++
>From a549987698d105fab2b2bdddeed49b586f4d799d Mon Sep 17 00:00:00 2001
From: Fabian Vogt
Date: Fri, 4 Nov 2022 15:29:59 +0100
Subject: [PATCH] Fix tools/Makefile with GNU make 4.4
Before GNU make 4.4, "export" variables were not actually exported to $(shell)
commands, so the "export GO111MODULE=off" line had no effect. With
make >= 4.4, this variable is now set in the environment of the "go build"
command, which breaks it. Just remove the wrong variable assignment to have
the same behavour as previously.
Signed-off-by: Fabian Vogt
---
tools/Makefile | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index 25783ae..0211016 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,3 @@
-export GO111MODULE=off
-
GO := go
BUILDDIR := build
--
2.38.0
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2022-08-23 14:25:39
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.2083 (New)
Package is "conmon"
Tue Aug 23 14:25:39 2022 rev:25 rq:998608 version:2.1.3
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2022-06-30
13:18:08.453523421 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.2083/conmon.changes 2022-08-23
14:26:01.815144713 +0200
@@ -1,0 +2,8 @@
+Wed Aug 17 20:16:56 UTC 2022 - Dirk M??ller
+
+- update to 2.1.3:
+ * Port conmon to FreeBSD
+ * Stop using g_unix_signal_add() to avoid threads
+ * Rename CLI optionlog-size-global-max to log-global-size-max
+
+---
Old:
conmon-2.1.2.tar.xz
New:
conmon-2.1.3.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.DsF15G/_old 2022-08-23 14:26:04.463150541 +0200
+++ /var/tmp/diff_new_pack.DsF15G/_new 2022-08-23 14:26:04.467150550 +0200
@@ -17,15 +17,15 @@
Name: conmon
-Version:2.1.2
+Version:2.1.3
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: golang(API) >= 1.16
BuildRequires: pkgconfig
+BuildRequires: golang(API) = 1.18
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsystemd)
++ _service ++
--- /var/tmp/diff_new_pack.DsF15G/_old 2022-08-23 14:26:04.511150647 +0200
+++ /var/tmp/diff_new_pack.DsF15G/_new 2022-08-23 14:26:04.511150647 +0200
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.1.2
+v2.1.3
disable
++ conmon-2.1.2.tar.xz -> conmon-2.1.3.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.2/.github/workflows/integration.yml
new/conmon-2.1.3/.github/workflows/integration.yml
--- old/conmon-2.1.2/.github/workflows/integration.yml 2022-06-16
14:51:54.0 +0200
+++ new/conmon-2.1.3/.github/workflows/integration.yml 2022-07-25
22:08:22.0 +0200
@@ -12,7 +12,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.17'
+ go-version: '1.18'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
@@ -29,7 +29,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.17'
+ go-version: '1.18'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
@@ -50,7 +50,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.17'
+ go-version: '1.18'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
@@ -74,7 +74,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.17'
+ go-version: '1.18'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
@@ -93,7 +93,7 @@
git clone https://github.com/containers/podman
cd podman
make
- sudo -E ginkgo \
+ sudo -E ACK_GINKGO_DEPRECATIONS=2.1.4 ginkgo \
-skip
'run.apparmor.disabled|image.trust.show.--json|run.network.bind.to.HostIP' \
-noColor \
-v test/e2e/.
@@ -103,7 +103,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.17'
+ go-version: '1.18'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.2/VERSION new/conmon-2.1.3/VERSION
--- old/conmon-2.1.2/VERSION2022-06-16 14:51:54.0 +0200
+++ new/conmon-2.1.3/VERSION2022-07-25 22:08:22.0 +0200
@@ -1 +1 @@
-2.1.2
+2.1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.2/hack/github-actions-setup
new/conmon-2.1.3/hack/github-actions-setup
--- old/conmon-2.1.2/hack/github-actions-setup 2022-06-16 14:51:54.0
+0200
+++ new/conmon-2.1.3/hack/github-actions-setup 2022-07-25 22:08:22.0
+0200
@@ -2,8 +2,8 @@
set -euo pipefail
declare -A VERSIONS=(
-["cni-plugins"]=v0.8.7
-["runc"]=v1.0.0-rc93
+["cni-plugins"]=v1.1.0
+["runc"]=v1.1.2
["bats"]=v1.2.1
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2022-06-30 13:18:06
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.1548 (New)
Package is "conmon"
Thu Jun 30 13:18:06 2022 rev:24 rq:985759 version:2.1.2
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2022-05-14
22:54:23.683158320 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.1548/conmon.changes 2022-06-30
13:18:08.453523421 +0200
@@ -1,0 +2,8 @@
+Wed Jun 29 06:05:57 UTC 2022 - Enrico Belleri
+
+- Update to version 2.1.2:
+ * add log-global-size-max option to limit the total output conmon processes
(CVE-2022-1708 boo#1200285)
+ * journald: print tag and name if both are specified
+ * drop some logs to debug level
+
+---
Old:
conmon-2.1.0.tar.xz
New:
conmon-2.1.2.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.DUzhhM/_old 2022-06-30 13:18:08.945523789 +0200
+++ /var/tmp/diff_new_pack.DUzhhM/_new 2022-06-30 13:18:08.949523793 +0200
@@ -17,16 +17,16 @@
Name: conmon
-Version:2.1.0
+Version:2.1.2
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
-BuildRequires: pkgconfig
BuildRequires: golang(API) >= 1.16
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsystemd)
++ _service ++
--- /var/tmp/diff_new_pack.DUzhhM/_old 2022-06-30 13:18:08.977523814 +0200
+++ /var/tmp/diff_new_pack.DUzhhM/_new 2022-06-30 13:18:08.981523817 +0200
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.1.0
+v2.1.2
disable
++ conmon-2.1.0.tar.xz -> conmon-2.1.2.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.0/VERSION new/conmon-2.1.2/VERSION
--- old/conmon-2.1.0/VERSION2022-01-24 21:00:50.0 +0100
+++ new/conmon-2.1.2/VERSION2022-06-16 14:51:54.0 +0200
@@ -1 +1 @@
-2.1.0
+2.1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.0/meson.build new/conmon-2.1.2/meson.build
--- old/conmon-2.1.0/meson.build2022-01-24 21:00:50.0 +0100
+++ new/conmon-2.1.2/meson.build2022-06-16 14:51:54.0 +0200
@@ -43,6 +43,14 @@
libdl = cc.find_library('dl')
endif
+sd_journal = dependency('libsystemd-journal', required : false)
+if not sd_journal.found()
+ sd_journal = dependency('libsystemd', required : false)
+endif
+if sd_journal.found()
+ add_project_arguments('-DUSE_JOURNALD=1', language : 'c')
+endif
+
executable('conmon',
['src/conmon.c',
'src/config.h',
@@ -78,7 +86,7 @@
'src/utils.h',
'src/seccomp_notify.c',
'src/seccomp_notify.h'],
- dependencies : [glib, libdl],
+ dependencies : [glib, libdl, sd_journal],
install : true,
install_dir : join_paths(get_option('libexecdir'), 'podman'),
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.1.0/src/cli.c new/conmon-2.1.2/src/cli.c
--- old/conmon-2.1.0/src/cli.c 2022-01-24 21:00:50.0 +0100
+++ new/conmon-2.1.2/src/cli.c 2022-06-16 14:51:54.0 +0200
@@ -38,6 +38,7 @@
char *opt_exit_dir = NULL;
int opt_timeout = 0;
int64_t opt_log_size_max = -1;
+int64_t opt_log_global_size_max = -1;
char *opt_socket_path = DEFAULT_SOCKET_PATH;
gboolean opt_no_new_keyring = FALSE;
char *opt_exit_command = NULL;
@@ -72,6 +73,7 @@
{"log-level", 0, 0, G_OPTION_ARG_STRING, _log_level, "Print debug
logs based on log level", NULL},
{"log-path", 'l', 0, G_OPTION_ARG_STRING_ARRAY, _log_path, "Log
file path", NULL},
{"log-size-max", 0, 0, G_OPTION_ARG_INT64, _log_size_max, "Maximum
size of log file", NULL},
+ {"log-global-size-max", 0, 0, G_OPTION_ARG_INT64,
_log_global_size_max, "Maximum size of all log files", NULL},
{"log-tag", 0, 0, G_OPTION_ARG_STRING, _log_tag, "Additional tag to
use for logging", NULL},
{"name", 'n', 0, G_OPTION_ARG_STRING, _name, "Container name",
NULL},
{"no-new-keyring", 0, 0, G_OPTION_ARG_NONE, _no_new_keyring, "Do
not create a new session keyring for the container", NULL},
@@ -189,5 +191,5 @@
if (opt_container_pid_file == NULL)
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2022-05-14 22:53:46
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.1538 (New)
Package is "conmon"
Sat May 14 22:53:46 2022 rev:23 rq:976687 version:2.1.0
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2021-09-26
21:49:05.834806513 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.1538/conmon.changes 2022-05-14
22:54:23.683158320 +0200
@@ -1,0 +2,16 @@
+Thu May 5 15:46:07 UTC 2022 - Ferdinand Thiessen
+
+- Update to version 2.1.0
+ * logging: buffer partial messages to journald
+ * exit: close all fds >= 3
+ * fix: cgroup: Free memory_cgroup_file_path if open fails.
+Call g_free instead of free.
+- Update to version 2.0.32
+ * Fix: Avoid mainfd_std{in,out} sharing the same file descriptor.
+ *exit_command: Fix: unset subreaper attribute before running exit command
+- Update to version 2.0.31
+ * logging: new mode -l passthrough
+ * ctr_logs: use container name or ID as SYSLOG_IDENTIFIER for journald
+ * conmon: Fix: free userdata files before exec cleanup
+
+---
Old:
conmon-2.0.30.tar.xz
New:
conmon-2.1.0.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.s0vivA/_old 2022-05-14 22:54:24.079158815 +0200
+++ /var/tmp/diff_new_pack.s0vivA/_new 2022-05-14 22:54:24.083158820 +0200
@@ -1,7 +1,7 @@
#
# spec file for package conmon
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 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.30
+Version:2.1.0
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.s0vivA/_old 2022-05-14 22:54:24.58855 +0200
+++ /var/tmp/diff_new_pack.s0vivA/_new 2022-05-14 22:54:24.115158860 +0200
@@ -4,8 +4,8 @@
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.0.30
-enable
+v2.1.0
+disable
conmon-*.tar
++ conmon-2.0.30.tar.xz -> conmon-2.1.0.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.30/.github/workflows/integration.yml
new/conmon-2.1.0/.github/workflows/integration.yml
--- old/conmon-2.0.30/.github/workflows/integration.yml 2021-09-21
22:13:00.0 +0200
+++ new/conmon-2.1.0/.github/workflows/integration.yml 2022-01-24
21:00:50.0 +0100
@@ -12,7 +12,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.16'
+ go-version: '1.17'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
@@ -29,7 +29,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.16'
+ go-version: '1.17'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
@@ -41,15 +41,16 @@
- run: hack/github-actions-setup
- name: Run conmon integration tests
run: |
- make vendor
- sudo make test
+ sudo make vendor
+ sudo mkdir -p /var/run/crio
+ sudo make test-binary
cri-o:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.16'
+ go-version: '1.17'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
@@ -63,7 +64,8 @@
run: |
cd cri-o
make all test-binaries
- sudo -E test/test_runner.sh
+ # skip seccomp tests because they have permission denied issues in a
container
+ sudo -E test/test_runner.sh $(ls test/ | grep bats | grep -v seccomp)
env:
JOBS: '2'
@@ -72,7 +74,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.16'
+ go-version: '1.17'
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
@@ -81,16 +83,16 @@
~/.cache/go-build
key: go-integration-podman-${{ hashFiles('**/go.mod') }}
restore-keys: go-integration-podman-
- # https://github.com/actions/setup-go/issues/107
- - run: |
-export PATH=${GOROOT}/bin:$PATH
-go version
- run: hack/github-actions-setup
+ - run: |
+ # https://github.com/actions/setup-go/issues/107
+ cp -f `which go` /usr/bin/go
+
- name: Run Podman integration tests
run: |
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2021-09-26 21:48:26
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.1899 (New)
Package is "conmon"
Sun Sep 26 21:48:26 2021 rev:22 rq:921243 version:2.0.30
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2021-07-30
23:21:53.647655026 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.1899/conmon.changes 2021-09-26
21:49:05.834806513 +0200
@@ -1,0 +2,10 @@
+Fri Sep 24 07:31:03 UTC 2021 - Paolo Stivanin
+
+- Update to version 2.0.30:
+ * Remove unreachable code path
+ * exit: report if the exit command was killed
+ * exit: fix race zombie reaper
+ * conn_sock: allow watchdog messages through the notify socket proxy
+ * seccomp: add support for seccomp notify
+
+---
Old:
conmon-2.0.29.tar.xz
New:
conmon-2.0.30.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.yfFIvm/_old 2021-09-26 21:49:06.282807012 +0200
+++ /var/tmp/diff_new_pack.yfFIvm/_new 2021-09-26 21:49:06.282807012 +0200
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.29
+Version:2.0.30
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
@@ -25,7 +25,9 @@
URL:https://github.com/containers/conmon
Source0:%{name}-%{version}.tar.xz
BuildRequires: glib2-devel
+BuildRequires: pkgconfig
BuildRequires: golang(API) >= 1.16
+BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsystemd)
%description
@@ -46,6 +48,6 @@
%license LICENSE
%doc README.md
%{_bindir}/%{name}
-%{_mandir}/man8/conmon*.8*
+%{_mandir}/man8/conmon*.8%{?ext_man}
%changelog
++ _service ++
--- /var/tmp/diff_new_pack.yfFIvm/_old 2021-09-26 21:49:06.306807039 +0200
+++ /var/tmp/diff_new_pack.yfFIvm/_new 2021-09-26 21:49:06.310807043 +0200
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.0.29
+v2.0.30
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.yfFIvm/_old 2021-09-26 21:49:06.326807061 +0200
+++ /var/tmp/diff_new_pack.yfFIvm/_new 2021-09-26 21:49:06.326807061 +0200
@@ -1,4 +1,4 @@
https://github.com/containers/conmon
- 7e6de6678f6ed8a18661e1d5721b81ccee293b9b
\ No newline at end of file
+ 2792c16f4436f1887a7070d9ad99d9c29742f38a
++ conmon-2.0.29.tar.xz -> conmon-2.0.30.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.29/.cirrus.yml
new/conmon-2.0.30/.cirrus.yml
--- old/conmon-2.0.29/.cirrus.yml 2021-06-02 18:20:07.0 +0200
+++ new/conmon-2.0.30/.cirrus.yml 2021-09-21 22:13:00.0 +0200
@@ -23,17 +23,15 @@
FEDORA_NAME: "fedora-34"
PRIOR_FEDORA_NAME: "fedora-33"
UBUNTU_NAME: "ubuntu-2104"
-PRIOR_UBUNTU_NAME: "ubuntu-2010"
# VM Image built in containers/automation_images
-IMAGE_SUFFIX: "c5032481331085312"
+IMAGE_SUFFIX: "c6431352024203264"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
# Container FQIN's
FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
PRIOR_FEDORA_CONTAINER_FQIN:
"quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}"
UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX}"
-PRIOR_UBUNTU_CONTAINER_FQIN:
"quay.io/libpod/prior-ubuntu_podman:${IMAGE_SUFFIX}"
# Only github users with write-access can define or use encrypted variables
@@ -73,7 +71,7 @@
image: "${PRIOR_FEDORA_CONTAINER_FQIN}"
script:
-- dnf install -y rpm-build golang
+- dnf install -y rpm-build golang libseccomp-devel
- cd $CIRRUS_WORKING_DIR
- make
- make -f .rpmbuild/Makefile
@@ -123,7 +121,7 @@
# the next line and file an issue with details about the failure.
# allow_failures: true
-timeout_in: '20m'
+timeout_in: '240m'
gce_instance:
image_name: "${FEDORA_CACHE_IMAGE_NAME}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.29/.github/workflows/integration.yml
new/conmon-2.0.30/.github/workflows/integration.yml
--- old/conmon-2.0.29/.github/workflows/integration.yml 2021-06-02
18:20:07.0 +0200
+++ new/conmon-2.0.30/.github/workflows/integration.yml 2021-09-21
22:13:00.0 +0200
@@ -72,7 +72,7 @@
steps:
- uses: actions/setup-go@v2
with:
- go-version: '1.15'
+ go-version: '1.16'
- uses: actions/checkout@v2
- uses:
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package conmon for openSUSE:Factory checked in at 2021-07-30 23:21:51 Comparing /work/SRC/openSUSE:Factory/conmon (Old) and /work/SRC/openSUSE:Factory/.conmon.new.1899 (New) Package is "conmon" Fri Jul 30 23:21:51 2021 rev:21 rq:908828 version:2.0.29 Changes: --- /work/SRC/openSUSE:Factory/conmon/conmon.changes2021-04-10 15:26:04.442286469 +0200 +++ /work/SRC/openSUSE:Factory/.conmon.new.1899/conmon.changes 2021-07-30 23:21:53.647655026 +0200 @@ -1,0 +2,8 @@ +Fri Jul 23 09:51:11 UTC 2021 - alexandre.vice...@suse.com + +- Update to version 2.0.29: + * Reset OOM score back to 0 for container runtime + * call functions registered with atexit on SIGTERM + * conn_sock: fix potential segfault + +--- Old: conmon-2.0.27.tar.xz New: conmon-2.0.29.tar.xz Other differences: -- ++ conmon.spec ++ --- /var/tmp/diff_new_pack.KraDUD/_old 2021-07-30 23:21:54.199654420 +0200 +++ /var/tmp/diff_new_pack.KraDUD/_new 2021-07-30 23:21:54.203654415 +0200 @@ -17,7 +17,7 @@ Name: conmon -Version:2.0.27 +Version:2.0.29 Release:0 Summary:An OCI container runtime monitor License:Apache-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.KraDUD/_old 2021-07-30 23:21:54.231654384 +0200 +++ /var/tmp/diff_new_pack.KraDUD/_new 2021-07-30 23:21:54.235654380 +0200 @@ -4,7 +4,7 @@ git @PARENT_TAG@ [v]?([^\+]+)(.*) -v2.0.27 +v2.0.29 enable ++ _servicedata ++ --- /var/tmp/diff_new_pack.KraDUD/_old 2021-07-30 23:21:54.255654359 +0200 +++ /var/tmp/diff_new_pack.KraDUD/_new 2021-07-30 23:21:54.255654359 +0200 @@ -1,4 +1,4 @@ https://github.com/containers/conmon - 65fad4bfcb250df0435ea668017e643e7f462155 \ No newline at end of file + 7e6de6678f6ed8a18661e1d5721b81ccee293b9b \ No newline at end of file ++ conmon-2.0.27.tar.xz -> conmon-2.0.29.tar.xz ++ 3894 lines of diff (skipped)
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2021-04-10 15:25:55
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.2401 (New)
Package is "conmon"
Sat Apr 10 15:25:55 2021 rev:20 rq:882552 version:2.0.27
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2021-03-02
12:27:51.591446232 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.2401/conmon.changes 2021-04-10
15:26:04.442286469 +0200
@@ -1,0 +2,11 @@
+Tue Mar 30 08:47:10 UTC 2021 - alexandre.vice...@suse.com
+
+- Update to version 2.0.27:
+ * bump to v2.0.27
+ * Add CRI-O integration test GitHub action
+ * exec: don't fail on EBADFD
+ * close_fds: fix close of external fds
+ * Add arm64 static build binary
+ * bump to v2.0.27-dev
+
+---
Old:
conmon-2.0.26.tar.xz
New:
conmon-2.0.27.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.eiEOug/_old 2021-04-10 15:26:04.918287030 +0200
+++ /var/tmp/diff_new_pack.eiEOug/_new 2021-04-10 15:26:04.922287034 +0200
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.26
+Version:2.0.27
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.eiEOug/_old 2021-04-10 15:26:04.942287058 +0200
+++ /var/tmp/diff_new_pack.eiEOug/_new 2021-04-10 15:26:04.946287062 +0200
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.0.26
+v2.0.27
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.eiEOug/_old 2021-04-10 15:26:04.958287076 +0200
+++ /var/tmp/diff_new_pack.eiEOug/_new 2021-04-10 15:26:04.962287081 +0200
@@ -1,4 +1,4 @@
https://github.com/containers/conmon
- 0e155c83aa739ef0a0540ec9f9d265f57f68038b
+ 65fad4bfcb250df0435ea668017e643e7f462155
\ No newline at end of file
++ conmon-2.0.26.tar.xz -> conmon-2.0.27.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.26/.cirrus.yml
new/conmon-2.0.27/.cirrus.yml
--- old/conmon-2.0.26/.cirrus.yml 2021-02-03 19:32:15.0 +0100
+++ new/conmon-2.0.27/.cirrus.yml 2021-03-08 18:44:27.0 +0100
@@ -141,28 +141,44 @@
memory: 12
disk: 200
-init_script: |
-set -ex
-setenforce 0
-growpart /dev/sda 1 || true
-resize2fs /dev/sda1 || true
-yum -y install podman
-
-nix_cache:
- folder: '.cache'
- fingerprint_script: |
-echo "nix-v1-$(sha1sum nix/nixpkgs.json | head -c 40)"
+# Community-maintained task, may fail on occasion. If so, uncomment
+# the next line and file an issue with details about the failure.
+# allow_failures: true
+
+timeout_in: '20m'
+
+env:
+# Do not use 'latest', fixed-version tag for runtime stability.
+CTR_FQIN: "docker.io/nixos/nix:2.3.6"
+# Authentication token for pushing the build cache to cachix.
+# This is critical, it helps to avoid a very lengthy process of
+# statically building every dependency needed to build conmon.
+# Assuming the pinned nix dependencies in nix/nixpkgs.json have not
+# changed, this cache will ensure that only the static conmon binary is
+# built.
+CACHIX_AUTH_TOKEN:
ENCRYPTED[4c3b8d82b0333abf048c56a71f2559ddb1c9ed38f0c28916eca13f79affa5904cf90c76a5bd8686680c89f41079ef341]
+
+alias: static_binary
+
+matrix:
+ - env:
+TARGET: default.nix
+ - env:
+TARGET: default-arm64.nix
build_script: |
set -ex
-mkdir -p .cache
-mv .cache /nix
-if [[ -z $(ls -A /nix) ]]; then podman run --rm --privileged -ti -v
/:/mnt nixos/nix cp -rfT /nix /mnt/nix; fi
-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/
+podman run -i --rm \
+ -e CACHIX_AUTH_TOKEN \
+ -v $PWD:$PWD:Z \
+ -w $PWD \
+ $CTR_FQIN \
+ sh -c \
+ "nix-env -iA cachix -f https://cachix.org/api/v1/install && \
+ cachix use conmon && \
+ nix-build nix/$TARGET && \
+ nix-store -qR --include-outputs \$(nix-instantiate nix/$TARGET) |
grep -v conmon | cachix push conmon && \
+ cp -R result/bin ."
binaries_artifacts:
-path: "result/bin/conmon"
-
-save_cache_script: |
-mv /nix .cache
-chown -Rf $(whoami)
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2021-03-02 12:26:23
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.2378 (New)
Package is "conmon"
Tue Mar 2 12:26:23 2021 rev:19 rq:875202 version:2.0.26
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2021-01-19
15:59:55.439174061 +0100
+++ /work/SRC/openSUSE:Factory/.conmon.new.2378/conmon.changes 2021-03-02
12:27:51.591446232 +0100
@@ -1,0 +2,17 @@
+Thu Feb 25 15:41:49 UTC 2021 - Alexandre Vicenzi
+
+- Update to version 2.0.26:
+ * conn_sock: do not fail on EAGAIN
+ * fix segfault from a double freed pointer
+ * Fix a bug where conmon could never spawn a container, because
+a disagreement between the caller and itself on where the attach
+socket was.
+ * improve --full-attach to ignore the socket-dir directly. that
+means callers don't need to specify a socket dir at all (and
+can remove it)
+ * add full-attach option to allow callers to not truncate a very
+long path for the attach socket
+ * close only opened FDs
+ * set locale to inherit environment
+
+---
Old:
conmon-2.0.22.tar.xz
New:
conmon-2.0.26.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.qi8a0M/_old 2021-03-02 12:27:52.147446728 +0100
+++ /var/tmp/diff_new_pack.qi8a0M/_new 2021-03-02 12:27:52.151446733 +0100
@@ -17,7 +17,7 @@
Name: conmon
-Version:2.0.22
+Version:2.0.26
Release:0
Summary:An OCI container runtime monitor
License:Apache-2.0
@@ -25,7 +25,7 @@
URL:https://github.com/containers/conmon
Source0:%{name}-%{version}.tar.xz
BuildRequires: glib2-devel
-BuildRequires: golang(API) >= 1.15
+BuildRequires: golang(API) >= 1.16
BuildRequires: pkgconfig(libsystemd)
%description
++ _service ++
--- /var/tmp/diff_new_pack.qi8a0M/_old 2021-03-02 12:27:52.171446750 +0100
+++ /var/tmp/diff_new_pack.qi8a0M/_new 2021-03-02 12:27:52.171446750 +0100
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.0.22
+v2.0.26
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.qi8a0M/_old 2021-03-02 12:27:52.187446764 +0100
+++ /var/tmp/diff_new_pack.qi8a0M/_new 2021-03-02 12:27:52.187446764 +0100
@@ -1,4 +1,4 @@
https://github.com/containers/conmon
- 9c34a8663b85e479e0c083801e89a2b2835228ed
\ No newline at end of file
+ 0e155c83aa739ef0a0540ec9f9d265f57f68038b
++ conmon-2.0.22.tar.xz -> conmon-2.0.26.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.22/Makefile new/conmon-2.0.26/Makefile
--- old/conmon-2.0.22/Makefile 2020-12-17 16:56:08.0 +0100
+++ new/conmon-2.0.26/Makefile 2021-02-03 19:32:15.0 +0100
@@ -6,7 +6,7 @@
PROJECT := github.com/containers/conmon
PKG_CONFIG ?= pkg-config
HEADERS := $(wildcard src/*.h)
-OBJS := src/conmon.o src/cmsg.o src/ctr_logging.o src/utils.o src/cli.o
src/globals.o src/cgroup.o src/conn_sock.o src/oom.o src/ctrl.o src/ctr_stdio.o
src/parent_pipe_fd.o src/ctr_exit.o src/runtime_args.o
+OBJS := src/conmon.o src/cmsg.o src/ctr_logging.o src/utils.o src/cli.o
src/globals.o src/cgroup.o src/conn_sock.o src/oom.o src/ctrl.o src/ctr_stdio.o
src/parent_pipe_fd.o src/ctr_exit.o src/runtime_args.o src/close_fds.o
DEBUGTAG ?=
ifneq (,$(findstring enable_debug,$(DEBUGTAG)))
DEBUGFLAG=-g
@@ -52,7 +52,7 @@
# 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 \
+ @nix run -f channel:nixos-20.09 nix-prefetch-git -c nix-prefetch-git \
--no-deepClone https://github.com/nixos/nixpkgs >
nix/nixpkgs.json
# Build statically linked binary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.22/VERSION new/conmon-2.0.26/VERSION
--- old/conmon-2.0.22/VERSION 2020-12-17 16:56:08.0 +0100
+++ new/conmon-2.0.26/VERSION 2021-02-03 19:32:15.0 +0100
@@ -1 +1 @@
-2.0.22
+2.0.26
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conmon-2.0.22/docs/Makefile
new/conmon-2.0.26/docs/Makefile
--- old/conmon-2.0.22/docs/Makefile 2020-12-17 16:56:08.0 +0100
+++ new/conmon-2.0.26/docs/Makefile 2021-02-03 19:32:15.0 +0100
@@ -1,4 +1,4 @@
-PREFIX := /usr/local
+PREFIX ?= /usr/local
DATADIR := ${PREFIX}/share
MANDIR := $(DATADIR)/man
commit conmon for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conmon for openSUSE:Factory checked
in at 2021-01-19 15:59:34
Comparing /work/SRC/openSUSE:Factory/conmon (Old)
and /work/SRC/openSUSE:Factory/.conmon.new.28504 (New)
Package is "conmon"
Tue Jan 19 15:59:34 2021 rev:18 rq:863391 version:2.0.22
Changes:
--- /work/SRC/openSUSE:Factory/conmon/conmon.changes2020-09-24
16:12:22.420786376 +0200
+++ /work/SRC/openSUSE:Factory/.conmon.new.28504/conmon.changes 2021-01-19
15:59:55.439174061 +0100
@@ -1,0 +2,9 @@
+Tue Jan 12 08:10:52 UTC 2021 - sgrun...@suse.com
+
+- Update to version 2.0.22:
+ * added man page
+ * attach: always chdir
+ * conn_sock: Explicitly free a heap-allocated string
+ * refactor I/O and add SD_NOTIFY proxy support
+
+---
Old:
conmon-2.0.21.tar.xz
New:
conmon-2.0.22.tar.xz
Other differences:
--
++ conmon.spec ++
--- /var/tmp/diff_new_pack.o2Uvkz/_old 2021-01-19 15:59:56.079175029 +0100
+++ /var/tmp/diff_new_pack.o2Uvkz/_new 2021-01-19 15:59:56.083175035 +0100
@@ -1,7 +1,7 @@
#
# spec file for package conmon
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 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.21
+Version:2.0.22
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: golang(API) >= 1.15
BuildRequires: pkgconfig(libsystemd)
%description
@@ -45,5 +46,6 @@
%license LICENSE
%doc README.md
%{_bindir}/%{name}
+%{_mandir}/man8/conmon*.8*
%changelog
++ _service ++
--- /var/tmp/diff_new_pack.o2Uvkz/_old 2021-01-19 15:59:56.115175083 +0100
+++ /var/tmp/diff_new_pack.o2Uvkz/_new 2021-01-19 15:59:56.119175090 +0100
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
[v]?([^\+]+)(.*)
-v2.0.21
+v2.0.22
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.o2Uvkz/_old 2021-01-19 15:59:56.139175120 +0100
+++ /var/tmp/diff_new_pack.o2Uvkz/_new 2021-01-19 15:59:56.139175120 +0100
@@ -1,4 +1,4 @@
https://github.com/containers/conmon
- 35a2fa83022e56e18af7e6a865ba5d7165fa2a4a
\ No newline at end of file
+ 9c34a8663b85e479e0c083801e89a2b2835228ed
\ No newline at end of file
++ conmon-2.0.21.tar.xz -> conmon-2.0.22.tar.xz ++
7448 lines of diff (skipped)
