diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2016-08-23 18:08:47 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-19 10:52:36 +0200 |
commit | 388a3ace91bc8c876b4c96b369ecbaac89b47121 (patch) | |
tree | ac0abedf34476fb40ef37e2f34e09b005f2c1dcd | |
parent | e4fed6b3b632ea33c27703d1557f82af5628ae32 (diff) | |
download | alpine_aports-388a3ace91bc8c876b4c96b369ecbaac89b47121.tar.bz2 alpine_aports-388a3ace91bc8c876b4c96b369ecbaac89b47121.tar.xz alpine_aports-388a3ace91bc8c876b4c96b369ecbaac89b47121.zip |
community/openjdk7: upgrade to 7.111.2.6.7
(cherry picked from commit 9040d888ee51bae2dc7915c21531ecaf53038591)
-rw-r--r-- | community/openjdk7/APKBUILD | 83 |
1 files changed, 42 insertions, 41 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index 910e97083e..40019af7f9 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD | |||
@@ -2,12 +2,12 @@ | |||
2 | # Contributor: Jakub Jirutka <jakub@jirutka.cz> | 2 | # Contributor: Jakub Jirutka <jakub@jirutka.cz> |
3 | # Maintainer: Timo Teras <timo.teras@iki.fi> | 3 | # Maintainer: Timo Teras <timo.teras@iki.fi> |
4 | pkgname=openjdk7 | 4 | pkgname=openjdk7 |
5 | _icedteaver=2.6.3 | 5 | _icedteaver=2.6.7 |
6 | # pkgver is <JDK version>.<JDK update> | 6 | # pkgver is <JDK version>.<JDK update> |
7 | # check icedtea JDK when updating | 7 | # check icedtea JDK when updating |
8 | pkgver=7.91.$_icedteaver | 8 | pkgver=7.111.$_icedteaver |
9 | pkgrel=2 | 9 | pkgrel=0 |
10 | pkgdesc="Sun OpenJDK 7 via IcedTea" | 10 | pkgdesc="OpenJDK 7 via IcedTea" |
11 | url="http://icedtea.classpath.org/" | 11 | url="http://icedtea.classpath.org/" |
12 | arch="all" | 12 | arch="all" |
13 | license="GPL2 with Classpath" | 13 | license="GPL2 with Classpath" |
@@ -19,12 +19,13 @@ makedepends="bash findutils tar zip file paxmark gawk util-linux libxslt | |||
19 | nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev | 19 | nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev |
20 | lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev | 20 | lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev |
21 | libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev | 21 | libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev |
22 | gtk+2.0-dev krb5-dev attr-dev pcsc-lite-dev lksctp-tools-dev" | 22 | gtk+2.0-dev krb5-dev attr-dev pcsc-lite-dev lksctp-tools-dev |
23 | libxcomposite-dev" | ||
23 | install="" | 24 | install="" |
24 | 25 | ||
25 | # upstream binary versions | 26 | # upstream binary versions |
26 | RHINO_VER=1.7.7 | 27 | RHINO_VER=1.7.7.1 |
27 | ANT_VER=1.9.6 | 28 | ANT_VER=1.9.7 |
28 | 29 | ||
29 | case $CARCH in | 30 | case $CARCH in |
30 | x86) _jarch=i386;; | 31 | x86) _jarch=i386;; |
@@ -66,7 +67,7 @@ source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz | |||
66 | langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2 | 67 | langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2 |
67 | hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2 | 68 | hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2 |
68 | http://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz | 69 | http://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz |
69 | https://github.com/mozilla/rhino/releases/download/Rhino$(echo ${RHINO_VER} | sed s'/\./_/g')_RELEASE/rhino$RHINO_VER.zip | 70 | https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_VER//./_}_RELEASE/rhino-$RHINO_VER.zip |
70 | 71 | ||
71 | icedtea-hotspot-musl.patch | 72 | icedtea-hotspot-musl.patch |
72 | icedtea-hotspot-noagent-musl.patch | 73 | icedtea-hotspot-noagent-musl.patch |
@@ -91,7 +92,7 @@ unpack() { | |||
91 | msg "Unpacking sources..." | 92 | msg "Unpacking sources..." |
92 | tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz || return 1 | 93 | tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz || return 1 |
93 | tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz || return 1 | 94 | tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz || return 1 |
94 | unzip -o -q "rhino$RHINO_VER.zip" -d "$srcdir" || return 1 | 95 | unzip -o -q "rhino-$RHINO_VER.zip" -d "$srcdir" || return 1 |
95 | } | 96 | } |
96 | 97 | ||
97 | prepare() { | 98 | prepare() { |
@@ -146,7 +147,7 @@ build() { | |||
146 | --with-parallel-jobs=${JOBS:-2} \ | 147 | --with-parallel-jobs=${JOBS:-2} \ |
147 | --disable-dependency-tracking \ | 148 | --disable-dependency-tracking \ |
148 | --disable-downloading \ | 149 | --disable-downloading \ |
149 | --with-rhino=$srcdir/rhino$RHINO_VER/js.jar \ | 150 | --with-rhino=$srcdir/rhino$RHINO_VER/lib/rhino-$RHINO_VER.jar \ |
150 | --with-openjdk-src-zip=$srcdir/openjdk-$_dropsver.tar.bz2 \ | 151 | --with-openjdk-src-zip=$srcdir/openjdk-$_dropsver.tar.bz2 \ |
151 | --with-hotspot-src-zip=$srcdir/hotspot-$_dropsver.tar.bz2 \ | 152 | --with-hotspot-src-zip=$srcdir/hotspot-$_dropsver.tar.bz2 \ |
152 | --with-corba-src-zip=$srcdir/corba-$_dropsver.tar.bz2 \ | 153 | --with-corba-src-zip=$srcdir/corba-$_dropsver.tar.bz2 \ |
@@ -229,22 +230,22 @@ jre() { | |||
229 | } | 230 | } |
230 | 231 | ||
231 | doc() { | 232 | doc() { |
232 | default_doc | 233 | default_doc || return 1 |
233 | 234 | ||
234 | mkdir -p "$subpkgdir"/$INSTALL_BASE/ | 235 | mkdir -p "$subpkgdir"/$INSTALL_BASE/ |
235 | mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/ | 236 | mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/ |
236 | } | 237 | } |
237 | 238 | ||
238 | md5sums="7bbc8dc603bf5abc87fe8c7ffcafeabe icedtea-2.6.3.tar.gz | 239 | md5sums="1cb1214bff5aa9f2d278715c8f694f55 icedtea-2.6.7.tar.gz |
239 | be68af0132b4d6ff4faa089dbd92d840 openjdk-2.6.3.tar.bz2 | 240 | fd13f8cdeaa31b71c4cfe131e29f1936 openjdk-2.6.7.tar.bz2 |
240 | a637ba113153688c3f1d04abd2062f3b corba-2.6.3.tar.bz2 | 241 | 49387b060090f090313e1aa30ad22c62 corba-2.6.7.tar.bz2 |
241 | 0ecc6d3156432e7a682f66d55c749d37 jaxp-2.6.3.tar.bz2 | 242 | f4aab7046a2ce7d06245da3c9f6f6682 jaxp-2.6.7.tar.bz2 |
242 | 78b8a041cdc667598a2917ff951447a0 jaxws-2.6.3.tar.bz2 | 243 | f5dfc808f7c8ac4cd8c41670881476be jaxws-2.6.7.tar.bz2 |
243 | a4502a9220ae2f392fda6b95e138aec1 jdk-2.6.3.tar.bz2 | 244 | 610434e1fd77ee59860ced5a2eafac32 jdk-2.6.7.tar.bz2 |
244 | ea84e3944cda222a213362ff06af6e58 langtools-2.6.3.tar.bz2 | 245 | 1a107a57717b0e524eedd5343f67196f langtools-2.6.7.tar.bz2 |
245 | 5303095889c786b679c13d2331461f86 hotspot-2.6.3.tar.bz2 | 246 | c90b9af0914737c40491109633020cf1 hotspot-2.6.7.tar.bz2 |
246 | f1d2e99df927a141c355210d55fe4d32 apache-ant-1.9.6-bin.tar.gz | 247 | bc1d9e5fe73eee5c50b26ed411fb0119 apache-ant-1.9.7-bin.tar.gz |
247 | 3f68c59471170f7bd574828e01b33a09 rhino1.7.7.zip | 248 | 84428130578f1d86ad9bf7230447b99d rhino-1.7.7.1.zip |
248 | f87dd2c4c3c97fc3ac33080a65ca9e14 icedtea-hotspot-musl.patch | 249 | f87dd2c4c3c97fc3ac33080a65ca9e14 icedtea-hotspot-musl.patch |
249 | bf8b50e157d80a8b884c1aa4f8124812 icedtea-hotspot-noagent-musl.patch | 250 | bf8b50e157d80a8b884c1aa4f8124812 icedtea-hotspot-noagent-musl.patch |
250 | 43023861c5f6efc3139a834aa3ec0476 icedtea-hotspot-uclibc-fixes.patch | 251 | 43023861c5f6efc3139a834aa3ec0476 icedtea-hotspot-uclibc-fixes.patch |
@@ -253,16 +254,16 @@ bd623081d5d2e63694c3649975b12412 icedtea-jdk-execinfo.patch | |||
253 | 250b0807b59762670954b132e8f8dfba icedtea-jdk-fix-ipv6-init.patch | 254 | 250b0807b59762670954b132e8f8dfba icedtea-jdk-fix-ipv6-init.patch |
254 | 66f6e66eb135f0d88847910f6581d323 icedtea-jdk-musl.patch | 255 | 66f6e66eb135f0d88847910f6581d323 icedtea-jdk-musl.patch |
255 | d014431e70cdabb82a75e4b9ae4c28a9 icedtea-jdk-no-soname.patch" | 256 | d014431e70cdabb82a75e4b9ae4c28a9 icedtea-jdk-no-soname.patch" |
256 | sha256sums="89183993d3dd794b4e2a428a8a0a35f1ce77c4ae64563e53f3a08c058ea134cc icedtea-2.6.3.tar.gz | 257 | sha256sums="55dc6f3cf3a49745132c53592f0980c1aca37385c12dce33fea229471979c88e icedtea-2.6.7.tar.gz |
257 | 9e5d26bb1888a8a1378e078953aa04314d4fb4f263ebbaf7f459110c21f8d46d openjdk-2.6.3.tar.bz2 | 258 | 5cacafbe543ad4b9179ab1cbfdb7d9baf8aa04d954510b9e7baf0bfef7db6878 openjdk-2.6.7.tar.bz2 |
258 | 1052ae3c70908aa3374818ada320685cb7abdc7bd7bbd3cfb4f26fbbe7435ec6 corba-2.6.3.tar.bz2 | 259 | 0049439ea08f8391c0dae464ceb249f0af9d8e70c68142a734ceb25fa145e764 corba-2.6.7.tar.bz2 |
259 | a0e978bc07371901560a746cae492edf0bcb22ddbb9e47b77319ffda1351806b jaxp-2.6.3.tar.bz2 | 260 | 9fbd60855406879b898843d7eeac2a5df64b0ccdeb927c615c5be648b8fac70b jaxp-2.6.7.tar.bz2 |
260 | 55897d92e368ac7df3e04d4f235e9dba12ea8264e20d4bd6b68e8c13e5addc1e jaxws-2.6.3.tar.bz2 | 261 | c9fcc1553bbb4fe1dd5ae4616b6a1f52f42c2bb990fd1cbdafeac43bfd6b30f7 jaxws-2.6.7.tar.bz2 |
261 | 583898549b52e958521474db34f2ce535b6a0926c7df1fa99a3f0321b3a109f5 jdk-2.6.3.tar.bz2 | 262 | e93cd330b2346bc6145bb76a141233aa1cc083eb25bbc82819632e1581290d81 jdk-2.6.7.tar.bz2 |
262 | f14716df84e047b19884ac5b0830e87b6cdf1925d0951195255c9124e89df27e langtools-2.6.3.tar.bz2 | 263 | 13e700318ed4a00bc85890525a1fe16b7ff4798ad9e49acdf730b6dfe1a6b4e4 langtools-2.6.7.tar.bz2 |
263 | dd8f3771439b4d51fa84e3f9b384b80e6656cf1a19ee3492b4f2fe09b37eef0e hotspot-2.6.3.tar.bz2 | 264 | 0412594f4dabd77a759957bba038aedf277dee87d06153505fb63919c0cb6a5c hotspot-2.6.7.tar.bz2 |
264 | 90d28c0202871bd9875a5da6d982f362bb3114d346b9d8ae58860b8d3312c21c apache-ant-1.9.6-bin.tar.gz | 265 | 1d0b808fe82cce9bcc167f8dbb7c7e89c1d7f7534c0d9c64bf615ec7c3e6bfe5 apache-ant-1.9.7-bin.tar.gz |
265 | 6ce56b4809d1e7723fd2918dcb093b594f30941194361d4aa2b699f68e897d47 rhino1.7.7.zip | 266 | f753d82002927208139f374e47febb35d7832a10890f57bb1a3c28cad0de6e84 rhino-1.7.7.1.zip |
266 | a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e icedtea-hotspot-musl.patch | 267 | a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e icedtea-hotspot-musl.patch |
267 | 1d937de95323094294c33dd490fc460f78502259eee3bf4b352ac7c7c6cf626f icedtea-hotspot-noagent-musl.patch | 268 | 1d937de95323094294c33dd490fc460f78502259eee3bf4b352ac7c7c6cf626f icedtea-hotspot-noagent-musl.patch |
268 | 0ef7592b8f2c954eda0a6cf4dc4a4010942f35ea426f44e34412be6c9a949745 icedtea-hotspot-uclibc-fixes.patch | 269 | 0ef7592b8f2c954eda0a6cf4dc4a4010942f35ea426f44e34412be6c9a949745 icedtea-hotspot-uclibc-fixes.patch |
@@ -271,16 +272,16 @@ a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e icedtea-hotspo | |||
271 | 632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5 icedtea-jdk-fix-ipv6-init.patch | 272 | 632683ec88a6fb250ef043aae9cace605d0c669b7058f8c47b62b09b03ecc6c5 icedtea-jdk-fix-ipv6-init.patch |
272 | b3f82269f69483d3fe137e369f9325003ce7872d886cdf67705b434ce949b5bc icedtea-jdk-musl.patch | 273 | b3f82269f69483d3fe137e369f9325003ce7872d886cdf67705b434ce949b5bc icedtea-jdk-musl.patch |
273 | 6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82 icedtea-jdk-no-soname.patch" | 274 | 6c0bbe710395c4ced1359ab279be6a7c36da5bfb9fd60dc47d920f06a0456d82 icedtea-jdk-no-soname.patch" |
274 | sha512sums="a48c7209752ef9705637485bc1752e6311547a1a7235f40a8fad02f51badb23acf493e181a2a500dc41ff055621aae5ab951151d0140d0bd26c218918b4ad715 icedtea-2.6.3.tar.gz | 275 | sha512sums="f1e68ffde0663b1b987f5d851c7006801aef8a599e270118cde9f72f5c203bc3befb3793e16b7519740125d4e58d9b449d5c12bccafb890dd60dbac4d7f2c1a5 icedtea-2.6.7.tar.gz |
275 | ff6246a8615a2113197eb41839912fa1fdc22d95252846b08ff1539db13715131aac65dc06f9086ffb83daa4558caf1b707091ed5ef058bebb5fffc9b665e472 openjdk-2.6.3.tar.bz2 | 276 | 819acf776e423bb5bcb8682967ac0fb3fcc37da4ada618d5da186d052d6958611f537799c7cec0ceb57fbf677727840dbf8cd569d9f2226693c6551586de2ae4 openjdk-2.6.7.tar.bz2 |
276 | 8d46557d564917514a14296b06cc35c1d84b1d7be7a3c6cd14770fe76481fcd02af9ff1cc528acde684cc1c5e2a065ce2e5254fae47fdaa3598c6e5ab8779697 corba-2.6.3.tar.bz2 | 277 | 735553ba107df875b61bea38735309ddd1d99cdce989826eaae3587efb10b2a99a3ec1bd749574d17bf502dd7cdcb12436a1a7d608fa1b44b8bbb79b603d8dfc corba-2.6.7.tar.bz2 |
277 | 4a0de68af85699b611e37af0749cccdb0483ac75af1fbd0f63cdc2f0c173605bca77c60bbb41aff916c768b5a29a933fbd8e34d8bd2dd67c22cbd629078061ab jaxp-2.6.3.tar.bz2 | 278 | 2483561e7ad0f6e201740689dffc097419d53640d394883026ec216b7ecacafb5f1952b12e5229fd5a6cd9174388fb45105bebcf80cefd7feb592b33e2f65b24 jaxp-2.6.7.tar.bz2 |
278 | a4cd98bc6c4b1b54dcee68f4a373322e550246ed88412e33d3700631bbd662d390df89047f9cc40f80c10f1ffce81142c301db06ef46bbc16e1245880242151d jaxws-2.6.3.tar.bz2 | 279 | e9c65a65dc61bdbc56bf7f0ff7945abfdff95551c0484fb031a29a540a692f11309916c76f2d8717f88a3d93fc59f6a97aa21d24231668f6d49c3afbc403bad1 jaxws-2.6.7.tar.bz2 |
279 | 9cfe22d2a112d35c8008069c61118f5e289e78a91d325da301949843d5c7b747cdf99fa7c97c09ea4c15a263f47d09b65ee26ca01282aa4d9abed6087a09f656 jdk-2.6.3.tar.bz2 | 280 | ac07270f88f6b1359224d665ad8e0c44d3a50fec186e9ee5291885d5574f0c77d3c2660583d2b09b21945213ace25dcdb45f72e2738794721901c22d740ca110 jdk-2.6.7.tar.bz2 |
280 | 2aa47e622194e0afd773c3f56df67afa35e69edc7af0c6385edc4d26383a3b1a29d87470c6fb2bc3d3e51b58c0283023ddb53bca4c4bf5504ed22fe457c39bb1 langtools-2.6.3.tar.bz2 | 281 | d26044cbd0104d27449c84bc24a687809c67a48926a23de5e155600f456a0a35514571304b38b63017d81d1c61991908e1d10cb60616dc16f9ba4635f3adad4c langtools-2.6.7.tar.bz2 |
281 | 3aadde373e01575cdd1fa3621ab132eb2273d70f08f8a3ad784cd238d8902626f9121c0f8abdddae7a810fb79cf70c0ea3fe7f2c2035fadd2803a2177a305ea9 hotspot-2.6.3.tar.bz2 | 282 | 9dc53d5f9bff967dffb994779621464540b94239a209d75482a6529d4b284bf40469ca180ada1a20cdede894d5b5d1297946db5d7ba5fc7d875c33b2d3559a02 hotspot-2.6.7.tar.bz2 |
282 | 8f6ef5e0710814844da53a67de6bbdcd72eca632888f8a5128609dc1af3341c3a74f4251ee191117c362adace73032c0a2900a028f95728a19603590c6255964 apache-ant-1.9.6-bin.tar.gz | 283 | 85d35441a3ecb1eb5c87b112ee9f3a8accbb16a1b9e249f706f0253566fcda7952f5a9cc08bd8c829b1c93d40ae452e1b1c9e29523a51a3c8a5032fa9c22e135 apache-ant-1.9.7-bin.tar.gz |
283 | fed7cad242eac105d0cc7dc668b4403c424080e17c8684ba02f11810afaa340c25e12526a00e3de5eaf9d93256824e3bb0bbf2051934d8d18d1ee88f44f30ee7 rhino1.7.7.zip | 284 | fba60e83db6e6dd7ef0a834e8aa6858af41b973e01a54392f11ed1d7d152b9641a48e5d473b434e062e8b8d5d19281da1445751e2b0e297ecd25d2680efc435a rhino-1.7.7.1.zip |
284 | 994e8a79a0a23f26d633bf2ce9dad62198c699892f6e7729cc6e509481330399bb2ba736514b516fd2b3dd125fd6c74a127ae7f16d643c3f6a69776737cdb933 icedtea-hotspot-musl.patch | 285 | 994e8a79a0a23f26d633bf2ce9dad62198c699892f6e7729cc6e509481330399bb2ba736514b516fd2b3dd125fd6c74a127ae7f16d643c3f6a69776737cdb933 icedtea-hotspot-musl.patch |
285 | e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e82f3e390535c950c5beee3bd8d06fb5a717b50f2d9b2a6bc icedtea-hotspot-noagent-musl.patch | 286 | e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e82f3e390535c950c5beee3bd8d06fb5a717b50f2d9b2a6bc icedtea-hotspot-noagent-musl.patch |
286 | 822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a icedtea-hotspot-uclibc-fixes.patch | 287 | 822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a icedtea-hotspot-uclibc-fixes.patch |