Oct 2023 PSU config files for Microsoft

adoptium · Oct 24, 2023 · f7b19d7 · f7b19d7
1 parent 6f1cc00
commit f7b19d7
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 35 deletions.
diff --git a/linux/jdk/debian/src/main/packaging/microsoft/11/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/11/debian/changelog
@@ -1,3 +1,9 @@
+msopenjdk-11 (11.0.21-1) STABLE; urgency=medium
+
+  * Microsoft 11.0.21-1 release.
+
+ -- Microsoft Package Maintainers <[email protected]>  Wed, 11 Oct 2023 10:29:35 +0000
+
 msopenjdk-11 (11.0.20.1-1) STABLE; urgency=medium
 
   * Microsoft 11.0.20.1-1 release.

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/11/debian/rules b/linux/jdk/debian/src/main/packaging/microsoft/11/debian/rules
@@ -3,7 +3,7 @@
 pkg_name = msopenjdk-11
 priority = 1111
 jvm_tools = jaotc jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jjs jlink jmap jmod jps jrunscript jshell jstack jstat jstatd keytool pack200 rmic rmid rmiregistry serialver unpack200 jexec jspawnhelper
-url_version = 11.0.20.1
+url_version = 11.0.21
 amd64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz
 amd64_checksum_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz.sha256sum.txt
 arm64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-aarch64.tar.gz

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/17/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/17/debian/changelog
@@ -1,3 +1,9 @@
+msopenjdk-17 (17.0.9-1) STABLE; urgency=medium
+
+  * Microsoft 17.0.9-1 release.
+
+ -- Microsoft Package Maintainers <[email protected]>  Wed, 18 Oct 2023 02:03:33 +0000
+
 msopenjdk-17 (17.0.8.1-1) STABLE; urgency=medium
 
   * Microsoft 17.0.8.1-1 release.

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/17/debian/rules b/linux/jdk/debian/src/main/packaging/microsoft/17/debian/rules
@@ -3,7 +3,7 @@
 pkg_name = msopenjdk-17
 priority = 1711
 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd keytool rmiregistry serialver jexec jspawnhelper
-url_version = 17.0.8.1
+url_version = 17.0.9
 amd64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz
 amd64_checksum_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz.sha256sum.txt
 arm64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-aarch64.tar.gz

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/21/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/21/debian/changelog
@@ -1,5 +1,11 @@
+msopenjdk-21 (21.0.1-1) STABLE; urgency=medium
+
+  * Microsoft 21.0.1-1 release.
+
+ -- Microsoft Package Maintainers <[email protected]>  Thu, 12 Oct 2023 17:07:03 +0000
+
 msopenjdk-21 (21.0.0-1) STABLE; urgency=medium
 
   * Microsoft 21.0.0-1 release.
 
- -- Microsoft Package Maintainers <[email protected]>  Tue, 19 Sep 2023 09:00:00 +0000
+ -- Microsoft Package Maintainers <[email protected]>  Tue, 19 Sep 2023 09:00:00 +0000
diff --git a/linux/jdk/debian/src/main/packaging/microsoft/21/debian/rules b/linux/jdk/debian/src/main/packaging/microsoft/21/debian/rules
@@ -3,7 +3,7 @@
 pkg_name = msopenjdk-21
 priority = 2111
 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd jwebserver keytool rmiregistry serialver jexec jspawnhelper
-url_version = 21.0.0
+url_version = 21.0.1
 amd64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz
 amd64_checksum_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz.sha256sum.txt
 arm64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-aarch64.tar.gz

diff --git a/linux/jdk/redhat/src/main/packaging/microsoft/11/msopenjdk-11.spec b/linux/jdk/redhat/src/main/packaging/microsoft/11/msopenjdk-11.spec
@@ -1,13 +1,11 @@
-%global upstream_version 11.0.20.1+1
+%global upstream_version 11.0.21+9
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
-%global spec_version 11.0.20.1
+%global spec_version 11.0.21
 %global spec_release 1
 %global priority 1111
 
 %global source_url_base https://aka.ms/download-jdk
-%global upstream_version_url %(echo %{upstream_version} | cut -d+ -f1)
-# Above is upstream_version before the '+'
 %global java_provides openjdk
 
 %global local_build_ %{?local_build}%{!?local_build:0}
@@ -95,12 +93,12 @@ Provides: jre-11-%{java_provides}
 Provides: jre-%{java_provides}
 
 # First architecture (x64)
-Source0: %{source_url_base}/microsoft-jdk-%{upstream_version_url}-linux-%{vers_arch}.tar.gz
-Source1: %{source_url_base}/microsoft-jdk-%{upstream_version_url}-linux-%{vers_arch}.tar.gz.sha256sum.txt
+Source0: %{source_url_base}/microsoft-jdk-%{spec_version}-linux-%{vers_arch}.tar.gz
+Source1: %{source_url_base}/microsoft-jdk-%{spec_version}-linux-%{vers_arch}.tar.gz.sha256sum.txt
 
 # Second architecture (aarch64)
-Source2: %{source_url_base}/microsoft-jdk-%{upstream_version_url}-linux-%{vers_arch2}.tar.gz
-Source3: %{source_url_base}/microsoft-jdk-%{upstream_version_url}-linux-%{vers_arch2}.tar.gz.sha256sum.txt
+Source2: %{source_url_base}/microsoft-jdk-%{spec_version}-linux-%{vers_arch2}.tar.gz
+Source3: %{source_url_base}/microsoft-jdk-%{spec_version}-linux-%{vers_arch2}.tar.gz.sha256sum.txt
 
 %if "%{local_build_}" == "true"
 Source4: local_build_jdk1.tar.gz
