diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2019-05-21 20:21:51 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2019-05-30 19:30:27 +0300 |
| commit | b548bfb613d67dfd04ddc56b7cc7c628325259da (patch) | |
| tree | a30c5f3aa0daabbd8f44ea600d5842df7cb13f96 /community/openjdk7 | |
| parent | eab7d43e02a30d99fec79fdb2764d525aeef22dc (diff) | |
| download | aports-b548bfb613d67dfd04ddc56b7cc7c628325259da.tar.bz2 aports-b548bfb613d67dfd04ddc56b7cc7c628325259da.tar.xz | |
community/openjdk7: security upgrade to 7.221.2.6.18
Diffstat (limited to 'community/openjdk7')
| -rw-r--r-- | community/openjdk7/APKBUILD | 32 | ||||
| -rw-r--r-- | community/openjdk7/icedtea-pr64174.patch | 24 |
2 files changed, 42 insertions, 14 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index 61b909110d..1c311b8aa3 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD @@ -2,12 +2,12 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=openjdk7 -_icedteaver=2.6.17 -_icedteaversrc=$_icedteaver-r1 +_icedteaver=2.6.18 +_icedteaversrc=$_icedteaver # pkgver is <JDK version>.<JDK update> # check icedtea JDK when updating -pkgver=7.211.$_icedteaver -pkgrel=1 +pkgver=7.221.$_icedteaver +pkgrel=0 pkgdesc="OpenJDK 7 via IcedTea" url="https://icedtea.classpath.org/" arch="all" @@ -73,13 +73,13 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaversrc.ta https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_VER//./_}_Release/rhino-$RHINO_VER.zip + icedtea-pr64174.patch icedtea-hotspot-musl.patch icedtea-hotspot-musl-ppc.patch icedtea-hotspot-noagent-musl.patch icedtea-hotspot-uclibc-fixes.patch icedtea-jdk-fix-build.patch icedtea-jdk-execinfo.patch - icedtea-jdk-fix-freetype-detection.patch icedtea-jdk-fix-ipv6-init.patch icedtea-jdk-musl.patch icedtea-jdk-no-soname.patch @@ -90,6 +90,10 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaversrc.ta " # secfixes: +# 7.221.2.6.18-r0: +# - CVE-2019-2602 +# - CVE-2019-2684 +# - CVE-2019-2698 # 7.211.2.6.17-r0: # - CVE-2018-11212 # - CVE-2019-2422 @@ -270,23 +274,23 @@ doc() { mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/ } -sha512sums="cc4f3f06da3332224e3826e7b3f8292e708a791d6b478db612b7bd01bdcf5ab717507d144ec03349361d665df899459930e0f21f6a5ee78195575488e58bec57 icedtea-2.6.17-r1.tar.xz -fe1ce302fe887dcb71f589387b44d3ae71ea389825df4f09d578a67c23aee79a1c2a463da84b22cf74e9b2ce92801da72c40d66093d0eb1c790f09955bb277cc openjdk-2.6.17.tar.bz2 -20336ab198e42d42c2f68d15b82fd25db523d68b65313df4c1233a13ccb286fc94e9941c84a2b2b18a196aa121109aedb0c2c6ca772b71c8e1721ebf04b702f6 corba-2.6.17.tar.bz2 -d7589d0586eb155225b263387099022af69b9e79c07348db4d48200f7b0a2f53b59c42df284a41604647b06ee4aff43b07dbc4d737b2a0cb29f857cb7fbc7f54 jaxp-2.6.17.tar.bz2 -cbc40096706743302b03204099ddc2d632cd14c24dd3d7a5dcb8ad6258146535d660a5f384e2df64c2b97e376122852f050f69f7e67983d86bfbf12a92c7cd2c jaxws-2.6.17.tar.bz2 -f0ba8dd6011b205fbc3b67924c7535cd7618df3b1ed084aa65e70532a352d604a908894bbc010d7a50fc2e2d28be7c3d0730d73fc30f1c361e444e63d4b34ac5 jdk-2.6.17.tar.bz2 -fd6cb9004c886b78b45ddad7ba98b202998d497ff26e3f0dd861cd418a52e7c0dd7e25e1e035a4278db449abd606a8248cccc28a10cdc543e9870848e05d30f5 langtools-2.6.17.tar.bz2 -2777299457b9f82736351a4c948431c1671a40bdc1315da66ba13f0f9930a40812da5385f7d8b10f4a847592cc4f253a36eb14b15bd6699fa5dcd7841718f821 hotspot-2.6.17.tar.bz2 +sha512sums="202038af902c7619e787c3f55ccc4ab5b758a72e4c841d17065809d2331ed4f8ed7a2bce753917d9e6215525ba56840793c9a9850142e865edde1a92a7e5806d icedtea-2.6.18.tar.xz +af8bbdad44448fb73d4f8ac87c00fa2198b7d6a401b9af9c8330768aa5ca395b50ff85f053b02a3e6d4b166b0a8f7badf6bd3c983cc9b2e35f157d0389983982 openjdk-2.6.18.tar.bz2 +0c688037efebbea1175ae26fc77be205cb43f8de886b00a6d89d35666c523bad8dbde3be636a428bff1331e89c4a6acf2aefc5611e65e4a3a7b617e240c536bf corba-2.6.18.tar.bz2 +0a23f37bf35537333d93c88e6f3e018af32f9019ec081e679a4f204848851f4fbcf47f2c0e58e27b8a0c5fdfc9897d427070e62022afcfc42ad70bb413f12c1e jaxp-2.6.18.tar.bz2 +1b2b8fd93e9f94af202c3816b4ecaa8c0809d5eed5962ff57f2edd15232abcaa11d4ac74bfb5b9f9121e5cdec3ea33559ebcc5605d8aa1fd013152abafe14aa9 jaxws-2.6.18.tar.bz2 +82d8b69f6ba3eeb3825275506704b793b5c3ea416da04319fd62948c7fa9db9a4bcb96b0b43d13fc58fbaf2f8d4b5eea098d98d5da68977cb41f9614e8c30933 jdk-2.6.18.tar.bz2 +b64c832474295b3c8d3a22a906b156555171128002c1870d071c98902f7b611d8d0f0dab4c98bf21a102011a7bf2a542d0207cdbe23433a77073670a17eb6322 langtools-2.6.18.tar.bz2 +bff77060aa4ccceec62fc14a1c47ba6d31d510353050b9b213ef87a58b82132e5cad72c59ff38f50a2c290fd2cfd84e0db9768e205d72865b6fc4b6d15fb5f0c hotspot-2.6.18.tar.bz2 0da12cb0f761b8cb76e042449e7d93f43236e7bc948e337215470a70031f0a2dda6d1b508f9397b283808d84c4ebddb31558fe1cd8e6e6469c1dd390d69ec6e7 apache-ant-1.9.11-bin.tar.gz 1b9e8721749e81c5420a00af1e00ee0e4f48624ccb4e9aa969032114116ad50f59b254d4d16d74feff74de64157cc8b0a2ead9b555907c84b7055b796fba9a75 rhino-1.7.7.2.zip +dbebef0b6246ffaba8d10e1b672821b55e69950961dcfd265f8b37a8123a71bd80b33a1e4f1ea27343e08803744138687c6ee367e4158bc3540f5d886c0e9cb4 icedtea-pr64174.patch f62b942f0bacda8e37d0f1876d8ba14ddb4fc55a7d5fd1019463744927f40f422a85e9ee051948d566242f5a785aa28f275eb58768611283cba89af91235f43c icedtea-hotspot-musl.patch e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d9591239fc44ffe5c74422d1842bd9f10a0c00dff1627bdeeef icedtea-hotspot-musl-ppc.patch e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e82f3e390535c950c5beee3bd8d06fb5a717b50f2d9b2a6bc icedtea-hotspot-noagent-musl.patch 822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a icedtea-hotspot-uclibc-fixes.patch 213a537de5f011cb39d608515c3413513ac75fb93593f9a9ef4205f71d72bdd8b097c80db185f7b26021d5bb85045b866f34f3478482dc4189972d8614a13458 icedtea-jdk-fix-build.patch 0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb icedtea-jdk-execinfo.patch -7b1525b5fb4bc7f0c6a8b957584a35297003b3063b6319f5557257ee1e6c277f0d4d1cf26cc389c72dd5157871010944f3fcb3fe70b64c429c76323521b6eb3d icedtea-jdk-fix-freetype-detection.patch 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5 icedtea-jdk-musl.patch bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch diff --git a/community/openjdk7/icedtea-pr64174.patch b/community/openjdk7/icedtea-pr64174.patch new file mode 100644 index 0000000000..ec8f0d5d3a --- /dev/null +++ b/community/openjdk7/icedtea-pr64174.patch @@ -0,0 +1,24 @@ +--- patches.orig/boot/pr64174.patch ++++ patches/boot/pr64174.patch +@@ -1,8 +1,7 @@ +-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties +---- openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:09:06.030312835 +0000 +-+++ openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:10:07.527160626 +0000 +-@@ -320,7 +320,7 @@ +- # LAO PEOPLE'S DEMOCRATIC REPUBLIC ++--- openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties +++++ openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties ++@@ -323,7 +323,7 @@ ++ # LAO PEOPLE'S DEMOCRATIC REPUBLIC (THE) + LA=LAK + # LATVIA + -LV=LVL;2013-12-31-22-00-00;EUR +@@ -10,7 +9,7 @@ + # LEBANON + LB=LBP + # LESOTHO +-@@ -332,7 +332,7 @@ ++@@ -335,7 +335,7 @@ + # LIECHTENSTEIN + LI=CHF + # LITHUANIA |