!12 [patch tracking] 20201129205849773219

From: @openeuler-ci-bot
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng

2583fb77dd57c5183998177a3fa13a680b573005.patch

@@ -0,0 +1,34 @@
+diff --git a/ping/ping.c b/ping/ping.c
+index e277697..d96298e 100644
+--- a/ping/ping.c
++++ b/ping/ping.c
+@@ -1314,8 +1314,11 @@ int ping4_receive_error_msg(struct ping_rts *rts, socket_st *sock)
+ 	msg.msg_controllen = sizeof(cbuf);
+ 
+ 	res = recvmsg(sock->fd, &msg, MSG_ERRQUEUE | MSG_DONTWAIT);
+-	if (res < 0)
++	if (res < 0) {
++		if (errno == EAGAIN || errno == EINTR)
++			local_errors++;
+ 		goto out;
++	}
+ 
+ 	e = NULL;
+ 	for (cmsgh = CMSG_FIRSTHDR(&msg); cmsgh; cmsgh = CMSG_NXTHDR(&msg, cmsgh)) {
+diff --git a/ping/ping6_common.c b/ping/ping6_common.c
+index 279c533..459f63e 100644
+--- a/ping/ping6_common.c
++++ b/ping/ping6_common.c
+@@ -481,8 +481,11 @@ int ping6_receive_error_msg(struct ping_rts *rts, socket_st *sock)
+ 	msg.msg_controllen = sizeof(cbuf);
+ 
+ 	res = recvmsg(sock->fd, &msg, MSG_ERRQUEUE | MSG_DONTWAIT);
+-	if (res < 0)
++	if (res < 0) {
++		if (errno == EAGAIN || errno == EINTR)
++			local_errors++;
+ 		goto out;
++	}
+ 
+ 	e = NULL;
+ 	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {

78e3d25a50537a842fd3b18eab971d63d5891350.patch

@@ -0,0 +1,23 @@
+diff --git a/.travis.yml b/.travis.yml
+index 16ebbcc..094c243 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,3 +1,4 @@
++---
+ # Copyright (c) 2019-2020 Petr Vorel <pvorel@suse.cz>
+ 
+ sudo: required
+@@ -72,8 +73,8 @@ before_install:
+     - docker build -t iputils .
+ 
+ script:
+-  - INSTALL="${DISTRO%%:*}"
+-  - INSTALL="${INSTALL%%/*}"
+-  - DISTRO_VERSION="${DISTRO#*:}"
+-  - case $VARIANT in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac
+-  - docker run -it iputils /bin/sh -c "cd travis && DISTRO_VERSION=\"$DISTRO_VERSION\" ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./$INSTALL.$VARIANT.sh; fi && CC=$CC EXTRA_BUILD_OPTS=\"$EXTRA_BUILD_OPTS\" ../build.sh"
++    - INSTALL="${DISTRO%%:*}"
++    - INSTALL="${INSTALL%%/*}"
++    - DISTRO_VERSION="${DISTRO#*:}"
++    - case $VARIANT in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac
++    - docker run -it iputils /bin/sh -c "cd travis && DISTRO_VERSION=\"$DISTRO_VERSION\" ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./$INSTALL.$VARIANT.sh; fi && CC=$CC EXTRA_BUILD_OPTS=\"$EXTRA_BUILD_OPTS\" ../build.sh"

950d36f8ba5a669cbc34a7972db611b675725fb5.patch

@@ -0,0 +1,69 @@
+diff --git a/meson.build b/meson.build
+index aff75a2..7281ccb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -40,8 +40,10 @@ localedir = join_paths(prefix, get_option('localedir'))
+ sbindir = join_paths(prefix, get_option('sbindir'))
+ 
+ systemd = dependency('systemd', required : false)
++install_systemd_units = systemd.found() or get_option('INSTALL_SYSTEMD_UNITS')
++
+ systemdunitdir = get_option('systemdunitdir')
+-if systemdunitdir == '' and systemd.found()
++if systemdunitdir == '' and install_systemd_units
+ 	systemdunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+ endif
+ 
+@@ -280,7 +282,7 @@ if build_rdisc == true
+ 		install_dir: sbindir,
+ 		link_with : [libcommon],
+ 		install: true)
+-	if systemd.found()
++	if install_systemd_units
+ 		subs = configuration_data()
+ 		subs.set('sbindir', sbindir)
+ 		unit_file = configure_file(
+@@ -316,7 +318,7 @@ if build_rarpd == true
+ 		install_dir: sbindir,
+ 		link_with : [libcommon],
+ 		install: true)
+-	if systemd.found()
++	if install_systemd_units
+ 		subs = configuration_data()
+ 		subs.set('sbindir', sbindir)
+ 		unit_file = configure_file(
+@@ -359,7 +361,7 @@ output += '\nCONFIGURATION\n'
+ output += 'Capatiblity (with libcap): ' + cap.to_string() + '\n'
+ output += 'IDN (with libidn2): ' + idn.to_string() + '\n'
+ output += 'I18N (with gettext): ' + gettext.to_string() + '\n'
+-output += 'systemd: ' + systemd.found().to_string() + '\n'
++output += 'systemd: ' + install_systemd_units.to_string() + '\n'
+ 
+ output += '\nSYSTEM PATHS\n'
+ output += 'prefix: ' + prefix + '\n'
+diff --git a/meson_options.txt b/meson_options.txt
+index aade675..c806d80 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -64,5 +64,8 @@ option('ARPING_DEFAULT_DEVICE', type : 'string', value : '',
+ option('systemdunitdir', type: 'string', value: '',
+ 	description: 'Directory for systemd units')
+ 
++option('INSTALL_SYSTEMD_UNITS', type: 'boolean', value: false,
++        description: 'Install generated systemd unit files')
++
+ option('USE_GETTEXT', type: 'boolean', value: true,
+ 	description: 'Enable I18N')
+diff --git a/ninfod/meson.build b/ninfod/meson.build
+index 80b0a44..770169a 100644
+--- a/ninfod/meson.build
++++ b/ninfod/meson.build
+@@ -18,7 +18,7 @@ executable('ninfod', [ninfod_sources, git_version_h],
+ conf_data = configuration_data()
+ conf_data.set('prefix', prefix)
+ 
+-if systemd.found()
++if install_systemd_units
+ 	subs = configuration_data()
+ 	subs.set('sbindir', sbindir)
+ 	unit_file = configure_file(

iputils.spec

@@ -1,6 +1,6 @@
 Name:            iputils
 Version:         20190709
-Release:         5
+Release:         6
 Summary:         Network monitoring tools including ping
 License:         BSD and GPLv2+
 URL:             https://github.com/iputils/iputils
@@ -18,6 +18,9 @@ Patch0003:       0002-iputils-arpings-count.patch
 Patch0004:       bugfix-arping-w-does-not-take-effect.patch
 Patch0005:       0003-ninfod-change-variable-name-to-avoid-colliding.patch
 Patch6000: 86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch
+Patch6001: 2583fb77dd57c5183998177a3fa13a680b573005.patch
+Patch6002: 950d36f8ba5a669cbc34a7972db611b675725fb5.patch
+Patch6003: 78e3d25a50537a842fd3b18eab971d63d5891350.patch
 
 BuildRequires:   gcc meson libidn2-devel openssl-devel libcap-devel libxslt
 BuildRequires:   docbook5-style-xsl systemd glibc-kernheaders gettext
@@ -98,6 +101,9 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* 20201129205849773219 patch-tracking 20190709-6
+- append patch file of upstream repository from <2583fb77dd57c5183998177a3fa13a680b573005> to <78e3d25a50537a842fd3b18eab971d63d5891350>
+
 * 20201103053007654140 patch-tracking 20190709-5
 - append patch file of upstream repository from <86ed08936d49e2c81ef49dfbd02aca1c74d0c098> to <86ed08936d49e2c81ef49dfbd02aca1c74d0c098>