changeset in /hg/icedtea: 2007-09-28 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Fri Sep 28 11:25:37 PDT 2007
changeset 7111f5efaaf3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7111f5efaaf3
description:
2007-09-28 Lillian Angel <langel at redhat.com>
* Makefile.am: Updated to b21. Removed all targets used to build
IcedTea with ecj. Removed building of jce.jar and copying over
security sources.
* Makefile.in: Regenerated
* configure: Regenerated
* configure.ac: Removed --with-icedtea option, now default.
* patches/icedtea-antialias.patch: Fixed to patch b21 correctly.
* patches/icedtea-copy-plugs.patch: Likewise.
* patches/icedtea-debuginfo.patch: Likewise.
* patches/icedtea-license-headers.patch: Likewise.
* patches/icedtea-paths.patch: Likewise.
* patches/icedtea-plugin.patch: Likewise.
* patches/icedtea-use-system-tzdata.patch: Likewise.
* patches/icedtea-version.patch: Likewise.
* rt/com/sun/media/sound/MixerSequencer.java: Implemented.
* rt/com/sun/media/sound/MixerSynth.java: Implemented.
* tools-copy-files.txt: Modified.
* patches/icedtea-headers.patch: New patch.
* patches/icedtea-java-home.patch: New patch.
* jce/: Removed
* patches/icedtea-assembler_amd64.patch: Removed.
* patches/icedtea-ecj-bootstrap.patch:Removed.
* patches/icedtea-lesstif_amd64.patch: Removed.
* rt/com/sun/media/sound/AutoConnectSequencer.java: Removed.
* rt/com/sun/media/sound/DirectAudioDevice.java: Removed.
* rt/com/sun/media/sound/DirectAudioDeviceProvider.java: Removed.
* rt/com/sun/media/sound/MidiOutDevice.java: Removed.
* rt/com/sun/media/sound/Platform.java: Removed.
* rt/com/sun/media/sound/Toolkit.java: Removed.
* rt/gnu/java/security/provider/Gnu.java: Removed.
diffstat:
542 files changed, 489 insertions(+), 97179 deletions(-)
ChangeLog | 33
Makefile.am | 320 -
Makefile.in | 333 -
configure | 1897 ----------
configure.ac | 52
jce/gnu/classpath/debug/Component.java | 175
jce/gnu/classpath/debug/PreciseFilter.java | 105
jce/gnu/classpath/debug/Simple1LineFormatter.java | 161
jce/gnu/classpath/debug/SystemLogger.java | 102
jce/gnu/classpath/debug/TeeInputStream.java | 98
jce/gnu/classpath/debug/TeeOutputStream.java | 93
jce/gnu/classpath/debug/TeeReader.java | 98
jce/gnu/classpath/debug/TeeWriter.java | 93
jce/gnu/java/security/Configuration.java | 56
jce/gnu/java/security/Engine.java | 280 -
jce/gnu/java/security/OID.java | 510 --
jce/gnu/java/security/PolicyFile.java | 685 ---
jce/gnu/java/security/Properties.java | 348 -
jce/gnu/java/security/Registry.java | 465 --
jce/gnu/java/security/Requires.java | 59
jce/gnu/java/security/action/GetPropertyAction.java | 89
jce/gnu/java/security/action/GetSecurityPropertyAction.java | 93
jce/gnu/java/security/action/SetAccessibleAction.java | 77
jce/gnu/java/security/der/BitString.java | 330 -
jce/gnu/java/security/der/DER.java | 86
jce/gnu/java/security/der/DEREncodingException.java | 54
jce/gnu/java/security/der/DERReader.java | 437 --
jce/gnu/java/security/der/DERValue.java | 189
jce/gnu/java/security/der/DERWriter.java | 355 -
jce/gnu/java/security/hash/BaseHash.java | 183
jce/gnu/java/security/hash/HashFactory.java | 135
jce/gnu/java/security/hash/Haval.java | 807 ----
jce/gnu/java/security/hash/IMessageDigest.java | 127
jce/gnu/java/security/hash/MD2.java | 256 -
jce/gnu/java/security/hash/MD4.java | 337 -
jce/gnu/java/security/hash/MD5.java | 371 -
jce/gnu/java/security/hash/RipeMD128.java | 257 -
jce/gnu/java/security/hash/RipeMD160.java | 291 -
jce/gnu/java/security/hash/Sha160.java | 241 -
jce/gnu/java/security/hash/Sha256.java | 252 -
jce/gnu/java/security/hash/Sha384.java | 279 -
jce/gnu/java/security/hash/Sha512.java | 281 -
jce/gnu/java/security/hash/Tiger.java | 864 ----
jce/gnu/java/security/hash/Whirlpool.java | 606 ---
jce/gnu/java/security/icedtea/CertBundleKeyStoreImpl.java | 199 -
jce/gnu/java/security/icedtea/GNUTlsKeyMaterialGeneratorImpl.java | 201 -
jce/gnu/java/security/icedtea/GNUTlsMasterSecretGenerator.java | 122
jce/gnu/java/security/icedtea/GNUTlsPrfGeneratorImpl.java | 180
jce/gnu/java/security/icedtea/GNUTlsRsaPreMasterSecretGeneratorImpl.java | 120
jce/gnu/java/security/icedtea/IcedTls.java | 60
jce/gnu/java/security/jce/hash/HavalSpi.java | 54
jce/gnu/java/security/jce/hash/MD2Spi.java | 55
jce/gnu/java/security/jce/hash/MD4Spi.java | 55
jce/gnu/java/security/jce/hash/MD5Spi.java | 54
jce/gnu/java/security/jce/hash/MessageDigestAdapter.java | 133
jce/gnu/java/security/jce/hash/RipeMD128Spi.java | 54
jce/gnu/java/security/jce/hash/RipeMD160Spi.java | 54
jce/gnu/java/security/jce/hash/Sha160Spi.java | 54
jce/gnu/java/security/jce/hash/Sha256Spi.java | 54
jce/gnu/java/security/jce/hash/Sha384Spi.java | 54
jce/gnu/java/security/jce/hash/Sha512Spi.java | 54
jce/gnu/java/security/jce/hash/TigerSpi.java | 55
jce/gnu/java/security/jce/hash/WhirlpoolSpi.java | 54
jce/gnu/java/security/jce/prng/HavalRandomSpi.java | 54
jce/gnu/java/security/jce/prng/MD2RandomSpi.java | 54
jce/gnu/java/security/jce/prng/MD4RandomSpi.java | 54
jce/gnu/java/security/jce/prng/MD5RandomSpi.java | 54
jce/gnu/java/security/jce/prng/RipeMD128RandomSpi.java | 54
jce/gnu/java/security/jce/prng/RipeMD160RandomSpi.java | 54
jce/gnu/java/security/jce/prng/SecureRandomAdapter.java | 107
jce/gnu/java/security/jce/prng/Sha160RandomSpi.java | 54
jce/gnu/java/security/jce/prng/Sha256RandomSpi.java | 54
jce/gnu/java/security/jce/prng/Sha384RandomSpi.java | 54
jce/gnu/java/security/jce/prng/Sha512RandomSpi.java | 54
jce/gnu/java/security/jce/prng/TigerRandomSpi.java | 54
jce/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java | 54
jce/gnu/java/security/jce/sig/DSSKeyFactory.java | 221 -
jce/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java | 146
jce/gnu/java/security/jce/sig/DSSParameters.java | 218 -
jce/gnu/java/security/jce/sig/DSSParametersGenerator.java | 125
jce/gnu/java/security/jce/sig/DSSRawSignatureSpi.java | 56
jce/gnu/java/security/jce/sig/EncodedKeyFactory.java | 430 --
jce/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java | 95
jce/gnu/java/security/jce/sig/MD2withRSA.java | 56
jce/gnu/java/security/jce/sig/MD5withRSA.java | 56
jce/gnu/java/security/jce/sig/RSAKeyFactory.java | 231 -
jce/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java | 96
jce/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java | 56
jce/gnu/java/security/jce/sig/SHA160withDSS.java | 54
jce/gnu/java/security/jce/sig/SHA160withRSA.java | 56
jce/gnu/java/security/jce/sig/SHA256withRSA.java | 56
jce/gnu/java/security/jce/sig/SHA384withRSA.java | 56
jce/gnu/java/security/jce/sig/SHA512withRSA.java | 56
jce/gnu/java/security/jce/sig/SignatureAdapter.java | 250 -
jce/gnu/java/security/key/IKeyPairCodec.java | 124
jce/gnu/java/security/key/IKeyPairGenerator.java | 73
jce/gnu/java/security/key/KeyPairCodecFactory.java | 360 -
jce/gnu/java/security/key/KeyPairGeneratorFactory.java | 120
jce/gnu/java/security/key/dss/DSSKey.java | 211 -
jce/gnu/java/security/key/dss/DSSKeyPairGenerator.java | 382 --
jce/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java | 249 -
jce/gnu/java/security/key/dss/DSSKeyPairRawCodec.java | 347 -
jce/gnu/java/security/key/dss/DSSKeyPairX509Codec.java | 276 -
jce/gnu/java/security/key/dss/DSSPrivateKey.java | 203 -
jce/gnu/java/security/key/dss/DSSPublicKey.java | 201 -
jce/gnu/java/security/key/dss/FIPS186.java | 262 -
jce/gnu/java/security/key/rsa/GnuRSAKey.java | 176
jce/gnu/java/security/key/rsa/GnuRSAPrivateKey.java | 311 -
jce/gnu/java/security/key/rsa/GnuRSAPublicKey.java | 188
jce/gnu/java/security/key/rsa/RSAKeyPairGenerator.java | 246 -
jce/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java | 299 -
jce/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java | 300 -
jce/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java | 250 -
jce/gnu/java/security/prng/BasePRNG.java | 178
jce/gnu/java/security/prng/EntropySource.java | 61
jce/gnu/java/security/prng/IRandom.java | 174
jce/gnu/java/security/prng/LimitReachedException.java | 57
jce/gnu/java/security/prng/MDGenerator.java | 127
jce/gnu/java/security/prng/PRNGFactory.java | 92
jce/gnu/java/security/prng/RandomEvent.java | 81
jce/gnu/java/security/prng/RandomEventListener.java | 50
jce/gnu/java/security/provider/CollectionCertStoreImpl.java | 102
jce/gnu/java/security/provider/DefaultPolicy.java | 68
jce/gnu/java/security/provider/Gnu.java | 306 -
jce/gnu/java/security/provider/PKIXCertPathValidatorImpl.java | 693 ---
jce/gnu/java/security/provider/X509CertificateFactory.java | 294 -
jce/gnu/java/security/provider/package.html | 46
jce/gnu/java/security/sig/BaseSignature.java | 219 -
jce/gnu/java/security/sig/ISignature.java | 160
jce/gnu/java/security/sig/ISignatureCodec.java | 59
jce/gnu/java/security/sig/SignatureCodecFactory.java | 226 -
jce/gnu/java/security/sig/SignatureFactory.java | 101
jce/gnu/java/security/sig/dss/DSSSignature.java | 275 -
jce/gnu/java/security/sig/dss/DSSSignatureRawCodec.java | 164
jce/gnu/java/security/sig/dss/DSSSignatureX509Codec.java | 193 -
jce/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java | 274 -
jce/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java | 243 -
jce/gnu/java/security/sig/rsa/EMSA_PSS.java | 371 -
jce/gnu/java/security/sig/rsa/RSA.java | 324 -
jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java | 224 -
jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java | 153
jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java | 128
jce/gnu/java/security/sig/rsa/RSAPSSSignature.java | 255 -
jce/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java | 134
jce/gnu/java/security/sig/rsa/RSASignatureFactory.java | 176
jce/gnu/java/security/util/ByteArray.java | 109
jce/gnu/java/security/util/ByteBufferOutputStream.java | 118
jce/gnu/java/security/util/DerUtil.java | 64
jce/gnu/java/security/util/ExpirableObject.java | 150
jce/gnu/java/security/util/FormatUtil.java | 140
jce/gnu/java/security/util/IntegerUtil.java | 109
jce/gnu/java/security/util/PRNG.java | 141
jce/gnu/java/security/util/Prime.java | 164
jce/gnu/java/security/util/Sequence.java | 133
jce/gnu/java/security/util/SimpleList.java | 155
jce/gnu/java/security/util/Util.java | 627 ---
jce/gnu/java/security/util/package.html | 46
jce/gnu/java/security/x509/GnuPKIExtension.java | 59
jce/gnu/java/security/x509/PolicyNodeImpl.java | 214 -
jce/gnu/java/security/x509/Util.java | 202 -
jce/gnu/java/security/x509/X500DistinguishedName.java | 556 --
jce/gnu/java/security/x509/X509CRL.java | 485 --
jce/gnu/java/security/x509/X509CRLEntry.java | 273 -
jce/gnu/java/security/x509/X509CRLSelectorImpl.java | 138
jce/gnu/java/security/x509/X509CertPath.java | 303 -
jce/gnu/java/security/x509/X509CertSelectorImpl.java | 197 -
jce/gnu/java/security/x509/X509Certificate.java | 757 ---
jce/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java | 133
jce/gnu/java/security/x509/ext/BasicConstraints.java | 129
jce/gnu/java/security/x509/ext/CRLNumber.java | 97
jce/gnu/java/security/x509/ext/CertificatePolicies.java | 205 -
jce/gnu/java/security/x509/ext/ExtendedKeyUsage.java | 95
jce/gnu/java/security/x509/ext/Extension.java | 297 -
jce/gnu/java/security/x509/ext/GeneralName.java | 232 -
jce/gnu/java/security/x509/ext/GeneralNames.java | 89
jce/gnu/java/security/x509/ext/GeneralSubtree.java | 156
jce/gnu/java/security/x509/ext/IssuerAlternativeNames.java | 77
jce/gnu/java/security/x509/ext/KeyUsage.java | 92
jce/gnu/java/security/x509/ext/NameConstraints.java | 161
jce/gnu/java/security/x509/ext/PolicyConstraint.java | 107
jce/gnu/java/security/x509/ext/PolicyMappings.java | 104
jce/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java | 105
jce/gnu/java/security/x509/ext/ReasonCode.java | 85
jce/gnu/java/security/x509/ext/SubjectAlternativeNames.java | 77
jce/gnu/java/security/x509/ext/SubjectKeyIdentifier.java | 84
jce/gnu/java/security/x509/ext/package.html | 46
jce/gnu/java/security/x509/package.html | 46
jce/gnu/javax/crypto/RSACipherImpl.java | 347 -
jce/gnu/javax/crypto/assembly/Assembly.java | 272 -
jce/gnu/javax/crypto/assembly/Cascade.java | 348 -
jce/gnu/javax/crypto/assembly/CascadeStage.java | 93
jce/gnu/javax/crypto/assembly/CascadeTransformer.java | 123
jce/gnu/javax/crypto/assembly/DeflateTransformer.java | 177
jce/gnu/javax/crypto/assembly/Direction.java | 78
jce/gnu/javax/crypto/assembly/LoopbackTransformer.java | 100
jce/gnu/javax/crypto/assembly/ModeStage.java | 112
jce/gnu/javax/crypto/assembly/Operation.java | 73
jce/gnu/javax/crypto/assembly/PaddingTransformer.java | 164
jce/gnu/javax/crypto/assembly/Stage.java | 202 -
jce/gnu/javax/crypto/assembly/Transformer.java | 421 --
jce/gnu/javax/crypto/assembly/TransformerException.java | 138
jce/gnu/javax/crypto/cipher/Anubis.java | 491 --
jce/gnu/javax/crypto/cipher/BaseCipher.java | 247 -
jce/gnu/javax/crypto/cipher/Blowfish.java | 611 ---
jce/gnu/javax/crypto/cipher/Cast5.java | 987 -----
jce/gnu/javax/crypto/cipher/CipherFactory.java | 129
jce/gnu/javax/crypto/cipher/DES.java | 652 ---
jce/gnu/javax/crypto/cipher/IBlockCipher.java | 195 -
jce/gnu/javax/crypto/cipher/IBlockCipherSpi.java | 124
jce/gnu/javax/crypto/cipher/Khazad.java | 449 --
jce/gnu/javax/crypto/cipher/NullCipher.java | 108
jce/gnu/javax/crypto/cipher/Rijndael.java | 704 ---
jce/gnu/javax/crypto/cipher/Serpent.java | 1781 ---------
jce/gnu/javax/crypto/cipher/Square.java | 425 --
jce/gnu/javax/crypto/cipher/TripleDES.java | 257 -
jce/gnu/javax/crypto/cipher/Twofish.java | 737 ---
jce/gnu/javax/crypto/cipher/WeakKeyException.java | 59
jce/gnu/javax/crypto/jce/DiffieHellmanImpl.java | 218 -
jce/gnu/javax/crypto/jce/GnuCrypto.java | 606 ---
jce/gnu/javax/crypto/jce/GnuSasl.java | 124
jce/gnu/javax/crypto/jce/PBESecretKeyFactory.java | 83
jce/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java | 218 -
jce/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java | 88
jce/gnu/javax/crypto/jce/cipher/AESSpi.java | 92
jce/gnu/javax/crypto/jce/cipher/ARCFourSpi.java | 183
jce/gnu/javax/crypto/jce/cipher/AnubisSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/BlowfishSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/Cast5Spi.java | 54
jce/gnu/javax/crypto/jce/cipher/CipherAdapter.java | 533 --
jce/gnu/javax/crypto/jce/cipher/DESSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java | 423 --
jce/gnu/javax/crypto/jce/cipher/KhazadSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/NullCipherSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/PBE.java | 229 -
jce/gnu/javax/crypto/jce/cipher/PBES2.java | 1379 -------
jce/gnu/javax/crypto/jce/cipher/RijndaelSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/SerpentSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/SquareSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/TripleDESSpi.java | 54
jce/gnu/javax/crypto/jce/cipher/TwofishSpi.java | 54
jce/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java | 47
jce/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java | 47
jce/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java | 47
jce/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java | 68
jce/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java | 82
jce/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java | 82
jce/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java | 47
jce/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java | 47
jce/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java | 87
jce/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java | 110
jce/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java | 47
jce/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java | 47
jce/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java | 50
jce/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java | 47
jce/gnu/javax/crypto/jce/keyring/GnuKeyring.java | 507 --
jce/gnu/javax/crypto/jce/mac/HMacHavalSpi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacMD2Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacMD4Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacMD5Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacTigerSpi.java | 54
jce/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java | 54
jce/gnu/javax/crypto/jce/mac/MacAdapter.java | 136
jce/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacCast5Impl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacDESImpl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacImpl.java | 140
jce/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacSquareImpl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java | 50
jce/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java | 50
jce/gnu/javax/crypto/jce/mac/TMMH16Spi.java | 81
jce/gnu/javax/crypto/jce/mac/UHash32Spi.java | 54
jce/gnu/javax/crypto/jce/mac/UMac32Spi.java | 79
jce/gnu/javax/crypto/jce/params/BlockCipherParameters.java | 149
jce/gnu/javax/crypto/jce/params/DEREncodingException.java | 54
jce/gnu/javax/crypto/jce/params/DERReader.java | 139
jce/gnu/javax/crypto/jce/params/DERWriter.java | 143
jce/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java | 101
jce/gnu/javax/crypto/jce/prng/CSPRNGSpi.java | 96
jce/gnu/javax/crypto/jce/prng/FortunaImpl.java | 87
jce/gnu/javax/crypto/jce/prng/ICMRandomSpi.java | 217 -
jce/gnu/javax/crypto/jce/prng/UMacRandomSpi.java | 168
jce/gnu/javax/crypto/jce/sig/DHKeyFactory.java | 219 -
jce/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java | 93
jce/gnu/javax/crypto/jce/sig/DHParameters.java | 220 -
jce/gnu/javax/crypto/jce/sig/DHParametersGenerator.java | 152
jce/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java | 122
jce/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java | 117
jce/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java | 73
jce/gnu/javax/crypto/key/BaseKeyAgreementParty.java | 168
jce/gnu/javax/crypto/key/GnuPBEKey.java | 96
jce/gnu/javax/crypto/key/GnuSecretKey.java | 131
jce/gnu/javax/crypto/key/IKeyAgreementParty.java | 100
jce/gnu/javax/crypto/key/IncomingMessage.java | 318 -
jce/gnu/javax/crypto/key/KeyAgreementException.java | 166
jce/gnu/javax/crypto/key/KeyAgreementFactory.java | 143
jce/gnu/javax/crypto/key/OutgoingMessage.java | 234 -
jce/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java | 240 -
jce/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java | 336 -
jce/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java | 255 -
jce/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java | 119
jce/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java | 117
jce/gnu/javax/crypto/key/dh/DiffieHellmanSender.java | 126
jce/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java | 115
jce/gnu/javax/crypto/key/dh/ElGamalReceiver.java | 99
jce/gnu/javax/crypto/key/dh/ElGamalSender.java | 112
jce/gnu/javax/crypto/key/dh/GnuDHKey.java | 174
jce/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java | 235 -
jce/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java | 200 -
jce/gnu/javax/crypto/key/dh/GnuDHPublicKey.java | 196 -
jce/gnu/javax/crypto/key/dh/RFC2631.java | 217 -
jce/gnu/javax/crypto/key/srp6/SRP6Host.java | 161
jce/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java | 141
jce/gnu/javax/crypto/key/srp6/SRP6SaslClient.java | 90
jce/gnu/javax/crypto/key/srp6/SRP6SaslServer.java | 90
jce/gnu/javax/crypto/key/srp6/SRP6TLSClient.java | 155
jce/gnu/javax/crypto/key/srp6/SRP6TLSServer.java | 177
jce/gnu/javax/crypto/key/srp6/SRP6User.java | 163
jce/gnu/javax/crypto/key/srp6/SRPAlgorithm.java | 131
jce/gnu/javax/crypto/key/srp6/SRPKey.java | 147
jce/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java | 282 -
jce/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java | 334 -
jce/gnu/javax/crypto/key/srp6/SRPPrivateKey.java | 227 -
jce/gnu/javax/crypto/key/srp6/SRPPublicKey.java | 175
jce/gnu/javax/crypto/keyring/AuthenticatedEntry.java | 176
jce/gnu/javax/crypto/keyring/BaseKeyring.java | 158
jce/gnu/javax/crypto/keyring/BinaryDataEntry.java | 111
jce/gnu/javax/crypto/keyring/CertPathEntry.java | 112
jce/gnu/javax/crypto/keyring/CertificateEntry.java | 128
jce/gnu/javax/crypto/keyring/CompressedEntry.java | 93
jce/gnu/javax/crypto/keyring/EncryptedEntry.java | 191 -
jce/gnu/javax/crypto/keyring/Entry.java | 179
jce/gnu/javax/crypto/keyring/EnvelopeEntry.java | 439 --
jce/gnu/javax/crypto/keyring/GnuPrivateKeyring.java | 368 -
jce/gnu/javax/crypto/keyring/GnuPublicKeyring.java | 151
jce/gnu/javax/crypto/keyring/IKeyring.java | 162
jce/gnu/javax/crypto/keyring/IPrivateKeyring.java | 144
jce/gnu/javax/crypto/keyring/IPublicKeyring.java | 82
jce/gnu/javax/crypto/keyring/MalformedKeyringException.java | 55
jce/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java | 135
jce/gnu/javax/crypto/keyring/MeteredInputStream.java | 127
jce/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java | 286 -
jce/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java | 293 -
jce/gnu/javax/crypto/keyring/PasswordProtectedEntry.java | 57
jce/gnu/javax/crypto/keyring/PrimitiveEntry.java | 112
jce/gnu/javax/crypto/keyring/PrivateKeyEntry.java | 194 -
jce/gnu/javax/crypto/keyring/Properties.java | 203 -
jce/gnu/javax/crypto/keyring/PublicKeyEntry.java | 162
jce/gnu/javax/crypto/kwa/AESKeyWrap.java | 168
jce/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java | 145
jce/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java | 160
jce/gnu/javax/crypto/kwa/KeyUnwrappingException.java | 67
jce/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java | 110
jce/gnu/javax/crypto/kwa/TripleDESKeyWrap.java | 292 -
jce/gnu/javax/crypto/mac/BaseMac.java | 127
jce/gnu/javax/crypto/mac/HMac.java | 263 -
jce/gnu/javax/crypto/mac/HMacFactory.java | 111
jce/gnu/javax/crypto/mac/IMac.java | 181
jce/gnu/javax/crypto/mac/MacFactory.java | 130
jce/gnu/javax/crypto/mac/MacInputStream.java | 124
jce/gnu/javax/crypto/mac/MacOutputStream.java | 123
jce/gnu/javax/crypto/mac/OMAC.java | 303 -
jce/gnu/javax/crypto/mac/TMMH16.java | 339 -
jce/gnu/javax/crypto/mac/UHash32.java | 758 ---
jce/gnu/javax/crypto/mac/UMac32.java | 418 --
jce/gnu/javax/crypto/mode/BaseMode.java | 293 -
jce/gnu/javax/crypto/mode/CBC.java | 123
jce/gnu/javax/crypto/mode/CFB.java | 155
jce/gnu/javax/crypto/mode/CTR.java | 168
jce/gnu/javax/crypto/mode/EAX.java | 289 -
jce/gnu/javax/crypto/mode/ECB.java | 121
jce/gnu/javax/crypto/mode/IAuthenticatedMode.java | 56
jce/gnu/javax/crypto/mode/ICM.java | 181
jce/gnu/javax/crypto/mode/IMode.java | 123
jce/gnu/javax/crypto/mode/ModeFactory.java | 151
jce/gnu/javax/crypto/mode/OFB.java | 174
jce/gnu/javax/crypto/pad/BasePad.java | 191 -
jce/gnu/javax/crypto/pad/IPad.java | 127
jce/gnu/javax/crypto/pad/ISO10126.java | 109
jce/gnu/javax/crypto/pad/PKCS1_V1_5.java | 156
jce/gnu/javax/crypto/pad/PKCS7.java | 111
jce/gnu/javax/crypto/pad/PadFactory.java | 120
jce/gnu/javax/crypto/pad/SSL3.java | 90
jce/gnu/javax/crypto/pad/TBC.java | 118
jce/gnu/javax/crypto/pad/TLS1.java | 91
jce/gnu/javax/crypto/pad/WrongPaddingException.java | 48
jce/gnu/javax/crypto/prng/ARCFour.java | 137
jce/gnu/javax/crypto/prng/CSPRNG.java | 985 -----
jce/gnu/javax/crypto/prng/Fortuna.java | 349 -
jce/gnu/javax/crypto/prng/ICMGenerator.java | 297 -
jce/gnu/javax/crypto/prng/IPBE.java | 81
jce/gnu/javax/crypto/prng/PBKDF2.java | 184
jce/gnu/javax/crypto/prng/PRNGFactory.java | 115
jce/gnu/javax/crypto/prng/UMacGenerator.java | 186
jce/gnu/javax/crypto/sasl/AuthInfo.java | 129
jce/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java | 67
jce/gnu/javax/crypto/sasl/ClientFactory.java | 168
jce/gnu/javax/crypto/sasl/ClientMechanism.java | 293 -
jce/gnu/javax/crypto/sasl/ConfidentialityException.java | 82
jce/gnu/javax/crypto/sasl/IAuthInfoProvider.java | 116
jce/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java | 55
jce/gnu/javax/crypto/sasl/IllegalMechanismStateException.java | 84
jce/gnu/javax/crypto/sasl/InputBuffer.java | 272 -
jce/gnu/javax/crypto/sasl/IntegrityException.java | 83
jce/gnu/javax/crypto/sasl/NoSuchMechanismException.java | 62
jce/gnu/javax/crypto/sasl/NoSuchUserException.java | 67
jce/gnu/javax/crypto/sasl/OutputBuffer.java | 198 -
jce/gnu/javax/crypto/sasl/SaslEncodingException.java | 66
jce/gnu/javax/crypto/sasl/SaslInputStream.java | 393 --
jce/gnu/javax/crypto/sasl/SaslOutputStream.java | 175
jce/gnu/javax/crypto/sasl/SaslUtil.java | 75
jce/gnu/javax/crypto/sasl/ServerFactory.java | 158
jce/gnu/javax/crypto/sasl/ServerMechanism.java | 294 -
jce/gnu/javax/crypto/sasl/UserAlreadyExistsException.java | 70
jce/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java | 102
jce/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java | 90
jce/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java | 83
jce/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java | 166
jce/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java | 168
jce/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java | 60
jce/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java | 158
jce/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java | 120
jce/gnu/javax/crypto/sasl/crammd5/PasswordFile.java | 238 -
jce/gnu/javax/crypto/sasl/plain/PasswordFile.java | 243 -
jce/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java | 166
jce/gnu/javax/crypto/sasl/plain/PlainClient.java | 154
jce/gnu/javax/crypto/sasl/plain/PlainRegistry.java | 57
jce/gnu/javax/crypto/sasl/plain/PlainServer.java | 155
jce/gnu/javax/crypto/sasl/srp/CALG.java | 221 -
jce/gnu/javax/crypto/sasl/srp/ClientStore.java | 155
jce/gnu/javax/crypto/sasl/srp/IALG.java | 128
jce/gnu/javax/crypto/sasl/srp/KDF.java | 140
jce/gnu/javax/crypto/sasl/srp/PasswordFile.java | 625 ---
jce/gnu/javax/crypto/sasl/srp/SRP.java | 255 -
jce/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java | 177
jce/gnu/javax/crypto/sasl/srp/SRPClient.java | 952 -----
jce/gnu/javax/crypto/sasl/srp/SRPRegistry.java | 165
jce/gnu/javax/crypto/sasl/srp/SRPServer.java | 840 ----
jce/gnu/javax/crypto/sasl/srp/SecurityContext.java | 140
jce/gnu/javax/crypto/sasl/srp/ServerStore.java | 175
jce/gnu/javax/crypto/sasl/srp/StoreEntry.java | 75
jce/gnu/javax/security/auth/Password.java | 285 -
jce/gnu/javax/security/auth/callback/AbstractCallbackHandler.java | 295 -
jce/gnu/javax/security/auth/callback/CertificateCallback.java | 64
jce/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java | 299 -
jce/gnu/javax/security/auth/callback/DefaultCallbackHandler.java | 109
jce/gnu/javax/security/auth/callback/GnuCallbacks.java | 65
jce/gnu/javax/security/auth/login/ConfigFileParser.java | 346 -
jce/gnu/javax/security/auth/login/ConfigFileTokenizer.java | 244 -
jce/gnu/javax/security/auth/login/GnuConfiguration.java | 466 --
jce/javax/crypto/BadPaddingException.java | 79
jce/javax/crypto/Cipher.java | 1154 ------
jce/javax/crypto/CipherInputStream.java | 368 -
jce/javax/crypto/CipherOutputStream.java | 154
jce/javax/crypto/CipherSpi.java | 445 --
jce/javax/crypto/EncryptedPrivateKeyInfo.java | 317 -
jce/javax/crypto/ExemptionMechanism.java | 274 -
jce/javax/crypto/ExemptionMechanismException.java | 78
jce/javax/crypto/ExemptionMechanismSpi.java | 149
jce/javax/crypto/IllegalBlockSizeException.java | 71
jce/javax/crypto/KeyAgreement.java | 378 -
jce/javax/crypto/KeyAgreementSpi.java | 160
jce/javax/crypto/KeyGenerator.java | 298 -
jce/javax/crypto/KeyGeneratorSpi.java | 112
jce/javax/crypto/Mac.java | 434 --
jce/javax/crypto/MacSpi.java | 163
jce/javax/crypto/NoSuchPaddingException.java | 71
jce/javax/crypto/NullCipher.java | 62
jce/javax/crypto/NullCipherImpl.java | 127
jce/javax/crypto/SealedObject.java | 355 -
jce/javax/crypto/SecretKey.java | 65
jce/javax/crypto/SecretKeyFactory.java | 255 -
jce/javax/crypto/SecretKeyFactorySpi.java | 108
jce/javax/crypto/ShortBufferException.java | 70
jce/javax/crypto/interfaces/DHKey.java | 61
jce/javax/crypto/interfaces/DHPrivateKey.java | 69
jce/javax/crypto/interfaces/DHPublicKey.java | 68
jce/javax/crypto/interfaces/PBEKey.java | 90
jce/javax/crypto/spec/DESKeySpec.java | 220 -
jce/javax/crypto/spec/DESedeKeySpec.java | 151
jce/javax/crypto/spec/DHGenParameterSpec.java | 100
jce/javax/crypto/spec/DHParameterSpec.java | 135
jce/javax/crypto/spec/DHPrivateKeySpec.java | 115
jce/javax/crypto/spec/DHPublicKeySpec.java | 115
jce/javax/crypto/spec/IvParameterSpec.java | 96
jce/javax/crypto/spec/OAEPParameterSpec.java | 78
jce/javax/crypto/spec/PBEKeySpec.java | 292 -
jce/javax/crypto/spec/PBEParameterSpec.java | 100
jce/javax/crypto/spec/PSource.java | 69
jce/javax/crypto/spec/RC2ParameterSpec.java | 166
jce/javax/crypto/spec/RC5ParameterSpec.java | 202 -
jce/javax/crypto/spec/SecretKeySpec.java | 163
jce/sun/security/internal/interfaces/TlsMasterSecret.java | 44
jce/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java | 78
jce/sun/security/internal/spec/TlsKeyMaterialSpec.java | 118
jce/sun/security/internal/spec/TlsMasterSecretParameterSpec.java | 60
jce/sun/security/internal/spec/TlsPrfParameterSpec.java | 58
jce/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java | 69
patches/icedtea-antialias.patch | 10
patches/icedtea-assembler_amd64.patch | 16
patches/icedtea-copy-plugs.patch | 58
patches/icedtea-debuginfo.patch | 45
patches/icedtea-ecj-bootstrap.patch | 366 -
patches/icedtea-headers.patch | 10
patches/icedtea-java-home.patch | 10
patches/icedtea-lesstif_amd64.patch | 29
patches/icedtea-license-headers.patch | 149
patches/icedtea-paths.patch | 62
patches/icedtea-plugin.patch | 22
patches/icedtea-use-system-tzdata.patch | 49
patches/icedtea-version.patch | 61
rt/com/sun/media/sound/AutoConnectSequencer.java | 50
rt/com/sun/media/sound/DirectAudioDevice.java | 45
rt/com/sun/media/sound/DirectAudioDeviceProvider.java | 45
rt/com/sun/media/sound/MidiOutDevice.java | 44
rt/com/sun/media/sound/MixerSequencer.java | 188
rt/com/sun/media/sound/MixerSynth.java | 10
rt/com/sun/media/sound/Platform.java | 45
rt/com/sun/media/sound/Toolkit.java | 50
rt/gnu/java/security/provider/Gnu.java | 306 -
tools-copy-files.txt | 32
diffs (truncated from 100589 to 500 lines):
diff -r 4d80ec020858 -r 7111f5efaaf3 ChangeLog
--- a/ChangeLog Thu Sep 27 20:27:19 2007 -0700
+++ b/ChangeLog Fri Sep 28 14:25:29 2007 -0400
@@ -1,3 +1,36 @@ 2007-09-27 Keith Seitz <keiths at redhat.
+2007-09-28 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Updated to b21. Removed all targets used to build
+ IcedTea with ecj. Removed building of jce.jar and copying over
+ security sources.
+ * Makefile.in: Regenerated
+ * configure: Regenerated
+ * configure.ac: Removed --with-icedtea option, now default.
+ * patches/icedtea-antialias.patch: Fixed to patch b21 correctly.
+ * patches/icedtea-copy-plugs.patch: Likewise.
+ * patches/icedtea-debuginfo.patch: Likewise.
+ * patches/icedtea-license-headers.patch: Likewise.
+ * patches/icedtea-paths.patch: Likewise.
+ * patches/icedtea-plugin.patch: Likewise.
+ * patches/icedtea-use-system-tzdata.patch: Likewise.
+ * patches/icedtea-version.patch: Likewise.
+ * rt/com/sun/media/sound/MixerSequencer.java: Implemented.
+ * rt/com/sun/media/sound/MixerSynth.java: Implemented.
+ * tools-copy-files.txt: Modified.
+ * patches/icedtea-headers.patch: New patch.
+ * patches/icedtea-java-home.patch: New patch.
+ * jce/: Removed
+ * patches/icedtea-assembler_amd64.patch: Removed.
+ * patches/icedtea-ecj-bootstrap.patch:Removed.
+ * patches/icedtea-lesstif_amd64.patch: Removed.
+ * rt/com/sun/media/sound/AutoConnectSequencer.java: Removed.
+ * rt/com/sun/media/sound/DirectAudioDevice.java: Removed.
+ * rt/com/sun/media/sound/DirectAudioDeviceProvider.java: Removed.
+ * rt/com/sun/media/sound/MidiOutDevice.java: Removed.
+ * rt/com/sun/media/sound/Platform.java: Removed.
+ * rt/com/sun/media/sound/Toolkit.java: Removed.
+ * rt/gnu/java/security/provider/Gnu.java: Removed.
+
2007-09-27 Keith Seitz <keiths at redhat.com>
* patches/icedtea-use-system-tzdata.patch: New file.
diff -r 4d80ec020858 -r 7111f5efaaf3 Makefile.am
--- a/Makefile.am Thu Sep 27 20:27:19 2007 -0700
+++ b/Makefile.am Fri Sep 28 14:25:29 2007 -0400
@@ -1,6 +1,6 @@ OPENJDK_VERSION = b19
-OPENJDK_VERSION = b19
-OPENJDK_DATE = 30_aug_2007
-OPENJDK_MD5SUM = 2763a34fe37695fafd09061cd2ca880b
+OPENJDK_VERSION = b21
+OPENJDK_DATE = 27_sep_2007
+OPENJDK_MD5SUM = 64ac356cd24af5e52cf9fd1217e234da
# Top-Level Targets
# =================
@@ -9,10 +9,9 @@ all-local: icedtea-against-icedtea
distclean-local: clean-copy
rm -rf stamps
- rm -f rt-source-files.txt jce-source-files.txt tools-source-files.txt
+ rm -f rt-source-files.txt tools-source-files.txt
rm -rf bootstrap
rm -rf lib
- rm -rf openjdk-ecj
rm -rf openjdk
rm -rf tools
rm -f gcjwebplugin.so
@@ -20,23 +19,19 @@ install:
install:
.PHONY: \
- env env-ecj snapshot clean-download clean-extract clean-patch \
- clean-extract-ecj clean-patch-ecj clean-bootstrap-directory \
- clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
- clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
- clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
- clean-tools-jar clean-tools clean-shared-objects clean-security-jars \
- clean-copy clean-rt clean-jce clean-gcjwebplugin
-
-EXTRA_DIST = rt jce generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
+ env snapshot clean-download clean-extract clean-patch \
+ clean-bootstrap-directory clean-bootstrap-directory-symlink \
+ icedtea icedtea-debug clean-icedtea icedtea-against-icedtea clean-plugs \
+ clean-tools-jar clean-tools clean-shared-objects \
+ clean-copy clean-rt clean-gcjwebplugin
+
+EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) \
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy-files.txt
# OpenJDK build environment.
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/
-ICEDTEA_JCE = \
- $(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/lib/jce.jar
ICEDTEA_RT = \
$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
ICEDTEA_CLS_DIR = \
@@ -44,14 +39,15 @@ ICEDTEA_ENDORSED_DIR = \
ICEDTEA_ENDORSED_DIR = \
$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
ICEDTEA_ENV = \
- "JRE_RELEASE_VERSION=1.7.0-b19" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-b19" \
+ "ANT_HOME=/usr" \
+ "BUILD_NUMBER=b21" \
+ "JRE_RELEASE_VERSION=1.7.0-b21" \
+ "HOTSPOT_RELEASE_VERSION=1.7.0-b21" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
- "ICEDTEA_JCE=$(ICEDTEA_JCE)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -64,40 +60,6 @@ env:
env:
@echo 'unset JAVA_HOME'
@echo 'export $(ICEDTEA_ENV)'
-
-# OpenJDK ecj build environment.
-ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
-ICEDTEA_JCE_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/lib/jce.jar
-ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
-ICEDTEA_ENV_ECJ = \
- "JRE_RELEASE_VERSION=1.7.0-b19" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-b19" \
- "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
- "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
- "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
- "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
- "ICEDTEA_JCE=$(ICEDTEA_JCE_ECJ)" \
- "ICEDTEA_RT=$(ICEDTEA_RT)" \
- "ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
- "ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR_ECJ)" \
- "ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
- "ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
- "BOOTCLASSPATH_CLS_RT=-bootclasspath \
- $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
- "BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
- "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(LIBGCJ_JAR)" \
- "CLASSPATH=" \
- "LD_LIBRARY_PATH=" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
-
-env-ecj:
- @echo 'unset JAVA_HOME'
- @echo 'export $(ICEDTEA_ENV_ECJ)'
# Mercurial snapshot.
snapshot: dist
@@ -163,18 +125,17 @@ ICEDTEA_PATCHES = \
patches/icedtea-antialias.patch \
patches/icedtea-paths.patch \
patches/icedtea-debuginfo.patch \
- patches/icedtea-java.security.patch \
patches/icedtea-ssl.patch \
- patches/icedtea-assembler_amd64.patch \
patches/icedtea-license-headers.patch \
patches/icedtea-libpng.patch \
patches/icedtea-plugin.patch \
patches/icedtea-rmi_amd64.patch \
- patches/icedtea-lesstif_amd64.patch \
patches/icedtea-tools.patch \
patches/icedtea-certbundle.patch \
patches/icedtea-demos.patch \
patches/icedtea-use-system-tzdata.patch \
+ patches/icedtea-java-home.patch \
+ patches/icedtea-headers.patch \
$(FAST_BUILD_PATCH)
stamps/patch.stamp: stamps/extract.stamp
@@ -202,95 +163,16 @@ clean-patch:
fi ; \
done
-# OpenJDK ecj Source Preparation Targets
-# ======================================
-
-# Extract OpenJDK sources for ecj.
-stamps/extract-ecj.stamp: stamps/download.stamp
- if ! test -d openjdk-ecj ; \
- then \
- mkdir tmp-ecj ; \
- $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \
- mv tmp-ecj/openjdk openjdk-ecj ; \
- rmdir tmp-ecj ; \
- chmod ug+w `find openjdk-ecj/j2se/src/share/demo/jvmti \
- -name sample.makefile.txt` ; \
- fi
- mkdir -p stamps
- touch stamps/extract-ecj.stamp
-
-clean-extract-ecj:
- rm -f stamps/extract-ecj.stamp
- rm -rf openjdk-ecj
-
-# Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj-bootstrap.patch
-
-stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
- for p in $(ICEDTEA_PATCHES) ; \
- do \
- echo Checking $$p ; \
- if $(PATCH) -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
- then \
- echo Applying $$p ; \
- $(PATCH) -p1 -d openjdk-ecj < $$p ; \
- fi ; \
- done
- echo Checking $(ICEDTEA_ECJ_PATCH) ; \
- if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
- then \
- echo Applying $(ICEDTEA_ECJ_PATCH) ; \
- $(PATCH) -p0 < $(ICEDTEA_ECJ_PATCH) ; \
- fi
- mkdir -p stamps
- touch stamps/patch-ecj.stamp
-
-clean-patch-ecj:
- rm -f stamps/patch-ecj.stamp
- echo Checking $(ICEDTEA_ECJ_PATCH) ; \
- if $(PATCH) -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
- then \
- echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
- $(PATCH) -p0 -R < $(ICEDTEA_ECJ_PATCH) ; \
- fi
- for p in $(ICEDTEA_PATCHES) ; \
- do \
- echo Checking $$p ; \
- if $(PATCH) -p1 -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
- then \
- echo Reverting $$p ; \
- $(PATCH) -p1 -d openjdk-ecj -R < $$p ; \
- fi ; \
- done
-
# Bootstrap Directory Targets
# ===========================
-# bootstrap/icedtea.
-stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
- rm -rf bootstrap/icedtea
- cp -a openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image \
- bootstrap/icedtea
- mkdir -p stamps
- touch stamps/bootstrap-directory.stamp
-
-clean-bootstrap-directory:
- rm -f stamps/bootstrap-directory.stamp
- rm -rf bootstrap/icedtea
-
-if WITH_ICEDTEA
- BOOTSTRAP_DIRECTORY_STAMP =
- ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
-else
- BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
- ICEDTEA_HOME = icedtea
-endif
+MEMORY_LIMIT = -J-Xmx512m
# bootstrap/jdk1.6.0 to bootstrap/icedtea symlink.
-stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP)
+stamps/bootstrap-directory-symlink.stamp:
mkdir -p bootstrap
rm -f bootstrap/jdk1.6.0
- ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0
+ ln -sf $(SYSTEM_ICEDTEA_DIR) bootstrap/jdk1.6.0
mkdir -p stamps
touch stamps/bootstrap-directory-symlink.stamp
@@ -298,55 +180,9 @@ clean-bootstrap-directory-symlink:
rm -f stamps/bootstrap-directory-symlink.stamp
rm -f bootstrap/jdk1.6.0
-# Bootstrap ecj Directory Targets
-# ===============================
-
-# bootstrap/ecj.
-stamps/bootstrap-directory-ecj.stamp:
- mkdir -p bootstrap/ecj/bin stamps/
- ln -sf $(JAVA) bootstrap/ecj/bin/java
- ln -sf $(JAVAH) bootstrap/ecj/bin/javah
- ln -sf $(RMIC) bootstrap/ecj/bin/rmic
- ln -sf $(JAR) bootstrap/ecj/bin/jar
- ln -sf ../../../javac bootstrap/ecj/bin/javac
- ln -sf ../../../javap bootstrap/ecj/bin/javap
- mkdir -p bootstrap/ecj/lib/endorsed
- ln -sf $(XALAN2_JAR) bootstrap/ecj/lib/endorsed/xalan-j2.jar
- ln -sf $(XALAN2_SERIALIZER_JAR) \
- bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
- ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
- mkdir -p stamps
- touch stamps/bootstrap-directory-ecj.stamp
-
-clean-bootstrap-directory-ecj:
- rm -f stamps/bootstrap-directory-ecj.stamp
- rm -rf bootstrap/ecj
-
-# bootstrap/jdk1.6.0 to bootstrap/ecj symlink.
-stamps/bootstrap-directory-symlink-ecj.stamp: \
- stamps/bootstrap-directory-ecj.stamp
- rm -f bootstrap/jdk1.6.0
- ln -sf ecj bootstrap/jdk1.6.0
- mkdir -p stamps
- touch stamps/bootstrap-directory-symlink-ecj.stamp
-
-clean-bootstrap-directory-symlink-ecj:
- rm -f stamps/bootstrap-directory-symlink-ecj.stamp
- rm -f bootstrap/jdk1.6.0
-
-
-# OpenJDK Targets
-# ===============
-
-if WITH_ICEDTEA
- MEMORY_LIMIT = -J-Xmx512m
-else
- MEMORY_LIMIT =
-endif
-
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
-icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
+icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
stamps/patch.stamp gcjwebplugin.so
$(MAKE) \
$(ICEDTEA_ENV) \
@@ -357,7 +193,7 @@ icedtea: stamps/tools.stamp stamps/plugs
openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
@echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR)
-icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
+icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
stamps/patch.stamp gcjwebplugin.so
$(MAKE) \
@@ -380,60 +216,33 @@ icedtea-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
icedtea
-# OpenJDK ecj Targets
-# ===================
-
-stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
- stamps/extract-ecj.stamp stamps/patch-ecj.stamp
- $(MAKE) \
- $(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make
- @echo "ecj-poured IcedTea is served:" \
- openjdk-ecj/control/build/$(LINUX_DIR)
- mkdir -p stamps
- touch stamps/icedtea-ecj.stamp
-
-clean-icedtea-ecj: stamps/extract-ecj.stamp
- rm -f stamps/icedtea-ecj.stamp
- $(MAKE) \
- $(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make clobber
-
-stamps/icedtea-against-ecj.stamp: \
- stamps/bootstrap-directory-symlink-ecj.stamp \
- stamps/icedtea-ecj.stamp
- mkdir -p stamps
- touch stamps/icedtea-against-ecj.stamp
-
# Binary Plugs and Tools Targets
# ==============================
-stamps/plugs.stamp: $(SHARED_OBJECT_FILES) $(SECURITY_JAR_FILES) \
- bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- bootstrap/jdk1.7.0/jre/lib/jce.jar
+stamps/plugs.stamp: $(SHARED_OBJECT_FILES) \
+ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p stamps
touch stamps/plugs.stamp
-stamps/tools.stamp: bootstrap/ecj/lib/tools.jar
+stamps/tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
mkdir -p stamps
touch stamps/tools.stamp
-clean-plugs: clean-plugs clean-shared-objects clean-security-jars \
- clean-copy clean-rt clean-jce
+clean-plugs: clean-plugs clean-shared-objects clean-copy clean-rt
rm -f stamps/plugs.stamp
rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
- rm -f bootstrap/jdk1.7.0/jre/lib/jce.jar
clean-tools-jar: clean-tools-jar clean-tools
rm -f stamps/tools.stamp
rm -rf tools/
- rm -f bootstrap/jdk1.6.0/lib/tools.jar
+ rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
# Shared objects.
SHARED_OBJECT_FILES = \
bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libdcpr.so \
bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundalsa.so \
bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsound.so \
+ bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so \
bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libt2k.so
$(SHARED_OBJECT_FILES):
@@ -447,25 +256,6 @@ SHARED_OBJECT_FILES = \
clean-shared-objects:
rm -f $(SHARED_OBJECT_FILES)
-
-# Security JAR files.
-SECURITY_JAR_FILES = \
- bootstrap/jdk1.7.0/jre/lib/ext/sunjce_provider.jar \
- bootstrap/jdk1.7.0/jre/lib/security/local_policy.jar \
- bootstrap/jdk1.7.0/jre/lib/security/US_export_policy.jar
-
-$(SECURITY_JAR_FILES):
- mkdir -p bootstrap/jdk1.7.0/jre/lib/ext
- mkdir -p bootstrap/jdk1.7.0/jre/lib/security
- touch dummy-file.txt
- for security_jar in $(SECURITY_JAR_FILES) ; \
- do \
- $(JAR) cf $$security_jar dummy-file.txt ; \
- done
- rm -f dummy-file.txt
-
-clean-security-jars:
- rm -f $(SECURITY_JAR_FILES)
# Sources copied from OpenJDK.
ICEDTEA_COPY_DIRS = \
@@ -476,11 +266,7 @@ ICEDTEA_COPY_DIRS = \
com/sun/jdi/request \
com/sun/jmx/snmp/agent \
com/sun/tools/jdi \
- java/security/cert \
- java/util \
- javax/security/auth \
- javax/security/auth/callback \
- javax/security/sasl
+ java/util
stamps/copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
@@ -500,7 +286,7 @@ clean-copy:
done
OPENJDK_SOURCEPATH_DIRS = \
- openjdk/j2se/src/share/classes:openjdk/j2se/src/solaris/classes
+ openjdk/j2se/src/share/classes:openjdk/j2se/src/solaris/classes:openjdk/langtools/src/share/classes
# tools.jar class files.
stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
@@ -520,7 +306,7 @@ tools-source-files.txt: stamps/extract.s
stamps/tools-class-files.stamp: tools-source-files.txt
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools -bootclasspath '' -source 1.6 \
- -sourcepath jce:rt:tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ -sourcepath rt:tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
@$<
mkdir -p stamps
touch stamps/tools-class-files.stamp
@@ -532,8 +318,8 @@ clean-tools:
rm -f stamps/tools-copy-source-files.stamp
# tools.jar
-bootstrap/ecj/lib/tools.jar: stamps/tools-class-files.stamp
- mkdir -p bootstrap/ecj/lib
+bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/tools-class-files.stamp
+ mkdir -p bootstrap/jdk1.7.0/jre/lib/
$(JAR) cf $@ -C lib/tools com -C lib/tools sun \
-C lib/tools org
@@ -544,7 +330,7 @@ stamps/rt-class-files.stamp: rt-source-f
stamps/rt-class-files.stamp: rt-source-files.txt
mkdir -p lib/rt
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated:jce \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
@$<
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -556,30 +342,9 @@ clean-rt:
# rt-closed.jar.
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
- mkdir -p bootstrap/jdk1.7.0/jre/lib
+ mkdir -p bootstrap/jdk1.7.0/jre/lib/
$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-C lib/rt javax -C lib/rt sun
-
-# jce.jar class files.
-jce-source-files.txt:
- find jce -name '*.java' -print | sort > $@
-
-stamps/jce-class-files.stamp: jce-source-files.txt stamps/rt-class-files.stamp
More information about the distro-pkg-dev
mailing list