From 3d3b2f0285c461469cd5603f721cb7c340915f43 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 23 Jul 2019 17:36:55 -0600
Subject: [PATCH] Fix git clone
---
recipes/git/git.patch | 20 ++++++++++----------
recipes/git/recipe.sh | 3 +++
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/recipes/git/git.patch b/recipes/git/git.patch
index 0d7c59296..fbdbcefde 100644
--- a/recipes/git/git.patch
+++ b/recipes/git/git.patch
@@ -1,6 +1,6 @@
diff -ruwN source/compat/terminal.c source-new/compat/terminal.c
--- source/compat/terminal.c 2017-06-04 19:08:11.000000000 -0600
-+++ source-new/compat/terminal.c 2019-07-20 19:05:48.503775048 -0600
++++ source-new/compat/terminal.c 2019-07-21 19:45:59.473213941 -0600
@@ -137,6 +137,18 @@
return buf.buf;
}
@@ -22,7 +22,7 @@ diff -ruwN source/compat/terminal.c source-new/compat/terminal.c
char *git_terminal_prompt(const char *prompt, int echo)
diff -ruwN source/configure source-new/configure
--- source/configure 2017-06-04 19:08:11.000000000 -0600
-+++ source-new/configure 2019-07-20 19:05:48.503775048 -0600
++++ source-new/configure 2019-07-21 19:45:59.473213941 -0600
@@ -6156,7 +6156,7 @@
ac_res=$ac_cv_search_getaddrinfo
if test "$ac_res" != no; then :
@@ -34,7 +34,7 @@ diff -ruwN source/configure source-new/configure
fi
diff -ruwN source/daemon.c source-new/daemon.c
--- source/daemon.c 2017-06-04 19:08:11.000000000 -0600
-+++ source-new/daemon.c 2019-07-20 19:05:48.503775048 -0600
++++ source-new/daemon.c 2019-07-21 19:45:59.477213914 -0600
@@ -71,13 +71,21 @@
return hi->ip_address.buf;
}
@@ -98,21 +98,21 @@ diff -ruwN source/daemon.c source-new/daemon.c
diff -ruwN source/git-compat-util.h source-new/git-compat-util.h
--- source/git-compat-util.h 2017-06-04 19:08:11.000000000 -0600
-+++ source-new/git-compat-util.h 2019-07-20 21:11:24.199972278 -0600
++++ source-new/git-compat-util.h 2019-07-23 17:32:11.157702041 -0600
@@ -1,6 +1,18 @@
#ifndef GIT_COMPAT_UTIL_H
#define GIT_COMPAT_UTIL_H
+#ifndef SIG_DFL
-+#define SIG_DFL 0
++#define SIG_DFL ((void (*)(int))0)
+#endif
+
+#ifndef SIG_IGN
-+#define SIG_IGN 1
++#define SIG_IGN ((void (*)(int))1)
+#endif
+
+#ifndef SIG_ERR
-+#define SIG_ERR (-1)
++#define SIG_ERR ((void (*)(int))-1)
+#endif
+
#define _FILE_OFFSET_BITS 64
@@ -197,7 +197,7 @@ diff -ruwN source/git-compat-util.h source-new/git-compat-util.h
#endif
diff -ruwN source/Makefile source-new/Makefile
--- source/Makefile 2017-06-04 19:08:11.000000000 -0600
-+++ source-new/Makefile 2019-07-20 19:05:48.507774930 -0600
++++ source-new/Makefile 2019-07-21 19:45:59.477213914 -0600
@@ -979,7 +979,7 @@
BUILTIN_OBJS += builtin/write-tree.o
@@ -248,7 +248,7 @@ diff -ruwN source/Makefile source-new/Makefile
done && \
diff -ruwN source/run-command.c source-new/run-command.c
--- source/run-command.c 2017-06-04 19:08:11.000000000 -0600
-+++ source-new/run-command.c 2019-07-20 19:05:48.507774930 -0600
++++ source-new/run-command.c 2019-07-21 19:45:59.477213914 -0600
@@ -120,9 +120,9 @@
#ifndef GIT_WINDOWS_NATIVE
static inline void dup_devnull(int to)
@@ -272,7 +272,7 @@ diff -ruwN source/run-command.c source-new/run-command.c
diff -ruwN source/setup.c source-new/setup.c
--- source/setup.c 2017-06-04 19:08:11.000000000 -0600
-+++ source-new/setup.c 2019-07-20 19:05:48.507774930 -0600
++++ source-new/setup.c 2019-07-21 19:45:59.477213914 -0600
@@ -1146,11 +1146,11 @@
/* if any standard file descriptor is missing open it to /dev/null */
void sanitize_stdfds(void)
diff --git a/recipes/git/recipe.sh b/recipes/git/recipe.sh
index 29673dae9..728f71f87 100644
--- a/recipes/git/recipe.sh
+++ b/recipes/git/recipe.sh
@@ -6,7 +6,10 @@ DEPENDS="ca-certificates"
MAKEFLAGS=(
NEEDS_SSL_WITH_CURL=1
NEEDS_CRYPTO_WITH_SSL=1
+ NO_IPV6=1
+ NO_PREAD=1
NO_MMAP=1
+ NO_SETITIMER=1
NO_UNIX_SOCKETS=1
NEEDS_LIBICONV=
NEEDS_LIBRT=
--
GitLab