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.changes 2020-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 <[email protected]> + +- 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 @@ <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.15</param> -<param name="revision">v2.0.15</param> +<param name="versionformat">2.0.16</param> +<param name="revision">v2.0.16</param> </service> <service name="recompress" mode="disabled"> <param name="file">conmon-*.tar</param> ++++++ 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.000000000 +0200 +++ new/conmon-2.0.16/Makefile 2020-05-12 22:25:09.000000000 +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.000000000 +0100 +++ new/conmon-2.0.16/SECURITY.md 2020-05-12 22:25:09.000000000 +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.000000000 +0200 +++ new/conmon-2.0.16/VERSION 2020-05-12 22:25:09.000000000 +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.md 2020-04-02 19:58:32.000000000 +0200 +++ new/conmon-2.0.16/install.md 2020-05-12 22:25:09.000000000 +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.000000000 +0200 +++ new/conmon-2.0.16/src/conn_sock.c 2020-05-12 22:25:09.000000000 +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) + if (!sock->remaining || masterfd_stdin < 0) return; ssize_t w = write(masterfd_stdin, sock->buf + sock->off, sock->remaining); @@ -264,3 +263,8 @@ return G_SOURCE_CONTINUE; return G_SOURCE_REMOVE; } + +void schedule_master_stdin_write() +{ + g_unix_fd_add(masterfd_stdin, G_IO_OUT, masterfd_write_cb, NULL); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conmon-2.0.15/src/conn_sock.h new/conmon-2.0.16/src/conn_sock.h --- old/conmon-2.0.15/src/conn_sock.h 2020-04-02 19:58:32.000000000 +0200 +++ new/conmon-2.0.16/src/conn_sock.h 2020-05-12 22:25:09.000000000 +0200 @@ -18,5 +18,6 @@ char *setup_console_socket(void); char *setup_attach_socket(void); void conn_sock_shutdown(struct conn_sock_s *sock, int how); +void schedule_master_stdin_write(); #endif // CONN_SOCK_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conmon-2.0.15/src/ctrl.c new/conmon-2.0.16/src/ctrl.c --- old/conmon-2.0.15/src/ctrl.c 2020-04-02 19:58:32.000000000 +0200 +++ new/conmon-2.0.16/src/ctrl.c 2020-05-12 22:25:09.000000000 +0200 @@ -5,6 +5,7 @@ #include "globals.h" #include "config.h" #include "ctr_logging.h" +#include "conn_sock.h" #include "cmsg.h" #include "cli.h" // opt_bundle_path @@ -59,6 +60,10 @@ masterfd_stdin = console.fd; masterfd_stdout = console.fd; + /* Now that we have a fd to the tty, make sure we handle any pending data + * that was already buffered. */ + schedule_master_stdin_write(); + /* now that we've set masterfd_stdout, we can register the ctrl_winsz_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 */
