give sparc there jre back, no longer installs the mozilla plugin, security vuln ...

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 9bfcaa17b20ed49d28d63eec194187dafdfdeffd..7373ab86e86b0083a8d98a99c693ee2c7d3419fe 100644 (file)
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.51 2004/11/27 12:20:15 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.52 2004/11/29 19:11:47 axxo Exp $
+
+*blackdown-jre-1.4.1-r1 (29 Nov 2004)
+
+  29 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
+  +blackdown-jre-1.4.1-r1.ebuild:
+  give sparc there jre back, no longer installs the mozilla plugin, security
+  vuln #72221
 
   27 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
   -files/blackdown-jre-1.4.2_rc1, -blackdown-jre-1.4.2_rc1-r2.ebuild:

diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index f390ec68cae6ca96d76b1283845370545b3c8e9f..1a5f375d00bd5957bdb7cd36add4e0598a49009b 100644 (file)
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -3,16 +3,19 @@ Hash: SHA1
 
 MD5 59d6ce50136f682426b428ed61b8b067 blackdown-jre-1.4.2.01.ebuild 3283
 MD5 ba7a0a5afe09b6aba7eb272554806e4d blackdown-jre-1.3.1-r9.ebuild 1726
-MD5 56a8323bfcc55e73b0c423c5665281b0 ChangeLog 8211
+MD5 1405301d371e763365e4796d43f063ce ChangeLog 8425
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 6ad871b773bf8a75d957c73e64318a29 blackdown-jre-1.4.1-r1.ebuild 2635
 MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
+MD5 773e3dae29edd26397f43c1e1ab99dae files/digest-blackdown-jre-1.4.1-r1 248
 MD5 7d186c2364cc118125d06076161306a8 files/digest-blackdown-jre-1.4.2.01 151
 MD5 57462605c4cce61fe2ac166306c5b491 files/blackdown-jre-1.4.2.01 428
 MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429
+MD5 271b1f89b9f0f70dd5154090978263b1 files/blackdown-jre-1.4.1 425
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBqHEI/rLF9B432nYRArGJAJ9ojgaFWKxMks90ZFGlJLZJWI1zXgCgiueB
-EUfenO99VdtcXYqeUekD+TI=
-=iH4U
+iD8DBQFBq3R9/rLF9B432nYRAjvzAJ0aJpj/1hHJKK9LnpMNsfFVR0y4mQCfUmFb
+NCuuLnIpQ9a18FWSiHKfwKs=
+=si4E
 -----END PGP SIGNATURE-----

diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild
new file mode 100644 (file)
index 0000000..be38429
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.1 2004/11/29 19:11:47 axxo Exp $
+
+inherit java gcc
+
+S=${WORKDIR}/j2re1.4.1
+DESCRIPTION="Blackdown Java Runtime Environment 1.4.1"
+
+SRC_URI="
+       x86? (
+               ftp://ftp.uk.linux.org/pub/linux/java//JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
+               ftp://ftp.uk.linux.org/pub/linux/java/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc2.95.bin
+       )
+       amd64? (
+               ftp://ftp.uk.linux.org/pub/linux/java/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
+       )
+       sparc? (
+               ftp://ftp.uk.linux.org/pub/linux/java/JDK-1.4.1/sparc/01/j2re-1.4.1-01-linux-sparc-gcc3.2.bin
+       )"
+
+HOMEPAGE="http://www.blackdown.org"
+DEPEND="virtual/libc
+       amd64? ( >=app-emulation/emul-linux-x86-baselibs-1 )
+       >=dev-java/java-config-0.2.5
+       >=sys-apps/sed-4"
+RDEPEND="${DEPEND}
+       sparc? ( >=sys-devel/gcc-3.2 )
+       amd64? ( >=sys-devel/gcc-3.2 )"
+PROVIDE="virtual/jre-1.4.1
+       virtual/java-scheme-2"
+SLOT="0"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="x86 sparc amd64"
+IUSE="mozilla"
+
+src_unpack () {
+       typeset a want_gcc_ver
+
+       if [[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 2 ]]; then
+               want_gcc_ver=3.2
+       else
+               want_gcc_ver=2.95
+       fi
+
+       for a in ${A}; do
+               if [[ ${a} == *gcc*.bin ]]; then
+                       if [[ ${a} == *-gcc${want_gcc_ver}.bin ]]; then
+                               echo ">>> Unpacking ${a}..."
+                               tail -n +461 ${DISTDIR}/${a} | tar xjf - || die
+                       fi
+               else
+                       # Handle files (none right now) that don't have a gcc
+                       # version dependency
+                       unpack ${a}
+               fi
+       done
+}
+
+src_install () {
+       typeset platform
+
+       dodir /opt/${P}
+
+       cp -a ${S}/{bin,lib,man,plugin} ${D}/opt/${P}/
+       find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
+
+       dodoc COPYRIGHT LICENSE README INSTALL
+       dohtml README.html
+
+       # Install mozilla plugin
+       # do not install plugins, security vulnerability   #72221
+       rm -rf ${D}/opt/${P}/plugin/
+       #if use mozilla; then
+       #       case ${ARCH} in
+       #               amd64|x86) platform="i386" ;;
+       #               ppc) platform="ppc" ;;
+       #               sparc*) platform="sparc" ;;
+       #       esac
+       #       install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
+       #fi
+
+       sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
+
+       set_java_env ${FILESDIR}/${VMHANDLE}
+
+       # Fix for bug #26629.
+       if [ "${PROFILE_ARCH}" = "sparc64" ]
+       then
+               sed -i -e 's/\/\//\/sparc\//g' \
+                       ${D}/etc/env.d/java/20blackdown-jre-1.4.1
+       fi
+}
+
+pkg_postinst() {
+       if use mozilla; then
+               echo
+               einfo "mozilla plugin NOT installed"
+               einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt"
+       fi
+}

diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.4.1 b/dev-java/blackdown-jre/files/blackdown-jre-1.4.1
new file mode 100644 (file)
index 0000000..b3a2654
--- /dev/null
+++ b/dev-java/blackdown-jre/files/blackdown-jre-1.4.1
@@ -0,0 +1,11 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.4.1,v 1.6 2004/11/29 19:11:47 axxo Exp $
+
+VERSION="Blackdown JRE @PV@"
+JAVA_HOME=/opt/@P@
+JRE_HOME=/opt/@P@
+ADDPATH="${JAVA_HOME}/bin"
+ADDLDPATH="/opt/@P@/lib/"
+MANPATH=/opt/@P@/man
+ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH"

diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r1 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r1
new file mode 100644 (file)
index 0000000..20a9270
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r1
@@ -0,0 +1,3 @@
+MD5 bea9c5869c084815bee026d466094995 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+MD5 3857975cd3b7ebcbe544ba0a46308e0c j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
+MD5 29f856a10aae9f296a09a3f9deaf01b7 j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279