Merge pull request #938 from flatcar/dongsu/openssl-3.0.9

dev-libs/openssl: update to 3.0.9
flatcar · Jun 29, 2023 · a9f25e3 · a9f25e3
2 parents e623787 + a3dfd93
commit a9f25e3
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 381 deletions.
diff --git a/changelog/security/2023-06-20-openssl-3.0.9.md b/changelog/security/2023-06-20-openssl-3.0.9.md
@@ -0,0 +1 @@
+- OpenSSL ([CVE-2023-2650](https://nvd.nist.gov/vuln/detail/CVE-2023-2650))
diff --git a/changelog/updates/2023-06-20-openssl-3.0.9.md b/changelog/updates/2023-06-20-openssl-3.0.9.md
@@ -0,0 +1 @@
+- OpenSSL ([3.0.9](https://github.com/openssl/openssl/blob/openssl-3.0.9/NEWS.md#major-changes-between-openssl-308-and-openssl-309-30-may-2023))
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/Manifest
@@ -1,2 +1,2 @@
-DIST openssl-3.0.8.tar.gz 15151328 BLAKE2B e163cc9b8b458f72405a2f1bde3811c8d0eb22e8b08ff5608ec64799975f1546dcdce31466b8a1d5ed29bc90d19aa6017d711987c81b71f4b20e279828cf753a SHA512 8ce10be000d7d4092c8efc5b96b1d2f7da04c1c3a624d3a7923899c6b1de06f369016be957e36e8ab6d4c9102eaeec5d1973295d547f7893a7f11f132ae42b0d
-DIST openssl-3.0.8.tar.gz.asc 833 BLAKE2B 1949801150e254e9be648f33014a4a16f803b42ca5a302c3942d377013e983e0ea0cca8aed594e3f9ecde26c6e31d222581e991af5fae6cd451d7ee83541f4bb SHA512 e1c04f1179aded228b39005fd9e9f6f75aedafb938b77ac58c97a00973eb412d93b92ad1c447332a5d96850b62b01093502928e6c190bdd0234a94c4e815d2a6
+DIST openssl-3.0.9.tar.gz 15181285 BLAKE2B cc1df41fa12ba4443e15e94f6ebdc5e103b9dab5eab2e1c8f74e6a74fa2c38207817921b65d7293cb241c190a910191c7163600bb75243adde0e2f9ec31cc885 SHA512 86c99146b37236419b110db77dd3ac3992e6bed78c258f0cc3434ca233460b4e17c0ac81d7058547fe9cb72a9fd80ee56d4b4916bb731dbe2bbcf1c3d46bf31a
+DIST openssl-3.0.9.tar.gz.asc 833 BLAKE2B 9943ac65f83f48465cae83b37a1d004f6be4622e53c3025166d42954abe9215f1a6c2af58d4aa2b45fa51182fee5019e740969f694655b6c592bb278c68aacef SHA512 9949de6b57d5aa21da1d4b68a29eb37e302403c983bd7d2d8769b320aac4268a9f9091c5fb182862a4f89a9099660939fe609df87c66991b75f7695faf357caf
diff --git a/...r/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0464.patch b/...r/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0464.patch
diff --git a/...r/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0465.patch b/...r/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0465.patch
diff --git a/...r/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0466.patch b/...r/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0466.patch
diff --git a/...r/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-1255.patch b/...r/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-1255.patch
diff --git a/...ner/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-mips-cflags.patch b/...ner/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-3.0.8-mips-cflags.patch
diff --git a/.../dev-libs/openssl/openssl-3.0.8-r4.ebuild → ...lay/dev-libs/openssl/openssl-3.0.9.ebuild b/.../dev-libs/openssl/openssl-3.0.8-r4.ebuild → ...lay/dev-libs/openssl/openssl-3.0.9.ebuild
@@ -54,14 +54,6 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/openssl/configuration.h
 )
 
-PATCHES=(
-	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
-	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0464.patch
-	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0465.patch
-	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0466.patch
-	"${FILESDIR}"/openssl-3.0.8-CVE-2023-1255.patch
-)
-
 pkg_setup() {
 	if use ktls ; then
 		if kernel_is -lt 4 18 ; then