summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2013-05-19 13:40:14 +0000
committerMagnus Granberg <zorry@gentoo.org>2013-05-19 13:40:14 +0000
commit6f8168a7308ed4c98020df3199002580bfd6fb70 (patch)
tree5096a5095b13cef87199b19475f7b87de54e9667 /gnome-extra/cinnamon
parentStable for amd64, wrt bug #470262 (diff)
downloadgentoo-2-6f8168a7308ed4c98020df3199002580bfd6fb70.tar.gz
gentoo-2-6f8168a7308ed4c98020df3199002580bfd6fb70.tar.bz2
gentoo-2-6f8168a7308ed4c98020df3199002580bfd6fb70.zip
Add new pax mark bug #457194
(Portage version: 2.1.12/cvs/Linux x86_64, signed Manifest commit with key FD79807F)
Diffstat (limited to 'gnome-extra/cinnamon')
-rw-r--r--gnome-extra/cinnamon/ChangeLog5
-rw-r--r--gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 3c4285b7e477..941933649143 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-extra/cinnamon
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.22 2013/03/29 20:09:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.23 2013/05/19 13:40:14 zorry Exp $
+
+ 19 May 2013; Magnus Granberg <zorry@gentoo.org> cinnamon-1.6.7-r1.ebuild:
+ Add new pax mark bug #457194
29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -cinnamon-1.6.1.ebuild,
-cinnamon-1.6.7.ebuild:
diff --git a/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild
index 3e85af9e553b..1bd1c8521dda 100644
--- a/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild,v 1.1 2013/01/07 05:13:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild,v 1.2 2013/05/19 13:40:14 zorry Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -191,8 +191,9 @@ src_install() {
-i "${ED}usr/bin/cinnamon-"{launcher,menu-editor,settings} \
-i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die
- # Required for gnome-shell on hardened/PaX, bug #398941
- pax-mark mr "${ED}usr/bin/cinnamon"
+ # Required for gnome-shell on hardened/PaX, bug #398941 and #457194
+ # PaX EMUTRAMP need to be on
+ pax-mark mrE "${ED}usr/bin/cinnamon"
}
pkg_postinst() {