Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ralph Sennhauser (sera)" <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
Date: Mon, 21 Nov 2011 11:40:23
Message-Id: 20111121114006.89B8A2004B@flycatcher.gentoo.org
1 sera 11/11/21 11:40:06
2
3 Modified: ChangeLog icedtea-7.2.0-r1.ebuild
4 icedtea-6.1.10.4-r1.ebuild
5 Log:
6 Use java-vm-2.eclass to set PaX markings
7
8 (Portage version: 2.1.10.35/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.54 dev-java/icedtea/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.54&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.54&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.53&r2=1.54
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
20 retrieving revision 1.53
21 retrieving revision 1.54
22 diff -u -r1.53 -r1.54
23 --- ChangeLog 18 Nov 2011 22:00:15 -0000 1.53
24 +++ ChangeLog 21 Nov 2011 11:40:06 -0000 1.54
25 @@ -1,6 +1,10 @@
26 # ChangeLog for dev-java/icedtea
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.53 2011/11/18 22:00:15 sera Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.54 2011/11/21 11:40:06 sera Exp $
30 +
31 + 21 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
32 + icedtea-7.2.0-r1.ebuild:
33 + Use java-vm-2.eclass to set PaX markings
34
35 18 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
36 icedtea-7.2.0-r1.ebuild:
37
38
39
40 1.18 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.18&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.18&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.17&r2=1.18
45
46 Index: icedtea-7.2.0-r1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
49 retrieving revision 1.17
50 retrieving revision 1.18
51 diff -u -r1.17 -r1.18
52 --- icedtea-7.2.0-r1.ebuild 18 Nov 2011 22:00:15 -0000 1.17
53 +++ icedtea-7.2.0-r1.ebuild 21 Nov 2011 11:40:06 -0000 1.18
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2011 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.17 2011/11/18 22:00:15 sera Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.18 2011/11/21 11:40:06 sera Exp $
59 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
60
61 # *********************************************************
62 @@ -9,7 +9,7 @@
63
64 EAPI="4"
65
66 -inherit flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator
67 +inherit flag-o-matic java-pkg-2 java-vm-2 versionator
68
69 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
70 SLOT="7"
71 @@ -262,12 +262,6 @@
72 # doins can't handle symlinks.
73 cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
74
75 - # Set PaX markings on all JDK/JRE executables to allow code-generation on
76 - # the heap by the JIT compiler.
77 - local marks="m"
78 - use x86 && marks="msp"
79 - pax-mark ${marks} $(list-paxables "${ddest}"{,/jre}/bin/*)
80 -
81 dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
82
83 if use examples; then
84 @@ -280,6 +274,9 @@
85 # Fix the permissions.
86 find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
87
88 + # Needs to be done before generating cacerts
89 + java-vm_set-pax-markings "${ddest}"
90 +
91 # We need to generate keystore - bug #273306
92 einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
93 mkdir "${T}/certgen" && cd "${T}/certgen" || die
94
95
96
97 1.11 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
98
99 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.11&view=markup
100 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.11&content-type=text/plain
101 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.10&r2=1.11
102
103 Index: icedtea-6.1.10.4-r1.ebuild
104 ===================================================================
105 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
106 retrieving revision 1.10
107 retrieving revision 1.11
108 diff -u -r1.10 -r1.11
109 --- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 22:00:16 -0000 1.10
110 +++ icedtea-6.1.10.4-r1.ebuild 21 Nov 2011 11:40:06 -0000 1.11
111 @@ -1,6 +1,6 @@
112 # Copyright 1999-2011 Gentoo Foundation
113 # Distributed under the terms of the GNU General Public License v2
114 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.10 2011/11/18 22:00:16 sera Exp $
115 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.11 2011/11/21 11:40:06 sera Exp $
116 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
117
118 # *********************************************************
119 @@ -236,12 +236,6 @@
120 # doins can't handle symlinks.
121 cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
122
123 - # Set PaX markings on all JDK/JRE executables to allow code-generation on
124 - # the heap by the JIT compiler.
125 - local marks="m"
126 - use x86 && marks="msp"
127 - pax-mark ${marks} $(list-paxables "${ddest}"{,/jre}/bin/*)
128 -
129 dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
130
131 if use examples; then
132 @@ -254,6 +248,9 @@
133 # Fix the permissions.
134 find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
135
136 + # Needs to be done before generating cacerts
137 + java-vm_set-pax-markings "${ddest}"
138 +
139 # We need to generate keystore - bug #273306
140 einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
141 mkdir "${T}/certgen" && cd "${T}/certgen" || die
Report Message
Find on MARC Find on Google Groups