community/openjdk7: security upgrade to 7.261.2.6.22

- CVE-2020-2756
- CVE-2020-2757
- CVE-2020-2773
- CVE-2020-2781
- CVE-2020-2800
- CVE-2020-2803
- CVE-2020-2805
- CVE-2020-2830

2 files changed, 21 insertions, 12 deletions

diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD
index 5c4f467cad1..0dfcd966578 100644
--- a/community/openjdk7/APKBUILD
+++ b/community/openjdk7/APKBUILD
@@ -2,11 +2,11 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openjdk7
-_icedteaver=2.6.21
+_icedteaver=2.6.22
 _icedteaversrc=$_icedteaver
 # pkgver is <JDK version>.<JDK update>
 # check icedtea JDK when updating
-pkgver=7.251.$_icedteaver
+pkgver=7.261.$_icedteaver
 pkgrel=0
 pkgdesc="OpenJDK 7 via IcedTea"
 url="https://icedtea.classpath.org/"
@@ -91,6 +91,15 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaversrc.ta
 	"
 
 # secfixes:
+#   7.261.2.6.22-r0:
+#     - CVE-2020-2756
+#     - CVE-2020-2757
+#     - CVE-2020-2773
+#     - CVE-2020-2781
+#     - CVE-2020-2800
+#     - CVE-2020-2803
+#     - CVE-2020-2805
+#     - CVE-2020-2830
 #   7.251.2.6.21-r0:
 #     - CVE-2020-2583
 #     - CVE-2020-2590
@@ -306,21 +315,21 @@ doc() {
 	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
 }
 
-sha512sums="ec86dc14e3d4293ff51bfb82df3fc00fb9dd2d556070d80bb5ccf7f550a89ae3f3f2f35fc6d07aa732c0c343798080614d8b3c383ff03b99043cfd82f3235296  icedtea-2.6.21.tar.xz
-0703c8b3e3c420e77b7e557526848dc96ce8b22decf35d9fb3726e006738834fb3276f90362eb0f702b405fc6bead57b3dfe221a3b4bec8e8911836935893007  openjdk-2.6.21.tar.bz2
-710c1cb4353c0601b5d67ac627131c22cdf17dfa3ae734641ff1b2a1773786b17033e81db6a493b055bc5272094aa08a65e5415a11d9843f7ecc9366ab55cf0f  corba-2.6.21.tar.bz2
-c07c07a55e0ff495aefc489b9c386f220cc831c2f77fd10d3fc628e15bd24e025de74f39b2bfb03f4e5a9cfd3750eca55186e8b3cc040c8eceaac10500ba2a6b  jaxp-2.6.21.tar.bz2
-7755670d8d763dd98ac7ba5d7a6f1372fa0eb7d834f01cb118b70b15717bec9039cb9b80ba317df2d27b6ac368932d84efd719a78ed686a232f59ec21851ba01  jaxws-2.6.21.tar.bz2
-72395385d640b875730cc55358b0b984b17deb852d4b8024f8e36a7c63c19a002e1161548ea57648a733d54f1a2f2b662fa10fa568aff2109b248977a23382e3  jdk-2.6.21.tar.bz2
-e7a71a1f1b52dd2e00646f3c9b71a1edf4612ebd2925647143bd2f99c34f77133b096e367f2d4a786960ed81f7594914fd67b41a80f45d9d645fa4e76c06dc12  langtools-2.6.21.tar.bz2
-03164553b87322b1a5ace73f6faf615295271944e2032b947a8f947b82ad8631ff405db0471380183c12e6a4f23e6142f1be449645643b354766e753ef6bc928  hotspot-2.6.21.tar.bz2
+sha512sums="28c96cd2971ce381f0bd1c2a7fe6443602ad89dc0dd5a48d533e3c1a473421bdb98abf5e38117409f305bab7c6c8fecf95e854e8da8acf022966014539916b5c  icedtea-2.6.22.tar.xz
+7e2027e0b32b34f63eb771aad0273313d963d455f11f635e6b268b49a7f390d9ef2ff2913f2b9f09b6959abbdc060788a1ad8da9ae221b0889054ec4120f9867  openjdk-2.6.22.tar.bz2
+105b9a40d2a65d106e2d59524b0ed24edc72f46f2383d5645d7dd1f09ea9359e76b07ce1712433c7ce1062c5c49f45937acbfe293cfb27379d9a412f03589324  corba-2.6.22.tar.bz2
+696f17f0ef263668fa775bfb65630dcbe5c673fd7b153eff598fc7a7ba60c99b3f6b5f8e82949f3ebf16f506a9158797227c7263292a04b63a8653189dd9bfbb  jaxp-2.6.22.tar.bz2
+406d9066e66d38a6cfd697f594e6955a625b685fd7dd83eb774243a9c3bbeeef13a9f6fc5c9fa9b3e2de561264831779edc7af312f1df08c29315d97f5b71e9e  jaxws-2.6.22.tar.bz2
+f2d6370b1bc5ee011670229b0d001f08e49aa688dfdaa196b5eb5db1484ce06046c6cf8415bb09ecca6810472f3211988a5a1cd42cdca805b3b56be8b6cd5bcd  jdk-2.6.22.tar.bz2
+df11b0d172c1493870ce3aabca076c16f73c2e2f50ac6beac921c72c6bf925a8b879cf8754b19d2d6dd0407f9baadeb597719c6f5972c97f5a5f7567bf98fcb1  langtools-2.6.22.tar.bz2
+f7652d0e6c1fe33ed7fe0d6f0c36daffc6509bb92818d5eaaf183fd9e8afc1a2fca9d547a2c087aa41134d5da0da4c647b5cdad11b9a520cf9a94cc1a548e219  hotspot-2.6.22.tar.bz2
 0da12cb0f761b8cb76e042449e7d93f43236e7bc948e337215470a70031f0a2dda6d1b508f9397b283808d84c4ebddb31558fe1cd8e6e6469c1dd390d69ec6e7  apache-ant-1.9.11-bin.tar.gz
 1b9e8721749e81c5420a00af1e00ee0e4f48624ccb4e9aa969032114116ad50f59b254d4d16d74feff74de64157cc8b0a2ead9b555907c84b7055b796fba9a75  rhino-1.7.7.2.zip
 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
+8fadeee6ea9886c7ee3118a1abaee2fbd04931a3ba880062bc97397ad30aab114a83542c888461a5a8a1d131c4e73920872317c96620e2a8c4689620adf9e9c3  icedtea-jdk-fix-build.patch
 0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb  icedtea-jdk-execinfo.patch
 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774  icedtea-jdk-fix-ipv6-init.patch
 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5  icedtea-jdk-musl.patch
diff --git a/community/openjdk7/icedtea-jdk-fix-build.patch b/community/openjdk7/icedtea-jdk-fix-build.patch
index 9fae895b662..c8daa6fb2a5 100644
--- a/community/openjdk7/icedtea-jdk-fix-build.patch
+++ b/community/openjdk7/icedtea-jdk-fix-build.patch
@@ -22,7 +22,7 @@ Fixes three issues:
 +LDFLAGS_DEFS_OPTION  =
  LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
  
- #
+ LDFLAGS_RELRO_OPTION = -Xlinker -z -Xlinker relro
 @@ -407,7 +407,7 @@
  # the library itself should not.
  #