glibc: fixes for CVE-2023-4527, CVE-2023-4806, CVE-2023-5156 and CVE-…

…2023-4911
crux-arm · Nov 5, 2023 · b769bb5 · b769bb5
1 parent 1d23faf
commit b769bb5
Show file tree

Hide file tree

Showing 5 changed files with 11,889 additions and 992 deletions.
diff --git a/glibc/.footprint b/glibc/.footprint
@@ -362,6 +362,7 @@ drwxr-xr-x	root/root	usr/include/bits/types/
 -rw-r--r--	root/root	usr/include/bits/waitstatus.h
 -rw-r--r--	root/root	usr/include/bits/wchar-ldbl.h
 -rw-r--r--	root/root	usr/include/bits/wchar.h
+-rw-r--r--	root/root	usr/include/bits/wchar2-decl.h
 -rw-r--r--	root/root	usr/include/bits/wchar2.h
 -rw-r--r--	root/root	usr/include/bits/wctype-wchar.h
 -rw-r--r--	root/root	usr/include/bits/wordsize.h

diff --git a/glibc/.signature b/glibc/.signature
@@ -1,11 +1,11 @@
 untrusted comment: verify with /etc/ports/core-arm.pub
-RWTMGLGEHsm4ddztvUIJ8jcsONonFjKi6F9/iZisNU/VXVYquk3h/kRSVExgodIae7VhDCGXsPo9MCkDfqQNfT/LcKtllHtvJAo=
-SHA256 (Pkgfile) = 8dd2a4a872db7e2c3418e6001c1ab3742d79d1ccf83a77cb35761ecf8625e7a2
-SHA256 (.footprint) = 5345a2c888612af6b032c332637a9e50404fc2da84aa74bdedf0e7332f4c77db
+RWTMGLGEHsm4dQEj80NArb9jGJURlKVmO/IW74FCxobOQKvMMIwT4hPd/0CdlG8KZsmuIiIcR6YnIa6qLgbF52Sc4GiGIhJHYww=
+SHA256 (Pkgfile) = 0d4f746a35a78b9807669cb5f254d0f9306dc0fa0a8f5357c3c1c3e84d307823
+SHA256 (.footprint) = 31a3f653b93c35a9ff3b26d1a3e5cf8dd82fcc300bc97c12dc8f3c9731a82a64
 SHA256 (glibc-2.36.tar.xz) = 1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75
 SHA256 (linux-5.15.55.tar.xz) = 1ef6bd508b6c3af3bef2d5b337e4477254dba284c79e329aa38f9763ae3bfdcc
 SHA256 (linux-headers-cp-insteadof-rsync.patch) = 17fe54769120a7fde06aa7e3c27c7557189580581025faf9bd25582fbde01c3a
-SHA256 (glibc-2.36-1.patch) = 6245087ab20402836cbd32b52ba944d31aeafc961ba597bcec0fa3727db79eee
+SHA256 (glibc-2.36-7.patch) = c167ddd1eb9e63fade7e60a2dc612a18e0900519d8c0ec1e0cf06fa92fca638a
 SHA256 (hosts) = 5c02b256c105f1d4a12fb738d71c1bab9eb126533074d7a0c8a14b92670c9431
 SHA256 (resolv.conf) = 72ccb58768a72a771ec37142bc361a18478a07ec9de6e925a20760794389bf51
 SHA256 (nsswitch.conf) = 859b8984e5e90aff3cce8f9779996ae4033b280d2122840e9411e2f44a1c2e61

diff --git a/glibc/Pkgfile b/glibc/Pkgfile
@@ -6,13 +6,13 @@
 
 name=glibc
 version=2.36
-release=1
+release=7
 _kernel_version=5.15.55
 
 source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
   http://www.kernel.org/pub/linux/kernel/v5.x/linux-$_kernel_version.tar.xz \
   linux-headers-cp-insteadof-rsync.patch \
-  $name-$version-1.patch \
+  $name-$version-7.patch \
   hosts resolv.conf nsswitch.conf host.conf ld.so.conf \
   locale-gen locale.gen.in)
 
@@ -25,7 +25,7 @@ build() {
   make -C $SRC/linux-$_kernel_version INSTALL_HDR_PATH=$PKG/usr headers_install
   chown root:root $PKG/usr
 
-  patch -p1 -d $SRC/$name-${version:0:4} -i $SRC/$name-$version-1.patch
+  patch -p1 -d $SRC/$name-${version:0:4} -i $SRC/$name-$version-7.patch
 
   export ASFLAGS="$CFLAGS"