diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-04-04 12:04:26 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-04-04 12:04:26 +0000 |
| commit | 40b6bc147a55773e00096060e7a4f1b64a0fa78e (patch) | |
| tree | f17bcf432aed11fe31ab3300f9f314c72fa6a261 | |
| parent | Version bump for Rails 3.1.4, security bug 406547. (diff) | |
| download | gentoo-2-40b6bc147a55773e00096060e7a4f1b64a0fa78e.tar.gz gentoo-2-40b6bc147a55773e00096060e7a4f1b64a0fa78e.tar.bz2 gentoo-2-40b6bc147a55773e00096060e7a4f1b64a0fa78e.zip | |
add another patch tto mksedscript to fix bug #410695
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
| -rw-r--r-- | app-text/xdvik/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch | 20 | ||||
| -rw-r--r-- | app-text/xdvik/xdvik-22.85.ebuild | 5 |
3 files changed, 28 insertions, 3 deletions
diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog index 257242e7d99c..ced9633be168 100644 --- a/app-text/xdvik/ChangeLog +++ b/app-text/xdvik/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/xdvik # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.81 2012/04/03 12:03:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.82 2012/04/04 12:04:26 aballier Exp $ + + 04 Apr 2012; Alexis Ballier <aballier@gentoo.org> xdvik-22.85.ebuild, + +files/xdvik-22.85-mksedscript_gentoo.patch: + add another patch tto mksedscript to fix bug #410695 *xdvik-22.85 (03 Apr 2012) diff --git a/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch b/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch new file mode 100644 index 000000000000..69873731dd4e --- /dev/null +++ b/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch @@ -0,0 +1,20 @@ +This used to eval something like: +foo=char ** +so, the first match to * would be executed +causing: https://bugs.gentoo.org/show_bug.cgi?id=410695 + +remove the quotes and quote again so that we always get foo="char **" + +Index: xdvik-22.85/texk/xdvik/mksedscript +=================================================================== +--- xdvik-22.85.orig/texk/xdvik/mksedscript ++++ xdvik-22.85/texk/xdvik/mksedscript +@@ -45,7 +45,7 @@ done + + eval "`awk '/^#define/ { printf "mk_%s=%s", $2, $3 + for (i = 4; i <= NF; i++) printf " %s", $i +- print "" }' c-auto.h`" ++ print "" }' c-auto.h | tr -d '"' |sed -e 's/\(.*\)=\(.*\)$/\1="\2"/'`" + + # eval "`cat c-auto.h \ + # | grep '^[ ]*#[ ]*define[ ]' \ diff --git a/app-text/xdvik/xdvik-22.85.ebuild b/app-text/xdvik/xdvik-22.85.ebuild index e24880c44b4d..569d729a74e8 100644 --- a/app-text/xdvik/xdvik-22.85.ebuild +++ b/app-text/xdvik/xdvik-22.85.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.85.ebuild,v 1.1 2012/04/03 12:03:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.85.ebuild,v 1.2 2012/04/04 12:04:26 aballier Exp $ EAPI=4 inherit eutils flag-o-matic elisp-common toolchain-funcs @@ -32,7 +32,8 @@ TEXMF_PATH=/usr/share/texmf S=${WORKDIR}/${P}/texk/xdvik src_prepare() { - epatch "${FILESDIR}/${P}-mksedscript.patch" + epatch "${FILESDIR}/${P}-mksedscript.patch" \ + "${FILESDIR}/${P}-mksedscript_gentoo.patch" # Make sure system kpathsea headers are used cd "${WORKDIR}/${P}/texk/kpathsea" for i in *.h ; do echo "#include_next \"$i\"" > $i; done |