diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-06-04 10:16:23 +0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-04 08:03:01 +0000 |
| commit | a733d5ca3c5b38a12b6d7a185325ee4bbe65a749 (patch) | |
| tree | 33a0366d4bea1f987f934c3cf88dbe5035325eb8 /main | |
| parent | de6fd1f6494d9bb25fae174826371b7c5dd03667 (diff) | |
| download | aports-a733d5ca3c5b38a12b6d7a185325ee4bbe65a749.tar.bz2 aports-a733d5ca3c5b38a12b6d7a185325ee4bbe65a749.tar.xz | |
main/openjdk6: fix ipv6 related startup crash
Diffstat (limited to 'main')
| -rw-r--r-- | main/openjdk6/APKBUILD | 6 | ||||
| -rw-r--r-- | main/openjdk6/icedtea-jdk-fix-ipv6-init.patch | 42 |
2 files changed, 47 insertions, 1 deletions
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD index 7774a07cd..934714211 100644 --- a/main/openjdk6/APKBUILD +++ b/main/openjdk6/APKBUILD @@ -3,7 +3,7 @@ pkgname=openjdk6 pkgver=1.6.0_p24 icedteaver=1.11.11 -pkgrel=7 +pkgrel=8 pkgdesc="Sun OpenJDK 6 via IcedTea" url="http://icedtea.classpath.org/" arch="x86 x86_64" @@ -49,6 +49,7 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk- http://icedtea.classpath.org/download/drops/$JAF_DROP_ZIP build-paxctl.patch icedtea-hotspot-uclibc-fixes.patch + icedtea-jdk-fix-ipv6-init.patch icedtea-jdk-iconv-uclibc.patch icedtea-jdk-execinfo.patch icedtea-jdk-no-lib-nsl-uclibc.patch @@ -220,6 +221,7 @@ afb0c7950a663f94e65da9f3be676d8f apache-ant-1.8.2-bin.tar.gz bc95c133620bd68c161cac9891592901 jdk6-jaf-b20.zip f8a7c115a478ba784353606b8607a34d build-paxctl.patch dc6a1e28a97d897d7a1057c11696727d icedtea-hotspot-uclibc-fixes.patch +250b0807b59762670954b132e8f8dfba icedtea-jdk-fix-ipv6-init.patch 7c0814181e5adc0763c5c0a24b01d4cb icedtea-jdk-iconv-uclibc.patch dae2ba8b87e2106b53974ace07e4ca72 icedtea-jdk-execinfo.patch c4bb40d5b1ff690b27900c5cd06bc1e5 icedtea-jdk-no-lib-nsl-uclibc.patch @@ -235,6 +237,7 @@ c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012 jaxp144_03.zip 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 jdk6-jaf-b20.zip b7d6bab5394cd0023b6737aeb0ff90569058d151185916ac2f80f5266c468312 build-paxctl.patch f4b06c01b664922a6d7785d90bb888fe4665ae9ed6ae76c5484314821fd2cc2d icedtea-hotspot-uclibc-fixes.patch +632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5 icedtea-jdk-fix-ipv6-init.patch a36ff13d81a1f1415bedd595b77f2c43574c546938cce7882cb33bbe63464865 icedtea-jdk-iconv-uclibc.patch 024a22622da408aa9db5b258e3eed49500292483c923f62b19aa6db0a3fed7b7 icedtea-jdk-execinfo.patch 6bba2870af0c5eac7b6edb7351e8e1833db401b1bf6b4861a14dcb1fd45cbea6 icedtea-jdk-no-lib-nsl-uclibc.patch @@ -250,6 +253,7 @@ fe65d396d0a57bc2b5dd2d8b00b0ecea860d4e5a5c9cb489bc5b9d7abd90861dedd26088184de938 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a jdk6-jaf-b20.zip 41bfdb08e74cbcc70eac9e6721d886d8e35cd77c19988bd812fa16f71819efa2e8101d8a41a9ae62094069282739a835209a66c8dea6e259a86aee8368c60643 build-paxctl.patch dc5a72ef92cd31e9ba4870ad2126f619932bae5918b6f6ad22af59dbc3e77a70fc27ba37909df0612f70922dfec6a58464469a18ed7a77d902c4a5038e086900 icedtea-hotspot-uclibc-fixes.patch +48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch a6ee1c63a171859ab1350481bc3e5d464354f1105d80fc72c1d58620672ca5c1a550b954b35917f89537f0aeb28c49470b27522ce53588e42dedff41e074774c icedtea-jdk-iconv-uclibc.patch dd8d7edad8309d41881d92d173b7b86e37d833bdb9be0ae9dbc39844b226b77f0e2dc2a137a50738c7642df32964b92c6ee74d0a6207aa3f4f7abaeb40ea3435 icedtea-jdk-execinfo.patch 833ec90fa9d3d26191303201012e4b8ca220d634497277f7e8c703ca03753720343e22c97dd2f10cd3e3be79c84f95b8c7d0db21545b8a35761c0de7cb834e7a icedtea-jdk-no-lib-nsl-uclibc.patch diff --git a/main/openjdk6/icedtea-jdk-fix-ipv6-init.patch b/main/openjdk6/icedtea-jdk-fix-ipv6-init.patch new file mode 100644 index 000000000..11f3bf6dd --- /dev/null +++ b/main/openjdk6/icedtea-jdk-fix-ipv6-init.patch @@ -0,0 +1,42 @@ +--- openjdk/jdk/src/solaris/native/java/net/net_util_md.c.orig ++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c +@@ -561,7 +561,7 @@ + + static struct localinterface *localifs = 0; + static int localifsSize = 0; /* size of array */ +-static int nifs = 0; /* number of entries used in array */ ++static int nifs = -1; /* number of entries used in array */ + + /* not thread safe: make sure called once from one thread */ + +@@ -573,6 +573,10 @@ + int index, x1, x2, x3; + unsigned int u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,ua,ub,uc,ud,ue,uf; + ++ if (nifs >= 0) ++ return ; ++ nifs = 0; ++ + if ((f = fopen("/proc/net/if_inet6", "r")) == NULL) { + return ; + } +@@ -601,7 +605,7 @@ + localifs = (struct localinterface *) realloc ( + localifs, sizeof (struct localinterface)* (localifsSize+5)); + if (localifs == 0) { +- nifs = 0; ++ nifs = -1; + fclose (f); + return; + } +@@ -624,9 +628,7 @@ + static int getLocalScopeID (char *addr) { + struct localinterface *lif; + int i; +- if (localifs == 0) { +- initLocalIfs(); +- } ++ initLocalIfs(); + for (i=0, lif=localifs; i<nifs; i++, lif++) { + if (memcmp (addr, lif->localaddr, 16) == 0) { + return lif->index; |