diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch | 60 | ||||
| -rw-r--r-- | libre/pacman/PKGBUILD | 7 |
2 files changed, 65 insertions, 2 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 new file mode 100644 index 000000000..b150746b9 --- /dev/null +++ b/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch @@ -0,0 +1,60 @@ +From 2c2a442ba21223de93b1927f8829dbf4ab4c495c Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich <kevin@archlinuxarm.org> +Date: Fri, 11 Mar 2016 20:11:24 -0700 +Subject: [PATCH 3/3] Revert "alpm_run_chroot: always connect parent2child + pipe" + +This reverts commit 1d6583a58da0904fb7feafd4a666391087955a7b. +--- + lib/libalpm/util.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c +index 5e74462..f2d43ee 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[], + goto cleanup; + } + +- if(pipe(parent2child_pipefd) == -1) { ++ if(stdin_cb && pipe(parent2child_pipefd) == -1) { + _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[], + 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]); ++ if(stdin_cb) { ++ while(dup2(parent2child_pipefd[0], 0) == -1 && errno == EINTR); ++ close(parent2child_pipefd[0]); ++ close(parent2child_pipefd[1]); ++ } + 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[], + child2parent->events = POLLIN; + fcntl(child2parent->fd, F_SETFL, O_NONBLOCK); + close(child2parent_pipefd[1]); +- close(parent2child_pipefd[0]); + + if(stdin_cb) { + parent2child->fd = parent2child_pipefd[1]; + parent2child->events = POLLOUT; + fcntl(parent2child->fd, F_SETFL, O_NONBLOCK); ++ close(parent2child_pipefd[0]); + } else { + parent2child->fd = -1; + parent2child->events = 0; +- close(parent2child_pipefd[1]); + } + + #define STOP_POLLING(p) do { close(p->fd); p->fd = -1; } while(0) +-- +2.7.1 + diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 2b3bd3e50..9f8ac5a1d 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -10,7 +10,7 @@ pkgname=pacman pkgver=5.0.1 -pkgrel=2.parabola1 +pkgrel=2.parabola2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'armv7h') url="http://www.archlinux.org/pacman/" @@ -38,6 +38,7 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig 0001-libmakepkg-fix-is_array-function.patch 0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch + 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch makepkg-pkgrel-5.patch) md5sums=('377a2664d6007d72d6d8a126add83bcf' 'SKIP' @@ -50,6 +51,7 @@ md5sums=('377a2664d6007d72d6d8a126add83bcf' '55732144f1048f714f1f93203e9b7728' '11869a104d0944cc86215098cf5a32bf' 'd4692c3add0b0dab87036edad3f59626' + 'fd59d9fb04abadffb937082c288bb10c' 'da78f246ac281ed949cf97d48f86d994') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <allan@archlinux.org> @@ -61,6 +63,7 @@ prepare() { if [ "${CARCH}" = "armv7h" ]; then patch -p1 -i ../0001-Sychronize-filesystem.patch patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch + patch -p1 -i ../0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch fi # treat pkgrel more similarly to pkgver @@ -106,7 +109,7 @@ package() { armv7h) mycarch="armv7h" mychost="armv7l-unknown-linux-gnueabihf" - myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector" + myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" ;; esac myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro" |