Fix for bug 303411, thanks to johan.hattne@utsouthwestern.edu for report and patch.

Package-Manager: portage-2.2_rc67/cvs/FreeBSD i386

4 files changed, 45 insertions, 9 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 6dcce28a84a5..f3d64b7c54c1 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.253 2010/03/28 04:09:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.254 2010/03/28 10:55:37 the_paya Exp $
+
+  28 Mar 2010; Javier Villavicencio <the_paya@gentoo.org>
+  bash-4.1_p2-r1.ebuild, +files/bash-4.1-fbsd-eaccess.patch:
+  Fix for bug 303411, reported and patched by Johan Hattne
+  <johan.hattne@utsouthwestern.edu>.
 
   28 Mar 2010; Mike Frysinger <vapier@gentoo.org> bash-4.0_p37.ebuild:
   Mark arm/ia64/s390/sh stable #310473.
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 538df819ecc0..e292ce5fa55a 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba
 AUX bash-3.0-configs.patch 2538 RMD160 00e8015531efb6a59298782581928f1aff2247e6 SHA1 7f4615de4ac2219372d34dfbead3311fcfdfab2a SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f
@@ -23,6 +23,7 @@ AUX bash-4.0-configure.patch 749 RMD160 30119c7d9aa27b9594182ef5632b61c1b986842a
 AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d6267ba826b9 SHA1 8967f82ba01bcb4913f914672d456f1d4b3682d6 SHA256 97b0ee283846e6530a0f025b1fe69054229a37b00180b82fcd44dc0c3381dc8a
 AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea51e323 SHA1 8fe1b27ad67e3e3b098b7ddeb6ded35594a9b106 SHA256 771f89825fc81ff035f1b03dfe1e65b7e58a0039c005067b0c37414b84ddbf2b
 AUX bash-4.0-parallel-build.patch 2237 RMD160 82aa28d48f12978cbaea7ebed987d13f5368c2c8 SHA1 c82d0c9ca049fe3c53418f4a3b399a840bbcdc90 SHA256 65db03b0c0b8e2fd917f049e9e84f7b2b234b3e9e37f395d4d8984194b392a56
+AUX bash-4.1-fbsd-eaccess.patch 843 RMD160 50e06a8ec83fa756a9749ab5011696e737731afe SHA1 9468675bdb345c01f6a285d76526e851de63a895 SHA256 42a4ee58b0d2fd529e25fcc3ca10d17bbac2c91fd8bcb191d70c788f0b55fb95
 AUX bash-4.1-parallel-build.patch 829 RMD160 371bd2d62a0b70c4305697975780165e02f2b38d SHA1 9978a6ed4668509660491799bbbc5b7d6ad2cbd9 SHA256 0da60b91e4fb2326137a4dde6d8937592b6efea45de51194ca1770127637e652
 AUX bash-4.x-deferred-heredocs.patch 1255 RMD160 69e3554d225e5a85be3f874b0bb0139c0e24c9b9 SHA1 b8d492af021ae59c9799dfbb169842c23ed9f826 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
@@ -147,14 +148,14 @@ EBUILD bash-3.2_p50.ebuild 6146 RMD160 13f3957af7bc8763d431846802dfcdd8455f14cf
 EBUILD bash-4.0_p35.ebuild 5784 RMD160 0d3f12c317794f751da33ab6e51926aafde10694 SHA1 120e55091bc67363214967fbf02fcb373905aef7 SHA256 be228bea883c3b952851959f27f206777bfe571a575ee3b6202f9db5b4517ac8
 EBUILD bash-4.0_p37.ebuild 5879 RMD160 ea6257a421e4cbe04b5ee4ab56818f5d22fc3156 SHA1 035c30b10a88d3eed1cefbee2737c54e8afb1000 SHA256 4469bbbd341b30aa90fe394c90dc1d64d4fa433b215977fb7ab0003ba068561d
 EBUILD bash-4.0_p38.ebuild 5906 RMD160 e4bb3f4cbde3e52393b7e63615a227b4e5e506b7 SHA1 b6e0561430b43bfac633ab11e46baf9d532d3cd1 SHA256 028319572ba6b6825eb33b2b67340831fc007fc7f1a1b5b2e52153d2a28a569a
