diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog deleted file mode 100644 index 22e7bf8..0000000 --- a/dev-java/icedtea/ChangeLog +++ /dev/null @@ -1,60 +0,0 @@ -# ChangeLog for dev-java/icedtea -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.9 2010/09/09 13:35:24 caster Exp $ - - 06 Oct 2010; Mario Fetka ChangeLog: - add arm keyword - -*icedtea-6.1.9 (09 Sep 2010) - - 09 Sep 2010; Vlastimil Babka +icedtea-6.1.9.ebuild: - Version bump from java-overlay. - -*icedtea-6.1.8.1 (30 Jul 2010) - - 30 Jul 2010; Vlastimil Babka -files/1.7.2-free.patch, - -files/6.1.7.3-systemtap-gcc-4.5.patch, -icedtea-6.1.7.2-r1.ebuild, - -icedtea-6.1.7.3.ebuild, +icedtea-6.1.8.1.ebuild, metadata.xml: - Security version bump, bug #330205. Remove the older 1.7.x. - -*icedtea-6.1.7.3 (03 May 2010) - - 03 May 2010; Vlastimil Babka - +files/6.1.7.3-systemtap-gcc-4.5.patch, - +files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.7.1.ebuild, - +icedtea-6.1.7.3.ebuild, icedtea-6.1.8.0.ebuild: - Fix building with gcc-4.5 and USE=systemtap - fixes bug #317343. Bump the - 6.1.7.2-r1 to 6.7.1.3 (which is the same)for easier sync with the overlay. - - 15 Apr 2010; Vlastimil Babka icedtea-6.1.8.0.ebuild: - Add ant-nodeps to DEPEND since it's used in ANT_TASKS variable. Bug - #315457. - -*icedtea-6.1.8.0 (14 Apr 2010) - - 14 Apr 2010; Vlastimil Babka +icedtea-6.1.8.0.ebuild: - Version bump, based on java-overlay ebuild. Remove the npplugin flag as - upstream removed the old plugin - the npplugin is now installed simply - with USE=nsplugin. - - 31 Mar 2010; Vlastimil Babka -icedtea-6.1.7.2.ebuild: - Remove the unpatched revision. - -*icedtea-6.1.7.2-r1 (31 Mar 2010) - - 31 Mar 2010; Vlastimil Babka +files/1.7.2-free.patch, - +icedtea-6.1.7.2-r1.ebuild: - Revbump to fix buffer overflow in npplugin. - -*icedtea-6.1.7.2 (31 Mar 2010) - - 31 Mar 2010; Vlastimil Babka +icedtea-6.1.7.2.ebuild: - Version bump, security bug #312297. - -*icedtea-6.1.7.1 (04 Mar 2010) - - 04 Mar 2010; Vlastimil Babka +icedtea-6.1.7.1.ebuild, - +files/generate-cacerts.pl, +files/icedtea.env, +metadata.xml: - Import of ebuild by Andrew John Hughes (gnu_andrew@member.fsf.org) from - java-overlay. - diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest deleted file mode 100644 index e9acb68..0000000 --- a/dev-java/icedtea/Manifest +++ /dev/null @@ -1,22 +0,0 @@ -AUX 6.1.8.0-systemtap-gcc-4.5.patch 2126 RMD160 df47a4640738ce825106c3607fbaff2f4e863801 SHA1 57cb61e877e06886ff4a259cbc0372bcbf145ac1 SHA256 5a41b9657f07cc9667dbae0bd0d4b01d2afd66fef168f001835fe60cc8bb7cce -AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 -AUX icedtea.env 999 RMD160 83d735b0941a9e33c4dd3f3bd3fe16e64c55f5e1 SHA1 6d8da5ad9d396d96f16f148c3a826d9e2a357d0e SHA256 85dc9543de305637739eea7b58e61865bd780aa50fd574ce19ccd95bc1013ec1 -DIST 62926c7f67a3.tar.gz 8080848 RMD160 1d9a41c4efddb75181b5cc5e301be4d4d1aead56 SHA1 0cf4d7b56da4edfeab47d413d6bb1b810e347b3f SHA256 fedfee5b5eb0acf4e7c3b90f46c02318e512a67034364d90c411f2b8e3a31cc6 -DIST cacao-0.99.4.tar.gz 3917411 RMD160 bde50674e07c3a1e6ed8c4a8fdc6273a2a23dd1a SHA1 d9d159f8f905a9fa53ea7ae0f50a442dbd6b5e84 SHA256 c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf -DIST e321b101a9ee.tar.bz2 2727158 RMD160 16cb5c6f58197dbfd690e578418fadf911935ed7 SHA1 b41d54057cd98bddb8adb6bd4c1e50b08eaef411 SHA256 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 -DIST icedtea6-1.8.1.tar.gz 6093074 RMD160 bde307437286a192fd5a0725af92685df45314fd SHA1 ea9264aad1e7de44d2abe90d6a0f726da0260972 SHA256 ebbc11f5f0ba0cfe3cba82471b1cc2611ac1ba28f59fbc5b047f41bd41b51839 -DIST icedtea6-1.8.tar.gz 6068172 RMD160 7f536afa37335fc183e7bd52996ca63c5aa1db14 SHA1 8866033807100f5a141f89a21c992b357c6e88bc SHA256 6823ff87969d978fe5523c729be3074142698c89acc8cc96c05b849fde54f61b -DIST icedtea6-1.9.tar.gz 6330215 RMD160 336b65c2675fa12be487d1618849c7edc5d26063 SHA1 b5201055a2ac9e6beb991a50e7bf60c0ee2433f2 SHA256 829ca9d920b60c62c5568fabf0458a7f8ac25294b07a7befbd82a80fe65da867 -DIST jdk6-jaf-2009_10_27.zip 69593 RMD160 f1c635a23efbe88ec364aab53c2adf6eea69a5eb SHA1 92a17d19bec6dbce09cc04ad78abd0682367ba2e SHA256 fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f -DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 -DIST jdk6-jaxp-2009_10_13.zip 5975524 RMD160 fd72e19fcbcd8a5cbbc5d0399cd2053b830f7c5e SHA1 e2c3a19a859d991a9e01124b4760cb432d6a435d SHA256 8714d55de18db48ca9da0ee986202005082f44cf4c215da8683342b70e61792b -DIST jdk6-jaxp-b20.zip 5944804 RMD160 c02276a9363ec89414e5061b301ee25fca353291 SHA1 688531dfcd81ef704732ffef7d467045fd850544 SHA256 d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156 -DIST jdk6-jaxws-2009_10_27.zip 5446377 RMD160 94b02aba2b08199571c4c4a05daf8ed354d840c9 SHA1 52fd35ca5fdeac0a6bd9a153397631597c407c22 SHA256 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2 -DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb -DIST openjdk-6-src-b18-16_feb_2010.tar.gz 44216412 RMD160 7ccb0ad2827f94dd07ebfbb554103aa2c0c2eae4 SHA1 7250fc40cd5fadc7ba9c1955cb60f05514406ca7 SHA256 778ea7b323aaa24d3c6e8fe32b8bb0f49040d9e86271859077ada9f9ee3c8ebf -DIST openjdk-6-src-b20-21_jun_2010.tar.gz 45078703 RMD160 5248e9b3ed762829c33bf2ff7e3ca0cbf4bee5d2 SHA1 39fc162a740f16aa18afa855fea9d5daf8cf03d4 SHA256 fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b -EBUILD icedtea-6.1.8.0.ebuild 10928 RMD160 7bfd129f8f6a7a961df31f6cc68735b55fe3d456 SHA1 415aaeffe5c1f60107427de66bd762a7245149fc SHA256 82051a1c85f11eca9e3a511ec2d3587debe7d805a7b0823d392c96e7f0768d88 -EBUILD icedtea-6.1.8.1.ebuild 10679 RMD160 0d70ecb49146b83f197cbb5d0af69b587e4d3049 SHA1 917b0cfcbe45b087248ef70250d1c29913ec698b SHA256 6f0188aa03e22a9cfa8653876ff890f4a7d880bc52baaca2ff029e119427607a -EBUILD icedtea-6.1.9.ebuild 10376 RMD160 75c4abd9eaa104fe176f97d92f7def76f67f5ff3 SHA1 7b383c95e2341b71ada2a431a82aada42a640f2d SHA256 66f3c4f6fed1c78ed9855b7af7187a6b4c1c67d10fd2bf829f440c9ab62a11f4 -MISC ChangeLog 2272 RMD160 54afc100521d1dc02dccd84053601c05f41b454a SHA1 96444ce3fedf9142c55cb4ff469378aae9fecb06 SHA256 4a840473bf9ce651c3161015ec5d2b4b9669748eb02c09cae00410d2459149ad -MISC metadata.xml 1308 RMD160 7fd0e996d1b10703bdd92c246763b005db93d0bf SHA1 907a526e3ad1c4436a53261f0cc59f7b916933de SHA256 fbd4f14f2da6a4c7052681487d2f306d968a733a6f12143a263a0c8b1a717edb diff --git a/dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch b/dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch deleted file mode 100644 index 95ef9a2..0000000 --- a/dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch +++ /dev/null @@ -1,62 +0,0 @@ -# HG changeset patch -# User Andrew John Hughes -# Date 1272471515 -3600 -# Node ID c8d38c28900e01a04d730fc59f899ae0cd1d0779 -# Parent c30ad39537453fa171d094f3534e79a2faf16fad -PR476: Enable building SystemTap on GCC 4.5. - -2010-04-28 Andrew John Hughes - - PR icedtea/476 - * Makefile.am: - Add patch when SystemTap is enabled to support - building with GCC 4.5. - * patches/systemtap-gcc-4.5.patch: - Add cast to NULL (doesn't apply to DTrace due - to differences between SystemTap and DTrace macros). - -diff -r c30ad3953745 -r c8d38c28900e ChangeLog ---- a/ChangeLog Mon Apr 26 14:11:34 2010 +0200 -+++ b/ChangeLog Wed Apr 28 17:18:35 2010 +0100 -@@ -1,3 +1,13 @@ -+2010-04-28 Andrew John Hughes -+ -+ PR icedtea/476 -+ * Makefile.am: -+ Add patch when SystemTap is enabled to support -+ building with GCC 4.5. -+ * patches/systemtap-gcc-4.5.patch: -+ Add cast to NULL (doesn't apply to DTrace due -+ to differences between SystemTap and DTrace macros). -+ - 2010-04-12 Andrew John Hughes - - PR icedtea/373 -diff -r c30ad3953745 -r c8d38c28900e Makefile.am ---- a/Makefile.am Mon Apr 26 14:11:34 2010 +0200 -+++ b/Makefile.am Wed Apr 28 17:18:35 2010 +0100 -@@ -374,7 +374,8 @@ - endif - - if ENABLE_SYSTEMTAP --ICEDTEA_PATCHES += patches/icedtea-systemtap.patch -+ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \ -+ patches/systemtap-gcc-4.5.patch - endif - - if ENABLE_NSS -diff -r c30ad3953745 -r c8d38c28900e patches/systemtap-gcc-4.5.patch ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/patches/systemtap-gcc-4.5.patch Wed Apr 28 17:18:35 2010 +0100 -@@ -0,0 +1,11 @@ -+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 08:51:29.000000000 +0100 -++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 09:29:22.000000000 +0100 -+@@ -2723,7 +2723,7 @@ -+ -+ if (!directBufferSupportInitializeEnded) { -+ if (!initializeDirectBufferSupport(env, thread)) { -+- DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL); -++ DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL); -+ return NULL; -+ } -+ } diff --git a/dev-java/icedtea/files/generate-cacerts.pl b/dev-java/icedtea/files/generate-cacerts.pl deleted file mode 100644 index 17d29b3..0000000 --- a/dev-java/icedtea/files/generate-cacerts.pl +++ /dev/null @@ -1,358 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2007, 2008 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# generate-cacerts.pl generates a JKS keystore named 'cacerts' from -# OpenSSL's certificate bundle using OpenJDK's keytool. - -# First extract each of OpenSSL's bundled certificates into its own -# aliased filename. - -# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2 -# Check and prevention of duplicate aliases added by Vlastimil Babka - -$file = $ARGV[1]; -open(CERTS, $file); -@certs = ; -close(CERTS); - -$pem_file_count = 0; -$in_cert_block = 0; -$write_current_cert = 1; -foreach $cert (@certs) -{ - if ($cert =~ /Issuer: /) - { - $_ = $cert; - if ($cert =~ /personal-freemail/) - { - $cert_alias = "thawtepersonalfreemailca"; - } - elsif ($cert =~ /personal-basic/) - { - $cert_alias = "thawtepersonalbasicca"; - } - elsif ($cert =~ /personal-premium/) - { - $cert_alias = "thawtepersonalpremiumca"; - } - elsif ($cert =~ /server-certs/) - { - $cert_alias = "thawteserverca"; - } - elsif ($cert =~ /premium-server/) - { - $cert_alias = "thawtepremiumserverca"; - } - elsif ($cert =~ /Class 1 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass1ca"; - } - elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/) - { - $cert_alias = "verisignclass1g2ca"; - } - elsif ($cert =~ - /VeriSign Class 1 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass1g3ca"; - } - elsif ($cert =~ /Class 2 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass2ca"; - } - elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/) - { - $cert_alias = "verisignclass2g2ca"; - } - elsif ($cert =~ - /VeriSign Class 2 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass2g3ca"; - } - elsif ($cert =~ /Class 3 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass3ca"; - } - # Version 1 of Class 3 Public Primary Certification Authority - # - G2 is added. Version 3 is excluded. See below. - elsif ($cert =~ - /VeriSign Class 3 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass3g3ca"; - } - elsif ($cert =~ - /RSA Data Security.*Secure Server Certification Authority/) - { - $cert_alias = "verisignserverca"; - } - elsif ($cert =~ /GTE CyberTrust Global Root/) - { - $cert_alias = "gtecybertrustglobalca"; - } - elsif ($cert =~ /Baltimore CyberTrust Root/) - { - $cert_alias = "baltimorecybertrustca"; - } - elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/) - { - $cert_alias = "entrustclientca"; - } - elsif ($cert =~ /www.entrust.net\/GCCA_CPS/) - { - $cert_alias = "entrustglobalclientca"; - } - elsif ($cert =~ /www.entrust.net\/CPS_2048/) - { - $cert_alias = "entrust2048ca"; - } - elsif ($cert =~ /www.entrust.net\/CPS /) - { - $cert_alias = "entrustsslca"; - } - elsif ($cert =~ /www.entrust.net\/SSL_CPS/) - { - $cert_alias = "entrustgsslca"; - } - elsif ($cert =~ /The Go Daddy Group/) - { - $cert_alias = "godaddyclass2ca"; - } - elsif ($cert =~ /Starfield Class 2 Certification Authority/) - { - $cert_alias = "starfieldclass2ca"; - } - elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/) - { - $cert_alias = "valicertclass2ca"; - } - elsif ($cert =~ /GeoTrust Global CA$/) - { - $cert_alias = "geotrustglobalca"; - } - elsif ($cert =~ /Equifax Secure Certificate Authority/) - { - $cert_alias = "equifaxsecureca"; - } - elsif ($cert =~ /Equifax Secure eBusiness CA-1/) - { - $cert_alias = "equifaxsecureebusinessca1"; - } - elsif ($cert =~ /Equifax Secure eBusiness CA-2/) - { - $cert_alias = "equifaxsecureebusinessca2"; - } - elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/) - { - $cert_alias = "equifaxsecureglobalebusinessca1"; - } - elsif ($cert =~ /Sonera Class1 CA/) - { - $cert_alias = "soneraclass1ca"; - } - elsif ($cert =~ /Sonera Class2 CA/) - { - $cert_alias = "soneraclass2ca"; - } - elsif ($cert =~ /AAA Certificate Services/) - { - $cert_alias = "comodoaaaca"; - } - elsif ($cert =~ /AddTrust Class 1 CA Root/) - { - $cert_alias = "addtrustclass1ca"; - } - elsif ($cert =~ /AddTrust External CA Root/) - { - $cert_alias = "addtrustexternalca"; - } - elsif ($cert =~ /AddTrust Qualified CA Root/) - { - $cert_alias = "addtrustqualifiedca"; - } - elsif ($cert =~ /UTN-USERFirst-Hardware/) - { - $cert_alias = "utnuserfirsthardwareca"; - } - elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/) - { - $cert_alias = "utnuserfirstclientauthemailca"; - } - elsif ($cert =~ /UTN - DATACorp SGC/) - { - $cert_alias = "utndatacorpsgcca"; - } - elsif ($cert =~ /UTN-USERFirst-Object/) - { - $cert_alias = "utnuserfirstobjectca"; - } - elsif ($cert =~ /America Online Root Certification Authority 1/) - { - $cert_alias = "aolrootca1"; - } - elsif ($cert =~ /DigiCert Assured ID Root CA/) - { - $cert_alias = "digicertassuredidrootca"; - } - elsif ($cert =~ /DigiCert Global Root CA/) - { - $cert_alias = "digicertglobalrootca"; - } - elsif ($cert =~ /DigiCert High Assurance EV Root CA/) - { - $cert_alias = "digicerthighassuranceevrootca"; - } - elsif ($cert =~ /GlobalSign Root CA$/) - { - $cert_alias = "globalsignca"; - } - elsif ($cert =~ /GlobalSign Root CA - R2/) - { - $cert_alias = "globalsignr2ca"; - } - elsif ($cert =~ /Elektronik.*Kas.*2005/) - { - $cert_alias = "extra-elektronikkas2005"; - } - elsif ($cert =~ /Elektronik/) - { - $cert_alias = "extra-elektronik2005"; - } - # Mozilla does not provide these certificates: - # baltimorecodesigningca - # gtecybertrust5ca - # trustcenterclass2caii - # trustcenterclass4caii - # trustcenteruniversalcai - else - { - # Generate an alias using the OU and CN attributes of the - # Issuer field if both are present, otherwise use only the - # CN attribute. The Issuer field must have either the OU - # or the CN attribute. - $_ = $cert; - if ($cert =~ /OU=/) - { - s/Issuer:.*?OU=//; - # Remove other occurrences of OU=. - s/OU=.*CN=//; - # Remove CN= if there were not other occurrences of OU=. - s/CN=//; - s/\/emailAddress.*//; - s/Certificate Authority/ca/g; - s/Certification Authority/ca/g; - } - elsif ($cert =~ /CN=/) - { - s/Issuer:.*CN=//; - s/\/emailAddress.*//; - s/Certificate Authority/ca/g; - s/Certification Authority/ca/g; - } - s/\W//g; - tr/A-Z/a-z/; - $cert_alias = "extra-$_"; - - } - while (-e "$cert_alias.pem") - { - $cert_alias = "$cert_alias" . "_"; - } - } - # When it attempts to parse: - # - # Class 3 Public Primary Certification Authority - G2, Version 3 - # - # keytool says: - # - # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false - # Unparseable AuthorityInfoAccess extension due to - # java.io.IOException: Invalid encoding of URI - # - # If we do not exclude this file - # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails - # on this cert, printing: - # - # Couldn't verify: java.security.SignatureException: Signature - # does not match. - # - elsif ($cert =~ - /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/) - { - $write_current_cert = 0; - $pem_file_count--; - } - elsif ($cert eq "-----BEGIN CERTIFICATE-----\n") - { - if ($in_cert_block != 0) - { - die "$file is malformed."; - } - $in_cert_block = 1; - if ($write_current_cert == 1) - { - $pem_file_count++; - if (-e "$cert_alias.pem") - { - print "$cert_alias"; - die "already exists" - } - open(PEM, ">$cert_alias.pem"); - print PEM $cert; - } - } - elsif ($cert eq "-----END CERTIFICATE-----\n") - { - $in_cert_block = 0; - if ($write_current_cert == 1) - { - print PEM $cert; - close(PEM); - } - $write_current_cert = 1 - } - else - { - if ($in_cert_block == 1 && $write_current_cert == 1) - { - print PEM $cert; - } - } -} - -# Check that the correct number of .pem files were produced. -@pem_files = <*.pem>; -if (@pem_files != $pem_file_count) -{ - print "$pem_file_count"; - die "Number of .pem files produced does not match". - " number of certs read from $file."; -} - -# Now store each cert in the 'cacerts' file using keytool. -$certs_written_count = 0; -foreach $pem_file (@pem_files) -{ - system "$ARGV[0] -noprompt -import". - " -alias `basename $pem_file .pem`". - " -keystore cacerts -storepass 'changeit' -file $pem_file"; - unlink($pem_file); - $certs_written_count++; -} - -# Check that the correct number of certs were added to the keystore. -if ($certs_written_count != $pem_file_count) -{ - die "Number of certs added to keystore does not match". - " number of certs read from $file."; -} diff --git a/dev-java/icedtea/files/icedtea.env b/dev-java/icedtea/files/icedtea.env deleted file mode 100644 index 115a7e0..0000000 --- a/dev-java/icedtea/files/icedtea.env +++ /dev/null @@ -1,18 +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/icedtea/files/icedtea.env,v 1.1 2010/03/04 23:21:01 caster Exp $ - -VERSION="OpenJDK@SLOT@/IcedTea@SLOT@ @PV@" -JAVA_HOME=/usr/lib/icedtea@SLOT@ -JDK_HOME=/usr/lib/icedtea@SLOT@ -JAVAC=${JAVA_HOME}/bin/javac -PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" -MANPATH="/usr/lib/icedtea@SLOT@/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.@SLOT@" -# Taken from sun.boot.class.path property -BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/icedtea/icedtea-6.1.8.0.ebuild b/dev-java/icedtea/icedtea-6.1.8.0.ebuild deleted file mode 100644 index cef3f5d..0000000 --- a/dev-java/icedtea/icedtea-6.1.8.0.ebuild +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.8.0.ebuild,v 1.3 2010/05/03 12:32:51 caster Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * -# ********************************************************* - -EAPI="2" - -inherit autotools pax-utils java-pkg-2 java-vm-2 - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="6" -KEYWORDS="~amd64 ~arm ~x86" - -DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies" -ICEDTEA_VER="1.8" -ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER} -OPENJDK_BUILD="18" -OPENJDK_DATE="16_feb_2010" -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" -HOTSPOT_TARBALL="62926c7f67a3.tar.gz" -JAXP_TARBALL="jdk6-jaxp-2009_10_13.zip" -JAXWS_TARBALL="jdk6-jaxws-2009_10_27.zip" -JAF_TARBALL="jdk6-jaf-2009_10_27.zip" -CACAO_TARBALL="cacao-0.99.4.tar.gz" -SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} - http://hg.openjdk.java.net/hsx/hsx16/master/archive/${HOTSPOT_TARBALL} - https://jaxp.dev.java.net/files/documents/913/147329/${JAXP_TARBALL} - http://kenai.com/projects/jdk6-drops/downloads/download/${JAXWS_TARBALL} - http://kenai.com/projects/jdk6-drops/downloads/download/${JAF_TARBALL} - cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )" -HOMEPAGE="http://icedtea.classpath.org" -S=${WORKDIR}/${ICEDTEA_PKG} - -# Missing options: -# shark - still experimental, requires llvm which is not yet packaged -# visualvm - requries netbeans which would cause major bootstrap issues -IUSE="cacao debug doc examples +hs16 javascript nio2 nsplugin +nss pulseaudio systemtap +xrender zero" - -# JTReg doesn't pass at present -RESTRICT="test" - -RDEPEND=">=net-print/cups-1.2.12 - >=x11-libs/libX11-1.1.3 - >=media-libs/freetype-2.3.5 - >=media-libs/alsa-lib-1.0 - >=x11-libs/gtk+-2.8 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXtst-1.0.3 - >=media-libs/jpeg-6b - >=media-libs/libpng-1.2 - >=media-libs/giflib-4.1.6 - >=sys-libs/zlib-1.2.3 - x11-proto/inputproto - x11-proto/xineramaproto - nsplugin? ( >=net-libs/xulrunner-1.9.1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - javascript? ( dev-java/rhino:1.6 ) - zero? ( virtual/libffi ) - xrender? ( >=x11-libs/libXrender-0.9.4 ) - systemtap? ( >=dev-util/systemtap-1 ) - !dev-java/icedtea6 - nss? ( >=dev-libs/nss-3.12.5-r1 )" - -# Additional dependencies for building: -# zip: extract OpenJDK tarball, and needed by configure -# xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly) -# ant, ecj, jdk: required to build Java code -# Only ant-core-1.7.1-r2 and later contain a version of Ant that -# properly respects environment variables, if the build -# sets some environment variables. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -DEPEND="${RDEPEND} - || ( - ( >=dev-java/gcj-jdk-4.3 =app-admin/eselect-ecj-0.5-r1 ) - ( >=dev-java/cacao-0.99.2 =app-admin/eselect-ecj-0.5-r1 ) - dev-java/icedtea6-bin - dev-java/icedtea:${SLOT} - ) - app-arch/zip - >=dev-java/xalan-2.7.0:0 - >=dev-java/xerces-2.9.1:2 - >=dev-java/ant-core-1.7.1-r2 - dev-java/ant-nodeps - app-misc/ca-certificates - dev-lang/perl - dev-libs/openssl - || ( - ( - >=x11-libs/libXext-1.1.1 - >=x11-proto/xextproto-7.1.1 - x11-proto/xproto - ) - > all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - sed -e "s/@SLOT@/${SLOT}/g" \ - -e "s/@PV@/${ICEDTEA_VER}/g" \ - < "${FILESDIR}/icedtea.env" > "${T}/icedtea.env" - set_java_env "${T}/icedtea.env" -} - -use_zero() { - use zero || ( ! use amd64 && ! use x86 && ! use sparc ) -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - if use nsplugin; then - elog "The icedtea${SLOT} browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" - elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" - elog "such as Firefox 3.5+, Chromium and perhaps some others too." - fi -} diff --git a/dev-java/icedtea/icedtea-6.1.8.1.ebuild b/dev-java/icedtea/icedtea-6.1.8.1.ebuild deleted file mode 100644 index 436bd89..0000000 --- a/dev-java/icedtea/icedtea-6.1.8.1.ebuild +++ /dev/null @@ -1,317 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.8.1.ebuild,v 1.1 2010/07/30 11:10:04 caster Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * -# ********************************************************* - -EAPI="2" - -inherit pax-utils java-pkg-2 java-vm-2 - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="6" -KEYWORDS="~amd64 ~arm ~x86" - -DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies" -ICEDTEA_VER="1.8.1" -ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER} -OPENJDK_BUILD="18" -OPENJDK_DATE="16_feb_2010" -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" -HOTSPOT_TARBALL="62926c7f67a3.tar.gz" -JAXP_TARBALL="jdk6-jaxp-2009_10_13.zip" -JAXWS_TARBALL="jdk6-jaxws-2009_10_27.zip" -JAF_TARBALL="jdk6-jaf-2009_10_27.zip" -CACAO_TARBALL="cacao-0.99.4.tar.gz" -SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} - http://hg.openjdk.java.net/hsx/hsx16/master/archive/${HOTSPOT_TARBALL} - https://jaxp.dev.java.net/files/documents/913/147329/${JAXP_TARBALL} - http://kenai.com/projects/jdk6-drops/downloads/download/${JAXWS_TARBALL} - http://kenai.com/projects/jdk6-drops/downloads/download/${JAF_TARBALL} - cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )" -HOMEPAGE="http://icedtea.classpath.org" -S=${WORKDIR}/${ICEDTEA_PKG} - -# Missing options: -# shark - still experimental, requires llvm which is not yet packaged -# visualvm - requries netbeans which would cause major bootstrap issues -IUSE="cacao debug doc examples +hs16 javascript nio2 nsplugin +nss pulseaudio systemtap +xrender zero" - -# JTReg doesn't pass at present -RESTRICT="test" - -RDEPEND=">=net-print/cups-1.2.12 - >=x11-libs/libX11-1.1.3 - >=media-libs/freetype-2.3.5 - >=media-libs/alsa-lib-1.0 - >=x11-libs/gtk+-2.8 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXtst-1.0.3 - >=media-libs/jpeg-6b - >=media-libs/libpng-1.2 - >=media-libs/giflib-4.1.6 - >=sys-libs/zlib-1.2.3 - x11-proto/inputproto - x11-proto/xineramaproto - nsplugin? ( >=net-libs/xulrunner-1.9.1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - javascript? ( dev-java/rhino:1.6 ) - zero? ( virtual/libffi ) - xrender? ( >=x11-libs/libXrender-0.9.4 ) - systemtap? ( >=dev-util/systemtap-1 ) - !dev-java/icedtea6 - nss? ( >=dev-libs/nss-3.12.5-r1 )" - -# Additional dependencies for building: -# zip: extract OpenJDK tarball, and needed by configure -# xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly) -# ant, ecj, jdk: required to build Java code -# Only ant-core-1.7.1-r2 and later contain a version of Ant that -# properly respects environment variables, if the build -# sets some environment variables. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -DEPEND="${RDEPEND} - || ( - ( >=dev-java/gcj-jdk-4.3 =app-admin/eselect-ecj-0.5-r1 ) - ( >=dev-java/cacao-0.99.2 =app-admin/eselect-ecj-0.5-r1 ) - dev-java/icedtea6-bin - dev-java/icedtea:${SLOT} - ) - app-arch/zip - >=dev-java/xalan-2.7.0:0 - >=dev-java/xerces-2.9.1:2 - >=dev-java/ant-core-1.7.1-r2 - dev-java/ant-nodeps - app-misc/ca-certificates - dev-lang/perl - dev-libs/openssl - || ( - ( - >=x11-libs/libXext-1.1.1 - >=x11-proto/xextproto-7.1.1 - x11-proto/xproto - ) - > all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - sed -e "s/@SLOT@/${SLOT}/g" \ - -e "s/@PV@/${ICEDTEA_VER}/g" \ - < "${FILESDIR}/icedtea.env" > "${T}/icedtea.env" - set_java_env "${T}/icedtea.env" -} - -use_zero() { - use zero || ( ! use amd64 && ! use x86 && ! use sparc ) -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - if use nsplugin; then - elog "The icedtea${SLOT} browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" - elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" - elog "such as Firefox 3.5+, Chromium and perhaps some others too." - fi -} diff --git a/dev-java/icedtea/icedtea-6.1.9.ebuild b/dev-java/icedtea/icedtea-6.1.9.ebuild deleted file mode 100644 index b0c21fc..0000000 --- a/dev-java/icedtea/icedtea-6.1.9.ebuild +++ /dev/null @@ -1,309 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.ebuild,v 1.1 2010/09/09 13:35:24 caster Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * -# ********************************************************* - -EAPI="2" - -inherit pax-utils java-pkg-2 java-vm-2 - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="6" -KEYWORDS="~amd64 ~arm ~x86" - -DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies" -ICEDTEA_VER="1.9" -ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER} -OPENJDK_BUILD="20" -OPENJDK_DATE="21_jun_2010" -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" -JAXP_TARBALL="jdk6-jaxp-b20.zip" -JAXWS_TARBALL="jdk6-jaxws-b20.zip" -JAF_TARBALL="jdk6-jaf-b20.zip" -CACAO_TARBALL="e321b101a9ee.tar.bz2" -SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} - https://jax-ws.dev.java.net/files/documents/4202/150724/${JAXWS_TARBALL} - https://jax-ws.dev.java.net/files/documents/4202/150725/${JAF_TARBALL} - https://jaxp.dev.java.net/files/documents/913/150648/${JAXP_TARBALL} - cacao? ( http://mips.complang.tuwien.ac.at/hg/cacao/archive/${CACAO_TARBALL} )" -HOMEPAGE="http://icedtea.classpath.org" -S=${WORKDIR}/${ICEDTEA_PKG} - -# Missing options: -# shark - needs adding -IUSE="cacao debug doc examples javascript nio2 nsplugin +nss pulseaudio systemtap +xrender zero" - -# JTReg doesn't pass at present -RESTRICT="test" - -RDEPEND=">=net-print/cups-1.2.12 - >=x11-libs/libX11-1.1.3 - >=media-libs/freetype-2.3.5 - >=media-libs/alsa-lib-1.0 - >=x11-libs/gtk+-2.8 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXtst-1.0.3 - >=media-libs/jpeg-6b - >=media-libs/libpng-1.2 - >=media-libs/giflib-4.1.6 - >=sys-libs/zlib-1.2.3 - x11-proto/inputproto - x11-proto/xineramaproto - nsplugin? ( >=net-libs/xulrunner-1.9.1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - javascript? ( dev-java/rhino:1.6 ) - zero? ( virtual/libffi ) - xrender? ( >=x11-libs/libXrender-0.9.4 ) - systemtap? ( >=dev-util/systemtap-1 ) - !dev-java/icedtea6 - nss? ( >=dev-libs/nss-3.12.5-r1 )" - -# Additional dependencies for building: -# zip: extract OpenJDK tarball, and needed by configure -# xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly) -# ant, ecj, jdk: required to build Java code -# Only ant-core-1.7.1-r2 and later contain a version of Ant that -# properly respects environment variables, if the build -# sets some environment variables. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -DEPEND="${RDEPEND} - || ( - ( >=dev-java/gcj-jdk-4.3 =app-admin/eselect-ecj-0.5-r1 ) - ( >=dev-java/cacao-0.99.2 =app-admin/eselect-ecj-0.5-r1 ) - dev-java/icedtea6-bin - dev-java/icedtea:${SLOT} - ) - app-arch/zip - >=dev-java/xalan-2.7.0:0 - >=dev-java/xerces-2.9.1:2 - >=dev-java/ant-core-1.7.1-r2 - dev-java/ant-nodeps - app-misc/ca-certificates - dev-lang/perl - dev-libs/openssl - || ( - ( - >=x11-libs/libXext-1.1.1 - >=x11-proto/xextproto-7.1.1 - x11-proto/xproto - ) - > all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - sed -e "s/@SLOT@/${SLOT}/g" \ - -e "s/@PV@/${ICEDTEA_VER}/g" \ - < "${FILESDIR}/icedtea.env" > "${T}/icedtea.env" - set_java_env "${T}/icedtea.env" -} - -use_zero() { - use zero || ( ! use amd64 && ! use x86 && ! use sparc ) -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - if use nsplugin; then - elog "The icedtea${SLOT} browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" - elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" - elog "such as Firefox 3.5+, Chromium and perhaps some others too." - fi -} diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml deleted file mode 100644 index f78b83a..0000000 --- a/dev-java/icedtea/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - -java - - gnu_andrew@member.fsf.org - Andrew John Hughes - Proxy Maintainer - - - caster@gentoo.org - Vlastimil Babka - Commiter (CC me) - -The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. - - Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures. - Use the new version of HotSpot (16). - Enable backport of NIO2 to OpenJDK6. - Enable NSS security provider support. - - Enable SystemTap probes in HotSpot. - Enable support for using XRender with the AWT libraries. - Enable the zero assembler port of HotSpot. - -