Spaces:

sterepando
/

MandreGitCompiller

Paused

App Files Files Community

sterepando commited on 21 days ago

Commit

a4ae104

verified ·

1 Parent(s): 807cb4b

Update Dockerfile

Browse files

Files changed (1) hide show

Dockerfile +10 -17

Dockerfile CHANGED Viewed

@@ -77,28 +77,21 @@ RUN cd /build && \
     --disable-tftp --without-libpsl --without-libidn2 --without-brotli --without-zstd --without-nghttp2 && \
     make -j$(nproc) && make install
-# 4. Компиляция GIT (С ПАТЧЕМ)
 RUN cd /build && \
     wget -q https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.43.0.tar.gz && \
     tar xzf git-2.43.0.tar.gz && \
     cd git-2.43.0 && \
-    # --- MANDRE PATCH: Linker Bypass ---
-    # Мы внедряем код прямо в prepare_cmd функцию в run-command.c
-    # Ищем строку "if (cmd->no_stdin)" (она есть в начале prepare_cmd) и вставляем перед ней патч
     sed -i '/if (cmd->no_stdin)/i \
     /* MANDRE PATCH START */ \
-    if (cmd->file && strncmp(cmd->file, "/data/", 6) == 0) { \
-        const char **new_argv = malloc(sizeof(char *) * (256)); \
-        new_argv[0] = "/system/bin/linker64"; \
-        new_argv[1] = cmd->file; \
-        int i = 0; \
-        while (cmd->argv[i] && i < 250) { \
-            new_argv[i + 2] = cmd->argv[i]; \
-            i++; \
-        } \
-        new_argv[i + 2] = NULL; \
-        cmd->argv = new_argv; \
-        cmd->file = new_argv[0]; \
     } \
     /* MANDRE PATCH END */' run-command.c && \
     # --- КОМПИЛЯЦИЯ ---
@@ -126,7 +119,7 @@ RUN cd /build && \
 # 5. Финал
 WORKDIR /output
-RUN echo '<html><body><h1>Mandre GIT Bundle (Fix 8: Linker Patch)</h1><ul><li><a href="android-git-bundle.zip" download>Download ZIP</a></li></ul></body></html>' > index.html
 RUN chmod -R 777 /output
 EXPOSE 7860
 CMD ["python3", "-m", "http.server", "7860"]

     --disable-tftp --without-libpsl --without-libidn2 --without-brotli --without-zstd --without-nghttp2 && \
     make -j$(nproc) && make install
+# 4. Компиляция GIT (С ПРАВИЛЬНЫМ ПАТЧЕМ)
 RUN cd /build && \
     wget -q https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.43.0.tar.gz && \
     tar xzf git-2.43.0.tar.gz && \
     cd git-2.43.0 && \
+    # --- MANDRE PATCH: Linker Bypass (Corrected for Git 2.43) ---
+    # Мы используем API strvec, который уже есть в git
     sed -i '/if (cmd->no_stdin)/i \
     /* MANDRE PATCH START */ \
+    if (cmd->args.v[0] && strncmp(cmd->args.v[0], "/data/", 6) == 0) { \
+        struct strvec new_args = STRVEC_INIT; \
+        strvec_push(&new_args, "/system/bin/linker64"); \
+        strvec_pushv(&new_args, cmd->args.v); \
+        strvec_clear(&cmd->args); \
+        cmd->args = new_args; \
     } \
     /* MANDRE PATCH END */' run-command.c && \
     # --- КОМПИЛЯЦИЯ ---
 # 5. Финал
 WORKDIR /output
+RUN echo '<html><body><h1>Mandre GIT Bundle (Fix 9: Corrected Patch)</h1><ul><li><a href="android-git-bundle.zip" download>Download ZIP</a></li></ul></body></html>' > index.html
 RUN chmod -R 777 /output
 EXPOSE 7860
 CMD ["python3", "-m", "http.server", "7860"]