Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/skype: metadata.xml ChangeLog skype-2.2.0.35-r1.ebuild
Date: Tue, 28 Feb 2012 21:25:04
Message-Id: 20120228212454.36F762004B@flycatcher.gentoo.org
1 prometheanfire 12/02/28 21:24:54
2
3 Modified: metadata.xml ChangeLog skype-2.2.0.35-r1.ebuild
4 Log:
5 paxmared on the pax_kernel use flag so it works on the hardened profile
6
7 (Portage version: 2.1.10.44/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.4 net-im/skype/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/metadata.xml?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/metadata.xml?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/metadata.xml?r1=1.3&r2=1.4
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-im/skype/metadata.xml,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- metadata.xml 5 Aug 2008 18:02:31 -0000 1.3
23 +++ metadata.xml 28 Feb 2012 21:24:54 -0000 1.4
24 @@ -12,5 +12,6 @@
25 </longdescription>
26 <use>
27 <flag name='qt-static'>Installs binaries statically linked to Qt</flag>
28 + <flag name='pax_kernel'>Triggers a paxmarking of the binary</flag>
29 </use>
30 </pkgmetadata>
31
32
33
34 1.118 net-im/skype/ChangeLog
35
36 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.118&view=markup
37 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.118&content-type=text/plain
38 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?r1=1.117&r2=1.118
39
40 Index: ChangeLog
41 ===================================================================
42 RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v
43 retrieving revision 1.117
44 retrieving revision 1.118
45 diff -u -r1.117 -r1.118
46 --- ChangeLog 15 Jun 2011 22:07:37 -0000 1.117
47 +++ ChangeLog 28 Feb 2012 21:24:54 -0000 1.118
48 @@ -1,6 +1,9 @@
49 # ChangeLog for net-im/skype
50 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
51 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.117 2011/06/15 22:07:37 hwoarang Exp $
52 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
53 +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.118 2012/02/28 21:24:54 prometheanfire Exp $
54 +
55 + 28 Feb 2012; mthode <mthode@g.o> skype-2.2.0.35-r1.ebuild:
56 + paxmarked m skype to work on hardened
57
58 *skype-2.2.0.35-r1 (15 Jun 2011)
59
60
61
62
63 1.2 net-im/skype/skype-2.2.0.35-r1.ebuild
64
65 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.2&view=markup
66 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.2&content-type=text/plain
67 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?r1=1.1&r2=1.2
68
69 Index: skype-2.2.0.35-r1.ebuild
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v
72 retrieving revision 1.1
73 retrieving revision 1.2
74 diff -u -r1.1 -r1.2
75 --- skype-2.2.0.35-r1.ebuild 15 Jun 2011 22:07:37 -0000 1.1
76 +++ skype-2.2.0.35-r1.ebuild 28 Feb 2012 21:24:54 -0000 1.2
77 @@ -1,6 +1,6 @@
78 -# Copyright 1999-2011 Gentoo Foundation
79 +# Copyright 1999-2012 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v 1.1 2011/06/15 22:07:37 hwoarang Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v 1.2 2012/02/28 21:24:54 prometheanfire Exp $
83
84 EAPI=4
85 inherit gnome2-utils eutils qt4-r2 pax-utils
86 @@ -16,7 +16,7 @@
87 LICENSE="skype-eula"
88 SLOT="0"
89 KEYWORDS="~amd64 ~x86"
90 -IUSE="qt-static"
91 +IUSE="qt-static pax_kernel"
92
93 RESTRICT="mirror strip" # Bug 299368
94 EMUL_VER=20091231
95 @@ -103,6 +103,15 @@
96 make_desktop_entry skype "Skype VoIP" skype "Network;InstantMessaging;Telephony"
97
98 dosym /opt/skype /usr/share/skype #Fix for disabled sound notification
99 +
100 + if use pax_kernel; then
101 + pax-mark m /opt/skype/skype || die
102 + eqawarn "You have set USE=pax_kernel meaning that you intend to run"
103 + eqawarn "skype under a PaX enabled kernel. To do so, we must modify"
104 + eqawarn "the skype binary itself and this *may* lead to breakage! If"
105 + eqawarn "you suspect that skype is being broken by this modification,"
106 + eqawarn "please open a bug."
107 + fi
108 }
109
110 pkg_preinst() {