gpkg/glibc: disable syscall __NR_futex_waitv (#158)

termux-pacman · Nov 13, 2023 · da56525 · da56525
1 parent 28f2f1e
commit da56525
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 40 deletions.
diff --git a/gpkg/glibc/aarch64-arch-syscall.h.patch b/gpkg/glibc/aarch64-arch-syscall.h.patch
@@ -1,5 +1,5 @@
 --- glibc-2.38/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h	2023-07-31 20:54:16.000000000 +0300
-+++ glibc-2.38/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h.patch	2023-11-05 14:07:33.000394043 +0300
++++ glibc-2.38/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h.patch	2023-11-10 23:47:19.646988223 +0300
 @@ -1,5 +1,4 @@
  /* AUTOGENERATED by update-syscall-lists.py.  */
 -#define __NR_accept 202
@@ -24,31 +24,39 @@
  #define __NR_fadvise64 223
  #define __NR_fallocate 47
  #define __NR_fanotify_init 262
-@@ -124,7 +120,6 @@
+@@ -62,7 +58,6 @@
+ #define __NR_fsync 82
+ #define __NR_ftruncate 46
+ #define __NR_futex 98
+-#define __NR_futex_waitv 449
+ #define __NR_get_mempolicy 236
+ #define __NR_get_robust_list 100
+ #define __NR_getcpu 168
+@@ -124,7 +119,6 @@
  #define __NR_lseek 62
  #define __NR_lsetxattr 6
  #define __NR_madvise 233
 -#define __NR_mbind 235
  #define __NR_membarrier 283
  #define __NR_memfd_create 279
  #define __NR_memfd_secret 447
-@@ -168,7 +163,6 @@
+@@ -168,7 +162,6 @@
  #define __NR_personality 92
  #define __NR_pidfd_getfd 438
  #define __NR_pidfd_open 434
 -#define __NR_pidfd_send_signal 424
  #define __NR_pipe2 59
  #define __NR_pivot_root 41
  #define __NR_pkey_alloc 289
-@@ -205,7 +199,6 @@
+@@ -205,7 +198,6 @@
  #define __NR_renameat2 276
  #define __NR_request_key 218
  #define __NR_restart_syscall 128
 -#define __NR_rseq 293
  #define __NR_rt_sigaction 134
  #define __NR_rt_sigpending 136
  #define __NR_rt_sigprocmask 135
-@@ -237,12 +230,8 @@
+@@ -237,12 +229,8 @@
  #define __NR_sendto 206
  #define __NR_set_mempolicy 237
  #define __NR_set_mempolicy_home_node 450
@@ -61,7 +69,7 @@
  #define __NR_setgroups 159
  #define __NR_sethostname 161
  #define __NR_setitimer 103
-@@ -250,14 +239,12 @@
+@@ -250,14 +238,12 @@
  #define __NR_setpgid 154
  #define __NR_setpriority 140
  #define __NR_setregid 143
@@ -76,7 +84,7 @@
  #define __NR_setxattr 5
  #define __NR_shmat 196
  #define __NR_shmctl 195
-@@ -270,7 +257,6 @@
+@@ -270,7 +256,6 @@
  #define __NR_socketpair 199
  #define __NR_splice 76
  #define __NR_statfs 43

diff --git a/gpkg/glibc/arm-arch-syscall.h.patch b/gpkg/glibc/arm-arch-syscall.h.patch
@@ -1,5 +1,5 @@
 --- glibc-2.38/sysdeps/unix/sysv/linux/arm/arch-syscall.h	2023-07-31 20:54:16.000000000 +0300
-+++ glibc-2.38/sysdeps/unix/sysv/linux/arm/arch-syscall.h.patch	2023-11-06 12:41:55.249731135 +0300
++++ glibc-2.38/sysdeps/unix/sysv/linux/arm/arch-syscall.h.patch	2023-11-10 23:47:29.706988219 +0300
 @@ -2,7 +2,6 @@
  #define __NR__llseek 140
  #define __NR__newselect 142
@@ -41,39 +41,47 @@
  #define __NR_fallocate 352
  #define __NR_fanotify_init 367
  #define __NR_fanotify_mark 368
-@@ -109,7 +101,6 @@
+@@ -90,7 +82,6 @@
+ #define __NR_ftruncate64 194
+ #define __NR_futex 240
+ #define __NR_futex_time64 422
+-#define __NR_futex_waitv 449
+ #define __NR_futimesat 326
+ #define __NR_get_mempolicy 320
+ #define __NR_get_robust_list 339
+@@ -109,7 +100,6 @@
  #define __NR_getitimer 105
  #define __NR_getpeername 287
  #define __NR_getpgid 132
 -#define __NR_getpgrp 65
  #define __NR_getpid 20
  #define __NR_getppid 64
  #define __NR_getpriority 96
-@@ -168,7 +159,6 @@
+@@ -168,7 +158,6 @@
  #define __NR_lstat 107
  #define __NR_lstat64 196
  #define __NR_madvise 220
 -#define __NR_mbind 319
  #define __NR_membarrier 389
  #define __NR_memfd_create 385
  #define __NR_migrate_pages 400
-@@ -220,7 +210,6 @@
+@@ -220,7 +209,6 @@
  #define __NR_personality 136
  #define __NR_pidfd_getfd 438
  #define __NR_pidfd_open 434
 -#define __NR_pidfd_send_signal 424
  #define __NR_pipe 42
  #define __NR_pipe2 359
  #define __NR_pivot_root 218
-@@ -253,7 +242,6 @@
+@@ -253,7 +241,6 @@
  #define __NR_readlinkat 332
  #define __NR_readv 145
  #define __NR_reboot 88
 -#define __NR_recv 291
  #define __NR_recvfrom 292
  #define __NR_recvmmsg 365
  #define __NR_recvmmsg_time64 417
-@@ -265,8 +253,6 @@
+@@ -265,8 +252,6 @@
  #define __NR_renameat2 382
  #define __NR_request_key 310
  #define __NR_restart_syscall 0
@@ -82,15 +90,15 @@
  #define __NR_rt_sigaction 174
  #define __NR_rt_sigpending 176
  #define __NR_rt_sigprocmask 175
-@@ -295,7 +281,6 @@
+@@ -295,7 +280,6 @@
  #define __NR_semop 298
  #define __NR_semtimedop 312
  #define __NR_semtimedop_time64 420
 -#define __NR_send 289
  #define __NR_sendfile 187
  #define __NR_sendfile64 239
  #define __NR_sendmmsg 374
-@@ -303,16 +288,9 @@
+@@ -303,16 +287,9 @@
  #define __NR_sendto 290
  #define __NR_set_mempolicy 321
  #define __NR_set_mempolicy_home_node 450
@@ -107,7 +115,7 @@
  #define __NR_setgroups 81
  #define __NR_setgroups32 206
  #define __NR_sethostname 74
-@@ -322,8 +300,6 @@
+@@ -322,8 +299,6 @@
  #define __NR_setpriority 97
  #define __NR_setregid 71
  #define __NR_setregid32 204
@@ -116,7 +124,7 @@
  #define __NR_setresuid 164
  #define __NR_setresuid32 208
  #define __NR_setreuid 70
-@@ -332,8 +308,6 @@
+@@ -332,8 +307,6 @@
  #define __NR_setsid 66
  #define __NR_setsockopt 294
  #define __NR_settimeofday 79
@@ -125,7 +133,7 @@
  #define __NR_setxattr 226
  #define __NR_shmat 305
  #define __NR_shmctl 308
-@@ -355,10 +329,8 @@
+@@ -355,10 +328,8 @@
  #define __NR_stat64 195
  #define __NR_statfs 99
  #define __NR_statfs64 266

diff --git a/gpkg/glibc/build.sh b/gpkg/glibc/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU C Library"
 TERMUX_PKG_LICENSE="GPL-3.0, LGPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
 TERMUX_PKG_VERSION=2.38
-TERMUX_PKG_REVISION=7
+TERMUX_PKG_REVISION=8
 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/libc/glibc-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
 TERMUX_PKG_DEPENDS="linux-api-headers-glibc"
@@ -63,10 +63,6 @@ termux_step_configure() {
 }
 
 termux_step_make() {
-	echo "build-programs=no" >> configparms
-	make -O
-
-	sed -i "/build-programs=/s#no#yes#" configparms
 	make -O
 	make info
 

diff --git a/gpkg/glibc/i386-arch-syscall.h.patch b/gpkg/glibc/i386-arch-syscall.h.patch
@@ -1,5 +1,5 @@
 --- glibc-2.38/sysdeps/unix/sysv/linux/i386/arch-syscall.h	2023-07-31 20:54:16.000000000 +0300
-+++ glibc-2.38/sysdeps/unix/sysv/linux/i386/arch-syscall.h.patch	2023-11-06 12:42:09.089731130 +0300
++++ glibc-2.38/sysdeps/unix/sysv/linux/i386/arch-syscall.h.patch	2023-11-10 23:47:46.716988212 +0300
 @@ -18,24 +18,18 @@
  #define __NR_capget 184
  #define __NR_capset 185
@@ -33,31 +33,39 @@
  #define __NR_fadvise64 250
  #define __NR_fadvise64_64 272
  #define __NR_fallocate 324
-@@ -115,7 +108,6 @@
+@@ -94,7 +87,6 @@
+ #define __NR_ftruncate64 194
+ #define __NR_futex 240
+ #define __NR_futex_time64 422
+-#define __NR_futex_waitv 449
+ #define __NR_futimesat 299
+ #define __NR_get_kernel_syms 130
+ #define __NR_get_mempolicy 275
+@@ -115,7 +107,6 @@
  #define __NR_getitimer 105
  #define __NR_getpeername 368
  #define __NR_getpgid 132
 -#define __NR_getpgrp 65
  #define __NR_getpid 20
  #define __NR_getpmsg 188
  #define __NR_getppid 64
-@@ -181,7 +173,6 @@
+@@ -181,7 +172,6 @@
  #define __NR_lstat 107
  #define __NR_lstat64 196
  #define __NR_madvise 219
 -#define __NR_mbind 274
  #define __NR_membarrier 375
  #define __NR_memfd_create 356
  #define __NR_memfd_secret 447
-@@ -239,7 +230,6 @@
+@@ -239,7 +229,6 @@
  #define __NR_personality 136
  #define __NR_pidfd_getfd 438
  #define __NR_pidfd_open 434
 -#define __NR_pidfd_send_signal 424
  #define __NR_pipe 42
  #define __NR_pipe2 331
  #define __NR_pivot_root 217
-@@ -288,8 +278,6 @@
+@@ -288,8 +277,6 @@
  #define __NR_renameat2 353
  #define __NR_request_key 287
  #define __NR_restart_syscall 0
@@ -66,7 +74,7 @@
  #define __NR_rt_sigaction 174
  #define __NR_rt_sigpending 176
  #define __NR_rt_sigprocmask 175
-@@ -324,16 +312,9 @@
+@@ -324,16 +311,9 @@
  #define __NR_sendto 369
  #define __NR_set_mempolicy 276
  #define __NR_set_mempolicy_home_node 450
@@ -83,7 +91,7 @@
  #define __NR_setgroups 81
  #define __NR_setgroups32 206
  #define __NR_sethostname 74
-@@ -343,8 +324,6 @@
+@@ -343,8 +323,6 @@
  #define __NR_setpriority 97
  #define __NR_setregid 71
  #define __NR_setregid32 204
@@ -92,7 +100,7 @@
  #define __NR_setresuid 164
  #define __NR_setresuid32 208
  #define __NR_setreuid 70
-@@ -353,8 +332,6 @@
+@@ -353,8 +331,6 @@
  #define __NR_setsid 66
  #define __NR_setsockopt 366
  #define __NR_settimeofday 79
@@ -101,7 +109,7 @@
  #define __NR_setxattr 226
  #define __NR_sgetmask 68
  #define __NR_shmat 397
-@@ -380,12 +357,10 @@
+@@ -380,12 +356,10 @@
  #define __NR_stat64 195
  #define __NR_statfs 99
  #define __NR_statfs64 268

diff --git a/gpkg/glibc/x86_64-arch-syscall.h.patch b/gpkg/glibc/x86_64-arch-syscall.h.patch
@@ -1,5 +1,5 @@
 --- glibc-2.38/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h	2023-07-31 20:54:16.000000000 +0300
-+++ glibc-2.38/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h.patch	2023-11-06 12:41:23.139731148 +0300
++++ glibc-2.38/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h.patch	2023-11-10 23:47:10.546988226 +0300
 @@ -1,6 +1,5 @@
  /* AUTOGENERATED by update-syscall-lists.py.  */
  #define __NR__sysctl 156
@@ -34,31 +34,39 @@
  #define __NR_fadvise64 221
  #define __NR_fallocate 285
  #define __NR_fanotify_init 300
-@@ -95,7 +89,6 @@
+@@ -78,7 +72,6 @@
+ #define __NR_fsync 74
+ #define __NR_ftruncate 77
+ #define __NR_futex 202
+-#define __NR_futex_waitv 449
+ #define __NR_futimesat 261
+ #define __NR_get_kernel_syms 177
+ #define __NR_get_mempolicy 239
+@@ -95,7 +88,6 @@
  #define __NR_getitimer 36
  #define __NR_getpeername 52
  #define __NR_getpgid 121
 -#define __NR_getpgrp 111
  #define __NR_getpid 39
  #define __NR_getpmsg 181
  #define __NR_getppid 110
-@@ -152,7 +145,6 @@
+@@ -152,7 +144,6 @@
  #define __NR_lsetxattr 189
  #define __NR_lstat 6
  #define __NR_madvise 28
 -#define __NR_mbind 237
  #define __NR_membarrier 324
  #define __NR_memfd_create 319
  #define __NR_memfd_secret 447
-@@ -201,7 +193,6 @@
+@@ -201,7 +192,6 @@
  #define __NR_personality 135
  #define __NR_pidfd_getfd 438
  #define __NR_pidfd_open 434
 -#define __NR_pidfd_send_signal 424
  #define __NR_pipe 22
  #define __NR_pipe2 293
  #define __NR_pivot_root 155
-@@ -244,8 +235,6 @@
+@@ -244,8 +234,6 @@
  #define __NR_renameat2 316
  #define __NR_request_key 249
  #define __NR_restart_syscall 219
@@ -67,7 +75,7 @@
  #define __NR_rt_sigaction 13
  #define __NR_rt_sigpending 127
  #define __NR_rt_sigprocmask 14
-@@ -279,13 +268,9 @@
+@@ -279,13 +267,9 @@
  #define __NR_sendto 44
  #define __NR_set_mempolicy 238
  #define __NR_set_mempolicy_home_node 450
@@ -81,7 +89,7 @@
  #define __NR_setgroups 116
  #define __NR_sethostname 170
  #define __NR_setitimer 38
-@@ -293,14 +278,12 @@
+@@ -293,14 +277,12 @@
  #define __NR_setpgid 109
  #define __NR_setpriority 141
  #define __NR_setregid 114
@@ -96,7 +104,7 @@
  #define __NR_setxattr 188
  #define __NR_shmat 30
  #define __NR_shmctl 31
-@@ -315,10 +298,8 @@
+@@ -315,10 +297,8 @@
  #define __NR_splice 275
  #define __NR_stat 4
  #define __NR_statfs 137