import slirp4netns-1.2.0-2.module+el8.7.0+16493+89f82ab8

This commit is contained in:
CentOS Sources 2022-08-29 19:37:28 +00:00 committed by Stepan Oksanichenko
parent 4ba3978c59
commit c3c588d63c
4 changed files with 12 additions and 79 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/v1.1.8.tar.gz SOURCES/v1.2.0.tar.gz

View File

@ -1 +1 @@
9f7965d1151311e6af4be9d3c0093ff86f1a3e4d SOURCES/v1.1.8.tar.gz 946ec8b117908ef77131975584e95599cadb5e4a SOURCES/v1.2.0.tar.gz

View File

@ -1,74 +0,0 @@
From 103cf5a3f83406f4a22b8d1899518e5fa4a351d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Tue, 15 Feb 2022 11:46:06 +0400
Subject: [PATCH] Replace deprecated inet_ntoa with safer inet_ntop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
inet_ntoa() is a legacy API with MT issues. Use the recommended
alternative instead. This makes some code checkers happy, and could
potentially fix issues if other parts of the process were to use
inet_ntoa() at the same time..
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
main.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/main.c b/main.c
index c79508e10f4d..2c38dc0da1af 100644
--- a/main.c
+++ b/main.c
@@ -257,6 +257,7 @@ static int recvfd(int sock)
static int parent(int sock, int ready_fd, int exit_fd, const char *api_socket,
struct slirp4netns_config *cfg, pid_t target_pid)
{
+ char str[INET6_ADDRSTRLEN];
int rc, tapfd;
if ((tapfd = recvfd(sock)) < 0) {
return tapfd;
@@ -265,23 +266,22 @@ static int parent(int sock, int ready_fd, int exit_fd, const char *api_socket,
close(sock);
printf("Starting slirp\n");
printf("* MTU: %d\n", cfg->mtu);
- printf("* Network: %s\n", inet_ntoa(cfg->vnetwork));
- printf("* Netmask: %s\n", inet_ntoa(cfg->vnetmask));
- printf("* Gateway: %s\n", inet_ntoa(cfg->vhost));
- printf("* DNS: %s\n", inet_ntoa(cfg->vnameserver));
- printf("* Recommended IP: %s\n", inet_ntoa(cfg->recommended_vguest));
+ printf("* Network: %s\n", inet_ntop(AF_INET, &cfg->vnetwork, str, sizeof(str)));
+ printf("* Netmask: %s\n", inet_ntop(AF_INET, &cfg->vnetmask, str, sizeof(str)));
+ printf("* Gateway: %s\n", inet_ntop(AF_INET, &cfg->vhost, str, sizeof(str)));
+ printf("* DNS: %s\n", inet_ntop(AF_INET, &cfg->vnameserver, str, sizeof(str)));
+ printf("* Recommended IP: %s\n", inet_ntop(AF_INET, &cfg->recommended_vguest, str, sizeof(str)));
if (api_socket != NULL) {
printf("* API Socket: %s\n", api_socket);
}
#if SLIRP_CONFIG_VERSION_MAX >= 2
if (cfg->enable_outbound_addr) {
printf("* Outbound IPv4: %s\n",
- inet_ntoa(cfg->outbound_addr.sin_addr));
+ inet_ntop(AF_INET, &cfg->outbound_addr.sin_addr, str, sizeof(str)));
}
if (cfg->enable_outbound_addr6) {
- char str[INET6_ADDRSTRLEN];
- if (inet_ntop(AF_INET6, &cfg->outbound_addr6.sin6_addr, str,
- INET6_ADDRSTRLEN) != NULL) {
+ if (inet_ntop(AF_INET6, &cfg->outbound_addr6.sin6_addr,
+ str, sizeof(str)) != NULL) {
printf("* Outbound IPv6: %s\n", str);
}
}
@@ -290,7 +290,7 @@ static int parent(int sock, int ready_fd, int exit_fd, const char *api_socket,
printf(
"WARNING: 127.0.0.1:* on the host is accessible as %s (set "
"--disable-host-loopback to prohibit connecting to 127.0.0.1:*)\n",
- inet_ntoa(cfg->vhost));
+ inet_ntop(AF_INET, &cfg->vhost, str, sizeof(str)));
}
if (cfg->enable_sandbox && geteuid() != 0) {
if ((rc = nsenter(target_pid, NULL, NULL, true)) < 0) {
--
2.34.1.428.gdcc0cd074f0c

View File

@ -1,7 +1,7 @@
%global git0 https://github.com/rootless-containers/%{name} %global git0 https://github.com/rootless-containers/%{name}
Name: slirp4netns Name: slirp4netns
Version: 1.1.8 Version: 1.2.0
Release: 2%{?dist} Release: 2%{?dist}
Summary: slirp for network namespaces Summary: slirp for network namespaces
License: GPLv2 License: GPLv2
@ -9,13 +9,12 @@ URL: %{git0}
# build fails on i686 with: No matching package to install: 'go-md2man' # build fails on i686 with: No matching package to install: 'go-md2man'
ExcludeArch: i686 ExcludeArch: i686
Source0: %{git0}/archive/v%{version}.tar.gz Source0: %{git0}/archive/v%{version}.tar.gz
Patch0: 1.1.8-0001-Replace-deprecated-inet_ntoa-with-safer-inet_ntop.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc BuildRequires: gcc
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: git BuildRequires: git
BuildRequires: go-md2man BuildRequires: /usr/bin/go-md2man
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: libseccomp-devel BuildRequires: libseccomp-devel
BuildRequires: make BuildRequires: make
@ -60,6 +59,14 @@ make DESTDIR=%{buildroot} install install-man
%{_mandir}/man1/%{name}.1.gz %{_mandir}/man1/%{name}.1.gz
%changelog %changelog
* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
- BuildRequires: /usr/bin/go-md2man
- Related: #2061390
* Tue May 03 2022 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
- update to https://github.com/rootless-containers/slirp4netns/releases/tag/v1.2.0
- Related: #2061390
* Tue Feb 15 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.8-2 * Tue Feb 15 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.8-2
- fix gating - don't use insecure functions - thanks to Marc-André Lureau - fix gating - don't use insecure functions - thanks to Marc-André Lureau
- Related: #2001445 - Related: #2001445