| Message ID | 20210918005027.97811-1-aduskett@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/openjdk{-bin}: bump versions to 11.0.12+7 and 16.0.2+7 | expand |
Adam, All, On 2021-09-17 17:50 -0700, Adam Duskett spake thusly: > As the github repository has changed from github.com/AdoptOpenJDK/ to > github.com/adoptium, both versions are updated in the same patch. > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > --- > package/openjdk-bin/openjdk-bin.hash | 6 +++--- > package/openjdk-bin/openjdk-bin.mk | 7 +++---- > package/openjdk/openjdk.hash | 4 ++-- > package/openjdk/openjdk.mk | 4 ++-- > 4 files changed, 10 insertions(+), 11 deletions(-) > > diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash > index 04b3c42d25..696371eb51 100644 > --- a/package/openjdk-bin/openjdk-bin.hash > +++ b/package/openjdk-bin/openjdk-bin.hash > @@ -1,8 +1,8 @@ > # From https://github.com/AdoptOpenJDK/openjdk16-binaries/releases > -sha256 7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz > +sha256 323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz > > -# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases > -sha256 e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz > +# From https://github.com/adoptium/temurin11-binaries/releases > +sha256 8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2 OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz > > # Locally calculated > sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE > diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk > index b48155dc28..641a212f17 100644 > --- a/package/openjdk-bin/openjdk-bin.mk > +++ b/package/openjdk-bin/openjdk-bin.mk > @@ -6,15 +6,14 @@ > > ifeq ($(BR2_OPENJDK_VERSION_LATEST),y) > HOST_OPENJDK_BIN_VERSION_MAJOR = 16 > -HOST_OPENJDK_BIN_VERSION_MINOR = 0.1_9 > +HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_7 > else > HOST_OPENJDK_BIN_VERSION_MAJOR = 11 > -HOST_OPENJDK_BIN_VERSION_MINOR = 0.11_9 > +HOST_OPENJDK_BIN_VERSION_MINOR = 0.12_7 > endif > HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR) > HOST_OPENJDK_BIN_SOURCE = OpenJDK$(HOST_OPENJDK_BIN_VERSION_MAJOR)U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz > -HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION)) > - > +HOST_OPENJDK_BIN_SITE = https://github.com/adoptium/temurin$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION)) I've reinstated the nice empty line that acts as a clean separation. ;-) Applied to master, thanks. Regards, Yann E. MORIN. > HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception > HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION > > diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash > index ba6c4385e7..2b4a2c7a62 100644 > --- a/package/openjdk/openjdk.hash > +++ b/package/openjdk/openjdk.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 3b3aca61fe2834322e51636d99bcd09c4abba7d8a2cde231dbcbcbdedf829baf openjdk-16.0.1+9.tar.gz > -sha256 55841c01dbe6606e0d5f88045fb2da02632ce3a2d9d9b25d030a06eadeee0f62 openjdk-11.0.11+9.tar.gz > +sha256 b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c openjdk-16.0.2+7.tar.gz > +sha256 9a37c9641b45f5c51fe19c1ccae141daeb5dcdbd59fa2f56e7dea7bf09484bec openjdk-11.0.12+7.tar.gz > sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE > diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk > index cbb975ca25..aac5c87e73 100644 > --- a/package/openjdk/openjdk.mk > +++ b/package/openjdk/openjdk.mk > @@ -6,10 +6,10 @@ > > ifeq ($(BR2_OPENJDK_VERSION_LATEST),y) > OPENJDK_VERSION_MAJOR = 16 > -OPENJDK_VERSION_MINOR = 0.1+9 > +OPENJDK_VERSION_MINOR = 0.2+7 > else > OPENJDK_VERSION_MAJOR = 11 > -OPENJDK_VERSION_MINOR = 0.11+9 > +OPENJDK_VERSION_MINOR = 0.12+7 > endif > OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) > OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot@lists.buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> "Adam" == Adam Duskett <aduskett@gmail.com> writes: > As the github repository has changed from github.com/AdoptOpenJDK/ to > github.com/adoptium, both versions are updated in the same patch. > Signed-off-by: Adam Duskett <aduskett@gmail.com> These contains a number of security fixes, so marked as a security bump and committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 04b3c42d25..696371eb51 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,8 +1,8 @@ # From https://github.com/AdoptOpenJDK/openjdk16-binaries/releases -sha256 7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz +sha256 323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases -sha256 e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz +# From https://github.com/adoptium/temurin11-binaries/releases +sha256 8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2 OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index b48155dc28..641a212f17 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,15 +6,14 @@ ifeq ($(BR2_OPENJDK_VERSION_LATEST),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 16 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.1_9 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_7 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.11_9 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.12_7 endif HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK$(HOST_OPENJDK_BIN_VERSION_MAJOR)U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz -HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION)) - +HOST_OPENJDK_BIN_SITE = https://github.com/adoptium/temurin$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION)) HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index ba6c4385e7..2b4a2c7a62 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 3b3aca61fe2834322e51636d99bcd09c4abba7d8a2cde231dbcbcbdedf829baf openjdk-16.0.1+9.tar.gz -sha256 55841c01dbe6606e0d5f88045fb2da02632ce3a2d9d9b25d030a06eadeee0f62 openjdk-11.0.11+9.tar.gz +sha256 b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c openjdk-16.0.2+7.tar.gz +sha256 9a37c9641b45f5c51fe19c1ccae141daeb5dcdbd59fa2f56e7dea7bf09484bec openjdk-11.0.12+7.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index cbb975ca25..aac5c87e73 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_OPENJDK_VERSION_LATEST),y) OPENJDK_VERSION_MAJOR = 16 -OPENJDK_VERSION_MINOR = 0.1+9 +OPENJDK_VERSION_MINOR = 0.2+7 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.11+9 +OPENJDK_VERSION_MINOR = 0.12+7 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION))
As the github repository has changed from github.com/AdoptOpenJDK/ to github.com/adoptium, both versions are updated in the same patch. Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/openjdk-bin/openjdk-bin.hash | 6 +++--- package/openjdk-bin/openjdk-bin.mk | 7 +++---- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-)