gpkg-dev/glibc: fix syscall setfsuid and setfsgid (#91)

termux-pacman · Sep 8, 2023 · 5774bc8 · 5774bc8
1 parent bd339e8
commit 5774bc8
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 22 deletions.
diff --git a/gpkg-dev/glibc/Makefile.patch b/gpkg-dev/glibc/Makefile.patch
@@ -0,0 +1,11 @@
+--- src/glibc-2.38/sysdeps/unix/sysv/linux/Makefile	2023-07-31 20:54:16.000000000 +0300
++++ src/glibc-2.38/sysdeps/unix/sysv/linux/Makefile.patch	2023-09-09 00:40:40.109180943 +0300
+@@ -94,8 +94,6 @@
+   process_vm_writev \
+   pselect32 \
+   readahead \
+-  setfsgid \
+-  setfsuid \
+   signalfd \
+   splice \
+   sysctl \
diff --git a/gpkg-dev/glibc/PKGBUILD b/gpkg-dev/glibc/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=glibc
 pkgver=2.38
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU C Library"
 arch=(any)
 url='https://www.gnu.org/software/libc/'
@@ -46,7 +46,8 @@ source=(https://ftp.gnu.org/gnu/libc/glibc-$pkgver.tar.xz
         'x86_64-arch-syscall.h.patch'
         'i386-arch-syscall.h.patch'
         'rmdir.c.patch'
-        'mprotect.c')
+        'mprotect.c'
+        'Makefile.patch')
 sha256sums=('fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2'
             '85153ad597c6101a73a9d1f3f6c35b6b141ddebb99e445ab601ebe95703b35ec'
             '4869ef24cdd59a931c9b5b173d2e3e9eaa67964bb8dcc34e4e6948f3e7856572'
@@ -79,12 +80,13 @@ sha256sums=('fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2'
             '8300d82107ee62b15a06ac3b336707e638f5575041ab81dd43e47a99a976c052'
             'cf962f0fde71d61e55f488356f8ec80791ef6438a00da69dda2a79bbb4fea7ef'
             '42742b49cb15df968965de852ac21a2e9f49c68f0492816a5848f9a15e99fd59'
-            '994d2664bfca5c3d9b82f89d96959d65dfaddd5197865861fcc867f761e43a91'
-            'dc96ecd72915e474d2fe1ce882e59d41c9f1a20db92f28c1fe85287e0db8c4a2'
-            'f0f47b222a6b67571d0b7e8aa57bc1e2546a0478fe75fb6718c1cc0bcf2e284d'
-            '4e1f759fee8fc904d1170cd5b6c444403d8bd0753f2168c6d3251109ac5385ad'
+            'c3bac40fb6156fea3d95b5fdaf7338163cd91789b4a0bf5c113c4eee7c39f971'
+            '29707ad92df0273c5e2dd70b12440300e6aff4c37e8530b36f45851937e8b9a5'
+            '708665ece353864bb6c32c0e8388c7add57442ee4eecfc22e340e0c9a8b71b5f'
+            '92dff2fbcd675a7d90bb5d7ca4761a044d9b3136f683e784eab8ec342809cb58'
             '6c2d79171ad884515d2e1ccdb880eb1c555a44040d288f689381e243a901cb27'
-            '8bd6e86fe6651acd0aaa543a5ad36ebd0588827824d330ca3bbba0769f4c8960')
+            '8bd6e86fe6651acd0aaa543a5ad36ebd0588827824d330ca3bbba0769f4c8960'
+            '735bc5deb54be47eff146bb60d4104bff44c56b150d0009fc655ca18201e5224')
 groups=('gpkg-dev')
 
 prepare() {
@@ -93,7 +95,7 @@ prepare() {
   done
 
   for i in shmem-android.h mprotect.c; do
-    install -Dm644 "${srcdir}/${i}" "glibc-$pkgver/sysdeps/unix/sysv/linux/${i}"
+    install -Dm644 "${srcdir}/${i}" "glibc-${pkgver}/sysdeps/unix/sysv/linux/${i}"
   done
 
   rm glibc-$pkgver/sysdeps/unix/sysv/linux/*/clone3.S

diff --git a/gpkg-dev/glibc/aarch64-arch-syscall.h.patch b/gpkg-dev/glibc/aarch64-arch-syscall.h.patch
@@ -1,5 +1,5 @@
---- src/glibc-2.38/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h	2023-02-01 06:27:45.000000000 +0300
-+++ src/glibc-2.38/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h.patch	2023-07-03 20:19:34.607208458 +0300
+--- src/glibc-2.38/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h	2023-07-31 20:54:16.000000000 +0300
++++ src/glibc-2.38/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h.patch	2023-09-09 00:41:22.799180926 +0300
 @@ -1,5 +1,4 @@
  /* AUTOGENERATED by update-syscall-lists.py.  */
 -#define __NR_accept 202
@@ -30,15 +30,19 @@
  #define __NR_rt_sigaction 134
  #define __NR_rt_sigpending 136
  #define __NR_rt_sigprocmask 135
-@@ -237,7 +233,6 @@
+@@ -237,11 +233,8 @@
  #define __NR_sendto 206
  #define __NR_set_mempolicy 237
  #define __NR_set_mempolicy_home_node 450
 -#define __NR_set_robust_list 99
  #define __NR_set_tid_address 96
  #define __NR_setdomainname 162
- #define __NR_setfsgid 152
-@@ -270,7 +265,6 @@
+-#define __NR_setfsgid 152
+-#define __NR_setfsuid 151
+ #define __NR_setgid 144
+ #define __NR_setgroups 159
+ #define __NR_sethostname 161
+@@ -270,7 +263,6 @@
  #define __NR_socketpair 199
  #define __NR_splice 76
  #define __NR_statfs 43

diff --git a/gpkg-dev/glibc/arm-arch-syscall.h.patch b/gpkg-dev/glibc/arm-arch-syscall.h.patch
@@ -1,5 +1,5 @@
 --- src/glibc-2.38/sysdeps/unix/sysv/linux/arm/arch-syscall.h	2023-07-31 20:54:16.000000000 +0300
-+++ src/glibc-2.38/sysdeps/unix/sysv/linux/arm/arch-syscall.h.patch	2023-08-03 18:02:02.376156803 +0300
++++ src/glibc-2.38/sysdeps/unix/sysv/linux/arm/arch-syscall.h.patch	2023-09-09 00:41:03.659180934 +0300
 @@ -2,7 +2,6 @@
  #define __NR__llseek 140
  #define __NR__newselect 142
@@ -71,15 +71,22 @@
  #define __NR_sendfile 187
  #define __NR_sendfile64 239
  #define __NR_sendmmsg 374
-@@ -303,7 +293,6 @@
+@@ -303,14 +293,9 @@
  #define __NR_sendto 290
  #define __NR_set_mempolicy 321
  #define __NR_set_mempolicy_home_node 450
 -#define __NR_set_robust_list 338
  #define __NR_set_tid_address 256
  #define __NR_set_tls 983045
  #define __NR_setdomainname 121
-@@ -355,7 +344,6 @@
+-#define __NR_setfsgid 139
+-#define __NR_setfsgid32 216
+-#define __NR_setfsuid 138
+-#define __NR_setfsuid32 215
+ #define __NR_setgid 46
+ #define __NR_setgid32 214
+ #define __NR_setgroups 81
+@@ -355,7 +340,6 @@
  #define __NR_stat64 195
  #define __NR_statfs 99
  #define __NR_statfs64 266

diff --git a/gpkg-dev/glibc/i386-arch-syscall.h.patch b/gpkg-dev/glibc/i386-arch-syscall.h.patch
@@ -1,5 +1,5 @@
 --- src/glibc-2.38/sysdeps/unix/sysv/linux/i386/arch-syscall.h	2023-07-31 20:54:16.000000000 +0300
-+++ src/glibc-2.38/sysdeps/unix/sysv/linux/i386/arch-syscall.h.patch	2023-08-03 18:01:46.346156809 +0300
++++ src/glibc-2.38/sysdeps/unix/sysv/linux/i386/arch-syscall.h.patch	2023-09-09 00:41:39.579180920 +0300
 @@ -18,7 +18,6 @@
  #define __NR_capget 184
  #define __NR_capset 185
@@ -47,15 +47,22 @@
  #define __NR_rt_sigaction 174
  #define __NR_rt_sigpending 176
  #define __NR_rt_sigprocmask 175
-@@ -324,7 +317,6 @@
+@@ -324,14 +317,9 @@
  #define __NR_sendto 369
  #define __NR_set_mempolicy 276
  #define __NR_set_mempolicy_home_node 450
 -#define __NR_set_robust_list 311
  #define __NR_set_thread_area 243
  #define __NR_set_tid_address 258
  #define __NR_setdomainname 121
-@@ -380,7 +372,6 @@
+-#define __NR_setfsgid 139
+-#define __NR_setfsgid32 216
+-#define __NR_setfsuid 138
+-#define __NR_setfsuid32 215
+ #define __NR_setgid 46
+ #define __NR_setgid32 214
+ #define __NR_setgroups 81
+@@ -380,7 +368,6 @@
  #define __NR_stat64 195
  #define __NR_statfs 99
  #define __NR_statfs64 268

diff --git a/gpkg-dev/glibc/x86_64-arch-syscall.h.patch b/gpkg-dev/glibc/x86_64-arch-syscall.h.patch
@@ -1,5 +1,5 @@
 --- src/glibc-2.38/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h	2023-07-31 20:54:16.000000000 +0300
-+++ src/glibc-2.38/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h.patch	2023-08-03 18:01:26.526156817 +0300
++++ src/glibc-2.38/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h.patch	2023-09-09 00:42:10.549180908 +0300
 @@ -1,6 +1,5 @@
  /* AUTOGENERATED by update-syscall-lists.py.  */
  #define __NR__sysctl 156
@@ -48,15 +48,20 @@
  #define __NR_rt_sigaction 13
  #define __NR_rt_sigpending 127
  #define __NR_rt_sigprocmask 14
-@@ -279,7 +272,6 @@
+@@ -279,12 +272,9 @@
  #define __NR_sendto 44
  #define __NR_set_mempolicy 238
  #define __NR_set_mempolicy_home_node 450
 -#define __NR_set_robust_list 273
  #define __NR_set_thread_area 205
  #define __NR_set_tid_address 218
  #define __NR_setdomainname 171
-@@ -315,7 +307,6 @@
+-#define __NR_setfsgid 123
+-#define __NR_setfsuid 122
+ #define __NR_setgid 106
+ #define __NR_setgroups 116
+ #define __NR_sethostname 170
+@@ -315,7 +305,6 @@
  #define __NR_splice 275
  #define __NR_stat 4
  #define __NR_statfs 137