From: Vlastimil Babka Date: Tue, 23 Jan 2007 11:37:49 +0000 (+0000) Subject: Remove versions vulnerable to #162511. Fix construct*.sh to write into instead of... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8760fbedcc93d194df6775d83fbb90ecd86c12f4;p=gentoo.git Remove versions vulnerable to #162511. Fix construct*.sh to write into instead of /tmp/ for bug #159547. Package-Manager: portage-2.1.2-r2 --- diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index a2e63d514a59..00c158cf9cbf 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.77 2007/01/23 10:38:24 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.78 2007/01/23 11:37:49 caster Exp $ + + 23 Jan 2007; Vlastimil Babka files/construct-1.6.sh, + files/construct.sh, -sun-jre-bin-1.5.0.09.ebuild, + -sun-jre-bin-1.5.0.09-r1.ebuild: + Remove versions vulnerable to #162511. Fix construct*.sh to write into + instead of /tmp/ for bug #159547. 23 Jan 2007; Steve Dibb sun-jre-bin-1.5.0.10.ebuild: amd64 stable, security bug 162511 diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index c33c27bff635..9007ebf53023 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,11 +1,11 @@ -AUX construct-1.6.sh 6794 RMD160 d22f39b648c6a306312b54bc89218dc76d3bcfc3 SHA1 a74be01576444a16d7212255a0e2f376595cb6df SHA256 baae7893300663f5c1bb702fbf40ddd1eb086bbbd4c7665998baf54e1273dc26 -MD5 e11b521d69bf1a8a90fc16693065490c files/construct-1.6.sh 6794 -RMD160 d22f39b648c6a306312b54bc89218dc76d3bcfc3 files/construct-1.6.sh 6794 -SHA256 baae7893300663f5c1bb702fbf40ddd1eb086bbbd4c7665998baf54e1273dc26 files/construct-1.6.sh 6794 -AUX construct.sh 6959 RMD160 fdc0d503b412657a6b0864cfc7f18fa63bf43225 SHA1 966b9c8229ef3dfb588c108124f367cc993cb581 SHA256 55ca240c8cb0e01b0548e66b0c6446437ebeff541334ead256b5139c1e14ea3f -MD5 94065b612df0046d9ae758943f9f6a75 files/construct.sh 6959 -RMD160 fdc0d503b412657a6b0864cfc7f18fa63bf43225 files/construct.sh 6959 -SHA256 55ca240c8cb0e01b0548e66b0c6446437ebeff541334ead256b5139c1e14ea3f files/construct.sh 6959 +AUX construct-1.6.sh 6798 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 SHA1 014a26831f8f3cee9653d42cd194216cda2e1787 SHA256 32639949b003703e236257f3d2d3272659ab89c80b2819bdb552af2d5f3070d7 +MD5 7d7c11a7876fbf6faa240eba586f7793 files/construct-1.6.sh 6798 +RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 files/construct-1.6.sh 6798 +SHA256 32639949b003703e236257f3d2d3272659ab89c80b2819bdb552af2d5f3070d7 files/construct-1.6.sh 6798 +AUX construct.sh 6963 RMD160 b1bb2e2ff9a0f5a8de7128d7b510a29356b1559b SHA1 12edcf184bc0ee5216260cee51595e2492dcd371 SHA256 dd1174321a419bef34c7fb4a6dedd80bf0873a00f16899d27b46dc89f2f9c216 +MD5 4ab101eeab50e3e50394b871ccf78650 files/construct.sh 6963 +RMD160 b1bb2e2ff9a0f5a8de7128d7b510a29356b1559b files/construct.sh 6963 +SHA256 dd1174321a419bef34c7fb4a6dedd80bf0873a00f16899d27b46dc89f2f9c216 files/construct.sh 6963 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1 MD5 494118498b85e238421b123a4ba16347 files/fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 files/fontconfig.Gentoo.properties 10932 @@ -23,8 +23,6 @@ MD5 7eb33864659e555b9520aaaece4f8ba5 files/sun-jre-bin-1.6.env 852 RMD160 ee3b29a24da833b3a4e19d55153ce8aa6cde02cc files/sun-jre-bin-1.6.env 852 SHA256 aa0a81aa290b056981bf7b8a5e585bb9d735be225ac11c3b29d9c9d99e095a79 files/sun-jre-bin-1.6.env 852 DIST j2re-1_4_2_13-linux-i586.bin 14363192 RMD160 ebe620a4a9ab5cd168345e5a26a58a759798854b SHA1 dded54dd6f926adf3aa17fe774ab5ae890f8313a SHA256 faaf24745233ef8cc112c848fb507b4aa1a274dd1f2adf6613bea2b6f60c79f2 -DIST jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff SHA1 b3cd93b445ce68b8d4b88c4afa9a177473adf3f7 SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35 -DIST jdk-1_5_0_09-dlj-linux-i586.bin 49504315 RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e SHA1 36a065b72af226804ff0b64b9c40859c7a879b6f SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 DIST jdk-1_5_0_10-dlj-linux-amd64.bin 43906073 RMD160 2d13d637b6d7351410f9e18d581206a05091effe SHA1 b0c4440f7059b2d477a437e5c58f135820e86326 SHA256 5bbac3fb78db48f7f996e412d45229db3a0b759886f360504cca61c93d4b5f61 DIST jdk-1_5_0_10-dlj-linux-i586.bin 49553457 RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 SHA1 fc4883d6da60940cbe4b6c2575478cead26313ff SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa DIST jdk-6-dlj-linux-amd64.bin 56347832 RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e SHA1 d51a60c80ac1a8173c53b9a389377b2774a50e92 SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3 @@ -33,14 +31,6 @@ EBUILD sun-jre-bin-1.4.2.13.ebuild 4618 RMD160 823867881b009f6ad46305d7e66636bb9 MD5 2973338ad006f24e6bc408b979064f94 sun-jre-bin-1.4.2.13.ebuild 4618 RMD160 823867881b009f6ad46305d7e66636bb9b8bff65 sun-jre-bin-1.4.2.13.ebuild 4618 SHA256 64f8f7110279949bc0790855c224ac054e8f4dd8875140c89a5d873d1a65a2c0 sun-jre-bin-1.4.2.13.ebuild 4618 -EBUILD sun-jre-bin-1.5.0.09-r1.ebuild 4406 RMD160 532d41a48781e1639e1e95172bb0625125a7e375 SHA1 58138c9b2b5aeff807b557f4b8ab8caaab87d0c1 SHA256 81594da0818e32c0b4e50cb36415243f294ec9fe94cfeef75fafad01b3b06886 -MD5 0d659228436067fff57df52b10862225 sun-jre-bin-1.5.0.09-r1.ebuild 4406 -RMD160 532d41a48781e1639e1e95172bb0625125a7e375 sun-jre-bin-1.5.0.09-r1.ebuild 4406 -SHA256 81594da0818e32c0b4e50cb36415243f294ec9fe94cfeef75fafad01b3b06886 sun-jre-bin-1.5.0.09-r1.ebuild 4406 -EBUILD sun-jre-bin-1.5.0.09.ebuild 4287 RMD160 6abbca5d1d0e4d71c15c45097a76dc3b98f09995 SHA1 cb003ef7ebfc2530f322866e444908d555a66bd5 SHA256 0d2365c2d8a0f968cdc6810865f1cb8fb1404f099fbb19d6784a114bac48e150 -MD5 04bb5562ad56b8c13e8a8e5a18155506 sun-jre-bin-1.5.0.09.ebuild 4287 -RMD160 6abbca5d1d0e4d71c15c45097a76dc3b98f09995 sun-jre-bin-1.5.0.09.ebuild 4287 -SHA256 0d2365c2d8a0f968cdc6810865f1cb8fb1404f099fbb19d6784a114bac48e150 sun-jre-bin-1.5.0.09.ebuild 4287 EBUILD sun-jre-bin-1.5.0.10.ebuild 3834 RMD160 72308022c20493d257983923273a6915605b3487 SHA1 6d5741d41a6956748eeb32f0fc5c863303d35286 SHA256 cf44ef723fd0330947a669456833146be1b852fa6880ddeb85e96aacdd0afc26 MD5 6c9f98ce381ca8c4a5217e93492299df sun-jre-bin-1.5.0.10.ebuild 3834 RMD160 72308022c20493d257983923273a6915605b3487 sun-jre-bin-1.5.0.10.ebuild 3834 @@ -53,10 +43,10 @@ EBUILD sun-jre-bin-1.6.0.ebuild 3882 RMD160 967b27493f5dade14bccee0a626c5f70cd2d MD5 eaabfc7a033301ed532b757f6d8f8c35 sun-jre-bin-1.6.0.ebuild 3882 RMD160 967b27493f5dade14bccee0a626c5f70cd2d4e72 sun-jre-bin-1.6.0.ebuild 3882 SHA256 dc9b72020dbd0084421564773c733a104845f4d4f94ad872af2c1f82a2bea4cc sun-jre-bin-1.6.0.ebuild 3882 -MISC ChangeLog 14585 RMD160 3043aeaad433f3aadfb6a3ed4ba735ef3dbefd26 SHA1 12cafd59a6b9bf63914513797ce2be0e66f6aed0 SHA256 b1898a0556517792a840107c64ec8e918a237882751d79e2fd188e922b3cc842 -MD5 4b201cf2eb76543f4429e2eddb436a83 ChangeLog 14585 -RMD160 3043aeaad433f3aadfb6a3ed4ba735ef3dbefd26 ChangeLog 14585 -SHA256 b1898a0556517792a840107c64ec8e918a237882751d79e2fd188e922b3cc842 ChangeLog 14585 +MISC ChangeLog 14856 RMD160 1b7fd73d91e0325a6185685517d71330d4696866 SHA1 8120c3fa375a2f5933c9cdbfd1ca581a2220d63e SHA256 80910651df9d3c1d7ca0279acb595adbb876003406acabeaf02728faee696cf5 +MD5 6862892c38c5e78b999a02ea7f04519c ChangeLog 14856 +RMD160 1b7fd73d91e0325a6185685517d71330d4696866 ChangeLog 14856 +SHA256 80910651df9d3c1d7ca0279acb595adbb876003406acabeaf02728faee696cf5 ChangeLog 14856 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240 @@ -64,12 +54,6 @@ SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f metadata MD5 164ca1935f8e5fde76df8f7fe7f85200 files/digest-sun-jre-bin-1.4.2.13 271 RMD160 3b26ac8471bcd7d76f0c6ccd5c9dc7b762670863 files/digest-sun-jre-bin-1.4.2.13 271 SHA256 9a8ab82dadb094b1989330c320f789b97a576e08a21bc5e139f1428b8a2b582b files/digest-sun-jre-bin-1.4.2.13 271 -MD5 8409e421272b316b007ee383c1d8508b files/digest-sun-jre-bin-1.5.0.09 563 -RMD160 93a25e28b116cacea4f5295169e9bb091b46575b files/digest-sun-jre-bin-1.5.0.09 563 -SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/digest-sun-jre-bin-1.5.0.09 563 -MD5 8409e421272b316b007ee383c1d8508b files/digest-sun-jre-bin-1.5.0.09-r1 563 -RMD160 93a25e28b116cacea4f5295169e9bb091b46575b files/digest-sun-jre-bin-1.5.0.09-r1 563 -SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/digest-sun-jre-bin-1.5.0.09-r1 563 MD5 bfc73dd88d30c26b64d0590cb52d7547 files/digest-sun-jre-bin-1.5.0.10 563 RMD160 ce0632d08fdd27b76bd6e2de244a0516555aeef0 files/digest-sun-jre-bin-1.5.0.10 563 SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/digest-sun-jre-bin-1.5.0.10 563 diff --git a/dev-java/sun-jre-bin/files/construct-1.6.sh b/dev-java/sun-jre-bin/files/construct-1.6.sh index 3e09d4621d63..39c7b911fe19 100644 --- a/dev-java/sun-jre-bin/files/construct-1.6.sh +++ b/dev-java/sun-jre-bin/files/construct-1.6.sh @@ -179,7 +179,7 @@ preparecds() { jreman () { echo "setting up the JRE man pages..." # note this list is slightly different for OpenSolaris bundles - jreman=/tmp/jre.man.txt + jreman="${T}/jre.man.txt" cat < $jreman man/ja_JP.eucJP/man1/java.1 man/ja_JP.eucJP/man1/javaws.1 @@ -222,7 +222,7 @@ EOF elimdups() { echo "eliminating duplication between the JDK and JDK/jre..." - jdkcomm=/tmp/jdk.bin.comm.txt + jdkcomm="${T}/jdk.bin.comm.txt" cat < $jdkcomm bin/ControlPanel bin/java diff --git a/dev-java/sun-jre-bin/files/construct.sh b/dev-java/sun-jre-bin/files/construct.sh index 5f6ff7f0f161..7ee0e42729bc 100644 --- a/dev-java/sun-jre-bin/files/construct.sh +++ b/dev-java/sun-jre-bin/files/construct.sh @@ -179,7 +179,7 @@ preparecds() { jreman () { echo "setting up the JRE man pages..." # note this list is slightly different for OpenSolaris bundles - jreman=/tmp/jre.man.txt + jreman="${T}/jre.man.txt" cat < $jreman man/ja_JP.eucJP/man1/java.1 man/ja_JP.eucJP/man1/javaws.1 @@ -228,7 +228,7 @@ EOF elimdups() { echo "eliminating duplication between the JDK and JDK/jre..." - jdkcomm=/tmp/jdk.bin.comm.txt + jdkcomm="${T}/jdk.bin.comm.txt" cat < $jdkcomm bin/ControlPanel bin/java diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09 deleted file mode 100644 index fb32756cb7a5..000000000000 --- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 a210623300238ebb230d47c774c25779 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 -RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 -SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 -MD5 b937aef01669744686e84ac5f0cc3d97 jdk-1_5_0_09-dlj-linux-i586.bin 49504315 -RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e jdk-1_5_0_09-dlj-linux-i586.bin 49504315 -SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 jdk-1_5_0_09-dlj-linux-i586.bin 49504315 diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09-r1 deleted file mode 100644 index fb32756cb7a5..000000000000 --- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 a210623300238ebb230d47c774c25779 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 -RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 -SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 -MD5 b937aef01669744686e84ac5f0cc3d97 jdk-1_5_0_09-dlj-linux-i586.bin 49504315 -RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e jdk-1_5_0_09-dlj-linux-i586.bin 49504315 -SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 jdk-1_5_0_09-dlj-linux-i586.bin 49504315 diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09-r1.ebuild deleted file mode 100644 index bf34c7e00754..000000000000 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09-r1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2006 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.09-r1.ebuild,v 1.1 2006/11/22 23:35:07 caster Exp $ - -inherit java-vm-2 eutils - -MY_PVL=${PV%.*}_${PV##*.} -MY_PVA=${PV//./_} -#S="${WORKDIR}/jdk${MY_PVL}" - -X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" -AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" -if use x86; then - At=${X86_AT} -elif use amd64; then - At=${AMD64_AT} -fi -DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" -HOMEPAGE="http://java.sun.com/j2se/1.5.0/" -SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) - amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" -SLOT="1.5" -LICENSE="dlj-1.1" -KEYWORDS="-* ~amd64 ~x86" -RESTRICT="nostrip" -IUSE="X alsa nsplugin" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - X? ( || ( ( x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXp - x11-libs/libXt - x11-libs/libXtst - ) - virtual/x11 - ) - )" - -JAVA_PROVIDE="jdbc-stdext jdbc-rowset" - -PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar" - -# this is needed for proper operating under a PaX kernel without activated grsecurity acl -CHPAX_CONSERVATIVE_FLAGS="pemsv" - -QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so - opt/${P}/lib/i386/libdeploy.so" - -src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then - die "cannot read ${At}. Please check the permission and try again." - fi - - mkdir bundled-jdk - cd bundled-jdk - sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack" - - cd .. - bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" -} - -src_install() { - local dirs="bin lib man" - # only X86 has the plugin and javaws - use x86 && dirs="${dirs} javaws plugin" - dodir /opt/${P} - - for i in $dirs ; do - cp -pPR $i ${D}/opt/${P}/ || die "failed to copy" - done - dodoc CHANGES README THIRDPARTYLICENSEREADME.txt - dohtml Welcome.html - dodir /opt/${P}/share/ - - if use nsplugin; then - local plugin_dir="ns7-gcc29" - if has_version '>=sys-devel/gcc-3' ; then - plugin_dir="ns7" - fi - - if use x86 ; then - install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so - else - eerror "No plugin available for amd64 arch" - fi - fi - - # TODO Don't think we still needs these -nichoj - # create dir for system preferences - #dodir /opt/${P}/jre/.systemPrefs - # Create files used as storage for system preferences. - #touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock - #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock - #touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile - #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile - - # FIXME figure out how to handle the control pannel conflict with - # sun-jdk-bin - - # install control panel for Gnome/KDE -# sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ -# -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ -# ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ -# ${T}/sun_java-${SLOT}.desktop - -# domenu ${T}/sun_java-${SLOT}.desktop - - # bug #56444 - insinto /opt/${P}/lib/ - newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties - - set_java_env -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - # 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 java" - - for paxkills in "java" - do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills - done - - # /opt/$VM/jre/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 + hardened@gentoo.org" - fi - - if ! use X; then - local xwarn="virtual/x11 and/or" - fi - - echo - ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." - ewarn "Be careful which Java libraries you attempt to use." -} diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild deleted file mode 100644 index e34cd8eac6e6..000000000000 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2007 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.09.ebuild,v 1.3 2007/01/09 23:46:44 malc Exp $ - -inherit java-vm-2 eutils - -MY_PVL=${PV%.*}_${PV##*.} -MY_PVA=${PV//./_} -#S="${WORKDIR}/jdk${MY_PVL}" - -X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" -AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" -if use x86; then - At=${X86_AT} -elif use amd64; then - At=${AMD64_AT} -fi -DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" -HOMEPAGE="http://java.sun.com/j2se/1.5.0/" -SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) - amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" -SLOT="1.5" -LICENSE="dlj-1.1" -KEYWORDS="-* amd64 x86" -RESTRICT="nostrip" -IUSE="X alsa nsplugin" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - X? ( || ( ( x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXp - x11-libs/libXt - x11-libs/libXtst - ) - virtual/x11 - ) - )" - -JAVA_PROVIDE="jdbc-stdext jdbc-rowset" - -PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar" - -# this is needed for proper operating under a PaX kernel without activated grsecurity acl -CHPAX_CONSERVATIVE_FLAGS="pemsv" - -QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so - opt/${P}/lib/i386/libdeploy.so" - -src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then - die "cannot read ${At}. Please check the permission and try again." - fi - - mkdir bundled-jdk - cd bundled-jdk - sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack" - - cd .. - bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" -} - -src_install() { - local dirs="bin lib man" - # only X86 has the plugin and javaws - use x86 && dirs="${dirs} javaws plugin" - dodir /opt/${P} - - for i in $dirs ; do - cp -pPR $i ${D}/opt/${P}/ || die "failed to copy" - done - dodoc CHANGES README THIRDPARTYLICENSEREADME.txt - dohtml Welcome.html - dodir /opt/${P}/share/ - - if use nsplugin; then - local plugin_dir="ns7-gcc29" - if has_version '>=sys-devel/gcc-3' ; then - plugin_dir="ns7" - fi - - if use x86 ; then - install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so - else - eerror "No plugin available for amd64 arch" - fi - fi - - # TODO Don't think we still needs these -nichoj - # create dir for system preferences - #dodir /opt/${P}/jre/.systemPrefs - # Create files used as storage for system preferences. - #touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock - #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock - #touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile - #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile - - # FIXME figure out how to handle the control pannel conflict with - # sun-jdk-bin - - # install control panel for Gnome/KDE -# sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ -# -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ -# ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ -# ${T}/sun_java-${SLOT}.desktop - -# domenu ${T}/sun_java-${SLOT}.desktop - - set_java_env -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - # 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 java" - - for paxkills in "java" - do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills - done - - # /opt/$VM/jre/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 + hardened@gentoo.org" - fi - - if ! use X; then - local xwarn="virtual/x11 and/or" - fi - - echo - ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." - ewarn "Be careful which Java libraries you attempt to use." -}