summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-01-24 20:03:45 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-01-24 20:03:45 +0000
commitcc96dc32b92ae8194d85792e5592db25769aa6cc (patch)
treefcddabeef77f0ccdc341085ccdd2fc2f4d627620 /dev-java
parentStable on hppa. (Manifest recommit) (diff)
downloadgentoo-2-cc96dc32b92ae8194d85792e5592db25769aa6cc.tar.gz
gentoo-2-cc96dc32b92ae8194d85792e5592db25769aa6cc.tar.bz2
gentoo-2-cc96dc32b92ae8194d85792e5592db25769aa6cc.zip
defined CHPAX_CONSERVATIVE_FLAGS to fix #75309.
(Portage version: 2.0.51-r14)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/blackdown-jdk/ChangeLog7
-rw-r--r--dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild4
-rw-r--r--dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild4
-rw-r--r--dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.014
-rw-r--r--dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r14
5 files changed, 16 insertions, 7 deletions
diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 4e282ecf2ed1..021f29c8f14a 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/blackdown-jdk
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.70 2005/01/12 22:13:11 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.71 2005/01/24 20:03:45 luckyduck Exp $
+
+ 24 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+ files/blackdown-jdk-1.4.2.01, files/blackdown-jdk-1.4.2.01-r1,
+ blackdown-jdk-1.4.2.01-r1.ebuild, blackdown-jdk-1.4.2.01.ebuild:
+ defined CHPAX_CONSERVATIVE_FLAGS to fix #75309.
12 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
blackdown-jdk-1.4.1-r1.ebuild:
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
index d19e0bc43d98..d4983d6dc5c7 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild,v 1.4 2005/01/01 18:11:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild,v 1.5 2005/01/24 20:03:45 luckyduck Exp $
inherit java versionator
@@ -136,6 +136,8 @@ pkg_postinst() {
echo
einfo "setting up conservative PaX flags for jar and javac"
+ CHPAX_CONSERVATIVE_FLAGS="pemrxs"
+
for paxkills in "jar" "javac" "java"
do
chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
index 4b863a296f49..826b1efc0f46 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild,v 1.4 2005/01/01 18:11:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild,v 1.5 2005/01/24 20:03:45 luckyduck Exp $
inherit java versionator
@@ -134,6 +134,8 @@ pkg_postinst() {
echo
einfo "setting up conservative PaX flags for jar and javac"
+ CHPAX_CONSERVATIVE_FLAGS="pemrxs"
+
for paxkills in "jar" "javac" "java"
do
chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
diff --git a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01
index 027778b73f10..a62d6530788e 100644
--- a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01
@@ -1,12 +1,12 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01,v 1.1 2004/11/24 20:50:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01,v 1.2 2005/01/24 20:03:45 luckyduck Exp $
VERSION="Blackdown JDK @PV@"
JAVA_HOME=/opt/@P@
JDK_HOME=/opt/@P@
JAVAC=${JAVA_HOME}/bin/javac
ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/"
+ADDLDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
MANPATH=/opt/@P@/man
ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1
index 296efbbb6c69..9fac4df89de6 100644
--- a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1
@@ -1,12 +1,12 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1,v 1.1 2004/12/23 12:14:06 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1,v 1.2 2005/01/24 20:03:45 luckyduck Exp $
VERSION="Blackdown JDK @PV@"
JAVA_HOME=/opt/@P@
JDK_HOME=/opt/@P@
JAVAC=${JAVA_HOME}/bin/javac
ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/"
+ADDLDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
MANPATH=/opt/@P@/man
ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"