[arch-commits] Commit in fakechroot/repos (10 files)
Allan McRae
allan at nymeria.archlinux.org
Sat Dec 14 00:10:26 UTC 2013
Date: Saturday, December 14, 2013 @ 01:10:26
Author: allan
Revision: 201531
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
fakechroot/repos/testing-i686/PKGBUILD
(from rev 201530, fakechroot/trunk/PKGBUILD)
fakechroot/repos/testing-i686/fakechroot-2.17.1-sanitize-chroot-path.patch
(from rev 201530, fakechroot/trunk/fakechroot-2.17.1-sanitize-chroot-path.patch)
fakechroot/repos/testing-i686/fakechroot.install
(from rev 201530, fakechroot/trunk/fakechroot.install)
fakechroot/repos/testing-x86_64/PKGBUILD
(from rev 201530, fakechroot/trunk/PKGBUILD)
fakechroot/repos/testing-x86_64/fakechroot-2.17.1-sanitize-chroot-path.patch
(from rev 201530, fakechroot/trunk/fakechroot-2.17.1-sanitize-chroot-path.patch)
fakechroot/repos/testing-x86_64/fakechroot.install
(from rev 201530, fakechroot/trunk/fakechroot.install)
Deleted:
fakechroot/repos/testing-i686/PKGBUILD
fakechroot/repos/testing-i686/fakechroot.install
fakechroot/repos/testing-x86_64/PKGBUILD
fakechroot/repos/testing-x86_64/fakechroot.install
-------------------------------------------------------------+
/PKGBUILD | 84 ++++++++++
/fakechroot.install | 22 ++
testing-i686/PKGBUILD | 35 ----
testing-i686/fakechroot-2.17.1-sanitize-chroot-path.patch | 44 +++++
testing-i686/fakechroot.install | 11 -
testing-x86_64/PKGBUILD | 35 ----
testing-x86_64/fakechroot-2.17.1-sanitize-chroot-path.patch | 44 +++++
testing-x86_64/fakechroot.install | 11 -
8 files changed, 194 insertions(+), 92 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-12-14 00:09:01 UTC (rev 201530)
+++ testing-i686/PKGBUILD 2013-12-14 00:10:26 UTC (rev 201531)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer : Allan McRae <allan at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=fakechroot
-pkgver=2.17.1
-pkgrel=1
-pkgdesc="Gives a fake chroot environment"
-arch=('i686' 'x86_64')
-url="https://github.com/dex4er/fakechroot/wiki"
-license=('LGPL')
-install=fakechroot.install
-source=(https://github.com/dex4er/fakechroot/archive/${pkgver}.tar.gz)
-md5sums=('3c17eff0c854a77f98b4d0db086bc5bc')
-
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sbindir=/usr/bin \
- --libdir=/usr/lib/libfakeroot --sysconfdir=/etc
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make -j1 check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- install -dm755 ${pkgdir}/etc/ld.so.conf.d/
- echo '/usr/lib/libfakeroot/fakechroot/' > ${pkgdir}/etc/ld.so.conf.d/fakechroot.conf
-}
Copied: fakechroot/repos/testing-i686/PKGBUILD (from rev 201530, fakechroot/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-12-14 00:10:26 UTC (rev 201531)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Allan McRae <allan at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=fakechroot
+pkgver=2.17.1
+pkgrel=2
+pkgdesc="Gives a fake chroot environment"
+arch=('i686' 'x86_64')
+url="https://github.com/dex4er/fakechroot/wiki"
+license=('LGPL')
+install=fakechroot.install
+source=(https://github.com/dex4er/fakechroot/archive/${pkgver}.tar.gz
+ fakechroot-2.17.1-sanitize-chroot-path.patch)
+md5sums=('3c17eff0c854a77f98b4d0db086bc5bc'
+ 'fadc56f4b4dd67ba362c5ac41f5cb293')
+
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 -i ${srcdir}/fakechroot-2.17.1-sanatise-chroot-path.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sbindir=/usr/bin \
+ --libdir=/usr/lib/libfakeroot --sysconfdir=/etc
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make -j1 check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ install -dm755 ${pkgdir}/etc/ld.so.conf.d/
+ echo '/usr/lib/libfakeroot/fakechroot/' > ${pkgdir}/etc/ld.so.conf.d/fakechroot.conf
+}
Copied: fakechroot/repos/testing-i686/fakechroot-2.17.1-sanitize-chroot-path.patch (from rev 201530, fakechroot/trunk/fakechroot-2.17.1-sanitize-chroot-path.patch)
===================================================================
--- testing-i686/fakechroot-2.17.1-sanitize-chroot-path.patch (rev 0)
+++ testing-i686/fakechroot-2.17.1-sanitize-chroot-path.patch 2013-12-14 00:10:26 UTC (rev 201531)
@@ -0,0 +1,44 @@
+From 922b9be90ccce8f5b01339864f499f6d77505c5f Mon Sep 17 00:00:00 2001
+From: Andrew Gregory <andrew.gregory.8 at gmail.com>
+Date: Fri, 13 Dec 2013 12:31:00 -0500
+Subject: [PATCH] chroot: sanitize path
+
+path was not being sanitized if it started with '/' causing chroot calls
+to fail when path ended with '/'.
+
+Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
+---
+ src/chroot.c | 3 +++
+ test/t/chroot.t | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/chroot.c b/src/chroot.c
+index 9e15ff5..7917a9a 100644
+--- a/src/chroot.c
++++ b/src/chroot.c
+@@ -76,6 +76,9 @@
+ else {
+ if (*path == '/') {
+ expand_chroot_rel_path(path);
++ strlcpy(tmp, path, FAKECHROOT_PATH_MAX);
++ dedotdot(tmpptr);
++ path = tmpptr;
+ }
+ else {
+ snprintf(tmp, FAKECHROOT_PATH_MAX, "%s/%s", cwd, path);
+diff --git a/test/t/chroot.t b/test/t/chroot.t
+index e532a6f..286b863 100755
+--- a/test/t/chroot.t
++++ b/test/t/chroot.t
+@@ -14,7 +14,7 @@ for chroot in chroot fakechroot; do
+ skip $(( $tap_plan / 2 )) "not root"
+ else
+
+- for testtree in testtree2 /testtree2 ./testtree2 /./testtree2 testtree2/. testtree2/./.; do
++ for testtree in testtree2 /testtree2 ./testtree2 /./testtree2 testtree2/. testtree2/./. testtree2/; do
+ t=`$srcdir/$chroot.sh testtree /usr/sbin/chroot $testtree /bin/cat /CHROOT 2>&1`
+ test "$t" = "testtree/testtree2" || not
+ ok "$chroot chroot $testtree:" $t
+--
+1.8.5.1
+
Deleted: testing-i686/fakechroot.install
===================================================================
--- testing-i686/fakechroot.install 2013-12-14 00:09:01 UTC (rev 201530)
+++ testing-i686/fakechroot.install 2013-12-14 00:10:26 UTC (rev 201531)
@@ -1,11 +0,0 @@
-post_install() {
- sbin/ldconfig -r .
-}
-
-post_upgrade() {
- sbin/ldconfig -r .
-}
-
-post_remove() {
- sbin/ldconfig -r .
-}
Copied: fakechroot/repos/testing-i686/fakechroot.install (from rev 201530, fakechroot/trunk/fakechroot.install)
===================================================================
--- testing-i686/fakechroot.install (rev 0)
+++ testing-i686/fakechroot.install 2013-12-14 00:10:26 UTC (rev 201531)
@@ -0,0 +1,11 @@
+post_install() {
+ sbin/ldconfig -r .
+}
+
+post_upgrade() {
+ sbin/ldconfig -r .
+}
+
+post_remove() {
+ sbin/ldconfig -r .
+}
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-12-14 00:09:01 UTC (rev 201530)
+++ testing-x86_64/PKGBUILD 2013-12-14 00:10:26 UTC (rev 201531)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer : Allan McRae <allan at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=fakechroot
-pkgver=2.17.1
-pkgrel=1
-pkgdesc="Gives a fake chroot environment"
-arch=('i686' 'x86_64')
-url="https://github.com/dex4er/fakechroot/wiki"
-license=('LGPL')
-install=fakechroot.install
-source=(https://github.com/dex4er/fakechroot/archive/${pkgver}.tar.gz)
-md5sums=('3c17eff0c854a77f98b4d0db086bc5bc')
-
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sbindir=/usr/bin \
- --libdir=/usr/lib/libfakeroot --sysconfdir=/etc
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make -j1 check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- install -dm755 ${pkgdir}/etc/ld.so.conf.d/
- echo '/usr/lib/libfakeroot/fakechroot/' > ${pkgdir}/etc/ld.so.conf.d/fakechroot.conf
-}
Copied: fakechroot/repos/testing-x86_64/PKGBUILD (from rev 201530, fakechroot/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-12-14 00:10:26 UTC (rev 201531)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Allan McRae <allan at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=fakechroot
+pkgver=2.17.1
+pkgrel=2
+pkgdesc="Gives a fake chroot environment"
+arch=('i686' 'x86_64')
+url="https://github.com/dex4er/fakechroot/wiki"
+license=('LGPL')
+install=fakechroot.install
+source=(https://github.com/dex4er/fakechroot/archive/${pkgver}.tar.gz
+ fakechroot-2.17.1-sanitize-chroot-path.patch)
+md5sums=('3c17eff0c854a77f98b4d0db086bc5bc'
+ 'fadc56f4b4dd67ba362c5ac41f5cb293')
+
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 -i ${srcdir}/fakechroot-2.17.1-sanatise-chroot-path.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sbindir=/usr/bin \
+ --libdir=/usr/lib/libfakeroot --sysconfdir=/etc
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make -j1 check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ install -dm755 ${pkgdir}/etc/ld.so.conf.d/
+ echo '/usr/lib/libfakeroot/fakechroot/' > ${pkgdir}/etc/ld.so.conf.d/fakechroot.conf
+}
Copied: fakechroot/repos/testing-x86_64/fakechroot-2.17.1-sanitize-chroot-path.patch (from rev 201530, fakechroot/trunk/fakechroot-2.17.1-sanitize-chroot-path.patch)
===================================================================
--- testing-x86_64/fakechroot-2.17.1-sanitize-chroot-path.patch (rev 0)
+++ testing-x86_64/fakechroot-2.17.1-sanitize-chroot-path.patch 2013-12-14 00:10:26 UTC (rev 201531)
@@ -0,0 +1,44 @@
+From 922b9be90ccce8f5b01339864f499f6d77505c5f Mon Sep 17 00:00:00 2001
+From: Andrew Gregory <andrew.gregory.8 at gmail.com>
+Date: Fri, 13 Dec 2013 12:31:00 -0500
+Subject: [PATCH] chroot: sanitize path
+
+path was not being sanitized if it started with '/' causing chroot calls
+to fail when path ended with '/'.
+
+Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
+---
+ src/chroot.c | 3 +++
+ test/t/chroot.t | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/chroot.c b/src/chroot.c
+index 9e15ff5..7917a9a 100644
+--- a/src/chroot.c
++++ b/src/chroot.c
+@@ -76,6 +76,9 @@
+ else {
+ if (*path == '/') {
+ expand_chroot_rel_path(path);
++ strlcpy(tmp, path, FAKECHROOT_PATH_MAX);
++ dedotdot(tmpptr);
++ path = tmpptr;
+ }
+ else {
+ snprintf(tmp, FAKECHROOT_PATH_MAX, "%s/%s", cwd, path);
+diff --git a/test/t/chroot.t b/test/t/chroot.t
+index e532a6f..286b863 100755
+--- a/test/t/chroot.t
++++ b/test/t/chroot.t
+@@ -14,7 +14,7 @@ for chroot in chroot fakechroot; do
+ skip $(( $tap_plan / 2 )) "not root"
+ else
+
+- for testtree in testtree2 /testtree2 ./testtree2 /./testtree2 testtree2/. testtree2/./.; do
++ for testtree in testtree2 /testtree2 ./testtree2 /./testtree2 testtree2/. testtree2/./. testtree2/; do
+ t=`$srcdir/$chroot.sh testtree /usr/sbin/chroot $testtree /bin/cat /CHROOT 2>&1`
+ test "$t" = "testtree/testtree2" || not
+ ok "$chroot chroot $testtree:" $t
+--
+1.8.5.1
+
Deleted: testing-x86_64/fakechroot.install
===================================================================
--- testing-x86_64/fakechroot.install 2013-12-14 00:09:01 UTC (rev 201530)
+++ testing-x86_64/fakechroot.install 2013-12-14 00:10:26 UTC (rev 201531)
@@ -1,11 +0,0 @@
-post_install() {
- sbin/ldconfig -r .
-}
-
-post_upgrade() {
- sbin/ldconfig -r .
-}
-
-post_remove() {
- sbin/ldconfig -r .
-}
Copied: fakechroot/repos/testing-x86_64/fakechroot.install (from rev 201530, fakechroot/trunk/fakechroot.install)
===================================================================
--- testing-x86_64/fakechroot.install (rev 0)
+++ testing-x86_64/fakechroot.install 2013-12-14 00:10:26 UTC (rev 201531)
@@ -0,0 +1,11 @@
+post_install() {
+ sbin/ldconfig -r .
+}
+
+post_upgrade() {
+ sbin/ldconfig -r .
+}
+
+post_remove() {
+ sbin/ldconfig -r .
+}
More information about the arch-commits
mailing list