gpkg-dev/glibc: real fix

gpkg-dev/glibc/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=glibc
 pkgver=2.37
-pkgrel=9
+pkgrel=10
 _commit=be176490b818b65b5162c332eb6b581690b16e5c
 pkgdesc="GNU C Library"
 arch=(any)
@@ -70,10 +70,10 @@ sha256sums=('2257eff111a1815d74f46856daaf40b019c1e553156c69d48ba0cbfc1bb91a43'
             '18f01ed2c6ed8acb122adc443fd428c8a37bc6a7d518f4e433e2ee462eebd5eb'
             '769b294e226877f12d47ac4ff86ab9246da6e547781071c1ee38e60772484c74'
             'f5b5b6ae3596f6fd617d015ff9c417a35da37c86ae3a49b5b5ce88275ed09f12'
-            '46e846c4237ab332ffb64abf46d3a95fd773173346e20a7e2b16f385beaab8d4'
+            '743c2fe91676cd8ce6eb520286abd28d9ad2764180894aad49d5be17dab3ab0c'
             'b8b573fcb85d59fc11ddef9aebb691b8047d700ea1894784883a1359c6ef94a8'
             '59e711916c946fc961bb8c3a0da5d367a90ffedd31bbf7cf250e9bc1e1e04744'
-            '660e83ab93f745b8f10ca6bce4704203233d65d7ac10ce481186c59b31252cb0'
+            '0298e3d4aca6e7db5d674f318a31cb68257bcba0cac66828b00202e012cbf567'
             'd7569b8f5aa1816461cf42e8f290ea861157ebb8da936c6fa472593e681737f2'
             '8a246f04d34253504bae46cf29e3e217c031f987b191de0fb2dafa38437e3809'
             '210e48732cdad2a2b01cff15771fcf12730bdad3f2a93ef772c03c8b57c74cc7'
@@ -83,16 +83,17 @@ sha256sums=('2257eff111a1815d74f46856daaf40b019c1e553156c69d48ba0cbfc1bb91a43'
             '6a63b915b8f50e05a9a2287241e907f0c2a2b39f8d696c18a3e23267805d6a92'
             'f29c92c48adae65e86256b4ae5180c77aa6957d90bbc7abb54042c2820b2a26f'
             'e378b410d1f1750b7751910dffcd525f58be71ab1b4f54a09e1eedd7fa3829f4'
-            '01f0c982181626e32d485015215de4f80b17952e7ad46618bd00497918f079e2')
+            '6236aa5e64875e0baed502dfee5f9b9f22b6bbefb7f394bf13a30a5230404585')
 groups=('gpkg-dev')
 
 prepare() {
   for i in *.patch; do
     patch -Np1 -i ${srcdir}/$i
   done
 
-  install -Dm644 "${srcdir}/shmem-android.h" "glibc-$pkgver/sysdeps/unix/sysv/linux/shmem-android.h"
-  install -Dm644 "${srcdir}/mprotect.c" "glibc-$pkgver/sysdeps/unix/sysv/linux/mprotect.c"
+  for i in shmem-android.h mprotect.c; do
+    install -Dm644 "${srcdir}/${i}" "glibc-$pkgver/sysdeps/unix/sysv/linux/${i}"
+  done
 
   rm glibc-$pkgver/sysdeps/unix/sysv/linux/*/clone3.S
 
@@ -112,11 +113,12 @@ build() {
       --libdir=$GLIBC_PREFIX/lib \
       --libexecdir=$GLIBC_PREFIX/lib \
       --host=$GPKG_DEV_TARGET \
+      --build=$GPKG_DEV_TARGET \
       --target=$GPKG_DEV_TARGET \
       --with-bugurl=https://github.com/termux-pacman/glibc-packages/issues \
       --enable-bind-now \
       --enable-cet \
-      --enable-multi-arch \
+      --disable-multi-arch \
       --enable-stack-protector=strong \
       --enable-systemtap \
       --disable-profile \

gpkg-dev/glibc/is_mapped.h

@@ -0,0 +1,27 @@
+#ifndef __IS_MAPPED
+#define __IS_MAPPED
+
+#include <stdio.h>
+
+int is_mapped(void *addr) {
+	int res = 1;
+
+	FILE *maps = __setmntent("/proc/self/maps", "r");
+	if (maps != NULL) {
+		char *line_of_maps = NULL;
+		size_t len_of_maps = 0;
+		while (getline(&line_of_maps, &len_of_maps, maps) != -1) {
+			unsigned long int maddr;
+			sscanf(line_of_maps, "%lx", &maddr);
+			if ((unsigned long int)addr == maddr) {
+				res = 0;
+				break;
+			}
+		}
+	}
+	fclose(maps);
+
+	return res;
+}
+
+#endif /* __IS_MAPPED */

gpkg-dev/glibc/mprotect.c

@@ -2,21 +2,40 @@
    If you run mprotect with the PROT_EXEC flag,
    then the error "Permission denied" is displayed.
 
-   Cause: https://stackoverflow.com/questions/41174549/mprotect-permission-denied-error-on-rhel-6-8
+   Cause: https://github.com/termux/proot/commit/89bfa991cb3cb7fc78099d06d0f7e7c840cb62d1
    Issue: https://github.com/termux-pacman/glibc-packages/issues/49
 */
 
+#include <errno.h>
 #include <sys/mman.h>
 #include <sysdep.h>
+#include <sys/syscall.h>
+#include <string.h>
+#include <not-cancel.h>
 
-int
-__mprotect (void *addr, size_t len, int prot)
-{
-  if (prot & PROT_EXEC)
-    prot &= ~PROT_EXEC;
+#if IS_IN (rtld)
+# define ALLOCATION
+#endif
 
-  return INLINE_SYSCALL_CALL (mprotect, addr, len, prot);
+int __mprotect(void *addr, size_t len, int prot) {
+	if (prot & PROT_EXEC) {
+#ifdef ALLOCATION
+		void *caddr = malloc(sizeof(addr));
+		if (caddr == NULL)
+			return errno;
+		memcpy(caddr, addr, sizeof(addr));
+#endif
+		addr = mmap(addr, len, prot, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+		if (__glibc_unlikely(addr == MAP_FAILED))
+			return errno;
+#ifdef ALLOCATION
+		memcpy(addr, caddr, sizeof(caddr));
+		free(caddr);
+#endif
+		return 0;
+	} else
+		return INLINE_SYSCALL_CALL(mprotect, addr, len, prot);
 }
 
-libc_hidden_def (__mprotect)
-weak_alias (__mprotect, mprotect)
+libc_hidden_def(__mprotect)
+weak_alias(__mprotect, mprotect)

gpkg-dev/glibc/setdirs.patch

@@ -106,9 +106,18 @@ index 9714f75d..452e0dfc 100644
    if (__libc_enable_secure)
      {
 diff --git a/elf/rtld.c b/elf/rtld.c
-index b8467f37..3a82030a 100644
+index b8467f37..1c8d38f6 100644
 --- src/glibc-2.37/elf/rtld.c
 +++ src/glibc-2.37/elf/rtld.c
+@@ -1872,7 +1872,7 @@ dl_main (const ElfW(Phdr) *phdr,
+      open().  So we do this first.  If it succeeds we do almost twice
+      the work but this does not matter, since it is not for production
+      use.  */
+-  static const char preload_file[] = "/etc/ld.so.preload";
++  static const char preload_file[] = "/data/data/com.termux/files/usr/glibc/etc/ld.so.preload";
+   if (__glibc_unlikely (__access (preload_file, R_OK) == 0))
+     {
+       /* Read the contents of the file.  */
 @@ -2551,7 +2551,7 @@ process_envvars (struct dl_main_state *state)
 
    /* This is the default place for profiling data file.  */
@@ -194,7 +203,7 @@ index 19740f49..3fd69a5e 100644
    int r;
 diff --git a/io/bug-ftw4.c b/io/bug-ftw4.c
 index bfbf4544..de1478fb 100644
---- /io/bug-ftw4.c
+--- src/glibc-2.37/io/bug-ftw4.c
 +++ src/glibc-2.37/io/bug-ftw4.c
 @@ -35,7 +35,7 @@ cb (const char *name, const struct stat64 *st, int type)
  int

gpkg-dev/glibc/shmem-android.h

@@ -21,6 +21,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <stdio.h>
 
 #define __u32 uint32_t