From 950af3f6b9ba4d67d43f3a461e1f99e0a542e092 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 6 Jan 2018 20:32:01 -0500 Subject: proot-5.1.0-3: rebuild --- pcr/proot/0001-Fix-use-of-size.patch | 43 +++++++++++++++++++++++++++++ pcr/proot/PKGBUILD | 53 ++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 pcr/proot/0001-Fix-use-of-size.patch create mode 100644 pcr/proot/PKGBUILD (limited to 'pcr/proot') diff --git a/pcr/proot/0001-Fix-use-of-size.patch b/pcr/proot/0001-Fix-use-of-size.patch new file mode 100644 index 000000000..266dcb6d9 --- /dev/null +++ b/pcr/proot/0001-Fix-use-of-size.patch @@ -0,0 +1,43 @@ +From 0d0113debe197f2e2364976bf0bc6f8af2d4e85e Mon Sep 17 00:00:00 2001 +From: Nicolas Cornu +Date: Wed, 29 Jul 2015 14:52:57 +0200 +Subject: [PATCH] Fix use of size + +--- + src/execve/enter.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/execve/enter.c b/src/execve/enter.c +index dfdbaae..108bfbc 100644 +--- a/src/execve/enter.c ++++ b/src/execve/enter.c +@@ -460,10 +460,10 @@ static int expand_runner(Tracee* tracee, char host_path[PATH_MAX], char user_pat + } + + extern unsigned char _binary_loader_exe_start; +-extern unsigned char _binary_loader_exe_size; ++extern unsigned char _binary_loader_exe_end; + + extern unsigned char WEAK _binary_loader_m32_exe_start; +-extern unsigned char WEAK _binary_loader_m32_exe_size; ++extern unsigned char WEAK _binary_loader_m32_exe_end; + + /** + * Extract the built-in loader. This function returns NULL if an +@@ -489,11 +489,11 @@ static char *extract_loader(const Tracee *tracee, bool wants_32bit_version) + + if (wants_32bit_version) { + start = (void *) &_binary_loader_m32_exe_start; +- size = (size_t) &_binary_loader_m32_exe_size; ++ size = (size_t)(&_binary_loader_m32_exe_end-&_binary_loader_m32_exe_start); + } + else { + start = (void *) &_binary_loader_exe_start; +- size = (size_t) &_binary_loader_exe_size; ++ size = (size_t) (&_binary_loader_exe_end-&_binary_loader_exe_start); + } + + status2 = write(fd, start, size); +-- +2.7.0 + diff --git a/pcr/proot/PKGBUILD b/pcr/proot/PKGBUILD new file mode 100644 index 000000000..3ce8aedca --- /dev/null +++ b/pcr/proot/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer (Arch): Nicolas Cornu +# Maintainer (Hyperbola): Márcio Silva +# Maintainer: Omar Vega Ramos + +pkgname=proot +_pkgname=PRoot +pkgver=5.1.0 +pkgrel=3 +pkgdesc="chroot, mount --bind, and binfmt_misc without privilege/setup" +arch=('i686' 'x86_64' 'armv7h') +url="http://proot.me" +license=('GPL') +provides=('proot') +depends=('talloc') +makedepends=('python-docutils' 'libxslt') +source=(${pkgname}-v${pkgver}.tar.gz::https://github.com/cedric-vincent/${_pkgname}/archive/v${pkgver}.tar.gz + 0001-Fix-use-of-size.patch) +sha256sums=('50fcb882662b2de3e64e603b68d1af75e920d480191a49e11c0cb63d50040386' + '6ecc533f18a18d2a85c7886bf98d6b05a2513677943d5eb2f570ce1ed773e6b4') + +prepare() { + cd "${srcdir}/PRoot-5.1.0" + patch -p1 -i ${srcdir}/0001-Fix-use-of-size.patch +} + +build() { + cd "${srcdir}"/${_pkgname}-${pkgver}/src + make -f GNUmakefile + + cd "${srcdir}"/${_pkgname}-${pkgver}/doc + make -f GNUmakefile +} + +package() { + cd "${srcdir}"/${_pkgname}-${pkgver} + + install -m755 -d "${pkgdir}"/usr/bin + install -m755 src/${pkgname} "${pkgdir}"/usr/bin + + install -m755 -d "${pkgdir}"/usr/share/man/man1/ + install -m644 -T doc/proot/man.1 "${pkgdir}"/usr/share/man/man1/${pkgname}.1 + + install -m755 -d "${pkgdir}"/usr/share/doc/proot/ + install -m644 doc/proot/changelog.txt "${pkgdir}"/usr/share/doc/proot + install -m644 doc/proot/index.html "${pkgdir}"/usr/share/doc/proot + install -m644 doc/proot/manual.txt "${pkgdir}"/usr/share/doc/proot + install -m644 doc/proot/roadmap.txt "${pkgdir}"/usr/share/doc/proot + + install -m755 -d "${pkgdir}"/usr/share/doc/proot/stylesheets + install -m644 doc/proot/stylesheets/* "${pkgdir}"/usr/share/doc/proot/stylesheets +} + +# vim: ft=sh syn=sh et -- cgit v1.2.3