From edb3a5d6629e3a46f7725e9157e69bb5db131a21 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Tue, 29 May 2018 15:38:59 -0500 Subject: pacman: armv7h port --- libre/pacman/0001-Sychronize-filesystem.patch | 6 +-- ...lose-stdin-before-running-install-scripts.patch | 10 ++--- ..._run_chroot-always-connect-parent2child-p.patch | 46 +++++++++++----------- libre/pacman/PKGBUILD | 6 +-- 4 files changed, 34 insertions(+), 34 deletions(-) (limited to 'libre/pacman') diff --git a/libre/pacman/0001-Sychronize-filesystem.patch b/libre/pacman/0001-Sychronize-filesystem.patch index b2a55e1bf..159c65f32 100644 --- a/libre/pacman/0001-Sychronize-filesystem.patch +++ b/libre/pacman/0001-Sychronize-filesystem.patch @@ -1,4 +1,4 @@ -From faad6b96560cc1c7c7e816299e56b3a1ea7098e0 Mon Sep 17 00:00:00 2001 +From 60abb58d9db663e6050d8d61d67e0e893306dfb0 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 13 Sep 2014 18:58:16 -0600 Subject: [PATCH 1/3] Sychronize filesystem @@ -14,7 +14,7 @@ Signed-off-by: Kevin Mihelich 1 file changed, 3 insertions(+) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c -index 13984707..82835ee5 100644 +index af964832..b3f9049e 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -230,6 +230,9 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) @@ -28,4 +28,4 @@ index 13984707..82835ee5 100644 } -- -2.13.1 +2.17.0 diff --git a/libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch b/libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch index 2e8a8f310..62ec5c7f7 100644 --- a/libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch +++ b/libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch @@ -1,4 +1,4 @@ -From 60baf4136355d00ce141b8dc4a90637eb0245245 Mon Sep 17 00:00:00 2001 +From d892998ecea95c8224b128e1797a0e5a970436a8 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 30 Jan 2016 17:19:03 -0700 Subject: [PATCH 2/3] Revert "close stdin before running install scripts" @@ -16,16 +16,16 @@ Signed-off-by: Kevin Mihelich 1 file changed, 1 deletion(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c -index 1e554632..41cca4a7 100644 +index 102a879a..c9fdd4af 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c -@@ -612,7 +612,6 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], +@@ -608,7 +608,6 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], if(pid == 0) { /* this code runs for the child only (the actual chroot/exec) */ - close(0); close(1); close(2); - while(dup2(child2parent_pipefd[1], 1) == -1 && errno == EINTR); + while(dup2(child2parent_pipefd[HEAD], 1) == -1 && errno == EINTR); -- -2.13.1 +2.17.0 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 0e5874a4c..c6b8b6160 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,4 +1,4 @@ -From 87612bf6ef06e5fa5d58716f9c18ccb52c27be6c Mon Sep 17 00:00:00 2001 +From dd8d526a39c86c300f158c581e028365efe60a64 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 @@ -10,50 +10,50 @@ This reverts commit 1d6583a58da0904fb7feafd4a666391087955a7b. 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c -index 41cca4a7..aba0ee94 100644 +index c9fdd4af..2d57b256 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c -@@ -596,7 +596,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], +@@ -592,7 +592,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], goto cleanup; } -- if(pipe(parent2child_pipefd) == -1) { -+ if(stdin_cb && pipe(parent2child_pipefd) == -1) { +- if(socketpair(AF_UNIX, SOCK_STREAM, 0, parent2child_pipefd) == -1) { ++ if(stdin_cb && socketpair(AF_UNIX, SOCK_STREAM, 0, parent2child_pipefd) == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); retval = 1; goto cleanup; -@@ -616,9 +616,11 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], +@@ -612,9 +612,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); -- while(dup2(parent2child_pipefd[0], 0) == -1 && errno == EINTR); -- close(parent2child_pipefd[0]); -- close(parent2child_pipefd[1]); + while(dup2(child2parent_pipefd[HEAD], 1) == -1 && errno == EINTR); + while(dup2(child2parent_pipefd[HEAD], 2) == -1 && errno == EINTR); +- while(dup2(parent2child_pipefd[TAIL], 0) == -1 && errno == EINTR); +- close(parent2child_pipefd[TAIL]); +- close(parent2child_pipefd[HEAD]); + if(stdin_cb) { -+ while(dup2(parent2child_pipefd[0], 0) == -1 && errno == EINTR); -+ close(parent2child_pipefd[0]); -+ close(parent2child_pipefd[1]); ++ while(dup2(parent2child_pipefd[TAIL], 0) == -1 && errno == EINTR); ++ close(parent2child_pipefd[TAIL]); ++ close(parent2child_pipefd[HEAD]); + } - close(child2parent_pipefd[0]); - close(child2parent_pipefd[1]); + close(child2parent_pipefd[TAIL]); + close(child2parent_pipefd[HEAD]); if(cwdfd >= 0) { -@@ -653,16 +655,15 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], +@@ -649,16 +651,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]); -- close(parent2child_pipefd[0]); + close(child2parent_pipefd[HEAD]); +- close(parent2child_pipefd[TAIL]); if(stdin_cb) { - parent2child->fd = parent2child_pipefd[1]; + parent2child->fd = parent2child_pipefd[HEAD]; parent2child->events = POLLOUT; fcntl(parent2child->fd, F_SETFL, O_NONBLOCK); -+ close(parent2child_pipefd[0]); ++ close(parent2child_pipefd[TAIL]); } else { parent2child->fd = -1; parent2child->events = 0; -- close(parent2child_pipefd[1]); +- close(parent2child_pipefd[HEAD]); } #define STOP_POLLING(p) do { close(p->fd); p->fd = -1; } while(0) -- -2.13.1 +2.17.0 diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index a9710a79a..3500c02f0 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -49,9 +49,9 @@ sha256sums=('9f5993fc8923530713742f15df284677f297b3eca15ed7a24758c98ac7399bd3' '31565aae027a26bb0e9074aca89a012483dc078e0239dc225c3c15fced526607' '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d' '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6' - '6064bbf5b453ec50b25291cf9268c56cac4bca3ad80d47f2d6b62c82254e5461' - 'dbadad986353ff90a390614f393a09ea07498fcf00467481bc58fbc07ac2d003' - '4187d385e173127df8ed6d358291f0a0b0c2581742d8859ad6b276bb6d703e49' + '635ef682073878b6273e3376b00a89a572c4f5f39b118f7b0b4c7497a265a16c' + 'e9e63a58ba7022869b001f4badbfcf340c47c19ab345c77bef3b2287cf9045fd' + '94e6771cc47ba0bd19f67f2c866dfd0336560e89ee72b4af373a20d3ae1abab7' '91bdcb8b29cc75a2e9f0fe821c1599fec2736a5115308ad502d309f04f3320a2') prepare() { -- cgit v1.2.3