@@ -139,12 +137,6 @@ tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_n
 # Strip bundled Freetype and use OS package instead.
 rm -f "%{buildroot}%{prefix}/lib/libfreetype.so"
 
-# Use cacerts included in OS
-rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
-pushd "%{buildroot}%{prefix}/lib/security"
-ln -s /etc/pki/java/cacerts "%{buildroot}%{prefix}/lib/security/cacerts"
-popd
-
 # Ensure systemd-tmpfiles-clean does not remove pid files
 # https://bugzilla.redhat.com/show_bug.cgi?id=1704608
 %{__mkdir} -p %{buildroot}/usr/lib/tmpfiles.d
@@ -228,6 +220,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 # Make below specific 
 %changelog
+* Wed Oct 11 2023 Microsoft Package Maintainers <[email protected]> 11.0.21-1
+- Microsoft 11.0.21+9 initial release.
 * Wed Aug 23 2023 Microsoft Package Maintainers <[email protected]> 11.0.20.1-1
 - Microsoft 11.0.20.1+1 initial release.
 * Fri Jul 07 2023 Microsoft Package Maintainers <[email protected]> 11.0.20-1

diff --git a/linux/jdk/redhat/src/main/packaging/microsoft/17/msopenjdk-17.spec b/linux/jdk/redhat/src/main/packaging/microsoft/17/msopenjdk-17.spec
@@ -1,13 +1,11 @@
-%global upstream_version 17.0.8.1+1
+%global upstream_version 17.0.9+8
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
-%global spec_version 17.0.8.1
+%global spec_version 17.0.9
 %global spec_release 1
 %global priority 1161
 
 %global source_url_base https://aka.ms/download-jdk
-%global upstream_version_url %(echo %{upstream_version} | cut -d+ -f1)
-# Above is upstream_version before the '+'
 %global java_provides openjdk
 
 %global local_build_ %{?local_build}%{!?local_build:0}
@@ -95,12 +93,12 @@ Provides: jre-17-%{java_provides}
 Provides: jre-%{java_provides}
 
 # First architecture (x64)
-Source0: %{source_url_base}/microsoft-jdk-%{upstream_version_url}-linux-%{vers_arch}.tar.gz
-Source1: %{source_url_base}/microsoft-jdk-%{upstream_version_url}-linux-%{vers_arch}.tar.gz.sha256sum.txt
+Source0: %{source_url_base}/microsoft-jdk-%{spec_version}-linux-%{vers_arch}.tar.gz
+Source1: %{source_url_base}/microsoft-jdk-%{spec_version}-linux-%{vers_arch}.tar.gz.sha256sum.txt
 
 # Second architecture (aarch64)
-Source2: %{source_url_base}/microsoft-jdk-%{upstream_version_url}-linux-%{vers_arch2}.tar.gz
-Source3: %{source_url_base}/microsoft-jdk-%{upstream_version_url}-linux-%{vers_arch2}.tar.gz.sha256sum.txt
+Source2: %{source_url_base}/microsoft-jdk-%{spec_version}-linux-%{vers_arch2}.tar.gz
+Source3: %{source_url_base}/microsoft-jdk-%{spec_version}-linux-%{vers_arch2}.tar.gz.sha256sum.txt
 
 %if "%{local_build_}" == "true"
 Source4: local_build_jdk1.tar.gz
@@ -139,12 +137,6 @@ tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_n
 # Strip bundled Freetype and use OS package instead.
 rm -f "%{buildroot}%{prefix}/lib/libfreetype.so"
 
-# Use cacerts included in OS
-rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
-pushd "%{buildroot}%{prefix}/lib/security"
-ln -s /etc/pki/java/cacerts "%{buildroot}%{prefix}/lib/security/cacerts"
-popd
-
 # Ensure systemd-tmpfiles-clean does not remove pid files
 # https://bugzilla.redhat.com/show_bug.cgi?id=1704608
 %{__mkdir} -p %{buildroot}/usr/lib/tmpfiles.d
@@ -225,6 +217,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Wed Oct 18 2023 Microsoft Package Maintainers <[email protected]> 17.0.9-1
+- Microsoft 17.0.9+8 initial release.
 * Wed Aug 23 2023 Microsoft Package Maintainers <[email protected]> 17.0.8.1-1
 - Microsoft 17.0.8.1+1 initial release.
 * Fri Jul 07 2023 Microsoft Package Maintainers <[email protected]> 17.0.8-1

diff --git a/linux/jdk/redhat/src/main/packaging/microsoft/21/msopenjdk-21.spec b/linux/jdk/redhat/src/main/packaging/microsoft/21/msopenjdk-21.spec
@@ -1,7 +1,7 @@
-%global upstream_version 21+35
+%global upstream_version 21.0.1+12
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
-%global spec_version 21.0.0
+%global spec_version 21.0.1
 %global spec_release 1
 %global priority 1211
 
@@ -222,5 +222,7 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Thu Oct 12 2023 Microsoft Package Maintainers <[email protected]> 21.0.1-1
+- Microsoft 21.0.1+12 initial release.
 * Tue Sep 26 2023 Microsoft Package Maintainers <[email protected]> 21.0.0-1
-- Microsoft 21.0.0+35 initial release.
+- Microsoft 21.0.0+35 initial release.