diff options
Diffstat (limited to 'community/openjdk7')
| -rw-r--r-- | community/openjdk7/APKBUILD | 41 | ||||
| -rw-r--r-- | community/openjdk7/icedtea-freebl3.patch | 11 |
2 files changed, 15 insertions, 37 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index a773c48f52..f6c3b724e2 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD @@ -79,6 +79,8 @@ source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz icedtea-jdk-fix-ipv6-init.patch icedtea-jdk-musl.patch icedtea-jdk-no-soname.patch + + icedtea-freebl3.patch " # icedtea6-1.9.7-generate_cacerts-1.patch @@ -252,42 +254,6 @@ doc() { mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/ } -md5sums="af9721fd61d7f1179731af5c7db05474 icedtea-2.6.8.tar.gz -7f26fbe901e9544ee0a1c3790a9340e1 openjdk-2.6.8.tar.bz2 -260a8ebb13e4089dc22b2fcd575454d7 corba-2.6.8.tar.bz2 -23d303629c2cb701c56bf45d17a49192 jaxp-2.6.8.tar.bz2 -9cebdcb1a776ceb73109b379eedd9756 jaxws-2.6.8.tar.bz2 -52022d8f652b9b5bb4c75e3e461cef80 jdk-2.6.8.tar.bz2 -32c3f9f5a6143dd5733b674dbb7ad363 langtools-2.6.8.tar.bz2 -a0c75b432e74aeabf60e49496ba8bcb5 hotspot-2.6.8.tar.bz2 -bc1d9e5fe73eee5c50b26ed411fb0119 apache-ant-1.9.7-bin.tar.gz -84428130578f1d86ad9bf7230447b99d rhino-1.7.7.1.zip -938bc5cd8303a7b931b818ec690127fb icedtea-hotspot-musl.patch -bf8b50e157d80a8b884c1aa4f8124812 icedtea-hotspot-noagent-musl.patch -43023861c5f6efc3139a834aa3ec0476 icedtea-hotspot-uclibc-fixes.patch -07c7ab583808e8c8ceb46aff9c265aa4 icedtea-jdk-fix-build.patch -bd623081d5d2e63694c3649975b12412 icedtea-jdk-execinfo.patch -250b0807b59762670954b132e8f8dfba icedtea-jdk-fix-ipv6-init.patch -66f6e66eb135f0d88847910f6581d323 icedtea-jdk-musl.patch -d014431e70cdabb82a75e4b9ae4c28a9 icedtea-jdk-no-soname.patch" -sha256sums="e5f0a14077de47a1e6bcba672042880f1cb28859468fe95570555593a28fe02b icedtea-2.6.8.tar.gz -e6bea22acb9e89e200fdc2a4a7a04ecee042f3ea9f9a49bab739fdd2598e4ce3 openjdk-2.6.8.tar.bz2 -2f728daac0ca88e7097a223f8c1ceaff8b4597e4622c5e365931edb25aa04538 corba-2.6.8.tar.bz2 -ba1ba48e9ad9ee36df344e6e283f0f7a9f8aa9cee223c8ea2f2ee711092091fc jaxp-2.6.8.tar.bz2 -753093e71ac609b9350bf16daf230fdc2f873cd573428883448098e39e4c041a jaxws-2.6.8.tar.bz2 -ec1118f52eb208a529e99ec1a64351b737bc0f892e05f0ffd4327b4be533e761 jdk-2.6.8.tar.bz2 -004ec63ebdd0b6182c2bde3e190bb745a0d932ad7b05901a4376a04f06158813 langtools-2.6.8.tar.bz2 -ca55f548f3169ba9bb6ca81265900722150953ee19b19606e4bf8e6dd50d7194 hotspot-2.6.8.tar.bz2 -1d0b808fe82cce9bcc167f8dbb7c7e89c1d7f7534c0d9c64bf615ec7c3e6bfe5 apache-ant-1.9.7-bin.tar.gz -f753d82002927208139f374e47febb35d7832a10890f57bb1a3c28cad0de6e84 rhino-1.7.7.1.zip -648eb9dd33f01cb5b85036f3a32c85520f9628e7c7c81c164195a590554ca043 icedtea-hotspot-musl.patch -1d937de95323094294c33dd490fc460f78502259eee3bf4b352ac7c7c6cf626f icedtea-hotspot-noagent-musl.patch -0ef7592b8f2c954eda0a6cf4dc4a4010942f35ea426f44e34412be6c9a949745 icedtea-hotspot-uclibc-fixes.patch -33b18e827a13cc46be11a4491deefac171c8c2c4fbdd3e0cb4a5fdafa560f958 icedtea-jdk-fix-build.patch -6cebef19d8eec5a4623a96c37ae71b79d124a10478c1db33ad5fc71bc04b30e9 icedtea-jdk-execinfo.patch -632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5 icedtea-jdk-fix-ipv6-init.patch -b3f82269f69483d3fe137e369f9325003ce7872d886cdf67705b434ce949b5bc icedtea-jdk-musl.patch -6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82 icedtea-jdk-no-soname.patch" sha512sums="bfcc36fd868e36ab4be7669dd92460b7c581d550453792f6d93e456d6195ee71cca1de0482c369f038f63d67681645ba3cf7ded02dbc94205b47124b13205695 icedtea-2.6.8.tar.gz 7f5076df16dafabe556c64ddfa51a684ba62f85dadf750d22d2a4abd2766073e1a67f1705bf2c6bbc6fdf2559ac3cc9a83658a23a6e541aa3bd605ce8e44cf8b openjdk-2.6.8.tar.bz2 b306a562b999c7e221c2535d5ef575f835a0e1fbbc6fab331cfa3ae016c048d6d7f822786a270e61958c9590395ae360af0f8069beaa123c00be1592487c37dd corba-2.6.8.tar.bz2 @@ -305,4 +271,5 @@ e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e 0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb icedtea-jdk-execinfo.patch 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5 icedtea-jdk-musl.patch -bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch" +bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch +c5c008ce22baf8cae0c29d8e36d2eb5264abf1b267d79c8335d4f02e82f034a70c1395bc23ea61cc5deb416c3cd853e59c5f3f5c9e97bc3ed5bb133fabb8c637 icedtea-freebl3.patch" diff --git a/community/openjdk7/icedtea-freebl3.patch b/community/openjdk7/icedtea-freebl3.patch new file mode 100644 index 0000000000..e4908cb192 --- /dev/null +++ b/community/openjdk7/icedtea-freebl3.patch @@ -0,0 +1,11 @@ +--- icedtea-2.6.8.orig/acinclude.m4 ++++ icedtea-2.6.8/acinclude.m4 +@@ -2759,7 +2759,7 @@ + PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no]) + if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then + SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS; +- SUNEC_LIBS="$NSS_LIBS -lfreebl"; ++ SUNEC_LIBS="$NSS_LIBS -lfreebl3"; + elif test "x${NSS_JAVA_FOUND}" = "xyes"; then + SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS"; + SUNEC_LIBS=$NSS_JAVA_LIBS; |