diff --git a/0001-Fix-tools-Makefile-with-GNU-make-4.4.patch b/0001-Fix-tools-Makefile-with-GNU-make-4.4.patch index ae680a2..ce081ae 100644 --- a/0001-Fix-tools-Makefile-with-GNU-make-4.4.patch +++ b/0001-Fix-tools-Makefile-with-GNU-make-4.4.patch @@ -15,7 +15,7 @@ Signed-off-by: Fabian Vogt 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,6 +24,3 @@ index 25783ae..0211016 100644 GO := go BUILDDIR := build --- -2.38.0 - diff --git a/_service b/_service index 8720835..b225a45 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git @PARENT_TAG@ [v]?([^\+]+)(.*) -v2.1.3 +v2.1.5 disable diff --git a/conmon-2.1.3.tar.xz b/conmon-2.1.3.tar.xz deleted file mode 100644 index 8b5db1c..0000000 --- a/conmon-2.1.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c342e622ca2cef60cc6d32d823f82ac5794b421c849b5d346f7e10184dbf71ba -size 140044 diff --git a/conmon-2.1.5.tar.xz b/conmon-2.1.5.tar.xz new file mode 100644 index 0000000..05d0794 --- /dev/null +++ b/conmon-2.1.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68aacc02ef86e8eb96593e75f9bf3be703cbbe46173fec90d81f064a894c0de8 +size 140364 diff --git a/conmon.changes b/conmon.changes index 7be2c41..7cb804d 100644 --- a/conmon.changes +++ b/conmon.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Fri Nov 4 14:35:09 UTC 2022 - Fabian Vogt diff --git a/conmon.spec b/conmon.spec index 2085765..1e0e146 100644 --- a/conmon.spec +++ b/conmon.spec @@ -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 @@ 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 +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)