Skip to content

Commit

Permalink
[glibc] Bump version to 2.39
Browse files Browse the repository at this point in the history
Drop the security fixes for CVE-2023-4527, CVE-2023-4806, CVE-2023-4911,
CVE-2023-5156 and the fix for a performance regression
(glibc bug 30723) applied to glibc 2.38, as they are included in the
2.39 release.

Besides the above fixes for CVEs, this version of glibc additionally
includes fixes for CVE-2023-6246, CVE-2023-6779 and CVE-2023-6780.

Signed-off-by: Kailun Qin <kailun.qin@intel.com>
  • Loading branch information
kailun-qin authored and mkow committed Feb 10, 2024
1 parent 4c6be0a commit f35d8e0
Show file tree
Hide file tree
Showing 12 changed files with 125 additions and 801 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ subdir('python')
subdir('tools')

if get_option('libc') == 'glibc'
subproject('glibc-2.38-1')
subproject('glibc-2.39-1')
elif get_option('libc') == 'musl'
subproject('musl-1.2.4')
endif
Expand Down
16 changes: 8 additions & 8 deletions subprojects/glibc-2.38-1.wrap → subprojects/glibc-2.39-1.wrap
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# NOTE: We use a custom version number (the `-1` suffix) to force Meson to rebuild when there is a
# breaking change to the interface between Glibc and Gramine. The important part is that the
# directory in `subprojects` has to change (`subprojects/glibc-2.38-1`, `subprojects/glibc-2.38-2`
# directory in `subprojects` has to change (`subprojects/glibc-2.39-1`, `subprojects/glibc-2.39-2`
# etc.)

[wrap-file]
directory = glibc-2.38-1
source_url = https://ftp.gnu.org/gnu/glibc/glibc-2.38.tar.gz
source_fallback_url = https://packages.gramineproject.io/distfiles/glibc-2.38.tar.gz
source_filename = glibc-2.38.tar.gz
source_hash = 16e51e0455e288f03380b436e41d5927c60945abd86d0c9852b84be57dd6ed5e
patch_directory = glibc-2.38
directory = glibc-2.39-1
source_url = https://ftp.gnu.org/gnu/glibc/glibc-2.39.tar.gz
source_fallback_url = https://packages.gramineproject.io/distfiles/glibc-2.39.tar.gz
source_filename = glibc-2.39.tar.gz
source_hash = 97f84f3b7588cd54093a6f6389b0c1a81e70d99708d74963a2e3eab7c7dc942d
patch_directory = glibc-2.39

# this unpacks the sources to `glibc-2.38-1/glibc-2.38`
# this unpacks the sources to `glibc-2.39-1/glibc-2.39`
lead_directory_missing = true
13 changes: 0 additions & 13 deletions subprojects/packagefiles/glibc-2.38/fix-CVE-2023-4527.patch

This file was deleted.

84 changes: 0 additions & 84 deletions subprojects/packagefiles/glibc-2.38/fix-CVE-2023-4806.patch

This file was deleted.

36 changes: 0 additions & 36 deletions subprojects/packagefiles/glibc-2.38/fix-CVE-2023-4911.patch

This file was deleted.

15 changes: 0 additions & 15 deletions subprojects/packagefiles/glibc-2.38/fix-CVE-2023-5156.patch

This file was deleted.

0 comments on commit f35d8e0

Please sign in to comment.