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.changes 2020-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 <[email protected]> + +- 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 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/containers/conmon</param> <param name="scm">git</param> -<param name="versionformat">2.0.16</param> -<param name="revision">v2.0.16</param> +<param name="versionformat">2.0.17</param> +<param name="revision">v2.0.17</param> </service> <service name="recompress" mode="disabled"> <param name="file">conmon-*.tar</param> ++++++ 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.000000000 +0200 +++ new/conmon-2.0.17/VERSION 2020-05-26 17:29:46.000000000 +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.000000000 +0200 +++ new/conmon-2.0.17/src/cli.c 2020-05-26 17:29:46.000000000 +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.000000000 +0200 +++ new/conmon-2.0.17/src/cli.h 2020-05-26 17:29:46.000000000 +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.c 2020-05-12 22:25:09.000000000 +0200 +++ new/conmon-2.0.17/src/ctr_exit.c 2020-05-26 17:29:46.000000000 +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; + if (opt_exit_delay) { + ndebugf("Sleeping for %d seconds before executing exit command", opt_exit_delay); + sleep(opt_exit_delay); + } + execv(opt_exit_command, args); /* Should not happen, but better be safe. */
