diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-01-23 22:48:10 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-01-23 22:48:10 +0000 |
| commit | 2f9a041f2fe4ed777be3ec483780588728655fc4 (patch) | |
| tree | 611d1f7e06960bb8e7372a7553a2a7cfb0c7bf7d | |
| parent | EAPI=5; add patch from Martin Väth to fix compile with gcc49 (bug #537338) (diff) | |
| download | gentoo-2-2f9a041f2fe4ed777be3ec483780588728655fc4.tar.gz gentoo-2-2f9a041f2fe4ed777be3ec483780588728655fc4.tar.bz2 gentoo-2-2f9a041f2fe4ed777be3ec483780588728655fc4.zip | |
Sanitise find arguments when using JAVA_PKG_BSFIX_NAME option. Fix #231956.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/java-ant-2.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
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 <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 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 |