-EBUILD bash-4.1_p2-r1.ebuild 5551 RMD160 25249eb4a26e6b7e27d61499224bc3656e4d37dd SHA1 9ac46b7d2ac45c11e759f8e64ba49404313df1e3 SHA256 f2ddeaeb56314150c254c2ee9b4041ee0ebcba5e908f2ba286a25e536c5bcd43
+EBUILD bash-4.1_p2-r1.ebuild 5617 RMD160 9cf3322d0e1dda3c37fff0004acb9c1c952fc40d SHA1 2679e9d767d69b01f0165247fc879545189d5ffd SHA256 481813c62a6c1ede289aca9006b82ebc7bd96a66f98317d8df89db25ba42d28b
 EBUILD bash-4.1_p2.ebuild 5491 RMD160 0c6d7734f41862701c320a648d97f6faa85bf70f SHA1 a4a48fd39d12db7aa620aeee2feef9b8fbfbaeea SHA256 b422714c9a54ec97a5c10a4bf7fb2de88fa65c3cad507b5924473e5fa6f7bc77
-MISC ChangeLog 40106 RMD160 f59b3a95366de2043724b23612e2c9476dab0f4e SHA1 233218e4f9b2e14dfe0b02da3e8470d9061edcdd SHA256 bca7d4f07245f597a153018fbc27eb9cfee31f38eec2571b011e3964b3f24eb9
+MISC ChangeLog 40324 RMD160 e3e138b388335edee4cceaf20a216f86b9bf749c SHA1 94970e88249d35084a7a5457526fbb9df08cb305 SHA256 58ca200e3e44882aa74aad018e86ae7eb48075b85a025c445f5d15e7eee37442
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.14 (FreeBSD)
 
-iF4EAREIAAYFAkuu1mUACgkQTwhj9JtAlp5yHQD/TncqPzbInKTtBvIV8HmiO4RD
-rc3QlsMeByb1zi0cXN0A/3/v3g7iDDk3wjqgxZUX+TbMpn65auWhx7/W30cal+cG
-=HAtN
+iEYEARECAAYFAkuvNdIACgkQgvV6MZSadQpKugCeLclnO2wIfOYEdULGzapB20Su
+AJ4AoKKXUAed4TiMf2gTSCwoCd0MuK9y
+=beHi
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.1_p2-r1.ebuild b/app-shells/bash/bash-4.1_p2-r1.ebuild
index fb373b5b01e5..dee1fcefc5f7 100644
--- a/app-shells/bash/bash-4.1_p2-r1.ebuild
+++ b/app-shells/bash/bash-4.1_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p2-r1.ebuild,v 1.1 2010/03/23 02:27:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p2-r1.ebuild,v 1.2 2010/03/28 10:55:37 the_paya Exp $
 
 EAPI="1"
 
@@ -71,6 +71,7 @@ src_unpack() {
 	cd ../..
 
 	epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
+	epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch # bug 303411
 
 	if ! use vanilla ; then
 		sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
diff --git a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
new file mode 100644
index 000000000000..576a8a47a619
--- /dev/null
+++ b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
@@ -0,0 +1,29 @@
+Bash built-in test fails to correctly report exeuctable status for non-
+executable files when run by root on FreeBSD.
+
+See http://bugs.gentoo.org/303411
+
+Patch from Johan Hattne <johan.hattne@utsuthwestern.edu>
+--- lib/sh/eaccess.c.orig
++++ lib/sh/eaccess.c
+@@ -198,11 +198,19 @@
+      char *path;
+      int mode;
+ {
++  struct stat s;
++  int ret;
++
+   if (path_is_devfd (path))
+     return (sh_stataccess (path, mode));
+ 
+ #if defined (HAVE_EACCESS)		/* FreeBSD */
+-  return (eaccess (path, mode));
++  if (stat (path, &s) != 0)
++    return (-1);
++  ret = eaccess (path, mode);
++  if (mode == X_OK && ret == 0 && !S_ISDIR(s.st_mode) && geteuid() == 0)
++    return ((s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0 ? -1 : 0);
++  return (ret);
+ #elif defined (EFF_ONLY_OK)		/* SVR4(?), SVR4.2 */
+   return access (path, mode|EFF_ONLY_OK);
+ #else