diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2017-08-05 19:03:01 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2017-08-05 19:03:01 -0500 |
| commit | 8ee3b7b24e34c76ae5c360413fb0477f25ff27d3 (patch) | |
| tree | a45e2cd29701a806df0b20242680c91a0fcebc2c /libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch | |
| parent | b610ca858b5bcc7b8ca5cf48bbcbaf8745b77e48 (diff) | |
| download | abslibre-8ee3b7b24e34c76ae5c360413fb0477f25ff27d3.tar.gz abslibre-8ee3b7b24e34c76ae5c360413fb0477f25ff27d3.tar.bz2 abslibre-8ee3b7b24e34c76ae5c360413fb0477f25ff27d3.zip | |
pacman-5.0.2-2.parabola1: enable full RELRO and BIND_NOW
Diffstat (limited to 'libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch')
| -rw-r--r-- | libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch b/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch index b150746b9..0e5874a4c 100644 --- a/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch +++ b/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch @@ -1,5 +1,5 @@ -From 2c2a442ba21223de93b1927f8829dbf4ab4c495c Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich <kevin@archlinuxarm.org> +From 87612bf6ef06e5fa5d58716f9c18ccb52c27be6c Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich Date: Fri, 11 Mar 2016 20:11:24 -0700 Subject: [PATCH 3/3] Revert "alpm_run_chroot: always connect parent2child pipe" @@ -10,10 +10,10 @@ This reverts commit 1d6583a58da0904fb7feafd4a666391087955a7b. 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c -index 5e74462..f2d43ee 100644 +index 41cca4a7..aba0ee94 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c -@@ -586,7 +586,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], +@@ -596,7 +596,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], goto cleanup; } @@ -22,7 +22,7 @@ index 5e74462..f2d43ee 100644 _alpm_log(handle, ALPM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); retval = 1; goto cleanup; -@@ -606,9 +606,11 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], +@@ -616,9 +616,11 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], close(2); while(dup2(child2parent_pipefd[1], 1) == -1 && errno == EINTR); while(dup2(child2parent_pipefd[1], 2) == -1 && errno == EINTR); @@ -37,7 +37,7 @@ index 5e74462..f2d43ee 100644 close(child2parent_pipefd[0]); close(child2parent_pipefd[1]); if(cwdfd >= 0) { -@@ -643,16 +645,15 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], +@@ -653,16 +655,15 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], child2parent->events = POLLIN; fcntl(child2parent->fd, F_SETFL, O_NONBLOCK); close(child2parent_pipefd[1]); @@ -56,5 +56,4 @@ index 5e74462..f2d43ee 100644 #define STOP_POLLING(p) do { close(p->fd); p->fd = -1; } while(0) -- -2.7.1 - +2.13.1 |