aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-05-10 11:17:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-05-10 13:20:10 +0200
commit150c9b2836ce6fba7a512e569b3c2a151338b9dc (patch)
treea48321e847490428ae6fc530d96deb748e6609e9
parente9c02563843de1f486cae7cc96da90eb9113169b (diff)
community/openjdk8: security upgrade to 8u92
-rw-r--r--community/openjdk8/APKBUILD58
-rw-r--r--community/openjdk8/build-demo-ldflags.patch12
2 files changed, 35 insertions, 35 deletions
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index ffc9b504963..a5cdc1f62d9 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=openjdk8
_java_ver=8
-_jdk_update=77
-_jdk_build=03
+_jdk_update=92
+_jdk_build=14
pkgver=$_java_ver.$_jdk_update.$_jdk_build
pkgrel=0
pkgdesc="Sun OpenJDK 8"
@@ -218,14 +218,14 @@ demos() {
"$subpkgdir"/$INSTALL_BASE/
}
-md5sums="1954ffeb123a7f4552472ba9f9e38b0d jdk8u-jdk8u77-b03.tar.bz2
-eb7695323d3340214792114ad8e3bdce corba-jdk8u77-b03.tar.bz2
-fcc49430937eba2c64f8a53475edf99d jaxp-jdk8u77-b03.tar.bz2
-f05a009f2e0fdb710c3405723ed42199 jaxws-jdk8u77-b03.tar.bz2
-ffe70c01fc0fe513e329f170f4c922c1 jdk-jdk8u77-b03.tar.bz2
-a7e0ff3378d02e075284db7fe4a8dfbf langtools-jdk8u77-b03.tar.bz2
-1dee0e478002e80f87b235ae982edf6e nashorn-jdk8u77-b03.tar.bz2
-434e3dd4272d39b255ba9269838647b9 hotspot-jdk8u77-b03.tar.bz2
+md5sums="226f9051e34b70fbff031ec9d959773d jdk8u-jdk8u92-b14.tar.bz2
+9619e84a600aaf81737f7ed71430d3aa corba-jdk8u92-b14.tar.bz2
+567189edafbe0aabaff2d75d86c05456 jaxp-jdk8u92-b14.tar.bz2
+3e7db7d843ebbcd5eb2ba0a9e7e275d7 jaxws-jdk8u92-b14.tar.bz2
+b06f2e3504357820bb3dd29e19ccfc0d jdk-jdk8u92-b14.tar.bz2
+afbe0e3a8c0e9e2beac5567e1084f3ee langtools-jdk8u92-b14.tar.bz2
+e3641526c2875b5d4d1414980769f6ea nashorn-jdk8u92-b14.tar.bz2
+21e8fdc20ab17e7399752ef74c8e03e2 hotspot-jdk8u92-b14.tar.bz2
f87dd2c4c3c97fc3ac33080a65ca9e14 icedtea-hotspot-musl.patch
a5841507a216890bd8419d496bb118c3 icedtea-hotspot-noagent-musl.patch
43023861c5f6efc3139a834aa3ec0476 icedtea-hotspot-uclibc-fixes.patch
@@ -234,15 +234,15 @@ bdea7060a067faf1c2de5f4eb6e8525d icedtea-jdk-execinfo.patch
fc1dc983dc562eda399c9d7eabd3b299 icedtea-jdk-musl.patch
fc7d3cc1f5a5615574fd1e416144a042 icedtea-jdk-includes.patch
9b95183ae088ac2520ac66ae587619e4 fix-libjvm-load.patch
-ea23c28032d50816a243d15afb2d8fb6 build-demo-ldflags.patch"
-sha256sums="bcd2cacec7c965d67667eec8c0383ab38674ca0bd09b087a6fd4e27fe1e54405 jdk8u-jdk8u77-b03.tar.bz2
-724bfdb2c843e28ffc019a545a5394cf0b8a902da348cbe60193bdbf875dfbc4 corba-jdk8u77-b03.tar.bz2
-dabc4bdee31f003550d9043f77f096d80a4b94c735d1662df1e7d520ce84150b jaxp-jdk8u77-b03.tar.bz2
-ab61d3eb6717af61e0b52e7b8be207d5b1fd31930ae10c0abc3705fbe162f1b8 jaxws-jdk8u77-b03.tar.bz2
-ee6e149c51639303ed8c09c5c8697b5943104540f19b578309f88fd7ddb2173f jdk-jdk8u77-b03.tar.bz2
-34bc6e73fc79034b183cb8443557d874d30f943e2ac6ade07771ae882e9b4905 langtools-jdk8u77-b03.tar.bz2
-a30e4e54c31e0bbfde6c16ba073dc5f5f0bfc426b0cd01a1bfa9b38a20123eb1 nashorn-jdk8u77-b03.tar.bz2
-236c58dedc773b36621418aa2a6156153914c3f9d726f7b480c24e9120da6690 hotspot-jdk8u77-b03.tar.bz2
+34fd6af2160e062b9f4b434a9a350b79 build-demo-ldflags.patch"
+sha256sums="948b651e542618ced3f27395f75f0cca8dc0cb69577fdac94c1bb0445b56ca32 jdk8u-jdk8u92-b14.tar.bz2
+a0cde75df26176b9f0c75bc77ad2649e42bbbc321fb9bdca19ab339f4d9f949e corba-jdk8u92-b14.tar.bz2
+f72662de92ecdae80cbed04d5af6d72530f34631bfb15a73fef58bbb95faf4e2 jaxp-jdk8u92-b14.tar.bz2
+0d3e59432bebcd2d8353250e746ed6f59cf73f521471edbfca7392339d1bd264 jaxws-jdk8u92-b14.tar.bz2
+4eb3b4823f91c10da9cc5358946643b54f4e66ba499f9ae13904554ef45bbe85 jdk-jdk8u92-b14.tar.bz2
+27afacfefd7af8afcc47284fbdc6ac8377c8677f8e542a75b26228309c452b0c langtools-jdk8u92-b14.tar.bz2
+5a63849ebafe07c6f0fe13bdcf4f00f5b40a2966ccdf9f5c89d6f7bde62aa718 nashorn-jdk8u92-b14.tar.bz2
+251f1c684c951a94fed3af5cb4084e08b0448b564363a590d57fd648db634433 hotspot-jdk8u92-b14.tar.bz2
a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e icedtea-hotspot-musl.patch
9223d4a1ae20b51bcb901ace115a2cd5f15b05655ea076c05f4c7f2c66f341e5 icedtea-hotspot-noagent-musl.patch
0ef7592b8f2c954eda0a6cf4dc4a4010942f35ea426f44e34412be6c9a949745 icedtea-hotspot-uclibc-fixes.patch
@@ -251,15 +251,15 @@ a35d40f24098747cdb73d9c3742cfb4aecafa0f72c9dfdfe2cb460f9706ff665 icedtea-jdk-ex
d3fcf4779a23181178e722a93290921f5c61ed7220d3a431953a53c24f89e562 icedtea-jdk-musl.patch
38590e411b7bf9b99f5168709b975e1c432ef600915800c709a6617504e2c13a icedtea-jdk-includes.patch
47028d87c9a65df8d0103b39bf54b2b22de7db7c52a5de1058f88f4c5ea24f0d fix-libjvm-load.patch
-eebfb2613ae342587e8477a1022703ac986ed59e941ec1e96b2a3264c67c587b build-demo-ldflags.patch"
-sha512sums="11ba854ec70ad57c2801d9d6ce9f7c1e0b2422f199295efe656726cdd1f0bf9a61d9e3324406118da880e6a783e9a9f4d9cab4baa63772e51b85c826c58dc516 jdk8u-jdk8u77-b03.tar.bz2
-f1707f65832dfcc0e75b1c1624b3ef38c19a2db0684a2f6ad27fdf1ddfdc8180b59109a7fa5d8fdfd1f54ea3702d53960f423bac438e14a5ee2cf50a6cfcb084 corba-jdk8u77-b03.tar.bz2
-1ad820513b9672b9073ec69c9f677a5e737efed76cbb90efd8fcf87732afcba14efc23a451d294519bd80ef18972267717bcab07805a282931519135aa03ff7b jaxp-jdk8u77-b03.tar.bz2
-abdc24f4caf1a8c440575bc85c416bb2ac0fee75bcebdde433643aa5a4f784f04e77a3efee1bce274fdeadba6f66415d9ea030a6068cf727a7916c4f855ec7dc jaxws-jdk8u77-b03.tar.bz2
-4320c44b04a522e5ca500de9c118c77bb7709cabc13a18d672e88d360135a7c711049052c49e1398aba72615885d70423823d06fdb0b0555508427930784d9f8 jdk-jdk8u77-b03.tar.bz2
-2669e4f55c8458be7f494faac98d5ed7b67787cd8294e2476015613c04615be4af4f0fc490e72020952f750e05679d50da401d8581e9a11f6bf6e6e28f07d816 langtools-jdk8u77-b03.tar.bz2
-ee55b11b93e0509ae2d4167b3b8a73f64137321ee02fbd5bf422cc66ffa1e10f452a93a68794101c93a4e1b03aeb3c2b0f782c08936b434f5b078f00332605a0 nashorn-jdk8u77-b03.tar.bz2
-122bcbd568649d96338b19b5f3e31b877aa6655e3d050009a09a2e26fe6df899abca6e921c074cb1134a012792a6b2e610a7c7c6506486e0f84e5d5d0d505891 hotspot-jdk8u77-b03.tar.bz2
+606a08d7b986ab4dd52bbf03f0ea2e652b5687d9c929924046373ce0afef479a build-demo-ldflags.patch"
+sha512sums="aaea06ba72b2bda8c6f6426ca62ff698c00b73f1acae83f5531ffe9908a03547ce34a683d8af51d7e6d848e3a2c1e699f6f684d8969e602aa4ce0395f307cff9 jdk8u-jdk8u92-b14.tar.bz2
+361406d6911edeecb0928f28f53f029e107df4d31eb544a3a32417533b28eb90a4b7ab6c8322514cc14c9da09d523af514e5a7f48de120a908c8f74e0f0e9823 corba-jdk8u92-b14.tar.bz2
+df0dfa57aea9a368947e750a2ecfee8dd5d250d6a3fd41655cc589d2026bf5be53e69079d2067e2a5d0c3390257cc9708e77e3ef4e1d951c38fea6b5e5ed62c3 jaxp-jdk8u92-b14.tar.bz2
+c3bd6bdd10d01596c00224227c2026210384cca80959a416d9b99618028f0a2da5a1d9439d33e8f729a527b74c63749d19bb8b8424cce4b617e9e6ebdb424b0d jaxws-jdk8u92-b14.tar.bz2
+aa424052ccd37b545e014d28ea0a15dfd76499007b86a0b23ba49daabcd204dda34fd39d27ff832854eeb006a0484c58c4149a36dce1b5d0f6aa90ff53b4d100 jdk-jdk8u92-b14.tar.bz2
+177080c1b4bc1347ace8e0626a5ee778857e35158a165e1aaf4742d13d77ae9216504f827aa201679049b34e389ec5dcb4925d8e24e98534046f3afc62d06d43 langtools-jdk8u92-b14.tar.bz2
+f1cffe2135bdf4eac020fefaeb532fee7ed22805d49407c5b68aba45b5e0793aae7d9cc760e1458a3261a9118bf987e885e5d9d12bb735c4dc1019436469c2f6 nashorn-jdk8u92-b14.tar.bz2
+967c9e3ca1881d208daf7683f3093594a0919d71a7897b4332bb7d78488616e831bdd50cc899ab2aa104871c9d3c19f04609ec5f765b0abdce419b90327965b8 hotspot-jdk8u92-b14.tar.bz2
994e8a79a0a23f26d633bf2ce9dad62198c699892f6e7729cc6e509481330399bb2ba736514b516fd2b3dd125fd6c74a127ae7f16d643c3f6a69776737cdb933 icedtea-hotspot-musl.patch
d930edbb830957729031228196720fa2d50747655a9289097103d36f852ab11b7198e18805bd89c6a438c3ccf224be48cda5f994b193ab1f81a72aada0df2b16 icedtea-hotspot-noagent-musl.patch
822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a icedtea-hotspot-uclibc-fixes.patch
@@ -268,4 +268,4 @@ f6365cfafafa008bd6c1bf0ccec01a63f8a39bd1a8bc87baa492a27234d47793ba02d455e5667a87
2fd75bb52e7c9e3b56a383b72ee519d395413b000aef94ad00b106a692a199de34967bac1120164cebce5f71d302413742922a55cc6479b2d33258aaf7d03c1b icedtea-jdk-musl.patch
7df0db85039da8cbde49093ec3299f6804370f4134554a9c26c130a4e9e0b35409a3be833f3e90764ed16718683daffb6447261db8e5988f2e0519f649aedbc6 icedtea-jdk-includes.patch
978539ba0b1f1694cda6a3a1542a4373861cbfb4dc414a3b796cd8841ecf6e12248c746b5efe2c031c85a3b0684101b29e8a5f4ff70e77c1a3f3cd7f5cb148ce fix-libjvm-load.patch
-bcf9af85907b4f49f1aa470d21917280fcf9fc8892f089fe8c284ec3f2eccd57f799c7f06ce2ce641421d50396fa192cb71ccbb7a077958aacf57b8dadc80bc1 build-demo-ldflags.patch"
+d3f21cfa958d458624c7b1be807d9f4c0028bc83c5d0f55b72ceb05f0cbad71f9e98dfa5248382828cf7c8ed4678cc76c573aeb8c56476dd4709e4f5a841c028 build-demo-ldflags.patch"
diff --git a/community/openjdk8/build-demo-ldflags.patch b/community/openjdk8/build-demo-ldflags.patch
index ded0f11c8b7..b30cc455ac1 100644
--- a/community/openjdk8/build-demo-ldflags.patch
+++ b/community/openjdk8/build-demo-ldflags.patch
@@ -2,20 +2,20 @@ our LDFLAGS has -Wl,-z,relro but the commas are expanded too early in makefile.
--- ./jdk/make/CompileDemos.gmk.orig
+++ ./jdk/make/CompileDemos.gmk
-@@ -245,13 +245,15 @@
+@@ -244,6 +244,7 @@
+ # eval call below, the comma gets expanded too early.
BUILD_DEMO_JVMTI_$1_CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \
-I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
-
+ BUILD_DEMO_JVMTI_$1_LDFLAGS := $(filter-out -incremental:no -opt:ref,$(LDFLAGS_JDKLIB))
-+
+
# Remove the -incremental:no setting to get .ilk-files like in the old build.
$$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
- SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
+@@ -251,7 +252,7 @@
LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
OPTIMIZATION := LOW, \
CXXFLAGS := $$($1_CXXFLAGS), \
-- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
+- LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \
+ LDFLAGS := $$(BUILD_DEMO_JVMTI_$1_LDFLAGS), \
- LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
+ LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
LDFLAGS_SUFFIX_posix := $5, \