Sanitise find arguments when using JAVA_PKG_BSFIX_NAME option. Fix #231956.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index ab7c5124b68303b95d79e553f8b6a59adc1525e4..026bbd231e9fb1a8275469d351a19163292e242a 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1514 2015/01/21 22:01:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1515 2015/01/23 22:48:10 monsieurp Exp $
+
+  23 Jan 2015; Patrice Clement <monsieurp@gentoo.org> java-ant-2.eclass:
+  Sanitise find arguments when using JAVA_PKG_BSFIX_NAME option. Fix #231956.
 
   21 Jan 2015; Anthony Basile <blueness@gentoo.org> toolchain.eclass:
   Stub out fixed includes, bug #536878.

diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index f92fdf2864633317242d1b042d604129c9439094..ec69cc78ba9788a804eb2e819882cf63d98dbcbb 100644 (file)
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -14,7 +14,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.58 2014/03/31 16:48:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.59 2015/01/23 22:48:10 monsieurp Exp $
 
 # @ECLASS: java-ant-2.eclass
 # @MAINTAINER:
@@ -172,7 +172,7 @@ java-ant_bsfix() {
        local find_args=""
        [[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1"
 
-       find_args="${find_args} -type f -name ${JAVA_PKG_BSFIX_NAME// / -o -name } "
+       find_args="${find_args} -type f ( -name ${JAVA_PKG_BSFIX_NAME// / -o -name } )"
 
        # This voodoo is done for paths with spaces
        local bsfix_these