diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-11 13:21:56 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-11 13:21:56 +0000 |
| commit | 176800f6cc12824138c6d3093082b9ad652a933c (patch) | |
| tree | 7cd45938d0b37aa81c56346b2f744b65100da3ad /dev-java | |
| parent | welcome browserplugin (diff) | |
| download | historical-176800f6cc12824138c6d3093082b9ad652a933c.tar.gz historical-176800f6cc12824138c6d3093082b9ad652a933c.tar.bz2 historical-176800f6cc12824138c6d3093082b9ad652a933c.zip | |
bug 69542: javaws broken, add preload hack. bug 94056: useflag rename mozilla -> browserplugin
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java')
20 files changed, 373 insertions, 421 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index d9e27492f813..ebbfa636f2d4 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.114 2005/06/28 11:18:40 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.115 2005/07/11 13:21:55 axxo Exp $ + +*sun-jdk-1.4.2.08-r1 (11 Jul 2005) + + 11 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -files/sun-jdk-1.5.0.02, + -files/sun-jdk-1.5.0.03, +files/javaws-waitid.c, sun-jdk-1.2.2.017.ebuild, + sun-jdk-1.3.1.13.ebuild, sun-jdk-1.4.2.08.ebuild, + +sun-jdk-1.4.2.08-r1.ebuild, -sun-jdk-1.5.0.02-r1.ebuild, + -sun-jdk-1.5.0.03.ebuild, sun-jdk-1.5.0.04.ebuild: + bug 69542: javaws broken, add preload hack. bug 94056: useflag rename + mozilla -> browserplugin *sun-jdk-1.5.0.04 (28 Jun 2005) diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index 4598b8eb267a..7d945791c903 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -1,30 +1,17 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 7f861d0d853e5d5e71a97ea7573cadb0 sun-jdk-1.3.1.13.ebuild 3785 -MD5 6d442e148f395e4101ee4640a95c7c54 sun-jdk-1.5.0.03.ebuild 6969 -MD5 cc6b8f9c01104fa009af2bf90aec953e sun-jdk-1.2.2.017.ebuild 3114 -MD5 9bd6795e36b20d7f21d86322a9b2e81c sun-jdk-1.4.2.08.ebuild 6203 -MD5 7ea5e277c360811313944beb6de383bb sun-jdk-1.5.0.04.ebuild 6969 +MD5 7ce6ecf5d389f473404b4c25c04eeea6 sun-jdk-1.4.2.08-r1.ebuild 6480 +MD5 1edf120dea46f2d448d9abf064c95446 sun-jdk-1.3.1.13.ebuild 3733 +MD5 c7441ce1291766a1ee5494d80881ee63 sun-jdk-1.2.2.017.ebuild 2931 +MD5 0efd31e7e1a2ba243c0fb9281770c55b sun-jdk-1.4.2.08.ebuild 6181 +MD5 3d20bc08df0d9d3905245c0fc191f13b sun-jdk-1.5.0.04.ebuild 6951 MD5 ad17d20968ce10e4ee84bfffba820ad6 ChangeLog 23710 -MD5 645ed5bb0daa7a4507172022736897e6 sun-jdk-1.5.0.02-r1.ebuild 6972 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239 MD5 0f94a657aa38fbca24dd767967474bc4 files/sun-jdk-1.3.1.13 475 MD5 a9fa8b3f17e5639d26a53ab0c163e25c files/sun-jdk-1.4.2.08 495 -MD5 7e47512a18f9af78546d9b528b3bfd47 files/sun-jdk-1.5.0.02 471 -MD5 42c1ef4e10df8f6d1f01a9c95973b7e3 files/sun-jdk-1.5.0.03 476 MD5 57bd74c36bf2f6202cb9b470ae6ff365 files/sun-jdk-1.5.0.04 471 MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78 +MD5 49cf0d15bb5d59149d1828735355d139 files/digest-sun-jdk-1.4.2.08-r1 140 MD5 d1e29e8acce3cfec9912e23aa366478a files/digest-sun-jdk-1.3.1.13 76 MD5 49cf0d15bb5d59149d1828735355d139 files/digest-sun-jdk-1.4.2.08 140 -MD5 160b416ee657e71dda6bdfb888696231 files/digest-sun-jdk-1.5.0.03 212 MD5 3bb18cb5771d0bf04e97de8d08d41117 files/digest-sun-jdk-1.5.0.04 212 -MD5 dc0cdafb5c99594fb0ef9daa13b35fcf files/digest-sun-jdk-1.5.0.02-r1 212 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCwTIw/rLF9B432nYRAuQgAJ9WBd3eELSMRrNATIC8/Qo5H3pumACgo8Mn -BY9oexwRev4Em4EeDqFN3Wk= -=r8av ------END PGP SIGNATURE----- +MD5 64ade01a917993ba9712b2c0d2f4a580 files/javaws-waitid.c 833 diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08-r1 new file mode 100644 index 000000000000..4d7c6a558899 --- /dev/null +++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08-r1 @@ -0,0 +1,2 @@ +MD5 e35832af75e963a58119d2344a5a37c0 j2sdk-1_4_2_08-linux-i586.bin 36418360 +MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195 diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.02-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.02-r1 deleted file mode 100644 index decf30bbef29..000000000000 --- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.02-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 562d9797af801bfbe2b5e44417d8ccc4 jdk-1_5_0_02-linux-i586.bin 46155976 -MD5 db0d14713854fb3be9350fd68bf2674f jdk-1_5_0_02-linux-amd64.bin 42119076 -MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826 diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.03 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.03 deleted file mode 100644 index c90ae1f47427..000000000000 --- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.03 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bc221641fcfdc9268499001326fc8ebb jdk-1_5_0_03-linux-i586.bin 48772357 -MD5 7ee64fb99eee684b849248db4d778eef jdk-1_5_0_03-linux-amd64.bin 43533399 -MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826 diff --git a/dev-java/sun-jdk/files/javaws-waitid.c b/dev-java/sun-jdk/files/javaws-waitid.c new file mode 100644 index 000000000000..eea428d79c75 --- /dev/null +++ b/dev-java/sun-jdk/files/javaws-waitid.c @@ -0,0 +1,33 @@ +/* Quick and dirty pre-loaded DSO to make buggy javawsbin + in JDK 1.4.2_07 work on Linux with kernel 2.6.x and + glibc 2.3.4. + + Compilation: + gcc -O2 -fPIC -g0 -shared -o mywait.so mywait.c + + Usage (Bash): + LD_PRELOAD=/path/to/mywait.so /path/to/javaws <Launcher URL> + + + Taken from: http://www.advogato.org/person/rmathew/diary.html?start=71 + */ +#include <dlfcn.h> +#include <sys/wait.h> + + int (*real_waitid)( idtype_t, id_t, siginfo_t *, int); + + int +waitid( idtype_t idtype, id_t id, siginfo_t *infop, int options) +{ + int retVal = -1; + + void *handle = dlopen( "/lib/libc.so.6", RTLD_LAZY); + real_waitid = dlsym( handle, "waitid"); + + options = (options == 0) ? WEXITED : options; + retVal = (*real_waitid)( idtype, id, infop, options); + + dlclose( handle); + + return retVal; +} /* End pseudo-waitid() */ diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.0.02 b/dev-java/sun-jdk/files/sun-jdk-1.5.0.02 deleted file mode 100644 index 86273095d89b..000000000000 --- a/dev-java/sun-jdk/files/sun-jdk-1.5.0.02 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.5.0.02,v 1.1 2005/03/21 18:20:11 axxo Exp $ - -VERSION="Sun JDK @PV@" -JAVA_HOME=/opt/@P@ -JDK_HOME=/opt/@P@ -JAVAC=${JAVA_HOME}/bin/javac -ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ADDLDPATH="/opt/@P@/jre/lib" -MANPATH="/opt/@P@/man" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH" diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.0.03 b/dev-java/sun-jdk/files/sun-jdk-1.5.0.03 deleted file mode 100644 index d68b6e56697d..000000000000 --- a/dev-java/sun-jdk/files/sun-jdk-1.5.0.03 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.5.0.03,v 1.1 2005/05/04 12:23:33 luckyduck Exp $ - -VERSION="Sun JDK @PV@" -JAVA_HOME=/opt/@P@ -JDK_HOME=/opt/@P@ -JAVAC=${JAVA_HOME}/bin/javac -ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ADDLDPATH="/opt/@P@/jre/lib" -MANPATH="/opt/@P@/man" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH" diff --git a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild index 585ee6e27991..8e864026b15c 100644 --- a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.2.2.017.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/sun-jdk/sun-jdk-1.2.2.017.ebuild,v 1.5 2005/05/18 15:48:35 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild,v 1.6 2005/07/11 13:21:55 axxo Exp $ inherit java @@ -13,9 +13,9 @@ PROVIDE="virtual/jre virtual/jdk" LICENSE="sun-bcla-java-vm-1.2" SLOT="1.2" -KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm" +KEYWORDS="~x86 -*" RESTRICT="fetch" -IUSE="doc mozilla X" +IUSE="doc X" # NOTE: Sun's JDK also requires the XFree86 be installed to use the graphical # libraries. Even some non-graphical libraries (such as JavaMail) have bizarre # dependencies on windowing toolkits. @@ -81,13 +81,6 @@ pkg_postinst() { # Set as default VM if none exists java_pkg_postinst - # Again, this will not work as a Mozilla plugin. - if use mozilla ; then - echo - einfo "JDK 1.2.2 does not work with Mozilla. A more recent JDK is" - einfo "required." - fi - # Warn the user if they don't appear to have XFree86 installed. if ! use X ; then echo diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild index e6a2109820b1..67f0df578d40 100644 --- a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.3.1.13.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/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.7 2005/05/18 15:48:35 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.8 2005/07/11 13:21:55 axxo Exp $ inherit java eutils @@ -21,10 +21,10 @@ PROVIDE="virtual/jre virtual/jdk" LICENSE="sun-bcla-java-vm" SLOT="1.3" -KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa" +KEYWORDS="x86 -*" RESTRICT="fetch" -IUSE="doc mozilla" +IUSE="doc browserplugin mozilla" # this is needed for proper operating under a PaX kernel without activated grsecurity acl CHPAX_CONSERVATIVE_FLAGS="pemsv" @@ -87,8 +87,8 @@ src_install () { dodir /opt/${P}/share/ cp -a demo src.jar ${D}/opt/${P}/share/ - if use mozilla ; then - install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/ + if use browserplugin || use mozilla; then + install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so fi set_java_env ${FILESDIR}/${VMHANDLE} || die @@ -108,11 +108,11 @@ pkg_postinst () { for paxkills in "jar" "javac" "java" "javah" "javadoc" do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills done # /opt/sun-jdk-1.3.1.09/jre/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm einfo "you should have seen lots of chpax output above now" ewarn "make sure the grsec ACL contains those entries also" @@ -122,9 +122,6 @@ pkg_postinst () { fi echo - eerror "Some parts of Sun's JDK require XFree86 to be installed." + eerror "Some parts of Sun's JDK require X11 to be installed." eerror "Be careful which Java libraries you attempt to use." - - ebeep 5 - epause 8 } diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild index 068ee6c0dd81..b0d0838015f6 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild @@ -1,91 +1,79 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild,v 1.2 2005/05/18 15:48:35 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild,v 1.1 2005/07/11 13:21:55 axxo Exp $ inherit java eutils -MY_PVL=${PV%.*}_${PV##*.} -MY_PVA=${PV//./_} +MY_PV=${PV%.*}_${PV##*.} +MY_P=j2sdk${MY_PV} +MY_PVB=${PV%.*} -amd64file="jdk-${MY_PVA}-linux-amd64.bin" -x86file="jdk-${MY_PVA}-linux-i586.bin" +At="j2sdk-${PV//./_}-linux-i586.bin" +jce_policy="jce_policy-${MY_PVB//./_}.zip" -jcefile="jce_policy-${MY_PVA%_*}.zip" - -if use x86; then - At=${x86file} -elif use amd64; then - At=${amd64file} -fi - -S="${WORKDIR}/jdk${MY_PVL}" -DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" -HOMEPAGE="http://java.sun.com/j2se/1.5.0/" -SRC_URI="x86? ( $x86file ) amd64? ( $amd64file ) - jce? ( $jcefile )" -SLOT="1.5" +S="${WORKDIR}/${MY_P}" +DESCRIPTION="Sun's J2SE Development Kit" +HOMEPAGE="http://java.sun.com/j2se/1.4.2/" +SRC_URI="${At} + jce? ( ${jce_policy} )" +SLOT="1.4" LICENSE="sun-bcla-java-vm" -KEYWORDS="~x86 ~amd64" -RESTRICT="fetch nostrip" -IUSE="doc gnome kde mozilla jce" +KEYWORDS="-* ~x86" +RESTRICT="fetch" +IUSE="doc browserplugin jce mozilla" -# -DEPEND=">=dev-java/java-config-1.2 +DEPEND=">=dev-java/java-config-1.1.5 sys-apps/sed - jce? ( app-arch/unzip ) - doc? ( =dev-java/java-sdk-docs-1.5.0* )" + app-arch/unzip + doc? ( =dev-java/java-sdk-docs-1.4.2* )" -RDEPEND="x86? ( sys-libs/lib-compat ) - doc? ( =dev-java/java-sdk-docs-1.5.0* )" +RDEPEND="sys-libs/lib-compat" PROVIDE="virtual/jre virtual/jdk" -PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar" +PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar +jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar" # this is needed for proper operating under a PaX kernel without activated grsecurity acl -CHPAX_CONSERVATIVE_FLAGS="pemsv" - -FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg" -FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg" +CHPAX_CONSERVATIVE_FLAGS="pemrsv" +DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg" +DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg" pkg_nofetch() { einfo "Please download ${At} from:" - einfo ${FETCH_SDK} - einfo "(Select the Self-extracting (.bin) for Linux or Linux AMD64, depending on your arch)" + einfo ${DOWNLOAD_URL} + einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting." einfo "and move it to ${DISTDIR}" - if use jce; then echo - einfo "Also download ${jcefile} from:" - einfo ${FETCH_JCE} + einfo "Also download ${jce_policy} from:" + einfo ${DOWNLOAD_URL_JCE} einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files" einfo "and move it to ${DISTDIR}" fi - } src_unpack() { if [ ! -r ${DISTDIR}/${At} ]; then - die "cannot read ${At}. Please check the permission and try again." + die "cannot read ${MY_PV}.bin. Please check the permission and try again." fi if use jce; then - if [ ! -r ${DISTDIR}/${jcefile} ]; then - die "cannot read ${jcefile}. Please check the permission and try again." + if [ ! -r ${DISTDIR}/${jce_policy} ]; then + die "cannot read ${jce_policy}. Please check the permission and try again." fi fi - #Search for the ELF Header - testExp=`echo -e "\105\114\106"` + testExp=`echo -e "\177\105\114\106\001\001\001"` startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1` tail -n +${startAt} ${DISTDIR}/${At} > install.sfx chmod +x install.sfx ./install.sfx || die rm install.sfx - if [ -f ${S}/bin/unpack200 ]; then - UNPACK_CMD=${S}/bin/unpack200 + if [ -f ${S}/lib/unpack ]; then + UNPACK_CMD=${S}/lib/unpack chmod +x $UNPACK_CMD sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD for i in $PACKED_JARS; do @@ -96,11 +84,14 @@ src_unpack() { rm -f ${PACK_FILE} fi done - rm -f ${UNPACK_CMD} - else - die "unpack not found" fi - ${S}/bin/java -client -Xshare:dump + #javaws hack + cd ${S} + sed -i "s,^exec,export LD_PRELOAD=/opt/${P}/jre/javaws/javaws-waitid.so\nexec," jre/javaws/javaws || die "javaws sed failed" +} + +src_compile() { + gcc -O2 -fPIC -g0 -shared -o ${S}/jre/javaws/javaws-waitid.so ${FILESDIR}/javaws-waitid.c || die "failed to compile javaws hack" } src_install() { @@ -108,19 +99,20 @@ src_install() { dodir /opt/${P} for i in $dirs ; do - cp -a $i ${D}/opt/${P}/ || die "failed to copy" + cp -dPR $i ${D}/opt/${P}/ done - dodoc COPYRIGHT LICENSE README.html + + dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt dohtml README.html dodir /opt/${P}/share/ cp -a demo src.zip ${D}/opt/${P}/share/ - if ( use x86 || use amd64 ); then - cp -a sample ${D}/opt/${P}/share/ - fi if use jce ; then + # Using unlimited jce while still retaining the strong jce + # May have repercussions when you find you cannot symlink libraries + # in classpaths. cd ${D}/opt/${P}/jre/lib/security - unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce" + unzip ${DISTDIR}/${jce_policy} mv jce unlimited-jce dodir /opt/${P}/jre/lib/security/strong-jce mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce @@ -129,17 +121,13 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - if use mozilla; then - local plugin_dir="ns7-gcc29" - if has_version '>=gcc-3*' ; then - plugin_dir="ns7" + if use browserplugin || use mozilla; then + local plugin_dir="ns610" + if has_version '>=gcc-3.2*' ; then + plugin_dir="ns610-gcc32" fi - if use x86 ; then - install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so - else - eerror "No plugin available for amd64 arch" - fi + install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so fi # create dir for system preferences @@ -162,16 +150,10 @@ src_install() { pkg_postinst() { # Create files used as storage for system preferences. - PREFS_LOCATION=/opt/${P}/jre - mkdir -p ${PREFS_LOCATION}/.systemPrefs - if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then - touch $PREFS_LOCATION/.systemPrefs/.system.lock - chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock - fi - if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then - touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile - chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile - fi + touch /opt/${P}/.systemPrefs/.system.lock + chmod 644 /opt/${P}/.systemPrefs/.system.lock + touch /opt/${P}/.systemPrefs/.systemRootModFile + chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile # Set as default VM if none exists java_pkg_postinst @@ -195,11 +177,11 @@ pkg_postinst() { for paxkills in "jar" "javac" "java" "javah" "javadoc" do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills done - # /opt/$VM/jre/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm + # /opt/sun-jdk-1.4.2.03/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm einfo "you should have seen lots of chpax output above now" ewarn "make sure the grsec ACL contains those entries also" @@ -209,15 +191,12 @@ pkg_postinst() { fi echo - eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed." + eerror "Some parts of Sun's JDK require virtual/x11 to be installed." eerror "Be careful which Java libraries you attempt to use." - echo - einfo " Be careful: ${P}'s Java compiler uses" - einfo " '-source 1.5' as default. Some keywords such as 'enum'" - einfo " are not valid identifiers any more in that mode," - einfo " which can cause incompatibility with certain sources." - - ebeep 5 - epause 8 + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi } diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild index b3a4953c2999..93d114836ca8 100644 --- a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.4.2.08.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/sun-jdk/sun-jdk-1.4.2.08.ebuild,v 1.5 2005/05/18 15:48:35 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild,v 1.6 2005/07/11 13:21:55 axxo Exp $ inherit java eutils @@ -20,7 +20,7 @@ SLOT="1.4" LICENSE="sun-bcla-java-vm" KEYWORDS="x86 -*" RESTRICT="fetch" -IUSE="doc mozilla jce" +IUSE="doc browserplugin jce mozilla" DEPEND=">=dev-java/java-config-1.1.5 sys-apps/sed @@ -114,7 +114,7 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - if use mozilla; then + if use browserplugin || use mozilla; then local plugin_dir="ns610" if has_version '>=gcc-3.2*' ; then plugin_dir="ns610-gcc32" @@ -170,11 +170,11 @@ pkg_postinst() { for paxkills in "jar" "javac" "java" "javah" "javadoc" do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills done # /opt/sun-jdk-1.4.2.03/jre/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm einfo "you should have seen lots of chpax output above now" ewarn "make sure the grsec ACL contains those entries also" @@ -187,6 +187,9 @@ pkg_postinst() { eerror "Some parts of Sun's JDK require virtual/x11 to be installed." eerror "Be careful which Java libraries you attempt to use." - ebeep 5 - epause 8 + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi } diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild deleted file mode 100644 index 73d12a42dff4..000000000000 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild,v 1.5 2005/05/18 15:48:35 axxo Exp $ - -inherit java eutils - -MY_PVL=${PV%.*}_${PV##*.} -MY_PVA=${PV//./_} - -amd64file="jdk-${MY_PVA}-linux-amd64.bin" -x86file="jdk-${MY_PVA}-linux-i586.bin" - -jcefile="jce_policy-${MY_PVA%_*}.zip" - -if use x86; then - At=${x86file} -elif use amd64; then - At=${amd64file} -fi - -S="${WORKDIR}/jdk${MY_PVL}" -DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" -HOMEPAGE="http://java.sun.com/j2se/1.5.0/" -SRC_URI="x86? ( $x86file ) amd64? ( $amd64file ) - jce? ( $jcefile )" -SLOT="1.5" -LICENSE="sun-bcla-java-vm" -KEYWORDS="~x86 ~amd64" -RESTRICT="fetch nostrip" -IUSE="doc gnome kde mozilla jce" - -# -DEPEND=">=dev-java/java-config-1.2 - sys-apps/sed - jce? ( app-arch/unzip ) - doc? ( =dev-java/java-sdk-docs-1.5.0* )" - -RDEPEND="x86? ( sys-libs/lib-compat ) - doc? ( =dev-java/java-sdk-docs-1.5.0* )" - -PROVIDE="virtual/jre - virtual/jdk" - -PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar" - -# this is needed for proper operating under a PaX kernel without activated grsecurity acl -CHPAX_CONSERVATIVE_FLAGS="pemsv" - -FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg" -FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg" - - -pkg_nofetch() { - einfo "Please download ${At} from:" - einfo ${FETCH_SDK} - einfo "(Select the Self-extracting (.bin) for Linux or Linux AMD64, depending on your arch)" - einfo "and move it to ${DISTDIR}" - - if use jce; then - echo - einfo "Also download ${jcefile} from:" - einfo ${FETCH_JCE} - einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files" - einfo "and move it to ${DISTDIR}" - fi - -} - -src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then - die "cannot read ${At}. Please check the permission and try again." - fi - if use jce; then - if [ ! -r ${DISTDIR}/${jcefile} ]; then - die "cannot read ${jcefile}. Please check the permission and try again." - fi - fi - - #Search for the ELF Header - testExp=`echo -e "\105\114\106"` - startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1` - tail -n +${startAt} ${DISTDIR}/${At} > install.sfx - chmod +x install.sfx - ./install.sfx || die - rm install.sfx - - if [ -f ${S}/bin/unpack200 ]; then - UNPACK_CMD=${S}/bin/unpack200 - chmod +x $UNPACK_CMD - sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD - for i in $PACKED_JARS; do - PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack - if [ -f ${PACK_FILE} ]; then - echo " unpacking: $i" - $UNPACK_CMD ${PACK_FILE} ${S}/$i - rm -f ${PACK_FILE} - fi - done - rm -f ${UNPACK_CMD} - else - die "unpack not found" - fi - ${S}/bin/java -client -Xshare:dump -} - -src_install() { - local dirs="bin include jre lib man" - dodir /opt/${P} - - for i in $dirs ; do - cp -a $i ${D}/opt/${P}/ || die "failed to copy" - done - dodoc COPYRIGHT LICENSE README.html - dohtml README.html - dodir /opt/${P}/share/ - cp -a demo src.zip ${D}/opt/${P}/share/ - if ( use x86 || use amd64 ); then - cp -a sample ${D}/opt/${P}/share/ - fi - - if use jce ; then - cd ${D}/opt/${P}/jre/lib/security - unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce" - mv jce unlimited-jce - dodir /opt/${P}/jre/lib/security/strong-jce - mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce - mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce - dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ - dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ - fi - - if use mozilla; then - local plugin_dir="ns7-gcc29" - if has_version '>=gcc-3*' ; then - plugin_dir="ns7" - fi - - if use x86 ; then - install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so - else - eerror "No plugin available for amd64 arch" - fi - fi - - # create dir for system preferences - dodir /opt/${P}/.systemPrefs - - # install control panel for Gnome/KDE - sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ - -e "s/\(Name=Java\)/\1 Control Panel/" \ - ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ - ${T}/sun_java.desktop - - domenu ${T}/sun_java.desktop - - set_java_env ${FILESDIR}/${VMHANDLE} - - # TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory, - # creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP - # is a directory and will not be gzipped ;) -} - -pkg_postinst() { - # Create files used as storage for system preferences. - PREFS_LOCATION=/opt/${P}/jre - mkdir -p ${PREFS_LOCATION}/.systemPrefs - if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then - touch $PREFS_LOCATION/.systemPrefs/.system.lock - chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock - fi - if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then - touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile - chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile - fi - - # Set as default VM if none exists - java_pkg_postinst - - #Show info about netscape - if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then - echo - einfo "If you want to install the plugin for Netscape 4.x, type" - einfo - einfo " cd /usr/lib/nsbrowser/plugins/" - einfo " ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so" - fi - - # if chpax is on the target system, set the appropriate PaX flags - # this will not hurt the binary, it modifies only unused ELF bits - # but may confuse things like AV scanners and automatic tripwire - if has_version "sys-apps/chpax" - then - echo - einfo "setting up conservative PaX flags for jar, javac and java" - - for paxkills in "jar" "javac" "java" "javah" "javadoc" - do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills - done - - # /opt/$VM/jre/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm - - einfo "you should have seen lots of chpax output above now" - ewarn "make sure the grsec ACL contains those entries also" - ewarn "because enabling it will override the chpax setting" - ewarn "on the physical files - help for PaX and grsecurity" - ewarn "can be given by #gentoo-hardened + pappy@gentoo.org" - fi - - echo - eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed." - eerror "Be careful which Java libraries you attempt to use." - - echo - einfo " Be careful: ${P}'s Java compiler uses" - einfo " '-source 1.5' as default. Some keywords such as 'enum'" - einfo " are not valid identifiers any more in that mode," - einfo " which can cause incompatibility with certain sources." - - ebeep 5 - epause 8 -} diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild index 523ba8a97324..021aa7c1bb5f 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.04.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/sun-jdk/sun-jdk-1.5.0.04.ebuild,v 1.1 2005/06/28 11:18:40 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild,v 1.2 2005/07/11 13:21:55 axxo Exp $ inherit java eutils @@ -25,9 +25,9 @@ SRC_URI="x86? ( $x86file ) amd64? ( $amd64file ) jce? ( $jcefile )" SLOT="1.5" LICENSE="sun-bcla-java-vm" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~x86 ~amd64 -*" RESTRICT="fetch nostrip" -IUSE="doc gnome kde mozilla jce" +IUSE="doc browserplugin jce mozilla" # DEPEND=">=dev-java/java-config-1.2 @@ -129,7 +129,7 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - if use mozilla; then + if use browserplugin || use mozilla; then local plugin_dir="ns7-gcc29" if has_version '>=gcc-3*' ; then plugin_dir="ns7" @@ -195,11 +195,11 @@ pkg_postinst() { for paxkills in "jar" "javac" "java" "javah" "javadoc" do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills done # /opt/$VM/jre/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm einfo "you should have seen lots of chpax output above now" ewarn "make sure the grsec ACL contains those entries also" @@ -218,6 +218,9 @@ pkg_postinst() { einfo " are not valid identifiers any more in that mode," einfo " which can cause incompatibility with certain sources." - ebeep 5 - epause 8 + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi } diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index 7e9b399b3365..d4fad6bbbb8f 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,18 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 f616a1f2c6d082217298811f4b31227d sun-jre-bin-1.4.2.08.ebuild 4610 -MD5 f315428e927a7b623c56519222470d78 sun-jre-bin-1.5.0.04.ebuild 4974 +MD5 83314efefc0cff74b53433b89caa7b44 sun-jre-bin-1.4.2.08.ebuild 4588 +MD5 3348bcb35647775d996a853abf781da7 sun-jre-bin-1.4.2.08-r1.ebuild 4861 +MD5 8e89ca6a06a16602d5b0904cd01537da sun-jre-bin-1.5.0.04.ebuild 4986 MD5 c3c6b18d50bc518c15fbfbb94174b007 ChangeLog 5405 MD5 ca35f917561afc166491d77810b71095 metadata.xml 242 MD5 8f5aa278070a1b37d88a9abe3f238c31 files/digest-sun-jre-bin-1.4.2.08 75 MD5 375f1fcc6d5fbf77a2202df4851b0033 files/digest-sun-jre-bin-1.5.0.04 149 +MD5 8f5aa278070a1b37d88a9abe3f238c31 files/digest-sun-jre-bin-1.4.2.08-r1 75 +MD5 64ade01a917993ba9712b2c0d2f4a580 files/javaws-waitid.c 833 MD5 5a80336551071fdccb6dda6f2e08a79d files/sun-jre-bin-1.4.2.08 439 MD5 25c2e617fdcc9fa2215a8682748b64f3 files/sun-jre-bin-1.5.0.04 439 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCwUuV/rLF9B432nYRAtrQAJ0Ui+N4ajiamxI7BCL/gQ2MXJDE1wCgnJsp -kHpTIMro+Pgkj6B4B58sW9A= -=B/gF ------END PGP SIGNATURE----- diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08-r1 new file mode 100644 index 000000000000..ff0f856c8025 --- /dev/null +++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08-r1 @@ -0,0 +1 @@ +MD5 fa26930175b18ab4b2ad67eb7f43eb14 j2re-1_4_2_08-linux-i586.bin 14389429 diff --git a/dev-java/sun-jre-bin/files/javaws-waitid.c b/dev-java/sun-jre-bin/files/javaws-waitid.c new file mode 100644 index 000000000000..eea428d79c75 --- /dev/null +++ b/dev-java/sun-jre-bin/files/javaws-waitid.c @@ -0,0 +1,33 @@ +/* Quick and dirty pre-loaded DSO to make buggy javawsbin + in JDK 1.4.2_07 work on Linux with kernel 2.6.x and + glibc 2.3.4. + + Compilation: + gcc -O2 -fPIC -g0 -shared -o mywait.so mywait.c + + Usage (Bash): + LD_PRELOAD=/path/to/mywait.so /path/to/javaws <Launcher URL> + + + Taken from: http://www.advogato.org/person/rmathew/diary.html?start=71 + */ +#include <dlfcn.h> +#include <sys/wait.h> + + int (*real_waitid)( idtype_t, id_t, siginfo_t *, int); + + int +waitid( idtype_t idtype, id_t id, siginfo_t *infop, int options) +{ + int retVal = -1; + + void *handle = dlopen( "/lib/libc.so.6", RTLD_LAZY); + real_waitid = dlsym( handle, "waitid"); + + options = (options == 0) ? WEXITED : options; + retVal = (*real_waitid)( idtype, id, infop, options); + + dlclose( handle); + + return retVal; +} /* End pseudo-waitid() */ diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild new file mode 100644 index 000000000000..6b447303290c --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild,v 1.1 2005/07/11 13:20:24 axxo Exp $ + +inherit java eutils + +MY_PV=${PV%.*}_${PV##*.} +MY_PV2=${PV//./_} +At="j2re-${MY_PV2}-linux-i586.bin" +S="${WORKDIR}/j2re${MY_PV}" +DESCRIPTION="Sun's J2SE Platform" +HOMEPAGE="http://java.sun.com/j2se/1.4.2/" +SRC_URI=${At} +SLOT="1.4" +LICENSE="sun-bcla-java-vm-1.4.2" +KEYWORDS="-* ~x86" +RESTRICT="fetch" +IUSE="browserplugin mozilla" + +DEPEND=">=dev-java/java-config-1.1.5 + sys-apps/sed" + +RDEPEND="sys-libs/lib-compat" + +PROVIDE="virtual/jre" + +PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar +lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar" + +# this is needed for proper operating under a PaX kernel without activated grsecurity acl +CHPAX_CONSERVATIVE_FLAGS="pemsv" + +DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg" + +pkg_nofetch() { + einfo "Please download ${At} from:" + einfo ${DOWNLOAD_URL} + einfo "(select the \"Linux self-extracting file\" package format of the JRE" + einfo "and move it to ${DISTDIR}" +} + +src_unpack() { + if [ ! -r ${DISTDIR}/${At} ]; then + eerror "cannot read ${At}. Please check the permission and try again." + die + fi + #Search for the ELF Header + testExp=`echo -e "\177\105\114\106\001\001\001"` + startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1` + tail -n +${startAt} ${DISTDIR}/${At} > install.sfx + chmod +x install.sfx + ./install.sfx || die + rm install.sfx + + if [ -f ${S}/lib/unpack ]; then + UNPACK_CMD=${S}/lib/unpack + chmod +x $UNPACK_CMD + sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD + for i in $PACKED_JARS; do + PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack + if [ -f ${PACK_FILE} ]; then + echo " unpacking: $i" + $UNPACK_CMD ${PACK_FILE} ${S}/$i + rm -f ${PACK_FILE} + fi + done + fi + cd ${S} + sed -i "s,^exec,export LD_PRELOAD=/opt/${P}/javaws/javaws-waitid.so\nexec," javaws/javaws || die "javaws sed failed" +} + +src_compile() { + gcc -O2 -fPIC -g0 -shared -o ${S}/javaws/javaws-waitid.so ${FILESDIR}/javaws-waitid.c || die "failed to compile javaws hack" +} + + +src_install () { + local dirs="bin lib man javaws plugin" + dodir /opt/${P} + + for i in $dirs ; do + cp -a $i ${D}/opt/${P}/ + done + + dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt + dohtml Welcome.html ControlPanel.html + + if use browserplugin || use mozilla; then + local plugin_dir="ns610" + if has_version '>=gcc-3.2*' ; then + plugin_dir="ns610-gcc32" + fi + install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so + fi + + # create dir for system preferences + dodir /opt/${P}/.systemPrefs + + # install control panel for Gnome/KDE + sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \ + -e "s/\(Name=Java\)/\1 Control Panel/" \ + ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ + ${T}/sun_java-jre.desktop + domenu ${T}/sun_java-jre.desktop + + set_java_env ${FILESDIR}/${VMHANDLE} + + # TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory, + # creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP + # is a directory and will not be gzipped ;) +} + +pkg_postinst () { + # Create files used as storage for system preferences. + touch /opt/${P}/.systemPrefs/.system.lock + chmod 644 /opt/${P}/.systemPrefs/.system.lock + touch /opt/${P}/.systemPrefs/.systemRootModFile + chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile + + java_pkg_postinst + + #Show info about netscape + if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then + echo + einfo "If you want to install the plugin for Netscape 4.x, type" + einfo + einfo " cd /usr/lib/nsbrowser/plugins/" + einfo " ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so" + fi + + # if chpax is on the target system, set the appropriate PaX flags + # this will not hurt the binary, it modifies only unused ELF bits + # but may confuse things like AV scanners and automatic tripwire + if has_version "sys-apps/chpax" + then + echo + einfo "setting up conservative PaX flags for jar, javac and java" + + for paxkills in "java" + do + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills + done + + # /opt/sun-jdk-1.4.2.03/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm + + einfo "you should have seen lots of chpax output above now" + ewarn "make sure the grsec ACL contains those entries also" + ewarn "because enabling it will override the chpax setting" + ewarn "on the physical files - help for PaX and grsecurity" + ewarn "can be given by #gentoo-hardened + pappy@gentoo.org" + fi + + echo + eerror "Some parts of Sun's JDK require virtual/x11 to be installed." + eerror "Be careful which Java libraries you attempt to use." + + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi +} diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild index a7aefd01e2b4..5a4b4d939f27 100644 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.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/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild,v 1.2 2005/05/18 15:48:38 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild,v 1.3 2005/07/11 13:20:24 axxo Exp $ inherit java eutils @@ -15,7 +15,7 @@ SLOT="1.4" LICENSE="sun-bcla-java-vm-1.4.2" KEYWORDS="x86 -*" RESTRICT="fetch" -IUSE="mozilla" +IUSE="browserplugin mozilla" DEPEND=">=dev-java/java-config-1.1.5 sys-apps/sed" @@ -78,7 +78,7 @@ src_install () { dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt dohtml Welcome.html ControlPanel.html - if use mozilla ; then + if use browserplugin || use mozilla; then local plugin_dir="ns610" if has_version '>=gcc-3.2*' ; then plugin_dir="ns610-gcc32" @@ -131,11 +131,11 @@ pkg_postinst () { for paxkills in "java" do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills done # /opt/sun-jdk-1.4.2.03/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm einfo "you should have seen lots of chpax output above now" ewarn "make sure the grsec ACL contains those entries also" @@ -147,7 +147,9 @@ pkg_postinst () { echo eerror "Some parts of Sun's JDK require virtual/x11 to be installed." eerror "Be careful which Java libraries you attempt to use." - - ebeep 5 - epause 8 + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi } diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild index 30a3b2ab8926..599d613b6397 100644 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.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/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild,v 1.2 2005/06/28 13:06:55 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild,v 1.3 2005/07/11 13:20:24 axxo Exp $ inherit java eutils @@ -22,9 +22,9 @@ HOMEPAGE="http://java.sun.com/j2se/" SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )" SLOT="1.5" LICENSE="sun-bcla-java-vm" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~x86 ~amd64 -*" RESTRICT="fetch" -IUSE="mozilla" +IUSE="browserplugin mozilla" DEPEND=">=dev-java/java-config-1.2 sys-apps/sed" @@ -97,7 +97,7 @@ src_install() { dodoc COPYRIGHT LICENSE README dohtml Welcome.html - if use mozilla; then + if use browserplugin || use mozilla; then local plugin_dir="ns7-gcc29" if has_version '>=gcc-3*' ; then plugin_dir="ns7" @@ -175,4 +175,10 @@ pkg_postinst() { echo eerror "Some parts of Sun's JRE require virtual/x11 and virtual/lpr to be installed." eerror "Be careful which Java libraries you attempt to use." + + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi } |