diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-05 07:48:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-05 07:48:36 +0000 |
| commit | e6f606673798d4617b862296eed68ab363412749 (patch) | |
| tree | 10797a809908f88f48ded1c79e6dea720ff6bb23 /app-text | |
| parent | version bump; directory fix pointed out by Jyrki Launonen (bug #287715) (diff) | |
| download | gentoo-2-e6f606673798d4617b862296eed68ab363412749.tar.gz gentoo-2-e6f606673798d4617b862296eed68ab363412749.tar.bz2 gentoo-2-e6f606673798d4617b862296eed68ab363412749.zip | |
Avoid sandbox violations when xdg-mime is called during src_install, as reported in bug #287067, comment #13.
(Portage version: 2.2_rc43_p14493/cvs/Linux i686)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/calibre/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/calibre/calibre-0.6.16-r1.ebuild | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index f80f04ef4e5d..6a83385dece3 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/calibre # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.51 2009/10/03 21:08:37 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.52 2009/10/05 07:48:36 zmedico Exp $ + + 05 Oct 2009; Zac Medico <zmedico@gentoo.org> calibre-0.6.16-r1.ebuild: + Avoid sandbox violations when xdg-mime is called during src_install, + as reported in bug #287067, comment #13. *calibre-0.6.16-r1 (03 Oct 2009) diff --git a/app-text/calibre/calibre-0.6.16-r1.ebuild b/app-text/calibre/calibre-0.6.16-r1.ebuild index 23a56678e371..9eca2129db66 100644 --- a/app-text/calibre/calibre-0.6.16-r1.ebuild +++ b/app-text/calibre/calibre-0.6.16-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.16-r1.ebuild,v 1.1 2009/10/03 21:08:37 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.16-r1.ebuild,v 1.2 2009/10/05 07:48:36 zmedico Exp $ EAPI=2 NEED_PYTHON=2.6 @@ -59,9 +59,23 @@ src_prepare() { } src_install() { + + # Bypass kbuildsycoca and update-mime-database in order to + # avoid sandbox violations if xdg-mime tries to call them. + cat - > "${T}/kbuildsycoca" <<-EOF + #!$BASH + exit 0 + EOF + + cp "${T}"/{kbuildsycoca,update-mime-database} + chmod +x "${T}"/{kbuildsycoca,update-mime-database} + # --bindir and --sharedir don't seem to work. # Pass them in anyway so we'll know when they are fixed. - PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ + # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox + # violation with kbuildsycoca as in bug #287067, comment #13. + export -n DISPLAY + PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share" grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i || |