From: Patrice Clement Date: Fri, 23 Jan 2015 22:48:10 +0000 (+0000) Subject: Sanitise find arguments when using JAVA_PKG_BSFIX_NAME option. Fix #231956. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=521c1beae74c96ae9b64a3a1332757daa0409f77;p=gentoo.git Sanitise find arguments when using JAVA_PKG_BSFIX_NAME option. Fix #231956. --- diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ab7c5124b683..026bbd231e9f 100644 --- 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 java-ant-2.eclass: + Sanitise find arguments when using JAVA_PKG_BSFIX_NAME option. Fix #231956. 21 Jan 2015; Anthony Basile toolchain.eclass: Stub out fixed includes, bug #536878. diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index f92fdf286463..ec69cc78ba97 100644 --- 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