From 13c63c0275fcf3a86f7c7a0ecb149c83a0c5d531 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Tue, 7 Jan 2025 17:38:44 +0100
Subject: [PATCH 1/2] Attempt to fix git

---
 tools/git/Dockerfile.template | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/tools/git/Dockerfile.template b/tools/git/Dockerfile.template
index 8e10f60380..5f295135b5 100644
--- a/tools/git/Dockerfile.template
+++ b/tools/git/Dockerfile.template
@@ -17,17 +17,44 @@ apk add --update-cache \
     ncurses-dev \
     tcl \
     asciidoc \
-    xmlto
+    xmlto \
+    pcre2-dev
 EOF
 WORKDIR /tmp/git
 ARG name
 ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/git/git .
+EOF
+COPY <<EOF config.mak
+NO_GETTEXT=YesPlease
+NO_SVN_TESTS=YesPlease
+NO_REGEX=YesPlease
+NO_SYS_POLL_H=1
+ICONV_OMITS_BOM=Yes
+INSTALL_SYMLINKS=1
+USE_LIBPCRE2=YesPlease
+NO_PYTHON=YesPlease
+NO_TCLTK=YesPlease
+EOF
+RUN <<EOF
 export CFLAGS="${CFLAGS} -static"
 make configure
 ./configure --prefix="${prefix}"
 make -j$(nproc) all
 make -j$(nproc) doc
 make install install-doc install-html
+EOF
+RUN <<EOF
+make -C contrib/subtree
+make -C contrib/subtree install
+
+make -C contrib/diff-highlight
+install -Dm755 contrib/diff-highlight/diff-highlight -t "${prefix}/bin/"
+
+#make -C contrib/credential/libsecret
+#install -Dm755 contrib/credential/libsecret/git-credential-libsecret "${prefix}/libexec/git-core/"
+
+install -Dm644 contrib/completion/git-completion.bash "${prefix}/usr/share/bash-completion/completions/git"
+install -Dm644 contrib/completion/git-prompt.sh "${prefix}/share/git-core/git-prompt.sh"
 EOF
\ No newline at end of file

From 3b7661001849817da249edb94ce772403cf98bc7 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Wed, 8 Jan 2025 09:35:27 +0100
Subject: [PATCH 2/2] Improved hardcoded paths

---
 tools/git/Dockerfile.template | 18 +++++++++++-------
 tools/git/manifest.yaml       |  8 ++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/tools/git/Dockerfile.template b/tools/git/Dockerfile.template
index 5f295135b5..2d3d0920dc 100644
--- a/tools/git/Dockerfile.template
+++ b/tools/git/Dockerfile.template
@@ -40,21 +40,25 @@ EOF
 RUN <<EOF
 export CFLAGS="${CFLAGS} -static"
 make configure
-./configure --prefix="${prefix}"
+./configure \
+    --prefix="/usr/local" \
+    --sysconfdir="/etc"
 make -j$(nproc) all
 make -j$(nproc) doc
-make install install-doc install-html
+make install install-doc install-html DESTDIR="${prefix}"
 EOF
 RUN <<EOF
 make -C contrib/subtree
-make -C contrib/subtree install
+make -C contrib/subtree install DESTDIR="${prefix}"
 
 make -C contrib/diff-highlight
 install -Dm755 contrib/diff-highlight/diff-highlight -t "${prefix}/bin/"
 
-#make -C contrib/credential/libsecret
-#install -Dm755 contrib/credential/libsecret/git-credential-libsecret "${prefix}/libexec/git-core/"
-
-install -Dm644 contrib/completion/git-completion.bash "${prefix}/usr/share/bash-completion/completions/git"
+install -Dm644 contrib/completion/git-completion.bash "${prefix}/share/bash-completion/completions/git"
 install -Dm644 contrib/completion/git-prompt.sh "${prefix}/share/git-core/git-prompt.sh"
+EOF
+WORKDIR /uniget_bootstrap
+RUN <<EOF
+cp -r usr/local/* .
+rm -rf usr/local
 EOF
\ No newline at end of file
diff --git a/tools/git/manifest.yaml b/tools/git/manifest.yaml
index 25a362e526..2f3272ad1c 100644
--- a/tools/git/manifest.yaml
+++ b/tools/git/manifest.yaml
@@ -16,6 +16,14 @@ tags:
 homepage: https://git-scm.com/
 repository: https://github.com/git/git
 description: Distributed version control system
+messages:
+  internals: |
+    git has multiple paths compiled in:
+    - GIT_EXEC_PATH defaults to /usr/local/libexec/git-core
+    - GIT_TEMPLATE_DIR defaults to /usr/local/share/git-core/templates
+    - Global configuration files are expected to live in /etc/git{attributes,config}
+    
+    You con override them by setting the approprivate environment variables. Please refer to the official documentation: https://git-scm.com/docs
 renovate:
   datasource: github-tags
   package: git/git