Add some fixes to the getcwd implementation, bug #98419.

(Portage version: 2.0.51.22-r1)

6 files changed, 75 insertions, 19 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 512378308578..038ccc5165f6 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.19 2005/07/05 06:12:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.20 2005/07/10 14:04:45 azarah Exp $
+
+  10 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/sandbox-1.2.9-uclibc-getcwd.patch,
+  +files/sandbox-1.2.10-uclibc-getcwd.patch, sandbox-1.2.9.ebuild,
+  sandbox-1.2.10.ebuild:
+  Add some fixes to the getcwd implementation, bug #98419.
 
   05 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
   sandbox-1.2.9.ebuild:
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 528d9983f6f0..bfaed6e92849 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 9577ed05c914f1f9af48c0013f86f9b0 sandbox-1.2.9.ebuild 2732
+MD5 b5d57fdba9f0cb9bc58151df778b30dc .sandbox-1.2.11.ebuild.swp 12288
 MD5 95005ec57007aeb8836ea5061ebb1d50 ChangeLog 3055
+MD5 4904a8de51b1d1bf327dec5f20228aa7 sandbox-1.2.11.ebuild 2829
 MD5 968e2965b0b6f620634dae6d28d8b4c4 metadata.xml 455
-MD5 9577ed05c914f1f9af48c0013f86f9b0 sandbox-1.2.9.ebuild 2732
 MD5 712a227c38e91acbf46935ca02c8f9a8 sandbox-1.2.10.ebuild 2629
-MD5 0b9d8a3302f89af8fcb328f02eb16824 files/digest-sandbox-1.2.9 66
+MD5 cd85ead9a8e5717e585479853122fcdf files/digest-sandbox-1.2.11 67
 MD5 9fe5eef00b6290f1c9fb750c3bfc1fad files/digest-sandbox-1.2.10 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCyiTKArHZZzCEUG0RAjMpAJwI4c4LqPylWmo4GxVQaLDQbfwiPQCcCc8e
-qEibQatgVg2ZD9fmEcufaSw=
-=v4em
------END PGP SIGNATURE-----
+MD5 0b9d8a3302f89af8fcb328f02eb16824 files/digest-sandbox-1.2.9 66
diff --git a/sys-apps/sandbox/files/sandbox-1.2.10-uclibc-getcwd.patch b/sys-apps/sandbox/files/sandbox-1.2.10-uclibc-getcwd.patch
new file mode 100644
index 000000000000..2c538eec6f86
--- /dev/null
+++ b/sys-apps/sandbox/files/sandbox-1.2.10-uclibc-getcwd.patch
@@ -0,0 +1,30 @@
+Index: getcwd.c
+===================================================================
+--- getcwd.c	(revision 125)
++++ getcwd.c	(working copy)
+@@ -128,7 +128,7 @@
+ 	if (strlen(path_buf) + 4 > path_size) {
+ 	    goto oops;
+ 	}
+-	snprintf(path_buf, 4, "/..");
++	snprintf(path_buf + strlen(path_buf), 4, "/..");
+ 	if (recurser(path_buf, path_size, root_dev, root_ino) == 0)
+ 		return 0;
+ 
+@@ -146,6 +146,8 @@
+     struct stat st;
+     size_t olderrno;
+ 
++    if (lstat("/", &st) < 0)
++	return -1;
+     olderrno = errno;
+     len = -1;
+     cwd = recurser(buf, size, st.st_dev, st.st_ino);
+@@ -175,6 +177,7 @@
+ 	if (path == NULL)
+ 	    return NULL;
+     }
++    snprintf(buf, 2, ".");
+     ret = __syscall_egetcwd(path, alloc_size);
+     if (ret >= 0)
+     {
diff --git a/sys-apps/sandbox/files/sandbox-1.2.9-uclibc-getcwd.patch b/sys-apps/sandbox/files/sandbox-1.2.9-uclibc-getcwd.patch
new file mode 100644
index 000000000000..8709d70d6d66
--- /dev/null
+++ b/sys-apps/sandbox/files/sandbox-1.2.9-uclibc-getcwd.patch
@@ -0,0 +1,21 @@
+Index: getcwd.c
+===================================================================
+--- getcwd.c	(revision 125)
++++ getcwd.c	(working copy)
+@@ -146,6 +146,8 @@
+     struct stat st;
+     size_t olderrno;
+ 
++    if (lstat("/", &st) < 0)
++	return -1;
+     olderrno = errno;
+     len = -1;
+     cwd = recurser(buf, size, st.st_dev, st.st_ino);
+@@ -175,6 +177,7 @@
+ 	if (path == NULL)
+ 	    return NULL;
+     }
++    snprintf(buf, 2, ".");
+     ret = __syscall_egetcwd(path, alloc_size);
+     if (ret >= 0)
+     {
diff --git a/sys-apps/sandbox/sandbox-1.2.10.ebuild b/sys-apps/sandbox/sandbox-1.2.10.ebuild
index 61b5f80d5f5f..0c45f277cff5 100644
--- a/sys-apps/sandbox/sandbox-1.2.10.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.10.ebuild,v 1.1 2005/07/03 19:06:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.10.ebuild,v 1.2 2005/07/10 14:04:45 azarah Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic eutils toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -37,10 +37,13 @@ setup_multilib() {
 src_unpack() {
 	setup_multilib
 	for ABI in $(get_install_abis) ; do
-		unpack ${A}
 		cd ${WORKDIR}
+		unpack ${A}
 		einfo "Unpacking sandbox for ABI=${ABI}..."
 		mv ${S} ${S%/}-${ABI} || die "failed moving \$S to ${ABI}"
+		cd ${S%/}-${ABI}
+		# Fix getcwd, bug #98419.
+		epatch ${FILESDIR}/${P}-uclibc-getcwd.patch
 	done
 }
 
diff --git a/sys-apps/sandbox/sandbox-1.2.9.ebuild b/sys-apps/sandbox/sandbox-1.2.9.ebuild
index 5e3a27ae0e90..da4f690a1f8f 100644
--- a/sys-apps/sandbox/sandbox-1.2.9.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.9.ebuild,v 1.2 2005/07/05 06:12:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.9.ebuild,v 1.3 2005/07/10 14:04:45 azarah Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic eutils toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -38,10 +38,13 @@ setup_multilib() {
 src_unpack() {
 	setup_multilib
 	for ABI in $(get_install_abis) ; do
-		unpack ${A}
 		cd ${WORKDIR}
+		unpack ${A}
 		einfo "Unpacking sandbox for ABI=${ABI}..."
 		mv ${S} ${S%/}-${ABI} || die "failed moving \$S to ${ABI}"
+		cd ${S%/}-${ABI}
+		# Fix getcwd, bug #98419.
+		epatch ${FILESDIR}/${P}-uclibc-getcwd.patch
 	done
 }