* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2011-11-12 13:05 Ralph Sennhauser (sera)
0 siblings, 0 replies; 11+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-12 13:05 UTC (permalink / raw
To: gentoo-commits
sera 11/11/12 13:05:33
Modified: ChangeLog java-vm-2.eclass
Log:
Add java-vm_sandbox-predict for installing a sandbox control file along with any JVM that needs it. Bug 388937#c1
Revision Changes Path
1.8 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 11 Nov 2011 07:06:25 -0000 1.7
+++ ChangeLog 12 Nov 2011 13:05:33 -0000 1.8
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.7 2011/11/11 07:06:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.8 2011/11/12 13:05:33 sera Exp $
+
+ 12 Nov 2011; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
+ Add java-vm_sandbox-predict for installing a sandbox control file along with
+ any JVM that needs it. Bug 388937#c1
11 Nov 2011; Ryan Hill <dirtyepic@gentoo.org> flag-o-matic.eclass:
Test that appended flags are valid. This allows people to add flags that were
1.37 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.36&r2=1.37
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- java-vm-2.eclass 30 Oct 2011 11:06:38 -0000 1.36
+++ java-vm-2.eclass 12 Nov 2011 13:05:33 -0000 1.37
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.36 2011/10/30 11:06:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.37 2011/11/12 13:05:33 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -204,6 +204,28 @@
elog "USE flags (typically X, alsa, odbc) and some Java code may fail without them."
}
+# -----------------------------------------------------------------------------
+# @ebuild-function java-vm_sandbox-predict
+#
+# Install a sandbox control file. Specified paths won't cause a sandbox
+# violation if opened read write but no write takes place. See bug 388937#c1
+#
+# @example
+# java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+# -----------------------------------------------------------------------------
+java-vm_sandbox-predict() {
+ debug-print-function ${FUNCNAME} "$*"
+ [[ -z "${1}" ]] && die "${FUNCNAME} takes at least one argument"
+
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+
+ local path path_arr=("$@")
+ IFS=":" path="${path_arr[*]}"
+ dodir /etc/sandbox.d
+ echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \
+ || die "Failed to write sandbox control file"
+}
+
java_get_plugin_dir_() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
echo "${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2011-11-15 9:02 Vlastimil Babka (caster)
0 siblings, 0 replies; 11+ messages in thread
From: Vlastimil Babka (caster) @ 2011-11-15 9:02 UTC (permalink / raw
To: gentoo-commits
caster 11/11/15 09:02:15
Modified: ChangeLog java-vm-2.eclass
Log:
Drop the repetitive elogs about revdep rebuild control files for binary JVM's.
Revision Changes Path
1.14 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.13&r2=1.14
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 14 Nov 2011 15:54:08 -0000 1.13
+++ ChangeLog 15 Nov 2011 09:02:15 -0000 1.14
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.13 2011/11/14 15:54:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.14 2011/11/15 09:02:15 caster Exp $
+
+ 15 Nov 2011; Vlastimil Babka <caster@gentoo.org> java-vm-2.eclass:
+ Drop the repetitive elogs about revdep rebuild control files for binary
+ JVM's.
14 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org> mozconfig-3.eclass:
Remove obsolete xorg-x11 dep from mozconfig-3
1.38 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.37&r2=1.38
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- java-vm-2.eclass 12 Nov 2011 13:05:33 -0000 1.37
+++ java-vm-2.eclass 15 Nov 2011 09:02:15 -0000 1.38
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.37 2011/11/12 13:05:33 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.38 2011/11/15 09:02:15 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -197,11 +197,6 @@
dodir /etc/revdep-rebuild/
echo "SEARCH_DIRS_MASK=\"${VMROOT}\""> "${ED}/etc/revdep-rebuild/61-${VMHANDLE}"
-
- elog "A revdep-rebuild control file was installed to prevent reinstalls due to"
- elog "missing dependencies (see bug #177925 for more info). Note that some parts"
- elog "of the JVM may require dependencies that are pulled only through respective"
- elog "USE flags (typically X, alsa, odbc) and some Java code may fail without them."
}
# -----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2011-11-21 10:15 Ralph Sennhauser (sera)
0 siblings, 0 replies; 11+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-21 10:15 UTC (permalink / raw
To: gentoo-commits
sera 11/11/21 10:15:46
Modified: ChangeLog java-vm-2.eclass
Log:
Move handling of PaX marking JVM executables to eclass.
Revision Changes Path
1.22 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 21 Nov 2011 01:43:44 -0000 1.21
+++ ChangeLog 21 Nov 2011 10:15:46 -0000 1.22
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.21 2011/11/21 01:43:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.22 2011/11/21 10:15:46 sera Exp $
+
+ 21 Nov 2011; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
+ Move handling of PaX marking JVM executables to eclass.
21 Nov 2011; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Fix live ebuilds.
1.39 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.38&r2=1.39
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- java-vm-2.eclass 15 Nov 2011 09:02:15 -0000 1.38
+++ java-vm-2.eclass 21 Nov 2011 10:15:46 -0000 1.39
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.38 2011/11/15 09:02:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.39 2011/11/21 10:15:46 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -12,7 +12,7 @@
#
# -----------------------------------------------------------------------------
-inherit eutils fdo-mime multilib prefix
+inherit eutils fdo-mime multilib pax-utils prefix
DEPEND="=dev-java/java-config-2*"
has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1"
@@ -175,6 +175,40 @@
}
# -----------------------------------------------------------------------------
+# @ebuild-function java-vm_set-pax-markings
+#
+# Set PaX markings on all JDK/JRE executables to allow code-generation on
+# the heap by the JIT compiler.
+#
+# The markings need to be set prior to the first invocation of the the freshly
+# built / installed VM. Be it before creating the Class Data Sharing archive or
+# generating cacerts. Otherwise a PaX enabled kernel will kill the VM.
+# Bug #215225 #389751
+#
+# @example
+# java-vm_set-pax-markings "${S}"
+# java-vm_set-pax-markings "${ED}"/opt/${P}
+#
+# @param $1 - JDK/JRE base directory.
+# -----------------------------------------------------------------------------
+java-vm_set-pax-markings() {
+ debug-print-function ${FUNCNAME} "$*"
+ [[ $# -ne 1 ]] && die "${FUNCNAME}: takes exactly one argument"
+ [[ ! -f "${1}"/bin/java ]] \
+ && die "${FUNCNAME}: argument needs to be JDK/JRE base directory"
+
+ local executables=( "${1}"/bin/* )
+ [[ -d "${1}"/jre ]] && executables+=( "${1}"/jre/bin/* )
+
+ # Usally disabeling MPROTECT is sufficent
+ local pax_markings="m"
+ # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+ use x86 && pax_markings="msp"
+
+ pax-mark ${pax_markings} $(list-paxables "${executables[@]}")
+}
+
+# -----------------------------------------------------------------------------
# @ebuild-function java-vm_revdep-mask
#
# Installs a revdep-rebuild control file which SEARCH_DIR_MASK set to the path
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2011-11-24 20:05 Ralph Sennhauser (sera)
0 siblings, 0 replies; 11+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-24 20:05 UTC (permalink / raw
To: gentoo-commits
sera 11/11/24 20:05:01
Modified: ChangeLog java-vm-2.eclass
Log:
set_java_env(): Substitute @SLOT@ in vm env files
java-vm_check-nsplugin(): Fix handling of IUSE defaults
Revision Changes Path
1.26 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.25&r2=1.26
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog 24 Nov 2011 00:57:00 -0000 1.25
+++ ChangeLog 24 Nov 2011 20:05:01 -0000 1.26
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.25 2011/11/24 00:57:00 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.26 2011/11/24 20:05:01 sera Exp $
+
+ 24 Nov 2011; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
+ set_java_env(): Substitute @SLOT@ in vm env files
+ java-vm_check-nsplugin(): Fix handling of IUSE defaults
24 Nov 2011; Maciej Mrozowski <reavertm@gentoo.org> virtuoso.eclass:
Dependency on <gawk-4 moved to virtuoso-server-6.1.{2,3}.
1.40 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.39&r2=1.40
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- java-vm-2.eclass 21 Nov 2011 10:15:46 -0000 1.39
+++ java-vm-2.eclass 24 Nov 2011 20:05:01 -0000 1.40
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.39 2011/11/21 10:15:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.40 2011/11/24 20:05:01 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -68,7 +68,7 @@
has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
# Install a default nsplugin if we don't already have one
- if has nsplugin ${IUSE} && use nsplugin; then
+ if in_iuse nsplugin && use nsplugin; then
if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then
einfo "No system nsplugin currently set."
java-vm_set-nsplugin
@@ -150,6 +150,7 @@
-e "s/@PN@/${PN}/g" \
-e "s/@PV@/${PV}/g" \
-e "s/@PF@/${PF}/g" \
+ -e "s/@SLOT@/${SLOT}/g" \
-e "s/@PLATFORM@/${platform}/g" \
-e "s/@LIBDIR@/$(get_libdir)/g" \
-e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2011-12-04 6:52 Brian Harring (ferringb)
0 siblings, 0 replies; 11+ messages in thread
From: Brian Harring (ferringb) @ 2011-12-04 6:52 UTC (permalink / raw
To: gentoo-commits
ferringb 11/12/04 06:52:39
Modified: ChangeLog java-vm-2.eclass
Log:
Fix IFS=: bleeding out from java-vm_sandbox-predict invocations
Revision Changes Path
1.34 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.33&r2=1.34
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog 3 Dec 2011 20:43:21 -0000 1.33
+++ ChangeLog 4 Dec 2011 06:52:39 -0000 1.34
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.33 2011/12/03 20:43:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.34 2011/12/04 06:52:39 ferringb Exp $
+
+ 04 Dec 2011; Brian Harring <ferringb@gentoo.org> java-vm-2.eclass:
+ Fix IFS=: bleeding out from java-vm_sandbox-predict invocations.
03 Dec 2011; Ulrich Mueller <ulm@gentoo.org> elisp.eclass,
elisp-common.eclass:
1.41 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.40&r2=1.41
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- java-vm-2.eclass 24 Nov 2011 20:05:01 -0000 1.40
+++ java-vm-2.eclass 4 Dec 2011 06:52:39 -0000 1.41
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.40 2011/11/24 20:05:01 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.41 2011/12/04 06:52:39 ferringb Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -250,7 +250,9 @@
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
local path path_arr=("$@")
- IFS=":" path="${path_arr[*]}"
+ # subshell this to prevent IFS bleeding out dependant on bash version.
+ # could use local, which *should* work, but that requires a lot of testing.
+ path=$(IFS=":" echo "${path_arr[*]}")
dodir /etc/sandbox.d
echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \
|| die "Failed to write sandbox control file"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2011-12-05 7:07 Mike Gilbert (floppym)
0 siblings, 0 replies; 11+ messages in thread
From: Mike Gilbert (floppym) @ 2011-12-05 7:07 UTC (permalink / raw
To: gentoo-commits
floppym 11/12/05 07:07:44
Modified: ChangeLog java-vm-2.eclass
Log:
Add semicolon to fix ferringb's last change.
Revision Changes Path
1.35 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.34&r2=1.35
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 4 Dec 2011 06:52:39 -0000 1.34
+++ ChangeLog 5 Dec 2011 07:07:44 -0000 1.35
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.34 2011/12/04 06:52:39 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.35 2011/12/05 07:07:44 floppym Exp $
+
+ 05 Dec 2011; Mike Gilbert <floppym@gentoo.org> java-vm-2.eclass:
+ Add semicolon to fix ferringb's last change.
04 Dec 2011; Brian Harring <ferringb@gentoo.org> java-vm-2.eclass:
Fix IFS=: bleeding out from java-vm_sandbox-predict invocations.
1.42 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.41&r2=1.42
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- java-vm-2.eclass 4 Dec 2011 06:52:39 -0000 1.41
+++ java-vm-2.eclass 5 Dec 2011 07:07:44 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.41 2011/12/04 06:52:39 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.42 2011/12/05 07:07:44 floppym Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -252,7 +252,7 @@
local path path_arr=("$@")
# subshell this to prevent IFS bleeding out dependant on bash version.
# could use local, which *should* work, but that requires a lot of testing.
- path=$(IFS=":" echo "${path_arr[*]}")
+ path=$(IFS=":"; echo "${path_arr[*]}")
dodir /etc/sandbox.d
echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \
|| die "Failed to write sandbox control file"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2012-06-11 19:46 Ralph Sennhauser (sera)
0 siblings, 0 replies; 11+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-06-11 19:46 UTC (permalink / raw
To: gentoo-commits
sera 12/06/11 19:46:32
Modified: ChangeLog java-vm-2.eclass
Log:
Add app-admin/eselect-java as preferred provider of eselect java-vm.
Revision Changes Path
1.310 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.310&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.310&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.309&r2=1.310
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- ChangeLog 11 Jun 2012 14:22:19 -0000 1.309
+++ ChangeLog 11 Jun 2012 19:46:32 -0000 1.310
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.309 2012/06/11 14:22:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.310 2012/06/11 19:46:32 sera Exp $
+
+ 11 Jun 2012; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
+ Add app-admin/eselect-java as preferred provider of eselect java-vm.
11 Jun 2012; Michał Górny <mgorny@gentoo.org> vcs-snapshot.eclass:
Unpack tarballs in directory matching their name rather than ${P}. This
1.43 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.42&r2=1.43
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- java-vm-2.eclass 5 Dec 2011 07:07:44 -0000 1.42
+++ java-vm-2.eclass 11 Jun 2012 19:46:32 -0000 1.43
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.42 2011/12/05 07:07:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.43 2012/06/11 19:46:32 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -14,11 +14,11 @@
inherit eutils fdo-mime multilib pax-utils prefix
-DEPEND="=dev-java/java-config-2*"
-has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1"
-
RDEPEND="
- =dev-java/java-config-2*"
+ =dev-java/java-config-2*
+ || ( app-admin/eselect-java <dev-java/java-config-2.2 )"
+DEPEND="${RDEPEND}"
+has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1"
export WANT_JAVA_CONFIG=2
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2012-06-12 9:17 Ralph Sennhauser (sera)
0 siblings, 0 replies; 11+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-06-12 9:17 UTC (permalink / raw
To: gentoo-commits
sera 12/06/12 09:17:33
Modified: ChangeLog java-vm-2.eclass
Log:
Convert docs to eclass-manpages.
Revision Changes Path
1.311 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.311&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.311&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.310&r2=1.311
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- ChangeLog 11 Jun 2012 19:46:32 -0000 1.310
+++ ChangeLog 12 Jun 2012 09:17:33 -0000 1.311
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.310 2012/06/11 19:46:32 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.311 2012/06/12 09:17:33 sera Exp $
+
+ 12 Jun 2012; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
+ Convert docs to eclass-manpages.
11 Jun 2012; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
Add app-admin/eselect-java as preferred provider of eselect java-vm.
1.44 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.43&r2=1.44
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- java-vm-2.eclass 11 Jun 2012 19:46:32 -0000 1.43
+++ java-vm-2.eclass 12 Jun 2012 09:17:33 -0000 1.44
@@ -1,19 +1,19 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.43 2012/06/11 19:46:32 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.44 2012/06/12 09:17:33 sera Exp $
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-shortdesc Java Virtual Machine eclass
-# @eclass-maintainer java@gentoo.org
-#
+# @ECLASS: java-vm-2.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @BLURB: Java Virtual Machine eclass
+# @DESCRIPTION:
# This eclass provides functionality which assists with installing
# virtual machines, and ensures that they are recognized by java-config.
-#
-# -----------------------------------------------------------------------------
inherit eutils fdo-mime multilib pax-utils prefix
+EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm
+
RDEPEND="
=dev-java/java-config-2*
|| ( app-admin/eselect-java <dev-java/java-config-2.2 )"
@@ -22,12 +22,36 @@
export WANT_JAVA_CONFIG=2
+
+# @ECLASS-VARIABLE: JAVA_VM_CONFIG_DIR
+# @INTERNAL
+# @DESCRIPTION:
+# Where to place the vm env file.
JAVA_VM_CONFIG_DIR="/usr/share/java-config-2/vm"
+
+# @ECLASS-VARIABLE: JAVA_VM_DIR
+# @INTERNAL
+# @DESCRIPTION:
+# Base directory for vm links.
JAVA_VM_DIR="/usr/lib/jvm"
+
+# @ECLASS-VARIABLE: JAVA_VM_SYSTEM
+# @INTERNAL
+# @DESCRIPTION:
+# Link for system-vm
JAVA_VM_SYSTEM="/etc/java-config-2/current-system-vm"
+
+# @ECLASS-VARIABLE: JAVA_VM_BUILD_ONLY
+# @DESCRIPTION:
+# Set to YES to mark a vm as build-only.
JAVA_VM_BUILD_ONLY="${JAVA_VM_BUILD_ONLY:-FALSE}"
-EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm
+
+# @FUNCTION: java-vm-2_pkg_setup
+# @DESCRIPTION:
+# default pkg_setup
+#
+# Initialize vm handle.
java-vm-2_pkg_setup() {
if [[ "${SLOT}" != "0" ]]; then
@@ -37,8 +61,15 @@
fi
}
+
+# @FUNCTION: java-vm-2_pkg_postinst
+# @DESCRIPTION:
+# default pkg_postinst
+#
+# Set the generation-2 system VM and Java plugin, if it isn't set or the
+# setting is invalid. Also update mime database.
+
java-vm-2_pkg_postinst() {
- # Set the generation-2 system VM, if it isn't set or the setting is invalid
# Note that we cannot rely on java-config here, as it will silently recognize
# e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due
# to the migration to icedtea-6)
@@ -57,6 +88,12 @@
fdo-mime_desktop_database_update
}
+
+# @FUNCTION: java-vm_check-nsplugin
+# @INTERNAL
+# @DESCRIPTION:
+# Check if the nsplugin needs updating
+
java-vm_check-nsplugin() {
local libdir
if [[ ${VMHANDLE} =~ emul-linux-x86 ]]; then
@@ -79,6 +116,12 @@
fi
}
+
+# @FUNCTION: java-vm_set-nsplugin
+# @INTERNAL
+# @DESCRIPTION:
+# Set the nsplugin implemetation.
+
java-vm_set-nsplugin() {
local extra_args
if use amd64; then
@@ -94,6 +137,13 @@
eselect java-nsplugin set ${extra_args} ${VMHANDLE}
}
+
+# @FUNCTION: java-vm-2_pkg_prerm
+# @DESCRIPTION:
+# default pkg_prerm
+#
+# Warn user if removing system-vm.
+
java-vm-2_pkg_prerm() {
# Although REPLACED_BY_VERSION is EAPI=4, we shouldn't need to check EAPI for this use case
if [[ "$(GENTOO_VM="" java-config -f 2>/dev/null)" == "${VMHANDLE}" && -z "${REPLACED_BY_VERSION}" ]]; then
@@ -103,16 +153,34 @@
fi
}
+
+# @FUNCTION: java-vm-2_pkg_postrm
+# @DESCRIPTION:
+# default pkg_postrm
+#
+# Update mime database.
+
java-vm-2_pkg_postrm() {
fdo-mime_desktop_database_update
}
+
+# @FUNCTION: java_set_default_vm_
+# @INTERNAL
+# @DESCRIPTION:
+# Set system-vm.
+
java_set_default_vm_() {
java-config-2 --set-system-vm="${VMHANDLE}"
einfo " ${P} set as the default system-vm."
}
+
+# @FUNCTION: get_system_arch
+# @DESCRIPTION:
+# Get Java specific arch name.
+
get_system_arch() {
local sarch
sarch=$(echo ${ARCH} | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/)
@@ -122,6 +190,11 @@
echo ${sarch}
}
+
+# @FUNCTION: set_java_env
+# @DESCRIPTION:
+# Installs a vm env file.
+
# TODO rename to something more evident, like install_env_file
set_java_env() {
debug-print-function ${FUNCNAME} $*
@@ -175,9 +248,9 @@
|| die "Failed to make VM symlink at ${JAVA_VM_DIR}/${VMHANDLE}"
}
-# -----------------------------------------------------------------------------
-# @ebuild-function java-vm_set-pax-markings
-#
+
+# @FUNCTION: java-vm_set-pax-markings
+# @DESCRIPTION:
# Set PaX markings on all JDK/JRE executables to allow code-generation on
# the heap by the JIT compiler.
#
@@ -186,12 +259,15 @@
# generating cacerts. Otherwise a PaX enabled kernel will kill the VM.
# Bug #215225 #389751
#
-# @example
-# java-vm_set-pax-markings "${S}"
-# java-vm_set-pax-markings "${ED}"/opt/${P}
+# @CODE
+# Parameters:
+# $1 - JDK/JRE base directory.
#
-# @param $1 - JDK/JRE base directory.
-# -----------------------------------------------------------------------------
+# Examples:
+# java-vm_set-pax-markings "${S}"
+# java-vm_set-pax-markings "${ED}"/opt/${P}
+# @CODE
+
java-vm_set-pax-markings() {
debug-print-function ${FUNCNAME} "$*"
[[ $# -ne 1 ]] && die "${FUNCNAME}: takes exactly one argument"
@@ -209,19 +285,23 @@
pax-mark ${pax_markings} $(list-paxables "${executables[@]}")
}
-# -----------------------------------------------------------------------------
-# @ebuild-function java-vm_revdep-mask
-#
+
+# @FUNCTION: java-vm_revdep-mask
+# @DESCRIPTION:
# Installs a revdep-rebuild control file which SEARCH_DIR_MASK set to the path
# where the VM is installed. Prevents pointless rebuilds - see bug #177925.
# Also gives a notice to the user.
#
-# @example
-# java-vm_revdep-mask
-# java-vm_revdep-mask /path/to/jdk/
+# @CODE
+# Parameters:
+# $1 - Path of the VM (defaults to /opt/${P} if not set)
+#
+# Examples:
+# java-vm_revdep-mask
+# java-vm_revdep-mask /path/to/jdk/
#
-# @param $1 - Path of the VM (defaults to /opt/${P} if not set)
-# ------------------------------------------------------------------------------
+# @CODE
+
java-vm_revdep-mask() {
if has ${EAPI:-0} 0 1 2 && ! use prefix; then
ED="${D}"
@@ -234,15 +314,17 @@
echo "SEARCH_DIRS_MASK=\"${VMROOT}\""> "${ED}/etc/revdep-rebuild/61-${VMHANDLE}"
}
-# -----------------------------------------------------------------------------
-# @ebuild-function java-vm_sandbox-predict
-#
+
+# @FUNCTION: java-vm_sandbox-predict
+# @DESCRIPTION:
# Install a sandbox control file. Specified paths won't cause a sandbox
# violation if opened read write but no write takes place. See bug 388937#c1
#
-# @example
-# java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-# -----------------------------------------------------------------------------
+# @CODE
+# Examples:
+# java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+# @CODE
+
java-vm_sandbox-predict() {
debug-print-function ${FUNCNAME} "$*"
[[ -z "${1}" ]] && die "${FUNCNAME} takes at least one argument"
@@ -258,11 +340,22 @@
|| die "Failed to write sandbox control file"
}
+
+# @FUNCTION: java_get_plugin_dir_
+# @INTERNAL
+# @DESCRIPTION:
+# Get the java plugin dir.
+
java_get_plugin_dir_() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
echo "${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
}
+
+# @FUNCTION: install_mozilla_plugin
+# @DESCRIPTION:
+# Register a netscape java-plugin.
+
install_mozilla_plugin() {
local plugin="${1}"
local variant="${2}"
@@ -281,10 +374,15 @@
dosym "${plugin}" "${plugin_dir}/${VMHANDLE}${variant}-javaplugin.so"
}
+
+# @FUNCTION: java_mozilla_clean_
+# @INTERNAL
+# @DESCRIPTION:
+# Because previously some ebuilds installed symlinks outside of pkg_install
+# and are left behind, which forces you to manualy remove them to select the
+# jdk/jre you want to use for java
+
java_mozilla_clean_() {
- # Because previously some ebuilds installed symlinks outside of pkg_install
- # and are left behind, which forces you to manualy remove them to select the
- # jdk/jre you want to use for java
local plugin_dir=$(java_get_plugin_dir_)
for file in ${plugin_dir}/javaplugin_*; do
rm -f ${file}
@@ -293,7 +391,3 @@
rm -f ${file}
done
}
-
-# ------------------------------------------------------------------------------
-# @eclass-end
-# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2012-07-18 16:54 Ralph Sennhauser (sera)
0 siblings, 0 replies; 11+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-07-18 16:54 UTC (permalink / raw
To: gentoo-commits
sera 12/07/18 16:54:55
Modified: ChangeLog java-vm-2.eclass
Log:
Add ROOT support, patch by vapier. #416341
Revision Changes Path
1.343 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.343&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.343&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.342&r2=1.343
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- ChangeLog 18 Jul 2012 15:12:54 -0000 1.342
+++ ChangeLog 18 Jul 2012 16:54:55 -0000 1.343
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.342 2012/07/18 15:12:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.343 2012/07/18 16:54:55 sera Exp $
+
+ 18 Jul 2012; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
+ Add ROOT support, patch by vapier. #416341
18 Jul 2012; Ulrich Müller <ulm@gentoo.org> bzr.eclass:
Don't assign useless values to DESCRIPTION and HOMEPAGE variables.
1.45 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.44&r2=1.45
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- java-vm-2.eclass 12 Jun 2012 09:17:33 -0000 1.44
+++ java-vm-2.eclass 18 Jul 2012 16:54:55 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.44 2012/06/12 09:17:33 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.45 2012/07/18 16:54:55 sera Exp $
# @ECLASS: java-vm-2.eclass
# @MAINTAINER:
@@ -73,12 +73,12 @@
# Note that we cannot rely on java-config here, as it will silently recognize
# e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due
# to the migration to icedtea-6)
- if [[ ! -L "${JAVA_VM_SYSTEM}" ]]; then
+ if [[ ! -L "${ROOT}${JAVA_VM_SYSTEM}" ]]; then
java_set_default_vm_
else
- local current_vm_path="$(readlink "${JAVA_VM_SYSTEM}")"
- local current_vm="$(basename "${current_vm_path}")"
- if [[ ! -L "${JAVA_VM_DIR}/${current_vm}" ]]; then
+ local current_vm_path=$(readlink "${ROOT}${JAVA_VM_SYSTEM}")
+ local current_vm=$(basename "${ROOT}${current_vm_path}")
+ if [[ ! -L "${ROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then
java_set_default_vm_
fi
fi
@@ -106,7 +106,7 @@
# Install a default nsplugin if we don't already have one
if in_iuse nsplugin && use nsplugin; then
- if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then
+ if [[ ! -f "${ROOT}${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then
einfo "No system nsplugin currently set."
java-vm_set-nsplugin
else
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2012-07-23 19:06 Ralph Sennhauser (sera)
0 siblings, 0 replies; 11+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-07-23 19:06 UTC (permalink / raw
To: gentoo-commits
sera 12/07/23 19:06:20
Modified: ChangeLog java-vm-2.eclass
Log:
Add C to flags pass to pax-mark to ensure a header is created. Thanks to blueness. #427642
Revision Changes Path
1.352 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.352&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.352&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.351&r2=1.352
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- ChangeLog 23 Jul 2012 14:11:26 -0000 1.351
+++ ChangeLog 23 Jul 2012 19:06:20 -0000 1.352
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.351 2012/07/23 14:11:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.352 2012/07/23 19:06:20 sera Exp $
+
+ 23 Jul 2012; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
+ Add C to flags pass to pax-mark to ensure a header is created. Thanks to
+ blueness. #427642
23 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> myspell-r2.eclass:
More licenses removal
1.46 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.45&r2=1.46
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- java-vm-2.eclass 18 Jul 2012 16:54:55 -0000 1.45
+++ java-vm-2.eclass 23 Jul 2012 19:06:20 -0000 1.46
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.45 2012/07/18 16:54:55 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.46 2012/07/23 19:06:20 sera Exp $
# @ECLASS: java-vm-2.eclass
# @MAINTAINER:
@@ -277,10 +277,12 @@
local executables=( "${1}"/bin/* )
[[ -d "${1}"/jre ]] && executables+=( "${1}"/jre/bin/* )
- # Usally disabeling MPROTECT is sufficent
- local pax_markings="m"
+ # Ensure a PaX header is created.
+ local pax_markings="C"
+ # Usally disabeling MPROTECT is sufficent.
+ local pax_markings+="m"
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
- use x86 && pax_markings="msp"
+ use x86 && pax_markings+="sp"
pax-mark ${pax_markings} $(list-paxables "${executables[@]}")
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass
@ 2014-07-22 6:38 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2014-07-22 6:38 UTC (permalink / raw
To: gentoo-commits
haubi 14/07/22 06:38:57
Modified: ChangeLog java-vm-2.eclass
Log:
java-vm-2.eclass: Respect EPREFIX in pkg_postinst, bug#517236.
Revision Changes Path
1.1324 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1324&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1324&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1323&r2=1.1324
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1323
retrieving revision 1.1324
diff -u -r1.1323 -r1.1324
--- ChangeLog 19 Jul 2014 10:18:41 -0000 1.1323
+++ ChangeLog 22 Jul 2014 06:38:56 -0000 1.1324
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1323 2014/07/19 10:18:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1324 2014/07/22 06:38:56 haubi Exp $
+
+ 22 Jul 2014; Michael Haubenwallner <haubi@gentoo.org> java-vm-2.eclass:
+ Respect EPREFIX in pkg_postinst, bug#517236.
19 Jul 2014; Fabian Groffen <grobian@gentoo.org> mysql.eclass,
mysql-autotools.eclass, mysql-cmake.eclass, mysql-v2.eclass:
1.47 eclass/java-vm-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.46&r2=1.47
Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- java-vm-2.eclass 23 Jul 2012 19:06:20 -0000 1.46
+++ java-vm-2.eclass 22 Jul 2014 06:38:56 -0000 1.47
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.46 2012/07/23 19:06:20 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.47 2014/07/22 06:38:56 haubi Exp $
# @ECLASS: java-vm-2.eclass
# @MAINTAINER:
@@ -70,15 +70,16 @@
# setting is invalid. Also update mime database.
java-vm-2_pkg_postinst() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT=${ROOT}
# Note that we cannot rely on java-config here, as it will silently recognize
# e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due
# to the migration to icedtea-6)
- if [[ ! -L "${ROOT}${JAVA_VM_SYSTEM}" ]]; then
+ if [[ ! -L "${EROOT}${JAVA_VM_SYSTEM}" ]]; then
java_set_default_vm_
else
- local current_vm_path=$(readlink "${ROOT}${JAVA_VM_SYSTEM}")
+ local current_vm_path=$(readlink "${EROOT}${JAVA_VM_SYSTEM}")
local current_vm=$(basename "${ROOT}${current_vm_path}")
- if [[ ! -L "${ROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then
+ if [[ ! -L "${EROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then
java_set_default_vm_
fi
fi
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-07-22 6:39 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-12 13:05 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-vm-2.eclass Ralph Sennhauser (sera)
-- strict thread matches above, loose matches on Subject: below --
2011-11-15 9:02 Vlastimil Babka (caster)
2011-11-21 10:15 Ralph Sennhauser (sera)
2011-11-24 20:05 Ralph Sennhauser (sera)
2011-12-04 6:52 Brian Harring (ferringb)
2011-12-05 7:07 Mike Gilbert (floppym)
2012-06-11 19:46 Ralph Sennhauser (sera)
2012-06-12 9:17 Ralph Sennhauser (sera)
2012-07-18 16:54 Ralph Sennhauser (sera)
2012-07-23 19:06 Ralph Sennhauser (sera)
2014-07-22 6:38 Michael Haubenwallner (haubi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox