Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/sun-jdk: sun-jdk-1.6.0.05-r1.ebuild ChangeLog sun-jdk-1.5.0.15-r1.ebuild
Date: Fri, 28 Mar 2008 23:11:05
Message-Id: E1JfNiv-0005JW-LS@stork.gentoo.org
1 caster 08/03/28 23:11:01
2
3 Modified: sun-jdk-1.6.0.05-r1.ebuild ChangeLog
4 sun-jdk-1.5.0.15-r1.ebuild
5 Log:
6 Fix CDS generation on hardened, bug #215225.
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.2 dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild?r1=1.1&r2=1.2
15
16 Index: sun-jdk-1.6.0.05-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- sun-jdk-1.6.0.05-r1.ebuild 27 Mar 2008 20:18:28 -0000 1.1
23 +++ sun-jdk-1.6.0.05-r1.ebuild 28 Mar 2008 23:11:01 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v 1.1 2008/03/27 20:18:28 caster Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v 1.2 2008/03/28 23:11:01 caster Exp $
29
30 inherit versionator java-vm-2 eutils pax-utils
31
32 @@ -47,6 +47,12 @@
33
34 src_unpack() {
35 sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
36 +}
37 +
38 +src_compile() {
39 + # Set PaX markings on all JDK/JRE executables to allow code-generation on
40 + # the heap by the JIT compiler. This needs to be done before CDS - #215225
41 + pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
42
43 # see bug #207282
44 if use x86; then
45 @@ -59,9 +65,6 @@
46 src_install() {
47 local dirs="bin include jre lib man"
48
49 - # Set PaX markings on all JDK/JRE executables to allow code-generation on
50 - # the heap by the JIT compiler.
51 - pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
52
53 dodir /opt/${P}
54
55
56
57
58 1.232 dev-java/sun-jdk/ChangeLog
59
60 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.232&view=markup
61 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.232&content-type=text/plain
62 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.231&r2=1.232
63
64 Index: ChangeLog
65 ===================================================================
66 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v
67 retrieving revision 1.231
68 retrieving revision 1.232
69 diff -u -r1.231 -r1.232
70 --- ChangeLog 27 Mar 2008 20:18:28 -0000 1.231
71 +++ ChangeLog 28 Mar 2008 23:11:01 -0000 1.232
72 @@ -1,6 +1,10 @@
73 # ChangeLog for dev-java/sun-jdk
74 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
75 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.231 2008/03/27 20:18:28 caster Exp $
76 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.232 2008/03/28 23:11:01 caster Exp $
77 +
78 + 28 Mar 2008; Vlastimil Babka <caster@g.o>
79 + sun-jdk-1.5.0.15-r1.ebuild, sun-jdk-1.6.0.05-r1.ebuild:
80 + Fix CDS generation on hardened, bug #215225.
81
82 *sun-jdk-1.6.0.05-r1 (27 Mar 2008)
83 *sun-jdk-1.5.0.15-r1 (27 Mar 2008)
84
85
86
87 1.2 dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild
88
89 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild?rev=1.2&view=markup
90 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild?rev=1.2&content-type=text/plain
91 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild?r1=1.1&r2=1.2
92
93 Index: sun-jdk-1.5.0.15-r1.ebuild
94 ===================================================================
95 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v
96 retrieving revision 1.1
97 retrieving revision 1.2
98 diff -u -r1.1 -r1.2
99 --- sun-jdk-1.5.0.15-r1.ebuild 27 Mar 2008 20:18:28 -0000 1.1
100 +++ sun-jdk-1.5.0.15-r1.ebuild 28 Mar 2008 23:11:01 -0000 1.2
101 @@ -1,6 +1,6 @@
102 # Copyright 1999-2008 Gentoo Foundation
103 # Distributed under the terms of the GNU General Public License v2
104 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v 1.1 2008/03/27 20:18:28 caster Exp $
105 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v 1.2 2008/03/28 23:11:01 caster Exp $
106
107 inherit versionator java-vm-2 eutils pax-utils
108
109 @@ -43,6 +43,12 @@
110
111 src_unpack() {
112 sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
113 +}
114 +
115 +src_compile() {
116 + # Set PaX markings on all JDK/JRE executables to allow code-generation on
117 + # the heap by the JIT compiler. This needs to be done before CDS - #215225
118 + pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
119
120 # see bug #207282
121 if use x86; then
122 @@ -54,10 +60,6 @@
123 src_install() {
124 local dirs="bin include jre lib man"
125
126 - # Set PaX markings on all JDK/JRE executables to allow code-generation on
127 - # the heap by the JIT compiler.
128 - pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
129 -
130 dodir /opt/${P}
131
132 cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
133
134
135
136 --
137 gentoo-commits@l.g.o mailing list