1915a138c0
Same as #4584 but with an additional backport: https://github.com/msys2/msys2-pacman/pull/49 Old message: See msys2/msys2-pacman#45 makepkg.conf synced with the upstream version: https://gitlab.archlinux.org/pacman/pacman/-/blob/v6.1.0/etc/makepkg.conf.in Skip patches only changing CI configs
77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
From 9336f25f1c529d370e66d4b34500f89bb5a0af01 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Fri, 21 May 2021 22:56:23 +0200
|
|
Subject: [PATCH 17/N] Use pipe instead of socket
|
|
|
|
---
|
|
lib/libalpm/util.c | 26 ++++++++++++++++++++++++++
|
|
1 file changed, 26 insertions(+)
|
|
|
|
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
|
|
index 95f30a4..f09077c 100644
|
|
--- a/lib/libalpm/util.c
|
|
+++ b/lib/libalpm/util.c
|
|
@@ -30,7 +30,9 @@
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <sys/wait.h>
|
|
+#ifndef __MSYS__
|
|
#include <sys/socket.h>
|
|
+#endif
|
|
#include <fcntl.h>
|
|
#include <fnmatch.h>
|
|
#include <poll.h>
|
|
@@ -471,6 +473,9 @@ static int _alpm_chroot_write_to_child(alpm_handle_t *handle, int fd,
|
|
_alpm_cb_io out_cb, void *cb_ctx)
|
|
{
|
|
ssize_t nwrite;
|
|
+#ifdef __MSYS__
|
|
+ struct sigaction newaction, oldaction;
|
|
+#endif
|
|
|
|
if(*buf_size == 0) {
|
|
/* empty buffer, ask the callback for more */
|
|
@@ -480,7 +485,20 @@ static int _alpm_chroot_write_to_child(alpm_handle_t *handle, int fd,
|
|
}
|
|
}
|
|
|
|
+#ifdef __MSYS__
|
|
+ /* ignore SIGPIPE in case the pipe has been closed */
|
|
+ newaction.sa_handler = SIG_IGN;
|
|
+ sigemptyset(&newaction.sa_mask);
|
|
+ newaction.sa_flags = 0;
|
|
+ sigaction(SIGPIPE, &newaction, &oldaction);
|
|
+
|
|
+ nwrite = write(fd, buf, *buf_size);
|
|
+
|
|
+ /* restore previous SIGPIPE handler */
|
|
+ sigaction(SIGPIPE, &oldaction, NULL);
|
|
+#else
|
|
nwrite = send(fd, buf, *buf_size, MSG_NOSIGNAL);
|
|
+#endif
|
|
|
|
if(nwrite != -1) {
|
|
/* write was successful, remove the written data from the buffer */
|
|
@@ -618,13 +636,21 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[],
|
|
/* Flush open fds before fork() to avoid cloning buffers */
|
|
fflush(NULL);
|
|
|
|
+#ifdef __MSYS__
|
|
+ if(pipe(child2parent_pipefd) == -1) {
|
|
+#else
|
|
if(socketpair(AF_UNIX, SOCK_STREAM, 0, child2parent_pipefd) == -1) {
|
|
+#endif
|
|
_alpm_log(handle, ALPM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno));
|
|
retval = 1;
|
|
goto cleanup;
|
|
}
|
|
|
|
+#ifdef __MSYS__
|
|
+ if(pipe(parent2child_pipefd) == -1) {
|
|
+#else
|
|
if(socketpair(AF_UNIX, SOCK_STREAM, 0, parent2child_pipefd) == -1) {
|
|
+#endif
|
|
_alpm_log(handle, ALPM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno));
|
|
retval = 1;
|
|
goto cleanup;
|